Changeset 4395

Timestamp:

Nov 29, 2009, 10:33:33 PM (14 years ago)

Author:

grum

Message:

[AMM] feature 1299, feature 1298, feature 1297
Allows to manage access for the 'Admin' users
Users 'Webmaster' aren't managed
AMM don't works properly if a block 'menu' or 'specials' is hidden

Location:

extensions/AMenuManager

Files:

• admin/amm_sections_visibility.tpl (modified) (2 diffs)
• admin/amm_sectionsmod_detail.tpl (deleted)
• amm_aip.class.inc.php (modified) (1 diff)
• amm_pip.class.inc.php (modified) (1 diff)
• amm_root.class.inc.php (modified) (1 diff)
• main.inc.php (modified) (3 diffs)
• maintain.inc.php (modified) (2 diffs)

extensions/AMenuManager/admin/amm_sections_visibility.tpl

@@ -4 +4 @@
   <label>
   <input type="checkbox" id="i{$name}_vis_user_{$values.id}" value="{$values.id}"
-    {if $values.allowed==true} checked{/if}
-    {if $values.enabled==false} disabled{/if} />{$values.name}
+    {if $values.allowed==true} checked{/if} />{$values.name}
   </label><br/>
 {/foreach}
@@ -15 +14 @@
   <label>
   <input type="checkbox" id="i{$name}_vis_group_{$values.id}" value="{$values.id}"
-    {if $values.allowed==true} checked{/if}
-    {if $values.enabled==false} disabled{/if} />{$values.name}
+    {if $values.allowed==true} checked{/if} />{$values.name}
   </label><br/>
 {/foreach}

extensions/AMenuManager/amm_aip.class.inc.php

@@ -521 +521 @@
     {
       $this->my_config['amm_sections_items'][$key]['visibilityForm'] = $this->makeVisibility($val['visibility'], $key);
-      $this->defaultMenus[$key]['visibilityForm'] = $this->makeVisibility("guest,generic,normal,admin/", $key);
+      $this->defaultMenus[$key]['visibilityForm'] = $this->makeVisibility("guest,generic,normal,webmaster,admin/", $key);
     }
 

extensions/AMenuManager/amm_pip.class.inc.php

@@ -147 +147 @@
     */
     $blocks=Array();
-    $blocks['menu']=$menu->get_block('mbMenu');
-    $blocks['special']=$menu->get_block('mbSpecials');
+
+    if($menu->is_hidden('mbMenu'))
+    {
+      // if block is hidden, make a fake to manage AMM features
+      // the fake block isn't displayed
+      $blocks['menu']=new DisplayBlock('amm_mbMenu');
+      $blocks['menu']->data=Array();
+    }
+    else
+    {
+      $blocks['menu']=$menu->get_block('mbMenu');
+    }
+
+    if($menu->is_hidden('mbSpecials'))
+    {
+      // if block is hidden, make a fake to manage AMM features
+      // the fake block isn't displayed
+      $blocks['special']=new DisplayBlock('amm_mbSpecial');
+      $blocks['special']->data=Array();
+    }
+    else
+    {
+      $blocks['special']=$menu->get_block('mbSpecials');
+    }
 
     $menuItems=array_merge($blocks['menu']->data, $blocks['special']->data);

extensions/AMenuManager/amm_root.class.inc.php

@@ -26 +26 @@
   protected $css;   //the css object
   protected $defaultMenus = array(
-    'favorites' => array('container' => 'special', 'visibility' => 'guest,generic,normal,admin/', 'order' => 0, 'translation' => 'favorite_cat'),
-    'most_visited' => array('container' => 'special', 'visibility' => 'guest,generic,normal,admin/', 'order' => 1, 'translation' => 'most_visited_cat'),
-    'best_rated' => array('container' => 'special', 'visibility' => 'guest,generic,normal,admin/', 'order' => 2, 'translation' => 'best_rated_cat'),
-    'random' => array('container' => 'special', 'visibility' => 'guest,generic,normal,admin/', 'order' => 3, 'translation' => 'random_cat'),
-    'recent_pics' => array('container' => 'special', 'visibility' => 'guest,generic,normal,admin/', 'order' => 4, 'translation' => 'recent_pics_cat'),
-    'recent_cats' => array('container' => 'special', 'visibility' => 'guest,generic,normal,admin/', 'order' => 5, 'translation' => 'recent_cats_cat'),
-    'calendar' => array('container' => 'special', 'visibility' => 'guest,generic,normal,admin/', 'order' => 6, 'translation' => 'calendar'),
-    'qsearch' => array('container' => 'menu', 'visibility' => 'guest,generic,normal,admin/', 'order' => 0, 'translation' => 'qsearch'),
-    'tags' => array('container' => 'menu', 'visibility' => 'guest,generic,normal,admin/', 'order' => 1, 'translation' => 'Tags'),
-    'search' => array('container' => 'menu', 'visibility' => 'guest,generic,normal,admin/', 'order' => 2, 'translation' => 'Search'),
-    'comments' => array('container' => 'menu', 'visibility' => 'guest,generic,normal,admin/', 'order' => 3, 'translation' => 'comments'),
-    'about' => array('container' => 'menu', 'visibility' => 'guest,generic,normal,admin/', 'order' => 4, 'translation' => 'About'),
-    'rss' => array('container' => 'menu', 'visibility' => 'guest,generic,normal,admin/', 'order' => 5, 'translation' => 'Notification')
+    'favorites' => array('container' => 'special', 'visibility' => 'guest,generic,normal,webmaster,admin/', 'order' => 0, 'translation' => 'favorite_cat'),
+    'most_visited' => array('container' => 'special', 'visibility' => 'guest,generic,normal,webmaster,admin/', 'order' => 1, 'translation' => 'most_visited_cat'),
+    'best_rated' => array('container' => 'special', 'visibility' => 'guest,generic,normal,webmaster,admin/', 'order' => 2, 'translation' => 'best_rated_cat'),
+    'random' => array('container' => 'special', 'visibility' => 'guest,generic,normal,webmaster,admin/', 'order' => 3, 'translation' => 'random_cat'),
+    'recent_pics' => array('container' => 'special', 'visibility' => 'guest,generic,normal,webmaster,admin/', 'order' => 4, 'translation' => 'recent_pics_cat'),
+    'recent_cats' => array('container' => 'special', 'visibility' => 'guest,generic,normal,webmaster,admin/', 'order' => 5, 'translation' => 'recent_cats_cat'),
+    'calendar' => array('container' => 'special', 'visibility' => 'guest,generic,normal,webmaster,admin/', 'order' => 6, 'translation' => 'calendar'),
+    'qsearch' => array('container' => 'menu', 'visibility' => 'guest,generic,normal,webmaster,admin/', 'order' => 0, 'translation' => 'qsearch'),
+    'tags' => array('container' => 'menu', 'visibility' => 'guest,generic,normal,webmaster,admin/', 'order' => 1, 'translation' => 'Tags'),
+    'search' => array('container' => 'menu', 'visibility' => 'guest,generic,normal,webmaster,admin/', 'order' => 2, 'translation' => 'Search'),
+    'comments' => array('container' => 'menu', 'visibility' => 'guest,generic,normal,webmaster,admin/', 'order' => 3, 'translation' => 'comments'),
+    'about' => array('container' => 'menu', 'visibility' => 'guest,generic,normal,webmaster,admin/', 'order' => 4, 'translation' => 'About'),
+    'rss' => array('container' => 'menu', 'visibility' => 'guest,generic,normal,webmaster,admin/', 'order' => 5, 'translation' => 'Notification')
   );
 

extensions/AMenuManager/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Advanced Menu Manager
-Version: 2.1.3
+Version: 2.1.4
 Description: Gestion avancée du menu / Advanced management of menu
 Plugin URI: http://piwigo.org
@@ -58 +58 @@
 |         |            | * mantis: feature 1100
 |         |            |   Random picture : compatibility with theme 'montblanc'
-|         |            |
-|         |            |
-|         |            |
-|         |            |
-|         |            |
+| 2.1.4   | 2009/11/29 | * mantis: feature 1299
+|         |            |   Allows to manage access for the 'Admin' users
+|         |            | * mantis: feature 1298
+|         |            |   Users 'Webmaster' aren't managed
+|         |            | * mantis: feature 1297
+|         |            |   AMM don't works properly if a block 'menu' or
+|         |            |   'specials' is hidden
 |         |            |
 |         |            |
@@ -88 +90 @@
 define('AMM_PATH' , PHPWG_PLUGINS_PATH . AMM_DIR . '/');
 
-define('AMM_VERSION' , '2.1.3'); //=> ne pas oublier la version dans l'entête !!
+define('AMM_VERSION' , '2.1.4'); //=> ne pas oublier la version dans l'entête !!
 
 global $prefixeTable, $page;

extensions/AMenuManager/maintain.inc.php

@@ -20 +20 @@
 {
   @include_once(PHPWG_PLUGINS_PATH.'grum_plugins_classes-2/main.inc.php');
-  // need GPC release greater or equal than 2.0.3
+  // need GPC release greater or equal than 2.0.4
 
-  if(checkGPCRelease(2,0,3))
+  if(checkGPCRelease(2,0,4))
   {
     @include_once("amm_install.class.inc.php");
@@ -31 +31 @@
 function gpcMsgError(&$errors)
 {
-  array_push($errors, sprintf(l10n('Grum Plugin Classes is not installed (release >= %s)'), "2.0.3"));
+  array_push($errors, sprintf(l10n('Grum Plugin Classes is not installed (release >= %s)'), "2.0.4"));
 }
 // -----------------------------------------------------------------------------