Changeset 2488 for trunk/plugins

Timestamp:

Aug 28, 2008, 2:32:39 AM (16 years ago)

Author:

rvelices

Message:

• based on test_menu by grum (thanks to you) - integration of dynamic menu bar to pwg
• the menubar is composed now of dynamic blocks that can be ordered/hidden
• plugins can add their own blocks

Location:

trunk/plugins

Files:

• AMenuManager/admin/amm_linksconfig.tpl (modified) (1 diff)
• AMenuManager/admin/amm_randompicconfig.tpl (modified) (1 diff)
• AMenuManager/amm_aim.class.inc.php (modified) (1 diff)
• AMenuManager/amm_aip.class.inc.php (modified) (10 diffs)
• AMenuManager/amm_install.class.inc.php (modified) (2 diffs)
• AMenuManager/amm_pip.class.inc.php (modified) (5 diffs)
• AMenuManager/amm_root.class.inc.php (modified) (2 diffs)
• AMenuManager/main.inc.php (modified) (1 diff)
• AMenuManager/maintain.inc.php (modified) (3 diffs)
• AMenuManager/menu_templates/menubar_links.tpl (modified) (1 diff)
• AMenuManager/menu_templates/menubar_personalised.tpl (modified) (1 diff)
• AMenuManager/menu_templates/menubar_randompic.tpl (modified) (1 diff)
• test_menu (deleted)

trunk/plugins/AMenuManager/admin/amm_linksconfig.tpl

@@ -67 +67 @@
     <table class="formtable">
       <tr>
-        <td>{'g002_setting_block_active'|@translate}</td>
-        <td>
-          <select name="famm_links_active" id="iamm_links_active">
-            {html_options values=$datas.yesno_values output=$datas.yesno_labels selected=$datas.active_selected}
-          </select>
-        </td>
-      </tr>
-
-      <tr>
         <td>{'g002_setting_block_title'|@translate}</td>
         <td>

trunk/plugins/AMenuManager/admin/amm_randompicconfig.tpl

@@ -67 +67 @@
     <table class="formtable">
       <tr>
-        <td>{'g002_setting_block_active'|@translate}</td>
-        <td>
-          <select name="famm_randompicture_active" id="iamm_randompicture_active">
-            {html_options values=$datas.yesno_values output=$datas.yesno_labels selected=$datas.active_selected}
-          </select>
-        </td>
-      </tr>
-
-      <tr>
         <td>{'g002_setting_block_title'|@translate}</td>
         <td>

trunk/plugins/AMenuManager/amm_aim.class.inc.php

@@ -31 +31 @@
   function init_events()
   {
+    parent::init_events();
     add_event_handler('get_admin_plugin_menu_links', array(&$this, 'plugin_admin_menu') );
   }

trunk/plugins/AMenuManager/amm_aip.class.inc.php

@@ -190 +190 @@
   public function init_events()
   {
-    add_event_handler('menubar_file', array(&$this, 'plugin_public_menu') );
     add_event_handler('loc_end_page_header', array(&$this->css, 'apply_CSS'));
   }
@@ -238 +237 @@
 
         case 'setmenu_modspecial_sections_list':
-          $result=$this->ajax_amm_setmenu_mod_section_list('amm_sections_modspecial');
+          $result=$this->ajax_amm_setmenu_mod_section_list('amm_sections_modspecials');
           break;
         case 'setmenu_modspecial_sections_showhide':
-          $result=$this->ajax_amm_setmenu_mod_section_showhide('amm_sections_modspecial', $_REQUEST['fItem']);
+          $result=$this->ajax_amm_setmenu_mod_section_showhide('amm_sections_modspecials', $_REQUEST['fItem']);
           break;
 
@@ -326 +325 @@
       'AMM_AJAX_URL_LIST' => $this->page_link."&ajaxfct=",
       'show_icons_selected' => $this->my_config['amm_links_show_icons'],
-      'active_selected' => $this->my_config['amm_links_active'],
       'lang_selected' => $user['language'],
       'fromlang' => substr($user['language'],0,2)
