[Easymod-cvs] easymod2/mods/easymod easymod_display_functions.php,1.4,1.5 easymod_install.php,1.5,1.
Status: Beta
Brought to you by:
wgeric
From: Eric F. <wg...@us...> - 2005-05-02 00:22:48
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22931/mods/easymod Modified Files: easymod_display_functions.php easymod_install.php lang_easymod.php Log Message: I think I have all of the changes that were removed put back. Remember to update before you commit. Index: easymod_display_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_display_functions.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** easymod_display_functions.php 1 May 2005 07:20:18 -0000 1.4 --- easymod_display_functions.php 2 May 2005 00:22:38 -0000 1.5 *************** *** 109,113 **** function page_header( $text, $simple=false) { ! global $lang, $easymod_install_version; $variables = array() ; --- 109,113 ---- function page_header( $text, $simple=false) { ! global $lang, $easymod_install_version, $phpbb_root_path, $script_path; $variables = array() ; *************** *** 116,123 **** $variables['TEXT'] = $text ; ! display_template( './templates/page_start.tpl', $variables) ; if (!$simple) { ! display_template( './templates/page_header.tpl', $variables) ; } } --- 116,123 ---- $variables['TEXT'] = $text ; ! isplay_template( $phpbb_root_path . $script_path . 'templates/page_start.tpl', $variables) ; if (!$simple) { ! display_template( $phpbb_root_path . $script_path . 'templates/page_header.tpl', $variables) ; } } *************** *** 127,131 **** function page_footer() { ! global $install_step, $write, $move, $ftp_dir, $ftp_user, $ftp_pass, $ftp_host, $ftp_port, $ftp_debug, $ftp_type, $lang, $phpEx ; ///////////////////////// --- 127,131 ---- function page_footer() { ! global $install_step, $write, $move, $ftp_dir, $ftp_user, $ftp_pass, $ftp_host, $ftp_port, $ftp_debug, $ftp_type, $lang, $phpEx, $phpbb_root_path, $script_path ; ///////////////////////// *************** *** 142,146 **** $variables['DEBUG'] = $lang['EM_debug_display'] ; ! display_template( './templates/page_footer.tpl', $variables) ; } --- 142,146 ---- $variables['DEBUG'] = $lang['EM_debug_display'] ; ! display_template( $phpbb_root_path . $script_path . 'templates/page_footer.tpl', $variables) ; } *************** *** 149,157 **** function helpwin( $width=400, $height=200) { $variables = array() ; $variables['WIDTH'] = $width ; $variables['HEIGHT'] = $height ; ! display_template( './templates/helpwin.tpl', $variables) ; } --- 149,159 ---- function helpwin( $width=400, $height=200) { + global $phpbb_root_path, $script_path; + $variables = array() ; $variables['WIDTH'] = $width ; $variables['HEIGHT'] = $height ; ! display_template( $phpbb_root_path . $script_path . 'templates/helpwin.tpl', $variables) ; } *************** *** 160,167 **** function form_settings( $hidden, $step, $main_button, $rescan) { ! global $phpEx, $lang ; $variables = array() ; ! $variables['U_FORM'] = 'easymod_install.'.$phpEx ; $variables['STEP'] = $step ; $variables['HIDDEN'] = $hidden ; --- 162,169 ---- function form_settings( $hidden, $step, $main_button, $rescan) { ! global $phpEx, $lang, $phpbb_root_path, $script_path ; $variables = array() ; ! $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['STEP'] = $step ; $variables['HIDDEN'] = $hidden ; *************** *** 169,173 **** $variables['RESCAN'] = (!$rescan) ? '' : '<input class="mainoption" type="submit" value="' . $lang['Rescan'] . '" name="rescan"/>' ; ! display_template( './templates/form_settings.tpl', $variables) ; } --- 171,175 ---- $variables['RESCAN'] = (!$rescan) ? '' : '<input class="mainoption" type="submit" value="' . $lang['Rescan'] . '" name="rescan"/>' ; ! display_template( $phpbb_root_path . $script_path . 'templates/form_settings.tpl', $variables) ; } *************** *** 176,180 **** function display_debug_html( $variables, $access, $values) { ! global $lang, $easymod_install_version, $install_step, $mode, $write, $move, $ftp_user, $ftp_pass, $ftp_host, $ftp_port, $ftp_dir, $ftp_debug, $ftp_type, $ftp_cache ; // assign template data --- 178,182 ---- function display_debug_html( $variables, $access, $values) { ! global $lang, $easymod_install_version, $install_step, $mode, $write, $move, $ftp_user, $ftp_pass, $ftp_host, $ftp_port, $ftp_dir, $ftp_debug, $ftp_type, $ftp_cache, $phpbb_root_path, $script_path ; // assign template data *************** *** 215,219 **** $variables['EM_VERSION'] = $easymod_install_version ; $variables['PHPBB_VERSION'] = get_phpbb_version() ; ! $variables['CWD'] = getcwd() ; $variables['STEP'] = $install_step ; $variables['MODE'] = $mode ; --- 217,221 ---- $variables['EM_VERSION'] = $easymod_install_version ; $variables['PHPBB_VERSION'] = get_phpbb_version() ; ! $variables['CWD'] = dirname(__FILE__) ; $variables['STEP'] = $install_step ; $variables['MODE'] = $mode ; *************** *** 231,235 **** $variables['FILE_LISTING'] = $values['file_listing'] ; ! display_template( './templates/display_debug.tpl', $variables) ; // check FTP compatiblity --- 233,237 ---- $variables['FILE_LISTING'] = $values['file_listing'] ; ! display_template( $phpbb_root_path . $script_path . 'templates/display_debug.tpl', $variables) ; // check FTP compatiblity *************** *** 237,241 **** { // test the ftp connection ! if (test_ftp( $ftp_user, $ftp_pass, $ftp_dir, $ftp_host, $ftp_port, true, $ftp_type)) { echo '<br>[b]<b>' . $lang['EM_debug_ftp_test'] . '</b>[/b] :: [b][color=green]<b class="ok">' . $lang['EM_debug_success']. "</b>[/color][/b]<br />\n" ; --- 239,243 ---- { // test the ftp connection ! if (test_ftp( $ftp_user, $ftp_pass, $ftp_dir, $ftp_host, true, $ftp_type, $ftp_cache)) { echo '<br>[b]<b>' . $lang['EM_debug_ftp_test'] . '</b>[/b] :: [b][color=green]<b class="ok">' . $lang['EM_debug_success']. "</b>[/color][/b]<br />\n" ; *************** *** 247,251 **** } ! display_template( './templates/display_debug_footer.tpl', $variables) ; } --- 249,253 ---- } ! display_template( $phpbb_root_path . $script_path . 'templates/display_debug_footer.tpl', $variables) ; } *************** *** 287,291 **** $values['file_listing'] = '' ; ! if ($dh = opendir('./')) { while (($file = readdir($dh)) !== false) --- 289,293 ---- $values['file_listing'] = '' ; ! if ($dh = opendir(dirname(__FILE__))) { while (($file = readdir($dh)) !== false) *************** *** 303,307 **** function display_error( $error) { ! global $lang ; // assign template data --- 305,309 ---- function display_error( $error) { ! global $lang, $phpbb_root_path, $script_path ; // assign template data *************** *** 310,314 **** $variables['ERROR'] = $error ; ! display_template( './templates/display_error.tpl', $variables) ; } --- 312,316 ---- $variables['ERROR'] = $error ; ! display_template( $phpbb_root_path . $script_path . 'templates/display_error.tpl', $variables) ; } *************** *** 364,370 **** function get_install_info( &$variables, $prev_em_version) { ! global $phpEx, $lang, $easymod_install_version, $phpBB_version ; ! $variables['U_FORM'] = 'easymod_install.' . $phpEx ; $variables['EM_Install_Info'] = $lang['EM_Install_Info'] ; $variables['EM_Select_Language'] = $lang['EM_Select_Language'] ; --- 366,372 ---- function get_install_info( &$variables, $prev_em_version) { ! global $phpEx, $lang, $easymod_install_version, $phpBB_version, $phpbb_root_path, $script_path ; ! $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.' . $phpEx ; $variables['EM_Install_Info'] = $lang['EM_Install_Info'] ; $variables['EM_Select_Language'] = $lang['EM_Select_Language'] ; *************** *** 428,433 **** if ($bbcode) { ! $ok_msg = '[b][color=green]<b class="ok">OK</b>[/b]' ; ! $okparms = '[b][color=green]<b class="ok">%s</b>[/b]' ; $no_msg = '[b]<b>' . $lang['EM_no'] . '</b>[/b]' ; $noparms = '[b]<b>%s</b>[/b]' ; --- 430,435 ---- if ($bbcode) { ! $ok_msg = '[b][color=green]<b class="ok">OK</b>[/color][/b]' ; ! $okparms = '[b][color=green]<b class="ok">%s</b>[/color][/b]' ; $no_msg = '[b]<b>' . $lang['EM_no'] . '</b>[/b]' ; $noparms = '[b]<b>%s</b>[/b]' ; *************** *** 573,580 **** function check_installablity() { ! global $db, $lang, $easymod_install_version ; // make sure we are in the correct directory ! $cwd = getcwd() ; $cwd = str_replace("\\", '/', $cwd) ; $dirs = explode('/', $cwd) ; --- 575,582 ---- function check_installablity() { ! global $db, $lang, $easymod_install_version, $phpbb_root_path ; // make sure we are in the correct directory ! $cwd = dirname(__FILE__) ; $cwd = str_replace("\\", '/', $cwd) ; $dirs = explode('/', $cwd) ; *************** *** 584,595 **** //// make sure EM is in the right directory //// ! // for some odd reason getcwd returns empty on some servers??? (added in 0.0.10a-2) ! if ($cwd == '') ! { ! // do nothing ! } ! ! // otherwise make sure we are in the correct directory for installation ! else if (($dirs[count($dirs)-3] != 'admin') || ($dirs[count($dirs)-2] != 'mods') || (strtolower($dirs[count($dirs)-1]) != 'easymod')) { handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $lang['EM_err_install_dir'] ) ; --- 586,590 ---- //// make sure EM is in the right directory //// ! if (($dirs[count($dirs)-3] != 'admin') || ($dirs[count($dirs)-2] != 'mods') || (strtolower($dirs[count($dirs)-1]) != 'easymod')) { handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $lang['EM_err_install_dir'] ) ; *************** *** 601,605 **** //// // make sure subsilver dir exists ! if (!file_exists('../../../templates/subSilver')) { handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $lang['EM_err_no_subsilver'] ) ; --- 596,600 ---- //// // make sure subsilver dir exists ! if (!file_exists($phpbb_root_path . 'templates/subSilver')) { handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $lang['EM_err_no_subsilver'] ) ; *************** *** 621,625 **** // make sure english exists ! if (!file_exists('../../../language/lang_english')) { handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $lang['EM_err_no_english'] ) ; --- 616,620 ---- // make sure english exists ! if (!file_exists($phpbb_root_path . 'language/lang_english')) { handle_error( OPEN_FAIL_CRITICAL, $file_list, false, $lang['EM_err_no_english'] ) ; *************** *** 695,699 **** function display_step1_classic() { ! global $lang, $db, $easymod_install_version, $phpEx ; $variables = array() ; --- 690,694 ---- function display_step1_classic() { ! global $lang, $db, $easymod_install_version, $phpEx, $phpbb_root_path, $script_path ; $variables = array() ; *************** *** 750,754 **** // assign template data ! $variables['U_FORM'] = 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; $variables['EM_Settings'] = $lang['EM_Settings'] ; --- 745,749 ---- // assign template data ! $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; $variables['EM_Settings'] = $lang['EM_Settings'] ; *************** *** 774,778 **** // dispay the page and the footer ! display_template( './templates/step1_classic.tpl', $variables) ; page_footer() ; exit ; --- 769,773 ---- // dispay the page and the footer ! display_template( $phpbb_root_path . $script_path . 'templates/step1_classic.tpl', $variables) ; page_footer() ; exit ; *************** *** 783,787 **** function display_step1_simple() { ! global $lang, $db, $easymod_install_version, $phpEx, $language ; $variables = array() ; --- 778,782 ---- function display_step1_simple() { ! global $lang, $db, $easymod_install_version, $phpEx, $language, $phpbb_root_path, $script_path ; $variables = array() ; *************** *** 798,802 **** // assign template data ! $variables['U_FORM'] = 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; $variables['EM_Settings'] = $lang['EM_Settings'] ; --- 793,797 ---- // assign template data ! $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; $variables['EM_Settings'] = $lang['EM_Settings'] ; *************** *** 806,810 **** // dispay the page and the footer ! display_template( './templates/step1_simple.tpl', $variables) ; page_footer() ; exit ; --- 801,805 ---- // dispay the page and the footer ! display_template( $phpbb_root_path . $script_path . 'templates/step1_simple.tpl', $variables) ; page_footer() ; exit ; *************** *** 814,818 **** function display_step1b_idunno() { ! global $lang, $db, $easymod_install_version, $phpEx ; $variables = array() ; --- 809,813 ---- function display_step1b_idunno() { ! global $lang, $db, $easymod_install_version, $phpEx, $phpbb_root_path, $script_path ; $variables = array() ; *************** *** 859,863 **** // assign template data ! $variables['U_FORM'] = 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; $variables['EM_Settings'] = $lang['EM_Settings'] ; --- 854,858 ---- // assign template data ! $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; $variables['EM_Settings'] = $lang['EM_Settings'] ; *************** *** 867,871 **** // dispay the page and the footer ! display_template( './templates/step1b_simple.tpl', $variables) ; page_footer() ; exit ; --- 862,866 ---- // dispay the page and the footer ! display_template( $phpbb_root_path . $script_path . 'templates/step1b_simple.tpl', $variables) ; page_footer() ; exit ; *************** *** 875,879 **** function display_step1b_ftp() { ! global $lang, $db, $easymod_install_version, $phpEx, $language ; $variables = array() ; --- 870,874 ---- function display_step1b_ftp() { ! global $lang, $db, $easymod_install_version, $phpEx, $language, $phpbb_root_path, $script_path ; $variables = array() ; *************** *** 887,891 **** // assign template data ! $variables['U_FORM'] = 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; $variables['EM_Settings'] = $lang['EM_Settings'] ; --- 882,886 ---- // assign template data ! $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; $variables['EM_Settings'] = $lang['EM_Settings'] ; *************** *** 903,907 **** // dispay the page and the footer ! display_template( './templates/step1b_ftp.tpl', $variables) ; page_footer() ; exit ; --- 898,902 ---- // dispay the page and the footer ! display_template( $phpbb_root_path . $script_path . 'templates/step1b_ftp.tpl', $variables) ; page_footer() ; exit ; *************** *** 911,915 **** function display_step1c_empw() { ! global $lang, $db, $easymod_install_version, $phpEx ; global $read, $write, $move, $ftp_user, $ftp_pass, $ftp_host, $ftp_port, $ftp_dir, $ftp_debug, $ftp_type, $ftp_cache; --- 906,910 ---- function display_step1c_empw() { ! global $lang, $db, $easymod_install_version, $phpEx, $phpbb_root_path, $script_path ; global $read, $write, $move, $ftp_user, $ftp_pass, $ftp_host, $ftp_port, $ftp_dir, $ftp_debug, $ftp_type, $ftp_cache; *************** *** 927,931 **** // assign template data ! $variables['U_FORM'] = 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; $variables['EM_Settings'] = $lang['EM_Settings'] ; --- 922,926 ---- // assign template data ! $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx ; $variables['EM_support'] = $lang['EM_support'] ; $variables['EM_Settings'] = $lang['EM_Settings'] ; *************** *** 952,956 **** // dispay the page and the footer ! display_template( './templates/step1c_empw.tpl', $variables) ; page_footer() ; exit ; --- 947,951 ---- // dispay the page and the footer ! display_template( $phpbb_root_path . $script_path . 'templates/step1c_empw.tpl', $variables) ; page_footer() ; exit ; Index: lang_easymod.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/lang_easymod.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lang_easymod.php 1 May 2005 07:12:52 -0000 1.4 --- lang_easymod.php 2 May 2005 00:22:38 -0000 1.5 *************** *** 160,164 **** $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/phpBB22/viewforum.php?f=15" target="_blank">EasyMOD Central</a> over at Area51. No emails, IMs, or PMs please.' ; $lang['EM_read_access'] = 'read access' ; --- 160,164 ---- $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://easymod.sourceforge.net/" target="_blank">EasyMOD Central</a> over at SourceForge. No emails, IMs, or PMs please.' ; $lang['EM_read_access'] = 'read access' ; Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** easymod_install.php 1 May 2005 07:18:42 -0000 1.5 --- easymod_install.php 2 May 2005 00:22:38 -0000 1.6 *************** *** 27,30 **** --- 27,47 ---- //// + // PHP5 with register_long_arrays off? + if (!isset($HTTP_POST_VARS) && isset($_POST)) + { + $HTTP_POST_VARS = $_POST; + $HTTP_GET_VARS = $_GET; + $HTTP_SERVER_VARS = $_SERVER; + $HTTP_COOKIE_VARS = $_COOKIE; + $HTTP_ENV_VARS = $_ENV; + $HTTP_POST_FILES = $_FILES; + + // _SESSION is the only superglobal which is conditionally set + if (isset($_SESSION)) + { + $HTTP_SESSION_VARS = $_SESSION; + } + } + include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'config.'.$phpEx); *************** *** 34,42 **** include($phpbb_root_path . 'includes/db.'.$phpEx); ! include( './em_includes/em_ftp.'.$phpEx); ! include( './em_includes/em_modio.'.$phpEx); ! include( './em_includes/em_functions.'.$phpEx); ! include( './easymod_display_functions.'.$phpEx); --- 51,59 ---- include($phpbb_root_path . 'includes/db.'.$phpEx); ! include( $phpbb_root_path . $script_path . 'em_includes/em_ftp.'.$phpEx); ! include( $phpbb_root_path . $script_path . 'em_includes/em_modio.'.$phpEx); ! include( $phpbb_root_path . $script_path . 'em_includes/em_functions.'.$phpEx); ! include( $phpbb_root_path . $script_path . 'easymod_display_functions.'.$phpEx); *************** *** 65,69 **** { // make sure the lang file exists ! if (!file_exists('./lang_easymod.'.$phpEx)) { // display error message (obviously we can't use the lang system for this error) ;-) --- 82,86 ---- { // make sure the lang file exists ! if (!file_exists($phpbb_root_path . $script_path . 'lang_easymod.'.$phpEx)) { // display error message (obviously we can't use the lang system for this error) ;-) *************** *** 72,81 **** } ! include( './lang_easymod.'.$phpEx); } else { // make sure the lang file exists ! if (!file_exists('./lang_easymod.'.$phpEx)) { // display error message (obviously we can't use the lang system from this ;-) --- 89,98 ---- } ! include( $phpbb_root_path . $script_path . 'lang_easymod.'.$phpEx); } else { // make sure the lang file exists ! if (!file_exists($phpbb_root_path . $script_path . 'lang_easymod.'.$phpEx)) { // display error message (obviously we can't use the lang system from this ;-) *************** *** 84,88 **** } ! include( './lang_easymod.'.$phpEx); } --- 101,105 ---- } ! include( $phpbb_root_path . $script_path . 'lang_easymod.'.$phpEx); } *************** *** 147,151 **** { // if we can't open the file then we are in trouble, but we'll let the wrapper_find handle it ! if (!($fin = fopen( '../../../language/lang_english/lang_admin.'.$phpEx,'r'))) { return false ; --- 164,168 ---- { // if we can't open the file then we are in trouble, but we'll let the wrapper_find handle it ! if (!($fin = fopen( $phpbb_root_path . 'language/lang_english/lang_admin.'.$phpEx,'r'))) { return false ; *************** *** 984,989 **** case 'mysql4': $sql[] = "CREATE TABLE " . EASYMOD_TABLE . " ( ! mod_id mediumint(8) NOT NULL DEFAULT '0' auto_increment, ! mod_title varchar(50) NULL DEFAULT '', mod_file varchar(255) NULL DEFAULT '', mod_version varchar(15) NULL DEFAULT '', --- 1001,1006 ---- case 'mysql4': $sql[] = "CREATE TABLE " . EASYMOD_TABLE . " ( ! mod_id mediumint(8) NOT NULL auto_increment, ! mod_title varchar(255) NULL DEFAULT '', mod_file varchar(255) NULL DEFAULT '', mod_version varchar(15) NULL DEFAULT '', *************** *** 1010,1014 **** mod_id int4 NOT NULL DEFAULT nextval('phpbb_easymod_mod_id_seq'::text), CONSTRAINT PK_phpbb_easymod PRIMARY KEY (mod_id), ! mod_title varchar(50) NULL DEFAULT '', mod_file varchar(255) NULL DEFAULT '', mod_version varchar(15) NULL DEFAULT '', --- 1027,1031 ---- mod_id int4 NOT NULL DEFAULT nextval('phpbb_easymod_mod_id_seq'::text), CONSTRAINT PK_phpbb_easymod PRIMARY KEY (mod_id), ! mod_title varchar(255) NULL DEFAULT '', mod_file varchar(255) NULL DEFAULT '', mod_version varchar(15) NULL DEFAULT '', *************** *** 1037,1041 **** $sql[] = "CREATE TABLE [" . EASYMOD_TABLE . "] ( [mod_id] [int] IDENTITY (1, 1) NOT NULL, ! [mod_title] [varchar] (50) NULL, [mod_file] [varchar] (255) NULL, [mod_version] [varchar] (15) NULL, --- 1054,1058 ---- $sql[] = "CREATE TABLE [" . EASYMOD_TABLE . "] ( [mod_id] [int] IDENTITY (1, 1) NOT NULL, ! [mod_title] [varchar] (255) NULL, [mod_file] [varchar] (255) NULL, [mod_version] [varchar] (15) NULL, *************** *** 1094,1098 **** $sql[] = "CREATE TABLE " . EASYMOD_TABLE . " ( mod_id COUNTER NOT NULL CONSTRAINT PK_phpbb_easymod PRIMARY KEY, ! mod_title TEXT(50) NULL, mod_file TEXT(255) NULL, mod_version TEXT(15) NULL, --- 1111,1115 ---- $sql[] = "CREATE TABLE " . EASYMOD_TABLE . " ( mod_id COUNTER NOT NULL CONSTRAINT PK_phpbb_easymod PRIMARY KEY, ! mod_title TEXT(255) NULL, mod_file TEXT(255) NULL, mod_version TEXT(15) NULL, *************** *** 1652,1656 **** // let 'em know what we are doing ! echo '<br><br><b>' . $lang['EM_confirm_admin'] . ':</b> admin_easymod.php,v ' . $easymod_install_version . "<br>\n" ; // open admin_easymod.php for reading --- 1669,1673 ---- // let 'em know what we are doing ! echo '<br><br><b>' . $lang['EM_confirm_admin'] . ":</b> admin_easymod.php<br>\n" ; // open admin_easymod.php for reading *************** *** 1663,1667 **** // read a line and see if it contains our key $line = fgets( $fin, 4096) ; ! if (strstr($line, 'admin_easymod.php,v ' . $easymod_install_version)) { // print success and break out --- 1680,1684 ---- // read a line and see if it contains our key $line = fgets( $fin, 4096) ; ! if (strstr($line, 'admin_easymod.php')) { // print success and break out *************** *** 1676,1680 **** if (!$found) { ! $error = $lang['EM_err_find'] . ' <b>admin_easymod.php,v ' . $easymod_install_version . '</b> in [admin/admin_easymod.php].' ; display_error( $error) ; } --- 1693,1697 ---- if (!$found) { ! $error = $lang['EM_err_find'] . ' <b>admin_easymod.php</b> in [admin/admin_easymod.php].' ; display_error( $error) ; } *************** *** 1756,1760 **** // added security starting in 0.0.11, blowfish encrypt the ftp_pass ! include($phpbb_root_path . $script_path . '/em_includes/em_cipher.php') ; $cipher = new Cipher_BlockMode_cbc(); $cipher->blowfish->setKey( $em_pass); --- 1773,1777 ---- // added security starting in 0.0.11, blowfish encrypt the ftp_pass ! include($phpbb_root_path . $script_path . '/em_includes/em_cipher.'.$phpEx) ; $cipher = new Cipher_BlockMode_cbc(); $cipher->blowfish->setKey( $em_pass); |