Changeset 874 for trunk/Modules

Timestamp:

Apr 6, 2020, 11:56:19 PM (5 years ago)

Author:

chronos

Message:

• Modified: Do not use parenthesis around returned value.

Location:

trunk/Modules

Files:

• API/API.php (modified) (3 diffs)
• Chat/Chat.php (modified) (3 diffs)
• Customer/Customer.php (modified) (1 diff)
• EmailQueue/EmailQueue.php (modified) (2 diffs)
• File/File.php (modified) (4 diffs)
• Finance/Bill.php (modified) (5 diffs)
• Finance/Finance.php (modified) (14 diffs)
• Finance/Import.php (modified) (4 diffs)
• Finance/Manage.php (modified) (10 diffs)
• Finance/Trade.php (modified) (4 diffs)
• Finance/UserState.php (modified) (6 diffs)
• FinanceBankAPI/FileImport.php (modified) (7 diffs)
• FinanceBankAPI/FinanceBankAPI.php (modified) (3 diffs)
• FinanceBankAPI/Fio.php (modified) (1 diff)
• FinanceBankAPI/FioAPI.php (modified) (2 diffs)
• FinanceBankAPI/GPC.php (modified) (1 diff)
• FinanceBankAPI/ImportFio.php (modified) (1 diff)
• Log/Log.php (modified) (1 diff)
• Map/Map.php (modified) (4 diffs)
• Map/MapAPI.php (modified) (2 diffs)
• Meals/Meals.php (modified) (5 diffs)
• Meteostation/Meteostation.php (modified) (1 diff)
• Network/HostList.php (modified) (2 diffs)
• Network/Hosting.php (modified) (1 diff)
• Network/Network.php (modified) (5 diffs)
• Network/Subnet.php (modified) (1 diff)
• Network/UserHosts.php (modified) (2 diffs)
• NetworkConfig/NetworkConfig.php (modified) (1 diff)
• NetworkConfigAirOS/Generators/SSHClient.php (modified) (1 diff)
• NetworkConfigLinux/Generators/CheckPorts.php (modified) (1 diff)
• NetworkConfigRouterOS/Generators/AddressPortability.php (modified) (1 diff)
• NetworkConfigRouterOS/Generators/Common.php (modified) (2 diffs)
• NetworkConfigRouterOS/Generators/Signal.php (modified) (1 diff)
• NetworkConfigRouterOS/NetworkConfigRouterOS.php (modified) (3 diffs)
• NetworkConfigRouterOS/Routerboard.php (modified) (6 diffs)
• NetworkConfigRouterOS/Routerboard2.php (modified) (3 diffs)
• NetworkConfigRouterOS/RouterboardAPI.php (modified) (3 diffs)
• NetworkConfigRouterOS/SSH.php (modified) (1 diff)
• NetworkShare/SharePage.php (modified) (4 diffs)
• NetworkShare/browse.php (modified) (1 diff)
• NetworkShare/playlist.php (modified) (2 diffs)
• NetworkTopology/NetworkTopology.php (modified) (3 diffs)
• NetworkTopology/topologie-img.php (modified) (2 diffs)
• NetworkTopology/topologie2.php (modified) (1 diff)
• News/News.php (modified) (5 diffs)
• News/NewsPage.php (modified) (13 diffs)
• Notify/Notify.php (modified) (2 diffs)
• OpeningHours/OpeningHours.php (modified) (6 diffs)
• Portal/Portal.php (modified) (10 diffs)
• RSS/RSS.php (modified) (2 diffs)
• Scheduler/Scheduler.php (modified) (1 diff)
• Search/Search.php (modified) (1 diff)
• SpeedTest/SpeedTest.php (modified) (2 diffs)
• Stock/Stock.php (modified) (1 diff)
• Subject/Subject.php (modified) (1 diff)
• System/System.php (modified) (4 diffs)
• TV/TV.php (modified) (2 diffs)
• TV/tkr.php (modified) (1 diff)
• TimeMeasure/Graph.php (modified) (1 diff)
• TimeMeasure/Main.php (modified) (5 diffs)
• TimeMeasure/Measure.php (modified) (9 diffs)
• TimeMeasure/Measurement/System.php (modified) (11 diffs)
• TimeMeasure/Measurement/WoW.php (modified) (7 diffs)
• User/User.php (modified) (1 diff)
• User/UserList.php (modified) (2 diffs)
• User/UserModel.php (modified) (14 diffs)
• User/UserPage.php (modified) (5 diffs)
• WebCam/WebCam.php (modified) (2 diffs)
• Wiki/Wiki.php (modified) (6 diffs)

trunk/Modules/API/API.php

@@ -72 +72 @@
       else $Output = 'Unsupported action';
 
-    return ($Output);
+    return $Output;
   }
 
@@ -79 +79 @@
     if (($Table != '') and (array_key_exists($Table, $this->System->FormManager->Classes)))
       $FormClass = $this->System->FormManager->Classes[$Table];
-      else return ('Table not found');
+      else return 'Table not found';
 
     if (array_key_exists('SQL', $FormClass))
@@ -102 +102 @@
       else if ($this->DataFormat == 'json') $Output = json_encode($Result);
       else die('Unknown data format '.$this->DataFormat);
-    return ($Output);
+    return $Output;
   }
 

trunk/Modules/Chat/Chat.php

@@ -14 +14 @@
   {
     $Num = dechex($Num);
-    return (substr($Num, 4, 2).substr($Num, 2, 2).substr($Num, 0, 2));
+    return substr($Num, 4, 2).substr($Num, 2, 2).substr($Num, 0, 2);
   }
 
@@ -21 +21 @@
     global $MonthNames;
 
-    if (!$this->System->User->CheckPermission('Chat', 'Display')) return ('Nemáte oprávnění');
+    if (!$this->System->User->CheckPermission('Chat', 'Display')) return 'Nemáte oprávnění';
 
     if (array_key_exists('date', $_GET)) $Date = $_GET['date'];
@@ -81 +81 @@
     else $Output .= 'V daném dni nebyly zaznamenány žádné zprávy.';
     $Output .= '</div>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Customer/Customer.php

@@ -201 +201 @@
     $Output .= ' platících:'.$DbRow['0'].'<br/>';
 
-    return ($Output);
+    return $Output;
   }
 

trunk/Modules/EmailQueue/EmailQueue.php

@@ -11 +11 @@
     $Output = $this->System->ModuleManager->Modules['EmailQueue']->Process();
     $Output = $this->SystemMessage('Zpracování fronty emailů', 'Nové emaily byly odeslány').$Output;
-    return ($Output);
+    return $Output;
   }
 }
@@ -106 +106 @@
       $Output .= 'To: '.$DbRow['To'].'  Subject: '.$DbRow['Subject'].'<br />';
     }
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/File/File.php

@@ -38 +38 @@
       }
     }
-    return ($Result);
+    return $Result;
   }
 
@@ -46 +46 @@
 
     $Result = $MimeTypes[pathinfo($FileName, PATHINFO_EXTENSION)][0];
-    return ($Result);
+    return $Result;
   }
 
@@ -74 +74 @@
       else $Result = $this->FilesDir;
     $Result .= $DbRow['Name'].'/';
-    return ($Result);
+    return $Result;
   }
 }
@@ -85 +85 @@
     if (array_key_exists('id', $_GET)) $Id = $_GET['id'];
     else if (array_key_exists('i', $_GET)) $Id = $_GET['i'];
-    else return ($this->SystemMessage('Chyba', 'Nezadáno id souboru'));
+    else return $this->SystemMessage('Chyba', 'Nezadáno id souboru');
     $this->ClearPage = true;
     $Output = $this->System->Modules['File']->Download($Id);
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Finance/Bill.php

@@ -8 +8 @@
   function GenerateHTML()
   {
-    return ('');
+    return '';
   }
 
@@ -29 +29 @@
     $Output = shell_exec('echo "'.addslashes($Encoding->FromUTF8($HtmlCode)).
       '"|htmldoc --no-numbered --webpage --no-embedfonts --charset 8859-2 -t pdf -');