@@ -460 +458 @@
   {
     $this->my_config['amm_links_show_icons']=$_POST['famm_links_show_icons'];
-    $this->my_config['amm_links_active']=$_POST['famm_links_active'];
     $languages=get_languages();
     foreach($languages as $key => $val)
@@ -474 +471 @@
   protected function action_randompic_modify_config()
   {
-    $this->my_config['amm_randompicture_active']=$_POST['famm_randompicture_active'];
     $this->my_config['amm_randompicture_showname']=$_POST['famm_randompicture_showname'];
     $this->my_config['amm_randompicture_showcomment']=$_POST['famm_randompicture_showcomment'];
@@ -542 +538 @@
     $template_datas=array(
       'lnk_list' => $this->page_link.'&fAMM_tabsheet=links',
-      'active_selected' => $this->my_config['amm_randompicture_active'],
       'showname_selected' => $this->my_config['amm_randompicture_showname'],
       'showcomment_selected' => $this->my_config['amm_randompicture_showcomment'],
@@ -703 +698 @@
   protected function action_create_modify_personalised()
   {
-    global $menu, $user;
+    global $user;
 
     if($_POST['famm_modeedit']=='create')
@@ -734 +729 @@
       }
     }
-
-    if($_POST['famm_modeedit']=='create')
-    {
-      $menu->register('mbAMM_personalised'.$id, ($_POST['famm_personalised_nfo']=='')?$_POST['famm_personalised_title_'.$user['language']]:$_POST['famm_personalised_nfo'], 0, 'AMM');
-    }
-
-
-
   }
 
@@ -813 +800 @@
   {
     $numurl=$this->get_count_url();
-    $sql="INSERT INTO ".$this->tables['urls']." (id, label, url, mode, icon, position, visible)
-          VALUES ('', '".$datas['label']."', '".$datas['url']."', '".$datas['mode']."',
+    $sql="INSERT INTO ".$this->tables['urls']." (label, url, mode, icon, position, visible)
+          VALUES ('".$datas['label']."', '".$datas['url']."', '".$datas['mode']."',
                   '".$datas['icon']."', '".$numurl."', '".$datas['visible']."')";
     return(pwg_query($sql));
@@ -1054 +1041 @@
   private function ajax_amm_personalised_delete($sectionid)
   {
-    global $menu;
-
     if(!$this->adviser_abort())
     {
       $this->delete_personalised($sectionid);
-      $menu->unregister('mbAMM_personalised'.$sectionid);
     }
     return($this->ajax_amm_personalised_list());

trunk/plugins/AMenuManager/amm_install.class.inc.php

@@ -48 +48 @@
   PRIMARY KEY  (`id`),
   KEY `order_key` (`position`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1",
+)",
 
 "CREATE TABLE  `".$this->tables['personalised']."` (
@@ -58 +58 @@
   `nfo` varchar(25) NOT NULL default '',
   PRIMARY KEY  (`id`,`lang`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1"
+)"
 );
       //$table_def array
-
+      $tables_def = create_table_add_character_set($tables_def);
       $result=$this->tablef->create_tables($tables_def);
       return($result);

trunk/plugins/AMenuManager/amm_pip.class.inc.php

@@ -39 +39 @@
   public function init_events()
   {
-    add_event_handler('loc_begin_menubar', array(&$this, 'modify_menu') );
+    //TODELETE: add_event_handler('loc_begin_menubar', array(&$this, 'modify_menu') );
+    parent::init_events();
+    add_event_handler('blockmanager_apply', array(&$this, 'blockmanager_apply') );
   }
 
-  /* ---------------------------------------------------------------------------
-  protected classe functions
-  --------------------------------------------------------------------------- */
-  public function modify_menu()
+  public function blockmanager_apply( $menu_ref_arr )
   {
-    global $menu, $user;
-
-
-    /*
-      Add a new section (links)
-    */
-    $urls=$this->get_urls(true);
-    if(($this->my_config['amm_links_active']=='y')and(count($urls)>0))
-    {
-      if($this->my_config['amm_links_show_icons']=='y')
-      {
-        for($i=0;$i<count($urls);$i++)
-        {
-          $urls[$i]['icon']=AMM_PATH."links_pictures/".$urls[$i]['icon'];
-        }
-      }
-
-      $section = new Section('mbAMM_links', base64_decode($this->my_config['amm_links_title'][$user['language']]), dirname(__FILE__).'/menu_templates/menubar_links.tpl');
-      $section->set_items(array(
-        'LINKS' => $urls,
-        'icons' => $this->my_config['amm_links_show_icons']
-      ));
-      $menu->add($section->get());
-    }
-
+    $menu = & $menu_ref_arr[0];
 
     /*
       Add a new random picture section
     */
-    if($this->my_config['amm_randompicture_active']=='y')
+    if ( ($block = $menu->get_block( 'mbAMM_randompict' ) ) != null )
     {
       $sql="SELECT i.id as image_id, i.file as image_file, i.comment, i.path, i.tn_ext, c.id as catid, c.name, c.permalink, RAND() as rndvalue, i.name as imgname
@@ -96 +71 @@
           'permalink' => $nfo['permalink']
         );
-
-        $section = new Section('mbAMM_randompict', base64_decode($this->my_config['amm_randompicture_title'][$user['language']]), dirname(__FILE__).'/menu_templates/menubar_randompic.tpl');
-        $section->set_items(array(
+        global $user;
+        $block->set_title(  base64_decode($this->my_config['amm_randompicture_title'][$user['language']]) );
+        $block->template = dirname(__FILE__).'/menu_templates/menubar_randompic.tpl';
+        $block->data = array(
           'LINK' => make_picture_url($nfo),
           'IMG' => get_thumbnail_url($nfo),
@@ -105 +81 @@
           'SHOWNAME' => $this->my_config['amm_randompicture_showname'],
           'SHOWCOMMENT' => $this->my_config['amm_randompicture_showcomment']
-        ));
-        $menu->add($section->get());
+        );
+      }
+    }
+
+    /*
+      Add a new section (links)
+    */
+    if ( ($block = $menu->get_block( 'mbAMM_links' ) ) != null )
+    {
+      $urls=$this->get_urls(true);
+      if ( count($urls)>0 )
+      {
+        if($this->my_config['amm_links_show_icons']=='y')
+        {
+          for($i=0;$i<count($urls);$i++)
+          {
+            $urls[$i]['icon']=get_root_url().'plugins/'.AMM_DIR."/links_pictures/".$urls[$i]['icon'];
+          }
+        }
+        
+        $block->set_title( base64_decode($this->my_config['amm_links_title'][$user['language']]) );
+        $block->template = dirname(__FILE__).'/menu_templates/menubar_links.tpl';
+
+        $block->data = array(
+          'LINKS' => $urls,
+          'icons' => $this->my_config['amm_links_show_icons']
+        );
       }
     }
@@ -122 +123 @@
         if(!isset($id_done[$val['id']]))
         {
-          $section = new Section('mbAMM_personalised'.$val['id'], $val['title'], dirname(__FILE__).'/menu_templates/menubar_personalised.tpl');
-          $section->set_items(array(
-            'CONTENT' => stripslashes($val['content'])));
-          $menu->add($section->get());
-
+          if ( ($block = $menu->get_block( 'mbAMM_personalised'.$val['id'] ) ) != null )
+          {
+            $block->set_title( $val['title'] );
+            $block->template = dirname(__FILE__).'/menu_templates/menubar_personalised.tpl';
+            $block->data = stripslashes($val['content']);
+          }
           $id_done[$val['id']]="";
         }
-      }
-    }
-
-
-    /*
-      Hide sections
-    */
-    foreach($this->my_config['amm_sections_visible'] as $key => $val)
-    {
-      if($val=='n')
-      {
-        $menu->remove($key);
       }
     }
