Changeset 599

Timestamp:

Dec 6, 2013, 10:30:44 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Nepoužívat zatím rozpracovaný nový systém oprávnění.

Location:

trunk

Files:

• Application/System.php (modified) (1 diff)
• Application/Version.php (modified) (1 diff)
• Common/Global.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (8 diffs)
• Modules/Portal/Portal.php (modified) (1 diff)

trunk/Application/System.php

@@ -124 +124 @@
       if($Action['Icon'] == '') $Action['Icon'] = 'clear.png';
       if(substr($Action['URL'], 0, 4) != 'http') $Action['URL'] = $this->Link($Action['URL']);
-      if($this->User->CheckPermission('System', 'Read', 'Item', $Id))
+      if(!defined('NEW_PERMISSION') or $this->User->CheckPermission('System', 'Read', 'Item', $Id))
         $Output .= '<img alt="'.$Action['Title'].'" src="'.$this->Link('/images/favicons/'.$Action['Icon']).
         '" width="16" height="16" /> <a href="'.$Action['URL'].'">'.$Action['Title'].'</a>';

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 597; // Subversion revision
+$Revision = 599; // Subversion revision
 $DatabaseRevision = 597; // SQL structure revision
-$ReleaseTime = '2013-11-20';
+$ReleaseTime = '2013-12-06';

trunk/Common/Global.php

@@ -17 +17 @@
 include_once(dirname(__FILE__).'/Setup/Setup.php');
 
+//define('NEW_PERMISSION', '1');
+
 $MonthNames = array('', 'Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 
         'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec');

trunk/Modules/IS/IS.php

@@ -74 +74 @@
   {
     $Output = '';
-    if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
+    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
       return('Nemáte oprávnění');
     if(array_key_exists('o', $_GET))
@@ -124 +124 @@
   {
     $Output = '';
-    if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
+    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
       return('Nemáte oprávnění');
     $this->Database->delete($Table, 'Id='.$Id);
@@ -135 +135 @@
   {
     $Output = '';
-    if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
+    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
       return('Nemáte oprávnění');
     if(array_key_exists('o', $_GET))
@@ -187 +187 @@
     if($Table != '') $FormClass = $this->System->FormManager->Classes[$Table];
       else return($this->SystemMessage('Chyba', 'Tabulka nenalezena'));
-    if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
+    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
       return('Nemáte oprávnění');
     
@@ -390 +390 @@
   function ShowSelect($Table, $Filter = '', $Title = '')
   { 
-    if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
+    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
       return('Nemáte oprávnění');
     $this->BasicHTML = true;
@@ -403 +403 @@
   function ShowMapSelect($Table, $Filter = '', $Title = '')
   {
-    if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
+    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
       return('Nemáte oprávnění');
     $MapApi = new MapApiGoogle($this->System);
@@ -418 +418 @@
   function ShowList($Table, $Filter = '', $Title = '', $ExcludeColumn = '')  
   {
-    if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
+    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
       return('Nemáte oprávnění');
     $RowActions = '<a href="?a=view&amp;t='.$Table.'&amp;i=#RowId"><img alt="Ukázat" title="Ukázat" src="'.
@@ -486 +486 @@
       if($MenuItem['IconName'] != '') $Image = '<img src="'.$this->System->Link('/images/favicons/'.$MenuItem['IconName']).'"/>&nbsp;';
         else $Image = '<img src="'.$this->System->Link('/images/favicons/blank.png').'"/>&nbsp;';
-      if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))       
+      //if($this->System->User->CheckPermission($this->TableToModule($Table), 'Write') or !defined('NEW_PERMISSION'))       
         $Output .= '<li>'.$Image.$LinkTitle.'</li>';
       $Output .= $this->ShowMenuItem($MenuItem['Id']);

trunk/Modules/Portal/Portal.php

@@ -108 +108 @@
     while($Action = $DbResult->fetch_assoc())
     {
-        $Output .= $this->System->ShowAction($Action['Id']);
+        $Output .= $this->System->ShowAction($Action['Id']).'<br/>';
     }
     return($this->Panel($ActionGroup['Name'], $Output));