[Easymod-cvs] easymod2/mods/easymod easymod_display_functions.php,1.10,1.11 easymod_install.php,1.13
Status: Beta
Brought to you by:
wgeric
From: Eric F. <wg...@us...> - 2005-06-11 23:06:10
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5948/mods/easymod Modified Files: easymod_display_functions.php easymod_install.php lang_easymod.php Log Message: - Changed copyright - Change <br> to <br /> - Removed some more hardcoded text - Removed the password and version change files - Other minor changes Index: easymod_display_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_display_functions.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** easymod_display_functions.php 8 Jun 2005 03:12:20 -0000 1.10 --- easymod_display_functions.php 11 Jun 2005 23:05:53 -0000 1.11 *************** *** 4,9 **** * ------------------------------- * begin : Wednesday, November 26, 2003 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall ! * email : nu...@bl... * * $Id$ --- 4,9 ---- * ------------------------------- * begin : Wednesday, November 26, 2003 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall, 2005 The phpBB Group ! * email : su...@ph... * * $Id$ *************** *** 112,117 **** $variables = array() ; ! $variables['TITLE'] = "Installing EasyMOD beta 1 ($easymod_install_version)" ; // hard coded ! $variables['BY'] = 'by Nuttzy' ; // hard coded $variables['TEXT'] = $text ; --- 112,116 ---- $variables = array() ; ! $variables['TITLE'] = sprintf($lang['EM_installing_beta1'], $easymod_install_version); $variables['TEXT'] = $text ; *************** *** 241,250 **** if (test_ftp( $ftp_user, $ftp_pass, $ftp_dir, $ftp_host, true, $ftp_type, $ftp_cache)) { ! echo '<br>[b]<b>' . $lang['EM_debug_ftp_test'] . '</b>[/b] :: [b][color=green]<b class="ok">' . $lang['EM_debug_success']. "</b>[/color][/b]<br />\n" ; } } else { ! echo '<br><br>[b]<b>' . $lang['EM_debug_ftp_notest'] . "</b>[/b]<br>\n" ; } --- 240,249 ---- if (test_ftp( $ftp_user, $ftp_pass, $ftp_dir, $ftp_host, true, $ftp_type, $ftp_cache)) { ! echo '<br />[b]<b>' . $lang['EM_debug_ftp_test'] . '</b>[/b] :: [b][color=green]<b class="ok">' . $lang['EM_debug_success']. "</b>[/color][/b]<br />\n" ; } } else { ! echo '<br /><br />[b]<b>' . $lang['EM_debug_ftp_notest'] . "</b>[/b]<br />\n" ; } *************** *** 293,297 **** while (($file = readdir($dh)) !== false) { ! $values['file_listing'] .= mfunGetPerms(fileperms( $file)) . " $file <br>\n"; } closedir($dh); --- 292,296 ---- while (($file = readdir($dh)) !== false) { ! $values['file_listing'] .= mfunGetPerms(fileperms( $file)) . " $file <br />\n"; } closedir($dh); *************** *** 350,354 **** { display_debug_info( $error) ; ! echo "<br>\n" ; } // no printing debug do print the footer --- 349,353 ---- { display_debug_info( $error) ; ! echo "<br />\n" ; } // no printing debug do print the footer *************** *** 376,380 **** $variables['LANG_OPTIONS'] = '<option value="english" selected="selected">English</option>' ; // HARD CODED ! $variables['GO'] = 'Go' ; // HARD CODED $variables['SQL_LAYER'] = SQL_LAYER ; $variables['PHPBB_VERSION'] = $phpBB_version ; --- 375,379 ---- $variables['LANG_OPTIONS'] = '<option value="english" selected="selected">English</option>' ; // HARD CODED ! $variables['GO'] = $lang['Go'] ; $variables['SQL_LAYER'] = SQL_LAYER ; $variables['PHPBB_VERSION'] = $phpBB_version ; *************** *** 406,410 **** $variables['EM_File_Access'] = ($bbcode) ? '' : $lang['EM_File_Access'] ; ! $variables['EM_no_problem'] = ($bbcode) ? '' : "Let's see what you have for file access. You do not need everything to read 'ok'.<br><br>" ; $variables['EM_read_access'] = $lang['EM_read_access'] ; $variables['EM_write_access'] = $lang['EM_write_access'] ; --- 405,409 ---- $variables['EM_File_Access'] = ($bbcode) ? '' : $lang['EM_File_Access'] ; ! $variables['EM_no_problem'] = ($bbcode) ? '' : $lang['EM_see_file_access'] . '<br /><br />' ; $variables['EM_read_access'] = $lang['EM_read_access'] ; $variables['EM_write_access'] = $lang['EM_write_access'] ; *************** *** 415,419 **** $variables['EM_tmp_write'] = $lang['EM_tmp_write'] ; $variables['EM_ftp_ext'] = $lang['EM_ftp_ext'] ; ! $variables['EM_safe_mode'] = 'Safe Mode' ; $variables['EM_copy_access'] = $lang['EM_copy_access'] ; --- 414,418 ---- $variables['EM_tmp_write'] = $lang['EM_tmp_write'] ; $variables['EM_ftp_ext'] = $lang['EM_ftp_ext'] ; ! $variables['EM_safe_mode'] = $lang['Safe_mode']; $variables['EM_copy_access'] = $lang['EM_copy_access'] ; *************** *** 662,667 **** if ( $row['config_value'] == $easymod_install_version) { ! $error_msg = '<b>' . $lang['EM_err_critical_error'] . ':</b> ' . $lang['EM_err_dupe_install'] ; ! $error_msg .= '<br><br>If you are trying to reinstall this version, change the EM version number from the Admin Control Panel under EasyMOD Settings. Or you could also use the EM Version Changer (by GPHemsley) found in the admin/mods/easymod/includes directory.' ; handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $error_msg) ; } --- 661,666 ---- if ( $row['config_value'] == $easymod_install_version) { ! $error_msg = '<strong>' . $lang['EM_err_critical_error'] . ':</strong> ' . $lang['EM_err_dupe_install'] ; ! $error_msg .= '<br /><br />' . $lang['EN_reinstall_version'] ; handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $error_msg) ; } *************** *** 788,792 **** // display header info, like the welcome message and pic ! page_header( '<b>Step 1 (gathering settings):</b> Welcome to the EasyMOD installer. EasyMOD will try to guide you every step of the way. First, we need to know a little about your server.') ; // do the checks to make sure things are where we are expecting them --- 787,791 ---- // display header info, like the welcome message and pic ! page_header($lang['EM_step1_simple_header']) ; // do the checks to make sure things are where we are expecting them *************** *** 902,906 **** // display header info, like the welcome message and pic ! page_header( '<b>Step 1 (gathering settings):</b> You have specified that you have FTP access. Enter your FTP information below.') ; // display the file access info get_file_access_info( $variables, $access) ; --- 901,905 ---- // display header info, like the welcome message and pic ! page_header($lang['EM_step1_ftp_header']) ; // display the file access info get_file_access_info( $variables, $access) ; *************** *** 920,924 **** get_ftp_settings( $variables, $access) ; ! $variables['EM_ftp_desc'] = 'Enter the information you would normally need to access your phpBB files via FTP.' ; --- 919,923 ---- get_ftp_settings( $variables, $access) ; ! $variables['EM_ftp_desc'] = $lang['EM_ftp_desc'] ; *************** *** 940,944 **** // display header info, like the welcome message and pic ! page_header( '<b>Step 1 (gathering settings):</b> EasyMOD takes security very seriously. A password will further restict who has access. If you are using FTP, then a password is required so that your FTP information can safely be crypted into the database.') ; --- 939,943 ---- // display header info, like the welcome message and pic ! page_header($lang['EM_step1_password_header']) ; Index: lang_easymod.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/lang_easymod.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** lang_easymod.php 8 Jun 2005 03:12:20 -0000 1.9 --- lang_easymod.php 11 Jun 2005 23:05:53 -0000 1.10 *************** *** 4,9 **** * ------------------- * begin : Saturday, Mar 22 2003 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall ! * email : nu...@bl... * * $Id$ --- 4,9 ---- * ------------------- * begin : Saturday, Mar 22 2003 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall, 2005 The phpBB Group ! * email : su...@ph... * * $Id$ *************** *** 120,124 **** $lang['EM_complete_install'] = 'Complete Installation' ; $lang['EM_proposed_alterations'] = 'Proposed Database Alterations for your %s Database'; ! $lang['EM_sql_intro_explain'] = 'EasyMOD will now make changes to your database if you command it to. Any SQL with a check next to it will be performed by EM. If you are reinstalling a MOD, you probably <b>do not</b> want to run the SQL a second time, <b>so be careful!</b><br><br><b>Official Warning:</b> This is a DUMB process. Commands you check off will be executed but EM does NOT check to seeif these changes will negatively impact your database. You are STRONGLY advised to <b>backup your database</b> before makingany changes. Prior to executing, you are advised to examine each command thoroughly or ask for feedback from experienced MOD installers. Again, if you are reinstalling a MOD, multiple executions of the same SQL lines could adversely effect your database.'; $lang['EM_sql_error'] = 'SQL ERROR'; $lang['EM_not_attempted'] = 'Not Attempted'; --- 120,124 ---- $lang['EM_complete_install'] = 'Complete Installation' ; $lang['EM_proposed_alterations'] = 'Proposed Database Alterations for your %s Database'; ! $lang['EM_sql_intro_explain'] = 'EasyMOD will now make changes to your database if you command it to. Any SQL with a check next to it will be performed by EM. If you are reinstalling a MOD, you probably <b>do not</b> want to run the SQL a second time, <b>so be careful!</b><br /><br /><b>Official Warning:</b> This is a DUMB process. Commands you check off will be executed but EM does NOT check to seeif these changes will negatively impact your database. You are STRONGLY advised to <b>backup your database</b> before makingany changes. Prior to executing, you are advised to examine each command thoroughly or ask for feedback from experienced MOD installers. Again, if you are reinstalling a MOD, multiple executions of the same SQL lines could adversely effect your database.'; $lang['EM_sql_error'] = 'SQL ERROR'; $lang['EM_not_attempted'] = 'Not Attempted'; *************** *** 176,180 **** --- 176,185 ---- // installer // + $lang['Safe_mode'] = 'Safe Mode'; + $lang['Go'] = 'Go'; + $lang['EM_installing_beta1'] = 'Installing EasyMOD beta 1 (%s)'; $lang['EM_more_info'] = 'More information'; + $lang['EM_see_file_access'] = 'Let\'s see what you have for file access. You do not need everything to read \'ok\'.'; + $lang['EN_reinstall_version'] = 'If you are trying to reinstall this version, change the EM version number from the Admin Control Panel under EasyMOD Settings. Or you could also use the EM Version Changer (by GPHemsley) <a href="http://gphemsley.music-hq.net/phpBB/EasyMOD/">here</a>.'; // translate this and I'll hardcode the message into easymod_install.php *************** *** 245,248 **** --- 250,256 ---- // simple step 1 + $lang['EM_step1_simple_header'] = '<strong>Step 1 (gathering settings):</strong> Welcome to the EasyMOD installer. EasyMOD will try to guide you every step of the way. First, we need to know a little about your server.'; + $lang['EM_step1_ftp_header'] = '<strong>Step 1 (gathering settings):</strong> You have specified that you have FTP access. Enter your FTP information below.'; + $lang['EM_step1_password_header'] = '<strong>Step 1 (gathering settings):</strong> EasyMOD takes security very seriously. A password will further restict who has access. If you are using FTP, then a password is required so that your FTP information can safely be crypted into the database.' $lang['EM_server_style'] = 'Server Style'; $lang['EM_about_server'] = 'About your server'; *************** *** 254,261 **** $lang['EM_diagnosis'] = 'Diagnosis'; $lang['EM_auto_tech_detected'] = 'Automation Technique detected!'; // no write no copy $lang['Select_one'] = 'Select One:'; ! $lang['EM_nowrite_nocopy__desc'] = 'This is the worst case scenario. EasyMOD does not have permission to either create new files or to replace the old files with the new ones. There are several things you can do:<br> <ol> <li>If you have FTP access, then use the FTP option.</li> --- 262,270 ---- $lang['EM_diagnosis'] = 'Diagnosis'; $lang['EM_auto_tech_detected'] = 'Automation Technique detected!'; + $lang['EM_ftp_desc'] = 'Enter the information you would normally need to access your phpBB files via FTP.'; // no write no copy $lang['Select_one'] = 'Select One:'; ! $lang['EM_nowrite_nocopy__desc'] = 'This is the worst case scenario. EasyMOD does not have permission to either create new files or to replace the old files with the new ones. There are several things you can do:<br /> <ol> <li>If you have FTP access, then use the FTP option.</li> *************** *** 270,274 **** // write no copy ! $lang['EM_write_nocopy_desc'] = 'Problem. EasyMOD has permission to create new files, but does not have permission to replace the old files with the new ones. There are several things you can do:<br> <ol> <li>If you have FTP access, then use the FTP option.</li> --- 279,283 ---- // write no copy ! $lang['EM_write_nocopy_desc'] = 'Problem. EasyMOD has permission to create new files, but does not have permission to replace the old files with the new ones. There are several things you can do:<br /> <ol> <li>If you have FTP access, then use the FTP option.</li> *************** *** 432,436 **** $lang['EM_err_secondary'] = 'Secondary Error - Critical' ; $lang['EM_err_cwd'] = 'Current working directory' ; ! $lang['EM_err_install_dir'] = '<b>Critical Error:</b> EasyMOD is not in the correct directory to be installed. It must be placed in a admin/mods/easymod off the phpBB root prior to installation.<br>' ; $lang['EM_err_no_subsilver'] = '<b>Critical Error:</b> EasyMOD cannot be installed. The subSilver template is not present in the templates directory. This template is required as the baseline template for MOD installations. The subSilver template is provided in the standard phpBB download at <a href="http://www.phpbb.com">www.phpbb.com</a>.' ; $lang['EM_err_no_english'] = '<b>Critical Error:</b> EasyMOD cannot be installed. The English language package is not present in the language directory. This language is required as the baseline language package for MOD installations. The English language package is provided in the standard phpBB download at <a href="http://www.phpbb.com">www.phpbb.com</a>.' ; --- 441,445 ---- $lang['EM_err_secondary'] = 'Secondary Error - Critical' ; $lang['EM_err_cwd'] = 'Current working directory' ; ! $lang['EM_err_install_dir'] = '<b>Critical Error:</b> EasyMOD is not in the correct directory to be installed. It must be placed in a admin/mods/easymod off the phpBB root prior to installation.<br />' ; $lang['EM_err_no_subsilver'] = '<b>Critical Error:</b> EasyMOD cannot be installed. The subSilver template is not present in the templates directory. This template is required as the baseline template for MOD installations. The subSilver template is provided in the standard phpBB download at <a href="http://www.phpbb.com">www.phpbb.com</a>.' ; $lang['EM_err_no_english'] = '<b>Critical Error:</b> EasyMOD cannot be installed. The English language package is not present in the language directory. This language is required as the baseline language package for MOD installations. The English language package is provided in the standard phpBB download at <a href="http://www.phpbb.com">www.phpbb.com</a>.' ; *************** *** 477,482 **** // mod_io errors ! $lang['EM_modio_mkdir_chdir'] = 'FTP ERROR: could not change directory to [%s]<br>Current dir: [%s]' ; ! $lang['EM_modio_mkdir_mkdir'] = 'FTP ERROR: could not make directory [%s]<br>Current dir: [%s]' ; $lang['EM_modio_open_read'] = 'Could not open [%s] for reading.' ; $lang['EM_modio_open_write'] = 'Could not open [%s] for writing.' ; --- 486,491 ---- // mod_io errors ! $lang['EM_modio_mkdir_chdir'] = 'FTP ERROR: could not change directory to [%s]<br />Current dir: [%s]' ; ! $lang['EM_modio_mkdir_mkdir'] = 'FTP ERROR: could not make directory [%s]<br />Current dir: [%s]' ; $lang['EM_modio_open_read'] = 'Could not open [%s] for reading.' ; $lang['EM_modio_open_write'] = 'Could not open [%s] for writing.' ; Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** easymod_install.php 5 Jun 2005 23:37:05 -0000 1.13 --- easymod_install.php 11 Jun 2005 23:05:53 -0000 1.14 *************** *** 4,9 **** * ------------------- * begin : Wednesday, March 15, 2002 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall ! * email : nu...@bl... * * $Id$ --- 4,9 ---- * ------------------- * begin : Wednesday, March 15, 2002 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall, 2005 The phpBB Group ! * email : su...@ph... * * $Id$ *************** *** 120,124 **** for ( $i=0; $i<count($search_array); $i++) { ! echo htmlspecialchars($search_array[$i]) . "<br>" ; } --- 120,124 ---- for ( $i=0; $i<count($search_array); $i++) { ! echo htmlspecialchars($search_array[$i]) . "<br />" ; } *************** *** 137,141 **** for ($i=0; $i<count($insert); $i++) { ! echo htmlspecialchars($insert[$i]) . "<br>\n" ; $insert_string .= $insert[$i] . "\r\n" ; } --- 137,141 ---- for ($i=0; $i<count($insert); $i++) { ! echo htmlspecialchars($insert[$i]) . "<br />\n" ; $insert_string .= $insert[$i] . "\r\n" ; } *************** *** 348,352 **** page_header( $lang['EM_debug_header']) ; display_debug_info() ; ! echo "<br>\n" ; page_footer() ; exit ; --- 348,352 ---- page_header( $lang['EM_debug_header']) ; display_debug_info() ; ! echo "<br />\n" ; page_footer() ; exit ; *************** *** 498,502 **** if ( $em_pass != $em_pass_confirm) { ! echo $lang['EM_err_pw_match'] . "<br>\n" ; form_settings( $hidden, 3, '', true) ; exit ; --- 498,502 ---- if ( $em_pass != $em_pass_confirm) { ! echo $lang['EM_err_pw_match'] . "<br />\n" ; form_settings( $hidden, 3, '', true) ; exit ; *************** *** 558,562 **** { // this will create a download button ! echo $lang['EM_confirm_download'] . "<br>\n" ; echo '<form action="easymod_install.' . $phpEx . '" name="install" method="post">' . "\n" ; $button = '<input type="hidden" name="install_step" value="5">' . "\n" ; --- 558,562 ---- { // this will create a download button ! echo $lang['EM_confirm_download'] . "<br />\n" ; echo '<form action="easymod_install.' . $phpEx . '" name="install" method="post">' . "\n" ; $button = '<input type="hidden" name="install_step" value="5">' . "\n" ; *************** *** 575,579 **** ! echo '<b class="ok">' . $lang['EM_confirm_write'] . "</b><br>\n" ; if ($write == 'server') { --- 575,579 ---- ! echo '<b class="ok">' . $lang['EM_confirm_write'] . "</b><br />\n" ; if ($write == 'server') { *************** *** 640,644 **** else if (( $move == 'copy') && ((!$copy_access) || (!$root_write))) { ! echo $lang['EM_err_copy'] . "<br>\n" ; //////////// //////////// --- 640,644 ---- else if (( $move == 'copy') && ((!$copy_access) || (!$root_write))) { ! echo $lang['EM_err_copy'] . "<br />\n" ; //////////// //////////// *************** *** 659,663 **** ! echo '<b class="ok">' . $lang['EM_confirm_move'] . "</b><br>\n" ; if ($move == 'ftpa') { --- 659,663 ---- ! echo '<b class="ok">' . $lang['EM_confirm_move'] . "</b><br />\n" ; if ($move == 'ftpa') { *************** *** 740,744 **** { $command_file->err_msg = $lang['EM_trace'] . ': main[1]->' . $command_file->err_msg ; ! $error = '<b>' . $lang['EM_err_critical_error'] . ':</b><br> ' . $command_file->err_msg . "<br>\n" ; handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $error) ; } --- 740,744 ---- { $command_file->err_msg = $lang['EM_trace'] . ': main[1]->' . $command_file->err_msg ; ! $error = '<b>' . $lang['EM_err_critical_error'] . ':</b><br /> ' . $command_file->err_msg . "<br />\n" ; handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $error) ; } *************** *** 850,854 **** wrapper_insert( $file_list, $find_array, $insert['module'], false) ; } ! echo "<br>\n" ; // insert the entries or atleast update the control tag --- 850,854 ---- wrapper_insert( $file_list, $find_array, $insert['module'], false) ; } ! echo "<br />\n" ; // insert the entries or atleast update the control tag *************** *** 865,870 **** else { ! echo '<b>' . $lang['EM_ifinding'] . ":</b> $inline_find<br>\n" ; ! echo '<b>' . $lang['EM_iafter'] . ":</b> $inline_after<br>\n" ; $result = perform_inline_add( $find_array, $file_list, $inline_find, $inline_after, 'after'); handle_error($result, $file_list, true) ; --- 865,870 ---- else { ! echo '<b>' . $lang['EM_ifinding'] . ":</b> $inline_find<br />\n" ; ! echo '<b>' . $lang['EM_iafter'] . ":</b> $inline_after<br />\n" ; $result = perform_inline_add( $find_array, $file_list, $inline_find, $inline_after, 'after'); handle_error($result, $file_list, true) ; *************** *** 959,963 **** for ($i=0; $i<count( $command_file->afile); $i++) { ! echo $command_file->afile[$i] . "<br>\n" ; $hidden .= "<input type=\"hidden\" name=\"command_step$i\" value=\"" . $command_file->afile[$i] . "\">\n" ; } --- 959,963 ---- for ($i=0; $i<count( $command_file->afile); $i++) { ! echo $command_file->afile[$i] . "<br />\n" ; $hidden .= "<input type=\"hidden\" name=\"command_step$i\" value=\"" . $command_file->afile[$i] . "\">\n" ; } *************** *** 1144,1148 **** if ( $result = $db->sql_query($test_sql)) { ! echo '<p>' . $lang['EM_progress'] . ' :: <b class="ok">' . $lang['EM_done'] . '</b> - ' . $lang['EM_already_exist'] . "<br>\n" ; } --- 1144,1148 ---- if ( $result = $db->sql_query($test_sql)) { ! echo '<p>' . $lang['EM_progress'] . ' :: <b class="ok">' . $lang['EM_done'] . '</b> - ' . $lang['EM_already_exist'] . "<br />\n" ; } *************** *** 1153,1157 **** for($i = 0; $i < count($sql); $i++) { ! echo "$sql[$i]<br>\n" ; } --- 1153,1157 ---- for($i = 0; $i < count($sql); $i++) { ! echo "$sql[$i]<br />\n" ; } *************** *** 1203,1208 **** { $command_file->err_msg = $lang['EM_trace'] . ': main[1b]->' . $command_file->err_msg ; ! $error = '<br>' . $lang['EM_err_open_pp'] . '<br> ' . $command_file->err_msg . "<br>\n" ; ! // handle_error( OPEN_FAIL_CRITICAL, $file_list, false, '<br>' . $lang['EM_err_open_pp'] . "<br>\n") ; handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $error) ; } --- 1203,1208 ---- { $command_file->err_msg = $lang['EM_trace'] . ': main[1b]->' . $command_file->err_msg ; ! $error = '<br />' . $lang['EM_err_open_pp'] . '<br /> ' . $command_file->err_msg . "<br />\n" ; ! // handle_error( OPEN_FAIL_CRITICAL, $file_list, false, '<br />' . $lang['EM_err_open_pp'] . "<br />\n") ; handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $error) ; } *************** *** 1213,1217 **** { $command_file->err_msg = $lang['EM_trace'] . ': main[2]->' . $command_file->err_msg ; ! handle_error( OPEN_FAIL_CRITICAL, $file_list, false, '<b>' . $lang['EM_err_critical_error'] . ':</b><br> ' . $command_file->err_msg . "<br>\n") ; } --- 1213,1217 ---- { $command_file->err_msg = $lang['EM_trace'] . ': main[2]->' . $command_file->err_msg ; ! handle_error( OPEN_FAIL_CRITICAL, $file_list, false, '<b>' . $lang['EM_err_critical_error'] . ':</b><br /> ' . $command_file->err_msg . "<br />\n") ; } *************** *** 1269,1273 **** if ($i == 1) { ! handle_error( OPEN_FAIL_CRITICAL, $file_list, false, '<b>' . $lang['EM_err_critical_error'] . ':</b><br> ' . $command_file->err_msg ) ; } --- 1269,1273 ---- if ($i == 1) { ! handle_error( OPEN_FAIL_CRITICAL, $file_list, false, '<b>' . $lang['EM_err_critical_error'] . ':</b><br /> ' . $command_file->err_msg ) ; } *************** *** 1275,1279 **** else { ! echo '<b>' . $lang['EM_err_critical_error'] . ':</b><br> ' . $command_file->err_msg . '<br>' . $lang['EM_err_attempt_remainder'] . "<br><br><br>\n" ; } } --- 1275,1279 ---- else { ! echo '<b>' . $lang['EM_err_critical_error'] . ':</b><br /> ' . $command_file->err_msg . '<br />' . $lang['EM_err_attempt_remainder'] . "<br /><br /><br />\n" ; } } *************** *** 1320,1324 **** echo $bu_list[$i] ; } ! echo "</table><br>\n" ; // print the move list --- 1320,1324 ---- echo $bu_list[$i] ; } ! echo "</table><br />\n" ; // print the move list *************** *** 1341,1345 **** { $command_file->err_msg = $lang['EM_trace'] . ': main[4]->' . $command_file->err_msg ; ! $error = '<br>' . $lang['EM_err_write_pp'] . '<br> ' . $command_file->err_msg . "<br>\n" ; // handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $lang['EM_err_write_pp'] ) ; handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $error ) ; --- 1341,1345 ---- { $command_file->err_msg = $lang['EM_trace'] . ': main[4]->' . $command_file->err_msg ; ! $error = '<br />' . $lang['EM_err_write_pp'] . '<br /> ' . $command_file->err_msg . "<br />\n" ; // handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $lang['EM_err_write_pp'] ) ; handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $error ) ; *************** *** 1375,1383 **** $hidden .= "<input type=\"hidden\" name=\"language\" value=\"$language\">\n" ; ! echo "<br>\n" ; // print a warning if they aren't using an automated move method if (($move != 'copy') && ($move != 'ftpa')) { ! echo $lang['EM_move_files'] . "<br>\n" ; } form_settings( $hidden, 7, $lang['EM_confirm'], false) ; --- 1375,1383 ---- $hidden .= "<input type=\"hidden\" name=\"language\" value=\"$language\">\n" ; ! echo "<br />\n" ; // print a warning if they aren't using an automated move method if (($move != 'copy') && ($move != 'ftpa')) { ! echo $lang['EM_move_files'] . "<br />\n" ; } form_settings( $hidden, 7, $lang['EM_confirm'], false) ; *************** *** 1630,1634 **** // let 'em know what we are doing ! echo '<b>' . $lang['EM_confirm_lang'] . ':</b> $lang[\'MOD_control_tag\'] = \'' . $easymod_install_version . "<br>\n" ; // open lang_admin.php for reading --- 1630,1634 ---- // let 'em know what we are doing ! echo '<b>' . $lang['EM_confirm_lang'] . ':</b> $lang[\'MOD_control_tag\'] = \'' . $easymod_install_version . "<br />\n" ; // open lang_admin.php for reading *************** *** 1645,1649 **** // print success and break out $found = true ; ! echo '<span class="ok"><b>' . $lang['EM_confirmed'] . "</b></span><br>\n" ; break ; } --- 1645,1649 ---- // print success and break out $found = true ; ! echo '<span class="ok"><b>' . $lang['EM_confirmed'] . "</b></span><br />\n" ; break ; } *************** *** 1671,1675 **** // let 'em know what we are doing ! echo '<br><br><b>' . $lang['EM_confirm_admin'] . ":</b> admin_easymod.php<br>\n" ; // open admin_easymod.php for reading --- 1671,1675 ---- // let 'em know what we are doing ! echo '<br /><br /><b>' . $lang['EM_confirm_admin'] . ":</b> admin_easymod.php<br />\n" ; // open admin_easymod.php for reading *************** *** 1686,1690 **** // print success and break out $found = true ; ! echo '<span class="ok"><b>' . $lang['EM_confirmed'] . "</b></span><br>\n" ; break ; } --- 1686,1690 ---- // print success and break out $found = true ; ! echo '<span class="ok"><b>' . $lang['EM_confirmed'] . "</b></span><br />\n" ; break ; } *************** *** 1711,1715 **** // let 'em know what we are doing ! echo '<br><br><b>mod_install.tpl:</b> ' . $lang['EM_confirm_exist'] . "<br>\n" ; // see if the file exists --- 1711,1715 ---- // let 'em know what we are doing ! echo '<br /><br /><b>mod_install.tpl:</b> ' . $lang['EM_confirm_exist'] . "<br />\n" ; // see if the file exists *************** *** 1717,1721 **** { // print success ! echo '<span class="ok"><b>' . $lang['EM_confirmed'] . "</b></span><br>\n" ; } else --- 1717,1721 ---- { // print success ! echo '<span class="ok"><b>' . $lang['EM_confirmed'] . "</b></span><br />\n" ; } else *************** *** 1734,1743 **** { // tell them that EM is not properly installed and they will need to fix the above errors ! echo '<br><br><h2>' . $lang['EM_confirm_failed'] . "</h2>\n" ; ! echo '<b>' . $lang['EM_confirm_fix'] . "</b><br><br><br>\n" ; // display debug display_debug_info( $error) ; ! echo "<br>\n" ; // get us out of here! --- 1734,1743 ---- { // tell them that EM is not properly installed and they will need to fix the above errors ! echo '<br /><br /><h2>' . $lang['EM_confirm_failed'] . "</h2>\n" ; ! echo '<strong>' . $lang['EM_confirm_fix'] . "</strong><br /><br /><br />\n" ; // display debug display_debug_info( $error) ; ! echo "<br />\n" ; // get us out of here! *************** *** 1750,1761 **** // ! echo "<br>\n" ; ! echo "<br>\n" ; ! echo "<br>\n" ; echo '<h2>' . $lang['EM_update_db'] . "</h2>\n"; // update our EM config info ! echo '<b>' . $lang['EM_store_entries'] . ": </b>" ; // see if we have already made the EM entries --- 1750,1761 ---- // ! echo "<br />\n" ; ! echo "<br />\n" ; ! echo "<br />\n" ; echo '<h2>' . $lang['EM_update_db'] . "</h2>\n"; // update our EM config info ! echo '<strong>' . $lang['EM_store_entries'] . ": </strong>" ; // see if we have already made the EM entries *************** *** 1833,1838 **** } } ! echo '<span class="OK"><b>' . $lang['EM_done'] . "</b></span><br>\n" ; ! echo "<br>\n" ; --- 1833,1838 ---- } } ! echo '<span class="OK"><b>' . $lang['EM_done'] . "</b></span><br />\n" ; ! echo "<br />\n" ; *************** *** 1848,1852 **** VALUES ( 'EasyMOD', 'easymod/easymod_install." . $phpEx . "', '$easymod_install_version', 'Nuttzy', 'pkt...@bl...', 'n/a', 'http://www.blizzhackers.com', 'EasyMOD automatically perfoms in seconds which previously required the tedious task of manually editing files.', " . time() . ", '$phpBB_version', '" . get_themes() . "', '" . get_languages( '../../../language') . "', 0, 1, 0, 1)"; ! echo '<b>' . $lang['EM_exec_sql'] . ": </b>$sql<br>\n" ; echo '<p>' . $lang['EM_progress'] . ' :: <b>'; flush(); --- 1848,1852 ---- VALUES ( 'EasyMOD', 'easymod/easymod_install." . $phpEx . "', '$easymod_install_version', 'Nuttzy', 'pkt...@bl...', 'n/a', 'http://www.blizzhackers.com', 'EasyMOD automatically perfoms in seconds which previously required the tedious task of manually editing files.', " . time() . ", '$phpBB_version', '" . get_themes() . "', '" . get_languages( '../../../language') . "', 0, 1, 0, 1)"; ! echo '<b>' . $lang['EM_exec_sql'] . ": </b>$sql<br />\n" ; echo '<p>' . $lang['EM_progress'] . ' :: <b>'; flush(); *************** *** 1878,1885 **** // congratufuckinglations // ! echo "<br>\n" ; ! echo "<br>\n" ; ! echo '<br><br><h2><span class="ok"><b>' . $lang['EM_install_completed'] . "</b></span></h2>\n" ; ! echo '<p>' . $lang['EM_admin_panel'] . "</p><br>" ; --- 1878,1885 ---- // congratufuckinglations // ! echo "<br />\n" ; ! echo "<br />\n" ; ! echo '<br /><br /><h2><span class="ok"><b>' . $lang['EM_install_completed'] . "</b></span></h2>\n" ; ! echo '<p>' . $lang['EM_admin_panel'] . "</p><br />" ; *************** *** 1892,1896 **** else { ! echo $lang['EM_err_no_step'] . "<br>\n" ; exit ; } --- 1892,1896 ---- else { ! echo $lang['EM_err_no_step'] . "<br />\n" ; exit ; } |