Changeset 426

Timestamp:

Oct 10, 2012, 8:28:07 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Tlačítko zrušit u formulářů.
• Opraveno: Chyba načítání informací o uživateli pokud neměl vazbu na Member/Customer.

Location:

trunk

Files:

• database.php (modified) (5 diffs)
• forms.php (modified) (1 diff)
• network/user_hosts.php (modified) (1 diff)
• page.php (modified) (1 diff)
• user.php (modified) (5 diffs)

trunk/database.php

@@ -78 +78 @@
   function delete($Table, $Condition)
   {
-    $this->PDO->query('DELETE FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);  
+    $this->query('DELETE FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);  
   }
   
@@ -93 +93 @@
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    $this->PDO->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')'); 
+    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')'); 
     $this->insert_id = $this->PDO->lastInsertId();
   }
@@ -106 +106 @@
     }
     $Values = substr($Values, 2);  
-    $this->PDO->query('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
+    $this->query('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
   }
   
@@ -122 +122 @@
     $Values = substr($Values, 1);
     //echo('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES ('.$Values.')<br />');
-    $this->PDO->query('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
+    $this->query('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
     //echo($this->error().'<br>');
   }
@@ -128 +128 @@
   function charset($Charset)
   {
-    $this->PDO->query('SET NAMES "'.$Charset.'"');
+    $this->query('SET NAMES "'.$Charset.'"');
   }
   

trunk/forms.php

@@ -20 +20 @@
   {
     if(!array_key_exists('SubmitText', $this->Definition)) $this->Definition['SubmitText'] = 'Uložit';
-    $Output = '<form class="Form" action="'.$this->OnSubmit.'" method="post">'.$this->ShowEditBlock().'<div><input type="submit" value="'.$this->Definition['SubmitText'].'" /></div></form>';
+    $Output = '<form class="Form" action="'.$this->OnSubmit.'" method="post">'.$this->ShowEditBlock().
+      '<div><input type="submit" value="'.$this->Definition['SubmitText'].'" /> '.
+      '<input type="button" value="Zrušit" onclick="location.href=\'?\'"/></div></form>';
     return($Output);
   }

trunk/network/user_hosts.php

@@ -14 +14 @@
     $Output = '<div align="center" style="font-size: small;"><table class="WideTable">';
     $Output .= '<tr><th>Jméno počítače</th><th>Místní adresa</th><th>Veřejná adresa</th><th>CZFree adresa</th><th>Fyzická adresa</th><th>Typ</th><th>Naposledy online</th></tr>';
-    $DbResult = $this->Database->query('SELECT NetworkDevice.*, NetworkDeviceType.Name AS HostType FROM NetworkDevice LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type WHERE NetworkDevice.Used = 1 AND NetworkDevice.Member = '.$this->System->Modules['User']->User['Member'].' ORDER BY NetworkDevice.Name');
+    $DbResult = $this->Database->query('SELECT NetworkDevice.*, NetworkDeviceType.Name AS HostType FROM NetworkDevice LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type WHERE NetworkDevice.Used = 1 AND NetworkDevice.Member = (SELECT Customer FROM UserCustomerRel WHERE User='.$this->System->Modules['User']->User['Id'].') ORDER BY NetworkDevice.Name');
     while($Device = $DbResult->fetch_assoc())
     {

trunk/page.php

@@ -17 +17 @@
     'map' => array('',
       'index.php' => 'Mapa sítě',
+    ),
+    'tv' => array('',
+      'index.php' => 'Síťová televize',
     ),
     'network' => array('',

trunk/user.php

@@ -36 +36 @@
   var $PermissionCache = array();
   var $PermissionGroupCache = array();
+  var $PermissionGroupCacheOp = array();
 
   function Check()
@@ -54 +55 @@
     if($Row['User'] != $this->AnonymousUserId) 
     {
-      $Query = $this->Database->query('SELECT User.*, UserCustomerRel.Customer AS Member FROM User JOIN UserCustomerRel ON UserCustomerRel.User=User.Id WHERE User.Id='.$Row['User']);      
+      $Query = $this->Database->query('SELECT User.*, UserCustomerRel.Customer AS Member FROM User LEFT JOIN UserCustomerRel ON UserCustomerRel.User=User.Id WHERE User.Id='.$Row['User']);      
       $this->User = $Query->fetch_assoc();
       $Result = USER_LOGGED;
@@ -218 +219 @@
     }
 
-
     // Check group-operation relation
-    $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND `AssignedOperation`="'.$OperationId.'"');
-    if($DbResult->num_rows > 0) return(true); 
+    if(array_key_exists($GroupId.','.$OperationId, $this->PermissionGroupCacheOp))
+    {
+      $PermissionExists = true; 
+    } else 
+    {          
+      // If no permission combination exists in cache, do new check of database items            
+      $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND `AssignedOperation`="'.$OperationId.'"');
+      if($DbResult->num_rows > 0) $this->PermissionGroupCacheOp[$GroupId.','.$OperationId] = true;
+        else $this->PermissionGroupCacheOp[$GroupId.','.$OperationId] = false;
+      $PermissionExists = true; 
+    }
+    if($PermissionExists)
+    {
+      return($this->PermissionGroupCacheOp[$GroupId.','.$OperationId]);
+    }
     return(false);
   }
@@ -227 +240 @@
   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)) 
     {
-      $OperationId = array_search(array($Module, $Operation, $ItemType, $ItemType), $this->PermissionCache);
+      $OperationId = array_search(array($Module, $Operation, $ItemType, $ItemIndex), $this->PermissionCache);
       $PermissionExists = is_numeric($OperationId);
     } else 
@@ -240 +255 @@
         $DbRow = $DbResult->fetch_array();
         $OperationId = $DbRow['Id'];
-        $this->PermissionCache[$DbRow['Id']] = array($Module, $Operation, $ItemType, $ItemType);        
+        $this->PermissionCache[$DbRow['Id']] = array($Module, $Operation, $ItemType, $ItemIndex);
         $PermissionExists = true;
       } else 
       {          
-        $this->PermissionCache[$DbRow['Id'].'_'] = array($Module, $Operation, $ItemType, $ItemType);        
+        $this->PermissionCache[$DbRow['Id'].'_'] = array($Module, $Operation, $ItemType, $ItemIndex);        
         $PermissionExists = false;
       }