Changeset 860 for trunk/includes

Timestamp:

Jan 21, 2016, 2:49:19 PM (9 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/includes

Files:

• Global.php (modified) (1 diff)
• System.php (modified) (11 diffs)

trunk/includes/Global.php

@@ -9 +9 @@
 include_once(dirname(__FILE__).'/../Application/Version.php');
 require_once(dirname(__FILE__).'/../HTML/BBCodeParser2.php');
-
-// Include application modules
-// TODO: Make modules configurable
-include_once(dirname(__FILE__).'/../Modules/Error/Error.php');
-include_once(dirname(__FILE__).'/../Modules/Log/Log.php');
-include_once(dirname(__FILE__).'/../Modules/Translation/Translation.php');
-include_once(dirname(__FILE__).'/../Modules/AoWoW/AoWoW.php');
-include_once(dirname(__FILE__).'/../Modules/Referrer/Referrer.php');
-include_once(dirname(__FILE__).'/../Modules/Team/Team.php');
-include_once(dirname(__FILE__).'/../Modules/User/User.php');
-include_once(dirname(__FILE__).'/../Modules/Dictionary/Dictionary.php');
-include_once(dirname(__FILE__).'/../Modules/Import/Import.php');
-include_once(dirname(__FILE__).'/../Modules/Export/Export.php');
-include_once(dirname(__FILE__).'/../Modules/Server/Server.php');
-include_once(dirname(__FILE__).'/../Modules/ClientVersion/ClientVersion.php');
-include_once(dirname(__FILE__).'/../Modules/ShoutBox/ShoutBox.php');
-include_once(dirname(__FILE__).'/../Modules/News/News.php');
-include_once(dirname(__FILE__).'/../Modules/Wiki/Wiki.php');
-include_once(dirname(__FILE__).'/../Modules/Search/Search.php');
-include_once(dirname(__FILE__).'/../Modules/FrontPage/FrontPage.php');
-include_once(dirname(__FILE__).'/../Modules/Download/Download.php');
-include_once(dirname(__FILE__).'/../Modules/Forum/Forum.php');
-include_once(dirname(__FILE__).'/../Modules/Redirection/Redirection.php');
-include_once(dirname(__FILE__).'/../Modules/Admin/Admin.php');
-include_once(dirname(__FILE__).'/../Modules/Info/Info.php');
-
 
 // Back compatibility, will be removed

trunk/includes/System.php

@@ -11 +11 @@
   /* @var LocaleManager */
   var $LocaleManager;
+  var $Bars;
 
   function __construct()
@@ -21 +22 @@
     $this->OnPageNotFound = array();
     $this->Pages = array();
+    $this->Bars = array();
   }
 
@@ -28 +30 @@
 
     $this->Config = $Config;
-    date_default_timezone_set($this->Config['Web']['Timezone']);
+    if(isset($this->Config['Web']['Timezone']))
+      date_default_timezone_set($this->Config['Web']['Timezone']);
     mb_internal_encoding("UTF-8");
 
@@ -78 +81 @@
        'Icon' => '',
       ),
-    */
+
       array(
         'Title' => T('IRC chat'),
@@ -86 +89 @@
         'Icon' => '',
       ),
+      */
     );
   }
@@ -106 +110 @@
     foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($_GET[$Index]);
 
+    $this->RegisterPageBar('Top');
+    $this->RegisterPageBar('Left');
+    $this->RegisterPageBar('Right');
     $this->Init();
 
@@ -116 +123 @@
       $this->ModuleManager->Start();
     }
-
-    // Initialize application modules
-    $this->ModuleManager->RegisterModule(new ModuleError($this));
-    $this->ModuleManager->Modules['Error']->ErrorHandler->ShowError = $this->Config['Web']['ShowPHPError'];
-    $this->ModuleManager->RegisterModule(new ModuleLog($this));
-    $this->ModuleManager->RegisterModule(new ModuleUser($this));
-    $this->ModuleManager->RegisterModule(new ModuleAoWoW($this));
-    $this->ModuleManager->RegisterModule(new ModuleReferrer($this));
-    $this->ModuleManager->Modules['Referrer']->Excludes[] = $this->Config['Web']['Host'];
-    $this->ModuleManager->RegisterModule(new ModuleTeam($this));
-    $this->ModuleManager->RegisterModule(new ModuleDictionary($this));
-    $this->ModuleManager->RegisterModule(new ModuleTranslation($this));
-    $this->ModuleManager->RegisterModule(new ModuleImport($this));
-    $this->ModuleManager->RegisterModule(new ModuleExport($this));
-    $this->ModuleManager->RegisterModule(new ModuleServer($this));
-    $this->ModuleManager->RegisterModule(new ModuleClientVersion($this));
-    $this->ModuleManager->RegisterModule(new ModuleShoutBox($this));
-    $this->ModuleManager->RegisterModule(new ModuleNews($this));
-    $this->ModuleManager->RegisterModule(new ModuleWiki($this));
-    $this->ModuleManager->RegisterModule(new ModuleSearch($this));
-    $this->ModuleManager->RegisterModule(new ModuleFrontPage($this));
-    $this->ModuleManager->RegisterModule(new ModuleDownload($this));
-    $this->ModuleManager->RegisterModule(new ModuleForum($this));
-    $this->ModuleManager->RegisterModule(new ModuleRedirection($this));
-    $this->ModuleManager->RegisterModule(new ModuleAdmin($this));
-    $this->ModuleManager->RegisterModule(new ModuleInfo($this));
-    $this->ModuleManager->FileName = dirname(__FILE__).'/../Config/ModulesConfig.php';
-    // TODO: Allow control from web which modules should be installed
-    $this->ModuleManager->InstallAll();
-    $this->ModuleManager->StartAll();
 
     $this->BaseView = new BaseView($this);
