Fixed issue #6985: Custom default template is not used as default in …

…user template permission
LimeSurvey · Dec 3, 2012 · 403f027 · 403f027
1 parent b0240db
commit 403f027
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/application/controllers/admin/globalsettings.php b/application/controllers/admin/globalsettings.php
@@ -68,7 +68,12 @@ private function _displaySettings()
 
         // Some URLs are not to be allowed to refered back to.
         // These exceptions can be added to the $aReplacements array
-        $aReplacements=array('admin/user/adduser'=>'admin/user/index');
+        $aReplacements=array('admin/user/adduser'=>'admin/user/index',
+                             'admin/user/sa/adduser'=>'admin/user/sa/index',
+                             'admin/user/sa/setusertemplates'=>'admin/user/sa/index',
+                             'admin/user/setusertemplates'=>'admin/user/sa/index'
+
+                            );
         $refurl= str_replace(array_keys($aReplacements),array_values($aReplacements),$refurl);
         Yii::app()->session['refurl'] = htmlspecialchars($refurl); //just to be safe!
 

diff --git a/application/controllers/admin/useraction.php b/application/controllers/admin/useraction.php
@@ -105,7 +105,7 @@ function adduser()
 
             if ($iNewUID) {
                 // add default template to template rights for user
-                Templates_rights::model()->insertRecords(array('uid' => $iNewUID, 'folder' => 'default', 'use' => '1'));
+                Templates_rights::model()->insertRecords(array('uid' => $iNewUID, 'folder' => Yii::app()->getConfig("defaulttemplate"), 'use' => '1'));
 
                 // add new user to userlist
                 $sresult = User::model()->getAllRecords(array('uid' => $iNewUID));
@@ -433,7 +433,7 @@ function userrights()
         $postuserid = Yii::app()->request->getPost("uid");
         $aViewUrls = array();
 
-        // A user can't modify his own rights ;-)
+        // A user can't modify his own rights
         if ($postuserid != Yii::app()->session['loginID']) {
             $sresult = User::model()->findAllByAttributes(array('uid' => $postuserid, 'parent_id' => Yii::app()->session['loginID']));
             $sresultcount = count($sresult);