@@ -147 +137 @@
       hide items from special & menu sections
     */
-    foreach(array('mbMenu' => 'amm_sections_modmenu', 'mbSpecial' =>'amm_sections_modspecial') as $key0 => $val0)
+    foreach(array('mbMenu' => 'amm_sections_modmenu', 'mbSpecials' =>'amm_sections_modspecials') as $key0 => $val0)
     {
-      $section_menu=$menu->section($key0);
-      foreach($this->my_config[$val0] as $key => $val)
+      if ( ($block = $menu->get_block( $key0 ) ) != null )
       {
-        if($val=='n')
+        foreach($this->my_config[$val0] as $key => $val)
         {
-          unset($section_menu['ITEMS'][$key]);
+          if($val=='n')
+          {
+            unset( $block->data[$key] );
+          }
         }
       }
-      $menu->replace($section_menu);
     }
-
-  }
-
+        }
 
 } // AMM_PIP class

trunk/plugins/AMenuManager/amm_root.class.inc.php

@@ -38 +38 @@
   public function init_config()
   {
-    global $menu;
-
     $this->my_config=array(
       'amm_links_show_icons' => 'y',
-      'amm_links_active' => 'y',
       'amm_links_title' => array(),
-      'amm_sections_visible' => array(),
-      'amm_randompicture_active' => 'n',
       'amm_randompicture_showname' => 'n',     //n:no, o:over, u:under
       'amm_randompicture_showcomment' => 'n',   //n:no, o:over, u:under
       'amm_randompicture_title' => array(),
-      'amm_sections_modspecial' => array(
-        'favorite_cat' => 'y',
-        'most_visited_cat' => 'y',
-        'best_rated_cat' => 'y',
-        'random_cat' => 'y',
-        'recent_pics_cat' => 'y',
-        'recent_cats_cat' => 'y',
+      'amm_sections_modspecials' => array(
+        'favorites' => 'y',
+        'most_visited' => 'y',
+        'best_rated' => 'y',
+        'random' => 'y',
+        'recent_pics' => 'y',
+        'recent_cats' => 'y',
         'calendar' => 'y'
       ),
       'amm_sections_modmenu' => array(
         'qsearch' => 'y',
-        'Tags' => 'y',
-        'Search' => 'y',
+        'tags' => 'y',
+        'search' => 'y',
         'comments' => 'y',
-        'About' => 'y',
-        'Notification' => 'y'
+        'about' => 'y',
+        'notification' => 'y'
       )
     );
@@ -83 +78 @@
     }
 
-    $sections=$menu->registered();
-    foreach($sections as $key => $val)
-    {
-      $this->my_config['amm_sections_visible'][$key]='y';
-    }
   }
 
   public function load_config()
   {
-    global $menu;
+    parent::load_config();
+  }
 
