Dev Fixed Scrutinizer issues

LimeSurvey · Nov 27, 2017 · fa6e9dc · fa6e9dc
1 parent 381862d
commit fa6e9dc
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 172 deletions.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -944,7 +944,6 @@ public function rendersidemenulink($iSurveyID, $subaction)
         if (!(Permission::model()->hasSurveyPermission($iSurveyID, $menuEntry->permission, $menuEntry->permission_grade))) {
             Yii::app()->setFlashMessage(gT("You do not have permission to access this page."), 'error');
             $this->getController()->redirect(array('admin/survey', 'sa'=>'view', 'surveyid'=>$iSurveyID));
-            Yii::app()->end();
         }
 
         $templateData = is_array($menuEntry->data) ? $menuEntry->data : [];

diff --git a/application/controllers/admin/surveypermission.php b/application/controllers/admin/surveypermission.php
@@ -75,7 +75,7 @@ public function index($iSurveyID)
             // Foot first
 
             if (Yii::app()->getConfig('usercontrolSameGroupPolicy') == true) {
-                $authorizedGroupsList = getUserGroupList(null, 'simplegidarray');
+                $authorizedGroupsList = getUserGroupList();
             }
 
             $surveysecurity .= "<tbody>\n";
@@ -202,7 +202,7 @@ public function index($iSurveyID)
             . "<li><label class='col-sm-1 col-md-offset-2 text-right control-label' for='uidselect'>".gT("User").": </label>
                  <div class='col-sm-4'>
                 <select id='uidselect' name='uid'  class='form-control'>\n"
-            . getSurveyUserList(false, false, $iSurveyID)
+            . getSurveyUserList( false, $iSurveyID)
             . "</select></div>\n"
             . "<input style='width: 15em;' class='btn btn-default' type='submit' value='".gT("Add user")."'  onclick=\"if (document.getElementById('uidselect').value == -1) { alert('".gT("Please select a user first", "js")."'); return false;}\"/>"
             . "<input type='hidden' name='action' value='addsurveysecurity' />"
@@ -430,7 +430,7 @@ function set($surveyid)
                 $this->getController()->error('Access denied');
             }
         } elseif ($action == "setusergroupsurveysecurity") {
-            if (!Permission::model()->hasGlobalPermission('superadmin', 'read') && !in_array($postusergroupid, getUserGroupList(null, 'simplegidarray'))) {
+            if (!Permission::model()->hasGlobalPermission('superadmin', 'read') && !in_array($postusergroupid, getUserGroupList())) {
                 // User can not change own security (except for superadmin ?)
                 $this->getController()->error('Access denied');
             }
@@ -607,7 +607,7 @@ function surveyright($surveyid)
 
         if ($postuserid && !in_array($postuserid, getUserList('onlyuidarray'))) {
             $this->getController()->error('Access denied');
-        } elseif ($postusergroupid && !in_array($postusergroupid, getUserGroupList(null, 'simplegidarray'))) {
+        } elseif ($postusergroupid && !in_array($postusergroupid, getUserGroupList())) {
             $this->getController()->error('Access denied');
         }