Changeset 833

Timestamp:

Jul 3, 2016, 1:41:25 PM (8 years ago)

Author:

chronos

Message:

• Modified: Show users list, device list and map only for network managers.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Finance/Manage.php (modified) (2 diffs)
• Modules/Map/Map.php (modified) (2 diffs)
• Modules/Network/HostList.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/User/UserList.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 831; // Subversion revision
+$Revision = 833; // Subversion revision
 $DatabaseRevision = 831; // SQL structure revision
-$ReleaseTime = strtotime('2016-05-01');
+$ReleaseTime = strtotime('2016-07-03');

trunk/Modules/Finance/Manage.php

@@ -52 +52 @@
     $MonthFrom = floor(($MonthCurrent - 1) / $MonthCount) * $MonthCount + 1;
     $MonthTo = $MonthFrom + $MonthCount - 1;
-    
+
     /* Use period from current month to end month so months before current month are cut out */
     $MonthCount = $MonthTo - $MonthCurrent + 1;
@@ -365 +365 @@
       $Content = 'Vyúčtovaní zákazníka <strong>'.$Subject['Name'].'</strong> zastoupeného uživatelem <strong>'.
         $User['Name'].'</strong> ke dni <strong>'.$this->System->HumanDate(time()).'</strong>.<br/><br/>'."\n".
-        'Váše aktuální služby: ';
+        'Vaše aktuální služby: ';
       $DbResult = $this->Database->query('SELECT GROUP_CONCAT(`Service`.`Name`) AS `Name` FROM `ServiceCustomerRel` LEFT JOIN `Service` '.
         'ON `Service`.`Id`=`ServiceCustomerRel`.`Service` WHERE (`ServiceCustomerRel`.`Customer`='.$Member['Id'].') '.

trunk/Modules/Map/Map.php

@@ -13 +13 @@
   function Show()
   {
+    if(!$this->System->User->CheckPermission('Map', 'Show'))
+      return('Nemáte oprávnění');
+
     if(count($this->System->PathItems) > 1)
     {
@@ -224 +227 @@
         array('Caption' => 'Ukázat na mapě', 'URL' => '/map/show-position?i=#RowId'),
       ),
+      'Actions' => array(
+        array('Caption' => 'Ukázat mapu', 'URL' => '/map/'),
+      ),
     ));
     $this->System->FormManager->RegisterFormType('TMapPosition', array(

trunk/Modules/Network/HostList.php

@@ -11 +11 @@
   function Show()
   {
+    if(!$this->System->User->CheckPermission('Network', 'ShowHostList'))
+      return('Nemáte oprávnění');
+
     if(array_key_exists('admin', $_GET)) $Where = 'AND NetworkDevice.Type IN (1,4,5) ';
       else $Where = '';

trunk/Modules/Network/Network.php

@@ -90 +90 @@
   function ShowInformation()
   {
+    if(!$this->System->User->CheckPermission('Network', 'ShowInfo'))
+      return('Nemáte oprávnění');
+
     $Output = '<a href="'.$this->System->Link('/network/frequency-plan/').'">Frekvenční plán</a><br />';
     $Output .= '<a href="'.$this->System->Link('/network/subnet/').'">Výpis registrovaných podsítí</a><br />';

trunk/Modules/User/UserList.php

@@ -9 +9 @@
   function Show()
   {
+    if(!$this->System->User->CheckPermission('User', 'ShowList'))
+      return('Nemáte oprávnění');
+
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `User`');
     $DbRow = $DbResult->fetch_row();