Changeset 860 for trunk/Modules

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/Modules

Files:

• Error/Error.php (modified) (1 diff)
• Referrer/Referrer.php (modified) (1 diff)
• Translation/Translation.php (modified) (2 diffs)
• User/Profile.php (modified) (1 diff)
• User/User.php (modified) (2 diffs)

trunk/Modules/Error/Error.php

@@ -23 +23 @@
   function DoStart()
   {
+    if(isset($this->System->Config['Web']['ShowPHPError']))
+      $this->ErrorHandler->ShowError = $this->System->Config['Web']['ShowPHPError'];
+      else $this->ErrorHandler->ShowError = true;
     $this->ErrorHandler->Start();
   }

trunk/Modules/Referrer/Referrer.php

@@ -20 +20 @@
   function DoStart()
   {
+    $this->Excludes[] = $this->System->Config['Web']['Host'];
     $this->Log();
     $this->System->RegisterPage('referrer', 'PageReferrer');

trunk/Modules/Translation/Translation.php

@@ -24 +24 @@
   function DoStart()
   {
-    $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
-
     $this->System->RegisterPage('comparison.php', 'PageTranslationComparison');
     $this->System->RegisterPage('form.php', 'PageTranslationForm');
@@ -51 +49 @@
     if(array_key_exists('Search', $this->System->ModuleManager->Modules))
     {
+      $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
       foreach($TranslationTree as $Group)
       {

trunk/Modules/User/Profile.php

@@ -163 +163 @@
         T('Number of translated:').' <a href="'.$this->System->Link('/TranslationList.php?user='.$UserLine['ID'].'&amp;state=2&amp;group=0').'" title="Zobrazit Všechny jeho přeložené texty"><strong>'.$UserLine['TranslatedCount'].'</strong></a><br />'.
         T('Level:').' <strong>'.$XP['Level'].'</strong> '.T('experience:').' '.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'<br/>';
-      if($UserLine['TeamName'] != '')
+      if($this->System->ModuleManager->ModuleRunning('Team') and ($UserLine['TeamName'] != ''))
         $Output .= T('Member of team:').' <a href="'.$this->System->Link('/team/?action=team&amp;id='.$UserLine['Team']).'"><strong>'.htmlspecialchars($UserLine['TeamName']).'</strong></a><br />';
 

trunk/Modules/User/User.php

@@ -37 +37 @@
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('user',
       T('Translators'), array('Name'), '`User`', $this->System->Link('/users/?search='));
+    $this->System->RegisterPageBarItem('Top', 'User', array($this, 'TopBarCallback'));
   }
 
@@ -51 +52 @@
       $Name = '<a href="'.$this->System->Link('/user/?user='.$DbUser['ID']).'">'.$DbUser['Name'].'</a>';
       $Output .= $Name.'<br />';
+    }
+    return($Output);
+  }
+
+  function TopBarCallback()
+  {
+    $Output = '';
+    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>';
     }
     return($Output);