From 3ee39be0bdc245c0aba35b4430fb0b71027d2ea3 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 21 Nov 2012 10:14:46 -0500
Subject: [PATCH] FS#2546 - Update all custom php.ini files for webs on main php.ini change  - added configuration options to server config (web tab, php section)  - do not update custom php.inis if md5sum file does not exist

---
 server/server.php |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/server.php b/server/server.php
index 3683f19..be710ee 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,11 +148,14 @@
 	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
 	$app->plugins->loadPlugins('all');
+	
+	$app->plugins->raiseAction('server_plugins_loaded', '');
+	
 	if ($tmp_num_records > 0) {
 		$app->log("Found $tmp_num_records changes, starting update process.", LOGLEVEL_DEBUG);
 		//** Go through the sys_datalog table and call the processing functions

--
Gitblit v1.9.1