webcraftmedia/system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

database schema and deleted old stuff

Browse Source
This commit is contained in:
Ulf Gebhardt 2013-12-20 01:45:18 +01:00
parent fe6790df08
commit 8b28ea441a
12 changed files with 191 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
api/api.php
View File

@ -34,12 +34,12 @@ class api {
//Parameters //Parameters
$parentid = $commands[count($commands)-1][0]; $parentid = $commands[count($commands)-1][0];
$parentid = $parentid[\SYSTEM\DBD\APITable::FIELD_ID]; $parentid = $parentid[\SYSTEM\DBD\system_api::FIELD_ID];
$parameters = self::do_parameters($params, $tree, $parentid, $commands[count($commands)-1][1],$verifyclassname); //throws $parameters = self::do_parameters($params, $tree, $parentid, $commands[count($commands)-1][1],$verifyclassname); //throws
//Opt Parameters //Opt Parameters
$parentid = $commands[count($commands)-1][0]; $parentid = $commands[count($commands)-1][0];
$parentid = $parentid[\SYSTEM\DBD\APITable::FIELD_ID]; $parentid = $parentid[\SYSTEM\DBD\system_api::FIELD_ID];
$parameters_opt = self::do_parameters_opt($params, $tree, $parentid, $commands[count($commands)-1][1],$verifyclassname); //throws $parameters_opt = self::do_parameters_opt($params, $tree, $parentid, $commands[count($commands)-1][1],$verifyclassname); //throws
//strict check //strict check
@ -62,9 +62,9 @@ class api {
private static function getApiTree($group){ private static function getApiTree($group){
$con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo());
if(\SYSTEM\system::isSystemDbInfoPG()){ if(\SYSTEM\system::isSystemDbInfoPG()){
$res = $con->query('SELECT * FROM '.\SYSTEM\DBD\APITable::NAME_PG .' WHERE "'.\SYSTEM\DBD\APITable::FIELD_GROUP.'" = '.$group.' ORDER BY "'.\SYSTEM\DBD\APITable::FIELD_ID.'"'); $res = $con->query('SELECT * FROM '.\SYSTEM\DBD\system_api::NAME_PG .' WHERE "'.\SYSTEM\DBD\system_api::FIELD_GROUP.'" = '.$group.' ORDER BY "'.\SYSTEM\DBD\system_api::FIELD_ID.'"');
} else { } else {
$res = $con->query('SELECT * FROM '.\SYSTEM\DBD\APITable::NAME_MYS.' WHERE `'.\SYSTEM\DBD\APITable::FIELD_GROUP.'` = '.$group.' ORDER BY '.\SYSTEM\DBD\APITable::FIELD_ID); $res = $con->query('SELECT * FROM '.\SYSTEM\DBD\system_api::NAME_MYS.' WHERE `'.\SYSTEM\DBD\system_api::FIELD_GROUP.'` = '.$group.' ORDER BY '.\SYSTEM\DBD\system_api::FIELD_ID);
} }
if(!$res){ if(!$res){
@ -84,23 +84,23 @@ class api {
$statics = array(); $statics = array();
$parentid = self::ROOT_PARENTID; $parentid = self::ROOT_PARENTID;
foreach($tree as $item){ foreach($tree as $item){
if( intval($item[\SYSTEM\DBD\APITable::FIELD_TYPE]) == \SYSTEM\DBD\APITable::VALUE_TYPE_STATIC && if( intval($item[\SYSTEM\DBD\system_api::FIELD_TYPE]) == \SYSTEM\DBD\system_api::VALUE_TYPE_STATIC &&
intval($item[\SYSTEM\DBD\APITable::FIELD_PARENTID]) == $parentid && intval($item[\SYSTEM\DBD\system_api::FIELD_PARENTID]) == $parentid &&
isset($params[$item[\SYSTEM\DBD\APITable::FIELD_NAME]])){ isset($params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]])){
$statics[] = array($item,$params[$item[\SYSTEM\DBD\APITable::FIELD_NAME]]); $statics[] = array($item,$params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]]);
$call_funcname = 'static_'.$item[\SYSTEM\DBD\APITable::FIELD_NAME]; $call_funcname = 'static_'.$item[\SYSTEM\DBD\system_api::FIELD_NAME];
//verify func //verify func
if(!\method_exists($apiclassname, $call_funcname)){ if(!\method_exists($apiclassname, $call_funcname)){
return self::do_default($default, $apiclassname, $call_funcname);} //throws return self::do_default($default, $apiclassname, $call_funcname);} //throws
//verify parameter //verify parameter
if( !method_exists($verifyclassname, $item[\SYSTEM\DBD\APITable::FIELD_VERIFY]) || if( !method_exists($verifyclassname, $item[\SYSTEM\DBD\system_api::FIELD_VERIFY]) ||
!call_user_func(array($verifyclassname,$item[\SYSTEM\DBD\APITable::FIELD_VERIFY]),$params[$item[\SYSTEM\DBD\APITable::FIELD_NAME]])){ !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\APITable::FIELD_NAME].' Verifier: '.$item[\SYSTEM\DBD\APITable::FIELD_VERIFY]);} 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]);}
\call_user_func_array(array($apiclassname,$call_funcname),array($params[$item[\SYSTEM\DBD\APITable::FIELD_NAME]])); \call_user_func_array(array($apiclassname,$call_funcname),array($params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]]));
} }
} }
@ -131,18 +131,18 @@ class api {
$commands = array(); $commands = array();
$parentid = self::ROOT_PARENTID; $parentid = self::ROOT_PARENTID;
foreach($tree as $item){ foreach($tree as $item){
if( (intval($item[\SYSTEM\DBD\APITable::FIELD_TYPE]) == \SYSTEM\DBD\APITable::VALUE_TYPE_COMMAND || if( (intval($item[\SYSTEM\DBD\system_api::FIELD_TYPE]) == \SYSTEM\DBD\system_api::VALUE_TYPE_COMMAND ||
intval($item[\SYSTEM\DBD\APITable::FIELD_TYPE]) == \SYSTEM\DBD\APITable::VALUE_TYPE_COMMAND_FLAG) && intval($item[\SYSTEM\DBD\system_api::FIELD_TYPE]) == \SYSTEM\DBD\system_api::VALUE_TYPE_COMMAND_FLAG) &&
intval($item[\SYSTEM\DBD\APITable::FIELD_PARENTID]) == $parentid && intval($item[\SYSTEM\DBD\system_api::FIELD_PARENTID]) == $parentid &&
isset($params[$item[\SYSTEM\DBD\APITable::FIELD_NAME]])){ isset($params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]])){
//check parent value //check parent value
if( isset($item[\SYSTEM\DBD\APITable::FIELD_PARENTVALUE]) && if( isset($item[\SYSTEM\DBD\system_api::FIELD_PARENTVALUE]) &&
$commands[count($commands)-1][1] != $item[\SYSTEM\DBD\APITable::FIELD_PARENTVALUE]){ $commands[count($commands)-1][1] != $item[\SYSTEM\DBD\system_api::FIELD_PARENTVALUE]){
continue;} continue;}
$commands[] = array($item,$params[$item[\SYSTEM\DBD\APITable::FIELD_NAME]]); $commands[] = array($item,$params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]]);
$parentid = intval($item[\SYSTEM\DBD\APITable::FIELD_ID]); $parentid = intval($item[\SYSTEM\DBD\system_api::FIELD_ID]);
} }
} }
@ -152,24 +152,24 @@ class api {
private static function do_parameters($params,$tree,$parentid,$lastcommandvalue,$verifyclassname){ private static function do_parameters($params,$tree,$parentid,$lastcommandvalue,$verifyclassname){
$parameters = array(); $parameters = array();
foreach($tree as $item){ foreach($tree as $item){
if( intval($item[\SYSTEM\DBD\APITable::FIELD_TYPE]) == \SYSTEM\DBD\APITable::VALUE_TYPE_PARAM && if( intval($item[\SYSTEM\DBD\system_api::FIELD_TYPE]) == \SYSTEM\DBD\system_api::VALUE_TYPE_PARAM &&
intval($item[\SYSTEM\DBD\APITable::FIELD_PARENTID]) == $parentid){ intval($item[\SYSTEM\DBD\system_api::FIELD_PARENTID]) == $parentid){
//check parent value //check parent value
if( isset($item[\SYSTEM\DBD\APITable::FIELD_PARENTVALUE]) && if( isset($item[\SYSTEM\DBD\system_api::FIELD_PARENTVALUE]) &&
$lastcommandvalue != $item[\SYSTEM\DBD\APITable::FIELD_PARENTVALUE]){ $lastcommandvalue != $item[\SYSTEM\DBD\system_api::FIELD_PARENTVALUE]){
continue;} continue;}
//all parameters are required //all parameters are required
if(!isset($params[$item[\SYSTEM\DBD\APITable::FIELD_NAME]])){ if(!isset($params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]])){
throw new \SYSTEM\LOG\ERROR('Parameter missing: '.$item[\SYSTEM\DBD\APITable::FIELD_NAME]);} throw new \SYSTEM\LOG\ERROR('Parameter missing: '.$item[\SYSTEM\DBD\system_api::FIELD_NAME]);}
//verify parameter //verify parameter
if( !method_exists($verifyclassname, $item[\SYSTEM\DBD\APITable::FIELD_VERIFY]) || if( !method_exists($verifyclassname, $item[\SYSTEM\DBD\system_api::FIELD_VERIFY]) ||
!call_user_func(array($verifyclassname,$item[\SYSTEM\DBD\APITable::FIELD_VERIFY]),$params[$item[\SYSTEM\DBD\APITable::FIELD_NAME]])){ !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\APITable::FIELD_NAME].' Verifier: '.$item[\SYSTEM\DBD\APITable::FIELD_VERIFY]);} 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]);}
$parameters[] = array($item, $params[$item[\SYSTEM\DBD\APITable::FIELD_NAME]]); $parameters[] = array($item, $params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]]);
} }
} }
@ -179,24 +179,24 @@ class api {
private static function do_parameters_opt($params,$tree,$parentid,$lastcommandvalue,$verifyclassname){ private static function do_parameters_opt($params,$tree,$parentid,$lastcommandvalue,$verifyclassname){
$parameters_opt = array(); $parameters_opt = array();
foreach($tree as $item){ foreach($tree as $item){
if( intval($item[\SYSTEM\DBD\APITable::FIELD_TYPE]) == \SYSTEM\DBD\APITable::VALUE_TYPE_PARAM_OPT && if( intval($item[\SYSTEM\DBD\system_api::FIELD_TYPE]) == \SYSTEM\DBD\system_api::VALUE_TYPE_PARAM_OPT &&
intval($item[\SYSTEM\DBD\APITable::FIELD_PARENTID]) == $parentid){ intval($item[\SYSTEM\DBD\system_api::FIELD_PARENTID]) == $parentid){
//check parent value //check parent value
if( isset($item[\SYSTEM\DBD\APITable::FIELD_PARENTVALUE]) && if( isset($item[\SYSTEM\DBD\system_api::FIELD_PARENTVALUE]) &&
$lastcommandvalue != $item[\SYSTEM\DBD\APITable::FIELD_PARENTVALUE]){ $lastcommandvalue != $item[\SYSTEM\DBD\system_api::FIELD_PARENTVALUE]){
continue;} continue;}
//all parameters are NOT required - just continue //all parameters are NOT required - just continue
if(!isset($params[$item[\SYSTEM\DBD\APITable::FIELD_NAME]])){ if(!isset($params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]])){
continue;} continue;}
//verify parameter //verify parameter
if( !method_exists($verifyclassname, $item[\SYSTEM\DBD\APITable::FIELD_VERIFY]) || if( !method_exists($verifyclassname, $item[\SYSTEM\DBD\system_api::FIELD_VERIFY]) ||
!call_user_func(array($verifyclassname,$item[\SYSTEM\DBD\APITable::FIELD_VERIFY]),$params[$item[\SYSTEM\DBD\APITable::FIELD_NAME]])){ !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\APITable::FIELD_NAME].' Verifier: '.$item[\SYSTEM\DBD\APITable::FIELD_VERIFY]);} 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]);}
$parameters_opt[] = array($item, $params[$item[\SYSTEM\DBD\APITable::FIELD_NAME]]); $parameters_opt[] = array($item, $params[$item[\SYSTEM\DBD\system_api::FIELD_NAME]]);
} }
} }
@ -209,10 +209,10 @@ class api {
if(!\preg_match('^[0-9A-Za-z_]+$^', $com[1])){ 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]);} throw new \SYSTEM\LOG\ERROR('Call Command can only have letters! command: '.$com[0]['name'].'; value: '.$com[1]);}
if($com[0][\SYSTEM\DBD\APITable::FIELD_TYPE] == \SYSTEM\DBD\APITable::VALUE_TYPE_COMMAND_FLAG){ if($com[0][\SYSTEM\DBD\system_api::FIELD_TYPE] == \SYSTEM\DBD\system_api::VALUE_TYPE_COMMAND_FLAG){
$call_funcname .= '_flag_'.$com[0][\SYSTEM\DBD\APITable::FIELD_NAME]; $call_funcname .= '_flag_'.$com[0][\SYSTEM\DBD\system_api::FIELD_NAME];
} else { } else {
$call_funcname .= '_'.$com[0][\SYSTEM\DBD\APITable::FIELD_NAME].'_'.\strtolower($com[1]);} $call_funcname .= '_'.$com[0][\SYSTEM\DBD\system_api::FIELD_NAME].'_'.\strtolower($com[1]);}
} }
$call_funcname = substr($call_funcname, 1); //strip leading _ $call_funcname = substr($call_funcname, 1); //strip leading _

