diff --git a/docu/apiclass/ApiClass.php b/docu/apiclass/ApiClass.php deleted file mode 100644 index 1f6d986..0000000 --- a/docu/apiclass/ApiClass.php +++ /dev/null @@ -1,345 +0,0 @@ -input_deviceinfo();} - public static function call_input_type_data($source,$json){ - $pars = new JSONParser($json, $source); - return $pars->input_data();} - - //#Imageoverlays - public static function call_map_algo_heatmapStd($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new heatmapStd_algo(); - return $imggen->generateTile($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - public static function call_map_algo_heatmapStd_flag_key($type){ - $imggen = new heatmapStd_algo(); - return $imggen->generateMapKey($type);} - public static function call_map_algo_heatmapStd_flag_markers($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new heatmapStd_algo(); - return $imggen->getMarkers($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - - public static function call_map_algo_heatmapRect($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new heatmapRect_algo(); - return $imggen->generateTile($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - public static function call_map_algo_heatmapRect_flag_key($type){ - $imggen = new heatmapRect_algo(); - return $imggen->generateMapKey($type);} - public static function call_map_algo_heatmapRect_flag_markers($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new heatmapRect_algo(); - return $imggen->getMarkers($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - - public static function call_map_algo_speedmap($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new speedmap_algo(); - return $imggen->generateTile($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - public static function call_map_algo_speedmap_flag_key($type){ - $imggen = new speedmap_algo(); - return $imggen->generateMapKey($type);} - public static function call_map_algo_speedmap_flag_markers($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new speedmap_algo(); - return $imggen->getMarkers($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - - public static function call_map_algo_differencemap($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new differencemap_algo(); - return $imggen->generateTile($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - public static function call_map_algo_differencemap_flag_key($type){ - $imggen = new differencemap_algo(); - return $imggen->generateMapKey($type);} - public static function call_map_algo_differencemap_flag_markers($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new differencemap_algo(); - return $imggen->getMarkers($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - - public static function call_map_algo_tramlines($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new tramlines_algo(); - return $imggen->generateTile($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - public static function call_map_algo_tramlines_flag_key($type){ - $imggen = new tramlines_algo(); - return $imggen->generateMapKey($type);} - public static function call_map_algo_tramlines_flag_markers($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new tramlines_algo(); - return $imggen->getMarkers($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - - public static function call_map_algo_tram($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new tram_algo(); - return $imggen->generateTile($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - public static function call_map_algo_tram_flag_key($type){ - $imggen = new tram_algo(); - return $imggen->generateMapKey($type);} - public static function call_map_algo_tram_flag_markers($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new tram_algo(); - return $imggen->getMarkers($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - - public static function call_map_algo_animationTest($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new animationTest_algo(); - return $imggen->generateTile($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - public static function call_map_algo_animationTest_flag_key($type){ - $imggen = new animationTest_algo(); - return $imggen->generateMapKey($type);} - public static function call_map_algo_animationTest_flag_markers($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new animationTest_algo(); - return $imggen->getMarkers($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - public static function call_map_algo_animationTest_flag_animation($x,$y,$zoom,$time_start,$time_end,$type,$provider){ - $imggen = new animationTest_algo(); - return $imggen->getAnimation($x,$y,$zoom,$time_start,$time_end,$type,$provider);} - - //#Analysis API - // insert new bonus area - public static function call_analysis_action_barea_mthd_insert($pswd,$json){ - return BonusAreaController::insert($pswd, $json);} - // get all bonus areas - public static function call_analysis_action_barea_mthd_getall(){ - return BonusAreaController::getall();} - // get all active bonus areas - public static function call_analysis_action_barea_mthd_getallactive(){ - return BonusAreaController::getallactive();} - // within a bonus area? - public static function call_analysis_action_barea_mthd_within($lat,$lng,$when){ - return BonusAreaController::within($lat, $lng, $when);} - - // get total statistics - public static function call_analysis_action_statistic_mthd_gettotal($useruid,$intval){ - return StatisticsController::getTotalUserStatistics($useruid,$intval);} - // get series statistics - public static function call_analysis_action_statistic_mthd_getseries($useruid){ - return StatisticsController::getTotalSeriesStatistics($useruid);} - // get 24 map projection - public static function call_analysis_action_statistic_mthd_projection24($useruid,$intval){ - return StatisticsController::getProjection24($intval, $useruid);} - - // get own rank - public static function call_analysis_action_rank_mthd_get($useruid,$acronym){ - return RankController::getRank($useruid, $acronym);} - // get own history ranks - public static function call_analysis_action_rank_mthd_gethist($useruid,$sort){ - return RankController::getRankHistoryByUser($useruid, $sort);} - // questions calls - public static function call_analysis_action_rank_mthd_is($useruid,$acronym){ - return RankController::isRank($useruid, $acronym);} - - // get all achievements by userUID - public static function call_analysis_action_achievement_mthd_getbyuser($useruid){ - return AchievementController::getReachedAchievements($useruid);} - // get all defined achievements conditions - public static function call_analysis_action_achievement_mthd_getallcond($useruid, $acronym){ - return AchievementController::getAllAchievementDefinitionCondition($acronym, $useruid);} - // get all defined achievements - public static function call_analysis_action_achievement_mthd_getalldefs($useruid, $acronym){ - return AchievementController::getAllAchievementDefinitionCondition($acronym, $useruid);} - - // get current ranking all - public static function call_analysis_action_ranking_mthd_all($useruid,$last){ - return RankingController::getRankingAll($useruid,$last);} - // get current ranking own - public static function call_analysis_action_ranking_mthd_own($useruid,$last){ - return RankingController::getRankingOwn($useruid,$last);} - - // get explore factor - public static function call_analysis_action_data_mthd_explore($lat,$lng,$radius,$endtime){ - return DataController::getExplore($lat, $lng, $radius, $endtime);} - // get cities by postal code - public static function call_analysis_action_data_mthd_citybyzip($zip){ - return DataController::queryByZip($zip);} - - // store registration id - public static function call_analysis_action_ctwodm_mthd_register($useruid, $regid, $deviceid){ - return MessageController::handleRegistrationId($regid, $useruid, $deviceid);} - // fetch new messages - public static function call_analysis_action_ctwodm_mthd_fetch($useruid, $last){ - return MessageController::fetchAllData($useruid,$last);} - - // call=locale - public static function call_locale($request,$lang){ - $starttime = microtime(true); - return JsonResult::toString($starttime, \SYSTEM\locale::getStrings($request, $lang));} - - //TODO remove -> backend - public function call_preprocessing1233423DONOTCALL(){ - PreprocessAll::process(); - } -}; \ No newline at end of file diff --git a/docu/apiclass/ApiVerify.php b/docu/apiclass/ApiVerify.php deleted file mode 100644 index eacf875..0000000 --- a/docu/apiclass/ApiVerify.php +++ /dev/null @@ -1,17 +0,0 @@ - 0 & $param < 10;} - public static function GOOGLEMAPCOORD ($param){ return self::UINT($param);} - public static function GOOGLEMAPZOOM ($param){ return self::UINT($param) && $param < 20;} - public static function WIERDTIMESTAMP ($param){ return (strtotime($param)==false) ? false : true;} - public static function SENSORPROVIDER ($param){ return true;} //TODO remove this param - public static function LATLONCOORD ($param){ return self::FLOAT($param) && floatval($param) >= 0 && floatval($param) <= 180;} - public static function USERNAME ($param){ return self::STRING($param) && strlen($param) >=3 && strlen($param) <= 30;} - public static function PASSWORD ($param){ return self::STRING($param) && strlen($param) >=5 && strlen($param) <= 16;} - public static function HASH ($param){ return preg_match("^[0-9A-Fa-f]+$^", $param) != 0 && strlen($param) >=5;} - public static function PASSHASH ($param){ return self::PASSWORD($param) || self::HASH($param);} - public static function EMAIL ($param){ return filter_var($param, FILTER_VALIDATE_EMAIL);} - public static function ARRAYINT ($param){ return self::ARY($param) || self::INT($param);} -} \ No newline at end of file diff --git a/docu/apiclass/PageApi.php b/docu/apiclass/PageApi.php deleted file mode 100644 index c23ab93..0000000 --- a/docu/apiclass/PageApi.php +++ /dev/null @@ -1,110 +0,0 @@ -getConstants(); - $line_end = $class->getEndLine(); - $extension_name = $class->getExtensionName(); - $filename = $class->getFileName(); - $interfaces = $class->getInterfaceNames(); - $methods = $class->getMethods(); - $modifiers = $class->getModifiers(); - $name_long = $class->getName(); - $namespace = $class->getNamespaceName(); - $properties = $class->getProperties(); - $name_short = $class->getShortName(); - $line_start = $class->getStartLine(); - $properties_static = $class->getStaticProperties(); - $in_namespace = $class->inNamespace(); - $is_abstract = $class->isAbstract(); - $is_final = $class->isFinal(); - $is_instantiable = $class->isInstantiable(); - $is_interace = $class->isInterface(); - $is_internal = $class->isInternal(); - $is_iterateable = $class->isIterateable(); - $is_user_defined = $class->isUserDefined(); - - $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); - //$con->query('SELECT count(*) FROM `system_code_docu_class` WHERE ') - $con->prepare( 'insert_class', - "INSERT INTO `system_code_docu_class` (`class`, `name`, `namespace`, `dead`, `line_start`, `line_end`, `file`, `abstract`, `final`, `instantiable`, `interface`, `internal`, `iterateable`, `userdefined`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);", - array($name_long,$name_short,$namespace,(int)false,$line_start,$line_end,$filename,(int)$is_abstract,(int)$is_final,(int)$is_instantiable,(int)$is_interace,(int)$is_internal,(int)$is_iterateable,(int)$is_user_defined)); - - - } -} \ No newline at end of file diff --git a/docu/docu.php b/docu/docu.php index f87f364..7b3f5b1 100644 --- a/docu/docu.php +++ b/docu/docu.php @@ -2,29 +2,7 @@ namespace SYSTEM\DOCU; class docu { - /*private static $documents = array(); //only strings! - - public static function registerFolder($folder,$category){ - if(!is_dir($folder)){ - throw new \SYSTEM\LOG\ERROR('Docu Folder does not exist: '.$folder);} - - foreach (glob($folder."/*.md") as $filename) { - self::register($filename, $category);} - } - public static function register($document,$category){ - if(!file_exists($document)){ - throw new \SYSTEM\LOG\ERROR("Could not find registered documentation: ".$document);} - if(!isset(self::$documents[$category])){ - self::$documents[$category] = array();} - array_push(self::$documents[$category],$document);} - - public static function getDocuments(){ - return self::$documents;} - public static function getCategory($category){ - return self::$documents[$category];}*/ private static $phpdocconfigs = array(); - //phpdocconfig - //array('inoath' => path, 'outpath' => path) public static function register($phpdocconfig){ array_push(self::$phpdocconfigs,$phpdocconfig);} diff --git a/docu/docu_categories.php b/docu/docu_categories.php deleted file mode 100644 index 1249230..0000000 --- a/docu/docu_categories.php +++ /dev/null @@ -1,6 +0,0 @@ - 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()); - -$json = json_decode(file_get_contents("php://input"), true); - -$starttime = microtime(true); -try { - if($json){ - echo $api->CALL($json); - } else { - echo $api->CALL(array_merge($_POST,$_GET));} -} catch(Exception $e){ - echo JsonResult::error($starttime, $e); -} \ No newline at end of file diff --git a/docu/index/index.php b/docu/index/index.php deleted file mode 100644 index 495cdfb..0000000 --- a/docu/index/index.php +++ /dev/null @@ -1,36 +0,0 @@ -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()); - -try{ - echo $page->CALL(array_merge($_POST,$_GET))->html(); -} catch(Exception $e) { - echo $e; - $page = new default_page(); - echo $page->html(); -} - -?> \ No newline at end of file diff --git a/lib/phpdocumentor b/lib/phpdocumentor index fe1c390..33be5be 160000 --- a/lib/phpdocumentor +++ b/lib/phpdocumentor @@ -1 +1 @@ -Subproject commit fe1c3909426881fd10c55b688e0c48aa8acb9f13 +Subproject commit 33be5be1b0f01423dee08ddb1091599f92e106ad diff --git a/sai/modules/saimod_sys_docu/saimod_sys_docu.php b/sai/modules/saimod_sys_docu/saimod_sys_docu.php index b4f83e2..71c6120 100644 --- a/sai/modules/saimod_sys_docu/saimod_sys_docu.php +++ b/sai/modules/saimod_sys_docu/saimod_sys_docu.php @@ -14,9 +14,10 @@ class saimod_sys_docu extends \SYSTEM\SAI\SaiModule { \LIB\lib_phpdocumentor::php(); $configs = \SYSTEM\DOCU\docu::getAll(); foreach($configs as $config){ - \phpdocumentor::run( $config['inpath']->SERVERPATH(), - $config['outpath']->SERVERPATH(), - $config['cachepath']->SERVERPATH(), + \phpdocumentor::run( $config['inpath'], + $config['outpath'], + $config['cachepath'], + $config['ignore'], $config['title'], $config['sourcecode'], $config['parseprivate']);} @@ -24,17 +25,7 @@ class saimod_sys_docu extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_docu_action_cat($cat = 'system'){ $vars = array('iframesrc' => \SYSTEM\DOCU\docu::get($cat)['outpath']->WEBPATH(false)); - return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_docu/tpl/saimod_sys_docu_cat.tpl'))->SERVERPATH(), $vars); - } - - public static function sai_mod__SYSTEM_SAI_saimod_sys_docu_action_doc($cat = 'System',$doc = '1_system_md'){ - /*\LIB\lib_markdown::php(); - $document = \SYSTEM\DOCU\docu::getDocuments()[$cat]; - foreach($document as $docu){ - if(str_replace(array('.',' ','\\','/'), '_', basename($docu)) == $doc){ - return \Michelf\MarkdownExtra::defaultTransform(file_get_contents($docu));} - }*/ - return 'not found'; + return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_docu/tpl/saimod_sys_docu_iframe.tpl'))->SERVERPATH(), $vars); } //public static function html_li_menu(){return '
  • ${sai_menu_docu}
  • ';} diff --git a/sai/modules/saimod_sys_docu/tpl/saimod_sys_docu_cat.tpl b/sai/modules/saimod_sys_docu/tpl/saimod_sys_docu_iframe.tpl similarity index 100% rename from sai/modules/saimod_sys_docu/tpl/saimod_sys_docu_cat.tpl rename to sai/modules/saimod_sys_docu/tpl/saimod_sys_docu_iframe.tpl diff --git a/sai/sai/saigui.php b/sai/sai/saigui.php index 4e50cd9..61b4d44 100644 --- a/sai/sai/saigui.php +++ b/sai/sai/saigui.php @@ -4,6 +4,29 @@ class saigui extends \SYSTEM\PAGE\Page { const SAI_MOD_POSTFIELD = 'sai_mod'; public function html(){ + //register docu here, we require path so system must be started + \SYSTEM\DOCU\docu::register(array( 'id' => 'system', + 'inpath' => new \SYSTEM\PSYSTEM(), + 'outpath' => new \SYSTEM\PSYSTEM('docu/system/'), + 'cachepath' => new \SYSTEM\PSYSTEM('docu/system/cache/'), + 'ignore' => array( 'lib/animate/*', + 'lib/bootstrap/*', + 'lib/bootstrap_growl/*', + 'lib/git/*', + 'lib/jqbootstrapvalidation/*', + 'lib/jquery/*', + 'lib/lettering/*', + 'lib/markdown/*', + 'lib/minify/*', + 'lib/phpdocumentor/*', + 'lib/scssphp/*', + 'lib/tablesorter/*', + 'lib/texttilate/*', + 'lib/tinymce/*'), + 'sourcecode' => true, + 'parseprivate' => false, + 'title' => 'SYSTEM - PHP Framework')); + \SYSTEM\SECURITY\Security::isLoggedIn(); // refresh session //Direct JSON Input $pg = json_decode(file_get_contents("php://input"), true); diff --git a/sql/qt/mysql/data/system_page.sql b/sql/qt/mysql/data/system_page.sql index 0aa9416..048cb4f 100644 --- a/sql/qt/mysql/data/system_page.sql +++ b/sql/qt/mysql/data/system_page.sql @@ -20,7 +20,7 @@ INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (50, 42, 'docu', 'docu', -1, 0, 0, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_docu', 'init_saimod_sys_docu', '\\SYSTEM\\SAI\\saimod_sys_docu'); INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (51, 42, 'cat', 'docu', 50, 0, 0, '#tab_docu', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_docu&action=cat&cat=${cat}', 'init_saimod_sys_docu_cat', '\\SYSTEM\\SAI\\saimod_sys_docu'); -INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (55, 42, 'doc', 'docu', 51, 0, 0, '#tab2_docu', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_docu&action=doc&cat=${cat}&doc=${doc}', 'init_saimod_sys_docu_doc', '\\SYSTEM\\SAI\\saimod_sys_docu'); +-- INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (55, 42, 'doc', 'docu', 51, 0, 0, '#tab2_docu', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_docu&action=doc&cat=${cat}&doc=${doc}', 'init_saimod_sys_docu_doc', '\\SYSTEM\\SAI\\saimod_sys_docu'); INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (60, 42, 'files', 'files', -1, 0, 0, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_files', 'init_saimod_sys_files', '\\SYSTEM\\SAI\\saimod_sys_files'); INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (61, 42, 'list', 'files', 60, 0, 0, '#tab_files', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_files&action=tab&name=${folder}', 'init_saimod_sys_files_list', '\\SYSTEM\\SAI\\saimod_sys_files'); diff --git a/sql/qt/mysql/data/system_sai_api.sql b/sql/qt/mysql/data/system_sai_api.sql index 9636586..4b7fcb5 100644 --- a/sql/qt/mysql/data/system_sai_api.sql +++ b/sql/qt/mysql/data/system_sai_api.sql @@ -168,8 +168,8 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `nam INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (1100, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_docu', 'action', NULL); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (1101, 42, 3, 1100, 'cat', 'cat', 'STRING'); -INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (1110, 42, 3, 1100, 'doc', 'cat', 'STRING'); -INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (1111, 42, 3, 1100, 'doc', 'doc', 'STRING'); +-- INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (1110, 42, 3, 1100, 'doc', 'cat', 'STRING'); +-- INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (1111, 42, 3, 1100, 'doc', 'doc', 'STRING'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (1200, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_cron', 'action', NULL); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (1201, 42, 2, 1200, 'add', 'cls', 'STRING'); diff --git a/sql/qt/mysql/data/system_text.sql b/sql/qt/mysql/data/system_text.sql index 9c33d10..562dfbe 100644 --- a/sql/qt/mysql/data/system_text.sql +++ b/sql/qt/mysql/data/system_text.sql @@ -642,6 +642,13 @@ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_clear', 'basic'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_clear', 'sai_cache'); + DELETE FROM `system_text` WHERE id = 'basic_generate'; + DELETE FROM `system_text_tag` WHERE id = 'basic_generate'; + INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_generate', 'deDE', 'Generieren', 1, 1, '2015-04-16 23:11:18', '2015-04-16 16:48:36'); + INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_generate', 'enUS', 'Generate', 2, 1, '2015-04-16 23:11:18', '2015-04-16 23:11:18'); + INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_generate', 'basic'); + INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_generate', 'sai_docu'); + -- SAI DELETE FROM `system_text` WHERE id = 'sai_api_title'; DELETE FROM `system_text_tag` WHERE id = 'sai_api_title'; diff --git a/system/system.php b/system/system.php index 373836b..27e9e0c 100644 --- a/system/system.php +++ b/system/system.php @@ -17,15 +17,6 @@ class system { \SYSTEM\system::register_errorhandler_dbwriter();} //write errors to database (must be first errorhandler to register) if($error_json){ \SYSTEM\system::register_errorhandler_jsonoutput();} //print errors as json to caller (must be last errorhandler to register) - - //register docu here, we require path - \SYSTEM\DOCU\docu::register(array( 'id' => 'system', - 'inpath' => new \SYSTEM\PSYSTEM(), - 'outpath' => new \SYSTEM\PSYSTEM('docu/system/'), - 'cachepath' => new \SYSTEM\PSYSTEM('docu/system/cache/'), - 'sourcecode' => true, - 'parseprivate' => false, - 'title' => 'SYSTEM - PHP Framework')); } public static function _start_time(){ \SYSTEM\time::start();}