-    return ($Output);
+    return $Output;
   }
 }
@@ -47 +47 @@
     if ($Subject['Account'] != '') $Output .= 'Účet: '.$Subject['Account'].'<br>';
     if ($Subject['PayVAT'] != '') $Output .= 'Plátce DPH: '.$BooleanText[$Subject['PayVAT']].'<br>';
-    return ($Output);
+    return $Output;
   }
 
@@ -146 +146 @@
       '</table>';
 
-    return ($Output);
+    return $Output;
   }
 }
@@ -215 +215 @@
       '<tr><td>&nbsp;</td><td><br><br>'.$Desc['Signature'].':</td></tr>';
     $Output .= '</table>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Finance/Finance.php

@@ -80 +80 @@
   function W2Kc($Spotreba)
   {
-    return (round($Spotreba * 0.72 * $this->kWh));
+    return round($Spotreba * 0.72 * $this->kWh);
   }
 
@@ -138 +138 @@
     $this->Database->query('UPDATE `DocumentLineSequence` SET `NextNumber` = `NextNumber` + 1 '.
       'WHERE (`DocumentLine`='.$Id.') AND (`FinanceYear`='.$FinanceYear['Id'].')');
-    return ($Result);
+    return $Result;
   }
 
@@ -153 +153 @@
     if ($DbResult->num_rows == 1) {
       $Group = $DbResult->fetch_assoc();
-      return ($Group);
+      return $Group;
     } else die('Finance group id '.$Id.' not found in table '.$Table);
   }
@@ -204 +204 @@
     }
     $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'RecalculateMemberPayment');
-    return ($Output);
+    return $Output;
   }
 
@@ -214 +214 @@
       TimeToMysqlDate($Time).'") OR (ValidTo IS NULL)) LIMIT 1');
     $Row = $DbResult->fetch_array();
-    return ($Row[0]);
+    return $Row[0];
   }
 }
@@ -669 +669 @@
     $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($Form->Values['Group'], 'FinanceOperationGroup');
     $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($FinanceGroup['DocumentLine'], $Year);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -677 +677 @@
     $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
       ($Form->Values['ValueUser'] * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -685 +685 @@
     $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
       ($Form->Values['ValueUser'] * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -695 +695 @@
     $Group = $this->System->Modules['Finance']->GetFinanceGroupById($Form->Values['Group'], 'FinanceInvoiceGroup');
     $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -707 +707 @@
     $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
       ($Sum * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -718 +718 @@
     $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
       ($Sum * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -727 +727 @@
     $ParentForm->LoadValuesFromDatabase($Form->Values['FinanceInvoice']);
     $this->AfterInsertFinanceInvoice($ParentForm, $Form->Values['FinanceInvoice']);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -736 +736 @@
     $ParentForm->LoadValuesFromDatabase($Form->Values['FinanceInvoice']);
     $this->BeforeModifyFinanceInvoice($ParentForm, $Form->Values['FinanceInvoice']);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -744 +744 @@
       else $Year = date("Y", $Form->Values['ValidFrom']);
     $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($Form->Values['DocumentLine'], $Year);
-    return ($Form->Values);
+    return $Form->Values;
   }
 }

trunk/Modules/Finance/Import.php

@@ -9 +9 @@
   function Show()
   {
-    if (!$this->System->User->CheckPermission('Finance', 'SubjectList')) return ('Nemáte oprávnění');
+    if (!$this->System->User->CheckPermission('Finance', 'SubjectList')) return 'Nemáte oprávnění';
     if (array_key_exists('Operation', $_GET))
     {
-      if ($_GET['Operation'] == 'prepare') return ($this->Prepare());
-      else if ($_GET['Operation'] == 'insert') return ($this->Insert());
+      if ($_GET['Operation'] == 'prepare') return $this->Prepare();
+      else if ($_GET['Operation'] == 'insert') return $this->Insert();
       else echo('Neplatná akce');
     } else
@@ -22 +22 @@
       $Output .= '<input type="submit" value="Analyzovat"/>';
       $Output .= '</form>';
-      return ($Output);
+      return $Output;
     }
   }
@@ -121 +121 @@
       $Output .= '<input type="submit" value="Zpracovat"/></form>';
     }
-    return ($Output);
+    return $Output;
   }
 
@@ -156 +156 @@
       $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');
     }
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Finance/Manage.php

@@ -11 +11 @@
     $Output = '';
     if (!$this->System->User->CheckPermission('Finance', 'Manage'))
-      return ('Nemáte oprávnění');
+      return 'Nemáte oprávnění';
 
     if (array_key_exists('Operation', $_GET)) $Operation = $_GET['Operation'];
@@ -42 +42 @@
         $Output .= '<a href="'.$this->System->Link('/finance/import/').'">Import plateb</a><br />';
     }
-    return ($Output);
+    return $Output;
   }
 
@@ -52 +52 @@
 
     $MonthCount = $this->System->Modules['Finance']->BillingPeriods[$Period]['MonthCount'];
-    if ($MonthCount <= 0) return (array('From' => NULL, 'To' => NULL, 'MonthCount' => 0));
+    if ($MonthCount <= 0) return array('From' => NULL, 'To' => NULL, 'MonthCount' => 0);
     $MonthCurrent = date('n', $Time);
 
@@ -67 +67 @@
     $PeriodTo = mktime(0, 0, 0, $MonthTo, date('t', mktime(0, 0, 0, $MonthTo, 1, $Year)), $Year);
 
-    return (array('From' => $PeriodFrom, 'To' => $PeriodTo, 'MonthCount' => $MonthCount));
+    return array('From' => $PeriodFrom, 'To' => $PeriodTo, 'MonthCount' => $MonthCount);
   }
 
   function ShowMonthlyPayment()
   {
-    if (!$this->System->User->CheckPermission('Finance', 'Manage')) return ('Nemáte oprávnění');
+    if (!$this->System->User->CheckPermission('Finance', 'Manage')) return 'Nemáte oprávnění';
     $SQL = 'SELECT `Member`.*, `MemberPayment`.`MonthlyTotal` AS `Monthly`, '.
       '`MemberPayment`.`Cash` AS `Cash`, '.
@@ -120 +120 @@
     $Output .= $PageList['Output'];
     $Output .= '<a href="?Operation=ProcessMonthlyPayment">Generovat faktury</a>';
-    return ($Output);
+    return $Output;
   }
 
@@ -149 +149 @@
     //$LastInsertTime = $Time;
     //$this->CheckAdvancesAndLiabilities($Subject);
-    return ($InvoiceId);
+    return $InvoiceId;
   }
 
@@ -217 +217 @@
       $Output .= "\n";
     }
-    return ($Output);
+    return $Output;
   }
 
@@ -270 +270 @@
     $this->TableUpdateChanges('ServiceCustomerRel');
 
-    return ($Output);
+    return $Output;
   }
 
   function ProcessMonthlyPayment()
   {
-    if (!$this->System->User->CheckPermission('Finance', 'Manage')) return ('Nemáte oprávnění');
+    if (!$this->System->User->CheckPermission('Finance', 'Manage')) return 'Nemáte oprávnění';
     $Output = '';
 
@@ -335 +335 @@
     }
     $Output = str_replace("\n", '<br/>', $Output);
-    return ($Output);
+    return $Output;
   }
 
@@ -478 +478 @@
     $Output .= $this->GenerateInvoice(' AND (`File` IS NULL)');
     $Output .= $this->GenerateOperation(' AND (`File` IS NULL)');
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Finance/Trade.php

@@ -65 +65 @@
     $Row = $DbResult->fetch_array();
     $Balance['SmallAssets']['End'] = $Row[0] + 0;
-    return ($Balance);
+    return $Balance;
   }
 
@@ -427 +427 @@
   {
     if (!$this->System->User->CheckPermission('Finance', 'TradingStatus'))
-      return ('Nemáte oprávnění');
+      return 'Nemáte oprávnění';
 
     $Finance = &$this->System->Modules['Finance'];
@@ -478 +478 @@
         $Output = $this->ShowDefault();
     }