-    parent::load_config();
+  public function init_events()
+  {
+    add_event_handler('blockmanager_register_blocks', array(&$this, 'register_blocks') );
+  }
 
-    $sections=$menu->registered();
-    foreach($sections as $key => $val)
+  public function register_blocks( $menu_ref_arr )
+  {
+    $menu = & $menu_ref_arr[0];
+    if ($menu->get_id() != 'menubar')
+      return;
+    $menu->register_block( new RegisteredBlock( 'mbAMM_randompict', 'Random pictures', 'AMM'));
+    $menu->register_block( new RegisteredBlock( 'mbAMM_links', 'Links', 'AMM'));
+
+    $sections=$this->get_sections(true);
+    if(count($sections))
     {
-      if(!isset($this->my_config['amm_sections_visible'][$key]))
+      $id_done=array();
+      foreach($sections as $key => $val)
       {
-        $this->my_config['amm_sections_visible'][$key]='y';
+        if(!isset($id_done[$val['id']]))
+        {
+          $menu->register_block( new RegisteredBlock( 'mbAMM_personalised'.$val['id'], $val['title'], 'AMM'));
+          $id_done[$val['id']]="";
+        }
       }
     }
-    
   }
 

trunk/plugins/AMenuManager/main.inc.php

@@ -44 +44 @@
 define('AMM_VERSION' , '1.0.0'); // => ne pas oublier la version dans l'entête !!
 
-global $prefixeTable, $menu;
+global $prefixeTable;
 
