Changeset 549 for trunk

Timestamp:

Jun 18, 2013, 8:30:40 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Do hlavní nabídky lze přidávat položky na určitou pozici.

Location:

trunk

Files:

• Modules/Dictionary/Dictionary.php (modified) (2 diffs)
• Modules/FrontPage/FrontPage.php (modified) (3 diffs)
• Modules/Team/Team.php (modified) (1 diff)
• Modules/User/User.php (modified) (1 diff)
• TranslationList.php (modified) (1 diff)
• includes/Database.php (modified) (1 diff)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (2 diffs)
• includes/system.php (modified) (1 diff)
• index.php (modified) (1 diff)
• save.php (modified) (3 diffs)

trunk/Modules/Dictionary/Dictionary.php

@@ -18 +18 @@
         $this->System->RegisterPage('dictionary.php', 'PageDictionary');
         $this->System->RegisterMenuItem(array(
+                'Name' => 'Dictionary',
         'Title' => 'Slovníček',
         'Hint' => 'Slovník WoW výrazů',
@@ -23 +24 @@
         'Permission' => LICENCE_ANONYMOUS,
         'Icon' => '',
-    ));
+    ), 1);
   }
 }

trunk/Modules/FrontPage/FrontPage.php

@@ -23 +23 @@
       'Permission' => LICENCE_ANONYMOUS,
       'Icon' => '', 
-    ));
+    ), 0);
   }
+  
+  function HandleLoginForm()
+  {
+        global $User, $Message, $MessageType;
+  
+        if(array_key_exists('action', $_GET))
+        {
+                if($_GET['action'] == 'login')
+                {
+                        if(array_key_exists('LoginUser', $_POST) and array_key_exists('LoginPass', $_POST))
+                        {
+                                $User->Login($_POST['LoginUser'], $_POST['LoginPass']);
+                                if($User->Role == LICENCE_ANONYMOUS)
+                                {
+                                        $Message = 'Jméno nebo heslo bylo zadáno špatně.';
+                                        $MessageType = MESSAGE_CRITICAL;
+                                } else
+                                {
+                                        $Message = 'Přihlášení proběhlo úspěšně. Vítej <strong>'.$User->Name.'</strong>!';
+                                        $MessageType = MESSAGE_INFORMATION;
+                                }
+                        } else
+                        {
+                                $Message = 'Nebylo zadáno jméno a heslo.';
+                                $MessageType = MESSAGE_CRITICAL;
+                        }
+                } else
+                        if($_GET['action'] == 'logout')
+                        {
+                                if($User->Role != LICENCE_ANONYMOUS)
+                                {
+                                        WriteLog('Odhlášení', LOG_TYPE_USER);
+                                        $User->Logout();
+                                        $Message = 'Byl jsi odhlášen.';
+                                        $MessageType = MESSAGE_INFORMATION;
+                                }
+                        }
+        }
+  }
+  
 }
 
@@ -31 +71 @@
   function Show()
   {
-        $Output = '<br />'.
+        global $Message, $MessageType;
+        
+        $this->System->ModuleManager->Modules['FrontPage']->HandleLoginForm();
+        $Output = '';
+        if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
+         
+        $Output .= '<br />'.
                         '<table class="Home"><tr><td colspan="3">'.$this->ShowWelcome().
                         '</td></tr>'.
@@ -39 +85 @@
                         '</tr></table>';
          return($Output);
-  }
+  } 
 
   function ShowShoutbox()

trunk/Modules/Team/Team.php

@@ -23 +23 @@
       'Permission' => LICENCE_ANONYMOUS, 
       'Icon' => '', 
-    ));
+    ), 1);
   }
 }

trunk/Modules/User/User.php

@@ -32 +32 @@
         'Permission' => LICENCE_ANONYMOUS,
         'Icon' => '',
-    ));
+    ), 0);
         }
 }

trunk/TranslationList.php

@@ -158 +158 @@
       ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`Complete` = 1) AND '.
       '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`))';
-    else if($Filter['State'] == 2) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`Complete` = 1)';
-    else if($Filter['State'] == 3) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`Language` != '.$Config['OriginalLanguage'].') AND (`Complete` = 0)';
-    else if($Filter['State'] == 4) $Filter['SQL'] .= $VersionFilter.' AND (`Language` = '.$Config['OriginalLanguage'].')';
+    else if($Filter['State'] == 2) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Complete` = 1)';
+    else if($Filter['State'] == 3) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Language` != '.$Config['OriginalLanguage'].
+      ') AND (`T`.`Complete` = 0)';
+    else if($Filter['State'] == 4) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$Config['OriginalLanguage'].')';
   }
 