-    return ($Output);
+    return $Output;
   }
 
@@ -488 +488 @@
       $Output .= '<a href="?year='.$DbRow['Id'].'">'.$DbRow['Year'].'</a> ';
     $Output .= '<br/>';
-    return ($Output);
+    return $Output;
   }
 

trunk/Modules/Finance/UserState.php

@@ -66 +66 @@
     $Output .= '</table>';
     $Output .= $PageList['Output'];
-    return ($Output);
+    return $Output;
   }
 
@@ -77 +77 @@
     if (array_key_exists('i', $_GET))
     {
-      if (!$this->System->User->CheckPermission('Finance', 'Manage')) return ('Nemáte oprávnění');
+      if (!$this->System->User->CheckPermission('Finance', 'Manage')) return 'Nemáte oprávnění';
       $CustomerId = $_GET['i'];
     } else
     {
-      if (!$this->System->User->CheckPermission('Finance', 'DisplaySubjectState')) return ('Nemáte oprávnění');
+      if (!$this->System->User->CheckPermission('Finance', 'DisplaySubjectState')) return 'Nemáte oprávnění';
       $UserId = $this->System->User->User['Id'];
       $DbResult = $this->Database->query('SELECT `Customer` FROM `UserCustomerRel` WHERE `User`='.$UserId.' LIMIT 1');
@@ -88 +88 @@
         $CustomerUserRel = $DbResult->fetch_assoc();
         $CustomerId = $CustomerUserRel['Customer'];
-      } else return ($this->SystemMessage('Chyba', 'Nejste zákazníkem'));
+      } else return $this->SystemMessage('Chyba', 'Nejste zákazníkem');
     }
 
@@ -96 +96 @@
     {
       $Customer = $DbResult->fetch_assoc();
-    } else return ($this->SystemMessage('Položka nenalezena', 'Zákazník nenalezen'));
+    } else return $this->SystemMessage('Položka nenalezena', 'Zákazník nenalezen');
 
 
@@ -104 +104 @@
     {
       $Subject = $DbResult->fetch_assoc();
-    } else return ($this->SystemMessage('Položka nenalezena', 'Subjekt nenalezen'));
+    } else return $this->SystemMessage('Položka nenalezena', 'Subjekt nenalezen');
 
 
@@ -152 +152 @@
 
     $Output .= '</td></tr></table>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -89 +89 @@
       $Import->PairOperations();
     }
-    return ($Output);
+    return $Output;
   }
 
@@ -95 +95 @@
   {
     if (!$this->System->User->CheckPermission('Finance', 'SubjectList'))
-      return ('Nemáte oprávnění');
+      return 'Nemáte oprávnění';
 
     $Output = $this->Import($_GET['i']);
-    return ($Output);
+    return $Output;
   }
 }
@@ -111 +111 @@
   {
     $Output = '';
-    if (!$this->System->User->CheckPermission('Finance', 'SubjectList')) return ('Nemáte oprávnění');
+    if (!$this->System->User->CheckPermission('Finance', 'SubjectList')) return 'Nemáte oprávnění';
     if (array_key_exists('Operation', $_GET))
     {
@@ -118 +118 @@
       else $Output .= 'Neplatná akce';
     } else $Output .= $this->ShowForm();
-    return ($Output);
+    return $Output;
   }
 
@@ -128 +128 @@
     $Form->Values['BankAccount'] = $_GET['id'];
     $Output = $Form->ShowEditForm();
-    return ($Output);
+    return $Output;
   }
 
@@ -153 +153 @@
     $Output .= $Import->ImportFile($File->GetContent(), $File->GetExt());
 
-    return ($Output);
+    return $Output;
   }
 
@@ -187 +187 @@
       $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');
     }
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

@@ -76 +76 @@
     $DbRow = $DbResult->fetch_row();
     $Output = 'Nezpárovaných plateb: '.$DbRow['0'].'<br/>';
-    return ($Output);
+    return $Output;
   }
 
@@ -94 +94 @@
       'presetBankAccount' => $Item['BankAccount'],
       'presetGroup' => $FinanceGroup['Id']);
-    return ($Preset);
+    return $Preset;
   }
 }
@@ -112 +112 @@
       $Output .= $Page->Import($DbRow['Id']);
     }
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/FinanceBankAPI/Fio.php

@@ -55 +55 @@
         if ($GPCLine != NULL) $Result[] = $GPCLine;
       }
-      return ($Result);
+      return $Result;
     }
   }

trunk/Modules/FinanceBankAPI/FioAPI.php

@@ -7 +7 @@
 function RemoveComma($Text)
 {
-  if ((mb_strlen($Text) >= 2) and ($Text[0] == '"') and (mb_substr($Text, -1, 1) == '"')) return (mb_substr($Text, 1, -1));
-    else return ($Text);
+  if ((mb_strlen($Text) >= 2) and ($Text[0] == '"') and (mb_substr($Text, -1, 1) == '"')) return mb_substr($Text, 1, -1);
+    else return $Text;
 }
 
@@ -97 +97 @@
         }
       }
-      return ($Result);
+      return $Result;
     }
   }

trunk/Modules/FinanceBankAPI/GPC.php

@@ -53 +53 @@
     $GPCLine = NULL;
 
-    return ($GPCLine);
+    return $GPCLine;
   }
 }

trunk/Modules/FinanceBankAPI/ImportFio.php

@@ -44 +44 @@
     $this->Database->update('FinanceBankAccount', 'Id='.$this->BankAccount['Id'],
       array('LastImportDate' => TimeToMysqlDate($PeriodEnd)));
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Log/Log.php

@@ -96 +96 @@
     $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail'];
     $RSS->Items = $Items;
-    return ($RSS->Generate());
+    return $RSS->Generate();
   }
 }

trunk/Modules/Map/Map.php

@@ -14 +14 @@
   {
     if (!$this->System->User->CheckPermission('Map', 'Show'))
-      return ('Nemáte oprávnění');
+      return 'Nemáte oprávnění';
 
     if (count($this->System->PathItems) > 1)
     {
-      if ($this->System->PathItems[1] == 'show-position') return ($this->ShowPosition());
-      else return (PAGE_NOT_FOUND);
-    } else return ($this->ShowMain());
+      if ($this->System->PathItems[1] == 'show-position') return $this->ShowPosition();
+      else return PAGE_NOT_FOUND;
+    } else return $this->ShowMain();
   }
 
@@ -40 +40 @@
       $MapApi->Markers[] = $Marker;
       $Output = $MapApi->ShowPage($this);
-      return ($Output);
-    } else return ('Položka nenalezena');
+      return $Output;
+    } else return 'Položka nenalezena';
   }
 
@@ -236 +236 @@
                 </table>';
     */
-    return ($Output);
+    return $Output;
   }
 }
@@ -249 +249 @@
         'onclick="return popupwindow(&quot;'.$this->FormManager->Root.'/is/?a=mapselect&amp;r='.
         $Item['Name'].'&quot;,&quot;test&quot;);" style="cursor:hand;cursor:pointer"/>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Map/MapAPI.php

@@ -37 +37 @@
   function Show()
   {
-    return ('');
+    return '';
   }
 }
@@ -102 +102 @@
     </script>';
     $Output .= '<div id="map_canvas" style="width: 100%; height: 98%;"></div>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Meals/Meals.php

@@ -15 +15 @@
     if (count($this->System->PathItems) > 1)
     {
-      if ($this->System->PathItems[1] == 'tisk') return ($this->ShowPrint());
-        else if ($this->System->PathItems[1] == 'menuedit.php') return ($this->ShowEdit());
-        else return (PAGE_NOT_FOUND);
-    } else return ($this->ShowMenu());
+      if ($this->System->PathItems[1] == 'tisk') return $this->ShowPrint();
+        else if ($this->System->PathItems[1] == 'menuedit.php') return $this->ShowEdit();
+        else return PAGE_NOT_FOUND;
+    } else return $this->ShowMenu();
   }
 
