From 9a90e72366178ee8e22078bff8217e9fee701f3d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 10 Sep 2015 00:56:17 +0200 Subject: [PATCH] renamed dbd -> sql --- api/api.php | 84 ++++---- api/autoload.inc | 2 +- api/qq/SYS_API_TREE.php | 14 +- autoload.inc | 2 +- cache/autoload.inc | 2 +- cache/cache.php | 6 +- cache/qq/SYS_CACHE_CHECK.php | 2 +- cache/qq/SYS_CACHE_DELETE.php | 2 +- cache/qq/SYS_CACHE_DELETE_ALL.php | 2 +- cache/qq/SYS_CACHE_PUT.php | 2 +- cron/autoload.inc | 2 +- cron/cron.php | 46 ++-- cron/cron_cache_delete.php | 2 +- cron/cron_log2sqlite.php | 8 +- cron/qq/SYS_CRON_GET.php | 6 +- cron/qq/SYS_CRON_LAST_VISIT.php | 6 +- cron/qq/SYS_CRON_LIST.php | 6 +- cron/qq/SYS_CRON_UPD.php | 6 +- docu/index/api.php | 196 +++++++++--------- docu/index/index.php | 26 +-- log/autoload.inc | 2 +- log/error_handler/error_handler_dbwriter.php | 2 +- log/qq/SYS_LOG_DEL.php | 6 +- log/qq/SYS_LOG_INSERT.php | 40 ++-- log/qq/SYS_LOG_MONTH.php | 4 +- log/qq/SYS_LOG_OLDEST.php | 6 +- page/State.php | 2 +- page/autoload.inc | 2 +- page/qq/SYS_PAGE_GROUP.php | 18 +- page/qq/SYS_TEXT_DELETE.php | 2 +- page/qq/SYS_TEXT_DELETE_TAGS.php | 2 +- page/qq/SYS_TEXT_GET_ID.php | 2 +- page/qq/SYS_TEXT_GET_ID_ADV.php | 2 +- page/qq/SYS_TEXT_GET_ID_COUNT.php | 2 +- page/qq/SYS_TEXT_GET_ID_TAGS.php | 2 +- page/qq/SYS_TEXT_GET_TAG.php | 2 +- page/qq/SYS_TEXT_GET_TAG_ADV.php | 2 +- page/qq/SYS_TEXT_RENAME.php | 2 +- page/qq/SYS_TEXT_RENAME_TAGS.php | 2 +- page/qq/SYS_TEXT_SAVE.php | 2 +- page/qq/SYS_TEXT_SAVE_TAG.php | 2 +- page/qq/SYS_TEXT_SEARCH_TAG.php | 2 +- page/text.php | 32 +-- sai/modules/saimod_sys_api/autoload.inc | 2 +- .../saimod_sys_api/qq/SYS_SAIMOD_API_ADD.php | 6 +- .../saimod_sys_api/qq/SYS_SAIMOD_API_DEL.php | 6 +- .../saimod_sys_api/qq/SYS_SAIMOD_API_GET.php | 2 +- .../qq/SYS_SAIMOD_API_GROUPS.php | 2 +- .../qq/SYS_SAIMOD_API_SINGLE_SELECT.php | 6 +- sai/modules/saimod_sys_api/saimod_sys_api.php | 18 +- sai/modules/saimod_sys_cache/autoload.inc | 2 +- .../saimod_sys_cache/qq/SYS_SAIMOD_CACHE.php | 2 +- .../qq/SYS_SAIMOD_CACHE_COUNT.php | 2 +- .../saimod_sys_cache/saimod_sys_cache.php | 4 +- sai/modules/saimod_sys_config/autoload.inc | 2 +- .../saimod_sys_config/saimod_sys_config.php | 6 +- sai/modules/saimod_sys_cron/autoload.inc | 2 +- .../saimod_sys_cron/qq/SYS_SAIMOD_CRON.php | 6 +- .../qq/SYS_SAIMOD_CRON_ADD.php | 6 +- .../qq/SYS_SAIMOD_CRON_CHANGE.php | 6 +- .../qq/SYS_SAIMOD_CRON_DEL.php | 6 +- .../qq/SYS_SAIMOD_CRON_SINGLE_SELECT.php | 6 +- .../saimod_sys_cron/saimod_sys_cron.php | 10 +- sai/modules/saimod_sys_docu/autoload.inc | 2 +- .../saimod_sys_docu/saimod_sys_docu.php | 4 +- sai/modules/saimod_sys_files/autoload.inc | 2 +- .../saimod_sys_files/saimod_sys_files.php | 4 +- sai/modules/saimod_sys_git/autoload.inc | 2 +- sai/modules/saimod_sys_git/saimod_sys_git.php | 2 +- sai/modules/saimod_sys_log/autoload.inc | 2 +- .../qq/SYS_SAIMOD_LOG_ANALYTICS.php | 10 +- .../qq/SYS_SAIMOD_LOG_BASIC_QUERYTIME.php | 26 +-- .../qq/SYS_SAIMOD_LOG_BASIC_SUCCESS.php | 68 +++--- .../qq/SYS_SAIMOD_LOG_BASIC_VISITOR.php | 18 +- .../qq/SYS_SAIMOD_LOG_CLASS_BASIC.php | 30 +-- .../qq/SYS_SAIMOD_LOG_CLASS_OTHER.php | 22 +- .../qq/SYS_SAIMOD_LOG_CLASS_SYSTEM.php | 38 ++-- .../qq/SYS_SAIMOD_LOG_ERROR.php | 22 +- .../qq/SYS_SAIMOD_LOG_FILTER.php | 28 +-- .../qq/SYS_SAIMOD_LOG_FILTERS.php | 18 +- .../qq/SYS_SAIMOD_LOG_FILTER_COUNT.php | 12 +- .../qq/SYS_SAIMOD_LOG_TRUNCATE.php | 6 +- .../qq/SYS_SAIMOD_LOG_UNIQUE_BASIC.php | 22 +- .../qq/SYS_SAIMOD_LOG_UNIQUE_EXCEPTION.php | 22 +- .../qq/SYS_SAIMOD_LOG_UNIQUE_REFERER.php | 26 +-- .../qq/SYS_SAIMOD_LOG_UNIQUE_REQUEST.php | 26 +-- sai/modules/saimod_sys_log/saimod_sys_log.php | 182 ++++++++-------- sai/modules/saimod_sys_login/autoload.inc | 2 +- .../saimod_sys_login/saimod_sys_login.php | 4 +- sai/modules/saimod_sys_mod/autoload.inc | 2 +- sai/modules/saimod_sys_mod/saimod_sys_mod.php | 8 +- sai/modules/saimod_sys_page/autoload.inc | 2 +- .../qq/SYS_SAIMOD_PAGE_ADD.php | 6 +- .../qq/SYS_SAIMOD_PAGE_DEL.php | 6 +- .../qq/SYS_SAIMOD_PAGE_GET.php | 2 +- .../qq/SYS_SAIMOD_PAGE_GROUPS.php | 2 +- .../qq/SYS_SAIMOD_PAGE_SINGLE_SELECT.php | 6 +- .../saimod_sys_page/saimod_sys_page.php | 18 +- sai/modules/saimod_sys_security/autoload.inc | 2 +- .../qq/SYS_SAIMOD_SECURITY_RIGHTS.php | 2 +- .../qq/SYS_SAIMOD_SECURITY_RIGHT_CHECK.php | 2 +- .../qq/SYS_SAIMOD_SECURITY_RIGHT_DELETE.php | 2 +- .../qq/SYS_SAIMOD_SECURITY_RIGHT_INSERT.php | 2 +- .../qq/SYS_SAIMOD_SECURITY_USER.php | 2 +- .../qq/SYS_SAIMOD_SECURITY_USERS.php | 2 +- .../qq/SYS_SAIMOD_SECURITY_USERS_FILTER.php | 2 +- .../qq/SYS_SAIMOD_SECURITY_USER_COUNT.php | 2 +- .../SYS_SAIMOD_SECURITY_USER_COUNT_FILTER.php | 2 +- .../qq/SYS_SAIMOD_SECURITY_USER_LOG.php | 26 +-- .../qq/SYS_SAIMOD_SECURITY_USER_LOG_COUNT.php | 10 +- .../qq/SYS_SAIMOD_SECURITY_USER_RIGHTS.php | 2 +- .../SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK.php | 2 +- .../SYS_SAIMOD_SECURITY_USER_RIGHT_DELETE.php | 2 +- .../SYS_SAIMOD_SECURITY_USER_RIGHT_INSERT.php | 2 +- .../saimod_sys_security.php | 54 ++--- sai/modules/saimod_sys_text/autoload.inc | 2 +- .../qq/SYS_SAIMOD_TEXT_COUNT.php | 2 +- .../qq/SYS_SAIMOD_TEXT_COUNT_FILTER.php | 2 +- .../qq/SYS_SAIMOD_TEXT_COUNT_NOTAG.php | 2 +- .../qq/SYS_SAIMOD_TEXT_COUNT_NOTAG_FILTER.php | 2 +- .../qq/SYS_SAIMOD_TEXT_COUNT_TAG.php | 2 +- .../qq/SYS_SAIMOD_TEXT_COUNT_TAG_FILTER.php | 2 +- .../qq/SYS_SAIMOD_TEXT_TAGS.php | 2 +- .../qq/SYS_SAIMOD_TEXT_TEXT.php | 2 +- .../qq/SYS_SAIMOD_TEXT_TEXT_FILTER.php | 2 +- .../qq/SYS_SAIMOD_TEXT_TEXT_NOTAG.php | 2 +- .../qq/SYS_SAIMOD_TEXT_TEXT_NOTAG_FILTER.php | 2 +- .../qq/SYS_SAIMOD_TEXT_TEXT_TAG.php | 2 +- .../qq/SYS_SAIMOD_TEXT_TEXT_TAG_FILTER.php | 2 +- .../saimod_sys_text/saimod_sys_text.php | 38 ++-- sai/modules/saimod_sys_todo/autoload.inc | 2 +- .../qq/SYS_SAIMOD_TODO_ASSIGN.php | 6 +- .../qq/SYS_SAIMOD_TODO_ASSIGNEES.php | 16 +- .../qq/SYS_SAIMOD_TODO_CLOSE.php | 10 +- .../qq/SYS_SAIMOD_TODO_CLOSE_ALL.php | 10 +- .../qq/SYS_SAIMOD_TODO_COUNT.php | 14 +- .../qq/SYS_SAIMOD_TODO_COUNT_FREE.php | 16 +- .../qq/SYS_SAIMOD_TODO_COUNT_MINE.php | 16 +- .../qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php | 16 +- .../qq/SYS_SAIMOD_TODO_COUNT_TYPE.php | 16 +- .../qq/SYS_SAIMOD_TODO_DEASSIGN.php | 4 +- .../qq/SYS_SAIMOD_TODO_EDIT.php | 12 +- .../qq/SYS_SAIMOD_TODO_EXCEPTION_INSERT.php | 56 ++--- .../qq/SYS_SAIMOD_TODO_LIST.php | 30 +-- .../qq/SYS_SAIMOD_TODO_LIST_FREE.php | 30 +-- .../qq/SYS_SAIMOD_TODO_LIST_MINE.php | 30 +-- .../qq/SYS_SAIMOD_TODO_LIST_OTHERS.php | 30 +-- .../qq/SYS_SAIMOD_TODO_LIST_TYPE.php | 32 +-- .../qq/SYS_SAIMOD_TODO_OPEN.php | 10 +- .../qq/SYS_SAIMOD_TODO_PRIORITY.php | 6 +- .../SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php | 2 +- .../SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php | 2 +- ..._SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php | 2 +- .../SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php | 2 +- .../SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php | 2 +- .../qq/SYS_SAIMOD_TODO_STATS_USERS.php | 2 +- .../qq/SYS_SAIMOD_TODO_TODO.php | 18 +- .../saimod_sys_todo/saimod_sys_todo.php | 80 +++---- .../stats/todo_stats_assign.php | 4 +- .../saimod_sys_todo/stats/todo_stats_gen.php | 4 +- .../saimod_sys_todo/stats/todo_stats_user.php | 4 +- sai/modules/saistart_sys_sai/autoload.inc | 2 +- .../saistart_sys_sai/saistart_sys_sai.php | 6 +- sai/page/default_page.php | 2 +- security/Security.php | 36 ++-- security/autoload.inc | 2 +- security/qq/SYS_SECURITY_AVAILABLE.php | 10 +- security/qq/SYS_SECURITY_CHECK.php | 14 +- security/qq/SYS_SECURITY_CREATE.php | 14 +- security/qq/SYS_SECURITY_LOGIN_MD5.php | 14 +- security/qq/SYS_SECURITY_LOGIN_SHA1.php | 14 +- .../qq/SYS_SECURITY_UPDATE_LASTACTIVE.php | 14 +- security/qq/SYS_SECURITY_UPDATE_PW.php | 14 +- {dbd => sql}/autoload.inc | 6 +- {dbd => sql}/qt/INSTALL_SAI.php | 2 +- .../mysql/convert_locale_string_2_text.sql | 0 {dbd => sql}/sql/mysql/data/system_api.sql | 0 .../sql/mysql/data/system_api_default.sql | 0 {dbd => sql}/sql/mysql/data/system_cron.sql | 0 {dbd => sql}/sql/mysql/data/system_page.sql | 0 {dbd => sql}/sql/mysql/data/system_rights.sql | 0 .../sql/mysql/data/system_sai_api.sql | 0 {dbd => sql}/sql/mysql/data/system_text.sql | 0 {dbd => sql}/sql/mysql/schema/system_api.sql | 0 .../sql/mysql/schema/system_cache.sql | 0 {dbd => sql}/sql/mysql/schema/system_cron.sql | 0 {dbd => sql}/sql/mysql/schema/system_log.sql | 0 {dbd => sql}/sql/mysql/schema/system_page.sql | 0 .../sql/mysql/schema/system_rights.sql | 0 {dbd => sql}/sql/mysql/schema/system_text.sql | 0 .../sql/mysql/schema/system_text_tag.sql | 0 {dbd => sql}/sql/mysql/schema/system_todo.sql | 0 .../sql/mysql/schema/system_todo_assign.sql | 0 {dbd => sql}/sql/mysql/schema/system_user.sql | 0 .../mysql/schema/system_user_to_rights.sql | 0 .../sql/pg/data/basic_locale_string.sql | 0 {dbd => sql}/sql/pg/data/sai_api.sql | 0 .../sql/pg/data/sai_error_locale_string.sql | 0 .../sql/pg/data/sai_locale_string.sql | 0 {dbd => sql}/sql/pg/data/system_api.sql | 0 {dbd => sql}/sql/pg/data/system_cron.sql | 0 {dbd => sql}/sql/pg/data/system_rights.sql | 0 {dbd => sql}/sql/pg/schema/schema.sql | 0 {dbd => sql}/sql/pg/schema/system_api.sql | 0 {dbd => sql}/sql/pg/schema/system_cache.sql | 0 {dbd => sql}/sql/pg/schema/system_cron.sql | 0 .../sql/pg/schema/system_locale_string.sql | 0 {dbd => sql}/sql/pg/schema/system_log.sql | 0 {dbd => sql}/sql/pg/schema/system_rights.sql | 0 {dbd => sql}/sql/pg/schema/system_todo.sql | 0 {dbd => sql}/sql/pg/schema/system_user.sql | 0 .../sql/pg/schema/system_user_to_rights.sql | 0 .../sql/pg/util_copy_api_table_by_groupa.sql | 0 {dbd => sql}/tbl/system_api.php | 2 +- {dbd => sql}/tbl/system_cron.php | 2 +- {dbd => sql}/tbl/system_log.php | 2 +- {dbd => sql}/tbl/system_page.php | 2 +- {dbd => sql}/tbl/system_text.php | 2 +- {dbd => sql}/tbl/system_todo.php | 2 +- {dbd => sql}/tbl/system_todo_assign.php | 2 +- {dbd => sql}/tbl/system_user.php | 2 +- {dbd => sql}/tbl/system_user_to_rights.php | 2 +- system/autoload.inc | 2 +- system/locale.php | 2 +- system/qq/SYS_LOCALE_SET_LOCALE.php | 14 +- 225 files changed, 1085 insertions(+), 1085 deletions(-) rename {dbd => sql}/autoload.inc (89%) rename {dbd => sql}/qt/INSTALL_SAI.php (92%) rename {dbd => sql}/sql/mysql/convert_locale_string_2_text.sql (100%) rename {dbd => sql}/sql/mysql/data/system_api.sql (100%) rename {dbd => sql}/sql/mysql/data/system_api_default.sql (100%) rename {dbd => sql}/sql/mysql/data/system_cron.sql (100%) rename {dbd => sql}/sql/mysql/data/system_page.sql (100%) rename {dbd => sql}/sql/mysql/data/system_rights.sql (100%) rename {dbd => sql}/sql/mysql/data/system_sai_api.sql (100%) rename {dbd => sql}/sql/mysql/data/system_text.sql (100%) rename {dbd => sql}/sql/mysql/schema/system_api.sql (100%) rename {dbd => sql}/sql/mysql/schema/system_cache.sql (100%) rename {dbd => sql}/sql/mysql/schema/system_cron.sql (100%) rename {dbd => sql}/sql/mysql/schema/system_log.sql (100%) rename {dbd => sql}/sql/mysql/schema/system_page.sql (100%) rename {dbd => sql}/sql/mysql/schema/system_rights.sql (100%) rename {dbd => sql}/sql/mysql/schema/system_text.sql (100%) rename {dbd => sql}/sql/mysql/schema/system_text_tag.sql (100%) rename {dbd => sql}/sql/mysql/schema/system_todo.sql (100%) rename {dbd => sql}/sql/mysql/schema/system_todo_assign.sql (100%) rename {dbd => sql}/sql/mysql/schema/system_user.sql (100%) rename {dbd => sql}/sql/mysql/schema/system_user_to_rights.sql (100%) rename {dbd => sql}/sql/pg/data/basic_locale_string.sql (100%) rename {dbd => sql}/sql/pg/data/sai_api.sql (100%) rename {dbd => sql}/sql/pg/data/sai_error_locale_string.sql (100%) rename {dbd => sql}/sql/pg/data/sai_locale_string.sql (100%) rename {dbd => sql}/sql/pg/data/system_api.sql (100%) rename {dbd => sql}/sql/pg/data/system_cron.sql (100%) rename {dbd => sql}/sql/pg/data/system_rights.sql (100%) rename {dbd => sql}/sql/pg/schema/schema.sql (100%) rename {dbd => sql}/sql/pg/schema/system_api.sql (100%) rename {dbd => sql}/sql/pg/schema/system_cache.sql (100%) rename {dbd => sql}/sql/pg/schema/system_cron.sql (100%) rename {dbd => sql}/sql/pg/schema/system_locale_string.sql (100%) rename {dbd => sql}/sql/pg/schema/system_log.sql (100%) rename {dbd => sql}/sql/pg/schema/system_rights.sql (100%) rename {dbd => sql}/sql/pg/schema/system_todo.sql (100%) rename {dbd => sql}/sql/pg/schema/system_user.sql (100%) rename {dbd => sql}/sql/pg/schema/system_user_to_rights.sql (100%) rename {dbd => sql}/sql/pg/util_copy_api_table_by_groupa.sql (100%) rename {dbd => sql}/tbl/system_api.php (96%) rename {dbd => sql}/tbl/system_cron.php (96%) rename {dbd => sql}/tbl/system_log.php (97%) rename {dbd => sql}/tbl/system_page.php (96%) rename {dbd => sql}/tbl/system_text.php (97%) rename {dbd => sql}/tbl/system_todo.php (98%) rename {dbd => sql}/tbl/system_todo_assign.php (93%) rename {dbd => sql}/tbl/system_user.php (95%) rename {dbd => sql}/tbl/system_user_to_rights.php (90%) diff --git a/api/api.php b/api/api.php index 612c370..cd566cd 100644 --- a/api/api.php +++ b/api/api.php @@ -34,12 +34,12 @@ class api { //Parameters $parentid = $commands[count($commands)-1][0]; - $parentid = $parentid[\SYSTEM\DBD\system_api::FIELD_ID]; + $parentid = $parentid[\SYSTEM\SQL\system_api::FIELD_ID]; $parameters = self::do_parameters($params, $tree, $parentid, $commands[count($commands)-1][1],$verifyclassname); //throws //Opt Parameters $parentid = $commands[count($commands)-1][0]; - $parentid = $parentid[\SYSTEM\DBD\system_api::FIELD_ID]; + $parentid = $parentid[\SYSTEM\SQL\system_api::FIELD_ID]; $parameters_opt = self::do_parameters_opt($params, $tree, $parentid, $commands[count($commands)-1][1],$verifyclassname); //throws //strict check @@ -60,7 +60,7 @@ class api { } private static function getApiTree($group){ - $result = \SYSTEM\DBD\SYS_API_TREE::QA(array($group)); + $result = \SYSTEM\SQL\SYS_API_TREE::QA(array($group)); if(!isset($result) || !is_array($result) || count($result) <= 0){ throw new \SYSTEM\LOG\ERROR("Database Tree for Api empty - cannot proced! GROUP: ".$group);} return $result; @@ -70,23 +70,23 @@ class api { $statics = array(); $parentid = self::ROOT_PARENTID; foreach($tree as $item){ - if( intval($item[\SYSTEM\DBD\system_api::FIELD_TYPE]) == \SYSTEM\DBD\system_api::VALUE_TYPE_STATIC && - intval($item[\SYSTEM\DBD\system_api::FIELD_PARENTID]) == $parentid && - isset($params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]])){ + if( intval($item[\SYSTEM\SQL\system_api::FIELD_TYPE]) == \SYSTEM\SQL\system_api::VALUE_TYPE_STATIC && + intval($item[\SYSTEM\SQL\system_api::FIELD_PARENTID]) == $parentid && + isset($params[$item[\SYSTEM\SQL\system_api::FIELD_NAME]])){ - $statics[] = array($item,$params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]]); - $call_funcname = 'static_'.$item[\SYSTEM\DBD\system_api::FIELD_NAME]; + $statics[] = array($item,$params[$item[\SYSTEM\SQL\system_api::FIELD_NAME]]); + $call_funcname = 'static_'.$item[\SYSTEM\SQL\system_api::FIELD_NAME]; //verify func if(!\method_exists($apiclassname, $call_funcname)){ return self::do_default($default, $apiclassname, $call_funcname);} //throws //verify parameter - if( !method_exists($verifyclassname, $item[\SYSTEM\DBD\system_api::FIELD_VERIFY]) || - !call_user_func(array($verifyclassname,$item[\SYSTEM\DBD\system_api::FIELD_VERIFY]),$params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]])){ - throw new \SYSTEM\LOG\ERROR('Parameter type missmacht or Missing Verifier. Param: '.$item[\SYSTEM\DBD\system_api::FIELD_NAME].' Verifier: '.$item[\SYSTEM\DBD\system_api::FIELD_VERIFY]);} + if( !method_exists($verifyclassname, $item[\SYSTEM\SQL\system_api::FIELD_VERIFY]) || + !call_user_func(array($verifyclassname,$item[\SYSTEM\SQL\system_api::FIELD_VERIFY]),$params[$item[\SYSTEM\SQL\system_api::FIELD_NAME]])){ + throw new \SYSTEM\LOG\ERROR('Parameter type missmacht or Missing Verifier. Param: '.$item[\SYSTEM\SQL\system_api::FIELD_NAME].' Verifier: '.$item[\SYSTEM\SQL\system_api::FIELD_VERIFY]);} //throw new \SYSTEM\LOG\ERROR("yo ".$call_funcname.' '.$apiclassname); - \call_user_func_array(array($apiclassname,$call_funcname),array($params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]])); + \call_user_func_array(array($apiclassname,$call_funcname),array($params[$item[\SYSTEM\SQL\system_api::FIELD_NAME]])); } } @@ -117,18 +117,18 @@ class api { $commands = array(); $parentid = self::ROOT_PARENTID; foreach($tree as $item){ - if( (intval($item[\SYSTEM\DBD\system_api::FIELD_TYPE]) == \SYSTEM\DBD\system_api::VALUE_TYPE_COMMAND || - intval($item[\SYSTEM\DBD\system_api::FIELD_TYPE]) == \SYSTEM\DBD\system_api::VALUE_TYPE_COMMAND_FLAG) && - intval($item[\SYSTEM\DBD\system_api::FIELD_PARENTID]) == $parentid && - isset($params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]])){ + if( (intval($item[\SYSTEM\SQL\system_api::FIELD_TYPE]) == \SYSTEM\SQL\system_api::VALUE_TYPE_COMMAND || + intval($item[\SYSTEM\SQL\system_api::FIELD_TYPE]) == \SYSTEM\SQL\system_api::VALUE_TYPE_COMMAND_FLAG) && + intval($item[\SYSTEM\SQL\system_api::FIELD_PARENTID]) == $parentid && + isset($params[$item[\SYSTEM\SQL\system_api::FIELD_NAME]])){ //check parent value - if( isset($item[\SYSTEM\DBD\system_api::FIELD_PARENTVALUE]) && - $commands[count($commands)-1][1] != $item[\SYSTEM\DBD\system_api::FIELD_PARENTVALUE]){ + if( isset($item[\SYSTEM\SQL\system_api::FIELD_PARENTVALUE]) && + $commands[count($commands)-1][1] != $item[\SYSTEM\SQL\system_api::FIELD_PARENTVALUE]){ continue;} - $commands[] = array($item,$params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]]); - $parentid = intval($item[\SYSTEM\DBD\system_api::FIELD_ID]); + $commands[] = array($item,$params[$item[\SYSTEM\SQL\system_api::FIELD_NAME]]); + $parentid = intval($item[\SYSTEM\SQL\system_api::FIELD_ID]); } } @@ -138,24 +138,24 @@ class api { private static function do_parameters($params,$tree,$parentid,$lastcommandvalue,$verifyclassname){ $parameters = array(); foreach($tree as $item){ - if( intval($item[\SYSTEM\DBD\system_api::FIELD_TYPE]) == \SYSTEM\DBD\system_api::VALUE_TYPE_PARAM && - intval($item[\SYSTEM\DBD\system_api::FIELD_PARENTID]) == $parentid){ + if( intval($item[\SYSTEM\SQL\system_api::FIELD_TYPE]) == \SYSTEM\SQL\system_api::VALUE_TYPE_PARAM && + intval($item[\SYSTEM\SQL\system_api::FIELD_PARENTID]) == $parentid){ //check parent value - if( isset($item[\SYSTEM\DBD\system_api::FIELD_PARENTVALUE]) && - $lastcommandvalue != $item[\SYSTEM\DBD\system_api::FIELD_PARENTVALUE]){ + if( isset($item[\SYSTEM\SQL\system_api::FIELD_PARENTVALUE]) && + $lastcommandvalue != $item[\SYSTEM\SQL\system_api::FIELD_PARENTVALUE]){ continue;} //all parameters are required - if(!isset($params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]])){ - throw new \SYSTEM\LOG\ERROR('Parameter missing: '.$item[\SYSTEM\DBD\system_api::FIELD_NAME]);} + if(!isset($params[$item[\SYSTEM\SQL\system_api::FIELD_NAME]])){ + throw new \SYSTEM\LOG\ERROR('Parameter missing: '.$item[\SYSTEM\SQL\system_api::FIELD_NAME]);} //verify parameter - if( !method_exists($verifyclassname, $item[\SYSTEM\DBD\system_api::FIELD_VERIFY]) || - !call_user_func(array($verifyclassname,$item[\SYSTEM\DBD\system_api::FIELD_VERIFY]),$params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]])){ - throw new \SYSTEM\LOG\ERROR('Parameter type missmacht or Missing Verifier. Param: '.$item[\SYSTEM\DBD\system_api::FIELD_NAME].' Verifier: '.$item[\SYSTEM\DBD\system_api::FIELD_VERIFY]);} + if( !method_exists($verifyclassname, $item[\SYSTEM\SQL\system_api::FIELD_VERIFY]) || + !call_user_func(array($verifyclassname,$item[\SYSTEM\SQL\system_api::FIELD_VERIFY]),$params[$item[\SYSTEM\SQL\system_api::FIELD_NAME]])){ + throw new \SYSTEM\LOG\ERROR('Parameter type missmacht or Missing Verifier. Param: '.$item[\SYSTEM\SQL\system_api::FIELD_NAME].' Verifier: '.$item[\SYSTEM\SQL\system_api::FIELD_VERIFY]);} - $parameters[] = array($item, $params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]]); + $parameters[] = array($item, $params[$item[\SYSTEM\SQL\system_api::FIELD_NAME]]); } } @@ -165,24 +165,24 @@ class api { private static function do_parameters_opt($params,$tree,$parentid,$lastcommandvalue,$verifyclassname){ $parameters_opt = array(); foreach($tree as $item){ - if( intval($item[\SYSTEM\DBD\system_api::FIELD_TYPE]) == \SYSTEM\DBD\system_api::VALUE_TYPE_PARAM_OPT && - intval($item[\SYSTEM\DBD\system_api::FIELD_PARENTID]) == $parentid){ + if( intval($item[\SYSTEM\SQL\system_api::FIELD_TYPE]) == \SYSTEM\SQL\system_api::VALUE_TYPE_PARAM_OPT && + intval($item[\SYSTEM\SQL\system_api::FIELD_PARENTID]) == $parentid){ //check parent value - if( isset($item[\SYSTEM\DBD\system_api::FIELD_PARENTVALUE]) && - $lastcommandvalue != $item[\SYSTEM\DBD\system_api::FIELD_PARENTVALUE]){ + if( isset($item[\SYSTEM\SQL\system_api::FIELD_PARENTVALUE]) && + $lastcommandvalue != $item[\SYSTEM\SQL\system_api::FIELD_PARENTVALUE]){ continue;} //all parameters are NOT required - just continue - if(!isset($params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]])){ + if(!isset($params[$item[\SYSTEM\SQL\system_api::FIELD_NAME]])){ continue;} //verify parameter - if( !method_exists($verifyclassname, $item[\SYSTEM\DBD\system_api::FIELD_VERIFY]) || - !call_user_func(array($verifyclassname,$item[\SYSTEM\DBD\system_api::FIELD_VERIFY]),$params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]])){ - throw new \SYSTEM\LOG\ERROR('Parameter type missmacht or Missing Verifier. Param: '.$item[\SYSTEM\DBD\system_api::FIELD_NAME].' Verifier: '.$item[\SYSTEM\DBD\system_api::FIELD_VERIFY]);} + if( !method_exists($verifyclassname, $item[\SYSTEM\SQL\system_api::FIELD_VERIFY]) || + !call_user_func(array($verifyclassname,$item[\SYSTEM\SQL\system_api::FIELD_VERIFY]),$params[$item[\SYSTEM\SQL\system_api::FIELD_NAME]])){ + throw new \SYSTEM\LOG\ERROR('Parameter type missmacht or Missing Verifier. Param: '.$item[\SYSTEM\SQL\system_api::FIELD_NAME].' Verifier: '.$item[\SYSTEM\SQL\system_api::FIELD_VERIFY]);} - $parameters_opt[] = array($item, $params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]]); + $parameters_opt[] = array($item, $params[$item[\SYSTEM\SQL\system_api::FIELD_NAME]]); } } @@ -195,10 +195,10 @@ class api { if(!\preg_match('^[0-9A-Za-z_]+$^', $com[1])){ throw new \SYSTEM\LOG\ERROR('Call Command can only have letters! command: '.$com[0]['name'].'; value: '.$com[1]);} - if($com[0][\SYSTEM\DBD\system_api::FIELD_TYPE] == \SYSTEM\DBD\system_api::VALUE_TYPE_COMMAND_FLAG){ - $call_funcname .= '_flag_'.$com[0][\SYSTEM\DBD\system_api::FIELD_NAME]; + if($com[0][\SYSTEM\SQL\system_api::FIELD_TYPE] == \SYSTEM\SQL\system_api::VALUE_TYPE_COMMAND_FLAG){ + $call_funcname .= '_flag_'.$com[0][\SYSTEM\SQL\system_api::FIELD_NAME]; } else { - $call_funcname .= '_'.$com[0][\SYSTEM\DBD\system_api::FIELD_NAME].'_'.\strtolower($com[1]);} + $call_funcname .= '_'.$com[0][\SYSTEM\SQL\system_api::FIELD_NAME].'_'.\strtolower($com[1]);} } $call_funcname = substr($call_funcname, 1); //strip leading _ diff --git a/api/autoload.inc b/api/autoload.inc index cf0349d..517a79c 100644 --- a/api/autoload.inc +++ b/api/autoload.inc @@ -1,3 +1,3 @@ next()){ //check module - if(!self::check($cron[\SYSTEM\DBD\system_cron::FIELD_CLASS])){ - self::status($cron[\SYSTEM\DBD\system_cron::FIELD_CLASS], \SYSTEM\CRON\cronstatus::CRON_STATUS_FAIL_CLASS); + if(!self::check($cron[\SYSTEM\SQL\system_cron::FIELD_CLASS])){ + self::status($cron[\SYSTEM\SQL\system_cron::FIELD_CLASS], \SYSTEM\CRON\cronstatus::CRON_STATUS_FAIL_CLASS); continue;} //time to execute? - if(!\SYSTEM\CRON\crontime::check_now( strtotime($cron[\SYSTEM\DBD\system_cron::FIELD_LAST_RUN]), - $cron[\SYSTEM\DBD\system_cron::FIELD_MIN], - $cron[\SYSTEM\DBD\system_cron::FIELD_HOUR], - $cron[\SYSTEM\DBD\system_cron::FIELD_DAY], - $cron[\SYSTEM\DBD\system_cron::FIELD_DAY_WEEK], - $cron[\SYSTEM\DBD\system_cron::FIELD_MONTH])){ + if(!\SYSTEM\CRON\crontime::check_now( strtotime($cron[\SYSTEM\SQL\system_cron::FIELD_LAST_RUN]), + $cron[\SYSTEM\SQL\system_cron::FIELD_MIN], + $cron[\SYSTEM\SQL\system_cron::FIELD_HOUR], + $cron[\SYSTEM\SQL\system_cron::FIELD_DAY], + $cron[\SYSTEM\SQL\system_cron::FIELD_DAY_WEEK], + $cron[\SYSTEM\SQL\system_cron::FIELD_MONTH])){ continue;} //Status is ok? - if($cron[\SYSTEM\DBD\system_cron::FIELD_STATUS] != \SYSTEM\CRON\cronstatus::CRON_STATUS_SUCCESFULLY){ - new \SYSTEM\LOG\CRON('Cron for Class '.$cron[\SYSTEM\DBD\system_cron::FIELD_CLASS].' could not execute cuz Status aint good: '. \SYSTEM\CRON\cronstatus::text($cron[\SYSTEM\DBD\system_cron::FIELD_STATUS])); + if($cron[\SYSTEM\SQL\system_cron::FIELD_STATUS] != \SYSTEM\CRON\cronstatus::CRON_STATUS_SUCCESFULLY){ + new \SYSTEM\LOG\CRON('Cron for Class '.$cron[\SYSTEM\SQL\system_cron::FIELD_CLASS].' could not execute cuz Status aint good: '. \SYSTEM\CRON\cronstatus::text($cron[\SYSTEM\SQL\system_cron::FIELD_STATUS])); continue;} //set running - self::status($cron[\SYSTEM\DBD\system_cron::FIELD_CLASS], \SYSTEM\CRON\cronstatus::CRON_STATUS_RUNNING); - self::status($cron[\SYSTEM\DBD\system_cron::FIELD_CLASS], call_user_func(array($cron[\SYSTEM\DBD\system_cron::FIELD_CLASS],'run'))); + self::status($cron[\SYSTEM\SQL\system_cron::FIELD_CLASS], \SYSTEM\CRON\cronstatus::CRON_STATUS_RUNNING); + self::status($cron[\SYSTEM\SQL\system_cron::FIELD_CLASS], call_user_func(array($cron[\SYSTEM\SQL\system_cron::FIELD_CLASS],'run'))); } return \SYSTEM\LOG\JsonResult::ok(); } public static function next($class){ - $cron = \SYSTEM\DBD\SYS_CRON_GET::Q1(array($class)); + $cron = \SYSTEM\SQL\SYS_CRON_GET::Q1(array($class)); //check module - if(!self::check($cron[\SYSTEM\DBD\system_cron::FIELD_CLASS])){ + if(!self::check($cron[\SYSTEM\SQL\system_cron::FIELD_CLASS])){ throw new \SYSTEM\LOG\ERROR("Given class is not a cronjob");} //time - return \SYSTEM\CRON\crontime::next( strtotime($cron[\SYSTEM\DBD\system_cron::FIELD_LAST_RUN]), - $cron[\SYSTEM\DBD\system_cron::FIELD_MIN], - $cron[\SYSTEM\DBD\system_cron::FIELD_HOUR], - $cron[\SYSTEM\DBD\system_cron::FIELD_DAY], - $cron[\SYSTEM\DBD\system_cron::FIELD_DAY_WEEK], - $cron[\SYSTEM\DBD\system_cron::FIELD_MONTH]); + return \SYSTEM\CRON\crontime::next( strtotime($cron[\SYSTEM\SQL\system_cron::FIELD_LAST_RUN]), + $cron[\SYSTEM\SQL\system_cron::FIELD_MIN], + $cron[\SYSTEM\SQL\system_cron::FIELD_HOUR], + $cron[\SYSTEM\SQL\system_cron::FIELD_DAY], + $cron[\SYSTEM\SQL\system_cron::FIELD_DAY_WEEK], + $cron[\SYSTEM\SQL\system_cron::FIELD_MONTH]); } private static function status($class, $status){ //new \SYSTEM\LOG\CRON('Cron Status for Class '.$class.' updated to: '. \SYSTEM\CRON\cronstatus::text($status)); - return \SYSTEM\DBD\SYS_CRON_UPD::QI(array($status,time(),$class));} + return \SYSTEM\SQL\SYS_CRON_UPD::QI(array($status,time(),$class));} public static function last_visit(){ - return \SYSTEM\DBD\SYS_CRON_LAST_VISIT::Q1()['time'];} + return \SYSTEM\SQL\SYS_CRON_LAST_VISIT::Q1()['time'];} } \ No newline at end of file diff --git a/cron/cron_cache_delete.php b/cron/cron_cache_delete.php index 6b14080..e961f5e 100644 --- a/cron/cron_cache_delete.php +++ b/cron/cron_cache_delete.php @@ -2,7 +2,7 @@ namespace SYSTEM\CRON; class cron_cache_delete extends \SYSTEM\CRON\cronjob{ public static function run(){ - if(!\SYSTEM\DBD\SYS_CACHE_DELETE_ALL::QI()){ + if(!\SYSTEM\SQL\SYS_CACHE_DELETE_ALL::QI()){ return cronstatus::CRON_STATUS_FAIL;} return cronstatus::CRON_STATUS_SUCCESFULLY; } diff --git a/cron/cron_log2sqlite.php b/cron/cron_log2sqlite.php index 3ebd42f..c239120 100644 --- a/cron/cron_log2sqlite.php +++ b/cron/cron_log2sqlite.php @@ -3,7 +3,7 @@ namespace SYSTEM\CRON; class cron_log2sqlite extends \SYSTEM\CRON\cronjob{ public static function run(){ //find oldest value - $oldest = \SYSTEM\DBD\SYS_LOG_OLDEST::Q1(); + $oldest = \SYSTEM\SQL\SYS_LOG_OLDEST::Q1(); list( $now_month, $now_year ) = preg_split( "/ /", date("m Y")); //All fine -> abort if( $oldest['year'] >= $now_year && @@ -40,11 +40,11 @@ class cron_log2sqlite extends \SYSTEM\CRON\cronjob{ //write data as trasaction $con->exec('begin transaction'); set_time_limit(30); - $res = \SYSTEM\DBD\SYS_LOG_MONTH::QQ(array($oldest['month'],$oldest['year'])); + $res = \SYSTEM\SQL\SYS_LOG_MONTH::QQ(array($oldest['month'],$oldest['year'])); while($row = $res->next()){ set_time_limit(30); $row['time'] = array_key_exists('time_pg', $row) ? date("Y-m-d H:i:s", $row['time_pg']) : $row['time']; - if(!$con->exec('INSERT OR IGNORE INTO '.\SYSTEM\DBD\system_log::NAME_MYS. + if(!$con->exec('INSERT OR IGNORE INTO '.\SYSTEM\SQL\system_log::NAME_MYS. '(`ID`, `class`, `message`, `code`, `file`, `line`, `trace`, `ip`, `querytime`, `time`,'. ' `server_name`, `server_port`, `request_uri`, `post`,'. ' `http_referer`, `http_user_agent`, `user`, `thrown`)'. @@ -57,7 +57,7 @@ class cron_log2sqlite extends \SYSTEM\CRON\cronjob{ return cronstatus::CRON_STATUS_FAIL; } //Delete single - if(!\SYSTEM\DBD\SYS_LOG_DEL::QI(array($row['ID']))){ + if(!\SYSTEM\SQL\SYS_LOG_DEL::QI(array($row['ID']))){ new \SYSTEM\LOG\ERROR('failed to delete log entries'); return cronstatus::CRON_STATUS_FAIL;} } diff --git a/cron/qq/SYS_CRON_GET.php b/cron/qq/SYS_CRON_GET.php index ba846c6..4e4db55 100644 --- a/cron/qq/SYS_CRON_GET.php +++ b/cron/qq/SYS_CRON_GET.php @@ -1,11 +1,11 @@ 0, \DBD\APITable::FIELD_FLAG =>0, \DBD\APITable::FIELD_PARENTID =>-1, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'call', \DBD\APITable::FIELD_ALLOWEDVALUES =>NULL), - array(\DBD\APITable::FIELD_ID => 45, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>1, \DBD\APITable::FIELD_PARENTVALUE =>'geopoint', \DBD\APITable::FIELD_NAME =>'datatype', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 120, \DBD\APITable::FIELD_FLAG =>0, \DBD\APITable::FIELD_PARENTID =>60, \DBD\APITable::FIELD_PARENTVALUE =>'login', \DBD\APITable::FIELD_NAME =>'compatibility', \DBD\APITable::FIELD_ALLOWEDVALUES =>'FLAG'), - array(\DBD\APITable::FIELD_ID => 5, \DBD\APITable::FIELD_FLAG =>0, \DBD\APITable::FIELD_PARENTID =>0, \DBD\APITable::FIELD_PARENTVALUE =>'map', \DBD\APITable::FIELD_NAME =>'algo', \DBD\APITable::FIELD_ALLOWEDVALUES =>NULL), - array(\DBD\APITable::FIELD_ID => 6, \DBD\APITable::FIELD_FLAG =>0, \DBD\APITable::FIELD_PARENTID =>5, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'key', \DBD\APITable::FIELD_ALLOWEDVALUES =>'FLAG'), - array(\DBD\APITable::FIELD_ID => 16, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>6, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'type', \DBD\APITable::FIELD_ALLOWEDVALUES =>'SENSORTYPE'), - array(\DBD\APITable::FIELD_ID => 7, \DBD\APITable::FIELD_FLAG =>0, \DBD\APITable::FIELD_PARENTID =>5, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'markers', \DBD\APITable::FIELD_ALLOWEDVALUES =>'FLAG'), - array(\DBD\APITable::FIELD_ID => 8, \DBD\APITable::FIELD_FLAG =>0, \DBD\APITable::FIELD_PARENTID =>5, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'animation', \DBD\APITable::FIELD_ALLOWEDVALUES =>'FLAG'), - array(\DBD\APITable::FIELD_ID => 17, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>7, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'x', \DBD\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPCOORD'), - array(\DBD\APITable::FIELD_ID => 18, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>7, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'y', \DBD\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPCOORD'), - array(\DBD\APITable::FIELD_ID => 19, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>7, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'zoom', \DBD\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPZOOM'), - array(\DBD\APITable::FIELD_ID => 20, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>7, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'from', \DBD\APITable::FIELD_ALLOWEDVALUES =>'WIERDTIMESTAMP'), - array(\DBD\APITable::FIELD_ID => 21, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>7, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'to', \DBD\APITable::FIELD_ALLOWEDVALUES =>'WIERDTIMESTAMP'), - array(\DBD\APITable::FIELD_ID => 22, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>7, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'type', \DBD\APITable::FIELD_ALLOWEDVALUES =>'SENSORTYPE'), - array(\DBD\APITable::FIELD_ID => 23, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>7, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'provider', \DBD\APITable::FIELD_ALLOWEDVALUES =>'SENSORPROVIDER'), - array(\DBD\APITable::FIELD_ID => 9, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>5, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'x', \DBD\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPCOORD'), - array(\DBD\APITable::FIELD_ID => 10, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>5, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'y', \DBD\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPCOORD'), - array(\DBD\APITable::FIELD_ID => 11, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>5, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'zoom', \DBD\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPZOOM'), - array(\DBD\APITable::FIELD_ID => 12, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>5, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'from', \DBD\APITable::FIELD_ALLOWEDVALUES =>'WIERDTIMESTAMP'), - array(\DBD\APITable::FIELD_ID => 13, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>5, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'to', \DBD\APITable::FIELD_ALLOWEDVALUES =>'WIERDTIMESTAMP'), - array(\DBD\APITable::FIELD_ID => 14, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>5, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'type', \DBD\APITable::FIELD_ALLOWEDVALUES =>'SENSORTYPE'), - array(\DBD\APITable::FIELD_ID => 15, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>5, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'provider', \DBD\APITable::FIELD_ALLOWEDVALUES =>'SENSORPROVIDER'), - array(\DBD\APITable::FIELD_ID => 132, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>130, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'password', \DBD\APITable::FIELD_ALLOWEDVALUES =>'PASSWORD'), - array(\DBD\APITable::FIELD_ID => 111, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>110, \DBD\APITable::FIELD_PARENTVALUE =>'data', \DBD\APITable::FIELD_NAME =>'source', \DBD\APITable::FIELD_ALLOWEDVALUES =>'INPUTSOURCE'), - array(\DBD\APITable::FIELD_ID => 110, \DBD\APITable::FIELD_FLAG =>0, \DBD\APITable::FIELD_PARENTID =>0, \DBD\APITable::FIELD_PARENTVALUE =>'input', \DBD\APITable::FIELD_NAME =>'type', \DBD\APITable::FIELD_ALLOWEDVALUES =>NULL), - array(\DBD\APITable::FIELD_ID => 131, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>130, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'username', \DBD\APITable::FIELD_ALLOWEDVALUES =>'USERNAME'), - array(\DBD\APITable::FIELD_ID => 130, \DBD\APITable::FIELD_FLAG =>0, \DBD\APITable::FIELD_PARENTID =>60, \DBD\APITable::FIELD_PARENTVALUE =>'create', \DBD\APITable::FIELD_NAME =>'compatibility', \DBD\APITable::FIELD_ALLOWEDVALUES =>'FLAG'), - array(\DBD\APITable::FIELD_ID => 126, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>125, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'username', \DBD\APITable::FIELD_ALLOWEDVALUES =>'USERNAME'), - array(\DBD\APITable::FIELD_ID => 125, \DBD\APITable::FIELD_FLAG =>0, \DBD\APITable::FIELD_PARENTID =>60, \DBD\APITable::FIELD_PARENTVALUE =>'available', \DBD\APITable::FIELD_NAME =>'compatibility', \DBD\APITable::FIELD_ALLOWEDVALUES =>'FLAG'), - array(\DBD\APITable::FIELD_ID => 123, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>120, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'hashed', \DBD\APITable::FIELD_ALLOWEDVALUES =>'BOOL'), - array(\DBD\APITable::FIELD_ID => 122, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>120, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'password', \DBD\APITable::FIELD_ALLOWEDVALUES =>'PASSWORD'), - array(\DBD\APITable::FIELD_ID => 121, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>120, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'username', \DBD\APITable::FIELD_ALLOWEDVALUES =>'USERNAME'), - array(\DBD\APITable::FIELD_ID => 34, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>8, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'x', \DBD\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPCOORD'), - array(\DBD\APITable::FIELD_ID => 35, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>8, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'y', \DBD\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPCOORD'), - array(\DBD\APITable::FIELD_ID => 36, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>8, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'zoom', \DBD\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPZOOM'), - array(\DBD\APITable::FIELD_ID => 37, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>8, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'from', \DBD\APITable::FIELD_ALLOWEDVALUES =>'WIERDTIMESTAMP'), - array(\DBD\APITable::FIELD_ID => 38, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>8, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'to', \DBD\APITable::FIELD_ALLOWEDVALUES =>'WIERDTIMESTAMP'), - array(\DBD\APITable::FIELD_ID => 39, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>8, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'type', \DBD\APITable::FIELD_ALLOWEDVALUES =>'SENSORTYPE'), - array(\DBD\APITable::FIELD_ID => 40, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>8, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'provider', \DBD\APITable::FIELD_ALLOWEDVALUES =>'SENSORPROVIDER'), - array(\DBD\APITable::FIELD_ID => 43, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>1, \DBD\APITable::FIELD_PARENTVALUE =>'geopoint', \DBD\APITable::FIELD_NAME =>'radius', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 42, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>1, \DBD\APITable::FIELD_PARENTVALUE =>'geopoint', \DBD\APITable::FIELD_NAME =>'long', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 41, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>1, \DBD\APITable::FIELD_PARENTVALUE =>'geopoint', \DBD\APITable::FIELD_NAME =>'lat', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 60, \DBD\APITable::FIELD_FLAG =>0, \DBD\APITable::FIELD_PARENTID =>0, \DBD\APITable::FIELD_PARENTVALUE =>'account', \DBD\APITable::FIELD_NAME =>'action', \DBD\APITable::FIELD_ALLOWEDVALUES =>NULL), - array(\DBD\APITable::FIELD_ID => 140, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>1, \DBD\APITable::FIELD_PARENTVALUE =>'sensor', \DBD\APITable::FIELD_NAME =>'sensorid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'INT'), - array(\DBD\APITable::FIELD_ID => 1, \DBD\APITable::FIELD_FLAG =>0, \DBD\APITable::FIELD_PARENTID =>0, \DBD\APITable::FIELD_PARENTVALUE =>'page', \DBD\APITable::FIELD_NAME =>'page', \DBD\APITable::FIELD_ALLOWEDVALUES =>NULL), - array(\DBD\APITable::FIELD_ID => 47, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>46, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'lat', \DBD\APITable::FIELD_ALLOWEDVALUES =>'LATLONCOORD'), - array(\DBD\APITable::FIELD_ID => 48, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>46, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'long', \DBD\APITable::FIELD_ALLOWEDVALUES =>'LATLONCOORD'), - array(\DBD\APITable::FIELD_ID => 49, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>46, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'radius', \DBD\APITable::FIELD_ALLOWEDVALUES =>'UINT'), - array(\DBD\APITable::FIELD_ID => 61, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>60, \DBD\APITable::FIELD_PARENTVALUE =>'login', \DBD\APITable::FIELD_NAME =>'username', \DBD\APITable::FIELD_ALLOWEDVALUES =>'USERNAME'), - array(\DBD\APITable::FIELD_ID => 51, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>46, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'datatype', \DBD\APITable::FIELD_ALLOWEDVALUES =>'SENSORTYPE'), - array(\DBD\APITable::FIELD_ID => 62, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>60, \DBD\APITable::FIELD_PARENTVALUE =>'login', \DBD\APITable::FIELD_NAME =>'password', \DBD\APITable::FIELD_ALLOWEDVALUES =>'PASSWORD'), - array(\DBD\APITable::FIELD_ID => 63, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>60, \DBD\APITable::FIELD_PARENTVALUE =>'login', \DBD\APITable::FIELD_NAME =>'hashed', \DBD\APITable::FIELD_ALLOWEDVALUES =>'BOOL'), - array(\DBD\APITable::FIELD_ID => 64, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>60, \DBD\APITable::FIELD_PARENTVALUE =>'check', \DBD\APITable::FIELD_NAME =>'rightid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'UINT'), - array(\DBD\APITable::FIELD_ID => 65, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>60, \DBD\APITable::FIELD_PARENTVALUE =>'create', \DBD\APITable::FIELD_NAME =>'username', \DBD\APITable::FIELD_ALLOWEDVALUES =>'USERNAME'), - array(\DBD\APITable::FIELD_ID => 66, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>60, \DBD\APITable::FIELD_PARENTVALUE =>'create', \DBD\APITable::FIELD_NAME =>'password', \DBD\APITable::FIELD_ALLOWEDVALUES =>'PASSWORD'), - array(\DBD\APITable::FIELD_ID => 67, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>60, \DBD\APITable::FIELD_PARENTVALUE =>'create', \DBD\APITable::FIELD_NAME =>'email', \DBD\APITable::FIELD_ALLOWEDVALUES =>'EMAIL'), - array(\DBD\APITable::FIELD_ID => 68, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>60, \DBD\APITable::FIELD_PARENTVALUE =>'create', \DBD\APITable::FIELD_NAME =>'hashed', \DBD\APITable::FIELD_ALLOWEDVALUES =>'BOOL'), - array(\DBD\APITable::FIELD_ID => 70, \DBD\APITable::FIELD_FLAG =>0, \DBD\APITable::FIELD_PARENTID =>0, \DBD\APITable::FIELD_PARENTVALUE =>'analysis', \DBD\APITable::FIELD_NAME =>'action', \DBD\APITable::FIELD_ALLOWEDVALUES =>NULL), - array(\DBD\APITable::FIELD_ID => 71, \DBD\APITable::FIELD_FLAG =>0, \DBD\APITable::FIELD_PARENTID =>70, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'mthd', \DBD\APITable::FIELD_ALLOWEDVALUES =>NULL), - array(\DBD\APITable::FIELD_ID => 72, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'within', \DBD\APITable::FIELD_NAME =>'lat', \DBD\APITable::FIELD_ALLOWEDVALUES =>'LATLONCOORD'), - array(\DBD\APITable::FIELD_ID => 73, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'within', \DBD\APITable::FIELD_NAME =>'lng', \DBD\APITable::FIELD_ALLOWEDVALUES =>'LATLONCOORD'), - array(\DBD\APITable::FIELD_ID => 74, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'within', \DBD\APITable::FIELD_NAME =>'when', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 75, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'gettotal', \DBD\APITable::FIELD_NAME =>'useruid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 76, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'gettotal', \DBD\APITable::FIELD_NAME =>'intval', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 77, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'getseries', \DBD\APITable::FIELD_NAME =>'useruid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 78, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'projection24', \DBD\APITable::FIELD_NAME =>'useruid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 79, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'projection24', \DBD\APITable::FIELD_NAME =>'intval', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 80, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'get', \DBD\APITable::FIELD_NAME =>'useruid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 81, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'get', \DBD\APITable::FIELD_NAME =>'acronym', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 82, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'gethist', \DBD\APITable::FIELD_NAME =>'useruid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 83, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'gethist', \DBD\APITable::FIELD_NAME =>'sort', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 84, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'is', \DBD\APITable::FIELD_NAME =>'useruid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 85, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'is', \DBD\APITable::FIELD_NAME =>'acronym', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 86, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'getbyuser', \DBD\APITable::FIELD_NAME =>'useruid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 87, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'getallcond', \DBD\APITable::FIELD_NAME =>'useruid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 88, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'getallcond', \DBD\APITable::FIELD_NAME =>'acronym', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 89, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'getalldefs', \DBD\APITable::FIELD_NAME =>'useruid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 90, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'getalldefs', \DBD\APITable::FIELD_NAME =>'acronym', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 91, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'all', \DBD\APITable::FIELD_NAME =>'useruid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 92, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'all', \DBD\APITable::FIELD_NAME =>'last', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 93, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'own', \DBD\APITable::FIELD_NAME =>'useruid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 94, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'own', \DBD\APITable::FIELD_NAME =>'last', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 95, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'register', \DBD\APITable::FIELD_NAME =>'useruid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 96, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'register', \DBD\APITable::FIELD_NAME =>'regid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 97, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'register', \DBD\APITable::FIELD_NAME =>'deviceid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 98, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'fetch', \DBD\APITable::FIELD_NAME =>'useruid', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 99, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'fetch', \DBD\APITable::FIELD_NAME =>'last', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 100, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'explore', \DBD\APITable::FIELD_NAME =>'lat', \DBD\APITable::FIELD_ALLOWEDVALUES =>'LATLONCOORD'), - array(\DBD\APITable::FIELD_ID => 101, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'explore', \DBD\APITable::FIELD_NAME =>'lng', \DBD\APITable::FIELD_ALLOWEDVALUES =>'LATLONCOORD'), - array(\DBD\APITable::FIELD_ID => 102, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'explore', \DBD\APITable::FIELD_NAME =>'radius', \DBD\APITable::FIELD_ALLOWEDVALUES =>'UINT'), - array(\DBD\APITable::FIELD_ID => 103, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'explore', \DBD\APITable::FIELD_NAME =>'endtime', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 104, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>71, \DBD\APITable::FIELD_PARENTVALUE =>'citybyzip', \DBD\APITable::FIELD_NAME =>'zip', \DBD\APITable::FIELD_ALLOWEDVALUES =>'ALL'), - array(\DBD\APITable::FIELD_ID => 112, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>110, \DBD\APITable::FIELD_PARENTVALUE =>'data', \DBD\APITable::FIELD_NAME =>'json', \DBD\APITable::FIELD_ALLOWEDVALUES =>'JSON'), - array(\DBD\APITable::FIELD_ID => 113, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>110, \DBD\APITable::FIELD_PARENTVALUE =>'deviceinfo', \DBD\APITable::FIELD_NAME =>'json', \DBD\APITable::FIELD_ALLOWEDVALUES =>'JSON'), - array(\DBD\APITable::FIELD_ID => 133, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>130, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'email', \DBD\APITable::FIELD_ALLOWEDVALUES =>'EMAIL'), - array(\DBD\APITable::FIELD_ID => 134, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>130, \DBD\APITable::FIELD_PARENTVALUE =>NULL, \DBD\APITable::FIELD_NAME =>'hashed', \DBD\APITable::FIELD_ALLOWEDVALUES =>'BOOL'), - array(\DBD\APITable::FIELD_ID => 135, \DBD\APITable::FIELD_FLAG =>1, \DBD\APITable::FIELD_PARENTID =>0, \DBD\APITable::FIELD_PARENTVALUE =>'log', \DBD\APITable::FIELD_NAME =>'json', \DBD\APITable::FIELD_ALLOWEDVALUES =>'JSON'), - array(\DBD\APITable::FIELD_ID => 46, \DBD\APITable::FIELD_FLAG =>0, \DBD\APITable::FIELD_PARENTID =>1, \DBD\APITable::FIELD_PARENTVALUE =>'geopoint', \DBD\APITable::FIELD_NAME =>'explore', \DBD\APITable::FIELD_ALLOWEDVALUES =>'FLAG'));*/ +/*$call = array( array(\SQL\APITable::FIELD_ID => 0, \SQL\APITable::FIELD_FLAG =>0, \SQL\APITable::FIELD_PARENTID =>-1, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'call', \SQL\APITable::FIELD_ALLOWEDVALUES =>NULL), + array(\SQL\APITable::FIELD_ID => 45, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>1, \SQL\APITable::FIELD_PARENTVALUE =>'geopoint', \SQL\APITable::FIELD_NAME =>'datatype', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 120, \SQL\APITable::FIELD_FLAG =>0, \SQL\APITable::FIELD_PARENTID =>60, \SQL\APITable::FIELD_PARENTVALUE =>'login', \SQL\APITable::FIELD_NAME =>'compatibility', \SQL\APITable::FIELD_ALLOWEDVALUES =>'FLAG'), + array(\SQL\APITable::FIELD_ID => 5, \SQL\APITable::FIELD_FLAG =>0, \SQL\APITable::FIELD_PARENTID =>0, \SQL\APITable::FIELD_PARENTVALUE =>'map', \SQL\APITable::FIELD_NAME =>'algo', \SQL\APITable::FIELD_ALLOWEDVALUES =>NULL), + array(\SQL\APITable::FIELD_ID => 6, \SQL\APITable::FIELD_FLAG =>0, \SQL\APITable::FIELD_PARENTID =>5, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'key', \SQL\APITable::FIELD_ALLOWEDVALUES =>'FLAG'), + array(\SQL\APITable::FIELD_ID => 16, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>6, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'type', \SQL\APITable::FIELD_ALLOWEDVALUES =>'SENSORTYPE'), + array(\SQL\APITable::FIELD_ID => 7, \SQL\APITable::FIELD_FLAG =>0, \SQL\APITable::FIELD_PARENTID =>5, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'markers', \SQL\APITable::FIELD_ALLOWEDVALUES =>'FLAG'), + array(\SQL\APITable::FIELD_ID => 8, \SQL\APITable::FIELD_FLAG =>0, \SQL\APITable::FIELD_PARENTID =>5, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'animation', \SQL\APITable::FIELD_ALLOWEDVALUES =>'FLAG'), + array(\SQL\APITable::FIELD_ID => 17, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>7, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'x', \SQL\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPCOORD'), + array(\SQL\APITable::FIELD_ID => 18, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>7, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'y', \SQL\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPCOORD'), + array(\SQL\APITable::FIELD_ID => 19, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>7, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'zoom', \SQL\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPZOOM'), + array(\SQL\APITable::FIELD_ID => 20, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>7, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'from', \SQL\APITable::FIELD_ALLOWEDVALUES =>'WIERDTIMESTAMP'), + array(\SQL\APITable::FIELD_ID => 21, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>7, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'to', \SQL\APITable::FIELD_ALLOWEDVALUES =>'WIERDTIMESTAMP'), + array(\SQL\APITable::FIELD_ID => 22, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>7, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'type', \SQL\APITable::FIELD_ALLOWEDVALUES =>'SENSORTYPE'), + array(\SQL\APITable::FIELD_ID => 23, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>7, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'provider', \SQL\APITable::FIELD_ALLOWEDVALUES =>'SENSORPROVIDER'), + array(\SQL\APITable::FIELD_ID => 9, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>5, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'x', \SQL\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPCOORD'), + array(\SQL\APITable::FIELD_ID => 10, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>5, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'y', \SQL\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPCOORD'), + array(\SQL\APITable::FIELD_ID => 11, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>5, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'zoom', \SQL\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPZOOM'), + array(\SQL\APITable::FIELD_ID => 12, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>5, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'from', \SQL\APITable::FIELD_ALLOWEDVALUES =>'WIERDTIMESTAMP'), + array(\SQL\APITable::FIELD_ID => 13, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>5, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'to', \SQL\APITable::FIELD_ALLOWEDVALUES =>'WIERDTIMESTAMP'), + array(\SQL\APITable::FIELD_ID => 14, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>5, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'type', \SQL\APITable::FIELD_ALLOWEDVALUES =>'SENSORTYPE'), + array(\SQL\APITable::FIELD_ID => 15, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>5, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'provider', \SQL\APITable::FIELD_ALLOWEDVALUES =>'SENSORPROVIDER'), + array(\SQL\APITable::FIELD_ID => 132, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>130, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'password', \SQL\APITable::FIELD_ALLOWEDVALUES =>'PASSWORD'), + array(\SQL\APITable::FIELD_ID => 111, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>110, \SQL\APITable::FIELD_PARENTVALUE =>'data', \SQL\APITable::FIELD_NAME =>'source', \SQL\APITable::FIELD_ALLOWEDVALUES =>'INPUTSOURCE'), + array(\SQL\APITable::FIELD_ID => 110, \SQL\APITable::FIELD_FLAG =>0, \SQL\APITable::FIELD_PARENTID =>0, \SQL\APITable::FIELD_PARENTVALUE =>'input', \SQL\APITable::FIELD_NAME =>'type', \SQL\APITable::FIELD_ALLOWEDVALUES =>NULL), + array(\SQL\APITable::FIELD_ID => 131, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>130, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'username', \SQL\APITable::FIELD_ALLOWEDVALUES =>'USERNAME'), + array(\SQL\APITable::FIELD_ID => 130, \SQL\APITable::FIELD_FLAG =>0, \SQL\APITable::FIELD_PARENTID =>60, \SQL\APITable::FIELD_PARENTVALUE =>'create', \SQL\APITable::FIELD_NAME =>'compatibility', \SQL\APITable::FIELD_ALLOWEDVALUES =>'FLAG'), + array(\SQL\APITable::FIELD_ID => 126, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>125, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'username', \SQL\APITable::FIELD_ALLOWEDVALUES =>'USERNAME'), + array(\SQL\APITable::FIELD_ID => 125, \SQL\APITable::FIELD_FLAG =>0, \SQL\APITable::FIELD_PARENTID =>60, \SQL\APITable::FIELD_PARENTVALUE =>'available', \SQL\APITable::FIELD_NAME =>'compatibility', \SQL\APITable::FIELD_ALLOWEDVALUES =>'FLAG'), + array(\SQL\APITable::FIELD_ID => 123, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>120, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'hashed', \SQL\APITable::FIELD_ALLOWEDVALUES =>'BOOL'), + array(\SQL\APITable::FIELD_ID => 122, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>120, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'password', \SQL\APITable::FIELD_ALLOWEDVALUES =>'PASSWORD'), + array(\SQL\APITable::FIELD_ID => 121, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>120, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'username', \SQL\APITable::FIELD_ALLOWEDVALUES =>'USERNAME'), + array(\SQL\APITable::FIELD_ID => 34, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>8, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'x', \SQL\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPCOORD'), + array(\SQL\APITable::FIELD_ID => 35, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>8, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'y', \SQL\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPCOORD'), + array(\SQL\APITable::FIELD_ID => 36, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>8, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'zoom', \SQL\APITable::FIELD_ALLOWEDVALUES =>'GOOGLEMAPZOOM'), + array(\SQL\APITable::FIELD_ID => 37, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>8, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'from', \SQL\APITable::FIELD_ALLOWEDVALUES =>'WIERDTIMESTAMP'), + array(\SQL\APITable::FIELD_ID => 38, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>8, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'to', \SQL\APITable::FIELD_ALLOWEDVALUES =>'WIERDTIMESTAMP'), + array(\SQL\APITable::FIELD_ID => 39, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>8, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'type', \SQL\APITable::FIELD_ALLOWEDVALUES =>'SENSORTYPE'), + array(\SQL\APITable::FIELD_ID => 40, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>8, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'provider', \SQL\APITable::FIELD_ALLOWEDVALUES =>'SENSORPROVIDER'), + array(\SQL\APITable::FIELD_ID => 43, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>1, \SQL\APITable::FIELD_PARENTVALUE =>'geopoint', \SQL\APITable::FIELD_NAME =>'radius', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 42, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>1, \SQL\APITable::FIELD_PARENTVALUE =>'geopoint', \SQL\APITable::FIELD_NAME =>'long', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 41, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>1, \SQL\APITable::FIELD_PARENTVALUE =>'geopoint', \SQL\APITable::FIELD_NAME =>'lat', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 60, \SQL\APITable::FIELD_FLAG =>0, \SQL\APITable::FIELD_PARENTID =>0, \SQL\APITable::FIELD_PARENTVALUE =>'account', \SQL\APITable::FIELD_NAME =>'action', \SQL\APITable::FIELD_ALLOWEDVALUES =>NULL), + array(\SQL\APITable::FIELD_ID => 140, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>1, \SQL\APITable::FIELD_PARENTVALUE =>'sensor', \SQL\APITable::FIELD_NAME =>'sensorid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'INT'), + array(\SQL\APITable::FIELD_ID => 1, \SQL\APITable::FIELD_FLAG =>0, \SQL\APITable::FIELD_PARENTID =>0, \SQL\APITable::FIELD_PARENTVALUE =>'page', \SQL\APITable::FIELD_NAME =>'page', \SQL\APITable::FIELD_ALLOWEDVALUES =>NULL), + array(\SQL\APITable::FIELD_ID => 47, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>46, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'lat', \SQL\APITable::FIELD_ALLOWEDVALUES =>'LATLONCOORD'), + array(\SQL\APITable::FIELD_ID => 48, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>46, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'long', \SQL\APITable::FIELD_ALLOWEDVALUES =>'LATLONCOORD'), + array(\SQL\APITable::FIELD_ID => 49, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>46, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'radius', \SQL\APITable::FIELD_ALLOWEDVALUES =>'UINT'), + array(\SQL\APITable::FIELD_ID => 61, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>60, \SQL\APITable::FIELD_PARENTVALUE =>'login', \SQL\APITable::FIELD_NAME =>'username', \SQL\APITable::FIELD_ALLOWEDVALUES =>'USERNAME'), + array(\SQL\APITable::FIELD_ID => 51, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>46, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'datatype', \SQL\APITable::FIELD_ALLOWEDVALUES =>'SENSORTYPE'), + array(\SQL\APITable::FIELD_ID => 62, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>60, \SQL\APITable::FIELD_PARENTVALUE =>'login', \SQL\APITable::FIELD_NAME =>'password', \SQL\APITable::FIELD_ALLOWEDVALUES =>'PASSWORD'), + array(\SQL\APITable::FIELD_ID => 63, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>60, \SQL\APITable::FIELD_PARENTVALUE =>'login', \SQL\APITable::FIELD_NAME =>'hashed', \SQL\APITable::FIELD_ALLOWEDVALUES =>'BOOL'), + array(\SQL\APITable::FIELD_ID => 64, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>60, \SQL\APITable::FIELD_PARENTVALUE =>'check', \SQL\APITable::FIELD_NAME =>'rightid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'UINT'), + array(\SQL\APITable::FIELD_ID => 65, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>60, \SQL\APITable::FIELD_PARENTVALUE =>'create', \SQL\APITable::FIELD_NAME =>'username', \SQL\APITable::FIELD_ALLOWEDVALUES =>'USERNAME'), + array(\SQL\APITable::FIELD_ID => 66, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>60, \SQL\APITable::FIELD_PARENTVALUE =>'create', \SQL\APITable::FIELD_NAME =>'password', \SQL\APITable::FIELD_ALLOWEDVALUES =>'PASSWORD'), + array(\SQL\APITable::FIELD_ID => 67, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>60, \SQL\APITable::FIELD_PARENTVALUE =>'create', \SQL\APITable::FIELD_NAME =>'email', \SQL\APITable::FIELD_ALLOWEDVALUES =>'EMAIL'), + array(\SQL\APITable::FIELD_ID => 68, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>60, \SQL\APITable::FIELD_PARENTVALUE =>'create', \SQL\APITable::FIELD_NAME =>'hashed', \SQL\APITable::FIELD_ALLOWEDVALUES =>'BOOL'), + array(\SQL\APITable::FIELD_ID => 70, \SQL\APITable::FIELD_FLAG =>0, \SQL\APITable::FIELD_PARENTID =>0, \SQL\APITable::FIELD_PARENTVALUE =>'analysis', \SQL\APITable::FIELD_NAME =>'action', \SQL\APITable::FIELD_ALLOWEDVALUES =>NULL), + array(\SQL\APITable::FIELD_ID => 71, \SQL\APITable::FIELD_FLAG =>0, \SQL\APITable::FIELD_PARENTID =>70, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'mthd', \SQL\APITable::FIELD_ALLOWEDVALUES =>NULL), + array(\SQL\APITable::FIELD_ID => 72, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'within', \SQL\APITable::FIELD_NAME =>'lat', \SQL\APITable::FIELD_ALLOWEDVALUES =>'LATLONCOORD'), + array(\SQL\APITable::FIELD_ID => 73, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'within', \SQL\APITable::FIELD_NAME =>'lng', \SQL\APITable::FIELD_ALLOWEDVALUES =>'LATLONCOORD'), + array(\SQL\APITable::FIELD_ID => 74, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'within', \SQL\APITable::FIELD_NAME =>'when', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 75, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'gettotal', \SQL\APITable::FIELD_NAME =>'useruid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 76, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'gettotal', \SQL\APITable::FIELD_NAME =>'intval', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 77, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'getseries', \SQL\APITable::FIELD_NAME =>'useruid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 78, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'projection24', \SQL\APITable::FIELD_NAME =>'useruid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 79, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'projection24', \SQL\APITable::FIELD_NAME =>'intval', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 80, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'get', \SQL\APITable::FIELD_NAME =>'useruid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 81, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'get', \SQL\APITable::FIELD_NAME =>'acronym', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 82, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'gethist', \SQL\APITable::FIELD_NAME =>'useruid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 83, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'gethist', \SQL\APITable::FIELD_NAME =>'sort', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 84, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'is', \SQL\APITable::FIELD_NAME =>'useruid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 85, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'is', \SQL\APITable::FIELD_NAME =>'acronym', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 86, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'getbyuser', \SQL\APITable::FIELD_NAME =>'useruid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 87, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'getallcond', \SQL\APITable::FIELD_NAME =>'useruid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 88, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'getallcond', \SQL\APITable::FIELD_NAME =>'acronym', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 89, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'getalldefs', \SQL\APITable::FIELD_NAME =>'useruid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 90, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'getalldefs', \SQL\APITable::FIELD_NAME =>'acronym', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 91, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'all', \SQL\APITable::FIELD_NAME =>'useruid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 92, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'all', \SQL\APITable::FIELD_NAME =>'last', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 93, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'own', \SQL\APITable::FIELD_NAME =>'useruid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 94, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'own', \SQL\APITable::FIELD_NAME =>'last', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 95, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'register', \SQL\APITable::FIELD_NAME =>'useruid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 96, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'register', \SQL\APITable::FIELD_NAME =>'regid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 97, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'register', \SQL\APITable::FIELD_NAME =>'deviceid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 98, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'fetch', \SQL\APITable::FIELD_NAME =>'useruid', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 99, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'fetch', \SQL\APITable::FIELD_NAME =>'last', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 100, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'explore', \SQL\APITable::FIELD_NAME =>'lat', \SQL\APITable::FIELD_ALLOWEDVALUES =>'LATLONCOORD'), + array(\SQL\APITable::FIELD_ID => 101, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'explore', \SQL\APITable::FIELD_NAME =>'lng', \SQL\APITable::FIELD_ALLOWEDVALUES =>'LATLONCOORD'), + array(\SQL\APITable::FIELD_ID => 102, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'explore', \SQL\APITable::FIELD_NAME =>'radius', \SQL\APITable::FIELD_ALLOWEDVALUES =>'UINT'), + array(\SQL\APITable::FIELD_ID => 103, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'explore', \SQL\APITable::FIELD_NAME =>'endtime', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 104, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>71, \SQL\APITable::FIELD_PARENTVALUE =>'citybyzip', \SQL\APITable::FIELD_NAME =>'zip', \SQL\APITable::FIELD_ALLOWEDVALUES =>'ALL'), + array(\SQL\APITable::FIELD_ID => 112, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>110, \SQL\APITable::FIELD_PARENTVALUE =>'data', \SQL\APITable::FIELD_NAME =>'json', \SQL\APITable::FIELD_ALLOWEDVALUES =>'JSON'), + array(\SQL\APITable::FIELD_ID => 113, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>110, \SQL\APITable::FIELD_PARENTVALUE =>'deviceinfo', \SQL\APITable::FIELD_NAME =>'json', \SQL\APITable::FIELD_ALLOWEDVALUES =>'JSON'), + array(\SQL\APITable::FIELD_ID => 133, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>130, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'email', \SQL\APITable::FIELD_ALLOWEDVALUES =>'EMAIL'), + array(\SQL\APITable::FIELD_ID => 134, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>130, \SQL\APITable::FIELD_PARENTVALUE =>NULL, \SQL\APITable::FIELD_NAME =>'hashed', \SQL\APITable::FIELD_ALLOWEDVALUES =>'BOOL'), + array(\SQL\APITable::FIELD_ID => 135, \SQL\APITable::FIELD_FLAG =>1, \SQL\APITable::FIELD_PARENTID =>0, \SQL\APITable::FIELD_PARENTVALUE =>'log', \SQL\APITable::FIELD_NAME =>'json', \SQL\APITable::FIELD_ALLOWEDVALUES =>'JSON'), + array(\SQL\APITable::FIELD_ID => 46, \SQL\APITable::FIELD_FLAG =>0, \SQL\APITable::FIELD_PARENTID =>1, \SQL\APITable::FIELD_PARENTVALUE =>'geopoint', \SQL\APITable::FIELD_NAME =>'explore', \SQL\APITable::FIELD_ALLOWEDVALUES =>'FLAG'));*/ $api = new SYSTEM\API\Api($call, new ApiVerify(), new ApiClass()); diff --git a/docu/index/index.php b/docu/index/index.php index 1589646..a670dc6 100644 --- a/docu/index/index.php +++ b/docu/index/index.php @@ -9,19 +9,19 @@ error_reporting(E_ALL); ini_set('display_errors', TRUE); // evtl. hilfreich $call = new DBD\dasensedata(); -/*$call = array( array(\DBD\PAGETable::FIELD_ID=>6, \DBD\PAGETable::FIELD_FLAG=>1, \DBD\PAGETable::FIELD_PARENTID=>5, \DBD\PAGETable::FIELD_PARENTVALUE=>'sensor', \DBD\PAGETable::FIELD_NAME=>'sensorIDs', \DBD\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), - array(\DBD\PAGETable::FIELD_ID=>5, \DBD\PAGETable::FIELD_FLAG=>0, \DBD\PAGETable::FIELD_PARENTID=>-1, \DBD\PAGETable::FIELD_PARENTVALUE=>NULL, \DBD\PAGETable::FIELD_NAME=>'action', \DBD\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), - array(\DBD\PAGETable::FIELD_ID=>0, \DBD\PAGETable::FIELD_FLAG=>0, \DBD\PAGETable::FIELD_PARENTID=>-1, \DBD\PAGETable::FIELD_PARENTVALUE=>NULL, \DBD\PAGETable::FIELD_NAME=>'module', \DBD\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), - array(\DBD\PAGETable::FIELD_ID=>1, \DBD\PAGETable::FIELD_FLAG=>0, \DBD\PAGETable::FIELD_PARENTID=>0, \DBD\PAGETable::FIELD_PARENTVALUE=>NULL, \DBD\PAGETable::FIELD_NAME=>'action', \DBD\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), - array(\DBD\PAGETable::FIELD_ID=>2, \DBD\PAGETable::FIELD_FLAG=>1, \DBD\PAGETable::FIELD_PARENTID=>1, \DBD\PAGETable::FIELD_PARENTVALUE=>'sensor', \DBD\PAGETable::FIELD_NAME=>'sensorIDs', \DBD\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), - array(\DBD\PAGETable::FIELD_ID=>3, \DBD\PAGETable::FIELD_FLAG=>1, \DBD\PAGETable::FIELD_PARENTID=>1, \DBD\PAGETable::FIELD_PARENTVALUE=>'login', \DBD\PAGETable::FIELD_NAME=>'old_module', \DBD\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), - array(\DBD\PAGETable::FIELD_ID=>4, \DBD\PAGETable::FIELD_FLAG=>1, \DBD\PAGETable::FIELD_PARENTID=>1, \DBD\PAGETable::FIELD_PARENTVALUE=>'login', \DBD\PAGETable::FIELD_NAME=>'old_action', \DBD\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), - array(\DBD\PAGETable::FIELD_ID=>7, \DBD\PAGETable::FIELD_FLAG=>1, \DBD\PAGETable::FIELD_PARENTID=>1, \DBD\PAGETable::FIELD_PARENTVALUE=>'geopoint', \DBD\PAGETable::FIELD_NAME=>'coord', \DBD\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), - array(\DBD\PAGETable::FIELD_ID=>8, \DBD\PAGETable::FIELD_FLAG=>1, \DBD\PAGETable::FIELD_PARENTID=>1, \DBD\PAGETable::FIELD_PARENTVALUE=>'geopoint', \DBD\PAGETable::FIELD_NAME=>'datatype', \DBD\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), - array(\DBD\PAGETable::FIELD_ID=>9, \DBD\PAGETable::FIELD_FLAG=>1, \DBD\PAGETable::FIELD_PARENTID=>1, \DBD\PAGETable::FIELD_PARENTVALUE=>'geopoint', \DBD\PAGETable::FIELD_NAME=>'radius', \DBD\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), - array(\DBD\PAGETable::FIELD_ID=>10, \DBD\PAGETable::FIELD_FLAG=>1, \DBD\PAGETable::FIELD_PARENTID=>5, \DBD\PAGETable::FIELD_PARENTVALUE=>'geopoint', \DBD\PAGETable::FIELD_NAME=>'coord', \DBD\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), - array(\DBD\PAGETable::FIELD_ID=>11, \DBD\PAGETable::FIELD_FLAG=>1, \DBD\PAGETable::FIELD_PARENTID=>5, \DBD\PAGETable::FIELD_PARENTVALUE=>'geopoint', \DBD\PAGETable::FIELD_NAME=>'datatype', \DBD\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), - array(\DBD\PAGETable::FIELD_ID=>12, \DBD\PAGETable::FIELD_FLAG=>1, \DBD\PAGETable::FIELD_PARENTID=>5, \DBD\PAGETable::FIELD_PARENTVALUE=>'geopoint', \DBD\PAGETable::FIELD_NAME=>'radius', \DBD\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'));*/ +/*$call = array( array(\SQL\PAGETable::FIELD_ID=>6, \SQL\PAGETable::FIELD_FLAG=>1, \SQL\PAGETable::FIELD_PARENTID=>5, \SQL\PAGETable::FIELD_PARENTVALUE=>'sensor', \SQL\PAGETable::FIELD_NAME=>'sensorIDs', \SQL\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), + array(\SQL\PAGETable::FIELD_ID=>5, \SQL\PAGETable::FIELD_FLAG=>0, \SQL\PAGETable::FIELD_PARENTID=>-1, \SQL\PAGETable::FIELD_PARENTVALUE=>NULL, \SQL\PAGETable::FIELD_NAME=>'action', \SQL\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), + array(\SQL\PAGETable::FIELD_ID=>0, \SQL\PAGETable::FIELD_FLAG=>0, \SQL\PAGETable::FIELD_PARENTID=>-1, \SQL\PAGETable::FIELD_PARENTVALUE=>NULL, \SQL\PAGETable::FIELD_NAME=>'module', \SQL\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), + array(\SQL\PAGETable::FIELD_ID=>1, \SQL\PAGETable::FIELD_FLAG=>0, \SQL\PAGETable::FIELD_PARENTID=>0, \SQL\PAGETable::FIELD_PARENTVALUE=>NULL, \SQL\PAGETable::FIELD_NAME=>'action', \SQL\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), + array(\SQL\PAGETable::FIELD_ID=>2, \SQL\PAGETable::FIELD_FLAG=>1, \SQL\PAGETable::FIELD_PARENTID=>1, \SQL\PAGETable::FIELD_PARENTVALUE=>'sensor', \SQL\PAGETable::FIELD_NAME=>'sensorIDs', \SQL\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), + array(\SQL\PAGETable::FIELD_ID=>3, \SQL\PAGETable::FIELD_FLAG=>1, \SQL\PAGETable::FIELD_PARENTID=>1, \SQL\PAGETable::FIELD_PARENTVALUE=>'login', \SQL\PAGETable::FIELD_NAME=>'old_module', \SQL\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), + array(\SQL\PAGETable::FIELD_ID=>4, \SQL\PAGETable::FIELD_FLAG=>1, \SQL\PAGETable::FIELD_PARENTID=>1, \SQL\PAGETable::FIELD_PARENTVALUE=>'login', \SQL\PAGETable::FIELD_NAME=>'old_action', \SQL\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), + array(\SQL\PAGETable::FIELD_ID=>7, \SQL\PAGETable::FIELD_FLAG=>1, \SQL\PAGETable::FIELD_PARENTID=>1, \SQL\PAGETable::FIELD_PARENTVALUE=>'geopoint', \SQL\PAGETable::FIELD_NAME=>'coord', \SQL\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), + array(\SQL\PAGETable::FIELD_ID=>8, \SQL\PAGETable::FIELD_FLAG=>1, \SQL\PAGETable::FIELD_PARENTID=>1, \SQL\PAGETable::FIELD_PARENTVALUE=>'geopoint', \SQL\PAGETable::FIELD_NAME=>'datatype', \SQL\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), + array(\SQL\PAGETable::FIELD_ID=>9, \SQL\PAGETable::FIELD_FLAG=>1, \SQL\PAGETable::FIELD_PARENTID=>1, \SQL\PAGETable::FIELD_PARENTVALUE=>'geopoint', \SQL\PAGETable::FIELD_NAME=>'radius', \SQL\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), + array(\SQL\PAGETable::FIELD_ID=>10, \SQL\PAGETable::FIELD_FLAG=>1, \SQL\PAGETable::FIELD_PARENTID=>5, \SQL\PAGETable::FIELD_PARENTVALUE=>'geopoint', \SQL\PAGETable::FIELD_NAME=>'coord', \SQL\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), + array(\SQL\PAGETable::FIELD_ID=>11, \SQL\PAGETable::FIELD_FLAG=>1, \SQL\PAGETable::FIELD_PARENTID=>5, \SQL\PAGETable::FIELD_PARENTVALUE=>'geopoint', \SQL\PAGETable::FIELD_NAME=>'datatype', \SQL\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'), + array(\SQL\PAGETable::FIELD_ID=>12, \SQL\PAGETable::FIELD_FLAG=>1, \SQL\PAGETable::FIELD_PARENTID=>5, \SQL\PAGETable::FIELD_PARENTVALUE=>'geopoint', \SQL\PAGETable::FIELD_NAME=>'radius', \SQL\PAGETable::FIELD_ALLOWEDVALUES=>'ALL'));*/ $page = new \SYSTEM\PAGE\PageApi( $call, new SYSTEM\verifyclass(), new PageApi()); diff --git a/log/autoload.inc b/log/autoload.inc index ae6269a..5bb4106 100644 --- a/log/autoload.inc +++ b/log/autoload.inc @@ -3,4 +3,4 @@ \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/result','SYSTEM\LOG'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/exceptions','SYSTEM\LOG'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/error_handler','SYSTEM\LOG'); -\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SYSTEM\DBD'); +\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SYSTEM\SQL'); diff --git a/log/error_handler/error_handler_dbwriter.php b/log/error_handler/error_handler_dbwriter.php index 455e9a7..c17872a 100644 --- a/log/error_handler/error_handler_dbwriter.php +++ b/log/error_handler/error_handler_dbwriter.php @@ -10,7 +10,7 @@ class error_handler_dbwriter extends \SYSTEM\LOG\error_handler { if(\property_exists(get_class($E), 'logged') && $E->logged){ return false;} //alrdy logged(this prevents proper thrown value for every system exception) - \SYSTEM\DBD\SYS_LOG_INSERT::Q1( /*array( get_class($E), $E->getMessage(), $E->getCode(), $E->getFile(), $E->getLine(), $E->getTraceAsString(), + \SYSTEM\SQL\SYS_LOG_INSERT::Q1( /*array( get_class($E), $E->getMessage(), $E->getCode(), $E->getFile(), $E->getLine(), $E->getTraceAsString(), getenv('REMOTE_ADDR'),round(microtime(true) - \SYSTEM\time::getStartTime(),5), $_SERVER["SERVER_NAME"],$_SERVER["SERVER_PORT"],$_SERVER['REQUEST_URI'], serialize($_POST), array_key_exists('HTTP_REFERER', $_SERVER) ? $_SERVER['HTTP_REFERER'] : null, diff --git a/log/qq/SYS_LOG_DEL.php b/log/qq/SYS_LOG_DEL.php index 1ac8125..6bfe21a 100644 --- a/log/qq/SYS_LOG_DEL.php +++ b/log/qq/SYS_LOG_DEL.php @@ -1,11 +1,11 @@ next()){ if(!self::is_loaded($row,$substate,$state_name,$row['parent_id'])){ continue;} diff --git a/page/autoload.inc b/page/autoload.inc index f714c14..a4e3cde 100644 --- a/page/autoload.inc +++ b/page/autoload.inc @@ -1,3 +1,3 @@ text) public static function tag($tag, $lang = NULL,$fallback = true) { if($lang == NULL){ @@ -13,13 +13,13 @@ class text { throw new \Exception("The requested language is not supported: ".$lang);} $result = array(); - $res = \SYSTEM\DBD\SYS_TEXT_GET_TAG::QQ(array($tag,$lang)); + $res = \SYSTEM\SQL\SYS_TEXT_GET_TAG::QQ(array($tag,$lang)); while($row = $res->next()){ $result[$row['id']] = $row['text'];} if($fallback){ $result2 = array(); - $res = \SYSTEM\DBD\SYS_TEXT_GET_TAG::QQ(array($tag,\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG))); + $res = \SYSTEM\SQL\SYS_TEXT_GET_TAG::QQ(array($tag,\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG))); while($row = $res->next()){ $result2[$row['id']] = $row['text'];} if(count($result) < count($result2)){ @@ -36,13 +36,13 @@ class text { throw new \Exception("The requested language is not supported: ".$lang);} $result = array(); - $res = \SYSTEM\DBD\SYS_TEXT_GET_TAG_ADV::QQ(array($tag,$lang)); + $res = \SYSTEM\SQL\SYS_TEXT_GET_TAG_ADV::QQ(array($tag,$lang)); while($row = $res->next()){ $result[$row['id']] = $row;} if($fallback){ $result2 = array(); - $res = \SYSTEM\DBD\SYS_TEXT_GET_TAG_ADV::QQ(array($tag,\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG))); + $res = \SYSTEM\SQL\SYS_TEXT_GET_TAG_ADV::QQ(array($tag,\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG))); while($row = $res->next()){ $result2[$row['id']] = $row;} if(count($result) < count($result2)){ @@ -59,7 +59,7 @@ class text { if(!\SYSTEM\locale::isLang($lang)){ throw new \Exception("The requested language is not supported: ".$lang);} - $res = \SYSTEM\DBD\SYS_TEXT_GET_ID::Q1(array($id,$lang)); + $res = \SYSTEM\SQL\SYS_TEXT_GET_ID::Q1(array($id,$lang)); if($fallback && !$res && $lang != \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG)){ new \SYSTEM\LOG\WARNING('Text with id: '.$id.' not found for lang: '.$lang.' - fallback to default lang.'); return self::get($id, \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG));} @@ -72,7 +72,7 @@ class text { if(!\SYSTEM\locale::isLang($lang)){ throw new \Exception("The requested language is not supported: ".$lang);} - $res = \SYSTEM\DBD\SYS_TEXT_GET_ID_ADV::Q1(array($id,$lang)); + $res = \SYSTEM\SQL\SYS_TEXT_GET_ID_ADV::Q1(array($id,$lang)); if($fallback && !$res && $lang != \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG)){ new \SYSTEM\LOG\WARNING('Text with id: '.$id.' not found for lang: '.$lang.' - fallback to default lang.'); return self::get_adv($id, \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG));} @@ -80,30 +80,30 @@ class text { } public static function search($search,$tag/*=null*/){ $search = '%'.$search.'%'; - return \SYSTEM\DBD\SYS_TEXT_SEARCH_TAG::QA(array($tag,$search,$search,$search));} + return \SYSTEM\SQL\SYS_TEXT_SEARCH_TAG::QA(array($tag,$search,$search,$search));} public static function save($id, $new_id, $lang, $tags, $text){ if($new_id == self::NEW_ENTRY){ return false;} //Insert - if(!\SYSTEM\DBD\SYS_TEXT_SAVE::QI(array($id,$lang,$text, \SYSTEM\SECURITY\Security::getUser()->id,\SYSTEM\SECURITY\Security::getUser()->id))){ + if(!\SYSTEM\SQL\SYS_TEXT_SAVE::QI(array($id,$lang,$text, \SYSTEM\SECURITY\Security::getUser()->id,\SYSTEM\SECURITY\Security::getUser()->id))){ return false;} //delete all tags - \SYSTEM\DBD\SYS_TEXT_DELETE_TAGS::QI(array($id)); + \SYSTEM\SQL\SYS_TEXT_DELETE_TAGS::QI(array($id)); //Insert tags foreach($tags as $tag){ - if($tag){\SYSTEM\DBD\SYS_TEXT_SAVE_TAG::QI(array($id,$tag));}} + if($tag){\SYSTEM\SQL\SYS_TEXT_SAVE_TAG::QI(array($id,$tag));}} //Rename - \SYSTEM\DBD\SYS_TEXT_RENAME::QI(array($new_id,$id)); - \SYSTEM\DBD\SYS_TEXT_RENAME_TAGS::QI(array($new_id,$id)); + \SYSTEM\SQL\SYS_TEXT_RENAME::QI(array($new_id,$id)); + \SYSTEM\SQL\SYS_TEXT_RENAME_TAGS::QI(array($new_id,$id)); return true; } public static function delete($id, $lang = null){ - if(!\SYSTEM\DBD\SYS_TEXT_DELETE::QI(array($id,$lang))){ + if(!\SYSTEM\SQL\SYS_TEXT_DELETE::QI(array($id,$lang))){ return false;} - if(\SYSTEM\DBD\SYS_TEXT_GET_ID_COUNT::Q1(array($id))['count'] == 0){ - \SYSTEM\DBD\SYS_TEXT_DELETE_TAGS::QI(array($id));} + if(\SYSTEM\SQL\SYS_TEXT_GET_ID_COUNT::Q1(array($id))['count'] == 0){ + \SYSTEM\SQL\SYS_TEXT_DELETE_TAGS::QI(array($id));} return true; } } \ No newline at end of file diff --git a/sai/modules/saimod_sys_api/autoload.inc b/sai/modules/saimod_sys_api/autoload.inc index fc1fd0e..fea9aa8 100644 --- a/sai/modules/saimod_sys_api/autoload.inc +++ b/sai/modules/saimod_sys_api/autoload.inc @@ -1,5 +1,5 @@ next()){ $vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/tpl/tabopt.tpl'), array( 'tab_id' => $r['group']));} @@ -13,7 +13,7 @@ class saimod_sys_api extends \SYSTEM\SAI\SaiModule { } public static function sai_mod__system_sai_saimod_sys_api_action_list($group=null){ - $res = \SYSTEM\DBD\SYS_SAIMOD_API_GET::QQ(); + $res = \SYSTEM\SQL\SYS_SAIMOD_API_GET::QQ(); $tab = array('content' => ''); while($r = $res->next()){ if($group != null && $r['group'] != $group){ @@ -23,31 +23,31 @@ class saimod_sys_api extends \SYSTEM\SAI\SaiModule { $r['type'] = self::type_names($r['type']); $tab['content'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/tpl/list_entry.tpl'), $r); } - $tab = array_merge($tab,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_API)); + $tab = array_merge($tab,\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_API)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/tpl/saimod_sys_api_list.tpl'), $tab); } public static function sai_mod__system_sai_saimod_sys_api_action_deletedialog($ID,$group){ - $res = \SYSTEM\DBD\SYS_SAIMOD_API_SINGLE_SELECT::Q1(array($ID,$group)); - $res = array_merge($res,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_API)); + $res = \SYSTEM\SQL\SYS_SAIMOD_API_SINGLE_SELECT::Q1(array($ID,$group)); + $res = array_merge($res,\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_API)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/tpl/delete_dialog.tpl'), $res); } public static function sai_mod__system_sai_saimod_sys_api_action_newdialog(){ - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/tpl/new_dialog.tpl'),\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_API));} + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/tpl/new_dialog.tpl'),\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_API));} public static function sai_mod__system_sai_saimod_sys_api_action_addcall($ID,$group,$type,$parentID,$parentValue,$name,$verify){ if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_API)){ throw new \SYSTEM\LOG\ERROR("You dont have edit Rights - Cant proceeed");} if($parentValue == ''){ $parentValue = NULL;} if($verify == ''){ $verify = NULL;} - \SYSTEM\DBD\SYS_SAIMOD_API_ADD::QI(array($ID,$group,$type,$parentID,$parentValue,$name,$verify)); + \SYSTEM\SQL\SYS_SAIMOD_API_ADD::QI(array($ID,$group,$type,$parentID,$parentValue,$name,$verify)); return \SYSTEM\LOG\JsonResult::ok(); } public static function sai_mod__system_sai_saimod_sys_api_action_deletecall($ID,$group){ if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_API)){ throw new \SYSTEM\LOG\ERROR("You dont have edit Rights - Cant proceeed");} - \SYSTEM\DBD\SYS_SAIMOD_API_DEL::QI(array($ID,$group)); + \SYSTEM\SQL\SYS_SAIMOD_API_DEL::QI(array($ID,$group)); return \SYSTEM\LOG\JsonResult::ok(); } diff --git a/sai/modules/saimod_sys_cache/autoload.inc b/sai/modules/saimod_sys_cache/autoload.inc index 12c20b3..f027232 100644 --- a/sai/modules/saimod_sys_cache/autoload.inc +++ b/sai/modules/saimod_sys_cache/autoload.inc @@ -1,5 +1,5 @@ next()){ $r['class'] = self::tablerow_class($r['CacheID']); $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cache/tpl/saimod_sys_cache_entry.tpl'), $r);} diff --git a/sai/modules/saimod_sys_config/autoload.inc b/sai/modules/saimod_sys_config/autoload.inc index 0182131..33fbc4a 100644 --- a/sai/modules/saimod_sys_config/autoload.inc +++ b/sai/modules/saimod_sys_config/autoload.inc @@ -1,5 +1,5 @@ \SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING, @@ -66,7 +66,7 @@ class saimod_sys_config extends \SYSTEM\SAI\SaiModule { } //public static function html_li_menu(){return '
  • ${sai_menu_config}
    • ';} public static function sai_mod__SYSTEM_SAI_saimod_sys_config_action_basics(){ - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_CONFIG); + $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_CONFIG); $vars['basics'] = $vars['database'] = $vars['sai'] = ''; $vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_tr.tpl'), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING, @@ -100,7 +100,7 @@ class saimod_sys_config extends \SYSTEM\SAI\SaiModule { return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_basics.tpl'),$vars); } public static function sai_mod__SYSTEM_SAI_saimod_sys_config_action_database(){ - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_CONFIG); + $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_CONFIG); $vars['database'] = ''; $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_tr.tpl'), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE, diff --git a/sai/modules/saimod_sys_cron/autoload.inc b/sai/modules/saimod_sys_cron/autoload.inc index 01c1646..fc4e5c6 100644 --- a/sai/modules/saimod_sys_cron/autoload.inc +++ b/sai/modules/saimod_sys_cron/autoload.inc @@ -1,5 +1,5 @@ next()){ $r['selected_0'] = $r['selected_1'] = $r['selected_2'] = $r['selected_3'] = ''; @@ -13,14 +13,14 @@ class saimod_sys_cron extends \SYSTEM\SAI\SaiModule { $r['selected_'.$r['status']] = 'selected'; $r['i'] = $i++; $vars['content'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/tpl/list_entry.tpl'), $r);} - $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_CRON)); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_CRON)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/tpl/tabs.tpl'), $vars); } public static function sai_mod__system_sai_saimod_sys_cron_action_change($cls,$status){ if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_CRON)){ throw new \SYSTEM\LOG\ERROR("You dont have edit Rights - Cant proceeed");} - \SYSTEM\DBD\SYS_SAIMOD_CRON_CHANGE::QI(array($status, $cls)); + \SYSTEM\SQL\SYS_SAIMOD_CRON_CHANGE::QI(array($status, $cls)); return \SYSTEM\LOG\JsonResult::ok(); } @@ -29,14 +29,14 @@ class saimod_sys_cron extends \SYSTEM\SAI\SaiModule { throw new \SYSTEM\LOG\ERROR("You dont have edit Rights - Cant proceeed");} if(!\SYSTEM\CRON\cron::check($cls)){ throw new \SYSTEM\LOG\ERROR("Given Class is not a CronJob");} - \SYSTEM\DBD\SYS_SAIMOD_CRON_ADD::QI(array($cls,$min,$hour,$day,$day_week,$month)); + \SYSTEM\SQL\SYS_SAIMOD_CRON_ADD::QI(array($cls,$min,$hour,$day,$day_week,$month)); return \SYSTEM\LOG\JsonResult::ok(); } public static function sai_mod__system_sai_saimod_sys_cron_action_del($cls){ if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_CRON)){ throw new \SYSTEM\LOG\ERROR("You dont have edit Rights - Cant proceeed");} - \SYSTEM\DBD\SYS_SAIMOD_CRON_DEL::QI(array($cls)); + \SYSTEM\SQL\SYS_SAIMOD_CRON_DEL::QI(array($cls)); return \SYSTEM\LOG\JsonResult::ok();} //public static function html_li_menu(){return '
  • ${sai_menu_cron}
    • ';} diff --git a/sai/modules/saimod_sys_docu/autoload.inc b/sai/modules/saimod_sys_docu/autoload.inc index 9159a3d..4b5ae12 100644 --- a/sai/modules/saimod_sys_docu/autoload.inc +++ b/sai/modules/saimod_sys_docu/autoload.inc @@ -1,5 +1,5 @@ $docs){ $vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_docu/tpl/tabopt.tpl'), array( 'tab_id' => str_replace(' ', '_', $cat),'tab_id_pretty' => $cat));} @@ -13,7 +13,7 @@ class saimod_sys_docu extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_docu_action_cat($cat = 'System'){ $documents = \SYSTEM\DOCU\docu::getDocuments()[$cat]; - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_DOCU); + $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_DOCU); $vars['tabopts'] = ''; foreach($documents as $doc){ $vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_docu/tpl/tabopt2.tpl'), diff --git a/sai/modules/saimod_sys_files/autoload.inc b/sai/modules/saimod_sys_files/autoload.inc index f688fac..8a6eba5 100644 --- a/sai/modules/saimod_sys_files/autoload.inc +++ b/sai/modules/saimod_sys_files/autoload.inc @@ -1,5 +1,5 @@ $folder){ $vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/tpl/saimod_sys_files_tabopt.tpl'), array( 'name' => $name));} - $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_FILES)); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_FILES)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/tpl/saimod_sys_files.tpl'), $vars); } @@ -40,7 +40,7 @@ class saimod_sys_files extends \SYSTEM\SAI\SaiModule { $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl'), array('i' => $i++, 'cat' => $name, 'name' => $file, 'extension' => substr($file,-3,3), 'url' => 'api.php?call=files&cat='.$name.'&id='.$file));} $vars['cat'] = $name; $vars['content'] = $result; - $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_FILES)); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_FILES)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl'), $vars);} //public static function html_li_menu(){return '
  • ${sai_menu_files}
    • ';} diff --git a/sai/modules/saimod_sys_git/autoload.inc b/sai/modules/saimod_sys_git/autoload.inc index 2c5ef1c..75dd3ca 100644 --- a/sai/modules/saimod_sys_git/autoload.inc +++ b/sai/modules/saimod_sys_git/autoload.inc @@ -1,5 +1,5 @@ prepare('class_system', - 'SELECT datetime(strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' + 'SELECT datetime(strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' .'count(*) as count,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\COUNTER" then 1 else 0 end) class_SYSTEM_LOG_COUNTER,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\INFO" then 1 else 0 end) class_SYSTEM_LOG_INFO,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\DEPRECATED" then 1 else 0 end) class_SYSTEM_LOG_DEPRECATED,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\WARNING" then 1 else 0 end) class_SYSTEM_LOG_WARNING,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\ERROR" then 1 else 0 end) class_SYSTEM_LOG_ERROR,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\ERROR_EXCEPTION" then 1 else 0 end) class_SYSTEM_LOG_ERROR_EXCEPTION,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\SHUTDOWN_EXCEPTION" then 1 else 0 end) class_SYSTEM_LOG_SHUTDOWN_EXCEPTION' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\COUNTER" then 1 else 0 end) class_SYSTEM_LOG_COUNTER,' + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\INFO" then 1 else 0 end) class_SYSTEM_LOG_INFO,' + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\DEPRECATED" then 1 else 0 end) class_SYSTEM_LOG_DEPRECATED,' + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\WARNING" then 1 else 0 end) class_SYSTEM_LOG_WARNING,' + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\ERROR" then 1 else 0 end) class_SYSTEM_LOG_ERROR,' + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\ERROR_EXCEPTION" then 1 else 0 end) class_SYSTEM_LOG_ERROR_EXCEPTION,' + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\SHUTDOWN_EXCEPTION" then 1 else 0 end) class_SYSTEM_LOG_SHUTDOWN_EXCEPTION' + .' FROM '.\SYSTEM\SQL\system_log::NAME_MYS .' GROUP BY day' .' ORDER BY day DESC' .' LIMIT 30;', @@ -67,16 +67,16 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_class_other($filter,$db){ $result = array(); if(!$db){ - $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_CLASS_OTHER::QA(array($filter)); + $result = \SYSTEM\SQL\SYS_SAIMOD_LOG_CLASS_OTHER::QA(array($filter)); } else { $con = new \SYSTEM\DB\Connection(new \SYSTEM\DB\DBInfoSQLite(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH).$db)); $res = $con->prepare('class_other', - 'SELECT datetime(strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' + 'SELECT datetime(strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' .'count(*) as count,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'Exception\' then 1 else 0 end) class_Exception,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'RuntimeException\' then 1 else 0 end) class_RuntimeException,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'ErrorException\' then 1 else 0 end) class_ErrorException' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = \'Exception\' then 1 else 0 end) class_Exception,' + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = \'RuntimeException\' then 1 else 0 end) class_RuntimeException,' + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = \'ErrorException\' then 1 else 0 end) class_ErrorException' + .' FROM '.\SYSTEM\SQL\system_log::NAME_MYS .' GROUP BY day' .' ORDER BY day DESC' .' LIMIT 30;', @@ -90,18 +90,18 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_class_basic($filter,$db){ $result = array(); if(!$db){ - $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_CLASS_BASIC::QA(array($filter)); + $result = \SYSTEM\SQL\SYS_SAIMOD_LOG_CLASS_BASIC::QA(array($filter)); } else { $con = new \SYSTEM\DB\Connection(new \SYSTEM\DB\DBInfoSQLite(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH).$db)); $res = $con->prepare('class_basic', - 'SELECT datetime(strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' + 'SELECT datetime(strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' .'count(*) as count,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'ERROR\' then 1 else 0 end) class_ERROR,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'WARNING\' then 1 else 0 end) class_WARNING,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'INFO\' then 1 else 0 end) class_INFO,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'DEPRECATED\' then 1 else 0 end) class_DEPRECATED,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'AppError\' then 1 else 0 end) class_AppError' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = \'ERROR\' then 1 else 0 end) class_ERROR,' + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = \'WARNING\' then 1 else 0 end) class_WARNING,' + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = \'INFO\' then 1 else 0 end) class_INFO,' + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = \'DEPRECATED\' then 1 else 0 end) class_DEPRECATED,' + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = \'AppError\' then 1 else 0 end) class_AppError' + .' FROM '.\SYSTEM\SQL\system_log::NAME_MYS .' GROUP BY day' .' ORDER BY day DESC' .' LIMIT 30;', @@ -115,16 +115,16 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_unique_basic($filter,$db){ $result = array(); if(!$db){ - $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_UNIQUE_BASIC::QA(array($filter)); + $result = \SYSTEM\SQL\SYS_SAIMOD_LOG_UNIQUE_BASIC::QA(array($filter)); } else { $con = new \SYSTEM\DB\Connection(new \SYSTEM\DB\DBInfoSQLite(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH).$db)); $res = $con->prepare('unique_basic', - 'SELECT datetime(strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' + 'SELECT datetime(strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' .'count(*) as count,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_USER.') as user_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_USER.') as user_unique,' + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_IP.') as ip_unique,' + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_SERVER_NAME.') as server_name_unique' + .' FROM '.\SYSTEM\SQL\system_log::NAME_MYS .' GROUP BY day' .' ORDER BY day DESC' .' LIMIT 30;', @@ -138,17 +138,17 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_unique_request($filter,$db){ $result = array(); if(!$db){ - $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_UNIQUE_REQUEST::QA(array($filter)); + $result = \SYSTEM\SQL\SYS_SAIMOD_LOG_UNIQUE_REQUEST::QA(array($filter)); } else { $con = new \SYSTEM\DB\Connection(new \SYSTEM\DB\DBInfoSQLite(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH).$db)); $res = $con->prepare('unique_request', - 'SELECT datetime(strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' + 'SELECT datetime(strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' .'count(*) as count,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_PORT.') as server_port_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_REQUEST_URI.') as request_uri_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_POST.') as post_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_SERVER_NAME.') as server_name_unique,' + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_SERVER_PORT.') as server_port_unique,' + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_REQUEST_URI.') as request_uri_unique,' + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_POST.') as post_unique' + .' FROM '.\SYSTEM\SQL\system_log::NAME_MYS .' GROUP BY day' .' ORDER BY day DESC' .' LIMIT 30;', @@ -162,16 +162,16 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_unique_exception($filter,$db){ $result = array(); if(!$db){ - $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_UNIQUE_EXCEPTION::QA(array($filter)); + $result = \SYSTEM\SQL\SYS_SAIMOD_LOG_UNIQUE_EXCEPTION::QA(array($filter)); } else { $con = new \SYSTEM\DB\Connection(new \SYSTEM\DB\DBInfoSQLite(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH).$db)); $res = $con->prepare('unique_exception', - 'SELECT datetime(strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' + 'SELECT datetime(strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' .'count(*) as count,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_FILE.') as file_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_LINE.') as line_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_CLASS.') as class_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_FILE.') as file_unique,' + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_LINE.') as line_unique,' + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_CLASS.') as class_unique' + .' FROM '.\SYSTEM\SQL\system_log::NAME_MYS .' GROUP BY day' .' ORDER BY day DESC' .' LIMIT 30;', @@ -185,17 +185,17 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_unique_referer($filter,$db){ $result = array(); if(!$db){ - $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_UNIQUE_REFERER::QA(array($filter)); + $result = \SYSTEM\SQL\SYS_SAIMOD_LOG_UNIQUE_REFERER::QA(array($filter)); } else { $con = new \SYSTEM\DB\Connection(new \SYSTEM\DB\DBInfoSQLite(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH).$db)); $res = $con->prepare('unique_referer', - 'SELECT datetime(strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' + 'SELECT datetime(strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' .'count(*) as count,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_USER.') as user_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_HTTP_REFERER.') as http_referer_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_HTTP_USER_AGENT.') as http_user_agent_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_USER.') as user_unique,' + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_IP.') as ip_unique,' + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_HTTP_REFERER.') as http_referer_unique,' + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_HTTP_USER_AGENT.') as http_user_agent_unique' + .' FROM '.\SYSTEM\SQL\system_log::NAME_MYS .' GROUP BY day' .' ORDER BY day DESC' .' LIMIT 30;', @@ -209,15 +209,15 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_basic_visitor($filter,$db){ $result = array(); if(!$db){ - $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_BASIC_VISITOR::QA(array($filter)); + $result = \SYSTEM\SQL\SYS_SAIMOD_LOG_BASIC_VISITOR::QA(array($filter)); } else { $con = new \SYSTEM\DB\Connection(new \SYSTEM\DB\DBInfoSQLite(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH).$db)); $res = $con->prepare('basic_visitor', - 'SELECT datetime(strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' + 'SELECT datetime(strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' .'count(*) as count,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_USER.') as user_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_USER.') as user_unique,' + .'count(distinct '.\SYSTEM\SQL\system_log::FIELD_IP.') as ip_unique' + .' FROM '.\SYSTEM\SQL\system_log::NAME_MYS .' GROUP BY day' .' ORDER BY day DESC' .' LIMIT 30;', @@ -231,30 +231,30 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_basic_sucess($filter,$db){ $result = array(); if(!$db){ - $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_BASIC_SUCCESS::QA(array($filter)); + $result = \SYSTEM\SQL\SYS_SAIMOD_LOG_BASIC_SUCCESS::QA(array($filter)); } else { $con = new \SYSTEM\DB\Connection(new \SYSTEM\DB\DBInfoSQLite(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH).$db)); $res = $con->prepare('basic_sucess', - 'SELECT datetime(strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' + 'SELECT datetime(strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' .'count(*) as count,' - .'sum(case when not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\COUNTER" and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\INFO" and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "INFO" and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\DEPRECATED" and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "DEPRECATED" and ' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\WARNING" and ' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "PreprocessingLog" ' + .'sum(case when not '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\COUNTER" and' + .' not '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\INFO" and' + .' not '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "INFO" and' + .' not '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\DEPRECATED" and' + .' not '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "DEPRECATED" and ' + .' not '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\WARNING" and ' + .' not '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "PreprocessingLog" ' .'then 1 else 0 end) class_fail,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\COUNTER" or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\INFO" or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = "INFO" or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\DEPRECATE" or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = "DEPRECATED" or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\WARNING" or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = "PreprocessingLog" ' + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\COUNTER" or ' + .\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\INFO" or ' + .\SYSTEM\SQL\system_log::FIELD_CLASS.' = "INFO" or ' + .\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\DEPRECATE" or ' + .\SYSTEM\SQL\system_log::FIELD_CLASS.' = "DEPRECATED" or ' + .\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\WARNING" or ' + .\SYSTEM\SQL\system_log::FIELD_CLASS.' = "PreprocessingLog" ' .'then 1 else 0 end) class_log,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\COUNTER" then 1 else 0 end) class_sucess' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS + .'sum(case when '.\SYSTEM\SQL\system_log::FIELD_CLASS.' = "SYSTEM\\LOG\\COUNTER" then 1 else 0 end) class_sucess' + .' FROM '.\SYSTEM\SQL\system_log::NAME_MYS .' GROUP BY day' .' ORDER BY day DESC' .' LIMIT 30;', @@ -267,16 +267,16 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_basic_querytime($filter,$db){ $result = array(); if(!$db){ - $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_BASIC_QUERYTIME::QA(array($filter)); + $result = \SYSTEM\SQL\SYS_SAIMOD_LOG_BASIC_QUERYTIME::QA(array($filter)); } else { $con = new \SYSTEM\DB\Connection(new \SYSTEM\DB\DBInfoSQLite(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH).$db)); $res = $con->prepare('basic_querytime', - 'SELECT datetime(strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\DBD\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' + 'SELECT datetime(strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.') - strftime("%s",'.\SYSTEM\SQL\system_log::FIELD_TIME.')%:filter,"unixepoch", "localtime") as day,' .'count(*) as count,' - .'avg('.\SYSTEM\DBD\system_log::FIELD_QUERYTIME.') as querytime_avg,' - .'max('.\SYSTEM\DBD\system_log::FIELD_QUERYTIME.') as querytime_max,' - .'min('.\SYSTEM\DBD\system_log::FIELD_QUERYTIME.') as querytime_min' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS + .'avg('.\SYSTEM\SQL\system_log::FIELD_QUERYTIME.') as querytime_avg,' + .'max('.\SYSTEM\SQL\system_log::FIELD_QUERYTIME.') as querytime_max,' + .'min('.\SYSTEM\SQL\system_log::FIELD_QUERYTIME.') as querytime_min' + .' FROM '.\SYSTEM\SQL\system_log::NAME_MYS .' GROUP BY day' .' ORDER BY day DESC' .' LIMIT 30;', @@ -287,19 +287,19 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { return \SYSTEM\LOG\JsonResult::toString($result);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_error($error){ - $vars = \SYSTEM\DBD\SYS_SAIMOD_LOG_ERROR::QQ(array($error))->next(); + $vars = \SYSTEM\SQL\SYS_SAIMOD_LOG_ERROR::QQ(array($error))->next(); $vars['trace'] = implode('
    ', array_slice(explode('#', $vars['trace']), 1, -1)); - $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_LOG)); + $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_LOG)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_error.tpl'), $vars);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_filter($filter = "%",$search="%",$page=0){ $filter = str_replace('\\', '\\\\', $filter); - $count = \SYSTEM\DBD\SYS_SAIMOD_LOG_FILTER_COUNT::Q1(array($filter,$search,$search,$search))['count']; + $count = \SYSTEM\SQL\SYS_SAIMOD_LOG_FILTER_COUNT::Q1(array($filter,$search,$search,$search))['count']; $vars = array(); $vars['filter'] = $filter; $vars['search'] = $search; $vars['page'] = $page; - $res = \SYSTEM\DBD\SYS_SAIMOD_LOG_FILTER::QQ(array($filter,$search,$search,$search)); + $res = \SYSTEM\SQL\SYS_SAIMOD_LOG_FILTER::QQ(array($filter,$search,$search,$search)); $vars['table'] = ''; $count_filtered = 0; $res->seek(100*$page); @@ -319,17 +319,17 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { } $vars['count'] = $count_filtered.'/'.$count; $vars['error_filter'] = ''; - $res = \SYSTEM\DBD\SYS_SAIMOD_LOG_FILTERS::QQ(); + $res = \SYSTEM\SQL\SYS_SAIMOD_LOG_FILTERS::QQ(); while($row = $res->next()){ $data = array('active' => ($filter == $row['class'] ? 'active' : ''), 'filter' => $row['class'], 'search' => $search); $vars['error_filter'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_error_filter.tpl'),$data);} $vars['active'] = ($filter == '%' ? 'active' : ''); - $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_LOG)); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_LOG)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl'),$vars); } public static function sai_mod__SYSTEM_SAI_saimod_sys_log(){ - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_LOG); + $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_LOG); $vars['PICPATH'] = \SYSTEM\WEBPATH(new \SYSTEM\PSAI(), 'modules/saimod_sys_log/img/'); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log.tpl'), $vars); } diff --git a/sai/modules/saimod_sys_login/autoload.inc b/sai/modules/saimod_sys_login/autoload.inc index 30cf2ec..ce614b7 100644 --- a/sai/modules/saimod_sys_login/autoload.inc +++ b/sai/modules/saimod_sys_login/autoload.inc @@ -1,5 +1,5 @@ '.(\SYSTEM\SECURITY\Security::isLoggedIn() ? '' : '').'';} diff --git a/sai/modules/saimod_sys_mod/autoload.inc b/sai/modules/saimod_sys_mod/autoload.inc index 75df4e4..3c860c5 100644 --- a/sai/modules/saimod_sys_mod/autoload.inc +++ b/sai/modules/saimod_sys_mod/autoload.inc @@ -1,5 +1,5 @@ ${sai_menu_mod}';} public static function html_li_menu(){return '
    • ';} diff --git a/sai/modules/saimod_sys_page/autoload.inc b/sai/modules/saimod_sys_page/autoload.inc index d716329..aeda793 100644 --- a/sai/modules/saimod_sys_page/autoload.inc +++ b/sai/modules/saimod_sys_page/autoload.inc @@ -1,5 +1,5 @@ next()){ $vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_page/tpl/tabopt.tpl'), array( 'tab_id' => $r['group']));} return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_page/tpl/saimod_sys_page.tpl'), $vars); } public static function sai_mod__system_sai_saimod_sys_page_action_list($group=null){ - $res = \SYSTEM\DBD\SYS_SAIMOD_PAGE_GET::QQ(); - $tab = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_PAGE); + $res = \SYSTEM\SQL\SYS_SAIMOD_PAGE_GET::QQ(); + $tab = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_PAGE); $tab['content'] = ''; while($r = $res->next()){ if($group != null && $r['group'] != $group){ @@ -27,26 +27,26 @@ class saimod_sys_page extends \SYSTEM\SAI\SaiModule { } public static function sai_mod__system_sai_saimod_sys_page_action_deletedialog($ID,$group){ - $res = \SYSTEM\DBD\SYS_SAIMOD_PAGE_SINGLE_SELECT::Q1(array($ID,$group)); - $res = array_merge($res,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_PAGE)); + $res = \SYSTEM\SQL\SYS_SAIMOD_PAGE_SINGLE_SELECT::Q1(array($ID,$group)); + $res = array_merge($res,\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_PAGE)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_page/tpl/delete_dialog.tpl'), $res); } public static function sai_mod__system_sai_saimod_sys_page_action_newdialog(){ - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_page/tpl/new_dialog.tpl'),\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_PAGE));} + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_page/tpl/new_dialog.tpl'),\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_PAGE));} public static function sai_mod__system_sai_saimod_sys_page_action_addcall($ID,$group,$type,$parentID,$parentValue,$name,$verify){ if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_API)){ throw new \SYSTEM\LOG\ERROR("You dont have edit Rights - Cant proceeed");} if($parentValue == ''){ $parentValue = NULL;} if($verify == ''){ $verify = NULL;} - \SYSTEM\DBD\SYS_SAIMOD_PAGE_ADD::QI(array($ID,$group,$type,$parentID,$parentValue,$name,$verify)); + \SYSTEM\SQL\SYS_SAIMOD_PAGE_ADD::QI(array($ID,$group,$type,$parentID,$parentValue,$name,$verify)); return \SYSTEM\LOG\JsonResult::ok(); } public static function sai_mod__system_sai_saimod_sys_page_action_deletecall($ID,$group){ if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_API)){ throw new \SYSTEM\LOG\ERROR("You dont have edit Rights - Cant proceeed");} - \SYSTEM\DBD\SYS_SAIMOD_PAGE_DEL::QI(array($ID,$group)); + \SYSTEM\SQL\SYS_SAIMOD_PAGE_DEL::QI(array($ID,$group)); return \SYSTEM\LOG\JsonResult::ok(); } diff --git a/sai/modules/saimod_sys_security/autoload.inc b/sai/modules/saimod_sys_security/autoload.inc index 2daa8f2..5554c11 100644 --- a/sai/modules/saimod_sys_security/autoload.inc +++ b/sai/modules/saimod_sys_security/autoload.inc @@ -1,5 +1,5 @@ next()){ $r['right_edit_btn'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT) ? ' @@ -22,45 +22,45 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule { $vars['addright_btn'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT) ? '
    ' : 'You are missing the required rights for adding or removing rights.'; - $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY)); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_SECURITY)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_rights.tpl'),$vars); } public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_deleterightuser($rightid,$userid){ if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT)){ return false;} - $res = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK::Q1(array($rightid,$userid)); + $res = \SYSTEM\SQL\SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK::Q1(array($rightid,$userid)); if(!$res || $res['count'] == 0){ return false;} - return \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USER_RIGHT_DELETE::QI(array($rightid,$userid));} + return \SYSTEM\SQL\SYS_SAIMOD_SECURITY_USER_RIGHT_DELETE::QI(array($rightid,$userid));} public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_addrightuser($rightid,$userid){ if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT)){ return false;} - $res = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK::Q1(array($rightid,$userid)); + $res = \SYSTEM\SQL\SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK::Q1(array($rightid,$userid)); if(!$res || $res['count'] != 0){ return false;} - return \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USER_RIGHT_INSERT::QI(array($rightid,$userid));} + return \SYSTEM\SQL\SYS_SAIMOD_SECURITY_USER_RIGHT_INSERT::QI(array($rightid,$userid));} public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_addright($id,$name,$description){ if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT)){ return false;} - return \SYSTEM\DBD\SYS_SAIMOD_SECURITY_RIGHT_INSERT::QI(array($id,$name,$description));} + return \SYSTEM\SQL\SYS_SAIMOD_SECURITY_RIGHT_INSERT::QI(array($id,$name,$description));} public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_deleterightconfirm($id){ if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT)){ return false;} - $vars = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_RIGHT_CHECK::Q1(array($id)); + $vars = \SYSTEM\SQL\SYS_SAIMOD_SECURITY_RIGHT_CHECK::Q1(array($id)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_deleteright.tpl'),$vars);} public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_deleteright($id){ if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT)){ return false;} - return \SYSTEM\DBD\SYS_SAIMOD_SECURITY_RIGHT_DELETE::QI(array($id));} + return \SYSTEM\SQL\SYS_SAIMOD_SECURITY_RIGHT_DELETE::QI(array($id));} //Todo move to log private static function user_actions($userid){ - $count = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USER_LOG_COUNT::Q1(array($userid)); - $res = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USER_LOG::QQ(array($userid)); + $count = \SYSTEM\SQL\SYS_SAIMOD_SECURITY_USER_LOG_COUNT::Q1(array($userid)); + $res = \SYSTEM\SQL\SYS_SAIMOD_SECURITY_USER_LOG::QQ(array($userid)); $table=''; while($r = $res->next()){ $r['class_row'] = \SYSTEM\SAI\saimod_sys_log::tablerow_class($r['class']); @@ -71,13 +71,13 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule { $vars = array(); $vars['count'] = $count['count']; $vars['table'] = $table; - $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY)); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_SECURITY)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_user_actions.tpl'), $vars); } private static function user_rights($userid){ $vars['user_rights_table'] = ''; - $res = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USER_RIGHTS::QQ(array($userid)); + $res = \SYSTEM\SQL\SYS_SAIMOD_SECURITY_USER_RIGHTS::QQ(array($userid)); while($r = $res->next()){ $r['user_id'] = $userid; $r['remove_btn'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT) ? @@ -88,7 +88,7 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule { $vars['user_rights_add'] = 'You are missing the required rights for adding or removing the rights of an user.'; if(\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT)){ $opts = ''; - $res = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_RIGHTS::QQ(); + $res = \SYSTEM\SQL\SYS_SAIMOD_SECURITY_RIGHTS::QQ(); $b = true; while($r = $res->next()){ $r['selected'] = $b ? 'selected="selected"' : ''; @@ -100,32 +100,32 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule { $v['right_options'] = $opts; $vars['user_rights_add'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_user_rights_add.tpl'), $v); } - $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY)); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_SECURITY)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_user_rights.tpl'), $vars);} public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_stats(){ - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_stats.tpl'),\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY)); + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_stats.tpl'),\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_SECURITY)); } public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_user($username){ - $vars = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USER::Q1(array($username)); + $vars = \SYSTEM\SQL\SYS_SAIMOD_SECURITY_USER::Q1(array($username)); $vars['time_elapsed'] = \SYSTEM\time::time_ago_string(strtotime($vars['last_active'])); $vars['user_rights'] = array_key_exists('id', $vars) ? self::user_rights($vars['id']) : ''; $vars['user_actions'] = array_key_exists('id', $vars) ? self::user_actions($vars['id']) : ''; - $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY)); + $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_SECURITY)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_user_view.tpl'),$vars); } public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_users($filter = "all",$search="%",$page=0){ - $count = $filter == "all" ? \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USER_COUNT::Q1(array($search,$search))['count'] : - \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USER_COUNT_FILTER::Q1(array($search,$search,$filter))['count']; + $count = $filter == "all" ? \SYSTEM\SQL\SYS_SAIMOD_SECURITY_USER_COUNT::Q1(array($search,$search))['count'] : + \SYSTEM\SQL\SYS_SAIMOD_SECURITY_USER_COUNT_FILTER::Q1(array($search,$search,$filter))['count']; $vars = array(); $vars['filter'] = $filter; $vars['search'] = $search; $vars['page'] = $page; $vars['table'] = ''; - $res = $filter == "all" ? \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USERS::QQ(array($search,$search)) : - \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USERS_FILTER::QQ(array($search,$search,$filter)); + $res = $filter == "all" ? \SYSTEM\SQL\SYS_SAIMOD_SECURITY_USERS::QQ(array($search,$search)) : + \SYSTEM\SQL\SYS_SAIMOD_SECURITY_USERS_FILTER::QQ(array($search,$search,$filter)); $count_filtered = 0; $res->seek(100*$page); while(($r = $res->next()) && ($count_filtered < 100)){ @@ -142,17 +142,17 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule { } $vars['count'] = $count_filtered.'/'.$count; $vars['right_filter'] = ''; - $res = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_RIGHTS::QQ(); + $res = \SYSTEM\SQL\SYS_SAIMOD_SECURITY_RIGHTS::QQ(); while($row = $res->next()){ $data = array('active' => ($filter == $row['ID'] ? 'active' : ''), 'filter' => $row['ID'], 'search' => $search, 'name' => $row['name']); $vars['right_filter'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_right_filter.tpl'),$data);} $vars['active'] = ($filter == 'all' ? 'active' : ''); - $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY)); + $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_SECURITY)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_users.tpl'),$vars); } public static function sai_mod__SYSTEM_SAI_saimod_sys_security(){ - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY); + $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_SECURITY); $vars['PICPATH'] = \SYSTEM\WEBPATH(new \SYSTEM\PSAI(), 'modules/saimod_sys_log/img/'); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security.tpl'), $vars);} diff --git a/sai/modules/saimod_sys_text/autoload.inc b/sai/modules/saimod_sys_text/autoload.inc index 89de480..9686b87 100644 --- a/sai/modules/saimod_sys_text/autoload.inc +++ b/sai/modules/saimod_sys_text/autoload.inc @@ -1,5 +1,5 @@ next()){ @@ -17,12 +17,12 @@ class saimod_sys_text extends \SYSTEM\SAI\SaiModule { } public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_notag(){ - $res = \SYSTEM\DBD\SYS_SAIMOD_TEXT_GETTEXTS_NOTAG::QQ(); + $res = \SYSTEM\SQL\SYS_SAIMOD_TEXT_GETTEXTS_NOTAG::QQ(); $entries = ''; while($r = $res->next()){ $entries .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list_entry.tpl'), $r); } - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TEXT); + $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_TEXT); $vars['entries'] = $entries; return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl'), $vars); } @@ -30,29 +30,29 @@ class saimod_sys_text extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_tag($tag = 'all',$filter = "all",$search="%",$page=0){ if($tag == 'all'){ if($filter == 'all'){ - $count = \SYSTEM\DBD\SYS_SAIMOD_TEXT_COUNT::Q1(array($search,$search,$search))['count']; - $res = \SYSTEM\DBD\SYS_SAIMOD_TEXT_TEXT::QQ(array($search,$search,$search)); + $count = \SYSTEM\SQL\SYS_SAIMOD_TEXT_COUNT::Q1(array($search,$search,$search))['count']; + $res = \SYSTEM\SQL\SYS_SAIMOD_TEXT_TEXT::QQ(array($search,$search,$search)); } else { - $count = \SYSTEM\DBD\SYS_SAIMOD_TEXT_COUNT_FILTER::Q1(array($filter,$search,$search,$search))['count']; - $res = \SYSTEM\DBD\SYS_SAIMOD_TEXT_TEXT_FILTER::QQ(array($filter,$search,$search,$search)); + $count = \SYSTEM\SQL\SYS_SAIMOD_TEXT_COUNT_FILTER::Q1(array($filter,$search,$search,$search))['count']; + $res = \SYSTEM\SQL\SYS_SAIMOD_TEXT_TEXT_FILTER::QQ(array($filter,$search,$search,$search)); } } elseif($tag == 'notag'){ if($filter == 'all'){ - $count = \SYSTEM\DBD\SYS_SAIMOD_TEXT_COUNT_NOTAG::Q1(array($search,$search,$search))['count']; - $res = \SYSTEM\DBD\SYS_SAIMOD_TEXT_TEXT_NOTAG::QQ(array($search,$search,$search)); + $count = \SYSTEM\SQL\SYS_SAIMOD_TEXT_COUNT_NOTAG::Q1(array($search,$search,$search))['count']; + $res = \SYSTEM\SQL\SYS_SAIMOD_TEXT_TEXT_NOTAG::QQ(array($search,$search,$search)); } else { - $count = \SYSTEM\DBD\SYS_SAIMOD_TEXT_COUNT_NOTAG_FILTER::Q1(array($filter,$search,$search,$search))['count']; - $res = \SYSTEM\DBD\SYS_SAIMOD_TEXT_TEXT_NOTAG_FILTER::QQ(array($filter,$search,$search,$search)); + $count = \SYSTEM\SQL\SYS_SAIMOD_TEXT_COUNT_NOTAG_FILTER::Q1(array($filter,$search,$search,$search))['count']; + $res = \SYSTEM\SQL\SYS_SAIMOD_TEXT_TEXT_NOTAG_FILTER::QQ(array($filter,$search,$search,$search)); } } else { if($filter == 'all'){ - $count = \SYSTEM\DBD\SYS_SAIMOD_TEXT_COUNT_TAG::Q1(array($tag,$search,$search,$search))['count']; - $res = \SYSTEM\DBD\SYS_SAIMOD_TEXT_TEXT_TAG::QQ(array($tag,$search,$search,$search)); + $count = \SYSTEM\SQL\SYS_SAIMOD_TEXT_COUNT_TAG::Q1(array($tag,$search,$search,$search))['count']; + $res = \SYSTEM\SQL\SYS_SAIMOD_TEXT_TEXT_TAG::QQ(array($tag,$search,$search,$search)); } else { - $count = \SYSTEM\DBD\SYS_SAIMOD_TEXT_COUNT_TAG_FILTER::Q1(array($tag,$filter,$search,$search,$search))['count']; - $res = \SYSTEM\DBD\SYS_SAIMOD_TEXT_TEXT_TAG_FILTER::QQ(array($tag,$filter,$search,$search,$search)); + $count = \SYSTEM\SQL\SYS_SAIMOD_TEXT_COUNT_TAG_FILTER::Q1(array($tag,$filter,$search,$search,$search))['count']; + $res = \SYSTEM\SQL\SYS_SAIMOD_TEXT_TEXT_TAG_FILTER::QQ(array($tag,$filter,$search,$search,$search)); } } $vars = array(); @@ -79,13 +79,13 @@ class saimod_sys_text extends \SYSTEM\SAI\SaiModule { $data = array('active' => ($filter == $lang ? 'active' : ''), 'filter' => $lang, 'search' => $search, 'name' => $lang, 'tag' => $tag); $vars['lang_filter'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_lang_filter.tpl'),$data);} $vars['active'] = ($filter == 'all' ? 'active' : ''); - $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TEXT)); + $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_TEXT)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl'), $vars); } public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_edittext($id,$lang){ $langs = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS); - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TEXT); + $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_TEXT); $vars['tabopts'] = ''; foreach($langs as $l){ $vars2 = array(); @@ -98,7 +98,7 @@ class saimod_sys_text extends \SYSTEM\SAI\SaiModule { } public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_editor($id, $lang){ - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TEXT); + $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_TEXT); $vars['id'] = $id; $vars['lang'] = $lang; $vars['content'] = \SYSTEM\PAGE\text::get($id,$lang,false); diff --git a/sai/modules/saimod_sys_todo/autoload.inc b/sai/modules/saimod_sys_todo/autoload.inc index 1838e6a..677553f 100644 --- a/sai/modules/saimod_sys_todo/autoload.inc +++ b/sai/modules/saimod_sys_todo/autoload.inc @@ -1,7 +1,7 @@ id)); + \SYSTEM\SQL\SYS_SAIMOD_TODO_ASSIGN::QI(array($todo,\SYSTEM\SECURITY\Security::getUser()->id)); return \SYSTEM\LOG\JsonResult::ok();} public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_deassign($todo){ - \SYSTEM\DBD\SYS_SAIMOD_TODO_DEASSIGN::QI(array($todo,\SYSTEM\SECURITY\Security::getUser()->id)); + \SYSTEM\SQL\SYS_SAIMOD_TODO_DEASSIGN::QI(array($todo,\SYSTEM\SECURITY\Security::getUser()->id)); return \SYSTEM\LOG\JsonResult::ok();} public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_close($todo){ - \SYSTEM\DBD\SYS_SAIMOD_TODO_CLOSE::QI(array($todo)); + \SYSTEM\SQL\SYS_SAIMOD_TODO_CLOSE::QI(array($todo)); return \SYSTEM\LOG\JsonResult::ok();} public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_open($todo){ - \SYSTEM\DBD\SYS_SAIMOD_TODO_OPEN::QI(array($todo)); + \SYSTEM\SQL\SYS_SAIMOD_TODO_OPEN::QI(array($todo)); return \SYSTEM\LOG\JsonResult::ok();} public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_add($todo){ - self::exception(new \Exception($todo), false, \SYSTEM\DBD\system_todo::FIELD_TYPE_USER); + self::exception(new \Exception($todo), false, \SYSTEM\SQL\system_todo::FIELD_TYPE_USER); return \SYSTEM\LOG\JsonResult::ok();} public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_priority_up($todo){ - \SYSTEM\DBD\SYS_SAIMOD_TODO_PRIORITY::QI(array(+1,$todo)); + \SYSTEM\SQL\SYS_SAIMOD_TODO_PRIORITY::QI(array(+1,$todo)); return \SYSTEM\LOG\JsonResult::ok();} public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_priority_down($todo){ - \SYSTEM\DBD\SYS_SAIMOD_TODO_PRIORITY::QI(array(-1,$todo)); + \SYSTEM\SQL\SYS_SAIMOD_TODO_PRIORITY::QI(array(-1,$todo)); return \SYSTEM\LOG\JsonResult::ok();} public static function sai_mod__SYSTEM_SAI_saimod_sys_todo(){ - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO); + $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_TODO); $vars['PICPATH'] = \SYSTEM\WEBPATH(new \SYSTEM\PSAI(), 'modules/saimod_sys_log/img/'); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl'), $vars); } public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_new(){ - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO); + $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_TODO); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/saimod_sys_todo_new.tpl'), $vars); } public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_todolist($filter='all',$search='%',$page=0){ - return self::generate_list(\SYSTEM\DBD\system_todo::FIELD_STATE_OPEN,$filter,$search,$page);} + return self::generate_list(\SYSTEM\SQL\system_todo::FIELD_STATE_OPEN,$filter,$search,$page);} public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_dotolist($filter='all',$search='%',$page=0){ - return self::generate_list(\SYSTEM\DBD\system_todo::FIELD_STATE_CLOSED,$filter,$search,$page);} + return self::generate_list(\SYSTEM\SQL\system_todo::FIELD_STATE_CLOSED,$filter,$search,$page);} private static function generate_list($state,$filter,$search,$page){ $vars = array(); @@ -67,38 +67,38 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { $userid = \SYSTEM\SECURITY\Security::getUser()->id; switch($filter){ case 'mine': - $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT_MINE::Q1(array($state,$userid,$search,$search,$search))['count']; - $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST_MINE::QQ(array($state,$userid,$search,$search,$search)); + $count = \SYSTEM\SQL\SYS_SAIMOD_TODO_COUNT_MINE::Q1(array($state,$userid,$search,$search,$search))['count']; + $res = \SYSTEM\SQL\SYS_SAIMOD_TODO_LIST_MINE::QQ(array($state,$userid,$search,$search,$search)); $vars['filter_mine'] = 'active'; break; case 'free': - $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT_FREE::Q1(array($state,$search,$search,$search))['count']; - $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST_FREE::QQ(array($state,$search,$search,$search)); + $count = \SYSTEM\SQL\SYS_SAIMOD_TODO_COUNT_FREE::Q1(array($state,$search,$search,$search))['count']; + $res = \SYSTEM\SQL\SYS_SAIMOD_TODO_LIST_FREE::QQ(array($state,$search,$search,$search)); $vars['filter_free'] = 'active'; break; case 'others': - $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT_OTHERS::Q1(array($state,$userid,$search,$search,$search))['count']; - $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST_OTHERS::QQ(array($state,$userid,$search,$search,$search)); + $count = \SYSTEM\SQL\SYS_SAIMOD_TODO_COUNT_OTHERS::Q1(array($state,$userid,$search,$search,$search))['count']; + $res = \SYSTEM\SQL\SYS_SAIMOD_TODO_LIST_OTHERS::QQ(array($state,$userid,$search,$search,$search)); $vars['filter_others'] = 'active'; break; case 'gen': - $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT_TYPE::Q1(array($state,\SYSTEM\DBD\system_todo::FIELD_TYPE_EXCEPTION,$search,$search,$search))['count']; - $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST_TYPE::QQ(array($state,\SYSTEM\DBD\system_todo::FIELD_TYPE_EXCEPTION,$search,$search,$search,$userid)); + $count = \SYSTEM\SQL\SYS_SAIMOD_TODO_COUNT_TYPE::Q1(array($state,\SYSTEM\SQL\system_todo::FIELD_TYPE_EXCEPTION,$search,$search,$search))['count']; + $res = \SYSTEM\SQL\SYS_SAIMOD_TODO_LIST_TYPE::QQ(array($state,\SYSTEM\SQL\system_todo::FIELD_TYPE_EXCEPTION,$search,$search,$search,$userid)); $vars['filter_gen'] = 'active'; break; case 'user': - $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT_TYPE::Q1(array($state,\SYSTEM\DBD\system_todo::FIELD_TYPE_USER,$search,$search,$search))['count']; - $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST_TYPE::QQ(array($state,\SYSTEM\DBD\system_todo::FIELD_TYPE_USER,$search,$search,$search,$userid)); + $count = \SYSTEM\SQL\SYS_SAIMOD_TODO_COUNT_TYPE::Q1(array($state,\SYSTEM\SQL\system_todo::FIELD_TYPE_USER,$search,$search,$search))['count']; + $res = \SYSTEM\SQL\SYS_SAIMOD_TODO_LIST_TYPE::QQ(array($state,\SYSTEM\SQL\system_todo::FIELD_TYPE_USER,$search,$search,$search,$userid)); $vars['filter_user'] = 'active'; break; case 'report': - $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT_TYPE::Q1(array($state,\SYSTEM\DBD\system_todo::FIELD_TYPE_REPORT,$search,$search,$search))['count']; - $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST_TYPE::QQ(array($state,\SYSTEM\DBD\system_todo::FIELD_TYPE_REPORT,$search,$search,$search,$userid)); + $count = \SYSTEM\SQL\SYS_SAIMOD_TODO_COUNT_TYPE::Q1(array($state,\SYSTEM\SQL\system_todo::FIELD_TYPE_REPORT,$search,$search,$search))['count']; + $res = \SYSTEM\SQL\SYS_SAIMOD_TODO_LIST_TYPE::QQ(array($state,\SYSTEM\SQL\system_todo::FIELD_TYPE_REPORT,$search,$search,$search,$userid)); $vars['filter_report'] = 'active'; break; default: - $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT::Q1(array($state,$search,$search,$search))['count']; - $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST::QQ(array($state,$search,$search,$search,$userid)); + $count = \SYSTEM\SQL\SYS_SAIMOD_TODO_COUNT::Q1(array($state,$search,$search,$search))['count']; + $res = \SYSTEM\SQL\SYS_SAIMOD_TODO_LIST::QQ(array($state,$search,$search,$search,$userid)); $vars['filter_all'] = 'active'; break; } @@ -111,7 +111,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { $row['state_btn'] = self::statebtn($row['count']); $row['message'] = $row['message']; $row['request_uri'] = htmlspecialchars($row['request_uri']); - $row['openclose'] = $state == \SYSTEM\DBD\system_todo::FIELD_STATE_OPEN ? 'close' : 'open'; + $row['openclose'] = $state == \SYSTEM\SQL\system_todo::FIELD_STATE_OPEN ? 'close' : 'open'; $row['message'] = str_replace("\n", '
    ', $row['message']); $vars['todo_list_elements'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_user_list_element.tpl'), $row); $count_filtered++; @@ -123,8 +123,8 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { $vars['pagination'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_list_pagination.tpl'), $data); } $vars['count'] = $count_filtered.'/'.$count; - $vars['state'] = $state == \SYSTEM\DBD\system_todo::FIELD_STATE_OPEN ? 'todo' : 'todo(doto)'; - $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO)); + $vars['state'] = $state == \SYSTEM\SQL\system_todo::FIELD_STATE_OPEN ? 'todo' : 'todo(doto)'; + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_TODO)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_list.tpl'), $vars); } @@ -149,13 +149,13 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_stats(){ $vars = self::statistics(); - $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO)); + $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_TODO)); $vars['entries'] = ''; foreach($vars['data'] as $stat){ $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats_entry.tpl'), $stat); } $vars['userstats'] = ''; - $userstats = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_USERS::QQ(); + $userstats = \SYSTEM\SQL\SYS_SAIMOD_TODO_STATS_USERS::QQ(); while($stat = $userstats->next()){ $stat['perc'] = sprintf("%.2f",($stat['state_closed'] / ($stat['state_open']+$stat['state_closed']))*100); $vars['userstats'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats_users_entry.tpl'), $stat); @@ -174,7 +174,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { return '';} private static function trclass($type,$class,$assignee,$userid){ - if($type == \SYSTEM\DBD\system_todo::FIELD_TYPE_USER){ + if($type == \SYSTEM\SQL\system_todo::FIELD_TYPE_USER){ if($assignee == $userid){ return 'success';} if($assignee){ return 'danger';} return 'warning'; @@ -195,26 +195,26 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { } public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_close_all(){ - \SYSTEM\DBD\SYS_SAIMOD_TODO_CLOSE_ALL::QI(); + \SYSTEM\SQL\SYS_SAIMOD_TODO_CLOSE_ALL::QI(); return \SYSTEM\LOG\JsonResult::ok();} public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_edit($todo, $message){ - \SYSTEM\DBD\SYS_SAIMOD_TODO_EDIT::QI(array($message,$message,$todo)); + \SYSTEM\SQL\SYS_SAIMOD_TODO_EDIT::QI(array($message,$message,$todo)); return \SYSTEM\LOG\JsonResult::ok();} public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_todo($todo){ $userid = \SYSTEM\SECURITY\Security::getUser()->id; - $vars = \SYSTEM\DBD\SYS_SAIMOD_TODO_TODO::Q1(array($todo,$userid)); + $vars = \SYSTEM\SQL\SYS_SAIMOD_TODO_TODO::Q1(array($todo,$userid)); $vars['trace'] = implode('
    ', array_slice(explode('#', $vars['trace']), 1, -1)); $vars['display_assign'] = $vars['assignee_id'] != $userid ? '' : 'display: none;'; $vars['display_deassign'] = $vars['assignee_id'] == $userid ? '' : 'display: none;'; $vars['assignees'] = ''; - $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_ASSIGNEES::QQ(array($todo,$userid)); + $res = \SYSTEM\SQL\SYS_SAIMOD_TODO_ASSIGNEES::QQ(array($todo,$userid)); while($row = $res->next()){ $vars['assignees'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user_assignee.tpl'), $row); } - $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO)); - return $vars[\SYSTEM\DBD\system_todo::FIELD_TYPE] == \SYSTEM\DBD\system_todo::FIELD_TYPE_USER ? + $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_TODO)); + return $vars[\SYSTEM\SQL\system_todo::FIELD_TYPE] == \SYSTEM\SQL\system_todo::FIELD_TYPE_USER ? \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl'), $vars) : \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl'), $vars);} @@ -228,15 +228,15 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { public static function report($message,$data){ $_POST = $data; //save data in post - self::exception(new \Exception($message), false, \SYSTEM\DBD\system_todo::FIELD_TYPE_REPORT); + self::exception(new \Exception($message), false, \SYSTEM\SQL\system_todo::FIELD_TYPE_REPORT); return \SYSTEM\LOG\JsonResult::ok();} - public static function exception(\Exception $E, $thrown, $type = \SYSTEM\DBD\system_todo::FIELD_TYPE_EXCEPTION){ + public static function exception(\Exception $E, $thrown, $type = \SYSTEM\SQL\system_todo::FIELD_TYPE_EXCEPTION){ try{ if(\property_exists(get_class($E), 'todo_logged') && $E->todo_logged){ return false;} //alrdy logged(this prevents proper thrown value for every system exception) - \SYSTEM\DBD\SYS_SAIMOD_TODO_EXCEPTION_INSERT::Q1( array( get_class($E), $E->getMessage(), $E->getCode(), $E->getFile(), $E->getLine(), $E->getTraceAsString(), + \SYSTEM\SQL\SYS_SAIMOD_TODO_EXCEPTION_INSERT::Q1( array( get_class($E), $E->getMessage(), $E->getCode(), $E->getFile(), $E->getLine(), $E->getTraceAsString(), getenv('REMOTE_ADDR'),round(microtime(true) - \SYSTEM\time::getStartTime(),5),date('Y-m-d H:i:s', microtime(true)), $_SERVER["SERVER_NAME"],$_SERVER["SERVER_PORT"],$_SERVER['REQUEST_URI'], serialize($_POST), array_key_exists('HTTP_REFERER', $_SERVER) ? $_SERVER['HTTP_REFERER'] : null, diff --git a/sai/modules/saimod_sys_todo/stats/todo_stats_assign.php b/sai/modules/saimod_sys_todo/stats/todo_stats_assign.php index 9932515..cd5c518 100644 --- a/sai/modules/saimod_sys_todo/stats/todo_stats_assign.php +++ b/sai/modules/saimod_sys_todo/stats/todo_stats_assign.php @@ -3,7 +3,7 @@ namespace SYSTEM\SAI; class todo_stats_assign extends todo_stats { public static function stats() { - $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED::Q1()['count']; - $all = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER::Q1()['count']; + $count = \SYSTEM\SQL\SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED::Q1()['count']; + $all = \SYSTEM\SQL\SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER::Q1()['count']; return new \SYSTEM\SAI\todo_stats_data('Assigned ToDos',$count,$all);} } diff --git a/sai/modules/saimod_sys_todo/stats/todo_stats_gen.php b/sai/modules/saimod_sys_todo/stats/todo_stats_gen.php index 453150d..3350997 100644 --- a/sai/modules/saimod_sys_todo/stats/todo_stats_gen.php +++ b/sai/modules/saimod_sys_todo/stats/todo_stats_gen.php @@ -4,8 +4,8 @@ namespace SYSTEM\SAI; class todo_stats_gen extends todo_stats { public static function stats() { $res = array(); - $res[0] = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN::Q1(); - $res[2] = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN::Q1(); + $res[0] = \SYSTEM\SQL\SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN::Q1(); + $res[2] = \SYSTEM\SQL\SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN::Q1(); $count = floatval($res[2]['count']); $all = floatval($res[0]['count']+$res[2]['count']); return $all == 0 ? new \SYSTEM\SAI\todo_stats_data('Generated ToDos',1,1) : new \SYSTEM\SAI\todo_stats_data('Generated ToDos',$count,$all);} diff --git a/sai/modules/saimod_sys_todo/stats/todo_stats_user.php b/sai/modules/saimod_sys_todo/stats/todo_stats_user.php index e60fea0..61b2151 100644 --- a/sai/modules/saimod_sys_todo/stats/todo_stats_user.php +++ b/sai/modules/saimod_sys_todo/stats/todo_stats_user.php @@ -4,8 +4,8 @@ namespace SYSTEM\SAI; class todo_stats_user extends todo_stats { public static function stats() { $res = array(); - $res[0] = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER::Q1(); - $res[2] = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER::Q1(); + $res[0] = \SYSTEM\SQL\SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER::Q1(); + $res[2] = \SYSTEM\SQL\SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER::Q1(); $count = floatval($res[2]['count']); $all = floatval($res[0]['count']+$res[2]['count']); return $all == 0 ? new \SYSTEM\SAI\todo_stats_data('User ToDos',1,1) : new \SYSTEM\SAI\todo_stats_data('User ToDos',$count,$all);} diff --git a/sai/modules/saistart_sys_sai/autoload.inc b/sai/modules/saistart_sys_sai/autoload.inc index e5dbfae..ac32c6c 100644 --- a/sai/modules/saistart_sys_sai/autoload.inc +++ b/sai/modules/saistart_sys_sai/autoload.inc @@ -1,3 +1,3 @@ self::html_content()), - \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_START)); + \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_START)); return \SYSTEM\PAGE\replace::replaceFile( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/saistart.tpl'),$vars);} //public static function html_li_menu(){return '
  • ${sai_menu_start}
    • ';} public static function html_li_menu(){return '
    • ';} @@ -38,14 +38,14 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule { $vars['locale'] = $user->locale; $vars['isadmin'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) ? "yes" : "no"; $vars['userstats'] = ''; - $userstats = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_USERS::QQ(); + $userstats = \SYSTEM\SQL\SYS_SAIMOD_TODO_STATS_USERS::QQ(); while($stat = $userstats->next()){ $stat['perc'] = round($stat['state_closed'] / ($stat['state_open']+$stat['state_closed']),2)*100; $vars['userstats'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats_users_entry.tpl'), $stat); } $vars = array_merge( $vars, \SYSTEM\SAI\saimod_sys_todo::statistics(), - \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_START), + \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_START), \SYSTEM\SAI\saimod_sys_git::getGitInfo()); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content_loggedin.tpl'), $vars); } diff --git a/sai/page/default_page.php b/sai/page/default_page.php index c26c1f2..004c18e 100644 --- a/sai/page/default_page.php +++ b/sai/page/default_page.php @@ -63,7 +63,7 @@ class default_page extends \SYSTEM\PAGE\Page { $vars['menu_start'] = self::menu_start(); $vars['menu_sys'] = self::menu_sys(); $vars['menu_proj'] = self::menu_proj(); - $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_DEFAULT), + $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_DEFAULT), array( 'project' => \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT), 'project_url' => \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL))); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/tpl/sai.tpl'), $vars); diff --git a/security/Security.php b/security/Security.php index 9dfabaa..a53b1f8 100644 --- a/security/Security.php +++ b/security/Security.php @@ -10,18 +10,18 @@ class Security { // check availability of username (in non-compatibility mode, otherwise it is already checked in DasenseAccount) if($checkAvailable && !self::available($username)){ return self::FAIL;} - $result = \SYSTEM\DBD\SYS_SECURITY_CREATE::QI(array( $username , $password, $email, $locale, 1 )); + $result = \SYSTEM\SQL\SYS_SECURITY_CREATE::QI(array( $username , $password, $email, $locale, 1 )); if(!$result || !self::login($username, $password, $locale)){ return self::FAIL;} - return ($advancedResult ? \SYSTEM\DBD\SYS_SECURITY_LOGIN_SHA1::Q1(array($username, $username, $password)) : self::OK); + return ($advancedResult ? \SYSTEM\SQL\SYS_SECURITY_LOGIN_SHA1::Q1(array($username, $username, $password)) : self::OK); } public static function changePassword($username, $password_sha_old, $password_sha_new){ - $row = \SYSTEM\DBD\SYS_SECURITY_LOGIN_SHA1::Q1(array($username, $username, $password_sha_old)); + $row = \SYSTEM\SQL\SYS_SECURITY_LOGIN_SHA1::Q1(array($username, $username, $password_sha_old)); if(!$row){ return self::FAIL;} // old password wrong $userID = $row['id']; - $result = \SYSTEM\DBD\SYS_SECURITY_UPDATE_PW::QI(array($password_sha_new, $userID)); + $result = \SYSTEM\SQL\SYS_SECURITY_UPDATE_PW::QI(array($password_sha_new, $userID)); return $result ? self::OK : self::FAIL; } @@ -31,9 +31,9 @@ class Security { //Database check if(isset($password_md5)){ - $row = \SYSTEM\DBD\SYS_SECURITY_LOGIN_MD5::Q1(array($username, $username, $password_sha, $password_md5)); + $row = \SYSTEM\SQL\SYS_SECURITY_LOGIN_MD5::Q1(array($username, $username, $password_sha, $password_md5)); }else{ - $row = \SYSTEM\DBD\SYS_SECURITY_LOGIN_SHA1::Q1(array($username, $username, $password_sha));} + $row = \SYSTEM\SQL\SYS_SECURITY_LOGIN_SHA1::Q1(array($username, $username, $password_sha));} if(!$row){ new \SYSTEM\LOG\WARNING("Login Failed, User was not found in db"); @@ -41,32 +41,32 @@ class Security { //todo: move to da-sense // set password_sha if it is empty or if it length is < 40 -> SHA1 Androidappbugfix - if( !$row[\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA] || - strlen($row[\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA]) < 40){ + if( !$row[\SYSTEM\SQL\system_user::FIELD_PASSWORD_SHA] || + strlen($row[\SYSTEM\SQL\system_user::FIELD_PASSWORD_SHA]) < 40){ if($password_sha_new != NULL){ $pw = $password_sha_new; }else{ $pw = $password_sha; } - \SYSTEM\DBD\SYS_SECURITY_UPDATE_PW::QQ(array($pw,$row[\SYSTEM\DBD\system_user::FIELD_ID])); - $row[\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA] = $pw; + \SYSTEM\SQL\SYS_SECURITY_UPDATE_PW::QQ(array($pw,$row[\SYSTEM\SQL\system_user::FIELD_ID])); + $row[\SYSTEM\SQL\system_user::FIELD_PASSWORD_SHA] = $pw; } // set session variables $_SESSION[\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL)] = - new User( $row[\SYSTEM\DBD\system_user::FIELD_ID], - $row[\SYSTEM\DBD\system_user::FIELD_USERNAME], - $row[\SYSTEM\DBD\system_user::FIELD_EMAIL], - $row[\SYSTEM\DBD\system_user::FIELD_JOINDATE], + new User( $row[\SYSTEM\SQL\system_user::FIELD_ID], + $row[\SYSTEM\SQL\system_user::FIELD_USERNAME], + $row[\SYSTEM\SQL\system_user::FIELD_EMAIL], + $row[\SYSTEM\SQL\system_user::FIELD_JOINDATE], time(), getenv('REMOTE_ADDR'), 0, NULL, - $row[\SYSTEM\DBD\system_user::FIELD_LOCALE], + $row[\SYSTEM\SQL\system_user::FIELD_LOCALE], \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL)); if(isset($locale)){ \SYSTEM\locale::set($locale);} - \SYSTEM\DBD\SYS_SECURITY_UPDATE_LASTACTIVE::QI(array($row[\SYSTEM\DBD\system_user::FIELD_ID])); + \SYSTEM\SQL\SYS_SECURITY_UPDATE_LASTACTIVE::QI(array($row[\SYSTEM\SQL\system_user::FIELD_ID])); return ($advancedResult ? $row : self::OK); } @@ -78,7 +78,7 @@ class Security { // Determine if username exists public static function available($username){ - $res = \SYSTEM\DBD\SYS_SECURITY_AVAILABLE::Q1(array($username)); + $res = \SYSTEM\SQL\SYS_SECURITY_AVAILABLE::Q1(array($username)); if(!$res){ throw new \SYSTEM\LOG\ERRROR("Cannot determine the availability of username!");} if($res['count'] != 0){ @@ -93,7 +93,7 @@ class Security { $user = null; if(!($user = self::getUser())){ return false;} - $res = \SYSTEM\DBD\SYS_SECURITY_CHECK::Q1(array($user->id, $rightid)); + $res = \SYSTEM\SQL\SYS_SECURITY_CHECK::Q1(array($user->id, $rightid)); if(!$res){ throw new \SYSTEM\LOG\ERROR("Cannot determine if you have the required rights!");} if($res['count'] == 0){ diff --git a/security/autoload.inc b/security/autoload.inc index 19117c3..179fb57 100644 --- a/security/autoload.inc +++ b/security/autoload.inc @@ -1,3 +1,3 @@ locale = $lang; - \SYSTEM\DBD\SYS_LOCALE_SET_LOCALE::Q1(array($lang, $user->id)); + \SYSTEM\SQL\SYS_LOCALE_SET_LOCALE::Q1(array($lang, $user->id)); } return true; diff --git a/system/qq/SYS_LOCALE_SET_LOCALE.php b/system/qq/SYS_LOCALE_SET_LOCALE.php index 9ce5acb..4de21e4 100644 --- a/system/qq/SYS_LOCALE_SET_LOCALE.php +++ b/system/qq/SYS_LOCALE_SET_LOCALE.php @@ -1,15 +1,15 @@