Dev: Revert "Dev: comment in readConfigFiles"

Dev: oups .... This reverts commit e5ac7d3.
LimeSurvey · Jan 25, 2017 · 781940b · 781940b
1 parent e5ac7d3
commit 781940b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 94 deletions.
diff --git a/application/extensions/SettingsWidget/SettingsWidget.php b/application/extensions/SettingsWidget/SettingsWidget.php
@@ -160,32 +160,24 @@ protected function renderSetting($name, $metaData, $form = null, $return = false
         {
             $name = "{$this->prefix}[$name]";
         }
-
-
+        if ($metaData['localized'])
+        {
+            $name = "{$name}[{$metaData['language']}]";
+        }
         // Find function
+        $function = "render{$metaData['type']}";
 
+        // Construct the content
+        // The labels
+        $content  = $this->renderLabel($name, $metaData);
+        // The control
+        $content .= CHtml::openTag('div',$metaData['controlOptions']);
+        // The input
+        $content .= $this->$function($name, $metaData, $form);
+        // The help
+        $content .= $this->renderHelp($name, $metaData);
+        $content .= CHtml::closeTag('div');
 
-        if (is_array($metaData['language'])){
-            $metaData['language']=$metaData['language'];
-            $content=$this->renderLocalizedSetting($name, $metaData);
-        } else {
-            $function = "render{$metaData['type']}";
-            if ($metaData['localized'])
-            {
-                $name = "{$name}[{$metaData['language']}]";
-            }
-            // Construct the content
-            // The labels
-            $content  = $this->renderLabel($name, $metaData);
-            // The control
-            $content .= CHtml::openTag('div',$metaData['controlOptions']);
-            // The input
-            $content .= $this->$function($name, $metaData, $form);
-            // The help
-            $content .= $this->renderHelp($name, $metaData);
-            $content .= CHtml::closeTag('div');
-
-        }
         $result=CHtml::tag($wrapper,array('class'=>"form-group setting setting-{$metaData['type']}", 'data-name' => $name),$content);
 
         if($return)
@@ -198,63 +190,6 @@ protected function renderSetting($name, $metaData, $form = null, $return = false
         }
     }
 
-    /**
-     * render an localized settings : fieldset legend label + input for each language with tab https://getbootstrap.com/javascript/#tabs
-     * @param $name string
-     * @param $metaData
-     * @return string
-     */
-    protected function renderLocalizedSetting($name,$metaData,$form=null){
-        //return "BROKEN";
-        $function = "render{$metaData['type']}";
-        $content  = CHtml::openTag('fieldset');
-        if(!empty($metaData['label'])){
-            $content .= CHtml::tag('legend',array(),$metaData['label']);
-        }
-        $content .= CHtml::openTag('ul',array('class'=>"nav nav-tabs",'role'=>"tablist"));
-        $first=true;
-        foreach($metaData['language'] as $lang){
-            $langId=CHtml::getIdByName("{$name}[{$lang}]");
-            $content .= CHtml::tag('li',array('role'=>"presentation",'class'=>$first ? "active":""),
-                CHtml::link(getLanguageNameFromCode($lang, false),"#{$langId}",array('aria-controls'=>"{$langId}",'role'=>"tab",'data-toggle'=>"tab"))
-            );
-            $first=false;
-        }
-        $content .= CHtml::closeTag('ul');
-        $content .= CHtml::openTag('div',array('class'=>"tab-content row"));
-        $first=true;
-        foreach($metaData['language'] as $lang){
-            $langMetaData=$metaData;
-            $content .= CHtml::openTag('div',array('id'=>CHtml::getIdByName("{$name}[{$lang}]"),'role'=>"tabpanel",'class'=>"tab-pane".($first ? " active":"")));
-            $first=false;
-            $langName="{$name}[{$lang}]";
-            if (isset($metaData['current']) && is_array($metaData['current']) && isset($metaData['current'][$lang]))
-            {
-                $langMetaData['current'] = $metaData['current'][$lang];
-            }
-            else
-            {
-                unset($langMetaData['current']);
-            }
-            //~ $langMetaData['label']=$metaData['label']." - ".$lang
-            $content .= $this->renderLabel($langName, $langMetaData);
-            // The control
-            $content .= CHtml::openTag('div',$langMetaData['controlOptions']);
-            // The input
-            $content .= $this->$function($langName, $langMetaData, $form);
-            // The help
-            $content .= CHtml::closeTag('div');
-            $content .= CHtml::closeTag('div');
-        }
-        $content .= CHtml::closeTag('div');
-        if(!empty($metaData['help'])){
-            $content .= CHtml::tag('div',array('class'=>'row'),
-                CHtml::tag('div', array('class' =>"help-block col-sm-offset-{$this->labelWidth}"),$metaData['help'])
-            );
-        }
-        $content .= CHtml::closeTag('fieldset');
-        return $content;
-    }
     protected function renderSettings()
     {
         foreach($this->settings as $name => $metaData)
@@ -307,7 +242,6 @@ public function fixMetaData($name,$metaData){
                 'class' => "default"
             ),
             'localized'=>false,
-            'language'=>null,
         );
         $metaData = array_merge($defaults, $metaData);
 
@@ -329,16 +263,14 @@ public function fixMetaData($name,$metaData){
         // Handle localization.
         if ($metaData['localized'])
         {
-            if(!is_array($metaData['language'])){
-                $name = "{$name}[{$metaData['language']}]";
-                if (isset($metaData['current']) && is_array($metaData['current']) && isset($metaData['current'][$metaData['language']]))
-                {
-                    $metaData['current'] = $metaData['current'][$metaData['language']];
-                }
-                else
-                {
-                    unset($metaData['current']);
-                }
+            $name = "{$name}[{$metaData['language']}]";
+            if (isset($metaData['current']) && is_array($metaData['current']) && isset($metaData['current'][$metaData['language']]))
+            {
+                $metaData['current'] = $metaData['current'][$metaData['language']];
+            }
+            else
+            {
+                unset($metaData['current']);
             }
         }
 
@@ -364,7 +296,7 @@ public function renderLabel($name, $metaData){
         }
         else if(!in_array($metaData['type'], array('list','logo','link','info')))
         {
-            return CHtml::label($metaData['label'], CHtml::getIdByName($name), $metaData['labelOptions']);
+            return CHtml::label($metaData['label'], $name, $metaData['labelOptions']);
         }
         else
         {

diff --git a/application/libraries/PluginManager/PluginManager.php b/application/libraries/PluginManager/PluginManager.php
@@ -425,8 +425,6 @@ public function readConfigFiles()
         foreach ($this->plugins as $plugin) {
             if(is_object($plugin)){
                 $plugin->readConfigFile();
-            } else {
-              // Do nothing, plugin is deleted next time plugin manager is visited and loadPlugin validate if class exist
             }
         }
         $this->plugins = array();