@@ -40 +40 @@
     $Output .= 'Cena jednoho menu: '.$Row['Price'].' Kč<br />';
     $Output .= $Row['Info'];
-    return ($Output);
+    return $Output;
   }
 
@@ -91 +91 @@
 
     $Output .= '</body></html>';
-    return ($Output);
+    return $Output;
   }
 
@@ -117 +117 @@
     $Output .= '</select></td></tr>';
     $LastWeekOfYear = $WeekOfYear;
-    return ($Output);
+    return $Output;
   }
 
@@ -173 +173 @@
 '<div align="center"><input type="submit" value="Uložit údaje"></div>
 </fieldset></form>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Meteostation/Meteostation.php

@@ -11 +11 @@
     $Output = 'Stav meteostanice:<br/>';
     $Output .= '<img src="'.$this->System->Link('/Modules/Meteostation/cache/1.png').'" alt="stav meteostanice"/>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Network/HostList.php

@@ -12 +12 @@
   {
     if (!$this->System->User->CheckPermission('Network', 'ShowHostList'))
-      return ('Nemáte oprávnění');
+      return 'Nemáte oprávnění';
 
     if (array_key_exists('admin', $_GET)) $Where = 'AND NetworkDevice.Type IN (1,4,5) ';
@@ -52 +52 @@
     }
     $Output .= '</table></div>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Network/Hosting.php

@@ -16 +16 @@
     }
     $Output .= '</table>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Network/Network.php

@@ -69 +69 @@
     }
     $Output .= '</table>';
-    return ($Output);
+    return $Output;
   }
 }
@@ -85 +85 @@
       $Output = $this->PageNotFound();
     } else $Output = $this->ShowInformation();
-    return ($Output);
+    return $Output;
   }
 
@@ -91 +91 @@
   {
     if (!$this->System->User->CheckPermission('Network', 'ShowInfo'))
-      return ('Nemáte oprávnění');
+      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 />';
     $Output .= '<a href="'.$this->System->Link('/network/hosts/').'">Registrované zařízení</a><br />';
-    return ($Output);
+    return $Output;
   }
 }
@@ -895 +895 @@
     $Output .= $StillOffline['Report'];
     $Offline = $this->OnlineList('Offline', 0, -1, 0);
-    return (array('Report' => $Output, 'Count' => $Offline['Count'], 'ShortTitle' => 'Odezva'));
+    return array('Report' => $Output, 'Count' => $Offline['Count'], 'ShortTitle' => 'Odezva');
   }
 
@@ -947 +947 @@
     $Output .= $StillOffline['Report'];
     $Offline = $this->PortCheckList('Offline', 0, -1, 0);
-    return (array('Report' => $Output, 'Count' => $Offline['Count'], 'ShortTitle' => 'Port'));
+    return array('Report' => $Output, 'Count' => $Offline['Count'], 'ShortTitle' => 'Port');
   }
 }

trunk/Modules/Network/Subnet.php

@@ -54 +54 @@
     $Output .= '</table>';
     $Output .= $PageList['Output'];
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Network/UserHosts.php

@@ -15 +15 @@
     global $Config;
 
-    if ($this->System->User->User['Id'] == '') return ($this->SystemMessage('Nepovolený přístup', 'Nemáte oprávnění pro tuto operaci'));
+    if ($this->System->User->User['Id'] == '') return $this->SystemMessage('Nepovolený přístup', 'Nemáte oprávnění pro tuto operaci');
     $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>Fyzická adresa</th><th>Typ</th><th>Naposledy online</th></tr>';
@@ -39 +39 @@
     }
     $Output .= '</table></div>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/NetworkConfig/NetworkConfig.php

@@ -90 +90 @@
       } else $Output = 'Config item '.$ConfigItemName.' not found';
     } else $Output = 'Not enough parameters';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/NetworkConfigAirOS/Generators/SSHClient.php

@@ -39 +39 @@
     } else $Output = '';
     if ($this->Debug) print_r($Output);
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/NetworkConfigLinux/Generators/CheckPorts.php

@@ -15 +15 @@
       $State = 1;
     }
-    return ($State);
+    return $State;
   }
   

trunk/Modules/NetworkConfigRouterOS/Generators/AddressPortability.php

@@ -11 +11 @@
 {
   $TimeParts = explode(':', $Time);
-  return ($TimeParts[0] * 3600 + $TimeParts[1] * 60 + $TimeParts[2]);
+  return $TimeParts[0] * 3600 + $TimeParts[1] * 60 + $TimeParts[2];
 }
 

trunk/Modules/NetworkConfigRouterOS/Generators/Common.php

@@ -9 +9 @@
   {
     $DbRow = $DbResult->fetch_assoc();
-    return ($DbRow['Id']);
+    return $DbRow['Id'];
   } else
   {
     $DbResult = $Database->query('INSERT INTO `NetworkMark` (`Comment`) VALUES ("'.$Comment.'")');
-    return ($Database->insert_id);
+    return $Database->insert_id;
   }
 }
@@ -25 +25 @@
   {
     $DbRow = $DbResult->fetch_assoc();
-    return ($DbRow['Id']);
+    return $DbRow['Id'];
   } else
   {
     $DbResult = $Database->query('INSERT INTO `NetworkMangleSubgroup` (`AddressRange`) VALUES ("'.$AddressRange.'")');
-    return ($Database->insert_id);
+    return $Database->insert_id;
   }
 }

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -74 +74 @@
     if (substr($Value, -3, 3) == "Mbp") $Value = substr($Value, 0, -3); // without Mbp unit    
     if (substr($Value, -1, 1) == "M") $Value = substr($Value, 0, -1); // without M unit
-    return ($Value);
+    return $Value;
   }
 

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -72 +72 @@
     if (IsInternetAddr($IPAddress)) {
       $Output .= '<p>Internet zdarma je dostupný pouze z vnitřní sítě.</p>';
-      return ($Output);
+      return $Output;
     }
     $Time = time();
@@ -111 +111 @@
       else $Output .= '<a href="?a=activate">Aktivovat</a>';
 
-    return ($Output);
+    return $Output;
   }
 }
@@ -135 +135 @@
     $Routerboard->ExecuteBatch(implode(';', $Commands));
 
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/NetworkConfigRouterOS/Routerboard.php

@@ -41 +41 @@
     } else
       $Output = array_merge($Output, $this->ExecuteBatch($Commands));
-    return ($Output);
+    return $Output;
   }
 
@@ -62 +62 @@
     } else $Output = '';
     if ($this->Debug) print_r($Output);
-    return ($Output);
+    return $Output;
   }
 
@@ -79 +79 @@
       } else $List[substr($ResultLineParts[0], 0, -1)] = '';
     }
-    return ($List);
+    return $List;
   }
 
@@ -113 +113 @@
       $List[] = $ListItem;
     }
-    return ($List);
+    return $List;
   }
 
@@ -148 +148 @@
       if (count($ListItem) > 0) $List[] = $ListItem;
     }
-    return ($List);
+    return $List;
   }
 
@@ -244 +244 @@
     }
     if ($this->Debug) print_r($Commands);
-    return ($this->Execute($Commands));
+    return $this->Execute($Commands);
   }
 }

trunk/Modules/NetworkConfigRouterOS/Routerboard2.php

@@ -14 +14 @@
   {
     if (is_array($Commands)) $Commands = implode(';', $Commands);
-    return (parent::Execute($Commands));
+    return parent::Execute($Commands);
   }
 
@@ -28 +28 @@
       $List[substr($ResultLineParts[0], 0, -1)] = $ResultLineParts[1];
     }
-    return ($List);
+    return $List;
   }
 
@@ -52 +52 @@
       $List[] = $ListItem;
     }
