Changeset 9272 for extensions/AdditionalPages/admin

Timestamp:

Feb 18, 2011, 11:53:06 AM (13 years ago)

Author:

patdenice

Message:

New functionalities

Location:

extensions/AdditionalPages/admin

Files:

• add_page.inc.php (modified) (1 diff)
• admin.php (modified) (1 diff)
• config.inc.php (modified) (3 diffs)
• edit_page.inc.php (modified) (1 diff)
• template/config.tpl (modified) (4 diffs)
• upgrade_from_21.php (modified) (4 diffs)

extensions/AdditionalPages/admin/add_page.inc.php

@@ -83 +83 @@
     {
       $conf['additional_pages']['homepage'] = isset($_POST['homepage']) ? $edited_page['id'] : null;
-      pwg_query('UPDATE '.CONFIG_TABLE.' SET value = "'.addslashes(serialize($conf['additional_pages'])).'" WHERE param = "additional_pages";');
+      conf_update_param('additional_pages', pwg_db_real_escape_string(serialize($conf['additional_pages'])));
     }
 

extensions/AdditionalPages/admin/admin.php

@@ -15 +15 @@
 $page_exist = array_from_query($query, 'id');
 
-if (!isset($_GET['tab']))
+$page['tab'] = isset($_GET['tab']) ? $_GET['tab'] : 'manage';
+
+if (!$page_exist and $page['tab'] == 'manage')
 {
-  $page['tab'] = $page_exist ? 'manage' : 'add_page';
-}
-else
-{
-  $page['tab'] = $_GET['tab'];
+  redirect($my_base_url.'&tab=add_page');
 }
 

extensions/AdditionalPages/admin/config.inc.php

@@ -2 +2 @@
 
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+
+$mb_conf = @unserialize($conf['blk_menubar']);
 
 // Enregistrement de la configuration
@@ -8 +10 @@
   $params = array('show_home', 'group_perm', 'user_perm');
 
-  $new_conf = array();
   foreach ($params as $param)
   {
-    $new_conf[$param] = isset($_POST[$param]);
+    $conf['additional_pages'][$param] = isset($_POST[$param]);
   }
 
-  $new_conf['languages'] = array();
+  $conf['additional_pages']['languages'] = array();
         foreach($_POST['menu_lang'] as $language_code => $name)
   {
                 if (!empty($name))
-      $new_conf['languages'][$language_code] = $name;
+      $conf['additional_pages']['languages'][$language_code] = $name;
         }
 
-  $new_conf['homepage'] = $conf['additional_pages']['homepage'];
+  conf_update_param('additional_pages', pwg_db_real_escape_string(serialize($conf['additional_pages'])));
 
-    $query = '
-UPDATE ' . CONFIG_TABLE . '
-  SET value="'.addslashes(serialize($new_conf)).'"
-  WHERE param="additional_pages"
-  LIMIT 1';
-    pwg_query($query);
-    array_push($page['infos'], l10n('ap_conf_saved'));
-    $conf['additional_pages'] = $new_conf;
+  if (isset($_POST['show_menu']) xor (!isset($mb_conf['mbAdditionalPages']) or $mb_conf['mbAdditionalPages'] == abs($mb_conf['mbAdditionalPages'])))
+  {
+    if (!isset($mb_conf['mbAdditionalPages']))
+    {
+      $last = @abs(end($mb_conf));
+      $mb_conf['mbAdditionalPages'] = $last + 50;
+    }
+    $mb_conf['mbAdditionalPages'] = (isset($_POST['show_menu']) ? +1 : -1) * abs($mb_conf['mbAdditionalPages']);
+    conf_update_param('blk_menubar', pwg_db_real_escape_string(serialize($mb_conf)));
+  }
+
+  array_push($page['infos'], l10n('ap_conf_saved'));
 }
 
@@ -48 +53 @@
 $template->assign('ap_conf', $conf['additional_pages']);
 
+if (!isset($mb_conf['mbAdditionalPages']) or $mb_conf['mbAdditionalPages'] == abs($mb_conf['mbAdditionalPages']))
+{
+  $template->assign('SHOW_MENU', true);
+}
+
 $template->set_filenames(array('plugin_admin_content' => dirname(__FILE__) . '/template/config.tpl'));
 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');

extensions/AdditionalPages/admin/edit_page.inc.php

