Changeset 515

Timestamp:

Apr 8, 2013, 11:15:52 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Načítání oprávnění anonymního uživatele. Dříve byl uživatel identifikován předvoleným číslem, nyní je použita hodnota NULL.

Location:

trunk

Files:

• Common/User.php (modified) (5 diffs)
• Common/Version.php (modified) (1 diff)
• Modules/News/NewsPage.php (modified) (2 diffs)
• Modules/Portal/Portal.php (modified) (2 diffs)
• Readme.txt (modified) (1 diff)
• admin/Updates.php (modified) (2 diffs)

trunk/Common/User.php

@@ -113 +113 @@
     else
     {
-      // Je uživatel registrován?
+      // Is user registred yet?
       $Query = $this->Database->select('User', '*', 'Login = "'.$Login.'"');
       if($Query->num_rows > 0) $Result = LOGIN_USED;
@@ -138 +138 @@
             $NewPassword = substr(sha1(strtoupper($Login)), 0, 7);
             
+            // Send activation mail to user email
             $Mail = new Mail();
             $Mail->Subject = 'Registrace nového účtu';
@@ -194 +195 @@
         $this->Database->update('User', 'Id='.$Row['Id'], array('LastLoginTime' => 'NOW()', 'LastIpAddress' => GetRemoteAddress()));            
         $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $Row['Id']));
-        // načtení stavu stromu
+        
         $Result = USER_LOGGED_IN;
         $this->Check();
@@ -289 +290 @@
   function CheckPermission($Module, $Operation, $ItemType = '', $ItemIndex = 0)
   {
-    //echo('Check '.$Module.' '.$Operation.' '.$ItemType.' '.$ItemIndex);
-    //
     // First try to check cache
     if(in_array(array($Module, $Operation, $ItemType, $ItemType), $this->PermissionCache)) 
@@ -315 +314 @@
     if($PermissionExists)
     {
+      if($this->User['Id'] == null) $UserCondition = '(`User` IS NULL)';
+        else $UserCondition = '(`User`="'.$this->User['Id'].'")';
       // Check user-operation relation
-      $DbResult = $this->Database->select('PermissionUserAssignment', '*', '`User`="'.$this->User['Id'].'" AND `AssignedOperation`="'.$OperationId.'"');
+      $DbResult = $this->Database->select('PermissionUserAssignment', '*', $UserCondition.' AND (`AssignedOperation`="'.$OperationId.'")');      
       if($DbResult->num_rows > 0) return(true);
 
       // Check user-group relation
-      $DbResult = $this->Database->select('PermissionUserAssignment', 'AssignedGroup', '`User`="'.$this->User['Id'].'"');
+      $DbResult = $this->Database->select('PermissionUserAssignment', 'AssignedGroup', $UserCondition);
       while($DbRow = $DbResult->fetch_array())
       {

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 514; // Subversion revision
-$DatabaseRevision = 507; 
+$Revision = 515; // Subversion revision
+$DatabaseRevision = 515; 
 $ReleaseTime = '2013-04-08';
 

trunk/Modules/News/NewsPage.php

@@ -99 +99 @@
         if($this->System->Modules['User']->CheckPermission('News', 'Insert', 'Group', $Category))
         {
-          //print_r($_FILES);
           // Process uploaded file
           $EnclosureFileNames = array('enclosure1', 'enclosure2', 'enclosure3');
@@ -156 +155 @@
             $this->Database->update('News', 'Id='.$_POST['id'], array('Title' => $_POST['title'], 'Content' => $_POST['content']));
             $Output .= 'Aktualita uložena!<br />';
-      $Output .= '<a href="index.php?category='.$Category.'">Zpět na seznam aktualit</a>';
+            $Output .= '<a href="index.php?category='.$Category.'">Zpět na seznam aktualit</a>';
           } else $Output .= 'Nelze měnit cizí aktualitu!<br />';
         } else $Output .= 'ID nenalezeno!';

trunk/Modules/Portal/Portal.php

@@ -26 +26 @@
     global $Config;
     
-    $this->Database->select_db($Config['Database']['Database']);
-
     $Output2 = '';
 
@@ -307 +305 @@
     }
 
-    $this->Database->select_db($Config['Database']['Database']);
-
     $DbResult = $this->Database->query('SELECT * FROM `HyperlinkGroup`');
     while($DbRow = $DbResult->fetch_assoc())

trunk/Readme.txt

@@ -34 +34 @@
   
   htmldoc - Pro generování PDF z HTML
-  php-pecl-Fileinfo - pro zjištění MIME type ze souboru
 
 6) Speedtest

trunk/admin/Updates.php

@@ -229 +229 @@
 }
 
+function UpdateTo515($Manager)
+{
+  $Manager->Execute("ALTER TABLE `PermissionUserAssignment` CHANGE `User` `User` INT( 11 ) NULL");
+}
+
 $Updates = array(
-        491 => array('Revision' => 493, 'Function' => 'UpdateTo493'),
+  491 => array('Revision' => 493, 'Function' => 'UpdateTo493'),
   493 => array('Revision' => 494, 'Function' => 'UpdateTo494'),
   494 => array('Revision' => 495, 'Function' => 'UpdateTo495'),
@@ -240 +245 @@
   502 => array('Revision' => 505, 'Function' => 'UpdateTo505'),
   505 => array('Revision' => 507, 'Function' => 'UpdateTo507'),
+  507 => array('Revision' => 515, 'Function' => 'UpdateTo515'),
 );