-    return ($List);
+    return $List;
   }
 
   function GetSystemResource()
   {
-    return ($this->GetItem('/system resource print'));
+    return $this->GetItem('/system resource print');
   }
 
   function GetFirewallFilterList()
   {
-    return ($this->GetList('/ip firewall nat', array('src-address', 'dst-address', 'bytes')));
+    return $this->GetList('/ip firewall nat', array('src-address', 'dst-address', 'bytes'));
   }
 
   function GetDHCPServerLeasesList()
   {
-    return ($this->GetList('/ip dhcp-server lease', array('address', 'active-address', 'comment', 'lease-time', 'status', 'host-name')));
+    return $this->GetList('/ip dhcp-server lease', array('address', 'active-address', 'comment', 'lease-time', 'status', 'host-name'));
   }
 }

trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

@@ -40 +40 @@
     } else if ($Length >= 0x10000000)
       $Length = chr(0xF0).chr(($Length >> 24) & 0xFF).chr(($Length >> 16) & 0xFF).chr(($Length >> 8) & 0xFF).chr($Length & 0xFF);
-    return ($Length);
+    return $Length;
   }
 
@@ -71 +71 @@
       sleep($this->Delay);
     }
-    return ($this->Connected);
+    return $this->Connected;
   }
 
@@ -234 +234 @@
       $this->Write($el, $Last);
     }
-    return ($this->Read());
+    return $this->Read();
   }
 }

trunk/Modules/NetworkConfigRouterOS/SSH.php

@@ -54 +54 @@
     }
     echo($Response);
-    return (explode("\n", substr($Response, 0, -1)));
+    return explode("\n", substr($Response, 0, -1));
   }
 }

trunk/Modules/NetworkShare/SharePage.php

@@ -22 +22 @@
   function ShowTime()
   {
-    return (date("H:i:s")."<br />\n");
+    return date("H:i:s")."<br />\n";
   }
 
@@ -51 +51 @@
     }
     if ($i >= $this->MaxNesting) $Cesta = '?'.'\\'.$Cesta;
-    return ('\\\\'.$Cesta);
+    return '\\\\'.$Cesta;
   }
 
@@ -63 +63 @@
       array_shift($Jednotky);
     }
-    return ($Velikost.'&nbsp;'.$Jednotky[0]);
+    return $Velikost.'&nbsp;'.$Jednotky[0];
   }
 
   function Show()
   {
-    if (!$this->System->User->CheckPermission('NetworkShare', 'Display')) return ('Nemáte oprávnění');
+    if (!$this->System->User->CheckPermission('NetworkShare', 'Display')) return 'Nemáte oprávnění';
 
     // If not only online checkbox checked
@@ -318 +318 @@
       }
     }
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/NetworkShare/browse.php

@@ -130 +130 @@
   $Database->update('NetworkShareItem', 'id='.$Parent, array('size' => $VelikostSlozky));
   //closedir($Dir);
-  return ($VelikostSlozky);
+  return $VelikostSlozky;
 }
 

trunk/Modules/NetworkShare/playlist.php

@@ -34 +34 @@
   }
   if ($i >= $MaxNesting) $Cesta = '?'.'\\'.$Cesta;
-  return ('\\\\'.$Cesta);
+  return '\\\\'.$Cesta;
 }
 
@@ -40 +40 @@
 {
   //$FileInfo = new finfo(FILEINFO_MIME);
-  //return ($FileInfo->file($FileName));
-  return ('');
+  //return $FileInfo->file($FileName);
+  return '';
 }
 

trunk/Modules/NetworkTopology/NetworkTopology.php

@@ -12 +12 @@
     if (count($this->System->PathItems) > 1)
     {
-      if ($this->System->PathItems[1] == 'topologie.png') return ($this->ShowImage());
-        else return (PAGE_NOT_FOUND);
+      if ($this->System->PathItems[1] == 'topologie.png') return $this->ShowImage();
+        else return PAGE_NOT_FOUND;
 
-    } else return ($this->ShowOverview());
+    } else return $this->ShowOverview();
   }
 
@@ -109 +109 @@
       imagedestroy($im_dev);
     }
-    return ('');
+    return '';
   }
 
@@ -126 +126 @@
 zařízení, které jsou přes něj připojeny. U zařízení, kde není stav možné
 zjišťovat je použita <span style="color:gray">šedá barvou</span>.</p>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/NetworkTopology/topologie-img.php

@@ -156 +156 @@
   } while ($level >= 0);
   $data = compact('tbound', 'count', 'tbound', 'vfirst', 'vlast', 'vtop', 'vleft', 'height', 'width', 'index', 'maxindex');
-  return ($data);
+  return $data;
 };
 
@@ -194 +194 @@
 {
   global $vleft, $spacex;
-  return ($vleft[$id] * $spacex);
+  return $vleft[$id] * $spacex;
 }
 

trunk/Modules/NetworkTopology/topologie2.php

@@ -50 +50 @@
       $Result['max'] = max($SubitemResult['max'], $Result['max']);
     }
-    return ($Result);
+    return $Result;
   }
 

trunk/Modules/News/News.php

@@ -5 +5 @@
 function CategoryItemCompare($Item1, $Item2)
 {
-  if ($Item1['Index'] == $Item2['Index']) return (0);
-  return ($Item1['Index'] > $Item2['Index']) ? -1 : 1;
+  if ($Item1['Index'] == $Item2['Index']) return 0;
+  return $Item1['Index'] > $Item2['Index'] ? -1 : 1;
 }
 
@@ -133 +133 @@
     }
     $Output .= '</div></div>';
-    return ($Output);
+    return $Output;
   }
 
@@ -191 +191 @@
     $Output .= '<a href="aktuality/subscription"><img class="RSSIcon" src="images/rss20.png" alt="Aktuality přes RSS" /></a>  <a href="aktuality/subscription">Automatické sledování novinek</a>';
     $Output .= '</div>';
-    return ($Output);
+    return $Output;
   }
 
@@ -214 +214 @@
     }
     $Output .= '</table><input type="hidden" name="NewsCategoryCount" value="'.count($this->NewsSetting).'" /><input type="submit" value="Uložit" /></form></td></tr></table><br>';
-    return ($Output);
+    return $Output;
   }
 
@@ -267 +267 @@
     }
     $Result .= $Content;
-    return ($Result);
+    return $Result;
   }
 }

trunk/Modules/News/NewsPage.php

@@ -13 +13 @@
     if (count($this->System->PathItems) > 1)
     {
-      if ($this->System->PathItems[1] == 'subscription') return ($this->ShowSubscription());
-        else if ($this->System->PathItems[1] == 'rss') return ($this->ShowRSS());
-        else return (PAGE_NOT_FOUND);
-    } else return ($this->ShowMain());
+      if ($this->System->PathItems[1] == 'subscription') return $this->ShowSubscription();
+        else if ($this->System->PathItems[1] == 'rss') return $this->ShowRSS();
+        else return PAGE_NOT_FOUND;
+    } else return $this->ShowMain();
   }
 
@@ -57 +57 @@
       } else $Output .= 'Položka nenalezena.';
     }
-    return ($Output);
+    return $Output;
   }
 
@@ -93 +93 @@
         '</form>';
     } else $Output .= 'Do této kategorie nemůžete vkládat aktuality!';
-    return ($Output);
+    return $Output;
   }
 
@@ -130 +130 @@
         $this->System->ModuleManager->Modules['Log']->NewRecord('News', 'Aktualita přidána', $this->Database->insert_id);
     } else $Output .= 'Do této kategorie nemůžete vkládat aktuality!';
-    return ($Output);
+    return $Output;
   }
 
   function GetPageHeader()
   {
-    return ('<script src="'.$this->System->Link('/Packages/TinyMCE/tinymce.min.js').'"></script>'.
+    return '<script src="'.$this->System->Link('/Packages/TinyMCE/tinymce.min.js').'"></script>'.
         "<script>tinymce.init({
   selector: 'textarea',
@@ -149 +149 @@
   toolbar: 'insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image',
   language: 'cs_CZ',
-});</script>");
+});</script>";
   }
 
@@ -174 +174 @@
       } else $Output .= 'Nepovolená operace!';
     } else $Output .= 'Do této kategorie nemůžete vkládat aktuality!';
