From 458767fb1b65a15ddae3846df6aacdc9610342ad Mon Sep 17 00:00:00 2001 From: jwarnier <jwarnier@ispconfig3> Date: Thu, 23 Sep 2010 17:15:39 -0400 Subject: [PATCH] - replace double-quotes with single-quotes whenever appropriate - reword some output - fix typos --- server/lib/classes/modules.inc.php | 72 ++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php index ed855b8..fff4928 100644 --- a/server/lib/classes/modules.inc.php +++ b/server/lib/classes/modules.inc.php @@ -43,21 +43,21 @@ $subPath = 'mods-enabled'; if ($type == 'core') $subPath = 'mods-core'; - $modules_dir = $conf["rootpath"].$conf["fs_div"].$subPath.$conf["fs_div"]; + $modules_dir = $conf['rootpath'].$conf['fs_div'].$subPath.$conf['fs_div']; if (is_dir($modules_dir)) { if ($dh = opendir($modules_dir)) { while (($file = readdir($dh)) !== false) { if($file != '.' && $file != '..' && substr($file,-8,8) == '.inc.php') { $module_name = substr($file,0,-8); include_once($modules_dir.$file); - if($this->debug) $app->log("Loading Module: $module_name",LOGLEVEL_DEBUG); + if($this->debug) $app->log('Loading Module: '.$module_name,LOGLEVEL_DEBUG); $app->loaded_modules[$module_name] = new $module_name; $app->loaded_modules[$module_name]->onLoad(); } } } } else { - $app->log("Modules directory missing: $modules_dir",LOGLEVEL_ERROR); + $app->log('Modules directory missing: '.$modules_dir,LOGLEVEL_ERROR); } } @@ -84,18 +84,18 @@ //* If its a multiserver setup if($app->db->dbHost != $app->dbmaster->dbHost) { - 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"; + 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"; + $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"]); + if(!$data = unserialize(stripslashes($d['data']))) { + $data = unserialize($d['data']); } //** Decode data back to locale foreach($data['old'] as $key => $val) { @@ -107,20 +107,20 @@ $replication_error = false; - $this->current_datalog_id = $d["datalog_id"]; + $this->current_datalog_id = $d['datalog_id']; /* * If we are in a mirror setup, rewrite the server_id of records that originally * belonged to the mirrored server to the local server_id */ - if($conf["mirror_server_id"] > 0 && $d['dbtable'] != 'server') { - if(isset($data['new']['server_id']) && $data['new']['server_id'] == $conf["mirror_server_id"]) $data['new']['server_id'] = $conf["server_id"]; - if(isset($data['old']['server_id']) && $data['old']['server_id'] == $conf["mirror_server_id"]) $data['old']['server_id'] = $conf["server_id"]; + if($conf['mirror_server_id'] > 0 && $d['dbtable'] != 'server') { + if(isset($data['new']['server_id']) && $data['new']['server_id'] == $conf['mirror_server_id']) $data['new']['server_id'] = $conf['server_id']; + if(isset($data['old']['server_id']) && $data['old']['server_id'] == $conf['mirror_server_id']) $data['old']['server_id'] = $conf['server_id']; } if(count($data['new']) > 0) { - if($d["action"] == 'i' || $d["action"] == 'u') { - $idx = explode(":",$d["dbidx"]); + if($d['action'] == 'i' || $d['action'] == 'u') { + $idx = explode(':',$d['dbidx']); $tmp_sql1 = ''; $tmp_sql2 = ''; foreach($data['new'] as $fieldname => $val) { @@ -137,9 +137,9 @@ $app->db->query($sql); if($app->db->errorNumber > 0) { $replication_error = true; - $app->log("Replication failed. Error: (" . $d[dbtable] . ") in mysql server: (".$app->db->dbHost.") " . $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); + $app->log('Replicated from master: '.$sql,LOGLEVEL_DEBUG); } /* if($d["action"] == 'u') { @@ -158,8 +158,8 @@ $app->log("Replicated from master: ".$sql,LOGLEVEL_DEBUG); } */ - if($d["action"] == 'd') { - $idx = explode(":",$d["dbidx"]); + if($d['action'] == 'd') { + $idx = explode(':',$d['dbidx']); $sql = "DELETE FROM $d[dbtable] "; $sql .= " WHERE $idx[0] = $idx[1]"; $app->db->query($sql); @@ -167,23 +167,23 @@ $replication_error = true; $app->log("Replication failed. Error: (" . $d[dbtable] . ") " . $app->db->errorMessage . " # SQL: " . $sql,LOGLEVEL_ERROR); } - $app->log("Replicated from master: ".$sql,LOGLEVEL_DEBUG); + $app->log('Replicated from master: '.$sql,LOGLEVEL_DEBUG); } if($replication_error == false) { if(is_array($data['old']) || is_array($data['new'])) { - $this->raiseTableHook($d["dbtable"],$d["action"],$data); + $this->raiseTableHook($d['dbtable'],$d['action'],$data); } else { - $app->log("Data array was empty for datalog_id ".$d["datalog_id"],LOGLEVEL_WARN); + $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"]); - $app->log("Processed datalog_id ".$d["datalog_id"],LOGLEVEL_DEBUG); + $app->dbmaster->query("UPDATE server SET updated = ".$d["datalog_id"]." WHERE server_id = ".$conf['server_id']); + $app->log('Processed datalog_id '.$d['datalog_id'],LOGLEVEL_DEBUG); } else { - $app->log("Error in Replication, changes were not processed.",LOGLEVEL_ERROR); + $app->log('Error in Replication, changes were not processed.',LOGLEVEL_ERROR); /* * If there is any error in processing the datalog we can't continue, because * we do not know if the newer actions require this (old) one. @@ -191,19 +191,19 @@ return; } } else { - $app->log("Datalog does not contain 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); } } //* if we have a single server setup } 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"; + $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"]); + if(!$data = unserialize(stripslashes($d['data']))) { + $data = unserialize($d['data']); } //** decode data back to current locale foreach($data['old'] as $key => $val) { @@ -213,16 +213,16 @@ $data['new'][$key] = utf8_decode($val); } - $this->current_datalog_id = $d["datalog_id"]; + $this->current_datalog_id = $d['datalog_id']; if(is_array($data['old']) || is_array($data['new'])) { - $this->raiseTableHook($d["dbtable"],$d["action"],$data); + $this->raiseTableHook($d['dbtable'],$d['action'],$data); } else { - $app->log("Data array was empty for datalog_id ".$d["datalog_id"],LOGLEVEL_WARN); + $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"]); - $app->log("Processed datalog_id ".$d["datalog_id"],LOGLEVEL_DEBUG); + $app->db->query("UPDATE server SET updated = ".$d['datalog_id']." WHERE server_id = ".$conf['server_id']); + $app->log('Processed datalog_id '.$d['datalog_id'],LOGLEVEL_DEBUG); } } @@ -241,8 +241,8 @@ if(is_array($hooks)) { foreach($hooks as $hook) { - $module_name = $hook["module"]; - $function_name = $hook["function"]; + $module_name = $hook['module']; + $function_name = $hook['function']; // Claa the processing function of the module if($this->debug) $app->log("Call function '$function_name' in module '$module_name' raised by TableHook '$table_name'.",LOGLEVEL_DEBUG); call_user_method($function_name,$app->loaded_modules[$module_name],$table_name,$action,$data); @@ -256,4 +256,4 @@ } -?> \ No newline at end of file +?> -- Gitblit v1.9.1