Changeset 9272 for extensions/AdditionalPages
- Timestamp:
- Feb 18, 2011, 11:53:06 AM (13 years ago)
- Location:
- extensions/AdditionalPages
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/AdditionalPages/additional_page.php
r9270 r9272 6 6 7 7 $page['section'] = 'additional_page'; 8 $identifier = $page[' is_homepage'] ? $conf['additional_pages']['homepage'] : $tokens[1];8 $identifier = $page['ap_homepage'] ? $conf['additional_pages']['homepage'] : $tokens[1]; 9 9 10 10 load_language('plugin.lang.php', AP_PATH); … … 25 25 if (empty($row)) 26 26 { 27 if ($page[' is_homepage']) return;27 if ($page['ap_homepage']) return; 28 28 page_not_found('Requested page does not exist'); 29 29 } 30 30 31 if (is_numeric($identifier) and !empty($row['permalink']) and !$page[' is_homepage'])31 if (is_numeric($identifier) and !empty($row['permalink']) and !$page['ap_homepage']) 32 32 { 33 33 redirect(make_index_url().'/page/' . $row['permalink']); 34 } 35 36 if (!$page['ap_homepage'] and $row['id'] == $conf['additional_pages']['homepage']) 37 { 38 redirect(make_index_url()); 34 39 } 35 40 … … 48 53 if (!is_admin() and $conf['additional_pages']['user_perm'] and !in_array($user['status'], $authorized_users)) 49 54 { 50 if ($page[' is_homepage']) return;55 if ($page['ap_homepage']) return; 51 56 page_forbidden(l10n('You are not authorized to access the requested page')); 52 57 } … … 62 67 if (!is_admin() and $conf['additional_pages']['group_perm'] and empty($array)) 63 68 { 64 if ($page[' is_homepage']) return;69 if ($page['ap_homepage']) return; 65 70 page_forbidden(l10n('You are not authorized to access the requested page')); 66 71 } … … 85 90 ); 86 91 87 if ($conf['additional_pages']['show_home'] )92 if ($conf['additional_pages']['show_home'] and !$page['ap_homepage']) 88 93 { 89 94 $template->assign('PLUGIN_INDEX_ACTIONS' , ' 90 <li><a href="'.make_index_url().' /categories" title="' . l10n('return to homepage') . '">95 <li><a href="'.make_index_url().'" title="' . l10n('return to homepage') . '"> 91 96 <img src="' . $template->get_themeconf('icon_dir') . '/home.png" class="button" alt="' . l10n('home') . '"/></a> 92 97 </li>'); -
extensions/AdditionalPages/admin/add_page.inc.php
r9270 r9272 83 83 { 84 84 $conf['additional_pages']['homepage'] = isset($_POST['homepage']) ? $edited_page['id'] : null; 85 pwg_query('UPDATE '.CONFIG_TABLE.' SET value = "'.addslashes(serialize($conf['additional_pages'])).'" WHERE param = "additional_pages";');85 conf_update_param('additional_pages', pwg_db_real_escape_string(serialize($conf['additional_pages']))); 86 86 } 87 87 -
extensions/AdditionalPages/admin/admin.php
r9270 r9272 15 15 $page_exist = array_from_query($query, 'id'); 16 16 17 if (!isset($_GET['tab'])) 17 $page['tab'] = isset($_GET['tab']) ? $_GET['tab'] : 'manage'; 18 19 if (!$page_exist and $page['tab'] == 'manage') 18 20 { 19 $page['tab'] = $page_exist ? 'manage' : 'add_page'; 20 } 21 else 22 { 23 $page['tab'] = $_GET['tab']; 21 redirect($my_base_url.'&tab=add_page'); 24 22 } 25 23 -
extensions/AdditionalPages/admin/config.inc.php
r9263 r9272 2 2 3 3 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 4 5 $mb_conf = @unserialize($conf['blk_menubar']); 4 6 5 7 // Enregistrement de la configuration … … 8 10 $params = array('show_home', 'group_perm', 'user_perm'); 9 11 10 $new_conf = array();11 12 foreach ($params as $param) 12 13 { 13 $ new_conf[$param] = isset($_POST[$param]);14 $conf['additional_pages'][$param] = isset($_POST[$param]); 14 15 } 15 16 16 $ new_conf['languages'] = array();17 $conf['additional_pages']['languages'] = array(); 17 18 foreach($_POST['menu_lang'] as $language_code => $name) 18 19 { 19 20 if (!empty($name)) 20 $ new_conf['languages'][$language_code] = $name;21 $conf['additional_pages']['languages'][$language_code] = $name; 21 22 } 22 23 23 $new_conf['homepage'] = $conf['additional_pages']['homepage'];24 conf_update_param('additional_pages', pwg_db_real_escape_string(serialize($conf['additional_pages']))); 24 25 25 $query = ' 26 UPDATE ' . CONFIG_TABLE . ' 27 SET value="'.addslashes(serialize($new_conf)).'" 28 WHERE param="additional_pages" 29 LIMIT 1'; 30 pwg_query($query); 31 array_push($page['infos'], l10n('ap_conf_saved')); 32 $conf['additional_pages'] = $new_conf; 26 if (isset($_POST['show_menu']) xor (!isset($mb_conf['mbAdditionalPages']) or $mb_conf['mbAdditionalPages'] == abs($mb_conf['mbAdditionalPages']))) 27 { 28 if (!isset($mb_conf['mbAdditionalPages'])) 29 { 30 $last = @abs(end($mb_conf)); 31 $mb_conf['mbAdditionalPages'] = $last + 50; 32 } 33 $mb_conf['mbAdditionalPages'] = (isset($_POST['show_menu']) ? +1 : -1) * abs($mb_conf['mbAdditionalPages']); 34 conf_update_param('blk_menubar', pwg_db_real_escape_string(serialize($mb_conf))); 35 } 36 37 array_push($page['infos'], l10n('ap_conf_saved')); 33 38 } 34 39 … … 48 53 $template->assign('ap_conf', $conf['additional_pages']); 49 54 55 if (!isset($mb_conf['mbAdditionalPages']) or $mb_conf['mbAdditionalPages'] == abs($mb_conf['mbAdditionalPages'])) 56 { 57 $template->assign('SHOW_MENU', true); 58 } 59 50 60 $template->set_filenames(array('plugin_admin_content' => dirname(__FILE__) . '/template/config.tpl')); 51 61 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content'); -
extensions/AdditionalPages/admin/edit_page.inc.php
r9270 r9272 16 16 { 17 17 $conf['additional_pages']['homepage'] = null; 18 pwg_query('UPDATE '.CONFIG_TABLE.' SET value = "'.addslashes(serialize($conf['additional_pages'])).'" WHERE param = "additional_pages";');18 conf_update_param('additional_pages', pwg_db_real_escape_string(serialize($conf['additional_pages']))); 19 19 } 20 20 redirect($my_base_url.'&page_deleted='); -
extensions/AdditionalPages/admin/template/config.tpl
r9262 r9272 7 7 <legend>{'ap_config'|@translate}</legend> 8 8 <table> 9 <tr>10 <td colspan="3"><input type="checkbox" name="show_home" value="on" {if $ap_conf.show_home}checked="checked"{/if}/> {'ap_show_home'|@translate}</td>11 </tr>12 <tr>13 <td colspan="3"><br><hr><br></td>14 </tr>15 9 <tr> 16 10 <td colspan="3">{'ap_perm'|@translate}</td> … … 25 19 <td colspan="3"><br><hr><br></td> 26 20 </tr> 27 <tr> 21 <tr> 22 <td colspan="3"><input type="checkbox" name="show_home" value="on" {if $ap_conf.show_home}checked="checked"{/if}/> {'ap_show_home'|@translate}</td> 23 </tr> 24 <tr> 25 <td colspan="3"><input type="checkbox" name="show_menu" value="on" {if isset($SHOW_MENU)}checked="checked"{/if}/> {'ap_show_menu'|@translate}</td> 26 </tr> 27 <tr class="menu_languages"> 28 28 <td><br>{'ap_menu_name'|@translate} : </td> 29 29 <td><br>{'Default'|@translate} </td> … … 31 31 </tr> 32 32 {foreach from=$language item=lang} 33 <tr >33 <tr class="menu_languages"> 34 34 <td></td> 35 35 <td>{$lang.LANGUAGE_NAME} </td> … … 47 47 <p><a href="{$convert_bbcode.PATH}">{'ap_parse_bbcode'|@translate}</a></p> 48 48 {/if} 49 50 <script type="text/javascript"> 51 jQuery().ready( function () {ldelim} 52 jQuery("input[name='show_menu']").click( function() {ldelim} 53 if (this.checked) 54 jQuery('.menu_languages').show(); 55 else 56 jQuery('.menu_languages').hide(); 57 }); 58 }); 59 if (!jQuery("input[name='show_menu']").attr('checked')) 60 jQuery('.menu_languages').hide(); 61 </script> -
extensions/AdditionalPages/admin/upgrade_from_21.php
r9270 r9272 19 19 SELECT id, pos, title, lang 20 20 FROM '.$prefixeTable.'additionalpages 21 ORDER BY pos ASC , id ASC21 ORDER BY pos ASC 22 22 ;'; 23 23 $result = pwg_query($query); … … 43 43 $position = $row['pos']; 44 44 if ($row['pos'] === '0') 45 $position = '-1 ';45 $position = '-100'; 46 46 elseif (empty($row['pos'])) 47 47 $position = '0'; … … 61 61 } 62 62 63 load_conf_from_db('param = "additional_pages"'); 63 64 $old_conf = explode ("," , $conf['additional_pages']); 65 66 if ($old_conf[1] == 'off') 67 { 68 $mb_conf = @unserialize($conf['blk_menubar']); 69 if (!isset($mb_conf['mbAdditionalPages'])) 70 { 71 $last = @abs(end($mb_conf)); 72 $mb_conf['mbAdditionalPages'] = $last + 50; 73 } 74 $mb_conf['mbAdditionalPages'] = -1 * abs($mb_conf['mbAdditionalPages']); 75 conf_update_param('blk_menubar', pwg_db_real_escape_string(serialize($mb_conf))); 76 } 64 77 65 78 $new_conf = array( … … 81 94 $conf['additional_pages'] = $new_conf; 82 95 83 $query = ' 84 UPDATE '.CONFIG_TABLE.' 85 SET value = "'.addslashes(serialize($new_conf)).'" 86 WHERE param = "additional_pages" 87 ;'; 88 pwg_query($query); 96 conf_update_param('additional_pages', pwg_db_real_escape_string(serialize($new_conf))); 89 97 90 98 ?> -
extensions/AdditionalPages/index_menu.php
r9262 r9272 65 65 (!$conf['additional_pages']['user_perm'] or empty($row['users']) or in_array($user['status'], $authorized_users)))) 66 66 { 67 $url = make_index_url(); 68 if ($row['id'] != $conf['additional_pages']['homepage']) 69 { 70 $url .= '/page/'.(isset($row['permalink']) ? $row['permalink'] : $row['id']); 71 } 67 72 array_push($data, array( 68 'URL' => make_index_url().'/page/'.(isset($row['permalink']) ? $row['permalink'] : $row['id']),73 'URL' => $url, 69 74 'LABEL' => $row['title'])); 70 75 } -
extensions/AdditionalPages/main.inc.php
r9262 r9272 34 34 global $tokens, $conf, $page; 35 35 36 $page[' is_homepage'] = (count($tokens) == 1 and empty($tokens[0]));36 $page['ap_homepage'] = (count($tokens) == 1 and empty($tokens[0])); 37 37 38 if (($tokens[0] == 'page' and !empty($tokens[1])) or ($page[' is_homepage'] and !is_null($conf['additional_pages']['homepage'])))38 if (($tokens[0] == 'page' and !empty($tokens[1])) or ($page['ap_homepage'] and !is_null($conf['additional_pages']['homepage']))) 39 39 include(AP_PATH . 'additional_page.php'); 40 40 -
extensions/AdditionalPages/maintain.inc.php
r9270 r9272 18 18 groups VARCHAR( 255 ) NULL DEFAULT NULL , 19 19 permalink VARCHAR( 64 ) NULL DEFAULT NULL , 20 standalone ENUM( "true", "false" ) NOT NULL DEFAULT "false" 20 standalone ENUM( "true", "false" ) NOT NULL DEFAULT "false" , 21 21 PRIMARY KEY (id) , 22 22 INDEX (pos) , … … 35 35 'homepage' => null, 36 36 ); 37 37 38 $query = 'INSERT INTO ' . CONFIG_TABLE . ' (param,value,comment) 38 VALUES ("additional_pages" , "'. addslashes(serialize($config)).'" , "Additional Pages config configuration");';39 VALUES ("additional_pages" , "'.pwg_db_real_escape_string(serialize($config)).'" , "Additional Pages config configuration");'; 39 40 pwg_query($query); 40 41 }
Note: See TracChangeset
for help on using the changeset viewer.