From 293551a530a734aba68cc77615d39eca67d54d75 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 3 Aug 2017 23:49:52 +0200
Subject: [PATCH] #352 use wat.webcraft-media.de api instead of local queries,
 display errors if they occur

---
 saimod_webcraft_updates.php               | 52 +++++++++++++----------
 sql/autoload.inc                          |  1 -
 sql/qq/WEBCRAFT_UPDATES_COMMIT.php        | 10 -----
 sql/qq/WEBCRAFT_UPDATES_COMMIT_SELECT.php |  9 ----
 sql/qq/WEBCRAFT_UPDATES_PROJECT.php       | 10 -----
 sql/qq/WEBCRAFT_UPDATES_UPDATE.php        | 12 ------
 tpl/saimod_webcraft_updates.tpl           |  7 ++-
 7 files changed, 35 insertions(+), 66 deletions(-)
 delete mode 100644 sql/qq/WEBCRAFT_UPDATES_COMMIT.php
 delete mode 100644 sql/qq/WEBCRAFT_UPDATES_COMMIT_SELECT.php
 delete mode 100644 sql/qq/WEBCRAFT_UPDATES_PROJECT.php
 delete mode 100644 sql/qq/WEBCRAFT_UPDATES_UPDATE.php

diff --git a/saimod_webcraft_updates.php b/saimod_webcraft_updates.php
index c9345fc..17434c8 100644
--- a/saimod_webcraft_updates.php
+++ b/saimod_webcraft_updates.php
@@ -2,34 +2,40 @@
 namespace SAI;
 class saimod_webcraft_updates extends \SYSTEM\SAI\SaiModule {    
     public static function sai_mod__SAI_saimod_webcraft_updates($update = null, $project = null){
-        $vars = array('updates' => '', 'projects' => '', 'commits' => '');
+        $vars = array('updates' => '', 'projects' => '', 'commits' => '', 'error' => '');
+        $token = \SYSTEM\CONFIG\config::get(\config_ids::WEBCRAFT_BILLING_TOKEN);
         
-        $res = \SQL\WEBCRAFT_UPDATES_UPDATE::QQ(array('test/mojotrollz/%'));
-        while($row = $res->next()){
-            $row['time'] = \SYSTEM\time::time_ago_string(strtotime($row['time']));
-            $vars['updates'] .= \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_webcraft_updates/tpl/saimod_webcraft_updates_update.tpl'))->SERVERPATH(),$row);}
-        
-        $project_row = null;
-        if($update){
-            $vars2 = array('project' => '', 'update' => $update);
-            $res = \SQL\WEBCRAFT_UPDATES_PROJECT::QQ(array($update, 'test/mojotrollz/%'));
-            while($row = $res->next()){
-                if($project && $row['path'] == $project){
-                    $project_row = $row;}
+        $updates = json_decode(file_get_contents('https://wat.webcraft-media.de/api.php?call=updates&action=updates&token='.$token),true);
+        if($updates['status']){
+            foreach($updates['result'] as $row){
                 $row['time'] = \SYSTEM\time::time_ago_string(strtotime($row['time']));
-                $vars2['project'] .= \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_webcraft_updates/tpl/saimod_webcraft_updates_project.tpl'))->SERVERPATH(),$row);}
-            $vars['projects'] = \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_webcraft_updates/tpl/saimod_webcraft_updates_projects.tpl'))->SERVERPATH(),$vars2);
+                $vars['updates'] .= \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_webcraft_updates/tpl/saimod_webcraft_updates_update.tpl'))->SERVERPATH(),$row);
+            }
+        } else {
+            $vars['error'] .= 'Error: '.$updates['result']['message'].'<br>';}
+        
+        if($update){
+            $projects = json_decode(file_get_contents('https://wat.webcraft-media.de/api.php?call=updates&action=projects'.'&update='.$update.'&token='.$token),true);
+            if($projects['status']){
+                $vars2 = array('project' => '', 'update' => $update);
+                foreach($projects['result'] as $row){
+                    $row['time'] = \SYSTEM\time::time_ago_string(strtotime($row['time']));
+                    $vars2['project'] .= \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_webcraft_updates/tpl/saimod_webcraft_updates_project.tpl'))->SERVERPATH(),$row);}
+                $vars['projects'] = \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_webcraft_updates/tpl/saimod_webcraft_updates_projects.tpl'))->SERVERPATH(),$vars2);
+            } else {
+                $vars['error'] .= 'Error: '.$updates['result']['message'].'<br>';}
         }
         
         if($project){
-            $vars3 = array('commit' => '', 'project' => $project);
-            $min = \SQL\WEBCRAFT_UPDATES_COMMIT_SELECT::Q1(array($project_row['git'],$project_row['commit_last']))['id']+1;
-            $max = \SQL\WEBCRAFT_UPDATES_COMMIT_SELECT::Q1(array($project_row['git'],$project_row['commit']))['id'];
-            $res = \SQL\WEBCRAFT_UPDATES_COMMIT::QQ(array($project_row['git'],$min,$max));
-            while($row = $res->next()){
-                $row['time'] = \SYSTEM\time::time_ago_string(strtotime($row['time']));
-                $vars3['commit'] .= \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_webcraft_updates/tpl/saimod_webcraft_updates_commit.tpl'))->SERVERPATH(),$row);}
-            $vars['commits'] = \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_webcraft_updates/tpl/saimod_webcraft_updates_commits.tpl'))->SERVERPATH(),$vars3);
+            $commits = json_decode(file_get_contents('https://wat.webcraft-media.de/api.php?call=updates&action=commits'.'&token='.$token.'&update='.$update.'&project='.$project),true);
+            if($commits['status']){
+                $vars3 = array('commit' => '', 'project' => $project);
+                foreach($commits['result'] as $row){
+                    $row['time'] = \SYSTEM\time::time_ago_string(strtotime($row['time']));
+                    $vars3['commit'] .= \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_webcraft_updates/tpl/saimod_webcraft_updates_commit.tpl'))->SERVERPATH(),$row);}
+                $vars['commits'] = \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_webcraft_updates/tpl/saimod_webcraft_updates_commits.tpl'))->SERVERPATH(),$vars3);
+            } else {
+                $vars['error'] .= 'Error: '.$updates['result']['message'].'<br>';}
         }
         
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('time'));
diff --git a/sql/autoload.inc b/sql/autoload.inc
index ab5b8be..7b6b96c 100644
--- a/sql/autoload.inc
+++ b/sql/autoload.inc
@@ -1,4 +1,3 @@
 <?php
 \SYSTEM\autoload::registerFolder(dirname(__FILE__),'SQL');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq/','SQL');
 \SYSTEM\SQL\setup::register('SQL\\DATA_SAIMOD_WEBCRAFT_UPDATES');
\ No newline at end of file
diff --git a/sql/qq/WEBCRAFT_UPDATES_COMMIT.php b/sql/qq/WEBCRAFT_UPDATES_COMMIT.php
deleted file mode 100644
index ed4ea71..0000000
--- a/sql/qq/WEBCRAFT_UPDATES_COMMIT.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace SQL;
-class WEBCRAFT_UPDATES_COMMIT extends \SYSTEM\DB\QP {
-    public static function get_class(){return \get_class();}
-    public static function mysql(){return
-'SELECT `time`, `email`, `author`, `log`, `commit` FROM host_wat.webcraft_update_commit'.
-' WHERE `git` = ? AND (id BETWEEN ? AND ?)'.
-' ORDER BY `time` DESC;';
-    }
-}
\ No newline at end of file
diff --git a/sql/qq/WEBCRAFT_UPDATES_COMMIT_SELECT.php b/sql/qq/WEBCRAFT_UPDATES_COMMIT_SELECT.php
deleted file mode 100644
index 6dc4fa7..0000000
--- a/sql/qq/WEBCRAFT_UPDATES_COMMIT_SELECT.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace SQL;
-class WEBCRAFT_UPDATES_COMMIT_SELECT extends \SYSTEM\DB\QP {
-    public static function get_class(){return \get_class();}
-    public static function mysql(){return
-'SELECT id FROM host_wat.webcraft_update_commit'.
-' WHERE `git` = ? AND `commit` = ?;';
-    }
-}
\ No newline at end of file
diff --git a/sql/qq/WEBCRAFT_UPDATES_PROJECT.php b/sql/qq/WEBCRAFT_UPDATES_PROJECT.php
deleted file mode 100644
index a8e9f26..0000000
--- a/sql/qq/WEBCRAFT_UPDATES_PROJECT.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace SQL;
-class WEBCRAFT_UPDATES_PROJECT extends \SYSTEM\DB\QP {
-    public static function get_class(){return \get_class();}
-    public static function mysql(){return
-'SELECT `time`, `path`, `git`, `commit`, `commit_last` FROM host_wat.webcraft_update_project'.
-' WHERE `update` = ? AND `path` LIKE ?'.
-' ORDER BY `time` ASC;';
-    }
-}
\ No newline at end of file
diff --git a/sql/qq/WEBCRAFT_UPDATES_UPDATE.php b/sql/qq/WEBCRAFT_UPDATES_UPDATE.php
deleted file mode 100644
index c339622..0000000
--- a/sql/qq/WEBCRAFT_UPDATES_UPDATE.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace SQL;
-class WEBCRAFT_UPDATES_UPDATE extends \SYSTEM\DB\QP {
-    public static function get_class(){return \get_class();}
-    public static function mysql(){return
-'SELECT u.`time`, u.`commit`, u.`commit_last`, u.`complete` FROM host_wat.`webcraft_update` as u'.
-' RIGHT JOIN host_wat.`webcraft_update_project` as p ON u.`commit` = p.`update`'.
-' WHERE `path` LIKE ?'.
-' GROUP BY u.`commit`'.
-' ORDER BY u.`time` DESC;';
-    }
-}
\ No newline at end of file
diff --git a/tpl/saimod_webcraft_updates.tpl b/tpl/saimod_webcraft_updates.tpl
index c63812e..36a3537 100644
--- a/tpl/saimod_webcraft_updates.tpl
+++ b/tpl/saimod_webcraft_updates.tpl
@@ -22,5 +22,10 @@
         </table>
         ${projects}
         ${commits}
-    </div>
+    </div>    
 </div>
+<div class="row-fluid">
+    <div class="col-md-12">
+        ${error}
+    </div>
+</div>
\ No newline at end of file