Changeset 791 for trunk/Packages/Common/AppModule.php

Timestamp:

Jan 22, 2016, 5:31:05 PM (9 years ago)

Author:

chronos

Message:

• Updated: Common package.

File:

• trunk/Packages/Common/AppModule.php (modified) (3 diffs)

trunk/Packages/Common/AppModule.php

@@ -197 +197 @@
     $this->Modules = array();
     $this->System = &$System;
-    $this->FileName = 'Config/Modules.php';
+    $this->FileName = dirname(__FILE__).'/../../Config/ModulesConfig.php';
     $this->ModulesDir = dirname(__FILE__).'/../../Modules';
   }
@@ -232 +232 @@
     {
       if(!array_key_exists($Dependency, $this->Modules))
-        throw new Exception('Module "'.$Module->Name.'" dependency "'.$Dependency.'" not found');
+        throw new Exception(sprintf(T('Module "%s" dependency "%s" not found'), $Module->Name, $Dependency));
       $DepModule = $this->Modules[$Dependency];
       if(in_array(ModuleCondition::All, $Conditions) or
@@ -318 +318 @@
   }
 
+  function ModuleEnabled($Name)
+  {
+    return(array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Enabled);
+  }
+
+  function ModuleRunning($Name)
+  {
+    return(array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Running);
+  }
+
   /* @return Module */
   function SearchModuleById($Id)