[Easymod-cvs] easymod2/mods/easymod easymod_display_functions.php, 1.25, 1.26 easymod_install.php,
Status: Beta
Brought to you by:
wgeric
Menu
▾
▴
[Easymod-cvs] easymod2/mods/easymod easymod_display_functions.php, 1.25, 1.26 easymod_install.php, 1.47, 1.48
|
From: Eric F. <wg...@us...> - 2006-09-30 17:59:14
|
Update of /cvsroot/easymod/easymod2/mods/easymod In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5136/easymod Modified Files: easymod_display_functions.php easymod_install.php Log Message: Bug fixes. - append_sid() used in install now - and some others Index: easymod_display_functions.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_display_functions.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** easymod_display_functions.php 8 Nov 2005 19:35:12 -0000 1.25 --- easymod_display_functions.php 30 Sep 2006 17:59:09 -0000 1.26 *************** *** 140,144 **** // we have to fix the password so it does not have a # in it or else the link won't work $ftp_pass = str_replace('#', '~pound~', $ftp_pass); ! $link = "easymod_install.$phpEx?mode=debug&install_step=$install_step&write=$write&move=$move&ftp_dir=$ftp_dir&ftp_user=$ftp_user&ftp_pass=$ftp_pass&ftp_host=$ftp_host&ftp_port=$ftp_port&ftp_debug=$ftp_debug&ftp_type=$ftp_type"; $variables = array(); --- 140,144 ---- // we have to fix the password so it does not have a # in it or else the link won't work $ftp_pass = str_replace('#', '~pound~', $ftp_pass); ! $link = append_sid("easymod_install.$phpEx?mode=debug&install_step=$install_step&write=$write&move=$move&ftp_dir=$ftp_dir&ftp_user=$ftp_user&ftp_pass=$ftp_pass&ftp_host=$ftp_host&ftp_port=$ftp_port&ftp_debug=$ftp_debug&ftp_type=$ftp_type"); $variables = array(); *************** *** 169,173 **** $variables = array(); ! $variables['U_FORM'] = $phpbb_root_path . $script_path . 'easymod_install.'.$phpEx; $variables['STEP'] = $step; $variables['HIDDEN'] = $hidden; --- 169,173 ---- $variables = array(); ! $variables['U_FORM'] = append_sid($phpbb_root_path . $script_path . 'easymod_install.'.$phpEx); $variables['STEP'] = $step; $variables['HIDDEN'] = $hidden; *************** *** 454,458 **** global $phpEx, $lang, $easymod_install_version, $phpBB_version, $phpbb_root_path, $script_path, $language; ! $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']; --- 454,458 ---- global $phpEx, $lang, $easymod_install_version, $phpBB_version, $phpbb_root_path, $script_path, $language; ! $variables['U_FORM'] = append_sid($phpbb_root_path . $script_path . 'easymod_install.' . $phpEx); $variables['EM_Install_Info'] = $lang['EM_Install_Info']; $variables['EM_Select_Language'] = $lang['EM_Select_Language']; *************** *** 832,836 **** // 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']; --- 832,837 ---- // assign template data ! $variables['U_FORM'] = append_sid($phpbb_root_path . $script_path . 'easymod_install.'.$phpEx); ! $variables['U_SIMPLE'] = append_sid($phpbb_root_path . $script_path . 'easymod_install.' . $phpEx . '?setup=simple'); $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']; --- 883,888 ---- // assign template data ! $variables['U_FORM'] = append_sid($phpbb_root_path . $script_path . 'easymod_install.'.$phpEx); ! $variables['U_ADVANCED'] = append_sid($phpbb_root_path . $script_path . 'easymod_install.' . $phpEx . '?setup=advanced'); $variables['EM_support'] = $lang['EM_support']; $variables['EM_Settings'] = $lang['EM_settings']; *************** *** 951,955 **** // 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']; --- 953,957 ---- // assign template data ! $variables['U_FORM'] = append_sid($phpbb_root_path . $script_path . 'easymod_install.'.$phpEx); $variables['EM_support'] = $lang['EM_support']; $variables['EM_Settings'] = $lang['EM_settings']; *************** *** 992,996 **** // 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']; --- 994,998 ---- // assign template data ! $variables['U_FORM'] = append_sid($phpbb_root_path . $script_path . 'easymod_install.'.$phpEx); $variables['EM_support'] = $lang['EM_support']; $variables['EM_Settings'] = $lang['EM_settings']; *************** *** 1032,1036 **** // 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']; --- 1034,1038 ---- // assign template data ! $variables['U_FORM'] = append_sid($phpbb_root_path . $script_path . 'easymod_install.'.$phpEx); $variables['EM_support'] = $lang['EM_support']; $variables['EM_Settings'] = $lang['EM_settings']; Index: easymod_install.php =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** easymod_install.php 8 Nov 2005 16:52:41 -0000 1.47 --- easymod_install.php 30 Sep 2006 17:59:09 -0000 1.48 *************** *** 161,165 **** { $errored = true; ! $error_ary['sql'][] = ( is_array($sql) ) ? $sql[$i] : $sql; $error_ary['error_code'][] = $db->sql_error(); } --- 161,165 ---- { $errored = true; ! $error_ary['sql'][] = ( is_array($sql) ) ? $sql[0] : $sql; $error_ary['error_code'][] = $db->sql_error(); } |
