Changeset 860 for trunk/Packages

Timestamp:

Jan 21, 2016, 2:49:19 PM (8 years ago)

Author:

chronos

Message:

• Modified: Now application modules are started according configuration file.
• Added: Each module which want to show something in main page bars needs to register its callback.

Location:

trunk/Packages/Common

Files:

• AppModule.php (modified) (2 diffs)
• Setup.php (modified) (1 diff)

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';
   }
@@ -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)

trunk/Packages/Common/Setup.php

@@ -362 +362 @@
   {
     $Output = '';
-    if(!$this->Database->Connected()) $Output .= 'Nelze se připojit k databázi.<br>';
+    if(!$this->Database->Connected()) $Output .= T('Can\'t connect to database').'<br>';
     else {
       if(!$this->System->Setup->UpdateManager->IsInstalled())
-        $Output .= 'Systém vyžaduje instalaci databáze.<br>';
+        $Output .= T('System requires database initialization').'<br>';
       else
       if(!$this->System->Setup->UpdateManager->IsUpToDate())
-        $Output .= 'Systém vyžaduje aktualizaci databáze.<br>';
-    }
-    $Output .= 'Pokračujte <a href="'.$this->System->Link('/setup/').'">zde</a>';
+        $Output .= T('System requires database upgrade').'<br>';
+    }
+    $Output .= sprintf(T('Front page was not configured. Continue to %s'), '<a href="'.$this->System->Link('/setup/').'">'.T('setup').'</a>');
     return($Output);
   }