easymod-cvs Mailing List for EasyMOD (Page 6)
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-06 04:01:25
|
Update of /cvsroot/easymod/easymod2/mods/easymod/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20186/mods/easymod/languages Modified Files: lang_easymod_english.php Log Message: Fixed links to the EM FAQ and completed language entries for the installation help panels. Index: lang_easymod_english.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/languages/lang_easymod_english.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** lang_easymod_english.php 5 Nov 2005 22:28:21 -0000 1.6 --- lang_easymod_english.php 6 Nov 2005 04:01:09 -0000 1.7 *************** *** 93,97 **** $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'; --- 93,97 ---- $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="%s">here</a>.'; $lang['EM_Unprocessed'] = 'Unprocessed MODs'; $lang['EM_process'] = 'Process'; *************** *** 555,573 **** // 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'; ?> \ No newline at end of file --- 555,601 ---- // EasyMOD Installer Help $lang['EM_installer_help'] = 'EasyMOD Installer Help'; ! $lang['help']['file_writing'][] = 'File Writing'; ! $lang['help']['file_writing'][] = 'Here you can select one of the following options: ! <ul> ! <li><b>Server:</b> Files will be written using regular file manipulation functions. The user running the web server process needs write access to the files.</li> ! <li><b>Buffer & FTP:</b> Files will be prepared on a memory buffer and then written into place using an FTP connection to the server.</li> ! <li><b>Download:</b> EasyMOD will offer you the possibility to download the modified files for you to manually upload to the server.</li> ! <li><b>On Screen:</b> EasyMOD will display the modified files on the browser, then you would have to upload them manually.</li> ! </ul>'; ! $lang['help']['file_moving'][] = 'File Moving'; ! $lang['help']['file_moving'][] = 'Here you can select one of the following options: ! <ul> ! <li><b>Copy:</b> Files will be copied using regular file manipulation functions. The user running the web server process needs access permissions to the files.</li> ! <li><b>Automated FTP:</b> Files will be copied into place using an FTP connection to the server.</li> ! <li><b>Execute Script:</b> EasyMOD will attempt to generate and execute a shell script to perform the required file operations.</li> ! <li><b>Manually Load:</b> EasyMOD will allow you to download the files (or display them on screen) and then you have to manually upload the files to the server.</li> ! </ul>'; ! $lang['help']['ftp_dir'][] = 'FTP Directory'; ! $lang['help']['ftp_dir'][] = 'Most of all it is important that you don\'t put the slash (/) at the end of the path.'; ! $lang['help']['ftp_dir'][] = 'Second thing to remember is that (in most cases) this path is not the same as you would put in your main configuration settings (in Administration Panel). Usually the path is different because FTP servers hide the real directory structure of the web server.'; ! $lang['help']['ftp_dir'][] = 'So the path needs to be the same as the one that you have to walk through when using your FTP client to get to your forum (there should be a file like extension.inc there). Common settings would be: ! <ul> ! <li>public_html/phpBB2</li> ! <li>public_html/forum</li> ! <li>httpdocs/phpBB2</li> ! <li>httpdocs/forum</li> ! <li>board_name/phpBB2</li> ! <li>board_name/forum</li> ! <li>phpBB2</li> ! <li>forum</li> ! <li>/ (this usually means that you don\'t actually have anything else on your FTP server than the forum)</li> ! </ul>'; ! $lang['help']['ftp_host'][] = 'FTP Host'; ! $lang['help']['ftp_host'][] = 'This should usually remain localhost, but some servers (like Lycos) need a different name.'; ! $lang['help']['ftp_host'][] = 'If you don\'t know what to put in here then try the default (localhost) 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_port'][] = 'FTP Port'; ! $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_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.'; ! $lang['help']['ftp_php_ext'][] = 'EasyMOD will try to use the <a href="http://www.php.net/network" target="_blank">PHP Network Functions</a>, if this option is not enabled. While there\'s no special requirement in PHP to use these functions, they may be restricted in your server configuration.'; ! $lang['help']['ftp_cache'][] = 'FTP Cache'; ! $lang['help']['ftp_cache'][] = 'When the <em>PHP FTP Extension</em> option is enabled, EasyMOD needs write access to a temporary location to store the files that need to be moved to their final locations using the FTP method.'; ! $lang['help']['ftp_cache'][] = 'EasyMOD will attempt to create a cache directory located in your admin/em_includes folder. Otherwise, when this option is disabled, it will try to use the system TEMP directory.'; ?> \ No newline at end of file |
|
From: Markus P. <mar...@us...> - 2005-11-05 23:25:26
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15891/mods/easymod Modified Files: easymod_display_functions.php easymod_install.php Log Message: Here we go with more Nux' suggestions Index: easymod_display_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_display_functions.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** easymod_display_functions.php 5 Nov 2005 22:28:21 -0000 1.18 --- easymod_display_functions.php 5 Nov 2005 23:25:15 -0000 1.19 *************** *** 120,123 **** --- 120,126 ---- display_template( $phpbb_root_path . $script_path . 'templates/page_header.tpl', $variables) ; } + + // add the helpwin javascript and then options form + helpwin(); } *************** *** 146,150 **** // allow for the ability to pop open a sub window ! function helpwin( $width=400, $height=200) { global $phpbb_root_path, $script_path; --- 149,153 ---- // allow for the ability to pop open a sub window ! function helpwin($width=400, $height=300) { global $phpbb_root_path, $script_path; *************** *** 738,743 **** // display header info, like the welcome message and pic page_header( $lang['EM_step1']) ; - // add the helpwin javascript and then options form - helpwin() ; --- 741,744 ---- Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** easymod_install.php 5 Nov 2005 23:01:12 -0000 1.41 --- easymod_install.php 5 Nov 2005 23:25:15 -0000 1.42 *************** *** 874,878 **** page_header($lang['EM_step4']); - helpwin(600, 500); // Check which tables should we create before building the $sql array. --- 874,877 ---- |
|
From: Markus P. <mar...@us...> - 2005-11-05 23:25:26
|
Update of /cvsroot/easymod/easymod2/mods/easymod/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15891/mods/easymod/templates Modified Files: helpwin.tpl Log Message: Here we go with more Nux' suggestions Index: helpwin.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/templates/helpwin.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** helpwin.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- helpwin.tpl 5 Nov 2005 23:25:16 -0000 1.2 *************** *** 11,15 **** else href=mylink.href; ! window.open(href, 'easymod_help', 'width={{WIDTH}},height={{HEIGHT}},scrollbars=yes'); return false; } --- 11,15 ---- else href=mylink.href; ! window.open(href, 'easymod_help', 'width={{WIDTH}},height={{HEIGHT}},scrollbars=yes,resizable=yes'); return false; } |
|
From: Markus P. <mar...@us...> - 2005-11-05 23:01:20
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6253/mods/easymod Modified Files: easymod_install.php Log Message: Yep, too quick commiting Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** easymod_install.php 5 Nov 2005 22:55:27 -0000 1.40 --- easymod_install.php 5 Nov 2005 23:01:12 -0000 1.41 *************** *** 190,194 **** while( $file = @readdir($dir) ) { ! if( preg_match("#^lang_easymod_(.*)\.$phpEx#i", $file, $match) ) { $filecode = $match[1]; --- 190,194 ---- while( $file = @readdir($dir) ) { ! if( preg_match("#^lang_easymod_(.*)\.$phpEx\$#i", $file, $match) ) { $filecode = $match[1]; |
|
From: Markus P. <mar...@us...> - 2005-11-05 22:55:38
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4952/mods/easymod Modified Files: easymod_install.php Log Message: Fixed the first issue reported via PM by Nux. Keep them coming ;-) Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** easymod_install.php 5 Nov 2005 22:28:21 -0000 1.39 --- easymod_install.php 5 Nov 2005 22:55:27 -0000 1.40 *************** *** 58,61 **** --- 58,64 ---- //// + // Enable debug helpers? + define('EM_DEBUG_AID', 1); + if( !@file_exists($phpbb_root_path . $script_path . 'em_includes/em_ftp.'.$phpEx) ) { *************** *** 73,91 **** // set teh language (typo intentional ;-) ) // ! $dirname = $phpbb_root_path . $script_path . 'languages'; ! $dir = @opendir($dirname); ! ! $EM_lang = array(); ! while( $file = @readdir($dir) ) ! { ! if( preg_match('#^lang_easymod_#i', $file) && is_file($dirname . '/' . $file) && !is_link($dirname . '/' . $file) ) ! { ! $filecode = substr($file, 13, strpos($file, '.')-13); ! include($dirname . '/lang_easymod_' . $filecode . '.' .$phpEx); ! $displayname = $lang['EM_lang_name']; ! $EM_lang[$displayname] = $filecode; ! } ! } ! @closedir($dir); if( !empty($HTTP_GET_VARS['language']) || !empty($HTTP_POST_VARS['language']) ) --- 76,80 ---- // set teh language (typo intentional ;-) ) // ! $EM_lang = _em_get_install_languages(); if( !empty($HTTP_GET_VARS['language']) || !empty($HTTP_POST_VARS['language']) ) *************** *** 122,126 **** // - function wrapper_find(&$file_list, &$find_array, $search_array) { --- 111,114 ---- *************** *** 191,194 **** --- 179,208 ---- } + function _em_get_install_languages() + { + // do not declare $lang as global here, or else will be unset ;-) + global $phpbb_root_path, $script_path, $phpEx; + + $dirname = $phpbb_root_path . $script_path . 'languages'; + $dir = @opendir($dirname); + + $EM_lang = array(); + while( $file = @readdir($dir) ) + { + if( preg_match("#^lang_easymod_(.*)\.$phpEx#i", $file, $match) ) + { + $filecode = $match[1]; + $lang = array(); + include($dirname . '/lang_easymod_' . $filecode . '.' .$phpEx); + $displayname = $lang['EM_lang_name']; + $EM_lang[$displayname] = $filecode; + unset($lang); + } + } + @closedir($dir); + + return $EM_lang; + } + |
|
From: Markus P. <mar...@us...> - 2005-11-05 22:28:45
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32242/mods/easymod Modified Files: easymod_display_functions.php easymod_install.php Log Message: Fixing isssues with language entries here and there... Index: easymod_display_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_display_functions.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** easymod_display_functions.php 31 Oct 2005 17:57:15 -0000 1.17 --- easymod_display_functions.php 5 Nov 2005 22:28:21 -0000 1.18 *************** *** 410,414 **** $variables['EM_Database_type'] = $lang['EM_Database_type'] ; $variables['EM_phpBB_version'] = $lang['EM_phpBB_version'] ; ! $variables['EM_EasyMOD_version'] = $lang['EM_EasyMOD_version'] ; $variables['LANG_OPTIONS'] = em_language_select($language, 'language') ; --- 410,414 ---- $variables['EM_Database_type'] = $lang['EM_Database_type'] ; $variables['EM_phpBB_version'] = $lang['EM_phpBB_version'] ; ! $variables['EM_EasyMOD_version'] = $lang['EM_easymod_version'] ; $variables['LANG_OPTIONS'] = em_language_select($language, 'language') ; *************** *** 683,687 **** // ! $variables['EM_Settings'] = $lang['EM_Settings'] ; // make sure this version of EM is not already installed --- 683,687 ---- // ! $variables['EM_Settings'] = $lang['EM_settings'] ; // make sure this version of EM is not already installed *************** *** 787,791 **** $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; ! $variables['EM_Settings'] = $lang['EM_Settings'] ; $variables['EM_file_title'] = $lang['EM_file_title'] ; $variables['EM_file_desc'] = $lang['EM_file_desc'] ; --- 787,791 ---- $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; ! $variables['EM_Settings'] = $lang['EM_settings'] ; $variables['EM_file_title'] = $lang['EM_file_title'] ; $variables['EM_file_desc'] = $lang['EM_file_desc'] ; *************** *** 837,841 **** $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; ! $variables['EM_Settings'] = $lang['EM_Settings'] ; $variables['Submit'] = $lang['Submit'] ; $variables['LANGUAGE'] = $language ; --- 837,841 ---- $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; ! $variables['EM_Settings'] = $lang['EM_settings'] ; $variables['Submit'] = $lang['Submit'] ; $variables['LANGUAGE'] = $language ; *************** *** 906,910 **** $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; ! $variables['EM_Settings'] = $lang['EM_Settings'] ; $variables['Submit'] = $lang['Submit'] ; $variables['Rescan'] = $lang['Rescan'] ; --- 906,910 ---- $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; ! $variables['EM_Settings'] = $lang['EM_settings'] ; $variables['Submit'] = $lang['Submit'] ; $variables['Rescan'] = $lang['Rescan'] ; *************** *** 947,951 **** $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; ! $variables['EM_Settings'] = $lang['EM_Settings'] ; $variables['Submit'] = $lang['Submit'] ; $variables['Rescan'] = $lang['Rescan'] ; --- 947,951 ---- $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; ! $variables['EM_Settings'] = $lang['EM_settings'] ; $variables['Submit'] = $lang['Submit'] ; $variables['Rescan'] = $lang['Rescan'] ; *************** *** 987,991 **** $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; ! $variables['EM_Settings'] = $lang['EM_Settings'] ; $variables['Submit'] = $lang['Submit'] ; $variables['Rescan'] = $lang['Rescan'] ; --- 987,991 ---- $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; ! $variables['EM_Settings'] = $lang['EM_settings'] ; $variables['Submit'] = $lang['Submit'] ; $variables['Rescan'] = $lang['Rescan'] ; Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** easymod_install.php 5 Nov 2005 12:52:50 -0000 1.38 --- easymod_install.php 5 Nov 2005 22:28:21 -0000 1.39 *************** *** 639,643 **** //////////// //////////// ! echo '<p>' . $lang['EM_checking_permissions'] . "</p>\n"; form_settings($hidden, 3, '', true); page_footer(); --- 639,643 ---- //////////// //////////// ! echo '<p>' . $lang['EM_check_permissions'] . "</p>\n"; form_settings($hidden, 3, '', true); page_footer(); *************** *** 1852,1856 **** 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 />"; page_footer(); --- 1852,1856 ---- echo "<br />\n"; echo '<br /><br /><h2><span class="ok"><b>' . $lang['EM_install_completed'] . "</b></span></h2>\n"; ! echo '<p>' . sprintf($lang['EM_admin_panel'], append_sid($phpbb_root_path . 'index.' . $phpEx)) . "</p><br />"; page_footer(); |
|
From: Markus P. <mar...@us...> - 2005-11-05 22:28:45
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32242/mods/easymod/includes Modified Files: admin_easymod.php.txt Log Message: Fixing isssues with language entries here and there... Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** admin_easymod.php.txt 5 Nov 2005 17:13:01 -0000 1.37 --- admin_easymod.php.txt 5 Nov 2005 22:28:21 -0000 1.38 *************** *** 1139,1143 **** 'L_DESCRIPTION' => $lang['EM_Description'], 'L_DATE' => $lang['EM_Process_Date'], ! 'L_PHPBB_VER' => $lang['EM_phpBB_Version'], 'L_THEMES' => $lang['EM_Themes'], 'L_LANGUAGES' => $lang['EM_Languages'], --- 1139,1143 ---- 'L_DESCRIPTION' => $lang['EM_Description'], 'L_DATE' => $lang['EM_Process_Date'], ! 'L_PHPBB_VER' => $lang['EM_phpBB_version'], 'L_THEMES' => $lang['EM_Themes'], 'L_LANGUAGES' => $lang['EM_Languages'], *************** *** 1181,1185 **** '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'], --- 1181,1185 ---- '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'], |
|
From: Markus P. <mar...@us...> - 2005-11-05 22:28:45
|
Update of /cvsroot/easymod/easymod2/mods/easymod/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32242/mods/easymod/languages Modified Files: lang_easymod_english.php Log Message: Fixing isssues with language entries here and there... Index: lang_easymod_english.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/languages/lang_easymod_english.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** lang_easymod_english.php 5 Nov 2005 12:52:51 -0000 1.5 --- lang_easymod_english.php 5 Nov 2005 22:28:21 -0000 1.6 *************** *** 35,39 **** $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.'; --- 35,39 ---- $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.'; *************** *** 43,47 **** // 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'; --- 43,46 ---- *************** *** 80,84 **** $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'; --- 79,82 ---- *************** *** 101,107 **** $lang['EM_EMC'] = 'EMC'; $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'; --- 99,104 ---- $lang['EM_EMC'] = 'EMC'; $lang['EM_undefined_write'] = 'Undefined write method.'; ! $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'; *************** *** 123,127 **** $lang['EM_Author'] = 'Author'; $lang['EM_Description'] = 'Description'; - $lang['EM_phpBB_Version'] = 'phpBB ver'; $lang['EM_Themes'] = 'Themes'; $lang['EM_Languages'] = 'Languages'; --- 120,123 ---- *************** *** 187,193 **** $lang['EM_sql_warnings_reported'] = '%d Warning(s) reported by the SQL Parser'; $lang['EM_database_alterations'] = 'Database Alterations'; - $lang['EM_tables_added'] = 'Tables Added'; - $lang['EM_tables_altered'] = 'Tables Altered'; - $lang['EM_rows_added'] = 'Rows Added'; // EasyMOD sql errors --- 183,186 ---- *************** *** 202,206 **** $lang['EM_malformed_DROP'] = 'malformed DROP action'; $lang['EM_malformed_DROP2'] = 'malformed DROP statement, too many attributes.'; ! $lang['EM_postgresql_ABORTED'] = "ABORTED: [%d]<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."; $lang['EM_malformed_sql'] = 'malformed SQL, no target defined'; $lang['EM_type_unknown'] = 'type \'%s\' unknown.'; --- 195,199 ---- $lang['EM_malformed_DROP'] = 'malformed DROP action'; $lang['EM_malformed_DROP2'] = 'malformed DROP statement, too many attributes.'; ! $lang['EM_postgresql_ABORTED'] = 'ABORTED: [%d]<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.'; $lang['EM_malformed_sql'] = 'malformed SQL, no target defined'; $lang['EM_type_unknown'] = 'type \'%s\' unknown.'; *************** *** 258,262 **** $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'; --- 251,254 ---- *************** *** 264,268 **** $lang['EM_File_Access'] = 'File Access Info'; - $lang['EM_failed'] = 'failed'; $lang['EM_unattempted'] = 'unattempted'; $lang['EM_no_module'] = 'module not loaded'; --- 256,259 ---- *************** *** 280,284 **** $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.'; --- 271,274 ---- *************** *** 292,296 **** $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'; --- 282,285 ---- *************** *** 332,337 **** <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>'; --- 321,326 ---- <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> </ol>'; *************** *** 345,351 **** <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)'; --- 334,340 ---- <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> </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)'; *************** *** 362,366 **** $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.'; --- 351,355 ---- $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.'; *************** *** 383,395 **** $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:'; --- 372,384 ---- $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:'; *************** *** 405,410 **** $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.'; --- 394,399 ---- $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.'; *************** *** 449,453 **** $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.'; --- 438,442 ---- $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'; $lang['EM_move_files'] = '<b>IMPORTANT:</b> Before pressing confirm, move files into place.'; *************** *** 574,578 **** $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...'; --- 563,567 ---- $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...'; |
|
From: Markus P. <mar...@us...> - 2005-11-05 17:13:11
|
Update of /cvsroot/easymod/easymod2/mods/easymod/em_includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27327/mods/easymod/em_includes Modified Files: em_ftp.php em_functions.php Log Message: Implemented the test_ftp function in the EM settings panel. Index: em_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_functions.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** em_functions.php 5 Nov 2005 00:30:52 -0000 1.20 --- em_functions.php 5 Nov 2005 17:13:01 -0000 1.21 *************** *** 730,734 **** $sP = 'b'; elseif($in_Perms & 0x8000) // Regular ! $sP = '-;'; elseif($in_Perms & 0xA000) // Symbolic Link $sP = 'l'; --- 730,734 ---- $sP = 'b'; elseif($in_Perms & 0x8000) // Regular ! $sP = '-'; elseif($in_Perms & 0xA000) // Symbolic Link $sP = 'l'; Index: em_ftp.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_ftp.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** em_ftp.php 5 Nov 2005 12:52:51 -0000 1.10 --- em_ftp.php 5 Nov 2005 17:13:01 -0000 1.11 *************** *** 126,130 **** if( $ftp_debug ) { ! $test_report[] = '<b>PWD:</b> ' . $emftp->ftp_pwd() . '<br />'; ////// --- 126,130 ---- if( $ftp_debug ) { ! $test_report[] = '<b>Current FTP working directory:</b> ' . $emftp->ftp_pwd() . '<br />'; ////// *************** *** 225,230 **** ///// this looks like it could be a problem with the ../../../ on ftp ///// ! $local_filename = 'easymod.gif'; ! $remote_filename = '../../../easymod.gif'; // write to phpBB root and then, confirm we can overwrite so just do the same thing again --- 225,232 ---- ///// this looks like it could be a problem with the ../../../ on ftp ///// ! // $local_filename = 'easymod.gif'; ! // $remote_filename = '../../../easymod.gif'; ! $local_filename = $phpbb_root_path . 'admin/mods/easymod/easymod.gif'; ! $remote_filename = $phpbb_root_path . 'easymod.gif'; // write to phpBB root and then, confirm we can overwrite so just do the same thing again *************** *** 242,250 **** $test_report[] = '<br />'; $test_report[] = '<b>' . $lang['EM_ftp_phpbb_root'] . '</b><br />'; ! if( $dh = opendir('../../../') ) { while( ($file = readdir($dh)) !== false ) { ! $test_report[] = mfunGetPerms(fileperms('../../../' . $file)) . " $file <br />"; } closedir($dh); --- 244,252 ---- $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); |
|
From: Markus P. <mar...@us...> - 2005-11-05 17:13:11
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27327/mods/easymod/includes Modified Files: admin_easymod.php.txt Log Message: Implemented the test_ftp function 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.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** admin_easymod.php.txt 5 Nov 2005 00:30:52 -0000 1.36 --- admin_easymod.php.txt 5 Nov 2005 17:13:01 -0000 1.37 *************** *** 1005,1009 **** em_db_update('EM_version', str_replace("'", "''", $em_version)); ! message_die(GENERAL_MESSAGE, '<br />' . $lang['EM_settings_success'] . " $pass_msg<br /><br />"); } --- 1005,1021 ---- em_db_update('EM_version', str_replace("'", "''", $em_version)); ! // Test the FTP connection? ! if( $write == 'ftpb' || $move == 'ftpa' ) ! { ! $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 ! { ! $test_report = ''; ! } ! ! message_die(GENERAL_MESSAGE, '<br />' . $lang['EM_settings_success'] . " $pass_msg<br /><br />$test_report"); } |
|
From: Markus P. <mar...@us...> - 2005-11-05 14:49:41
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30678/mods/easymod/includes Modified Files: mod_settings.tpl Log Message: Fixed a bug in the EM settings template, that was sending wring data to update the FTP cache option. Index: mod_settings.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_settings.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mod_settings.tpl 5 Nov 2005 00:30:52 -0000 1.5 --- mod_settings.tpl 5 Nov 2005 14:49:29 -0000 1.6 *************** *** 74,79 **** <td class="row1" align="right"><span class="gen">{L_FTP_CACHE}</span></td> <td class="row2"> ! <input type="radio" name="ftp_cache" value="ext" {FTP_CACHE_YES} /><span class="gen">{L_YES}</span> ! <input type="radio" name="ftp_cache" value="fsock" {FTP_CACHE_NO} />{L_NO}</span> <span class="gen">{L_FTP_EXT_WARN}</span> </td> </tr> --- 74,79 ---- <td class="row1" align="right"><span class="gen">{L_FTP_CACHE}</span></td> <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> </td> </tr> |
|
From: Markus P. <mar...@us...> - 2005-11-05 12:53:03
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6111/mods/easymod Modified Files: easymod_install.php Log Message: Chmod to 777 instead of 755 inside ftp_mkdir method. Changed the FTP method function so it can be invoked from the EM settings panel. =:-O Fixed semi-colons in language file. Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** easymod_install.php 5 Nov 2005 00:30:52 -0000 1.37 --- easymod_install.php 5 Nov 2005 12:52:50 -0000 1.38 *************** *** 529,533 **** { // test the FTP connection ! if (!test_ftp( $ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, $ftp_debug, $ftp_type, $ftp_cache)) { // FTP failed; print RESCAN button and then exit --- 529,535 ---- { // 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 ) { // FTP failed; print RESCAN button and then exit *************** *** 618,622 **** { // test the FTP connection ! if (!test_ftp( $ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, $ftp_debug, $ftp_type, $ftp_cache)) { // FTP failed; print RESCAN button and then exit --- 620,626 ---- { // 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 ) { // FTP failed; print RESCAN button and then exit |
|
From: Markus P. <mar...@us...> - 2005-11-05 12:53:03
|
Update of /cvsroot/easymod/easymod2/mods/easymod/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6111/mods/easymod/languages Modified Files: lang_easymod_english.php Log Message: Chmod to 777 instead of 755 inside ftp_mkdir method. Changed the FTP method function so it can be invoked from the EM settings panel. =:-O Fixed semi-colons in language file. Index: lang_easymod_english.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/languages/lang_easymod_english.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lang_easymod_english.php 4 Nov 2005 05:14:10 -0000 1.4 --- lang_easymod_english.php 5 Nov 2005 12:52:51 -0000 1.5 *************** *** 26,30 **** // Name of the language, to write in this language ! $lang['EM_lang_name'] = 'English' ; // EM module entries in the ACP --- 26,30 ---- // Name of the language, to write in this language ! $lang['EM_lang_name'] = 'English'; // EM module entries in the ACP *************** *** 35,54 **** $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' ; // 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.'; --- 35,54 ---- $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'; // 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.'; *************** *** 70,90 **** // 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.'; --- 70,90 ---- // 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.'; *************** *** 92,103 **** // 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_undefined_write'] = 'Undefined write method.'; $lang['EM_check_permissions'] = 'Write stuff about checking permissions and how to.'; --- 92,103 ---- // 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_undefined_write'] = 'Undefined write method.'; $lang['EM_check_permissions'] = 'Write stuff about checking permissions and how to.'; *************** *** 110,129 **** // 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' ; $lang['EM_Filter'] = 'Filter'; $lang['EM_Filtered'] = 'Filtered'; --- 110,129 ---- // 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'; $lang['EM_Filter'] = 'Filter'; $lang['EM_Filtered'] = 'Filtered'; *************** *** 135,164 **** // 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 see if these changes will negatively impact your database. You are STRONGLY advised to <b>backup your database</b> before making any 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.'; --- 135,164 ---- // 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 see if these changes will negatively impact your database. You are STRONGLY advised to <b>backup your database</b> before making any 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.'; *************** *** 210,225 **** // 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 --- 210,225 ---- // 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 *************** *** 231,235 **** // general use ! $lang['EM_next_step'] = 'Next Step' ; --- 231,235 ---- // general use ! $lang['EM_next_step'] = 'Next Step'; *************** *** 247,314 **** // 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 --- 247,314 ---- // 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 *************** *** 358,493 **** // 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'] = '<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' ; ! $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 tables 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 tables were 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_store_files'] = 'Storing processed files table' ; ! $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 --- 358,494 ---- // 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_test_ftp4'] = '4) FTP cache access checked 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'] = '<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'; ! $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 tables 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 tables were 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_store_files'] = 'Storing processed files table'; ! $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 *************** *** 499,582 **** // 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 file 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.' ; $lang['EM_err_delete_em_info'] = 'Could not delete EasyMod entry!'; // 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' ; ?> \ No newline at end of file --- 500,584 ---- // 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 file 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.'; $lang['EM_err_delete_em_info'] = 'Could not delete EasyMod entry!'; // mod_io errors ! $lang['EM_mod... [truncated message content] |
|
From: Markus P. <mar...@us...> - 2005-11-05 12:53:03
|
Update of /cvsroot/easymod/easymod2/mods/easymod/em_includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6111/mods/easymod/em_includes Modified Files: em_ftp.php Log Message: Chmod to 777 instead of 755 inside ftp_mkdir method. Changed the FTP method function so it can be invoked from the EM settings panel. =:-O Fixed semi-colons in language file. Index: em_ftp.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_ftp.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** em_ftp.php 4 Nov 2005 05:14:10 -0000 1.9 --- em_ftp.php 5 Nov 2005 12:52:51 -0000 1.10 *************** *** 30,61 **** ! // used in step 2 of the installer to test the connection and also used in the debug feature; could be ! // used in the main proggie to check settings some day; it will need to be de-HTML'ed though ;-) ! 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 ! $emftp = new emftp( $ftp_type, $ftp_debug) ; // connect to the FTP server ! if (!$emftp->ftp_connect( $ftp_host, $ftp_port)) { // 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" ; } // they may need to specify the port ! else if ($ftp_port == 21) { ! echo $lang['EM_ftp_fail_conn_21'] . "<br />\n"; } --- 30,63 ---- ! // 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 ! $emftp = new emftp($ftp_type, $ftp_debug); // connect to the FTP server ! if( !$emftp->ftp_connect( $ftp_host, $ftp_port) ) { // 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 />'; } // they may need to specify the port ! elseif( $ftp_port == 21 ) { ! $test_report[] = $lang['EM_ftp_fail_conn_21'] . '<br />'; } *************** *** 64,129 **** { // if they have / : or \ in the hostname then they are probably stupid and supplying invalid name ! if ((strstr($ftp_host, '/')) || (strstr($ftp_host, '\\')) || (strstr($ftp_host, ':'))) { ! echo $lang['EM_ftp_fail_conn_invalid'] . "<br />\n" ; ! echo "<br />\n" ; } // if they have anything other than an integer in the port then... ! 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" ; } ! return false ; } - // connected to the FTP server, now send the user/pass ! if (!$emftp->ftp_login($ftp_user, $ftp_pass)) { // failed to login! Tell them they are stupid! Disconnect from server ! $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 ! echo '<li>' . $lang['EM_fail_login_op1'] . "\n" ; ! if ( $ftp_host == 'localhost' || $ftp_port == 21) { // change from localhost ! echo '<li>' . $lang['EM_fail_login_op2a'] . "\n" ; } else { // change to localhost or something else ! echo '<li>' . $lang['EM_fail_login_op2b'] . "\n" ; } ! echo "</ol>\n" ; ! return false ; } - 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"; ////// --- 66,130 ---- { // if they have / : or \ in the hostname then they are probably stupid and supplying invalid name ! if( (strstr($ftp_host, '/')) || (strstr($ftp_host, '\\')) || (strstr($ftp_host, ':')) ) { ! $test_report[] = $lang['EM_ftp_fail_conn_invalid'] . '<br />'; ! $test_report[] = '<br />'; } // if they have anything other than an integer in the port then... ! 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>'; } ! return false; } // connected to the FTP server, now send the user/pass ! if( !$emftp->ftp_login($ftp_user, $ftp_pass) ) { // failed to login! Tell them they are stupid! Disconnect from server ! $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 />'; // if we are in debug mode, then get a dir listing before we start moving around ! if( $ftp_debug ) { ! $test_report[] = '<b>PWD:</b> ' . $emftp->ftp_pwd() . '<br />'; ////// *************** *** 132,225 **** $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" ; } } // change directory to the EM dir ! 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" ; } // make sure there is no / at the end of the path ! 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'] . "\n" ; } else { ! echo $emftp->ftp_pwd() . "\n" ; } - // print directory listing ! echo '<br /><br />' . $lang['EM_dir_list'] . "<br />\n" ; ! $list = $emftp->ftp_nlist() ; // if the nlist command failed, then print an error ! 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 { ! for ($i=0; $i<count($list); $i++) { ! echo $list[$i] . "<br />\n" ; } } $emftp->ftp_quit(); ! return false ; } ! if (!$pwd = $emftp->ftp_pwd()) { $emftp->ftp_quit(); ! echo $lang['EM_fail_pwd'] . "\n" ; ! return false ; } ! ! echo $lang['EM_test_ftp2'] . "<br />\n" ; --- 133,223 ---- $list = $emftp->ftp_nlist(); ! $test_report[] = '<b>Dir listing:</b> (' . count($list) . ' files being listed)<br />'; ! for( $i = 0; $i < count($list); $i++ ) { ! $test_report[] = '[' . $list[$i] . ']<br />'; } } // change directory to the EM dir ! 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>'; } // make sure there is no / at the end of the path ! 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(); // if the nlist command failed, then print an error ! 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 { ! for( $i = 0; $i < count($list); $i++ ) { ! $test_report[] = $list[$i] . '<br />'; } } $emftp->ftp_quit(); ! return false; } ! if( !($pwd = $emftp->ftp_pwd()) ) { $emftp->ftp_quit(); ! $test_report[] = $lang['EM_fail_pwd'] . '<br />'; ! return false; } ! $test_report[] = $lang['EM_test_ftp2'] . '<br />'; *************** *** 227,329 **** ///// this looks like it could be a problem with the ../../../ on ftp ///// ! $local_filename = 'easymod.gif' ; ! $remote_filename = '../../../easymod.gif' ; ! // write to phpBB root ! if (!$emftp->ftp_put( $remote_filename, $local_filename, 1)) { ! $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); ! } ! ! return false ; ! } ! ! // confirm we can overwrite so just do the same thing again ! if (!$emftp->ftp_put( $remote_filename, $local_filename, 1)) ! { ! $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); - } ! return false ; } - // cleanup ! if (!$emftp->ftp_delete($remote_filename)) { ! echo $lang['EM_fail_delete'] . "<br />\n" ; } // if we are using the FTP ext and the cache, then make sure the cache is created, otherwise create it ! if (($ftp_type == 'ext') && ($ftp_cache)) { // return the admin directory ! $emftp->ftp_cdup() ; ! $emftp->ftp_cdup() ; // see if the cache dir exists, otherwise create it put_array ! if (!file_exists( $phpbb_root_path . 'admin/em_includes/cache')) { ! $emftp->ftp_mkdir( 'em_includes') ; ! $emftp->ftp_chdir( 'em_includes') ; ! $emftp->ftp_mkdir( 'cache') ; ! if (!file_exists( $phpbb_root_path . 'admin/em_includes/cache')) { $emftp->ftp_quit(); ! echo 'Could not make the [admin/em_includes/cache] directory.' . "\n" ; ! return false ; } } // create a tmp file and write something out ! $tmpfname = @tempnam( $phpbb_root_path . 'admin/em_includes/cache', 'txt'); @unlink($tmpfname); // unlink for safety on php4.0.3+ ! if ($fp = @fopen($tmpfname, 'w')) { @fwrite($fp, ">>$easymod_install_version<<\n"); @fclose($fp); } else { ! echo 'Could not create the [$tmpfname] temporary file.' . "\n" ; } - } - ! echo $lang['EM_test_ftp3']. "<br />\n" ; // disconnect $emftp->ftp_quit(); ! return true ; } --- 225,321 ---- ///// this looks like it could be a problem with the ../../../ on ftp ///// ! $local_filename = 'easymod.gif'; ! $remote_filename = '../../../easymod.gif'; ! // write to phpBB root and then, confirm we can overwrite so just do the same thing again ! $test_twice = array('EM_fail_put', 'EM_fail_reput'); ! foreach( $test_twice as $langkey ) { ! if( !$emftp->ftp_put($remote_filename, $local_filename, 1) ) { ! $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('../../../') ) { ! while( ($file = readdir($dh)) !== false ) ! { ! $test_report[] = mfunGetPerms(fileperms('../../../' . $file)) . " $file <br />"; ! } ! closedir($dh); } ! return false; ! } } // cleanup ! if( !$emftp->ftp_delete($remote_filename) ) { ! $test_report[] = $lang['EM_fail_delete'] . '<br />'; } + $test_report[] = $lang['EM_test_ftp3']. '<br />'; + // if we are using the FTP ext and the cache, then make sure the cache is created, otherwise create it ! if( ($ftp_type == 'ext') && ($ftp_cache) ) { // return the admin directory ! $emftp->ftp_cdup(); ! $emftp->ftp_cdup(); // see if the cache dir exists, otherwise create it put_array ! if( !file_exists($phpbb_root_path . 'admin/em_includes/cache') ) { ! $emftp->ftp_mkdir('em_includes'); ! $emftp->ftp_chdir('em_includes'); ! $emftp->ftp_mkdir('cache'); ! if( !file_exists($phpbb_root_path . 'admin/em_includes/cache') ) { $emftp->ftp_quit(); ! $test_report[] = 'Could not make the [admin/em_includes/cache] directory.' . '<br />'; ! return false; } } + // if it was there before (created from a previous EM install)... + // due to chmod 755 in previous versions, it might not be writable, try to fix this then + elseif( !is_writeable($phpbb_root_path . 'admin/em_includes/cache') ) + { + $emftp->ftp_chdir('em_includes'); + $emftp->emftp_chmod('em_includes', '0777'); + $emftp->ftp_chdir('cache'); + $emftp->emftp_chmod('cache', '0777'); + } + // create a tmp file and write something out ! $tmpfname = @tempnam($phpbb_root_path . 'admin/em_includes/cache', 'txt'); @unlink($tmpfname); // unlink for safety on php4.0.3+ ! if( $fp = @fopen($tmpfname, 'w') ) { @fwrite($fp, ">>$easymod_install_version<<\n"); @fclose($fp); + @unlink($tmpfname); // Delete the temporary file } else { ! $emftp->ftp_quit(); ! $test_report[] = "Could not create the [$tmpfname] temporary file.<br />"; ! return false; } ! $test_report[] = $lang['EM_test_ftp4']. '<br />'; ! } // disconnect $emftp->ftp_quit(); ! return true; } *************** *** 1144,1152 **** { // make sure the cache directory exists ! if (!file_exists( $phpbb_root_path . 'admin/em_includes/cache')) { ! return false ; } ! $tmpfname = @tempnam( $phpbb_root_path . 'admin/em_includes/cache', 'txt'); } // create in the tmp dir --- 1136,1144 ---- { // make sure the cache directory exists ! if (!file_exists($phpbb_root_path . 'admin/em_includes/cache')) { ! return false; } ! $tmpfname = @tempnam($phpbb_root_path . 'admin/em_includes/cache', 'txt'); } // create in the tmp dir *************** *** 1196,1200 **** if ( $result ) { ! $this->emftp_chmod($dir_name, '0755'); } return $result; --- 1188,1192 ---- if ( $result ) { ! $this->emftp_chmod($dir_name, '0777'); } return $result; *************** *** 1203,1207 **** { $result = @ftp_mkdir( $this->ftp_conn_id, $dir_name) ; ! $this->emftp_chmod($dir_name, '0755'); // return $result ; ///////////// --- 1195,1199 ---- { $result = @ftp_mkdir( $this->ftp_conn_id, $dir_name) ; ! $this->emftp_chmod($dir_name, '0777'); // return $result ; ///////////// |
|
From: Markus P. <mar...@us...> - 2005-11-05 01:50:39
|
Update of /cvsroot/easymod/easymod2/mods/easymod/em_includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24339 Modified Files: em_cipher.php Log Message: In fact, the new hex2bin/bin2hex methods allow to relax precautions taken with slashes et all. Let's simplify it, then. Index: em_cipher.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_cipher.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** em_cipher.php 4 Nov 2005 22:03:58 -0000 1.6 --- em_cipher.php 5 Nov 2005 01:50:32 -0000 1.7 *************** *** 559,566 **** // added by Nuttzy - we'll be storing the result in a DB so we need to replace ' with \' ! $encrypted = addslashes($encrypted); // TAKE TWO: the way General Config settings work in phpBB, this isn't sufficient, get rid of the ' all together ! $encrypted = str_replace("\'", 'NUTTICK', $encrypted); ! $encrypted = str_replace("\n", 'NUTLINE', $encrypted); // NOTE: a cipher of "single'quote" (the cipher is the stuff between the double quotes) has the ' changed --- 559,566 ---- // added by Nuttzy - we'll be storing the result in a DB so we need to replace ' with \' ! // $encrypted = addslashes($encrypted); // TAKE TWO: the way General Config settings work in phpBB, this isn't sufficient, get rid of the ' all together ! // $encrypted = str_replace("\'", 'NUTTICK', $encrypted); ! // $encrypted = str_replace("\n", 'NUTLINE', $encrypted); // NOTE: a cipher of "single'quote" (the cipher is the stuff between the double quotes) has the ' changed *************** *** 569,572 **** --- 569,573 ---- // same is true for any slashes that get added. The slashes won't actually show up when viewing the DB ;-) + // TAKE THREE: Hopefully the new hex2bin/bin2hex methods solve all these problems. // change encoding for storage (postgres problems with binary string) $encrypted = $this->bin2hex($encrypted); *************** *** 580,589 **** $this->setkey($key); // decode for use (postgres storage problems with binary string) $ciphertext = $this->hex2bin($ciphertext); // TAKE TWO: the way General Config settings work in phpBB, this isn't sufficient, get rid of the ' all together ! $ciphertext = str_replace('NUTTICK', "'", $ciphertext); ! $ciphertext = str_replace('NUTLINE', "\n", $ciphertext); $decrypted = ''; --- 581,591 ---- $this->setkey($key); + // TAKE THREE: Hopefully the new hex2bin/bin2hex methods solve all these problems. // decode for use (postgres storage problems with binary string) $ciphertext = $this->hex2bin($ciphertext); // TAKE TWO: the way General Config settings work in phpBB, this isn't sufficient, get rid of the ' all together ! // $ciphertext = str_replace('NUTTICK', "'", $ciphertext); ! // $ciphertext = str_replace('NUTLINE', "\n", $ciphertext); $decrypted = ''; |
|
From: Markus P. <mar...@us...> - 2005-11-05 00:31:03
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7470/mods/easymod Modified Files: easymod_install.php Log Message: Fixed issues updating the EM/FTP passwords. Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** easymod_install.php 4 Nov 2005 22:06:13 -0000 1.36 --- easymod_install.php 5 Nov 2005 00:30:52 -0000 1.37 *************** *** 1630,1634 **** // added security starting in 0.0.11, blowfish encrypt the ftp_pass ! $ftp_cipher = crypt_ftp_pass(EM_ENCRYPT, $ftp_pass, $em_md5); // if not, add the fields --- 1630,1634 ---- // added security starting in 0.0.11, blowfish encrypt the ftp_pass ! $ftp_cipher = crypt_ftp_pass(EM_ENCRYPT, $ftp_pass, $em_pass); // if not, add the fields |
|
From: Markus P. <mar...@us...> - 2005-11-05 00:31:03
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7470/mods/easymod/includes Modified Files: admin_easymod.php.txt mod_settings.tpl Log Message: Fixed issues updating the EM/FTP passwords. Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** admin_easymod.php.txt 4 Nov 2005 21:59:42 -0000 1.35 --- admin_easymod.php.txt 5 Nov 2005 00:30:52 -0000 1.36 *************** *** 659,666 **** $password = ( !empty($HTTP_POST_VARS['password']) ) ? stripslashes($HTTP_POST_VARS['password']) : ''; - if( isset($HTTP_POST_VARS['login']) ) - { - $password = md5($password); - } $install_file = ( !empty($HTTP_POST_VARS['install_file']) ) ? stripslashes(trim($HTTP_POST_VARS['install_file'])) : ''; $install_path = ( !empty($HTTP_POST_VARS['install_path']) ) ? stripslashes(trim($HTTP_POST_VARS['install_path'])) : ''; --- 659,662 ---- *************** *** 693,697 **** { // compare passwords and send them back to the password screen if they fail ! if ($password !== get_em_pw()) { $get_password = true; --- 689,693 ---- { // compare passwords and send them back to the password screen if they fail ! if (md5($password) !== get_em_pw()) { $get_password = true; *************** *** 970,978 **** // update the password; starting with 0.0.11 store as MD5 hash em_db_update('EM_password', md5($em_pass)); ! $pass_msg = ($em_pass == '') ? $lang['EM_pass_disabled'] : $lang['EM_pass_updated']; $force_ftp_pass = true; } // the confirm is empty so they are not trying to update the pw, so don't ! else if ($em_pass_confirm == '') { $pass_msg = $lang['EM_pass_not_updated']; --- 966,974 ---- // update the password; starting with 0.0.11 store as MD5 hash em_db_update('EM_password', md5($em_pass)); ! $pass_msg = (empty($em_pass)) ? $lang['EM_pass_disabled'] : $lang['EM_pass_updated']; $force_ftp_pass = true; } // the confirm is empty so they are not trying to update the pw, so don't ! else if (empty($em_pass_confirm)) { $pass_msg = $lang['EM_pass_not_updated']; *************** *** 991,1000 **** em_db_update('EM_ftp_dir', str_replace("'", "''", $ftp_dir)); em_db_update('EM_ftp_user', str_replace("'", "''", $ftp_user)); ! if ( $force_ftp_pass || !empty($ftp_pass) ) { em_db_update('EM_ftp_pass', str_replace("'", "''", crypt_ftp_pass(EM_ENCRYPT, $ftp_pass, $em_pass))); } ! em_db_update('EM_ftp_host', str_replace("'", "''", $ftp_host)); em_db_update('EM_ftp_port', $ftp_port); --- 987,1002 ---- em_db_update('EM_ftp_dir', str_replace("'", "''", $ftp_dir)); em_db_update('EM_ftp_user', str_replace("'", "''", $ftp_user)); ! if ( $force_ftp_pass || !empty($ftp_pass) ) { + // If they are updating the EM password, but they haven't supplied the FTP password, then + // we need the old EM password to decrypt the FTP password so it can be encrypted again + if( empty($ftp_pass) ) + { + $ftp_pass = crypt_ftp_pass(EM_DECRYPT, $board_config['EM_ftp_pass'], $password); + } em_db_update('EM_ftp_pass', str_replace("'", "''", crypt_ftp_pass(EM_ENCRYPT, $ftp_pass, $em_pass))); } ! em_db_update('EM_ftp_host', str_replace("'", "''", $ftp_host)); em_db_update('EM_ftp_port', $ftp_port); Index: mod_settings.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_settings.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mod_settings.tpl 3 Jun 2005 22:59:12 -0000 1.4 --- mod_settings.tpl 5 Nov 2005 00:30:52 -0000 1.5 *************** *** 92,95 **** --- 92,96 ---- <td class="catbottom" align="center" colspan="2"> <input type="hidden" name="mode" value="{MODE}" /> + <input type="hidden" name="password" value="{EM_PASS}" /> <input class="mainoption" type="submit" value="{L_SUBMIT}" /> </td> |
|
From: Markus P. <mar...@us...> - 2005-11-05 00:31:03
|
Update of /cvsroot/easymod/easymod2/mods/easymod/em_includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7470/mods/easymod/em_includes Modified Files: em_functions.php Log Message: Fixed issues updating the EM/FTP passwords. Index: em_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_functions.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** em_functions.php 2 Nov 2005 09:22:42 -0000 1.19 --- em_functions.php 5 Nov 2005 00:30:52 -0000 1.20 *************** *** 57,61 **** } ! require($phpbb_root_path . 'admin/em_includes/em_cipher.' . $phpEx); $cipher = new Cipher_BlockMode_cbc(); $crypt_method = ( $crypt_direction == EM_ENCRYPT ? 'encrypt' : 'decrypt' ); --- 57,61 ---- } ! require_once($phpbb_root_path . 'admin/em_includes/em_cipher.' . $phpEx); $cipher = new Cipher_BlockMode_cbc(); $crypt_method = ( $crypt_direction == EM_ENCRYPT ? 'encrypt' : 'decrypt' ); |
|
From: Markus P. <mar...@us...> - 2005-11-04 22:06:21
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28798 Modified Files: easymod_install.php Log Message: Fixed some issues still pending in the installer such as making sure the user language is selected, if present on the package. Aside from normalizing use of semi-colons at end on statements. Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** easymod_install.php 2 Nov 2005 19:42:50 -0000 1.35 --- easymod_install.php 4 Nov 2005 22:06:13 -0000 1.36 *************** *** 73,96 **** // set teh language (typo intentional ;-) ) // - if(!empty($HTTP_GET_VARS['language']) || !empty($HTTP_POST_VARS['language'])) - { - $language = (!empty($HTTP_POST_VARS['language'])) ? stripslashes($HTTP_POST_VARS['language']) : stripslashes($HTTP_GET_VARS['language']); - } - else if ( !empty($HTTP_COOKIE_VARS['em_lang']) ) - { - $language = stripslashes($HTTP_COOKIE_VARS['em_lang']); - } [...2253 lines suppressed...] ! 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 />"; page_footer(); *************** *** 1872,1877 **** else { ! echo $lang['EM_err_no_step'] . "<br />\n" ; ! exit ; } --- 1858,1863 ---- else { ! echo $lang['EM_err_no_step'] . "<br />\n"; ! exit; } |
|
From: Markus P. <mar...@us...> - 2005-11-04 22:04:11
|
Update of /cvsroot/easymod/easymod2/mods/easymod/em_includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28517 Modified Files: em_cipher.php Log Message: Make sure the FTP password is stored using ascii chars to avoid problems in certain SQL servers where storing binary data in char files (phpbb_config table is out of scope here) might generate conflicts. This is now achived using plain PHP functions rather than using the UTF8 encoder/decoder, which is part of the XML module and it might not be available on some servers. Index: em_cipher.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_cipher.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** em_cipher.php 2 Nov 2005 09:22:42 -0000 1.5 --- em_cipher.php 4 Nov 2005 22:03:58 -0000 1.6 *************** *** 521,525 **** class Cipher_BlockMode_cbc { ! var $_iv = "\0\0\0\0\0\0\0\0"; // String containing the initilization vector. var $blowfish; // will contain a blowfish class --- 521,525 ---- class Cipher_BlockMode_cbc { ! var $_iv = "\0\0\0\0\0\0\0\0"; // String containing the initilization vector. var $blowfish; // will contain a blowfish class *************** *** 527,531 **** var $key_set; - // constructor function Cipher_BlockMode_cbc() --- 527,530 ---- *************** *** 535,544 **** } - // encrypts the text a chunk at a time and then strings them all together and returns the value function encrypt($plaintext, $key) { $this->setkey($key); ! $encrypted = ''; --- 534,542 ---- } // encrypts the text a chunk at a time and then strings them all together and returns the value function encrypt($plaintext, $key) { $this->setkey($key); ! $encrypted = ''; *************** *** 570,583 **** // all just so the string is formed properly and what actually gets stored in the DB is "single'quote". The // same is true for any slashes that get added. The slashes won't actually show up when viewing the DB ;-) - - // change encoding for storage (postgres problems) - if( function_exists('utf8_encode') ) - { - $encrypted = utf8_encode($encrypted); - } - - return $encrypted ; - } // decrypts the cipher a chunk at a time and returns the plaintext --- 568,577 ---- // all just so the string is formed properly and what actually gets stored in the DB is "single'quote". The // same is true for any slashes that get added. The slashes won't actually show up when viewing the DB ;-) + // change encoding for storage (postgres problems with binary string) + $encrypted = $this->bin2hex($encrypted); + + return $encrypted; + } // decrypts the cipher a chunk at a time and returns the plaintext *************** *** 585,594 **** { $this->setkey($key); ! ! // decode for use (postgres storage problems) ! if( function_exists('utf8_decode') ) ! { ! $ciphertext = utf8_decode($ciphertext); ! } // TAKE TWO: the way General Config settings work in phpBB, this isn't sufficient, get rid of the ' all together --- 579,585 ---- { $this->setkey($key); ! ! // decode for use (postgres storage problems with binary string) ! $ciphertext = $this->hex2bin($ciphertext); // TAKE TWO: the way General Config settings work in phpBB, this isn't sufficient, get rid of the ' all together *************** *** 623,629 **** $this->key_set = true; } ! return; } } --- 614,640 ---- $this->key_set = true; } ! return; } + + // convert a binary string into an hexadecimal string + function bin2hex($bin) + { + for( $hex = '', $i = 0, $length = strlen($bin); $i < $length; $i++ ) + { + $hex .= substr('0' . dechex(ord($bin[$i])), -2); + } + return $hex; + } + + // convert an hexadecimal string into a binary string + function hex2bin($hex) + { + for( $bin = '', $i = 0, $length = strlen($hex); $i < $length; $i=$i+2 ) + { + $bin .= chr(hexdec(substr($hex, $i, 2))); + } + return $bin; + } } |
|
From: Markus P. <mar...@us...> - 2005-11-04 21:59:50
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27666 Modified Files: admin_easymod.php.txt mod_sql_body.tpl Log Message: Regarding usage of htmlspecialchars, just figured it's going to be a problem to fix existing installtions, hence undoing changes made here. Index: mod_sql_body.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_sql_body.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mod_sql_body.tpl 4 Nov 2005 05:14:10 -0000 1.5 --- mod_sql_body.tpl 4 Nov 2005 21:59:42 -0000 1.6 *************** *** 195,199 **** {HIDDEN} <input type="hidden" name="mode" value="{MODE}" /> - <input type="hidden" name="SQL_lines" value="{SQL_LINES}" /> <input type="hidden" name="themes" value="{THEMES}" /> <input type="hidden" name="languages" value="{LANGUAGES}" /> --- 195,198 ---- Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** admin_easymod.php.txt 4 Nov 2005 05:14:10 -0000 1.34 --- admin_easymod.php.txt 4 Nov 2005 21:59:42 -0000 1.35 *************** *** 249,253 **** if ((stristr($buffer, 'MOD Title:')) || (($mod_title == '') && (stristr( $buffer, 'Title:')))) { ! $mod_title = trim(substr($buffer, strpos($buffer, ":")+1)); $getting_desc = 0; } --- 249,253 ---- if ((stristr($buffer, 'MOD Title:')) || (($mod_title == '') && (stristr( $buffer, 'Title:')))) { ! $mod_title = htmlspecialchars(trim(substr($buffer, strpos($buffer, ":")+1))); $getting_desc = 0; } *************** *** 294,300 **** $left = strpos( $orig, "<")+1; $len = strpos( $orig, ">") - $left; ! $mod_author_email = trim(substr($orig, $left, $len)); ! $mod_author_handle = trim(substr($orig, 0, $left-1)); ! $mod_author_url = trim(substr($orig, $left + $len +1)); } --- 294,300 ---- $left = strpos( $orig, "<")+1; $len = strpos( $orig, ">") - $left; ! $mod_author_email = htmlspecialchars(trim(substr($orig, $left, $len))); ! $mod_author_handle = htmlspecialchars(trim(substr($orig, 0, $left-1))); ! $mod_author_url = htmlspecialchars(trim(substr($orig, $left + $len +1))); } *************** *** 304,312 **** $left = strpos( $orig, "(")+1; $len = strpos( $orig, ")") - $left; ! $mod_author_name = trim(substr($orig, $left, $len)); ! $mod_author_url = trim(substr($orig, $left + $len +1)); if ( $mod_author_handle == '') { ! $mod_author_handle = trim(substr( $orig, 0, $left-1)); } } --- 304,312 ---- $left = strpos( $orig, "(")+1; $len = strpos( $orig, ")") - $left; ! $mod_author_name = htmlspecialchars(trim(substr($orig, $left, $len))); ! $mod_author_url = htmlspecialchars(trim(substr($orig, $left + $len +1))); if ( $mod_author_handle == '') { ! $mod_author_handle = htmlspecialchars(trim(substr($orig, 0, $left-1))); } } *************** *** 315,319 **** else if ($mod_author_handle == '') { ! $mod_author_handle = $orig; } --- 315,319 ---- else if ($mod_author_handle == '') { ! $mod_author_handle = htmlspecialchars($orig); } *************** *** 330,339 **** if (strstr($url_array[$url], 'http:')) { ! $mod_author_url = $url_array[$url]; // if we didn't get a proper real name, then use whatever was in front of the url if ($mod_author_name == '') { ! $mod_author_name = $pos_name; } break; --- 330,339 ---- if (strstr($url_array[$url], 'http:')) { ! $mod_author_url = htmlspecialchars($url_array[$url]); // if we didn't get a proper real name, then use whatever was in front of the url if ($mod_author_name == '') { ! $mod_author_name = htmlspecialchars($pos_name); } break; *************** *** 351,359 **** if (($mod_author_handle == '') && ($mod_author_name != '')) { ! $mod_author_handle = $mod_author_name; } else if (($mod_author_handle == '') && ($mod_author_email != '')) { ! $mod_author_handle = $mod_author_email; } --- 351,359 ---- if (($mod_author_handle == '') && ($mod_author_name != '')) { ! $mod_author_handle = htmlspecialchars($mod_author_name); } else if (($mod_author_handle == '') && ($mod_author_email != '')) { ! $mod_author_handle = htmlspecialchars($mod_author_email); } *************** *** 364,368 **** else if ((stristr($buffer, 'MOD Description:')) || (($mod_description == '') && (stristr( $buffer, 'Description:')))) { ! $mod_description = trim(substr($buffer, strpos($buffer, ":")+1)); $getting_desc = 1; } --- 364,368 ---- else if ((stristr($buffer, 'MOD Description:')) || (($mod_description == '') && (stristr( $buffer, 'Description:')))) { ! $mod_description = htmlspecialchars(trim(substr($buffer, strpos($buffer, ":")+1))); $getting_desc = 1; } *************** *** 371,375 **** else if ((stristr( $buffer, 'MOD Version:')) || (($mod_description == '') && (stristr( $buffer, 'Version:')))) { ! $mod_version = trim(substr($buffer, strpos($buffer, ":")+1)); $getting_desc = 0; } --- 371,375 ---- else if ((stristr( $buffer, 'MOD Version:')) || (($mod_description == '') && (stristr( $buffer, 'Version:')))) { ! $mod_version = htmlspecialchars(trim(substr($buffer, strpos($buffer, ":")+1))); $getting_desc = 0; } *************** *** 379,383 **** { $new_line = ' ' . trim(substr($buffer, 2)); ! $mod_description .= $new_line; $getting_desc = ($getting_desc >= 3) ? 0 : $getting_desc + 1; } --- 379,383 ---- { $new_line = ' ' . trim(substr($buffer, 2)); ! $mod_description .= htmlspecialchars($new_line); $getting_desc = ($getting_desc >= 3) ? 0 : $getting_desc + 1; } *************** *** 665,669 **** $install_file = ( !empty($HTTP_POST_VARS['install_file']) ) ? stripslashes(trim($HTTP_POST_VARS['install_file'])) : ''; $install_path = ( !empty($HTTP_POST_VARS['install_path']) ) ? stripslashes(trim($HTTP_POST_VARS['install_path'])) : ''; - $SQL_lines = ( isset($HTTP_POST_VARS['SQL_lines']) ) ? intval($HTTP_POST_VARS['SQL_lines']) : 0; // 0.0.11 preview mode --- 665,668 ---- *************** *** 1094,1101 **** 'ROW_CLASS' => $row_class, 'INSTALL_DATE' => create_date($board_config['default_dateformat'], $row['mod_process_date'], $board_config['board_timezone']), ! 'TITLE' => htmlspecialchars($row['mod_title']), ! 'VERSION' => htmlspecialchars($row['mod_version']), ! 'AUTHOR' => htmlspecialchars($row['mod_author_handle']), ! 'URL' => htmlspecialchars($row['mod_author_url']), 'PHPBB_VER' => $row['mod_phpBB_version'], --- 1093,1100 ---- 'ROW_CLASS' => $row_class, 'INSTALL_DATE' => create_date($board_config['default_dateformat'], $row['mod_process_date'], $board_config['board_timezone']), ! 'TITLE' => $row['mod_title'], ! 'VERSION' => $row['mod_version'], ! 'AUTHOR' => $row['mod_author_handle'], ! 'URL' => $row['mod_author_url'], 'PHPBB_VER' => $row['mod_phpBB_version'], *************** *** 1106,1111 **** ///////////////// blah, what about schema name? ///////////////// ! 'THEMES' => htmlspecialchars($row['mod_processed_themes']), ! 'LANGS' => htmlspecialchars($row['mod_processed_langs'])) ); $total_mods++; --- 1105,1110 ---- ///////////////// blah, what about schema name? ///////////////// ! 'THEMES' => $row['mod_processed_themes'], ! 'LANGS' => $row['mod_processed_langs']) ); $total_mods++; *************** *** 1246,1261 **** $template->assign_vars(array( ! 'TITLE' => htmlspecialchars($row['mod_title']), ! 'VERSION' => htmlspecialchars($row['mod_version']), 'MOD_FILE' => $mod_file, ! 'DESCRIPTION' => htmlspecialchars($row['mod_description']), ! 'AUTHOR' => htmlspecialchars($row['mod_author_handle']), ! 'EMAIL' => htmlspecialchars($row['mod_author_email']), ! 'REAL_NAME' => htmlspecialchars($row['mod_author_name']), ! 'URL' => htmlspecialchars($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' => htmlspecialchars($row['mod_processed_themes']), ! 'LANGUAGES' => htmlspecialchars($row['mod_processed_langs']), 'FILES' => $row['mod_files_edited'], 'FILE_LIST' => $epf_list, --- 1245,1260 ---- $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'], 'FILE_LIST' => $epf_list, *************** *** 1549,1557 **** $template->assign_block_vars('unprocessed', array( 'ROW_CLASS' => $row_class, ! 'MOD_TITLE' => htmlspecialchars($mod_title), ! 'MOD_AUTHOR' => htmlspecialchars($mod_author_handle), ! 'MOD_URL' => htmlspecialchars($mod_author_url), ! 'MOD_VERSION' => htmlspecialchars($mod_version), ! 'MOD_DESC' => htmlspecialchars($mod_description), 'MOD_EMC' => ($compliant) ? '<img src="../templates/subSilver/images/emc.gif">' : $lang['No'], 'MOD_PATH' => $path . '/', --- 1548,1556 ---- $template->assign_block_vars('unprocessed', array( 'ROW_CLASS' => $row_class, ! 'MOD_TITLE' => $mod_title, ! 'MOD_AUTHOR' => $mod_author_handle, ! 'MOD_URL' => $mod_author_url, ! 'MOD_VERSION' => $mod_version, ! 'MOD_DESC' => $mod_description, 'MOD_EMC' => ($compliant) ? '<img src="../templates/subSilver/images/emc.gif">' : $lang['No'], 'MOD_PATH' => $path . '/', *************** *** 2802,2815 **** 'INSTALL_PATH' => $print_path, ! 'TITLE' => htmlspecialchars($mod_title), ! 'VERSION' => htmlspecialchars($mod_version), 'MOD_FILE' => $install_file, ! 'AUTHOR' => htmlspecialchars($mod_author_handle), ! 'EMAIL' => htmlspecialchars($mod_author_email), ! 'REAL_NAME' => htmlspecialchars($mod_author_name), ! 'URL' => htmlspecialchars($mod_author_url), ! 'THEMES' => htmlspecialchars($mod_themes), ! 'LANGUAGES' => htmlspecialchars($mod_langs), 'FILES' => $files_edited, 'PROCESSED' => $num_processed, --- 2801,2814 ---- 'INSTALL_PATH' => $print_path, ! 'TITLE' => $mod_title, ! 'VERSION' => $mod_version, 'MOD_FILE' => $install_file, ! 'AUTHOR' => $mod_author_handle, ! 'EMAIL' => $mod_author_email, ! 'REAL_NAME' => $mod_author_name, ! 'URL' => $mod_author_url, ! 'THEMES' => $mod_themes, ! 'LANGUAGES' => $mod_langs, 'FILES' => $files_edited, 'PROCESSED' => $num_processed, *************** *** 2860,2864 **** 'L_NEXT_STEP' => $lang['EM_next_step'], ! 'TITLE' => htmlspecialchars($mod_title), 'INSTALL_PATH' => $print_path, --- 2859,2863 ---- 'L_NEXT_STEP' => $lang['EM_next_step'], ! 'TITLE' => $mod_title, 'INSTALL_PATH' => $print_path, *************** *** 3111,3120 **** 'L_FOLLOWING_ERROR' => $lang['EM_following_error'], ! 'THEMES' => htmlspecialchars($themes), ! 'LANGUAGES' => htmlspecialchars($languages), 'FILES' => $files, 'PROCESSED' => $num_proc, 'UNPROCESSED' => $num_unproc, - 'SQL_LINES' => $num_sql_lines, 'MOD_FILE' => $install_file, 'MOD_PATH' => $install_path, --- 3110,3118 ---- 'L_FOLLOWING_ERROR' => $lang['EM_following_error'], ! 'THEMES' => $themes, ! 'LANGUAGES' => $languages, 'FILES' => $files, 'PROCESSED' => $num_proc, 'UNPROCESSED' => $num_unproc, 'MOD_FILE' => $install_file, 'MOD_PATH' => $install_path, *************** *** 3239,3249 **** 'L_COMPLETE' => $lang['EM_complete_install'], ! 'THEMES' => htmlspecialchars($themes), ! 'LANGUAGES' => htmlspecialchars($languages), 'FILES' => $files, 'PROCESSED' => $num_proc, 'UNPROCESSED' => $num_unproc, - // 'SQL_LINES' => $i, - 'SQL_LINES' => $num_sql_lines, 'MOD_FILE' => $install_file, 'MOD_PATH' => $install_path, --- 3237,3245 ---- 'L_COMPLETE' => $lang['EM_complete_install'], ! 'THEMES' => $themes, ! 'LANGUAGES' => $languages, 'FILES' => $files, 'PROCESSED' => $num_proc, 'UNPROCESSED' => $num_unproc, 'MOD_FILE' => $install_file, 'MOD_PATH' => $install_path, *************** *** 3474,3490 **** 'INSTALL_PATH' => $print_path, ! 'TITLE' => htmlspecialchars($mod_title), ! 'VERSION' => htmlspecialchars($mod_version), 'MOD_FILE' => $install_file, ! 'AUTHOR' => htmlspecialchars($mod_author_handle), ! 'EMAIL' => htmlspecialchars($mod_author_email), ! 'REAL_NAME' => htmlspecialchars($mod_author_name), ! 'URL' => htmlspecialchars($mod_author_url), 'MOD_FILE' => $install_file, 'MOD_PATH' => $install_path, 'MOD_COUNT' => $mod_count, ! 'THEMES' => htmlspecialchars($themes), ! 'LANGUAGES' => htmlspecialchars($languages), 'FILES' => $files, 'PROCESSED' => $num_proc, --- 3470,3486 ---- 'INSTALL_PATH' => $print_path, ! 'TITLE' => $mod_title, ! 'VERSION' => $mod_version, 'MOD_FILE' => $install_file, ! 'AUTHOR' => $mod_author_handle, ! 'EMAIL' => $mod_author_email, ! 'REAL_NAME' => $mod_author_name, ! 'URL' => $mod_author_url, 'MOD_FILE' => $install_file, 'MOD_PATH' => $install_path, 'MOD_COUNT' => $mod_count, ! 'THEMES' => $themes, ! 'LANGUAGES' => $languages, 'FILES' => $files, 'PROCESSED' => $num_proc, |
|
From: Markus P. <mar...@us...> - 2005-11-04 05:44:41
|
Update of /cvsroot/easymod/sql_parser/root/includes/sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26860/root/includes/sql Modified Files: sql_builder_mssql.php sql_builder_mysql.php sql_parser.php Log Message: fixed a couple of issues. Index: sql_builder_mysql.php =================================================================== RCS file: /cvsroot/easymod/sql_parser/root/includes/sql/sql_builder_mysql.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sql_builder_mysql.php 26 Sep 2005 09:59:13 -0000 1.3 --- sql_builder_mysql.php 4 Nov 2005 05:44:33 -0000 1.4 *************** *** 33,36 **** --- 33,40 ---- $column_data['unsigned'] = true; } + else + { + $datatype .= '(' . implode(', ', $column_data['datatype_argv']) . ')'; + } return $datatype; } Index: sql_builder_mssql.php =================================================================== RCS file: /cvsroot/easymod/sql_parser/root/includes/sql/sql_builder_mssql.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sql_builder_mssql.php 26 Sep 2005 09:59:13 -0000 1.3 --- sql_builder_mssql.php 4 Nov 2005 05:44:33 -0000 1.4 *************** *** 94,101 **** $column_definition = $column_data['name'] . ' ' . $this->translate_datatype($column_data); ! if( !empty($column_data['null']) ) ! { ! $column_definition .= ' ' . $column_data['null']; ! } if( isset($column_data['default']) ) { --- 94,101 ---- $column_definition = $column_data['name'] . ' ' . $this->translate_datatype($column_data); ! // According to the MSSQL manual (chapter "Nullability Rules Within a Table Definition") ! // It is recommended to explicitly define the nullability attribute of columns. ! $column_definition .= ' ' . ( empty($column_data['null']) ? 'NULL' : $column_data['null'] ); ! if( isset($column_data['default']) ) { Index: sql_parser.php =================================================================== RCS file: /cvsroot/easymod/sql_parser/root/includes/sql/sql_parser.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sql_parser.php 29 Sep 2005 19:32:21 -0000 1.4 --- sql_parser.php 4 Nov 2005 05:44:33 -0000 1.5 *************** *** 1852,1856 **** // Convert array into a long string again. ! $sql_string = implode('', $sql_array); // Remove C-style comments, introduced by /* and ended with */ --- 1852,1856 ---- // Convert array into a long string again. ! $sql_string = implode(' ', $sql_array); // Remove C-style comments, introduced by /* and ended with */ |
|
From: Markus P. <mar...@us...> - 2005-11-04 05:14:19
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22538/mods/easymod/includes Modified Files: admin_easymod.php.txt mod_sql_body.tpl Log Message: revised implementation of the sql parser. Index: mod_sql_body.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_sql_body.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mod_sql_body.tpl 31 Oct 2005 17:57:15 -0000 1.4 --- mod_sql_body.tpl 4 Nov 2005 05:14:10 -0000 1.5 *************** *** 3,26 **** <p>{L_SQL_INTRO}</p> - <!-- BEGIN drop_warning --> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> ! <tr> ! <th height="25" class="thHead" nowrap="nowrap">{L_URGENT_WARNING}</th> ! </tr> ! <tr> ! <td class="row1"><table border="0" cellpadding="3" cellspacing="1" width="100%"> ! <tr> ! <td align="center"> </td> ! </tr> ! <tr> ! <td width="100%" align="center"><span class="gen">{L_SQL_DROP_WARN}</span></td> ! </tr> ! <tr> ! <td align="center"> </td> ! </tr> ! </table> ! </td> ! </tr> </table> <br /> --- 3,26 ---- <p>{L_SQL_INTRO}</p> <!-- BEGIN drop_warning --> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> ! <tr> ! <th height="25" class="thHead" nowrap="nowrap">{L_URGENT_WARNING}</th> ! </tr> ! <tr> ! <td class="row1"> ! <table border="0" cellpadding="3" cellspacing="1" width="100%"> ! <tr> ! <td align="center"> </td> ! </tr> ! <tr> ! <td width="100%" align="center"><span class="gen">{L_SQL_DROP_WARN}</span></td> ! </tr> ! <tr> ! <td align="center"> </td> ! </tr> ! </table> ! </td> ! </tr> </table> <br /> *************** *** 29,49 **** <!-- BEGIN msaccess --> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> ! <tr> ! <th height="25" class="thHead" nowrap="nowrap">{L_NOTICE}</th> ! </tr> ! <tr> ! <td class="row1"><table border="0" cellpadding="3" cellspacing="1" width="100%"> ! <tr> ! <td align="center"> </td> ! </tr> ! <tr> ! <td width="100%" align="center"><span class="gen">{L_SQL_MSACCESS_WARN}</span></td> ! </tr> ! <tr> ! <td align="center"> </td> ! </tr> ! </table> ! </td> ! </tr> </table> <br /> --- 29,50 ---- <!-- BEGIN msaccess --> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> ! <tr> ! <th height="25" class="thHead" nowrap="nowrap">{L_NOTICE}</th> ! </tr> ! <tr> ! <td class="row1"> ! <table border="0" cellpadding="3" cellspacing="1" width="100%"> ! <tr> ! <td align="center"> </td> ! </tr> ! <tr> ! <td width="100%" align="center"><span class="gen">{L_SQL_MSACCESS_WARN}</span></td> ! </tr> ! <tr> ! <td align="center"> </td> ! </tr> ! </table> ! </td> ! </tr> </table> <br /> *************** *** 52,79 **** <!-- BEGIN sql_error --> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> ! <tr> ! <th height="25" class="thHead" nowrap="nowrap">{L_SQL_ERROR}</th> ! </tr> ! <tr> ! <td class="row1"><table border="0" cellpadding="3" cellspacing="1" width="100%"> ! <tr> ! <td align="center"> </td> ! </tr> ! <tr> ! <td width="100%" align="center"><div class="gen"><b>{L_SQL_HALTED}</b><br /> ! <br />{L_SQL_ERROR_EXPLAIN}<br /> ! <br /> ! {L_FAILED_LINE}:<br /> ! <table cellpadding="4" border="0"><tr><td><pre style="text-align:left;">{sql_error.LINE}</pre></td></tr></table> ! <br /> ! {L_SQL_ERROR}: {sql_error.ERROR_CODE}<br /> ! {sql_error.ERROR_MSG}</div></td> ! </tr> ! <tr> ! <td align="center"> </td> ! </tr> ! </table> ! </td> ! </tr> </table> <br /> --- 53,82 ---- <!-- BEGIN sql_error --> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> ! <tr> ! <th height="25" class="thHead" nowrap="nowrap">{L_SQL_ERROR}</th> ! </tr> ! <tr> ! <td class="row1"> ! <table border="0" cellpadding="3" cellspacing="1" width="100%"> ! <tr> ! <td align="center"> </td> ! </tr> ! <tr> ! <td width="100%" align="center"><div class="gen"><b>{L_SQL_HALTED}</b><br /> ! <br />{L_SQL_ERROR_EXPLAIN}<br /> ! <br /> ! {L_FAILED_LINE}:<br /> ! <table cellpadding="4" border="0"><tr><td><pre style="text-align:left;">{sql_error.LINE}</pre></td></tr></table> ! <br /> ! {L_SQL_ERROR}: {sql_error.ERROR_CODE}<br /> ! {sql_error.ERROR_MSG}</div> ! </td> ! </tr> ! <tr> ! <td align="center"> </td> ! </tr> ! </table> ! </td> ! </tr> </table> <br /> *************** *** 82,185 **** <!-- BEGIN experimental --> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> ! <tr> ! <th height="25" class="thHead" nowrap="nowrap">{L_NOTICE}</th> ! </tr> ! <tr> ! <td class="row1"><table border="0" cellpadding="3" cellspacing="1" width="100%"> ! <tr> ! <td align="center"> </td> ! </tr> ! <tr> ! <td width="100%" align="center"><span class="gen">{L_EXPERIMENTAL_EXPLAIN}</span></td> ! </tr> ! <tr> ! <td align="center"> </td> ! </tr> ! </table> ! </td> ! </tr> </table> <!-- END experimental --> ! <form method="post" action="{S_ACTION}"> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th width="90%" class="thCornerL" height="25">{L_PSEUDO}</th> ! <th width="10%" height="25" class="thCornerR">{L_ALLOW}</th> ! </tr> ! <!-- BEGIN error --> ! <tr> ! <td class="row1" colspan="2"> ! <table border="0" cellpadding="3" cellspacing="1" width="100%"> ! <tr> ! <td align="center"> </td> ! </tr> ! <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> ! </tr> ! <tr> ! <td align="center"> </td> ! </tr> ! </table> ! </td> ! </tr> ! <!-- END error --> ! <!-- BEGIN no_sql --> ! <tr> ! <td class="row1" colspan="2"> ! <table border="0" cellpadding="3" cellspacing="1" width="100%"> ! <tr> ! <td align="center"> </td> ! </tr> ! <tr> ! <td width="100%" align="center"><span class="gen"> ! {L_NO_SQL} ! </span></td> ! </tr> ! <tr> ! <td align="center"> </td> ! </tr> ! </table> ! </td> ! </tr> ! <!-- END no_sql --> ! <!-- BEGIN sql_row --> ! <tr> ! <td width="90%" class="{sql_row.ROW_CLASS}"><pre>{sql_row.DISPLAY_SQL}</pre></td> ! <td width="10%" align="center" class="{sql_row.ROW_CLASS}"> ! {sql_row.HIDDEN_SQL} ! {sql_row.CHECK} ! </td> ! </tr> ! <!-- END sql_row --> ! <tr> ! <td class="catBottom" colspan="2" align="center" height="28"> ! {HIDDEN} ! <input type="hidden" name="mode" value="{MODE}" /> ! <input type="hidden" name="SQL_lines" value="{SQL_LINES}" /> ! <input type="hidden" name="themes" value="{THEMES}" /> ! <input type="hidden" name="languages" value="{LANGUAGES}" /> ! <input type="hidden" name="files" value="{FILES}" /> ! <input type="hidden" name="num_proc" value="{PROCESSED}" /> ! <input type="hidden" name="num_unproc" value="{UNPROCESSED}" /> ! <input type="hidden" name="install_file" value="{MOD_FILE}" /> ! <input type="hidden" name="install_path" value="{MOD_PATH}" /> ! <input type="hidden" name="password" value="{EM_PASS}" /> ! <input type="submit" name="post" class="mainoption" value="{L_COMPLETE}" /> ! </td> ! </tr> </table> ! <br /> </form> <br /> --- 85,227 ---- <!-- BEGIN experimental --> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> ! <tr> ! <th height="25" class="thHead" nowrap="nowrap">{L_NOTICE}</th> ! </tr> ! <tr> ! <td class="row1"> ! <table border="0" cellpadding="3" cellspacing="1" width="100%"> ! <tr> ! <td align="center"> </td> ! </tr> ! <tr> ! <td width="100%" align="center"><span class="gen">{L_EXPERIMENTAL_EXPLAIN}</span></td> ! </tr> ! <tr> ! <td align="center"> </td> ! </tr> ! </table> ! </td> ! </tr> </table> + <br /> <!-- END experimental --> ! <!-- BEGIN warnings_block --> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th height="25" class="thHead" nowrap="nowrap">{warnings_block.TITLE}</th> ! </tr> ! <tr> ! <td class="row1"> ! <table cellpadding="4" cellspacing="0" border="0" align="center"> ! <tr><td align="left"> ! <div class="genmed"><ol> ! <!-- BEGIN line --> ! <li style="margin-bottom:8px;">{warnings_block.line.TEXT}</li> ! <!-- END line --> ! </ol></div> ! </td></tr> ! </table> ! </td> ! </tr> ! </table> ! <br /> ! <!-- END warnings_block --> ! <form name="sqlform" method="post" action="{S_ACTION}"> ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th width="5%" height="25" class="thCornerL"> </th> ! <th width="90%" height="25" class="thTop">{L_PSEUDO}</th> ! <th width="5%" height="25" class="thCornerR">{L_ALLOW}</th> ! </tr> ! <!-- BEGIN error --> ! <tr> ! <td class="row1" colspan="3"> ! <table border="0" cellpadding="3" cellspacing="1" width="100%"> ! <tr> ! <td align="center"> </td> ! </tr> ! <tr> ! <td width="100%" align="center"><div class="gen"> ! <b>{L_SQL_PROCESS_ERROR}:</b><br /> ! {L_NO_SQL_PREFORMED}<br /> ! <br /> ! {L_FOLLOWING_ERROR}:<br /> ! <br /> ! {error.ERROR_MSG} ! </div></td> ! </tr> ! <tr> ! <td align="center"> </td> ! </tr> ! </table> ! </td> ! </tr> ! <!-- END error --> ! <!-- BEGIN no_sql --> ! <tr> ! <td class="row1" colspan="3"> ! <table border="0" cellpadding="3" cellspacing="1" width="100%"> ! <tr> ! <td align="center"> </td> ! </tr> ! <tr> ! <td width="100%" align="center"><span class="gen">{L_NO_SQL}</span></td> ! </tr> ! <tr> ! <td align="center"> </td> ! </tr> ! </table> ! </td> ! </tr> ! <!-- END no_sql --> ! <!-- BEGIN sql_row --> ! <tr> ! <td width="5%" align="center" class="{sql_row.ROW_CLASS}"><span class="genmed"> {sql_row.STMT_COUNT} </span></td> ! <td width="90%" class="{sql_row.ROW_CLASS}"><pre>{sql_row.DISPLAY_SQL}</pre></td> ! <td width="5%" align="center" class="{sql_row.ROW_CLASS}"> ! {sql_row.HIDDEN_SQL} ! {sql_row.CHECK} ! </td> ! </tr> ! <!-- END sql_row --> ! ! <tr> ! <td class="catBottom" colspan="3" align="center" height="28"> ! {HIDDEN} ! <input type="hidden" name="mode" value="{MODE}" /> ! <input type="hidden" name="SQL_lines" value="{SQL_LINES}" /> ! <input type="hidden" name="themes" value="{THEMES}" /> ! <input type="hidden" name="languages" value="{LANGUAGES}" /> ! <input type="hidden" name="files" value="{FILES}" /> ! <input type="hidden" name="num_proc" value="{PROCESSED}" /> ! <input type="hidden" name="num_unproc" value="{UNPROCESSED}" /> ! <input type="hidden" name="install_file" value="{MOD_FILE}" /> ! <input type="hidden" name="install_path" value="{MOD_PATH}" /> ! <input type="hidden" name="password" value="{EM_PASS}" /> ! <input type="submit" name="post" class="mainoption" value="{L_COMPLETE}" /> ! </td> ! </tr> </table> ! <!-- BEGIN sql_rows --> ! <table width="100%" cellspacing="0" cellpadding="0" border="0"> ! <tr> ! <td align="right"><span class="nav"><b><a href="javascript:marklist('sqlform', true);this.blur();">{L_MARK_ALL}</a> :: <a href="javascript:marklist('sqlform', false);this.blur();">{L_UNMARK_ALL}</a></b> </span></td> ! </tr> ! </table> ! <!-- END sql_rows --> </form> <br /> + <script language="javascript" type="text/javascript"><!-- + function marklist(formname, status) + { + for( i = 0; i < document.forms[formname].length; i++ ) + { + document.forms[formname].elements[i].checked = status; + } + } + //--></script> \ No newline at end of file Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** admin_easymod.php.txt 2 Nov 2005 12:58:07 -0000 1.33 --- admin_easymod.php.txt 4 Nov 2005 05:14:10 -0000 1.34 *************** *** 2832,2836 **** // load up any SQL commands into hidden fields as well ! for ($i=0; $i<count( $sql); $i++) { $line = ''; --- 2832,2836 ---- // load up any SQL commands into hidden fields as well ! for ($i=0; $i<count($sql); $i++) { $line = ''; *************** *** 2933,2993 **** ); ! ! /********************************************************************************\ ! // turn the psuedo mysql into SQL for this user's DB type ! include($phpbb_root_path . 'admin/em_includes/em_schema.' . $phpEx); $formatted_sql = array(); $error = ''; ! for ($i=0; $i<count($sql); $i++) { ! $return_sql = handle_db_alteration( $sql[$i], $error ); ! if ( $error != '') { ! $template->assign_block_vars( 'error', array('ERROR_MSG' => $error)); ! break; } ! for ($j=0; $j<count($return_sql); $j++) { ! $formatted_sql[] = $return_sql[$j]; ! } ! } ! \********************************************************************************/ ! // Load the new SQL Parser ! if( @file_exists($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_sql_parser.' . $phpEx) ) ! { ! require($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_sql_parser.' . $phpEx); ! } ! else ! { ! require($phpbb_root_path . 'language/lang_english/lang_sql_parser.' . $phpEx); ! } ! require($phpbb_root_path . 'includes/sql/sql_parser.' . $phpEx); ! // Instatiate the SQL Parser object. ! $sql_parser = new sql_parser(); ! // Parse and convert the SQL statements for this user's DB type. ! $result = $sql_parser->parse_stream(implode("\n", $sql), $table_prefix); ! $error = ''; ! $formatted_sql = array(); ! if( $result & SQL_PARSER_ERROR ) ! { ! $error = '<b>Error:</b><br />' . $sql_parser->error_message['message'] . '<br /><br /><b>SQL:</b><br />' . $sql_parser->sql_input[$sql_parser->sql_count]; ! $template->assign_block_vars('error', array('ERROR_MSG' => $error)); ! } ! if( $result & SQL_PARSER_WARNINGS ) ! { ! $warnings = $sql_parser->warnings; ! } ! for( $j = 0; $j < count($sql_parser->sql_output); $j++ ) ! { ! $formatted_sql[] = $sql_parser->sql_output[$j]; } - /********************************************************************************/ // print message if there is no SQL to worry about ! if (count($sql) == 0) { $template->assign_block_vars('no_sql', array()); --- 2933,3001 ---- ); ! // Parser SQL statements, if any $formatted_sql = array(); + $sql_warnings = array(); $error = ''; ! if( count($sql) > 0 ) { ! // Use the old SQL Parser for MS-Access, support for which has been dropped ! if( SQL_LAYER == 'msaccess' ) { ! // turn the psuedo mysql into SQL for this user's DB type ! require($phpbb_root_path . 'admin/em_includes/em_schema.' . $phpEx); ! for( $i = 0; $i < count($sql); $i++ ) ! { ! $return_sql = handle_db_alteration($sql[$i], $error); ! if (!empty($error)) ! { ! $template->assign_block_vars('error', array('ERROR_MSG' => $error)); ! break; ! } ! ! for( $j = 0; $j < count($return_sql); $j++ ) ! { ! $formatted_sql[] = $return_sql[$j]; ! } ! } } ! // Use the new SQL Parser to deal with any other SQL server ! else { ! // Load the new SQL Parser ! if( @file_exists($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_sql_parser.' . $phpEx) ) ! { ! require($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_sql_parser.' . $phpEx); ! } ! else ! { ! require($phpbb_root_path . 'language/lang_english/lang_sql_parser.' . $phpEx); ! } ! require($phpbb_root_path . 'includes/sql/sql_parser.' . $phpEx); ! // Instatiate the SQL Parser object. ! $sql_parser = new sql_parser(); ! // Parse and convert the SQL statements for this user's DB type. ! $result = $sql_parser->parse_stream(implode("\n", $sql), $table_prefix); ! if( $result & SQL_PARSER_ERROR ) ! { ! $error = '<b>Error:</b><br />' . $sql_parser->error_message['message'] . '<br /><br /><b>SQL:</b><br />' . $sql_parser->sql_input[$sql_parser->sql_count]; ! $template->assign_block_vars('error', array('ERROR_MSG' => $error)); ! } ! if( $result & SQL_PARSER_WARNINGS ) ! { ! $sql_warnings = $sql_parser->warnings; ! } ! for( $j = 0; $j < count($sql_parser->sql_output); $j++ ) ! { ! $formatted_sql[] = $sql_parser->sql_output[$j]; ! } ! } } // print message if there is no SQL to worry about ! else { $template->assign_block_vars('no_sql', array()); *************** *** 2996,3061 **** } ! // display the list of SQL to generate and give use the option to not run them; display warnings if needed $drop_warning = false; $steps = 0; ! for ($i=0; $i<count($formatted_sql); $i++) { ! // if there is an error, then skip this ! if ( $error != '') { ! break; } ! $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; ! // see if this is the warning about dropping columns in postgresql ! $split = explode(' ', $formatted_sql[$i]); ! $hidden_sql = ''; ! if ($split[0] == 'ABORTED:') { ! $formatted_sql[$i] = '<b>' . htmlspecialchars($formatted_sql[$i]) . ';</b>'; $hidden_sql = ''; ! $check = ''; ! } ! else ! { ! $formatted_sql[$i] = htmlspecialchars($formatted_sql[$i]) . ';'; ! $hidden_sql = '<input type="hidden" name="SQL' . $steps . '" value="' . htmlspecialchars($formatted_sql[$i]) . '" />'; ! $check = '<input type="checkbox" name="check_SQL' . $steps . '" checked="checked" />'; ! $steps++; ! } ! // see if there are any DROP's we should warn the user about; we only want to display the warning once ! if ((!$drop_warning) && ((strtoupper($split[0]) == 'DROP') || (strtoupper($split[3]) == 'DROP'))) ! { ! $template->assign_block_vars( 'drop_warning', array()); ! $template->assign_vars(array( ! 'L_SQL_DROP_WARN' => $lang['EM_sql_drop_warning'], ! 'L_URGENT_WARNING' => $lang['EM_urgent_warning']) ); - $drop_warning = true; } - - - $template->assign_block_vars( 'sql_row', array( - 'ROW_CLASS' => $row_class, - 'HIDDEN_SQL' => $hidden_sql, - 'CHECK' => $check, - 'DISPLAY_SQL' => $formatted_sql[$i]) - ); } $hidden .= '<input type="hidden" name="num_sql_steps" value="' . $steps . "\" />\n"; // if it's postgre or mssql, let them know I don't have things quite right yet! ! if (($error == '') && ((SQL_LAYER == 'mssql') || (SQL_LAYER == 'postgresql'))) ! { ! $link = 'http://area51.phpbb.com/phpBB/viewtopic.php?t='; ! $link .= (SQL_LAYER == 'postgresql') ? '15388' : '15389'; ! ! $template->assign_block_vars('experimental', array()); ! $template->assign_vars(array( ! 'L_EXPERIMENTAL_EXPLAIN' => sprintf($lang['EM_experimental_explain'], SQL_LAYER, $link)) ! ); ! } // if it's msaccess, let them know that we can't add defaults :( --- 3004,3086 ---- } ! // display the list of SQL to generate and give user the option to not run them; display warnings if needed $drop_warning = false; $steps = 0; ! // if there was an error, then simply skip this ! if (empty($error)) { ! // Display warnings generated by the SQL Parser, if any ! for( $i = 0; $i < count($sql_warnings); $i++ ) { ! $sql_warnings_count = count($sql_warnings); ! $template->assign_block_vars('warnings_block', array( ! 'TITLE' => sprintf($lang['EM_sql_warnings_reported'], $sql_warnings_count) ! )); ! for( $j = 0; $j < $sql_warnings_count; $j++ ) ! { ! $template->assign_block_vars('warnings_block.line', array( ! 'TEXT' => $sql_warnings[$j]['message'] ! )); ! } } ! // Show the mark/unmark commands ! $template->assign_block_vars('sql_rows', array()); ! for( $i = 0; $i < count($formatted_sql); $i++ ) { ! $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; ! ! // see if this is the warning about dropping columns in postgresql ! $split = explode(' ', $formatted_sql[$i]); $hidden_sql = ''; ! if ($split[0] == 'ABORTED:') ! { ! $formatted_sql[$i] = '<b>' . htmlspecialchars($formatted_sql[$i]) . ';</b>'; ! $hidden_sql = ''; ! $check = ''; ! } ! else ! { ! $formatted_sql[$i] = htmlspecialchars($formatted_sql[$i]) . ';'; ! $hidden_sql = '<input type="hidden" name="SQL' . $steps . '" value="' . htmlspecialchars($formatted_sql[$i]) . '" />'; ! $check = '<input type="checkbox" name="check_SQL' . $steps . '" checked="checked" />'; ! $steps++; ! } ! // see if there are any DROP's we should warn the user about; we only want to display the warning once ! if ((!$drop_warning) && ((strtoupper($split[0]) == 'DROP') || (strtoupper($split[3]) == 'DROP'))) ! { ! $template->assign_block_vars('drop_warning', array()); ! $template->assign_vars(array( ! 'L_SQL_DROP_WARN' => $lang['EM_sql_drop_warning'], ! 'L_URGENT_WARNING' => $lang['EM_urgent_warning']) ! ); ! $drop_warning = true; ! } ! ! $template->assign_block_vars('sql_row', array( ! 'ROW_CLASS' => $row_class, ! 'STMT_COUNT' => $i+1, ! 'HIDDEN_SQL' => $hidden_sql, ! 'CHECK' => $check, ! 'DISPLAY_SQL' => $formatted_sql[$i]) ); } } $hidden .= '<input type="hidden" name="num_sql_steps" value="' . $steps . "\" />\n"; // if it's postgre or mssql, let them know I don't have things quite right yet! ! // Commented out since the new SQL Parser should process them nicely ! // if (($error == '') && ((SQL_LAYER == 'mssql') || (SQL_LAYER == 'postgresql'))) ! // { ! // $link = 'http://area51.phpbb.com/phpBB/viewtopic.php?t='; ! // $link .= (SQL_LAYER == 'postgresql') ? '15388' : '15389'; ! // ! // $template->assign_block_vars('experimental', array()); ! // $template->assign_vars(array( ! // 'L_EXPERIMENTAL_EXPLAIN' => sprintf($lang['EM_experimental_explain'], SQL_LAYER, $link)) ! // ); ! // } // if it's msaccess, let them know that we can't add defaults :( *************** *** 3066,3070 **** } - // fill the template $template->assign_vars(array( --- 3091,3094 ---- *************** *** 3080,3083 **** --- 3104,3109 ---- 'L_COMPLETE' => $lang['EM_complete_install'], 'L_NOTICE' => $lang['EM_notice'], + 'L_MARK_ALL' => $lang['Mark_all'], + 'L_UNMARK_ALL' => $lang['Unmark_all'], 'L_SQL_PROCESS_ERROR' => $lang['EM_sql_process_error'], *************** *** 3186,3190 **** // display the list of SQL to generate and give use the option to not run them; display warnings if needed - $drop_warning = false; $steps = 0; for( $i = 0; $i < count($sql); $i++ ) --- 3212,3215 ---- |
|
From: Markus P. <mar...@us...> - 2005-11-04 05:14:18
|
Update of /cvsroot/easymod/easymod2/mods/easymod/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22538/mods/easymod/languages Modified Files: lang_easymod_english.php Log Message: revised implementation of the sql parser. Index: lang_easymod_english.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/languages/lang_easymod_english.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_easymod_english.php 2 Nov 2005 05:51:56 -0000 1.3 --- lang_easymod_english.php 4 Nov 2005 05:14:10 -0000 1.4 *************** *** 162,166 **** $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'; --- 162,166 ---- $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 see if these changes will negatively impact your database. You are STRONGLY advised to <b>backup your database</b> before making any 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'; *************** *** 177,181 **** $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.'; --- 177,181 ---- $lang['EM_sql_process_error'] = 'SQL PROCESSING ERROR'; $lang['EM_failed_line'] = 'The failed line was'; ! $lang['EM_no_sql_preformed'] = '<b>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.'; *************** *** 185,188 **** --- 185,189 ---- $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_sql_warnings_reported'] = '%d Warning(s) reported by the SQL Parser'; $lang['EM_database_alterations'] = 'Database Alterations'; $lang['EM_tables_added'] = 'Tables Added'; *************** *** 409,413 **** $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.' ; --- 410,414 ---- $lang['EM_fail_cd_nlist_no'] = 'No files to list.' ; $lang['EM_ftp_root'] = 'FTP root directory:' ; ! $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' ; $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.' ; |
|
From: Markus P. <mar...@us...> - 2005-11-04 05:14:18
|
Update of /cvsroot/easymod/easymod2/mods/easymod/em_includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22538/mods/easymod/em_includes Modified Files: em_ftp.php Log Message: revised implementation of the sql parser. Index: em_ftp.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_ftp.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** em_ftp.php 31 Oct 2005 17:57:15 -0000 1.8 --- em_ftp.php 4 Nov 2005 05:14:10 -0000 1.9 *************** *** 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 />' . $lang['EM_dir_list'] . "<br />\n" ; $list = $emftp->ftp_nlist() ; |
