merge -r1287 from branch-1_6 to trunk

bug 349: Nicer display messages instead of "die" when urls cannot be 
solved (also set 404 status code for bots)

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

category.php

@@ -39,6 +39,9 @@ if ( isset($_GET['cat']) )
   {
     $url_params['section'] = 'categories';
     $url_params['category'] = $_GET['cat'];
+    $result = get_cat_info($url_params['category']);
+    if ( !empty($result) )
+      $url_params['cat_name'] = $result['name'];
   }
   elseif ( in_array($_GET['cat'],
               array('best_rated','most_visited','recent_pics','recent_cats')
@@ -47,6 +50,10 @@ if ( isset($_GET['cat']) )
   {
     $url_params['section'] = $_GET['cat'];
   }
+  else
+  {
+    page_not_found('');
+  }
 }
 
 redirect ( make_index_url($url_params) );

include/functions_category.inc.php

@@ -118,6 +118,8 @@ SELECT '.implode(',', $infos).'
   WHERE id = '.$id.'
 ;';
   $row = mysql_fetch_array(pwg_query($query));
+  if (empty($row))
+    return null;
 
   $cat = array();
   foreach ($infos as $info)

include/functions_html.inc.php

@@ -591,4 +591,22 @@ function access_denied()
     redirect($login_url);
   }
 }
+
+/**
+ * exits the current script with 404 code when a page cannot be found
+ * @param string msg a message to display
+ * @param string alternate_url redirect to this url
+ */
+function page_not_found($msg, $alternate_url=null)
+{
+  header('HTTP/1.1 404 Not found');
+  header('Status: 404 Not found');
+  if ($alternate_url==null)
+    $alternate_url = make_index_url();
+  redirect( $alternate_url,
+    '<div style="text-align:left; margin-left:5em;margin-bottom:5em;">
+<h1 style="text-align:left; font-size:36px;">Page not found</h1><br/>'
+.$msg.'</div>',
+    5 );
+}
 ?>

include/section_init.inc.php

@@ -197,7 +197,7 @@ SELECT name, url_name, id
   }
   if ( empty($page['tags']) )
   {
-    die('Fatal: no existing tag');
+    page_not_found('Requested tag does not exist', get_root_url().'tags.php' );
   }
 }
 else if (0 === strpos($tokens[$next_token], 'fav'))
@@ -316,6 +316,10 @@ if ('categories' == $page['section'])
   if (isset($page['category']))
   {
     $result = get_cat_info($page['category']);
+    if (empty($result))
+    {
+      page_not_found('Requested category does not exist' );
+    }
 
     $page = array_merge(
       $page,

picture.php

@@ -42,7 +42,8 @@ if (isset($page['category']))
 // displayed, and execution is stopped
 if (!in_array($page['image_id'], $page['items']))
 {
-  die('Fatal: this picture does not belong to this section');
+  page_not_found('The requested image does not belong to this image set',
+      duplicate_index_url() );
 }
 
 // +-----------------------------------------------------------------------+