-    return ($Output);
+    return $Output;
   }
 
@@ -198 +198 @@
       } else $Output .= 'ID nenalezeno!';
     } else $Output .= 'Do této kategorie nemůžete vkládat aktuality!';
-    return ($Output);
+    return $Output;
   }
 
@@ -225 +225 @@
       } else $Output .= 'Nemáte oprávnění.';
     } else $Output .= 'Do této kategorie nemůžete vkládat aktuality!';
-    return ($Output);
+    return $Output;
   }
 
@@ -274 +274 @@
       $Output .= '</div>';
     } else $Output .= 'Nemáte oprávnění.';
-    return ($Output);
+    return $Output;
   }
 
@@ -289 +289 @@
         else $Category = array('Id' => 0); //throw new Exception('Kategorie nenalezena');
     }
-    return ($Category);
+    return $Category;
   }
 
@@ -304 +304 @@
     else if ($Action == 'del') $Output .= $this->ShowDelete();
     else $Output .= $this->ShowList();
-    return ($Output);
+    return $Output;
   }
 
@@ -331 +331 @@
         '</form>';
     }
-    return ($Output);
+    return $Output;
   }
 
@@ -429 +429 @@
     $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail'];
     $RSS->Items = $Items;
-    return ($RSS->Generate());
+    return $RSS->Generate();
   }
 }

trunk/Modules/Notify/Notify.php

@@ -120 +120 @@
     }
 
-    return ($Output);
+    return $Output;
   }
 
@@ -195 +195 @@
     $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail'];
     $RSS->Items = $Items;
-    return ($RSS->Generate());
+    return $RSS->Generate();
   }
 }

trunk/Modules/OpeningHours/OpeningHours.php

@@ -17 +17 @@
     if ($Minutes < 10) $Minutes = '0'.$Minutes;
     $Hours = $Hours % 24;
-    return ($Hours.':'.$Minutes);
+    return $Hours.':'.$Minutes;
   }
 
@@ -31 +31 @@
     if ($Hours > 0) $Output .= $Hours.' hodin, ';
     if ($Minutes > 0) $Output .= $Minutes.' minut';
-    return ($Output);
+    return $Output;
   }
 
@@ -70 +70 @@
       '</form></div>';
     } else $Output = 'Nemáte oprávnění';
-    return ($Output);
+    return $Output;
   }
 
@@ -111 +111 @@
       $this->Database->update('SubjectOpenTime', 'Subject='.$Id, array('UpdateTime' => 'NOW()', 'Notice' => $_POST['notice'], 'Photo' => $FileId));
     } else $Output = 'Nemáte oprávnění';
-    return ($Output);
+    return $Output;
   }
 
@@ -195 +195 @@
     }
     $Output .= '</div>';
-    return ($Output);
+    return $Output;
   }
 
@@ -209 +209 @@
       } else $Output = PAGE_NOT_FOUND;
     } else $Output = $this->ShowAll();
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Portal/Portal.php

@@ -64 +64 @@
       $Output .= $this->System->ShowAction($Action['Id']).'<br/>';
     }
-    return ($this->Panel($ActionGroup['Name'], $Output));
+    return $this->Panel($ActionGroup['Name'], $Output);
   }
 
@@ -109 +109 @@
 
     $Output = '<div class="Navigation"><span class="MenuItem">'.$Output.'</span><div class="MenuItem2">&nbsp;'.$Output2.'</div></div>';
-    return ($Output);
+    return $Output;
   }
 
@@ -129 +129 @@
     if ($this->System->User->CheckPermission('IS', 'Manage'))
       $Output .= '<a href="'.$this->System->Link('/is/').'">Správa dat</a><br />';
-    return ($Output);
+    return $Output;
   }
 
@@ -135 +135 @@
   {
     $Output = $this->System->ModuleManager->Modules['WebCam']->ShowImage();
-    return ($Output);
+    return $Output;
   }
 
@@ -141 +141 @@
   {
     $Output = '<a href="https://stat.zdechov.net/meteo/?Measure=28" title="Klikněte pro detailní informace a předpověď"><img src="https://www.zdechov.net/meteo/koliba.png" border="0" alt="Počasí - Meteostanice Zděchov" width="150" height="150" /></a>';
-    return ($Output);
+    return $Output;
   }
 
@@ -155 +155 @@
     }
     $Output .= '</span>';
-    return ($Output);
+    return $Output;
   }
 
@@ -167 +167 @@
     }
     $Output .= '</span>';
-    return ($Output);
+    return $Output;
   }
 
@@ -175 +175 @@
       foreach ($Menu as $Item)
         $Title .= '<div class="Action">'.$Item.'</div>';
-    return ('<div class="Panel"><div class="Title">'.$Title.'</div><div class="Content">'.$Content.'</div></div>');
+    return '<div class="Panel"><div class="Title">'.$Title.'</div><div class="Content">'.$Content.'</div></div>';
   }
 
@@ -243 +243 @@
       }
     } else $Output = $this->ShowMain();
-    return ($Output);
+    return $Output;
   }
 
@@ -280 +280 @@
     }
     $Output .= '</tr></table>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/RSS/RSS.php

@@ -48 +48 @@
           $this->System->Link('/rss/?channel='.$Channel['Channel']).'" type="application/rss+xml" />';
     }
-    return ($Output);
+    return $Output;
   }
 }
@@ -76 +76 @@
       } else $Output = 'Nemáte oprávnění';
     } else $Output = 'Kanál nenalezen';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Scheduler/Scheduler.php

@@ -115 +115 @@
   {
     $Output = '#';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Search/Search.php

@@ -43 +43 @@
       }
     }
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/SpeedTest/SpeedTest.php

@@ -41 +41 @@
     if (count($this->System->PathItems) > 1)
     {
-      if ($this->System->PathItems[1] == 'download.php') return ($this->ShowDownload());
-      //else if ($this->System->PathItems[1] == 'rss') return ($this->ShowRSS());
-      else return (PAGE_NOT_FOUND);
-    } else return ($this->ShowMain());
+      if ($this->System->PathItems[1] == 'download.php') return $this->ShowDownload();
+      //else if ($this->System->PathItems[1] == 'rss') return $this->ShowRSS();
+      else return PAGE_NOT_FOUND;
+    } else return $this->ShowMain();
   }
 
@@ -114 +114 @@
     print "</center>\n";
 }
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Stock/Stock.php

@@ -252 +252 @@
     $Group = $this->System->Modules['Finance']->GetFinanceGroupById($Form->Values['Group'], 'StockMoveGroup');
     $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
-    return ($Form->Values);
+    return $Form->Values;
   }
 }

trunk/Modules/Subject/Subject.php

@@ -184 +184 @@
     $DbRow = $DbResult->fetch_row();
     $Output = 'Subjektů: '.$DbRow['0'].'<br/>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/System/System.php

@@ -59 +59 @@
     $Output .= $PageList['Output'];
     $Output .= '<p><a href="?A=SaveToDb">Uložit do databáze</a></p>';
-    return ($Output);
+    return $Output;
   }
 
@@ -94 +94 @@
     }
     $Output .= $this->ShowList();
-    return ($Output);
+    return $Output;
   }
 }
@@ -416 +416 @@
       $this->InstalledChecked = true;
     }
-    return ($this->Installed);
+    return $this->Installed;
   }
 
@@ -532 +532 @@
       }
     }
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/TV/TV.php

@@ -13 +13 @@
     if (count($this->System->PathItems) > 1)
     {
-      if ($this->System->PathItems[1] == 'playlist.m3u') return ($this->ShowPlayList());
-        else return (PAGE_NOT_FOUND);
-    } else return ($this->ShowChannelList());
+      if ($this->System->PathItems[1] == 'playlist.m3u') return $this->ShowPlayList();
+        else return PAGE_NOT_FOUND;
+    } else return $this->ShowChannelList();
   }
 
@@ -72 +72 @@
     $Output .= 'Další online TV na webu: <a href="http://www.tvinfo.cz/live/televize/evropa/cz">TV info</a><br/>';
 
