- Webservice-Aufruf ohne Domain

- Logfunktion bei Import und backup

app/ImportController.php

@@ -52,7 +52,7 @@ class ImportController
 				$count = 0;
 				$report[$i]['Errors'][0] = preg_replace("/(!![^\n]*!!)/im", "<b>$1</b>", $report[$i]['Errors'][0], -1, $count);
 				$count2 = 0;
-				$report[$i]['Errors'][0] = preg_replace("/\((\w{2}\d{4})\)( [^\r]*)/im", "<b><a href='http://rbs06/wiki/$1' target='_blank'>($1)</a>$2</b>", $report[$i]['Errors'][0], -1, $count2);
+				$report[$i]['Errors'][0] = preg_replace("/\((\w{2}\d{4})\)( [^\r]*)/im", "<b><a href='http://gc-server1/wiki/$1' target='_blank'>($1)</a>$2</b>", $report[$i]['Errors'][0], -1, $count2);
 				//die(print($log['Errors'][0]));
 				if ($count > 0 || $count2 > 0) {
 					$report[$i]['ErrorLevel'] = 2;
@@ -127,7 +127,10 @@ class ImportController
 				if (strtotime($header->MailDate) < strtotime("-5 days")) {
 					imap_delete($this->imap['connect'], $m);
 				}
-				print_r($this->dbh->errorInfo());
+				$error = $this->dbh->errorInfo();
+				if ($error[0] != "23000") {
+					print_r($error);					
+				}
 			}
 
 

app/backup.bat

@@ -2,4 +2,5 @@
 cd /d "%~dp0"
 set PHP="D:\dev\xampp\php"
 
-%PHP%\php backup.php
+
+%PHP%\php backup.php > logs\backup.log

app/db.php

@@ -90,11 +90,12 @@ switch ($_REQUEST['a']) {
 		break;
 
 	case 'changelog':
-		$kunde = "Entenmann";
+		$kunde = "Jansen";
 		$q = $dbh->query("SELECT * FROM kunden_gcstarter WHERE kunde = '{$kunde}' ORDER BY datum DESC LIMIT 1");
 		$result = $q->fetch(PDO::FETCH_ASSOC);
-		$r = json_decode($result['gcstarter'], true);
-		$byDate = $r['Kontenzuordnung GAPS.csv.log'];
+		$r = json_decode(utf8_decode($result['gcstarter']), true);
+		//echo json_last_error();
+		$byDate = (isset($r['Kontenzuordnung GAPS.csv.log'])) ? $r['Kontenzuordnung GAPS.csv.log'] : array();
 
 		$states = array("neu", "akt", "entf");
 
@@ -181,7 +182,7 @@ switch ($_REQUEST['a']) {
 
 		if (count($data) > 0) {
 			if ($id == '') {
-				$now = date('Y-m-d H:m:i');
+				$now = date('Y-m-d H:i:s');
 				$q = $dbh->exec("INSERT INTO status_kommentar (kunde, datum, start, benutzer, fehler, status, kommentar, cdate)
 								 VALUES ('{$data['kunde']}','{$data['datum']}','{$data['start']}','{$data['benutzer']}','{$data['fehler']}','{$data['status']}','{$data['kommentar']}','{$now}')");
 				$id = $dbh->lastInsertId();
@@ -255,5 +256,5 @@ switch ($_REQUEST['a']) {
 			$result = $events;
 		}
 }
-echo json_encode($result);
+echo json_encode($result); 
 // echo json_last_error();

app/import.php

@@ -13,8 +13,14 @@ $imap['server'] = "{imap.1und1.de:993/imap/ssl}INBOX";
 $imap['user'] = "status@global-cube.de";
 $imap['password'] = "gc01smtp";
 
+ob_start();
 $importCtrl = new ImportController($database, $imap);
 $importCtrl->Workflow();
+$result = ob_get_contents();
+if (trim($result) != "") {
+	file_put_contents(dirname(__FILE__)."/logs/import_".date("Ymd_His").".log", $result);
+}
+ob_end_clean();
 
 if ($importCtrl->fail) {
 	die(23);

app/scripts/controllers/calendar.js

@@ -2,7 +2,7 @@
 
 angular.module('fehlerberichtApp')
     .controller('CalendarCtrl', function ($scope, $http) {
-        var webservice = 'http://rbs06:8090/fehlerbericht/db.php?';
+        var webservice = 'db.php?';
 
         $().ready(function () {
 

app/scripts/controllers/changelog.js

@@ -3,7 +3,7 @@
 
     angular.module('fehlerberichtApp')
         .controller('ChangelogCtrl', function ($scope, $http) {
-            var webservice = 'http://rbs06:8090/fehlerbericht/db.php?';
+            var webservice = 'db.php?';
 
             $scope.Typen = ["neu", "akt", "entf"];
 

app/scripts/controllers/config.js

@@ -2,7 +2,7 @@
 
 angular.module('fehlerberichtApp')
     .controller('ConfigCtrl', function ($scope, $http, $routeParams) {
-        var webservice = 'http://rbs06:8090/fehlerbericht/db.php?';
+        var webservice = 'db.php?';
 
         $scope.current = {
             'kunde': $routeParams.customer,

app/scripts/controllers/stats.js

@@ -3,7 +3,7 @@
 
     angular.module('fehlerberichtApp')
         .controller('StatsCtrl', function ($scope, $http, $routeParams) {
-            var webservice = 'http://rbs06:8090/fehlerbericht/db.php?';
+            var webservice = 'db.php?';
 
             $scope.data = {};
             $scope.summary = {};

app/scripts/controllers/tickets.js

@@ -11,7 +11,7 @@ angular.module('fehlerberichtApp').filter("euro", function () {
 
 angular.module('fehlerberichtApp')
     .controller('TicketsCtrl', function ($scope, $http) {
-        var webservice = 'http://rbs06:8090/fehlerbericht/db.php?';
+        var webservice = 'db.php?';
 
         $scope.current = {};