From 9b8e0fb0952fa97e756987e4a69d785950eac463 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 10 Sep 2015 03:00:49 +0200 Subject: [PATCH] install script for system --- autoload.inc | 2 +- db/qq/QI.php | 5 ++-- sql/autoload.inc | 23 ++++++++++++++++-- sql/qt/DATA_SYSTEM_API.php | 10 ++++++++ sql/qt/DATA_SYSTEM_CRON.php | 8 +++++++ sql/qt/DATA_SYSTEM_PAGE.php | 8 +++++++ sql/qt/DATA_SYSTEM_RIGHTS.php | 8 +++++++ sql/qt/DATA_SYSTEM_TEXT.php | 8 +++++++ sql/qt/INSTALL_SAI.php | 10 -------- sql/qt/SCHEMA_SYSTEM_API.php | 8 +++++++ sql/qt/SCHEMA_SYSTEM_CACHE.php | 8 +++++++ sql/qt/SCHEMA_SYSTEM_CRON.php | 8 +++++++ sql/qt/SCHEMA_SYSTEM_LOG.php | 8 +++++++ sql/qt/SCHEMA_SYSTEM_PAGE.php | 8 +++++++ sql/qt/SCHEMA_SYSTEM_RIGHTS.php | 8 +++++++ sql/qt/SCHEMA_SYSTEM_TEXT.php | 8 +++++++ sql/qt/SCHEMA_SYSTEM_TEXT_TAG.php | 8 +++++++ sql/qt/SCHEMA_SYSTEM_TODO.php | 8 +++++++ sql/qt/SCHEMA_SYSTEM_TODO_ASSIGN.php | 8 +++++++ sql/qt/SCHEMA_SYSTEM_USER.php | 8 +++++++ sql/qt/SCHEMA_SYSTEM_USER_TO_RIGHTS.php | 8 +++++++ .../mysql/convert_locale_string_2_text.sql | 0 sql/{sql => qt}/mysql/data/system_api.sql | 0 .../mysql/data/system_api_default.sql | 0 sql/{sql => qt}/mysql/data/system_cron.sql | 0 sql/{sql => qt}/mysql/data/system_page.sql | 0 sql/{sql => qt}/mysql/data/system_rights.sql | 0 sql/{sql => qt}/mysql/data/system_sai_api.sql | 0 sql/{sql => qt}/mysql/data/system_text.sql | 0 sql/{sql => qt}/mysql/schema/system_api.sql | 0 sql/{sql => qt}/mysql/schema/system_cache.sql | 0 sql/{sql => qt}/mysql/schema/system_cron.sql | 0 sql/{sql => qt}/mysql/schema/system_log.sql | 0 sql/{sql => qt}/mysql/schema/system_page.sql | 0 .../mysql/schema/system_rights.sql | 0 sql/{sql => qt}/mysql/schema/system_text.sql | 0 .../mysql/schema/system_text_tag.sql | 0 sql/{sql => qt}/mysql/schema/system_todo.sql | 0 .../mysql/schema/system_todo_assign.sql | 0 sql/{sql => qt}/mysql/schema/system_user.sql | 0 .../mysql/schema/system_user_to_rights.sql | 0 .../pg/data/basic_locale_string.sql | 0 sql/{sql => qt}/pg/data/sai_api.sql | 0 .../pg/data/sai_error_locale_string.sql | 0 sql/{sql => qt}/pg/data/sai_locale_string.sql | 0 sql/{sql => qt}/pg/data/system_api.sql | 0 sql/{sql => qt}/pg/data/system_cron.sql | 0 sql/{sql => qt}/pg/data/system_rights.sql | 0 sql/{sql => qt}/pg/schema/schema.sql | 0 sql/{sql => qt}/pg/schema/system_api.sql | 0 sql/{sql => qt}/pg/schema/system_cache.sql | 0 sql/{sql => qt}/pg/schema/system_cron.sql | 0 .../pg/schema/system_locale_string.sql | 0 sql/{sql => qt}/pg/schema/system_log.sql | 0 sql/{sql => qt}/pg/schema/system_rights.sql | 0 sql/{sql => qt}/pg/schema/system_todo.sql | 0 sql/{sql => qt}/pg/schema/system_user.sql | 0 .../pg/schema/system_user_to_rights.sql | 0 .../pg/util_copy_api_table_by_groupa.sql | 0 sql/setup.php | 24 +++++++++++++++++++ system/path.php | 2 +- 61 files changed, 188 insertions(+), 16 deletions(-) create mode 100644 sql/qt/DATA_SYSTEM_API.php create mode 100644 sql/qt/DATA_SYSTEM_CRON.php create mode 100644 sql/qt/DATA_SYSTEM_PAGE.php create mode 100644 sql/qt/DATA_SYSTEM_RIGHTS.php create mode 100644 sql/qt/DATA_SYSTEM_TEXT.php delete mode 100644 sql/qt/INSTALL_SAI.php create mode 100644 sql/qt/SCHEMA_SYSTEM_API.php create mode 100644 sql/qt/SCHEMA_SYSTEM_CACHE.php create mode 100644 sql/qt/SCHEMA_SYSTEM_CRON.php create mode 100644 sql/qt/SCHEMA_SYSTEM_LOG.php create mode 100644 sql/qt/SCHEMA_SYSTEM_PAGE.php create mode 100644 sql/qt/SCHEMA_SYSTEM_RIGHTS.php create mode 100644 sql/qt/SCHEMA_SYSTEM_TEXT.php create mode 100644 sql/qt/SCHEMA_SYSTEM_TEXT_TAG.php create mode 100644 sql/qt/SCHEMA_SYSTEM_TODO.php create mode 100644 sql/qt/SCHEMA_SYSTEM_TODO_ASSIGN.php create mode 100644 sql/qt/SCHEMA_SYSTEM_USER.php create mode 100644 sql/qt/SCHEMA_SYSTEM_USER_TO_RIGHTS.php rename sql/{sql => qt}/mysql/convert_locale_string_2_text.sql (100%) rename sql/{sql => qt}/mysql/data/system_api.sql (100%) rename sql/{sql => qt}/mysql/data/system_api_default.sql (100%) rename sql/{sql => qt}/mysql/data/system_cron.sql (100%) rename sql/{sql => qt}/mysql/data/system_page.sql (100%) rename sql/{sql => qt}/mysql/data/system_rights.sql (100%) rename sql/{sql => qt}/mysql/data/system_sai_api.sql (100%) rename sql/{sql => qt}/mysql/data/system_text.sql (100%) rename sql/{sql => qt}/mysql/schema/system_api.sql (100%) rename sql/{sql => qt}/mysql/schema/system_cache.sql (100%) rename sql/{sql => qt}/mysql/schema/system_cron.sql (100%) rename sql/{sql => qt}/mysql/schema/system_log.sql (100%) rename sql/{sql => qt}/mysql/schema/system_page.sql (100%) rename sql/{sql => qt}/mysql/schema/system_rights.sql (100%) rename sql/{sql => qt}/mysql/schema/system_text.sql (100%) rename sql/{sql => qt}/mysql/schema/system_text_tag.sql (100%) rename sql/{sql => qt}/mysql/schema/system_todo.sql (100%) rename sql/{sql => qt}/mysql/schema/system_todo_assign.sql (100%) rename sql/{sql => qt}/mysql/schema/system_user.sql (100%) rename sql/{sql => qt}/mysql/schema/system_user_to_rights.sql (100%) rename sql/{sql => qt}/pg/data/basic_locale_string.sql (100%) rename sql/{sql => qt}/pg/data/sai_api.sql (100%) rename sql/{sql => qt}/pg/data/sai_error_locale_string.sql (100%) rename sql/{sql => qt}/pg/data/sai_locale_string.sql (100%) rename sql/{sql => qt}/pg/data/system_api.sql (100%) rename sql/{sql => qt}/pg/data/system_cron.sql (100%) rename sql/{sql => qt}/pg/data/system_rights.sql (100%) rename sql/{sql => qt}/pg/schema/schema.sql (100%) rename sql/{sql => qt}/pg/schema/system_api.sql (100%) rename sql/{sql => qt}/pg/schema/system_cache.sql (100%) rename sql/{sql => qt}/pg/schema/system_cron.sql (100%) rename sql/{sql => qt}/pg/schema/system_locale_string.sql (100%) rename sql/{sql => qt}/pg/schema/system_log.sql (100%) rename sql/{sql => qt}/pg/schema/system_rights.sql (100%) rename sql/{sql => qt}/pg/schema/system_todo.sql (100%) rename sql/{sql => qt}/pg/schema/system_user.sql (100%) rename sql/{sql => qt}/pg/schema/system_user_to_rights.sql (100%) rename sql/{sql => qt}/pg/util_copy_api_table_by_groupa.sql (100%) create mode 100644 sql/setup.php diff --git a/autoload.inc b/autoload.inc index 46927d3..a5e809b 100644 --- a/autoload.inc +++ b/autoload.inc @@ -8,11 +8,11 @@ require_once dirname(__FILE__).'/system/autoload.php'; //Autoload submodules require_once dirname(__FILE__).'/system/autoload.inc'; +require_once dirname(__FILE__).'/db/autoload.inc'; require_once dirname(__FILE__).'/log/autoload.inc'; require_once dirname(__FILE__).'/api/autoload.inc'; require_once dirname(__FILE__).'/page/autoload.inc'; require_once dirname(__FILE__).'/sql/autoload.inc'; -require_once dirname(__FILE__).'/db/autoload.inc'; require_once dirname(__FILE__).'/security/autoload.inc'; require_once dirname(__FILE__).'/config/autoload.inc'; require_once dirname(__FILE__).'/cache/autoload.inc'; diff --git a/db/qq/QI.php b/db/qq/QI.php index 668fc7c..bba9d16 100644 --- a/db/qq/QI.php +++ b/db/qq/QI.php @@ -24,7 +24,8 @@ class QI { ' --execute="SOURCE '; $result = array(); foreach($files as $file){ - $result[] = shell_exec($command .$file. '"');} - return \SYSTEM\LOG\JsonResult::toString($result); + $output = shell_exec($command .$file. '"'); + $result[] = array($file,$output);} + return $result; } } \ No newline at end of file diff --git a/sql/autoload.inc b/sql/autoload.inc index 774ace9..c5a0b89 100644 --- a/sql/autoload.inc +++ b/sql/autoload.inc @@ -1,4 +1,23 @@