makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ok, this includes fixes for bugs numbered 526000, 524591, 520370, and 520872. Manily, a few typos were fixed, along with a problem in the jumpbox (fixed using a quick Javascript check, there really isn't another way without modifying some large portions of code), and a problem in the rank control panel. In other words, everything assigned to me (as of this morning) has been fixed. I also ran the lovely fix_files.sh, so CVS might be a little wacky and try to update everything. I hope not...

Browse source 
That's it for now!
dougk_ff7


git-svn-id: file:///svn/phpbb/trunk@2287 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
dougk_ff7 2002-03-10 03:23:56 +00:00
parent cb97372773
commit 0383e1b80a
84 changed files with 11926 additions and 11916 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/admin/admin_ranks.php
View file

@ -207,11 +207,20 @@ if( $mode != "" )
$sql = "DELETE FROM " . RANKS_TABLE . " $sql = "DELETE FROM " . RANKS_TABLE . "
WHERE rank_id = $rank_id"; WHERE rank_id = $rank_id";
if( !$result = $db->sql_query($sql)) if( !$result = $db->sql_query($sql) )
{ {
message_die(GENERAL_ERROR, "Couldn't delete rank data", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Couldn't delete rank data", "", __LINE__, __FILE__, $sql);
} }
$sql = "UPDATE " . USERS_TABLE . "
SET user_rank = 0
WHERE user_rank = $rank_id";
if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, $lang['No_update_ranks'], "", __LINE__, __FILE__, $sql);
}
$message = $lang['Rank_removed'] . "<br /><br />" . sprintf($lang['Click_return_rankadmin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); $message = $lang['Rank_removed'] . "<br /><br />" . sprintf($lang['Click_return_rankadmin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message); message_die(GENERAL_MESSAGE, $message);

BIN
phpBB/db/schemas/ms_access_primer.zip
View file

Binary file not shown.

3
phpBB/language/lang_english/lang_admin.php
View file

@ -505,7 +505,7 @@ $lang['Click_return_wordadmin'] = "Click %sHere%s to return to Word Censor Admin
// //
// Mass Email // Mass Email
// //
$lang['Mass_email_explain'] = "Here you can email a message to either all of your users, or all users of a specific group. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for amass emailing to take a long time, you will be notified when the script has completed"; $lang['Mass_email_explain'] = "Here you can email a message to either all of your users, or all users of a specific group. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed";
$lang['Compose'] = "Compose"; $lang['Compose'] = "Compose";
$lang['Recipients'] = "Recipients"; $lang['Recipients'] = "Recipients";
@ -536,6 +536,7 @@ $lang['No_assigned_rank'] = "No special rank assigned";
$lang['Rank_updated'] = "The rank was successfully updated"; $lang['Rank_updated'] = "The rank was successfully updated";
$lang['Rank_added'] = "The rank was successfully added"; $lang['Rank_added'] = "The rank was successfully added";
$lang['Rank_removed'] = "The rank was successfully deleted"; $lang['Rank_removed'] = "The rank was successfully deleted";
$lang['No_update_ranks'] = "The rank was successfully deleted, however user accounts using this rank were not updated. You will need to manually reset the rank on these accounts";
$lang['Click_return_rankadmin'] = "Click %sHere%s to return to Rank Administration"; $lang['Click_return_rankadmin'] = "Click %sHere%s to return to Rank Administration";

2
phpBB/language/lang_english/lang_main.php
View file

@ -531,7 +531,7 @@ $lang['File_no_data'] = "The file at the URL you gave contains no data";
$lang['No_connection_URL'] = "A connection could not be made to the URL you gave"; $lang['No_connection_URL'] = "A connection could not be made to the URL you gave";
$lang['Incomplete_URL'] = "The URL you entered is incomplete"; $lang['Incomplete_URL'] = "The URL you entered is incomplete";
$lang['Wrong_remote_avatar_format'] = "The URL of the remote avatar is not valid"; $lang['Wrong_remote_avatar_format'] = "The URL of the remote avatar is not valid";
$lang['No_send_account_inactive'] = "Sorry but you're password cannot be retrieved because you account is currently inactive. Please contact the forum administrator for more information"; $lang['No_send_account_inactive'] = "Sorry, but your password cannot be retrieved because your account is currently inactive. Please contact the forum administrator for more information";
$lang['Always_smile'] = "Always enable Smilies"; $lang['Always_smile'] = "Always enable Smilies";
$lang['Always_html'] = "Always allow HTML"; $lang['Always_html'] = "Always allow HTML";

2
phpBB/templates/subSilver/jumpbox.tpl
View file

@ -1,5 +1,5 @@
<form method="GET" name="jumpbox" action="{S_JUMPBOX_ACTION}"> <form method="GET" name="jumpbox" action="{S_JUMPBOX_ACTION}" onSubmit="if(document.jumpbox.f.value == -1){return false;}">
<table cellspacing="0" cellpadding="0" border="0"> <table cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}:&nbsp;{S_JUMPBOX_LIST}&nbsp; <td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}:&nbsp;{S_JUMPBOX_LIST}&nbsp;