[Easymod-cvs] easymod2/mods/easymod/includes admin_easymod.php.txt,1.8,1.9 mod_settings.tpl,1.2,1.3
Status: Beta
Brought to you by:
wgeric
Menu
▾
▴
[Easymod-cvs] easymod2/mods/easymod/includes admin_easymod.php.txt,1.8,1.9 mod_settings.tpl,1.2,1.3
|
From: Eric F. <wg...@us...> - 2005-05-25 01:11:11
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3259/mods/easymod/includes Modified Files: admin_easymod.php.txt mod_settings.tpl Log Message: - Fixed bug #1188771 - Workaround for bug #1204617 , can't really fix this since we can't delete the directory - Other minor updates Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** admin_easymod.php.txt 9 May 2005 22:40:52 -0000 1.8 --- admin_easymod.php.txt 25 May 2005 01:10:50 -0000 1.9 *************** *** 907,911 **** 'FTP_USER' => $command_file->ftp_user, ! 'FTP_PASS' => $command_file->ftp_pass, 'FTP_PATH' => $command_file->ftp_path, 'FTP_HOST' => $command_file->ftp_host, --- 907,911 ---- 'FTP_USER' => $command_file->ftp_user, ! 'FTP_PASS' => '', // don't send FTP password to page, is unsecure $command_file->ftp_pass, 'FTP_PATH' => $command_file->ftp_path, 'FTP_HOST' => $command_file->ftp_host, *************** *** 938,942 **** // ftp settings $ftp_user = (isset($HTTP_POST_VARS['ftp_user'])) ? htmlspecialchars( $HTTP_POST_VARS['ftp_user']) : '' ; ! $ftp_pass = (isset($HTTP_POST_VARS['ftp_pass'])) ? htmlspecialchars( $HTTP_POST_VARS['ftp_pass']) : '' ; $ftp_host = (isset($HTTP_POST_VARS['ftp_host'])) ? htmlspecialchars( $HTTP_POST_VARS['ftp_host']) : '' ; $ftp_port = (isset($HTTP_POST_VARS['ftp_port'])) ? intval( $HTTP_POST_VARS['ftp_port']) : 0 ; --- 938,942 ---- // ftp settings $ftp_user = (isset($HTTP_POST_VARS['ftp_user'])) ? htmlspecialchars( $HTTP_POST_VARS['ftp_user']) : '' ; ! $ftp_pass = (isset($HTTP_POST_VARS['ftp_pass']) && !empty($HTTP_POST_VARS['ftp_pass'])) ? htmlspecialchars( $HTTP_POST_VARS['ftp_pass']) : $command_file->ftp_pass ; $ftp_host = (isset($HTTP_POST_VARS['ftp_host'])) ? htmlspecialchars( $HTTP_POST_VARS['ftp_host']) : '' ; $ftp_port = (isset($HTTP_POST_VARS['ftp_port'])) ? intval( $HTTP_POST_VARS['ftp_port']) : 0 ; *************** *** 946,949 **** --- 946,952 ---- $ftp_dir == ( $ftp_dir == '') ? '/' : $ftp_dir ; + // if user is removing ftp server, then remove the password as well + $ftp_pass = ( !empty($ftp_host) ) ? $ftp_pass : ''; + // confirm passwords match and update pw if needed Index: mod_settings.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_settings.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mod_settings.tpl 1 May 2005 07:22:50 -0000 1.2 --- mod_settings.tpl 25 May 2005 01:10:51 -0000 1.3 *************** *** 12,20 **** <tr> <td class="row1" align="right"><span class="gen">{L_PW_SET}</span></td> ! <td class="row2"><input type="password" name="em_pass" value="{EM_PASS}"></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_PW_CONFIRM}</span></td> ! <td class="row2"><input type="password" name="em_pass_confirm" value=""></td> </tr> <tr> --- 12,20 ---- <tr> <td class="row1" align="right"><span class="gen">{L_PW_SET}</span></td> ! <td class="row2"><input type="password" name="em_pass" value="{EM_PASS}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_PW_CONFIRM}</span></td> ! <td class="row2"><input type="password" name="em_pass_confirm" value="" /></td> </tr> <tr> *************** *** 46,72 **** <tr> <td class="row1" align="right"><span class="gen">{L_FTP_DIR}</span></td> ! <td class="row2"><input type="text" name="ftp_dir" value="{FTP_PATH}"> (ex: public_html/phpBB2)</td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FTP_USER}</span></td> ! <td class="row2"><input type="text" name="ftp_user" value="{FTP_USER}"></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FTP_PASS}</span></td> ! <td class="row2"><input type="password" name="ftp_pass" value="{FTP_PASS}"></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FTP_HOST}</span></td> ! <td class="row2"><input type="text" name="ftp_host" value="{FTP_HOST}"></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FTP_PORT}</span></td> ! <td class="row2"><input type="text" size="5" maxlength="5" name="ftp_port" value="{FTP_PORT}"></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FTP_EXT}</span></td> <td class="row2"> ! <input type="radio" name="ftp_type" value="ext" {FTP_EXT}><span class="gen">{L_YES}</span> ! <input type="radio" name="ftp_type" value="fsock" {FTP_FSOCK}>{L_NO}</span> <span class="gen">{L_FTP_EXT_WARN}</span> </td> </tr> --- 46,72 ---- <tr> <td class="row1" align="right"><span class="gen">{L_FTP_DIR}</span></td> ! <td class="row2"><input type="text" name="ftp_dir" value="{FTP_PATH}" /> (ex: public_html/phpBB2)</td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FTP_USER}</span></td> ! <td class="row2"><input type="text" name="ftp_user" value="{FTP_USER}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FTP_PASS}</span></td> ! <td class="row2"><input type="password" name="ftp_pass" value="{FTP_PASS}" /> Only supply if you want to change it</td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FTP_HOST}</span></td> ! <td class="row2"><input type="text" name="ftp_host" value="{FTP_HOST}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FTP_PORT}</span></td> ! <td class="row2"><input type="text" size="5" maxlength="5" name="ftp_port" value="{FTP_PORT}" /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_FTP_EXT}</span></td> <td class="row2"> ! <input type="radio" name="ftp_type" value="ext" {FTP_EXT} /><span class="gen">{L_YES}</span> ! <input type="radio" name="ftp_type" value="fsock" {FTP_FSOCK} />{L_NO}</span> <span class="gen">{L_FTP_EXT_WARN}</span> </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="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="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> *************** *** 87,95 **** <tr> <td class="row1" align="right"><span class="gen">{L_EM_VERSION}</span></td> ! <td class="row2"><input type="text" name="em_version" value="{EM_VERSION}"></td> </tr> <tr> <td class="catbottom" align="center" colspan="2"> ! <input type="hidden" name="mode" value="{MODE}"> <input class="mainoption" type="submit" value="{L_SUBMIT}" /> </td> --- 87,95 ---- <tr> <td class="row1" align="right"><span class="gen">{L_EM_VERSION}</span></td> ! <td class="row2"><input type="text" name="em_version" value="{EM_VERSION}" /></td> </tr> <tr> <td class="catbottom" align="center" colspan="2"> ! <input type="hidden" name="mode" value="{MODE}" /> <input class="mainoption" type="submit" value="{L_SUBMIT}" /> </td> |
