fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-03 01:03:28 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/member-phone-number

Browse source
This commit is contained in:
Kijin Sung 2018-07-06 09:15:52 +09:00
commit 625c3b741f
435 changed files with 22374 additions and 21994 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/install/install.admin.controller.php
View file

@ -50,6 +50,8 @@ class installAdminController extends install
{
return $output;
}
$this->setMessage('success_updated');
}
function procInstallAdminRemoveFTPInfo()

5
modules/install/install.controller.php
View file

@ -450,6 +450,7 @@ class installController extends install
$oModuleModel = getModel('module');
// Create a table ny finding schemas/*.xml file in each module
$module_list = FileHandler::readDir('./modules/', NULL, false, true);
$modules = array();
foreach($module_list as $module_path)
{
// Get module name
@ -467,7 +468,7 @@ class installController extends install
// Install all the remaining modules
foreach($install_step as $category)
{
if(count($modules[$category]))
if(is_array($modules[$category]) && count($modules[$category]))
{
foreach($modules[$category] as $module)
{
@ -488,7 +489,7 @@ class installController extends install
{
foreach($modules as $category => $module_list)
{
if(count($module_list))
if(is_array($module_list) && count($module_list))
{
foreach($module_list as $module)
{

2
modules/install/lang/en.php
View file

@ -47,7 +47,7 @@ $lang->cmd_ignore = 'Ignore';
$lang->cmd_recommended = 'Recommended';
$lang->db_desc['mysqli'] = 'Use MySQL as a database via the mysqli extension.';
$lang->db_desc['mysql'] = 'Use MySQL as a database via mysql_* functions.';
$lang->db_desc['cubrid'] = 'Use CUBRID as a database. See <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manual</a> for more info';
$lang->db_desc['cubrid'] = 'Use CUBRID as a database. See <a href="https://www.cubrid.org/documentation/manuals" target="_blank">Manual</a> for more info';
$lang->db_desc['mssql'] = 'Use Microsoft SQL Server as a database.';
$lang->can_use_when_installed = 'Not installed on this server';
$lang->form_title = 'Database &amp; Administrator Information';

2
modules/install/lang/es.php
View file

@ -26,7 +26,7 @@ $lang->cmd_install_next = 'Continuar la instalación';
$lang->cmd_recommended = 'Recomendado';
$lang->db_desc['mysqli'] = 'Utilizando las funciones mysqli*() de PHP usar DB mysql.';
$lang->db_desc['mysql'] = 'Utilizando las funciones mysql_*() de PHP usar DB mysql.';
$lang->db_desc['cubrid'] = 'Usar BD CUBRID. <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manual</a>';
$lang->db_desc['cubrid'] = 'Usar BD CUBRID. <a href="https://www.cubrid.org/documentation/manuals" target="_blank">Manual</a>';
$lang->db_desc['mssql'] = 'Usar Microsoft SQL Server.';
$lang->form_title = 'Ingresar BD &amp; Información del Administrador;';
$lang->db_title = 'Por favor escribir información de BD';

2
modules/install/lang/fr.php
View file

@ -26,7 +26,7 @@ $lang->cmd_install_next = 'Continuer à installer';
$lang->cmd_recommended = 'Recommandé';
$lang->db_desc['mysqli'] = 'Utilisera fonction mysqli_*() pour utiliser la base de données de MySQL.';
$lang->db_desc['mysql'] = 'Utilisera fonction mysql_*() pour utiliser la base de données de MySQL';
$lang->db_desc['cubrid'] = 'Utiliser la Base de Données de CUBRID. <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manual</a>';
$lang->db_desc['cubrid'] = 'Utiliser la Base de Données de CUBRID. <a href="https://www.cubrid.org/documentation/manuals" target="_blank">Manual</a>';
$lang->db_desc['mssql'] = 'Utiliser la Base de Données de Microsoft SQL Server.';
$lang->can_use_when_installed = 'Pas installé sur ce serveur';
$lang->form_title = 'Entrer des informations de Base de données et Administrateur';

2
modules/install/lang/ja.php
View file

@ -47,7 +47,7 @@ $lang->cmd_ignore = 'FTP設定を省略する';
$lang->cmd_recommended = '推奨';
$lang->db_desc['mysqli'] = 'mysqliモジュールを使用してMySQL DBに接続します。';
$lang->db_desc['mysql'] = 'mysql_*()関数を使用してMySQL DBに接続します。';
$lang->db_desc['cubrid'] = 'CUBRID DBを利用します。 <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manual</a>';
$lang->db_desc['cubrid'] = 'CUBRID DBを利用します。 <a href="https://www.cubrid.org/documentation/manuals" target="_blank">Manual</a>';
$lang->db_desc['mssql'] = 'Microsoft SQL Serverを利用します。';
$lang->can_use_when_installed = 'このサーバーにインストールされていません';
$lang->form_title = 'データベース &amp; 管理者情報入力';

2
modules/install/lang/ko.php
View file

@ -47,7 +47,7 @@ $lang->cmd_ignore = '무시';
$lang->cmd_recommended = '권장';
$lang->db_desc['mysqli'] = 'mysqli 모듈을 사용하여 MySQL DB에 접속합니다.';
$lang->db_desc['mysql'] = 'mysql_*() 함수를 사용하여 MySQL DB에 접속합니다.';
$lang->db_desc['cubrid'] = 'CUBRID DB를 이용합니다. <a href="http://www.cubrid.com/zbxe/?mid=bbs_developer_tutorial&category=47452" target="_blank">Manual</a>';
$lang->db_desc['cubrid'] = 'CUBRID DB를 이용합니다. <a href="https://www.cubrid.org/documentation/manuals" target="_blank">Manual</a>';
$lang->db_desc['mssql'] = 'Microsoft SQL Server를 이용합니다.';
$lang->can_use_when_installed = '설치되어 있지 않음';
$lang->form_title = 'DB &amp; 관리자 정보 입력';

2
modules/install/lang/ru.php
View file

@ -26,7 +26,7 @@ $lang->cmd_install_next = 'Продолжить установку';
$lang->cmd_recommended = 'рекомендуемые';
$lang->db_desc['mysqli'] = 'Используем mysqli_*() функцию, чтобы использовать базу данных mysql.';
$lang->db_desc['mysql'] = 'Используем mysql_*() функцию, чтобы использовать базу данных mysql.';
$lang->db_desc['cubrid'] = 'Используем CUBRID DB. <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manual</a>';
$lang->db_desc['cubrid'] = 'Используем CUBRID DB. <a href="https://www.cubrid.org/documentation/manuals" target="_blank">Manual</a>';
$lang->db_desc['mssql'] = 'Используем Microsoft SQL Server DB.';
$lang->form_title = 'Пожалуйста, введите дазу данных &amp; Административная Информация';
$lang->db_title = 'Пожалуйста, введите информацию базы данных';

2
modules/install/lang/tr.php
View file

@ -27,7 +27,7 @@ $lang->cmd_ignore = 'Önemseme';
$lang->cmd_recommended = 'Tavsiye edilen';
$lang->db_desc['mysqli'] = 'PHP\'de mysqli_*() özellikleri için MySQL\'ü veritabanı olarak kullanınız.';
$lang->db_desc['mysql'] = 'PHP\'de mysql_*() özellikleri için MySQL\'ü veritabanı olarak kullanınız.';
$lang->db_desc['cubrid'] = 'CUBRID\'ü veritabanı olarak kullanın. Daha fazla bilgi için <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manuel</a>i inceleyiniz';
$lang->db_desc['cubrid'] = 'CUBRID\'ü veritabanı olarak kullanın. Daha fazla bilgi için <a href="https://www.cubrid.org/documentation/manuals" target="_blank">Manuel</a>i inceleyiniz';
$lang->db_desc['mssql'] = 'Microsoft SQL Server\'ü veritabanı olarak kullanın';
$lang->form_title = 'Veritabanı &amp; Yönetici Bilgisi';
$lang->db_title = 'Lütfen Veritabanı bilgisini giriniz';

2
modules/install/lang/vi.php
View file

@ -22,7 +22,7 @@ $lang->cmd_ignore = 'Bỏ qua';
$lang->cmd_recommended = 'Đê';
$lang->db_desc['mysqli'] = 'Dùng chức năng <b>mysqli_*()</b> để sử dụng MySql Database.';
$lang->db_desc['mysql'] = 'Dùng chức năng <b>mysql_*()</b> để sử dụng MySql Database.';
$lang->db_desc['cubrid'] = 'Sử dụng <b>CUBRID</b> Database. <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Hướng dẫn</a>';
$lang->db_desc['cubrid'] = 'Sử dụng <b>CUBRID</b> Database. <a href="https://www.cubrid.org/documentation/manuals" target="_blank">Hướng dẫn</a>';
$lang->form_title = 'Hãy nhập thông tin Database và thông tin Administrator';
$lang->db_title = 'Xin hãy nhập thông tin Database';
$lang->db_type = 'Định dạng Database';

2
modules/install/lang/zh-CN.php
View file

@ -35,7 +35,7 @@ $lang->cmd_ignore = '忽略';
$lang->cmd_recommended = '推荐';
$lang->db_desc['mysqli'] = '利用php的 mysqli*()函数使用mysql DB。';
$lang->db_desc['mysql'] = '利用php的 mysql_*()函数使用mysql DB。';
$lang->db_desc['cubrid'] = '使用CUBRID DB。 <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manual</a>';
$lang->db_desc['cubrid'] = '使用CUBRID DB。 <a href="https://www.cubrid.org/documentation/manuals" target="_blank">Manual</a>';
$lang->db_desc['mssql'] = '使用 Microsoft SQL Server。';
$lang->can_use_when_installed = '不是这个服务器上安装';
$lang->form_title = '数据库及管理员基本信息';

2
modules/install/lang/zh-TW.php
View file

@ -35,7 +35,7 @@ $lang->cmd_ignore = '忽略';
$lang->cmd_recommended = '推薦';
$lang->db_desc['mysqli'] = '利用 PHP 的『mysqli*()』函數使用 MySQL 資料庫。';
$lang->db_desc['mysql'] = '利用 PHP 的『mysql_*()』函數使用 MySQL 資料庫。';
$lang->db_desc['cubrid'] = '使用 CUBRID DB。 <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manual</a>';
$lang->db_desc['cubrid'] = '使用 CUBRID DB。 <a href="https://www.cubrid.org/documentation/manuals" target="_blank">Manual</a>';
$lang->db_desc['mssql'] = '使用 Microsoft SQL Server。';
$lang->can_use_when_installed = '不是這個服務器上安裝';
$lang->form_title = '輸入資料庫及管理員資訊';