Extended PMF_Perm_Medium::getAllGroupsOptions() to allow array of group ids

Author: thorsten

phpmyfaq/admin/category.add.php

@@ -22,35 +22,33 @@
     exit();
 }
 ?>
-
         <header>
             <h2><?php print $PMF_LANG['ad_categ_new']; ?></h2>
         </header>
-
 <?php
 if ($permission["addcateg"]) {
 
     $category = new PMF_Category($faqConfig, false);
     $category->setUser($currentAdminUser);
     $category->setGroups($currentAdminGroups);
-    $parent_id = PMF_Filter::filterInput(INPUT_GET, 'cat', FILTER_VALIDATE_INT, 0);
+    $parentId = PMF_Filter::filterInput(INPUT_GET, 'cat', FILTER_VALIDATE_INT, 0);
 ?>
         <form class="form-horizontal" action="?action=savecategory" method="post">
             <input type="hidden" id="lang" name="lang" value="<?php print $LANGCODE; ?>" />
-            <input type="hidden" name="parent_id" value="<?php print $parent_id; ?>" />
+            <input type="hidden" name="parent_id" value="<?php print $parentId; ?>" />
             <input type="hidden" name="csrf" value="<?php print $user->getCsrfTokenFromSession(); ?>" />
 <?php
-    if ($parent_id > 0) {
-        $user_allowed  = $category->getPermissions('user', array($parent_id));
-        $group_allowed = $category->getPermissions('group', array($parent_id));
+    if ($parentId > 0) {
+        $user_allowed  = $category->getPermissions('user', array($parentId));
+        $group_allowed = $category->getPermissions('group', array($parentId));
 ?>
             <input type="hidden" name="restricted_users" value="<?php print $user_allowed[0]; ?>" />
             <input type="hidden" name="restricted_groups" value="<?php print $group_allowed[0]; ?>" />
 <?php
         printf('<div class="control-group">%s: %s (%s)</div>',
             $PMF_LANG["msgMainCategory"],
-            $category->categoryName[$parent_id]["name"],
-            $languageCodes[PMF_String::strtoupper($category->categoryName[$parent_id]["lang"])]);
+            $category->categoryName[$parentId]["name"],
+            $languageCodes[PMF_String::strtoupper($category->categoryName[$parentId]["lang"])]);
     }
 ?>
             <div class="control-group">
@@ -71,13 +69,13 @@
                 <label class="control-label" for="user_id"><?php print $PMF_LANG["ad_categ_owner"]; ?>:</label>
                 <div class="controls">
                     <select name="user_id" id="user_id" size="1">
-                    <?php print $user->getAllUserOptions(1); ?>
+                    <?php print $user->getAllUserOptions(); ?>
                     </select>
                 </div>
             </div>
 
 <?php
-    if ($parent_id == 0) {
+    if ($parentId == 0) {
         if ($faqConfig->get('security.permLevel') != 'basic') {
 ?>
             <div class="control-group">
@@ -91,8 +89,8 @@
                         <input type="radio" name="grouppermission" value="restricted" />
                         <?php print $PMF_LANG['ad_entry_restricted_groups']; ?>
                     </label>
-                    <select name="restricted_groups" size="1">
-                        <?php print $user->perm->getAllGroupsOptions(1); ?>
+                    <select name="restricted_groups" size="3" multiple>
+                        <?php print $user->perm->getAllGroupsOptions(); ?>
                     </select>
                 </div>
             </div>

phpmyfaq/admin/category.edit.php

@@ -96,8 +96,8 @@
                         <input type="radio" name="grouppermission" value="restricted" <?php print ($restricted_groups ? 'checked="checked"' : ''); ?>/>
                         <?php print $PMF_LANG['ad_entry_restricted_groups']; ?>
                     </label>
-                    <select name="restricted_groups" size="1">
-                        <?php print $user->perm->getAllGroupsOptions($group_permission[0]); ?>
+                    <select name="restricted_groups" size="3" multiple>
+                        <?php print $user->perm->getAllGroupsOptions($group_permission); ?>
                     </select>
                 </div>
             </div>

phpmyfaq/admin/record.edit.php

@@ -561,7 +561,7 @@
                                 <input type="radio" name="grouppermission"  value="restricted" <?php echo ($restrictedGroups ? 'checked="checked"' : ''); ?>/>
                                 <?php echo $PMF_LANG['ad_entry_restricted_groups']; ?>
                                 <select name="restricted_groups" size="1" class="input-medium">
-                                    <?php echo $user->perm->getAllGroupsOptions($groupPermission[0]); ?>
+                                    <?php echo $user->perm->getAllGroupsOptions($groupPermission); ?>
                                 </select>
                             </label>
                         </div>

phpmyfaq/inc/Perm/Medium.php

@@ -620,21 +620,25 @@ public function getAllGroups()
     /**
      * Get all groups in <option> tags
      *
-     * @param  integer $groups Selected group
+     * @param array $groups Selected groups
+     *
      * @return string
      */
-    public function getAllGroupsOptions($groups = -1)
+    public function getAllGroupsOptions(Array $groups)
     {
-        $options = '';
+        $options   = '';
         $allGroups = $this->getAllGroups();
-        foreach ($allGroups as $group_id) {
-            if (-1 != $group_id) {
+
+        foreach ($allGroups as $groupId) {
+            if (-1 != $groupId) {
                 $options .= sprintf('<option value="%d"%s>%s</option>',
-                    $group_id,
-                    ($group_id == $groups) ? ' selected="selected"' : '',
-                    $this->getGroupName($group_id));
+                    $groupId,
+                    (in_array($groupId, $groups) ? ' selected="selected"' : ''),
+                    $this->getGroupName($groupId)
+                );
             }
         }
+
         return $options;
     }
 
@@ -874,12 +878,12 @@ public function refuseAllGroupRights($group_id)
     /**
      * Returns the name of the group $group_id.
      *
-     * @param  integer $group_id Group ID
+     * @param  integer $groupId Group ID
      * @return string
      */
-    public function getGroupName($group_id)
+    public function getGroupName($groupId)
     {
-        if ($group_id <= 0 || !is_numeric($group_id)) {
+        if ($groupId <= 0 || !is_numeric($groupId)) {
             return false;
         }
 
@@ -891,7 +895,8 @@ public function getGroupName($group_id)
             WHERE
                 group_id = %d",
             PMF_Db::getTablePrefix(),
-            $group_id);
+            $groupId
+        );
 
         $res = $this->config->getDb()->query($select);
         if ($this->config->getDb()->numRows($res) != 1) {