makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Languagified ... like that word? ... and updated a little

Browse source 
git-svn-id: file:///svn/phpbb/trunk@763 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-07-29 23:26:40 +00:00
parent 8356cd0d05
commit 294569795b
4 changed files with 119 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
phpBB/admin/admin_db_utilities.php
View file

@ -155,8 +155,8 @@ function get_table_def_postgres($table, $crlf)
if(!$result) if(!$result)
{ {
$error = $db->sql_error(); include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, 'Failed in get_table_def (show fields) : ' . $error['message']); message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $field_query);
} // end if.. } // end if..
if ($drop == 1) if ($drop == 1)
@ -235,6 +235,7 @@ function get_table_def_postgres($table, $crlf)
if(!$result) if(!$result)
{ {
include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $sql_pri_keys); message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $sql_pri_keys);
} }
@ -296,6 +297,7 @@ function get_table_def_postgres($table, $crlf)
if (!$result) if (!$result)
{ {
include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $sql_checks); message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $sql_checks);
} }
@ -346,6 +348,7 @@ function get_table_def_mysql($table, $crlf)
$result = $db->sql_query($field_query); $result = $db->sql_query($field_query);
if(!result) if(!result)
{ {
include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $field_query); message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $field_query);
} }
@ -381,6 +384,7 @@ function get_table_def_mysql($table, $crlf)
$result = $db->sql_query($key_query); $result = $db->sql_query($key_query);
if(!$result) if(!$result)
{ {
include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, "FAILED IN get_table_def (show keys)", "", __LINE__, __FILE__, $key_query); message_die(GENERAL_ERROR, "FAILED IN get_table_def (show keys)", "", __LINE__, __FILE__, $key_query);
} }
@ -454,6 +458,7 @@ function get_table_content_postgres($table, $handler)
if (!$result) if (!$result)
{ {
include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, "Faild in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table"); message_die(GENERAL_ERROR, "Faild in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
} }
@ -532,6 +537,7 @@ function get_table_content_mysql($table, $handler)
if (!$result) if (!$result)
{ {
include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, "Faild in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table"); message_die(GENERAL_ERROR, "Faild in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
} }
@ -685,14 +691,9 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
switch($perform) switch($perform)
{ {
case 'backup': case 'backup':
if( SQL_LAYER == 'oracle' || SQL_LAYER == 'odbc' || SQL_LAYER == 'mssql' ) if( SQL_LAYER == 'oracle' || SQL_LAYER == 'odbc' || SQL_LAYER == 'mssql' )
{ {
//
// Page header
//
$template_header = "admin/page_header.tpl";
include('page_header_admin.'.$phpEx);
switch(SQL_LAYER) switch(SQL_LAYER)
{ {
case 'oracle': case 'oracle':
@ -706,12 +707,20 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
break; break;
} }
$db_message = "<h2>Database backups are not currently supported for your Database system (" . $db_type . ")</h2>\n"; //
// Page header
//
include('page_header_admin.'.$phpEx);
$template->set_filenames(array(
"body" => "admin/admin_message_body.tpl")
);
$template->assign_vars(array( $template->assign_vars(array(
"U_DB_MESSAGE" => $db_message, "MESSAGE_TITLE" => $lang['Information'],
"U_DB_LINKS" => $db_links) "MESSAGE_TEXT" => $lang['Backups_not_supported'])
); );
$template->pparse("body"); $template->pparse("body");
break; break;
@ -745,25 +754,26 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
// //
// Page header // Page header
// //
$template_header = "admin/page_header.tpl";
include('page_header_admin.'.$phpEx); include('page_header_admin.'.$phpEx);
$db_message = "<H2>This will perform a backup of all phpBB2 related tables.</H2><BR>\n"; $template->set_filenames(array(
$db_message .= "<P>If you have any additional custom tables in the same database with phpBB that you would like to back up as well please enter their names seperated by commas in the Additional Tables textbox below.<BR>\n"; "body" => "admin/db_utils_backup_body.tpl")
$db_message .= "Otherwise just select the form of backup you want to perform and click the Start Backup button below.</P><BR>\n\n"; );
$db_links = "<FORM METHOD=\"post\" ACTION=\"". append_sid($PHP_SELF) . "\">\n";
$db_links .= "<TABLE BORDER=0>\n"; $s_hidden_fields = "<input type=\"hidden\" name=\"perform\" value=\"backup\"><input type=\"hidden\" name=\"drop\" value=\"1\"><input type=\"hidden\" name=\"perform\" value=\"$perform\">";
$db_links .= "<TR><TD>Additional Tables:</TD><TD><INPUT TYPE=\"text\" NAME=\"additional_tables\"></TD></TR>\n";
$db_links .= "<TR><TD>Full Backup:</TD><TD><INPUT TYPE=\"radio\" NAME=\"backup_type\" VALUE=\"full\" checked></TD></TR>\n";
$db_links .= "<TR><TD>Table Structure Only:</TD><TD><INPUT TYPE=\"radio\" NAME=\"backup_type\" VALUE=\"structure\"></TD></TR>\n";
$db_links .= "<TR><TD>Table Data Only:</TD><TD><INPUT TYPE=\"radio\" NAME=\"backup_type\" VALUE=\"data\"></TD></TR>\n";
$db_links .= "</TABLE><INPUT TYPE=\"hidden\" NAME=\"perform\" VALUE=\"backup\">\n";
$db_links .= "<INPUT TYPE=\"hidden\" NAME=\"drop\" VALUE=\"1\">";
$db_links .= "<INPUT TYPE=\"submit\" NAME=\"backupstart\" VALUE=\"Start Backup\"></FORM></P>\n";
$template->assign_vars(array( $template->assign_vars(array(
"U_DB_MESSAGE" => $db_message, "L_DATABASE_BACKUP" => $lang['Database_Utilities'] . " : " . $lang['Backup'],
"U_DB_LINKS" => $db_links) "L_BACKUP_EXPLAIN" => $lang['Backup_explain'],
"L_FULL_BACKUP" => $lang['Full_backup'],
"L_STRUCTURE_BACKUP" => $lang['Structure_backup'],
"L_DATA_BACKUP" => $lang['Data_backup'],
"L_ADDITIONAL_TABLES" => $lang['Additional_tables'],
"L_START_BACKUP" => $lang['Start_backup'],
"L_BACKUP_OPTIONS" => $lang['Backup_options'],
"S_HIDDEN_FIELDS" => $s_hidden_fields,
"S_DBUTILS_ACTION" => append_sid("admin_db_utilities.$phpEx"))
); );
$template->pparse("body"); $template->pparse("body");
@ -772,23 +782,23 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
} }
else if( !isset($HTTP_POST_VARS['startdownload']) && !isset($HTTP_GET_VARS['startdownload']) ) else if( !isset($HTTP_POST_VARS['startdownload']) && !isset($HTTP_GET_VARS['startdownload']) )
{ {
$template->set_filenames(array(
"body" => "admin/admin_message_body.tpl")
);
$template->assign_vars(array(
"META" => "<meta http-equiv=\"refresh\" content=\"0;url=admin_db_utilities.$phpEx?perform=backup&additional_tables=".quotemeta($additional_tables)."&backup_type=$backup_type&drop=1&backupstart=1&startdownload=1\">",
"MESSAGE_TITLE" => $lang['Database_Utilities'] . " : " . $lang['Backup'],
"MESSAGE_TEXT" => $lang['Backup_download'])
);
// //
// Page header // Page header
// //
$template->assign_vars(array(
"META" => "<meta http-equiv=\"refresh\" content=\"0;url=admin_db_utilities.$phpEx?perform=backup&additional_tables=".quotemeta($additional_tables)."&backup_type=$backup_type&drop=1&backupstart=1&startdownload=1\">")
);
$template_header = "admin/page_header.tpl";
include('page_header_admin.'.$phpEx); include('page_header_admin.'.$phpEx);
$db_message = "<H2>Your backup file will start downloading soon</H2><br>\n";
$template->assign_vars(array(
"U_DB_MESSAGE" => $db_message,
"U_DB_LINKS" => $db_links)
);
$template->pparse("body"); $template->pparse("body");
include('page_footer_admin.'.$phpEx); include('page_footer_admin.'.$phpEx);
@ -853,13 +863,17 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
// //
// Page header // Page header
// //
$template_header = "admin/page_header.tpl";
include('page_header_admin.'.$phpEx); include('page_header_admin.'.$phpEx);
$s_hidden_fields = "<input type=\"hidden\" name=\"perform\" value=\"restore\">"; $s_hidden_fields = "<input type=\"hidden\" name=\"perform\" value=\"restore\"><input type=\"hidden\" name=\"perform\" value=\"$perform\">";
$template->assign_vars(array( $template->assign_vars(array(
"S_DBRESTORE_ACTION" => append_sid("admin_db_utilities.$phpEx"), "L_DATABASE_RESTORE" => $lang['Database_Utilities'] . " : " . $lang['Restore'],
"L_RESTORE_EXPLAIN" => $lang['Restore_explain'],
"L_SELECT_FILE" => $lang['Select_file'],
"L_START_RESTORE" => $lang['Start_Restore'],
"S_DBUTILS_ACTION" => append_sid("admin_db_utilities.$phpEx"),
"S_HIDDEN_FIELDS" => $s_hidden_fields) "S_HIDDEN_FIELDS" => $s_hidden_fields)
); );
$template->pparse("body"); $template->pparse("body");
@ -872,6 +886,7 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
// Handle the file upload .... // Handle the file upload ....
if($backup_file == "none") if($backup_file == "none")
{ {
include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, "Backup file upload failed"); message_die(GENERAL_ERROR, "Backup file upload failed");
} }
@ -882,6 +897,7 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
} }
else else
{ {
include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, "Trouble Accessing uploaded file"); message_die(GENERAL_ERROR, "Trouble Accessing uploaded file");
} }
@ -908,6 +924,7 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
if(!$result && ( !(SQL_LAYER == 'postgres' && eregi("drop table", $sql) ) ) ) if(!$result && ( !(SQL_LAYER == 'postgres' && eregi("drop table", $sql) ) ) )
{ {
include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, "Error importing backup file", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Error importing backup file", "", __LINE__, __FILE__, $sql);
} }
} }
@ -917,15 +934,17 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
// //
// Page header // Page header
// //
$template_header = "admin/page_header.tpl";
include('page_header_admin.'.$phpEx); include('page_header_admin.'.$phpEx);
$db_message = "<CENTER><H2>The Database has been successfully restored..</H2>\n"; $template->set_filenames(array(
$db_message .= "<P><BR>Your board should be back to the state it was when the backup was made.<BR></P>\n"; "body" => "admin/admin_message_body.tpl")
);
$message = $lang['Restore_success'];
$template->assign_vars(array( $template->assign_vars(array(
"U_DB_MESSAGE" => $db_message, "MESSAGE_TITLE" => $lang['Database_Utilities'] . " : " . $lang['Restore'],
"U_DB_LINKS" => $db_links) "MESSAGE_TEXT" => $message)
); );
$template->pparse("body"); $template->pparse("body");
@ -934,23 +953,6 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
break; break;
} }
} }
else
{
//
// Page header
//
$template_header = "admin/page_header.tpl";
include('page_header_admin.'.$phpEx);
$db_message = "<h2>These Utilties will help you to backup or restore your phpBB database</h2><br>\n";
$template->assign_vars(array(
"U_DB_MESSAGE" => $db_message,
"U_DB_LINKS" => $db_links)
);
$template->pparse("body");
}
include('page_footer_admin.'.$phpEx); include('page_footer_admin.'.$phpEx);

