From d87f76019fc231ec20d95126a7fee0487e7be5f0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 14 Aug 2012 10:56:20 -0400
Subject: [PATCH] - Added new web folder named private to web folder layout. The folder is intended to store data that shall not be visible in the web directory, it is owned by the user of the web. - Changed ownership of web root directory to root user in all security modes to prevent symlink attacks. - Apache log files are now owned by user root. - Improved functions in system library.
---
server/server.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/server.php b/server/server.php
index 3683f19..54a4b5b 100644
--- a/server/server.php
+++ b/server/server.php
@@ -42,7 +42,9 @@
*/
if ($app->dbmaster->connect_error == NULL) {
$server_db_record = $app->dbmaster->queryOneRecord("SELECT * FROM server WHERE server_id = " . $conf['server_id']);
-
+
+ if(!is_array($server_db_record)) die('Unable to load the server configuration from database.');
+
$conf['last_datalog_id'] = (int) $server_db_record['updated'];
$conf['mirror_server_id'] = (int) $server_db_record['mirror_server_id'];
@@ -146,7 +148,7 @@
unset($tmp_rec);
//** Load required base-classes
- $app->uses('modules,plugins,file,services');
+ $app->uses('modules,plugins,file,services,system');
//** Load the modules that are in the mods-enabled folder
$app->modules->loadModules('all');
//** Load the plugins that are in the plugins-enabled folder
--
Gitblit v1.9.1