Changeset 549 for trunk/includes

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

Files:

• Database.php (modified) (1 diff)
• Version.php (modified) (1 diff)
• global.php (modified) (2 diffs)
• system.php (modified) (1 diff)

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));
+          }
   }