diff options
| author | rvelices <rv-github@modusoptimus.com> | 2006-04-28 05:12:25 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2006-04-28 05:12:25 +0000 |
| commit | aaea0a1653e42bfa2db8e5be2e36f5e22be16631 (patch) | |
| tree | c813db5f5550be832cc71d2f334f94a86de28839 | |
| parent | 0510cfdc5ad38487600f8f1bf8e4d4f9747781df (diff) | |
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
Diffstat (limited to '')
| -rw-r--r-- | category.php | 7 | ||||
| -rw-r--r-- | include/functions_category.inc.php | 2 | ||||
| -rw-r--r-- | include/functions_html.inc.php | 18 | ||||
| -rw-r--r-- | include/section_init.inc.php | 6 | ||||
| -rw-r--r-- | picture.php | 3 |
5 files changed, 34 insertions, 2 deletions
diff --git a/category.php b/category.php index f91ad942c..f0a5161f7 100644 --- a/category.php +++ b/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) ); diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php index a671474ef..2aff86975 100644 --- a/include/functions_category.inc.php +++ b/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) diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index bc967b752..65cbc879c 100644 --- a/include/functions_html.inc.php +++ b/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 ); +} ?> diff --git a/include/section_init.inc.php b/include/section_init.inc.php index 3a27882ba..1d5949e63 100644 --- a/include/section_init.inc.php +++ b/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, diff --git a/picture.php b/picture.php index 486e303cb..ed143723f 100644 --- a/picture.php +++ b/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() ); } // +-----------------------------------------------------------------------+ |