Rename errorpage() to util_show_error_page() and move util_show_error_page() into include/util.php

This commit is contained in:
Jonathan Ernst
2006-06-29 16:13:35 +00:00
committed by WineHQ
parent 6b89df82a5
commit 6d019b918a
38 changed files with 68 additions and 72 deletions

View File

@@ -530,7 +530,7 @@ class Application {
/* is this user supposed to view this version? */
if(!$_SESSION['current']->canViewApplication($this))
{
errorpage("Something went wrong with the application or version id");
util_show_error_page("Something went wrong with the application or version id");
exit;
}

View File

@@ -164,23 +164,6 @@ function apidb_image($name)
}
/**
* display an error page
*/
function errorpage($text = null, $message = null)
{
if (!$text) {
$text = "You must be logged in to perform that operation.";
}
header("HTTP/1.0 404 Object not found or user is not logged in");
apidb_header("Oops");
echo "<div align=center><font color=red><b>$text</b></font></div>\n";
echo "<p>$message</p>\n";
apidb_footer();
}
/**
* redirect to $url
*/

View File

@@ -1,4 +1,18 @@
<?php
/**
* display an error page
*/
function util_show_error_page($text = null, $message = null)
{
if (!$text) {
$text = "You must be logged in to perform that operation.";
}
header("HTTP/1.0 404 Object not found or user is not logged in");
apidb_header("Oops");
echo "<div align=center><font color=red><b>$text</b></font></div>\n";
echo "<p>$message</p>\n";
apidb_footer();
}
function makeSafe($var)
{

View File

@@ -623,7 +623,7 @@ class Version {
/* is this user supposed to view this version? */
if(!$_SESSION['current']->canViewVersion($this))
{
errorpage("Something went wrong with the application or version id");
util_show_error_page("Something went wrong with the application or version id");
exit;
}
@@ -631,14 +631,14 @@ class Version {
if(!$oApp->iAppId)
{
// Oops! application not found or other error. do something
errorpage('Internal Database Access Error. No App found.');
util_show_error_page('Internal Database Access Error. No App found.');
exit;
}
if(!$this->iVersionId)
{
// Oops! Version not found or other error. do something
errorpage('Internal Database Access Error. No Version Found.');
util_show_error_page('Internal Database Access Error. No Version Found.');
exit;
}

View File

@@ -152,7 +152,7 @@ function vote_update($vars)
{
if(!$_SESSION['current']->isLoggedIn())
{
errorpage("You must be logged in to vote");
util_show_error_page("You must be logged in to vote");
return;
}