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 | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index b9b875c..408f4d3 100644
--- a/server/lib/classes/modules.inc.php
+++ b/server/lib/classes/modules.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -84,13 +84,27 @@
//* If its a multiserver setup
if($app->db->dbHost != $app->dbmaster->dbHost) {
- $sql = "SELECT * FROM sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf["server_id"]." OR server_id = 0) ORDER BY datalog_id";
+ if($conf["mirror_server_id"] > 0) {
+ $sql = "SELECT * FROM sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf["server_id"]." OR server_id = ".$conf["mirror_server_id"]." OR server_id = 0) ORDER BY datalog_id";
+ } else {
+ $sql = "SELECT * FROM sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf["server_id"]." OR server_id = 0) ORDER BY datalog_id";
+ }
+
$records = $app->dbmaster->queryAllRecords($sql);
foreach($records as $d) {
+ //** encode data to utf-8 and unserialize it
if(!$data = unserialize(stripslashes($d["data"]))) {
$data = unserialize($d["data"]);
}
+ //** Decode data back to locale
+ foreach($data['old'] as $key => $val) {
+ $data['old'][$key] = utf8_decode($val);
+ }
+ foreach($data['new'] as $key => $val) {
+ $data['new'][$key] = utf8_decode($val);
+ }
+
$replication_error = false;
$this->current_datalog_id = $d["datalog_id"];
@@ -102,17 +116,19 @@
$tmp_sql2 = '';
foreach($data['new'] as $fieldname => $val) {
$tmp_sql1 .= "`$fieldname`,";
- $tmp_sql2 .= "'$val',";
+ $tmp_sql2 .= "'".$app->db->quote($val)."',";
}
$tmp_sql1 = substr($tmp_sql1,0,-1);
$tmp_sql2 = substr($tmp_sql2,0,-1);
//$tmp_sql1 .= "$idx[0]";
//$tmp_sql2 .= "$idx[1]";
$sql = "REPLACE INTO $d[dbtable] ($tmp_sql1) VALUES ($tmp_sql2)";
+ $app->db->errorNumber = 0;
+ $app->db->errorMessage = '';
$app->db->query($sql);
if($app->db->errorNumber > 0) {
$replication_error = true;
- $app->log("Replication failed. Error: (" . $d[dbtable] . ") " . $app->db->errorMessage . " # SQL: " . $sql,LOGLEVEL_ERROR);
+ $app->log("Replication failed. Error: (" . $d[dbtable] . ") in mysql server: (".$app->db->dbHost.") " . $app->db->errorMessage . " # SQL: " . $sql,LOGLEVEL_ERROR);
}
$app->log("Replicated from master: ".$sql,LOGLEVEL_DEBUG);
}
@@ -147,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"]);
@@ -161,7 +182,7 @@
return;
}
} else {
- $app->log("Datalog does not conatin any changes for this record ".$d["datalog_id"],LOGLEVEL_DEBUG);
+ $app->log("Datalog does not contain any changes for this record ".$d["datalog_id"],LOGLEVEL_DEBUG);
}
}
@@ -170,11 +191,25 @@
$sql = "SELECT * FROM sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf["server_id"]." OR server_id = 0) ORDER BY datalog_id";
$records = $app->db->queryAllRecords($sql);
foreach($records as $d) {
+
+ //** encode data to utf-8 to be able to unserialize it and then unserialize it
if(!$data = unserialize(stripslashes($d["data"]))) {
$data = unserialize($d["data"]);
}
+ //** decode data back to current locale
+ foreach($data['old'] as $key => $val) {
+ $data['old'][$key] = utf8_decode($val);
+ }
+ foreach($data['new'] as $key => $val) {
+ $data['new'][$key] = utf8_decode($val);
+ }
+
$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"]);
@@ -192,7 +227,7 @@
global $app;
// Get the hooks for this table
- $hooks = $this->notification_hooks[$table_name];
+ $hooks = (isset($this->notification_hooks[$table_name]))?$this->notification_hooks[$table_name]:'';
if($this->debug) $app->log("Raised TableHook for table: '$table_name'",LOGLEVEL_DEBUG);
if(is_array($hooks)) {
--
Gitblit v1.9.1