2
dbd/sql/pg/schema/schema.sql Normal file
View File

@ -0,0 +1,2 @@
CREATE SCHEMA system
AUTHORIZATION username;

16
dbd/sql/pg/schema/system_api.sql Normal file
View File

@ -0,0 +1,16 @@
CREATE TABLE system.api
(
"ID" integer NOT NULL,
"group" integer NOT NULL,
type integer NOT NULL,
"parentID" integer NOT NULL,
"parentValue" character varying(50),
name character varying(50) NOT NULL,
verify character varying(50),
CONSTRAINT system_api_pk PRIMARY KEY ("ID", "group")
)
WITH (
OIDS=FALSE
);
ALTER TABLE system.api
OWNER TO username;

32
dbd/sql/pg/schema/system_cache.sql Normal file
View File

@ -0,0 +1,32 @@
CREATE TABLE system.cache
(
"ID" integer NOT NULL DEFAULT nextval('system."cache_ID_seq"'::regclass),
"CacheID" integer NOT NULL,
"Ident" character varying NOT NULL,
data bytea,
CONSTRAINT pk_system_cache_id PRIMARY KEY ("ID"),
CONSTRAINT unique_system_cache_cid_ident UNIQUE ("CacheID", "Ident")
)
WITH (
OIDS=FALSE
);
ALTER TABLE system.cache
OWNER TO username;
-- Index: system."cache_CacheID_Ident_idx"
-- DROP INDEX system."cache_CacheID_Ident_idx";
CREATE INDEX "cache_CacheID_Ident_idx"
ON system.cache
USING btree
("CacheID", "Ident" COLLATE pg_catalog."default");
-- Index: system."cache_Ident_idx"
-- DROP INDEX system."cache_Ident_idx";
CREATE INDEX "cache_Ident_idx"
ON system.cache
USING btree
("Ident" COLLATE pg_catalog."default");

