From e28564dbde4f922a6a8263e3dea32d56b60b5b5b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 16 Jun 2010 11:41:46 -0400
Subject: [PATCH] Implemented: FS#468 - Client name conversion in FTP user too restricted
---
server/lib/classes/modules.inc.php | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index fd8e473..408f4d3 100644
--- a/server/lib/classes/modules.inc.php
+++ b/server/lib/classes/modules.inc.php
@@ -94,8 +94,8 @@
foreach($records as $d) {
//** encode data to utf-8 and unserialize it
- if(!$data = unserialize(utf8_encode(stripslashes($d["data"])))) {
- $data = unserialize(utf8_encode($d["data"]));
+ if(!$data = unserialize(stripslashes($d["data"]))) {
+ $data = unserialize($d["data"]);
}
//** Decode data back to locale
foreach($data['old'] as $key => $val) {
@@ -163,7 +163,12 @@
if($replication_error == false) {
- $this->raiseTableHook($d["dbtable"],$d["action"],$data);
+ if(is_array($data['old']) || is_array($data['new'])) {
+ $this->raiseTableHook($d["dbtable"],$d["action"],$data);
+ } else {
+ $app->log("Data array was empty for datalog_id ".$d["datalog_id"],LOGLEVEL_WARN);
+ }
+ //$this->raiseTableHook($d["dbtable"],$d["action"],$data);
//$app->dbmaster->query("DELETE FROM sys_datalog WHERE datalog_id = ".$d["datalog_id"]);
//$app->log("Deleting sys_datalog ID ".$d["datalog_id"],LOGLEVEL_DEBUG);
$app->dbmaster->query("UPDATE server SET updated = ".$d["datalog_id"]." WHERE server_id = ".$conf["server_id"]);
@@ -188,8 +193,8 @@
foreach($records as $d) {
//** encode data to utf-8 to be able to unserialize it and then unserialize it
- if(!$data = unserialize(utf8_encode(stripslashes($d["data"])))) {
- $data = unserialize(utf8_encode($d["data"]));
+ if(!$data = unserialize(stripslashes($d["data"]))) {
+ $data = unserialize($d["data"]);
}
//** decode data back to current locale
foreach($data['old'] as $key => $val) {
@@ -200,7 +205,11 @@
}
$this->current_datalog_id = $d["datalog_id"];
- $this->raiseTableHook($d["dbtable"],$d["action"],$data);
+ if(is_array($data['old']) || is_array($data['new'])) {
+ $this->raiseTableHook($d["dbtable"],$d["action"],$data);
+ } else {
+ $app->log("Data array was empty for datalog_id ".$d["datalog_id"],LOGLEVEL_WARN);
+ }
//$app->db->query("DELETE FROM sys_datalog WHERE datalog_id = ".$rec["datalog_id"]);
//$app->log("Deleting sys_datalog ID ".$rec["datalog_id"],LOGLEVEL_DEBUG);
$app->db->query("UPDATE server SET updated = ".$d["datalog_id"]." WHERE server_id = ".$conf["server_id"]);
--
Gitblit v1.9.1