18
phpBB/language/lang_english.php
View file

@ -656,6 +656,24 @@ $lang['Avatar_dir_size'] = "Avatar directory size";
$lang['Database_size'] = "Database size"; $lang['Database_size'] = "Database size";
$lang['Not_available'] = "Not available"; $lang['Not_available'] = "Not available";
// DB Utils
$lang['Database_Utilities'] = "Database Utilities";
$lang['Restore'] = "Restore";
$lang['Backup'] = "Backup";
$lang['Restore_explain'] = "This will perform a full restore of all phpBB tables from a saved file. <b>WARNING</b> This will overwrite any existing data.";
$lang['Backup_explain'] = "Here you can backup all your phpBB related data. If you have any additional custom tables in the same database with phpBB that you would like to back up as well please enter their names seperated by commas in the Additional Tables textbox below.";
$lang['Backup_options'] = "Backup options";
$lang['Start_backup'] = "Start Backup";
$lang['Full_backup'] = "Full backup";
$lang['Structure_backup'] = "Structure Only backup";
$lang['Data_backup'] = "Data only backup";
$lang['Additional_tables'] = "Additional tables";
$lang['Select_file'] = "Select a file";
$lang['Start_Restore'] = "Start Restore";
$lang['Restore_success'] = "The Database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made.";
$lang['Backup_download'] = "Your download will start shortly please wait till it begins";
$lang['Backups_not_supported'] = "Sorry but database backups are not currently supported for your database system";
// Auth pages // Auth pages
$lang['Administrator'] = "Administrator"; $lang['Administrator'] = "Administrator";
$lang['User'] = "User"; $lang['User'] = "User";