13
dbd/sql/pg/schema/system_locale_string.sql Normal file
View File

@ -0,0 +1,13 @@
CREATE TABLE system.locale_string
(
id character varying(50) NOT NULL,
category integer NOT NULL DEFAULT 0,
"enUS" text,
"deDE" text,
CONSTRAINT system_locale_string_pk_id PRIMARY KEY (id)
)
WITH (
OIDS=FALSE
);
ALTER TABLE system.locale_string
OWNER TO username;

12
dbd/sql/pg/schema/system_rights.sql Normal file
View File

@ -0,0 +1,12 @@
CREATE TABLE system.rights
(
"ID" integer NOT NULL DEFAULT nextval('system."user_rights_ID_seq"'::regclass),
name character varying(55) NOT NULL,
description character varying(255) NOT NULL,
CONSTRAINT system_rights_pk PRIMARY KEY ("ID")
)
WITH (
OIDS=FALSE
);
ALTER TABLE system.rights
OWNER TO username;

19
dbd/sql/pg/schema/system_sys_log.sql Normal file
View File

@ -0,0 +1,19 @@
CREATE TABLE system.sys_log
(
"ID" integer NOT NULL DEFAULT nextval('system."sys_log_ID_seq"'::regclass),
class text NOT NULL,
message text NOT NULL,
code integer NOT NULL,
file text NOT NULL,
line integer NOT NULL,
trace text NOT NULL,
ip text NOT NULL,
querytime double precision NOT NULL,
"time" timestamp with time zone NOT NULL DEFAULT now()
)
WITH (
OIDS=FALSE
);
ALTER TABLE system.sys_log
OWNER TO username;

