From 5f027cd03dc2f1c99530108bc398ab8cec6bba15 Mon Sep 17 00:00:00 2001
From: jwarnier <jwarnier@ispconfig3>
Date: Thu, 23 Sep 2010 17:17:06 -0400
Subject: [PATCH] replace double-quotes with single-quotes whenever appropriate
---
server/lib/app.inc.php | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index 0fe0b8e..ad03a2f 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -37,27 +37,27 @@
global $conf;
- if($conf["start_db"] == true) {
- $this->load('db_'.$conf["db_type"]);
+ if($conf['start_db'] == true) {
+ $this->load('db_'.$conf['db_type']);
$this->db = new db;
if($this->db->linkId) $this->db->closeConn();
- $this->db->dbHost = $conf["db_host"];
- $this->db->dbName = $conf["db_database"];
- $this->db->dbUser = $conf["db_user"];
- $this->db->dbPass = $conf["db_password"];
+ $this->db->dbHost = $conf['db_host'];
+ $this->db->dbName = $conf['db_database'];
+ $this->db->dbUser = $conf['db_user'];
+ $this->db->dbPass = $conf['db_password'];
/*
Initialize the connection to the master DB,
if we are in a multiserver setup
*/
- if($conf["dbmaster_host"] != '' && $conf["dbmaster_host"] != $conf["db_host"]) {
+ if($conf['dbmaster_host'] != '' && $conf['dbmaster_host'] != $conf['db_host']) {
$this->dbmaster = new db;
if($this->dbmaster->linkId) $this->dbmaster->closeConn();
- $this->dbmaster->dbHost = $conf["dbmaster_host"];
- $this->dbmaster->dbName = $conf["dbmaster_database"];
- $this->dbmaster->dbUser = $conf["dbmaster_user"];
- $this->dbmaster->dbPass = $conf["dbmaster_password"];
+ $this->dbmaster->dbHost = $conf['dbmaster_host'];
+ $this->dbmaster->dbName = $conf['dbmaster_database'];
+ $this->dbmaster->dbUser = $conf['dbmaster_user'];
+ $this->dbmaster->dbPass = $conf['dbmaster_password'];
} else {
$this->dbmaster = $this->db;
}
@@ -74,8 +74,8 @@
if(is_array($cl)) {
foreach($cl as $classname) {
if(!@is_object($this->$classname)) {
- if(is_file($conf['classpath'] . "/".$classname.".inc.php") && !is_link($conf['classpath'] . "/".$classname.".inc.php")) {
- include_once($conf['classpath'] . "/".$classname.".inc.php");
+ if(is_file($conf['classpath'] . '/'.$classname.'.inc.php') && !is_link($conf['classpath'] . '/'.$classname.'.inc.php')) {
+ include_once($conf['classpath'] . '/'.$classname.'.inc.php');
$this->$classname = new $classname;
}
}
@@ -89,10 +89,10 @@
$cl = explode(',',$classes);
if(is_array($cl)) {
foreach($cl as $classname) {
- if(is_file($conf['classpath'] . "/".$classname.".inc.php") && !is_link($conf['classpath'] . "/".$classname.".inc.php")) {
- include_once($conf['classpath'] . "/".$classname.".inc.php");
+ if(is_file($conf['classpath'] . '/'.$classname.'.inc.php') && !is_link($conf['classpath'] . '/'.$classname.'.inc.php')) {
+ include_once($conf['classpath'] . '/'.$classname.'.inc.php');
} else {
- die('Unable to load: '.$conf['classpath'] . "/".$classname.".inc.php");
+ die('Unable to load: '.$conf['classpath'] . '/'.$classname.'.inc.php');
}
}
}
@@ -108,27 +108,27 @@
global $conf;
- if($priority >= $conf["log_priority"]) {
+ if($priority >= $conf['log_priority']) {
//if (is_writable($conf["log_file"])) {
- if (!$fp = fopen ($conf["log_file"], "a")) {
- die("Unable to open logfile.");
+ if (!$fp = fopen ($conf['log_file'], 'a')) {
+ die('Unable to open logfile.');
}
switch ($priority) {
case 0:
- $priority_txt = "DEBUG";
+ $priority_txt = 'DEBUG';
break;
case 1:
- $priority_txt = "WARNING";
+ $priority_txt = 'WARNING';
break;
case 2:
- $priority_txt = "ERROR";
+ $priority_txt = 'ERROR';
break;
}
- if (!fwrite($fp, date("d.m.Y-H:i")." - ".$priority_txt." - ". $msg."\r\n")) {
- die("Unable to write to logfile.");
+ if (!fwrite($fp, date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\r\n")) {
+ die('Unable to write to logfile.');
}
- echo date("d.m.Y-H:i")." - ".$priority_txt." - ". $msg."\n";
+ echo date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\n";
fclose($fp);
// Log to database
@@ -178,4 +178,4 @@
$app = new app;
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1