Merge branch 'master' of mojotrollz.eu:system
This commit is contained in:
messerbill
commit
9c10bfc1be
11
dbd/qq/SYS_SAIMOD_CRON.php
Normal file
11
dbd/qq/SYS_SAIMOD_CRON.php
Normal file
@ -0,0 +1,11 @@
|
||||
<?php
|
||||
namespace SYSTEM\DBD;
|
||||
|
||||
class SYS_SAIMOD_CRON extends \SYSTEM\DB\QQ {
|
||||
protected static function query(){
|
||||
return new \SYSTEM\DB\QQuery(get_class(),
|
||||
//pg
|
||||
'',
|
||||
//mys
|
||||
'SELECT * FROM system_cron ORDER BY class;'
|
||||
);}}
|
||||
@ -1,16 +1,16 @@
|
||||
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');
|
||||
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, 10, 'files', 'id', 'STRING');
|
||||
@ -21,8 +21,16 @@ class files {
|
||||
if (!in_array($id, $folder)) {
|
||||
throw new \SYSTEM\LOG\ERROR("No matching ID '" . $id . "' found.");}
|
||||
|
||||
\SYSTEM\HEADER::PNG();
|
||||
return file_get_contents(self::$folders[$cat].$id);
|
||||
$ext = pathinfo(self::$folders[$cat].$id);
|
||||
$ext = strtoupper(array_key_exists('extension', $ext) ? $ext['extension'] : '');
|
||||
if(\SYSTEM\HEADER::available($ext)){
|
||||
call_user_func('\SYSTEM\HEADER::'.$ext);
|
||||
}else{
|
||||
\SYSTEM\HEADER::FILE($id);}
|
||||
|
||||
if(!self::file_get_contents_chunked(self::$folders[$cat].$id,4096,function($chunk,&$handle,$iteration){echo $chunk;})){
|
||||
throw new \SYSTEM\LOG\ERROR("Could not transfere File.");}
|
||||
return;
|
||||
}
|
||||
|
||||
public static function put($cat, $id, $contents) {
|
||||
@ -57,4 +65,17 @@ class files {
|
||||
|
||||
public static function getURL($cat, $id = null) {
|
||||
return \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL) . 'api.php?call=files&cat=' . $cat . '&id=' . $id;}
|
||||
|
||||
private static function file_get_contents_chunked($file,$chunk_size,$callback)
|
||||
{
|
||||
$handle = fopen($file, "r");
|
||||
$i = 0;
|
||||
while (!feof($handle))
|
||||
{
|
||||
call_user_func_array($callback,array(fread($handle,$chunk_size),&$handle,$i));
|
||||
$i++;
|
||||
}
|
||||
fclose($handle);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@ -3,51 +3,16 @@ namespace SYSTEM\SAI;
|
||||
|
||||
class saimod_sys_cron extends \SYSTEM\SAI\SaiModule {
|
||||
public static function sai_mod__SYSTEM_SAI_saimod_sys_cron(){
|
||||
//$last_group = -1;
|
||||
$vars = array();
|
||||
$vars['tabopts'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/tabopt.tpl'), array());
|
||||
$vars['content'] = '';
|
||||
|
||||
$con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo());
|
||||
if(\SYSTEM\system::isSystemDbInfoPG()){
|
||||
$res = $con->query('SELECT "group", count(*) as "count" FROM system.api GROUP BY "group" ORDER BY "group" ASC;');
|
||||
} else {
|
||||
$res = $con->query('SELECT `group`, count(*) as `count` FROM system_api GROUP BY `group` ORDER BY `group` ASC;');
|
||||
}
|
||||
|
||||
$vars['tabopts'] = '';
|
||||
$first = true;
|
||||
$res = \SYSTEM\DBD\SYS_SAIMOD_CRON::QQ();
|
||||
while($r = $res->next()){
|
||||
$vars2 = array( 'active' => ($first ? 'active' : ''),
|
||||
'tab_id' => $r['group']);
|
||||
$first = false;
|
||||
$vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/tabopt.tpl'), $vars2);
|
||||
}
|
||||
|
||||
if(\SYSTEM\system::isSystemDbInfoPG()){
|
||||
$res = $con->query('SELECT * FROM system.api ORDER BY "group", "ID" ASC;');
|
||||
} else {
|
||||
$res = $con->query('SELECT * FROM system_api ORDER BY `group`, `ID` ASC;');
|
||||
}
|
||||
|
||||
while($r = $res->next()){
|
||||
$tabs[$r['group']]['tab_id'] = $r['group'];
|
||||
$tabs[$r['group']]['content'] = isset($tabs[$r['group']]['content']) ? $tabs[$r['group']]['content'] : '';
|
||||
$r['tr_class'] = self::tablerow_class($r['type']);
|
||||
$r['type'] = self::type_names($r['type']);
|
||||
$tabs[$r['group']]['content'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/list_entry.tpl'), $r);
|
||||
}
|
||||
|
||||
$vars['tabs'] = '';
|
||||
$first = true;
|
||||
foreach($tabs as $tab){
|
||||
$tab['active'] = ($first ? 'active' : '');
|
||||
$first = false;
|
||||
$vars['tabs'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/tab.tpl'), $tab);}
|
||||
$vars['content'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/list_entry.tpl'), $r);}
|
||||
|
||||
$vars['tabs'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/tab.tpl'), $vars);
|
||||
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/tabs.tpl'), $vars);
|
||||
|
||||
/* $result = "";
|
||||
$result .= '<tr class="'.self::tablerow_class($r['type']).'">'.'<td>'.$r['ID'].'</td>'.'<td>'.$r['group'].'</td>'.'<td>'.$r['type'].'</td>'.'<td>'.$r['parentID'].'</td>'.'<td>'.$r['parentValue'].'</td>'.'<td>'.$r['name'].'</td>'.'<td>'.$r['verify'].'</td>'.'</tr>';
|
||||
return $result;*/
|
||||
}
|
||||
|
||||
public static function sai_mod__system_sai_saimod_sys_api_action_deletedialog($ID){
|
||||
@ -69,17 +34,6 @@ class saimod_sys_cron extends \SYSTEM\SAI\SaiModule {
|
||||
return \SYSTEM\LOG\JsonResult::ok();
|
||||
}
|
||||
|
||||
private static function type_names($type){
|
||||
switch($type){
|
||||
case 0: return 'COMMAND';
|
||||
case 1: return 'COMMAND_FLAG';
|
||||
case 2: return 'PARAMETER';
|
||||
case 3: return 'PARAMETER_OPT';
|
||||
case 4: return 'STATIC';
|
||||
default: return 'Problem unknown type';
|
||||
}
|
||||
}
|
||||
|
||||
private static function tablerow_class($flag){
|
||||
switch($flag){
|
||||
case 0: return 'info';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<div class="tab-pane ${active}" id="tab_${tab_id}">
|
||||
<div class="tab-pane active" id="tab_cron">
|
||||
<table class="table table-hover table-condensed" style="overflow: auto;">
|
||||
<tr>
|
||||
<th>class</th>
|
||||
|
||||
@ -1 +1 @@
|
||||
<li class="${active}"><a href="#tab_${tab_id}">Group ${tab_id}</a></li>
|
||||
<li class="active"><a href="#tab_cron">Cron</a></li>
|
||||
@ -3,7 +3,7 @@
|
||||
<hr>
|
||||
<div id="cron_content">
|
||||
<div class="tabbable">
|
||||
<ul class="nav nav-tabs" id="localetab">
|
||||
<ul class="nav nav-tabs" id="crontab">
|
||||
${tabopts}
|
||||
</ul>
|
||||
<div class="tab-content">
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
namespace SYSTEM;
|
||||
|
||||
class HEADER {
|
||||
|
||||
private static function checkHeader(){
|
||||
$file = null;
|
||||
$line = null;
|
||||
@ -15,10 +14,25 @@ class HEADER {
|
||||
public static function JSON(){
|
||||
if(self::checkHeader()){
|
||||
header('Access-Control-Allow-Origin: *');//allow cross domain calls
|
||||
header('content-type: application/json');}
|
||||
}
|
||||
header('content-type: application/json');}}
|
||||
public static function PNG(){
|
||||
if(self::checkHeader()){
|
||||
header('content-type:image/png;');}
|
||||
}
|
||||
header('content-type:image/png;');}}
|
||||
public static function JPG(){
|
||||
if(self::checkHeader()){
|
||||
header('content-type:image/jpeg;');}}
|
||||
public static function JPEG(){
|
||||
if(self::checkHeader()){
|
||||
header('content-type:image/jpeg;');}}
|
||||
public static function GIF(){
|
||||
if(self::checkHeader()){
|
||||
header('content-type:image/gif;');}}
|
||||
|
||||
public static function FILE($filename){
|
||||
header("Content-type: application/octet-stream");
|
||||
header("Content-Disposition: attachment; filename=\"".$filename."\"");}
|
||||
|
||||
public static function available($datatype){
|
||||
$datatype = strtoupper($datatype);
|
||||
return \method_exists('\SYSTEM\HEADER', $datatype);}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user