Changeset 1504 for branches/branch-1_6/include
- Timestamp:
- Jul 26, 2006, 11:04:23 PM (18 years ago)
- Location:
- branches/branch-1_6/include
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/branch-1_6/include/functions_url.inc.php
r1402 r1504 93 93 * @return string 94 94 */ 95 function make_index_ URL($params = array())95 function make_index_url($params = array()) 96 96 { 97 97 global $conf; … … 105 105 $url .= '?'; 106 106 } 107 $url.= make_section_in_ URL($params);107 $url.= make_section_in_url($params); 108 108 $url = add_well_known_params_in_url($url, $params); 109 109 return $url; … … 114 114 * and removes. 115 115 * 116 * duplicate_index_ URL(array('category' => 12), array('start')) will create116 * duplicate_index_url(array('category' => 12), array('start')) will create 117 117 * an index URL on the current section (categories), but on a redefined 118 118 * category and without the start URL parameter. … … 122 122 * @return string 123 123 */ 124 function duplicate_index_ URL($redefined = array(), $removed = array())125 { 126 return make_index_ URL(124 function duplicate_index_url($redefined = array(), $removed = array()) 125 { 126 return make_index_url( 127 127 params_for_duplication($redefined, $removed) 128 128 ); … … 167 167 /** 168 168 * create a picture URL with current page parameters, but with redefinitions 169 * and removes. See duplicate_index_ URL.169 * and removes. See duplicate_index_url. 170 170 * 171 171 * @param array redefined keys … … 173 173 * @return string 174 174 */ 175 function duplicate_picture_ URL($redefined = array(), $removed = array())176 { 177 return make_picture_ URL(175 function duplicate_picture_url($redefined = array(), $removed = array()) 176 { 177 return make_picture_url( 178 178 params_for_duplication($redefined, $removed) 179 179 ); … … 186 186 * @return string 187 187 */ 188 function make_picture_ URL($params)188 function make_picture_url($params) 189 189 { 190 190 global $conf; 191 191 if (!isset($params['image_id'])) 192 192 { 193 die('make_picture_ URL: image_id is a required parameter');193 die('make_picture_url: image_id is a required parameter'); 194 194 } 195 195 … … 227 227 $url .= $params['image_id']; 228 228 } 229 $url .= make_section_in_ URL($params);229 $url .= make_section_in_url($params); 230 230 $url = add_well_known_params_in_url($url, $params); 231 231 return $url; … … 267 267 * @return string 268 268 */ 269 function make_section_in_ URL($params)269 function make_section_in_url($params) 270 270 { 271 271 global $conf; … … 324 324 if (!isset($params['tags']) or count($params['tags']) == 0) 325 325 { 326 die('make_section_in_ URL: require at least one tag');326 die('make_section_in_url: require at least one tag'); 327 327 } 328 328 … … 357 357 if (!isset($params['search'])) 358 358 { 359 die('make_section_in_ URL: require a search identifier');359 die('make_section_in_url: require a search identifier'); 360 360 } 361 361 … … 368 368 if (!isset($params['list'])) 369 369 { 370 die('make_section_in_ URL: require a list of items');370 die('make_section_in_url: require a list of items'); 371 371 } 372 372 -
branches/branch-1_6/include/menubar.inc.php
r1435 r1504 6 6 // +-----------------------------------------------------------------------+ 7 7 // | branch : BSF (Best So Far) 8 // | file : $Id :$9 // | last update : $Date :$10 // | last modifier : $Author :$11 // | revision : $Revision :$8 // | file : $Id$ 9 // | last update : $Date$ 10 // | last modifier : $Author$ 11 // | revision : $Revision$ 12 12 // +-----------------------------------------------------------------------+ 13 13 // | This program is free software; you can redistribute it and/or modify | … … 42 42 'MENU_CATEGORIES_CONTENT' => get_categories_menu(), 43 43 'F_IDENTIFY' => get_root_url().'identification.php', 44 'U_HOME' => make_index_ URL(),44 'U_HOME' => make_index_url(), 45 45 'U_REGISTER' => get_root_url().'register.php', 46 46 'U_LOST_PASSWORD' => get_root_url().'password.php', 47 'U_LOGOUT' => add_url_params(make_index_ URL(), array('act'=>'logout') ),47 'U_LOGOUT' => add_url_params(make_index_url(), array('act'=>'logout') ), 48 48 'U_ADMIN'=> get_root_url().'admin.php', 49 49 'U_PROFILE'=> get_root_url().'profile.php', … … 100 100 'tags.tag', 101 101 array( 102 'URL_ADD' => make_index_ URL(102 'URL_ADD' => make_index_url( 103 103 array( 104 104 'tags' => array_merge( … … 114 114 ), 115 115 116 'URL' => make_index_ URL(116 'URL' => make_index_url( 117 117 array( 118 118 'tags' => array( … … 148 148 'special_cat', 149 149 array( 150 'URL' => make_index_ URL(array('section' => 'favorites')),150 'URL' => make_index_url(array('section' => 'favorites')), 151 151 'TITLE' => $lang['favorite_cat_hint'], 152 152 'NAME' => $lang['favorite_cat'] … … 157 157 'special_cat', 158 158 array( 159 'URL' => make_index_ URL(array('section' => 'most_visited')),159 'URL' => make_index_url(array('section' => 'most_visited')), 160 160 'TITLE' => $lang['most_visited_cat_hint'], 161 161 'NAME' => $lang['most_visited_cat'] … … 167 167 'special_cat', 168 168 array( 169 'URL' => make_index_ URL(array('section' => 'best_rated')),169 'URL' => make_index_url(array('section' => 'best_rated')), 170 170 'TITLE' => $lang['best_rated_cat_hint'], 171 171 'NAME' => $lang['best_rated_cat'] … … 185 185 'special_cat', 186 186 array( 187 'URL' => make_index_ URL(array('section' => 'recent_pics')),187 'URL' => make_index_url(array('section' => 'recent_pics')), 188 188 'TITLE' => $lang['recent_pics_cat_hint'], 189 189 'NAME' => $lang['recent_pics_cat'] … … 193 193 'special_cat', 194 194 array( 195 'URL' => make_index_ URL(array('section' => 'recent_cats')),195 'URL' => make_index_url(array('section' => 'recent_cats')), 196 196 'TITLE' => $lang['recent_cats_cat_hint'], 197 197 'NAME' => $lang['recent_cats_cat'] … … 203 203 array( 204 204 'URL' => 205 make_index_ URL(205 make_index_url( 206 206 array( 207 207 'chronology_field' => ($conf['calendar_datefield']=='date_available' -
branches/branch-1_6/include/picture_comment.inc.php
r1094 r1504 136 136 137 137 $page['navigation_bar'] = create_navigation_bar( 138 duplicate_picture_ URL(array(), array('start')),138 duplicate_picture_url(array(), array('start')), 139 139 $row['nb_comments'], 140 140 $page['start'],
Note: See TracChangeset
for help on using the changeset viewer.