38
phpBB/templates/PSO/admin/db_utils_backup_body.tpl
View file

@ -1,9 +1,33 @@
<br clear="all" />
<br clear="all" />
<h1>Database Utilities : Backup</h1>
<h1>{L_DATABASE_BACKUP}</h1>
<div align="center">{U_DB_MESSAGE}
<P>{L_BACKUP_EXPLAIN}</p>
{U_DB_LINKS}</div>
<table cellspacing="1" cellpadding="4" border="0" align="center">
<tr><form enctype="multipart/form-data" method="post" action="{S_DBUTILS_ACTION}">
<th colspan="2">{L_BACKUP_OPTIONS}</th>
</tr>
<tr>
<td class="row2">{L_FULL_BACKUP}</td>
<td class="row2"><input type="radio" name="backup_type" value="full"></td>
</tr>
<tr>
<td class="row1">{L_STRUCTURE_BACKUP}</td>
<td class="row1"><input type="radio" name="backup_type" value="structure"></td>
</tr>
<tr>
<td class="row2">{L_DATA_BACKUP}</td>
<td class="row2"><input type="radio" name="backup_type" value="data"></td>
</tr>
<tr>
<td class="row1">{L_ADDITIONAL_TABLES}</td>
<td class="row1"><input type="text" name="additional_tables"></td>
</tr>
<tr>
<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="backupstart" value="{L_START_BACKUP}"></td>
</form></tr>
</table></div>
<br clear="all" /> <br clear="all" />

