Changeset 25545 for trunk/include
- Timestamp:
- Nov 18, 2013, 6:03:00 AM (10 years ago)
- Location:
- trunk/include/ws_functions
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/ws_functions/pwg.permissions.php
r25281 r25545 58 58 if (!isset($perms[ $row['cat_id'] ])) 59 59 { 60 $perms[ $row['cat_id'] ]['id'] = $row['cat_id'];61 } 62 $perms[ $row['cat_id'] ]['users'][] = $row['user_id'];60 $perms[ $row['cat_id'] ]['id'] = intval($row['cat_id']); 61 } 62 $perms[ $row['cat_id'] ]['users'][] = intval($row['user_id']); 63 63 } 64 64 … … 77 77 if (!isset($perms[ $row['cat_id'] ])) 78 78 { 79 $perms[ $row['cat_id'] ]['id'] = $row['cat_id'];80 } 81 $perms[ $row['cat_id'] ]['users_indirect'][] = $row['user_id'];79 $perms[ $row['cat_id'] ]['id'] = intval($row['cat_id']); 80 } 81 $perms[ $row['cat_id'] ]['users_indirect'][] = intval($row['user_id']); 82 82 } 83 83 … … 94 94 if (!isset($perms[ $row['cat_id'] ])) 95 95 { 96 $perms[ $row['cat_id'] ]['id'] = $row['cat_id'];97 } 98 $perms[ $row['cat_id'] ]['groups'][] = $row['group_id'];96 $perms[ $row['cat_id'] ]['id'] = intval($row['cat_id']); 97 } 98 $perms[ $row['cat_id'] ]['groups'][] = intval($row['group_id']); 99 99 } 100 100 … … 121 121 } 122 122 123 $cat['groups'] = !empty($cat['groups']) ? array_ unique($cat['groups']) : array();124 $cat['users'] = !empty($cat['users']) ? array_ unique($cat['users']) : array();125 $cat['users_indirect'] = !empty($cat['users_indirect']) ? array_ unique($cat['users_indirect']) : array();123 $cat['groups'] = !empty($cat['groups']) ? array_values(array_unique($cat['groups'])) : array(); 124 $cat['users'] = !empty($cat['users']) ? array_values(array_unique($cat['users'])) : array(); 125 $cat['users_indirect'] = !empty($cat['users_indirect']) ? array_values(array_unique($cat['users_indirect'])) : array(); 126 126 } 127 127 unset($cat); -
trunk/include/ws_functions/pwg.users.php
r25474 r25545 168 168 ;'; 169 169 170 $users = hash_from_query($query, 'id'); 170 $users = array(); 171 $result = pwg_query($query); 172 while ($row = pwg_db_fetch_assoc($result)) 173 { 174 $row['id'] = intval($row['id']); 175 $users[ $row['id'] ] = $row; 176 } 171 177 172 178 if (count($users) > 0) … … 183 189 while ($row = pwg_db_fetch_assoc($result)) 184 190 { 185 $users[ $row['user_id'] ]['groups'][] = $row['group_id'];191 $users[ $row['user_id'] ]['groups'][] = intval($row['group_id']); 186 192 } 187 193 }
Note: See TracChangeset
for help on using the changeset viewer.