From 1b2630d0ba85b1f564b2894257d9ec500fc5ffd6 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Sun, 14 Dec 2014 04:17:23 +0100
Subject: [PATCH] fixed saimod todo stats, fixed login problem - session
 refresh on saigui now

---
 .../qq/SYS_SAIMOD_TODO_STATS_COUNT.php                | 11 -----------
 .../qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php       | 11 +++++++++++
 .../qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php      | 11 +++++++++++
 .../qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php       | 11 +++++++++++
 .../qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php      | 11 +++++++++++
 sai/modules/saimod_sys_todo/saimod_sys_todo.php       |  6 +++++-
 sai/sai/saigui.php                                    |  1 +
 7 files changed, 50 insertions(+), 12 deletions(-)
 delete mode 100644 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT.php
 create mode 100644 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php
 create mode 100644 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php
 create mode 100644 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php
 create mode 100644 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php

diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT.php
deleted file mode 100644
index 980c994..0000000
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace SYSTEM\DBD;
-
-class SYS_SAIMOD_TODO_STATS_COUNT extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT COUNT(*) as `count` FROM system_todo GROUP BY state, `type` ORDER BY state, `type`;',
-//mys
-'SELECT COUNT(*) as `count` FROM system_todo GROUP BY state, `type` ORDER BY state, `type`;'
-);}}
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php
new file mode 100644
index 0000000..3ef0f45
--- /dev/null
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php
@@ -0,0 +1,11 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN extends \SYSTEM\DB\QQ {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 0',
+//mys
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 0'
+);}}
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php
new file mode 100644
index 0000000..db14c33
--- /dev/null
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php
@@ -0,0 +1,11 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER extends \SYSTEM\DB\QQ {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 1',
+//mys
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 1'
+);}}
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php
new file mode 100644
index 0000000..8d3b143
--- /dev/null
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php
@@ -0,0 +1,11 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN extends \SYSTEM\DB\QQ {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 0',
+//mys
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 0'
+);}}
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php
new file mode 100644
index 0000000..038a106
--- /dev/null
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php
@@ -0,0 +1,11 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER extends \SYSTEM\DB\QQ {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 1',
+//mys
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 1'
+);}}
diff --git a/sai/modules/saimod_sys_todo/saimod_sys_todo.php b/sai/modules/saimod_sys_todo/saimod_sys_todo.php
index ad5b01f..fe85f55 100644
--- a/sai/modules/saimod_sys_todo/saimod_sys_todo.php
+++ b/sai/modules/saimod_sys_todo/saimod_sys_todo.php
@@ -69,7 +69,11 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule {
          *  149;1;0
          *  1;1;1
          */
-        $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_COUNT::QA();
+        $res = array();
+        $res[0] = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN::Q1();
+        $res[1] = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER::Q1();
+        $res[2] = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN::Q1();
+        $res[3] = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER::Q1();
         $vars = array();
         $vars['todo_count'] = $res[0]['count']+$res[1]['count'];
         $vars['doto_count'] = $res[2]['count']+$res[3]['count'];
diff --git a/sai/sai/saigui.php b/sai/sai/saigui.php
index 6efc242..4857510 100644
--- a/sai/sai/saigui.php
+++ b/sai/sai/saigui.php
@@ -6,6 +6,7 @@ define('SAI_MOD_POSTFIELD','sai_mod');
 class saigui extends \SYSTEM\PAGE\Page {
     
     public function html(){
+        \SYSTEM\SECURITY\Security::isLoggedIn(); // refresh session
         //Direct JSON Input
         $pg = json_decode(file_get_contents("php://input"), true);
         if(!$pg){