Fixed issue: auth_webserver_autocreate_user option not properly setti…

…ng template permission
LimeSurvey · Jun 18, 2014 · 66b0565 · 66b0565
1 parent 4ac107a
commit 66b0565
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 41 deletions.
diff --git a/application/core/UserIdentity.php b/application/core/UserIdentity.php
@@ -130,11 +130,12 @@ public function authenticate($sOneTimePassword='')
                     $aTemplates=explode(",",$aUserProfile['templatelist']);
                     foreach ($aTemplates as $sTemplateName)
                     {
-                        $oRecord=new Templates_rights;
-                        $oRecord->uid = $oUser->uid;
-                        $oRecord->folder = trim($sTemplateName);
-                        $oRecord->use = 1;
-                        $oRecord->save();
+                        $oPermission=new Permission;
+                        $oPermission->uid = $oUser->uid;
+                        $oPermission->entity = 'template';
+                        $oPermission->permission = trim($sTemplateName);
+                        $oPermission->read_p = 1;
+                        $oPermission->save();
                     }
 
                     // read again user from newly created entry

diff --git a/application/tests/staticCalls.php b/application/tests/staticCalls.php
@@ -94,7 +94,6 @@ function checkStatic($line)
 'SettingGlobal::',
 'Zend_Http_Client::',
 'Zend_XmlRpc_Value::',
-'Templates_rights_model::',
 'Zend_XmlRpc_Server_Fault::',
 'Zend_XmlRpc_Value::',
 'Zend_Server_Cache::',
@@ -129,7 +128,6 @@ function checkStatic($line)
 'surveypermission::',
 'Template::',
 'templates::',
-'Templates_rights::',
 'register::',
 '::first',
 '::before',

diff --git a/installer/sql/create-mssql.sql b/installer/sql/create-mssql.sql
@@ -535,17 +535,6 @@ CREATE TABLE [prefix_users] (
 );
 
 
---
--- Table structure for table templates_rights
---
-CREATE TABLE [prefix_templates_rights] (
-[uid] int NOT NULL,
-[folder] varchar(255) NOT NULL,
-[use] int NOT NULL,
-PRIMARY KEY  ([uid],[folder])
-);
-
-
 --
 -- Table structure for table templates
 --

diff --git a/installer/sql/create-mysql.sql b/installer/sql/create-mysql.sql
@@ -539,17 +539,6 @@ CREATE TABLE `prefix_users` (
 ) ENGINE=MYISAM CHARACTER SET utf8 COLLATE utf8_unicode_ci;
 
 
---
--- Table structure for table templates_rights
---
-CREATE TABLE `prefix_templates_rights` (
-  `uid` int(11) NOT NULL,
-  `folder` varchar(255) NOT NULL,
-  `use` int(11) NOT NULL,
-  PRIMARY KEY  (`uid`,`folder`)
-) ENGINE=MYISAM CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-
 --
 -- Table structure for table templates
 --

diff --git a/installer/sql/create-pgsql.sql b/installer/sql/create-pgsql.sql
@@ -542,18 +542,6 @@ CREATE TABLE prefix_users (
     "modified" timestamp
 );
 
-
---
--- Table structure for table templates_rights
---
-CREATE TABLE prefix_templates_rights (
-  "uid" integer NOT NULL,
-  "folder" character varying(255) NOT NULL,
-  "use" integer NOT NULL,
-  CONSTRAINT prefix_templates_rights_pkey PRIMARY KEY ("uid","folder")
-);
-
-
 --
 -- Table structure for table templates
 --