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

Timestamp:

Apr 7, 2020, 10:15:48 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

File:

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

trunk/Packages/Common/AppModule.php

@@ -77 +77 @@
   function Install()
   {
-    if($this->Installed) return;
+    if ($this->Installed) return;
     $List = array();
     $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotInstalled));
@@ -89 +89 @@
   function Uninstall()
   {
-    if(!$this->Installed) return;
+    if (!$this->Installed) return;
     $this->Stop();
     $this->Installed = false;
@@ -100 +100 @@
   function Upgrade()
   {
-    if(!$this->Installed) return;
-    if($this->InstalledVersion == $this->Version) return;
+    if (!$this->Installed) return;
+    if ($this->InstalledVersion == $this->Version) return;
     $List = array();
     $this->Manager->EnumSuperiorDependenciesCascade($this, $List, array(ModuleCondition::Installed));
@@ -117 +117 @@
   function Start()
   {
-    if($this->Running) return;
-    if(!$this->Installed) return;
+    if ($this->Running) return;
+    if (!$this->Installed) return;
     $List = array();
     $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotRunning));
@@ -128 +128 @@
   function Stop()
   {
-    if(!$this->Running) return;
+    if (!$this->Running) return;
     $this->Running = false;
     $List = array();
@@ -144 +144 @@
   function Enable()
   {
-    if($this->Enabled) return;
-    if(!$this->Installed) return;
+    if ($this->Enabled) return;
+    if (!$this->Installed) return;
     $List = array();
     $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotEnabled));
@@ -154 +154 @@
   function Disable()
   {
-    if(!$this->Enabled) return;
+    if (!$this->Enabled) return;
     $this->Stop();
     $this->Enabled = false;
@@ -203 +203 @@
   function Perform($List, $Actions, $Conditions = array(ModuleCondition::All))
   {
-    foreach($List as $Index => $Module)
-    {
-      if(in_array(ModuleCondition::All, $Conditions) or
+    foreach ($List as $Index => $Module)
+    {
+      if (in_array(ModuleCondition::All, $Conditions) or
         ($Module->Running and in_array(ModuleCondition::Running, $Conditions)) or
         (!$Module->Running and in_array(ModuleCondition::NotRunning, $Conditions)) or
@@ -213 +213 @@
         (!$Module->Enabled and in_array(ModuleCondition::NotEnabled, $Conditions)))
       {
-        foreach($Actions as $Action)
+        foreach ($Actions as $Action)
         {
-          if($Action == ModuleAction::Start) $Module->Start();
-          if($Action == ModuleAction::Stop) $Module->Stop();
-          if($Action == ModuleAction::Install) $Module->Install();
-          if($Action == ModuleAction::Uninstall) $Module->Uninstall();
-          if($Action == ModuleAction::Enable) $Module->Enable();
-          if($Action == ModuleAction::Disable) $Module->Disable();
-          if($Action == ModuleAction::Upgrade) $Module->Upgrade();
+          if ($Action == ModuleAction::Start) $Module->Start();
+          if ($Action == ModuleAction::Stop) $Module->Stop();
+          if ($Action == ModuleAction::Install) $Module->Install();
+          if ($Action == ModuleAction::Uninstall) $Module->Uninstall();
+          if ($Action == ModuleAction::Enable) $Module->Enable();
+          if ($Action == ModuleAction::Disable) $Module->Disable();
+          if ($Action == ModuleAction::Upgrade) $Module->Upgrade();
         }
       }
@@ -229 +229 @@
   function EnumDependenciesCascade($Module, &$List, $Conditions = array(ModuleCondition::All))
   {
-    foreach($Module->Dependencies as $Dependency)
-    {
-      if(!array_key_exists($Dependency, $this->Modules))
+    foreach ($Module->Dependencies as $Dependency)
+    {
+      if (!array_key_exists($Dependency, $this->Modules))
         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
+      if (in_array(ModuleCondition::All, $Conditions) or
         ($Module->Running and in_array(ModuleCondition::Running, $Conditions)) or
         (!$Module->Running and in_array(ModuleCondition::NotRunning, $Conditions)) or
@@ -250 +250 @@
   function EnumSuperiorDependenciesCascade($Module, &$List, $Conditions = array(ModuleCondition::All))
   {
-    foreach($this->Modules as $RefModule)
-    {
-      if(in_array($Module->Name, $RefModule->Dependencies) and
+    foreach ($this->Modules as $RefModule)
+    {
+      if (in_array($Module->Name, $RefModule->Dependencies) and
           (in_array(ModuleCondition::All, $Conditions) or
           ($Module->Running and in_array(ModuleCondition::Running, $Conditions)) or
@@ -270 +270 @@
   {
     $this->LoadModules();
-    if(file_exists($this->FileName)) $this->LoadState();
+    if (file_exists($this->FileName)) $this->LoadState();
     $this->StartEnabled();
   }
@@ -315 +315 @@
   function ModulePresent($Name)
   {
-    return(array_key_exists($Name, $this->Modules));
+    return array_key_exists($Name, $this->Modules);
   }
 
   function ModuleEnabled($Name)
   {
-    return(array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Enabled);
+    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 array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Running;
   }
 
@@ -331 +331 @@
   function SearchModuleById($Id)
   {
-    foreach($this->Modules as $Module)
+    foreach ($this->Modules as $Module)
     {
       //DebugLog($Module->Name.' '.$Module->Id);
-      if($Module->Id == $Id) return($Module->Name);
-    }
-    return('');
+      if ($Module->Id == $Id) return $Module->Name;
+    }
+    return '';
   }
 
@@ -343 +343 @@
     $ConfigModules = array();
     include($this->FileName);
-    foreach($ConfigModules as $Mod)
-    {
-      if(array_key_exists($Mod['Name'], $this->Modules))
+    foreach ($ConfigModules as $Mod)
+    {
+      if (array_key_exists($Mod['Name'], $this->Modules))
       {
         $this->Modules[$Mod['Name']] = $this->Modules[$Mod['Name']];
@@ -358 +358 @@
   {
     $Data = array();
-    foreach($this->Modules as $Module)
+    foreach ($this->Modules as $Module)
     {
       $Data[] = array('Name' => $Module->Name, 'Enabled' => $Module->Enabled,
@@ -381 +381 @@
   {
     $List = scandir($Directory);
-    foreach($List as $Item)
-    {
-      if(is_dir($Directory.'/'.$Item) and ($Item != '.') and ($Item != '..') and ($Item != '.svn'))
+    foreach ($List as $Item)
+    {
+      if (is_dir($Directory.'/'.$Item) and ($Item != '.') and ($Item != '..') and ($Item != '.svn'))
       {
         include_once($Directory.'/'.$Item.'/'.$Item.'.php');
@@ -394 +394 @@
   function LoadModules()
   {
-    if(method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
+    if (method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
       $this->OnLoadModules();
     else $this->LoadModulesFromDir($this->ModulesDir);