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, 6 insertions, 9 deletions

diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index 2bc455775..8b5bd58a4 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -46,16 +46,13 @@ function check_restrictions($category_id)
 
   if (in_array($category_id, explode(',', $user['forbidden_categories'])))
   {
-    $login_url = './identification.php?redirect='.
-                  urlencode(urlencode($_SERVER['REQUEST_URI']));
-    if ( ! $user['is_the_guest'] )
+    $login_url =
+      './identification.php?redirect='
+      .urlencode(urlencode($_SERVER['REQUEST_URI']));
+    
+    if (!$user['is_the_guest'])
     {
-      echo '<div style="text-align:center;">';
-      echo $lang['hello'].' '.$user['username'].'! ';
-      echo $lang['access_forbiden'].'<br />';
-      echo '<a href="./category.php">'.$lang['thumbnails'].'</a> ';
-      echo '</div>';
-      exit();
+      die('Fatal: you are trying to reach a forbidden category');
     }
     else
     {