Fixed #6927: Undefined Index error when restricted users attempts to …

…access 'Create/edit user groups'
LimeSurvey · Nov 22, 2012 · a8c2776 · a8c2776
1 parent 8b895c2
commit a8c2776
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/application/controllers/admin/usergroups.php b/application/controllers/admin/usergroups.php
@@ -307,25 +307,29 @@ public function index($ugid = false, $header = false)
                 $bgcc = "oddrow";
                 foreach ($aUserInGroupsResult as $egurow)
                 {
-                    if ($bgcc == "evenrow")
+                    if ($bgcc == "evenrow") {
                         $bgcc = "oddrow";
-                    else
+                    } else {
                         $bgcc = "evenrow";
+                    }
                     $userloop[$row]["userid"] = $egurow['uid'];
                     if ($egurow['uid'] == $crow['owner_id']) {
                         $userloop[$row]["username"] = "<strong>{$egurow['users_name']}</strong>";
                         $userloop[$row]["email"] = "<strong>{$egurow['email']}</strong>";
                         $userloop[$row]["rowclass"] = $bgcc;
                         $userloop[$row]["displayactions"] = false;
-                        continue;
-                    }
-                    // output users
-                    $userloop[$row]["rowclass"] = $bgcc;
-                    if (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1)
-                        $userloop[$row]["displayactions"] = true;
+                    } else {
+                        //	output users
+                        $userloop[$row]["rowclass"] = $bgcc;
+                        if (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1) {
+                            $userloop[$row]["displayactions"] = true;
+                        } else {
+                            $userloop[$row]["displayactions"] = false;
+                        }
 
-                    $userloop[$row]["username"] = $egurow['users_name'];
-                    $userloop[$row]["email"] = $egurow['email'];
+                        $userloop[$row]["username"] = $egurow['users_name'];
+                        $userloop[$row]["email"] = $egurow['email'];
+                    }
                     $row++;
                 }
                 $aData["userloop"] = $userloop;

diff --git a/application/views/admin/usergroup/viewUserGroup_view.php b/application/views/admin/usergroup/viewUserGroup_view.php
@@ -42,7 +42,7 @@
             <tr class='<?php echo $currentuser["rowclass"];?>'>
                 <td align='center'>
                 <?php
-                if($currentuser["displayactions"])
+                if(isset($currentuser["displayactions"]) && $currentuser["displayactions"] == true)
                 { ?>
                     <form method='post' action='<?php echo $this->createUrl("admin/usergroups/user/ugid/{$usergroupid}/action/remove"); ?>'>
                     <input type='image' src='<?php echo Yii::app()->getConfig('adminimageurl')?>/token_delete.png' alt='<?php $clang->eT("Delete this user from group");?>' onclick='return confirm("<?php $clang->eT("Are you sure you want to delete this entry?","js");?>")' />