From 65e8ac35b18fe6f85cfd8ff688a4da521dc568d0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 04 Jan 2013 10:52:59 -0500
Subject: [PATCH] Fixed: FS#2606 - New version message
---
server/lib/classes/db_mysql.inc.php | 58 +++++++++++++++++++++++-----------------------------------
1 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 6269798..4c75e62 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -1,4 +1,3 @@
-
<?php
/*
Copyright (c) 2005, Till Brehm, projektfarm Gmbh
@@ -104,7 +103,8 @@
}
public function query($queryString) {
- $this->queryId = parent::query($queryString);
+ parent::ping();
+ $this->queryId = parent::query($queryString);
$this->updateError('DB::query('.$queryString.') -> mysqli_query');
if(!$this->queryId) {
return false;
@@ -226,10 +226,10 @@
if(is_array($record_old) && count($record_old) > 0) {
foreach($record_old as $key => $val) {
// if(!isset($record_new[$key]) || $record_new[$key] != $val) {
- if($record_new[$key] != $val) {
+ if(@$record_new[$key] != $val) {
// Record has changed
$diffrec_full['old'][$key] = $val;
- $diffrec_full['new'][$key] = $record_new[$key];
+ $diffrec_full['new'][$key] = @$record_new[$key];
$diff_num++;
} else {
$diffrec_full['old'][$key] = $val;
@@ -253,24 +253,10 @@
return array('diff_num' => $diff_num, 'diff_rec' => $diffrec_full);
}
-
- if($diff_num > 0) {
- //print_r($diff_num);
- //print_r($diffrec_full);
- $diffstr = $app->db->quote(serialize($diffrec_full));
- if(isset($_SESSION)) {
- $username = $app->db->quote($_SESSION['s']['user']['username']);
- } else {
- $username = 'admin';
- }
- $dbidx = $primary_field.':'.$primary_id;
-
- if($action == 'INSERT') $action = 'i';
- if($action == 'UPDATE') $action = 'u';
- if($action == 'DELETE') $action = 'd';
- $sql = "INSERT INTO sys_datalog (dbtable,dbidx,server_id,action,tstamp,user,data) VALUES ('".$db_table."','$dbidx','$server_id','$action','".time()."','$username','$diffstr')";
- $app->db->query($sql);
- }
+
+ //** Function to fill the datalog with a full differential record.
+ public function datalogSave($db_table, $action, $primary_field, $primary_id, $record_old, $record_new) {
+ global $app,$conf;
// Insert backticks only for incomplete table names.
if(stristr($db_table,'.')) {
@@ -289,19 +275,21 @@
if(isset($record_new['server_id'])) $server_id = $record_new['server_id'];
- if($diff_num > 0) {
- //print_r($diff_num);
- //print_r($diffrec_full);
- $diffstr = $app->db->quote(serialize($diffrec_full));
- $username = $app->db->quote($_SESSION['s']['user']['username']);
- $dbidx = $primary_field.':'.$primary_id;
+ if($diff_num > 0) {
+ $diffstr = $this->quote(serialize($diffrec_full));
+ if(isset($_SESSION)) {
+ $username = $this->quote($_SESSION['s']['user']['username']);
+ } else {
+ $username = 'admin';
+ }
+ $dbidx = $primary_field.':'.$primary_id;
- if($action == 'INSERT') $action = 'i';
- if($action == 'UPDATE') $action = 'u';
- if($action == 'DELETE') $action = 'd';
- $sql = "INSERT INTO sys_datalog (dbtable,dbidx,server_id,action,tstamp,user,data) VALUES ('".$db_table."','$dbidx','$server_id','$action','".time()."','$username','$diffstr')";
- $app->db->query($sql);
- }
+ if($action == 'INSERT') $action = 'i';
+ if($action == 'UPDATE') $action = 'u';
+ if($action == 'DELETE') $action = 'd';
+ $sql = "INSERT INTO sys_datalog (dbtable,dbidx,server_id,action,tstamp,user,data) VALUES ('".$db_table."','$dbidx','$server_id','$action','".time()."','$username','$diffstr')";
+ $this->query($sql);
+ }
return true;
}
@@ -605,4 +593,4 @@
}
- ?>
+ ?>
\ No newline at end of file
--
Gitblit v1.9.1