19
dbd/sql/pg/schema/system_todo.sql Normal file
View File

@ -0,0 +1,19 @@
CREATE TABLE system.todo
(
"ID" integer NOT NULL,
"time" timestamp with time zone NOT NULL,
author integer NOT NULL,
type integer NOT NULL,
state integer NOT NULL,
msg_1 text NOT NULL,
msg_2 text,
msg_3 text,
msg_4 text,
msg_5 text,
CONSTRAINT system_todo_pk_id PRIMARY KEY ("ID")
)
WITH (
OIDS=FALSE
);
ALTER TABLE system.todo
OWNER TO username;

18
dbd/sql/pg/schema/system_user.sql Normal file
View File

@ -0,0 +1,18 @@
CREATE TABLE system."user"
(
id serial NOT NULL,
username character varying(32) NOT NULL,
password_sha character varying(255),
password_md5 character varying(255),
email character varying(255) NOT NULL,
joindate timestamp with time zone NOT NULL DEFAULT now(),
locale character varying(6) NOT NULL DEFAULT 'enUS'::character varying,
last_active timestamp with time zone NOT NULL DEFAULT now(),
account_flag integer,
CONSTRAINT system_user_pk_id PRIMARY KEY (id)
)
WITH (
OIDS=FALSE
);
ALTER TABLE system."user"
OWNER TO username;

