[Easymod-cvs] easymod2/mods/easymod easymod_display_functions.php,1.8,1.9 easymod_install.php,1.12,1
Status: Beta
Brought to you by:
wgeric
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' ; //// |