From 9aa4e244c2c590d4195cf248d014493792b6d1c0 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sun, 3 Jul 2016 18:00:14 +0900 Subject: [PATCH] Remove safe_mode condition from admin and install modules --- modules/admin/lang/de.php | 2 - modules/admin/lang/en.php | 4 - modules/admin/lang/es.php | 1 - modules/admin/lang/ja.php | 4 - modules/admin/lang/ko.php | 4 - modules/admin/lang/mn.php | 1 - modules/admin/lang/tr.php | 4 - modules/admin/lang/vi.php | 1 - modules/admin/lang/zh-CN.php | 4 - modules/admin/lang/zh-TW.php | 3 - modules/admin/tpl/config_ftp.html | 1 - modules/install/conf/module.xml | 2 - modules/install/install.admin.controller.php | 5 +- modules/install/install.controller.php | 96 -------------------- modules/install/install.view.php | 14 --- modules/install/lang/de.php | 2 - modules/install/lang/en.php | 3 - modules/install/lang/es.php | 1 - modules/install/lang/ja.php | 2 - modules/install/lang/ko.php | 3 - modules/install/lang/mn.php | 1 - modules/install/lang/tr.php | 1 - modules/install/lang/vi.php | 1 - modules/install/lang/zh-CN.php | 1 - modules/install/lang/zh-TW.php | 3 - modules/install/tpl/ftp.html | 5 - modules/install/tpl/progress_menu.html | 3 +- 27 files changed, 2 insertions(+), 170 deletions(-) diff --git a/modules/admin/lang/de.php b/modules/admin/lang/de.php index 40cbffa4b..5812136a4 100644 --- a/modules/admin/lang/de.php +++ b/modules/admin/lang/de.php @@ -7,8 +7,6 @@ $lang->ftp_host = 'FTP-Server hostname'; $lang->ftp_port = 'FTP Port'; $lang->about_ftp_password = 'Das Passwort des FTPs wird nicht gespeichert.'; $lang->cmd_check_ftp_connect = 'Verbindung des FTPs checken'; -$lang->msg_safe_mode_ftp_needed = 'Zur Installation und Nutzung des Rhymixs muss die Angabe des FTPs festgestellt werden, wenn safe_mode in PHP \'An\' ist.'; -$lang->msg_safe_mode_ftp_config = 'Die Angabe wird unterfiles/config/ftp.config.php gespeichert. Nach der Installation ist es auch möglich, dass die Angabe von Administrator modifiziert oder gelöscht werden kann.'; $lang->msg_ftp_no_directory = 'Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.'; $lang->msg_ftp_mkdir_fail = 'Der Befehl von Herstellung des Verzeichnisses durch FTP ist gescheitert. FTP_Server festlegen.'; $lang->msg_ftp_chmod_fail = 'Die Modifikation der Zugriffsberechtigung des Verzeichnisses durch FTP ist gescheitert. FTP_Server festlegen.'; diff --git a/modules/admin/lang/en.php b/modules/admin/lang/en.php index fcafa0fa9..4e26b9682 100644 --- a/modules/admin/lang/en.php +++ b/modules/admin/lang/en.php @@ -201,7 +201,6 @@ $lang->local_ip_address = 'Local IP address'; $lang->about_admin_ip_allow = 'If this list is not empty, the administrator will only be able to log in from one of the listed IP addresses.'; $lang->about_admin_ip_deny = 'This list can be used to designate IP addresses that are not allowed to log in as administrator.'; $lang->msg_current_ip_will_be_denied = 'The given IP list cannot be applied, as they would block your own IP address.'; -$lang->detail_about_ftp_info = 'FTP information is needed for easyinstall when save_mode = on.'; $lang->allow_use_favicon = 'Favicon'; $lang->about_use_favicon = 'The favicon should be 16x16 or 32x32, either ico or png format.'; $lang->allow_use_mobile_icon = 'Home Screen Icon'; @@ -251,9 +250,6 @@ $lang->ftp_host = 'FTP hostname'; $lang->ftp_port = 'FTP port'; $lang->about_ftp_password = 'Password is required during access to FTP for checking FTP directories. FTP password will not be stored after this.'; $lang->cmd_check_ftp_connect = 'Check FTP Connection'; -$lang->msg_safe_mode_ftp_needed = 'If safe_mode setting of PHP is On, it hepls normal functioning of Rhymix.'; -$lang->msg_safe_mode_ftp_needed2 = 'Easy installation or update of module is enabled.'; -$lang->msg_safe_mode_ftp_config = 'This information is stored infiles/config/ftp.config.php. You can add, change or delete this on the Settings page after the installation.'; $lang->msg_ftp_no_directory = 'Succeed to connect to the host via FTP, but cannot read any directory list informaiton. Please check the server configurations.'; $lang->msg_ftp_mkdir_fail = 'Failed to create a directory using FTP. Please check the permission of FTP account.'; $lang->msg_ftp_chmod_fail = 'Chmod failed. Please check the permission and configuration of the FTP server.'; diff --git a/modules/admin/lang/es.php b/modules/admin/lang/es.php index 96978864e..f36b24e35 100644 --- a/modules/admin/lang/es.php +++ b/modules/admin/lang/es.php @@ -48,7 +48,6 @@ $lang->modify = 'Modificar'; $lang->ftp_form_title = 'Datos de conexión para FTP'; $lang->ftp = 'FTP'; $lang->cmd_check_ftp_connect = 'conexión de FTP confirmada'; -$lang->msg_safe_mode_ftp_needed = 'Si la la variable safe_mode está activa[safe_mode=On], debe rellenar los datos de FTP para seguir instalando y usar con normalidad el Rhymix.'; $lang->msg_ftp_no_directory = 'Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.'; $lang->msg_ftp_mkdir_fail = 'Ha fallado el comando de FTP para la creación de directorio. Verifique la configuración del servicio FTP en el servidor'; $lang->msg_ftp_chmod_fail = 'Ha fallado el comando de FTP para la modificación de atributos de directorio. Verifique la configuración del servicio FTP en el servidor.'; diff --git a/modules/admin/lang/ja.php b/modules/admin/lang/ja.php index 5b83904d5..3eea07a08 100644 --- a/modules/admin/lang/ja.php +++ b/modules/admin/lang/ja.php @@ -133,7 +133,6 @@ $lang->local_ip_address = 'ローカルIPアドレス'; $lang->about_admin_ip_allow = 'ここでIPアドレスの一覧を表示すると、そのIPのみ、管理者のログインが可能になります。すべてのIPからのログインを許可するには、リストを空白のままに。'; $lang->about_admin_ip_deny = 'ここに記載され、IPアドレスは、管理者のログインが禁止されます。'; $lang->msg_current_ip_will_be_denied = '入力された設定によると、現在ログインして、管理者のIPアドレスもブロックされます。再度確認してください。'; -$lang->detail_about_ftp_info = 'FTP情報を入力すれば簡単設置を可能にします。FTP情報は files/config/ftp.config.php ファイルに保存されます。簡単設置ができない場合、PHPのsafe_modeをOnへ変更が必要です。'; $lang->allow_use_favicon = 'ファビコン設定'; $lang->about_use_favicon = '16 x 16 サイズの*.ico ファイルのみ登録できます。'; $lang->allow_use_mobile_icon = '待受画面のアイコン設定'; @@ -181,9 +180,6 @@ $lang->ftp_host = 'FTPサーバーアドレス'; $lang->ftp_port = 'FTPポート番号（port）'; $lang->about_ftp_password = 'パースワードはFTPパス確認のために使い、使用後には保存しません。'; $lang->cmd_check_ftp_connect = 'FTP接続を確認する'; -$lang->msg_safe_mode_ftp_needed = 'PHPのsafe_modeがOnの場合、FTP情報を登録することで、Rhymixのインストール及び利用が可能になります。'; -$lang->msg_safe_mode_ftp_needed2 = 'モジュールの簡単インストール、または更新が可能になります。'; -$lang->msg_safe_mode_ftp_config = 'この情報はfiles/config/ftp.config.php ファイルに保存されます。インストール後カスタマ設定ページでも登録、変更、削除できます。'; $lang->msg_ftp_no_directory = 'FTPに接続しましたが、ディレクトリの情報を読み取ることができません。サーバー設定を確認してください。'; $lang->msg_ftp_mkdir_fail = 'FTPでのディレクトリ作成に失敗しました。FTPサーバーの設定を再度確認してください。'; $lang->msg_ftp_chmod_fail = 'FTPでのディレクトリのアクセス権変更に失敗しました。FTPサーバーの設定を再度確認してください。'; diff --git a/modules/admin/lang/ko.php b/modules/admin/lang/ko.php index e236e0dce..221dcce35 100644 --- a/modules/admin/lang/ko.php +++ b/modules/admin/lang/ko.php @@ -196,7 +196,6 @@ $lang->local_ip_address = '로컬 IP 주소'; $lang->about_admin_ip_allow = '여기에 IP 주소를 나열하면 해당 IP에서만 관리자 로그인이 가능하게 됩니다. 모든 IP에서 로그인을 허용하려면 목록을 비워 두십시오.'; $lang->about_admin_ip_deny = '여기에 나열된 IP 주소에서는 관리자 로그인이 금지됩니다.'; $lang->msg_current_ip_will_be_denied = '주어진 설정에 따르면 현재 로그인하신 관리자의 IP 주소도 차단됩니다. 다시 확인해 주십시오.'; -$lang->detail_about_ftp_info = 'safe_mode = on 상태에서 쉬운설치를 사용하려면 FTP 정보를 입력해야 합니다.'; $lang->allow_use_favicon = '파비콘'; $lang->about_use_favicon = '16x16 또는 32x32 크기의 ico 또는 png 파일을 권장합니다.'; $lang->allow_use_mobile_icon = '모바일 홈 화면 아이콘'; @@ -246,9 +245,6 @@ $lang->ftp_host = 'FTP 서버 주소'; $lang->ftp_port = 'FTP 포트'; $lang->about_ftp_password = '비밀번호는 FTP 경로 확인을 위한 FTP 접속 시 필요하며 사용 후 저장하지 않습니다.'; $lang->cmd_check_ftp_connect = 'FTP 접속 확인'; -$lang->msg_safe_mode_ftp_needed = 'PHP의safe_mode=On일 경우 Rhymix의 정상적인 동작을 돕습니다.'; -$lang->msg_safe_mode_ftp_needed2 = '모듈의 쉬운 설치 또는 업데이트가 가능해 집니다.'; -$lang->msg_safe_mode_ftp_config = '이 정보는files/config/ftp.config.php 파일에 저장 됩니다. 설치 후 환경설정 페이지에서도 등록, 변경, 제거 할 수 있습니다.'; $lang->msg_ftp_no_directory = 'FTP 접속에 성공했으나, 디렉토리 정보를 읽어올 수 없습니다. 서버 설정을 확인해주세요.'; $lang->msg_ftp_mkdir_fail = 'FTP를 이용한 디렉토리 생성 명령에 실패했습니다. FTP 서버의 설정을 확인해주세요.'; $lang->msg_ftp_chmod_fail = 'FTP를 이용한 디렉토리의 속성 변경에 실패했습니다. FTP 서버의 설정을 확인해주세요.'; diff --git a/modules/admin/lang/mn.php b/modules/admin/lang/mn.php index a677a766c..c58649943 100644 --- a/modules/admin/lang/mn.php +++ b/modules/admin/lang/mn.php @@ -3,7 +3,6 @@ $lang->modify = 'Засах'; $lang->ftp_form_title = 'FTP мэдээлэл оруулах'; $lang->ftp = 'FTP'; $lang->cmd_check_ftp_connect = 'FTP холболт шалгах'; -$lang->msg_safe_mode_ftp_needed = 'PHP safe_mode Onбайх тохиолдолд , FTP мэдээллийг заавал оруулснаар Rhymix идэвжvvлэх болон хэрэглэх боломжтой болно.'; $lang->msg_ftp_mkdir_fail = 'FTP-г ашиглан eгсeн eгeгдлийг биелvvлж чадсангvй. FTP серверийн идэвхжvvлэлтээ шалгана уу.'; $lang->msg_ftp_chmod_fail = 'FTP-г ашиглан eeрчлeлтийг хийж чадсангvй. FTP серверийн идэвхжvvлэлтээ шалгана уу.'; $lang->msg_ftp_connect_success = 'FTP холболт болон баталгаажуулалт хийгдлээ.'; diff --git a/modules/admin/lang/tr.php b/modules/admin/lang/tr.php index 816980428..849a763d3 100644 --- a/modules/admin/lang/tr.php +++ b/modules/admin/lang/tr.php @@ -96,7 +96,6 @@ $lang->ratio = 'Ratio(Yüzde Ayarı)'; $lang->admin_ip_allow = 'Yönetici sayfasına ulaşabileceğiniz IP aralığını belirleyiniz.'; $lang->local_ip_address = 'Yerel IP adresi'; $lang->about_admin_ip_limit = 'Sadece bu IP adresi üzerinden yönetici sayfasına erişim mümkündür.IP-bant bilgileri /files/config/db.config.php dosyasında saklanır. Satıra birden fazla öğe girin.'; -$lang->detail_about_ftp_info = 'Kolay kurulum sağlayan FTP bilgilerini girdiğinizde. FTP bilgi, dosya / config / ftp.config.php dosyasında saklanır. Kolay yükleme sizin için mümkün değilse, PHP\'nin safe_mode ayarını On şeklinde değiştiriniz.'; $lang->allow_use_favicon = 'Favicon\'u kullanmak istiyor musunuz?'; $lang->about_use_favicon = '16 x 16 boyutunda*.Ico dosyalar yüklenebilir.'; $lang->allow_use_mobile_icon = 'Mobil Ana Ekran Simgesini kullanmak istiyor musunuz?'; @@ -141,9 +140,6 @@ $lang->ftp_host = 'FTP Sunucu Adı'; $lang->ftp_port = 'FTP Portu'; $lang->about_ftp_password = 'FTP şifresi saklanmayacaktır.'; $lang->cmd_check_ftp_connect = 'FTP Bağlantısını kontrol ediniz'; -$lang->msg_safe_mode_ftp_needed = 'Eğer PHP güvenli mod ayarları etkinse, Rhymix\'yi kurmak için FTP hesap bilgilerini girmelisiniz.'; -$lang->msg_safe_mode_ftp_needed2 = 'Modülün Kolay kurulumu veya güncelleme özelliği etkindir.'; -$lang->msg_safe_mode_ftp_config = 'Bu bilgilerfiles/config/ftp.config.php adlı dosyada saklanır. Kurulumdan sonra, Ayarlar sayfasında, bu na eklenti yapabilir, değiştirebilir ve ya silebilirsiniz'; $lang->msg_ftp_no_directory = 'FTP bağlantısı başarılı oldu ancak dizin bilgileri okunamıyor. Sunucu ayarlarını kontrol edin.'; $lang->msg_ftp_mkdir_fail = 'Dizin oluşturma başarısız oldu. Lütfen FTP hesap iznini kontrol ediniz.'; $lang->msg_ftp_chmod_fail = 'Chmod başarısız oldu. Lütfen FTP sunucusunun yapılandırmasını kontrol ediniz.'; diff --git a/modules/admin/lang/vi.php b/modules/admin/lang/vi.php index 45da587f1..eb6d75c0a 100644 --- a/modules/admin/lang/vi.php +++ b/modules/admin/lang/vi.php @@ -66,7 +66,6 @@ $lang->ftp_host = 'Tên Host FTP'; $lang->ftp_port = 'Cổng kết nối'; $lang->about_ftp_password = 'Mật khẩu của FTP sẽ không lưu lại'; $lang->cmd_check_ftp_connect = 'Kiểm tra kết nối bằng FTP'; -$lang->msg_safe_mode_ftp_needed = 'Nếu safe_mode của PHP mở, bạn có thể cài đặt các thành phần bổ xung cho Rhymix một cách tự động qua FTP.'; $lang->msg_ftp_mkdir_fail = 'Lỗi khi tạo thư mục. Xin vui lòng kiểm tra lại quyền truy cập FTP.'; $lang->msg_ftp_chmod_fail = 'CHMOD thất bại. Xin vui lòng kiểm tra lại.'; $lang->msg_ftp_connect_success = 'Đã xác nhận và kết nối thành công tới máy chủ bằng FTP.'; diff --git a/modules/admin/lang/zh-CN.php b/modules/admin/lang/zh-CN.php index a2232ec92..22da4b73d 100644 --- a/modules/admin/lang/zh-CN.php +++ b/modules/admin/lang/zh-CN.php @@ -91,7 +91,6 @@ $lang->ratio = '缩放'; $lang->admin_ip_allow = '后台IP绑定'; $lang->local_ip_address = '本地IP地址'; $lang->about_admin_ip_limit = '请注意，只有绑定的IP才能访问后台。IP信息将保存在 /files/config/db.config.php. 每行一个IP。'; -$lang->detail_about_ftp_info = '当设定FTP信息来启用快捷安装。FTP的信息保存在 /files/config/ftp.config.php. 如果不启用快捷安装，请务必将开启PHP安全模式'; $lang->allow_use_favicon = '是否启用自定义favicon?'; $lang->about_use_favicon = '请上传16*16像素的*.ico文件.'; $lang->allow_use_mobile_icon = '是否启用移动版屏幕图标?'; @@ -135,9 +134,6 @@ $lang->ftp_host = 'FTP服务器名'; $lang->ftp_port = 'FTP端口'; $lang->about_ftp_password = 'FTP密码不会被保存。'; $lang->cmd_check_ftp_connect = '测试FTP连接'; -$lang->msg_safe_mode_ftp_needed = '当PHP的safe_mode=On时，请必须输入相关FTP信息，否则将无法正常安装或使用Rhymix程序。'; -$lang->msg_safe_mode_ftp_needed2 = '可用的安装或更新。'; -$lang->msg_safe_mode_ftp_config = '该信息将会保存在files/config/ftp.config.php里面。你可以安装后在设置页面里面增加、修改或者删除该信息。'; $lang->msg_ftp_no_directory = 'FTP成功连接主机。但是无法获取目录列表。请检查服务器配置。'; $lang->msg_ftp_mkdir_fail = '新建文件夹失败。请确认 FTP服务器设置。'; $lang->msg_ftp_chmod_fail = '修改文件夹属性失败。请确认 FTP服务器设置。'; diff --git a/modules/admin/lang/zh-TW.php b/modules/admin/lang/zh-TW.php index 6a517cfbd..b3d86c07c 100644 --- a/modules/admin/lang/zh-TW.php +++ b/modules/admin/lang/zh-TW.php @@ -66,9 +66,6 @@ $lang->ftp_host = 'FTP 主機名稱'; $lang->ftp_port = 'FTP 埠口'; $lang->about_ftp_password = '不會儲存 FTP 密碼'; $lang->cmd_check_ftp_connect = '檢查 FTP 連線'; -$lang->msg_safe_mode_ftp_needed = '當 PHP 的安全模式(safe_mode)開啟時，請輸入相關 FTP 資訊，否則無法正常安裝或使用程式。'; -$lang->msg_safe_mode_ftp_needed2 = '可用的安裝或更新。'; -$lang->msg_safe_mode_ftp_config = '此資料會儲存在files/config/ftp.config.php 檔案中。 安裝後可在設定頁面中新增、更改或刪除此資訊。'; $lang->msg_ftp_mkdir_fail = '新增資料夾失敗。請確認 FTP 主機設置。'; $lang->msg_ftp_chmod_fail = '修改資料夾權限失敗。請確認 FTP 主機設置。'; $lang->msg_ftp_connect_success = 'FTP連線成功。'; diff --git a/modules/admin/tpl/config_ftp.html b/modules/admin/tpl/config_ftp.html index 5f780408a..16ae55f08 100644 --- a/modules/admin/tpl/config_ftp.html +++ b/modules/admin/tpl/config_ftp.html @@ -6,7 +6,6 @@

