Changeset 9350 for extensions
- Timestamp:
- Feb 22, 2011, 3:50:46 PM (13 years ago)
- Location:
- extensions/AdditionalPages
- Files:
-
- 26 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/AdditionalPages/additional_page.php
r9345 r9350 29 29 $identifier = $page['ap_homepage'] ? $conf['AP']['homepage'] : $tokens[1]; 30 30 31 if (function_exists('get_extended_desc'))32 add_event_handler('AP_render_content', 'get_extended_desc');33 34 31 // Retrieve page data 35 $query = 'SELECT id, title 32 $query = 'SELECT id, title, lang, content, users, groups, level, permalink, standalone 36 33 FROM ' . ADD_PAGES_TABLE . ' 37 34 '; … … 58 55 if (!is_admin() or (!is_admin() xor $page['ap_homepage'])) 59 56 { 57 // authorized language 58 if (!empty($row['lang']) and $row['lang'] != $user['language']) 59 { 60 if ($page['ap_homepage'] and check_random_index_redirect()) return; 61 page_forbidden(l10n('You are not authorized to access the requested page'), make_index_url()); 62 } 63 60 64 // authorized level 61 65 if ($user['level'] < $row['level']) 62 66 { 63 67 if ($page['ap_homepage'] and check_random_index_redirect()) return; 64 page_forbidden(l10n('You are not authorized to access the requested page') );68 page_forbidden(l10n('You are not authorized to access the requested page'), make_index_url()); 65 69 } 66 70 … … 72 76 { 73 77 if ($page['ap_homepage'] and check_random_index_redirect()) return; 74 page_forbidden(l10n('You are not authorized to access the requested page') );78 page_forbidden(l10n('You are not authorized to access the requested page'), make_index_url()); 75 79 } 76 80 } … … 88 92 { 89 93 if ($page['ap_homepage'] and check_random_index_redirect()) return; 90 page_forbidden(l10n('You are not authorized to access the requested page') );94 page_forbidden(l10n('You are not authorized to access the requested page'), make_index_url()); 91 95 } 92 96 } … … 106 110 'id' => $row['id'], 107 111 'permalink' => @$row['permalink'], 108 'title' => trigger_event('AP_render_ content', $row['title']),112 'title' => trigger_event('AP_render_title', $row['title']), 109 113 'content' => trigger_event('AP_render_content', $row['content']), 110 114 ); -
extensions/AdditionalPages/admin/add_page.inc.php
r9323 r9350 13 13 'title' => '', 14 14 'permalink' => '', 15 'lang' => 'ALL', 15 16 'homepage' => false, 16 17 'standalone' => false, … … 51 52 } 52 53 53 $language = $_POST['lang'] != 'ALL' ? '"'.$_POST['lang'].'"' : 'NULL';54 $language = (empty($_POST['lang']) or $_POST['lang'] == 'ALL') ? 'NULL' : '"'.$_POST['lang'].'"'; 54 55 $group_access = !empty($_POST['groups']) ? '"'.implode(',', $_POST['groups']).'"' : 'NULL'; 55 56 $standalone = isset($_POST['standalone']) ? '"true"' : '"false"'; … … 114 115 mkgetdir($conf['local_data_dir'].'/additional_pages_backup', MKGETDIR_PROTECT_HTACCESS&~MKGETDIR_DIE_ON_ERROR); 115 116 $sav_file = @fopen($conf['local_data_dir'].'/additional_pages_backup/' . $edited_page['id'] . '.txt', "w"); 116 @fwrite($sav_file, "Title: ". $_POST['title']."\nPermalink: ".$_POST['permalink']."\nLanguage: ".$_POST['lang']."\n\n" . $_POST['ap_content']);117 @fwrite($sav_file, "Title: ".stripslashes($_POST['title'])."\nPermalink: ".stripslashes($_POST['permalink'])."\n\n".stripslashes($_POST['ap_content'])); 117 118 @fclose($sav_file); 118 119 … … 127 128 $edited_page['title'] = stripslashes($_POST['title']); 128 129 $edited_page['permalink'] = stripslashes($_POST['permalink']); 129 $edited_page['lang'] = $_POST['lang'];130 130 $edited_page['content'] = stripslashes($_POST['ap_content']); 131 $edited_page['lang'] = !empty($_POST['lang']) ? $_POST['lang'] : 'ALL'; 131 132 $edited_page['groups'] = !empty($_POST['groups']) ? $_POST['groups'] : array(); 132 133 $edited_page['users'] = !empty($_POST['users']) ? $_POST['users'] : array(); … … 137 138 138 139 // Language options 139 $options['ALL'] = l10n('ap_all_lang'); 140 $selected = 'ALL'; 141 foreach (get_languages() as $language_code => $language_name) 142 { 143 $options[$language_code] = $language_name; 144 if (isset($edited_page['lang']) and $edited_page['lang'] == $language_code) 145 { 146 $selected = $language_code; 147 } 148 } 149 $template->assign('lang', array( 150 'OPTIONS' => $options, 151 'SELECTED' => $selected)); 140 if ($conf['AP']['language_perm']) 141 { 142 $languages = get_languages(); 143 $options = array('ALL' => l10n('ap_all_lang')); 144 foreach ($languages as $language_code => $language_name) 145 { 146 $options[$language_code] = $language_name; 147 } 148 $template->assign(array( 149 'lang' => $options, 150 'selected_lang' => $edited_page['lang'], 151 ) 152 ); 153 } 152 154 153 155 // Groups options -
extensions/AdditionalPages/admin/config.inc.php
r9345 r9350 25 25 pwg_query('UPDATE '.ADD_PAGES_TABLE.' SET groups = NULL;'); 26 26 } 27 if ($conf['AP']['language_perm'] and !isset($_POST['language_perm'])) 28 { 29 pwg_query('UPDATE '.ADD_PAGES_TABLE.' SET lang = NULL;'); 30 } 27 31 28 $params = array('show_home', 'group_perm', 'user_perm', 'level_perm' );32 $params = array('show_home', 'group_perm', 'user_perm', 'level_perm', 'language_perm'); 29 33 30 34 foreach ($params as $param) -
extensions/AdditionalPages/admin/edit_page.inc.php
r9323 r9350 34 34 $edited_page['groups'] = !empty($edited_page['groups']) ? explode(',', $edited_page['groups']) : array(); 35 35 $edited_page['homepage'] = $conf['AP']['homepage'] == $edited_page['id']; 36 $edited_page['standalone'] = ($edited_page['standalone'] == 'true');36 $edited_page['standalone'] = $edited_page['standalone'] == 'true'; 37 37 38 38 $template->assign('delete', true); -
extensions/AdditionalPages/admin/manage.inc.php
r9323 r9350 29 29 } 30 30 31 if (defined('EXTENDED_DESC_PATH')) 32 { 33 add_event_handler('AP_render_title', 'get_user_language_desc'); 34 } 35 31 36 $languages = get_languages(); 32 37 … … 43 48 $row['U_DELETE'] = PHPWG_ROOT_PATH.'admin.php?page=plugin&section='.AP_DIR.'%2Fadmin%2Fadmin.php&tab=edit_page&edit='.$row['id'].'&delete='; 44 49 50 $row['title'] = trigger_event('AP_render_title', $row['title']); 45 51 $row['language'] = @$languages[$row['lang']]; 46 52 -
extensions/AdditionalPages/admin/template/add_page.tpl
r9312 r9350 43 43 </li> 44 44 45 {if isset($lang)} 45 46 <li> 46 47 <span class="property"> 47 48 <label for="lang">{'ap_page_lang'|@translate}</label> 48 49 </span> 49 {html_options name=lang id=lang options=$lang .OPTIONS selected=$lang.SELECTED}50 {html_options name=lang id=lang options=$lang selected=$selected_lang} 50 51 </li> 52 {/if} 51 53 52 54 <li style="margin-top:15px;"> -
extensions/AdditionalPages/admin/template/config.tpl
r9345 r9350 56 56 </label> 57 57 </li> 58 59 <li> 60 <label> 61 <span class="property">{'ap_language_perm'|@translate}</span> 62 <input type="checkbox" name="language_perm" id="language_perm" value="on" {if $ap_conf.language_perm}checked="checked"{/if}/> 63 </label> 64 </li> 58 65 </ul> 59 66 </fieldset> -
extensions/AdditionalPages/admin/upgrade.inc.php
r9323 r9350 133 133 } 134 134 135 if (!isset($conf['AP']['language_perm'])) 136 { 137 $query = ' 138 SELECT id 139 FROM '.$prefixeTable.'additionalpages 140 WHERE lang IS NOT NULL 141 ;'; 142 $ids = array_from_query($query, 'id'); 143 144 $conf['AP']['language_perm'] = !empty($ids); 145 146 conf_update_param('additional_pages', pwg_db_real_escape_string(serialize($conf['AP']))); 147 } 148 135 149 ?> -
extensions/AdditionalPages/language/ar_SA/plugin.lang.php
r9310 r9350 46 46 /*TODO*/$lang['ap_permalink_already_used'] = 'Permalink %s is already used by page %s'; 47 47 /*TODO*/$lang['ap_level_perm'] = 'by privacy level'; 48 /*TODO*/$lang['ap_language_perm'] = 'by language'; 48 49 49 50 ?> -
extensions/AdditionalPages/language/cs_CZ/plugin.lang.php
r9310 r9350 46 46 /*TODO*/$lang['ap_permalink_already_used'] = 'Permalink %s is already used by page %s'; 47 47 /*TODO*/$lang['ap_level_perm'] = 'by privacy level'; 48 /*TODO*/$lang['ap_language_perm'] = 'by language'; 48 49 49 50 ?> -
extensions/AdditionalPages/language/de_DE/plugin.lang.php
r9310 r9350 46 46 /*TODO*/$lang['ap_permalink_already_used'] = 'Permalink %s is already used by page %s'; 47 47 /*TODO*/$lang['ap_level_perm'] = 'by privacy level'; 48 /*TODO*/$lang['ap_language_perm'] = 'by language'; 48 49 49 50 ?> -
extensions/AdditionalPages/language/en_UK/plugin.lang.php
r9310 r9350 46 46 $lang['ap_permalink_already_used'] = 'Permalink %s is already used by page %s'; 47 47 $lang['ap_level_perm'] = 'by privacy level'; 48 $lang['ap_language_perm'] = 'by language'; 48 49 49 50 ?> -
extensions/AdditionalPages/language/es_ES/plugin.lang.php
r9320 r9350 46 46 $lang['ap_permalink_already_used'] = 'El enlace permanente% s ya está siendo utilizado por la página% s'; 47 47 $lang['ap_level_perm'] = 'por nivel de confidencialidad'; 48 /*TODO*/$lang['ap_language_perm'] = 'by language'; 48 49 49 50 ?> -
extensions/AdditionalPages/language/fr_FR/plugin.lang.php
r9310 r9350 46 46 $lang['ap_permalink_already_used'] = 'Le lien permanent %s est déja utilisé par la page %s'; 47 47 $lang['ap_level_perm'] = 'par niveau de confidentialité'; 48 $lang['ap_language_perm'] = 'par langue'; 48 49 49 50 ?> -
extensions/AdditionalPages/language/hu_HU/plugin.lang.php
r9310 r9350 46 46 /*TODO*/$lang['ap_permalink_already_used'] = 'Permalink %s is already used by page %s'; 47 47 /*TODO*/$lang['ap_level_perm'] = 'by privacy level'; 48 /*TODO*/$lang['ap_language_perm'] = 'by language'; 48 49 49 50 ?> -
extensions/AdditionalPages/language/it_IT/plugin.lang.php
r9310 r9350 46 46 $lang['ap_permalink_already_used'] = 'Permalink %s è già utilizzato da pagina %s'; 47 47 /*TODO*/$lang['ap_level_perm'] = 'by privacy level'; 48 48 /*TODO*/$lang['ap_language_perm'] = 'by language'; 49 49 50 50 ?> -
extensions/AdditionalPages/language/lv_LV/plugin.lang.php
r9340 r9350 46 46 $lang['ap_permalink_already_used'] = 'Pastāvīgo saiti %s jau lieto %s lapa'; 47 47 $lang['ap_level_perm'] = 'ar konfidencialitātes līmeni'; 48 /*TODO*/$lang['ap_language_perm'] = 'by language'; 48 49 49 50 ?> -
extensions/AdditionalPages/language/nl_NL/plugin.lang.php
r9321 r9350 46 46 $lang['ap_permalink_already_used'] = 'De permalink %s wordt al gebruikt door pagina %s'; 47 47 $lang['ap_level_perm'] = 'op privacy nivo'; 48 /*TODO*/$lang['ap_language_perm'] = 'by language'; 48 49 49 50 ?> -
extensions/AdditionalPages/language/no_NO/plugin.lang.php
r9346 r9350 46 46 $lang['ap_permalink_already_used'] = 'Permalink %s er allerede I bruk av side %s'; 47 47 $lang['ap_level_perm'] = 'av privat nivå'; 48 /*TODO*/$lang['ap_language_perm'] = 'by language'; 48 49 49 50 ?> -
extensions/AdditionalPages/language/pl_PL/plugin.lang.php
r9328 r9350 46 46 $lang['ap_permalink_already_used'] = 'Link permanentny %s jest już używane przez stronę %s'; 47 47 $lang['ap_level_perm'] = 'po poziomie prywatności'; 48 /*TODO*/$lang['ap_language_perm'] = 'by language'; 48 49 49 50 ?> -
extensions/AdditionalPages/language/ru_RU/plugin.lang.php
r9318 r9350 46 46 $lang['ap_permalink_already_used'] = 'Постоянная ссылка %s уже используется страницей %s'; 47 47 $lang['ap_level_perm'] = 'по уровню доступа'; 48 /*TODO*/$lang['ap_language_perm'] = 'by language'; 48 49 49 50 ?> -
extensions/AdditionalPages/language/sk_SK/plugin.lang.php
r9344 r9350 46 46 $lang['ap_permalink_already_used'] = 'Trvalý link %s je stále používaný stránkou %s'; 47 47 $lang['ap_level_perm'] = 'pri súkromnej úrovni'; 48 /*TODO*/$lang['ap_language_perm'] = 'by language'; 48 49 49 50 ?> -
extensions/AdditionalPages/language/sv_SE/plugin.lang.php
r9327 r9350 46 46 $lang['ap_permalink_already_used'] = 'Permalänk %s används redan av sidan %s'; 47 47 $lang['ap_level_perm'] = 'enligt säkerhets nivå'; 48 /*TODO*/$lang['ap_language_perm'] = 'by language'; 48 49 49 50 ?> -
extensions/AdditionalPages/language/tr_TR/plugin.lang.php
r9322 r9350 46 46 $lang['ap_permalink_already_used'] = 'Kalıcı bağlantı %s zaten sayfa %s tarafından kullanılıyor'; 47 47 $lang['ap_level_perm'] = 'gizlilik seviyesine göre'; 48 /*TODO*/$lang['ap_language_perm'] = 'by language'; 48 49 49 50 ?> -
extensions/AdditionalPages/main.inc.php
r9345 r9350 20 20 21 21 // Need upgrade? 22 if (!isset($conf['AP']['l evel_perm']))22 if (!isset($conf['AP']['language_perm'])) 23 23 include(AP_PATH.'admin/upgrade.inc.php'); 24 24 … … 43 43 { 44 44 global $tokens, $conf, $page; 45 46 if (defined('EXTENDED_DESC_PATH')) 47 { 48 add_event_handler('AP_render_content', 'get_extended_desc'); 49 add_event_handler('AP_render_title', 'get_user_language_desc'); 50 } 45 51 46 52 $page['ap_homepage'] = (count($tokens) == 1 and empty($tokens[0])); … … 85 91 { 86 92 $url = make_index_url().'/page/'.(isset($row['permalink']) ? $row['permalink'] : $row['id']); 87 array_push($data, array('URL' => $url, 'LABEL' => $row['title']));93 array_push($data, array('URL' => $url, 'LABEL' => trigger_event('AP_render_title', $row['title']))); 88 94 } 89 95 -
extensions/AdditionalPages/maintain.inc.php
r9345 r9350 39 39 'group_perm' => false, 40 40 'user_perm' => false, 41 'language_perm' => false, 41 42 'homepage' => null, 42 43 );
Note: See TracChangeset
for help on using the changeset viewer.