Changeset 600 for trunk

Timestamp:

Nov 25, 2013, 9:48:38 PM (11 years ago)

Author:

chronos

Message:

• Modified: Logged unknown pages have now separate log type to better distinguish from ordinal errors.

Location:

trunk

Files:

• Modules/Log/Log.php (modified) (3 diffs)
• admin/UpdateTrace.php (modified) (4 diffs)
• includes/Version.php (modified) (1 diff)
• includes/system.php (modified) (1 diff)

trunk/Modules/Log/Log.php

@@ -54 +54 @@
 define('LOG_TYPE_CZWOW', 13);
 define('LOG_TYPE_ADMINISTRATION', 14);
+define('LOG_TYPE_PAGE_NOT_FOUND', 15);
 
 // TODO: Change global function to module class local method  
@@ -193 +194 @@
       $PageList['Output'];
       if($this->System->User->Licence(LICENCE_ADMIN))
-        $Output .= '<div><a href="'.$this->System->Link('/log.php?a=delerrlog').'">Vymázání chybových záznamů</a></div>';     
+      {
+        $Output .= '<div>Vymazat: <a href="'.$this->System->Link('/log.php?a=delerrlog&amp;type='.LOG_TYPE_ERROR).'">Chybové záznamy</a> '.
+          '<a href="'.$this->System->Link('/log.php?a=delerrlog&amp;type='.LOG_TYPE_PAGE_NOT_FOUND).'">Neznámé stránky</a></div>';
+      }     
     } else $Output .= ShowMessage('Nemáte oprávnění.', MESSAGE_CRITICAL);
   
@@ -201 +205 @@
   function DeleteErrorLog()
   {
-        if($this->System->User->Licence(LICENCE_ADMIN))
+        if($this->System->User->Licence(LICENCE_ADMIN) and 
+        (($_GET['type'] == LOG_TYPE_ERROR) or ($_GET['type'] == LOG_TYPE_PAGE_NOT_FOUND)))
         {
-          $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Log` WHERE `Type`='.LOG_TYPE_ERROR);
+                $DbResult = $this->System->Database->select('LogType', '*', 'Id='.$_GET['type']);
+                $LogType = $DbResult->fetch_assoc();
+          $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Log` WHERE `Type`='.$_GET['type']);
           $DbRow = $DbResult->fetch_row();
-          $this->System->Database->query('DELETE FROM `Log` WHERE `Type`='.LOG_TYPE_ERROR);
-          $this->System->ModuleManager->Modules['Log']->WriteLog('Vymazány chybové záznamy', LOG_TYPE_ADMINISTRATION);
-          $Output = ShowMessage('Smazáno všech '.$DbRow[0].' chybových záznamů.');
+          $this->System->Database->query('DELETE FROM `Log` WHERE `Type`='.$_GET['type']);
+          $this->System->ModuleManager->Modules['Log']->WriteLog('Vymazáno záznamů z '.$LogType['Description'].'.', LOG_TYPE_ADMINISTRATION);
+          $Output = ShowMessage('Smazáno všech '.$DbRow[0].' záznamů z '.$LogType['Description'].'.');
           $Output .= $this->ShowList();
           return($Output);

trunk/admin/UpdateTrace.php

@@ -2515 +2515 @@
 function UpdateTo510($Manager)
 {      
-  global $System;
-  
   $Manager->Execute('ALTER TABLE `News` ADD `Title` VARCHAR( 255 ) NOT NULL AFTER `Time`');
   $Manager->Execute('UPDATE `News` SET `Title` = (SELECT `Name` FROM `User` AS `T` WHERE `T`.`ID` = `User`)');
@@ -2523 +2521 @@
 function UpdateTo524($Manager)
 {      
-  global $System;
-  
   $Manager->Execute('ALTER TABLE `User` ADD `PreferredVersion` INT NULL DEFAULT NULL');
   $Manager->Execute('ALTER TABLE `User` ADD INDEX ( `PreferredVersion` )');
@@ -2613 +2609 @@
 }
 
+function UpdateTo600($Manager)
+{
+        $Manager->Execute("INSERT INTO `LogType` (`Id` ,`Name` ,`Color` ,`Description`)
+VALUES (NULL , 'Nenalezené', 'teal', 'Nenalezené stránky');");
+}
+
 $Updates = array(
         498 => array('Revision' => 506, 'Function' => 'UpdateTo506'),
@@ -2623 +2625 @@
         567 => array('Revision' => 574, 'Function' => 'UpdateTo574'),
         574 => array('Revision' => 585, 'Function' => 'UpdateTo585'),
+        585 => array('Revision' => 600, 'Function' => 'UpdateTo600'),
 );

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 599; // Subversion revision
-$DatabaseRevision = 585; // Database structure revision 
+$Revision = 600; // Subversion revision
+$DatabaseRevision = 600; // Database structure revision 
 $ReleaseTime = '2013-11-25';

trunk/includes/system.php

@@ -207 +207 @@
         if(isset($this->ModuleManager->Modules['Log'])) 
           $this->ModuleManager->Modules['Log']->WriteLog('Stránka "'.
-          implode('/', $this->PathItems).'" nenalezena'.$Referer, LOG_TYPE_ERROR);
+          implode('/', $this->PathItems).'" nenalezena'.$Referer, LOG_TYPE_PAGE_NOT_FOUND);
     return(ShowMessage('Stránka "'.implode('/', $this->PathItems).'" nenalezena.', MESSAGE_CRITICAL));
   }