Changeset 11582
- Timestamp:
- Jun 29, 2011, 11:45:00 PM (13 years ago)
- Location:
- extensions/AMenuManager
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/AMenuManager/amm_root.class.inc.php
r11071 r11582 540 540 $registeredBlocks = $menu->get_registered_blocks(); 541 541 542 $userGroups=array(); 543 $sql="SELECT group_id 544 FROM ".USER_GROUP_TABLE." 545 WHERE user_id = '".$user['id']."';"; 546 $result=pwg_query($sql); 547 if($result) 548 { 549 while($row=pwg_db_fetch_assoc($result)) 550 { 551 $userGroups[$row['group_id']]=''; 552 } 553 } 554 542 555 $sql="SELECT id, `order`, users, groups 543 556 FROM ".$this->tables['blocks']." … … 548 561 while($row=pwg_db_fetch_assoc($result)) 549 562 { 550 $row['users']= explode(',', $row['users']);551 $row['groups']= explode(',', $row['groups']);563 $row['users']=(trim($row['users'])=='')?array():explode(',', $row['users']); 564 $row['groups']=(trim($row['groups'])=='')?array():explode(',', $row['groups']); 552 565 553 566 if(isset($registeredBlocks[$row['id']])) … … 559 572 if($users->isAllowed($user['status'])) 560 573 { 561 $groups->setAlloweds($row['groups'], false); 562 foreach($row['groups'] as $val) 574 if(count($userGroups)) 563 575 { 564 if(!$groups->isAllowed($val)) $ok=false; 576 $groups->setAlloweds($row['groups'], false); 577 foreach($row['groups'] as $val) 578 { 579 if(isset($userGroups[$val]) and !$groups->isAllowed($val)) $ok=false; 580 } 581 } 582 else 583 { 584 if(count($row['groups'])==0) $ok=false; 565 585 } 566 586 } -
extensions/AMenuManager/amm_version.inc.php
r11036 r11582 15 15 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 16 16 17 define('AMM_VERSION', '3.1. 3');18 define('AMM_VERSION2', '03.01.0 3');17 define('AMM_VERSION', '3.1.4'); 18 define('AMM_VERSION2', '03.01.04'); 19 19 define('AMM_GPC_NEEDED', '3.5.1'); 20 20 ?> -
extensions/AMenuManager/main.inc.php
r11071 r11582 2 2 /* 3 3 Plugin Name: Advanced Menu Manager 4 Version: 3.1. 34 Version: 3.1.4 5 5 Description: Gestion avancée du menu / Advanced management of menu 6 6 Plugin URI: http://piwigo.org … … 193 193 | | | 194 194 | 3.1.3 | 2011/05/24 | * mantis bug:2311 195 | | | . broken javascript if random pic set is empty 195 | | | . broken javascript if random pic set is empty 196 196 | | | 197 197 | | | * mantis bug:2312 198 | | | . randomPictureJS is loaded even if menu is hidden 198 | | | . randomPictureJS is loaded even if menu is hidden 199 199 | | | 200 200 | | | * mantis bug:2281 201 | | | . Custom language value is use in queries unescaped. 201 | | | . Custom language value is use in queries unescaped. 202 | | | 203 | 3.1.4 | 2011/06/29 | * mantis bug:2371 204 | | | . User access management don't work if user is linked 205 | | | to a group 206 | | | 207 | | | 208 | | | 202 209 | | | 203 210 | | |
Note: See TracChangeset
for help on using the changeset viewer.