CHANGE: プラグインオプションのselectと説明で翻訳ファイルのメッセージを使用可能とするコミット

CHANGE: Allow to use translation file in Plugin's 'select' option and
its 'description'.

http://japan.nucleuscms.org/bb/viewtopic.php?t=1133

プラグインオプションのselect値及びその説明で翻訳ファイルのメッセージを埋め込んでも置換されないバグの修正。これは日本語フォーラムで7年にわたり議論されてきたものである。
This is to fix the bug that translation message for plugin in the
value of 'select' option and description cannot be parsed in the
output. This bus is discussed in our Japanese Forum since 2005.

diff --git a/nucleus/libs/PLUGIN.php b/nucleus/libs/PLUGIN.php
index 23f9a58..9d84722 100644 (file)
--- a/nucleus/libs/PLUGIN.php
+++ b/nucleus/libs/PLUGIN.php
@@ -842,11 +842,12 @@
                                                $meta = NucleusPlugin::getOptionMeta($o->oextra);
 
                                                // if the option is readonly or hidden it may not be saved
-                                               if ( ($meta['access'] != 'readonly') && ($meta['access'] != 'hidden') ) 
+                                               if ( !array_key_exists('access', $meta)
+                                                || (($meta['access'] != 'readonly') && ($meta['access'] != 'hidden')) ) 
                                                {
-
-                                                       $value = undoMagic($value);     // value comes from request
-
+                                                       // value comes from request
+                                                       $value = undoMagic($value);
+                                                       
                                                        switch ( $o->otype ) 
                                                        {
                                                                case 'yesno':
@@ -858,15 +859,15 @@
                                                                default:
                                                                        break;
                                                        }
-
+                                                       
                                                        // check the validity of numerical options
-                                                       if ( ($meta['datatype'] == 'numerical') && (!is_numeric($value)) ) 
+                                                       if ( array_key_exists('datatype', $meta) && ($meta['datatype'] == 'numerical') && (!is_numeric($value)) ) 
                                                        {
                                                                //the option must be numeric, but the it isn't
                                                                //use the default for this option
                                                                $value = $o->odef;
                                                        }
-
+                                                       
                                                        // decide wether we are using the contextid of newContextid
                                                        if ( $newContextid != 0 ) 
                                                        {

diff --git a/nucleus/libs/showlist.php b/nucleus/libs/showlist.php
index a6c4922..20414e2 100644 (file)
--- a/nucleus/libs/showlist.php
+++ b/nucleus/libs/showlist.php
@@ -265,58 +265,100 @@ function listplug_table_plugoptionlist($template, $type) {
        }
 }
 
-function listplug_plugOptionRow($current) {
+function listplug_plugOptionRow($current)
+{
        $varname = 'plugoption['.$current['oid'].']['.$current['contextid'].']';
+       
        // retreive the optionmeta
        $meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
-
+       
        // only if it is not a hidden option write the controls to the page
-       if ($meta['access'] != 'hidden') {
-               echo '<td>',i18n::hsc($current['description']?$current['description']:$current['name']),'</td>';
-               echo '<td>';
-               switch($current['type']) {
+       if ( !in_array('access', $meta) || $meta['access'] != 'hidden' )
+       {
+               if ( !$current['description'] )
+               {
+                       echo '<td>' , i18n::hsc($current['name']) . "</td>\n";
+               }
+               else
+               {
+                       if ( !defined($current['description']) )
+                       {
+                               echo '<td>' , i18n::hsc($current['description']) . "</td>\n";
+                       }
+                       else
+                       {
+                               echo '<td>' , i18n::hsc(constant($current['description'])) . "</td>\n";
+                       }
+               }
+               echo "<td>\n";
+               switch($current['type'])
+               {
                        case 'yesno':
                                ADMIN::input_yesno($varname, $current['value'], 0, 'yes', 'no');
                                break;
                        case 'password':
-                               echo '<input type="password" size="40" maxlength="128" name="',i18n::hsc($varname),'" value="',i18n::hsc($current['value']),'" />';
+                               echo '<input type="password" size="40" maxlength="128" name="',i18n::hsc($varname),'" value="',i18n::hsc($current['value']),"\" />\n";
                                break;
                        case 'select':
-                               echo '<select name="'.i18n::hsc($varname).'">';
+                               echo '<select name="'.i18n::hsc($varname)."\">\n";
                                $aOptions = NucleusPlugin::getOptionSelectValues($current['typeinfo']);
                                $aOptions = i18n::explode('|', $aOptions);
-                               for ($i=0; $i<(count($aOptions)-1); $i+=2) {
-                                       echo '<option value="'.i18n::hsc($aOptions[$i+1]).'"';
+                               for ( $i=0; $i<(count($aOptions)-1); $i+=2 )
+                               {
                                        if ($aOptions[$i+1] == $current['value'])
-                                               echo ' selected="selected"';
-                                       echo '>'.i18n::hsc($aOptions[$i]).'</option>';
+                                       {
+                                               echo '<option value="' . i18n::hsc($aOptions[$i+1]) . '" selected="selected">';
+                                       }
+                                       else
+                                       {
+                                               echo '<option value="' . i18n::hsc($aOptions[$i+1]) . '">';
+                                       }
+                                       if ( defined($aOptions[$i]) )
+                                       {
+                                               echo i18n::hsc(constant($aOptions[$i]));
+                                       }
+                                       else
+                                       {
+                                               echo i18n::hsc($aOptions[$i]);
+                                       }
+                                       echo "</option>\n";
                                }
-                               echo '</select>';
+                               echo "</select>\n";
                                break;
                        case 'textarea':
                                //$meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
-                               echo '<textarea class="pluginoption" cols="30" rows="5" name="',i18n::hsc($varname),'"';
-                               if ($meta['access'] == 'readonly') {
-                                       echo ' readonly="readonly"';
+                               if ( array_key_exists('access', $meta) && $meta['access'] == 'readonly' )
+                               {
+                                       echo '<textarea class="pluginoption" cols="30" rows="5" name="' . i18n::hsc($varname) . "\" readonly=\"readonly\">\n";
+                               }
+                               else
+                               {
+                                       echo '<textarea class="pluginoption" cols="30" rows="5" name="' . i18n::hsc($varname) . "\">\n";
                                }
-                               echo '>',i18n::hsc($current['value']),'</textarea>';
+                               echo i18n::hsc($current['value']) . "\n";
+                               echo "</textarea>\n";
                                break;
                        case 'text':
                        default:
                                //$meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
-
                                echo '<input type="text" size="40" maxlength="128" name="',i18n::hsc($varname),'" value="',i18n::hsc($current['value']),'"';
-                               if ($meta['datatype'] == 'numerical') {
+                               if ( array_key_exists('datatype', $meta) && $meta['datatype'] == 'numerical' )
+                               {
                                        echo ' onkeyup="checkNumeric(this)" onblur="checkNumeric(this)"';
                                }
-                               if ($meta['access'] == 'readonly') {
+                               if ( array_key_exists('access', $current) && $meta['access'] == 'readonly')
+                               {
                                        echo ' readonly="readonly"';
                                }
-                               echo ' />';
+                               echo " />\n";
+               }
+               if ( array_key_exists('extra', $current) )
+               {
+                       echo $current['extra'];
                }
-               echo $current['extra'];
-               echo '</td>';
+               echo "</td>\n";
        }
+       return;
 }
 
 function listplug_table_itemlist($template, $type) {