{$XE_VALIDATOR_MESSAGE}

-

{$lang->detail_about_ftp_info}

diff --git a/modules/install/conf/module.xml b/modules/install/conf/module.xml index c10d5ab53..9dfbf7e3a 100644 --- a/modules/install/conf/module.xml +++ b/modules/install/conf/module.xml @@ -10,8 +10,6 @@ - - diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index 9c430eba7..274f3324e 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -106,10 +106,7 @@ class installAdminController extends install $ftp_info->ftp_root_path = $ftp_root_path.'/'; } - if(ini_get('safe_mode')) - { - $ftp_info->ftp_password = Context::get('ftp_password'); - } + $ftp_info->ftp_password = Context::get('ftp_password'); $buff = ' $val) diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 1a8ce38bd..77ce89ec5 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -264,102 +264,6 @@ class installController extends install return new Object(); } - /** - * @brief Set FTP Information - */ - function procInstallFTP() - { - if(Context::isInstalled()) return new Object(-1, 'msg_already_installed'); - $ftp_info = Context::gets('ftp_host', 'ftp_user','ftp_password','ftp_port','ftp_root_path'); - $ftp_info->ftp_port = (int)$ftp_info->ftp_port; - if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21; - if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1'; - if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/'; - - $buff = array(' $val) - { - $buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'","\\'",$val)); - } - - // If safe_mode - if(ini_get('safe_mode')) - { - if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed'); - - $oFtp = new ftp(); - if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_info->ftp_host)); - - if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) - { - $oFtp->ftp_quit(); - return new Object(-1,'msg_ftp_invalid_auth_info'); - } - - if(!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files')) - { - $oFtp->ftp_quit(); - return new Object(-1,'msg_ftp_mkdir_fail'); - } - - if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files')) - { - $oFtp->ftp_quit(); - return new Object(-1,'msg_ftp_chmod_fail'); - } - - if(!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config')) - { - $oFtp->ftp_quit(); - return new Object(-1,'msg_ftp_mkdir_fail'); - } - - if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config')) - { - $oFtp->ftp_quit(); - return new Object(-1,'msg_ftp_chmod_fail'); - } - - $oFtp->ftp_quit(); - } - - FileHandler::WriteFile(Context::getFTPConfigFile(), join(PHP_EOL, $buff)); - } - - function procInstallCheckFtp() - { - $ftp_info = Context::gets('ftp_user','ftp_password','ftp_port','sftp'); - $ftp_info->ftp_port = (int)$ftp_info->ftp_port; - if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21; - if(!$ftp_info->sftp) $ftp_info->sftp = 'N'; - - if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed'); - - if($ftp_info->sftp == 'Y') - { - $connection = ssh2_connect('localhost', $ftp_info->ftp_port); - if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password)) - { - return new Object(-1,'msg_ftp_invalid_auth_info'); - } - } - else - { - $oFtp = new ftp(); - if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new Object(-1, sprintf(lang('msg_ftp_not_connected'), 'localhost')); - - if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) - { - $oFtp->ftp_quit(); - return new Object(-1,'msg_ftp_invalid_auth_info'); - } - $oFtp->ftp_quit(); - } - - $this->setMessage('msg_ftp_connect_success'); - } - /** * @brief Result returned after checking the installation environment */ diff --git a/modules/install/install.view.php b/modules/install/install.view.php index 27f504ea7..849fd35a5 100644 --- a/modules/install/install.view.php +++ b/modules/install/install.view.php @@ -102,18 +102,6 @@ class installView extends install Context::set('use_rewrite', $_SESSION['use_rewrite'] = 'Y'); } - // FTP config is disabled in Rhymix. - /* - if(ini_get('safe_mode') && !Context::isFTPRegisted()) - { - Context::set('progressMenu', '3'); - Context::set('server_ip_address', $_SERVER['SERVER_ADDR']); - Context::set('server_ftp_user', get_current_user()); - $this->setTemplateFile('ftp'); - return; - } - */ - $defaultDatabase = 'mysqli'; $disableList = DB::getDisableList(); if(is_array($disableList)) @@ -128,8 +116,6 @@ class installView extends install } } Context::set('defaultDatabase', $defaultDatabase); - - Context::set('progressMenu', '4'); Context::set('error_return_url', getNotEncodedUrl('', 'act', Context::get('act'), 'db_type', Context::get('db_type'))); $this->setTemplateFile('db_config'); } diff --git a/modules/install/lang/de.php b/modules/install/lang/de.php index 10b3eed39..5f38f660a 100644 --- a/modules/install/lang/de.php +++ b/modules/install/lang/de.php @@ -5,8 +5,6 @@ $lang->ftp_host = 'FTP-Server hostname'; $lang->ftp_port = 'FTP Port'; $lang->about_ftp_password = 'Das Passwort des FTPs wird nicht gespeichert.'; $lang->cmd_check_ftp_connect = 'Verbindung des FTPs checken'; -$lang->msg_safe_mode_ftp_needed = 'Zur Installation und Nutzung des Rhymixs muss die Angabe des FTPs festgestellt werden, wenn safe_mode in PHP \'An\' ist.'; -$lang->msg_safe_mode_ftp_config = 'Die Angabe wird unter files/config/ftp.config.php gespeichert. Nach der Installation ist es auch möglich, dass die Angabe von Administrator modifiziert oder gelöscht werden kann.'; $lang->msg_ftp_not_connected = 'Ein Verbindungsfehler des FTPs an localhost ist aufgetreten. Bitte FTP_Port checken, oder ob FTP_Service möglich ist.'; $lang->msg_ftp_invalid_auth_info = 'Anmeldungsfehler mit der Angabe des FTPs Bitte die Angabe des FTPs festlegen.'; $lang->msg_ftp_mkdir_fail = 'Der Befehl von Herstellung des Verzeichnisses durch FTP ist gescheitert. FTP_Server festlegen.'; diff --git a/modules/install/lang/en.php b/modules/install/lang/en.php index c4d9aed81..c2e97449d 100644 --- a/modules/install/lang/en.php +++ b/modules/install/lang/en.php @@ -103,9 +103,6 @@ $lang->ftp_host = 'FTP hostname'; $lang->ftp_port = 'FTP server port'; $lang->about_ftp_password = 'FTP password will not be stored.'; $lang->cmd_check_ftp_connect = 'Check FTP Connection'; -$lang->msg_safe_mode_ftp_needed = 'When safe_mode setting of PHP is On, you should enter FTP account information to install Rhymix.'; -$lang->msg_safe_mode_ftp_needed2 = 'Easy installation or update of module is enabled.'; -$lang->msg_safe_mode_ftp_config = 'This information is stored in files/config/ftp.config.php. You can add, change or delete this on the Settings page after the installation.'; $lang->msg_ftp_not_connected = 'Connection to the localhost via FTP failed. Please check the port number and whether the FTP service is available.'; $lang->msg_ftp_invalid_auth_info = 'Authentication failed. Please check the username and password.'; $lang->msg_ftp_mkdir_fail = 'Failed to create a directory using FTP. Please check the permission of FTP account.'; diff --git a/modules/install/lang/es.php b/modules/install/lang/es.php index ac0ed2a5f..6292cc109 100644 --- a/modules/install/lang/es.php +++ b/modules/install/lang/es.php @@ -62,7 +62,6 @@ $lang->msg_install_failed = 'Ha ocurrido un error al crear el archivo de instala $lang->ftp_form_title = 'Datos de conexión para FTP'; $lang->ftp = 'FTP'; $lang->cmd_check_ftp_connect = 'conexión de FTP confirmada'; -$lang->msg_safe_mode_ftp_needed = 'Si la la variable safe_mode está activa[safe_mode=On], debe rellenar los datos de FTP para seguir instalando y usar con normalidad el Rhymix.'; $lang->msg_ftp_not_connected = 'Ha ocurrico un error de conexión al FTP del localhost. Verifique el puerto del FTP y/o el funcionamiento del servicio FTP.'; $lang->msg_ftp_invalid_auth_info = 'Los datos de login para el FTP no son correctos. Veriféquelos.'; $lang->msg_ftp_mkdir_fail = 'Ha fallado el comando de FTP para la creación de directorio. Verifique la configuración del servicio FTP en el servidor'; diff --git a/modules/install/lang/ja.php b/modules/install/lang/ja.php index 857aff19f..fbfbb2466 100644 --- a/modules/install/lang/ja.php +++ b/modules/install/lang/ja.php @@ -97,8 +97,6 @@ $lang->ftp_host = 'FTPサーバーアドレス'; $lang->ftp_port = 'FTPサーバーポート'; $lang->about_ftp_password = 'FTP情報は保存できません。'; $lang->cmd_check_ftp_connect = 'FTP接続を確認する'; -$lang->msg_safe_mode_ftp_needed = 'PHPのsafe_modeがOnの場合、FTP情報を登録することで、Rhymixのインストール及び利用が可能になります。'; -$lang->msg_safe_mode_ftp_needed2 = 'モジュールのイージーインストール、または更新が可能になります。'; $lang->msg_ftp_not_connected = 'localhostへのFTP接続エラーが発生しました。FTPポート(port)番号をはじめ、FTPサービスが可能であるかを確認してください。'; $lang->msg_ftp_invalid_auth_info = 'ログインに失敗しました。FTPアクセス情報を再度確認してください。'; $lang->msg_ftp_mkdir_fail = 'FTPでのディレクトリ生成に失敗しました。FTPサーバーの設定を再度確認してください。'; diff --git a/modules/install/lang/ko.php b/modules/install/lang/ko.php index 51092c35d..be57f8ee9 100644 --- a/modules/install/lang/ko.php +++ b/modules/install/lang/ko.php @@ -103,9 +103,6 @@ $lang->ftp_host = 'FTP 서버 주소'; $lang->ftp_port = 'FTP 서버 포트'; $lang->about_ftp_password = '비밀번호는 FTP 경로 확인을 위한 FTP 접속 시 필요하며 사용 후 저장하지 않습니다.'; $lang->cmd_check_ftp_connect = 'FTP 접속 확인'; -$lang->msg_safe_mode_ftp_needed = 'PHP의 safe_mode=On일 경우 Rhymix의 정상적인 동작을 돕습니다.'; -$lang->msg_safe_mode_ftp_needed2 = '모듈의 쉬운 설치 또는 업데이트가 가능해 집니다.'; -$lang->msg_safe_mode_ftp_config = '이 정보는 files/config/ftp.config.php 파일에 저장 됩니다. 설치 후 환경설정 페이지에서도 등록, 변경, 제거 할 수 있습니다.'; $lang->msg_ftp_not_connected = 'localhost로의 FTP 접속 오류가 발생했습니다. FTP 포트 번호를 확인하거나 FTP 서비스가 가능한지 확인해주세요.'; $lang->msg_ftp_invalid_auth_info = '입력한 FTP 정보로 로그인을 하지 못했습니다. FTP정보를 확인해주세요.'; $lang->msg_ftp_mkdir_fail = 'FTP를 이용한 디렉토리 생성 명령에 실패했습니다. FTP 서버의 설정을 확인해주세요.'; diff --git a/modules/install/lang/mn.php b/modules/install/lang/mn.php index d3869234d..e381f3527 100644 --- a/modules/install/lang/mn.php +++ b/modules/install/lang/mn.php @@ -2,7 +2,6 @@ $lang->ftp_form_title = 'FTP мэдээлэл оруулах'; $lang->ftp = 'FTP'; $lang->cmd_check_ftp_connect = 'FTP холболт шалгах'; -$lang->msg_safe_mode_ftp_needed = 'PHP의 safe_mode가 Onбайх тохиолдолд , FTP мэдээллийг заавал оруулснаар Rhymix идэвжvvлэх болон хэрэглэх боломжтой болно.'; $lang->msg_ftp_not_connected = 'localhost-ын FTP холболт амжилтгvй боллоо. FTP дугаараа шалгах буюу эсвэл FTP vйлчилгээг ашиглах боломжтой эсэхээ шалгана уу.'; $lang->msg_ftp_invalid_auth_info = 'Таны оруулсан FTP мэдээллээр нэвтэрч чадсангvй. FTPмэдээллээ шалгана уу.'; $lang->msg_ftp_mkdir_fail = 'FTP-г ашиглан eгсeн eгeгдлийг биелvvлж чадсангvй. FTP серверийн идэвхжvvлэлтээ шалгана уу.'; diff --git a/modules/install/lang/tr.php b/modules/install/lang/tr.php index 4a811e07b..3bb58c1ef 100644 --- a/modules/install/lang/tr.php +++ b/modules/install/lang/tr.php @@ -66,7 +66,6 @@ $lang->ftp_host = 'FTP sistem adı'; $lang->ftp_port = 'FTP portu'; $lang->about_ftp_password = 'FTP şifresi saklanmayacaktır.'; $lang->cmd_check_ftp_connect = 'FTP Bağlantısını kontrol ediniz'; -$lang->msg_safe_mode_ftp_needed = 'Eğer PHP güvenli mod ayarları etkinse, Rhymix\'yi kurmak için FTP hesap bilgilerini girmelisiniz.'; $lang->msg_ftp_not_connected = 'Yerel web alanına FTP bağlantısı sağlanamadı. Lütfen port numarasını ve FTP servisinin mevcut olup-olmadığını kontrol ediniz .'; $lang->msg_ftp_invalid_auth_info = 'Kimlik doğrulama başarısız oldu. Lütfen kullanıcı adını ve şifreyi kontrol ediniz.'; $lang->msg_ftp_mkdir_fail = 'Dizin oluşturma başarısız oldu. Lütfen FTP hesap iznini kontrol ediniz.'; diff --git a/modules/install/lang/vi.php b/modules/install/lang/vi.php index 9ca0ca2ab..ec54f85e7 100644 --- a/modules/install/lang/vi.php +++ b/modules/install/lang/vi.php @@ -61,7 +61,6 @@ $lang->ftp_host = 'Tên Host FTP'; $lang->ftp_port = 'Cổng kết nối'; $lang->about_ftp_password = 'Mật khẩu của FTP sẽ không lưu lại'; $lang->cmd_check_ftp_connect = 'Kiểm tra kết nối bằng FTP'; -$lang->msg_safe_mode_ftp_needed = 'Nếu safe_mode của PHP mở, bạn có thể cài đặt các thành phần bổ xung cho Rhymix một cách tự động qua FTP.'; $lang->msg_ftp_not_connected = 'Kết nối bằng FTP không thành công. Xin vui lòng kiểm tra lại thông tin tài khoản và cổng kết nối!'; $lang->msg_ftp_invalid_auth_info = 'Xác nhận thất bại. Xin vui lòng kiểm tra lại tên sử dụng và mật khẩu.'; $lang->msg_ftp_mkdir_fail = 'Lỗi khi tạo thư mục. Xin vui lòng kiểm tra lại quyền truy cập FTP.'; diff --git a/modules/install/lang/zh-CN.php b/modules/install/lang/zh-CN.php index 99a1a1a08..eed8e4ea3 100644 --- a/modules/install/lang/zh-CN.php +++ b/modules/install/lang/zh-CN.php @@ -77,7 +77,6 @@ $lang->ftp_host = 'FTP服务器名'; $lang->ftp_port = 'FTP端口'; $lang->about_ftp_password = 'FTP密码不会被保存。'; $lang->cmd_check_ftp_connect = '测试FTP连接'; -$lang->msg_safe_mode_ftp_needed = '当PHP的safe_mode=On时，请必须输入相关FTP信息，否则将无法正常安装或使用Rhymix程序。'; $lang->msg_ftp_not_connected = '发生本地(localhost)FTP连接错误。请确认ftp端口号及支持ftp服务与否。'; $lang->msg_ftp_invalid_auth_info = 'FTP登录失败。请确认输入的FTP信息。'; $lang->msg_ftp_mkdir_fail = '新建文件夹失败。请确认 FTP服务器设置。'; diff --git a/modules/install/lang/zh-TW.php b/modules/install/lang/zh-TW.php index 3c0f27afc..c8c481736 100644 --- a/modules/install/lang/zh-TW.php +++ b/modules/install/lang/zh-TW.php @@ -76,9 +76,6 @@ $lang->ftp_host = 'FTP 主機名稱'; $lang->ftp_port = 'FTP 埠口'; $lang->about_ftp_password = '不會儲存 FTP 密碼'; $lang->cmd_check_ftp_connect = '檢查 FTP 連線'; -$lang->msg_safe_mode_ftp_needed = '當 PHP 的安全模式(safe_mode)開啟時，請輸入相關 FTP 資訊，否則無法正常安裝或使用程式。'; -$lang->msg_safe_mode_ftp_needed2 = '可用的安裝或更新。'; -$lang->msg_safe_mode_ftp_config = '此資料會儲存在 files/config/ftp.config.php 檔案中。 安裝後可在設定頁面中新增、更改或刪除此資訊。'; $lang->msg_ftp_not_connected = '本地(localhost) FTP連線錯誤。請檢查 FTP 埠口並確認是否支援 FTP 功能。'; $lang->msg_ftp_invalid_auth_info = 'FTP登入失敗。請確認輸入的 FTP 資訊。'; $lang->msg_ftp_mkdir_fail = '新增資料夾失敗。請確認 FTP 主機設置。'; diff --git a/modules/install/tpl/ftp.html b/modules/install/tpl/ftp.html index 116fdbce7..e5bfe8d61 100644 --- a/modules/install/tpl/ftp.html +++ b/modules/install/tpl/ftp.html @@ -42,11 +42,6 @@

    {$lang->install_ftp_reason}

    -
      -
    • {$lang->msg_safe_mode_ftp_needed}
      • -
    • {$lang->msg_safe_mode_ftp_needed2}
      • -
    -

    {$lang->msg_safe_mode_ftp_config}

    diff --git a/modules/install/tpl/progress_menu.html b/modules/install/tpl/progress_menu.html index 12c1ef842..219018c3d 100644 --- a/modules/install/tpl/progress_menu.html +++ b/modules/install/tpl/progress_menu.html @@ -2,8 +2,7 @@
    • {$lang->install_progress_menu['license_agreement']}
    • {$lang->install_progress_menu['condition']}
      • -
    • {$lang->install_progress_menu['ftp']}
      • -
    • {$lang->install_progress_menu['dbInfo']}
      • +
    • {$lang->install_progress_menu['dbInfo']}
    • {$lang->install_progress_menu['adminInfo']}