Fixed issue #08947: Unable to see underscore in plugin settings (and …

…some other CSS issue) Dev: add some bootsrap style, get bootsrap 3.1 for width of label and controls Dev: allow to save without quit in plugin settig Dev: use autosublit select save actual settings
LimeSurvey · May 29, 2014 · 132ba28 · 132ba28
1 parent f405274
commit 132ba28
Show file tree

Hide file tree

Showing 6 changed files with 277 additions and 245 deletions.
diff --git a/application/controllers/PluginsController.php b/application/controllers/PluginsController.php
@@ -80,7 +80,7 @@ public function actionConfigure($id)
         }
 
         // If post handle data, yt0 seems to be the submit button
-        if (App()->request->isPostRequest && App()->request->getPost('yt0'))
+        if (App()->request->isPostRequest)
         {
 
             $aSettings = $oPluginObject->getPluginSettings(false);
@@ -91,8 +91,11 @@ public function actionConfigure($id)
             }
             $oPluginObject->saveSettings($aSave);
 
-            Yii::app()->user->setFlash('pluginmanager', 'Settings saved');
-            $this->forward('plugins/index', true);
+            if(App()->request->getPost('redirect'))
+            {
+                Yii::app()->user->setFlash('pluginmanager', 'Settings saved');
+                $this->forward('plugins/index', true);
+            }
         }
 
         $aSettings = $oPluginObject->getPluginSettings();

diff --git a/application/core/plugins/AuthLDAP/AuthLDAP.php b/application/core/plugins/AuthLDAP/AuthLDAP.php
@@ -17,11 +17,13 @@ class AuthLDAP extends AuthPluginBase
     protected $settings = array(
         'server' => array(
             'type' => 'string',
-            'label' => 'Ldap server e.g. ldap://ldap.mydomain.com or ldaps://ldap.mydomain.com'
+            'label' => 'Ldap server',
+            'help' => 'e.g. ldap://ldap.mydomain.com or ldaps://ldap.mydomain.com'
             ),
         'ldapport' => array(
             'type' => 'string',
-            'label' => 'Port number (default when omitted is 389)'
+            'label' => 'Port number',
+            'help' => 'Default when omitted is 389',
             ),
         'ldapversion' => array(
             'type' => 'select',
@@ -37,7 +39,8 @@ class AuthLDAP extends AuthPluginBase
             ),
         'ldaptls' => array(
             'type' => 'boolean',
-            'label' => 'Check to enable Start-TLS encryption When using LDAPv3',
+            'help' => 'Check to enable Start-TLS encryption, when using LDAPv3',
+            'label' => 'Enable Start-TLS',
             'default' => '0'
             ),
         'ldapmode' => array(
@@ -49,11 +52,13 @@ class AuthLDAP extends AuthPluginBase
             ),
         'userprefix' => array(
             'type' => 'string',
-            'label' => 'Username prefix cn= or uid=',
+            'label' => 'Username prefix',
+            'help' => 'e.g. cn= or uid=',
             ),
         'domainsuffix' => array(
                 'type' => 'string',
-                'label' => 'Username suffix e.g. @mydomain.com or remaining part of ldap query'
+                'label' => 'Username suffix',
+                'help' => 'e.g. @mydomain.com or remaining part of ldap query',
                 ),
         'searchuserattribute' => array(
                 'type' => 'string',