Update of /cvsroot/easymod/easymod2/mods/easymod/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14320/mods/easymod/includes
Modified Files:
admin_easymod.php.txt mod_settings.tpl
Log Message:
Implemented FTP Debug option in EM settings panel.
Index: admin_easymod.php.txt
===================================================================
RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** admin_easymod.php.txt 6 Nov 2005 13:30:52 -0000 1.41
--- admin_easymod.php.txt 6 Nov 2005 15:13:05 -0000 1.42
***************
*** 942,945 ****
--- 942,947 ----
'L_FTP_HOST' => $lang['EM_ftp_host'],
'L_FTP_PORT' => $lang['EM_ftp_port'],
+ 'L_FTP_DEBUG' => $lang['EM_ftp_debug'],
+ 'L_FTP_DEBUG_WARN' => $lang['EM_ftp_debug_not'],
'L_FTP_EXT' => $lang['EM_ftp_use_ext'],
'L_FTP_EXT_WARN' => $lang['EM_ftp_ext_not'],
***************
*** 1048,1053 ****
{
$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
--- 1050,1056 ----
{
$command_file = get_em_settings('6E7574747A79.72756C657321', '', $password);
! $test_report = '';
! $test_result = capture_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">' . $test_report . '</td></tr></table>';
}
else
Index: mod_settings.tpl
===================================================================
RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_settings.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mod_settings.tpl 6 Nov 2005 11:20:10 -0000 1.7
--- mod_settings.tpl 6 Nov 2005 15:13:05 -0000 1.8
***************
*** 96,103 ****
</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>
(<a href="{U_HELP}#ftp_php_ext" onclick="return helpwin(this);">{L_HELP}</a>)
</td>
--- 96,111 ----
</tr>
<tr>
+ <td class="row1" align="right"><span class="gen">{L_FTP_DEBUG}</span></td>
+ <td class="row2">
+ <input type="radio" name="ftp_debug" value="1" /><span class="gen">{L_YES}</span>
+ <input type="radio" name="ftp_debug" value="0" checked="checked" /><span class="gen">{L_NO}</span> <span class="gen">{L_FTP_DEBUG_WARN}</span>
+ (<a href="{U_HELP}#ftp_debug" onclick="return helpwin(this);">{L_HELP}</a>)
+ </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} /><span class="gen">{L_NO}</span> <span class="gen">{L_FTP_EXT_WARN}</span>
(<a href="{U_HELP}#ftp_php_ext" onclick="return helpwin(this);">{L_HELP}</a>)
</td>
***************
*** 107,115 ****
<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>
(<a href="{U_HELP}#ftp_cache" onclick="return helpwin(this);">{L_HELP}</a>)
</td>
</tr>
-
<tr>
<th colspan="2">{L_EM_VERSION}</th>
--- 115,122 ----
<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} /><span class="gen">{L_NO}</span> <span class="gen">{L_FTP_EXT_WARN}</span>
(<a href="{U_HELP}#ftp_cache" onclick="return helpwin(this);">{L_HELP}</a>)
</td>
</tr>
<tr>
<th colspan="2">{L_EM_VERSION}</th>
|