9
phpBB/templates/PSO/admin/db_utils_restore_body.tpl
View file

@ -1,15 +1,16 @@
<br clear="all" /> <br clear="all" />
<h1>Database Utilities : Restore</h1> <h1>{L_DATABASE_RESTORE}</h1>
<P>This will perform a full restore of all phpBB tables from a saved file. <b>WARNING</b> This will overwrite any existing data</p> <P>{L_RESTORE_EXPLAIN}</p>
<table cellspacing="1" cellpadding="4" border="0" align="center"> <table cellspacing="1" cellpadding="4" border="0" align="center">
<tr> <tr>
<th>Select a File</th> <th>{L_SELECT_FILE}</th>
</tr> </tr>
<tr><form enctype="multipart/form-data" method="post" action="{S_DBUTILS_ACTION}"> <tr><form enctype="multipart/form-data" method="post" action="{S_DBUTILS_ACTION}">
<td class="row1" align="center">&nbsp;<input type="file" name="backup_file">&nbsp;&nbsp;<input type="submit" name="restore_start" value="Start Restore">&nbsp;</td> <td class="row1" align="center">&nbsp;<input type="file" name="backup_file">&nbsp;&nbsp;{S_HIDDEN_FIELDS}<input type="submit" name="restore_start" value="{L_START_RESTORE}">&nbsp;</td>
</form></tr> </form></tr>
</table></div> </table></div>