Changeset 589 for trunk

Timestamp:

Nov 18, 2013, 10:32:30 PM (11 years ago)

Author:

chronos

Message:

• Fixed: If referenced unknown subpage then show main page with error message and log event.

Location:

trunk

Files:

• Modules/Log/Log.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (2 diffs)
• includes/system.php (modified) (3 diffs)

trunk/Modules/Log/Log.php

@@ -36 +36 @@
           else $IP = addslashes($_SERVER['REMOTE_ADDR']);
         
-        if(!is_null($this->System->User->Id)) $UserId = $this->System->User->Id;
+        if(isset($User) and !is_null($this->System->User->Id)) $UserId = $this->System->User->Id;
           else $UserId = 'NULL';
         $Query = 'INSERT INTO `Log` ( `User` , `Type` , `Text` , `Date` , `IP`, `URL` ) '.
@@ -63 +63 @@
           else $IP = addslashes($_SERVER['REMOTE_ADDR']);
 
-        if(!is_null($User->Id)) $UserId = $User->Id;
+        if(isset($User) and !is_null($User->Id)) $UserId = $User->Id;
           else $UserId = 'NULL';
         $Query = 'INSERT INTO `Log` ( `User` , `Type` , `Text` , `Date` , `IP`, `URL` ) '.

trunk/includes/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 588; // Subversion revision
+$Revision = 589; // Subversion revision
 $DatabaseRevision = 585; // Database structure revision 
 $ReleaseTime = '2013-11-18';

trunk/includes/global.php

@@ -49 +49 @@
         }
 }
+
 function ShowPage($Content)
 {
@@ -60 +61 @@
         $System->ShowPage();
 }
-
 
 function GetMicrotime()

trunk/includes/system.php

@@ -190 +190 @@
         array_shift($PathItems);
         return($this->SearchPage($PathItems, $Pages[$PathItem]));
-      } else return($Pages[$PathItem]);
+      } else 
+      {
+        if(count($PathItems) == 1) return($Pages[$PathItem]);           
+          else return(''); // Unexpected subpages
+      }
     } else return('');
   }
@@ -196 +200 @@
   function PageNotFound()
   {
+        if(isset($this->ModuleManager->Modules['Log'])) 
+          $this->ModuleManager->Modules['Log']->WriteLog('Stránka "'.
+          implode('/', $this->PathItems).'" nenalezena', LOG_TYPE_ERROR);
     return(ShowMessage('Stránka "'.implode('/', $this->PathItems).'" nenalezena.', MESSAGE_CRITICAL));
   }
@@ -202 +209 @@
   {
     /* @var $Page Page */
-    $ClassName = $this->SearchPage($this->PathItems, $this->Pages);     
+    $ClassName = $this->SearchPage($this->PathItems, $this->Pages);
     if($ClassName != '') 
     {