Changeset 1094 for trunk/include/functions.inc.php
- Timestamp:
- Mar 23, 2006, 2:49:04 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/functions.inc.php
r1092 r1094 1026 1026 /** 1027 1027 * adds one or more _GET style parameters to an url 1028 * example: add_url_param ('/x', 'a=b') returns /x?a=b1029 * add_url_param ('/x?cat_id=10', 'a=b') returns /x?cat_id=10&a=b1028 * example: add_url_params('/x', array('a'=>'b')) returns /x?a=b 1029 * add_url_params('/x?cat_id=10', array('a'=>'b')) returns /x?cat_id=10&a=b 1030 1030 * @param string url 1031 * @param string param1031 * @param array params 1032 1032 * @return string 1033 1033 */ 1034 function add_url_param($url, $param) 1035 { 1036 $url .= ( strstr($url, '?')===false ) ? '?' :'&'; 1037 $url .= $param; 1034 function add_url_params($url, $params) 1035 { 1036 if ( !empty($params) ) 1037 { 1038 assert( is_array($params) ); 1039 $is_first = true; 1040 foreach($params as $param=>$val) 1041 { 1042 if ($is_first) 1043 { 1044 $is_first = false; 1045 $url .= ( strstr($url, '?')===false ) ? '?' :'&'; 1046 } 1047 else 1048 { 1049 $url .= '&'; 1050 } 1051 $url .= $param; 1052 if (isset($val)) 1053 { 1054 $url .= '='.$val; 1055 } 1056 } 1057 } 1038 1058 return $url; 1039 1059 } … … 1047 1067 function make_index_URL($params = array()) 1048 1068 { 1049 $url = 1050 get_root_url().'category.php?' 1051 .'/'.make_section_in_URL($params) 1052 ; 1053 1069 global $conf; 1070 $url = get_root_url().'category'; 1071 if ($conf['question_mark_in_urls']) 1072 { 1073 } 1074 if ($conf['php_extension_in_urls']) 1075 { 1076 $url .= '.php'; 1077 } 1078 $url.= make_section_in_URL($params); 1054 1079 $url = add_well_known_params_in_url($url, $params); 1055 1056 1080 return $url; 1057 1081 } … … 1135 1159 function make_picture_URL($params) 1136 1160 { 1161 global $conf; 1137 1162 if (!isset($params['image_id'])) 1138 1163 { … … 1140 1165 } 1141 1166 1142 $url = 1143 get_root_url().'picture.php?' 1144 .'/'.make_section_in_URL($params) 1145 ; 1167 $url = get_root_url().'picture'; 1168 if ($conf['php_extension_in_urls']) 1169 { 1170 $url .= '.php'; 1171 } 1172 if ($conf['question_mark_in_urls']) 1173 { 1174 $url .= '?'; 1175 } 1176 $url .= make_section_in_URL($params); 1146 1177 $url = add_well_known_params_in_url($url, $params); 1147 $url.= '/'. 1148 $params['image_id']//.'-'. 1149 //get_filename_wo_extension($params['image_file']).'.htm' 1150 ; 1178 $url.= '/'; 1179 switch ( $conf['picture_url_style'] ) 1180 { 1181 case 'id-file': 1182 $url .= $params['image_id'].'-'; 1183 case 'file': 1184 $url .= get_filename_wo_extension($params['image_file']).'.htm'; 1185 break; 1186 default: 1187 $url .= $params['image_id']; 1188 } 1151 1189 return $url; 1152 1190 } … … 1222 1260 if (!isset($params['category'])) 1223 1261 { 1224 $section_string.= 'categories';1262 //$section_string.= '/categories'; 1225 1263 } 1226 1264 else 1227 1265 { 1228 $section_string.= ' category/'.$params['category'];1266 $section_string.= '/category/'.$params['category']; 1229 1267 } 1230 1268 … … 1238 1276 } 1239 1277 1240 $section_string.= ' tags';1278 $section_string.= '/tags'; 1241 1279 1242 1280 foreach ($params['tags'] as $tag) … … 1254 1292 } 1255 1293 1256 $section_string.= ' search/'.$params['search'];1294 $section_string.= '/search/'.$params['search']; 1257 1295 1258 1296 break; … … 1265 1303 } 1266 1304 1267 $section_string.= ' list/'.implode(',', $params['list']);1305 $section_string.= '/list/'.implode(',', $params['list']); 1268 1306 1269 1307 break; … … 1271 1309 default : 1272 1310 { 1273 $section_string.= $params['section'];1311 $section_string.= '/'.$params['section']; 1274 1312 } 1275 1313 }
Note: See TracChangeset
for help on using the changeset viewer.