From 0d0cd9b8ad552fd83197190a9e2fab7a379446a7 Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Thu, 30 Oct 2008 16:01:05 -0400
Subject: [PATCH] Added support for core-modules. Core modules are modules without DB-trigger Added new table monitor_data for the core-module monitor.

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

diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index 41bc2ae..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) {

--
Gitblit v1.9.1