trunk/includes/Database.php

@@ -46 +46 @@
         $this->ShowSQLQuery = false;
         $this->LogSQLQuery = false;
-        $this->LogFile = 'Query.log';
+        $this->LogFile = dirname(__FILE__).'/../Query.log';
   }
   

trunk/includes/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 547; // Subversion revision
+$Revision = 549; // Subversion revision
 $DatabaseRevision = 543; // Database structure revision 
 $ReleaseTime = '2013-06-18';

trunk/includes/global.php

@@ -16 +16 @@
 include_once(dirname(__FILE__).'/../Modules/AoWoW/AoWoW.php');
 include_once(dirname(__FILE__).'/../Modules/Referrer/Referrer.php');
-include_once(dirname(__FILE__).'/../Modules/FrontPage/FrontPage.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/FrontPage/FrontPage.php');
 
 GlobalInit();
@@ -645 +645 @@
 }
 
-function HandleLoginForm()
-{
-  global $User, $Message, $MessageType;
-  
-  if(array_key_exists('action', $_GET))
-  {
-    if($_GET['action'] == 'login')
-    {
-      if(array_key_exists('LoginUser', $_POST) and array_key_exists('LoginPass', $_POST))
-      {
-        $User->Login($_POST['LoginUser'], $_POST['LoginPass']);
-        if($User->Role == LICENCE_ANONYMOUS)
-        {
-          $Message = 'Jméno nebo heslo bylo zadáno špatně.';
-          $MessageType = MESSAGE_CRITICAL;
-        } else
-        {
-          $Message = 'Přihlášení proběhlo úspěšně. Vítej <strong>'.$User->Name.'</strong>!';
-          $MessageType = MESSAGE_INFORMATION;
-        }
-      } else
-      {
-        $Message = 'Nebylo zadáno jméno a heslo.';
-        $MessageType = MESSAGE_CRITICAL;
-      }
-    } else
-      if($_GET['action'] == 'logout')
-      {
-        if($User->Role != LICENCE_ANONYMOUS)
-        {
-          WriteLog('Odhlášení', LOG_TYPE_USER);
-          $User->Logout();
-          $Message = 'Byl jsi odhlášen.';
-          $MessageType = MESSAGE_INFORMATION;
-        }
-      }
-  }
-}
-
 function ProcessURL()
 {

trunk/includes/system.php

@@ -146 +146 @@
   }
   
-  function RegisterMenuItem($MenuItem)
+  function RegisterMenuItem($MenuItem, $Pos = NULL)
   {
-        $this->Menu[] = $MenuItem;
+        if(is_null($Pos)) $this->Menu[] = $MenuItem;
+          else {
+                array_splice($this->Menu, $Pos, 0, array($MenuItem));
+          }
   }
   

trunk/index.php

@@ -2 +2 @@
 
 include_once('includes/global.php');
-
-
-HandleLoginForm();
-
-$Output = '';
-if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
 
 $System->PathItems = ProcessURL();

trunk/save.php

@@ -8 +8 @@
 
 unset($Message);
-HandleLoginForm();
+$System->ModuleManager->Modules['FrontPage']->HandleLoginForm();
 if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
 
@@ -31 +31 @@
       
       // Get data for english original
-      $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Entry`='.$SourceText['Entry'].') AND (`Language` = '.$Config['OriginalLanguage'].') AND (`VersionStart` = '.$SourceText['VersionStart'].') AND (`VersionEnd` = '.$SourceText['VersionEnd'].')');
+      $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Entry`='.$SourceText['Entry'].
+        ') AND (`Language` = '.$Config['OriginalLanguage'].') AND (`VersionStart` = '.$SourceText['VersionStart'].
+        ') AND (`VersionEnd` = '.$SourceText['VersionEnd'].')');
       if($DbResult->num_rows > 0)
       {
@@ -47 +49 @@
         {         
           // Get user translation paired to found english item entry
-          $DbResult2 = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`User` = '.$User->Id.') AND (`Entry` = '.$EnglishFound['Entry'].') AND (`VersionStart` = '.$EnglishFound['VersionStart'].') AND (`VersionEnd` = '.$EnglishFound['VersionEnd'].')');
+          $DbResult2 = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`User` = '.$User->Id.
+                ') AND (`Entry` = '.$EnglishFound['Entry'].') AND (`VersionStart` = '.$EnglishFound['VersionStart'].
+                ') AND (`VersionEnd` = '.$EnglishFound['VersionEnd'].')');
           if($DbResult2->num_rows > 0)
           {