[Easymod-cvs] easymod/install em_install.php,1.5,1.6
Status: Beta
Brought to you by:
wgeric
|
From: Eric F. <wg...@us...> - 2006-01-09 00:38:47
|
Update of /cvsroot/easymod/easymod/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13373 Modified Files: em_install.php Log Message: - XML parsers history now - probably some other changes in there, its been a while I can't remember what all I have done Index: em_install.php =================================================================== RCS file: /cvsroot/easymod/easymod/install/em_install.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** em_install.php 25 Dec 2005 20:48:37 -0000 1.5 --- em_install.php 9 Jan 2006 00:38:38 -0000 1.6 *************** *** 104,107 **** --- 104,108 ---- $password_confirm = request_var('password_confirm', ''); $sel_method = request_var('method', ( !empty($board_config['em_method']) ) ? $board_config['em_method'] : ''); + $mod_dir = str_replace('\\', '/', request_var('mod_dir', 'mods')); $board_config['em_tmp_path'] = $tmp_path = request_var('tmp_path', ''); $board_config['em_ftp_host'] = $ftp_host = request_var('ftp_host', 'localhost'); *************** *** 112,115 **** --- 113,119 ---- $board_config['em_ftp_root_path'] = $ftp_root_path = request_var('ftp_root_path', implode('/', array_slice(explode('/', $HTTP_SERVER_VARS['SCRIPT_FILENAME']), 0, -2))); + $mod_dir = ( $mod_dir{0} == '/' ) ? substr($mod_dir, 1) : $mod_dir; + $mod_dir = ( substr($mod_dir, -1, 1) == '/' ) ? substr($mod_dir, 0, -1) : $mod_dir; + if ( $step == 2 ) { *************** *** 129,140 **** if ( $step != 5 ) { ! $hidden_fields .= '<input type="hidden" name="method" value="' . $sel_method . '" />'; ! $hidden_fields .= '<input type="hidden" name="tmp_path" value="' . $tmp_path . '" />'; ! $hidden_fields .= '<input type="hidden" name="ftp_host" value="' . $ftp_host . '" />'; ! $hidden_fields .= '<input type="hidden" name="ftp_port" value="' . $ftp_port . '" />'; ! $hidden_fields .= '<input type="hidden" name="ftp_timeout" value="' . $ftp_timeout . '" />'; ! $hidden_fields .= '<input type="hidden" name="ftp_username" value="' . $ftp_username . '" />'; ! $hidden_fields .= '<input type="hidden" name="ftp_password" value="' . $ftp_password . '" />'; ! $hidden_fields .= '<input type="hidden" name="ftp_root_path" value="' . $ftp_root_path . '" />'; } --- 133,147 ---- if ( $step != 5 ) { ! $hidden_fields .= build_hidden_fields(array( ! 'mod_dir' => $mod_dir, ! 'method' => $sel_method, ! 'tmp_path' => $tmp_path, ! 'ftp_host' => $ftp_host, ! 'ftp_port' => $ftp_port, ! 'ftp_timeout' => $ftp_timeout, ! 'ftp_username' => $ftp_username, ! 'ftp_password' => $ftp_password, ! 'ftp_root_path' => $ftp_root_path) ! ); } *************** *** 352,358 **** --- 359,369 ---- $sql = array(); + $sql[] = build_config_query('em_support_url', 'http://area51.phpbb.com'); + $sql[] = build_config_query('em_mod_dir', (string) $mod_dir); $sql[] = build_config_query('em_version', EM_INSTALL_VERSION); $sql[] = build_config_query('em_pass', (string) $password); $sql[] = build_config_query('em_method', (string) $sel_method); + $sql[] = build_config_query('em_extensions_cache', ''); + $sql[] = build_config_query('em_methods_cache', ''); $sql[] = build_config_query('em_tmp_path', (string) $tmp_path); $sql[] = build_config_query('em_ftp_host', (string) $ftp_host); *************** *** 360,366 **** $sql[] = build_config_query('em_ftp_timeout', (int) $ftp_timeout); $sql[] = build_config_query('em_ftp_username', (string) $ftp_username); - /** - * @TODO encrypt the ftp password somehow, blowfish? - */ $sql[] = build_config_query('em_ftp_password', (string) $ftp_password); $sql[] = build_config_query('em_ftp_root_path', (string) $ftp_root_path); --- 371,374 ---- *************** *** 570,573 **** --- 578,585 ---- </tr> <tr> + <td class="row1"><span class="gen">MOD Directory</span></td> + <td class="row1"><span class="gen"><input type="text" name="mod_dir" value="<?php echo $mod_dir; ?>" class="post" /></td> + </tr> + <tr> <td class="row1"><span class="gen">Temporary Path</span></td> <td class="row1"><span class="gen"><input type="text" name="tmp_path" value="/tmp" class="post" /> <a href="javascript:help_popup('tmp_path');">Help</a></span></td> *************** *** 766,770 **** // load the methods and the debug information $method_files = array(); ! $methods = load_methods('install/em_files/'); for($i = 0, $total = sizeof($methods); $i < $total; $i++) { --- 778,782 ---- // load the methods and the debug information $method_files = array(); ! $methods = load_methods('install/em_files/', true); for($i = 0, $total = sizeof($methods); $i < $total; $i++) { |