easymod-cvs Mailing List for EasyMOD (Page 5)
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: Markus P. <mar...@us...> - 2005-11-08 19:35:22
|
Update of /cvsroot/easymod/easymod2/mods/easymod/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11041/mods/easymod/languages Modified Files: lang_easymod_english.php Log Message: Changing 'beta 1' by 'beta' for the installer panel title. Index: lang_easymod_english.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/languages/lang_easymod_english.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** lang_easymod_english.php 8 Nov 2005 19:24:05 -0000 1.12 --- lang_easymod_english.php 8 Nov 2005 19:35:12 -0000 1.13 *************** *** 227,231 **** $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\'.'; --- 227,231 ---- $lang['Safe_mode'] = 'Safe Mode'; $lang['Go'] = 'Go'; ! $lang['EM_installing_beta'] = 'Installing EasyMOD beta (%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\'.'; |
|
From: Markus P. <mar...@us...> - 2005-11-08 19:24:13
|
Update of /cvsroot/easymod/easymod2/mods/easymod/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7937/mods/easymod/languages Modified Files: lang_easymod_english.php Log Message: Adding extra information to the debug report. Index: lang_easymod_english.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/languages/lang_easymod_english.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** lang_easymod_english.php 7 Nov 2005 18:14:55 -0000 1.11 --- lang_easymod_english.php 8 Nov 2005 19:24:05 -0000 1.12 *************** *** 247,250 **** --- 247,256 ---- $lang['EM_update_from'] = 'Update EM from'; + $lang['EM_PHP_sysinfo'] = 'Additional System Information'; + $lang['EM_not_avail'] = 'N/A'; + $lang['EM_PHP_system'] = 'System'; + $lang['EM_PHP_config'] = 'Configure Command'; + $lang['EM_PHP_version'] = 'PHP version'; + $lang['EM_File_Access'] = 'File Access Info'; $lang['EM_unattempted'] = 'unattempted'; |
|
From: Markus P. <mar...@us...> - 2005-11-08 19:24:13
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7937/mods/easymod Modified Files: easymod_display_functions.php Log Message: Adding extra information to the debug report. Index: easymod_display_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_display_functions.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** easymod_display_functions.php 8 Nov 2005 17:24:25 -0000 1.23 --- easymod_display_functions.php 8 Nov 2005 19:24:05 -0000 1.24 *************** *** 237,240 **** --- 237,265 ---- $variables['FILE_LISTING'] = $values['file_listing']; + // Added in 0.3.0 + global $board_config; + if (empty($board_config['EM_version'])) + { + $variables['L_EM_STATUS'] = $lang['EM_EM_status']; + $variables['EM_STATUS'] = $lang['EM_new_install']; + } + else + { + $variables['L_EM_STATUS'] = $lang['EM_update_from']; + $variables['EM_STATUS'] = $board_config['EM_version']; + } + $variables['L_EM_PHP_sysinfo'] = $lang['EM_PHP_sysinfo']; + $variables['L_EM_PHP_system'] = $lang['EM_PHP_system']; + $variables['L_EM_PHP_config'] = $lang['EM_PHP_config']; + $variables['L_EM_PHP_version'] = $lang['EM_PHP_version']; + $variables['PHP_system'] = htmlspecialchars(em_get_phpinfo_data('system')); + $variables['PHP_config'] = htmlspecialchars(em_get_phpinfo_data('configure command')); + $variables['PHP_version'] = phpversion(); + $variables['PHP_register_globals'] = (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' ? $lang['EM_on'] : $lang['EM_off']); + $variables['PHP_magic_quotes_gpc'] = (get_magic_quotes_gpc() ? $lang['EM_on'] : $lang['EM_off']); + $variables['PHP_magic_quotes_runtime'] = (get_magic_quotes_runtime() ? $lang['EM_on'] : $lang['EM_off']); + $variables['PHP_allow_url_fopen'] = (@ini_get('allow_url_fopen') == '1' || strtolower(@ini_get('allow_url_fopen')) == 'on' ? $lang['EM_on'] : $lang['EM_off']); + $variables['PHP_sockets_support'] = htmlspecialchars(em_get_phpinfo_data('sockets support')); + display_template( $phpbb_root_path . $script_path . 'templates/display_debug.tpl', $variables); *************** *** 259,262 **** --- 284,303 ---- } + // extract information from phpinfo output + function em_get_phpinfo_data($query) + { + global $lang; + + ob_start(); + phpinfo(); + $phpinfo = ob_get_contents(); + ob_end_clean(); + + if( preg_match('#<tr\s*.*?><td\s*.*?>\s*'.$query.'\s*</td><td\s*.*?>\s*(.*?)\s*</td>#i', $phpinfo, $match) && !empty($match[1]) ) + { + return $match[1]; + } + return $lang['EM_not_avail']; + } // display the debug info; can be called from handle error or from any page just to get info *************** *** 513,517 **** // check for server chmod access $access['chmod_access'] = check_access_chmod( $access_msg); ! $variables['ACCESS_CHMOD'] = ($access['copy_access']) ? $ok_msg : $no_msg; // check for server unlink access --- 554,558 ---- // check for server chmod access $access['chmod_access'] = check_access_chmod( $access_msg); ! $variables['ACCESS_CHMOD'] = ($access['chmod_access']) ? $ok_msg : $no_msg; // check for server unlink access |
|
From: Markus P. <mar...@us...> - 2005-11-08 19:24:13
|
Update of /cvsroot/easymod/easymod2/mods/easymod/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7937/mods/easymod/templates Modified Files: display_debug.tpl Log Message: Adding extra information to the debug report. Index: display_debug.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/display_debug.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** display_debug.tpl 31 Oct 2005 17:57:15 -0000 1.3 --- display_debug.tpl 8 Nov 2005 19:24:05 -0000 1.4 *************** *** 13,16 **** --- 13,17 ---- <br /> [quote="{{EM_debug_installer}} v{{EM_VERSION}}"]<br /> + [b]<b>{{L_EM_STATUS}}:</b>[/b] {{EM_STATUS}}<br /> [b]<b>{{EM_phpBB_version}}:</b>[/b] {{PHPBB_VERSION}}<br /> [b]<b>{{EM_debug_work_dir}}:</b>[/b] {{CWD}}<br /> *************** *** 18,25 **** [b]<b>{{EM_debug_mode}}:</b>[/b] {{MODE}}<br /> <br /> [quote="{{EM_debug_the_error}}"]<br /> ! {{ERROR}}<?php echo ?><br /> [/quote]<br /> <br /> [b]<b>{{EM_debug_permissions}}:</b>[/b] ({{EM_debug_sys_errors}})<br /> <!-- FILE ACCESS --> --- 19,28 ---- [b]<b>{{EM_debug_mode}}:</b>[/b] {{MODE}}<br /> <br /> + <br /> [quote="{{EM_debug_the_error}}"]<br /> ! {{ERROR}}<br /> [/quote]<br /> <br /> + <br /> [b]<b>{{EM_debug_permissions}}:</b>[/b] ({{EM_debug_sys_errors}})<br /> <!-- FILE ACCESS --> *************** *** 28,31 **** --- 31,45 ---- <br /> <br /> + [b]<b>{{L_EM_PHP_sysinfo}}:</b>[/b]<br /> + <br /> + [b]<b>{{L_EM_PHP_system}}:</b>[/b] {{PHP_system}}<br /> + [b]<b>{{L_EM_PHP_config}}:</b>[/b] {{PHP_config}}<br /> + [b]<b>{{L_EM_PHP_version}}:</b>[/b] {{PHP_version}}<br /> + [b]<b>register_globals:</b>[/b] {{PHP_register_globals}}<br /> + [b]<b>magic_quotes_gpc:</b>[/b] {{PHP_magic_quotes_gpc}}<br /> + [b]<b>magic_quotes_runtime:</b>[/b] {{PHP_magic_quotes_runtime}}<br /> + [b]<b>allow_url_fopen:</b>[/b] {{PHP_allow_url_fopen}}<br /> + [b]<b>sockets_support:</b>[/b] {{PHP_sockets_support}}<br /> + <br /> <br /> [b]<b>{{EM_debug_recommend}}:</b>[/b]<br /> |
|
From: Markus P. <mar...@us...> - 2005-11-08 17:24:36
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2811/mods/easymod Modified Files: easymod_display_functions.php Log Message: I'm going to add more information to the debug info report of the installer, but I first... normalizing end of statements here, so the incoming changes are easily visible with the next commit. Index: easymod_display_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_display_functions.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** easymod_display_functions.php 6 Nov 2005 15:13:05 -0000 1.22 --- easymod_display_functions.php 8 Nov 2005 17:24:25 -0000 1.23 *************** *** 42,46 **** // open the template file for readin ! $template = fopen( $template_file, 'r') ; // look through the file, displaying each line to the screen --- 42,46 ---- // open the template file for readin ! $template = fopen( $template_file, 'r'); [...1751 lines suppressed...] ! $variables['FTP_HOST'] = $ftp_host; ! $variables['FTP_PORT'] = $ftp_port; ! $variables['FTP_DIR'] = $ftp_dir; ! $variables['FTP_DEBUG'] = $ftp_debug; ! $variables['FTP_TYPE'] = $ftp_type; ! $variables['FTP_CACHE'] = $ftp_cache; // fill the template info ! get_empw_settings( $variables); ! get_hidden_data( $variables, $access); // dispay the page and the footer ! display_template( $phpbb_root_path . $script_path . 'templates/step1c_empw.tpl', $variables); ! page_footer(); ! exit; } ?> \ No newline at end of file |
|
From: Markus P. <mar...@us...> - 2005-11-08 16:52:50
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23542/mods/easymod/includes Modified Files: admin_easymod.php.txt Log Message: Removed the './' prefix from $phpbb_root_path used in the install and acp scripts. Changed version number to 0.3.0, it seems to make sense as the upgrade comes with several new features, but it still is (or should be) considered Beta code. Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** admin_easymod.php.txt 6 Nov 2005 15:32:00 -0000 1.43 --- admin_easymod.php.txt 8 Nov 2005 16:52:41 -0000 1.44 *************** *** 54,58 **** // define('IN_PHPBB', 1); ! $phpbb_root_path = './../'; require($phpbb_root_path . 'extension.inc'); require('./pagestart.' . $phpEx); --- 54,58 ---- // define('IN_PHPBB', 1); ! $phpbb_root_path = '../'; require($phpbb_root_path . 'extension.inc'); require('./pagestart.' . $phpEx); *************** *** 95,99 **** /// /// ! define('EASYMOD_VER', 'beta1 (0.2.2)'); define('FAQ_LINK', '<a href="http://easymod.sourceforge.net/readme/" target="_blank">'); define('REPORT_LINK', '<a href="http://area51.phpbb.com/phpBB/viewtopic.php?t=12143" target="_blank">'); --- 95,99 ---- /// /// ! define('EASYMOD_VER', 'beta (0.3.0)'); define('FAQ_LINK', '<a href="http://easymod.sourceforge.net/readme/" target="_blank">'); define('REPORT_LINK', '<a href="http://area51.phpbb.com/phpBB/viewtopic.php?t=12143" target="_blank">'); |
|
From: Markus P. <mar...@us...> - 2005-11-08 16:52:49
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23542/mods/easymod Modified Files: easymod_install.php Log Message: Removed the './' prefix from $phpbb_root_path used in the install and acp scripts. Changed version number to 0.3.0, it seems to make sense as the upgrade comes with several new features, but it still is (or should be) considered Beta code. Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** easymod_install.php 6 Nov 2005 15:13:05 -0000 1.46 --- easymod_install.php 8 Nov 2005 16:52:41 -0000 1.47 *************** *** 21,25 **** define('IN_PHPBB', 1); ! $phpbb_root_path = './../../../'; // Checking phpBB files here allow us to halt installation and warn them with an explanation if the have not upload EM to the correct place ;-) --- 21,25 ---- define('IN_PHPBB', 1); ! $phpbb_root_path = '../../../'; // Checking phpBB files here allow us to halt installation and warn them with an explanation if the have not upload EM to the correct place ;-) *************** *** 54,58 **** //// ! $easymod_install_version = '0.2.2'; $script_path = 'admin/mods/easymod/'; //// --- 54,58 ---- //// ! $easymod_install_version = '0.3.0'; $script_path = 'admin/mods/easymod/'; //// |
|
From: Markus P. <mar...@us...> - 2005-11-07 18:15:06
|
Update of /cvsroot/easymod/easymod2/mods/easymod/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27373/mods/easymod/languages Modified Files: lang_easymod_english.php Log Message: Remove another unused language entry. Index: lang_easymod_english.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/languages/lang_easymod_english.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** lang_easymod_english.php 6 Nov 2005 17:59:55 -0000 1.10 --- lang_easymod_english.php 7 Nov 2005 18:14:55 -0000 1.11 *************** *** 33,37 **** $lang['MOD_settings'] = 'EasyMOD Settings'; $lang['MOD_history'] = 'EasyMOD History'; - $lang['MOD_control_tag'] = '$easymod_install_version'; // header --- 33,36 ---- |
|
From: Markus P. <mar...@us...> - 2005-11-06 18:00:10
|
Update of /cvsroot/easymod/easymod2/mods/easymod/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13871/mods/easymod/languages Modified Files: lang_easymod_english.php Log Message: Changed settings panel description. Index: lang_easymod_english.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/languages/lang_easymod_english.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** lang_easymod_english.php 6 Nov 2005 15:13:05 -0000 1.9 --- lang_easymod_english.php 6 Nov 2005 17:59:55 -0000 1.10 *************** *** 76,80 **** $lang['EM_move_exec'] = 'execute script'; $lang['EM_move_manual'] = 'manually load'; ! $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.'; --- 76,80 ---- $lang['EM_move_exec'] = 'execute script'; $lang['EM_move_manual'] = 'manually load'; ! $lang['EM_settings_desc'] = 'This page allows you to configure EasyMOD settings. If you\'re using FTP methods, an attempt to check the connection will be made everytime you submit the form.'; $lang['EM_settings_update'] = 'Update Settings'; $lang['EM_settings_success'] = 'Your EasyMOD settings have been updated successfully.'; |
|
From: Markus P. <mar...@us...> - 2005-11-06 15:32:14
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18790/mods/easymod/includes Modified Files: admin_easymod.php.txt Log Message: Implemented FTP Debug option in EM settings panel. Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** admin_easymod.php.txt 6 Nov 2005 15:13:05 -0000 1.42 --- admin_easymod.php.txt 6 Nov 2005 15:32:00 -0000 1.43 *************** *** 997,1000 **** --- 997,1001 ---- $ftp_host = (isset($HTTP_POST_VARS['ftp_host'])) ? stripslashes($HTTP_POST_VARS['ftp_host']) : ''; $ftp_port = (isset($HTTP_POST_VARS['ftp_port'])) ? intval($HTTP_POST_VARS['ftp_port']) : 0; + $ftp_debug = (isset($HTTP_POST_VARS['ftp_debug'])) ? intval($HTTP_POST_VARS['ftp_debug']) : false; $ftp_type = (isset($HTTP_POST_VARS['ftp_type'])) ? stripslashes($HTTP_POST_VARS['ftp_type']) : 'fsock'; $ftp_cache = (isset($HTTP_POST_VARS['ftp_cache'])) ? intval($HTTP_POST_VARS['ftp_cache']) : 0; |
|
From: Markus P. <mar...@us...> - 2005-11-06 15:19:42
|
Update of /cvsroot/easymod/easymod2/mods/easymod/em_includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15737/mods/easymod/em_includes Modified Files: em_ftp.php Log Message: Implemented FTP Debug option in EM settings panel. Index: em_ftp.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_ftp.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** em_ftp.php 6 Nov 2005 13:30:52 -0000 1.13 --- em_ftp.php 6 Nov 2005 15:19:30 -0000 1.14 *************** *** 32,42 **** // used in step 2 of the installer to test the connection and also used in the debug feature; also // used in the main proggie to check settings ! function test_ftp($ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, $ftp_debug, $ftp_type, $ftp_cache, &$test_report) { global $lang, $phpbb_root_path, $easymod_install_version; ! $test_report = array(); ! ! $test_report[] = '<h3>' . $lang['EM_ftp_testing'] . '</h3>'; // create the emftp which will use either fsockopen or the PHP FTP extension --- 32,48 ---- // used in step 2 of the installer to test the connection and also used in the debug feature; also // used in the main proggie to check settings ! function capture_test_ftp($ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, $ftp_debug, $ftp_type, $ftp_cache, &$test_report) ! { ! ob_start(); ! $result = test_ftp($ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, $ftp_debug, $ftp_type, $ftp_cache); ! $test_report = ob_get_contents(); ! ob_end_clean(); ! return $result; ! } ! function test_ftp($ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, $ftp_debug, $ftp_type, $ftp_cache) { global $lang, $phpbb_root_path, $easymod_install_version; ! echo '<h3>' . $lang['EM_ftp_testing'] . '</h3>' . "\n"; // create the emftp which will use either fsockopen or the PHP FTP extension *************** *** 47,57 **** { // failed to connect! ! $test_report[] = '<br />'; ! $test_report[] = '<b>' . sprintf($lang['EM_ftp_fail_conn'], $ftp_host, $ftp_port) . '</b><br />'; // they may need to specify the host if( $ftp_host == 'localhost' ) { ! $test_report[] = $lang['EM_ftp_fail_conn_lh'] . '<br />'; } --- 53,63 ---- { // 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"; } *************** *** 59,63 **** elseif( $ftp_port == 21 ) { ! $test_report[] = $lang['EM_ftp_fail_conn_21'] . '<br />'; } --- 65,69 ---- elseif( $ftp_port == 21 ) { ! echo $lang['EM_ftp_fail_conn_21'] . '<br />' . "\n"; } *************** *** 68,73 **** if( (strstr($ftp_host, '/')) || (strstr($ftp_host, '\\')) || (strstr($ftp_host, ':')) ) { ! $test_report[] = $lang['EM_ftp_fail_conn_invalid'] . '<br />'; ! $test_report[] = '<br />'; } --- 74,79 ---- if( (strstr($ftp_host, '/')) || (strstr($ftp_host, '\\')) || (strstr($ftp_host, ':')) ) { ! echo $lang['EM_ftp_fail_conn_invalid'] . '<br />' . "\n"; ! echo '<br />' . "\n"; } *************** *** 75,89 **** elseif( intval($ftp_port) == $ftp_port ) { ! $test_report[] = $lang['EM_ftp_fail_conn_invalid2'] . '<br />'; ! $test_report[] = '<br />'; } // give them options ! $test_report[] = $lang['EM_fail_conn_info'] . '<br /><ol>'; ! $test_report[] = '<li>' . $lang['EM_fail_conn_op1'] . '</li>'; ! $test_report[] = '<li>' . $lang['EM_fail_conn_op2'] . '</li>'; ! $test_report[] = '<li>' . $lang['EM_fail_conn_op3'] . '</li>'; ! $test_report[] = '<li>' . $lang['EM_fail_conn_op4'] . '</li>'; ! $test_report[] = '</ol>'; } --- 81,95 ---- elseif( 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"; } *************** *** 97,124 **** $emftp->ftp_quit(); ! $test_report[] = '<br />'; ! $test_report[] = '<b>' . $lang['EM_fail_login'] . '</b><br />'; // give them options ! $test_report[] = $lang['EM_fail_login_info'] . '<br /><ol>'; // check user/pass ! $test_report[] = '<li>' . $lang['EM_fail_login_op1'] . '</li>'; if( $ftp_host == 'localhost' || $ftp_port == 21 ) { // change from localhost ! $test_report[] = '<li>' . $lang['EM_fail_login_op2a'] . '</li>'; } else { // change to localhost or something else ! $test_report[] = '<li>' . $lang['EM_fail_login_op2b'] . '</li>'; } ! $test_report[] = '</ol>'; return false; } ! $test_report[] = $lang['EM_test_ftp1']. '<br />'; --- 103,130 ---- $emftp->ftp_quit(); ! echo '<br />' . "\n"; ! echo '<b>' . $lang['EM_fail_login'] . '</b><br />' . "\n"; // give them options ! echo $lang['EM_fail_login_info'] . '<br /><ol>' . "\n"; // check user/pass ! echo '<li>' . $lang['EM_fail_login_op1'] . '</li>' . "\n"; if( $ftp_host == 'localhost' || $ftp_port == 21 ) { // change from localhost ! echo '<li>' . $lang['EM_fail_login_op2a'] . '</li>' . "\n"; } else { // change to localhost or something else ! echo '<li>' . $lang['EM_fail_login_op2b'] . '</li>' . "\n"; } ! echo '</ol>' . "\n"; return false; } ! echo $lang['EM_test_ftp1']. '<br />' . "\n"; *************** *** 126,130 **** if( $ftp_debug ) { ! $test_report[] = '<b>' . $lang['EM_dir_current'] . ':</b> ' . $emftp->ftp_pwd() . '<br />'; ////// --- 132,136 ---- if( $ftp_debug ) { ! echo '<b>' . $lang['EM_dir_current'] . ':</b> ' . $emftp->ftp_pwd() . '<br />' . "\n"; ////// *************** *** 133,140 **** $list = $emftp->ftp_nlist(); ! $test_report[] = sprintf($lang['EM_dir_nlist'], count($list)) . '<br />'; for( $i = 0; $i < count($list); $i++ ) { ! $test_report[] = '[' . $list[$i] . ']<br />'; } } --- 139,146 ---- $list = $emftp->ftp_nlist(); ! echo sprintf($lang['EM_dir_nlist'], count($list)) . '<br />' . "\n"; for( $i = 0; $i < count($list); $i++ ) { ! echo '[' . $list[$i] . ']<br />' . "\n"; } } *************** *** 143,155 **** if( !($pwd = $emftp->ftp_chdir($ftp_dir . '/admin/mods/easymod')) ) { ! $test_report[] = '<br />'; ! $test_report[] = '<b>' . sprintf($lang['EM_fail_cd'], $ftp_dir) . '</b><br />'; ! $test_report[] = $lang['EM_fail_cd_info'] . '<br /><ol><br />'; // some dopes put the ftp server in the paths if( (strstr($ftp_dir, '.com')) || (strstr($ftp_dir, '.net')) || (strstr($ftp_dir, '.org')) ) { ! $test_report[] = '<li>' . $lang['EM_fail_cd_op1'] . '</li>'; } --- 149,161 ---- 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"; } *************** *** 157,191 **** if( substr($ftp_dir, strlen($ftp_dir)-1) == '/' ) { ! $test_report[] = '<li>' . $lang['EM_fail_cd_op2'] . '</li>'; } // everything else ! $test_report[] = '<li>' . $lang['EM_fail_cd_op3'] . '</li>'; ! $test_report[] = '<li>' . $lang['EM_fail_cd_op4'] . '</li>'; if( $ftp_host == 'localhost' || $ftp_port == 21 ) { ! $test_report[] = '<li>' . $lang['EM_fail_cd_op5'] . '</li>'; } ! $test_report[] = '<li>' . $lang['EM_fail_cd_op6'] . '</li>'; ! $test_report[] = '</ol>'; // print the working dir $emftp->set_debug(false); ! $test_report[] = '<br />'; ! $test_report[] = '<b>' . $lang['EM_ftp_root'] . '</b><br />'; // if pwd fails then we know it is probably a passive mode problem if( !$emftp->ftp_pwd() ) { ! $test_report[] = $lang['EM_fail_cd_pwd'] . '<br />'; } else { ! $test_report[] = $emftp->ftp_pwd() . '<br />'; } // print directory listing ! $test_report[] = '<br /><br />' . $lang['EM_dir_list'] . '<br />'; $list = $emftp->ftp_nlist(); --- 163,197 ---- 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"; // 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() ) { ! echo $lang['EM_fail_cd_pwd'] . '<br />' . "\n"; } else { ! echo $emftp->ftp_pwd() . '<br />' . "\n"; } // print directory listing ! echo '<br /><br />' . $lang['EM_dir_list'] . '<br />' . "\n"; $list = $emftp->ftp_nlist(); *************** *** 193,202 **** if( !$list ) { ! $test_report[] = $lang['EM_fail_cd_nlist'] . '<br />'; } // if there are no files then indicate there are none to print elseif( count($list) == 0 ) { ! $test_report[] = '--' . $lang['EM_fail_cd_nlist_no'] . '--<br />'; } else --- 199,208 ---- if( !$list ) { ! echo $lang['EM_fail_cd_nlist'] . '<br />' . "\n"; } // if there are no files then indicate there are none to print elseif( count($list) == 0 ) { ! echo '--' . $lang['EM_fail_cd_nlist_no'] . '--<br />' . "\n"; } else *************** *** 204,208 **** for( $i = 0; $i < count($list); $i++ ) { ! $test_report[] = $list[$i] . '<br />'; } } --- 210,214 ---- for( $i = 0; $i < count($list); $i++ ) { ! echo $list[$i] . '<br />' . "\n"; } } *************** *** 215,223 **** { $emftp->ftp_quit(); ! $test_report[] = $lang['EM_fail_pwd'] . '<br />'; return false; } ! $test_report[] = $lang['EM_test_ftp2'] . '<br />'; --- 221,229 ---- { $emftp->ftp_quit(); ! echo $lang['EM_fail_pwd'] . '<br />' . "\n"; return false; } ! echo $lang['EM_test_ftp2'] . '<br />' . "\n"; *************** *** 238,252 **** $emftp->ftp_quit(); ! $test_report[] = '<br />'; ! $test_report[] = '<b>' . $lang[$langkey] . '</b><br />'; ! $test_report[] = sprintf($lang['EM_fail_put_info'], $ftp_user) . '<br />'; ! $test_report[] = '<br />'; ! $test_report[] = '<b>' . $lang['EM_ftp_phpbb_root'] . '</b><br />'; if( $dh = opendir($phpbb_root_path) ) { while( ($file = readdir($dh)) !== false ) { ! $test_report[] = mfunGetPerms(fileperms($phpbb_root_path . $file)) . " $file <br />"; } closedir($dh); --- 244,258 ---- $emftp->ftp_quit(); ! echo '<br />' . "\n"; ! echo '<b>' . $lang[$langkey] . '</b><br />' . "\n"; ! 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($phpbb_root_path) ) { while( ($file = readdir($dh)) !== false ) { ! echo mfunGetPerms(fileperms($phpbb_root_path . $file)) . " $file <br />" . "\n"; } closedir($dh); *************** *** 260,267 **** if( !$emftp->ftp_delete($remote_filename) ) { ! $test_report[] = $lang['EM_fail_delete'] . '<br />'; } ! $test_report[] = $lang['EM_test_ftp3']. '<br />'; --- 266,273 ---- if( !$emftp->ftp_delete($remote_filename) ) { ! echo $lang['EM_fail_delete'] . '<br />' . "\n"; } ! echo $lang['EM_test_ftp3']. '<br />' . "\n"; *************** *** 283,287 **** { $emftp->ftp_quit(); ! $test_report[] = sprintf($lang['EM_fail_make_cache'], 'admin/em_includes/cache') . '<br />'; return false; } --- 289,293 ---- { $emftp->ftp_quit(); ! echo sprintf($lang['EM_fail_make_cache'], 'admin/em_includes/cache') . '<br />' . "\n"; return false; } *************** *** 310,318 **** { $emftp->ftp_quit(); ! $test_report[] = sprintf($lang['EM_fail_tmp'], $tmpfname) . '<br />'; return false; } ! $test_report[] = $lang['EM_test_ftp4']. '<br />'; } --- 316,324 ---- { $emftp->ftp_quit(); ! echo sprintf($lang['EM_fail_tmp'], $tmpfname) . '<br />' . "\n"; return false; } ! echo $lang['EM_test_ftp4']. '<br />' . "\n"; } |
|
From: Markus P. <mar...@us...> - 2005-11-06 15:13:31
|
Update of /cvsroot/easymod/easymod2/mods/easymod/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14320/mods/easymod/templates Modified Files: ftp_settings.tpl Log Message: Implemented FTP Debug option in EM settings panel. Index: ftp_settings.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/ftp_settings.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ftp_settings.tpl 31 Oct 2005 17:57:15 -0000 1.6 --- ftp_settings.tpl 6 Nov 2005 15:13:06 -0000 1.7 *************** *** 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> --- 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="{{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> --- 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> *************** *** 33,37 **** <td class="row2"> <input type="radio" name="ftp_debug" value="1" /><span class="gen">{{EM_yes}}</span> ! <input type="radio" name="ftp_debug" value="0" checked="checked" /><span class="gen">{{EM_no}}</span> <span class="gen">{{EM_ftp_debug_not}}</span> </td> </tr> --- 33,37 ---- <td class="row2"> <input type="radio" name="ftp_debug" value="1" /><span class="gen">{{EM_yes}}</span> ! <input type="radio" name="ftp_debug" value="0" checked="checked" /><span class="gen">{{EM_no}}</span> <span class="gen">{{EM_ftp_debug_not}} (<a href="{{U_FORM}}?mode=help#ftp_debug" onclick="return helpwin(this)">{{EM_more_info}}</a>)</span> </td> </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}} /><span class="gen">{{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> --- 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}} /><span class="gen">{{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}} /><span class="gen">{{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> --- 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}} /><span class="gen">{{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> |
|
From: Markus P. <mar...@us...> - 2005-11-06 15:13:31
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14320/mods/easymod/includes Modified Files: admin_easymod.php.txt mod_settings.tpl Log Message: Implemented FTP Debug option in EM settings panel. Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** admin_easymod.php.txt 6 Nov 2005 13:30:52 -0000 1.41 --- admin_easymod.php.txt 6 Nov 2005 15:13:05 -0000 1.42 *************** *** 942,945 **** --- 942,947 ---- 'L_FTP_HOST' => $lang['EM_ftp_host'], 'L_FTP_PORT' => $lang['EM_ftp_port'], + 'L_FTP_DEBUG' => $lang['EM_ftp_debug'], + 'L_FTP_DEBUG_WARN' => $lang['EM_ftp_debug_not'], 'L_FTP_EXT' => $lang['EM_ftp_use_ext'], 'L_FTP_EXT_WARN' => $lang['EM_ftp_ext_not'], *************** *** 1048,1053 **** { $command_file = get_em_settings('6E7574747A79.72756C657321', '', $password); ! $test_result = test_ftp($ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, $ftp_debug, $ftp_type, $ftp_cache, $test_report); ! $test_report = '<table align="center"><tr><td align="left">' . implode("\n", $test_report) . '</td></tr></table>'; } else --- 1050,1056 ---- { $command_file = get_em_settings('6E7574747A79.72756C657321', '', $password); ! $test_report = ''; ! $test_result = capture_test_ftp($ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, $ftp_debug, $ftp_type, $ftp_cache, $test_report); ! $test_report = '<table align="center"><tr><td align="left">' . $test_report . '</td></tr></table>'; } else Index: mod_settings.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_settings.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mod_settings.tpl 6 Nov 2005 11:20:10 -0000 1.7 --- mod_settings.tpl 6 Nov 2005 15:13:05 -0000 1.8 *************** *** 96,103 **** </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FTP_EXT}</span></td> <td class="row2"> <input type="radio" name="ftp_type" value="ext" {FTP_EXT} /><span class="gen">{L_YES}</span> ! <input type="radio" name="ftp_type" value="fsock" {FTP_FSOCK} />{L_NO}</span> <span class="gen">{L_FTP_EXT_WARN}</span> (<a href="{U_HELP}#ftp_php_ext" onclick="return helpwin(this);">{L_HELP}</a>) </td> --- 96,111 ---- </tr> <tr> + <td class="row1" align="right"><span class="gen">{L_FTP_DEBUG}</span></td> + <td class="row2"> + <input type="radio" name="ftp_debug" value="1" /><span class="gen">{L_YES}</span> + <input type="radio" name="ftp_debug" value="0" checked="checked" /><span class="gen">{L_NO}</span> <span class="gen">{L_FTP_DEBUG_WARN}</span> + (<a href="{U_HELP}#ftp_debug" onclick="return helpwin(this);">{L_HELP}</a>) + </td> + </tr> + <tr> <td class="row1" align="right"><span class="gen">{L_FTP_EXT}</span></td> <td class="row2"> <input type="radio" name="ftp_type" value="ext" {FTP_EXT} /><span class="gen">{L_YES}</span> ! <input type="radio" name="ftp_type" value="fsock" {FTP_FSOCK} /><span class="gen">{L_NO}</span> <span class="gen">{L_FTP_EXT_WARN}</span> (<a href="{U_HELP}#ftp_php_ext" onclick="return helpwin(this);">{L_HELP}</a>) </td> *************** *** 107,115 **** <td class="row2"> <input type="radio" name="ftp_cache" value="1" {FTP_CACHE_YES} /><span class="gen">{L_YES}</span> ! <input type="radio" name="ftp_cache" value="0" {FTP_CACHE_NO} />{L_NO}</span> <span class="gen">{L_FTP_EXT_WARN}</span> (<a href="{U_HELP}#ftp_cache" onclick="return helpwin(this);">{L_HELP}</a>) </td> </tr> - <tr> <th colspan="2">{L_EM_VERSION}</th> --- 115,122 ---- <td class="row2"> <input type="radio" name="ftp_cache" value="1" {FTP_CACHE_YES} /><span class="gen">{L_YES}</span> ! <input type="radio" name="ftp_cache" value="0" {FTP_CACHE_NO} /><span class="gen">{L_NO}</span> <span class="gen">{L_FTP_EXT_WARN}</span> (<a href="{U_HELP}#ftp_cache" onclick="return helpwin(this);">{L_HELP}</a>) </td> </tr> <tr> <th colspan="2">{L_EM_VERSION}</th> |
|
From: Markus P. <mar...@us...> - 2005-11-06 15:13:31
|
Update of /cvsroot/easymod/easymod2/mods/easymod/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14320/mods/easymod/languages Modified Files: lang_easymod_english.php Log Message: Implemented FTP Debug option in EM settings panel. Index: lang_easymod_english.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/languages/lang_easymod_english.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** lang_easymod_english.php 6 Nov 2005 13:30:52 -0000 1.8 --- lang_easymod_english.php 6 Nov 2005 15:13:05 -0000 1.9 *************** *** 582,585 **** --- 582,588 ---- $lang['help']['ftp_port'][] = 'This should usually be the default value (that is 21), but some (rare) servers use a different port.'; $lang['help']['ftp_port'][] = 'If you don\'t know what to put in here then try the default (21) and then try to use the same setting as you use in you FTP client or ask your hosting provider or server administrator.'; + $lang['help']['ftp_debug'][] = 'FTP Debug'; + $lang['help']['ftp_debug'][] = 'This option tells EasyMOD to generate an extended report that may help to identify problems with FTP connections.'; + $lang['help']['ftp_debug'][] = 'Support staff may request this information for diagnosis purposes.'; $lang['help']['ftp_php_ext'][] = 'PHP FTP Extension'; $lang['help']['ftp_php_ext'][] = 'This option instructs EasyMOD to use the <a href="http://www.php.net/ftp" target="_blank">PHP FTP Extension</a> to perform the file operations required to install MODs. However, this extension may not be enabled in your server configuration.'; |
|
From: Markus P. <mar...@us...> - 2005-11-06 15:13:27
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14320/mods/easymod Modified Files: easymod_display_functions.php easymod_install.php Log Message: Implemented FTP Debug option in EM settings panel. Index: easymod_display_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_display_functions.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** easymod_display_functions.php 6 Nov 2005 13:30:51 -0000 1.21 --- easymod_display_functions.php 6 Nov 2005 15:13:05 -0000 1.22 *************** *** 243,248 **** { // test the ftp connection ! $test_result = test_ftp($ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, true, $ftp_type, $ftp_cache, $test_report); ! echo implode("\n", $test_report); if( $test_result ) { --- 243,249 ---- { // test the ftp connection ! $test_report = ''; ! $test_result = capture_test_ftp($ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, true, $ftp_type, $ftp_cache, $test_report); ! echo $test_report; if( $test_result ) { Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** easymod_install.php 6 Nov 2005 13:30:51 -0000 1.45 --- easymod_install.php 6 Nov 2005 15:13:05 -0000 1.46 *************** *** 552,557 **** { // test the FTP connection ! $test_result = test_ftp($ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, $ftp_debug, $ftp_type, $ftp_cache, $test_report); ! echo implode("\n", $test_report); if( !$test_result ) { --- 552,558 ---- { // test the FTP connection ! $test_report = ''; ! $test_result = capture_test_ftp($ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, $ftp_debug, $ftp_type, $ftp_cache, $test_report); ! echo $test_report; if( !$test_result ) { *************** *** 643,648 **** { // test the FTP connection ! $test_result = test_ftp($ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, $ftp_debug, $ftp_type, $ftp_cache, $test_report); ! echo implode("\n", $test_report); if( !$test_result ) { --- 644,650 ---- { // test the FTP connection ! $test_report = ''; ! $test_result = capture_test_ftp($ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, $ftp_debug, $ftp_type, $ftp_cache, $test_report); ! echo $test_report; if( !$test_result ) { |
|
From: Markus P. <mar...@us...> - 2005-11-06 13:31:17
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27619/mods/easymod Modified Files: easymod_display_functions.php easymod_install.php Log Message: Fixed all known language issues (-=ET=-). Index: easymod_display_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_display_functions.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** easymod_display_functions.php 6 Nov 2005 11:17:54 -0000 1.20 --- easymod_display_functions.php 6 Nov 2005 13:30:51 -0000 1.21 *************** *** 32,40 **** function display_template( $template_file, $variables) { // make sure the tpl file exists if (!file_exists( $template_file)) { ! echo "<h1><span class=\"ok\">A required file [$template_file] is missing. Aborting install.</span></h1>\n" ; ! exit ; } --- 32,42 ---- function display_template( $template_file, $variables) { + global $lang; + // make sure the tpl file exists if (!file_exists( $template_file)) { ! echo '<h1><span class="ok">' . sprintf($lang['EM_err_no_tpl'], $template_file) . "</span></h1>\n"; ! exit; } *************** *** 472,476 **** if ($bbcode) { ! $ok_msg = '[b][color=green]<b class="ok">OK</b>[/color][/b]' ; $okparms = '[b][color=green]<b class="ok">%s</b>[/color][/b]' ; $no_msg = '[b]<b>' . $lang['EM_no'] . '</b>[/b]' ; --- 474,478 ---- if ($bbcode) { ! $ok_msg = '[b][color=green]<b class="ok">' . $lang['EM_ok'] . '</b>[/color][/b]' ; $okparms = '[b][color=green]<b class="ok">%s</b>[/color][/b]' ; $no_msg = '[b]<b>' . $lang['EM_no'] . '</b>[/b]' ; *************** *** 479,483 **** else { ! $ok_msg = '<b class="ok">OK</b>' ; $okparms = '<b class="ok">%s</b>' ; $no_msg = '<b>' . $lang['EM_no'] . '</b>' ; --- 481,485 ---- else { ! $ok_msg = '<b class="ok">' . $lang['EM_ok'] . '</b>' ; $okparms = '<b class="ok">%s</b>' ; $no_msg = '<b>' . $lang['EM_no'] . '</b>' ; Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** easymod_install.php 6 Nov 2005 11:20:10 -0000 1.44 --- easymod_install.php 6 Nov 2005 13:30:51 -0000 1.45 *************** *** 1089,1093 **** default: ! die("No DB LAYER found!"); break; } --- 1089,1093 ---- default: ! message_die(GENERAL_ERROR, $lang['EM_err_no_sql']); break; } |
|
From: Markus P. <mar...@us...> - 2005-11-06 13:31:17
|
Update of /cvsroot/easymod/easymod2/mods/easymod/em_includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27619/mods/easymod/em_includes Modified Files: em_ftp.php em_functions.php Log Message: Fixed all known language issues (-=ET=-). Index: em_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_functions.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** em_functions.php 5 Nov 2005 17:13:01 -0000 1.21 --- em_functions.php 6 Nov 2005 13:30:52 -0000 1.22 *************** *** 773,777 **** if ( trim($buffer) == '<?php') { ! $access_msg = 'OK' ; return true ; } --- 773,777 ---- if ( trim($buffer) == '<?php') { ! $access_msg = $lang['EM_ok'] ; return true ; } *************** *** 803,807 **** fclose( $fout) ; ! $access_msg = 'OK' ; return true ; } --- 803,807 ---- fclose( $fout) ; ! $access_msg = $lang['EM_ok'] ; return true ; } *************** *** 824,828 **** fclose( $fout) ; ! $access_msg = 'OK' ; return true ; } --- 824,828 ---- fclose( $fout) ; ! $access_msg = $lang['EM_ok'] ; return true ; } *************** *** 843,847 **** if ( chmod( 'EM_test.txt', 0777)) { ! $access_msg = 'OK' ; return true ; } --- 843,847 ---- if ( chmod( 'EM_test.txt', 0777)) { ! $access_msg = $lang['EM_ok'] ; return true ; } *************** *** 862,866 **** if ( unlink('EM_test.txt') ) { ! $access_msg = 'OK' ; return true ; } --- 862,866 ---- if ( unlink('EM_test.txt') ) { ! $access_msg = $lang['EM_ok'] ; return true ; } *************** *** 883,887 **** { // we can't remove the file but it has been created so we'll assume we have mkdir access ! $access_msg = 'OK'; return true; } --- 883,887 ---- { // we can't remove the file but it has been created so we'll assume we have mkdir access ! $access_msg = $lang['EM_ok']; return true; } *************** *** 894,898 **** rmdir( 'EM_test_dir') ; ! $access_msg = 'OK' ; return true ; } --- 894,898 ---- rmdir( 'EM_test_dir') ; ! $access_msg = $lang['EM_ok'] ; return true ; } *************** *** 924,928 **** unlink($tmpfname); ! $access_msg = 'OK' ; return true ; } --- 924,928 ---- unlink($tmpfname); ! $access_msg = $lang['EM_ok'] ; return true ; } *************** *** 951,955 **** if (@extension_loaded('ftp')) { ! $access_msg = 'OK' ; return true ; } --- 951,955 ---- if (@extension_loaded('ftp')) { ! $access_msg = $lang['EM_ok'] ; return true ; } *************** *** 970,979 **** if (@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'on') { ! $access_msg = 'ON' ; return false ; } else { ! $access_msg = 'OFF' ; return true ; } --- 970,979 ---- if (@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'on') { ! $access_msg = $lang['EM_on'] ; return false ; } else { ! $access_msg = $lang['EM_off'] ; return true ; } *************** *** 992,996 **** unlink( $phpbb_root_path . 'EM_test.txt') ; ! $access_msg = 'OK' ; return true ; } --- 992,996 ---- unlink( $phpbb_root_path . 'EM_test.txt') ; ! $access_msg = $lang['EM_ok'] ; return true ; } Index: em_ftp.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_ftp.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** em_ftp.php 6 Nov 2005 11:20:10 -0000 1.12 --- em_ftp.php 6 Nov 2005 13:30:52 -0000 1.13 *************** *** 126,130 **** if( $ftp_debug ) { ! $test_report[] = '<b>Current FTP working directory:</b> ' . $emftp->ftp_pwd() . '<br />'; ////// --- 126,130 ---- if( $ftp_debug ) { ! $test_report[] = '<b>' . $lang['EM_dir_current'] . ':</b> ' . $emftp->ftp_pwd() . '<br />'; ////// *************** *** 133,137 **** $list = $emftp->ftp_nlist(); ! $test_report[] = '<b>Dir listing:</b> (' . count($list) . ' files being listed)<br />'; for( $i = 0; $i < count($list); $i++ ) { --- 133,137 ---- $list = $emftp->ftp_nlist(); ! $test_report[] = sprintf($lang['EM_dir_nlist'], count($list)) . '<br />'; for( $i = 0; $i < count($list); $i++ ) { *************** *** 283,287 **** { $emftp->ftp_quit(); ! $test_report[] = 'Could not make the [admin/em_includes/cache] directory.' . '<br />'; return false; } --- 283,287 ---- { $emftp->ftp_quit(); ! $test_report[] = sprintf($lang['EM_fail_make_cache'], 'admin/em_includes/cache') . '<br />'; return false; } *************** *** 310,314 **** { $emftp->ftp_quit(); ! $test_report[] = "Could not create the [$tmpfname] temporary file.<br />"; return false; } --- 310,314 ---- { $emftp->ftp_quit(); ! $test_report[] = sprintf($lang['EM_fail_tmp'], $tmpfname) . '<br />'; return false; } |
|
From: Markus P. <mar...@us...> - 2005-11-06 13:31:17
|
Update of /cvsroot/easymod/easymod2/mods/easymod/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27619/mods/easymod/languages Modified Files: lang_easymod_english.php Log Message: Fixed all known language issues (-=ET=-). Index: lang_easymod_english.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/languages/lang_easymod_english.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** lang_easymod_english.php 6 Nov 2005 04:01:09 -0000 1.7 --- lang_easymod_english.php 6 Nov 2005 13:30:52 -0000 1.8 *************** *** 35,41 **** $lang['MOD_control_tag'] = '$easymod_install_version'; - // 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'; --- 35,38 ---- *************** *** 101,108 **** $lang['EM_check_permissions'] = 'The files must be accessible to PHP and the user running the web server process, so you need to ensure that the file access permissions on the server allow this access. If you have enabled safe mode, or open_basedir further restrictions may apply.'; $lang['EM_undefined_move_method'] = 'Undefined move method.'; - $lang['EM_MOD_center'] = 'MOD Center'; - $lang['EM_install_MODs'] = 'Install MODs'; $lang['EM_settings'] = 'EasyMOD Settings'; - $lang['EM_history'] = 'EasyMOD History'; // Preview --- 98,102 ---- *************** *** 151,157 **** // 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'; --- 145,149 ---- *************** *** 225,228 **** --- 217,224 ---- // general use $lang['EM_next_step'] = 'Next Step'; + $lang['EM_ok'] = 'OK'; + $lang['EM_on'] = 'ON'; + $lang['EM_off'] = 'OFF'; + $lang['EM_line'] = 'line'; *************** *** 239,245 **** $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 --- 235,238 ---- *************** *** 258,262 **** $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.'; --- 251,254 ---- *************** *** 296,300 **** $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'; --- 288,291 ---- *************** *** 321,325 **** <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="http://www.wikipedia.org/wiki/chmod" target="_blank">chmod</a> or <a href="http://www.wikipedia.org/wiki/chown" target="_blank">chown</a> to allow access.</li> <li>You might consider using <a href="http://www.wikipedia.org/wiki/chmod" 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> --- 312,316 ---- <ol> <li>If you have FTP access, then use the FTP option.</li> ! <li>Your server has "safe mode" enabled which means EasyMOD cannot automaticly replace your phpBB files. You might consider using <a href="http://www.wikipedia.org/wiki/chmod" target="_blank">chmod</a> or <a href="http://www.wikipedia.org/wiki/chown" target="_blank">chown</a> to allow access.</li> <li>You might consider using <a href="http://www.wikipedia.org/wiki/chmod" 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> *************** *** 334,338 **** <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="http://www.wikipedia.org/wiki/chmod" target="_blank">chmod</a> or <a href="http://www.wikipedia.org/wiki/chown" target="_blank">chown</a> to allow access.</li> <li>You might consider using <a href="http://www.wikipedia.org/wiki/chmod" 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 post process script or manually move files into place.</li> --- 325,329 ---- <ol> <li>If you have FTP access, then use the FTP option.</li> ! <li>Your server has "safe mode" enabled which means EasyMOD cannot automaticly replace your phpBB files. You might consider using <a href="http://www.wikipedia.org/wiki/chmod" target="_blank">chmod</a> or <a href="http://www.wikipedia.org/wiki/chown" target="_blank">chown</a> to allow access.</li> <li>You might consider using <a href="http://www.wikipedia.org/wiki/chmod" 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 post process script or manually move files into place.</li> *************** *** 387,391 **** $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:'; --- 378,381 ---- *************** *** 399,403 **** --- 389,397 ---- $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_fail_make_cache'] = 'Could not make the [%s] directory.'; + $lang['EM_fail_tmp'] = 'Could not create the [%s] temporary file.'; $lang['EM_ftp_root'] = 'FTP root directory:'; + $lang['EM_dir_current'] = 'Current Working Directory'; + $lang['EM_dir_nlist'] = '<b>Directory listing:</b> (%d files being listed)'; $lang['EM_dir_list'] = '<b>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'; *************** *** 409,418 **** // 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'; --- 403,408 ---- *************** *** 437,441 **** $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="%s">Forum Index</a>.'; $lang['EM_confirm'] = 'Confirm'; --- 427,430 ---- *************** *** 444,450 **** // 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'; --- 433,437 ---- *************** *** 507,511 **** $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.'; --- 494,501 ---- $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_no_sql'] = '<b>Critical Error:</b> No DB LAYER found!'; ! $lang['EM_err_no_tpl'] = 'A required file [%s] is missing. Aborting install.'; ! $lang['EM_err_no_file'] = '<b>Critical Error:</b> could not find [%s]. Aborting.'; $lang['EM_err_insert'] = 'Could not insert %s config information.'; $lang['EM_err_update'] = 'Could not update %s config information.'; |
|
From: Markus P. <mar...@us...> - 2005-11-06 13:31:17
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27619/mods/easymod/includes Modified Files: admin_easymod.php.txt mod_install.tpl Log Message: Fixed all known language issues (-=ET=-). Index: mod_install.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_install.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mod_install.tpl 31 Oct 2005 17:57:15 -0000 1.2 --- mod_install.tpl 6 Nov 2005 13:30:52 -0000 1.3 *************** *** 6,10 **** <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <tr> ! <th width="20%" class="thCornerL" height="25">MOD</th> <th width="10%" class="thTop" height="25">{L_AUTHOR}</th> <th width="35%" class="thTop" height="25">{L_DESCRIPTION}</th> --- 6,10 ---- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <tr> ! <th width="20%" class="thCornerL" height="25">{L_MOD}</th> <th width="10%" class="thTop" height="25">{L_AUTHOR}</th> <th width="35%" class="thTop" height="25">{L_DESCRIPTION}</th> Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** admin_easymod.php.txt 6 Nov 2005 11:20:10 -0000 1.40 --- admin_easymod.php.txt 6 Nov 2005 13:30:52 -0000 1.41 *************** *** 75,79 **** if (!file_exists($phpbb_root_path . 'admin/em_includes/em_functions.' . $phpEx)) { ! $message = 'CRITICAL ERROR: could not find [' . $phpbb_root_path . 'admin/em_includes/em_functions.' . $phpEx . ']. Aborting.'; if( !defined('IN_ADMIN') ) { --- 75,79 ---- if (!file_exists($phpbb_root_path . 'admin/em_includes/em_functions.' . $phpEx)) { ! $message = sprintf($lang['EM_err_no_file'], $phpbb_root_path . 'admin/em_includes/em_functions.' . $phpEx); if( !defined('IN_ADMIN') ) { *************** *** 129,133 **** $template->assign_block_vars('processed', array( 'ROW_CLASS' => $theme['td_class2'], ! 'LINE' => '<b>' . htmlspecialchars($command['command']) . '</b> line #' . $command['line'] . "\n") ); --- 129,133 ---- $template->assign_block_vars('processed', array( 'ROW_CLASS' => $theme['td_class2'], ! 'LINE' => '<b>' . htmlspecialchars($command['command']) . '</b> ' . $lang['EM_line'] . ' #' . $command['line'] . "\n") ); *************** *** 160,164 **** $template->assign_block_vars('unprocessed', array( 'ROW_CLASS' => $theme['td_class2'], ! 'LINE' => '<b>' . htmlspecialchars($command['command']) . '</b> line #' . $command['line'] . "\n") ); --- 160,164 ---- $template->assign_block_vars('unprocessed', array( 'ROW_CLASS' => $theme['td_class2'], ! 'LINE' => '<b>' . htmlspecialchars($command['command']) . '</b> ' . $lang['EM_line'] . ' #' . $command['line'] . "\n") ); *************** *** 3148,3152 **** 'L_STEP' => $lang['EM_sql_step2'], - 'L_SQL_ALPHA2' => $lang['EM_SQL_Alpha2'], 'L_SQL_INTRO' => $lang['EM_sql_intro_explain'], 'L_ALTERATIONS' => $lang['EM_Alterations'], --- 3148,3151 ---- *************** *** 3282,3286 **** 'L_STEP' => $lang['EM_sql_step2'], - 'L_SQL_ALPHA2' => $lang['EM_SQL_Alpha2'], 'L_SQL_INTRO' => $sql_intro, 'L_ALTERATIONS' => $lang['EM_processing_results'], --- 3281,3284 ---- |
|
From: Markus P. <mar...@us...> - 2005-11-06 11:20:27
|
Update of /cvsroot/easymod/easymod2/mods/easymod/em_includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21723/mods/easymod/em_includes Modified Files: em_ftp.php Log Message: Implemented the help window in the EM Settings panel. Index: em_ftp.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_ftp.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** em_ftp.php 5 Nov 2005 17:13:01 -0000 1.11 --- em_ftp.php 6 Nov 2005 11:20:10 -0000 1.12 *************** *** 1070,1074 **** else { ! $chmod_cmd = 'CHMOD ' . $perms . ' ' .$file; return ftp_site($this->ftp_conn_id, $chmod_cmd); } --- 1070,1074 ---- else { ! $chmod_cmd = 'CHMOD ' . $perms . ' ' . $file; return ftp_site($this->ftp_conn_id, $chmod_cmd); } |
|
From: Markus P. <mar...@us...> - 2005-11-06 11:20:27
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21723/mods/easymod/includes Modified Files: admin_easymod.php.txt mod_settings.tpl Added Files: mod_help.tpl Log Message: Implemented the help window in the EM Settings panel. Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** admin_easymod.php.txt 6 Nov 2005 04:01:07 -0000 1.39 --- admin_easymod.php.txt 6 Nov 2005 11:20:10 -0000 1.40 *************** *** 619,622 **** --- 619,657 ---- // be very selective about what we allow from GET; the allowed types will also require password auth $mode = (isset($HTTP_GET_VARS['mode'])) ? stripslashes($HTTP_GET_VARS['mode']) : ''; + + if ($mode == 'help') + { + $template->set_filenames(array( + 'body' => 'admin/mod_help.tpl') + ); + $template->assign_vars(array( + 'L_TITLE' => $lang['EM_installer_help']) + ); + $first_item = true; + foreach( $lang['help'] as $name => $paragraphs ) + { + if( $first_item ) + { + $first_item = false; + } + else + { + $template->assign_block_vars('helpitem.separator', array()); + } + $template->assign_block_vars('helpitem', array( + 'TITLE' => $paragraphs[0], + 'NAME' => $name + )); + for( $i = 1; $i < count($paragraphs); $i++ ) + { + $template->assign_block_vars('helpitem.paragraph', array( + 'TEXT' => $paragraphs[$i] + )); + } + } + $template->pparse('body'); + include('page_footer_admin.'.$phpEx); + } + if (($mode == 'install') || ($mode == 'settings') || ($mode == 'history')) { *************** *** 932,935 **** --- 967,973 ---- 'FTP_CACHE_NO' => (!$command_file->ftp_cache) ? 'checked="checked"' : '', + 'U_HELP' => append_sid('admin_easymod.' . $phpEx . '?mode=help'), + 'L_HELP' => $lang['EM_more_info'], + 'MODE' => 'update') ); --- NEW FILE: mod_help.tpl --- <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0" align="center"> <tr> <td class="catHead" height="28" align="center"><span class="cattitle">{L_TITLE}</span></td> </tr> <tr> <td class="row1" align="left" valign="top"><div class="postbody"> <!-- BEGIN helpitem --> <p><a name="{helpitem.NAME}" /></a><b style="font-size:larger;">{helpitem.TITLE}</b></p> <!-- BEGIN paragraph --> <p>{helpitem.paragraph.TEXT}</p> <!-- END paragraph --> <!-- BEGIN separator --> <img src="../templates/subSilver/images/spacer.gif" alt="" width="1" height="30" /> <hr /> <!-- END separator --> <!-- END helpitem --> </div></td> </tr> <tr> <td class="spaceRow" height="1"><img src="../templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td> </tr> </table> <br clear="all" /> Index: mod_settings.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_settings.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mod_settings.tpl 5 Nov 2005 14:49:29 -0000 1.6 --- mod_settings.tpl 6 Nov 2005 11:20:10 -0000 1.7 *************** *** 1,3 **** ! <br> <h2>{L_SETTINGS}</h2> <p>{L_DESC}</p> --- 1,15 ---- ! <script language="javaScript" type="text/javascript"><!-- ! function helpwin(mylink) ! { ! if (! window.focus)return true; ! var href; ! if (typeof(mylink) == 'string') ! href=mylink; ! else ! href=mylink.href; ! window.open(href, 'easymod_help', 'width=400,height=300,scrollbars=yes,resizable=yes'); ! return false; ! } ! //--></script> <h2>{L_SETTINGS}</h2> <p>{L_DESC}</p> *************** *** 24,41 **** <td class="row2" align="center" colspan="2"><span class="gen">{L_FILE_DESC}</span></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FILE_READ}</span></td> ! <td class="row2"><select style="width:140px" name="sel_read">{SELECT_READ}</select></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FILE_WRITE}</span></td> ! <td class="row2"><select style="width:140px" name="sel_write">{SELECT_WRITE}</select></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FILE_MOVE}</span></td> ! <td class="row2"><select style="width:140px" name="sel_move">{SELECT_MOVE}</select></td> </tr> - - <tr> <th colspan="2">{L_FTP_TITLE}</th> --- 36,63 ---- <td class="row2" align="center" colspan="2"><span class="gen">{L_FILE_DESC}</span></td> </tr> + <!-- + ////////// REMOVING READ METHOD UNTIL THERE IS MORE THAN ONE OPTION (if ever) ;-) <tr> <td class="row1" align="right"><span class="gen">{L_FILE_READ}</span></td> ! <td class="row2"> ! <select style="width:140px" name="sel_read">{SELECT_READ}</select> ! (<a href="{U_HELP}#" onclick="return helpwin(this);">{L_HELP}</a>) ! </td> </tr> + --> <tr> <td class="row1" align="right"><span class="gen">{L_FILE_WRITE}</span></td> ! <td class="row2"> ! <select style="width:140px" name="sel_write">{SELECT_WRITE}</select> ! (<a href="{U_HELP}#file_writing" onclick="return helpwin(this);">{L_HELP}</a>) ! </td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FILE_MOVE}</span></td> ! <td class="row2"> ! <select style="width:140px" name="sel_move">{SELECT_MOVE}</select> ! (<a href="{U_HELP}#file_moving" onclick="return helpwin(this);">{L_HELP}</a>) ! </td> </tr> <tr> <th colspan="2">{L_FTP_TITLE}</th> *************** *** 46,50 **** <tr> <td class="row1" align="right"><span class="gen">{L_FTP_DIR}</span></td> ! <td class="row2"><input type="text" name="ftp_dir" value="{FTP_PATH}" /> (ex: public_html/phpBB2)</td> </tr> <tr> --- 68,75 ---- <tr> <td class="row1" align="right"><span class="gen">{L_FTP_DIR}</span></td> ! <td class="row2"> ! <input type="text" name="ftp_dir" value="{FTP_PATH}" /> (ex: public_html/phpBB2) ! (<a href="{U_HELP}#ftp_dir" onclick="return helpwin(this);">{L_HELP}</a>) ! </td> </tr> <tr> *************** *** 58,66 **** <tr> <td class="row1" align="right"><span class="gen">{L_FTP_HOST}</span></td> ! <td class="row2"><input type="text" name="ftp_host" value="{FTP_HOST}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FTP_PORT}</span></td> ! <td class="row2"><input type="text" size="5" maxlength="5" name="ftp_port" value="{FTP_PORT}" /></td> </tr> <tr> --- 83,97 ---- <tr> <td class="row1" align="right"><span class="gen">{L_FTP_HOST}</span></td> ! <td class="row2"> ! <input type="text" name="ftp_host" value="{FTP_HOST}" /> ! (<a href="{U_HELP}#ftp_host" onclick="return helpwin(this);">{L_HELP}</a>) ! </td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FTP_PORT}</span></td> ! <td class="row2"> ! <input type="text" size="5" maxlength="5" name="ftp_port" value="{FTP_PORT}" /> ! (<a href="{U_HELP}#ftp_port" onclick="return helpwin(this);">{L_HELP}</a>) ! </td> </tr> <tr> *************** *** 69,72 **** --- 100,104 ---- <input type="radio" name="ftp_type" value="ext" {FTP_EXT} /><span class="gen">{L_YES}</span> <input type="radio" name="ftp_type" value="fsock" {FTP_FSOCK} />{L_NO}</span> <span class="gen">{L_FTP_EXT_WARN}</span> + (<a href="{U_HELP}#ftp_php_ext" onclick="return helpwin(this);">{L_HELP}</a>) </td> </tr> *************** *** 76,79 **** --- 108,112 ---- <input type="radio" name="ftp_cache" value="1" {FTP_CACHE_YES} /><span class="gen">{L_YES}</span> <input type="radio" name="ftp_cache" value="0" {FTP_CACHE_NO} />{L_NO}</span> <span class="gen">{L_FTP_EXT_WARN}</span> + (<a href="{U_HELP}#ftp_cache" onclick="return helpwin(this);">{L_HELP}</a>) </td> </tr> |
|
From: Markus P. <mar...@us...> - 2005-11-06 11:20:23
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21723/mods/easymod Modified Files: easymod_install.php Log Message: Implemented the help window in the EM Settings panel. Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** easymod_install.php 6 Nov 2005 04:01:06 -0000 1.43 --- easymod_install.php 6 Nov 2005 11:20:10 -0000 1.44 *************** *** 822,825 **** --- 822,826 ---- $command_file->afile[] = 'copy includes/mod_preview.tpl ../../../' . $files[$i]['path'] . 'mod_preview.tpl'; $command_file->afile[] = 'copy includes/mod_diy_body.tpl ../../../' . $files[$i]['path'] . 'mod_diy_body.tpl'; + $command_file->afile[] = 'copy includes/mod_help.tpl ../../../' . $files[$i]['path'] . 'mod_help.tpl'; $command_file->afile[] = 'copy easymod.gif ../../../' . $pics[$i]['path'] . 'easymod.gif'; |
|
From: Markus P. <mar...@us...> - 2005-11-06 11:18:11
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20989 Modified Files: easymod_display_functions.php Log Message: Thanks TerraFrost for pointing this out :-) Index: easymod_display_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_display_functions.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** easymod_display_functions.php 5 Nov 2005 23:25:15 -0000 1.19 --- easymod_display_functions.php 6 Nov 2005 11:17:54 -0000 1.20 *************** *** 241,245 **** { // test the ftp connection ! if (test_ftp( $ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, 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" ; --- 241,247 ---- { // test the ftp connection ! $test_result = test_ftp($ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, true, $ftp_type, $ftp_cache, $test_report); ! echo implode("\n", $test_report); ! if( $test_result ) { 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" ; |
|
From: Markus P. <mar...@us...> - 2005-11-06 04:01:25
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20186/mods/easymod Modified Files: easymod_install.php Log Message: Fixed links to the EM FAQ and completed language entries for the installation help panels. Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** easymod_install.php 5 Nov 2005 23:25:15 -0000 1.42 --- easymod_install.php 6 Nov 2005 04:01:06 -0000 1.43 *************** *** 297,309 **** </tr> <tr> ! <td class="row1" align="left" valign="top"><span class="postbody"><? ! while( list($name, $paragraphs) = @each($lang['help']) ) { ! echo '<a name="' . $name . '" /></a><p>' . implode('<br />',$paragraphs) . "</p>\n"; } ! ?></span></td> </tr> <tr> ! <td class="spaceRow" height="1"><img src="../../../templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td> </tr> </table> --- 297,322 ---- </tr> <tr> ! <td class="row1" align="left" valign="top"><div class="postbody"><?php ! $first_item = true; ! foreach( $lang['help'] as $name => $paragraphs ) { ! if( $first_item ) ! { ! $first_item = false; ! } ! else ! { ! echo '<img src="' . $phpbb_root_path . 'templates/subSilver/images/spacer.gif" alt="" width="1" height="30" />' . "<hr />\n"; ! } ! echo '<p><a name="' . $name . '" /></a><b style="font-size:larger;">' . $paragraphs[0] . "</b></p>\n"; ! for( $i = 1; $i < count($paragraphs); $i++ ) ! { ! echo '<p>' . $paragraphs[$i] . "</p>\n"; ! } } ! ?></div></td> </tr> <tr> ! <td class="spaceRow" height="1"><img src="<?=$phpbb_root_path;?>templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td> </tr> </table> *************** *** 311,318 **** <br clear="all" /> - <!-- - <div align="center"><span class="copyright">CatDB {CATDB_VERSION} by <a href="http://www.phpbb.com/phpBB/profile.php?mode=viewprofile&u=190" target="_phpbb" class="copyright">Nuttzy</a><br /></span></div> - --> - <?php page_footer(); --- 324,327 ---- |
|
From: Markus P. <mar...@us...> - 2005-11-06 04:01:25
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20186/mods/easymod/includes Modified Files: admin_easymod.php.txt Log Message: Fixed links to the EM FAQ and completed language entries for the installation help panels. Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** admin_easymod.php.txt 5 Nov 2005 22:28:21 -0000 1.38 --- admin_easymod.php.txt 6 Nov 2005 04:01:07 -0000 1.39 *************** *** 96,101 **** /// define('EASYMOD_VER', 'beta1 (0.2.2)'); ! define('FAQ_LINK', '<a href="http://area51.phpbb.com/phpBB/viewtopic.php?t=12141" target="_blank">'); define('REPORT_LINK', '<a href="http://area51.phpbb.com/phpBB/viewtopic.php?t=12143" target="_blank">'); /// /// --- 96,102 ---- /// define('EASYMOD_VER', 'beta1 (0.2.2)'); ! define('FAQ_LINK', '<a href="http://easymod.sourceforge.net/readme/" target="_blank">'); define('REPORT_LINK', '<a href="http://area51.phpbb.com/phpBB/viewtopic.php?t=12143" target="_blank">'); + define('HOW_TO_INSTALL_MODS_URL', 'http://easymod.sourceforge.net/readme/#faq_mod_inst_main'); /// /// *************** *** 1505,1509 **** 'L_UNPROCESSED' => $lang['EM_Unprocessed'], ! 'L_UNPROCESSED_DESC' => $lang['EM_unprocessed_mods'], 'L_MOD' => $lang['EM_Mod'], --- 1506,1510 ---- 'L_UNPROCESSED' => $lang['EM_Unprocessed'], ! 'L_UNPROCESSED_DESC' => sprintf($lang['EM_unprocessed_mods'], HOW_TO_INSTALL_MODS_URL), 'L_MOD' => $lang['EM_Mod'], |
