Commit 12fcb241 authored by jwarnier's avatar jwarnier
Browse files

- replace double-quotes with single-quotes whenever appropriate

- fix indentation
- get it nearer than similar server/lib/ files
parent 734d2806
<?php
/*
Copyright (c) 2007, Till Brehm, projektfarm Gmbh
All rights reserved.
......@@ -33,11 +32,11 @@ class db {
private $dbName = ''; // logical database name on that server
private $dbUser = ''; // database authorized user
private $dbPass = ''; // user's password
private $dbCharset = ""; // what charset comes and goes to mysql: utf8 / latin1
private $dbCharset = ''; // what charset comes and goes to mysql: utf8 / latin1
private $linkId = 0; // last result of mysql_connect()
private $queryId = 0; // last result of mysql_query()
private $record = array(); // last record fetched
private $autoCommit = 1; // Autocommit Transactions
private $autoCommit = 1; // Autocommit Transactions
private $currentRow; // current row number
private $errorNumber = 0; // last error number
public $errorMessage = ''; // last error message
......@@ -68,7 +67,7 @@ class db {
}
public function connect()
{
{
if($this->linkId == 0){
$this->linkId = mysql_connect($this->dbHost, $this->dbUser, $this->dbPass);
if(!$this->linkId){
......@@ -82,7 +81,7 @@ class db {
}
public function query($queryString)
{
{
if(!$this->connect()){
return false;
}
......@@ -101,7 +100,7 @@ class db {
/** Returns all records as an array */
public function queryAllRecords($queryString)
{
{
if(!$this->query($queryString)){
return false;
}
......@@ -114,7 +113,7 @@ class db {
/** Returns one row as an array */
public function queryOneRecord($queryString)
{
{
if(!$this->query($queryString) || $this->numRows() == 0){
return false;
}
......@@ -123,8 +122,8 @@ class db {
/** Returns the next record as an array */
public function nextRecord()
{
$this->record = mysql_fetch_assoc($this->queryId);
{
$this->record = mysql_fetch_assoc($this->queryId);
$this->updateError('DB::nextRecord()<br />mysql_fetch_array');
if(!$this->record || !is_array($this->record)){
return false;
......@@ -146,7 +145,7 @@ class db {
/** Returns the last mySQL insert_id() */
public function insertID()
{
{
return mysql_insert_id($this->linkId);
}
......@@ -217,7 +216,7 @@ class db {
}
}
*/
public function diffrec($record_old, $record_new) {
$diffrec_full = array();
$diff_num = 0;
......@@ -270,16 +269,16 @@ class db {
unset($tmp);
// Insert the server_id, if the record has a server_id
$server_id = (isset($record_old["server_id"]) && $record_old["server_id"] > 0)?$record_old["server_id"]:0;
if(isset($record_new["server_id"])) $server_id = $record_new["server_id"];
$server_id = (isset($record_old['server_id']) && $record_old['server_id'] > 0)?$record_old['server_id']:0;
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;
$username = $app->db->quote($_SESSION['s']['user']['username']);
$dbidx = $primary_field.':'.$primary_id;
if($action == 'INSERT') $action = 'i';
if($action == 'UPDATE') $action = 'u';
......@@ -327,8 +326,8 @@ class db {
return true;
}
public function closeConn()
{
......@@ -338,7 +337,7 @@ class db {
return true;
} else { return false; }
}
public function freeResult($query)
{
if(mysql_free_result($query))
......@@ -406,10 +405,10 @@ class db {
if(isset($col['option']) && $col['option'] == 'primary'){ $index .= 'PRIMARY KEY ('.$col['name'].'),'; }
if(isset($col['option']) && $col['option'] == 'index'){ $index .= 'INDEX ('.$col['name'].'),'; }
if(isset($col['option']) && $col['option'] == 'unique'){ $index .= 'UNIQUE ('.$col['name'].'),'; }
}
}
$sql .= $index;
$sql = substr($sql,0,-1);
$sql .= ')';
$sql .= ')';
$this->query($sql);
return true;
}
......@@ -428,36 +427,36 @@ class db {
*/
public function alterTable($table_name,$columns)
{
$index = '';
$sql = "ALTER TABLE $table_name ";
foreach($columns as $col){
$index = '';
$sql = "ALTER TABLE $table_name ";
foreach($columns as $col){
if($col['action'] == 'add'){
$sql .= 'ADD '.$col['name'].' '.$this->mapType($col['type'], $col['typeValue']).' ';
$sql .= 'ADD '.$col['name'].' '.$this->mapType($col['type'],$col['typeValue']).' ';
}elseif($col['action'] == 'alter') {
$sql .= 'CHANGE '.$col['name'].' '.$col['name_new'].' '.$this->mapType($col['type'],$col['typeValue']).' ';
}elseif($col['action'] == 'drop') {
$sql .= 'DROP '.$col['name'].' ';
}
if($col["action"] != 'drop') {
if($col["defaultValue"] != "") $sql .= "DEFAULT '".$col["defaultValue"]."' ";
if($col["notNull"] == true) {
$sql .= "NOT NULL ";
if($col['action'] != 'drop') {
if($col['defaultValue'] != '') $sql .= "DEFAULT '".$col['defaultValue']."' ";
if($col['notNull'] == true) {
$sql .= 'NOT NULL ';
} else {
$sql .= "NULL ";
$sql .= 'NULL ';
}
if($col["autoInc"] == true) $sql .= "auto_increment ";
$sql.= ",";
if($col['autoInc'] == true) $sql .= 'auto_increment ';
$sql.= ',';
//* Index definitions
if($col['option'] == 'primary') $index .= 'PRIMARY KEY ('.$col['name'].'),';
if($col['option'] == 'index') $index .= 'INDEX ('.$col['name'].'),';
if($col['option'] == 'unique') $index .= 'UNIQUE ('.$col['name'].'),';
}
}
$sql .= $index;
$sql = substr($sql,0,-1);
//die($sql);
$this->query($sql);
return true;
}
$sql .= $index;
$sql = substr($sql,0,-1);
//die($sql);
$this->query($sql);
return true;
}
public function dropTable($table_name)
......@@ -484,7 +483,7 @@ class db {
public function tableInfo($table_name) {
//* Tabellenfelder einlesen ?
if($rows = $this->queryAllRecords("SHOW FIELDS FROM $table_name")){
if($rows = $this->queryAllRecords('SHOW FIELDS FROM $table_name')){
foreach($rows as $row) {
$name = $row['Field'];
$default = $row['Default'];
......@@ -512,9 +511,9 @@ class db {
$tmp_typeValue = explode('(',$type);
$column['typeValue'] = substr($tmp_typeValue[1], 0, -1);
}
if(stristr($type, 'text')) $metaType = 'text';
if(stristr($type, 'double')) $metaType = 'double';
if(stristr($type, 'blob')) $metaType = 'blob';
if(stristr($type,'text')) $metaType = 'text';
if(stristr($type,'double')) $metaType = 'double';
if(stristr($type,'blob')) $metaType = 'blob';
$column['type'] = $metaType;
$columns[] = $column;
......@@ -548,7 +547,7 @@ class db {
return 'blob';
}
}
}
?>
\ No newline at end of file
?>
......@@ -34,12 +34,12 @@ class getconf {
public function get_server_config($server_id, $section = '') {
global $app;
if(!is_array($this->config[$server_id])) {
$app->uses('ini_parser');
$server_id = intval($server_id);
$server = $app->db->queryOneRecord("SELECT config FROM server WHERE server_id = $server_id");
$this->config[$server_id] = $app->ini_parser->parse_ini_string(stripslashes($server["config"]));
$server = $app->db->queryOneRecord('SELECT config FROM server WHERE server_id = '.$server_id);
$this->config[$server_id] = $app->ini_parser->parse_ini_string(stripslashes($server['config']));
}
return ($section == '') ? $this->config[$server_id] : $this->config[$server_id][$section];
}
......@@ -49,11 +49,11 @@ class getconf {
if(!is_array($this->config['global'])) {
$app->uses('ini_parser');
$tmp = $app->db->queryOneRecord("SELECT config FROM sys_ini WHERE sysini_id = 1");
$this->config['global'] = $app->ini_parser->parse_ini_string(stripslashes($tmp["config"]));
$tmp = $app->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
$this->config['global'] = $app->ini_parser->parse_ini_string(stripslashes($tmp['config']));
}
return ($section == '') ? $this->config['global'] : $this->config['global'][$section];
}
}
?>
\ No newline at end of file
?>
......@@ -31,13 +31,13 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
class ini_parser{
private $config;
//* Converts a ini string to array
public function parse_ini_string($ini) {
$ini = str_replace("\r\n", "\n", $ini);
$lines = explode("\n", $ini);
foreach($lines as $line) {
$line = trim($line);
$line = trim($line);
if($line != '') {
if(preg_match("/^\[([\w\d_]+)\]$/", $line, $matches)) {
$section = strtolower($matches[1]);
......@@ -49,8 +49,8 @@ class ini_parser{
}
return $this->config;
}
//* Converts a config array to a string
public function get_ini_string($config_array = '') {
if($config_array == '') $config_array = $this->config;
......@@ -61,17 +61,14 @@ class ini_parser{
if($item != ''){
$value = trim($value);
$item = trim($item);
$content .= "$item=$value\n";
}
$content .= "$item=$value\n";
}
}
$content .= "\n";
}
return $content;
}
}
?>
\ No newline at end of file
?>
......@@ -63,15 +63,15 @@ class plugin {
//** load the plugins
foreach($tmp_plugins as $plugin_name => $file) {
include_once($plugins_dir.$file);
if($this->debug) $app->log("Loading Plugin: $plugin_name",LOGLEVEL_DEBUG);
if($this->debug) $app->log('Loading plugin: '.$plugin_name,LOGLEVEL_DEBUG);
$app->loaded_plugins[$plugin_name] = new $plugin_name;
$app->loaded_plugins[$plugin_name]->onLoad();
}
} else {
$app->log("Unable to open the plugin directory: $plugins_dir",LOGLEVEL_ERROR);
$app->log('Unable to open the plugins directory: '.$plugins_dir,LOGLEVEL_ERROR);
}
} else {
$app->log("Plugin directory missing: $plugins_dir",LOGLEVEL_ERROR);
$app->log('Plugins directory missing: '.$plugins_dir,LOGLEVEL_ERROR);
}
}
......@@ -98,7 +98,7 @@ class plugin {
if(!isset($_SESSION['s']['plugin_cache'])) {
$this->loadPluginCache();
if($this->debug) $app->log("Loaded the plugin cache.",LOGLEVEL_DEBUG);
if($this->debug) $app->log('Loaded the plugin cache.',LOGLEVEL_DEBUG);
}
......@@ -131,7 +131,7 @@ class plugin {
}
} // end function raiseEvent
//* Internal function to load the plugin and call the event function in the plugin.
private function callPluginEvent($event_name,$data) {
global $app;
......@@ -158,4 +158,4 @@ class plugin {
}
?>
\ No newline at end of file
?>
......@@ -48,27 +48,27 @@ define('ISPC_APP_VERSION', '3.0.2');
//** Database
$conf["db_type"] = 'mysql';
$conf["db_host"] = 'localhost';
$conf["db_database"] = 'ispconfig3';
$conf["db_user"] = 'root';
$conf["db_password"] = '';
$conf["db_charset"] = 'utf8'; // same charset as html-charset - (HTML --> MYSQL: "utf-8" --> "utf8", "iso-8859-1" --> "latin1")
$conf['db_type'] = 'mysql';
$conf['db_host'] = 'localhost';
$conf['db_database'] = 'ispconfig3';
$conf['db_user'] = 'root';
$conf['db_password'] = '';
$conf['db_charset'] = 'utf8'; // same charset as html-charset - (HTML --> MYSQL: "utf-8" --> "utf8", "iso-8859-1" --> "latin1")
define("DB_TYPE",$conf["db_type"]);
define("DB_HOST",$conf["db_host"]);
define("DB_DATABASE",$conf["db_database"]);
define("DB_USER",$conf["db_user"]);
define("DB_PASSWORD",$conf["db_password"]);
define("DB_CHARSET",$conf["db_charset"]);
define('DB_TYPE',$conf['db_type']);
define('DB_HOST',$conf['db_host']);
define('DB_DATABASE',$conf['db_database']);
define('DB_USER',$conf['db_user']);
define('DB_PASSWORD',$conf['db_password']);
define('DB_CHARSET',$conf['db_charset']);
//** Database settings for the master DB. This setting is only used in multiserver setups
$conf["dbmaster_type"] = 'mysql';
$conf["dbmaster_host"] = '{mysql_master_server_host}';
$conf["dbmaster_database"] = '{mysql_master_server_database}';
$conf["dbmaster_user"] = '{mysql_master_server_ispconfig_user}';
$conf["dbmaster_password"] = '{mysql_master_server_ispconfig_password}';
$conf['dbmaster_type'] = 'mysql';
$conf['dbmaster_host'] = '{mysql_master_server_host}';
$conf['dbmaster_database'] = '{mysql_master_server_database}';
$conf['dbmaster_user'] = '{mysql_master_server_ispconfig_user}';
$conf['dbmaster_password'] = '{mysql_master_server_ispconfig_password}';
//** Paths
......@@ -81,15 +81,15 @@ define('ISPC_WEB_TEMP_PATH', ISPC_WEB_PATH.'/temp'); // Path for downloads, acce
define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache');
//** Paths (Do not change!)
$conf["rootpath"] = substr(dirname(__FILE__),0,-4);
$conf["fs_div"] = "/"; // File system separator (divider), "\\" on Windows and "/"" on Linux and UNIX
$conf["classpath"] = $conf["rootpath"].$conf["fs_div"]."lib".$conf["fs_div"]."classes";
$conf["temppath"] = $conf["rootpath"].$conf["fs_div"]."temp";
$conf['rootpath'] = substr(dirname(__FILE__),0,-4);
$conf['fs_div'] = '/'; // File system separator (divider), "\\" on Windows and "/"" on Linux and UNIX
$conf['classpath'] = $conf['rootpath'].$conf['fs_div'].'lib'.$conf['fs_div'].'classes';
$conf['temppath'] = $conf['rootpath'].$conf['fs_div'].'temp';
define("FS_DIV",$conf["fs_div"]);
define("SERVER_ROOT",$conf["rootpath"]);
define("INCLUDE_ROOT",SERVER_ROOT.FS_DIV."lib");
define("CLASSES_ROOT",INCLUDE_ROOT.FS_DIV."classes");
define('FS_DIV',$conf['fs_div']);
define('SERVER_ROOT',$conf['rootpath']);
define('INCLUDE_ROOT',SERVER_ROOT.FS_DIV.'lib');
define('CLASSES_ROOT',INCLUDE_ROOT.FS_DIV.'classes');
//** Server
......@@ -97,7 +97,7 @@ $conf['app_title'] = ISPC_APP_TITLE;
$conf['app_version'] = ISPC_APP_VERSION;
$conf['app_link'] = 'http://www.howtoforge.com/forums/showthread.php?t=26988';
$conf['modules_available'] = 'admin,mail,sites,monitor,client,dns,help';
$conf["server_id"] = "1";
$conf['server_id'] = '1';
//** Interface
......@@ -114,8 +114,8 @@ $conf['demo_mode'] = false;
//** Logging
$conf["log_file"] = '/var/log/ispconfig/ispconfig.log';
$conf["log_priority"] = 0; // 0 = Debug, 1 = Warning, 2 = Error
$conf['log_file'] = '/var/log/ispconfig/ispconfig.log';
$conf['log_priority'] = 0; // 0 = Debug, 1 = Warning, 2 = Error
//** Allow software package installations
......@@ -123,28 +123,28 @@ $conf['software_updates_enabled'] = false;
//** Themes
$conf["theme"] = 'default';
$conf["html_content_encoding"] = 'utf-8'; // example: utf-8, iso-8859-1, ...
$conf["logo"] = 'themes/default/images/ispc_logo.png';
$conf['theme'] = 'default';
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
$conf['logo'] = 'themes/default/images/ispc_logo.png';
//** Default Language
$conf["language"] = 'en';
$conf["debug_language"] = false;
$conf['language'] = 'en';
$conf['debug_language'] = false;
//** Misc.
$conf["interface_logout_url"] = ""; // example: http://www.domain.tld/
$conf['interface_logout_url'] = ''; // example: http://www.domain.tld/
//** Auto Load Modules
$conf["start_db"] = true;
$conf["start_session"] = true;
$conf['start_db'] = true;
$conf['start_session'] = true;
//** Constants
define("LOGLEVEL_DEBUG",0);
define("LOGLEVEL_WARN",1);
define("LOGLEVEL_ERROR",2);
define('LOGLEVEL_DEBUG',0);
define('LOGLEVEL_WARN',1);
define('LOGLEVEL_ERROR',2);
?>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment