new: cleaner URL. Instead of category.php?cat=search&search=123&start=42,

you now have category.php?/search/123/start-42. Functions make_index_url and
make_picture_url build these new URLs. Functions duplicate_picture_url and
duplicate_index_url provide shortcuts to URL creation. The current main page
page is still category.php but this can be modified easily in make_index_url
function. In this first version, no backward compatibility. Calendar
definition in URL must be discussed with rvelices.

improvement: picture.php redesigned. First actions like "set as
representative" or "delete a comment" which all lead to a redirection. Then
the page (the big mess) and includes of new sub pages to manage specific
parts of the page (metadata, user comments, rates).

new: with the cleaner URL comes a new terminology. $page['cat'] doesn't
exist anymore. $page['section'] is among 'categories', 'tags' (TODO),
'list', 'most_seen'... And sub parameters are set : $page['category'] if
$page['section'] is "categories". See URL analyse in
include/section_init.inc.php for details.


git-svn-id: http://piwigo.org/svn/trunk@1082 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 17 insertions, 7 deletions

diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index 9e165b96b..0e20f9290 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -333,31 +333,41 @@ while ($row = mysql_fetch_array($result))
 // 3. if URL category not available or reachable, use the first reachable
 //    linked category
 // 4. if no category reachable, no jumpto link
-$base_url_img = PHPWG_ROOT_PATH.'picture.php';
-$base_url_img.= '?image_id='.$_GET['image_id'];
-$base_url_img.= '&cat=';
-unset($url_img);
 
 $query = '
 SELECT category_id
   FROM '.IMAGE_CATEGORY_TABLE.'
   WHERE image_id = '.$_GET['image_id'].'
 ;';
+
 $authorizeds = array_diff(
   array_from_query($query, 'category_id'),
-  explode(',', calculate_permissions($user['id'], $user['status']))
+  explode(
+    ',',
+    calculate_permissions($user['id'], $user['status'])
+    )
   );
 
 if (isset($_GET['cat_id'])
     and in_array($_GET['cat_id'], $authorizeds))
 {
-  $url_img = $base_url_img.$_GET['cat_id'];
+  $url_img = make_picture_URL(
+    array(
+      'image_id' => $_GET['image_id'],
+      'category' => $_GET['cat_id'],
+      )
+    );
 }
 else
 {
   foreach ($authorizeds as $category)
   {
-    $url_img = $base_url_img.$category;
+    $url_img = make_picture_URL(
+      array(
+        'image_id' => $_GET['image_id'],
+        'category' => $category,
+        )
+      );
     break;
   }
 }