-    return ($Output);
+    return $Output;
   }
 

trunk/Modules/TV/tkr.php

@@ -17 +17 @@
     }
     $Output .= '</table>Aktualizováno dne 17.12.2007<br></div>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/TimeMeasure/Graph.php

@@ -20 +20 @@
   {
     $this->ClearPage = true;
-    return ($this->Render());
+    return $this->Render();
   }
 

trunk/Modules/TimeMeasure/Main.php

@@ -111 +111 @@
     $Output .= '</form>';
 
-    return ($Output);
+    return $Output;
   }
 
@@ -179 +179 @@
 
     $Output .= '<br/>'.$this->MeasureTable();
-    return ($Output);
+    return $Output;
   }
 
@@ -191 +191 @@
     $Output .= '<a href="?Measure='.$_SESSION['Measure'].'&amp;TimeStart='.
       $_SESSION['TimeStart'].'&amp;TimeEnd='.$_SESSION['TimeEnd'].'&amp;TimeSpecify=1&amp;Differential='.$_SESSION['Differential'].'">Odkaz na vybraný graf</a><br>';
-    return ($Output);
+    return $Output;
   }
 
@@ -260 +260 @@
     //echo($PrefixMultiplier->Add('-0.000000071112345', 'B'));
     $Output .= '</div>';
-    return ($Output);
+    return $Output;
   }
 }
@@ -271 +271 @@
 
     $Output = '';
-    if (!array_key_exists('MeasureId', $_GET)) return ('Nebylo zadáno Id měření.');
-    if (!array_key_exists('Value', $_GET)) return ('Nebyla zadána hodnota.');
+    if (!array_key_exists('MeasureId', $_GET)) return 'Nebylo zadáno Id měření.';
+    if (!array_key_exists('Value', $_GET)) return 'Nebyla zadána hodnota.';
     $Measure = new Measure($this->System);
     $Measure->Load($_GET['MeasureId']);
-    if (!isset($Measure->Data['Id'])) return ('Měření s Id '.$_GET['MeasureId'].' nenalezeno.');
+    if (!isset($Measure->Data['Id'])) return 'Měření s Id '.$_GET['MeasureId'].' nenalezeno.';
     $Measure->AddValue(array('Min' => $_GET['Value'], 'Avg' => $_GET['Value'], 'Max' => $_GET['Value']));
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/TimeMeasure/Measure.php

@@ -25 +25 @@
   function TimeSegment($Base, $Level)
   {
-    return (pow($this->LevelReducing, $Level) * $Base);
+    return pow($this->LevelReducing, $Level) * $Base;
   }
 
   function StatTableName($Level)
   {
-    if ($Level == 0) return ('Data');
-      else return ('DataCache');
+    if ($Level == 0) return 'Data';
+      else return 'DataCache';
   }
 
   function AlignTime($Time, $TimeSegment)
   {
-    return (round(($Time - $this->ReferenceTime) / $TimeSegment) * $TimeSegment + $this->ReferenceTime);
+    return round(($Time - $this->ReferenceTime) / $TimeSegment) * $TimeSegment + $this->ReferenceTime;
   }
 
@@ -124 +124 @@
   {
     $Y = ($Y2 - $Y1) / ($X2 - $X1) * ($X - $X1) + $Y1;
-    return ($Y);
+    return $Y;
   }
 
@@ -203 +203 @@
       $NewValue['Avg'] = $NewValue['Avg'] / ($RightTime - $LeftTime);
     }
-    return ($NewValue);
+    return $NewValue;
   }
 
@@ -228 +228 @@
       echo('AbsoluteRightTime: '.$AbsoluteRightTime.'('.TimeToMysqlDateTime($AbsoluteRightTime).')<br>');
     }
-    return (array('Left' => $AbsoluteLeftTime, 'Right' => $AbsoluteRightTime));
+    return array('Left' => $AbsoluteLeftTime, 'Right' => $AbsoluteRightTime);
   }
 
@@ -239 +239 @@
       $Row = $DbResult->fetch_assoc();
       $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
-      return (array($Row));
+      return array($Row);
     } else
     {
@@ -253 +253 @@
       }
      // if ($Debug) print_r($Result);
-      return ($Result);
+      return $Result;
     }
   }
@@ -266 +266 @@
       $Row = $DbResult->fetch_assoc();
       $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
-      return (array($Row));
+      return array($Row);
     } else
     {
@@ -280 +280 @@
         array_push($Result, array('Time' => (MysqlDateTimeToTime($Row['Time']) - 10), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
       }
-      return ($Result);
+      return $Result;
     }
   }
@@ -338 +338 @@
       if ($this->Debug) print_r($Points);
     } else $Points[] = array('Min' => 0, 'Avg' => 0, 'Max' => 0);
-    return ($Points);
+    return $Points;
   }
 

trunk/Modules/TimeMeasure/Measurement/System.php

@@ -14 +14 @@
     {
       fclose($Fp1);
-      return (TRUE);
+      return TRUE;
     } else
     {
       //echo($ERROR_NO.','.$ERROR_STR);
-      return (FALSE);
+      return FALSE;
     }
     restore_error_handler();
@@ -34 +34 @@
       $Time = $Parts[7];
       $TimeParts = explode('=', $Time);
-      return ($TimeParts[1]);
-    } else return (0);
+      return $TimeParts[1];
+    } else return 0;
   }
 
@@ -48 +48 @@
     while (strpos($Row, '  ') !== false) $Row = str_replace('  ', ' ', $Row);
     $RowParts2 = explode(' ', $Row);
-    return ($RowParts[2] + $RowParts2[2]);
+    return $RowParts[2] + $RowParts2[2];
   }
 
@@ -81 +81 @@
     }
     file_put_contents($CpuStateFileName, serialize($CpuUsage));
-    return (100 - round($CpuUsagePercent['Idle'], 2));
+    return 100 - round($CpuUsagePercent['Idle'], 2);
   }
 
@@ -114 +114 @@
     }
     file_put_contents($NetworkStateFile, serialize($NetworkState));
-    return ($NetworkState);
+    return $NetworkState;
   }
 
@@ -120 +120 @@
   {
     $NetworkState = $this->GetNetworkState();
-    return ($NetworkState['Interface']['DownAverage']);
+    return $NetworkState['Interface']['DownAverage'];
   }
 
@@ -126 +126 @@
   {
     $NetworkState = $this->GetNetworkState();
-    return ($NetworkState['Interface']['UpAverage']);
+    return $NetworkState['Interface']['UpAverage'];
   }
 
@@ -134 +134 @@
     $Output = array();
     exec('cat /proc/net/nf_conntrack|grep "dst='.$HostIP.' "|grep "dport='.$Port.' "|grep "ASSURED"', $Output);
-    return (count($Output));
+    return count($Output);
   }
 
@@ -145 +145 @@
     $Parts = explode(' ', $Row);
     $Value = str_replace(',', '.', $Parts[11]);
-    return ($Value);
+    return $Value;
   }
 
   function DiskFree($Path)
   {
-    return (disk_free_space($Path));
+    return disk_free_space($Path);
   }
 
@@ -163 +163 @@
         $Line = substr($Line, strpos($Line, '+') + 1);
         $Line = substr($Line, 0, strpos($Line, '°'));
-        return ($Line);
+        return $Line;
       }
     }
-    return (0);
+    return 0;
   }
 
@@ -175 +175 @@
     fclose($File);
     $UptimeParts = explode(' ', $Uptime);
-    return ($UptimeParts[0]);
+    return $UptimeParts[0];
   }
 }

trunk/Modules/TimeMeasure/Measurement/WoW.php

@@ -12 +12 @@
     $DbResult = $Database->query('SELECT COUNT(*) FROM account WHERE online=1');
     $Row = $DbResult->fetch_array();
-    return ($Row[0]);
+    return $Row[0];
   }
 
@@ -20 +20 @@
     $DbResult = $Database->query('SELECT COUNT(*) FROM account WHERE online=1 AND gmlevel > 0');
     $Row = $DbResult->fetch_array();
