Changeset 94

Timestamp:

Aug 16, 2013, 10:20:57 PM (11 years ago)

Author:

chronos

Message:

• Added: Primary key for PermissionAssignment table.
• Fixed: Permission check in Server view.

Location:

trunk/www

Files:

• Application/View/Server.php (modified) (10 diffs)
• Application/View/Task.php (modified) (2 diffs)
• SQL/Updates/69.sql (modified) (1 diff)
• SQL/Updates/94.sql (added)

trunk/www/Application/View/Server.php

@@ -164 +164 @@
   {
     $Output = '';
-    if($this->System->Modules['User']->Data['Role'] >= USER_ROLE_USER)
+    if($this->System->Modules['Permission']->Check('Server', 'Add'))
     {
       $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server');
@@ -185 +185 @@
         }
       } else $Output .= $this->System->SystemMessage('Nový server', 'Nelze vytvářet další servery');
-    } else $Output .= USER_BAD_ROLE;
+    } else $Output = $this->System->SystemMessage('Vytvoření serveru', 'Nemáte oprávnění');
     return($Output);
   }
@@ -192 +192 @@
   {
     $Output = '';
-    if($this->System->Modules['User']->Data['Role'] >= USER_ROLE_USER)
+    if($this->System->Modules['Permission']->Check('Server', 'Add'))
     {
       $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server WHERE User='.$this->System->Modules['User']->Data['Id']);
@@ -219 +219 @@
         //$Output .= $Form->ShowEditForm();
       }
-    } else $Output .= USER_BAD_ROLE;
+    } else $Output = $this->System->SystemMessage('Vytvoření serveru', 'Nemáte oprávnění');
     return($Output);
   }
@@ -227 +227 @@
     $Output = '';
     $Server = new Server($this->System, $_POST['ServerId']);
-    if(($this->System->Modules['User']->Data['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->Data['Role'] >= USER_ROLE_ADMINISTRATOR))
+    if(($this->System->Modules['User']->Data['Id'] == $Server->Server['User']) or 
+        ($this->System->Modules['Permission']->Check('Server', 'Modify')))
     {
       $Form = new Form($this->System, $this->EditFormClass, array());
@@ -249 +250 @@
     $Output = '';
     $Server = new Server($this->System, $_GET['Id']);
-    if(($this->System->Modules['User']->Data['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->Data['Role'] >= USER_ROLE_ADMINISTRATOR))
+    if(($this->System->Modules['User']->Data['Id'] == $Server->Server['User']) or 
+        ($this->System->Modules['Permission']->Check('Server', 'Modify')))
     {
       $Form = new Form($this->System, $this->EditFormClass);
@@ -263 +265 @@
   {
     $Output = '';
-    if($this->System->Modules['User']->Data['Role'] >= USER_ROLE_USER)
+    if($this->System->Modules['Permission']->Check('Server', 'OwnerControl'))
     {
       $Server = new Server($this->System, $_GET['Id']);
-      if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->Data['Role'] >= USER_ROLE_ADMINISTRATOR))
+      if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or 
+        ($this->System->Modules['Permission']->Check('Server', 'Control')))
       {
         $Output .= $this->System->SystemMessage('Spuštění serveru', $Server->Start());
@@ -272 +275 @@
         $Output .= $TaskView->ItemList();;
       } else $this->System->SystemMessage('Spuštění serveru', 'Nemáte oprávnění');
-    } else $Output .= USER_BAD_ROLE;
+    } else $this->System->SystemMessage('Spuštění serveru', 'Nemáte oprávnění');
     return($Output);
   }
@@ -279 +282 @@
   {
     $Output = '';
-    if($this->System->Modules['User']->Data['Role'] >= USER_ROLE_USER)
+    if($this->System->Modules['Permission']->Check('Server', 'OwnerControl'))
     {
       $Server = new Server($this->System, $_GET['Id']);
-      if(($this->System->Modules['User']->Data['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->Data['Role'] >= USER_ROLE_ADMINISTRATOR))
+      if(($this->System->Modules['User']->Data['Id'] == $Server->Server['User']) or 
+        ($this->System->Modules['Permission']->Check('Server', 'Control')))
       {
         $Output .= $this->System->SystemMessage('Zastavení serveru', $Server->Stop());
@@ -288 +292 @@
         $Output .= $TaskView->ItemList();;
       } else $this->System->SystemMessage('Zastavení serveru', 'Nemáte oprávnění');
-    } else $Output .= USER_BAD_ROLE;
+    } else $this->System->SystemMessage('Zastavení serveru', 'Nemáte oprávnění');
     return($Output);
   }

trunk/www/Application/View/Task.php

@@ -30 +30 @@
     $Table->OnRow = array($this, 'ShowListOnRow');
     $Table->Definition['Table'] = '(SELECT Id, (COALESCE(UNIX_TIMESTAMP(TimeEnd), UNIX_TIMESTAMP(NOW())) - UNIX_TIMESTAMP(TimeStart)) AS Duration, TimeCreate, Title, State FROM Task WHERE User='.
-      $this->System->Modules['User']->User['Id'].' ORDER BY Id DESC)';
+      $this->System->Modules['User']->Data['Id'].' ORDER BY Id DESC)';
     $Table->Definition['Items']['Id'] = array('Type' => 'Hidden', 'Caption' => '', 'Default' => '');
     $Table->LoadValuesFromDatabase($this->Database);
@@ -40 +40 @@
     }
     $Output .= $Table->Show();
-    $Output .= '<br /><div style="text-align: center;"><a href="?Action=TaskList">Obnovit pohled</a></dev>';      
+    $Output .= '<br /><div style="text-align: center;"><a href="?Module=Task&amp;Action=ItemList">Obnovit pohled</a></dev>';      
     return($Output);
   } 

trunk/www/SQL/Updates/69.sql

@@ -10 +10 @@
 ALTER TABLE `Realm` ADD `ClusterNode` INT NOT NULL ;
 ALTER TABLE `Realm` ADD INDEX ( `ClusterNode` ) ;
-UPDATE `Realm` SET `Node` = 1;
-ALTER TABLE `Realm` ADD FOREIGN KEY ( `Node` ) REFERENCES `ClusterNode` (`Id`);
+UPDATE `Realm` SET `ClusterNode` = 1;
+ALTER TABLE `Realm` ADD FOREIGN KEY ( `ClusterNode` ) REFERENCES `ClusterNode` (`Id`);