@@ -327 +304 @@
     echo($Output);
   }
+
+  function RegisterPageBar($Name)
+  {
+    $this->Bars[$Name] = array();
+  }
+
+  function UnregisterPageBar($Name)
+  {
+    unset($this->Bars[$Name]);
+  }
+
+  function RegisterPageBarItem($BarName, $ItemName, $Callback)
+  {
+    $this->Bars[$BarName][$ItemName] = $Callback;
+  }
 }
 
@@ -357 +349 @@
   {
     $Output = '<div class="Menu">';
-    if(!$this->System->User->Licence(LICENCE_USER))
-      $Output .= '<div class="advert">'.$this->System->Config['Web']['Advertisement'].'</div>';
+    if(isset($this->System->User))
+    {
+      if(!$this->System->User->Licence(LICENCE_USER))
+        $Output .= '<div class="advert">'.$this->System->Config['Web']['Advertisement'].'</div>';
+    }
     $Output .= '<span class="MenuItem"></span><span class="MenuItem2">';
-    if($this->System->User->Licence(LICENCE_USER))
-    {
-      //$DbResult =$this->Database->query('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$this->System->User->Team);
-      //$Team = $DbResult->fetch_assoc();
-      //$Output .= ''<span class="MenuItem">Moje překlady: <a href="">Dokončené</a> <a href="">Rozpracované</a> <a href="">Exporty</a> Tým: <a href="">'.$Team['name'].'</a></span>';
-      $Output .= $this->System->User->Name.' <a href="'.$this->System->Link('/?action=logout').'">'.T('Logout').'</a>'.
-          ' <a href="'.$this->System->Link('/user/?user='.$this->System->User->Id).'">'.T('My page').'</a>'.
-          ' <a href="'.$this->System->Link('/options/').'">'.T('Options').'</a>'.
-          ' <a title="Vámi přeložené texty" href="'.$this->System->Link('/TranslationList.php?user='.
-          $this->System->User->Id.'&amp;group=0&amp;state=2&amp;text=&amp;entry=').'">'.T('Translated').'</a>'.
-          ' <a title="Vaše rozpracované text" href="'.$this->System->Link('/TranslationList.php?user='.
-          $this->System->User->Id.'&amp;group=0&amp;state=3&amp;text=&amp;entry=').'">'.T('Unfinished').'</a>'.
-          ' <a title="Nikým nepřeložené texty" href="'.
-          $this->System->Link('/TranslationList.php?user=0&amp;group=0&amp;state=1&amp;text=&amp;entry=').'">'.T('Untranslated').'</a>';
-    } else
-    {
-      $Output .= '<a href="'.$this->System->Link('/login/').'">'.T('Login').'</a>&nbsp;'.
-        '<a href="'.$this->System->Link('/registration/').'">'.T('Registration').'</a>';
-    }
+
+    // Show bars items
+    $Bar = '';
+    foreach($this->System->Bars['Top'] as $BarItem)
+      $Bar .= call_user_func($BarItem);
+      if(trim($Bar) != '') $Output .= $Bar;
+      else $Output .= '&nbsp;';
+
     $Output .= $this->ShowLocaleSelector();
     //$Output .= '</form>';
@@ -432 +416 @@
       '<div class="verticalmenu"><ul>';
     foreach($this->System->Menu as $MenuItem)
-      if($this->System->User->Licence($MenuItem['Permission']))
+      if(!isset($this->System->User) or $this->System->User->Licence($MenuItem['Permission']))
       {
         if(isset($MenuItem['Click'])) $OnClick = ' onclick="'.$MenuItem['Click'].'"';
@@ -466 +450 @@
         '&nbsp;<a title="Přeložené texty, můžete zde hlasovat, nebo opravovat překlady" href="'.
         $this->System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;state=2&amp;user=0&amp;entry=&amp;text=').'">'.T('Translated').'</a><br />';
-      if($this->System->User->Licence(LICENCE_USER))
+      if(isset($this->System->User) and $this->System->User->Licence(LICENCE_USER))
       {
         $Output .= '&nbsp;<a title="'.T('Unfinished translations').'" href="'.$this->System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;state=3').'">'.T('Unfinished').'</a><br />'.