Changeset 521 for trunk/Common

Timestamp:

Apr 14, 2013, 9:04:17 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Finance přepracovány na aplikační modul. Upraveny URL adresy stránek.
• Přidáno: Slučování registrovaných stránek do stromu stránek. Registgrovat lze nyní také pomocí cesty jako pole adresářů URL.

Location:

trunk/Common

Files:

• Global.php (modified) (4 diffs)
• Page.php (modified) (1 diff)
• Version.php (modified) (1 diff)

trunk/Common/Global.php

@@ -22 +22 @@
 include_once(dirname(__FILE__).'/Page.php');
 include_once(dirname(__FILE__).'/Form/Form.php');
-include_once(dirname(__FILE__).'/../finance/bills.php');
-include_once(dirname(__FILE__).'/../finance/finance.php');
 include_once(dirname(__FILE__).'/../form_classes.php');
 
@@ -70 +68 @@
   function RegisterPage($Path, $Handler)
   {
-    $this->Pages[$Path] = $Handler;
+    if(is_array($Path))
+    {
+      $Page = &$this->Pages;
+      $LastKey = array_pop($Path);
+      foreach($Path as $PathItem)
+      {
+        $Page = &$Page[$PathItem];       
+      }
+      if(!is_array($Page)) $Page = array('' => $Page);
+      $Page[$LastKey] = $Handler;
+    } else $this->Pages[$Path] = $Handler;
   }
   
   function SearchPage($PathItems, $Pages)
   {
-    $PathItem = $PathItems[0];
+    if(count($PathItems) > 0) $PathItem = $PathItems[0];
+      else $PathItem = '';
     if(array_key_exists($PathItem, $Pages))
     {
@@ -86 +95 @@
   }
   
+  function PageNotFound()
+  {
+    return('Page '.implode('/', $this->PathItems).' not found.');
+  }
+  
   function ShowPage()
   {
@@ -96 +110 @@
       $Page->Database = &$this->Database;
       $Page->GetOutput();
-    } else echo('Page '.implode('/', $this->PathItems).' not found.');
+    } else echo($this->PageNotFound());
   }
   

trunk/Common/Page.php

@@ -33 +33 @@
     while(strpos($ScriptName, '//') !== false)
       $ScriptName = str_replace('//', '/', $ScriptName);
+    if(strpos($ScriptName, '?') !== false)
+      $ScriptName = substr($ScriptName, 0, strrpos($ScriptName, '?'));
     $ScriptName = substr($ScriptName, strlen($this->System->Link('')));
     if(substr($ScriptName, -1, 1) == '/') $ScriptName = substr($ScriptName, 0, -1);

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 519; // Subversion revision
-$DatabaseRevision = 517; 
-$ReleaseTime = '2013-04-13';
+$Revision = 521; // Subversion revision
+$DatabaseRevision = 517; // SQL structure revision
+$ReleaseTime = '2013-04-14';
 
 ?>