16
dbd/sql/pg/schema/system_user_to_rights.sql Normal file
View File

@ -0,0 +1,16 @@
CREATE TABLE system.user_to_rights
(
"rightID" integer NOT NULL,
"userID" integer NOT NULL,
CONSTRAINT "system_user_to_rights_fk_userID" FOREIGN KEY ("userID")
REFERENCES system."user" (id) MATCH SIMPLE
ON UPDATE NO ACTION ON DELETE NO ACTION,
CONSTRAINT "system_user_to_rights_rightID" FOREIGN KEY ("rightID")
REFERENCES system.rights ("ID") MATCH SIMPLE
ON UPDATE NO ACTION ON DELETE NO ACTION
)
WITH (
OIDS=FALSE
);
ALTER TABLE system.user_to_rights
OWNER TO username;

20
dbd/tbl/PAGETable.php
View File

@ -1,20 +0,0 @@
<?php
namespace SYSTEM\DBD;
class PAGETable {
const NAME_PG = 'system.page_calls';
const NAME_MYS = 'system_page_calls';
const FIELD_ID = 'ID';
const FIELD_FLAG = 'flag';
const FIELD_PARENTID = 'parentID';
const FIELD_PARENTVALUE = 'parentValue';
const FIELD_NAME = 'name';
// const FIELD_ISCHACHED = 'IsCached'; use flagfield!
const FIELD_ALLOWEDVALUES = 'allowedValues';
const VALUE_FLAG_COMMAND = 0;
const VALUE_FLAG_PARAM = 1;
}

3
dbd/tbl/APITable.php → dbd/tbl/system_api.php
View File

@ -2,8 +2,7 @@
namespace SYSTEM\DBD; namespace SYSTEM\DBD;
class APITable { class system_api {
const NAME_PG = 'system.api'; const NAME_PG = 'system.api';
const NAME_MYS = 'system_api'; const NAME_MYS = 'system_api';