| interface/lib/classes/db_mysql.inc.php | ●●●●● patch | view | raw | blame | history | |
| interface/lib/classes/getconf.inc.php | ●●●●● patch | view | raw | blame | history | |
| interface/lib/classes/ini_parser.inc.php | ●●●●● patch | view | raw | blame | history | |
| interface/lib/classes/plugin.inc.php | ●●●●● patch | view | raw | blame | history | |
| interface/lib/config.inc.php | ●●●●● patch | view | raw | blame | history |
interface/lib/classes/db_mysql.inc.php
@@ -1,5 +1,4 @@ <?php /* Copyright (c) 2007, Till Brehm, projektfarm Gmbh All rights reserved. @@ -33,7 +32,7 @@ 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 @@ -270,16 +269,16 @@ 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'; @@ -438,15 +437,15 @@ }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'].'),'; @@ -484,7 +483,7 @@ 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']; interface/lib/classes/getconf.inc.php
@@ -38,8 +38,8 @@ 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,8 +49,8 @@ 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]; } interface/lib/classes/ini_parser.inc.php
@@ -69,9 +69,6 @@ return $content; } } ?> interface/lib/classes/plugin.inc.php
@@ -63,15 +63,15 @@ //** 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 @@ 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); }
@@ -48,27 +48,27 @@ //** 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_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_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 @@ //** 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 @@ //** 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); ?>