-if(basename($_SERVER["PHP_SELF"])=='admin.php')
+if(defined('IN_ADMIN'))
 {
   //AMM admin part loaded and active only if in admin page

trunk/plugins/AMenuManager/maintain.inc.php

@@ -6 +6 @@
 ini_set('display_errors', true);
 
-define('AMM_DIR' , basename(dirname(__FILE__)));
-define('AMM_PATH' , PHPWG_PLUGINS_PATH . AMM_DIR . '/');
+defined('AMM_DIR') || define('AMM_DIR' , basename(dirname(__FILE__)));
+defined('AMM_PATH') || define('AMM_PATH' , PHPWG_PLUGINS_PATH . AMM_DIR . '/');
 @include_once(PHPWG_PLUGINS_PATH.'grum_plugins_classes-2/tables.class.inc.php');
 
@@ -24 +24 @@
 function plugin_install($plugin_id, $plugin_version, &$errors) 
 {
-  global $prefixeTable, $gpc_installed, $menu;
+  global $prefixeTable, $gpc_installed;
   if($gpc_installed)
   {
-    $menu->register('mbAMM_links', 'Links', 0, 'AMM');
-    $menu->register('mbAMM_randompict', 'Random pictures', 0, 'AMM');
+    //$menu->register('mbAMM_links', 'Links', 0, 'AMM');
+    //$menu->register('mbAMM_randompict', 'Random pictures', 0, 'AMM');
     $amm=new AMM_install($prefixeTable, __FILE__);
     $result=$amm->install();
@@ -48 +48 @@
 function plugin_uninstall($plugin_id)
 {
-  global $prefixeTable, $gpc_installed, $menu;
-  if($gpc_installed)
-  {
-    $menu->unregister('mbAMM_links');
-    $menu->unregister('mbAMM_randompict');
-    $amm=new AMM_install($prefixeTable, __FILE__);
-    $result=$amm->uninstall();
-  }
-  else
-  {
-    array_push($errors, l10n('Grum Plugin Classes is not installed'));
-  }
+  global $prefixeTable;
+  $amm=new AMM_install($prefixeTable, __FILE__);
+  $result=$amm->uninstall();
 }
 

trunk/plugins/AMenuManager/menu_templates/menubar_links.tpl

@@ -1 +1 @@
 
 <!-- links menu bar -->
-{if $section.NAME!=""}
-  <dt>{$section.NAME|@translate}</dt>
+{if $block->get_title() !="" }
+  <dt>{$block->get_title()}</dt>
 {/if}
 <dd>
-  <ul {if $section.ITEMS.icons=='y'}style="padding-left:4px;list-style:none;"{/if}>
-    {foreach from=$section.ITEMS.LINKS item=link}
+  <ul {if $block->data.icons=='y'}style="padding-left:4px;list-style:none;"{/if}>
+    {foreach from=$block->data.LINKS item=link}
       <li>
-        {if $section.ITEMS.icons=='y'}<img src='{$link.icon}' style="position:relative;top:3px;"/>{/if}
+        {if $block->data.icons=='y'}<img src='{$link.icon}' style="position:relative;top:3px;"/>{/if}
         <a href="{$link.url}"
           {if $link.mode == 0} target = '_blank' {/if}>{$link.label}</a>

trunk/plugins/AMenuManager/menu_templates/menubar_personalised.tpl

@@ -1 +1 @@
 
 <!-- personalised menu bar -->
-{if $section.NAME!=""}
-  <dt>{$section.NAME|@translate}</dt>
+{if $block->get_title() !="" }
+  <dt>{$block->get_title()}</dt>
 {/if}
 <dd>
-    {if $section.ITEMS.CONTENT!=""}{$section.ITEMS.CONTENT}{/if}
+    {$block->data}
 </dd>

trunk/plugins/AMenuManager/menu_templates/menubar_randompic.tpl

@@ -1 +1 @@
 
 <!-- random picture menu bar -->
-{if $section.NAME!=""}
-  <dt>{$section.NAME|@translate}</dt>
-{/if}
+<dt>{$block->get_title()}</dt>
 <dd>
   <div class="illustration" style="text-align:center;padding:5px;font-size:85%;">
-    {if $section.ITEMS.IMGNAME!="" and $section.ITEMS.SHOWNAME=="o"}{$section.ITEMS.IMGNAME}<br/>{/if}
-    {if $section.ITEMS.IMGCOMMENT!="" and $section.ITEMS.SHOWCOMMENT=="o"}{$section.ITEMS.IMGCOMMENT}<br/>{/if}
-    <a href="{$section.ITEMS.LINK}"><img src="{$section.ITEMS.IMG}"/></a>
-    {if $section.ITEMS.IMGNAME!="" and $section.ITEMS.SHOWNAME=="u"}<br/>{$section.ITEMS.IMGNAME}{/if}
-    {if $section.ITEMS.IMGCOMMENT!="" and $section.ITEMS.SHOWCOMMENT=="u"}<br/>{$section.ITEMS.IMGCOMMENT}{/if}
+    {if $block->data.IMGNAME!="" and $block->data.SHOWNAME=="o"}{$block->data.IMGNAME}<br/>{/if}
+    {if $block->data.IMGCOMMENT!="" and $block->data.SHOWCOMMENT=="o"}{$block->data.IMGCOMMENT}<br/>{/if}
+    <a href="{$block->data.LINK}"><img src="{$block->data.IMG}"/></a>
+    {if $block->data.IMGNAME!="" and $block->data.SHOWNAME=="u"}<br/>{$block->data.IMGNAME}{/if}
+    {if $block->data.IMGCOMMENT!="" and $block->data.SHOWCOMMENT=="u"}<br/>{$block->data.IMGCOMMENT}{/if}
   </div>
 </dd>