Changeset 668

Timestamp:

Jul 15, 2014, 9:48:54 PM (10 years ago)

Author:

chronos

Message:

• Přidáno: Přístup k RSS kanálům přes přístupový token.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Global.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Log/Log.php (modified) (3 diffs)
• Modules/User/User.php (modified) (4 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 664; // Subversion revision
-$DatabaseRevision = 662; // SQL structure revision
-$ReleaseTime = strtotime('2014-06-13');
+$Revision = 668; // Subversion revision
+$DatabaseRevision = 668; // SQL structure revision
+$ReleaseTime = strtotime('2014-07-15');

trunk/Common/Global.php

@@ -18 +18 @@
 include_once(dirname(__FILE__).'/Setup/Setup.php');
 include_once(dirname(__FILE__).'/PrefixMultiplier.php');
+include_once(dirname(__FILE__).'/VCL/General.php');
+include_once(dirname(__FILE__).'/VCL/Database.php');
 
 //define('NEW_PERMISSION', '1');

trunk/Common/Setup/Updates.php

@@ -781 +781 @@
   $IconId = $Manager->Database->insert_id;
   $Manager->Execute('UPDATE `Action` SET `Icon` = '.$IconId.' WHERE `Title`="Kontakty"');
-
+}
+
+function UpdateTo668($Manager)
+{
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `APIToken` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `User` int(11) NOT NULL,
+  `Token` varchar(255) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `User` (`User`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+
+  $Manager->Execute('ALTER TABLE `APIToken`
+  ADD CONSTRAINT `APIToken_ibfk_1` FOREIGN KEY (`User`) REFERENCES `User` (`Id`);');
+  $Manager->Execute('INSERT INTO `Module` (`Id` ,`Name` ,`Title`)
+VALUES (NULL , "RSS", "RSS kanály");');
 }
 
@@ -826 +841 @@
       657 => array('Revision' => 661, 'Function' => 'UpdateTo661'),
       661 => array('Revision' => 662, 'Function' => 'UpdateTo662'),
+      662 => array('Revision' => 668, 'Function' => 'UpdateTo668'),
     ));
   }

trunk/Modules/Log/Log.php

@@ -11 +11 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'Logging user actions';
-    $this->Dependencies = array('User');
+    $this->Dependencies = array('User', 'RSS');
   }
 
@@ -38 +38 @@
       ),
     ));
-
+    $this->System->ModuleManager->Modules['RSS']->RegisterRSS(array('Title' => 'Logs',
+      'Channel' => 'log', 'Callback' => array('ModuleLog', 'ShowRSS'),
+      'Permission' => array('Module' => 'Log', 'Operation' => 'RSS')));
   }
 
@@ -57 +59 @@
       'Operation' => $Operation, 'Value' => $Value, 'IPAddress' => $IPAddress));
   }
+
+  function ShowRSS()
+  {
+    $this->ClearPage = true;
+    $this->FormatHTML = false;
+    Header('Content-Type: text/xml');
+    $Count = 20;
+
+    $Output = '';
+    $Items = array();
+    if(array_key_exists('type', $_GET)) $Where = ' WHERE `Type` = "'.($_GET['type'] * 1).'"';
+      else $Where = '';
+    $sql = 'SELECT *, UNIX_TIMESTAMP(`Time`) AS `TimeCreate`, (SELECT `User`.`Name` FROM `User` WHERE `User`.`Id` = `Log`.`User`) AS `UserName`, `Time` FROM `Log`'.
+      $Where.' ORDER BY `Time` DESC LIMIT '.$Count;
+    $DbResult = $this->System->Database->query($sql);
+    while($Line = $DbResult->fetch_assoc())
+    {
+      $Line['Value'] = htmlspecialchars($Line['Value']);
+      $Line['Value'] = str_replace("\n", '<br>', $Line['Value']);
+
+      $Items[] = array
+      (
+        'Title' => $Line['Module'].' '.$Line['Operation'].' ('.$Line['UserName'].', '.$Line['IPAddress'].')',
+        'Link' => 'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/log.php'),
+        'Description' => $Line['Module'].' '.$Line['Operation'].': '.$Line['Value'].' ('.$Line['UserName'].
+          ', '.$Line['IPAddress'].', '.HumanDate($Line['Time']).')',
+        'Time' => $Line['TimeCreate'],
+      );
+    }
+
+    $RSS = new RSS();
+    $RSS->Title = $this->System->Config['Web']['Title'].' - Záznamy';
+    $RSS->Link = 'http://'.$this->System->Config['Web']['Host'].'/';
+    $RSS->Description = 'Aktuality '.$this->System->Config['Web']['Description'];
+    $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail'];
+    $RSS->Items = $Items;
+    return($RSS->Generate());
+  }
 }

trunk/Modules/User/User.php

@@ -285 +285 @@
     {
       // If no permission combination exists in cache, do new check of database items
-      $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND `AssignedGroup` IS NOT NULL');
+      $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '(`Group`="'.$GroupId.
+        '") AND (`AssignedGroup` IS NOT NULL)');
       $DbRow = array();
       while($DbRow[] = $DbResult->fetch_array());
-      $this->PermissionGroupCache[$GroupId] = $DbRow;
+        $this->PermissionGroupCache[$GroupId] = $DbRow;
       $PermissionExists = true;
     }
@@ -337 +338 @@
     {
       // If no permission combination exists in cache, do new check of database items
-      $DbResult = $this->Database->select('PermissionOperation', 'Id', '`Module`="'.$ModuleId.'" AND `Item`="'.$ItemType.'" AND `ItemId`='.$ItemIndex.' AND `Operation`="'.$Operation.'"');
+      $DbResult = $this->Database->select('PermissionOperation', 'Id', '(`Module`="'.$ModuleId.
+        '") AND (`Item`="'.$ItemType.'") AND (`ItemId`='.$ItemIndex.') AND (`Operation`="'.$Operation.'")');
       if($DbResult->num_rows > 0)
       {
@@ -414 +416 @@
     } else $Output = USER_NOT_FOUND;
     return($Output);
+  }
+
+  function CheckToken($Module, $Operation, $Token)
+  {
+    $DbResult = $this->Database->select('APIToken', 'User', '`Token`="'.$Token.'"');
+    if($DbResult->num_rows > 0)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      $User = new User($this->System);
+      $User->User = array('Id' => $DbRow['User']);
+      return($User->CheckPermission($Module, $Operation));
+    } else return(false);
   }
 }
@@ -583 +597 @@
       ),
     ));
+    $this->System->FormManager->RegisterClass('APIToken', array(
+      'Title' => 'Přístupový token',
+      'Table' => 'APIToken',
+      'Items' => array(
+        'User' => array('Type' => 'TUser', 'Caption' => 'Uživatel', 'Default' => ''),
+        'Token' => array('Type' => 'String', 'Caption' => 'Token', 'Default' => ''),
+      ),
+    ));
     $this->System->FormManager->RegisterClass('User', array(
       'Title' => 'Uživatelé',