easymod-cvs Mailing List for EasyMOD (Page 10)
Status: Beta
Brought to you by:
wgeric
Menu
▾
▴
easymod-cvs — EasyMOD CVS updates
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(16) |
May
(36) |
Jun
(53) |
Jul
(21) |
Aug
|
Sep
(10) |
Oct
(4) |
Nov
(69) |
Dec
(57) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(8) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
(5) |
Oct
(3) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(7) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
(12) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jim W. <ter...@us...> - 2005-06-20 22:15:51
|
Update of /cvsroot/easymod/easymod2/mods/easymod/em_includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10578/mods/easymod/em_includes Modified Files: em_functions.php Log Message: Added some changes by -=ET=- Fixed a bug or two Index: em_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_functions.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** em_functions.php 11 Jun 2005 23:05:53 -0000 1.6 --- em_functions.php 20 Jun 2005 22:15:41 -0000 1.7 *************** *** 723,730 **** function check_access_read( &$access_msg) { ! global $phpEx, $lang ; // using a file that we know is present ! if ($fin = fopen( 'lang_easymod.'.$phpEx, 'r')) { // just make sure the first line is what we were expecting --- 723,730 ---- function check_access_read( &$access_msg) { ! global $phpEx, $lang, $language ; // using a file that we know is present ! if ($fin = fopen( 'languages/lang_easymod_'.$language.'.'.$phpEx, 'r')) { // just make sure the first line is what we were expecting *************** *** 739,743 **** { // $access_msg = $lang['EM_failed'] ; ! $access_msg = "Sucessfully opened [lang_easymod.$phpEx] for reading, but did not find the expected string.<br /> Found this instead: [" . htmlspecialchars($buffer) . "]" ; return false ; } --- 739,743 ---- { // $access_msg = $lang['EM_failed'] ; ! $access_msg = "Sucessfully opened [lang_easymod_$language.$phpEx] for reading, but did not find the expected string.<br /> Found this instead: [" . htmlspecialchars($buffer) . "]" ; return false ; } *************** *** 746,750 **** { // $access_msg = $lang['EM_failed'] ; ! $access_msg = "Could not open file [lang_easymod.$phpEx] for reading." ; return false ; } --- 746,750 ---- { // $access_msg = $lang['EM_failed'] ; ! $access_msg = "Could not open file [lang_easymod_$language.$phpEx] for reading." ; return false ; } *************** *** 944,951 **** function check_access_copy( &$access_msg) { ! global $phpbb_root_path, $phpEx, $lang ; // check for copy command ! if ( copy( 'lang_easymod.' . $phpEx, $phpbb_root_path . 'EM_test.txt')) { // clean up! --- 944,951 ---- function check_access_copy( &$access_msg) { ! global $phpbb_root_path, $phpEx, $lang, $language ; // check for copy command ! if ( copy( 'languages/lang_easymod_'.$language.'.' . $phpEx, $phpbb_root_path . 'EM_test.txt')) { // clean up! |
|
From: Brendan K. <bk...@us...> - 2005-06-20 18:06:02
|
Update of /cvsroot/easymod/easymod2/mods/easymod/language/english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29307/easymod/language/english Modified Files: lang_easymod.php Log Message: Bah, fixed the typo in the code, but not the actaul variable >_< Index: lang_easymod.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/language/english/lang_easymod.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_easymod.php 20 Jun 2005 17:41:43 -0000 1.1 --- lang_easymod.php 20 Jun 2005 18:05:50 -0000 1.2 *************** *** 53,57 **** $lang['EM_restore_backups'] = 'Restore Backups'; $lang['EM_uninstall'] = 'Uninstall MOD'; ! $lang['Coming_soon'] = 'Comming Soon!'; // settings --- 53,57 ---- $lang['EM_restore_backups'] = 'Restore Backups'; $lang['EM_uninstall'] = 'Uninstall MOD'; ! $lang['Coming_soon'] = 'Coming Soon!'; // settings |
|
From: Brendan K. <bk...@us...> - 2005-06-20 17:41:53
|
Update of /cvsroot/easymod/easymod2/mods/easymod/language/english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17006/easymod/language/english Added Files: lang_easymod.php Log Message: --- NEW FILE: lang_easymod.php --- <?php /*************************************************************************** * lang_easymod.php [English] * ------------------- * begin : Saturday, Mar 22 2003 * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall, 2005 The phpBB Group * email : su...@ph... * * $Id: lang_easymod.php,v 1.1 2005/06/20 17:41:43 bkettle Exp $ * ****************************************************************************/ /*************************************************************************** * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * ***************************************************************************/ // // EasyMOD // // EasyMOD alpha specific" ; //$lang['EM_SQL_Alpha2'] = '<b>NOTE:</b> SQL processing has been disabled in Alpha 3 and no alterations to your database will actually be preformed. It will be implemented in Beta 1. Press "Complete Installation" to continue.' ; // header $lang['EM_Title'] = 'EasyMOD - Automatic MOD Installer' ; // login $lang['EM_access_warning'] = 'A password is required to access the EasyMOD automatic MOD installer. Anyone with access could potentially access the database and FTP login information without the board owner knowing.' ; $lang['EM_password_title'] = 'Please enter the EasyMOD access password.' ; $lang['EM_password'] = 'Password' ; $lang['EM_access_EM'] = 'Access EasyMOD' ; // history (installed MODs) $lang['EM_Installed'] = 'Installed MODs' ; $lang['EM_installed_desc'] = 'All of these MODs have been installed at one time or another on your board. In later versions you will be able to get more details or uninstall the MODs from here.' ; $lang['EM_install_date'] = 'Installed' ; $lang['EM_details'] = 'Details'; $lang['EM_No_mod_selected'] = 'No MOD selected. Please go back and select one.'; $lang['EM_tables_added'] = 'Tables Added'; $lang['EM_tables_altered'] = 'Tables Altered'; $lang['EM_rows_added'] = 'Rows Added'; $lang['EM_db_alt'] = 'Database Alterations'; $lang['EM_del_files'] = 'Delete MOD Files'; $lang['EN_del_record'] = 'Delete MOD Record'; $lang['EM_install_new_lang'] = 'Install MOD on new languages'; $lang['EM_install_new_themes'] = 'Install MOD on new themes'; $lang['EM_restore_backups'] = 'Restore Backups'; $lang['EM_uninstall'] = 'Uninstall MOD'; $lang['Coming_soon'] = 'Comming Soon!'; // settings $lang['EM_settings_pw'] = 'The EasyMOD password will allow you to restrict which admins can use EasyMOD. By having access to EasyMOD an admin could covertly obtain your database user/pass and FTP info. Leave both the password and the confirm password empty to have no password set. Leave the confirm empty to not change the password.' ; $lang['EM_read_server'] = 'server' ; $lang['EM_write_server'] = 'server' ; $lang['EM_write_ftp'] = 'buffer & ftp' ; $lang['EM_write_download'] = 'download' ; $lang['EM_write_screen'] = 'on screen' ; $lang['EM_move_copy'] = 'copy' ; $lang['EM_move_ftp'] = 'automated FTP' ; $lang['EM_move_exec'] = 'execute script' ; $lang['EM_move_manual'] = 'manually load' ; $lang['EM_settings'] = 'Settings'; $lang['EM_settings_desc'] = 'Set the settings here. <b>This page still needs work.</b> I do not validate what you enter yet so be careful not to mess it up!' ; $lang['EM_settings_update'] = 'Update Settings' ; $lang['EM_settings_success'] = 'Your EasyMOD settings have been updated successfully.' ; $lang['EM_pass_disabled'] = '(EM password disabled)' ; $lang['EM_pass_updated'] = '(EM password updated)' ; $lang['EM_pass_not_updated'] = '(EM password not updated)' ; $lang['EM_supply_on_change'] = 'Only supply if you want to change it'; $lang['EM_emv_description'] = 'If you need to reinstall EM, then you might need to change the version. You can do so here.'; $lang['EM_easymod_version'] = 'EasyMOD Version'; // EasyMOD install $lang['EM_Intro'] = 'EasyMOD does in seconds what formally was a tedious process of manually editing files to install phpBB MODs. EasyMOD will attempt to install any phpBB MOD. However, approved EasyMOD Compliant MODs have the best chance to install successfully.' ; $lang['EM_none_installed'] = 'No MODs have been installed.' ; $lang['EM_All_Processed'] = 'All MODs have been processed.' ; $lang['EM_unprocessed_mods'] = 'These MODs appear in your MODs directory and have not been processed for your current version of phpBB. Clicking "Process" initiates a multi-step installation. Your current phpBB files will not be overwritten until the final step. MODs that are EasyMOD Compliant (EMC) are more likely to install than other MODs. More info on how to have EM install MODs is <a href="http://www.phpbb.com/phpBB/viewtopic.php?p=689082#689082">here</a>.' ; $lang['EM_Unprocessed'] = 'Unprocessed MODs' ; $lang['EM_process'] = 'Process' ; $lang['EM_support_thread'] = 'Support' ; $lang['EM_EMC'] = 'EMC' ; $lang['EM_lang_german'] = 'The file language/lang_german/lang_admin.php was not found. Do you have the German language pack installed? If not, then you should simply delete the language/lang_german directory and all the files inside of it. This problem is frequently caused by the popular Attachment MOD which can create a lang_german folder regardless of whether the language is present or not. If this is not the case, then visit our support forum for more help.'; $lang['EM_undefined_write'] = 'Undefined write method.'; $lang['EM_check_permissions'] = 'Write stuff about checking permissions and how to.'; $lang['EM_undefined_move_method'] = 'Undefined move method.'; $lang['EM_checking_permissions'] = 'Write stuff about checking permissions and how to.'; $lang['EM_MOD_center'] = 'MOD Center'; $lang['EM_install_MODs'] = 'Install MODs'; $lang['EM_settings'] = 'EasyMOD Settings'; $lang['EM_history'] = 'EasyMOD History'; // Preview $lang['EM_preview'] = 'Preview' ; $lang['EM_preview_mode'] = 'Preview Mode' ; $lang['EM_preview_desc'] = 'The following is a list of files that the MOD specifies to be modified. Click "View" to view what changes will take place. The changes that EasyMOD will make to the files are bolded in red. Unfortunately, becasue of HTML formatting, some extra carriage returns are occasionally added, but they will not appear when the file is actually written.' ; $lang['EM_preview_filename'] = 'Filename' ; $lang['EM_preview_view'] = 'View' ; $lang['EM_preview_nofile'] = 'This MOD will not modify any files. Nothing to preview.' ; // History + Install $lang['EM_Mod'] = 'MOD' ; $lang['EM_File'] = 'File' ; $lang['EM_Version'] = 'Version' ; $lang['EM_Author'] = 'Author' ; $lang['EM_Description'] = 'Description' ; $lang['EM_phpBB_Version'] = 'phpBB ver' ; $lang['EM_Themes'] = 'Themes' ; $lang['EM_Languages'] = 'Languages' ; // process $lang['EM_proc_step1'] = 'Step 1 of 3' ; $lang['EM_proc_complete'] = 'Processing completed successfully!' ; $lang['EM_proc_desc'] = 'EasyMOD has completed processing of this MOD. Your original phpBB files remain unaltered. The next step will update your DB and replace your phpBB files with the newly altered ones. Your original phpBB files will automatically be backed up. However, <b>this is beta quality software and you are urged to make your own backups!!</b> Press the "Next Step" button to continue.' ; $lang['EM_unprocessed_commands'] = 'Unprocessed Commands' ; $lang['EM_unprocessed_desc'] = 'The following commands were not recognized by EasyMOD and were ignored. The MOD script line number is displayed.' ; $lang['EM_processed_commands'] = 'Commands Processed' ; $lang['EM_processed_desc'] = 'EasyMOD successfully processed the following commands:'; $lang['EM_proc_failed'] = 'Installation Failed' ; $lang['EM_proc_failed_desc'] = 'EasyMOD encountered the following error(s). A general error could be ABC. A critical error means D and you should do XYZ.' ; $lang['EM_text_depend_move'] = 'THIS TEXT WILL DEPEND ON MOVE METHOD'; // process + post process $lang['EM_Mod_Data'] = 'MOD Data' ; $lang['EM_Mod_Title'] = 'MOD Title' ; $lang['EM_Proc_Themes'] = 'Processed Themes' ; $lang['EM_Proc_Languages'] = 'Processed Languages' ; $lang['EM_Files'] = 'Files Edited' ; // EasyMOD sql $lang['EM_sql_step2'] = 'Step 2 of 3' ; $lang['EM_SQL_Intro'] = '<b>Database Alterations</b> - DISABLED' ; $lang['EM_Alterations'] = 'Proposed Database Alterations' ; $lang['EM_Pseudo'] = 'Pseudo SQL' ; $lang['EM_Allow'] = 'Allow' ; $lang['EM_Perform'] = 'Perform DB alterations' ; $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'; $lang['EM_success'] = 'Success'; $lang['EM_skipped'] = 'Skipped'; $lang['EM_processing_results'] = 'SQL Processing Results'; $lang['EM_sql_attempted'] = 'The following SQL was attempted:'; $lang['EM_all_lines_successfull'] = 'ALL LINES EXECUTED SUCCESSFULLY'; $lang['EM_errors_detected'] = 'ERRORS DETECTED'; $lang['EM_failed'] = 'FAILED'; $lang['EM_line_results'] = 'The following is the result for each line of SQL executed.'; $lang['EM_sql_error_explain'] = 'An error was encountered while processing the SQL commands. Further SQL processing has been halted. You may choose to complete the MOD installation anyway and perform the SQL commands manually yourself. However, at this point EM cannot guarantee the MOD will work correctly so you are best off seeking support from the Author before continuing further.'; $lang['EM_sql_halted'] = 'SQL PROCESSING HALTED'; $lang['EM_sql_process_error'] = 'SQL PROCESSING ERROR'; $lang['EM_failed_line'] = 'The failed line was'; $lang['EM_no_sql_preformed'] = 'No SQL alterations will be performed.</b> However, you may skip SQL processing, continue installing the MOD, and deal with the SQL manually'; $lang['EM_following_error'] = 'The following error occured'; $lang['EM_no_sql'] = 'No SQL to process. Click \'Complete Installation\' to proceed.'; $lang['EM_notice'] = 'Notice'; $lang['EM_urgent_warning'] = 'URGENT WARNING'; $lang['EM_sql_drop_warning'] = 'SQL commands for dropping either a column or an entire table have been detected. Although these commands may be legitamate, you should double check that you want this. Dropping a table or column is irreversable. You are strongly urged to backup your database before proceeding even if the commands are legitamate!'; $lang['EM_sql_msaccess_warning'] = 'You have a MS Access database. EM should perform most SQL properly for Access. However, when creating tables or adding columns there is no way to assign default values. You will have to do this manually in Access. Without default values, the MOD may not function as intended and the consequences could be severe. If you know how to automate this, be sure to contact us!'; $lang['EM_experimental_explain'] = 'You have a %s database. Most likely EM isn\'t generating the SQL properly. The reason is simply because we don\'t know what it is supposed to look like. If you know what the SQL should look like, please let us know in <a href="%s" target="_sql">this topic</a>. Otherwise just expect that maybe this won\'t work so well ;-)'; $lang['EM_database_alterations'] = 'Database Alterations'; $lang['EM_tables_added'] = 'Tables Added'; $lang['EM_tables_altered'] = 'Tables Altered'; $lang['EM_rows_added'] = 'Rows Added'; // post process $lang['EM_pp_step3'] = 'Step 3 of 3' ; $lang['EM_pp_install_comp'] = 'Installation Complete!' ; $lang['EM_pp_comp_desc'] = 'Installation of this MOD is now complete! You should verify that the MOD is now functioning properly for all installed themes and languages.' ; $lang['EM_pp_complete'] = 'completed' ; $lang['EM_pp_ready'] = 'ready' ; $lang['EM_pp_manual'] = 'MANUAL' ; $lang['EM_pp_from'] = 'Copy From [%s]' ; $lang['EM_pp_backups'] = 'Making Backups in [%s]' ; $lang['EM_pp_backup'] = 'Backup' ; $lang['EM_pp_download'] = 'Download' ; $lang['EM_pp_to'] = 'To' ; $lang['EM_pp_status'] = 'Status' ; // diy $lang['DIY_final'] = 'Final Step'; $lang['DIY_Instructions'] = '\'Do it yourself\' Instructions'; $lang['DIY_intro'] = '\'Do it yourself\' instructions need to be executed by <strong>you manually</strong>, EasyMOD can <strong>not</strong> perform these actions'; $lang['Final_install_step'] = 'View the final install steps'; $lang['Install_complete'] = 'Installation Complete'; // general use $lang['EM_next_step'] = 'Next Step' ; // // 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>.'; $lang['EM_simple_mode'] = 'Simple Mode'; $lang['EM_advanced_mode'] = 'Advanced Mode'; // translate this and I'll hardcode the message into easymod_install.php $lang['EM_no_lang'] = '<b>CRITICAL ERROR:</b> the lang_easymod.$phpEx file could not be found in the easymod directory. EasyMOD cannot be installed without this file present.' ; // step 1 $lang['EM_step1'] = '<b>Step 1 (of 5):</b> Welcome to the EasyMOD installer. In this step EasyMOD has scanned the server to see what file access is available for the key steps of reading, writing, and moving files. EasyMOD has recommended what settings seem to best fit your configuration.' ; $lang['EM_Install_Info'] = 'Install Info' ; $lang['EM_Select_Language'] = 'Select Language' ; $lang['EM_Database_type'] = 'Database type' ; $lang['EM_phpBB_version'] = 'phpBB version' ; $lang['EM_EasyMOD_version'] = 'EasyMOD version' ; $lang['EM_EM_status'] = 'EM status' ; $lang['EM_new_install'] = 'New Install' ; $lang['EM_update_from'] = 'Update EM from' ; $lang['EM_File_Access'] = 'File Access Info' ; $lang['EM_failed'] = 'failed' ; $lang['EM_unattempted'] = 'unattempted' ; $lang['EM_no_module'] = 'module not loaded' ; $lang['EM_no_problem'] = 'NOTE: there is no problem if some items failed or were not attempted. This is normal.' ; $lang['EM_support'] = 'For support, visit <a href="http://area51.phpbb.com/phpBB/viewforum.php?f=15" target="_blank">EasyMOD Central</a> over at Area51.' ; $lang['EM_read_access'] = 'read access' ; $lang['EM_write_access'] = 'write access' ; $lang['EM_root_write'] = 'root path write' ; $lang['EM_chmod_access'] = 'chmod access' ; $lang['EM_unlink_access'] = 'unlink access' ; $lang['EM_mkdir_access'] = 'mkdir access' ; $lang['EM_tmp_write'] = 'tmp path write' ; $lang['EM_ftp_ext'] = 'FTP extension' ; $lang['EM_copy_access'] = 'copy access' ; $lang['EM_Settings'] = 'Settings' ; $lang['EM_password_title'] = 'EasyMOD Password Protection' ; $lang['EM_password_desc'] = 'The EasyMOD password will allow you to restrict which admins can use EasyMOD. By having access to EasyMOD an admin could covertly obtain your database user/pass and FTP info.' ; $lang['EM_password_set'] = 'Set EM password' ; $lang['EM_password_confirm'] = 'Confirm EM password' ; $lang['EM_file_title'] = 'File Access' ; $lang['EM_file_desc'] = 'FTP access is the perferred method for file access. If you do not have FTP access, EasyMOD has recommended alternate settings.' ; $lang['EM_file_reading'] = 'Reading' ; $lang['EM_file_writing'] = 'Writing' ; $lang['EM_file_moving'] = 'Moving' ; $lang['EM_file_alt'] = 'alternate' ; $lang['EM_ftp_title'] = 'FTP Information' ; $lang['EM_ftp_desc'] = 'If you have FTP access to the web server, enter it below. The info will be stored fairly securely in the phpBB database. It will only be accessible through EasyMOD.' ; $lang['EM_ftp_dir'] = 'FTP path to phpBB2' ; $lang['EM_ftp_user'] = 'FTP Username' ; $lang['EM_ftp_pass'] = 'FTP Password' ; $lang['EM_ftp_host'] = 'FTP Server' ; $lang['EM_ftp_host_info'] = '(localhost should be fine)' ; $lang['EM_ftp_port'] = 'FTP Port' ; $lang['EM_ftp_port_info'] = '(21 should be fine)' ; $lang['EM_ftp_advance_settings'] = 'Advanced FTP Settings (optional!)'; $lang['EM_ftp_debug'] = 'FTP Debug Mode' ; $lang['EM_ftp_debug_not'] = '(only use if there is a problem)' ; $lang['EM_ftp_use_ext'] = 'PHP FTP Extension' ; $lang['EM_ftp_ext_not'] = '(only change if instructed to)' ; $lang['EM_ftp_ext_noext'] = 'Not an option. PHP FTP module not loaded.' ; $lang['EM_ftp_ext_notmp'] = 'Not an option. No /tmp write access.' ; $lang['EM_ftp_cache'] = 'Use FTP cache' ; $lang['EM_yes'] = 'Yes' ; $lang['EM_no'] = 'No' ; // 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'; $lang['EM_describes_server'] = 'Which of the following choices best describes your phpBB server:'; $lang['EM_have_ftp'] = 'I have FTP access to my phpBB files on the server.'; $lang['EM_have_windows'] = 'This is a Windows server and I don\'t have to worry about file permissions.'; $lang['EM_no_ftp_suggest'] = 'I don\'t have FTP access. Have EasyMOD suggest what to do please!'; $lang['EM_auto_detect'] = 'Auto Detection'; $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> {{SAFE_MODE}}<li>Your server has "safe mode" enabled which means EasyMOD cannot automaticly replace your phpBB files. You might consider using <a href="#" target="_blank">chmod</a> or <a href="#" target="_blank">chown</a> to allow access.</li> <li>You might consider using <a href="#" target="_blank">chmod</a> to allow access. However, this is not advised in a shared server environment.</li> <li>Otherwise you will have to download the files and then manually move them into place.</li> </ol>'; $lang['EM_try_ftp'] = 'I\'ll try using the FTP option. (requires FTP access)'; $lang['EM_perms_mod_rescan'] = 'I have now modified my file permissions, try rescanning to see if EasyMOD has access.'; $lang['EM_download_manual'] = 'I will have to download the files and manually move them into place'; $lang['EM_select_else'] = 'I\'d like to select something else. (Advanced Mode)'; // 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> {{SAFE_MODE}}<li>Your server has "safe mode" enabled which means EasyMOD cannot automaticly replace your phpBB files. You might consider using <a href="#" target="_blank">chmod</a> or <a href="#" target="_blank">chown</a> to allow access.</li> <li>You might consider using <a href="#" target="_blank">chmod</a> to allow access. However, this is not advised in a shared server environment.</li> <li>Otherwise you have to use the <a href="#" target="_blank">post_process script</a> or manually move files into place.</li> </ol>'; $lang['EM_use_post_process'] = 'I will use the post_process script to automatically move files into place. (requires knowledge of how to execute a script)'; // write and copy $lang['EM_write_copy_desc'] = 'Good news! EasyMOD has detected that it has the necessary access to automatically install MODs. You should select yes below.'; $lang['EM_yes_use_auto'] = 'Yes, use this automated method.'; $lang['EM_no_use_else'] = 'No, I\'d like to select something else. (Advanced Mode)'; // step 2 $lang['EM_step2'] = '<b>Step 2 (of 5):</b> EasyMOD is now confirming your file access settings.' ; $lang['EM_test_write'] = 'Testing selected write method' ; $lang['EM_confirm_write'] = 'Write access method confirmed!'; $lang['EM_confirm_write_server'] = 'The modified files will be written on the server.' ; $lang['EM_confirm_write_ftp'] = "The modified files will be written to a buffer and then FTP'd into place." ; $lang['EM_confirm_write_local'] = 'The modified files will be downloaded locally through your web browser.' ; $lang['EM_confirm_write_screen'] = 'The modified file contents will be displayed on screen.' ; $lang['EM_test_move'] = 'Testing selected move method' ; $lang['EM_test_ftp1'] = '1) Logged in successfully' ; $lang['EM_test_ftp2'] = '2) CD to EasyMOD path successfully' ; $lang['EM_test_ftp3'] = '3) wrote to phpBB root successfully' ; $lang['EM_ftp_sync1'] = 'You have selected FTP for writing files but not for moving them. You must set both write and move to use FTP or else you cannot use FTP.' ; $lang['EM_ftp_sync2'] = 'You have selected FTP for moving files but not for writing them. You must set both write and move to use FTP or else you cannot use FTP.' ; $lang['EM_confirm_move'] = 'Move access method confirmed!' ; $lang['EM_confirm_move_ftp'] = 'The core phpBB files will automatically be replaced by modified files via FTP.' ; $lang['EM_confirm_move_copy'] = 'The core phpBB files will automatically be replaced by modified files using the copy function.' ; $lang['EM_confirm_move_exec'] = 'A script will be generated that you can execute to automatically replace the core phpBB files with the modified files.' ; $lang['EM_confirm_move_ftpm'] = 'You have selected to manually replace the core phpBB files with the modified files.' ; $lang['EM_install_EM'] = 'Install EasyMOD' ; $lang['EM_confirm_download'] = '<b>IMPORTANT:</b> To fully test the download method, make sure you can download this file. If it fails, you cannot use the "download" write method and should press "Rescan" to select another option.' ; // step 2 ftp test $lang['EM_ftp_testing'] = 'Testing FTP access...' ; $lang['EM_ftp_fail_conn'] = 'FTP ERROR: connection to %s:%s failed.' ; $lang['EM_ftp_fail_conn_lh'] = "This error occurs frequently, particularly on hosts like Lycos. Back on step 1 you should try changing the FTP Server from 'localhost' to whatever hostname you typically use when you FTP." ; $lang['EM_ftp_fail_conn_21'] = 'This error occurs frequently when the port number is incorrect. Back on step 1 you should try changing the FTP Port from 21 to whatever port you typically use when you FTP.' ; $lang['EM_ftp_fail_conn_invalid'] = "The connection failed because it appears you have provided an invalid FTP Server hostname. Hostnames cannot have slashes (/ or \\) or colons (:) in the name. Try reentering the FTP Server field." ; $lang['EM_ftp_fail_conn_invalid2'] = "The connection failed because it appears you have provided an invalid FTP Server port. Ports must only contain the numbers 0 through 9. Try reentering the FTP Port field." ; $lang['EM_fail_conn_info'] = 'The FTP Server you have specified could not be connected to. The following is recommended:'; $lang['EM_fail_conn_op1'] = 'Have you tried the default settings of <b>localhost</b> for the hostname and <b>21</b> for the port? These should be tried first.' ; $lang['EM_fail_conn_op2'] = 'Did you correctly enter the hostname? Try reentering.' ; $lang['EM_fail_conn_op3'] = 'Are you sure you have FTP access to the phpBB2 files? Obviously this is a requirement.' ; $lang['EM_fail_conn_op4'] = "Some servers have issues with the fsockopen method that EasyMOD attempts to use by default. If you have the PHP FTP extension loaded, then enable that option in step 1." ; $lang['EM_fail_login'] = 'FTP ERROR: login failed' ; $lang['EM_fail_login_info'] = 'The FTP Server was connected to, but the username and password were rejected. The following is recommended:' ; $lang['EM_fail_login_op1'] = 'Did you correctly type the username and password? Make sure your CAPS LOCK key is off and try again.' ; $lang['EM_fail_login_op2a'] = 'If you are 100% certain your user/pass is correct, then perhaps you are not connecting to the correct host or on the correct port. Try changing your FTP Server entry from localhost to the actual ftp host name and your FTP Port entry from 21 to the actual ftp port.' ; $lang['EM_fail_login_op2b'] = 'Perhaps you are not connecting to the correct host. Try changing your FTP Server entry back to localhost or verify you have correctly entered the ftp host name.' ; $lang['EM_fail_pwd'] = 'FTP ERROR: pwd failed' ; $lang['EM_fail_pwd_info'] = 'You successfully logged into the server, but the pwd command (print working directory) failed.' ; $lang['EM_fail_cd'] = 'FTP ERROR: could not cd to %s' ; $lang['EM_fail_cd_info'] = 'You successfully logged into the server, but could not change direcory (CD) to the easymod directory. The following is recommended:' ; $lang['EM_fail_cd_op1'] = '<b>Important:</b> It appears you are including a domain name in the FTP Path setting. For most servers this is incorrect. Try reentering the FTP Path setting without the domain name included.' ; $lang['EM_fail_cd_op2'] = '<b>Important:</b> You have a slash (/) at the end of your FTP Path. Try removing this and retrying.' ; $lang['EM_fail_cd_op3'] = 'Are you sure you entered the correct path? Below is a directory listing of the files in the FTP root directory. The FTP root directory is simply the starting point when you connect. The path to the phpBB2 installation should begin with one of the directory names listed below.' ; $lang['EM_fail_cd_op4'] = 'Directory names are case sensitive. Be sure the easymod directory is all lowercase.' ; $lang['EM_fail_cd_op5'] = "In some *very rare* cases it's possible that you are not connecting to the proper FTP Server. Try specifying the hostname in the FTP Server field and the port in the FTP Port field." ; $lang['EM_fail_cd_op6'] = "Some servers have issues with the passive mode that EasyMOD attempts to use by default. If you have the PHP FTP extension loaded, then enable that option in step 1." ; $lang['EM_fail_cd_pwd'] = 'FTP Error: Directory info could not be obtained. This usually indicates solution 4 listed above.' ; $lang['EM_fail_cd_nlist'] = 'FTP Error: A file listing could not be obtained. This usually indicates solution 4 listed above.' ; $lang['EM_fail_cd_nlist_no'] = 'No files to list.' ; $lang['EM_ftp_root'] = 'FTP root directory:' ; $lang['EM_dir_list'] = 'Directory listing:</b> your FTP Path should start with one of the directories listed below' ; $lang['EM_fail_put'] = 'FTP ERROR: could not write to phpBB root' ; $lang['EM_fail_put_info'] = 'EasyMOD requires that your <b>%s</b> account have write access on all directories and files in the phpBB directory. Please confirm all files and directories are set to at least 744 access.' ; $lang['EM_ftp_phpbb_root'] = 'phpBB root directory:' ; $lang['EM_fail_reput'] = 'FTP ERROR: could not overwrite phpBB root test file' ; $lang['EM_fail_delete'] = '<b>FTP WARNING:</b> could not remove test file (not critical)' ; // step 3 $lang['EM_step3'] = '<b>Step 3 (of 5):</b> EasyMOD is now installing itself as it would any MOD. There is a two step process of first creating the modified files and then moving them into place. The modified file(s) do no effect the core phpBB files in any way until the next step. Click the "Complete Processing" button to move the files into place.' ; $lang['EM_processing_files'] = 'Processing Files' ; $lang['EM_parsing'] = 'Parsing' ; $lang['EM_finding'] = 'Finding' ; $lang['EM_insert'] = 'Insert' ; $lang['EM_ifinding'] = 'In-line Finding' ; $lang['EM_iafter'] = 'In-line after, add' ; $lang['EM_before'] = 'before' ; $lang['EM_after'] = 'after' ; $lang['EM_build_post'] = 'Building Post Process Actions' ; $lang['EM_build_post_desc'] = 'The following actions will be executed in the final step' ; $lang['EM_complete_processing'] = 'Complete Processing' ; // step 4 $lang['EM_step4'] = '<b>Step 4 (of 5):</b> Depending on your selection, the modified files have been automatically moved into place or prepared for you to move them manually. If there are no errors, click the "Confirm" button to update your database and complete the installation process.' ; $lang['EM_add_db'] = 'Adding EasyMOD table to your database' ; $lang['EM_exec_sql'] = 'Executing SQL' ; $lang['EM_progress'] = 'Progress' ; $lang['EM_done'] = 'Done' ; $lang['EM_result'] = 'Result' ; $lang['EM_already_exist'] = 'The table was previously created' ; $lang['EM_failed_sql'] = 'Some queries failed, the statements and errors are listing below' ; $lang['EM_no_worry'] = 'This is probably nothing to worry about, install will continue. Should this fail to complete you may need to seek help at our development board.' ; $lang['EM_no_errors'] = 'No errors' ; $lang['EM_update_db'] = 'Updating EasyMOD table data' ; $lang['EM_store_entries'] = 'Storing config table entries' ; $lang['EM_do_worry'] = 'Could not successfully update table. Something is wrong and install cannot complete.' ; $lang['EM_complete_post'] = 'Completing Post-Process' ; $lang['EM_completed'] = 'Completed' ; $lang['EM_admin_panel'] = 'You can now proceed to the Admin Control Panel and select "Install MODs" under "MOD Center". You may install the included MODs if you desire. Return to <a href="../../../index.php">Forum Index</a>.' ; $lang['EM_confirm'] = 'Confirm' ; $lang['EM_move_files'] = '<b>IMPORTANT:</b> Before pressing confirm, move files into place.' ; // step 5 $lang['EM_step5'] = '<b>Final Step:</b> EasyMOD is now confirming all files have been correctly moved into place. If confirmed, then your database will be updated and installation will be complete!' ; $lang['EM_confirming_mod'] = 'Confirming Modifications' ; $lang['EM_confirmed'] = 'Confirmed!' ; $lang['EM_confirm_lang'] = 'lang_admin.php, looking for' ; $lang['EM_confirm_admin'] = 'admin_easymod.php, looking for' ; $lang['EM_confirm_exist'] = 'verifying existence' ; $lang['EM_confirm_failed'] = 'Install Failed' ; $lang['EM_confirm_fix'] = 'EM is not properly installed and you will need to fix the above error(s).' ; $lang['EM_install_completed'] = 'Installation Confirmed. EasyMOD is installed!' ; // debug info $lang['EM_debug_header'] = '<b>Debug Info:</b> The following information about your system config has been formatted for display in a forum post.' ; $lang['EM_debug_display'] = 'Display Debug Info' ; $lang['EM_debug_info'] = 'Expanded Debug Info' ; $lang['EM_debug_format'] = 'formatted for forum posting' ; $lang['EM_debug_installer'] = 'EM installer' ; $lang['EM_debug_work_dir'] = 'Working Dir' ; $lang['EM_debug_step'] = 'Install Step' ; $lang['EM_debug_mode'] = 'Mode' ; $lang['EM_debug_the_error'] = 'The Error' ; $lang['EM_debug_no_error'] = 'No error.' ; $lang['EM_debug_permissions'] = 'Permissions' ; $lang['EM_debug_sys_errors'] = 'including system errors' ; $lang['EM_debug_recommend'] = 'Recommendations' ; $lang['EM_debug_write'] = 'write' ; $lang['EM_debug_move'] = 'move' ; $lang['EM_debug_ftp_dir'] = 'ftp dir' ; $lang['EM_debug_ftp_host'] = 'ftp host'; $lang['EM_debug_ftp_post'] = 'ftp port'; $lang['EM_debug_ftp_debug'] = 'ftp debug' ; $lang['EM_debug_ftp_ext'] = 'ftp ext' ; $lang['EM_debug_ftp_cache'] = 'ftp cache'; $lang['EM_debug_ftp_notest'] = 'Not testing FTP since it is not being used.' ; $lang['EM_debug_selected'] = 'Selected settings' ; $lang['EM_debug_listing'] = 'CWD Listing' ; // cwd = current working directory $lang['EM_debug_ftp_test'] = 'FTP access test' ; $lang['EM_debug_success'] = 'successful' ; // forms $lang['Submit'] = 'Submit'; $lang['Rescan'] = 'Rescan'; // // errors // $lang['EM_err_warning'] = 'Warning' ; $lang['EM_err_error'] = 'Error' ; $lang['EM_err_critical_error'] = 'Critical Error' ; $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>.' ; $lang['EM_err_dupe_install'] = 'This version of EM has already been installed. Terminating to prevent reinstallation.' ; $lang['EM_err_pw_match'] = '<b>Error:</b> The EasyMOD passwords do not match. Please retry by pressing the "Rescan" button.' ; $lang['EM_err_acc_write'] = '<b>ACCESS ERROR:</b> phpBB does not have permission to write to the EasyMOD directory.' ; $lang['EM_err_acc_mkdir'] = '<b>ACCESS ERROR:</b> phpBB does not have permission to create new directories.' ; $lang['EM_err_copy'] = '<b>COPY ERROR:</b> You do not have copy access. Move method cannot be used.' ; $lang['EM_err_no_write'] = '<b>MOVE ERROR:</b> The write method you have selected does not create the files on there server. Therefore, using either automated FTP or the copy method is not permitted for the move method.' ; $lang['EM_err_config_table'] = 'Could not obtain Config Table list' ; $lang['EM_err_open_pp'] = '<b>Critical Error:</b> Cannot open post process file for writing.' ; $lang['EM_err_attempt_remainder'] = 'ATTEMPING REMAINDER OF POST PROCESS' ; $lang['EM_err_write_pp'] = '<b>Critical Error:</b> Unable to complete writing of post process file.' ; $lang['EM_err_no_step'] = '<b>Critical Error:</b> Undefinied install step.' ; $lang['EM_err_insert'] = 'Could not insert %s config information.' ; $lang['EM_err_update'] = 'Could not update %s config information.' ; $lang['EM_err_find'] = 'Could not find' ; $lang['EM_err_pw_fail'] = 'INVALID PASSWORD SUPPLIED' ; $lang['EM_err_find_fail'] = 'FIND FAILED: In file [%s] could not find' ; $lang['EM_err_ifind_fail'] = 'IN-LINE FIND FAILED: In file [%s] could not find' ; // admin_easymod errors $lang['EM_trace'] = 'Function Trace' ; $lang['EM_FAQ'] = 'FAQ' ; $lang['EM_report'] = 'Report' ; $lang['EM_error_detail'] = 'Error Detail' ; $lang['EM_line_num'] = 'MOD script line #' ; $lang['EM_err_config_info'] = 'Could not obtain Config information' ; $lang['EM_err_no_process_file'] = 'Critical Error: There is no filed specified to process.' ; $lang['EM_err_set_pw'] = 'The EasyMOD passwords do not match. Settings not updated.' ; $lang['EM_err_em_info'] = 'Could not obtain EasyMod information' ; $lang['EM_err_phpbb_ver'] = 'Could not obtain phpBB version info' ; $lang['EM_err_backup_open'] = 'Could not open [%s] for reading.' ; $lang['EM_err_no_find'] = 'FAILED: malformed script. A FIND was not previously performed.' ; $lang['EM_err_comm_open'] = 'OPEN FAILED: No file name supplied in MOD script' ; $lang['EM_err_comm_find'] = 'FIND FAILED: No target supplied for FIND command in MOD script' ; $lang['EM_err_inline_body'] = 'FAILED: Invalid command body supplied in MOD script' ; $lang['EM_err_increment_body'] = 'FAILED: Invalid command body supplied in MOD script' ; $lang['EM_err_no_ifind'] = 'FAILED: Malformed script. An IN-LINE FIND was not previously performed.' ; $lang['EM_err_comm_copy'] = 'COPY FAILED: The target file to be copied [%s%s] could not be found.' ; $lang['EM_err_modify'] = 'CRITICAL ERROR: Could not modify [%s]' ; $lang['EM_err_theme_info'] = 'Could not query database for theme info' ; $lang['EM_err_copy_format'] = 'Could not perform improperly formed COPY command.' ; // 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.' ; $lang['EM_modio_open_none'] = 'Write method not recognized.' ; $lang['EM_modio_close_chdir'] = 'FTP ERROR: could not change directory to [%s]' ; $lang['EM_modio_close_ftp'] = 'FTP ERROR: could not write file [%s]' ; $lang['EM_modio_prep_conn'] = 'FTP ERROR: could not connect to localhost' ; $lang['EM_modio_prep_login'] = 'FTP ERROR: login failed' ; $lang['EM_modio_prep_chdir'] = 'FTP ERROR: could not chdir to phpBB root directory' ; $lang['EM_modio_move_copy'] = 'COPY ERROR: could not move file [%s] to [%s]' ; $lang['EM_modio_move_ftpa'] = 'FTP ERROR: could not move file [%s] to [%s]' ; // EasyMOD Installer Help $lang['EM_installer_help'] = 'EasyMOD Installer Help' ; $lang['help']['file_writing'][] = '<b>File Writing</b>' ; $lang['help']['file_writing'][] = 'File writing help here...' ; $lang['help']['file_writing'][] = 'When, in lang_easymod.php, a $lang[\'help\'][\'topic\'][] is encountered, the [] means the start of a new paragraph.' ; $lang['help']['file_moving'][] = '<b>File Moving</b>' ; $lang['help']['file_moving'][] = 'Blah, Blah, Moving info here' ; $lang['help']['ftp_dir'][] = '<b>FTP Directory</b>' ; $lang['help']['ftp_dir'][] = 'Stuff here' ; $lang['help']['ftp_host'][] = '<b>FTP Host</b>' ; $lang['help']['ftp_host'][] = '"Old McDonald had a farm, EIEIO..."' ; $lang['help']['ftp_port'][] = '<b>FTP Port</b>' ; $lang['help']['ftp_port'][] = 'I think we get the drift...' ; $lang['help']['ftp_php_ext'][] = '<b>FTP PHP Extension</b>' ; $lang['help']['ftp_php_ext'][] = 'php extension information' ; $lang['help']['ftp_cache'][] = '<b>FTP Cache</b>' ; $lang['help']['ftp_cache'][] = 'cache stuff' ; ?> |
|
From: Brendan K. <bk...@us...> - 2005-06-20 17:37:12
|
Update of /cvsroot/easymod/easymod2/mods/easymod/language/english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14367/english Log Message: Directory /cvsroot/easymod/easymod2/mods/easymod/language/english added to the repository |
|
From: Brendan K. <bk...@us...> - 2005-06-19 22:46:52
|
Update of /cvsroot/easymod/easymod2/mods/easymod/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18229/mods/easymod/templates Modified Files: ftp_settings.tpl step1_classic.tpl Removed Files: nuttzy.jpg Log Message: Finishing off lang support. (add guess_lang()?). Hope I didn't break anything :) Index: ftp_settings.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/ftp_settings.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ftp_settings.tpl 12 Jun 2005 08:18:35 -0000 1.4 --- ftp_settings.tpl 19 Jun 2005 22:46:42 -0000 1.5 *************** *** 8,12 **** <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_dir}}</span></td> ! <td class="row2"><input type="text" name="ftp_dir"> <span class="gen">({{DIR_EX}}) (<a href="#" target="_blank">{{EM_more_info}}</a>)</span></td> </tr> <tr> --- 8,12 ---- <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_dir}}</span></td> ! <td class="row2"><input type="text" name="ftp_dir"> <span class="gen">({{DIR_EX}}) (<a href="{{U_FORM}}?mode=help#ftp_dir" onClick="return helpwin(this)">{{EM_more_info}}</a>)</span></td> </tr> <tr> *************** *** 20,28 **** <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_host}}</span></td> ! <td class="row2"><input type="text" name="ftp_host" value="localhost"> <span class="gen">{{EM_ftp_host_info}} (<a href="#" target="_blank">{{EM_more_info}}</a>)</span></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_port}}</span></td> ! <td class="row2"><input type="text" size="5" maxlength="5" name="ftp_port" value="21"> <span class="gen">{{EM_ftp_port_info}} (<a href="#" target="_blank">{{EM_more_info}}</a>)</span></td> </tr> <tr> --- 20,28 ---- <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_host}}</span></td> ! <td class="row2"><input type="text" name="ftp_host" value="localhost"> <span class="gen">{{EM_ftp_host_info}} (<a href="{{U_FORM}}?mode=help#ftp_host" onClick="return helpwin(this)">{{EM_more_info}}</a>)</span></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_port}}</span></td> ! <td class="row2"><input type="text" size="5" maxlength="5" name="ftp_port" value="21"> <span class="gen">{{EM_ftp_port_info}} (<a href="{{U_FORM}}?mode=help#ftp_port" onClick="return helpwin(this)">{{EM_more_info}}</a>)</span></td> </tr> <tr> *************** *** 40,44 **** <td class="row2">{{FTP_EXT_MSG}} <input type="radio" name="ftp_type" value="ext" {{EXT_YES}}><span class="gen">{{EM_yes}}</span> ! <input type="radio" name="ftp_type" value="fsock" {{EXT_NO}}>{{EM_no}}</span> <span class="gen">{{EM_ftp_ext_not}} (<a href="#" target="_blank">{{EM_more_info}}</a>)</span> {{FTP_EXT_CLOSE}} </td> --- 40,44 ---- <td class="row2">{{FTP_EXT_MSG}} <input type="radio" name="ftp_type" value="ext" {{EXT_YES}}><span class="gen">{{EM_yes}}</span> ! <input type="radio" name="ftp_type" value="fsock" {{EXT_NO}}>{{EM_no}}</span> <span class="gen">{{EM_ftp_ext_not}} (<a href="{{U_FORM}}?mode=help#ftp_php_ext" onClick="return helpwin(this)">{{EM_more_info}}</a>)</span> {{FTP_EXT_CLOSE}} </td> *************** *** 48,52 **** <td class="row2">{{FTP_CACHE_MSG}} <input type="radio" name="ftp_cache" value="1" {{CACHE_YES}}><span class="gen">{{EM_yes}}</span> ! <input type="radio" name="ftp_cache" value="0" {{CACHE_NO}}>{{EM_no}}</span> <span class="gen">{{EM_ftp_ext_not}} (<a href="#" target="_blank">{{EM_more_info}}</a>)</span> {{FTP_CACHE_CLOSE}} </td> --- 48,52 ---- <td class="row2">{{FTP_CACHE_MSG}} <input type="radio" name="ftp_cache" value="1" {{CACHE_YES}}><span class="gen">{{EM_yes}}</span> ! <input type="radio" name="ftp_cache" value="0" {{CACHE_NO}}>{{EM_no}}</span> <span class="gen">{{EM_ftp_ext_not}} (<a href="{{U_FORM}}?mode=help#ftp_cache" onClick="return helpwin(this)">{{EM_more_info}}</a>)</span> {{FTP_CACHE_CLOSE}} </td> --- nuttzy.jpg DELETED --- Index: step1_classic.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1_classic.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** step1_classic.tpl 5 Jun 2005 23:37:05 -0000 1.3 --- step1_classic.tpl 19 Jun 2005 22:46:42 -0000 1.4 *************** *** 37,41 **** ////////// REMOVING READ METHOD UNTIL THERE IS MORE THAN ONE OPTION (if ever) ;-) <tr> ! <td class="row1" align="right"><span class="gen"><a href="{{U_FORM}}?mode=help#topic1" onClick="return helpwin(this)">{{EM_file_reading}}</a></span></td> <td class="row2"><select style="width:140px" name="sel_read">{{SELECT_READ}}</select> <span class="gen">(only option for now)</span></td> </tr> --- 37,41 ---- ////////// REMOVING READ METHOD UNTIL THERE IS MORE THAN ONE OPTION (if ever) ;-) <tr> ! <td class="row1" align="right"><span class="gen"><a href="{{U_FORM}}?mode=help#" onClick="return helpwin(this)">{{EM_file_reading}}</a></span></td> <td class="row2"><select style="width:140px" name="sel_read">{{SELECT_READ}}</select> <span class="gen">(only option for now)</span></td> </tr> *************** *** 43,52 **** <tr> ! <td class="row1" align="right"><span class="gen"><a href="{{U_FORM}}?mode=help#topic1" onClick="return helpwin(this)">{{EM_file_writing}}</a></span></td> ! <td class="row2"><select style="width:140px" name="sel_write">{{SELECT_WRITE}}</select> <span class="gen">{{EM_file_alt}}: <a href="{{U_FORM}}?mode=help#topic1" onClick="return helpwin(this)">{{WRITE_REC}}</a></span></td> </tr> <tr> ! <td class="row1" align="right"><span class="gen"><a href="{{U_FORM}}?mode=help#topic1" onClick="return helpwin(this)">{{EM_file_moving}}</a></span></td> ! <td class="row2"><select style="width:140px" name="sel_move">{{SELECT_MOVE}}</select> <span class="gen">{{EM_file_alt}}: <a href="{{U_FORM}}?mode=help#topic1" onClick="return helpwin(this)">{{MOVE_REC}}</a></span></td> </tr> --- 43,52 ---- <tr> ! <td class="row1" align="right"><span class="gen"><a href="{{U_FORM}}?mode=help#file_writing" onClick="return helpwin(this)">{{EM_file_writing}}</a></span></td> ! <td class="row2"><select style="width:140px" name="sel_write">{{SELECT_WRITE}}</select> <span class="gen">{{EM_file_alt}}: <a href="{{U_FORM}}?mode=help#file_writing" onClick="return helpwin(this)">{{WRITE_REC}}</a></span></td> </tr> <tr> ! <td class="row1" align="right"><span class="gen"><a href="{{U_FORM}}?mode=help#file_moving" onClick="return helpwin(this)">{{EM_file_moving}}</a></span></td> ! <td class="row2"><select style="width:140px" name="sel_move">{{SELECT_MOVE}}</select> <span class="gen">{{EM_file_alt}}: <a href="{{U_FORM}}?mode=help#file_moving" onClick="return helpwin(this)">{{MOVE_REC}}</a></span></td> </tr> |
|
From: Brendan K. <bk...@us...> - 2005-06-19 22:46:52
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18229/mods/easymod Modified Files: easymod_display_functions.php easymod_install.php Removed Files: lang_easymod.php Log Message: Finishing off lang support. (add guess_lang()?). Hope I didn't break anything :) Index: easymod_display_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_display_functions.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** easymod_display_functions.php 11 Jun 2005 23:05:53 -0000 1.11 --- easymod_display_functions.php 19 Jun 2005 22:46:41 -0000 1.12 *************** *** 365,369 **** function get_install_info( &$variables, $prev_em_version) { ! global $phpEx, $lang, $easymod_install_version, $phpBB_version, $phpbb_root_path, $script_path ; $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.' . $phpEx ; --- 365,369 ---- function get_install_info( &$variables, $prev_em_version) { ! global $phpEx, $lang, $easymod_install_version, $phpBB_version, $language, $phpbb_root_path, $script_path ; $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.' . $phpEx ; *************** *** 374,378 **** $variables['EM_EasyMOD_version'] = $lang['EM_EasyMOD_version'] ; ! $variables['LANG_OPTIONS'] = '<option value="english" selected="selected">English</option>' ; // HARD CODED $variables['GO'] = $lang['Go'] ; $variables['SQL_LAYER'] = SQL_LAYER ; --- 374,392 ---- $variables['EM_EasyMOD_version'] = $lang['EM_EasyMOD_version'] ; ! // Read lang directory and build list ! $dir = $phpbb_root_path . $script_path . 'language/'; ! $variables['LANG_OPTIONS'] = ''; ! if ($handle = opendir($dir)) ! { ! while (false !== ($file = @readdir($handle))) ! { ! if ($file != "." && $file != "..") ! { ! $selected = ($file == $language) ? 'selected="selected"': ''; ! $variables['LANG_OPTIONS'] .= '<option value="' . $file . '" ' . $selected . '>' . $file . '</option>'; ! } ! } ! } ! $variables['GO'] = $lang['Go'] ; $variables['SQL_LAYER'] = SQL_LAYER ; --- lang_easymod.php DELETED --- Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** easymod_install.php 15 Jun 2005 02:10:24 -0000 1.17 --- easymod_install.php 19 Jun 2005 22:46:41 -0000 1.18 *************** *** 77,110 **** $hidden = "<input type=\"hidden\" name=\"language\" value=\"$language\">\n" ; ! ! // load the appropriate lang pack ! if ($language == 'english') ! { ! // make sure the lang file exists ! if (!file_exists($phpbb_root_path . $script_path . 'lang_easymod.'.$phpEx)) ! { ! // display error message (obviously we can't use the lang system for this error) ;-) ! echo "<b>CRITICAL ERROR:</b> the lang_easymod.$phpEx file could not be found in the easymod directory. EasyMOD cannot be installed without this file present.\n" ; ! exit ; ! } ! ! include( $phpbb_root_path . $script_path . 'lang_easymod.'.$phpEx); ! } ! else { ! // make sure the lang file exists ! if (!file_exists($phpbb_root_path . $script_path . 'lang_easymod.'.$phpEx)) ! { ! // display error message (obviously we can't use the lang system from this ;-) ! echo "<b>CRITICAL ERROR:</b> the lang_easymod.$phpEx file could not be found in the easymod directory. EasyMOD cannot be installed without this file present.\n" ; ! exit ; ! } ! ! include( $phpbb_root_path . $script_path . 'lang_easymod.'.$phpEx); } ! ! ! ! // --------- --- 77,88 ---- $hidden = "<input type=\"hidden\" name=\"language\" value=\"$language\">\n" ; ! // make sure the lang file exists ! if (!file_exists($phpbb_root_path . $script_path . 'language/' . $language . '/lang_easymod.'.$phpEx)) { ! // display error message (obviously we can't use the lang system for this error) ;-) ! echo "<b>CRITICAL ERROR:</b> the lang_easymod.$phpEx file could not be found in the easymod directory. EasyMOD cannot be installed without this file present.\n" ; ! exit ; } ! include( $phpbb_root_path . $script_path . 'language/' . $language . '/lang_easymod.'.$phpEx); // --------- *************** *** 310,314 **** while( list($name, $paragraphs) = @each($lang['help']) ) { ! echo '<a name="' . $name . '" /><p>' . implode('<br />',$paragraphs) . "</p>\n"; } ?></span></td> --- 288,292 ---- while( list($name, $paragraphs) = @each($lang['help']) ) { ! echo '<a name="' . $name . '" /></a><p>' . implode('<br />',$paragraphs) . "</p>\n"; } ?></span></td> *************** *** 650,654 **** //////////// //////////// ! echo "<p>Write stuff about checking permissions and how to.</p>\n" ; form_settings( $hidden, 3, '', true) ; exit ; --- 628,632 ---- //////////// //////////// ! echo '<p>' . $lang['EM_checking_permissions'] . "</p>\n" ; form_settings( $hidden, 3, '', true) ; exit ; *************** *** 658,662 **** //////// hard coded lang //////// also... what is the "3" in the error?? should be a defined constant ! echo "<p>Undefined move method.</p>\n" ; form_settings( $hidden, 3, '', true) ; exit ; --- 636,640 ---- //////// hard coded lang //////// also... what is the "3" in the error?? should be a defined constant ! echo '<p>' . $lang['EM_undefined_move_method'] . "</p>\n" ; form_settings( $hidden, 3, '', true) ; exit ; *************** *** 785,796 **** $search_array['module'][] = "\$lang['Styles']" ; $insert['module'][] = '// EASYMOD-start' ; ! $insert['module'][] = "\$lang['Modifications'] = 'MOD Center';" ; $insert['module'][] = '// EASYMOD-end' ; $search_array['entries'][] = "\$lang['Restore_DB']" ; $insert['entries'][] = '// EASYMOD-start' ; ! $insert['entries'][] = "\$lang['MOD_ainstall'] = 'Install MODs';" ; ! $insert['entries'][] = "\$lang['MOD_settings'] = 'EasyMOD Settings';" ; ! $insert['entries'][] = "\$lang['MOD_history'] = 'EasyMOD History';" ; $insert['entries'][] = "\$lang['MOD_control_tag'] = '$easymod_install_version';" ; $insert['entries'][] = '// EASYMOD-end' ; --- 763,774 ---- $search_array['module'][] = "\$lang['Styles']" ; $insert['module'][] = '// EASYMOD-start' ; ! $insert['module'][] = "\$lang['Modifications'] = '" . $lang['EM_MOD_center'] . "';" ; $insert['module'][] = '// EASYMOD-end' ; $search_array['entries'][] = "\$lang['Restore_DB']" ; $insert['entries'][] = '// EASYMOD-start' ; ! $insert['entries'][] = "\$lang['MOD_install'] = '" . $lang['EM_install_MODs'] . "';" ; ! $insert['entries'][] = "\$lang['MOD_settings'] = '" . $lang['EM_settings'] . "';" ; ! $insert['entries'][] = "\$lang['MOD_history'] = '" . $lang['EM_history'] . "';" ; $insert['entries'][] = "\$lang['MOD_control_tag'] = '$easymod_install_version';" ; $insert['entries'][] = '// EASYMOD-end' ; *************** *** 808,814 **** $insert['entries'][] = '// EASYMOD-start' ; ! $insert['entries'][] = "\$lang['MOD_ainstall'] = 'Install MODs';" ; ! $insert['entries'][] = "\$lang['MOD_settings'] = 'EasyMOD Settings';" ; ! $insert['entries'][] = "\$lang['MOD_history'] = 'EasyMOD History';" ; $insert['entries'][] = "\$lang['MOD_control_tag'] = '" . $easymod_install_version . "';" ; $insert['entries'][] = '// EASYMOD-end' ; --- 786,792 ---- $insert['entries'][] = '// EASYMOD-start' ; ! $insert['entries'][] = "\$lang['MOD_install'] = '" . $lang['EM_install_MODs'] . "';" ; ! $insert['entries'][] = "\$lang['MOD_settings'] = '" . $lang['EM_settings'] . "';" ; ! $insert['entries'][] = "\$lang['MOD_history'] = '" . $lang['EM_history'] . "';" ; $insert['entries'][] = "\$lang['MOD_control_tag'] = '" . $easymod_install_version . "';" ; $insert['entries'][] = '// EASYMOD-end' ; *************** *** 825,831 **** $search_array['entries'][0] = '// EASYMOD-start' ; ! $insert['entries'][] = "\$lang['MOD_ainstall'] = 'Install MODs';" ; ! $insert['entries'][] = "\$lang['MOD_settings'] = 'EasyMOD Settings';" ; ! $insert['entries'][] = "\$lang['MOD_history'] = 'EasyMOD History';" ; $insert['entries'][] = "\$lang['MOD_control_tag'] = '" . $easymod_install_version . "';" ; } --- 803,809 ---- $search_array['entries'][0] = '// EASYMOD-start' ; ! $insert['entries'][] = "\$lang['MOD_install'] = '" . $lang['EM_install_MODs'] . "';" ; ! $insert['entries'][] = "\$lang['MOD_settings'] = '" . $lang['EM_settings'] . "';" ; ! $insert['entries'][] = "\$lang['MOD_history'] = '" . $lang['EM_history'] . "';" ; $insert['entries'][] = "\$lang['MOD_control_tag'] = '" . $easymod_install_version . "';" ; } *************** *** 1554,1558 **** $insert = "// EASYMOD-start\n" ; ! $insert .= "\$lang['Modifications'] = 'MOD Center';\n" ; $insert .= "// EASYMOD-end\n" ; write_find_array( $find_array, $file_list) ; --- 1532,1536 ---- $insert = "// EASYMOD-start\n" ; ! $insert .= "\$lang['Modifications'] = '" . $lang['EM_MOD_center'] . "';\n" ; $insert .= "// EASYMOD-end\n" ; write_find_array( $find_array, $file_list) ; *************** *** 1570,1576 **** /////////////// $insert = "// EASYMOD-start\n" ; ! $insert .= "\$lang['MOD_ainstall'] = 'Install MODs';\n" ; ! $insert .= "\$lang['MOD_settings'] = 'EasyMOD Settings';\n" ; ! $insert .= "\$lang['MOD_history'] = 'EasyMOD History';\n" ; $insert .= "\$lang['MOD_control_tag'] = '" . $easymod_install_version . "';\n" ; $insert .= "// EASYMOD-end\n" ; --- 1548,1554 ---- /////////////// $insert = "// EASYMOD-start\n" ; ! $insert .= "\$lang['MOD_install'] = '" . $lang['EM_install_MODs'] . "';" ; ! $insert .= "\$lang['MOD_settings'] = '" . $lang['EM_settings'] . "';" ; ! $insert .= "\$lang['MOD_history'] = '" . $lang['EM_history'] . "';" ; $insert .= "\$lang['MOD_control_tag'] = '" . $easymod_install_version . "';\n" ; $insert .= "// EASYMOD-end\n" ; *************** *** 1701,1705 **** if (!$found) { ! $error = $lang['EM_err_find'] . ' <b>admin_easymod.php</b> in [admin/admin_easymod.php].' ; display_error( $error) ; } --- 1679,1683 ---- if (!$found) { ! $error = $lang['EM_err_find'] . ' <b>admin_easymod.php</b> [admin/admin_easymod.php].' ; display_error( $error) ; } |
|
From: Brendan K. <bk...@us...> - 2005-06-19 22:44:57
|
Update of /cvsroot/easymod/easymod2/mods/easymod/language In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17438/language Log Message: Directory /cvsroot/easymod/easymod2/mods/easymod/language added to the repository |
|
From: Jim W. <ter...@us...> - 2005-06-15 02:10:35
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8649/mods/easymod Modified Files: easymod_install.php lang_easymod.php Log Message: - Made a few improvements to the EasyMOD Installer Help. Index: lang_easymod.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/lang_easymod.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** lang_easymod.php 12 Jun 2005 08:18:34 -0000 1.13 --- lang_easymod.php 15 Jun 2005 02:10:24 -0000 1.14 *************** *** 516,518 **** --- 516,529 ---- $lang['EM_modio_move_ftpa'] = 'FTP ERROR: could not move file [%s] to [%s]' ; + // EasyMOD Installer Help + $lang['EM_installer_help'] = 'EasyMOD Installer Help' ; + $lang['help']['topic1'][] = '<b>Caption 1</b>' ; + $lang['help']['topic1'][] = 'A translatable help could be helpful' ; + $lang['help']['topic1'][] = 'When, in lang_easymod.php, a $lang[\'help\'][\'topic\'][] is encountered, the [] means the start of a new paragraph.' ; + $lang['help']['topic2'][] = '<b>Caption 2</b>' ; + $lang['help']['topic2'][] = 'I think it\'s pretty straightfoward...' ; + $lang['help']['topic3'][] = '<b>Caption 3</b>' ; + $lang['help']['topic3'][] = 'I also hope someone makes this more relevant' ; + $lang['help']['topic3'][] = 'And when you\'re doing this, don\'t forget to modify the templates, if appropriate!' ; + ?> \ No newline at end of file Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** easymod_install.php 12 Jun 2005 08:18:24 -0000 1.16 --- easymod_install.php 15 Jun 2005 02:10:24 -0000 1.17 *************** *** 304,311 **** <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0" align="center"> <tr> ! <td class="catHead" height="28" align="center"><span class="cattitle">EasyMOD Installer Help</span></td> </tr> <tr> ! <td class="row1" align="left" valign="top"><span class="postbody"><a name="topic1"></a><b>Ummm...</b> - Still need to write the help ;-)<br /></span></td> </tr> <tr> --- 304,316 ---- <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0" align="center"> <tr> ! <td class="catHead" height="28" align="center"><span class="cattitle"><?=$lang['EM_installer_help'];?></span></td> </tr> <tr> ! <td class="row1" align="left" valign="top"><span class="postbody"><? ! while( list($name, $paragraphs) = @each($lang['help']) ) ! { ! echo '<a name="' . $name . '" /><p>' . implode('<br />',$paragraphs) . "</p>\n"; ! } ! ?></span></td> </tr> <tr> |
|
From: Jim W. <ter...@us...> - 2005-06-12 08:18:44
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10241/mods/easymod/includes Modified Files: admin_easymod.php.txt mod_sql_body.tpl Log Message: - Fixed a few language errors - Replaced a few <br>'s with <br /> Index: mod_sql_body.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_sql_body.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mod_sql_body.tpl 3 Jun 2005 22:59:12 -0000 1.2 --- mod_sql_body.tpl 12 Jun 2005 08:18:35 -0000 1.3 *************** *** 24,28 **** </tr> </table> ! <br> <!-- END drop_warning --> --- 24,28 ---- </tr> </table> ! <br /> <!-- END drop_warning --> *************** *** 47,51 **** </tr> </table> ! <br> <!-- END msaccess --> --- 47,51 ---- </tr> </table> ! <br /> <!-- END msaccess --> *************** *** 61,71 **** </tr> <tr> ! <td width="100%" align="center"><span class="gen"><b>{L_SQL_HALTED}</b><br> ! <br>{L_SQL_ERROR_EXPLAIN}<br> ! <br> ! {L_FAILED_LINE}:<br> ! {sql_error.LINE}<br> ! <br> ! {L_SQL_ERROR}: {sql_error.ERROR_CODE}<br> {sql_error.ERROR_MSG}</span></td> </tr> --- 61,71 ---- </tr> <tr> ! <td width="100%" align="center"><span class="gen"><b>{L_SQL_HALTED}</b><br /> ! <br />{L_SQL_ERROR_EXPLAIN}<br /> ! <br /> ! {L_FAILED_LINE}:<br /> ! {sql_error.LINE}<br /> ! <br /> ! {L_SQL_ERROR}: {sql_error.ERROR_CODE}<br /> {sql_error.ERROR_MSG}</span></td> </tr> *************** *** 77,81 **** </tr> </table> ! <br> <!-- END sql_error --> --- 77,81 ---- </tr> </table> ! <br /> <!-- END sql_error --> *************** *** 118,126 **** <tr> <td width="100%" align="center"><span class="gen"> ! <b>{L_SQL_PROCESS_ERROR}:</b><br> ! <b>{L_NO_SQL_PREFORMED}<br> ! <br> ! {L_FOLLOWING_ERROR}:<br> ! <br> {error.ERROR_MSG} </span></td> --- 118,126 ---- <tr> <td width="100%" align="center"><span class="gen"> ! <b>{L_SQL_PROCESS_ERROR}:</b><br /> ! <b>{L_NO_SQL_PREFORMED}<br /> ! <br /> ! {L_FOLLOWING_ERROR}:<br /> ! <br /> {error.ERROR_MSG} </span></td> Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** admin_easymod.php.txt 11 Jun 2005 23:31:32 -0000 1.14 --- admin_easymod.php.txt 12 Jun 2005 08:18:35 -0000 1.15 *************** *** 110,114 **** for ($i=0; $i<count($body); $i++) { ! // $line .= htmlspecialchars($body[$i]) . "<br>\n" ; $line .= htmlspecialchars($body[$i]) ; } --- 110,114 ---- for ($i=0; $i<count($body); $i++) { ! // $line .= htmlspecialchars($body[$i]) . "<br />\n" ; $line .= htmlspecialchars($body[$i]) ; } *************** *** 141,145 **** for ($i=0; $i<count($body); $i++) { ! // $line .= htmlspecialchars($body[$i]) . "<br>\n" ; $line .= htmlspecialchars($body[$i]) ; } --- 141,145 ---- for ($i=0; $i<count($body); $i++) { ! // $line .= htmlspecialchars($body[$i]) . "<br />\n" ; $line .= htmlspecialchars($body[$i]) ; } *************** *** 163,172 **** return ; } - - $template->assign_vars(array( - 'L_SQL_PROCESS_ERROR' => $lang['EM_sql_process_error'], - 'L_NO_SQL_PREFORMED' => $lang['EM_no_sql_preformed'], - 'L_FOLLOWING_ERROR' => $lang['EM_following_error'], - )); $template->assign_block_vars('error', array( --- 163,166 ---- *************** *** 471,475 **** // show the error(s); do this last in case file repro throw another error ! display_error( $file_list[$err]->err_msg . "<br>\n" . $lang['EM_line_num'] . $line) ; } --- 465,469 ---- // show the error(s); do this last in case file repro throw another error ! display_error( $file_list[$err]->err_msg . "<br />\n" . $lang['EM_line_num'] . $line) ; } *************** *** 680,684 **** { $get_password = true ; ! $pass_message = '<b>' . $lang['EM_err_pw_fail'] . '</b><br>' ; } } --- 674,678 ---- { $get_password = true ; ! $pass_message = '<b>' . $lang['EM_err_pw_fail'] . '</b><br />' ; } } *************** *** 992,996 **** em_db_update( 'EM_version', $em_version) ; ! message_die( GENERAL_MESSAGE, '<br>' . $lang['EM_settings_success'] . " $pass_msg<br><br>") ; } --- 986,990 ---- em_db_update( 'EM_version', $em_version) ; ! message_die( GENERAL_MESSAGE, '<br />' . $lang['EM_settings_success'] . " $pass_msg<br /><br />") ; } *************** *** 1719,1723 **** { $command_file->err_msg = $lang['EM_trace'] . ': main[1]->' . $command_file->err_msg ; ! message_die( GENERAL_ERROR, '<b>' . $lang['EM_err_critical_error'] . ':</b><br>' . $command_file->err_msg . '<br>') ; } --- 1713,1717 ---- { $command_file->err_msg = $lang['EM_trace'] . ': main[1]->' . $command_file->err_msg ; ! message_die( GENERAL_ERROR, '<b>' . $lang['EM_err_critical_error'] . ':</b><br />' . $command_file->err_msg . '<br />') ; } *************** *** 1747,1751 **** if ((count($find_array) == 0 ) && (($commands[$i]['command'] == 'BEFOREADD') || (strstr($commands[$i]['command'], 'IN-LINE')))) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $commands[$i]['command'] . $lang['EM_err_no_find'] . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } --- 1741,1745 ---- if ((count($find_array) == 0 ) && (($commands[$i]['command'] == 'BEFOREADD') || (strstr($commands[$i]['command'], 'IN-LINE')))) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $commands[$i]['command'] . $lang['EM_err_no_find'] . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } *************** *** 1777,1781 **** for ($errs=0; $errs<count($file_list); $errs++) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $file_list[$errs]->err_msg . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; } --- 1771,1775 ---- for ($errs=0; $errs<count($file_list); $errs++) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $file_list[$errs]->err_msg . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; } *************** *** 1790,1794 **** if ( count($body[$i]) != 1) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $lang['EM_err_comm_open'] . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } --- 1784,1788 ---- if ( count($body[$i]) != 1) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $lang['EM_err_comm_open'] . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } *************** *** 1842,1846 **** if ( count($search_array) == 0 ) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $lang['EM_err_comm_find'] . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } --- 1836,1840 ---- if ( count($search_array) == 0 ) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $lang['EM_err_comm_find'] . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } *************** *** 1941,1945 **** if ( count($body[$i]) != 1) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $commands[$i]['command'] . $lang['EM_err_increment_body'] . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } --- 1935,1939 ---- if ( count($body[$i]) != 1) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $commands[$i]['command'] . $lang['EM_err_increment_body'] . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } *************** *** 1949,1953 **** if (!preg_match('#(%\:\d+)\s*([\+\-]\d+)?#',trim($body[$i][0]),$inc_data)) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $commands[$i]['command'] . $lang['EM_err_increment_body'] . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break; } --- 1943,1947 ---- if (!preg_match('#(%\:\d+)\s*([\+\-]\d+)?#',trim($body[$i][0]),$inc_data)) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $commands[$i]['command'] . $lang['EM_err_increment_body'] . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break; } *************** *** 1980,1984 **** if ( count($body[$i]) != 1) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $commands[$i]['command'] . $lang['EM_err_inline_body'] . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } --- 1974,1978 ---- if ( count($body[$i]) != 1) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $commands[$i]['command'] . $lang['EM_err_inline_body'] . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; break ; } *************** *** 1987,1991 **** if (($search_fragment == '') && ($commands[$i]['command'] != 'IN-LINE FIND')) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $commands[$i]['command'] . $lang['EM_err_no_ifind'] . "<br>\n" . $lang['EM_line_num'] .$commands[$i]['line']); break ; } --- 1981,1985 ---- if (($search_fragment == '') && ($commands[$i]['command'] != 'IN-LINE FIND')) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $commands[$i]['command'] . $lang['EM_err_no_ifind'] . "<br />\n" . $lang['EM_line_num'] .$commands[$i]['line']); break ; } *************** *** 2118,2122 **** { //echo "1<br>\n" ; ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $lang['EM_err_copy_format'] . '<br>' . trim($body[$i][$j]) . "<br>\n" . $lang['EM_line_num'] .$commands[$i]['line']); $bad_copy = true ; break ; --- 2112,2116 ---- { //echo "1<br>\n" ; ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $lang['EM_err_copy_format'] . '<br />' . trim($body[$i][$j]) . "<br />\n" . $lang['EM_line_num'] .$commands[$i]['line']); $bad_copy = true ; break ; *************** *** 2128,2132 **** { //echo "2<br>\n" ; ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $lang['EM_err_copy_format'] . '<br>' . trim($body[$i][$j]) . "<br>\n" . $lang['EM_line_num'] .$commands[$i]['line']); $bad_copy = true ; break ; --- 2122,2126 ---- { //echo "2<br>\n" ; ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $lang['EM_err_copy_format'] . '<br />' . trim($body[$i][$j]) . "<br />\n" . $lang['EM_line_num'] .$commands[$i]['line']); $bad_copy = true ; break ; *************** *** 2218,2222 **** { //echo "3 [$install_path][$tmp_from_dir]<br>\n" ; ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $lang['EM_err_copy_format'] . '<br>' . trim($body[$i][$j]) . "<br>\n" . $lang['EM_line_num'] .$commands[$i]['line']); $bad_copy = true ; break ; --- 2212,2216 ---- { //echo "3 [$install_path][$tmp_from_dir]<br>\n" ; ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $lang['EM_err_copy_format'] . '<br />' . trim($body[$i][$j]) . "<br />\n" . $lang['EM_line_num'] .$commands[$i]['line']); $bad_copy = true ; break ; *************** *** 2310,2314 **** for ($errs=0; $errs<count($file_list); $errs++) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $file_list[$errs]->err_msg . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; } --- 2304,2308 ---- for ($errs=0; $errs<count($file_list); $errs++) { ! display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br /><br />\n" . $file_list[$errs]->err_msg . "<br />\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; } *************** *** 2694,2699 **** $template->assign_vars(array( 'L_SQL_DROP_WARN' => $lang['EM_sql_drop_warning'], ! 'L_URGENT_WARNING' => $lang['EM_urgent_warning'], ! )); $drop_warning = true ; } --- 2688,2693 ---- $template->assign_vars(array( 'L_SQL_DROP_WARN' => $lang['EM_sql_drop_warning'], ! 'L_URGENT_WARNING' => $lang['EM_urgent_warning']) ! ); $drop_warning = true ; } *************** *** 2717,2722 **** $template->assign_block_vars('experimental', array()); $template->assign_vars(array( ! 'L_EXPERIMENTAL_EXPLAIN' => sprintf($lang['EM_experimental_explain'], SQL_LAYER, $link) ! )); } --- 2711,2716 ---- $template->assign_block_vars('experimental', array()); $template->assign_vars(array( ! 'L_EXPERIMENTAL_EXPLAIN' => sprintf($lang['EM_experimental_explain'], SQL_LAYER, $link)) ! ); } *************** *** 2743,2746 **** --- 2737,2744 ---- 'L_NOTICE' => $lang['EM_notice'], + 'L_SQL_PROCESS_ERROR' => $lang['EM_sql_process_error'], + 'L_NO_SQL_PREFORMED' => $lang['EM_no_sql_preformed'], + 'L_FOLLOWING_ERROR' => $lang['EM_following_error'], + 'THEMES' => $themes, 'LANGUAGES' => $languages, *************** *** 2813,2817 **** //echo "[" . $error['message'] . "][" . $error['code'] . "]<br>\n" ; //exit ; - // load up an error message $template->assign_block_vars( 'sql_error', array( --- 2811,2814 ---- *************** *** 2821,2829 **** ); $template->assign_vars(array( ! 'L_SQL_ERROR' => $lang['EM_sql_msaccess_warning'], 'L_SQL_ERROR_EXPLAIN' => $lang['EM_sql_error_explain'], 'L_FAILED_LINE' => $lang['EM_failed_line'], ! 'L_SQL_HALTED' => $lang['EM_sql_halted'], ! )); } else --- 2818,2826 ---- ); $template->assign_vars(array( ! 'L_SQL_ERROR' => $lang['EM_sql_error'], 'L_SQL_ERROR_EXPLAIN' => $lang['EM_sql_error_explain'], 'L_FAILED_LINE' => $lang['EM_failed_line'], ! 'L_SQL_HALTED' => $lang['EM_sql_halted']) ! ); } else *************** *** 2956,2961 **** if (( !$command_file->modio_open(true)) || ( !$command_bat->modio_open(true))) { ! $command_file->err_msg = $lang['EM_trace'] . ':<br> main[2]->' . $command_file->err_msg ; ! message_die( GENERAL_ERROR, '<br>' . $lang['EM_err_open_pp'] . '<br>' . $lang['EM_err_cwd'] . ': ' . getcwd() . '<br>') ; } --- 2953,2958 ---- if (( !$command_file->modio_open(true)) || ( !$command_bat->modio_open(true))) { ! $command_file->err_msg = $lang['EM_trace'] . ':<br /> main[2]->' . $command_file->err_msg ; ! message_die( GENERAL_ERROR, '<br />' . $lang['EM_err_open_pp'] . '<br />' . $lang['EM_err_cwd'] . ': ' . getcwd() . '<br />') ; } *************** *** 2965,2969 **** { $command_file->err_msg = $lang['EM_trace'] . ': main[3]->' . $command_file->err_msg ; ! message_die( GENERAL_ERROR, '<b>' . $lang['EM_err_critical_error'] . ':</b><br> ' . $command_file->err_msg . '<br>') ; } // share FTP attributes with the bat file --- 2962,2966 ---- { $command_file->err_msg = $lang['EM_trace'] . ': main[3]->' . $command_file->err_msg ; ! message_die( GENERAL_ERROR, '<b>' . $lang['EM_err_critical_error'] . ':</b><br /> ' . $command_file->err_msg . '<br />') ; } // share FTP attributes with the bat file *************** *** 3027,3031 **** if ($ret_value == '') { ! message_die( GENERAL_ERROR, '<b>' . $lang['EM_err_critical_error'] . ':</b> ' . $command_file->err_msg . '<br>' . $lang['EM_err_attempt_remainder'] . '<br>') ; } --- 3024,3028 ---- if ($ret_value == '') { ! message_die( GENERAL_ERROR, '<b>' . $lang['EM_err_critical_error'] . ':</b> ' . $command_file->err_msg . '<br />' . $lang['EM_err_attempt_remainder'] . '<br />') ; } *************** *** 3124,3128 **** if ((!$command_file->modio_close(true)) || (!$command_bat->modio_close(true))) { ! message_die( GENERAL_ERROR, '<br>' . $lang['EM_err_write_pp'] . '<br>' . $lang['EM_err_cwd'] . ': ' . getcwd() . '<br>') ; } --- 3121,3125 ---- if ((!$command_file->modio_close(true)) || (!$command_bat->modio_close(true))) { ! message_die( GENERAL_ERROR, '<br />' . $lang['EM_err_write_pp'] . '<br />' . $lang['EM_err_cwd'] . ': ' . getcwd() . '<br />') ; } |
|
From: Jim W. <ter...@us...> - 2005-06-12 08:18:44
|
Update of /cvsroot/easymod/easymod2/mods/easymod/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10241/mods/easymod/templates Modified Files: ftp_settings.tpl Log Message: - Fixed a few language errors - Replaced a few <br>'s with <br /> Index: ftp_settings.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/ftp_settings.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ftp_settings.tpl 5 Jun 2005 23:37:05 -0000 1.3 --- ftp_settings.tpl 12 Jun 2005 08:18:35 -0000 1.4 *************** *** 27,31 **** </tr> <tr> ! <th colspan="2">{{EM_ftp_advance_settings}} Advanced FTP Settings (optional!)</th> </tr> <tr> --- 27,31 ---- </tr> <tr> ! <th colspan="2">{{EM_ftp_advance_settings}}</th> </tr> <tr> |
|
From: Jim W. <ter...@us...> - 2005-06-12 08:18:43
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10241/mods/easymod Modified Files: easymod_install.php lang_easymod.php Log Message: - Fixed a few language errors - Replaced a few <br>'s with <br /> Index: lang_easymod.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/lang_easymod.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** lang_easymod.php 11 Jun 2005 23:36:52 -0000 1.12 --- lang_easymod.php 12 Jun 2005 08:18:34 -0000 1.13 *************** *** 86,89 **** --- 86,92 ---- $lang['EM_support_thread'] = 'Support' ; $lang['EM_EMC'] = 'EMC' ; + $lang['EM_lang_german'] = 'The file language/lang_german/lang_admin.php was not found. Do you have the German language pack installed? If not, then you should simply delete the language/lang_german directory and all the files inside of it. This problem is frequently caused by the popular Attachment MOD which can create a lang_german folder regardless of whether the language is present or not. If this is not the case, then visit our support forum for more help.'; + $lang['EM_undefined_write'] = 'Undefined write method.'; + $lang['EM_check_permissions'] = 'Write stuff about checking permissions and how to.'; // Preview Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** easymod_install.php 11 Jun 2005 23:31:32 -0000 1.15 --- easymod_install.php 12 Jun 2005 08:18:24 -0000 1.16 *************** *** 535,539 **** //////////// //////////// ! echo "<p>Write stuff about checking permissions and how to.</p>\n" ; form_settings( $hidden, 3, '', true) ; exit ; --- 535,539 ---- //////////// //////////// ! echo "<p>".$lang['EM_check_permissions']."</p>\n" ; form_settings( $hidden, 3, '', true) ; exit ; *************** *** 569,573 **** //////// hard coded lang //////// also... what is the "3" in the error?? should be a defined constant ! echo "<p>Undefined write method.</p>\n" ; form_settings( $hidden, 3, '', true) ; exit ; --- 569,573 ---- //////// hard coded lang //////// also... what is the "3" in the error?? should be a defined constant ! echo "<p>".$lang['EM_undefined_write']."</p>\n" ; form_settings( $hidden, 3, '', true) ; exit ; *************** *** 752,756 **** { /// hard coded lang ! display_error('The file language/lang_german/lang_admin.php was not found. Do you have the German language pack installed? If not, then you should simply delete the language/lang_german directory and all the files inside of it. This problem is frequently caused by the popular Attachment MOD which can create a lang_german folder regardless of whether the language is present or not. If this is not the case, then visit our support forum for more help.') ; } } --- 752,756 ---- { /// hard coded lang ! display_error($lang['EM_lang_german']) ; } } |
|
From: Eric F. <wg...@us...> - 2005-06-11 23:37:01
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22412/mods/easymod Modified Files: lang_easymod.php Log Message: Removed duplicate entry which I forgot in the previous commits I have done today :( Index: lang_easymod.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/lang_easymod.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** lang_easymod.php 11 Jun 2005 23:31:32 -0000 1.11 --- lang_easymod.php 11 Jun 2005 23:36:52 -0000 1.12 *************** *** 363,367 **** $lang['EM_ftp_root'] = 'FTP root directory:' ; $lang['EM_dir_list'] = 'Directory listing:</b> your FTP Path should start with one of the directories listed below' ; - $lang['EM_fail_pwd'] = 'FTP ERROR: could not pwd' ; $lang['EM_fail_put'] = 'FTP ERROR: could not write to phpBB root' ; $lang['EM_fail_put_info'] = 'EasyMOD requires that your <b>%s</b> account have write access on all directories and files in the phpBB directory. Please confirm all files and directories are set to at least 744 access.' ; --- 363,366 ---- |
|
From: Eric F. <wg...@us...> - 2005-06-11 23:34:38
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20897/mods/easymod/includes Added Files: mod_history_details.tpl Log Message: bleh, forgot to add this --- NEW FILE: mod_history_details.tpl --- <form action="{S_ACTION}" method="post"> <table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline" width="100%"> <tr> <th class="thCornerL" colspan="2" width="100%">{L_MOD_DATA}</th> </tr> <tr> <td class="row1" align="left" width="25%"><span class="gen">{L_MOD_TITLE}:</span></td> <td class="row2" align="left" width="75%"><span class="gen">{TITLE} {VERSION} {MOD_FILE}</span></td> </tr> <tr> <td class="row1" align="left" width="25%"><span class="gen">{L_MOD_DESCRIPTION}:</span></td> <td class="row2" align="left" width="75%"><span class="gen">{DESCRIPTION}</span></td> </tr> <tr> <td class="row1" align="left" width="25%"><span class="gen">{L_AUTHOR}:</span></td> <td class="row2" align="left" width="75%"><span class="gen">{AUTHOR} <a href="mailto:{EMAIL}">{EMAIL}</a> {REAL_NAME} <a href="{URL}" target="_blank">{URL}</a></span></td> </tr> <tr> <td class="row1" align="left" width="25%"><span class="gen">{L_INSTALL_DATE}:</span></td> <td class="row2" align="left" width="75%"><span class="gen">{DATE}</span></td> </tr> <tr> <td class="row1" align="left" width="25%"><span class="gen">{L_PHPBB_VER}:</span></td> <td class="row2" align="left" width="75%"><span class="gen">{PHPBB_VERSION}</span></td> </tr> <tr> <td class="row1" align="left" width="25%"><span class="gen">{L_THEMES}:</span></td> <td class="row2" align="left" width="75%"><span class="gen">{THEMES}</span></td> </tr> <tr> <td class="row1" align="left" width="25%"><span class="gen">{L_LANGUAGES}:</span></td> <td class="row2" align="left" width="75%"><span class="gen">{LANGUAGES}</span></td> </tr> <tr> <td class="row1" align="left" width="25%"><span class="gen">{L_FILES}:</span></td> <td class="row2" align="left" width="75%"><span class="gen">{FILES}</span></td> </tr> <tr> <tr> <td class="row1" align="left" width="25%"><span class="gen">{L_DB_ALTS}:</span></td> <td class="row2" align="left" width="75%"><span class="gen">{L_ADDED}: {ADDED} {L_ALTERED}: {ALTERED} {L_INSERTED}: {INSERTED}</span></td> </tr> <tr> <td class="catbottom" align="center" colspan="2"> <select name="mode" class="post"> <!-- BEGIN switch_files --> <option value="del_files">{L_DELETE_FILES}</option> <!-- END switch_files --> <option value="del_record">{L_DELETE_RECORD}</option> <!-- BEGIN switch_backups --> <option value="restore_backups">{L_RESTORE_BACKUPS}</option> <!-- END switch_backups --> <!-- BEGIN switch_install_file --> <option value="install_lang">{L_INSTALL_LANG}</option> <option value="install_themes">{L_INSTALL_THEMES}</option> <option value="uninstall">{L_UNISTALL}</option> <!-- END switch_install_file --> </select> {S_HIDDEN_FIELDS} <input type="submit" name="submit" value="{L_GO}" class="mainoption"> </td> </tr> </table> </form> |
|
From: Eric F. <wg...@us...> - 2005-06-11 23:31:43
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19046/mods/easymod Modified Files: easymod_install.php lang_easymod.php Log Message: - Fixed some language bugs - Added a details page to the history that I wrote a long time ago Index: lang_easymod.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/lang_easymod.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** lang_easymod.php 11 Jun 2005 23:05:53 -0000 1.10 --- lang_easymod.php 11 Jun 2005 23:31:32 -0000 1.11 *************** *** 41,44 **** --- 41,57 ---- $lang['EM_installed_desc'] = 'All of these MODs have been installed at one time or another on your board. In later versions you will be able to get more details or uninstall the MODs from here.' ; $lang['EM_install_date'] = 'Installed' ; + $lang['EM_details'] = 'Details'; + $lang['EM_No_mod_selected'] = 'No MOD selected. Please go back and select one.'; + $lang['EM_tables_added'] = 'Tables Added'; + $lang['EM_tables_altered'] = 'Tables Altered'; + $lang['EM_rows_added'] = 'Rows Added'; + $lang['EM_db_alt'] = 'Database Alterations'; + $lang['EM_del_files'] = 'Delete MOD Files'; + $lang['EN_del_record'] = 'Delete MOD Record'; + $lang['EM_install_new_lang'] = 'Install MOD on new languages'; + $lang['EM_install_new_themes'] = 'Install MOD on new themes'; + $lang['EM_restore_backups'] = 'Restore Backups'; + $lang['EM_uninstall'] = 'Uninstall MOD'; + $lang['Comming_soon'] = 'Comming Soon!'; // settings *************** *** 182,185 **** --- 195,200 ---- $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>.'; + $lang['EM_simple_mode'] = 'Simple Mode'; + $lang['EM_advanced_mode'] = 'Advanced Mode'; // translate this and I'll hardcode the message into easymod_install.php *************** *** 252,256 **** $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'; --- 267,271 ---- $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'; Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** easymod_install.php 11 Jun 2005 23:05:53 -0000 1.14 --- easymod_install.php 11 Jun 2005 23:31:32 -0000 1.15 *************** *** 919,922 **** --- 919,923 ---- $command_file->afile[] = 'copy includes/mod_header.tpl ../../../' . $files[$i]['path'] . 'mod_header.tpl' ; $command_file->afile[] = 'copy includes/mod_history.tpl ../../../' . $files[$i]['path'] . 'mod_history.tpl' ; + $command_file->afile[] = 'copy includes/mod_history_details.tpl ../../../' . $files[$i]['path'] . 'mod_history_details.tpl'; $command_file->afile[] = 'copy includes/mod_install.tpl ../../../' . $files[$i]['path'] . 'mod_install.tpl' ; $command_file->afile[] = 'copy includes/mod_login.tpl ../../../' . $files[$i]['path'] . 'mod_login.tpl' ; |
|
From: Eric F. <wg...@us...> - 2005-06-11 23:31:41
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19046/mods/easymod/includes Modified Files: admin_easymod.php.txt mod_history.tpl Log Message: - Fixed some language bugs - Added a details page to the history that I wrote a long time ago Index: mod_history.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_history.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mod_history.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- mod_history.tpl 11 Jun 2005 23:31:32 -0000 1.2 *************** *** 22,26 **** <td width="20%" class="{install.ROW_CLASS}" align="left"><span class="gen">{install.THEMES}</span></td> <td width="15%" class="{install.ROW_CLASS}" align="left"><span class="gen">{install.LANGS}</span></td> ! <td width="5%" class="{install.ROW_CLASS}" align="center"><span class="gensmall">details</span></td> </tr> <!-- END install --> --- 22,31 ---- <td width="20%" class="{install.ROW_CLASS}" align="left"><span class="gen">{install.THEMES}</span></td> <td width="15%" class="{install.ROW_CLASS}" align="left"><span class="gen">{install.LANGS}</span></td> ! <td width="5%" class="{install.ROW_CLASS}" align="center"> ! <form action="{install.S_ACTION}" method="post"> ! {install.S_HIDDEN_FIELDS} ! <input type="submit" name="submit" value="{S_DETAILS}" class="liteoption"> ! </form> ! </td> </tr> <!-- END install --> Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin_easymod.php.txt 11 Jun 2005 23:05:54 -0000 1.13 --- admin_easymod.php.txt 11 Jun 2005 23:31:32 -0000 1.14 *************** *** 660,664 **** ($mode != 'display_backup') && ($mode != 'download_backup') && ($mode != 'SQL_view') && ($mode != 'SQL_execute') && ! ($mode != 'update') && ($mode != 'process') && ($mode != 'post_process') && ($mode != 'diy_process')) { $mode = 'install' ; --- 660,665 ---- ($mode != 'display_backup') && ($mode != 'download_backup') && ($mode != 'SQL_view') && ($mode != 'SQL_execute') && ! ($mode != 'update') && ($mode != 'process') && ($mode != 'post_process') && ($mode != 'diy_process') && ! ($mode != 'history_details') && ($mode != 'del_files') && ($mode != 'del_record') && ($mode != 'restore_backups') && ($mode != 'install_lang') && ($mode != 'install_themes') && ($mode != 'uninstall')) { $mode = 'install' ; *************** *** 1019,1023 **** 'L_THEMES' => $lang['EM_Themes'], 'L_LANGUAGES' => $lang['EM_Languages'], ! 'L_NONE_INSTALLED' => $lang['EM_none_installed']) ); --- 1020,1025 ---- 'L_THEMES' => $lang['EM_Themes'], 'L_LANGUAGES' => $lang['EM_Languages'], ! 'L_NONE_INSTALLED' => $lang['EM_none_installed'], ! 'S_DETAILS' => $lang['EM_details']) ); *************** *** 1044,1047 **** --- 1046,1053 ---- 'URL' => $row['mod_author_url'], 'PHPBB_VER' => $row['mod_phpBB_version'], + + 'S_ACTION' => append_sid('admin_easymod.' . $phpEx), + 'S_HIDDEN_FIELDS' => '<input type="hidden" name="mod_id" value="' . $row['mod_id'] . '"><input type="hidden" name="mode" value="history_details"><input type="hidden" name="password" value="' . $password . '">', + ///////////////// ///////////////// blah, what about schema name? *************** *** 1058,1061 **** --- 1064,1230 ---- } + // + // history details + // + else if ( $mode == 'history_details' ) + { + // get the mod id + if ( isset($HTTP_POST_VARS['mod_id']) ) + { + $mod_id = intval($HTTP_POST_VARS['mod_id']); + } + else + { + message_die(GENERAL_ERROR, $lang['EM_No_mod_selected']); + } + + // load the template + $template->set_filenames(array( + "body" => "admin/mod_history_details.tpl") + ); + + $template->assign_vars(array( + 'L_MOD_DATA' => $lang['EM_Mod_Data'], + 'L_MOD_TITLE' => $lang['EM_Mod_Title'], + 'L_MOD_DESCRIPTION' => $lang['EM_Description'], + 'L_AUTHOR' => $lang['EM_Author'], + 'L_INSTALL_DATE' => $lang['EM_install_date'], + 'L_PHPBB_VER' => $lang['EM_phpBB_Version'], + 'L_THEMES' => $lang['EM_Proc_Themes'], + 'L_LANGUAGES' => $lang['EM_Proc_Languages'], + 'L_FILES' => $lang['EM_Files'], + 'L_DB_ALTS' => $lang['EM_db_alt'], + 'L_ADDED' => $lang['EM_tables_added'], + 'L_ALTERED' => $lang['EM_tables_altered'], + 'L_INSERTED' => $lang['EM_rows_added'], + + 'L_DELETE_FILES' => $lang['EM_del_files'], + 'L_DELETE_RECORD' => $lang['EN_del_record'], + 'L_INSTALL_LANG' => $lang['EM_install_new_lang'], + 'L_INSTALL_THEMES' => $lang['EM_install_new_themes'], + 'L_RESTORE_BACKUPS' => $lang['EM_restore_backups'], + 'L_UNISTALL' => $lang['EM_uninstall'], + 'L_GO' => $lang['Go'], + + 'S_ACTION' => append_sid($phpbb_root_path . 'admin/admin_easymod.'.$phpEx), + 'S_HIDDEN_FIELDS' => '<input type="hidden" name="mod_id" value="' . $mod_id . '"><input type="hidden" name="password" value="' . $password . '">') + ); + + $sql = "SELECT * FROM " . EASYMOD_TABLE . " + WHERE mod_id = $mod_id + LIMIT 0, 1"; + + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, $lang['EM_err_em_info'], '', __LINE__, __FILE__, $sql); + } + + $row = $db->sql_fetchrow($result); + + // file + $file = explode('/', $row['mod_file']); + + if ( file_exists('./mods/' . $row['mod_file']) ) + { + $temp_url = $phpbb_root_path . 'admin/mods/' . $row['mod_file']; + $mod_file = '<a href="' . $temp_url . '" class="gen" target="_blank">' . $file[1] . '</a>'; + + $template->assign_block_vars('switch_install_file', array()); + } + else + { + $mod_file = $file[1]; + } + + // see what files are there so we can work with them + if ( file_exists('./mods/' . $file[0] . '/processed/') || file_exists('./mods/' . $file[0]. '/backups/') ) + { + $template->assign_block_vars('switch_files', array()); + } + // see if backups are there so we can give them the option to restore them + if ( file_exists('./mods/' . $file[0]. '/backups/') ) + { + $template->assign_block_vars('switch_backups', array()); + } + + $template->assign_vars(array( + 'TITLE' => $row['mod_title'], + 'VERSION' => $row['mod_version'], + 'MOD_FILE' => $mod_file, + 'DESCRIPTION' => $row['mod_description'], + 'AUTHOR' => $row['mod_author_handle'], + 'EMAIL' => $row['mod_author_email'], + 'REAL_NAME' => $row['mod_author_name'], + 'URL' => $row['mod_author_url'], + 'DATE' => create_date($board_config['default_dateformat'], $row['mod_process_date'], $board_config['board_timezone']), + 'PHPBB_VERSION' => $row['mod_phpBB_version'], + 'THEMES' => $row['mod_processed_themes'], + 'LANGUAGES' => $row['mod_processed_langs'], + 'FILES' => $row['mod_files_edited'], + 'ADDED' => $row['mod_tables_added'], + 'ALTERED' => $row['mod_tables_altered'], + 'INSERTED' => $row['mod_rows_inserted']) + ); + + } + + // + // delete MOD files + // + else if ( $mode == 'del_files' ) + { + // display which folders to delete, either + // processed, backups, or the complete folder + message_die(GENERAL_MESSAGE, $lang['Comming_soon']); + + } + + // + // delete MOD record + // + else if ( $mode == 'del_record' ) + { + // display confirm and delete sql entry + message_die(GENERAL_MESSAGE, $lang['Comming_soon']); + + } + + // + // Restore Backups + // + else if ( $mode == 'restore_backups' ) + { + // display confirm and move the backups into place + message_die(GENERAL_ERROR, $lang['Comming_soon']); + + } + + // + // Install MOD on new Languages + // + else if ( $mode == 'install_lang' ) + { + // list which languages so user can choose and go through install process + message_die(GENERAL_ERROR, $lang['Comming_soon']); + + } + + // + // Install MOD on new themes + // + else if ( $mode == 'install_themes' ) + { + // list which themes so user can choose and go through install process + message_die(GENERAL_ERROR, $lang['Comming_soon']); + + } + + // + // uninstall the mod + // + else if ( $mode == 'unistall_mod' ) + { + message_die(GENERAL_MESSAGE, $lang['Comming_soon']); + } // |
|
From: Eric F. <wg...@us...> - 2005-06-11 23:31:41
|
Update of /cvsroot/easymod/easymod2/mods/easymod/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19046/mods/easymod/templates Modified Files: step1_simple.tpl Log Message: - Fixed some language bugs - Added a details page to the history that I wrote a long time ago Index: step1_simple.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1_simple.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** step1_simple.tpl 5 Jun 2005 23:37:05 -0000 1.2 --- step1_simple.tpl 11 Jun 2005 23:31:32 -0000 1.3 *************** *** 1,3 **** ! <span class="gen">{{EM_simple_mode}} :: <a href="easymod_install.php?setup=advanced">{{EM_advance_mode}}</a></span><br> <table width="100%" border="1" cellpadding="5"> <tr> --- 1,3 ---- ! <span class="gen">{{EM_simple_mode}} :: <a href="easymod_install.php?setup=advanced">{{EM_advanced_mode}}</a></span><br> <table width="100%" border="1" cellpadding="5"> <tr> |
|
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 ; } |
|
From: Eric F. <wg...@us...> - 2005-06-11 23:06:10
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5948/mods/easymod/includes Modified Files: admin_easymod.php.txt mod_header.tpl Removed Files: empw.php.txt emver.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: mod_header.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_header.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mod_header.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- mod_header.tpl 11 Jun 2005 23:05:54 -0000 1.2 *************** *** 3,7 **** <td align="center" width="100%"> <h1>{L_TITLE}</h1> ! <span class="gen">{L_EM_VERSION} by {NUTTZY}</span> </td> </tr></table> --- 3,7 ---- <td align="center" width="100%"> <h1>{L_TITLE}</h1> ! <span class="gen">{L_EM_VERSION}</span> </td> </tr></table> --- empw.php.txt DELETED --- --- emver.php DELETED --- Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** admin_easymod.php.txt 8 Jun 2005 03:12:20 -0000 1.12 --- admin_easymod.php.txt 11 Jun 2005 23:05:54 -0000 1.13 *************** *** 4,9 **** * ------------------- * begin : Sunday Mar 31, 2002 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall ! * email : nu...@bl... * * $Id$ --- 4,9 ---- * ------------------- * begin : Sunday Mar 31, 2002 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall, 2005 The phpBB Group ! * email : su...@ph... * * $Id$ *************** *** 88,92 **** /// define('EASYMOD_VER', 'beta1 (0.2.0)') ; - define('NUTTZY_LINK', '<a href="http://www.spellingcow.com" target="_blank">Nuttzy</a>') ; define('FAQ_LINK', '<a href="http://area51.phpbb.com/phpBB22/viewtopic.php?t=12141" target="_blank">') ; define('REPORT_LINK', '<a href="http://area51.phpbb.com/phpBB22/viewtopic.php?t=12143" target="_blank">') ; --- 88,91 ---- *************** *** 813,818 **** $template->assign_vars(array( 'L_TITLE' => $lang['EM_Title'], ! 'L_EM_VERSION' => EASYMOD_VER, ! 'NUTTZY' => NUTTZY_LINK) ); --- 812,816 ---- $template->assign_vars(array( 'L_TITLE' => $lang['EM_Title'], ! 'L_EM_VERSION' => EASYMOD_VER) ); *************** *** 2170,2183 **** display_unprocessed_line( $commands[$i], $body[$i]) ; } - - ///////////////////// - ///////////////////// emsql - say that we can't do it - ///////////////////// - /* - if ( $commands[$i]['command'] == 'SQL' ) - { - $display_sql_warning = true ; - } - */ } --- 2168,2171 ---- *************** *** 2194,2231 **** $command_file->modio_cleanup('move') ; - ///////////////////// - ///////////////////// emcopy - say that we can't do it - ///////////////////// - /* - - CAN GET RID OF THIS NOW! - - if (($display_copy_warning) && ($mode != 'display_file') && ($mode != 'download_file')) - { - $template->assign_block_vars('error', array( - 'L_TITLE' => 'v0.0.10 COPY Warning', - 'ERROR_MESSAGE' => '<b>COPY not performed:</b> in version 0.0.10 of EM the COPY command can only COPY one file at a time. It cannot COPY *.* or entire directories (yet). The MOD you are installing is attempting to do this. You will have to manually copy these files.') - ) ; - } - */ - - ///////////////////// - ///////////////////// emsql - say that we can't do it - ///////////////////// - /* - - CAN GET RID OF THIS NOW! - - if (($display_sql_warning) && ($mode != 'display_file') && ($mode != 'download_file')) - { - $template->assign_block_vars('error', array( - 'L_TITLE' => 'SQL Notice', - 'ERROR_MESSAGE' => '<b>SQL not performed:</b> SQL commands are not performed automatically in this version of EM. The MOD you are installing wants to perform an SQL command. You will have to manually execute this the old fashion way. If you do not know how, ask the MOD author, not Nuttzy!') - ) ; - } - */ - - - // // we will now finish up the download or display file if that's what we're doing --- 2182,2185 ---- |
|
From: Eric F. <wg...@us...> - 2005-06-11 23:06:09
|
Update of /cvsroot/easymod/easymod2/mods/easymod/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5948/mods/easymod/templates Modified Files: page_header.tpl Log Message: - Changed copyright - Change <br> to <br /> - Removed some more hardcoded text - Removed the password and version change files - Other minor changes Index: page_header.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/page_header.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** page_header.tpl 5 Jun 2005 23:37:05 -0000 1.2 --- page_header.tpl 11 Jun 2005 23:05:54 -0000 1.3 *************** *** 6,10 **** <tr> <td><img src="easymod.gif" border="0" alt="EasyMOD" vspace="1" /></td> ! <td align="center" width="100%" valign="middle"><span class="maintitle">{{TITLE}}</span><br>{{BY}}</td> </tr> </table></td> --- 6,10 ---- <tr> <td><img src="easymod.gif" border="0" alt="EasyMOD" vspace="1" /></td> ! <td align="center" width="100%" valign="middle"><span class="maintitle">{{TITLE}}</span></td> </tr> </table></td> |
|
From: Eric F. <wg...@us...> - 2005-06-11 23:06:09
|
Update of /cvsroot/easymod/easymod2/mods/easymod/em_includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5948/mods/easymod/em_includes Modified Files: em_cipher.php em_ftp.php em_functions.php em_modio.php em_schema.php Removed Files: emver.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: em_ftp.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_ftp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** em_ftp.php 1 May 2005 07:21:14 -0000 1.2 --- em_ftp.php 11 Jun 2005 23:05:53 -0000 1.3 *************** *** 4,9 **** * ------------------- * begin : Tuesday, Dec 10, 2003 ! * copyright : (C) 2002-2004 Nuttzy - Craig Nuttall ! * email : nu...@bl... * * $Id$ --- 4,9 ---- * ------------------- * begin : Tuesday, Dec 10, 2003 ! * copyright : (C) 2002-2004 Nuttzy - Craig Nuttall, 2005 The phpBB Group ! * email : su...@ph... * * $Id$ *************** *** 45,55 **** { // failed to connect! ! echo "<br>\n" ; ! echo '<b>' . sprintf($lang['EM_ftp_fail_conn'], $ftp_host, $ftp_port) . "</b><br>\n" ; // they may need to specify the host if ($ftp_host == 'localhost') { ! echo $lang['EM_ftp_fail_conn_lh'] . "<br>\n" ; } --- 45,55 ---- { // failed to connect! ! echo "<br />\n" ; ! echo '<b>' . sprintf($lang['EM_ftp_fail_conn'], $ftp_host, $ftp_port) . "</b><br />\n" ; // they may need to specify the host if ($ftp_host == 'localhost') { ! echo $lang['EM_ftp_fail_conn_lh'] . "<br />\n" ; } *************** *** 57,61 **** else if ($ftp_port == 21) { ! echo $lang['EM_ftp_fail_conn_21'] . "<br>\n"; } --- 57,61 ---- else if ($ftp_port == 21) { ! echo $lang['EM_ftp_fail_conn_21'] . "<br />\n"; } *************** *** 66,71 **** if ((strstr($ftp_host, '/')) || (strstr($ftp_host, '\\')) || (strstr($ftp_host, ':'))) { ! echo $lang['EM_ftp_fail_conn_invalid'] . "<br>\n" ; ! echo "<br>\n" ; } --- 66,71 ---- if ((strstr($ftp_host, '/')) || (strstr($ftp_host, '\\')) || (strstr($ftp_host, ':'))) { ! echo $lang['EM_ftp_fail_conn_invalid'] . "<br />\n" ; ! echo "<br />\n" ; } *************** *** 73,86 **** else if (intval($ftp_port) == $ftp_port) { ! echo $lang['EM_ftp_fail_conn_invalid2'] . "<br>\n"; ! echo "<br>\n"; } // give them options ! echo $lang['EM_fail_conn_info'] . "<br><ol>\n" ; ! echo '<li>' . $lang['EM_fail_conn_op1'] . "\n" ; ! echo '<li>' . $lang['EM_fail_conn_op2'] . "\n" ; ! echo '<li>' . $lang['EM_fail_conn_op3'] . "\n" ; ! echo '<li>' . $lang['EM_fail_conn_op4'] . "\n" ; echo "</ol>\n" ; } --- 73,86 ---- else if (intval($ftp_port) == $ftp_port) { ! echo $lang['EM_ftp_fail_conn_invalid2'] . "<br />\n"; ! echo "<br />\n"; } // give them options ! echo $lang['EM_fail_conn_info'] . "<br /><ol>\n" ; ! echo '<li>' . $lang['EM_fail_conn_op1'] . "</li>\n" ; ! echo '<li>' . $lang['EM_fail_conn_op2'] . "</li>\n" ; ! echo '<li>' . $lang['EM_fail_conn_op3'] . "</li>\n" ; ! echo '<li>' . $lang['EM_fail_conn_op4'] . "</li>\n" ; echo "</ol>\n" ; } *************** *** 96,104 **** $emftp->ftp_quit() ; ! echo "<br>\n" ; ! echo '<b>' . $lang['EM_fail_login'] . "</b><br>" ; // give them options ! echo $lang['EM_fail_login_info'] . "<br><ol>\n" ; // check user/pass --- 96,104 ---- $emftp->ftp_quit() ; ! echo "<br />\n" ; ! echo '<b>' . $lang['EM_fail_login'] . "</b><br />" ; // give them options ! echo $lang['EM_fail_login_info'] . "<br /><ol>\n" ; // check user/pass *************** *** 120,129 **** ! echo $lang['EM_test_ftp1']. "<br>\n" ; // if we are in debug mode, then get a dir listing before we start moving around if ($ftp_debug) { ! echo '<b>PWD:</b> ' . $emftp->ftp_pwd() . "<br>\n"; ////// --- 120,129 ---- ! echo $lang['EM_test_ftp1']. "<br />\n" ; // if we are in debug mode, then get a dir listing before we start moving around if ($ftp_debug) { ! echo '<b>PWD:</b> ' . $emftp->ftp_pwd() . "<br />\n"; ////// *************** *** 132,139 **** $list = $emftp->ftp_nlist(); ! echo '<b>Dir listing:</b> (' . count($list) . " files being listed)<br>\n"; for ($i=0; $i<count($list); $i++) { ! echo '[' . $list[$i] . "]<br>\n" ; } } --- 132,139 ---- $list = $emftp->ftp_nlist(); ! echo '<b>Dir listing:</b> (' . count($list) . " files being listed)<br />\n"; for ($i=0; $i<count($list); $i++) { ! echo '[' . $list[$i] . "]<br />\n" ; } } *************** *** 142,154 **** if (!$pwd = $emftp->ftp_chdir( $ftp_dir . '/admin/mods/easymod')) { ! echo "<br>\n" ; ! echo '<b>' . sprintf($lang['EM_fail_cd'], $ftp_dir) . "</b><br>\n" ; ! echo $lang['EM_fail_cd_info'] . "<br><ol><br>\n" ; // some dopes put the ftp server in the paths if ((strstr($ftp_dir, '.com')) || (strstr($ftp_dir, '.net')) || (strstr($ftp_dir, '.org'))) { ! echo '<li>' . $lang['EM_fail_cd_op1'] . "\n" ; } --- 142,154 ---- if (!$pwd = $emftp->ftp_chdir( $ftp_dir . '/admin/mods/easymod')) { ! echo "<br />\n" ; ! echo '<b>' . sprintf($lang['EM_fail_cd'], $ftp_dir) . "</b><br />\n" ; ! echo $lang['EM_fail_cd_info'] . "<br /><ol><br />\n" ; // some dopes put the ftp server in the paths if ((strstr($ftp_dir, '.com')) || (strstr($ftp_dir, '.net')) || (strstr($ftp_dir, '.org'))) { ! echo '<li>' . $lang['EM_fail_cd_op1'] . "</li>\n" ; } *************** *** 156,172 **** if (substr($ftp_dir, strlen($ftp_dir)-1) == '/') { ! echo '<li>' . $lang['EM_fail_cd_op2'] . "\n" ; } // everything else ! echo '<li>' . $lang['EM_fail_cd_op3'] . "\n" ; ! echo '<li>' . $lang['EM_fail_cd_op4'] . "\n" ; if ($ftp_host == 'localhost' || $ftp_port == 21) { ! echo '<li>' . $lang['EM_fail_cd_op5'] . "\n" ; } ! echo '<li>' . $lang['EM_fail_cd_op6'] . "\n" ; echo "</ol>\n" ; --- 156,172 ---- if (substr($ftp_dir, strlen($ftp_dir)-1) == '/') { ! echo '<li>' . $lang['EM_fail_cd_op2'] . "</li>\n" ; } // everything else ! echo '<li>' . $lang['EM_fail_cd_op3'] . "</li>\n" ; ! echo '<li>' . $lang['EM_fail_cd_op4'] . "</li>\n" ; if ($ftp_host == 'localhost' || $ftp_port == 21) { ! echo '<li>' . $lang['EM_fail_cd_op5'] . "</li>\n" ; } ! echo '<li>' . $lang['EM_fail_cd_op6'] . "</li>\n" ; echo "</ol>\n" ; *************** *** 174,179 **** // print the working dir $emftp->set_debug( false) ; ! echo "<br>\n" ; ! echo '<b>' . $lang['EM_ftp_root'] . "</b><br>\n" ; // if pwd fails then we know it is probably a passive mode problem if (!$emftp->ftp_pwd()) --- 174,179 ---- // print the working dir $emftp->set_debug( false) ; ! echo "<br />\n" ; ! echo '<b>' . $lang['EM_ftp_root'] . "</b><br />\n" ; // if pwd fails then we know it is probably a passive mode problem if (!$emftp->ftp_pwd()) *************** *** 188,192 **** // print directory listing ! echo '<br><br><b>' . $lang['EM_dir_list'] . "<br>\n" ; $list = $emftp->ftp_nlist() ; --- 188,192 ---- // print directory listing ! echo '<br /><br /><b>' . $lang['EM_dir_list'] . "<br />\n" ; $list = $emftp->ftp_nlist() ; *************** *** 194,203 **** if (!$list) { ! echo $lang['EM_fail_cd_nlist'] . "<br>\n" ; } // if there are no files then indicate there are none to print else if (count($list) == 0) { ! echo '--' . $lang['EM_fail_cd_nlist_no'] . "--<br>\n" ; } else --- 194,203 ---- if (!$list) { ! echo $lang['EM_fail_cd_nlist'] . "<br />\n" ; } // if there are no files then indicate there are none to print else if (count($list) == 0) { ! echo '--' . $lang['EM_fail_cd_nlist_no'] . "--<br />\n" ; } else *************** *** 205,209 **** for ($i=0; $i<count($list); $i++) { ! echo $list[$i] . "<br>\n" ; } } --- 205,209 ---- for ($i=0; $i<count($list); $i++) { ! echo $list[$i] . "<br />\n" ; } } *************** *** 221,225 **** ! echo $lang['EM_test_ftp2'] . "<br>\n" ; --- 221,225 ---- ! echo $lang['EM_test_ftp2'] . "<br />\n" ; *************** *** 235,249 **** $emftp->ftp_quit(); ! echo "<br>\n" ; ! echo '<b>' . $lang['EM_fail_put'] . "</b><br>" ; ! echo sprintf($lang['EM_fail_put_info'], $ftp_user) . "<br>\n" ; ! echo "<br>\n" ; ! echo '<b>' . $lang['EM_ftp_phpbb_root'] . "</b><br>\n" ; if ($dh = opendir('../../../')) { while (($file = readdir($dh)) !== false) { ! echo mfunGetPerms(fileperms( '../../../' . $file)) . " $file <br>\n"; } closedir($dh); --- 235,249 ---- $emftp->ftp_quit(); ! echo "<br />\n" ; ! echo '<b>' . $lang['EM_fail_put'] . "</b><br />" ; ! echo sprintf($lang['EM_fail_put_info'], $ftp_user) . "<br />\n" ; ! echo "<br />\n" ; ! echo '<b>' . $lang['EM_ftp_phpbb_root'] . "</b><br />\n" ; if ($dh = opendir('../../../')) { while (($file = readdir($dh)) !== false) { ! echo mfunGetPerms(fileperms( '../../../' . $file)) . " $file <br />\n"; } closedir($dh); *************** *** 258,272 **** $emftp->ftp_quit(); ! echo "<br>\n" ; ! echo '<b>' . $lang['EM_fail_reput'] . "</b><br>" ; ! echo sprintf($lang['EM_fail_put_info'], $ftp_user) . "<br>\n" ; ! echo "<br>\n" ; ! echo '<b>' . $lang['EM_ftp_phpbb_root'] . "</b><br>\n" ; if ($dh = opendir('../../../')) { while (($file = readdir($dh)) !== false) { ! echo mfunGetPerms(fileperms( '../../../' . $file)) . " $file <br>\n"; } closedir($dh); --- 258,272 ---- $emftp->ftp_quit(); ! echo "<br />\n" ; ! echo '<b>' . $lang['EM_fail_reput'] . "</b><br />" ; ! echo sprintf($lang['EM_fail_put_info'], $ftp_user) . "<br />\n" ; ! echo "<br />\n" ; ! echo '<b>' . $lang['EM_ftp_phpbb_root'] . "</b><br />\n" ; if ($dh = opendir('../../../')) { while (($file = readdir($dh)) !== false) { ! echo mfunGetPerms(fileperms( '../../../' . $file)) . " $file <br />\n"; } closedir($dh); *************** *** 280,284 **** if (!$emftp->ftp_delete($remote_filename)) { ! echo $lang['EM_fail_delete'] . "<br>\n" ; } --- 280,284 ---- if (!$emftp->ftp_delete($remote_filename)) { ! echo $lang['EM_fail_delete'] . "<br />\n" ; } *************** *** 321,325 **** ! echo $lang['EM_test_ftp3']. "<br>\n" ; // disconnect --- 321,325 ---- ! echo $lang['EM_test_ftp3']. "<br />\n" ; // disconnect *************** *** 881,885 **** // htmlspecialchars and str_replace added by Nuttzy $message = htmlspecialchars($message) ; ! $message = str_replace( "\n", "<br>\n", $message) ; // hide the password added by Nuttzy --- 881,885 ---- // htmlspecialchars and str_replace added by Nuttzy $message = htmlspecialchars($message) ; ! $message = str_replace( "\n", "<br />\n", $message) ; // hide the password added by Nuttzy *************** *** 887,891 **** if ($words[1] == 'PASS') { ! $message = "> PASS ********<br>\n" ; } --- 887,891 ---- if ($words[1] == 'PASS') { ! $message = "> PASS ********<br />\n" ; } *************** *** 1188,1192 **** { // we failed; don't close the connection though, assume it will be cleaned up later ! $err_msg = 'ftp_mkdir_struct[1]<br><br>' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $script_path, $this->ftp_pwd()) ; return false ; --- 1188,1192 ---- { // we failed; don't close the connection though, assume it will be cleaned up later ! $err_msg = 'ftp_mkdir_struct[1]<br /><br />' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $script_path, $this->ftp_pwd()) ; return false ; *************** *** 1219,1223 **** { // v0.0.10c, corrected err_msg to use prev_path instead of root_path - not tested! ! $err_msg = 'ftp_mkdir_struct[2]<br><br>' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $prev_path, $this->ftp_pwd()) ; $this->ftp_cdup_home( $num_return_cdup) ; --- 1219,1223 ---- { // v0.0.10c, corrected err_msg to use prev_path instead of root_path - not tested! ! $err_msg = 'ftp_mkdir_struct[2]<br /><br />' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $prev_path, $this->ftp_pwd()) ; $this->ftp_cdup_home( $num_return_cdup) ; *************** *** 1230,1234 **** if (!$this->ftp_mkdir( $ftp_path)) { ! $err_msg = 'ftp_mkdir_struct[3]<br><br>' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_mkdir'], $ftp_path, $this->ftp_pwd()); $this->ftp_cdup_home( $num_return_cdup) ; --- 1230,1234 ---- if (!$this->ftp_mkdir( $ftp_path)) { ! $err_msg = 'ftp_mkdir_struct[3]<br /><br />' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_mkdir'], $ftp_path, $this->ftp_pwd()); $this->ftp_cdup_home( $num_return_cdup) ; *************** *** 1260,1264 **** $return_path .= '../' ; } ! $err_msg = 'ftp_mkdir_struct[4]<br><br>' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $return_path, $this->ftp_pwd()); return false ; --- 1260,1264 ---- $return_path .= '../' ; } ! $err_msg = 'ftp_mkdir_struct[4]<br /><br />' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $return_path, $this->ftp_pwd()); return false ; *************** *** 1298,1302 **** if (!$this->ftp_chdir( $prev_path)) { ! $err_msg = 'ftp_mkdir_struct_copy[1]<br><br>' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $prev_path, $this->ftp_pwd()) ; $this->ftp_cdup_home( $num_return_cdup) ; --- 1298,1302 ---- if (!$this->ftp_chdir( $prev_path)) { ! $err_msg = 'ftp_mkdir_struct_copy[1]<br /><br />' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $prev_path, $this->ftp_pwd()) ; $this->ftp_cdup_home( $num_return_cdup) ; *************** *** 1309,1313 **** if (!$this->ftp_mkdir( $ftp_path)) { ! $err_msg = 'ftp_mkdir_struct_copy[2]<br><br>' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_mkdir'], $ftp_path, $this->ftp_pwd()); $this->ftp_cdup_home( $num_return_cdup) ; --- 1309,1313 ---- if (!$this->ftp_mkdir( $ftp_path)) { ! $err_msg = 'ftp_mkdir_struct_copy[2]<br /><br />' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_mkdir'], $ftp_path, $this->ftp_pwd()); $this->ftp_cdup_home( $num_return_cdup) ; *************** *** 1340,1344 **** $return_path .= '../' ; } ! $err_msg = 'ftp_mkdir_struct_copy[3]<br><br>' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $return_path, $this->ftp_pwd()); return false ; --- 1340,1344 ---- $return_path .= '../' ; } ! $err_msg = 'ftp_mkdir_struct_copy[3]<br /><br />' ; $err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $return_path, $this->ftp_pwd()); return false ; --- emver.php DELETED --- Index: em_schema.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_schema.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** em_schema.php 27 May 2005 08:10:50 -0000 1.6 --- em_schema.php 11 Jun 2005 23:05:53 -0000 1.7 *************** *** 4,9 **** * ------------------- * begin : Wednesday, May 16, 2002 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall ! * email : nu...@bl... * * $Id$ --- 4,9 ---- * ------------------- * begin : Wednesday, May 16, 2002 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall, 2005 The phpBB Group ! * email : su...@ph... * * $Id$ *************** *** 444,448 **** //$line = '[' . $ret_array['name'] . '][' . $ret_array['type'] . '][' . $ret_array['length'] . '][' . $ret_array['signed'] . '][' . $ret_array['null'] . '][' . $ret_array['default'] . '][' . $ret_array['def_val'] . '][' . $ret_array['increment'] . ']' ; ! //echo "$line<br><br>\n" ; return $ret_array ; --- 444,448 ---- //$line = '[' . $ret_array['name'] . '][' . $ret_array['type'] . '][' . $ret_array['length'] . '][' . $ret_array['signed'] . '][' . $ret_array['null'] . '][' . $ret_array['default'] . '][' . $ret_array['def_val'] . '][' . $ret_array['increment'] . ']' ; ! //echo "$line<br /><br />\n" ; return $ret_array ; *************** *** 1069,1073 **** $line = trim($sql[0]) ; $sql = array() ; ! $sql[] = "ABORTED: [$line]<br> Dropping a field in postgresql was not implemented. Contact Nuttzy if you know how to safely do this without having to drop the whole table." ; } --- 1069,1073 ---- $line = trim($sql[0]) ; $sql = array() ; ! $sql[] = "ABORTED: [$line]<br /> Dropping a field in postgresql was not implemented. Contact Nuttzy if you know how to safely do this without having to drop the whole table." ; } *************** *** 1271,1275 **** if ($error != '') { ! $error .= "<br><br>SQL Line:<br>$message" ; return ; } --- 1271,1275 ---- if ($error != '') { ! $error .= "<br /><br />SQL Line:<br />$message" ; return ; } Index: em_modio.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_modio.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** em_modio.php 9 May 2005 22:00:44 -0000 1.3 --- em_modio.php 11 Jun 2005 23:05:53 -0000 1.4 *************** *** 4,9 **** * ------------------- * begin : Tuesday, Dec 10, 2003 ! * copyright : (C) 2002 - 2004 Nuttzy - Craig Nuttall ! * email : nu...@bl... * * $Id$ --- 4,9 ---- * ------------------- * begin : Tuesday, Dec 10, 2003 ! * copyright : (C) 2002 - 2004 Nuttzy - Craig Nuttall, 2005 The phpBB Group ! * email : su...@ph... * * $Id$ *************** *** 250,254 **** error_reporting($old_error_reporting); ! $this->err_msg = 'modio_open[1]<br><br>' ; $this->err_msg .= sprintf( $lang['EM_modio_open_read'], $this->path . trim($this->filename)) ; return false ; --- 250,254 ---- error_reporting($old_error_reporting); ! $this->err_msg = 'modio_open[1]<br /><br />' ; $this->err_msg .= sprintf( $lang['EM_modio_open_read'], $this->path . trim($this->filename)) ; return false ; *************** *** 294,298 **** error_reporting($old_error_reporting); ! $this->err_msg = 'modio_open[3]<br><br>' ; $this->err_msg .= sprintf( $lang['EM_modio_open_write'], $install_path . $process . $this->path . trim($this->filename). $ext); return false ; --- 294,298 ---- error_reporting($old_error_reporting); ! $this->err_msg = 'modio_open[3]<br /><br />' ; $this->err_msg .= sprintf( $lang['EM_modio_open_write'], $install_path . $process . $this->path . trim($this->filename). $ext); return false ; *************** *** 404,408 **** // we do not wish to overwrite a pre-existing error message. close is often called after handling // another error. If this is the case then append this message on the end of that one. ! $this->err_msg = ($this->err_msg == '') ? "modio_close[1]<br><br>$err_msg" : 'modio_close[1]->' . $this->err_msg . '<br><br><b>' . $lang['EM_err_secondary'] . '<b><br>' . $err_msg ; return false ; --- 404,408 ---- // we do not wish to overwrite a pre-existing error message. close is often called after handling // another error. If this is the case then append this message on the end of that one. ! $this->err_msg = ($this->err_msg == '') ? "modio_close[1]<br /><br />$err_msg" : 'modio_close[1]->' . $this->err_msg . '<br /><br /><b>' . $lang['EM_err_secondary'] . '<b><br />' . $err_msg ; return false ; *************** *** 417,421 **** // we do not wish to overwrite a pre-existing error message. close is often called after handling // another error. If this is the case then append this message on the end of that one. ! $this->err_msg = ($this->err_msg == '') ? "modio_close[2]<br><br>$err_msg" : 'modio_close[2]->' . $this->err_msg . '<br><br><b>' . $lang['EM_err_secondary'] . '<b><br>' . $err_msg ; return false ; --- 417,421 ---- // we do not wish to overwrite a pre-existing error message. close is often called after handling // another error. If this is the case then append this message on the end of that one. ! $this->err_msg = ($this->err_msg == '') ? "modio_close[2]<br /><br />$err_msg" : 'modio_close[2]->' . $this->err_msg . '<br /><br /><b>' . $lang['EM_err_secondary'] . '<b><br />' . $err_msg ; return false ; *************** *** 431,435 **** // we do not wish to overwrite a pre-existing error message. close is often called after handling // another error. If this is the case then append this message on the end of that one. ! $this->err_msg = ($this->err_msg == '') ? "modio_close[3]<br><br>$err_msg" : 'modio_close[3]->' . $this->err_msg . '<br><br><b>' . $lang['EM_err_secondary'] . '<b><br>' . $err_msg ; return false ; --- 431,435 ---- // we do not wish to overwrite a pre-existing error message. close is often called after handling // another error. If this is the case then append this message on the end of that one. ! $this->err_msg = ($this->err_msg == '') ? "modio_close[3]<br /><br />$err_msg" : 'modio_close[3]->' . $this->err_msg . '<br /><br /><b>' . $lang['EM_err_secondary'] . '<b><br />' . $err_msg ; return false ; *************** *** 469,473 **** if (!$this->emftp->ftp_connect( $this->ftp_host, $this->ftp_port)) { ! $this->err_msg = 'modio_prep[1]<br><br>' ; $this->err_msg .= $lang['EM_modio_prep_conn'] ; return false ; --- 469,473 ---- if (!$this->emftp->ftp_connect( $this->ftp_host, $this->ftp_port)) { ! $this->err_msg = 'modio_prep[1]<br /><br />' ; $this->err_msg .= $lang['EM_modio_prep_conn'] ; return false ; *************** *** 477,481 **** $this->emftp->ftp_quit(); ! $this->err_msg = 'modio_prep[2]<br><br>' ; $this->err_msg .= $lang['EM_modio_prep_login'] ; return false ; --- 477,481 ---- $this->emftp->ftp_quit(); ! $this->err_msg = 'modio_prep[2]<br /><br />' ; $this->err_msg .= $lang['EM_modio_prep_login'] ; return false ; *************** *** 487,491 **** $this->emftp->ftp_quit(); ! $this->err_msg = 'modio_prep[3]<br><br>' ; $this->err_msg .= $lang['EM_modio_prep_chdir'] ; return false ; --- 487,491 ---- $this->emftp->ftp_quit(); ! $this->err_msg = 'modio_prep[3]<br /><br />' ; $this->err_msg .= $lang['EM_modio_prep_chdir'] ; return false ; *************** *** 548,552 **** else { ! $this->err_msg = 'modio_move[1]<br><br>' ; $this->err_msg .= sprintf( $lang['EM_modio_move_copy'], $from, $to) ; return '' ; --- 548,552 ---- else { ! $this->err_msg = 'modio_move[1]<br /><br />' ; $this->err_msg .= sprintf( $lang['EM_modio_move_copy'], $from, $to) ; return '' ; *************** *** 621,625 **** { // we failed; don't close the connection though, assume it will be cleaned up later ! $this->err_msg = 'modio_move[2]<br><br>' ; $this->err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $to_dir, $this->emftp->ftp_pwd()) ; return '' ; --- 621,625 ---- { // we failed; don't close the connection though, assume it will be cleaned up later ! $this->err_msg = 'modio_move[2]<br /><br />' ; $this->err_msg .= sprintf( $lang['EM_modio_mkdir_chdir'], $to_dir, $this->emftp->ftp_pwd()) ; return '' ; *************** *** 630,634 **** if (!$this->emftp->ftp_put( $to_file, $root . $from, $is_binary)) { ! $this->err_msg = 'modio_move[3]<br><br>' ; $this->err_msg .= sprintf( $lang['EM_modio_move_ftpa'], $from, $to_file) ; return '' ; --- 630,634 ---- if (!$this->emftp->ftp_put( $to_file, $root . $from, $is_binary)) { ! $this->err_msg = 'modio_move[3]<br /><br />' ; $this->err_msg .= sprintf( $lang['EM_modio_move_ftpa'], $from, $to_file) ; return '' ; *************** *** 643,647 **** { // we failed; don't close the connection though, assume it will be cleaned up later ! $this->err_msg = 'modio_move[4]<br><br>' ; $this->err_msg = sprintf( $lang['EM_modio_mkdir_chdir'], $return_path, $this->emftp->ftp_pwd()) ; return '' ; --- 643,647 ---- { // we failed; don't close the connection though, assume it will be cleaned up later ! $this->err_msg = 'modio_move[4]<br /><br />' ; $this->err_msg = sprintf( $lang['EM_modio_mkdir_chdir'], $return_path, $this->emftp->ftp_pwd()) ; return '' ; Index: em_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_functions.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** em_functions.php 8 Jun 2005 03:12:20 -0000 1.5 --- em_functions.php 11 Jun 2005 23:05:53 -0000 1.6 *************** *** 4,9 **** * ------------------- * begin : Sunday, Mar 31, 2002 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall ! * email : nu...@bl... * * $Id$ --- 4,9 ---- * ------------------- * begin : Sunday, Mar 31, 2002 ! * copyright : (C) 2002-2004 by Nuttzy - Craig Nuttall, 2005 The phpBB Group ! * email : su...@ph... * * $Id$ *************** *** 152,156 **** { $edit->err_msg = $lang['EM_trace'] . ': open_files[1]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' . $edit->err_msg ; $file_list[] = $edit ; return OPEN_FAIL_CRITICAL ; --- 152,156 ---- { $edit->err_msg = $lang['EM_trace'] . ': open_files[1]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' . $edit->err_msg ; $file_list[] = $edit ; return OPEN_FAIL_CRITICAL ; *************** *** 161,165 **** { $edit->err_msg = $lang['EM_trace'] . ': open_files[2]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br><br>' . $edit->err_msg ; $error_level = OPEN_FAIL_OK ; } --- 161,165 ---- { $edit->err_msg = $lang['EM_trace'] . ': open_files[2]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br /><br />' . $edit->err_msg ; $error_level = OPEN_FAIL_OK ; } *************** *** 194,198 **** { $edit->err_msg = $lang['EM_trace'] . ': open_files[3]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' . $edit->err_msg ; $file_list[] = $edit ; return OPEN_FAIL_CRITICAL ; --- 194,198 ---- { $edit->err_msg = $lang['EM_trace'] . ': open_files[3]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' . $edit->err_msg ; $file_list[] = $edit ; return OPEN_FAIL_CRITICAL ; *************** *** 206,210 **** { $edit->err_msg = $lang['EM_trace'] . ': open_files[4]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br><br>' . $edit->err_msg ; $error_level = OPEN_FAIL_OK ; } --- 206,210 ---- { $edit->err_msg = $lang['EM_trace'] . ': open_files[4]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br /><br />' . $edit->err_msg ; $error_level = OPEN_FAIL_OK ; } *************** *** 235,239 **** { $edit->err_msg = $lang['EM_trace'] . ': open_files[5]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' . $edit->err_msg ; $file_list[] = $edit ; return OPEN_FAIL_CRITICAL ; --- 235,239 ---- { $edit->err_msg = $lang['EM_trace'] . ': open_files[5]->' . $edit->err_msg ; ! $edit->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' . $edit->err_msg ; $file_list[] = $edit ; return OPEN_FAIL_CRITICAL ; *************** *** 347,351 **** { //warning: tmp is throwing undefined ! //echo "in here<br>\n" ; // $temp_array[] = $tmp ; $potential_find[count($potential_find)-1]['trailing_whitespace']++ ; --- 347,351 ---- { //warning: tmp is throwing undefined ! //echo "in here<br />\n" ; // $temp_array[] = $tmp ; $potential_find[count($potential_find)-1]['trailing_whitespace']++ ; *************** *** 469,473 **** if (strstr( $file_list[$file_count]->path, 'language/lang_english')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' ; $err_level = FIND_FAIL_CRITICAL ; } --- 469,473 ---- if (strstr( $file_list[$file_count]->path, 'language/lang_english')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' ; $err_level = FIND_FAIL_CRITICAL ; } *************** *** 476,480 **** else if (strstr( $file_list[$file_count]->path, 'templates/subSilver')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' ; $err_level = FIND_FAIL_CRITICAL ; } --- 476,480 ---- else if (strstr( $file_list[$file_count]->path, 'templates/subSilver')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' ; $err_level = FIND_FAIL_CRITICAL ; } *************** *** 483,487 **** else if (strstr( $file_list[$file_count]->path, 'language/lang_')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br><br>' ; $err_level = FIND_FAIL_OK ; } --- 483,487 ---- else if (strstr( $file_list[$file_count]->path, 'language/lang_')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br /><br />' ; $err_level = FIND_FAIL_OK ; } *************** *** 490,494 **** else if (strstr( $file_list[$file_count]->path, 'templates/')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br><br>' ; $err_level = FIND_FAIL_OK ; } --- 490,494 ---- else if (strstr( $file_list[$file_count]->path, 'templates/')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br /><br />' ; $err_level = FIND_FAIL_OK ; } *************** *** 497,506 **** else { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' ; $err_level = FIND_FAIL_CRITICAL ; } // now that we have the error level, append the fail message to it ! $file_list[$file_count]->err_msg .= sprintf( $lang['EM_err_find_fail'], $file_list[$file_count]->path . trim($file_list[$file_count]->filename)) . ":<br><br>\n" ; --- 497,506 ---- else { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' ; $err_level = FIND_FAIL_CRITICAL ; } // now that we have the error level, append the fail message to it ! $file_list[$file_count]->err_msg .= sprintf( $lang['EM_err_find_fail'], $file_list[$file_count]->path . trim($file_list[$file_count]->filename)) . ":<br /><br />\n" ; *************** *** 508,512 **** for ($x=0; $x<count($search_array); $x++) { ! $file_list[$file_count]->err_msg .= htmlspecialchars($search_array[$x]) . "<br>\n" ; } --- 508,512 ---- for ($x=0; $x<count($search_array); $x++) { ! $file_list[$file_count]->err_msg .= htmlspecialchars($search_array[$x]) . "<br />\n" ; } *************** *** 611,615 **** if (strstr( $file_list[$file_count]->path, 'language/lang_english')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' ; $err_level = FIND_FAIL_CRITICAL ; } --- 611,615 ---- if (strstr( $file_list[$file_count]->path, 'language/lang_english')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' ; $err_level = FIND_FAIL_CRITICAL ; } *************** *** 618,622 **** else if (strstr( $file_list[$file_count]->path, 'templates/subSilver')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' ; $err_level = FIND_FAIL_CRITICAL ; } --- 618,622 ---- else if (strstr( $file_list[$file_count]->path, 'templates/subSilver')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' ; $err_level = FIND_FAIL_CRITICAL ; } *************** *** 625,629 **** else if (strstr( $file_list[$file_count]->path, 'language/lang_')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br><br>' ; $err_level = FIND_FAIL_OK ; } --- 625,629 ---- else if (strstr( $file_list[$file_count]->path, 'language/lang_')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br /><br />' ; $err_level = FIND_FAIL_OK ; } *************** *** 632,636 **** else if (strstr( $file_list[$file_count]->path, 'templates/')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br><br>' ; $err_level = FIND_FAIL_OK ; } --- 632,636 ---- else if (strstr( $file_list[$file_count]->path, 'templates/')) { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_warning'] . '</b><br /><br />' ; $err_level = FIND_FAIL_OK ; } *************** *** 639,646 **** else { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br><br>' ; $err_level = FIND_FAIL_CRITICAL ; } ! $file_list[$file_count]->err_msg .= sprintf( $lang['EM_err_ifind_fail'], $file_list[$file_count]->path . trim($file_list[$file_count]->filename)) . ':<br><br>' . htmlspecialchars($search_fragment) . "<br>\n" ; --- 639,646 ---- else { ! $file_list[$file_count]->err_msg = '<b>' . $lang['EM_err_critical_error'] . '</b><br /><br />' ; $err_level = FIND_FAIL_CRITICAL ; } ! $file_list[$file_count]->err_msg .= sprintf( $lang['EM_err_ifind_fail'], $file_list[$file_count]->path . trim($file_list[$file_count]->filename)) . ':<br /><br />' . htmlspecialchars($search_fragment) . "<br />\n" ; *************** *** 739,743 **** { // $access_msg = $lang['EM_failed'] ; ! $access_msg = "Sucessfully opened [lang_easymod.$phpEx] for reading, but did not find the expected string.<br> Found this instead: [" . htmlspecialchars($buffer) . "]" ; return false ; } --- 739,743 ---- { // $access_msg = $lang['EM_failed'] ; ! $access_msg = "Sucessfully opened [lang_easymod.$phpEx] for reading, but did not find the expected string.<br /> Found this instead: [" . htmlspecialchars($buffer) . "]" ; return false ; } *************** *** 1048,1053 **** ///////////////////// sloppy... should return error, not exit ///////////////////// ! echo sprintf( $lang['EM_err_insert'], $config_name) . "<br>\n" ; ! echo "sql=[" . htmlspecialchars($sql) . "]<br>\n" ; // Debugging $sql_error = $db->sql_error(); --- 1048,1053 ---- ///////////////////// sloppy... should return error, not exit ///////////////////// ! echo sprintf( $lang['EM_err_insert'], $config_name) . "<br />\n" ; ! echo "sql=[" . htmlspecialchars($sql) . "]<br />\n" ; // Debugging $sql_error = $db->sql_error(); *************** *** 1072,1077 **** ///////////////////// sloppy... should return error, not exit ///////////////////// ! echo sprintf( $lang['EM_err_update'], $config_name) . "<br>\n" ; ! echo "sql=[" . htmlspecialchars($sql) . "]<br>\n" ; // Debugging $sql_error = $db->sql_error(); --- 1072,1077 ---- ///////////////////// sloppy... should return error, not exit ///////////////////// ! echo sprintf( $lang['EM_err_update'], $config_name) . "<br />\n" ; ! echo "sql=[" . htmlspecialchars($sql) . "]<br />\n" ; // Debugging $sql_error = $db->sql_error(); *************** *** 1192,1196 **** ! //echo "zzzzzzzzzz [$install_path][$file_path][$file_name]<br>\n" ; // check for wild cards if ( strstr( $file_name, '*') || strstr( $file_name, '?') ) --- 1192,1196 ---- ! //echo "zzzzzzzzzz [$install_path][$file_path][$file_name]<br />\n" ; // check for wild cards if ( strstr( $file_name, '*') || strstr( $file_name, '?') ) *************** *** 1202,1206 **** else if ( is_dir( $install_path . $file_path . '/' . $file_name) ) { ! //echo "x<br>\n" ; // if the whole thing is a directory, then it is a path and make the filename *.* // return array( 'path' => $file_path . '/' . $file_name, 'file' => '*.*') ; --- 1202,1206 ---- else if ( is_dir( $install_path . $file_path . '/' . $file_name) ) { ! //echo "x<br />\n" ; // if the whole thing is a directory, then it is a path and make the filename *.* // return array( 'path' => $file_path . '/' . $file_name, 'file' => '*.*') ; *************** *** 1212,1216 **** else if ( $file[ (strlen($file)-1)] == '/') { ! //echo "y<br>\n" ; // return array( 'path' => $file_path . '/' . $file_name, 'file' => '*.*') ; // return array( 'path' => $file_path . $file_name, 'file' => '*.*') ; --- 1212,1216 ---- else if ( $file[ (strlen($file)-1)] == '/') { ! //echo "y<br />\n" ; // return array( 'path' => $file_path . '/' . $file_name, 'file' => '*.*') ; // return array( 'path' => $file_path . $file_name, 'file' => '*.*') ; Index: em_cipher.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_cipher.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** em_cipher.php 22 May 2005 00:29:37 -0000 1.2 --- em_cipher.php 11 Jun 2005 23:05:53 -0000 1.3 *************** *** 4,9 **** * ------------------- * begin : Tuesday, Dec 10, 2003 ! * copyright : (C) 2002 - 2004 by Nuttzy - Craig Nuttall ! * email : nu...@bl... * * $Id$ --- 4,9 ---- * ------------------- * begin : Tuesday, Dec 10, 2003 ! * copyright : (C) 2002 - 2004 by Nuttzy - Craig Nuttall, 2005 The phpBB Group ! * email : su...@ph... * * $Id$ |
|
From: Jim W. <ter...@us...> - 2005-06-08 03:12:36
|
Update of /cvsroot/easymod/easymod2/mods/easymod/em_includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6023/mods/easymod/em_includes Modified Files: em_functions.php Log Message: - added support for the INCREMENT action - a few other small changes Index: em_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_functions.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** em_functions.php 25 May 2005 01:10:41 -0000 1.4 --- em_functions.php 8 Jun 2005 03:12:20 -0000 1.5 *************** *** 365,369 **** // if this new line fits in the correct order of the search array, then things are looking // more like this could be a match; we also know it's not a whitespace line ! if (strstr( $current_line, trim($search_array[count($potential_find)]))) { // load the line into the find array --- 365,369 ---- // if this new line fits in the correct order of the search array, then things are looking // more like this could be a match; we also know it's not a whitespace line ! if (preg_match('#'.preg_replace('#\\\\\\{%\\\\\\:(\\d+)\\\\\\}#','(\\d+|\\{%\\:$1\\})', preg_quote(trim($search_array[count($potential_find)]), '#')).'#', $current_line)) { // load the line into the find array *************** *** 565,569 **** { // found the fragment, cool! ! if (strstr( $find_array[$file_count][$looper], $search_fragment)) { $found_fragment = true ; --- 565,569 ---- { // found the fragment, cool! ! if (preg_match('#'.preg_replace('#\\\\\\{%\\\\\\:(\\d+)\\\\\\}#','(\\d+|\\{%\\:$1\\})', preg_quote($search_fragment, '#')).'#', $find_array[$file_count][$looper])) { $found_fragment = true ; *************** *** 656,659 **** --- 656,673 ---- } + // Increments variables in strings as appropriate. + function increment_wildcard( $wildcard_identifier, $increment_value, $wildcard_search, $search_result ) + { + $parts = preg_split('#\{%\:\d+\}#',substr($wildcard_search,0,strpos($wildcard_search,$wildcard_identifier))); + for ($i=0;$i<count($parts);$i++) + { + $parts[$i] = preg_quote($parts[$i],'#'); + } + $beg = preg_replace('#^(.*'.implode('\d+',$parts).').*#s','$1',$search_result,1); + $aft = substr($search_result,strlen($beg)); + $num = preg_replace('#^(\\d+).*#','$1',$aft); + $num += $increment_value; + return $beg.preg_replace('#^\\d+(.*)#',"$num$1",$aft); + } /// |
|
From: Jim W. <ter...@us...> - 2005-06-08 03:12:35
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6023/mods/easymod/includes Modified Files: admin_easymod.php.txt Log Message: - added support for the INCREMENT action - a few other small changes Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** admin_easymod.php.txt 3 Jun 2005 22:59:12 -0000 1.11 --- admin_easymod.php.txt 8 Jun 2005 03:12:20 -0000 1.12 *************** *** 87,91 **** /// /// ! define('EASYMOD_VER', 'beta1 (0.1.13)') ; define('NUTTZY_LINK', '<a href="http://www.spellingcow.com" target="_blank">Nuttzy</a>') ; define('FAQ_LINK', '<a href="http://area51.phpbb.com/phpBB22/viewtopic.php?t=12141" target="_blank">') ; --- 87,91 ---- /// /// ! define('EASYMOD_VER', 'beta1 (0.2.0)') ; define('NUTTZY_LINK', '<a href="http://www.spellingcow.com" target="_blank">Nuttzy</a>') ; define('FAQ_LINK', '<a href="http://area51.phpbb.com/phpBB22/viewtopic.php?t=12141" target="_blank">') ; *************** *** 1408,1411 **** --- 1408,1415 ---- $current_command = 'DIY INSTRUCTIONS'; } + else if ( strstr($buffer, 'INCREMENT') ) + { + $current_command = 'INCREMENT'; + } else if (strstr($buffer, 'SAVE/CLOSE')) { *************** *** 1762,1765 **** --- 1766,1802 ---- } + else if ($commands[$i]['command'] == 'INCREMENT') + { + // strip the body of whitespace down and down to a single line + $body[$i] = strip_whitespace( $body[$i], true) ; + + // if there is not exactly 1 line then throw a critical error + if ( count($body[$i]) != 1) + { + display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $commands[$i]['command'] . $lang['EM_err_increment_body'] . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; + break ; + } + + // parse the increment command + $inc_data = array(); + if (!preg_match('#(%\:\d+)\s*([\+\-]\d+)?#',trim($body[$i][0]),$inc_data)) + { + display_error( '<b>' . $lang['EM_err_critical_error'] . "</b><br><br>\n" . $commands[$i]['command'] . $lang['EM_err_increment_body'] . "<br>\n" . $lang['EM_line_num'] . $commands[$i]['line']) ; + break; + } + $inc_data[1] = '{'.$inc_data[1].'}'; + $inc_data[2] = isset($inc_data[2]) ? $inc_data[2] : 1; + + // perform the increment as appropriate + for ( $file = 0; $file < count($file_list); $file++ ) + { + for ( $j = 0; $j < count($find_array); $j++ ) + { + $increment_search = ($search_fragment != '') ? $search_fragment : $search_array[$j]; + $find_array[$file][$j] = increment_wildcard($inc_data[1], $inc_data[2], $increment_search, $find_array[$file][$j]); + } + } + } + // // IN-LINE commands; perform precision operations on a single line |
|
From: Jim W. <ter...@us...> - 2005-06-08 03:12:35
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6023/mods/easymod Modified Files: easymod_display_functions.php lang_easymod.php Log Message: - added support for the INCREMENT action - a few other small changes Index: easymod_display_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_display_functions.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** easymod_display_functions.php 5 Jun 2005 23:37:04 -0000 1.9 --- easymod_display_functions.php 8 Jun 2005 03:12:20 -0000 1.10 *************** *** 507,511 **** $variables['EM_ftp_use_ext'] = $lang['EM_ftp_use_ext'] ; $variables['EM_ftp_ext_not'] = $lang['EM_ftp_ext_not'] ; ! $variables['EM_ftp_use_cache'] = $lang['EM_ftp_cache'] $variables['EM_more_info'] = $lang['EM_more_info']; --- 507,511 ---- $variables['EM_ftp_use_ext'] = $lang['EM_ftp_use_ext'] ; $variables['EM_ftp_ext_not'] = $lang['EM_ftp_ext_not'] ; ! $variables['EM_ftp_use_cache'] = $lang['EM_ftp_cache'] ; $variables['EM_more_info'] = $lang['EM_more_info']; Index: lang_easymod.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/lang_easymod.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** lang_easymod.php 5 Jun 2005 23:37:05 -0000 1.8 --- lang_easymod.php 8 Jun 2005 03:12:20 -0000 1.9 *************** *** 469,472 **** --- 469,473 ---- $lang['EM_err_comm_find'] = 'FIND FAILED: No target supplied for FIND command in MOD script' ; $lang['EM_err_inline_body'] = 'FAILED: Invalid command body supplied in MOD script' ; + $lang['EM_err_increment_body'] = 'FAILED: Invalid command body supplied in MOD script' ; $lang['EM_err_no_ifind'] = 'FAILED: Malformed script. An IN-LINE FIND was not previously performed.' ; $lang['EM_err_comm_copy'] = 'COPY FAILED: The target file to be copied [%s%s] could not be found.' ; |
|
From: Eric F. <wg...@us...> - 2005-06-05 23:37:15
|
Update of /cvsroot/easymod/easymod2/mods/easymod/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17019/mods/easymod/templates Modified Files: ftp_settings.tpl page_header.tpl step1_classic.tpl step1_simple.tpl step1b_ftp.tpl step1b_nowrite_nocopy.tpl step1b_simple.tpl step1b_write_copy.tpl step1b_write_nocopy.tpl step1c_empw.tpl Log Message: - Removed all hardcoded language from installer (I think I got it all). I know I really shouldn't but I have tested it so some things might not be working correctly. - Template updates to make XHTML compatible (only the ones I saw, I didn't go looking) - Other minor changes Index: ftp_settings.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/ftp_settings.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ftp_settings.tpl 1 May 2005 07:24:36 -0000 1.2 --- ftp_settings.tpl 5 Jun 2005 23:37:05 -0000 1.3 *************** *** 8,12 **** <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_dir}}</span></td> ! <td class="row2"><input type="text" name="ftp_dir"> <span class="gen">({{DIR_EX}}) (<a href="x" target="_blank">more info</a>)</span></td> </tr> <tr> --- 8,12 ---- <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_dir}}</span></td> ! <td class="row2"><input type="text" name="ftp_dir"> <span class="gen">({{DIR_EX}}) (<a href="#" target="_blank">{{EM_more_info}}</a>)</span></td> </tr> <tr> *************** *** 20,31 **** <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_host}}</span></td> ! <td class="row2"><input type="text" name="ftp_host" value="localhost"> <span class="gen">{{EM_ftp_host_info}} (<a href="x" target="_blank">more info</a>)</span></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_port}}</span></td> ! <td class="row2"><input type="text" size="5" maxlength="5" name="ftp_port" value="21"> <span class="gen">{{EM_ftp_port_info}} (<a href="x" target="_blank">more info</a>)</span></td> </tr> <tr> ! <th colspan="2">{{EM_ftp_titlex}} Advanced FTP Settings (optional!)</th> </tr> <tr> --- 20,31 ---- <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_host}}</span></td> ! <td class="row2"><input type="text" name="ftp_host" value="localhost"> <span class="gen">{{EM_ftp_host_info}} (<a href="#" target="_blank">{{EM_more_info}}</a>)</span></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{{EM_ftp_port}}</span></td> ! <td class="row2"><input type="text" size="5" maxlength="5" name="ftp_port" value="21"> <span class="gen">{{EM_ftp_port_info}} (<a href="#" target="_blank">{{EM_more_info}}</a>)</span></td> </tr> <tr> ! <th colspan="2">{{EM_ftp_advance_settings}} Advanced FTP Settings (optional!)</th> </tr> <tr> *************** *** 40,52 **** <td class="row2">{{FTP_EXT_MSG}} <input type="radio" name="ftp_type" value="ext" {{EXT_YES}}><span class="gen">{{EM_yes}}</span> ! <input type="radio" name="ftp_type" value="fsock" {{EXT_NO}}>{{EM_no}}</span> <span class="gen">{{EM_ftp_ext_not}} (<a href="x" target="_blank">more info</a>)</span> {{FTP_EXT_CLOSE}} </td> </tr> <tr> ! <td class="row1" align="right"><span class="gen">{{EM_ftp_use_extX}} Use Cache</span></td> <td class="row2">{{FTP_CACHE_MSG}} <input type="radio" name="ftp_cache" value="1" {{CACHE_YES}}><span class="gen">{{EM_yes}}</span> ! <input type="radio" name="ftp_cache" value="0" {{CACHE_NO}}>{{EM_no}}</span> <span class="gen">{{EM_ftp_ext_notX}}(only change if instructed to) (<a href="x" target="_blank">more info</a>)</span> {{FTP_CACHE_CLOSE}} </td> --- 40,52 ---- <td class="row2">{{FTP_EXT_MSG}} <input type="radio" name="ftp_type" value="ext" {{EXT_YES}}><span class="gen">{{EM_yes}}</span> ! <input type="radio" name="ftp_type" value="fsock" {{EXT_NO}}>{{EM_no}}</span> <span class="gen">{{EM_ftp_ext_not}} (<a href="#" target="_blank">{{EM_more_info}}</a>)</span> {{FTP_EXT_CLOSE}} </td> </tr> <tr> ! <td class="row1" align="right"><span class="gen">{{EM_ftp_use_cache}}</span></td> <td class="row2">{{FTP_CACHE_MSG}} <input type="radio" name="ftp_cache" value="1" {{CACHE_YES}}><span class="gen">{{EM_yes}}</span> ! <input type="radio" name="ftp_cache" value="0" {{CACHE_NO}}>{{EM_no}}</span> <span class="gen">{{EM_ftp_ext_not}} (<a href="#" target="_blank">{{EM_more_info}}</a>)</span> {{FTP_CACHE_CLOSE}} </td> Index: step1_classic.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1_classic.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** step1_classic.tpl 25 May 2005 01:10:51 -0000 1.2 --- step1_classic.tpl 5 Jun 2005 23:37:05 -0000 1.3 *************** *** 1,3 **** ! <span class="gen"><a href="easymod_install.php?setup=simple">Simple Mode</a> :: Advanced Mode</span><br> <table width="100%" border="1" cellpadding="5"> <tr> --- 1,3 ---- ! <span class="gen"><a href="easymod_install.php?setup=simple">{{EM_simple_mode}}</a> :: {{EM_advanced_mode}}</span><br> <table width="100%" border="1" cellpadding="5"> <tr> Index: step1b_write_copy.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1b_write_copy.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** step1b_write_copy.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- step1b_write_copy.tpl 5 Jun 2005 23:37:05 -0000 1.2 *************** *** 2,21 **** {{WRITE_COPY_START}} <tr> ! <td class="row1" align="center" colspan="2"><span class="gen">{{EM_password_descX}} ! <br> ! Good news! EasyMOD has detected that it has the necessary access to automatically install MODs. You should select yes below.<br> ! <br> </span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="write_copy" checked="checked"></td> ! <td class="row1" align="left" width="100%"><span class="gen">{{EM_yesX}} Yes, use this automated method. (<a href="http://www.phpbb.com" target="_blank">learn more</a>)</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="advanced"></td> ! <td class="row1" align="left" width="100%"><span class="gen">{{EM_yesX}} No, I'd like to select something else. (advanced mode)</span></td> </tr> <tr> ! <td class="row1" align="center" colspan="2"><br></td> </tr> {{WRITE_COPY_END}} --- 2,21 ---- {{WRITE_COPY_START}} <tr> ! <td class="row1" align="center" colspan="2"><span class="gen"> ! <br /> ! {{EM_write_copy_desc}}<br /> ! <br /> </span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="write_copy" checked="checked" /></td> ! <td class="row1" align="left" width="100%"><span class="gen">{{EM_yes_use_auto}}</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="advanced" /></td> ! <td class="row1" align="left" width="100%"><span class="gen">{{EM_no_use_else}}</span></td> </tr> <tr> ! <td class="row1" align="center" colspan="2"><br /></td> </tr> {{WRITE_COPY_END}} Index: step1_simple.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1_simple.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** step1_simple.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- step1_simple.tpl 5 Jun 2005 23:37:05 -0000 1.2 *************** *** 1,3 **** ! <span class="gen">Simple Mode :: <a href="easymod_install.php?setup=advanced">Advanced Mode</a></span><br> <table width="100%" border="1" cellpadding="5"> <tr> --- 1,3 ---- ! <span class="gen">{{EM_simple_mode}} :: <a href="easymod_install.php?setup=advanced">{{EM_advance_mode}}</a></span><br> <table width="100%" border="1" cellpadding="5"> <tr> *************** *** 13,17 **** </td><td valign="top" class="row2"> ! <h2>{{EM_SettingsX}}Server Style</h2> --- 13,17 ---- </td><td valign="top" class="row2"> ! <h2>{{EM_server_style}}</h2> *************** *** 19,35 **** <table width="100%" cellpadding="2" cellspacing="0" border="0" class="forumline"> <tr> ! <th>{{EM_password_titleX}}About your server</th> </tr> <tr> ! <td class="row2" align="center"><span class="gen">{{EM_password_descX}}<b>Which of the following choices best describes your phpBB server:</b></span></td> </tr> <tr> ! <td class="row1" align="left"><span class="gen"><input type="radio" name="option" value="ftp" checked="checked"><span class="gen">{{EM_yesX}} I have FTP access to my phpBB files on the server.</span> </span></td> </tr> <tr> ! <td class="row1" align="left"><span class="gen"><input type="radio" name="option" value="windoze"><span class="gen">{{EM_yesX}} This is a Windows server and I don't have to worry about file permissions.</span> </span></td> </tr> <tr> ! <td class="row1" align="left"><span class="gen"><input type="radio" name="option" value="idunno"><span class="gen">{{EM_yesX}} I don't have FTP access. Have EasyMOD suggest what to do please!</span> </span></td> </tr> <tr> --- 19,35 ---- <table width="100%" cellpadding="2" cellspacing="0" border="0" class="forumline"> <tr> ! <th>{{EM_about_server}}</th> </tr> <tr> ! <td class="row2" align="center"><span class="gen"><strong>{{EM_describes_server}}</strong></span></td> </tr> <tr> ! <td class="row1" align="left"><span class="gen"><input type="radio" name="option" value="ftp" checked="checked">{{EM_have_ftp}}</span></td> </tr> <tr> ! <td class="row1" align="left"><span class="gen"><input type="radio" name="option" value="windoze">{{EM_have_windows}}</span></td> </tr> <tr> ! <td class="row1" align="left"><span class="gen"><input type="radio" name="option" value="idunno">{{EM_no_ftp_suggest}}</span></td> </tr> <tr> Index: step1b_write_nocopy.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1b_write_nocopy.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** step1b_write_nocopy.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- step1b_write_nocopy.tpl 5 Jun 2005 23:37:05 -0000 1.2 *************** *** 2,37 **** {{WRITE_NOCOPY_START}} <tr> ! <td class="row1" align="left" colspan="2"><span class="gen">{{EM_password_descX}} ! <br> ! 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> ! {{SAFE_MODE}}<li>Your server has "safe mode" enabled which means EasyMOD cannot automaticly replace your phpBB files. You might consider using <a href="z" target="_blank">chmod</a> or <a href="z" target="_blank">chown</a> to allow access.</li> ! <li>You might consider using <a href="z" target="_blank">chmod</a> to allow access. However, this is not advised in a shared server environment.</li> ! <li>Otherwise you have to use the <a href="x" target="_blank">post_process script</a> or manually move files into place.</li> ! </ol> ! <br> </span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="ftp" checked="checked"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I'll try using the FTP option. (requires FTP access)</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="idunno"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I have now modified my file permissions, try rescanning to see if EasyMOD has access.</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="post_process"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I will use the post_process script to automatically move files into place. (requires knowledge of how to execute a script)</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="manual"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I will have to manually move files into place :(</span></td> </tr> ! <td class="row1" align="left"><input type="radio" name="option" value="advanced"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I'd like to select something else. (advanced mode)</span></td> <tr> ! <td class="row1" align="center" colspan="2"><br></td> </tr> {{WRITE_NOCOPY_END}} --- 2,31 ---- {{WRITE_NOCOPY_START}} <tr> ! <td class="row1" align="left" colspan="2"><span class="gen"> ! <br /> ! {{EM_write_nocopy_desc}} ! <br /> </span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="ftp" checked="checked" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_try_ftp}}</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="idunno" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_perms_mod_rescan}}</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="post_process" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_use_post_process}}</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="manual" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_download_manual}}</span></td> </tr> ! <td class="row1" align="left"><input type="radio" name="option" value="advanced" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_select_else}}</span></td> <tr> ! <td class="row1" align="center" colspan="2"><br /></td> </tr> {{WRITE_NOCOPY_END}} Index: step1b_nowrite_nocopy.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1b_nowrite_nocopy.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** step1b_nowrite_nocopy.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- step1b_nowrite_nocopy.tpl 5 Jun 2005 23:37:05 -0000 1.2 *************** *** 2,36 **** {{NOWRITE_NOCOPY_START}} <tr> ! <td class="row1" align="left" colspan="2"><span class="gen">{{EM_password_descX}} ! <br> ! 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> ! {{SAFE_MODE}}<li>Your server has "safe mode" enabled which means EasyMOD cannot automaticly replace your phpBB files. You might consider using <a href="z" target="_blank">chmod</a> or <a href="z" target="_blank">chown</a> to allow access.</li> ! <li>You might consider using <a href="z" target="_blank">chmod</a> to allow access. However, this is not advised in a shared server environment.</li> ! <li>Otherwise you will have to download the files and then manually move them into place.</li> ! </ol> ! <br> ! <b>Select One:</b><br> </span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="ftp"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I'll try using the FTP option. (requires FTP access)</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="idunno"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I have now modified my file permissions, try rescanning to see if EasyMOD has access.</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="download"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I will have to download the files and manually move them into place :(</span></td> </tr> </tr> ! <td class="row1" align="left"><input type="radio" name="option" value="advanced"></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_yesX}} I'd like to select something else. (advanced mode)</span></td> <tr> <tr> ! <td class="row1" align="center" colspan="2"><br></td> </tr> {{NOWRITE_NOCOPY_END}} --- 2,30 ---- {{NOWRITE_NOCOPY_START}} <tr> ! <td class="row1" align="left" colspan="2"><span class="gen"> ! <br /> ! {{EM_nowrite_nocopy_desc}} ! <br /> ! <b>{{SELECT_ONE}}</b><br /> </span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="ftp" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_try_ftp}}</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="idunno" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_perms_mod_rescan}}</span></td> </tr> <tr> ! <td class="row1" align="left"><input type="radio" name="option" value="download" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_download_manual}}</span></td> </tr> </tr> ! <td class="row1" align="left"><input type="radio" name="option" value="advanced" /></td> ! <td class="row1" align="left" width="*"><span class="gen">{{EM_select_else}}</span></td> <tr> <tr> ! <td class="row1" align="center" colspan="2"><br /></td> </tr> {{NOWRITE_NOCOPY_END}} Index: step1b_simple.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1b_simple.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** step1b_simple.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- step1b_simple.tpl 5 Jun 2005 23:37:05 -0000 1.2 *************** *** 7,15 **** <!-- FILE ACCESS --> ! <br> <span class="gen">{{EM_support}}</class><br> </td><td valign="top" class="row2"> ! <h2>{{EM_SettingsX}}Diagnosis</h2> --- 7,15 ---- <!-- FILE ACCESS --> ! <br /> <span class="gen">{{EM_support}}</class><br> </td><td valign="top" class="row2"> ! <h2>{{EM_diagnosis}}</h2> *************** *** 17,21 **** <table width="100%" cellpadding="2" cellspacing="0" border="0" class="forumline"> <tr> ! <th colspan="2">{{EM_password_titleX}}Automation Technique detected!</th> </tr> --- 17,21 ---- <table width="100%" cellpadding="2" cellspacing="0" border="0" class="forumline"> <tr> ! <th colspan="2">{{EM_auto_tech_detected}}</th> </tr> *************** *** 41,48 **** {{[./templates/hidden_access.tpl]}} ! <input type="hidden" name="install_step" value="1"> ! <input type="hidden" name="substep" value="b"> <input class="mainoption" type="submit" value="{{Submit}}" /> ! <input class="mainoption" type="submit" value="{{Rescan}}" name="rescan"/> </td> </tr> --- 41,48 ---- {{[./templates/hidden_access.tpl]}} ! <input type="hidden" name="install_step" value="1" /> ! <input type="hidden" name="substep" value="b" /> <input class="mainoption" type="submit" value="{{Submit}}" /> ! <input class="mainoption" type="submit" value="{{Rescan}}" name="rescan" /> </td> </tr> Index: step1b_ftp.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1b_ftp.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** step1b_ftp.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- step1b_ftp.tpl 5 Jun 2005 23:37:05 -0000 1.2 *************** *** 9,13 **** <br> ! <span class="gen">{{EM_support}}</class><br> </td><td valign="top" class="row2"> --- 9,13 ---- <br> ! <span class="gen">{{EM_support}}</span><br> </td><td valign="top" class="row2"> Index: step1c_empw.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/step1c_empw.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** step1c_empw.tpl 1 May 2005 07:24:36 -0000 1.2 --- step1c_empw.tpl 5 Jun 2005 23:37:05 -0000 1.3 *************** *** 6,10 **** <img src="./templates/nuttzy.jpg"> <br> ! <span class="gen">{{EM_support}}</class><br> </td><td valign="top" class="row2"> --- 6,10 ---- <img src="./templates/nuttzy.jpg"> <br> ! <span class="gen">{{EM_support}}</span><br> </td><td valign="top" class="row2"> Index: page_header.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/page_header.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** page_header.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- page_header.tpl 5 Jun 2005 23:37:05 -0000 1.2 *************** *** 16,20 **** <td colspan="2"><table width="90%" border="0" align="center" cellspacing="0" cellpadding="0"> <tr> ! <td><span class="gen">{{TEXT}}</span></tsd> </tr> </table></td> --- 16,20 ---- <td colspan="2"><table width="90%" border="0" align="center" cellspacing="0" cellpadding="0"> <tr> ! <td><span class="gen">{{TEXT}}</span></td> </tr> </table></td> |
|
From: Eric F. <wg...@us...> - 2005-06-05 23:37:15
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17019/mods/easymod Modified Files: easymod_display_functions.php easymod_install.php lang_easymod.php Log Message: - Removed all hardcoded language from installer (I think I got it all). I know I really shouldn't but I have tested it so some things might not be working correctly. - Template updates to make XHTML compatible (only the ones I saw, I didn't go looking) - Other minor changes Index: easymod_display_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_display_functions.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** easymod_display_functions.php 25 May 2005 01:10:39 -0000 1.8 --- easymod_display_functions.php 5 Jun 2005 23:37:04 -0000 1.9 *************** *** 208,216 **** $variables['EM_debug_move'] = $lang['EM_debug_move'] ; $variables['EM_debug_ftp_dir'] = $lang['EM_debug_ftp_dir'] ; ! $variables['EM_debug_ftp_host'] = 'ftp host' ; ! $variables['EM_debug_ftp_port'] = 'ftp port' ; $variables['EM_debug_ftp_debug'] = $lang['EM_debug_ftp_debug'] ; $variables['EM_debug_ftp_ext'] = $lang['EM_debug_ftp_ext'] ; ! $variables['EM_debug_ftp_cache'] = 'ftp cache' ; $variables['EM_debug_listing'] = $lang['EM_debug_listing'] ; --- 208,216 ---- $variables['EM_debug_move'] = $lang['EM_debug_move'] ; $variables['EM_debug_ftp_dir'] = $lang['EM_debug_ftp_dir'] ; ! $variables['EM_debug_ftp_host'] = $lang['EM_debug_ftp_host']; ! $variables['EM_debug_ftp_port'] = $lang['EM_debug_ftp_post']; $variables['EM_debug_ftp_debug'] = $lang['EM_debug_ftp_debug'] ; $variables['EM_debug_ftp_ext'] = $lang['EM_debug_ftp_ext'] ; ! $variables['EM_debug_ftp_cache'] = $lang['EM_debug_ftp_cache']; $variables['EM_debug_listing'] = $lang['EM_debug_listing'] ; *************** *** 504,509 **** --- 504,512 ---- $variables['EM_no'] = $lang['EM_no'] ; $variables['EM_ftp_debug_not'] = $lang['EM_ftp_debug_not'] ; + $variables['EM_ftp_advance_settings'] = $lang['EM_ftp_advance_settings']; $variables['EM_ftp_use_ext'] = $lang['EM_ftp_use_ext'] ; $variables['EM_ftp_ext_not'] = $lang['EM_ftp_ext_not'] ; + $variables['EM_ftp_use_cache'] = $lang['EM_ftp_cache'] + $variables['EM_more_info'] = $lang['EM_more_info']; $ftp_ext_message = '' ; *************** *** 676,680 **** { // ask them WTF?? ! handle_error( OPEN_FAIL_CRITICAL, $file_list, false, "No server read access. Check your permission settings. Read access from a local file not implemented in this version.<br><br>" . $read_failure ) ; } --- 679,683 ---- { // ask them WTF?? ! handle_error( OPEN_FAIL_CRITICAL, $file_list, false, 'No server read access. Check your permission settings. Read access from a local file not implemented in this version.<br /><br />' . $read_failure ) ; } *************** *** 756,759 **** --- 759,764 ---- $variables['Submit'] = $lang['Submit'] ; $variables['Rescan'] = $lang['Rescan'] ; + $variables['EM_simple_mode'] = $lang['EM_simple_mode']; + $variables['EM_advanced_mode'] = $lang['EM_advanced_mode']; $variables['SELECT_READ'] = $select_read ; *************** *** 798,801 **** --- 803,814 ---- $variables['Submit'] = $lang['Submit'] ; $variables['LANGUAGE'] = $language ; + $variables['EM_simple_mode'] = $lang['EM_simple_mode']; + $variables['EM_advanced_mode'] = $lang['EM_advanced_mode']; + $variables['EM_server_style'] = $lang['EM_server_style']; + $variables['EM_about_server'] = $lang['EM_about_server']; + $variables['EM_describes_server'] = $lang['EM_describes_server']; + $variables['EM_have_ftp'] = $lang['EM_have_ftp']; + $variables['EM_have_windows'] = $lang['EM_have_windows']; + $variables['EM_no_ftp_suggest'] = $lang['EM_no_ftp_suggest']; *************** *** 850,854 **** // display header info, like the welcome message and pic ! page_header( 'auto detection') ; --- 863,867 ---- // display header info, like the welcome message and pic ! page_header($lang['EM_auto_detect']) ; *************** *** 859,862 **** --- 872,888 ---- $variables['Submit'] = $lang['Submit'] ; $variables['Rescan'] = $lang['Rescan'] ; + $variables['SELECT_ONE'] = $lang['Select_one']; + $variables['EM_diagnosis'] = $lang['EM_diagnosis']; + $variables['EM_auto_tech_detected'] = $lang['EM_auto_tech_detected']; + $variables['EM_nowrite_nocopy__desc'] = $lang['EM_nowrite_desc']; + $variables['EM_try_ftp'] = $lang['EM_try_ftp']; + $variables['EM_perms_mod_rescan'] = $lang['EM_perms_mod_rescan']; + $variables['EM_download_manual'] = $lang['EM_download_manual']; + $variables['EM_select_else'] = $lang['EM_select_else']; + $variables['EM_write_copy_desc'] = $lang['EM_write_copy_desc']; + $variables['EM_yes_use_auto'] = $lang['EM_yes_use_auto']; + $variables['EM_no_use_else'] = $lang['EM_no_use_else']; + $variables['EM_write_nocopy_desc'] = $lang['EM_write_nocopy_desc']; + $variables['EM_use_post_process'] = $lang['EM_use_post_process']; Index: lang_easymod.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/lang_easymod.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** lang_easymod.php 3 Jun 2005 22:59:13 -0000 1.7 --- lang_easymod.php 5 Jun 2005 23:37:05 -0000 1.8 *************** *** 176,179 **** --- 176,180 ---- // installer // + $lang['EM_more_info'] = 'More information'; // translate this and I'll hardcode the message into easymod_install.php *************** *** 232,235 **** --- 233,237 ---- $lang['EM_ftp_port_info'] = '(21 should be fine)' ; + $lang['EM_ftp_advance_settings'] = 'Advanced FTP Settings (optional!)'; $lang['EM_ftp_debug'] = 'FTP Debug Mode' ; $lang['EM_ftp_debug_not'] = '(only use if there is a problem)' ; *************** *** 242,245 **** --- 244,288 ---- $lang['EM_no'] = 'No' ; + // simple step 1 + $lang['EM_server_style'] = 'Server Style'; + $lang['EM_about_server'] = 'About your server'; + $lang['EM_describes_server'] = 'Which of the following choices best describes your phpBB server:'; + $lang['EM_have_ftp'] = 'I have FTP access to my phpBB files on the server.'; + $lang['EM_have_windows'] = 'This is a Windows server and I don\'t have to worry about file permissions.'; + $lang['EM_no_ftp_suggest'] = 'I don\'t have FTP access. Have EasyMOD suggest what to do please!'; + $lang['EM_auto_detect'] = 'Auto Detection'; + $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> + {{SAFE_MODE}}<li>Your server has "safe mode" enabled which means EasyMOD cannot automaticly replace your phpBB files. You might consider using <a href="#" target="_blank">chmod</a> or <a href="#" target="_blank">chown</a> to allow access.</li> + <li>You might consider using <a href="#" target="_blank">chmod</a> to allow access. However, this is not advised in a shared server environment.</li> + <li>Otherwise you will have to download the files and then manually move them into place.</li> + </ol>'; + $lang['EM_try_ftp'] = 'I\'ll try using the FTP option. (requires FTP access)'; + $lang['EM_perms_mod_rescan'] = 'I have now modified my file permissions, try rescanning to see if EasyMOD has access.'; + $lang['EM_download_manual'] = 'I will have to download the files and manually move them into place'; + $lang['EM_select_else'] = 'I\'d like to select something else. (Advanced Mode)'; + + // 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> + {{SAFE_MODE}}<li>Your server has "safe mode" enabled which means EasyMOD cannot automaticly replace your phpBB files. You might consider using <a href="#" target="_blank">chmod</a> or <a href="#" target="_blank">chown</a> to allow access.</li> + <li>You might consider using <a href="#" target="_blank">chmod</a> to allow access. However, this is not advised in a shared server environment.</li> + <li>Otherwise you have to use the <a href="#" target="_blank">post_process script</a> or manually move files into place.</li> + </ol>'; + $lang['EM_use_post_process'] = 'I will use the post_process script to automatically move files into place. (requires knowledge of how to execute a script)'; + + // write and copy + $lang['EM_write_copy_desc'] = 'Good news! EasyMOD has detected that it has the necessary access to automatically install MODs. You should select yes below.'; + $lang['EM_yes_use_auto'] = 'Yes, use this automated method.'; + $lang['EM_no_use_else'] = 'No, I\'d like to select something else. (Advanced Mode)'; + + // step 2 $lang['EM_step2'] = '<b>Step 2 (of 5):</b> EasyMOD is now confirming your file access settings.' ; *************** *** 365,370 **** --- 408,416 ---- $lang['EM_debug_move'] = 'move' ; $lang['EM_debug_ftp_dir'] = 'ftp dir' ; + $lang['EM_debug_ftp_host'] = 'ftp host'; + $lang['EM_debug_ftp_post'] = 'ftp port'; $lang['EM_debug_ftp_debug'] = 'ftp debug' ; $lang['EM_debug_ftp_ext'] = 'ftp ext' ; + $lang['EM_debug_ftp_cache'] = 'ftp cache'; $lang['EM_debug_ftp_notest'] = 'Not testing FTP since it is not being used.' ; $lang['EM_debug_selected'] = 'Selected settings' ; Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** easymod_install.php 27 May 2005 09:24:26 -0000 1.12 --- easymod_install.php 5 Jun 2005 23:37:05 -0000 1.13 *************** *** 24,28 **** $script_path = 'admin/mods/easymod/' ; //// ! $easymod_install_version = '0.1.13' ; //// --- 24,28 ---- $script_path = 'admin/mods/easymod/' ; //// ! $easymod_install_version = '0.2.0' ; //// |