-    return ($Row[0]);
+    return $Row[0];
   }
 
@@ -28 +28 @@
     $DbResult = $Database->query('SELECT COUNT(*) FROM account');
     $Row = $DbResult->fetch_array();
-    return ($Row[0]);
+    return $Row[0];
   }
 
@@ -36 +36 @@
     $DbResult = $Database->query('SELECT COUNT(*) FROM guild');
     $Row = $DbResult->fetch_array();
-    return ($Row[0]);
+    return $Row[0];
   }
 
@@ -44 +44 @@
     $DbResult = $Database->query('SELECT COUNT(*) FROM `characters`');
     $Row = $DbResult->fetch_array();
-    return ($Row[0]);
+    return $Row[0];
   }
 
@@ -52 +52 @@
     $DbResult = $Database->query('SELECT COUNT(*) FROM uptime');
     $Row = $DbResult->fetch_array();
-    return ($Row[0]);
+    return $Row[0];
   }
 
   function WoWEmulatorAvailability()
   {
-    if (CheckPortStatus('localhost', 8085)) return (100); else return (0);
+    if (CheckPortStatus('localhost', 8085)) return 100;
+      else return 0;
   }
 
@@ -69 +70 @@
     $Row = $DbResult->fetch_array();
     $Value = $Row[0];
-    return ($Value);
+    return $Value;
   }
 }

trunk/Modules/User/User.php

@@ -301 +301 @@
       //   <a href="'.$this->System->Link('/?Action=UserOptions').'">Nastavení</a>';
     }
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/User/UserList.php

@@ -10 +10 @@
   {
     if (!$this->System->User->CheckPermission('User', 'ShowList'))
-      return ('Nemáte oprávnění');
+      return 'Nemáte oprávnění';
 
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `User`');
@@ -52 +52 @@
     $Output .= $PageList['Output'];
 
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/User/UserModel.php

@@ -30 +30 @@
   function Hash($Password, $Salt)
   {
-    return (sha1(sha1($Password).$Salt));
+    return sha1(sha1($Password).$Salt);
   }
 
   function Verify($Password, $Salt, $StoredHash)
   {
-    return ($this->Hash($Password, $Salt) == $StoredHash);
+    return $this->Hash($Password, $Salt) == $StoredHash;
   }
 
@@ -177 +177 @@
       }
     }
-    return ($Result);
+    return $Result;
   }
 
@@ -195 +195 @@
       } else $Output = PASSWORDS_UNMATCHED;
     } else $Output = USER_NOT_FOUND;
-    return ($Output);
+    return $Output;
   }
 
@@ -231 +231 @@
       }
     } else $Result = USER_NOT_REGISTRED;
-    return ($Result);
+    return $Result;
   }
 
@@ -240 +240 @@
     $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout', $this->User['Login']);
     $this->Check();
-    return (USER_LOGGED_OUT);
+    return USER_LOGGED_OUT;
   }
 
@@ -271 +271 @@
       $Result[$DbRow['Description']][$DbRow['Title']] = $Value;
     }
-    return ($Result);
+    return $Result;
   }
 
@@ -296 +296 @@
       {
         if ($DbRow['AssignedGroup'] != '')
-        if ($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return (true);
+        if ($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return true;
       }
     }
@@ -314 +314 @@
     if ($PermissionExists)
     {
-      return ($this->PermissionGroupCacheOp[$GroupId.','.$OperationId]);
-    }
-    return (false);
+      return $this->PermissionGroupCacheOp[$GroupId.','.$OperationId];
+    }
+    return false;
   }
 
@@ -327 +327 @@
       $DbRow = $DbResult->fetch_assoc();
       $ModuleId = $DbRow['Id'];
-    } else return (false);
+    } else return false;
 
     // First try to check cache
@@ -358 +358 @@
       // Check user-operation relation
       $DbResult = $this->Database->select('PermissionUserAssignment', '*', $UserCondition.' AND (`AssignedOperation`="'.$OperationId.'")');
-      if ($DbResult->num_rows > 0) return (true);
+      if ($DbResult->num_rows > 0) return true;
 
       // Check user-group relation
@@ -364 +364 @@
       while ($DbRow = $DbResult->fetch_array())
       {
-       if ($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return (true);
-      }
-      return (false);
-    } else return (false);
+       if ($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return true;
+      }
+      return false;
+    } else return false;
   }
 
@@ -394 +394 @@
       $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'PasswordRecoveryRequest', 'Login='.$Login.',Email='.$Email);
     } else $Output = USER_PASSWORD_RECOVERY_FAIL;
-    return ($Output);
+    return $Output;
   }
 
@@ -414 +414 @@
       } else $Output = PASSWORDS_UNMATCHED;
     } else $Output = USER_NOT_FOUND;
-    return ($Output);
+    return $Output;
   }
 
@@ -425 +425 @@
       $User = new User($this->System);
       $User->User = array('Id' => $DbRow['User']);
-      return ($User->CheckPermission($Module, $Operation));
-    } else return (false);
+      return $User->CheckPermission($Module, $Operation);
+    } else return false;
   }
 }

trunk/Modules/User/UserPage.php

@@ -12 +12 @@
       foreach ($Menu as $Item)
         $Title .= '<div class="Action">'.$Item.'</div>';
-    return ('<div class="Panel"><div class="Title">'.$Title.'</div><div class="Content">'.$Content.'</div></div>');
+    return '<div class="Panel"><div class="Title">'.$Title.'</div><div class="Content">'.$Content.'</div></div>';
   }
 
@@ -50 +50 @@
     $Output .= $PageList['Output'];
 
-    return ($Output);
+    return $Output;
   }
 
@@ -85 +85 @@
       $Output .= '</td></tr></table></div>';
     } else $Output .= $this->SystemMessage('Oprávnění', 'Nejste přihlášen');
-    return ($Output);
+    return $Output;
   }
 
@@ -213 +213 @@
       } else $Output = $this->ShowMain();
     } else $Output = $this->ShowMain();
-    return ($Output);
+    return $Output;
   }
 
@@ -219 +219 @@
   {
     $Output = 'Nebyla vybrána akce';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/WebCam/WebCam.php

@@ -38 +38 @@
       '<a href="http://www.mestovsetin.cz/vismo/dokumenty2.asp?id_org=18676&id=480245">Webové kamery ve Vsetíně</a><br />';
 
-    return ($Output);
+    return $Output;
   }
 }
@@ -72 +72 @@
     $Output .= '<a href="//www.zdechov.net/kamery/?Id=3"><img alt="Skiareál, motokrosová grapa" width="140" height="79" src="//www.zdechov.net/images/webcam/webcam3.jpg" /></a>';
     $Output .= '<a href="//www.zdechov.net/kamery/?Id=4"><img alt="Fotbalové hřiště" width="140" height="79" src="//www.zdechov.net/images/webcam/webcam4.jpg" /></a>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Wiki/Wiki.php

@@ -89 +89 @@
       else $Output = $this->ShowContent();
     } else $Output = $this->ShowContent();
-    return ($Output);
+    return $Output;
   }
 
@@ -123 +123 @@
       }
     } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
-    return ($Output);
+    return $Output;
   }
 
@@ -148 +148 @@
     } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
     } else $Output = ShowMessage('Nemáte oprávnění', MESSAGE_CRITICAL);
-    return ($Output);
+    return $Output;
   }
 
@@ -169 +169 @@
     } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
     } else $Output = ShowMessage('Nemáte oprávnění', MESSAGE_CRITICAL);
-    return ($Output);
+    return $Output;
   }
 
@@ -215 +215 @@
       } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
     } else $Output = ShowMessage('Nemáte oprávnění', MESSAGE_CRITICAL);
-    return ($Output);
+    return $Output;
   }
 
@@ -242 +242 @@
     $text = str_replace("\r\n", '<br/>', $text);
     $text = '<p>'.$text.'</p>';
-    return ($text);
+    return $text;
   }
 }