From fd8e2b5317e8c43aa476a57bbf555c444049f536 Mon Sep 17 00:00:00 2001
From: quentusrex <quentusrex@ispconfig3>
Date: Fri, 31 Oct 2008 08:27:08 -0400
Subject: [PATCH] This is here to stop the variable overflow bug when setting a mail user quota higher than 2GB. 

---
 server/lib/classes/modules.inc.php |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index 16fc2cc..6ad967f 100644
--- a/server/lib/classes/modules.inc.php
+++ b/server/lib/classes/modules.inc.php
@@ -33,15 +33,15 @@
 	var $notification_hooks = array();
 	
 	/*
-	 This function is called to load the modules from the mods-available folder
+	 This function is called to load the modules from the mods-enabled or the mods-core folder
 	*/
-	
-	function loadModules() {
+	function loadModules($type) {
 		global $app, $conf;
 		
-		
-		
-		$modules_dir = $conf["rootpath"].$conf["fs_div"]."mods-enabled".$conf["fs_div"];
+		$subPath = 'mods-enabled';
+		if ($type == 'core') $subPath = 'mods-core';
+
+		$modules_dir = $conf["rootpath"].$conf["fs_div"].$subPath.$conf["fs_div"];
 		if (is_dir($modules_dir)) {
 			if ($dh = opendir($modules_dir)) {
 				while (($file = readdir($dh)) !== false) {
@@ -81,14 +81,14 @@
 		global $app,$conf;
 		
 		// TODO: process only new entries.
-		$sql = "SELECT * FROM sys_datalog WHERE server_id = ".$conf["server_id"];
+		$sql = "SELECT * FROM sys_datalog WHERE server_id = ".$conf["server_id"]." ORDER BY datalog_id";
 		$records = $app->db->queryAllRecords($sql);
 		foreach($records as $rec) {
 			$data = unserialize(stripslashes($rec["data"]));
 			$this->raiseTableHook($rec["dbtable"],$rec["action"],$data);
+			$app->db->query("DELETE FROM sys_datalog WHERE datalog_id = ".$rec["datalog_id"]);
+			$app->log("Deleting sys_datalog ID ".$rec["datalog_id"],LOGLEVEL_DEBUG);
 		}
-		$app->db->query("DELETE FROM sys_datalog WHERE datalog_id = ".$rec["datalog_id"]);
-		$app->log("Deleting sys_datalog ID ".$rec["datalog_id"],LOGLEVEL_DEBUG);
 	}
 	
 	function raiseTableHook($table_name,$action,$data) {

--
Gitblit v1.9.1