mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-02 22:02:07 +02:00
Code Issues Releases Wiki Activity

Checked all calls to message_die and made sure that if they would be outputted to a user

Browse Source 
without a major error that they got their error string from the lang file
Also made sure all calls had the right arguments in teh right place


git-svn-id: file:///svn/phpbb/trunk@1289 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
James Atkinson 2001-11-09 08:57:37 +00:00
parent 41c15e37ce
commit 833f085eb2
6 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/admin/admin_db_utilities.php
View File

@ -956,8 +956,8 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
if(!$result && ( !(SQL_LAYER == 'postgres' && eregi("drop table", $sql) ) ) )
{
include('page_header_admin.'.$phpEx);
echo "~~$sql~~";
//include('page_header_admin.'.$phpEx);
// echo "~~$sql~~";
message_die(GENERAL_ERROR, "Error importing backup file", "", __LINE__, __FILE__, $sql);
}
}

4
phpBB/admin/admin_groups.php
View File

@ -63,7 +63,7 @@ if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
}
if( !$db->sql_numrows($result) )
{
message_die(GENERAL_MESSAGE, "That user group does not exist");
message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
}
$group_info = $db->sql_fetchrow($result);
@ -199,7 +199,7 @@ else if( isset($HTTP_POST_VARS['group_update']) )
}
if( !$db->sql_numrows($result) )
{
message_die(GENERAL_MESSAGE, "That user group does not exist");
message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
}
$group_info = $db->sql_fetchrow($result);

10
phpBB/admin/admin_mass_email.php
View File

@ -43,7 +43,14 @@ require('pagestart.inc');
//
// Set VERBOSE to 1 for debugging info..
//
define("VERBOSE", 0);
if(DEBUG)
{
define("VERBOSE", 1);
}
else
{
define("VERBOSE", 0);
}
//
// Increase maximum execution time in case of a lot of users, but don't complain about it if it isn't
@ -88,6 +95,7 @@ if(isset($HTTP_POST_VARS['submit']))
}
$email_headers .= $g_list[$i]['user_email'];
}
mail($board_config['board_email'],$HTTP_POST_VARS["$f_title"],$HTTP_POST_VARS["$f_msg"],$email_headers);
$notice = $lang['Messages'].' '.$lang['Sent'].'!';
}

4
phpBB/groupcp.php
View File

@ -512,7 +512,7 @@ else if( $group_id )
if( !$db->sql_numrows($result) )
{
message_die(GENERAL_MESSAGE, "That user group does not exist");
message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
}
$group_info = $db->sql_fetchrow($result);
@ -993,7 +993,7 @@ else
if( !$db->sql_numrows($result) )
{
message_die(GENERAL_MESSAGE, "No groups exist");
message_die(GENERAL_MESSAGE, $lang['No_groups_exist']);
}
$group_list = $db->sql_fetchrowset($result);

4
phpBB/language/lang_english/lang_main.php
View File

@ -146,6 +146,7 @@ $lang['Registered_user_total'] = "We have <b>%d</b> registered user"; // # regis
$lang['Registered_users_total'] = "We have <b>%d</b> registered users"; // # registered users
$lang['Newest_user'] = "The newest registered user is <b>%s%s%s</b>"; // username
$lang['No_new_posts_last_visit'] = "No new posts since your last visit";
$lang['No_new_posts'] = "No new posts";
$lang['New_posts'] = "New posts";
$lang['New_post'] = "New post";
@ -556,6 +557,9 @@ $lang['Current_memberships'] = "Current memberships";
$lang['Non_member_groups'] = "Non-member groups";
$lang['Memberships_pending'] = "Memberships pending";
$lang['No_groups_exist'] = "No Groups Exist";
$lang['Group_not_exist'] = "That user group does not exist";
$lang['Join_group'] = "Join Group";
$lang['No_group_members'] = "This group has no members";
$lang['Group_hidden_members'] = "This group is hidden, you cannot view its membership";

4
phpBB/viewtopic.php
View File

@ -45,7 +45,7 @@ $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) :
if( !isset($topic_id) && !isset($post_id) )
{
message_die(GENERAL_MESSAGE, 'Topic_post_not_exist');
message_die(GENERAL_MESSAGE, $lang['Topic_post_not_exist'], $lang['Error'], __LINE__, __FILE__);
}
//
@ -75,7 +75,7 @@ if( isset($HTTP_GET_VARS["view"]) && empty($HTTP_GET_VARS[POST_POST_URL]) )
if( !($row = $db->sql_fetchrow($result)) )
{
message_die(GENERAL_MESSAGE, 'No new posts since your last visit');
message_die(GENERAL_MESSAGE, $lang['No_new_posts_last_visit']);
}
else
{