@@ -16 +16 @@
   {
     $conf['additional_pages']['homepage'] = null;
-    pwg_query('UPDATE '.CONFIG_TABLE.' SET value = "'.addslashes(serialize($conf['additional_pages'])).'" WHERE param = "additional_pages";');
+    conf_update_param('additional_pages', pwg_db_real_escape_string(serialize($conf['additional_pages'])));
   }
   redirect($my_base_url.'&page_deleted=');

extensions/AdditionalPages/admin/template/config.tpl

@@ -7 +7 @@
         <legend>{'ap_config'|@translate}</legend>
         <table>
-                <tr>
-                        <td colspan="3"><input type="checkbox" name="show_home" value="on" {if $ap_conf.show_home}checked="checked"{/if}/> {'ap_show_home'|@translate}</td>
-                </tr>
-                <tr>
-                        <td colspan="3"><br><hr><br></td>
-                </tr>
                 <tr>
                         <td colspan="3">{'ap_perm'|@translate}</td>
@@ -25 +19 @@
                         <td colspan="3"><br><hr><br></td>
                 </tr>
-                <tr>
+    <tr>
+                        <td colspan="3"><input type="checkbox" name="show_home" value="on" {if $ap_conf.show_home}checked="checked"{/if}/> {'ap_show_home'|@translate}</td>
+                </tr>
+    <tr>
+                        <td colspan="3"><input type="checkbox" name="show_menu" value="on" {if isset($SHOW_MENU)}checked="checked"{/if}/> {'ap_show_menu'|@translate}</td>
+                </tr>
+                <tr class="menu_languages">
                         <td><br>{'ap_menu_name'|@translate} : &nbsp;&nbsp;</td>
                         <td><br>{'Default'|@translate}&nbsp;&nbsp;</td>
@@ -31 +31 @@
                 </tr>
                 {foreach from=$language item=lang}
-                <tr>
+                <tr class="menu_languages">
                         <td></td>
                         <td>{$lang.LANGUAGE_NAME}&nbsp;&nbsp;</td>
@@ -47 +47 @@
         <p><a href="{$convert_bbcode.PATH}">{'ap_parse_bbcode'|@translate}</a></p>
 {/if}
+
+<script type="text/javascript">
+jQuery().ready( function () {ldelim}
+  jQuery("input[name='show_menu']").click( function() {ldelim}
+    if (this.checked)
+      jQuery('.menu_languages').show();
+    else
+      jQuery('.menu_languages').hide();
+  });
+});
+if (!jQuery("input[name='show_menu']").attr('checked'))
+  jQuery('.menu_languages').hide();
+</script>

extensions/AdditionalPages/admin/upgrade_from_21.php

@@ -19 +19 @@
 SELECT id, pos, title, lang
 FROM '.$prefixeTable.'additionalpages
-ORDER BY pos ASC, id ASC
+ORDER BY pos ASC
 ;';
 $result = pwg_query($query);
@@ -43 +43 @@
   $position = $row['pos'];
   if ($row['pos'] === '0')
-    $position = '-1';
+    $position = '-100';
   elseif (empty($row['pos']))
     $position = '0';
@@ -61 +61 @@
 }
 
+load_conf_from_db('param = "additional_pages"');
 $old_conf = explode ("," , $conf['additional_pages']);
+
+if ($old_conf[1] == 'off')
+{
+  $mb_conf = @unserialize($conf['blk_menubar']);
+  if (!isset($mb_conf['mbAdditionalPages']))
+  {
+    $last = @abs(end($mb_conf));
+    $mb_conf['mbAdditionalPages'] = $last + 50;
+  }
+  $mb_conf['mbAdditionalPages'] = -1 * abs($mb_conf['mbAdditionalPages']);
+  conf_update_param('blk_menubar', pwg_db_real_escape_string(serialize($mb_conf)));
+}
 
 $new_conf = array(
@@ -81 +94 @@
 $conf['additional_pages'] = $new_conf;
 
-$query = '
-UPDATE '.CONFIG_TABLE.'
-SET value = "'.addslashes(serialize($new_conf)).'"
-WHERE param = "additional_pages"
-;';
-pwg_query($query);
+conf_update_param('additional_pages', pwg_db_real_escape_string(serialize($new_conf)));
 
 ?>