From 0971ce48d217b7cc8081ae70c4b041ab23fdf29c Mon Sep 17 00:00:00 2001 From: rvelices Date: Wed, 22 Mar 2006 01:01:47 +0000 Subject: URL rewriting: capable of fully working with urls without ? URL rewriting: works with image file instead of image id (change make_picture_url to generate urls with file name instead of image id) URL rewriting: completely works with category/best_rated and picture/best_rated/534 (change 'category.php?' to 'category' in make_index_url and 'picture.php?' to 'picture' in make_picture_url to see it) fix: picture category display in upper bar fix: function rate_picture variables and use of the new user type fix: caddie icon appears now on category page fix: admin element_set sql query was using storage_category_id column (column has moved to #image_categories) fix: replaced some old $_GET[xxx] with $page[xxx] fix: pictures have metadata url (use ? parameter - might change later) git-svn-id: http://piwigo.org/svn/trunk@1092 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions.inc.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'include/functions.inc.php') diff --git a/include/functions.inc.php b/include/functions.inc.php index 68ba765fe..eb27ce51d 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -202,7 +202,7 @@ function get_dirs($directory) and $file != '..' and is_dir($directory.'/'.$file) and $file != 'CVS' - and $file != '.svn') + and $file != '.svn') { array_push($sub_dirs, $file); } @@ -356,7 +356,7 @@ function pwg_log( $file, $category, $picture = '' ) if ($conf['log']) { if ( ($conf['history_admin'] ) or ( (! $conf['history_admin']) and (!is_admin()) ) ) - { + { $login = ($user['id'] == $conf['guest_id']) ? 'guest' : addslashes($user['username']); @@ -1141,11 +1141,13 @@ function make_picture_URL($params) $url = get_root_url().'picture.php?' - .'/'.$params['image_id'] .'/'.make_section_in_URL($params) ; - $url = add_well_known_params_in_url($url, $params); + $url.= '/'. + $params['image_id']//.'-'. + //get_filename_wo_extension($params['image_file']).'.htm' + ; return $url; } -- cgit v1.2.3