From fb6137159f867defdc6a0a41d1b94ab014c2e8f0 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Mon, 23 Jun 2014 04:20:41 +0200
Subject: [PATCH 1/2] added missing sql for locale -> renamed to text in api
 call

---
 api/api_system.php                |  2 +-
 dbd/sql/mysql/data/sai_api.sql    |  6 ++++--
 dbd/sql/mysql/data/system_api.sql | 30 ++++++++++++++++++------------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/api/api_system.php b/api/api_system.php
index a760030..2910338 100644
--- a/api/api_system.php
+++ b/api/api_system.php
@@ -31,7 +31,7 @@ class api_system extends api_login{
     public static function call_cron(){
         return \SYSTEM\CRON\cron::run();}
     
-    public static function call_locale($request,$lang){        
+    public static function call_text($request,$lang){        
         return \SYSTEM\LOG\JsonResult::toString(\SYSTEM\locale::getStrings($request, $lang));}
         
     public static function call_files($cat,$id = null){
diff --git a/dbd/sql/mysql/data/sai_api.sql b/dbd/sql/mysql/data/sai_api.sql
index ef79236..a8bf410 100644
--- a/dbd/sql/mysql/data/sai_api.sql
+++ b/dbd/sql/mysql/data/sai_api.sql
@@ -19,8 +19,10 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `nam
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (27, 42, 2, 11, 'create', 'locale', 'LANG');
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (30, 42, 2, 10, 'files', 'cat', 'STRING');
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (31, 42, 3, 30, 'files', 'id', 'STRING');
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (40, 42, 4, -1, NULL, '_lang', 'LANG');
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (41, 42, 4, -1, NULL, '_result', 'RESULT');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (40, 42, 2, 10, 'text', 'request', 'STRING');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (41, 42, 2, 40, 'text', 'lang', 'LANG');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (90, 42, 4, -1, NULL, '_lang', 'LANG');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (91, 42, 4, -1, NULL, '_result', 'RESULT');
 
 -- specific stuff for mods
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (100, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_login', 'action', NULL);
diff --git a/dbd/sql/mysql/data/system_api.sql b/dbd/sql/mysql/data/system_api.sql
index 9a6e312..c2708ad 100644
--- a/dbd/sql/mysql/data/system_api.sql
+++ b/dbd/sql/mysql/data/system_api.sql
@@ -1,16 +1,22 @@
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (10, 42, 0, -1, NULL, 'call', NULL);
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (11, 42, 0, 10, NULL, 'action', NULL);
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (10, 0, 0, -1, NULL, 'call', NULL);
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (11, 0, 0, 10, NULL, 'action', NULL);
 
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (20, 42, 2, 11, 'login', 'username', 'STRING');
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (21, 42, 2, 11, 'login', 'password_sha', 'STRING');
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (22, 42, 2, 11, 'login', 'password_md5', 'STRING');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (20, 0, 2, 11, 'login', 'username', 'STRING');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (21, 0, 2, 11, 'login', 'password_sha', 'STRING');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (22, 0, 2, 11, 'login', 'password_md5', 'STRING');
 
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (23, 42, 2, 11, 'check', 'rightid', 'UINT');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (23, 0, 2, 11, 'check', 'rightid', 'UINT');
 
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (24, 42, 2, 11, 'create', 'username', 'STRING');
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (25, 42, 2, 11, 'create', 'password_sha', 'STRING');
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (26, 42, 2, 11, 'create', 'email', 'STRING');
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (27, 42, 2, 11, 'create', 'locale', 'LANG');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (24, 0, 2, 11, 'create', 'username', 'STRING');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (25, 0, 2, 11, 'create', 'password_sha', 'STRING');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (26, 0, 2, 11, 'create', 'email', 'STRING');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (27, 0, 2, 11, 'create', 'locale', 'LANG');
 
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (30, 42, 2, 10, 'files', 'cat', 'STRING');
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (31, 42, 3, 30, 'files', 'id', 'STRING');
\ No newline at end of file
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (30, 0, 2, 10, 'files', 'cat', 'STRING');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (31, 0, 3, 30, 'files', 'id', 'STRING');
+
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (40, 0, 2, 10, 'text', 'request', 'STRING');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (41, 0, 2, 10, 'text', 'lang', 'LANG');
+
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (90, 42, 4, -1, NULL, '_lang', 'LANG');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (91, 42, 4, -1, NULL, '_result', 'RESULT');
\ No newline at end of file

From b196e1cb7a403e4fabefc8ae686e6597b3f3eee5 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Mon, 23 Jun 2014 19:35:59 +0200
Subject: [PATCH 2/2] pagestate system, js implementation @ mojotrollz

---
 api/api_system.php                         | 28 +++-------------------
 dbd/qq/SYS_PAGESTATES_GROUP.php            | 15 ++++++++++++
 dbd/sql/mysql/data/sai_api.sql             |  1 +
 dbd/sql/mysql/data/system_api.sql          |  2 ++
 dbd/sql/mysql/schema/system_pagestates.sql | 10 ++++++++
 dbd/tbl/system_pagestates.php              | 15 ++++++++++++
 page/State.php                             |  7 ++++++
 7 files changed, 53 insertions(+), 25 deletions(-)
 create mode 100644 dbd/qq/SYS_PAGESTATES_GROUP.php
 create mode 100644 dbd/sql/mysql/schema/system_pagestates.sql
 create mode 100644 dbd/tbl/system_pagestates.php
 create mode 100644 page/State.php

diff --git a/api/api_system.php b/api/api_system.php
index 2910338..46e1959 100644
--- a/api/api_system.php
+++ b/api/api_system.php
@@ -3,31 +3,6 @@
 namespace SYSTEM\API;
 
 class api_system extends api_login{
-    /*
-    INSERT INTO `system_api_calls` (`ID`, `Flag`, `ParentID`, `ParentValue`, `Name`, `AllowedValues`) VALUES (0, 0, -1, NULL, 'call', NULL);
-    INSERT INTO `system_api_calls` (`ID`, `Flag`, `ParentID`, `ParentValue`, `Name`, `AllowedValues`) VALUES (60, 0, 0, 'account', 'action', NULL);
-
-    INSERT INTO `system_api_calls` (`ID`, `Flag`, `ParentID`, `ParentValue`, `Name`, `AllowedValues`) VALUES (61,1,60,'login','username','USERNAME');
-    INSERT INTO `system_api_calls` (`ID`, `Flag`, `ParentID`, `ParentValue`, `Name`, `AllowedValues`) VALUES (62,1,60,'login','password_sha','PASSHASH');
-    INSERT INTO `system_api_calls` (`ID`, `Flag`, `ParentID`, `ParentValue`, `Name`, `AllowedValues`) VALUES (63,1,60,'login','password_md5','PASSHASH');
-    INSERT INTO `system_api_calls` (`ID`, `Flag`, `ParentID`, `ParentValue`, `Name`, `AllowedValues`) VALUES (64,1,60,'check','rightid','UINT');
-    INSERT INTO `system_api_calls` (`ID`, `Flag`, `ParentID`, `ParentValue`, `Name`, `AllowedValues`) VALUES (65,1,60,'create','username','USERNAME');
-    INSERT INTO `system_api_calls` (`ID`, `Flag`, `ParentID`, `ParentValue`, `Name`, `AllowedValues`) VALUES (66,1,60,'create','password_sha','PASSHASH');
-    INSERT INTO `system_api_calls` (`ID`, `Flag`, `ParentID`, `ParentValue`, `Name`, `AllowedValues`) VALUES (67,1,60,'create','email','EMAIL');
-    INSERT INTO `system_api_calls` (`ID`, `Flag`, `ParentID`, `ParentValue`, `Name`, `AllowedValues`) VALUES (68,1,60,'create','locale','LANG');
-     */
-
-    /*public static function call_account_action_login($username, $password_sha, $password_md5){
-        return \SYSTEM\SECURITY\Security::login($username, $password_sha, $password_md5);}
-    public static function call_account_action_logout(){
-        return \SYSTEM\SECURITY\Security::logout();}
-    public static function call_account_action_isloggedin(){
-        return \SYSTEM\SECURITY\Security::isLoggedIn();}
-    public static function call_account_action_check($rightid){
-        return \SYSTEM\SECURITY\Security::check($rightid);}
-    public static function call_account_action_create($username, $password_sha, $email, $locale){
-        return \SYSTEM\SECURITY\Security::create($username, $password_sha, $email, $locale);}*/
-    
     public static function call_cron(){
         return \SYSTEM\CRON\cron::run();}
     
@@ -37,6 +12,9 @@ class api_system extends api_login{
     public static function call_files($cat,$id = null){
         return \SYSTEM\FILES\files::get($cat, $id, true);}
         
+    public static function call_pagestates($group){
+        return \SYSTEM\PAGE\State::get($group);}
+        
     public static function static__lang($lang){
         \SYSTEM\locale::set($lang);}        
     public static function static__result($result){
diff --git a/dbd/qq/SYS_PAGESTATES_GROUP.php b/dbd/qq/SYS_PAGESTATES_GROUP.php
new file mode 100644
index 0000000..ca52066
--- /dev/null
+++ b/dbd/qq/SYS_PAGESTATES_GROUP.php
@@ -0,0 +1,15 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_PAGESTATES_GROUP extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'SELECT * FROM '.\SYSTEM\DBD\system_pagestates::NAME_PG
+.' WHERE "'.\SYSTEM\DBD\system_pagestates::FIELD_GROUP.'" = $1'
+.' ORDER BY "'.\SYSTEM\DBD\system_pagestates::FIELD_ID.'"',
+//mys
+'SELECT * FROM '.\SYSTEM\DBD\system_pagestates::NAME_MYS
+.' WHERE `'.\SYSTEM\DBD\system_pagestates::FIELD_GROUP.'` = ?'
+.' ORDER BY '.\SYSTEM\DBD\system_pagestates::FIELD_ID
+);}}
\ No newline at end of file
diff --git a/dbd/sql/mysql/data/sai_api.sql b/dbd/sql/mysql/data/sai_api.sql
index a8bf410..f987904 100644
--- a/dbd/sql/mysql/data/sai_api.sql
+++ b/dbd/sql/mysql/data/sai_api.sql
@@ -21,6 +21,7 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `nam
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (31, 42, 3, 30, 'files', 'id', 'STRING');
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (40, 42, 2, 10, 'text', 'request', 'STRING');
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (41, 42, 2, 40, 'text', 'lang', 'LANG');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (50, 42, 2, 10, 'pagestates', 'group', 'UINT');
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (90, 42, 4, -1, NULL, '_lang', 'LANG');
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (91, 42, 4, -1, NULL, '_result', 'RESULT');
 
diff --git a/dbd/sql/mysql/data/system_api.sql b/dbd/sql/mysql/data/system_api.sql
index c2708ad..13ccb10 100644
--- a/dbd/sql/mysql/data/system_api.sql
+++ b/dbd/sql/mysql/data/system_api.sql
@@ -18,5 +18,7 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `nam
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (40, 0, 2, 10, 'text', 'request', 'STRING');
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (41, 0, 2, 10, 'text', 'lang', 'LANG');
 
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (50, 0, 2, 10, 'pagestates', 'group', 'UINT');
+
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (90, 42, 4, -1, NULL, '_lang', 'LANG');
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (91, 42, 4, -1, NULL, '_result', 'RESULT');
\ No newline at end of file
diff --git a/dbd/sql/mysql/schema/system_pagestates.sql b/dbd/sql/mysql/schema/system_pagestates.sql
new file mode 100644
index 0000000..138d962
--- /dev/null
+++ b/dbd/sql/mysql/schema/system_pagestates.sql
@@ -0,0 +1,10 @@
+CREATE TABLE `system_pagestates` (
+	`group` INT(10) UNSIGNED NOT NULL,
+	`id` CHAR(50) NOT NULL,
+	`div` CHAR(50) NOT NULL,
+	`url` TEXT NOT NULL,
+	`func` CHAR(50) NOT NULL,
+	PRIMARY KEY (`id`, `div`, `group`)
+)
+COLLATE='utf8_general_ci'
+ENGINE=InnoDB;
\ No newline at end of file
diff --git a/dbd/tbl/system_pagestates.php b/dbd/tbl/system_pagestates.php
new file mode 100644
index 0000000..0138daf
--- /dev/null
+++ b/dbd/tbl/system_pagestates.php
@@ -0,0 +1,15 @@
+<?php
+namespace SYSTEM\DBD;
+
+class system_pagestates {
+    const NAME_PG                   = 'system.pagestates';
+    const NAME_MYS                  = 'system_pagestates';
+
+    const FIELD_GROUP               = 'group';
+    const FIELD_ID                  = 'id';
+    const FIELD_DIV                 = 'div';
+    const FIELD_URL                 = 'url';
+    const FIELD_FUNC                = 'func';
+    
+    const VALUE_ID_DEFAULT          = 'default';
+}
\ No newline at end of file
diff --git a/page/State.php b/page/State.php
new file mode 100644
index 0000000..4eb76f4
--- /dev/null
+++ b/page/State.php
@@ -0,0 +1,7 @@
+<?php
+namespace SYSTEM\PAGE;
+
+class State {
+    public static function get($group){
+        return \SYSTEM\LOG\JsonResult::toString(\SYSTEM\DBD\SYS_PAGESTATES_GROUP::QA(array($group)));}
+}
\ No newline at end of file