issue 740 check enviroment for use sftp function

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9972 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-12-21 09:08:19 +00:00
parent 1ba2d35a75
commit 77b5d75c4d
4 changed files with 11 additions and 4 deletions

View file

@ -61,6 +61,10 @@
if($ftp_info->sftp == 'Y')
{
if(!function_exists(ssh2_sftp))
{
return new Object(-1,'disable_sftp_support');
}
return $this->getSFTPList();
}

View file

@ -342,8 +342,6 @@
$db_info = Context::getDBInfo();
Context::set('sftp_support', function_exists(ssh2_sftp));
Context::set('selected_lang', $db_info->lang_type);
Context::set('default_url', $db_info->default_url);
@ -391,6 +389,7 @@
$ftp_info = Context::getFTPInfo();
Context::set('ftp_info', $ftp_info);
Context::set('sftp_support', function_exists(ssh2_sftp));
$this->setTemplateFile('config_ftp');

View file

@ -735,6 +735,10 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
<value xml:lang="ko"><![CDATA[SFTP 를 사용하시겠습니까?]]></value>
<value xml:lang="en"><![CDATA[Use SFTP?]]></value>
</item>
<item name="disable_sftp_support">
<value xml:lang="ko"><![CDATA[SFTP를 사용할 수 있는 환경이 아닙니다.]]></value>
<value xml:lang="en"><![CDATA[Does Not Use SFTP]]></value>
</item>
<item name="msg_self_restart_cache_engine">
<value xml:lang="ko"><![CDATA[Memcached 또는 캐쉬데몬을 재시작 해주세요.]]></value>
<value xml:lang="en"><![CDATA[Please restart Memcached or cache daemon.]]></value>

View file

@ -37,9 +37,9 @@
</p>
</li>
<li>
<p class="q"><label for="sftp">{$lang->about_use_sftp_support}</label></p>
<p class="q"><label for="sftp">{$lang->about_use_sftp_support}</label><span cond="!$sftp_support"><label for="sftp"> ({$lang->disable_sftp_support})</label></span></p>
<p class="a">
<input type="radio" name="sftp" id="sftp_y" value="Y" <!--@if($ftp_info->sftp == 'Y')-->checked="checked" <!--@end-->/> <label for="sftp_y">{$lang->cmd_yes}</label>
<input type="radio" name="sftp" id="sftp_y" value="Y" <!--@if($ftp_info->sftp == 'Y')-->checked="checked" <!--@end--> <!--@if(!$sftp_support)-->disabled<!--@end-->/> <label for="sftp_y">{$lang->cmd_yes}</label>
<input type="radio" name="sftp" id="sftp_n" value="N" <!--@if($ftp_info->sftp != 'Y')-->checked="checked" <!--@end-->/> <label for="sftp_n">{$lang->cmd_no}</label>
</p>
</li>