Changeset 873 for trunk/Modules

trunk/Modules/API/API.php

-              r804
+              r873
+  {
     // p - token
     if(array_key_exists('p', $_GET)) {
+    if (array_key_exists('p', $_GET)) {
       $Token = $_GET['p'];
       $DbResult = $this->Database->query('SELECT `User` FROM `APIToken` WHERE `Token`="'.$Token.'"');
       if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
+      {
         $DbRow = $DbResult->fetch_assoc();
 …
     } else die('Missing access token');
     // f - data format
     if(array_key_exists('f', $_GET)) $this->DataFormat = $_GET['f'];
+    if (array_key_exists('f', $_GET)) $this->DataFormat = $_GET['f'];
       else $this->DataFormat = 'php';
     // a - action
     if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
+    if (array_key_exists('a', $_GET)) $Action = $_GET['a'];
       else $Action = '';
     // t - table
     if(array_key_exists('t', $_GET)) $Table = $_GET['t'];
+    if (array_key_exists('t', $_GET)) $Table = $_GET['t'];
       else $Table = '';
     // i - index of item
     if(array_key_exists('i', $_GET)) $ItemId = $_GET['i'];
+    if (array_key_exists('i', $_GET)) $ItemId = $_GET['i'];
       else $ItemId = 0;
     if($Action == 'list') $Output = $this->ShowList($Table, $ItemId);
+    if ($Action == 'list') $Output = $this->ShowList($Table, $ItemId);
       else $Output = 'Unsupported action';
     return($Output);
+    return ($Output);
+  }
   function ShowList($Table, $ItemId)
+  {
     if(($Table != '') and (array_key_exists($Table, $this->System->FormManager->Classes)))
+    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))
+    if (array_key_exists('SQL', $FormClass))
       $SourceTable = '('.$FormClass['SQL'].') AS `TX`';
       else $SourceTable = '`'.$FormClass['Table'].'` AS `TX`';
     $Filter = '';
     if($ItemId != 0)
+    if ($ItemId != 0)
+    {
       $Filter .= '`Id`='.$ItemId;
+    }
     if($Filter != '') $Filter = ' WHERE '.$Filter;
+    if ($Filter != '') $Filter = ' WHERE '.$Filter;
     $Result = array();
     $DbResult = $this->Database->query('SELECT * FROM '.$SourceTable.$Filter);
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
       $Result[] = $DbRow;
+    }
     if($this->DataFormat == 'php') $Output = serialize($Result);
       else if($this->DataFormat == 'xml') $Output = $this->array2xml($Result);
       else if($this->DataFormat == 'json') $Output = json_encode($Result);
+    if ($this->DataFormat == 'php') $Output = serialize($Result);
+      else if ($this->DataFormat == 'xml') $Output = $this->array2xml($Result);
+      else if ($this->DataFormat == 'json') $Output = json_encode($Result);
       else die('Unknown data format '.$this->DataFormat);
     return($Output);
+    return ($Output);
+  }
 …
     $array2xml = function ($node, $array) use ($dom, &$array2xml)
+    {
       foreach($array as $key => $value)
+      foreach ($array as $key => $value)
+      {
         if ( is_array($value) )
+        {
           if(is_numeric($key)) $key = 'N'.$key; //die('XML tag name "'.$key.'" can\'t be numeric');
+          if (is_numeric($key)) $key = 'N'.$key; //die('XML tag name "'.$key.'" can\'t be numeric');
           $n = $dom->createElement($key);
           $node->appendChild($n);
           $array2xml($n, $value);
         } else {
           if(is_numeric($key)) $key = 'N'.$key; //die('XML attribute name "'.$key.'" can\'t be numeric');
+          if (is_numeric($key)) $key = 'N'.$key; //die('XML attribute name "'.$key.'" can\'t be numeric');
           $attr = $dom->createAttribute($key);
           $attr->value = $value;

trunk/Modules/Chat/Chat.php

-              r790
+              r873
+  {
     $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));
+  }
 …
     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'];
+    if (array_key_exists('date', $_GET)) $Date = $_GET['date'];
       else $Date = date('Y-m-d');
     $DateParts = explode('-', $Date);
 …
     $EndDateParts = explode('-', $EndDateTimeParts[0]);
     if(!array_key_exists('year', $_SESSION)) $_SESSION['year'] = date('Y', time());
     if(array_key_exists('year', $_GET)) $_SESSION['year'] = addslashes($_GET['year']);
+    if (!array_key_exists('year', $_SESSION)) $_SESSION['year'] = date('Y', time());
+    if (array_key_exists('year', $_GET)) $_SESSION['year'] = addslashes($_GET['year']);
     if(!array_key_exists('month', $_SESSION)) $_SESSION['month'] = date('n', time());
     if(array_key_exists('month', $_GET)) $_SESSION['month'] = addslashes($_GET['month']);
+    if (!array_key_exists('month', $_SESSION)) $_SESSION['month'] = date('n', time());
+    if (array_key_exists('month', $_GET)) $_SESSION['month'] = addslashes($_GET['month']);
     $Output = '<div class="ChatHistory">';
     for($Year = $EndDateParts[0]; $Year >= $StartDateParts[0]; $Year--)
+    for ($Year = $EndDateParts[0]; $Year >= $StartDateParts[0]; $Year--)
+    {
       if($_SESSION['year'] == $Year)
+      if ($_SESSION['year'] == $Year)
+      {
         $Output .= '<div class="Year">'.$Year.'<div class="YearContent">';
         if($Year == $StartDateParts[0]) $StartMonth = ($StartDateParts[1] + 0); else $StartMonth = 1;
         if($Year == $EndDateParts[0]) $EndMonth = ($EndDateParts[1] + 0); else $EndMonth = 12;
         for($Month = $EndMonth; $Month >= $StartMonth; $Month--)
+        if ($Year == $StartDateParts[0]) $StartMonth = ($StartDateParts[1] + 0); else $StartMonth = 1;
+        if ($Year == $EndDateParts[0]) $EndMonth = ($EndDateParts[1] + 0); else $EndMonth = 12;
+        for ($Month = $EndMonth; $Month >= $StartMonth; $Month--)
+        {
           if($_SESSION['month'] == $Month)
+          if ($_SESSION['month'] == $Month)
+          {
             $Output .= '<div class="Months">'.$MonthNames[$Month].'<span>';
             if(($Year == $StartDateParts[0]) and ($Month == $StartDateParts[1])) $StartDay = ($StartDateParts[2]+0); else $StartDay = 1;
             if(($Year == $EndDateParts[0]) and ($Month == $EndDateParts[1])) $EndDay = ($EndDateParts[2]+0); else $EndDay = date('t',mktime(0,0,0,$Month,0,$Year));
             for($Day = $StartDay; $Day <= $EndDay; $Day++)
+            if (($Year == $StartDateParts[0]) and ($Month == $StartDateParts[1])) $StartDay = ($StartDateParts[2]+0); else $StartDay = 1;
+            if (($Year == $EndDateParts[0]) and ($Month == $EndDateParts[1])) $EndDay = ($EndDateParts[2]+0); else $EndDay = date('t',mktime(0,0,0,$Month,0,$Year));
+            for ($Day = $StartDay; $Day <= $EndDay; $Day++)
+            {
               $Text = '<a href="?date='.$Year.'-'.$Month.'-'.$Day.'">'.$Day.'</a> ';
               if(($DateParts[0] == $Year) and ($DateParts[1] == $Month) and ($DateParts[2] == $Day)) $Text = '<strong>'.$Text.'</strong>';
+              if (($DateParts[0] == $Year) and ($DateParts[1] == $Month) and ($DateParts[2] == $Day)) $Text = '<strong>'.$Text.'</strong>';
               $Output .= $Text;
+            }
 …
     $DbResult = $this->Database->select('ChatHistory', 'Nick, Color, Text, UNIX_TIMESTAMP(Time)', "RoomType = 0 AND Time > '".$Date." 00:00:00' AND Time < '".$Date." 23:59:59' ORDER BY Time DESC");
     $Output .= '<div class="ChatHistoryText">';
     if($DbResult->num_rows > 0)
     while($Row = $DbResult->fetch_array())
+    if ($DbResult->num_rows > 0)
+    while ($Row = $DbResult->fetch_array())
+    {
       $Text = $Row['Text'];;
 …
     else $Output .= 'V daném dni nebyly zaznamenány žádné zprávy.';
     $Output .= '</div>';
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/Chat/irc_bot.php

-              r738
+              r873
   function Say($Message, $Recipient = '')
+  {
     if($Recipient == '') $Recipient = $this->Channel;
+    if ($Recipient == '') $Recipient = $this->Channel;
     $this->Command(': PRIVMSG '.$Recipient.' :'.$Message);
+  }
 …
     global $Database;
     while(!fwrite($this->File, ''))
+    while (!fwrite($this->File, ''))
+    {
       $this->Command('JOIN '.$this->Channel);
 …
       $LineParts = explode(' ', $Line);
       if(count($LineParts) > 0)
+      if (count($LineParts) > 0)
+      {
         if($LineParts[0] == 'PING')
+        if ($LineParts[0] == 'PING')
+        {
           $this->Command('PONG '.trim($LineParts[1])."\n");
 …
+        }
         if(count($LineParts) > 1)
+        {
           if((trim($LineParts[1]) == 'INVITE') && (substr(trim($LineParts[3]), 0, 2) == ':#'))
+        if (count($LineParts) > 1)
+        {
+          if ((trim($LineParts[1]) == 'INVITE') && (substr(trim($LineParts[3]), 0, 2) == ':#'))
+          {
             $CurrentChannel = substr(trim($LineParts[3]), 1);
 …
       // Log messages to database
       if(strpos($Line, 'PRIVMSG') !== false)
+      if (strpos($Line, 'PRIVMSG') !== false)
+      {
         $Text = addslashes($Commands[2]);
 …
       explode(':', $Line);
       foreach($Commands as $Index => $Item)
+      foreach ($Commands as $Index => $Item)
         $Commands[$Index] = trim($Item);
       if(count($Commands) >= 2)
+      if (count($Commands) >= 2)
+      {
         $Command = $Commands[2];
         // Jméno - Pošle vizitku
         if($Command == $this->Nick)
+        if ($Command == $this->Nick)
+        {
           $this->Say('Ahoj lidi, ja jsem '.$this->OwnerName.' bot. Random#: '.rand(0, 10));
 …
         // hhelp - vypise tuto napovedu
         if($Command == 'hhelp')
+        if ($Command == 'hhelp')
+        {
           $this->Say('Ja jsem Harvester.');
 …
         // hsay:Message - Posle zpravu
         if($Command == 'hsay')
+        if ($Command == 'hsay')
+        {
           $this->Say($Commands[3]);
 …
         // hpsay:to:Message - Posle soukromou zpravu kanalu nebo osobe
         if($Command == 'hpsay')
+        if ($Command == 'hpsay')
+        {
           $this->Say($Commands[4], $Commands[3]);
 …
         // hcol:to:Message - Posle kolizni zpravu kanalu nebo osobe
         if($Command == 'hcol')
+        if ($Command == 'hcol')
+        {
           $this->Say($Commands[4], $Commands[3]);
 …
         // hdo:Command - Posle serveru prikaz
         if($Command == 'hdo')
+        if ($Command == 'hdo')
+        {
           $hdo = explode('hdo:', $Line);
 …
         // hpart:Channel - Odpoji se z kanalu
         if($Command == 'hpart')
+        if ($Command == 'hpart')
+        {
           $hdo = explode('hpart:', $Line);
           if(trim($hdo[1]) != trim($this->Channel))
+          if (trim($hdo[1]) != trim($this->Channel))
+          {
             $this->Command('PART :'.trim($hdo[1])."\n");
 …
         // hmove:Channel - Zmeni aktivni kanal
         if($Command == 'hmove')
+        if ($Command == 'hmove')
+        {
           $hdo = explode("hmove:", $Line);
           if(trim($hdo[1]) != trim($$this->Cannel))
+          if (trim($hdo[1]) != trim($$this->Cannel))
+          {
             $this->Channel = trim($hdo[1]);
 …
         // htime - udaje o casu
         if($Command == 'htime')
+        if ($Command == 'htime')
+        {
           $Date = implode("-", getdate(time()));
 …
         // hjoke - Posle nahodny vtip
         if($Command == 'hjoke')
+        if ($Command == 'hjoke')
+        {
           $Joke = ($this->Jokes[rand(0, (sizeof($this->Jokes) - 1))]);

trunk/Modules/Customer/Customer.php

r871	r873
201	201	$Output .= ' platících:'.$DbRow['0'].'<br/>';
202	202
203		return($Output);
	203	return ($Output);
204	204	}
205	205

trunk/Modules/EmailQueue/EmailQueue.php

r738	r873
11	11	$Output = $this->System->ModuleManager->Modules['EmailQueue']->Process();
12	12	$Output = $this->SystemMessage('Zpracování fronty emailů', 'Nové emaily byly odeslány').$Output;
13		return($Output);
	13	return ($Output);
14	14	}
15	15	}
…	…
79	79	'Subject' => $Subject, 'Content' => $Content, 'Time' => 'NOW()',
80	80	'From' => $From);
81		if($AttachmentFileId != '') $Values['AttachmentFile'] = $AttachmentFileId;
	81	if ($AttachmentFileId != '') $Values['AttachmentFile'] = $AttachmentFileId;
82	82	$this->Database->insert('EmailQueue', $Values);
83	83	}
…	…
87	87	$Output = '';
88	88	$DbResult = $this->Database->select('EmailQueue', '*', 'Archive=0');
89		while($DbRow = $DbResult->fetch_assoc())
	89	while ($DbRow = $DbResult->fetch_assoc())
90	90	{
91	91	$Mail = new Mail();
…	…
95	95	$Mail->AddBody(strip_tags($DbRow['Content']), 'text/plain');
96	96	$Mail->AddBody($DbRow['Content'], 'text/html');
97		if($DbRow['AttachmentFile'] != '')
	97	if ($DbRow['AttachmentFile'] != '')
98	98	{
99	99	$DbResult2 = $this->Database->select('File', '*', 'Id='.$DbRow['AttachmentFile']);
100		while($File = $DbResult2->fetch_assoc())
	100	while ($File = $DbResult2->fetch_assoc())
101	101	$Mail->AttachFile($this->Config['Web']['FileRootFolder'].$File['DrivePath'], $File['MimeType']);
102	102	}
…	…
106	106	$Output .= 'To: '.$DbRow['To'].' Subject: '.$DbRow['Subject'].'<br />';
107	107	}
108		return($Output);
	108	return ($Output);
109	109	}
110	110	}

trunk/Modules/Error/Error.php

-              r784
+              r873
     $this->System->ModuleManager->Modules['Log']->NewRecord('Error', 'Log', $Error);
     //if($Config['Web']['ErrorLogFile'] != '')
+    //if ($Config['Web']['ErrorLogFile'] != '')
     // error_log($Error, 3, $Config['Web']['ErrorLogFile']);
     // Pošli mi zprávu (pokud je to kritická chyba)
     //mail($Config['Web']['AdminEmail'], $Config['Web']['Title'].' - Chybové hlášení', $Error);
     // Show error message
     if($this->ErrorHandler->ShowError == true)
+    if ($this->ErrorHandler->ShowError == true)
+    {
       if(array_key_exists('REMOTE_ADDR', $_SERVER))
+      if (array_key_exists('REMOTE_ADDR', $_SERVER))
+      {
         echo('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>'."\n".

trunk/Modules/File/File.php

r738	r873
16	16	{
17	17	$DbResult = $this->Database->select('File', 'Name', 'Id='.$Id);
18		if($DbResult->num_rows > 0)
	18	if ($DbResult->num_rows > 0)
19	19	{
20	20	$DbRow = $DbResult->fetch_assoc();
…	…
28	28	// Submited form with file input have to be enctype="multipart/form-data"
29	29	$Result = 0;
30		if(array_key_exists($Name, $_FILES) and ($_FILES[$Name]['name'] != ''))
	30	if (array_key_exists($Name, $_FILES) and ($_FILES[$Name]['name'] != ''))
31	31	{
32		if(file_exists($_FILES[$Name]['tmp_name']))
	32	if (file_exists($_FILES[$Name]['tmp_name']))
33	33	{
34	34	$FileName = substr($_FILES[$Name]['name'], strrpos($_FILES[$Name]['name'], '/'));
35	35	$this->Database->query('INSERT INTO File (`Name`, `Size`) VALUES ("'.$FileName.'", '.filesize($_FILES[$Name]['tmp_name']).')');
36	36	$InsertId = $this->Database->insert_id;
37		if(move_uploaded_file($_FILES[$Name]['tmp_name'], $this->FilesDir.'/'.$InsertId.'_'.$FileName)) $Result = $InsertId;
	37	if (move_uploaded_file($_FILES[$Name]['tmp_name'], $this->FilesDir.'/'.$InsertId.'_'.$FileName)) $Result = $InsertId;
38	38	}
39	39	}
40		return($Result);
	40	return ($Result);
41	41	}
42	42
…	…
46	46
47	47	$Result = $MimeTypes[pathinfo($FileName, PATHINFO_EXTENSION)][0];
48		return($Result);
	48	return ($Result);
49	49	}
50	50
…	…
52	52	{
53	53	$DbResult = $this->Database->select('File', '*', 'Id='.addslashes($Id));
54		if($DbResult->num_rows > 0)
	54	if ($DbResult->num_rows > 0)
55	55	{
56	56	$DbRow = $DbResult->fetch_assoc();
57		if($DbRow['Directory'] != '') $FileName = $this->GetDir($DbRow['Directory']);
	57	if ($DbRow['Directory'] != '') $FileName = $this->GetDir($DbRow['Directory']);
58	58	else $FileName = $this->FilesDir;
59	59	$FileName .= $DbRow['Name'];
60		if(file_exists($FileName))
	60	if (file_exists($FileName))
61	61	{
62	62	Header('Content-Type: '.$this->DetectMimeType($FileName));
…	…
71	71	$DbResult = $this->Database->select('FileDirectory', '*', 'Id='.$Id);
72	72	$DbRow = $DbResult->fetch_assoc();
73		if($DbRow['Parent'] != '') $Result = $this->GetDir($DbRow['Parent']);
	73	if ($DbRow['Parent'] != '') $Result = $this->GetDir($DbRow['Parent']);
74	74	else $Result = $this->FilesDir;
75	75	$Result .= $DbRow['Name'].'/';
76		return($Result);
	76	return ($Result);
77	77	}
78	78	}
…	…
83	83	function Show()
84	84	{
85		if(array_key_exists('id', $_GET)) $Id = $_GET['id'];
86		else if(array_key_exists('i', $_GET)) $Id = $_GET['i'];
87		else return($this->SystemMessage('Chyba', 'Nezadáno id souboru'));
	85	if (array_key_exists('id', $_GET)) $Id = $_GET['id'];
	86	else if (array_key_exists('i', $_GET)) $Id = $_GET['i'];
	87	else return ($this->SystemMessage('Chyba', 'Nezadáno id souboru'));
88	88	$this->ClearPage = true;
89	89	$Output = $this->System->Modules['File']->Download($Id);
90		return($Output);
	90	return ($Output);
91	91	}
92	92	}

trunk/Modules/Finance/Bill.php

-              r748
+              r873
   function GenerateHTML()
+  {
     return('');
+    return ('');
+  }
 …
+  {
     $Encoding = new Encoding();
     if($this->Checked == false) {
       if(CommandExist('htmldoc')) {
+    if ($this->Checked == false) {
+      if (CommandExist('htmldoc')) {
         $this->Checked = true;
       } else throw new Exception('htmldoc is not installed.');
 …
     $Output = shell_exec('echo "'.addslashes($Encoding->FromUTF8($HtmlCode)).
       '"|htmldoc --no-numbered --webpage --no-embedfonts --charset 8859-2 -t pdf -');
     return($Output);
+    return ($Output);
+  }
+}
 …
       $Subject['AddressStreet'].'<br>'.
       $Subject['AddressPSC'].' '.$Subject['AddressTown'].'<br>';
     if($Subject['IC'] != 0) $Output .= 'IČ: '.$Subject['IC'].'<br>';
     if($Subject['DIC'] != '') $Output .= 'DIČ: '.$Subject['DIC'].'<br>';
     if($Subject['Account'] != '') $Output .= 'Účet: '.$Subject['Account'].'<br>';
     if($Subject['PayVAT'] != '') $Output .= 'Plátce DPH: '.$BooleanText[$Subject['PayVAT']].'<br>';
     return($Output);
+    if ($Subject['IC'] != 0) $Output .= 'IČ: '.$Subject['IC'].'<br>';
+    if ($Subject['DIC'] != '') $Output .= 'DIČ: '.$Subject['DIC'].'<br>';
+    if ($Subject['Account'] != '') $Output .= 'Účet: '.$Subject['Account'].'<br>';
+    if ($Subject['PayVAT'] != '') $Output .= 'Plátce DPH: '.$BooleanText[$Subject['PayVAT']].'<br>';
+    return ($Output);
+  }
 …
     $InvoiceItems = array();
     $DbResult = $this->Database->select('FinanceInvoiceItem', '*, ROUND(`Price` * `Quantity`, '.$Finance->Rounding.') AS `Total`', '`FinanceInvoice`='.$this->InvoiceId);
     while($Item = $DbResult->fetch_assoc())
+    while ($Item = $DbResult->fetch_assoc())
+    {
       $InvoiceItems[$Item['Id']] = $Item;
 …
     // If direction is in => switch sides
     if($Invoice['Direction'] == FINANCE_DIRECTION_OUT)
+    {
+    }
     else if($Invoice['Direction'] == FINANCE_DIRECTION_IN)
+    if ($Invoice['Direction'] == FINANCE_DIRECTION_OUT)
+    {
+    }
+    else if ($Invoice['Direction'] == FINANCE_DIRECTION_IN)
+    {
       $Subject = $SubjectTo;
 …
       'Datum zdanitel. plnění: '.HumanDate($Invoice['Time']).'<br>'.
       'Datum splatnosti: '.HumanDate($Invoice['TimeDue']).'<br>';
     if(($Invoice['PeriodFrom'] != '') and ($Invoice['PeriodTo'] != ''))
+    if (($Invoice['PeriodFrom'] != '') and ($Invoice['PeriodTo'] != ''))
       $Output .= 'Fakturované období: '.HumanDate($Invoice['PeriodFrom']).' - '.
         HumanDate($Invoice['PeriodTo']).'<br>';
 …
     $Total = 0;
     foreach($InvoiceItems as $Item)
+    foreach ($InvoiceItems as $Item)
+    {
       $Output .= '<tr><td>'.$Item['Description'].'</td><td align="right">'.
 …
       '</table>';
     return($Output);
+    return ($Output);
+  }
+}
 …
     $BooleanText = array('Ne', 'Ano');
     if($Operation['Direction'] == FINANCE_DIRECTION_OUT)
+    if ($Operation['Direction'] == FINANCE_DIRECTION_OUT)
     $Desc = array(
       'Type' => 'VÝDAJOVÝ',
 …
       'Target' => 'Vydáno komu',
     );
     else if($Operation['Direction'] == FINANCE_DIRECTION_IN)
+    else if ($Operation['Direction'] == FINANCE_DIRECTION_IN)
     $Desc = array(
       'Type' => 'PŘÍJMOVÝ',
 …
       $Subject['AddressStreet'].'<br>'.
       $Subject['AddressPSC'].' '.$Subject['AddressTown'].'<br>';
     if($Subject['IC'] != 0) $Output .= 'IČ: '.$Subject['IC'].'<br>';
     if($Subject['DIC'] != '') $Output .= 'DIČ: '.$Subject['DIC'].'<br>';
+    if ($Subject['IC'] != 0) $Output .= 'IČ: '.$Subject['IC'].'<br>';
+    if ($Subject['DIC'] != '') $Output .= 'DIČ: '.$Subject['DIC'].'<br>';
     $Description = $Operation['Text'];
     $Output .= '</td></tr>'.
 …
       '<tr><td>&nbsp;</td><td><br><br>'.$Desc['Signature'].':</td></tr>';
     $Output .= '</table>';
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/Finance/Finance.php

-              r866
+              r873
+  {
     $DbResult = $this->Database->query('SELECT * FROM `FinanceBillingPeriod`');
     while($BillingPeriod = $DbResult->fetch_assoc())
+    while ($BillingPeriod = $DbResult->fetch_assoc())
       $this->BillingPeriods[$BillingPeriod['Id']] = $BillingPeriod;
 …
   function W2Kc($Spotreba)
+  {
     return(round($Spotreba * 0.72 * $this->kWh));
+    return (round($Spotreba * 0.72 * $this->kWh));
+  }
 …
     // Create DocumentLineSequence from previous
     $DbResult = $this->Database->select('DocumentLine', 'Id', '`Yearly` = 1');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
           $this->Database->insert('DocumentLineSequence', array('FinanceYear' => $YearId,
 …
   function GetFinanceYear($Year)
+  {
     if($Year == 0)
+    if ($Year == 0)
+    {
       // Get latest year
       $DbResult = $this->Database->select('FinanceYear', '*', '1 ORDER BY `Year` DESC LIMIT 1');
     } else $DbResult = $this->Database->select('FinanceYear', '*', '`Year`='.$Year);
     if($DbResult->num_rows == 0) {
           if($Year == date('Y'))
+    if ($DbResult->num_rows == 0) {
+          if ($Year == date('Y'))
+          {
                 $this->CreateFinanceYear($Year);
 …
+        }
     $FinanceYear = $DbResult->fetch_assoc();
     if($FinanceYear['Closed'] == 1)
+    if ($FinanceYear['Closed'] == 1)
       throw new Exception('Rok '.$FinanceYear['Year'].' je již uzavřen. Nelze do něj přidávat položky.');
     return $FinanceYear;
 …
     $Sequence = $DbResult->fetch_assoc();
     if($Sequence['YearPrefix'] == 1)
+    if ($Sequence['YearPrefix'] == 1)
+    {
       $Result = $DocumentLine['Shortcut'].$Sequence['NextNumber'].'/'.$FinanceYear['Year'];
 …
     $this->Database->query('UPDATE `DocumentLineSequence` SET `NextNumber` = `NextNumber` + 1 '.
       'WHERE (`DocumentLine`='.$Id.') AND (`FinanceYear`='.$FinanceYear['Id'].')');
     return($Result);
+    return ($Result);
+  }
 …
+  {
     $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE `Id`= '.$Id);
     if($DbResult->num_rows == 1) {
+    if ($DbResult->num_rows == 1) {
       $Group = $DbResult->fetch_assoc();
       return($Group);
+      return ($Group);
     } else die('Finance group id '.$Id.' not found in table '.$Table);
+  }
 …
     $this->Database->query('TRUNCATE TABLE `MemberPayment`');
     $DbResult = $this->Database->query('SELECT * FROM `Member`');
     while($Member = $DbResult->fetch_assoc())
+    while ($Member = $DbResult->fetch_assoc())
+    {
       $DbResult2 = $this->Database->query('SELECT ((SELECT COALESCE(SUM(`Value`), 0) FROM `FinanceOperation` '.
 …
       $DbRow = $DbResult2->fetch_assoc();
       $Monthly = 0;
       if($DbRow['Price'] != '') $MonthlyInet = $DbRow['Price'];
+      if ($DbRow['Price'] != '') $MonthlyInet = $DbRow['Price'];
       else $MonthlyInet = 0;
 …
       $Monthly = round($Monthly);
       if($Member['BillingPeriod'] == 1)
+      if ($Member['BillingPeriod'] == 1)
+      {
         // Inactive payer
 …
+    }
     $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'RecalculateMemberPayment');
     return($Output);
+    return ($Output);
+  }
 …
       TimeToMysqlDate($Time).'") OR (ValidTo IS NULL)) LIMIT 1');
     $Row = $DbResult->fetch_array();
     return($Row[0]);
+    return ($Row[0]);
+  }
+}
 …
   function BeforeInsertFinanceOperation($Form)
+  {
     if(array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
+    if (array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
       else $Year = date("Y", $Form->Values['ValidFrom']);
     $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);
+  }
 …
     $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
       ($Form->Values['ValueUser'] * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
     return($Form->Values);
+    return ($Form->Values);
+  }
 …
     $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
       ($Form->Values['ValueUser'] * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
     return($Form->Values);
+    return ($Form->Values);
+  }
 …
+  {
     // Get new DocumentLineCode by selected invoice Group
     if(array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
+    if (array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
       else $Year = date("Y", $Form->Values['ValidFrom']);
     $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);
+  }
 …
     $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
       ($Sum * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
     return($Form->Values);
+    return ($Form->Values);
+  }
 …
     $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
       ($Sum * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
     return($Form->Values);
+    return ($Form->Values);
+  }
 …
     $ParentForm->LoadValuesFromDatabase($Form->Values['FinanceInvoice']);
     $this->AfterInsertFinanceInvoice($ParentForm, $Form->Values['FinanceInvoice']);
     return($Form->Values);
+    return ($Form->Values);
+  }
 …
     $ParentForm->LoadValuesFromDatabase($Form->Values['FinanceInvoice']);
     $this->BeforeModifyFinanceInvoice($ParentForm, $Form->Values['FinanceInvoice']);
     return($Form->Values);
+    return ($Form->Values);
+  }
   function BeforeInsertContract($Form)
+  {
     if(array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
+    if (array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
       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

-              r812
+              r873
   function Show()
+  {
     if(!$this->System->User->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
     if(array_key_exists('Operation', $_GET))
+    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
 …
       $Output .= '<input type="submit" value="Analyzovat"/>';
       $Output .= '</form>';
       return($Output);
+      return ($Output);
+    }
+  }
 …
     $Finance->LoadMonthParameters(0);
     $Data = explode("\n", $_POST['Source']);
     foreach($Data as $Key => $Value)
+    foreach ($Data as $Key => $Value)
+    {
       $Value = str_replace('\"', '"', $Value);
       $Data[$Key] = str_getcsv($Value, ',', '"', "\\");
       //print_r($Data[$Key]);
       foreach($Data[$Key] as $Key2 => $Value2)
+      foreach ($Data[$Key] as $Key2 => $Value2)
+      {
         if(substr($Data[$Key][$Key2], 0, 2) == '\"')
+        if (substr($Data[$Key][$Key2], 0, 2) == '\"')
           $Data[$Key][$Key2] = substr($Data[$Key][$Key2], 2, -2);
+      }
 …
     //print_r($Data);
     if($Header != $Data[0]) {
+    if ($Header != $Data[0]) {
       $Output = 'Nekompatibilní struktura CSV';
       print_r($Header);
 …
       $Output = '<form action="?Operation=insert" method="post">';
       $I = 0;
       foreach($Data as $Key => $Value)
+      foreach ($Data as $Key => $Value)
+      {
         if(count($Value) <= 1) continue;
         if($Value[9] == '') $Value[5] = 128; // Žádný účet => Poštovní spořitelna
+        if (count($Value) <= 1) continue;
+        if ($Value[9] == '') $Value[5] = 128; // Žádný účet => Poštovní spořitelna
         $Time = explode('.', $Value[0]);
         $Time = $Time[2].'-'.$Time[1].'-'.$Time[0];
         $Money = $Value[1];
         if(is_numeric($Value[5]))
+        if (is_numeric($Value[5]))
+        {
           $Subject = $Value[5] * 1;
           $DbResult = $this->Database->query('SELECT Id FROM Subject WHERE Id='.$this->Database->real_escape_string($Subject));
           if($DbResult->num_rows == 0) $Subject = '? ('.($Value[5] * 1).')';
+          if ($DbResult->num_rows == 0) $Subject = '? ('.($Value[5] * 1).')';
         } else
+        {
           $Subject = '? ('.$Value[5].')';
+        }
         if(!is_numeric($Subject))
+        if (!is_numeric($Subject))
+        {
           $Mode = 'Ručně';
 …
+        }
         if($Money < 0) $Text = 'Platba převodem';
+        if ($Money < 0) $Text = 'Platba převodem';
           else $Text = 'Přijatá platba';
         $Automatic .= '<tr>'.
 …
       $Output .= '<input type="submit" value="Zpracovat"/></form>';
+    }
     return($Output);
+    return ($Output);
+  }
 …
     $Output = '';
     for($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
+    for ($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
+    {
       if($_POST['Money'.$I] < 0) {
+      if ($_POST['Money'.$I] < 0) {
         $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_OUT, 'FinanceOperationGroup');
       } else {
 …
       $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');
+    }
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/Finance/Manage.php

-              r866
+              r873
+  {
     $Output = '';
     if(!$this->System->User->CheckPermission('Finance', 'Manage'))
       return('Nemáte oprávnění');
     if(array_key_exists('Operation', $_GET)) $Operation = $_GET['Operation'];
+    if (!$this->System->User->CheckPermission('Finance', 'Manage'))
+      return ('Nemáte oprávnění');
+    if (array_key_exists('Operation', $_GET)) $Operation = $_GET['Operation'];
       else $Operation = '';
     switch($Operation)
+    switch ($Operation)
+    {
       case 'Recalculate':
 …
         $Output .= '<a href="'.$this->System->Link('/finance/import/').'">Import plateb</a><br />';
+    }
     return($Output);
+    return ($Output);
+  }
 …
     $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);
 …
     $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`, '.
 …
     $DbResult = $this->Database->query($Query);
     while($Row = $DbResult->fetch_assoc())
+    while ($Row = $DbResult->fetch_assoc())
+    {
       $Output .= '<tr>'.
 …
     $Output .= $PageList['Output'];
     $Output .= '<a href="?Operation=ProcessMonthlyPayment">Generovat faktury</a>';
     return($Output);
+    return ($Output);
+  }
 …
     $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
     $SumValue = 0;
     foreach($Items as $Item) {
+    foreach ($Items as $Item) {
       $SumValue = $SumValue + $Item['Price'] * $Item['Quantity'];
+    }
 …
       'Generate' => 1, 'Group' => $Group['Id']));
     $InvoiceId = $this->Database->insert_id;
     foreach($Items as $Item)
+    foreach ($Items as $Item)
       $this->Database->insert('FinanceInvoiceItem', array('FinanceInvoice' => $InvoiceId,
         'Description' => $Item['Description'], 'Price' => $Item['Price'],
 …
     //$LastInsertTime = $Time;
     //$this->CheckAdvancesAndLiabilities($Subject);
     return($InvoiceId);
+    return ($InvoiceId);
+  }
 …
       'FROM `MemberPayment` JOIN `Member` ON `Member`.`Id`=`MemberPayment`.`Member` '.
       'JOIN `Subject` ON `Subject`.`Id`=`Member`.`Subject`');
     while($Member = $DbResult->fetch_assoc())
+    while ($Member = $DbResult->fetch_assoc())
+    {
       $Output .= $Member['SubjectName'].': ';
 …
       /* Check if need to produce new invoice for customer */
       if(($Period['MonthCount'] > 0) and ($Member['Blocked'] == 0) and
+      if (($Period['MonthCount'] > 0) and ($Member['Blocked'] == 0) and
         ($Period['From'] > $Member['BillingPeriodLastUnixTime']))
+      {
 …
           'WHERE (`ServiceCustomerRel`.`Customer`='.
           $Member['Id'].') AND (`ServiceCustomerRel`.`ChangeAction` IS NULL) ');
         while($Service = $DbResult2->fetch_assoc())
+        while ($Service = $DbResult2->fetch_assoc())
+        {
           $InvoiceItems[] = array('Description' => $Service['Name'], 'Price' => $Service['Price'],
 …
         // TODO: In case of negative invoice it is not sufficient to reverse invoicing direction
         // Other subject should invoice only positive items. Negative items should be somehow removed.
         if($MonthlyTotal >= 0)
+        if ($MonthlyTotal >= 0)
+        {
           $InvoiceGroupId = INVOICE_GROUP_OUT;
 …
         // Load invoice group
         $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($InvoiceGroupId, 'FinanceInvoiceGroup');
         foreach($InvoiceItems as $Index => $Item)
+        foreach ($InvoiceItems as $Index => $Item)
+        {
           $InvoiceItems[$Index]['Price'] = $Item['Price'] * $FinanceGroup['ValueSign'];
+        }
         if($PayPerPeriod != 0)
+        if ($PayPerPeriod != 0)
+        {
           $TimePeriodText = date('j.n.Y', $Period['From']).' - '.date('j.n.Y', $Period['To']);
 …
       $Output .= "\n";
+    }
     return($Output);
+    return ($Output);
+  }
 …
     $DbResult = $this->Database->select($Table, '*', '(`ChangeAction` IS NOT NULL) AND '.
       '(`ChangeTime` <= "'.TimeToMysqlDateTime($Time).'") ORDER BY `ChangeTime` ASC');
     while($Service = $DbResult->fetch_assoc())
+    {
       if($Service['ChangeAction'] == 'add')
+    while ($Service = $DbResult->fetch_assoc())
+    {
+      if ($Service['ChangeAction'] == 'add')
+      {
         unset($Service['Id']);
 …
         $this->Database->insert($Table, $Service);
       } else
       if($Service['ChangeAction'] == 'modify')
+      if ($Service['ChangeAction'] == 'modify')
+      {
         unset($Service['Id']);
 …
         $this->Database->update($Table, '`Id`='.$ReplaceId, $Service);
       } else
       if($Service['ChangeAction'] == 'delete')
+      if ($Service['ChangeAction'] == 'delete')
+      {
         $this->Database->delete($Table, '`Id`='.$Service['ReplaceId']);
 …
     $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 = '';
 …
     // Zkontrolovat odečtení měsíčního poplatku
     $Output .= 'Kontrola odečtení poplatků: Poslední měsíc-'.$MonthLast.' Aktuální měsíc-'.$MonthCurrent."\n";
     if($MonthCurrent != $MonthLast)
+    if ($MonthCurrent != $MonthLast)
+    {
       $Output .= 'Odečítám pravidelný poplatek...'."\n";
 …
+    }
     $Output = str_replace("\n", '<br/>', $Output);
     return($Output);
+    return ($Output);
+  }
 …
     $MainSubjectAccount = $DbResult->fetch_assoc();
     if($User['Email'] != '')
+    if ($User['Email'] != '')
+    {
       $Title = 'Pravidelné vyúčtování služeb';
 …
         '`Time`, -`Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='.
         $Member['Subject'].')) ORDER BY `Time` DESC) AS `T1` WHERE (`T1`.`Time` > "'.$Member['BillingPeriodLastDate'].'")');
       while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
+      {
         $Text = $DbRow['Text'];
 …
     $DbResult = $this->Database->query('SELECT * FROM `FinanceInvoice` WHERE (`BillCode` <> "") '.
       'AND (`Value` != 0) AND (`Generate` = 1)'.$Where);
     while($Row = $DbResult->fetch_assoc())
+    while ($Row = $DbResult->fetch_assoc())
+    {
       if ($Row['File'] == null)
 …
     $DbResult = $this->Database->query('SELECT * FROM `FinanceOperation` WHERE (`BillCode` <> "") '.
         'AND (`Value` != 0) AND (`Generate` = 1)'.$Where);
     while($Row = $DbResult->fetch_assoc())
+    while ($Row = $DbResult->fetch_assoc())
+    {
       if ($Row['File'] == null)
 …
       $FullFileName = $this->System->Modules['File']->GetDir($this->System->Modules['Finance']->DirectoryId).$FileName;
       $Bill->SaveToFile($FullFileName);
       if(file_exists($FullFileName))
+      if (file_exists($FullFileName))
+      {
         $this->Database->update('File', 'Id='.$FileId, array('Name' => $FileName, 'Size' => filesize($FullFileName)));
 …
     $Output .= $this->GenerateInvoice(' AND (`File` IS NULL)');
     $Output .= $this->GenerateOperation(' AND (`File` IS NULL)');
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/Finance/Trade.php

-              r847
+              r873
     $Row = $DbResult->fetch_array();
     $Balance['SmallAssets']['End'] = $Row[0] + 0;
     return($Balance);
+    return ($Balance);
+  }
 …
     $StartYear = date('Y', $this->StartEvidence);
     $EndYear = date('Y', time());
     for($Year = $StartYear; $Year <= $EndYear; $Year++)
+    for ($Year = $StartYear; $Year <= $EndYear; $Year++)
+    {
       $EndTime = mktime(0, 0, 0, 12, 31, $Year);
       //$Year = date('Y', $EndTime);
       $StartTime = mktime(0, 0, 0, 1, 1, $Year);
       if($StartTime < $this->StartEvidence) $StartTime = $this->StartEvidence;
+      if ($StartTime < $this->StartEvidence) $StartTime = $this->StartEvidence;
       $Balance = $this->GetTimePeriodBalance($StartTime, $EndTime);
 …
     $StartYear = date('Y', $this->StartEvidence);
     $EndYear = date('Y', time());
     for($Year = $StartYear; $Year <= $EndYear; $Year++)
+    {
       for($Month = 1; $Month <= 12; $Month++)
+    for ($Year = $StartYear; $Year <= $EndYear; $Year++)
+    {
+      for ($Month = 1; $Month <= 12; $Month++)
+      {
         $EndTime = mktime(0, 0, 0, $Month, 31, $Year);
         //$Year = date('Y', $EndTime);
         $StartTime = mktime(0, 0, 0, $Month, 1, $Year);
         if(($StartTime < time()) and ($EndTime > $this->StartEvidence))
+        if (($StartTime < time()) and ($EndTime > $this->StartEvidence))
+        {
           if($StartTime < $this->StartEvidence) $StartTime = $this->StartEvidence;
+          if ($StartTime < $this->StartEvidence) $StartTime = $this->StartEvidence;
           $Balance = $this->GetTimePeriodBalance($StartTime, $EndTime);
 …
       'WHERE (`ValueSign` = 1) AND (`FinanceOperation`.`Time` >= "'.$Year['DateStart'].'") '.
       'AND (`FinanceOperation`.`Time` <= "'.$Year['DateEnd'].'") ORDER BY `Time`');
     while($Row = $DbResult->fetch_array())
+    while ($Row = $DbResult->fetch_array())
+    {
       $Row['Time'] = explode(' ', $Row['Time']);
 …
       'WHERE (`FinanceOperationGroup`.`ValueSign` = -1) AND (`FinanceOperation`.`Time` >= "'.$Year['DateStart'].'") '.
       'AND (`FinanceOperation`.`Time` <= "'.$Year['DateEnd'].'") ORDER BY `Time`');
     while($Row = $DbResult->fetch_array())
+    while ($Row = $DbResult->fetch_array())
+    {
       $Row['Time'] = explode(' ', $Row['Time']);
 …
       'WHERE (`FinanceInvoiceGroup`.`ValueSign` = 1) AND (`FinanceInvoice`.`Time` >= "'.$Year['DateStart'].
       '") AND (`FinanceInvoice`.`Time` <= "'.$Year['DateEnd'].'") ORDER BY `Time`');
     while($Row = $DbResult->fetch_array())
+    {
       if($Row['TimePayment'] == '0000-00-00 00:00:00') $Row['TimePayment'] = '&nbsp;';
+    while ($Row = $DbResult->fetch_array())
+    {
+      if ($Row['TimePayment'] == '0000-00-00 00:00:00') $Row['TimePayment'] = '&nbsp;';
       $Output .= '<tr><td>'.HumanDate($Row['Time']).'</td><td>'.$Row['BillName'].
       '</td><td>'.$Row['SubjectName'].'</td><td>'.$Row['Text'].'</td><td>'.$Row['Value'].'</td></tr>';
 …
       'WHERE (`FinanceInvoiceGroup`.`ValueSign` = -1) AND (`FinanceInvoice`.`Time` >= "'.$Year['DateStart'].
       '") AND (FinanceInvoice.Time <= "'.$Year['DateEnd'].'") ORDER BY Time');
     while($Row = $DbResult->fetch_array())
+    {
       if($Row['TimePayment'] == '0000-00-00 00:00:00') $Row['TimePayment'] = '&nbsp;';
+    while ($Row = $DbResult->fetch_array())
+    {
+      if ($Row['TimePayment'] == '0000-00-00 00:00:00') $Row['TimePayment'] = '&nbsp;';
       $Row['Value'] = $Row['Value'] * $Row['ValueSign'];
       $Output .= '<tr><td>'.HumanDate($Row['Time']).'</td><td>'.$Row['BillName'].
 …
       'WHERE (T6.Subject = Subject.Id) AND (`FinanceOperationGroup`.`ValueSign` = -1)) AS `Spends` '.
       'FROM Subject ORDER BY Name');
     while($Row = $DbResult->fetch_assoc())
+    while ($Row = $DbResult->fetch_assoc())
+    {
       $Output .= '<tr><td style="text-align: left;"><a href="?table=SubjectAccount&Id='.$Row['Id'].'">'.$Row['Name'].'</a></td><td>'.$Row['Liabilities'].' / '.$Row['OpenedLiabilities'].'</td><td>'.$Row['Claims'].' / '.$Row['OpenedClaims'].'</td><td>'.$Row['Gains'].'</td><td>'.$Row['Spends'].'</td><td>'.($Row['Gains'] - $Row['Spends'] - $Row['Claims'] + $Row['Liabilities']).'</td><td>'.$Row['Cash'].'</td></tr>';
 …
       'FROM StockSerialNumber JOIN Product ON Product.Id = StockSerialNumber.Product '.
       'WHERE (TimeElimination IS NOT NULL)');
     while($Row = $DbResult->fetch_array())
+    while ($Row = $DbResult->fetch_array())
+    {
       $Output .= '<tr><td>'.$Row['Name'].'</td><td>'.$Row['Price'].'</td><td>'.$Row['TimeEnlistment'].'</td><td>'.$Row['TimeElimination'].'</td></tr>';
 …
       'LEFT JOIN `FinanceOperationGroup` ON `FinanceOperationGroup`.`Id` = `FinanceOperation`.`Group` '.
       'WHERE `Subject`='.$_GET['Id'].' ORDER BY `Time`');
     while($Row = $DbResult->fetch_array())
+    while ($Row = $DbResult->fetch_array())
+    {
       $Output .= '<tr><td>'.HumanDate($Row['Time']).'</td><td>'.$Row['Text'].
 …
       'LEFT JOIN `DocumentLineCode` ON `DocumentLineCode`.`Id` = `FinanceInvoice`.`BillCode` '.
       'WHERE `Subject`='.$_GET['Id'].' ORDER BY `Time`');
     while($Row = $DbResult->fetch_array())
+    while ($Row = $DbResult->fetch_array())
+    {
       $Output .= '<tr><td>'.HumanDate($Row['Time']).'</td><td>'.HumanDate($Row['TimePayment']).
 …
      $Output .= '<tr><th>Datum vytvoření</th><th>Datum zaplacení</th><th>Název</th><th>Hodnota [Kč]</th></tr>';
      $DbResult = $this->Database->select('FinanceAdvances', '*', 'Subject='.$_GET['Id']);
      while($Row = $DbResult->fetch_array())
+     while ($Row = $DbResult->fetch_array())
+     {
      $Output .= '<tr><td>'.$Row['Time'].'</td><td>'.$Row['TimePass'].'</td><td>'.$Row['ValueSign'].'</td><td>'.($Row['Value']).'</td><td>'.$Row['CashFlowId'].'</td></tr>';
 …
     $Output .= '<strong>Roční přehledy</strong><br/>';
     $Output .= $this->ShowFinanceYears();
     if(array_key_exists('year', $_GET))
+    if (array_key_exists('year', $_GET))
+    {
       $Year = $_GET['year'] * 1;
 …
   function Show()
+  {
     if(!$this->System->User->CheckPermission('Finance', 'TradingStatus'))
       return('Nemáte oprávnění');
+    if (!$this->System->User->CheckPermission('Finance', 'TradingStatus'))
+      return ('Nemáte oprávnění');
     $Finance = &$this->System->Modules['Finance'];
     $Output = '';
     if(!array_key_exists('table', $_GET)) $_GET['table'] = '';
     switch($_GET['table'])
+    if (!array_key_exists('table', $_GET)) $_GET['table'] = '';
+    switch ($_GET['table'])
+    {
       case 'AnnualBalance':
 …
         $Output = $this->ShowDefault();
+    }
     return($Output);
+    return ($Output);
+  }
 …
     $Output = 'Roky: ';
     $DbRows = $this->Database->select('FinanceYear', '*');
     while($DbRow = $DbRows->fetch_assoc())
+    while ($DbRow = $DbRows->fetch_assoc())
       $Output .= '<a href="?year='.$DbRow['Id'].'">'.$DbRow['Year'].'</a> ';
     $Output .= '<br/>';
     return($Output);
+    return ($Output);
+  }

trunk/Modules/Finance/UserState.php

-              r825
+              r873
     $DbResult = $this->Database->query($Query);
     $SumValue = 0;
     while($Row = $DbResult->fetch_assoc())
+    while ($Row = $DbResult->fetch_assoc())
+    {
       $Row['State'] = round($Row['State'], 2);
       if($Row['State'] > 0) $Row['State'] = '<span style="color:green;">'.$Row['State'].'</span>';
       if($Row['State'] < 0) $Row['State'] = '<span style="color:red;">'.$Row['State'].'</span>';
       if($Row['Value'] == -0) $Row['Value'] = 0;
       if($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
       if($Row['BillName'] == '') $Row['BillName'] = 'PDF';
       if($Row['File'] > 0) $Invoice = '<a href="'.$this->System->Link('/file?id='.$Row['File']).'">'.$Row['BillName'].'</a>';
+      if ($Row['State'] > 0) $Row['State'] = '<span style="color:green;">'.$Row['State'].'</span>';
+      if ($Row['State'] < 0) $Row['State'] = '<span style="color:red;">'.$Row['State'].'</span>';
+      if ($Row['Value'] == -0) $Row['Value'] = 0;
+      if ($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
+      if ($Row['BillName'] == '') $Row['BillName'] = 'PDF';
+      if ($Row['File'] > 0) $Invoice = '<a href="'.$this->System->Link('/file?id='.$Row['File']).'">'.$Row['BillName'].'</a>';
         else $Invoice = NotBlank($Row['BillName']);
       if($Row['PeriodFrom'] != '') $Period = HumanDate($Row['PeriodFrom']).' - '.HumanDate($Row['PeriodTo']);
+      if ($Row['PeriodFrom'] != '') $Period = HumanDate($Row['PeriodFrom']).' - '.HumanDate($Row['PeriodTo']);
         else $Period = '&nbsp;';
       $Output .= '<tr><td style="text-align: right;">'.HumanDate($Row['Time']).'</td>'.
 …
     $Output .= '</table>';
     $Output .= $PageList['Output'];
     return($Output);
+    return ($Output);
+  }
 …
     // Determine which customer should be displayed
     if(array_key_exists('i', $_GET))
+    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');
       if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
+      {
         $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'));
+    }
     // Load customer info
     $DbResult = $this->Database->query('SELECT * FROM `Member` WHERE `Id`='.$CustomerId);
     if($DbResult->num_rows == 1)
+    if ($DbResult->num_rows == 1)
+    {
       $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'));
     // Load subject info
     $DbResult = $this->Database->query('SELECT * FROM `Subject` WHERE `Id`='.$Customer['Subject']);
     if($DbResult->num_rows == 1)
+    if ($DbResult->num_rows == 1)
+    {
       $Subject = $DbResult->fetch_assoc();
     } else return($this->SystemMessage('Položka nenalezena', 'Subjekt nenalezen'));
+    } else return ($this->SystemMessage('Položka nenalezena', 'Subjekt nenalezen'));
 …
       'LEFT JOIN `Service` ON `Service`.`Id`=`ServiceCustomerRel`.`Service` '.
       'WHERE (`ServiceCustomerRel`.`Customer`='.$Customer['Id'].') AND (`ServiceCustomerRel`.`ChangeAction` IS NULL)');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
       $Output .= '<tr><td>'.$DbRow['Name'].'</td><td>'.$DbRow['Price'].'</td></tr>';
 …
     $Output .= '</td></tr></table>';
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/FinanceBankAPI/FileImport.php

-              r765
+              r873
+  {
     $DbResult = $this->Database->select('FinanceBankImport', '*', 'FinanceOperation IS NULL');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
       if(is_numeric($DbRow['VariableSymbol']))
+      if (is_numeric($DbRow['VariableSymbol']))
+      {
         $DbResult2 = $this->Database->select('Subject', 'Id', 'Id='.$DbRow['VariableSymbol']);
         if($DbResult2->num_rows == 1)
+        if ($DbResult2->num_rows == 1)
+        {
           $DbRow2 = $DbResult2->fetch_assoc();
           if($DbRow['Value'] >= 0) {
+          if ($DbRow['Value'] >= 0) {
             $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_IN, 'FinanceOperationGroup');
           } else {
 …
           $Form->SetClass('FinanceOperation');
           $Form->LoadValuesFromDatabase($Id);
           if(array_key_exists('AfterInsert', $Form->Definition))
+          if (array_key_exists('AfterInsert', $Form->Definition))
+          {
             $Class = $Form->Definition['AfterInsert'][0];
 …
     $Output .= 'Účet: '.$BankAccount['Number'].'/'.$Bank['Code'].' ('.$Bank['Name'].')'."\n";
     if($Bank['Code'] == '2010') $Import = new ImportFio($this->System);
       else if($Bank['Code'] == '0300') $Import = new ImportPS($this->System);
+    if ($Bank['Code'] == '2010') $Import = new ImportFio($this->System);
+      else if ($Bank['Code'] == '0300') $Import = new ImportPS($this->System);
       else $Output = $this->SystemMessage('Nepodporované API', 'Pro zvolenou banku není import podporován');
     if(isset($Import))
+    if (isset($Import))
+    {
       $Import->BankAccount = $BankAccount;
 …
       $Import->PairOperations();
+    }
     return($Output);
+    return ($Output);
+  }
   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í');
     $Output = $this->Import($_GET['i']);
     return($Output);
+    return ($Output);
+  }
+}
 …
+  {
     $Output = '';
     if(!$this->System->User->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
     if(array_key_exists('Operation', $_GET))
+    if (!$this->System->User->CheckPermission('Finance', 'SubjectList')) return ('Nemáte oprávnění');
+    if (array_key_exists('Operation', $_GET))
+    {
       if($_GET['Operation'] == 'prepare') $Output .= $this->Prepare();
       else if($_GET['Operation'] == 'insert') $Output .= $this->Insert();
+      if ($_GET['Operation'] == 'prepare') $Output .= $this->Prepare();
+      else if ($_GET['Operation'] == 'insert') $Output .= $this->Insert();
       else $Output .= 'Neplatná akce';
     } else $Output .= $this->ShowForm();
     return($Output);
+    return ($Output);
+  }
 …
     $Form->Values['BankAccount'] = $_GET['id'];
     $Output = $Form->ShowEditForm();
     return($Output);
+    return ($Output);
+  }
 …
     $Output .= 'Účet: '.$BankAccount['Number'].'/'.$Bank['Code'].' ('.$Bank['Name'].')';
     if($Bank['Code'] == '2010') $Import = new ImportFio($this->System);
       else if($Bank['Code'] == '0300') $Import = new ImportPS($this->System);
+    if ($Bank['Code'] == '2010') $Import = new ImportFio($this->System);
+      else if ($Bank['Code'] == '0300') $Import = new ImportPS($this->System);
       else $Output = $this->SystemMessage('Nepodporované API', 'Pro zvolenou banku není import podporován');
     $Import->BankAccount = $BankAccount;
     $Output .= $Import->ImportFile($File->GetContent(), $File->GetExt());
     return($Output);
+    return ($Output);
+  }
 …
     $Output = '';
     for($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
+    for ($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
+    {
       if($_POST['Money'.$I] >= 0) {
+      if ($_POST['Money'.$I] >= 0) {
         $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_IN,
           'FinanceOperationGroup');
 …
       $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');
+    }
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

r799	r873
76	76	$DbRow = $DbResult->fetch_row();
77	77	$Output = 'Nezpárovaných plateb: '.$DbRow['0'].'<br/>';
78		return($Output);
	78	return ($Output);
79	79	}
80	80
…	…
82	82	{
83	83	$Preset = array();
84		if($Item['Value'] < 0) $OperationGroupId = OPERATION_GROUP_ACCOUNT_OUT;
	84	if ($Item['Value'] < 0) $OperationGroupId = OPERATION_GROUP_ACCOUNT_OUT;
85	85	else $OperationGroupId = OPERATION_GROUP_ACCOUNT_IN;
86	86	$FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($OperationGroupId, 'FinanceOperationGroup');
…	…
94	94	'presetBankAccount' => $Item['BankAccount'],
95	95	'presetGroup' => $FinanceGroup['Id']);
96		return($Preset);
	96	return ($Preset);
97	97	}
98	98	}
…	…
106	106	'(`AutoImport`=1) AND (`TimeCreate` < NOW()) AND '.
107	107	'((`TimeEnd` IS NULL) OR (`TimeEnd` > NOW()))');
108		while($DbRow = $DbResult->fetch_assoc())
	108	while ($DbRow = $DbResult->fetch_assoc())
109	109	{
110	110	echo($DbRow['Comment']."\n");
…	…
112	112	$Output .= $Page->Import($DbRow['Id']);
113	113	}
114		return($Output);
	114	return ($Output);
115	115	}
116	116	}

trunk/Modules/FinanceBankAPI/Fio.php

-              r738
+              r873
   function Import($TimeFrom, $TimeTo)
+  {
     if($this->UserName == '') throw new Exception('Missing value for UserName property.');
     if($this->Password == '') throw new Exception('Missing value for Password property.');
     if(!is_numeric($this->Account)) throw new Exception('Missing or not numeric value for Account property.');
+    if ($this->UserName == '') throw new Exception('Missing value for UserName property.');
+    if ($this->Password == '') throw new Exception('Missing value for Password property.');
+    if (!is_numeric($this->Account)) throw new Exception('Missing or not numeric value for Account property.');
     $fp = fsockopen('ssl://www.fio.cz', 443, $errno, $errstr, 30);
     if(!$fp)
+    if (!$fp)
+    {
       throw new Exception('Connection error: '.$errstr);
 …
       // Read response
       $Response = array();
       while(!feof($fp))
+      while (!feof($fp))
+      {
         $Response[] = trim(fgets($fp, 1024));
 …
       // Strip HTTP header
       while($Response[0] != '') array_shift($Response);
+      while ($Response[0] != '') array_shift($Response);
       array_shift($Response); // Remove empty line
       //echo(implode("\n", $Response));
 …
       $GPC = new GPC();
       $Result = array();
       foreach($Response as $Index => $Line)
+      foreach ($Response as $Index => $Line)
+      {
         if(($Index == 0) and (substr($Line, 0, strlen(GPC_TYPE_REPORT)) != GPC_TYPE_REPORT)) $this->NoValidDataError($Response);
+        if (($Index == 0) and (substr($Line, 0, strlen(GPC_TYPE_REPORT)) != GPC_TYPE_REPORT)) $this->NoValidDataError($Response);
         $GPCLine = $GPC->ParseLine($Line);
         if($GPCLine != NULL) $Result[] = $GPCLine;
+        if ($GPCLine != NULL) $Result[] = $GPCLine;
+      }
       return($Result);
+      return ($Result);
+    }
+  }
 …
   $Response = implode('', $Response);
     $ErrorMessageStart = '<div id="oldform_warning">';
     if(strpos($Response, $ErrorMessageStart) !== false)
+    if (strpos($Response, $ErrorMessageStart) !== false)
+  {
     $Response = substr($Response, strpos($Response, $ErrorMessageStart) + strlen($ErrorMessageStart));

trunk/Modules/FinanceBankAPI/FioAPI.php

-              r836
+              r873
 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);
+}
 …
   function Import($TimeFrom, $TimeTo)
+  {
     if($this->Token == '') throw new Exception('Missing value for Token property.');
+    if ($this->Token == '') throw new Exception('Missing value for Token property.');
     // URL format: https://www.fio.cz/ib_api/rest/periods/{token}/{datum od}/{datum do}/transactions.{format}
 …
     $Response = '';
     $Response = @file_get_contents('https://www.fio.cz'.$RequestURL);
     if($Response == FALSE)
+    if ($Response == FALSE)
+    {
       throw new Exception('Connection error');
     } else
+    {
       if($this->Format == 'gpc') $Response = iconv('windows-1250', $this->Encoding, $Response);
+      if ($this->Format == 'gpc') $Response = iconv('windows-1250', $this->Encoding, $Response);
       $Response = explode("\n", $Response);
       if($this->Format == 'gpc')
+      if ($this->Format == 'gpc')
+      {
         // Parse all GPC lines
         $GPC = new GPC();
         $Result = array();
         foreach($Response as $Index => $Line)
+        foreach ($Response as $Index => $Line)
+        {
           if(($Index == 0) and (substr($Line, 0, strlen(GPC_TYPE_REPORT)) != GPC_TYPE_REPORT)) $this->NoValidDataError($Response);
+          if (($Index == 0) and (substr($Line, 0, strlen(GPC_TYPE_REPORT)) != GPC_TYPE_REPORT)) $this->NoValidDataError($Response);
           $GPCLine = $GPC->ParseLine($Line);
           if($GPCLine != NULL) $Result[] = $GPCLine;
+          if ($GPCLine != NULL) $Result[] = $GPCLine;
+        }
       } else
       if($this->Format == 'csv')
+      if ($this->Format == 'csv')
+      {
         $Result = array(
 …
         // CVS header
         while((count($Response) > 0) and ($Response[0] != ''))
+        while ((count($Response) > 0) and ($Response[0] != ''))
+        {
           $Line = explode(';', $Response[0]);
           if($Line[0] == 'accountId') $Result['AccountNumber'] = $Line[0];
           else if($Line[0] == 'bankId') $Result['BankId'] = $Line[0];
           else if($Line[0] == 'currency') $Result['Currency'] = $Line[0];
           else if($Line[0] == 'iban') $Result['IBAN'] = $Line[0];
           else if($Line[0] == 'bic') $Result['BIC'] = $Line[0];
           else if($Line[0] == 'openingBalance') $Result['OpeningBalance'] = $Line[0];
           else if($Line[0] == 'closingBalance') $Result['ClosingBalance'] = $Line[0];
           else if($Line[0] == 'dateStart') $Result['DateStart'] = $Line[0];
           else if($Line[0] == 'dateEnd') $Result['DateEnd'] = $Line[0];
           else if($Line[0] == 'idFrom') $Result['IdFrom'] = $Line[0];
           else if($Line[0] == 'idTo') $Result['IdTo'] = $Line[0];
+          if ($Line[0] == 'accountId') $Result['AccountNumber'] = $Line[0];
+          else if ($Line[0] == 'bankId') $Result['BankId'] = $Line[0];
+          else if ($Line[0] == 'currency') $Result['Currency'] = $Line[0];
+          else if ($Line[0] == 'iban') $Result['IBAN'] = $Line[0];
+          else if ($Line[0] == 'bic') $Result['BIC'] = $Line[0];
+          else if ($Line[0] == 'openingBalance') $Result['OpeningBalance'] = $Line[0];
+          else if ($Line[0] == 'closingBalance') $Result['ClosingBalance'] = $Line[0];
+          else if ($Line[0] == 'dateStart') $Result['DateStart'] = $Line[0];
+          else if ($Line[0] == 'dateEnd') $Result['DateEnd'] = $Line[0];
+          else if ($Line[0] == 'idFrom') $Result['IdFrom'] = $Line[0];
+          else if ($Line[0] == 'idTo') $Result['IdTo'] = $Line[0];
           array_shift($Response);
+        }
         array_shift($Response); // Remove empty line
         if((count($Response) == 0) or
+        if ((count($Response) == 0) or
           ($Response[0] != 'ID pohybu;Datum;Objem;Měna;Protiúčet;Název protiúčtu;Kód banky;Název banky;KS;VS;SS;Uživatelská identifikace;Zpráva pro příjemce;Typ;Provedl;Upřesnění;Komentář;BIC;ID pokynu')
           ) throw new Exception('Unsupported CSV header');
         array_shift($Response);
         array_pop($Response);
         foreach($Response as $Index => $Line)
+        foreach ($Response as $Index => $Line)
+        {
           $Line = explode(';', $Line);
 …
+        }
+      }
       return($Result);
+      return ($Result);
+    }
+  }
 …
     $Response = implode('', $Response);
     $ErrorMessageStart = '<div id="oldform_warning">';
     if(strpos($Response, $ErrorMessageStart) !== false)
+    if (strpos($Response, $ErrorMessageStart) !== false)
+    {
       $Response = substr($Response, strpos($Response, $ErrorMessageStart) + strlen($ErrorMessageStart));

trunk/Modules/FinanceBankAPI/FioDemo.php

-              r738
+              r873
 echo('<html><head><meta charset="utf-8"></head><body>');
 echo('<table border="1">');
 foreach($Records as $Record)
+foreach ($Records as $Record)
+{
   echo('<tr>');
   if($Record['Type'] == GPC_TYPE_REPORT)
+  if ($Record['Type'] == GPC_TYPE_REPORT)
+  {
     echo('<td>Jméno účtu: '.$Record['AccountName'].'</td>');
 …
     echo('<th>Uživatelská identifikace</th>');
   } else
   if($Record['Type'] == GPC_TYPE_ITEM)
+  if ($Record['Type'] == GPC_TYPE_ITEM)
+  {
     echo('<td>'.date('j.n.Y', $Record['DueDate']).'</td>');

trunk/Modules/FinanceBankAPI/GPC.php

r738	r873
11	11	$Type = mb_substr($Line, 1, 3);
12	12
13		if($Type == GPC_TYPE_REPORT)
	13	if ($Type == GPC_TYPE_REPORT)
14	14	{
15	15	$GPCLine = array
…	…
29	29	);
30	30	} else
31		if($Type == GPC_TYPE_ITEM)
	31	if ($Type == GPC_TYPE_ITEM)
32	32	{
33	33	$GPCLine = array
…	…
53	53	$GPCLine = NULL;
54	54
55		return($GPCLine);
	55	return ($GPCLine);
56	56	}
57	57	}

trunk/Modules/FinanceBankAPI/ImportFio.php

-              r765
+              r873
     $Fio = new FioAPI();
     $Fio->Token = $this->BankAccount['LoginName'];
     if($this->BankAccount['LastImportDate'] == '') $PeriodStart = time();
+    if ($this->BankAccount['LastImportDate'] == '') $PeriodStart = time();
       else $PeriodStart = MysqlDateToTime($this->BankAccount['LastImportDate']);
     $PeriodEnd = time();
 …
         //$Output .= '<td>Suma výdajů: '.$Records['DebitValue'].' Kč</td>';
       //$Output .= '</tr>';
     foreach($Records['Items'] as $Record)
+    foreach ($Records['Items'] as $Record)
+    {
       $DbResult = $this->Database->select('FinanceBankImport', 'ID', 'Identification='.$Record['ID']);
       if($DbResult->num_rows == 0)
+      if ($DbResult->num_rows == 0)
+      {
         $Output .= '<tr>';
 …
     $this->Database->update('FinanceBankAccount', 'Id='.$this->BankAccount['Id'],
       array('LastImportDate' => TimeToMysqlDate($PeriodEnd)));
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/FinanceBankAPI/ImportPS.php

-              r738
+              r873
   function ImportFile($Content, $Ext)
+  {
     if($Ext == 'txt') $this->ImportTxt($Content);
       else if($Ext == 'cvs') $this->ImportCVS($Content);
+    if ($Ext == 'txt') $this->ImportTxt($Content);
+      else if ($Ext == 'cvs') $this->ImportCVS($Content);
+  }
 …
     $Data = explode("\n", $Content);
     foreach($Data as $Key => $Value)
+    foreach ($Data as $Key => $Value)
+    {
       $Value = str_replace('\"', '"', $Value);
       $Data[$Key] = str_getcsv($Value, ',', '"', "\\");
       //print_r($Data[$Key]);
       foreach($Data[$Key] as $Key2 => $Value2)
+      foreach ($Data[$Key] as $Key2 => $Value2)
+      {
         if(substr($Data[$Key][$Key2], 0, 2) == '\"')
+        if (substr($Data[$Key][$Key2], 0, 2) == '\"')
           $Data[$Key][$Key2] = substr($Data[$Key][$Key2], 2, -2);
+      }
 …
     );
     if($Header != $Data[0]) $Output = 'Nekompatibilní struktura CSV';
+    if ($Header != $Data[0]) $Output = 'Nekompatibilní struktura CSV';
     else
+    {
 …
       $Output = '<form action="?Operation=insert" method="post">';
       $I = 0;
       foreach($Data as $Key => $Value)
+      foreach ($Data as $Key => $Value)
+      {
         if(count($Value) <= 1) continue;
         if($Value[9] == '') $Value[5] = 128; // Žádný účet => Poštovní spořitelna
+        if (count($Value) <= 1) continue;
+        if ($Value[9] == '') $Value[5] = 128; // Žádný účet => Poštovní spořitelna
         $Time = explode('.', $Value[0]);
         $Time = $Time[2].'-'.$Time[1].'-'.$Time[0];
         $Money = $Value[1];
         if(is_numeric($Value[5]))
+        if (is_numeric($Value[5]))
+        {
           $Subject = $Value[5] * 1;
           $DbResult = $this->Database->query('SELECT Id FROM Subject WHERE Id='.$this->Database->real_escape_string($Subject));
           if($DbResult->num_rows == 0) $Subject = '? ('.($Value[5] * 1).')';
+          if ($DbResult->num_rows == 0) $Subject = '? ('.($Value[5] * 1).')';
         } else
+        {
           $Subject = '? ('.$Value[5].')';
+        }
         if(!is_numeric($Subject))
+        if (!is_numeric($Subject))
+        {
           $Mode = 'Ručně';
 …
+        }
         if($Money < 0) $Text = 'Platba převodem';
+        if ($Money < 0) $Text = 'Platba převodem';
         else $Text = 'Přijatá platba';
         $Automatic .= '<tr>'.

trunk/Modules/IS/IS.php

-              r871
+              r873
             $DbRow = $DbResult->fetch_assoc();
             $Actions[] = '<a href="javascript:window.close();" onclick="add_select_item('.$Id.',&quot;'.$DbRow['Name'].'&quot;,&quot;'.
               $_GET['r'].'&quot;); set_return('.$Id.',&quot;'.
+              $_GET['r'].'&quot;); set_return ('.$Id.',&quot;'.
               $_GET['r'].'&quot;);"><img alt="Vybrat" title="Vybrat" src="'.
               $this->System->Link('/images/select.png').'"/> Vybrat</a>';
 …
     $this->BasicHTML = true;
     $this->HideMenu = true;
     $RowActions = '<a href="javascript:window.close();" onclick="set_return(#RowId,&quot;'.
+    $RowActions = '<a href="javascript:window.close();" onclick="set_return (#RowId,&quot;'.
       $_GET['r'].'&quot;);"><img alt="Vybrat" title="Vybrat" src="'.
       $this->System->Link('/images/select.png').'"/></a>';
 …
     if (defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
       return 'Nemáte oprávnění';
     if(!array_key_exists($Table, $this->System->FormManager->Classes))
+    if (!array_key_exists($Table, $this->System->FormManager->Classes))
       return $this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena');
     $FormClass = $this->System->FormManager->Classes[$Table];

trunk/Modules/Log/Log.php

-              r681
+              r873
   function NewRecord($Module, $Operation, $Value = '')
+  {
     if(array_key_exists('User', $this->System->ModuleManager->Modules) and
+    if (array_key_exists('User', $this->System->ModuleManager->Modules) and
       array_key_exists('Id', $this->System->User->User))
       $UserId = $this->System->User->User['Id'];
       else $UserId = NULL;
     if(array_key_exists('REMOTE_ADDR', $_SERVER)) $IPAddress = $_SERVER['REMOTE_ADDR'];
+    if (array_key_exists('REMOTE_ADDR', $_SERVER)) $IPAddress = $_SERVER['REMOTE_ADDR'];
       else $IPAddress = '';
     $this->Database->insert('Log', array('Time' => 'NOW()',
 …
     $Output = '';
     $Items = array();
     if(array_key_exists('type', $_GET)) $Where = ' WHERE `Type` = "'.($_GET['type'] * 1).'"';
+    if (array_key_exists('type', $_GET)) $Where = ' WHERE `Type` = "'.($_GET['type'] * 1).'"';
       else $Where = '';
     $sql = 'SELECT *, UNIX_TIMESTAMP(`Time`) AS `TimeCreate`, (SELECT `User`.`Name` FROM `User` WHERE `User`.`Id` = `Log`.`User`) AS `UserName`, `Time` FROM `Log`'.
       $Where.' ORDER BY `Time` DESC LIMIT '.$Count;
     $DbResult = $this->System->Database->query($sql);
     while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
+    {
       $Line['Value'] = preg_replace('/[\x00-\x1F\x80-\xFF]/', '', $Line['Value']);
 …
     $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail'];
     $RSS->Items = $Items;
     return($RSS->Generate());
+    return ($RSS->Generate());
+  }
+}

trunk/Modules/Map/Map.php

-              r865
+              r873
   function Show()
+  {
     if(!$this->System->User->CheckPermission('Map', 'Show'))
       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->User->CheckPermission('Map', 'Show'))
+      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());
+  }
 …
+  {
     $DbResult = $this->Database->select('MapPosition', '*', '`Id`='.$_GET['i']);
     if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
+    {
       $DbRow = $DbResult->fetch_assoc();
 …
       $MapApi->Markers[] = $Marker;
       $Output = $MapApi->ShowPage($this);
       return($Output);
     } else return('Položka nenalezena');
+      return ($Output);
+    } else return ('Položka nenalezena');
+  }
 …
     'WHERE (`NetworkDevice`.`Used`=1) AND (`NetworkDevice`.`MapPosition` IS NOT NULL) '.
     'GROUP BY `NetworkDevice`.`MapPosition`');
     while($Device = $DbResult->fetch_assoc())
+    while ($Device = $DbResult->fetch_assoc())
+    {
       $Pos = explode(';', $Device['Pos']);
 …
     $DbResult = $this->Database->query('SELECT * FROM `NetworkLink` WHERE (`Interface1` <> 0) AND (`Interface2` <> 0)');
     while($Link = $DbResult->fetch_assoc())
+    while ($Link = $DbResult->fetch_assoc())
+    {
       $DbResult2 = $this->Database->query('SELECT `NetworkDevice`.`Used`, `MapPosition`.`Pos` FROM `NetworkDevice` '.
 …
         'JOIN `MapPosition` ON `MapPosition`.`Id` = `NetworkDevice`.`MapPosition` '.
         'WHERE `NetworkDevice`.`Id` = (SELECT `NetworkInterface`.`Device` FROM `NetworkInterface` WHERE `NetworkInterface`.`Id` = '.$Link['Interface2'].')');
       if(($DbResult2->num_rows > 0) and ($DbResult3->num_rows > 0))
+      if (($DbResult2->num_rows > 0) and ($DbResult3->num_rows > 0))
+      {
         $Device1 = $DbResult2->fetch_assoc();
 …
         $Device2 = $DbResult3->fetch_assoc();
         $Pos2 = explode(';', $Device2['Pos']);
         if(($Device1['Used'] == 1) and ($Device2['Used'] == 1))
+        if (($Device1['Used'] == 1) and ($Device2['Used'] == 1))
+        {
           $PolyLine = new MapPolyLine();
 …
         NetworkLinks = [';
     $DbResult = $this->Database->query('SELECT * FROM `NetworkLink` WHERE (`Interface1` <> 0) AND (`Interface2` <> 0)');
     while($Link = $DbResult->fetch_assoc())
+    while ($Link = $DbResult->fetch_assoc())
+    {
       $DbResult2 = $this->Database->query('SELECT `NetworkDevice`.`Used`, `MapPosition`.`Pos` FROM `NetworkDevice` '.
 …
         'JOIN `MapPosition` ON `MapPosition`.`Id` = `NetworkDevice`.`MapPosition` '.
         'WHERE `NetworkDevice`.`Id` = (SELECT `NetworkInterface`.`Device` FROM `NetworkInterface` WHERE `NetworkInterface`.`Id` = '.$Link['Interface2'].')');
       if(($DbResult2->num_rows > 0) and ($DbResult3->num_rows > 0))
+      if (($DbResult2->num_rows > 0) and ($DbResult3->num_rows > 0))
+      {
         $Device1 = $DbResult2->fetch_assoc();
 …
         $Device2 = $DbResult3->fetch_assoc();
         $Pos2 = explode(';', $Device2['Pos']);
         if(($Device1['Used'] == 1) and ($Device2['Used'] == 1))
+        if (($Device1['Used'] == 1) and ($Device2['Used'] == 1))
           $Output .= 'new google.maps.Polyline([new google.maps.LatLng('.$Pos1[0].', '.
         $Pos1[1].'),new google.maps.LatLng('.$Pos2[0].', '.$Pos2[1].')], "#4F4FBF", 3, 0.8), ';
 …
       'WHERE (`NetworkDevice`.`Used`=1) AND (`NetworkDevice`.`MapPosition` IS NOT NULL) '.
       'GROUP BY `NetworkDevice`.`MapPosition`');
     while($Device = $DbResult->fetch_assoc())
+    while ($Device = $DbResult->fetch_assoc())
+    {
       $Pos = explode(';', $Device['Pos']);
 …
                 </table>';
     */
     return($Output);
+    return ($Output);
+  }
+}
 …
+  {
     $Output = parent::OnEdit($Item);
     if($this->FormManager->ShowRelation)
+    if ($this->FormManager->ShowRelation)
       $Output .=  '<img src="'.$this->FormManager->Root.'/images/select.png" alf="Vybrat" language="javascript" '.
         '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

r864	r873
37	37	function Show()
38	38	{
39		return('');
	39	return ('');
40	40	}
41	41	}
…	…
78	78	if (point)
79	79	{
80		set_return(point.lat() + ";" + point.lng(),"'.$this->OnClickObject.'");
	80	set_return (point.lat() + ";" + point.lng(),"'.$this->OnClickObject.'");
81	81	window.close();
82	82	}
…	…
102	102	</script>';
103	103	$Output .= '<div id="map_canvas" style="width: 100%; height: 98%;"></div>';
104		return($Output);
	104	return ($Output);
105	105	}
106	106	}
…	…
162	162	if (e)
163	163	{
164		set_return(e.latlng.lat + ";" + e.latlng.lng,"'.$this->OnClickObject.'");
	164	set_return (e.latlng.lat + ";" + e.latlng.lng,"'.$this->OnClickObject.'");
165	165	window.close();
166	166	}

trunk/Modules/Meals/Meals.php

-              r790
+              r873
   function Show()
+  {
     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 (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());
+  }
 …
     $Output = '<table align="center" class="WideTable"><tr><th>Den</th><th>Datum</th><th>Polévka</th><th>Hlavní jídlo</th></tr>';
     $DbResult = $this->Database->select('Meals', '*, UNIX_TIMESTAMP(Date)','Date >= NOW() ORDER BY Date');
     while($Row = $DbResult->fetch_array())
+    {
       if($Row['Status'] == 1) $Output .= '<tr><td>'.$this->DayNames[date('w', $Row['UNIX_TIMESTAMP(Date)'])].'</td><td align="right">'.HumanDate($Row['Date']).'</td><td>'.$Row['Soup'].'</td><td>'.$Row['Meal'].'</td></tr>';
       else if(($Row['Status' ] == 2) or ($Row['Status'] == 3))
+    while ($Row = $DbResult->fetch_array())
+    {
+      if ($Row['Status'] == 1) $Output .= '<tr><td>'.$this->DayNames[date('w', $Row['UNIX_TIMESTAMP(Date)'])].'</td><td align="right">'.HumanDate($Row['Date']).'</td><td>'.$Row['Soup'].'</td><td>'.$Row['Meal'].'</td></tr>';
+      else if (($Row['Status' ] == 2) or ($Row['Status'] == 3))
+      {
         $Output .= '<tr><td>'.$this->DayNames[date('w', $Row['UNIX_TIMESTAMP(Date)'])].'</td><td align="right">'.HumanDate($Row['Date']).'</td><td colspan="2" align="center">'.$this->Status[$Row['Status']].'</td></tr>';
 …
     $Output .= 'Cena jednoho menu: '.$Row['Price'].' Kč<br />';
     $Output .= $Row['Info'];
     return($Output);
+    return ($Output);
+  }
 …
     $Date = explode('-', $_GET['date']);
     $Time2 = mktime(0, 0, 0, $Date[1], $Date[2], $Date[0]);
     for($I = 0; $I < 5; $I++)
+    for ($I = 0; $I < 5; $I++)
+    {
       $Time = $Time2 + $I * 86400;
 …
       $Row = $DbResult->fetch_array();
       $Output .= '<tr><td style="border-style: solid; border-color: black; border-width: 2; font-size: xx-large;" width="10%">'.$this->DayNamesShort[$DayOfWeek].'</td><td style="font-size: x-large; border-style: solid; border-color: black; border-width: 2;" width="90%">';
       if($Row['Status'] == 0) $Output .= '&nbsp;<br><br>&nbsp;';
       if($Row['Status'] == 1) $Output .= 'Polévka: '.$Row['Soup'].'<br><br>'.$Row['Meal'];
       else if(($Row['Status'] == 2) or ($Row['Status'] == 3))
+      if ($Row['Status'] == 0) $Output .= '&nbsp;<br><br>&nbsp;';
+      if ($Row['Status'] == 1) $Output .= 'Polévka: '.$Row['Soup'].'<br><br>'.$Row['Meal'];
+      else if (($Row['Status'] == 2) or ($Row['Status'] == 3))
+      {
         $Output .= '<br>'.$this->Status[$Row['Status']].'<br>&nbsp;';
 …
     $Output .= '</body></html>';
     return($Output);
+    return ($Output);
+  }
 …
     $Week = date('w', mktime(0, 0, 0, $Date[1], $Date[2], $Date[0]));
     $WeekOfYear = date('W', mktime(0, 0, 0, $Date[1], $Date[2], $Date[0]));
     if($WeekOfYear != $LastWeekOfYear)
+    if ($WeekOfYear != $LastWeekOfYear)
       $WeekRowSpan = '<td align="center" rowspan="'.(7 - (($Week + 7 - 1) % 7)).'">'.
         $WeekOfYear.'<br /><a href="tisk/?date='.
 …
         '">Tisk</a></td>';
       else $WeekRowSpan = '';
     if($Week == 0) $Color = ' style="color: #ff0000;" '; else $Color = '';
+    if ($Week == 0) $Color = ' style="color: #ff0000;" '; else $Color = '';
     $Output = '<tr><td'.$Color.'>'.$this->DayNames[$Week].'</td><td>'.HumanDate($Row['Date']).'</td>'.$WeekRowSpan.'
     <td><input name="soup_'.$Row['Date'].'" size="30" value="'.$Row['Soup'].'"></td>
     <td><input name="meal_'.$Row['Date'].'" size="30" value="'.$Row['Meal'].'"></td>
     <td><select name="status_'.$Row['Date'].'">';
     for($I = 0; $I < 4; $I++) $Output .= '    <option '.$Selected[$I].'value="'.$I.'">'.$this->Status[$I].'</option>';
+    for ($I = 0; $I < 4; $I++) $Output .= '    <option '.$Selected[$I].'value="'.$I.'">'.$this->Status[$I].'</option>';
     $Output .= '</select></td></tr>';
     $LastWeekOfYear = $WeekOfYear;
     return($Output);
+    return ($Output);
+  }
 …
     $Output = '';
     if(array_key_exists('action', $_GET))
+    {
       if($_GET['action'] == 'savemenu')
+      {
         for($I = 0; $I < $this->DayCount; $I++)
+    if (array_key_exists('action', $_GET))
+    {
+      if ($_GET['action'] == 'savemenu')
+      {
+        for ($I = 0; $I < $this->DayCount; $I++)
+        {
           $Time = time() + $I * 86400;
 …
         $this->System->ModuleManager->Modules['Log']->NewRecord('EatingPlace', 'MenuSave');
+      }
       if($_GET['action'] == 'saveinfo')
+      if ($_GET['action'] == 'saveinfo')
+      {
         $this->Database->delete('MealsInfo', '1');
 …
 <fieldset><legend>Jídlo pro jednotlivé dny</legend>
 <table align="center" class="WideTable"><tr><th>Den</th><th>Datum</th><th>Týden</th><th>Polévka</th><th>Hlavní jídlo</th><th>Stav</th></tr>';
     for($I = 0; $I < $this->DayCount; $I++)
+    for ($I = 0; $I < $this->DayCount; $I++)
+    {
       $Time = time() + $I * 86400;
       $DbResult = $this->Database->select('Meals', '*', 'Date = "'.date('Y-m-d', $Time).'"');
       if($Row = $DbResult->fetch_array())
+      if ($Row = $DbResult->fetch_array())
         $Output .= $this->PrintTableRow($Row);
       else
 …
 '<div align="center"><input type="submit" value="Uložit údaje"></div>
 </fieldset></form>';
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/Meteostation/Download.php

r548	r873
4	4
5	5	$MeteoStation = new MeteoStation($System->Database, $System);
6		while(true)
	6	while (true)
7	7	{
8	8	$MeteoStation->DownloadAll();

trunk/Modules/Meteostation/Meteostation.php

r747	r873
11	11	$Output = 'Stav meteostanice:<br/>';
12	12	$Output .= '<img src="'.$this->System->Link('/Modules/Meteostation/cache/1.png').'" alt="stav meteostanice"/>';
13		return($Output);
	13	return ($Output);
14	14	}
15	15	}
…	…
91	91	{
92	92	$DbResult = $this->Database->select('MeteoStation', '*');
93		while($DbRow = $DbResult->fetch_assoc())
	93	while ($DbRow = $DbResult->fetch_assoc())
94	94	{
95	95	$MeteoStation = new MeteoStation();

trunk/Modules/Network/HostList.php

-              r833
+              r873
   function Show()
+  {
     if(!$this->System->User->CheckPermission('Network', 'ShowHostList'))
       return('Nemáte oprávnění');
+    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) ';
+    if (array_key_exists('admin', $_GET)) $Where = 'AND NetworkDevice.Type IN (1,4,5) ';
       else $Where = '';
     $Output = '<div align="center" style="font-size: small;"><table class="WideTable">';
 …
       'LEFT JOIN User ON Member.ResponsibleUser = User.Id '.
       'LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type WHERE NetworkDevice.Used = 1 '.$Where.'ORDER BY NetworkDevice.Name');
     while($Device = $DbResult->fetch_assoc())
+    while ($Device = $DbResult->fetch_assoc())
+    {
       if($Device['Online'] == 1) $Style = 'color: blue;'; else $Style = '';
+      if ($Device['Online'] == 1) $Style = 'color: blue;'; else $Style = '';
       $DbResult2 = $this->Database->query('SELECT COUNT(*) FROM NetworkInterface WHERE Device = '.$Device['Id']);
       $DbRow = $DbResult2->fetch_row();
       if($DbRow[0] == 1)
+      if ($DbRow[0] == 1)
+      {
         $DbResult2 = $this->Database->query('SELECT * FROM NetworkInterface WHERE Device = '.$Device['Id']);
         $Interface = $DbResult2->fetch_assoc();
         if($Interface['ExternalIP'] == '') $Interface['ExternalIP'] = '&nbsp;';
         if($Interface['LocalIP'] == '') $Interface['LocalIP'] = '&nbsp;';
         if($Interface['Online'] == 1) $Style = 'font-weight: bold; color: blue;'; else $Style = '';
+        if ($Interface['ExternalIP'] == '') $Interface['ExternalIP'] = '&nbsp;';
+        if ($Interface['LocalIP'] == '') $Interface['LocalIP'] = '&nbsp;';
+        if ($Interface['Online'] == 1) $Style = 'font-weight: bold; color: blue;'; else $Style = '';
         $InterfaceName = $Device['Name'];
         if($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
+        if ($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
         $Output .= '<tr><td style="text-align: left; '.$Style.'">'.$InterfaceName.'</td><td>'.$Interface['LocalIP'].'</td><td>'.$Interface['ExternalIP'].'</td><td>'.$Device['HostType'].'</td><td style="text-align: right;">'.HumanDate($Device['LastOnline']).'</td><td style="text-align: right;">'.$Device['UserName'].'</td></tr>';
       } else
 …
         $Output .= '<tr><td colspan="3" style="text-align: left; font-weight: bold; '.$Style.'">'.$Device['Name'].'</td><td>'.$Device['HostType'].'</td><td style="text-align: right;">'.HumanDate($Device['LastOnline']).'</td><td style="text-align: right;">'.$Device['UserName'].'</td></tr>';
         $DbResult2 = $this->Database->query('SELECT * FROM NetworkInterface WHERE Device = '.$Device['Id']);
         while($Interface = $DbResult2->fetch_assoc())
+        while ($Interface = $DbResult2->fetch_assoc())
+        {
           if($Interface['LocalIP'] == '') $Interface['LocalIP'] = '&nbsp;';
           if($Interface['Online'] == 1) $Style = 'font-weight: bold; color: blue;'; else $Style = '';
+          if ($Interface['LocalIP'] == '') $Interface['LocalIP'] = '&nbsp;';
+          if ($Interface['Online'] == 1) $Style = 'font-weight: bold; color: blue;'; else $Style = '';
           $InterfaceName = $Device['Name'];
           if($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
+          if ($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
           $Output .= '<tr><td style="text-align: left; '.$Style.'">&nbsp;&nbsp;'.$InterfaceName.'</td><td>'.$Interface['LocalIP'].'</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
+        }
 …
+    }
     $Output .= '</table></div>';
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/Network/Hosting.php

r790	r873
11	11	$Output = '<br /><table class="WideTable"><tr><th>Název projektu</th><th>Založeno</th><th>Umístění na serveru</th><th>Zodpovědná osoba</th></tr>';
12	12	$DbResult = $this->Database->query('SELECT NetworkDevice.Name as ServerName, HostedProject.Name, HostedProject.Homepage, HostedProject.TimeCreate, User.Name AS UserName FROM HostedProject JOIN User ON User.Id = HostedProject.User JOIN NetworkDevice ON NetworkDevice.Id = HostedProject.Server ORDER BY HostedProject.Name');
13		while($DbRow = $DbResult->fetch_assoc())
	13	while ($DbRow = $DbResult->fetch_assoc())
14	14	{
15	15	$Output .= '<tr><td><a href="'.$DbRow['Homepage'].'">'.$DbRow['Name'].'</a></td><td>'.HumanDate($DbRow['TimeCreate']).'</td><td>'.$DbRow['ServerName'].'</td><td>'.$DbRow['UserName'].'</td></tr>';
16	16	}
17	17	$Output .= '</table>';
18		return($Output);
	18	return ($Output);
19	19	}
20	20	}

trunk/Modules/Network/Network.php

-              r871
+              r873
     '<tr><th/><br/>SSID<br/><br/></th>';
     $ChannelList = array();
     if(!array_key_exists('range', $_GET)) $_GET['range'] = 'a';
     if($_GET['range'] == 'a')
+    if (!array_key_exists('range', $_GET)) $_GET['range'] = 'a';
+    if ($_GET['range'] == 'a')
+    {
       $Where = '(Frequency < 5000)';
       for($Freq = 2402; $Freq <= 2482; $Freq = $Freq + 5) $ChannelList[] = $Freq;
+      for ($Freq = 2402; $Freq <= 2482; $Freq = $Freq + 5) $ChannelList[] = $Freq;
+    }
     if($_GET['range'] == 'bc')
+    if ($_GET['range'] == 'bc')
+    {
       $Where = '(Frequency >= 5000) AND (Frequency <= 5350)';
       for($Freq = 5150; $Freq <= 5350; $Freq = $Freq + 5) $ChannelList[] = $Freq;
+      for ($Freq = 5150; $Freq <= 5350; $Freq = $Freq + 5) $ChannelList[] = $Freq;
+    }
     if($_GET['range'] == 'd')
+    if ($_GET['range'] == 'd')
+    {
       $Where = '(Frequency >= 5470)';
       for($Freq = 5470; $Freq <= 5725; $Freq = $Freq + 5) $ChannelList[] = $Freq;
+      for ($Freq = 5470; $Freq <= 5725; $Freq = $Freq + 5) $ChannelList[] = $Freq;
+    }
     foreach($ChannelList as $Frequency)
+    foreach ($ChannelList as $Frequency)
+    {
       $Output .= '<th><div class="RotatedHeader">'.$Frequency.'<div></th>';
 …
     $Output .= '</tr>';
     $DbResult = $this->Database->query('SELECT `Frequency` FROM `NetworkInterfaceWireless` WHERE '.$Where.' AND (`Mode`=0) GROUP BY `Frequency`');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
       $DbResult2 = $this->Database->query('SELECT * FROM `NetworkInterfaceWireless` WHERE (`Frequency`='.$DbRow['Frequency'].') AND '.$Where);
       while($DbRow2 = $DbResult2->fetch_assoc())
+      while ($DbRow2 = $DbResult2->fetch_assoc())
+      {
         $LowFrequency = $DbRow['Frequency'] - $DbRow2['ChannelWidth'] / 2 - $DbRow2['ChannelWidthLower'];
         $HighFrequency = $DbRow['Frequency'] + $DbRow2['ChannelWidth'] / 2 + $DbRow2['ChannelWidthUpper'];
         $Output .= '<tr><td>'.$DbRow2['SSID'].'</td>';
         foreach($ChannelList as $Frequency)
+        foreach ($ChannelList as $Frequency)
+        {
           if(($DbRow2['Frequency'] == $Frequency)) $Color = '#000000';
             else if(($LowFrequency <= ($Frequency - 2.5)) and ($HighFrequency >= ($Frequency + 2.5))) $Color = '#808080';
             else if(($LowFrequency == $Frequency) or ($HighFrequency == $Frequency)) $Color = '#c0c0c0';
+          if (($DbRow2['Frequency'] == $Frequency)) $Color = '#000000';
+            else if (($LowFrequency <= ($Frequency - 2.5)) and ($HighFrequency >= ($Frequency + 2.5))) $Color = '#808080';
+            else if (($LowFrequency == $Frequency) or ($HighFrequency == $Frequency)) $Color = '#c0c0c0';
             else $Color = '#ffffff';
           $Output .= '<td style="background-color: '.$Color.';">&nbsp;</td>';
 …
+    }
     $Output .= '</table>';
     return($Output);
+    return ($Output);
+  }
+}
 …
   function Show()
+  {
     if(count($this->System->PathItems) > 1)
+    if (count($this->System->PathItems) > 1)
+    {
       $Output = $this->PageNotFound();
     } else $Output = $this->ShowInformation();
     return($Output);
+    return ($Output);
+  }
   function ShowInformation()
+  {
     if(!$this->System->User->CheckPermission('Network', 'ShowInfo'))
       return('Nemáte oprávnění');
+    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 />';
     $Output .= '<a href="'.$this->System->Link('/network/hosts/').'">Registrované zařízení</a><br />';
     return($Output);
+    return ($Output);
+  }
+}
 …
       '(`NetworkInterface`.`LocalIP` != "") AND (`NetworkInterface`.`Enabled`=1)'.
       'ORDER BY `Name` ASC');
     if($DbResult3->num_rows > 0)
+    if ($DbResult3->num_rows > 0)
+    {
       $Output .= $Title.'<br/>';
       $Output .= '<table>'.
         '<tr><th align="center">Jméno</th><th align="center">Stav</th><th align="center">Čas</th><th align="center">Trvání</th></tr>'."\n";
       while($Item = $DbResult3->fetch_assoc())
+      while ($Item = $DbResult3->fetch_assoc())
+      {
         $Duration = $Time - MysqlDateTimeToTime($Item['LastOnline']);
 …
           sprintf('%02d', floor($Duration % 60));
         $Days = floor($Duration / (60 * 60 * 24));
         if($Days > 0) $DurationText = $Days.' dnů '.$DurationText;
+        if ($Days > 0) $DurationText = $Days.' dnů '.$DurationText;
         $Output .= '<tr><td>'.$Item['Name'].'</td><td>'.$OnlineText[$Item['Online']].
 …
     $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'));
+  }
 …
       $Output .= '<table>'.
         '<tr><th align="center">Jméno</th><th align="center">Stav</th><th align="center">Čas</th><th align="center">Trvání</th></tr>'."\n";
       while($Item = $DbResult3->fetch_assoc())
+      while ($Item = $DbResult3->fetch_assoc())
+      {
         $Duration = $Time - MysqlDateTimeToTime($Item['LastOnline']);
 …
           sprintf('%02d', floor($Duration % 60));
         $Days = floor($Duration / (60 * 60 * 24));
         if($Days > 0) $DurationText = $Days.' dnů '.$DurationText;
+        if ($Days > 0) $DurationText = $Days.' dnů '.$DurationText;
         $Output .= '<tr><td>'.$Item['Name'].'</td><td>'.$OnlineText[$Item['Online']].
 …
     $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

r825	r873
36	36
37	37	$DbResult = $this->Database->query($Query);
38		while($Subnet = $DbResult->fetch_assoc())
	38	while ($Subnet = $DbResult->fetch_assoc())
39	39	{
40	40	$DbResult2 = $this->Database->query('SELECT COUNT(*) FROM NetworkInterface WHERE CompareNetworkPrefix(INET_ATON("'.$Subnet['AddressRange'].'"), INET_ATON(LocalIP), '.$Subnet['Mask'].')');
…	…
54	54	$Output .= '</table>';
55	55	$Output .= $PageList['Output'];
56		return($Output);
	56	return ($Output);
57	57	}
58	58	}

trunk/Modules/Network/UserHosts.php

-              r738
+              r873
     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>';
 …
       'LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type '.
       'WHERE NetworkDevice.Used = 1 AND NetworkDevice.Member = (SELECT Customer FROM UserCustomerRel WHERE User='.$this->System->User->User['Id'].') ORDER BY NetworkDevice.Name');
     while($Device = $DbResult->fetch_assoc())
+    while ($Device = $DbResult->fetch_assoc())
+    {
       if($Device['Online'] == 1) $Style = 'color: blue;'; else $Style = '';
+      if ($Device['Online'] == 1) $Style = 'color: blue;'; else $Style = '';
       $Output .= '<tr><td colspan="4" style="text-align: left; font-weight: bold; '.
         $Style.'">'.$Device['Name'].'</td><td>'.$Device['HostType'].'</td><td style="text-align: right;">'.HumanDate($Device['LastOnline']).'</td></tr>';
       $DbResult2 = $this->Database->query('SELECT * FROM NetworkInterface WHERE Device = '.$Device['Id']);
       while($Interface = $DbResult2->fetch_assoc())
+      while ($Interface = $DbResult2->fetch_assoc())
+      {
         if($Interface['Online'] == 1) $Style = 'font-weight: bold; color: blue;'; else $Style = '';
+        if ($Interface['Online'] == 1) $Style = 'font-weight: bold; color: blue;'; else $Style = '';
         $InterfaceName = $Device['Name'];
         if($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
+        if ($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
         $Output .= '<tr><td style="text-align: left; '.$Style.'">&nbsp;&nbsp;'.
           $InterfaceName.'</td><td>'.NotBlank($Interface['LocalIP']).'</td><td>'.
 …
+    }
     $Output .= '</table></div>';
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/NetworkConfig/Generate.php

-              r848
+              r873
 <?php
 if(isset($_SERVER['REMOTE_ADDR'])) die();
+if (isset($_SERVER['REMOTE_ADDR'])) die();
 include_once(dirname(__FILE__).'/../../Application/System.php');
 $System = new Core();
 …
 $Now = time();
 $DbResult = $System->Database->select('NetworkConfiguration', '*, UNIX_TIMESTAMP(`LastTime`)', '(`Changed` = 1) AND (`Enabled` = 1)');
 while($Service = $DbResult->fetch_assoc())
+while ($Service = $DbResult->fetch_assoc())
+{
   if($Service['UNIX_TIMESTAMP(LastTime)'] < (time() - $Service['Period']))
+  if ($Service['UNIX_TIMESTAMP(LastTime)'] < (time() - $Service['Period']))
+  {
     $System->Database->update('NetworkConfiguration', '`Id`='.$Service['Id'], array('Changed' => 2));
 …
     $ExecuteParts = explode('|', $Service['Execute']);
     $Output = array();
     foreach($ExecuteParts as $Command)
       if($Command != '')
+    foreach ($ExecuteParts as $Command)
+      if ($Command != '')
+      {
         exec($Command, $Output);

trunk/Modules/NetworkConfig/NetworkConfig.php

r820	r873
80	80	{
81	81	$Output = '';
82		if($Parameters >= 3)
	82	if ($Parameters >= 3)
83	83	{
84	84	$ConfigItemName = $Parameters[2];
85		if(array_key_exists($ConfigItemName, $this->ConfigItems))
	85	if (array_key_exists($ConfigItemName, $this->ConfigItems))
86	86	{
87	87	$ClassName = $this->ConfigItems[$ConfigItemName];
…	…
90	90	} else $Output = 'Config item '.$ConfigItemName.' not found';
91	91	} else $Output = 'Not enough parameters';
92		return($Output);
	92	return ($Output);
93	93	}
94	94	}

trunk/Modules/NetworkConfigAirOS/Generators/SSHClient.php

-              r856
+              r873
+  {
     $Commands = trim($Commands);
     if($Commands != '')
+    if ($Commands != '')
+    {
       $Commands = addslashes($Commands);
 …
       $Command = $this->SSHPath.' -oBatchMode=yes -o ConnectTimeout='.$this->Timeout.' -l '.
         $this->UserName.$PrivKey.' '.$this->HostName.' "'.$Commands.'"';
       if($this->Debug) echo($Command);
+      if ($this->Debug) echo($Command);
       $Output = array();
       exec($Command, $Output);
     } else $Output = '';
     if($this->Debug) print_r($Output);
     return($Output);
+    if ($this->Debug) print_r($Output);
+    return ($Output);
+  }
+}

trunk/Modules/NetworkConfigAirOS/Generators/Signal.php

-              r856
+              r873
       '(SELECT `LocalIP` FROM `NetworkInterface` WHERE `NetworkInterface`.`Device` = `NetworkDevice`.`Id` LIMIT 1) AS `LocalIP` '.
       'FROM `NetworkDevice` WHERE (`API` = 2) AND (`Used` = 1)');
     while($Device = $DbResult3->fetch_assoc())
+    while ($Device = $DbResult3->fetch_assoc())
+    {
       echo($Device['LocalIP']."");
 …
       //print_r($Array);
       echo('-');
       foreach($Array as $Properties)
+      foreach ($Array as $Properties)
+      {
         $DbResult = $this->Database->select('NetworkInterface', 'Id', '`MAC`="'.$Properties['mac'].'"');
         if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
+        {
           $DbRow = $DbResult->fetch_assoc();

trunk/Modules/NetworkConfigLinux/Generators/CheckPorts.php

-              r819
+              r873
     $Timeout = 1;
     $State = 0;
     if($Protocol == 'tcp') $Prefix = '';
       else if($Protocol == 'udp') $Prefix = 'udp://';
+    if ($Protocol == 'tcp') $Prefix = '';
+      else if ($Protocol == 'udp') $Prefix = 'udp://';
       else throw new Exception('Unsupported protocol "'.$Protocol.'"');
     if($Socket = @fsockopen($Prefix.$IP, $Port, $ErrorNumber, $ErrorString, $Timeout))
+    if ($Socket = @fsockopen($Prefix.$IP, $Port, $ErrorNumber, $ErrorString, $Timeout))
+    {
       fclose($Socket);
       $State = 1;
+    }
     return($State);
+    return ($State);
+  }
 …
       'LEFT JOIN `NetworkInterface` ON `NetworkInterface`.`Id`=`NetworkPort`.`Interface` '.
       'WHERE (`NetworkPort`.`Enabled`=1) AND (`NetworkInterface`.`LocalIP` !="")');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
       $Ports[$DbRow['Id']] = $DbRow;
     foreach($Ports as $Index => $Port)
+    foreach ($Ports as $Index => $Port)
+    {
       if($Port['Protocol'] == 0) $Port['Protocol'] = 'tcp';
       if($Port['Protocol'] == 1) $Port['Protocol'] = 'udp';
+      if ($Port['Protocol'] == 0) $Port['Protocol'] = 'tcp';
+      if ($Port['Protocol'] == 1) $Port['Protocol'] = 'udp';
       $Port['NewOnline'] = $this->CheckPortStatus($Port['LocalIP'], $Port['Number'], $Port['Protocol']);
       // Update last online time if still online
       if($Port['NewOnline'])
+      if ($Port['NewOnline'])
+      {
         $DbResult = $this->Database->update('NetworkPort', '`Id` = "'.$Port['Id'].'"',
 …
       // Update UpDown table
       if($Port['Online'] != $Port['NewOnline'])
+      if ($Port['Online'] != $Port['NewOnline'])
+      {
         // Online state changed
 …
     $DbResult = $this->Database->select('NetworkPort', '*', '(`Online` = 1) AND '.
       '(`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'")');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
       echo('Port '.$DbRow['Number'].' online but time not updated.'."\n");
 …
     $DbResult = $this->Database->select('NetworkPort', '*', '(`Online` = 0) AND '.
       '(`LastOnline` >= "'.TimeToMysqlDateTime($StartTime).'")');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
       echo('Port '.$DbRow['Number'].' not online but time updated.'."\n");

trunk/Modules/NetworkConfigLinux/Generators/DHCP.php

-              r790
+              r873
 <?php
 if(isset($_SERVER['REMOTE_ADDR'])) die();
+if (isset($_SERVER['REMOTE_ADDR'])) die();
 /*
 include_once('../../global.php');
 …
 'option netbios-scope "";'."\n".
 "server-identifier 192.168.0.1;\n\n");
 for($i = 0; $i <= $MaxSubnet; $i++)
+for ($i = 0; $i <= $MaxSubnet; $i++)
+{
   fputs($File, "subnet 192.168.".$i.".0 netmask 255.255.255.0 {\n".
 …
   "  option routers 192.168.".$i.".1;\n");
   $DbResult = $Database->select('hosts', '*', "IP LIKE '192.168.".$i."%' ORDER BY IP");
   while($Row = $DbResult->fetch_array())
+  while ($Row = $DbResult->fetch_array())
+  {
     $Data = $Row['name'];
     if(strlen($Data) < 9) $Data .= "\t";
+    if (strlen($Data) < 9) $Data .= "\t";
     fputs($File, "  host ".$Data."\t{ fixed-address ".$Row['IP'].";\thardware ethernet ".$Row['MAC']."; }\n");
+  }

trunk/Modules/NetworkConfigLinux/Generators/DNS.php

-              r854
+              r873
         "\t\t\t".$DNS['Minimum']."\t; minimum\n".
         "\t\t\t)\n";
     foreach($DNS['NameServer'] as $NameServer)
+    foreach ($DNS['NameServer'] as $NameServer)
+    {
       $Output .= "\t\tIN\tNS\t".strtolower($NameServer).".\n";
 …
     // Mail server records
     $Priority = 10;
     foreach($DNS['MailServer'] as $MailServer)
+    foreach ($DNS['MailServer'] as $MailServer)
+    {
       $Output .="\t\t\tMX\t".$Priority." ".strtolower($MailServer).".\n";
 …
         $DNS['Domain'].".\tIN\tTXT\t\"v=spf1 mx -all\"\n".
         $DNS['Domain'].".\tIN\tSPF\t\"v=spf1 mx -all\"\n";
     foreach($DNS['MailServer'] as $MailServer)
+    foreach ($DNS['MailServer'] as $MailServer)
+    {
       $Output .= $MailServer.".\tIN\tTXT\t\"v=spf1 a -all\"\n".
 …
     // IPv4 host list
     foreach($DNS['Host'] as $Host)
+    {
       if(strlen($Host['Name']) < 8) $Host['Name'] .= "\t";
+    foreach ($DNS['Host'] as $Host)
+    {
+      if (strlen($Host['Name']) < 8) $Host['Name'] .= "\t";
       $Output .= strtolower($Host['Name'])."\tIN\tA\t".$Host['Address']."\n";
+    }
     // IPv6 host list
     foreach($DNS['Host'] as $Host)
+    {
       if(strlen($Host['Name']) < 8) $Host['Name'] .= "\t";
       if(array_key_exists('IPv6', $Host) and ($Host['IPv6'] != ''))
+    foreach ($DNS['Host'] as $Host)
+    {
+      if (strlen($Host['Name']) < 8) $Host['Name'] .= "\t";
+      if (array_key_exists('IPv6', $Host) and ($Host['IPv6'] != ''))
         $Output .= strtolower($Host['Name'])."\tIN\tAAAA\t".$Host['IPv6']."\n";
+    }
     // Alias list
     foreach($DNS['Alias'] as $Alias)
+    {
       if(strlen($Alias['Name']) < 8) $Alias['Name'] .= "\t";
+    foreach ($DNS['Alias'] as $Alias)
+    {
+      if (strlen($Alias['Name']) < 8) $Alias['Name'] .= "\t";
       $Output .= strtolower($Alias['Name'])."\tIN\tCNAME\t".strtolower($Alias['Target'])."\n";
+    }
 …
     // Generate reverse DNS records
     foreach($DNS['Network'] as $Network)
+    foreach ($DNS['Network'] as $Network)
+    {
       $Parts = explode('.', $Network);
 …
       "\t\t\t\t".$DNS['Minimum']."\t; minimum\n".
       "\t\t\t\t)\n";
       foreach($DNS['ReverseNameServer'] as $NameServer)
+      foreach ($DNS['ReverseNameServer'] as $NameServer)
+      {
         if(substr($NameServer, -strlen($DNS['Domain'])) == $DNS['Domain'])
+        if (substr($NameServer, -strlen($DNS['Domain'])) == $DNS['Domain'])
           $Output .= "@\tIN\tNS\t".$NameServer.".\n";
         else $Output .= "\tIN\tNS\t".$NameServer.".\n";
+      }
       foreach($DNS['Host'] as $Host)
         if(substr($Host['Address'], 0, strlen($Network)) == $Network)
+      foreach ($DNS['Host'] as $Host)
+        if (substr($Host['Address'], 0, strlen($Network)) == $Network)
+        {
           $AddressParts = explode('.', $Host['Address']);
 …
     // Generate reverse DNS IPv6 records
     foreach($DNS['IPv6Network'] as $Network)
+    foreach ($DNS['IPv6Network'] as $Network)
+    {
       $Parts = explode('/', $Network);
 …
       "\t\t\t\t".$DNS['Minimum']."\t; minimum\n".
       "\t\t\t\t)\n";
       foreach($DNS['ReverseNameServer'] as $NameServer)
+      foreach ($DNS['ReverseNameServer'] as $NameServer)
+      {
         if(substr($NameServer, -strlen($DNS['Domain'])) == $DNS['Domain'])
+        if (substr($NameServer, -strlen($DNS['Domain'])) == $DNS['Domain'])
           $Output .= "@\tIN\tNS\t".$NameServer.".\n";
         else $Output .= "\tIN\tNS\t".$NameServer.".\n";
+      }
       foreach($DNS['Host'] as $Host)
         if(array_key_exists('IPv6', $Host) and ($Host['IPv6'] != ''))
+      foreach ($DNS['Host'] as $Host)
+        if (array_key_exists('IPv6', $Host) and ($Host['IPv6'] != ''))
+        {
           $Addr = new NetworkAddressIPv6();
 …
     $BaseDir = '/var/cache/bind';
     //$BaseDir = '/home/chronos/Projekty/centrala/trunk/var/named';
     if(!file_exists($BaseDir)) die('Base directory "'.$BaseDir.'" not exists.');
+    if (!file_exists($BaseDir)) die('Base directory "'.$BaseDir.'" not exists.');
     $MailServer = 'centrala';
 …
       'JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
       'WHERE (`NetworkInterface`.`LocalIP` <> "") AND (`NetworkDevice`.`Used` = 1)');
     while($Interface = $DbResult->fetch_assoc())
+    {
       $Name = $Interface['DeviceName'];
       if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+    while ($Interface = $DbResult->fetch_assoc())
+    {
+      $Name = $Interface['DeviceName'];
+      if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
       $LocalDNS['Host'][] = array('Name' => $Name, 'Address' => $Interface['LocalIP'],
           'IPv6' => $Interface['IPv6']);
 …
         'JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
         'WHERE (`NetworkInterface`.`ExternalIP` <> "") AND (`NetworkDevice`.`Used` = 1)');
     while($Interface = $DbResult->fetch_assoc())
+    {
       $Name = $Interface['DeviceName'];
       if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+    while ($Interface = $DbResult->fetch_assoc())
+    {
+      $Name = $Interface['DeviceName'];
+      if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
       $LocalDNS['Host'][] = array('Name' => $Name.'-ext', 'Address' => $Interface['ExternalIP']);
+    }
 …
      $DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface '.
      'JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.CZFreeIP <> ""');
      while($Interface = $DbResult->fetch_assoc())
+     while ($Interface = $DbResult->fetch_assoc())
+     {
      $Name = $Interface['DeviceName'];
      if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+     if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
      $LocalDNS['Host'][] = array('Name' => $Name.'-czfree', 'Address' => $Interface['CZFreeIP']);
+     }
 …
     // Domain aliases
     $DbResult = $this->Database->select('NetworkDomainAlias', '*');
     while($Alias = $DbResult->fetch_assoc())
+    while ($Alias = $DbResult->fetch_assoc())
+    {
       $LocalDNS['Alias'][] = array('Name' => $Alias['Name'], 'Target' => $Alias['Target']);
 …
         'JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE '.
         '(`NetworkInterface`.`ExternalIP` != "") AND (`NetworkDevice`.`Used` = 1)');
     while($Interface = $DbResult->fetch_assoc())
+    {
       $Name = $Interface['DeviceName'];
       if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+    while ($Interface = $DbResult->fetch_assoc())
+    {
+      $Name = $Interface['DeviceName'];
+      if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
       $ExternalDNS['Host'][] = array('Name' => $Name, 'Address' => $Interface['ExternalIP'],
           'IPv6' => $Interface['IPv6']);
 …
     $DbResult = $this->Database->query('SELECT `NetworkDomainAlias`.* FROM `NetworkDomainAlias`');
     // JOIN `NetworkDevice` ON NetworkDomainAlias.Target LIKE NetworkDevice.Name AND NetworkInterface.ExternalIP != ""');
     while($Alias = $DbResult->fetch_assoc())
+    while ($Alias = $DbResult->fetch_assoc())
+    {
       $ExternalDNS['Alias'][] = array('Name' => $Alias['Name'], 'Target' => $Alias['Target']);
 …
         'JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
         'WHERE (`NetworkInterface`.`LocalIP` != "") AND (`NetworkDevice`.`Used` = 1)');
     while($Interface = $DbResult->fetch_assoc())
+    {
       $Name = $Interface['DeviceName'];
       if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+    while ($Interface = $DbResult->fetch_assoc())
+    {
+      $Name = $Interface['DeviceName'];
+      if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
       $CZFreeDNS['Host'][] = array('Name' => $Name, 'Address' => $Interface['LocalIP']);
+    }
 …
     $DbResult = $this->Database->query('SELECT `NetworkDomainAlias`.* FROM `NetworkDomainAlias`');
     // JOIN `hosts` ON NetworkDomainAlias.Target LIKE hosts.name AND hosts.czfree_ip != ""');
     while($Alias = $DbResult->fetch_assoc())
+    while ($Alias = $DbResult->fetch_assoc())
+    {
       $CZFreeDNS['Alias'][] = array('Name' => $Alias['Name'], 'Target' => $Alias['Target']);
 …
     $DbResult = $this->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface` '.
         'JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE `NetworkInterface`.`LocalIP` != ""');
     while($Interface = $DbResult->fetch_assoc())
+    {
       $Name = $Interface['DeviceName'];
       if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+    while ($Interface = $DbResult->fetch_assoc())
+    {
+      $Name = $Interface['DeviceName'];
+      if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
       //  $CZFreeLocalDNS['Host'][] = array('Name' => $Name.'-czfree', 'Address' => $Interface['LocalIP']);
       $CZFreeLocalDNS['Host'][] = array('Name' => $Name, 'Address' => $Interface['LocalIP']);
 …
     $DbResult = $this->Database->query('SELECT `NetworkDomainAlias`.* FROM `NetworkDomainAlias`');
     // JOIN `hosts` ON NetworkDomainAlias.Target LIKE hosts.name AND hosts.czfree_ip != ""');
     while($Alias = $DbResult->fetch_assoc())
+    while ($Alias = $DbResult->fetch_assoc())
+    {
       $CZFreeLocalDNS['Alias'][] = array('Name' => $Alias['Name'], 'Target' => $Alias['Target']);

trunk/Modules/NetworkConfigLinux/Generators/IPTables.php

-              r790
+              r873
 <?php
 if(isset($_SERVER['REMOTE_ADDR'])) die();
+if (isset($_SERVER['REMOTE_ADDR'])) die();
 include_once('../../../Common/Global.php');
 …
 // Blocking according IP address
 $DbResult = $Database->select('users', '*', 'inet = 0');
 while($User = $DbResult->fetch_array())
+while ($User = $DbResult->fetch_array())
+{
   $DbResult2 = $Database->select('hosts', '*', "block<2 AND MAC!='' AND user=".$User['id']);
   while($Row = $DbResult2->fetch_array())
+  while ($Row = $DbResult2->fetch_array())
+  {
     exec('/sbin/iptables -t nat -A Block -s '.$Row['IP'].' -j Local');
 …
+}
 $DbResult = $Database->select('users', '*', 'inet = 1');
 while($User = $DbResult->fetch_array())
+while ($User = $DbResult->fetch_array())
+{
   $DbResult2 = $Database->select('hosts','*',"block<2 AND MAC!='' AND vpn=1 AND user=".$User['id']);
   while($Row = $DbResult2->fetch_array())
+  while ($Row = $DbResult2->fetch_array())
+  {
     exec('/sbin/iptables -t nat -A Block -s '.$Row['IP'].' -j Local');
 …
 // Blocking according MAC address
 $DbResult = $Database->select('users', '*');
 while($User = $DbResult->fetch_array())
+while ($User = $DbResult->fetch_array())
+{
   //echo($User['fullname']."\n");
   $DbResult2 = $Database->select('hosts', '*', '(block < 2) AND (MAC != "") AND (user='.$User['id'].') AND (IP != external_ip) ORDER BY id DESC');
   while($Row = $DbResult2->fetch_array())
+  while ($Row = $DbResult2->fetch_array())
+  {
     //echo(' '.$Row['name']." ".$Row['MAC']." ");
     if($User['inet'] == 0)
+    if ($User['inet'] == 0)
+    {
       //if(($Row['block'] == 0) and ($Row['type'] == 1)) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
+      //if (($Row['block'] == 0) and ($Row['type'] == 1)) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
       //    else exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Local");
     } else {
       if($Row['vpn'] == 0)
+      if ($Row['vpn'] == 0)
+      {
   $CZFreeLocalIP = $Row['IP'];
         //echo($Row['external_ip']."\n");
   //if($Row['name'] == 'TBC')
+  //if ($Row['name'] == 'TBC')
   //{
         //  exec('/sbin/iptables -t nat -A PreroutingDNAT -m tcp -p tcp --dport 3724 -d '.$Row['external_ip'].' -j DNAT --to-destination '.$Row['IP'].':3725');
         //  exec('/sbin/iptables -t nat -A POSTROUTING -m tcp -p tcp -s '.$Row['IP'].' --sport 3725 -o '.$InetInterface.' -j SNAT --to-source '.$Row['external_ip'].':3724');
   //}
         if(strtolower($Row['name']) != 'gate')
+        if (strtolower($Row['name']) != 'gate')
+  {
       if($Row['external_ip'] != '')
+      if ($Row['external_ip'] != '')
+          {
             echo($Row['name'].'='.$Row['external_ip']."\n");
 …
  //echo('vpn');
         //exec('/sbin/iptables -t nat -A PreroutingDNAT -s '.$Row['IP'].' -p udp -m udp --dport 55556 -j DROP');
         if($Row['external_ip'] != '') exec('/sbin/iptables -t nat -A PreroutingDNAT -d '.$Row['external_ip'].' -j ACCEPT');
+        if ($Row['external_ip'] != '') exec('/sbin/iptables -t nat -A PreroutingDNAT -d '.$Row['external_ip'].' -j ACCEPT');
         exec('/sbin/iptables -t nat -A Block -s '.ToVpnIp($Row)." -j Proxy");
         //if($Row['vpn'] == 1)
+        //if ($Row['vpn'] == 1)
   //{
     //exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Local");
         //} else if($Row['vpn'] == 2) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
+        //} else if ($Row['vpn'] == 2) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
+      }
       if($Row['czfree_ip'] != '')
+      if ($Row['czfree_ip'] != '')
+      {
         // CZFree

trunk/Modules/NetworkConfigLinux/Generators/Latency.php

-              r852
+              r873
       'FROM `NetworkInterface` '.
       'WHERE (`NetworkInterface`.`Enabled`=1) AND (`NetworkInterface`.`LocalIP` !="")');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
       $Hosts[] = $DbRow['LocalIP'];
 …
     $Queries = array();
     foreach($Output as $Index => $Line)
+    foreach ($Output as $Index => $Line)
+    {
       $IP = substr($Line, 0, strPos($Line, ' '));

trunk/Modules/NetworkConfigLinux/Generators/NAT.php

-              r790
+              r873
 <?php
 if(isset($_SERVER['REMOTE_ADDR'])) die();
+if (isset($_SERVER['REMOTE_ADDR'])) die();
 include_once('../../../Common/Global.php');
 …
 // Blocking according IP address
 $DbResult = $Database->select('users', '*', 'inet = 0');
 while($User = $DbResult->fetch_array())
+while ($User = $DbResult->fetch_array())
+{
   $DbResult2 = $Database->select('hosts', '*', "block<2 AND MAC!='' AND user=".$User['id']);
   while($Row = $DbResult2->fetch_array())
+  while ($Row = $DbResult2->fetch_array())
+  {
     exec('/sbin/iptables -t nat -A Block -s '.$Row['IP'].' -j Local');
 …
+}
 $DbResult = $Database->select('users', '*', 'inet = 1');
 while($User = $DbResult->fetch_array())
+while ($User = $DbResult->fetch_array())
+{
   $DbResult2 = $Database->select('hosts','*',"block<2 AND MAC!='' AND vpn=1 AND user=".$User['id']);
   while($Row = $DbResult2->fetch_array())
+  while ($Row = $DbResult2->fetch_array())
+  {
     exec('/sbin/iptables -t nat -A Block -s '.$Row['IP'].' -j Local');
 …
 // Blocking according MAC address
 $DbResult = $Database->select('users', '*');
 while($User = $DbResult->fetch_array())
+while ($User = $DbResult->fetch_array())
+{
   //echo($User['fullname']."\n");
   $DbResult2 = $Database->select('hosts','*','block<2 AND MAC!="" AND user='.$User['id'].' ORDER BY id DESC');
   while($Row = $DbResult2->fetch_array())
+  while ($Row = $DbResult2->fetch_array())
+  {
     //echo(' '.$Row['name']." ".$Row['MAC']." ");
     if($User['inet'] == 0)
+    if ($User['inet'] == 0)
+    {
       //if(($Row['block'] == 0) and ($Row['type'] == 1)) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
+      //if (($Row['block'] == 0) and ($Row['type'] == 1)) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
       //    else exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Local");
     } else {
       if($Row['vpn'] == 0)
+      if ($Row['vpn'] == 0)
+      {
   $CZFreeLocalIP = $Row['IP'];
         //echo($Row['external_ip']."\n");
   //if($Row['name'] == 'TBC')
+  //if ($Row['name'] == 'TBC')
   //{
         //  exec('/sbin/iptables -t nat -A PreroutingDNAT -m tcp -p tcp --dport 3724 -d '.$Row['external_ip'].' -j DNAT --to-destination '.$Row['IP'].':3725');
         //  exec('/sbin/iptables -t nat -A POSTROUTING -m tcp -p tcp -s '.$Row['IP'].' --sport 3725 -o eth1 -j SNAT --to-source '.$Row['external_ip'].':3724');
   //}
         if(strtolower($Row['name']) != 'centrala')
+        if (strtolower($Row['name']) != 'centrala')
+  {
       if($Row['external_ip'] != '')
+      if ($Row['external_ip'] != '')
+          {
             echo($Row['name'].'='.$Row['external_ip']."\n");
 …
  //echo('vpn');
         //exec('/sbin/iptables -t nat -A PreroutingDNAT -s '.$Row['IP'].' -p udp -m udp --dport 55556 -j DROP');
         if($Row['external_ip'] != '') exec('/sbin/iptables -t nat -A PreroutingDNAT -d '.$Row['external_ip'].' -j ACCEPT');
+        if ($Row['external_ip'] != '') exec('/sbin/iptables -t nat -A PreroutingDNAT -d '.$Row['external_ip'].' -j ACCEPT');
         exec('/sbin/iptables -t nat -A Block -s '.ToVpnIp($Row)." -j Proxy");
         //if($Row['vpn'] == 1)
+        //if ($Row['vpn'] == 1)
   //{
     //exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Local");
         //} else if($Row['vpn'] == 2) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
+        //} else if ($Row['vpn'] == 2) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
+      }
       if($Row['czfree_ip'] != '')
+      if ($Row['czfree_ip'] != '')
+      {
         // CZFree

trunk/Modules/NetworkConfigLinux/Generators/TrafficShaping.php

-              r790
+              r873
 <?php
 if(isset($_SERVER['REMOTE_ADDR'])) die();
+if (isset($_SERVER['REMOTE_ADDR'])) die();
 $Enabled = 1;
 …
   exec('/sbin/iptables -t mangle -F PREROUTING');
   exec('/sbin/iptables -t mangle -F POSTROUTING');
   if($Enabled)
+  if ($Enabled)
+  {
     //exec('/sbin/iptables -t mangle -A FORWARD -j MARK --set-mark 0');
 …
   // In going traffic
   fputs($File, "/sbin/tc qdisc del dev ".$InInterface." root\n");
   if($Enabled)
+  if ($Enabled)
+  {
     fputs($File, "/sbin/tc qdisc add dev ".$InInterface." root handle 1:0 htb default 2\n");
 …
   // Out going traffic
   fputs($File, "/sbin/tc qdisc del dev ".$OutInterface." root\n");
   if($Enabled)
+  if ($Enabled)
+  {
     fputs($File, "/sbin/tc qdisc add dev ".$OutInterface." root handle 1:0 htb default 2\n");
 …
+  }
   if(!$Enabled) die("Traffic shaping disabled\n");
   if($ClassesEnabled)
+  if (!$Enabled) die("Traffic shaping disabled\n");
+  if ($ClassesEnabled)
+  {
   $ClassId = 3;
 …
   $DbResult = $Database->select('users', '*, CONCAT(second_name, " ", first_name) as fullname', '(inet=1)');
   while($User = $DbResult->fetch_array())
+  while ($User = $DbResult->fetch_array())
+  {
     $UserClassId = $ClassId;
 …
     $DbResult2 = $Database->select('hosts','*',"block=0 AND MAC!='' AND user=".$User['id']);
     while($Host = $DbResult2->fetch_array())
     //if($Row['name'] != 'WOW')
+    while ($Host = $DbResult2->fetch_array())
+    //if ($Row['name'] != 'WOW')
+    {
       $HostClassId = $ClassId;
 …
       fputs($FileClassInfo, '1:'.$HostClassId.' '.$Host['name']."\n");
       //echo('  Host class id: '.$HostClassId."\n");
     //if($User['inet'] == 1)
+    //if ($User['inet'] == 1)
+      {
         $Prio = 1;
         if($Host['vpn'] == 1)
+        if ($Host['vpn'] == 1)
+        {
           if($Host['external_ip'] != '') $Host['IP'] = $Host['external_ip'];
+          if ($Host['external_ip'] != '') $Host['IP'] = $Host['external_ip'];
           else $Host['IP'] = ToVpnIp($Host);
+        }
         //if($Host['name'] == 'TERMINAL') $SpeedDivider = 0.5;
+        //if ($Host['name'] == 'TERMINAL') $SpeedDivider = 0.5;
           //else
         $SpeedDivider = 1;
         if($Host['name'] == 'centrala')
+        if ($Host['name'] == 'centrala')
+        {
           $Host['IP'] = $Host['external_ip'];
 …
            $TableIn = 'FORWARD';
+         }
         //if($Row['name'] == 'TERMINAL2') $Prio = 0;
         //  if($Row['name'] = 'TERMINAL2') $Prio = 0;
         if($Host['name'] == 'voip-hajda') $Protocol = ' -p tcp';
+        //if ($Row['name'] == 'TERMINAL2') $Prio = 0;
+        //  if ($Row['name'] = 'TERMINAL2') $Prio = 0;
+        if ($Host['name'] == 'voip-hajda') $Protocol = ' -p tcp';
         else $Protocol = '';
         //  if($Host['name'] == 'KARLOS') $UserMaxSpeedIn = 128000;
+        //  if ($Host['name'] == 'KARLOS') $UserMaxSpeedIn = 128000;
         /*
 if($Host['name'] == 'GAME')
+if ($Host['name'] == 'GAME')
+        {
           exec('/sbin/iptables -t mangle -F game-server');
 …
           $TableIn = 'game-server';
         }*/
         //if($Host['name'] == 'TBC') continue;
+        //if ($Host['name'] == 'TBC') continue;
         // In going traffic
 …
+      }
       // Free inet
       if($Tarify[$User['inet_tarif_now']]['group_id'] == 3)
+      if ($Tarify[$User['inet_tarif_now']]['group_id'] == 3)
+      {
         //exec('/sbin/iptables -t mangle -A '.$TableIn.' -i eth1 -d '.$Host['IP'].$Protocol." -j MARK --set-mark ".$FreeInetClass);
 …
       // VoIP devices
 /*
       if(($Host['name'] == 'HAJDA-VOIP') || ($Host['name'] == 'NAVRATIL-VOIP'))
+      if (($Host['name'] == 'HAJDA-VOIP') || ($Host['name'] == 'NAVRATIL-VOIP'))
+      {
         exec('/sbin/iptables -t mangle -A '.$TableIn." -i eth1 -d ".$Host['IP']." -p udp -j MARK --set-mark ".$VoipClassId);
         exec('/sbin/iptables -t mangle -A '.$TableOut." -o eth1 -s ".$Host['IP']." -p udp -j MARK --set-mark ".$VoipClassId);
       } else
       if($Host['name'] == 'GAME')
+      if ($Host['name'] == 'GAME')
+      {
         exec('/sbin/iptables -t mangle -A FORWARD -o eth1 -s '.$Host['IP']." -j game-server");

trunk/Modules/NetworkConfigRouterOS/Generators/AddressPortability.php

-              r738
+              r873
 <?php
 if(isset($_SERVER['REMOTE_ADDR'])) die();
+if (isset($_SERVER['REMOTE_ADDR'])) die();
 include_once(dirname(__FILE__).'/../../../Common/Global.php');
 include_once(dirname(__FILE__).'/../Routerboard.php');
 …
+{
   $TimeParts = explode(':', $Time);
   return($TimeParts[0] * 3600 + $TimeParts[1] * 60 + $TimeParts[2]);
+  return ($TimeParts[0] * 3600 + $TimeParts[1] * 60 + $TimeParts[2]);
+}
 …
 $DbResult3 = $System->Database->query('SELECT * FROM `NetworkSubnet` WHERE `Member` = 0 GROUP BY `DHCP`');
 while($Subnet = $DbResult3->fetch_assoc())
+while ($Subnet = $DbResult3->fetch_assoc())
+{
   echo($Subnet['AddressRange'].'/'.$Subnet['Mask'].' on router '.$Subnet['DHCP']."\n");
   $Routerboard->HostName = $Subnet['DHCP'];
   $List = $Routerboard->ListGet($Path, array('address', 'active-mac-address', 'active-address', 'expires-after', 'server', 'dynamic'));
   foreach($List as $Properties)
+  foreach ($List as $Properties)
+  {
     if($Properties['dynamic'] == 'true')
+    if ($Properties['dynamic'] == 'true')
     //and ($Properties['address'] != $Properties['active-address']))
+    {
 …
       echo('MAC: '.$Properties['active-mac-address']."\n");
       $DbRows2 = $System->Database->query('SELECT `Id` FROM `NetworkInterface` WHERE `MAC`="'.$Properties['active-mac-address'].'"');
       if($DbRows2->num_rows > 0)
+      if ($DbRows2->num_rows > 0)
+      {
         $Interface = $DbRows2->fetch_assoc();
         $InterfaceId = $Interface['Id'];
         $DbRows2 = $System->Database->query('SELECT `Id` FROM `NetworkInterfacePortable` WHERE `NetworkInterface`='.$InterfaceId);
         if($DbRows2->num_rows > 0)
+        if ($DbRows2->num_rows > 0)
+        {
           $System->Database->update('NetworkInterfacePortable', '`Time` < "'.TimeToMysqlDateTime($Properties['expires-after']).'" AND `NetworkInterface`='.$InterfaceId, array('DynamicIP' => $Properties['active-address'], 'Update' => 1));
 …
 $NATRule = array();
 $DbRows = $System->Database->query('SELECT NetworkDevice.Name AS DeviceName, NetworkInterface.Name AS InterfaceName, DynamicIP FROM `NetworkInterfacePortable` JOIN NetworkInterface ON NetworkInterface.Id=NetworkInterfacePortable.NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE `Update`=1');
 while($Portable = $DbRows->fetch_assoc())
+while ($Portable = $DbRows->fetch_assoc())
+{
   $Name = $Portable['DeviceName'];
   if($Portable['InterfaceName'] != '') $Name .= '-'.$Portable['InterfaceName'];
+  if ($Portable['InterfaceName'] != '') $Name .= '-'.$Portable['InterfaceName'];
   array_push($NATRule, implode(' ', $PathNAT).' set [find comment="'.$Name.'-in"] to-addresses='.$Portable['DynamicIP']);
   array_push($NATRule, implode(' ', $PathNAT).' set [find comment="'.$Name.'-out"] src-address='.$Portable['DynamicIP']);

trunk/Modules/NetworkConfigRouterOS/Generators/Common.php

r870	r873
6	6
7	7	$DbResult = $Database->query('SELECT `Id` FROM `NetworkMark` WHERE `Comment`="'.$Comment.'"');
8		if($DbResult->num_rows > 0)
	8	if ($DbResult->num_rows > 0)
9	9	{
10	10	$DbRow = $DbResult->fetch_assoc();
11		return($DbRow['Id']);
	11	return ($DbRow['Id']);
12	12	} else
13	13	{
14	14	$DbResult = $Database->query('INSERT INTO `NetworkMark` (`Comment`) VALUES ("'.$Comment.'")');
15		return($Database->insert_id);
	15	return ($Database->insert_id);
16	16	}
17	17	}
…	…
22	22
23	23	$DbResult = $Database->query('SELECT `Id` FROM `NetworkMangleSubgroup` WHERE `AddressRange`="'.$AddressRange.'"');
24		if($DbResult->num_rows > 0)
	24	if ($DbResult->num_rows > 0)
25	25	{
26	26	$DbRow = $DbResult->fetch_assoc();
27		return($DbRow['Id']);
	27	return ($DbRow['Id']);
28	28	} else
29	29	{
30	30	$DbResult = $Database->query('INSERT INTO `NetworkMangleSubgroup` (`AddressRange`) VALUES ("'.$AddressRange.'")');
31		return($Database->insert_id);
	31	return ($Database->insert_id);
32	32	}
33	33	}
…	…
38	38
39	39	$Found = false;
40		foreach($Tree['Items'] as $Index => $Node)
	40	foreach ($Tree['Items'] as $Index => $Node)
41	41	{
42		if($Node['Address']->Contain($Address))
	42	if ($Node['Address']->Contain($Address))
43	43	{
44	44	InsertToAddressTreeIPv4($Tree['Items'][$Index], $Address, $Name, true);
…	…
46	46	}
47	47	}
48		if($Found == false)
	48	if ($Found == false)
49	49	{
50		if($InterSubnets and ($Tree['Address']->Prefix < $Config['MainRouter']['MangleRuleSubgroupMinPrefix']) and
	50	if ($InterSubnets and ($Tree['Address']->Prefix < $Config['MainRouter']['MangleRuleSubgroupMinPrefix']) and
51	51	($Address->Prefix > ($Tree['Address']->Prefix + 1)))
52	52	{
…	…
62	62	// Should be existed items placed under new node?
63	63	$Found = false;
64		foreach($Tree['Items'] as $Index => $Node)
	64	foreach ($Tree['Items'] as $Index => $Node)
65	65	{
66		if(($Node['Address']->Address == $NewNode['Address']->Address) and
	66	if (($Node['Address']->Address == $NewNode['Address']->Address) and
67	67	($Node['Address']->Prefix == $NewNode['Address']->Prefix)) $Found = true;
68	68
69		if($Address->Contain($Node['Address']))
	69	if ($Address->Contain($Node['Address']))
70	70	{
71	71	$NewNode['Items'][] = $Node;
…	…
73	73	}
74	74	}
75		if($Found == false) $Tree['Items'][] = $NewNode;
	75	if ($Found == false) $Tree['Items'][] = $NewNode;
76	76	}
77	77	}
…	…
83	83
84	84	$Found = false;
85		foreach($Tree['Items'] as $Index => $Node)
	85	foreach ($Tree['Items'] as $Index => $Node)
86	86	{
87		if($Node['Address']->Contain($Address))
	87	if ($Node['Address']->Contain($Address))
88	88	{
89	89	InsertToAddressTreeIPv6($Tree['Items'][$Index], $Address, $Name, true);
…	…
91	91	}
92	92	}
93		if($Found == false)
	93	if ($Found == false)
94	94	{
95		if($InterSubnets and ($Tree['Address']->Prefix < $Config['MainRouter']['MangleRuleSubgroupMinPrefix']) and
	95	if ($InterSubnets and ($Tree['Address']->Prefix < $Config['MainRouter']['MangleRuleSubgroupMinPrefix']) and
96	96	($Address->Prefix > ($Tree['Address']->Prefix + 1)))
97	97	{
…	…
107	107	// Should be existed items placed under new node?
108	108	$Found = false;
109		foreach($Tree['Items'] as $Index => $Node)
	109	foreach ($Tree['Items'] as $Index => $Node)
110	110	{
111		if(($Node['Address']->Address == $NewNode['Address']->Address) and
	111	if (($Node['Address']->Address == $NewNode['Address']->Address) and
112	112	($Node['Address']->Prefix == $NewNode['Address']->Prefix)) $Found = true;
113	113
114		if($Address->Contain($Node['Address']))
	114	if ($Address->Contain($Node['Address']))
115	115	{
116	116	$NewNode['Items'][] = $Node;
…	…
118	118	}
119	119	}
120		if($Found == false) $Tree['Items'][] = $NewNode;
	120	if ($Found == false) $Tree['Items'][] = $NewNode;
121	121	}
122	122	}
…	…
126	126	{
127	127	echo(str_repeat(' ', $Indent).$Node['Address']->AddressToString().'/'.$Node['Address']->Prefix.' '.$Node['Name']."\n");
128		foreach($Node['Items'] as $Index => $Item)
	128	foreach ($Node['Items'] as $Index => $Item)
129	129	{
130	130	ShowSubnetNode($Item, $Indent + 1);

trunk/Modules/NetworkConfigRouterOS/Generators/DHCP.php

-              r861
+              r873
     $DbResult = $this->Database->query('SELECT * FROM `NetworkSubnet` WHERE `Configure`=1');
     while($Subnet = $DbResult->fetch_assoc())
+    while ($Subnet = $DbResult->fetch_assoc())
+    {
       echo($Subnet['DHCP']);
 …
         'WHERE CompareNetworkPrefix(INET_ATON(`LocalIP`), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].') '.
         'AND (`MAC` != "00:00:00:00:00:00") ORDER BY `LocalIP`');
       while($Interface = $DbResult2->fetch_assoc())
+      while ($Interface = $DbResult2->fetch_assoc())
+      {
         $Name = $Interface['DeviceName'];
         if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+        if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
         $Items[] = array('mac-address' => $Interface['MAC'], 'address' => $Interface['LocalIP'], 'server' => $Server, 'comment' => $Name, 'lease-time' => '1d');
+      }

trunk/Modules/NetworkConfigRouterOS/Generators/DNS.php

-              r781
+              r873
     $DbResult = $this->Database->query('SELECT * FROM `NetworkDomain`');
     while($Domain = $DbResult->fetch_assoc())
+    while ($Domain = $DbResult->fetch_assoc())
+    {
       $DomainName = $Domain['Name'];
 …
       // Get full domain name from parent items
       $CurrentDomain = $Domain;
       while($CurrentDomain['Parent'] > 0)
+      while ($CurrentDomain['Parent'] > 0)
+      {
         $DbResult2 = $this->Database->query('SELECT * FROM `NetworkDomain` WHERE `Id`='.$CurrentDomain['Parent']);
 …
           'JOIN `NetworkDevice` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
           'WHERE (`NetworkDevice`.`Used`=1)');
       while($Interface = $DbResult2->fetch_assoc())
+      while ($Interface = $DbResult2->fetch_assoc())
+      {
         $Name = $Interface['DeviceName'];
         if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+        if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
         $NameFull = $Name.'.'.$DomainName;
         $NameExtFull = $Name.'-ext.'.$DomainName;
         if($Interface['LocalIP'] != '')
+        if ($Interface['LocalIP'] != '')
           $Items[] = array('name' => $NameFull, 'address' => $Interface['LocalIP']);
         if($Interface['IPv6'] != '')
+        if ($Interface['IPv6'] != '')
           $Items[] = array('name' => $NameFull, 'address' => $Interface['IPv6']);
         if($Interface['ExternalIP'] != '')
+        if ($Interface['ExternalIP'] != '')
           $Items[] = array('name' => $NameExtFull, 'address' => $Interface['ExternalIP']);
+      }
 …
           'WHERE (`NetworkDevice`.`Used`=1) AND '.
           '(CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")) = `NetworkDomainAlias`.`Target`)');
       while($Alias = $DbResult2->fetch_assoc())
+      while ($Alias = $DbResult2->fetch_assoc())
+      {
         $Name = $Alias['Name'];
         $NameFull = $Name.'.'.$DomainName;
         $NameExtFull = $Name.'-ext.'.$DomainName;
         if($Alias['LocalIP'] != '')
+        if ($Alias['LocalIP'] != '')
           $Items[] = array('name' => $NameFull, 'address' => $Alias['LocalIP']);
         if($Alias['IPv6'] != '')
+        if ($Alias['IPv6'] != '')
           $Items[] = array('name' => $NameFull, 'address' => $Alias['IPv6']);
         if($Alias['ExternalIP'] != '')
+        if ($Alias['ExternalIP'] != '')
           $Items[] = array('name' => $NameExtFull, 'address' => $Alias['ExternalIP']);
+      }
       $DbResult2 = $this->Database->query('SELECT * FROM `NetworkDomainServer` WHERE `Domain`='.$Domain['Id']);
       while($Server = $DbResult2->fetch_assoc())
+      while ($Server = $DbResult2->fetch_assoc())
+      {
         $Routerboard->HostName = $Server['Address'];

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallFilter.php

-              r831
+              r873
     // Insert blocked addresses
     $DbResult = $this->Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id WHERE Member.Blocked=1');
     while($Member = $DbResult->fetch_assoc())
+    while ($Member = $DbResult->fetch_assoc())
+    {
       echo($Member['Name'].': ');
       // Hosts
       $DbResult2 = $this->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.ExternalIP <> "") AND (NetworkDevice.Member = '.$Member['Id'].') AND (NetworkInterface.LocalIP != NetworkInterface.ExternalIP) ORDER BY id DESC');
       while($Interface = $DbResult2->fetch_assoc())
+      while ($Interface = $DbResult2->fetch_assoc())
+      {
         $Name = $Interface['DeviceName'];
         if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+        if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
         $Name = RouterOSIdent($Name);
         echo($Name.'('.$Interface['LocalIP'].'), ');
 …
       // Subnets
       $DbResult2 = $this->Database->select('NetworkSubnet', '*', 'Member='.$Member['Id']);
       while($Subnet = $DbResult2->fetch_assoc())
+      while ($Subnet = $DbResult2->fetch_assoc())
+      {
         $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
 …
         $NewAddress->Prefix = $Subnet['ExtMask'];
         $Range = $NewAddress->GetRange();
         if($Subnet['ExtMask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
+        if ($Subnet['ExtMask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
         else $Range = $Range['From']->AddressToString();
         if($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
+        if ($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
         else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
         $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'src-address' => $Src, 'action' => 'drop','comment' => $Subnet['Name'].'-out-drop');
 …
         $NewAddress->Prefix = $Subnet['Mask'];
         $Range = $NewAddress->GetRange();
         if($Subnet['Mask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
+        if ($Subnet['Mask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
         else $Range = $Range['From']->AddressToString();
         if($Subnet['ExtMask'] == 32) $Dest = $Subnet['ExtAddressRange'];
+        if ($Subnet['ExtMask'] == 32) $Dest = $Subnet['ExtAddressRange'];
         else $Dest = $Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'];
         $Items[] = array('chain' => 'forward', 'in-interface' => $InetInterface, 'dst-address' => $Dest, 'action' => 'drop', 'comment' => $Subnet['Name'].'-in-drop');

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallMangle.php

-              r870
+              r873
     global $InetInterface, $ItemsFirewall;
     foreach($Node['Items'] as $Index => $Item)
+    {
       if(count($Item['Items']) == 0)
+    foreach ($Node['Items'] as $Index => $Item)
+    {
+      if (count($Item['Items']) == 0)
+      {
         // Hosts
         $ParentSubnetId = GetSubgroupByRange($Node['Address']->AddressToString().'/'.$Node['Address']->Prefix);
         $Address = $Item['Address']->AddressToString();
         if($Item['Address']->Prefix != 32) $Address .= '/'.$Item['Address']->Prefix;
+        if ($Item['Address']->Prefix != 32) $Address .= '/'.$Item['Address']->Prefix;
         $PacketMark = GetMarkByComment($Item['Name'].'-out');
 …
         $Address = $Item['Address']->AddressToString();
         if($Item['Address']->Prefix != 32) $Address .= '/'.$Item['Address']->Prefix;
+        if ($Item['Address']->Prefix != 32) $Address .= '/'.$Item['Address']->Prefix;
         $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-out', 'src-address' => $Address, 'out-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-'.$SubnetId.'-out', 'comment' => $Item['Name'].'-out');
 …
+      }
+    }
     if($Node['ForceMark'] == true)
+    if ($Node['ForceMark'] == true)
+    {
       // Mark member subnets
 …
     // Divide rules by subnet number
     $DbResult = $this->System->Database->query('SELECT `Id`, `Name`, `AddressRange`, `Mask` FROM `NetworkSubnet` WHERE `Member` IS NULL');
     while($Subnet = $DbResult->fetch_assoc())
+    while ($Subnet = $DbResult->fetch_assoc())
+    {
       $NewAddress = new NetworkAddressIPv4();
 …
         'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` '.
         'WHERE `Member`.`Blocked` = 0');
     while($Member = $DbResult->fetch_assoc())
+    while ($Member = $DbResult->fetch_assoc())
+    {
       $Member['Name'] = RouterOSIdent($Member['Name'].'-'.$Member['Id'] );
 …
       $DbResult2 = $this->System->Database->select('NetworkDevice', '*', '`Used` = 1 AND `Member` = '.$Member['Id']);
       while($Device = $DbResult2->fetch_assoc())
+      while ($Device = $DbResult2->fetch_assoc())
+      {
         $DbResult3 = $this->Database->select('NetworkInterface', '*', '`Device` = '.$Device['Id'].' AND `LocalIP` != ""');
         while($Interface = $DbResult3->fetch_assoc())
+        while ($Interface = $DbResult3->fetch_assoc())
+        {
           $Name = $Device['Name'];
           if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+          if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
           $Name = RouterOSIdent($Name);
           echo($Name.', ');
 …
       $DbResult2 = $this->Database->select('NetworkSubnet', '*', '(`Member`='.$Member['Id'].') AND (AddressRange != "")');
       while($Subnet = $DbResult2->fetch_assoc())
+      while ($Subnet = $DbResult2->fetch_assoc())
+      {
         $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
 …
         $NewAddress->AddressFromString($Subnet['AddressRange']);
         $NewAddress->Prefix = $Subnet['Mask'];
         if($Subnet['Member'] != 0) $ForceMark = true;
+        if ($Subnet['Member'] != 0) $ForceMark = true;
         else $ForceMark = false;
         echo($ForceMark.', ');
 …
     $DbResult = $this->System->Database->query('SELECT `Id`, `Name`, `AddressRangeIPv6`, `MaskIPv6` FROM `NetworkSubnet` '.
       'WHERE (`Member` IS NULL) AND (`AddressRangeIPv6` != "")');
     while($Subnet = $DbResult->fetch_assoc())
+    while ($Subnet = $DbResult->fetch_assoc())
+    {
       $NewAddress = new NetworkAddressIPv6();
 …
         'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` '.
         'WHERE `Member`.`Blocked` = 0');
     while($Member = $DbResult->fetch_assoc())
+    while ($Member = $DbResult->fetch_assoc())
+    {
       $Member['Name'] = RouterOSIdent($Member['Name'].'-'.$Member['Id'] );
 …
       $DbResult2 = $this->System->Database->select('NetworkDevice', '*', '`Used` = 1 AND `Member` = '.$Member['Id']);
       while($Device = $DbResult2->fetch_assoc())
+      while ($Device = $DbResult2->fetch_assoc())
+      {
         $DbResult3 = $this->Database->select('NetworkInterface', '*', '`Device` = '.$Device['Id'].' AND `IPv6` != ""');
         while($Interface = $DbResult3->fetch_assoc())
+        while ($Interface = $DbResult3->fetch_assoc())
+        {
           $Name = $Device['Name'];
           if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+          if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
           $Name = RouterOSIdent($Name);
           echo($Name.', ');
 …
       $DbResult2 = $this->Database->select('NetworkSubnet', '*', '(`Member`='.$Member['Id'].') AND (AddressRangeIPv6 != "")');
       while($Subnet = $DbResult2->fetch_assoc())
+      while ($Subnet = $DbResult2->fetch_assoc())
+      {
         $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
 …
         $NewAddress->AddressFromString($Subnet['AddressRangeIPv6']);
         $NewAddress->Prefix = $Subnet['MaskIPv6'];
         if($Subnet['Member'] != 0) $ForceMark = true;
+        if ($Subnet['Member'] != 0) $ForceMark = true;
         else $ForceMark = false;
         echo($ForceMark.', ');

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php

-              r860
+              r873
         'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` '.
         'WHERE `Member`.`Blocked` = 0');
     while($Member = $DbResult->fetch_assoc())
+    while ($Member = $DbResult->fetch_assoc())
+    {
       echo($Member['Name'].': ');
 …
           ' AND (`NetworkInterface`.`LocalIP` <> "")'.
           ' AND (`NetworkDevice`.`Member` = '.$Member['Id'].') AND (`NetworkInterface`.`LocalIP` != `NetworkInterface`.`ExternalIP`) ORDER BY `id` DESC');
       while($Interface = $DbResult2->fetch_assoc())
+      while ($Interface = $DbResult2->fetch_assoc())
+      {
         $Name = $Interface['DeviceName'];
         if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+        if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
         $Name = RouterOSIdent($Name);
         echo($Name.'('.$Interface['LocalIP'].'), ');
         if($Member['Blocked'] == 0)
+        if ($Member['Blocked'] == 0)
+        {
           $Items[] = array('chain' => 'inet-out', 'src-address' => $Interface['LocalIP'], 'action' => 'src-nat',  'to-addresses' => $Interface['ExternalIP'], 'comment' => $Name.'-out');
           if($Interface['InboundNATPriority'] > 0)
+          if ($Interface['InboundNATPriority'] > 0)
             $Items[] = array('chain' => 'inet-in', 'dst-address' => $Interface['ExternalIP'], 'action' => 'dst-nat', 'to-addresses' => $Interface['LocalIP'], 'comment' => $Name.'-in');
         } else
 …
       // Subnets
       $DbResult2 = $this->Database->select('NetworkSubnet', '*', '`Member`='.$Member['Id']);
       while($Subnet = $DbResult2->fetch_assoc())
+      while ($Subnet = $DbResult2->fetch_assoc())
+      {
         $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
         echo($Subnet['Name'].'('.$Subnet['AddressRange'].'/'.$Subnet['Mask'].'), ');
         if($Member['Blocked'] == 0)
+        if ($Member['Blocked'] == 0)
+        {
           $NewAddress = new NetworkAddressIPv4();
 …
           $NewAddress->Prefix = $Subnet['ExtMask'];
           $Range = $NewAddress->GetRange();
           if($Subnet['ExtMask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
+          if ($Subnet['ExtMask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
           else $Range = $Range['From']->AddressToString();
           if($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
+          if ($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
           else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
           $Items[] = array('chain' => 'inet-out', 'src-address' => $Src, 'action' => 'src-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name'].'-out');
 …
           $NewAddress->Prefix = $Subnet['Mask'];
           $Range = $NewAddress->GetRange();
           if($Subnet['Mask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
+          if ($Subnet['Mask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
           else $Range = $Range['From']->AddressToString();
           if($Subnet['ExtMask'] == 32) $Dest = $Subnet['ExtAddressRange'];
+          if ($Subnet['ExtMask'] == 32) $Dest = $Subnet['ExtAddressRange'];
           else $Dest = $Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'];
           $Items[] = array('chain' => 'inet-in', 'dst-address' => $Dest, 'action' => 'dst-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name'].'-in');
         } else
+        {
           if($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
+          if ($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
           else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
           $Items[] = array('chain' => 'dstnat', 'src-address' => $Src, 'protocol' => 'tcp', 'dst-port' => 80, 'action' => 'dst-nat',  'to-addresses' => $IPCentrala, 'to-ports' => 81, 'comment' => $Subnet['Name'].'-out');
 …
      // Route public addresses localy
      $DbResult = $this->Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id');
      while($Member = $DbResult->fetch_assoc())
+     while ($Member = $DbResult->fetch_assoc())
+     {
      echo($Member['Name'].': ');
      // Hosts
      $DbResult2 = $this->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.ExternalIP <> "") AND (NetworkDevice.Member = '.$Member['Id'].') AND (NetworkInterface.LocalIP != NetworkInterface.ExternalIP) ORDER BY id DESC');
      while($Interface = $DbResult2->fetch_assoc())
+     while ($Interface = $DbResult2->fetch_assoc())
+     {
      $Name = $Interface['DeviceName'];
      if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+     if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
      $Name = RouterOSIdent($Name);
      echo($Name.'('.$Interface['LocalIP'].'), ');

trunk/Modules/NetworkConfigRouterOS/Generators/Netwatch.php

-              r835
+              r873
     $DbResult3 = $this->Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet` WHERE `Configure` = 1'); // WHERE `Member` = 0');
     while($Router = $DbResult3->fetch_assoc())
+    while ($Router = $DbResult3->fetch_assoc())
+    {
       echo($Router['DHCP']."\n");
 …
       $Items = array();
       $DbResult = $this->Database->query('SELECT * FROM `NetworkSubnet` WHERE (`Configure` = 1) AND (`DHCP`="'.$Router['DHCP'].'")');
       while($Subnet = $DbResult->fetch_assoc())
+      while ($Subnet = $DbResult->fetch_assoc())
+      {
         $I = explode('.', $Subnet['AddressRange']);
 …
             ' LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE CompareNetworkPrefix(INET_ATON(`LocalIP`), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].')'.
             ' AND (`NetworkDevice`.`Used` = 1) ORDER BY `NetworkInterface`.`LocalIP`');
         while($Interface = $DbResult2->fetch_assoc())
+        while ($Interface = $DbResult2->fetch_assoc())
+        {
           $Name = $Interface['DeviceName'];
           if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+          if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
           echo($Name.', ');
           $Items[] = array('host' => $Interface['LocalIP'], 'interval' => '00:00:10', 'comment' => $Name);

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

-              r863
+              r873
     $Interfaces = array();
     $DbResult = $this->Database->select('NetworkInterface', '`Id`, `LocalIP` AS `IP`, `Online`, 0 AS `NewOnline`');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
       $Interfaces[$DbRow['IP']] = $DbRow;
 …
     $DbResult3 = $this->Database->query('SELECT `DHCP` FROM `NetworkSubnet` '.
       'WHERE (`Configure` = 1) AND (`Member` IS NULL) GROUP BY `DHCP`');
     while($Subnet = $DbResult3->fetch_assoc())
+    while ($Subnet = $DbResult3->fetch_assoc())
+    {
       echo('router '.$Subnet['DHCP']."\n");
 …
       $Routerboard->Connect($Subnet['DHCP'], $this->System->Config['API']['UserName'],
         $this->System->Config['API']['Password']);
       if(!$Routerboard->Connected) continue;
+      if (!$Routerboard->Connected) continue;
       $Routerboard->Write('/tool/netwatch/getall', false);
       $Routerboard->Write('=.proplist=host,status');
       $Read = $Routerboard->Read(false);
       $List = $Routerboard->ParseResponse($Read);
       foreach($List as $Properties)
+      foreach ($List as $Properties)
+      {
         $IP = $Properties['host'];
         if($Properties['status'] == 'up') $Online = 1;
+        if ($Properties['status'] == 'up') $Online = 1;
           else $Online = 0;
         if($Online)
+        if ($Online)
+        {
           if(array_key_exists($IP, $Interfaces))
+          if (array_key_exists($IP, $Interfaces))
             $Interfaces[$IP]['NewOnline'] = 1;
             else echo('IP '.$IP.' not found.'."\n");
 …
     $Queries = array();
     $QueriesInsert = array();
     foreach($Interfaces as $Index => $Interface)
+    foreach ($Interfaces as $Index => $Interface)
+    {
       // Update last online time if still online
       if($Interface['NewOnline'])
+      if ($Interface['NewOnline'])
         $Queries[] = $this->Database->GetUpdate('NetworkInterface', '`Id` = '.$Interface['Id'],
           array('LastOnline' => TimeToMysqlDateTime($StartTime)));
       if($Interface['Online'] != $Interface['NewOnline'])
+      if ($Interface['Online'] != $Interface['NewOnline'])
+      {
         // Online state changed
 …
     $DbResult = $this->Database->select('NetworkInterface', '*', '(`Online` = 1) AND '.
       '(`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'")');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
       echo('IP '.$DbRow['LocalIP'].' online but time not updated.'."\n");
 …
     $DbResult = $this->Database->select('NetworkInterface', '*', '(`Online` = 0) AND '.
       '(`LastOnline` >= "'.TimeToMysqlDateTime($StartTime).'")');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
       echo('IP '.$DbRow['LocalIP'].' not online but time updated.'."\n");
 …
     // Update device online state
     $DbResult = $this->Database->select('NetworkInterface', '`Device`, SUM(`Online`) AS `SumOnline`', '`Online` = 1 GROUP BY `Device`');
     while($Device = $DbResult->fetch_assoc())
+    while ($Device = $DbResult->fetch_assoc())
+    {
       if($Device['SumOnline'] > 0)
+      if ($Device['SumOnline'] > 0)
         $Queries[] = $this->Database->GetUpdate('NetworkDevice', 'Id='.$Device['Device'], array('LastOnline' => TimeToMysqlDateTime($StartTime), 'Online' => 1));
+    }

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

-              r869
+              r873
   function CheckName($Name, &$UsedNames)
+  {
     if(in_array($Name, $UsedNames)) die("\n".'Duplicate name: '.$Name);
+    if (in_array($Name, $UsedNames)) die("\n".'Duplicate name: '.$Name);
       else $UsedNames[] = $Name;
+  }
 …
     $DbResult = $this->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` '.
       'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` WHERE `Member`.`Blocked`=0');
     while($Member = $DbResult->fetch_assoc())
+    while ($Member = $DbResult->fetch_assoc())
+    {
       $ServiceIndex = 1;
 …
         'WHERE (`ServiceCustomerRel`.`Customer` = '.$Member['Id'].') AND (`ServiceCustomerRel`.`ChangeAction` IS NULL) '.
         'AND (`Service`.`InternetSpeedMax` > 0) AND (`Service`.`InternetSpeedMin` > 0)');
       while($Service = $DbResult4->fetch_assoc())
+      while ($Service = $DbResult4->fetch_assoc())
+      {
         echo('Služba '.$Service['Name'].': ');
 …
         $Row = $DbResult2->fetch_row();
         $HostCount = $Row[0];
         if($HostCount > 0)
+        if ($HostCount > 0)
+        {
           $HostSpeedIn = round($SpeedIn / $HostCount);
 …
         $DbResult2 = $this->Database->select('NetworkDevice', '*', $Filter);
         while($Device = $DbResult2->fetch_assoc())
+        while ($Device = $DbResult2->fetch_assoc())
+        {
           $DbResult3 = $this->Database->select('NetworkInterface', '*', '`Device` = '.$Device['Id'].' AND `LocalIP` != ""');
           while($Interface = $DbResult3->fetch_assoc())
+          while ($Interface = $DbResult3->fetch_assoc())
+          {
             $DeviceName = $Device['Name'];
             if($Interface['Name'] != '') $DeviceName .= '-'.$Interface['Name'];
+            if ($Interface['Name'] != '') $DeviceName .= '-'.$Interface['Name'];
             $DeviceName = RouterOSIdent($DeviceName);
             echo($DeviceName.', ');
 …
         $DbResult2 = $this->Database->select('NetworkSubnet', '*', '`Service`='.$Service['RelId']);
         while($Subnet = $DbResult2->fetch_assoc())
+        while ($Subnet = $DbResult2->fetch_assoc())
+        {
           $SubnetName = RouterOSIdent('subnet-'.$Subnet['Name']);
 …
+  {
     $MinSpeed = 0;
     foreach($this->Devices[$DeviceId]['Childs'] as $DeviceChild)
+    foreach ($this->Devices[$DeviceId]['Childs'] as $DeviceChild)
+    {
       $this->UpdateMinSpeed($DeviceChild);
 …
+    }
     $this->Devices[$DeviceId]['MinSpeed'] = $MinSpeed;
     if($this->Devices[$DeviceId]['DeviceCount'] > 0)
+    if ($this->Devices[$DeviceId]['DeviceCount'] > 0)
       $this->Devices[$DeviceId]['MinSpeed'] += round($this->Devices[$DeviceId]['InternetSpeedMin'] / $this->Devices[$DeviceId]['DeviceCount']);
+  }
 …
       'LEFT JOIN `ServiceCustomerRel` ON `ServiceCustomerRel`.`Id`=`NetworkDevice`.`Service` '.
       'LEFT JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service`');
     while($Device = $DbResult->fetch_assoc())
+    while ($Device = $DbResult->fetch_assoc())
+    {
       $Device['Interfaces'] = array();
 …
     $Interfaces = array();
     $DbResult = $this->Database->query('SELECT `Device`,`Name`,`Id` FROM `NetworkInterface`');
     while($Interface = $DbResult->fetch_assoc())
+    while ($Interface = $DbResult->fetch_assoc())
+    {
       $Interface['Links'] = array();
 …
       '`NetworkLink`.`Interface2`,`NetworkLinkType`.`MaxRealSpeed` FROM `NetworkLink` '.
       'LEFT JOIN `NetworkLinkType` ON `NetworkLinkType`.`Id`=`NetworkLink`.`Type`');
     while($Link = $DbResult->fetch_assoc())
+    while ($Link = $DbResult->fetch_assoc())
+    {
       $Links[$Link['Id']] = $Link;
 …
     $this->Devices[$RootDeviceId]['Calculated'] = true;
     while(count($DevicesToCheck) > 0)
+    while (count($DevicesToCheck) > 0)
+    {
       //echo('Pass'."\n");
       $NewDevicesToCheck = array();
       foreach($DevicesToCheck as $DeviceId)
+      foreach ($DevicesToCheck as $DeviceId)
+      {
         //echo($this->Devices[$DeviceId]['Name'].': ');
         foreach($this->Devices[$DeviceId]['Interfaces'] as $InterfaceId)
+        foreach ($this->Devices[$DeviceId]['Interfaces'] as $InterfaceId)
+        {
           foreach($Interfaces[$InterfaceId]['Links'] as $LinkId)
+          foreach ($Interfaces[$InterfaceId]['Links'] as $LinkId)
+          {
             $Link = $Links[$LinkId];
             $Interface2Id = $Link['Interface1'];
             if($Interface2Id == $InterfaceId) $Interface2Id = $Links[$LinkId]['Interface2'];
+            if ($Interface2Id == $InterfaceId) $Interface2Id = $Links[$LinkId]['Interface2'];
             $Device2Id = $Interfaces[$Interface2Id]['Device'];
             if($this->Devices[$Device2Id]['Calculated'] == false)
+            if ($this->Devices[$Device2Id]['Calculated'] == false)
+            {
               $this->Devices[$Device2Id]['Calculated'] = true;
               $NewMaxSpeed = $this->Devices[$DeviceId]['MaxSpeed'];
               if($NewMaxSpeed > $Link['MaxRealSpeed'])
+              if ($NewMaxSpeed > $Link['MaxRealSpeed'])
                 $NewMaxSpeed = $Link['MaxRealSpeed'];
               //echo($this->Devices[$Device2Id]['Name'].' '.$Device2Id.', ');
 …
     echo('Not linked network devices: ');
     foreach($this->Devices as $Device)
+    {
       if($Device['MaxSpeed'] == 0) echo($Device['Name'].', ');
+    foreach ($this->Devices as $Device)
+    {
+      if ($Device['MaxSpeed'] == 0) echo($Device['Name'].', ');
+    }
     echo("\n");
 …
     $DbResult3 = $this->Database->select('NetworkInterface', '*', '`Device` = '.$DeviceId.' AND `LocalIP` != ""');
     $IntCount = $DbResult3->num_rows;
     while($Interface = $DbResult3->fetch_assoc())
+    while ($Interface = $DbResult3->fetch_assoc())
+    {
       $InterfaceName = $Device['Name'];
       if($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
+      if ($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
         else $InterfaceName .= '-';
       $InterfaceName = RouterOSIdent($InterfaceName);
 …
     // Process childs
     foreach($Device['Childs'] as $DeviceChild)
+    foreach ($Device['Childs'] as $DeviceChild)
+    {
       $this->BuildQueueItems($DeviceChild, $LimitDevice);
 …
     $DbResult = $this->Database->select('Service', '*', '(`ChangeAction` IS NULL) AND (`Id`='.TARIFF_FREE.')');
     if($DbResult->num_rows == 1)
+    if ($DbResult->num_rows == 1)
+    {
       $Service = $DbResult->fetch_array();

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

-              r851
+              r873
         '(SELECT `LocalIP` FROM `NetworkInterface` WHERE `NetworkInterface`.`Device` = `NetworkDevice`.`Id` LIMIT 1) AS `LocalIP` '.
         'FROM `NetworkDevice` WHERE (`API` = 1) AND (`Used` = 1)');
     while($Device = $DbResult3->fetch_assoc())
+    while ($Device = $DbResult3->fetch_assoc())
+    {
       echo($Device['LocalIP']."\n");
 …
       //$Routerboard->Port = 8729;
       $Routerboard->Connect($Device['LocalIP'], $this->System->Config['API']['UserName'], $this->System->Config['API']['Password']);
       if(!$Routerboard->Connected) continue;
+      if (!$Routerboard->Connected) continue;
       $Routerboard->Write('/interface/wireless/registration-table/getall', false);
       $Routerboard->Write('=.proplist=signal-strength,mac-address,rx-rate,tx-rate', false);
 …
       $Read = $Routerboard->Read(false);
       $Array = $Routerboard->ParseResponse($Read);
       foreach($Array as $Properties)
+      foreach ($Array as $Properties)
+      {
         $DbResult = $this->Database->select('NetworkInterface', 'Id', 'MAC="'.$Properties['mac-address'].'"');
         if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
+        {
           $DbRow = $DbResult->fetch_assoc();
 …
         } else $Interface = 'NULL';
         if(strpos($Properties['signal-strength'], '@') === false)
+        if (strpos($Properties['signal-strength'], '@') === false)
+        {
           $Strength = $Properties['signal-strength'];
         } else {
           $Parts = explode('@', $Properties['signal-strength']);
           if(substr($Parts[0], -3) == 'dBm')
+          if (substr($Parts[0], -3) == 'dBm')
             $Strength = substr($Parts[0], 0, -3); // without dBm
             else $Strength = $Parts[0];
 …
         /*
          $DbResult = $this->Database->select('Measure', 'Id', '`Name` = "'.$Properties['mac-address'].'"');
          if($DbResult->num_rows > 0)
+         if ($DbResult->num_rows > 0)
+         {
          $this->Database->insert('Measure', array('Name' => $Properties['mac-address']));
 …
     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

-              r860
+              r873
     $IPAddress = GetRemoteAddress();
     $Output = 'Vaše IP adresa je: '.$IPAddress.'<br/>';
     if(IsInternetAddr($IPAddress)) {
+    if (IsInternetAddr($IPAddress)) {
       $Output .= '<p>Internet zdarma je dostupný pouze z vnitřní sítě.</p>';
       return($Output);
+      return ($Output);
+    }
     $Time = time();
 …
     $DbResult = $this->Database->select('NetworkFreeAccess', '*', '(IPAddress="'.$IPAddress.
       '") ORDER BY Time DESC LIMIT 1');
     if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
+    {
       $DbRow = $DbResult->fetch_assoc();
       $ActivationTime = MysqlDateTimeToTime($DbRow['Time']);
       if(($ActivationTime + $this->Timeout) < $Time)
+      if (($ActivationTime + $this->Timeout) < $Time)
+      {
         $Activated = false;
 …
     } else $Activated = false;
     if(array_key_exists('a', $_GET))
+    if (array_key_exists('a', $_GET))
+    {
       if($_GET['a'] == 'activate')
+      if ($_GET['a'] == 'activate')
+      {
         if($Activated == false)
+        if ($Activated == false)
+        {
           $DbResult = $this->Database->insert('NetworkFreeAccess',
 …
     $PrefixMultiplier = new PrefixMultiplier();
     if($Activated) $Output .= 'Aktivováno. Vyprší za '.$PrefixMultiplier->Add($ActivationTime + $this->Timeout - $Time, '', 4, 'Time');
+    if ($Activated) $Output .= 'Aktivováno. Vyprší za '.$PrefixMultiplier->Add($ActivationTime + $this->Timeout - $Time, '', 4, 'Time');
       else $Output .= '<a href="?a=activate">Aktivovat</a>';
     return($Output);
+    return ($Output);
+  }
+}
 …
     $Commands = array();
     $DbResult = $this->Database->select('NetworkFreeAccess', '`Id`, `IPAddress`', '(`Configured`=0)');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
       $Commands[] = '/ip firewall address-list add address='.$DbRow['IPAddress'].
 …
     $Routerboard->ExecuteBatch(implode(';', $Commands));
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/NetworkConfigRouterOS/Routerboard.php

-              r860
+              r873
+  {
     $Output = array();
     if(is_array($Commands))
+    if (is_array($Commands))
+    {
       $I = 0;
       $Batch = array();
       while($I < count($Commands))
+      {
         if(($I % $this->MaxBurstLineCount) == 0)
+        {
           if(count($Batch) > 0)
+      while ($I < count($Commands))
+      {
+        if (($I % $this->MaxBurstLineCount) == 0)
+        {
+          if (count($Batch) > 0)
             $Output = array_merge($Output, $this->ExecuteBatch(implode(';', $Batch)));
           $Batch = array();
 …
         $I++;
+      }
       if(count($Batch) > 0)
+      if (count($Batch) > 0)
        $Output = array_merge($Output, $this->ExecuteBatch(implode(';', $Batch)));
     } else
       $Output = array_merge($Output, $this->ExecuteBatch($Commands));
     return($Output);
+    return ($Output);
+  }
 …
+  {
     $Commands = trim($Commands);
     if($Commands != '')
+    if ($Commands != '')
+    {
       $Commands = addslashes($Commands);
 …
       $Command = $this->SSHPath.' -oBatchMode=no -o ConnectTimeout='.$this->Timeout.' -l '.$this->UserName.
         $PrivKey.' '.$this->HostName.' "'.$Commands.'"';
       if($this->Debug) echo($Command);
+      if ($this->Debug) echo($Command);
       $Output = array();
       exec($Command, $Output);
     } else $Output = '';
     if($this->Debug) print_r($Output);
     return($Output);
+    if ($this->Debug) print_r($Output);
+    return ($Output);
+  }
 …
     array_pop($Result);
     $List = array();
     foreach($Result as $ResultLine)
+    foreach ($Result as $ResultLine)
+    {
       $ResultLineParts = explode(' ', trim($ResultLine));
       if(count($ResultLineParts) > 1)
+      {
         if($ResultLineParts[1]{0} == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
+      if (count($ResultLineParts) > 1)
+      {
+        if ($ResultLineParts[1]{0} == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
         $List[substr($ResultLineParts[0], 0, -1)] = $ResultLineParts[1];
       } else $List[substr($ResultLineParts[0], 0, -1)] = '';
+    }
     return($List);
+    return ($List);
+  }
 …
+  {
     $PropertyList = '"';
     foreach($Properties as $Index => $Property)
+    foreach ($Properties as $Index => $Property)
+    {
       $PropertyList .= $Index.'=".[get $i '.$Property.']." ';
 …
     $ConditionList = '';
     foreach($Conditions as $Index => $Item)
+    {
       if($Item == 'no') $ConditionList .= $Index.'='.$Item.' ';
+    foreach ($Conditions as $Index => $Item)
+    {
+      if ($Item == 'no') $ConditionList .= $Index.'='.$Item.' ';
       else $ConditionList .= $Index.'="'.$Item.'" ';
+    }
 …
     $Result = $this->Execute(implode(' ', $Path).' {:foreach i in=[find '.$ConditionList.'] do={:put ('.$PropertyList.')}}');
     $List = array();
     foreach($Result as $ResultLine)
+    foreach ($Result as $ResultLine)
+    {
       $ResultLineParts = explode(' ', $ResultLine);
       $ListItem = array();
       foreach($ResultLineParts as $ResultLinePart)
+      foreach ($ResultLineParts as $ResultLinePart)
+      {
         $Value = explode('=', $ResultLinePart);
         if(count($Value) > 1) $ListItem[$Properties[$Value[0]]] = $Value[1];
+        if (count($Value) > 1) $ListItem[$Properties[$Value[0]]] = $Value[1];
           else $ListItem[$Properties[$Value[0]]] = '';
+      }
       $List[] = $ListItem;
+    }
     return($List);
+    return ($List);
+  }
 …
+  {
     $ConditionList = '';
     foreach($Conditions as $Index => $Item)
+    foreach ($Conditions as $Index => $Item)
+    {
       $ConditionList .= $Index.'="'.$Item.'" ';
+    }
     $ConditionList = substr($ConditionList, 0, -1);
     if(trim($ConditionList) != '')
+    if (trim($ConditionList) != '')
       $ConditionList = ' where '.$ConditionList;
     $Result = $this->Execute(implode(' ', $Path).' print terse'.$ConditionList);
     $List = array();
     foreach($Result as $ResultLine)
+    foreach ($Result as $ResultLine)
+    {
       $ResultLineParts = explode(' ', $ResultLine);
       $ListItem = array();
       foreach($ResultLineParts as $ResultLinePart)
+      foreach ($ResultLineParts as $ResultLinePart)
+      {
         $Value = explode('=', $ResultLinePart);
         if(in_array($Value[0], $Properties))
+        {
           if(count($Value) > 1)
+        if (in_array($Value[0], $Properties))
+        {
+          if (count($Value) > 1)
+          {
             if($Value[1]{0} == '"') $Value[1] = substr($Value[1], 1, -1);
             //if(strlen($Value[1]) > 0)
+            if ($Value[1]{0} == '"') $Value[1] = substr($Value[1], 1, -1);
+            //if (strlen($Value[1]) > 0)
             $ListItem[$Value[0]] = $Value[1];
           } else $ListItem[$Value[0]] = '';
+        }
+      }
       if(count($ListItem) > 0) $List[] = $ListItem;
+    }
     return($List);
+      if (count($ListItem) > 0) $List[] = $ListItem;
+    }
+    return ($List);
+  }
 …
+  {
     // Get current list from routerboard
     if($UsePrint == 0)
+    if ($UsePrint == 0)
+    {
       $List = $this->ListGet($Path, $Properties, $Condition);
       // Change boolean values yes/no to true/false
       foreach($List as $Index => $ListItem)
+      {
         foreach($ListItem as $Index2 => $Item2)
+        {
           if($Item2 == 'true') $List[$Index][$Index2] = 'yes';
           if($Item2 == 'false') $List[$Index][$Index2] = 'no';
+      foreach ($List as $Index => $ListItem)
+      {
+        foreach ($ListItem as $Index2 => $Item2)
+        {
+          if ($Item2 == 'true') $List[$Index][$Index2] = 'yes';
+          if ($Item2 == 'false') $List[$Index][$Index2] = 'no';
+        }
+      }
 …
     // Add empty properties to values
     foreach($Values as $Index => $Item)
+    {
       foreach($Properties as $Property)
+      {
         if(!array_key_exists($Property, $Item))
+    foreach ($Values as $Index => $Item)
+    {
+      foreach ($Properties as $Property)
+      {
+        if (!array_key_exists($Property, $Item))
            $Item[$Property] = '';
+      }
       $Values[$Index] = $Item;
+    }
     foreach($List as $Index => $Item)
+    {
       foreach($Properties as $Property)
+      {
         if(!array_key_exists($Property, $Item))
+    foreach ($List as $Index => $Item)
+    {
+      foreach ($Properties as $Property)
+      {
+        if (!array_key_exists($Property, $Item))
            $Item[$Property] = '';
+      }
 …
     // Sort properties
     foreach($Values as $Index => $Item)
+    foreach ($Values as $Index => $Item)
+    {
       ksort($Values[$Index]);
+    }
     foreach($List as $Index => $Item)
+    foreach ($List as $Index => $Item)
+    {
       ksort($List[$Index]);
+    }
     if($this->Debug) print_r($List);
     if($this->Debug) print_r($Values);
+    if ($this->Debug) print_r($List);
+    if ($this->Debug) print_r($Values);
     // Erase all items not existed in $Values
     foreach($List as $Index => $ListItem)
+    {
       if(!in_array($ListItem, $Values))
+    foreach ($List as $Index => $ListItem)
+    {
+      if (!in_array($ListItem, $Values))
+      {
         $Prop = '';
         foreach($ListItem as $Index => $Property)
+        {
           if($Property != '')
+        foreach ($ListItem as $Index => $Property)
+        {
+          if ($Property != '')
+          {
             if(($Property == 'yes') or ($Property == 'no')) $Prop .= $Index.'='.$Property.' ';
+            if (($Property == 'yes') or ($Property == 'no')) $Prop .= $Index.'='.$Property.' ';
               else $Prop .= $Index.'="'.$Property.'" ';
+          }
+        }
         $Prop = substr($Prop, 0, -1);
         if(trim($Prop) != '')
+        if (trim($Prop) != '')
           $Commands[] = implode(' ', $Path).' remove [find '.$Prop.']';
+      }
 …
     // Add new items
     foreach($Values as $ListItem)
+    {
       if(!in_array($ListItem, $List))
+    foreach ($Values as $ListItem)
+    {
+      if (!in_array($ListItem, $List))
+      {
         $Prop = '';
         foreach($ListItem as $Index => $Property)
+        {
           if($Property != '') $Prop .= $Index.'="'.$Property.'" ';
+        foreach ($ListItem as $Index => $Property)
+        {
+          if ($Property != '') $Prop .= $Index.'="'.$Property.'" ';
+        }
         $Prop = substr($Prop, 0, -1);
 …
+      }
+    }
     if($this->Debug) print_r($Commands);
     return($this->Execute($Commands));
+    if ($this->Debug) print_r($Commands);
+    return ($this->Execute($Commands));
+  }
+}

trunk/Modules/NetworkConfigRouterOS/Routerboard2.php

r738	r873
13	13	function Execute($Commands)
14	14	{
15		if(is_array($Commands)) $Commands = implode(';', $Commands);
16		return(parent::Execute($Commands));
	15	if (is_array($Commands)) $Commands = implode(';', $Commands);
	16	return (parent::Execute($Commands));
17	17	}
18	18
…	…
22	22	array_pop($Result);
23	23	$List = array();
24		foreach($Result as $ResultLine)
	24	foreach ($Result as $ResultLine)
25	25	{
26	26	$ResultLineParts = explode(' ', trim($ResultLine));
27		if($ResultLineParts[1]{0} == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
	27	if ($ResultLineParts[1]{0} == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
28	28	$List[substr($ResultLineParts[0], 0, -1)] = $ResultLineParts[1];
29	29	}
30		return($List);
	30	return ($List);
31	31	}
32	32
…	…
34	34	{
35	35	$PropertyList = '"';
36		foreach($Properties as $Property)
	36	foreach ($Properties as $Property)
37	37	{
38	38	$PropertyList .= $Property.'=".[get $i '.$Property.']." ';
…	…
41	41	$Result = $this->Execute($Command.' {:foreach i in=[find] do={:put ('.$PropertyList.')}}');
42	42	$List = array();
43		foreach($Result as $ResultLine)
	43	foreach ($Result as $ResultLine)
44	44	{
45	45	$ResultLineParts = explode(' ', $ResultLine);
46	46	$ListItem = array();
47		foreach($ResultLineParts as $ResultLinePart)
	47	foreach ($ResultLineParts as $ResultLinePart)
48	48	{
49	49	$Value = explode('=', $ResultLinePart);
…	…
52	52	$List[] = $ListItem;
53	53	}
54		return($List);
	54	return ($List);
55	55	}
56	56
57	57	function GetSystemResource()
58	58	{
59		return($this->GetItem('/system resource print'));
	59	return ($this->GetItem('/system resource print'));
60	60	}
61	61
62	62	function GetFirewallFilterList()
63	63	{
64		return($this->GetList('/ip firewall nat', array('src-address', 'dst-address', 'bytes')));
	64	return ($this->GetList('/ip firewall nat', array('src-address', 'dst-address', 'bytes')));
65	65	}
66	66
67	67	function GetDHCPServerLeasesList()
68	68	{
69		return($this->GetList('/ip dhcp-server lease', array('address', 'active-address', 'comment', 'lease-time', 'status', 'host-name')));
	69	return ($this->GetList('/ip dhcp-server lease', array('address', 'active-address', 'comment', 'lease-time', 'status', 'host-name')));
70	70	}
71	71	}

trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

r861	r873
40	40	} else if ($Length >= 0x10000000)
41	41	$Length = chr(0xF0).chr(($Length >> 24) & 0xFF).chr(($Length >> 16) & 0xFF).chr(($Length >> 8) & 0xFF).chr($Length & 0xFF);
42		return($Length);
	42	return ($Length);
43	43	}
44	44
45	45	function ConnectOnce($IP, $Login, $Password)
46	46	{
47		if($this->Connected) $this->Disconnect();
48		if($this->SSL)
	47	if ($this->Connected) $this->Disconnect();
	48	if ($this->SSL)
49	49	{
50	50	$IP = 'ssl://'.$IP;
51	51	}
52	52	$this->Socket = @fsockopen($IP, $this->Port, $this->ErrorNo, $this->ErrorStr, $this->Timeout);
53		if($this->Socket)
	53	if ($this->Socket)
54	54	{
55	55	socket_set_timeout($this->Socket, $this->Timeout);
…	…
58	58	$this->Write('=password='.$Password);
59	59	$Response = $this->Read(false);
60		if((count($Response) > 0) and ($Response[0] == '!done')) $this->Connected = true;
61		if(!$this->Connected) fclose($this->Socket);
	60	if ((count($Response) > 0) and ($Response[0] == '!done')) $this->Connected = true;
	61	if (!$this->Connected) fclose($this->Socket);
62	62	}
63	63	}
…	…
65	65	function Connect($IP, $Login, $Password)
66	66	{
67		for($Attempt = 1; $Attempt <= $this->Attempts; $Attempt++)
	67	for ($Attempt = 1; $Attempt <= $this->Attempts; $Attempt++)
68	68	{
69	69	$this->ConnectOnce($IP, $Login, $Password);
70		if($this->Connected) break;
	70	if ($this->Connected) break;
71	71	sleep($this->Delay);
72	72	}
73		return($this->Connected);
	73	return ($this->Connected);
74	74	}
75	75
76	76	function Disconnect()
77	77	{
78		if($this->Connected)
	78	if ($this->Connected)
79	79	{
80	80	fclose($this->Socket);
…	…
183	183	$Response[] = $Line;
184	184	}
185		if($this->Debug) echo($Line);
	185	if ($this->Debug) echo($Line);
186	186	// If we get a !done, make a note of it.
187	187	if ($Line == "!done") $ReceivedDone = true;
…	…
192	192	break;
193	193	}
194		if($Parse) $Response = $this->ParseResponse($Response);
	194	if ($Parse) $Response = $this->ParseResponse($Response);
195	195	return $Response;
196	196	}
…	…
198	198	function Write($Command, $Param2 = true)
199	199	{
200		if($Command)
	200	if ($Command)
201	201	{
202	202	$Data = explode("\n", $Command);
…	…
234	234	$this->Write($el, $Last);
235	235	}
236		return($this->Read());
	236	return ($this->Read());
237	237	}
238	238	}

trunk/Modules/NetworkConfigRouterOS/SSH.php

r738	r873
18	18	{
19	19	echo($Commands);
20		if(!function_exists("ssh2_connect")) die("Function ssh2_connect doesn't exist");
21		if(!($this->Session = ssh2_connect($this->HostName, 22, $this->Methods))) echo("Fail: Unable to establish connection to host\n");
	20	if (!function_exists("ssh2_connect")) die("Function ssh2_connect doesn't exist");
	21	if (!($this->Session = ssh2_connect($this->HostName, 22, $this->Methods))) echo("Fail: Unable to establish connection to host\n");
22	22	else
23	23	{
24		if(!ssh2_auth_password($this->Session, $this->UserName, $this->Password)) echo("Fail: unable to authenticate\n");
	24	if (!ssh2_auth_password($this->Session, $this->UserName, $this->Password)) echo("Fail: unable to authenticate\n");
25	25	else
26	26	{
27		//if(!($Stream = ssh2_shell($this->Session, 'xterm', null, 80, 40, SSH2_TERM_UNIT_CHARS))) echo("Fail: unable to execute command\n");
28		if(!($Stream = ssh2_exec($this->Session, $Commands))) echo("Fail: unable to execute command\n");
	27	//if (!($Stream = ssh2_shell($this->Session, 'xterm', null, 80, 40, SSH2_TERM_UNIT_CHARS))) echo("Fail: unable to execute command\n");
	28	if (!($Stream = ssh2_exec($this->Session, $Commands))) echo("Fail: unable to execute command\n");
29	29	else
30	30	{
31	31	$Response = '';
32	32	stream_set_blocking($Stream, true);
33		while($Buffer = fread($Stream, 4000))
	33	while ($Buffer = fread($Stream, 4000))
34	34	{
35	35	$Response .= $Buffer;
…	…
37	37	/*
38	38	//echo(') '.strlen($Buffer).' '.ord($Buffer{0}).'(');
39		for($I = 0; $I < strlen($Buffer); $I++)
	39	for ($I = 0; $I < strlen($Buffer); $I++)
40	40	{
41		if(((ord($Buffer{$I}) >= 32) and (ord($Buffer{$I}) <= 128)) or ($Buffer{$I} = "\n") or ($Buffer{$I} = "\r")) echo($Buffer{$I});
42		if($Buffer{$I} == '>')
	41	if (((ord($Buffer{$I}) >= 32) and (ord($Buffer{$I}) <= 128)) or ($Buffer{$I} = "\n") or ($Buffer{$I} = "\r")) echo($Buffer{$I});
	42	if ($Buffer{$I} == '>')
43	43	{
44	44	fwrite($Stream, $Commands."\n\r");
…	…
54	54	}
55	55	echo($Response);
56		return(explode("\n", substr($Response, 0, -1)));
	56	return (explode("\n", substr($Response, 0, -1)));
57	57	}
58	58	}

trunk/Modules/NetworkShare/SharePage.php

-              r790
+              r873
   function ShowTime()
+  {
     return(date("H:i:s")."<br />\n");
+    return (date("H:i:s")."<br />\n");
+  }
 …
     $Cesta = ''; //$Row['name'];
     $i = 0;
     while(($Otec > 1) && ($i < $this->MaxNesting))
+    while (($Otec > 1) && ($i < $this->MaxNesting))
+    {
       $DbResult = $this->Database->query('SELECT Id,Name,Parent FROM NetworkShareItem WHERE Id='.$Otec);
 …
       $i++;
+    }
     if($i >= $this->MaxNesting) $Cesta = '?'.'\\'.$Cesta;
     return('\\\\'.$Cesta);
+    if ($i >= $this->MaxNesting) $Cesta = '?'.'\\'.$Cesta;
+    return ('\\\\'.$Cesta);
+  }
 …
+  {
     $Jednotky = array('B','kB','MB','GB','TB','PB','EB');
     while($Velikost >= 1024)
+    while ($Velikost >= 1024)
+    {
       $Velikost = round($Velikost / 1024 * 10) / 10;
       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
     if(array_key_exists('view', $_POST) and !array_key_exists('online', $_POST)) $_POST['online'] = 'off';
+    if (array_key_exists('view', $_POST) and !array_key_exists('online', $_POST)) $_POST['online'] = 'off';
     // Default host list view
     if((count($_POST) == 0) and (count($_GET) == 0))
+    if ((count($_POST) == 0) and (count($_GET) == 0))
+    {
       $_POST['view'] = 1;
 …
     // Toggle order direction
     if(array_key_exists('order', $_GET) and ($_SESSION['order'] == $_GET['order'])) $_GET['order'] .= ' DESC';
+    if (array_key_exists('order', $_GET) and ($_SESSION['order'] == $_GET['order'])) $_GET['order'] .= ' DESC';
     //print_r($_POST);
     foreach($this->Promene as $Index => $Prvek)
+    {
       if(!array_key_exists($Index, $_SESSION)) $_SESSION[$Index] = $this->Promene[$Index];
       if(array_key_exists($Index, $_GET)) $_SESSION[$Index] = $_GET[$Index];
       if(array_key_exists($Index, $_POST)) $_SESSION[$Index] = $_POST[$Index];
       if(($Index == 'keyword') and (array_key_exists('view', $_GET))) $_SESSION[$Index] = $this->Promene[$Index];
       if(($Index == 'view') and ((array_key_exists('keyword', $_POST)) or (array_key_exists('keyword', $_GET)))) $_SESSION[$Index] = '';
+    foreach ($this->Promene as $Index => $Prvek)
+    {
+      if (!array_key_exists($Index, $_SESSION)) $_SESSION[$Index] = $this->Promene[$Index];
+      if (array_key_exists($Index, $_GET)) $_SESSION[$Index] = $_GET[$Index];
+      if (array_key_exists($Index, $_POST)) $_SESSION[$Index] = $_POST[$Index];
+      if (($Index == 'keyword') and (array_key_exists('view', $_GET))) $_SESSION[$Index] = $this->Promene[$Index];
+      if (($Index == 'view') and ((array_key_exists('keyword', $_POST)) or (array_key_exists('keyword', $_GET)))) $_SESSION[$Index] = '';
       $$Index = $_SESSION[$Index];
       //echo('$'.$Index.' = '.$_SESSION[$Index].'<br>');
+    }
     //echo($keyword);
     //if($keyword)
     //if($keyword != '') $view = '';
+    //if ($keyword)
+    //if ($keyword != '') $view = '';
     //$this->Database->select_db('share');
     // Log search
     if(array_key_exists('keyword', $_POST) or array_key_exists('keyword', $_GET))
+    if (array_key_exists('keyword', $_POST) or array_key_exists('keyword', $_GET))
       $this->System->ModuleManager->Modules['Log']->NewRecord('Share', 'Hledaný výraz', $_SESSION['keyword']);
 …
     </select>&nbsp;';
     if($online == 'on') $Selected = 'checked '; else $Selected = '';
+    if ($online == 'on') $Selected = 'checked '; else $Selected = '';
     $Output .= '<input type="checkbox" '.$Selected.'name="online">Pouze aktivní uživatele<br>
     </form>';
     //$Output .= $view;
     if($view != '')
+    if ($view != '')
+    {
       // Zobrazení obsahu vybrané složky
 …
         "(ext LIKE 'iso') OR (ext LIKE 'nrg') OR (ext LIKE 'ccd') OR (ext LIKE 'bin') OR (ext LIKE 'mds')",
       );
       if($file_type > 0) $Podminka .= ' AND ('.$Pripony[$file_type].')';
+      if ($file_type > 0) $Podminka .= ' AND ('.$Pripony[$file_type].')';
       //Hledání podle velikosti
       $Jednotky = array(1, 1024, 1048576, 1073741824);
       if(is_numeric($size))
+      if (is_numeric($size))
+      {
         $Metoda = array('=', '>', '<');
 …
     // Omezení na online/offline uživatele
     //$this->Database->select_db('is');
     if($online == 'on') $DbResult = $this->Database->query('SELECT Id FROM NetworkDevice WHERE Online=1 AND Member IS NOT NULL');
+    if ($online == 'on') $DbResult = $this->Database->query('SELECT Id FROM NetworkDevice WHERE Online=1 AND Member IS NOT NULL');
       else $DbResult = $this->Database->query('SELECT Id FROM NetworkDevice');
     $Vyber = '';
     while($Row = $DbResult->fetch_array()) $Vyber .= $Row['Id'].',';
+    while ($Row = $DbResult->fetch_array()) $Vyber .= $Row['Id'].',';
     $Podminka .= ' AND (Host IN ('.substr($Vyber, 0, -1).'))';
     //echo($Podminka.'<br>');
 …
     // Zobrazení [..]
     if(($view != '') && ($page == 0) && ($Nahoru > 0))
+    if (($view != '') && ($page == 0) && ($Nahoru > 0))
+    {
       $DbResult = $this->Database->query('SELECT * FROM NetworkShareItem WHERE Id='.$view);
 …
     $PerPage = 30;
     $Dotaz = "SELECT COUNT(*) FROM NetworkShareItem WHERE (".$Podminka.")";
     if($order != '') $Dotaz .= ' ORDER BY '.$order;
+    if ($order != '') $Dotaz .= ' ORDER BY '.$order;
     $Dotaz .= " LIMIT ".($page * $PerPage).",".$PerPage;
     $DbResult = $this->Database->query($Dotaz);
 …
     $Pocet = $Row[0];
     if($Pocet > 0)
+    if ($Pocet > 0)
+    {
       $Output .= 'Nalezeno celkem: '.$Pocet.' položek<br />';
     } else
     $Output .= 'Podle zadaných podmínek nic nenalezeno';
     if(($Pocet > 0) || ($upstr))
+    if (($Pocet > 0) || ($upstr))
+    {
       $Output .= '<table width="100%" style="font-size: 8pt;" border="0" cellpadding="2" cellspacing="2">
       <tr><th bgcolor="#E0E0FF"><a href="index.php?order=name">Soubor</a></th><th bgcolor="#E0E0FF"><a href="index.php?order=ext">Přípona</a></th><th bgcolor="#E0E0FF"><a href="index.php?order=size">Velikost</a></th><th bgcolor="#E0E0FF"><a href="index.php?order=date">Datum</a></th><th bgcolor="#E0E0FF">Umístění</th></tr>';
       $Output .= $upstr;
       if($Pocet > 0)
+      if ($Pocet > 0)
+      {
         // Zobrazení tabulky s výsledky
 …
         // Zobrazení poloľek
         while($Row = $DbResult->fetch_array())
+        while ($Row = $DbResult->fetch_array())
+        {
           // Loguj('Radek '.$Row['name']);
 …
           // Zobrazení řádku
           $Cesta2 = strtr($Cesta.$Radek['Name'], '\\', '/');
           if($Radek['Ext'] != '') $Cesta2 .= '.'.$Radek['Ext'];
           if($Radek['Type'] != 0) $Adresa = 'index.php?view='.$Radek['Id'].'">['.$Radek['Name'].']';
+          if ($Radek['Ext'] != '') $Cesta2 .= '.'.$Radek['Ext'];
+          if ($Radek['Type'] != 0) $Adresa = 'index.php?view='.$Radek['Id'].'">['.$Radek['Name'].']';
           else
+          {
             if(strstr($_SERVER['HTTP_USER_AGENT'], 'Linux')) $Adresa = 'smb:'.$Cesta2.'">'.$Radek['Name'];
+            if (strstr($_SERVER['HTTP_USER_AGENT'], 'Linux')) $Adresa = 'smb:'.$Cesta2.'">'.$Radek['Name'];
             else $Adresa = 'file:///'.$Cesta2.'">'.$Radek['Name'];
+          }
 …
+      }
+    }
     if($Pocet > 0)
+    if ($Pocet > 0)
+    {
       // Celkový přehled
       if($view == 1)
+      if ($view == 1)
+      {
         $DbResult = $this->Database->query('SELECT SUM(Size) FROM NetworkShareItem WHERE (Parent=1) AND (Host IN ('.substr($Vyber,0,-1).'))');
 …
         $Host = strtoupper(substr($Host, 0, strpos($Host, '.')));
         $DbResult = $this->Database->select('NetworkShareError', '*', 'Host="'.$Host.'"');
         if($DbResult->num_rows > 0) $Output .= '<strong>Výpis chybových hlášení pro počítač '.$Host.':</strong><br />';
+        if ($DbResult->num_rows > 0) $Output .= '<strong>Výpis chybových hlášení pro počítač '.$Host.':</strong><br />';
         //echo('host="'.$Host.'"');
         while($Row = $DbResult->fetch_array())
+        while ($Row = $DbResult->fetch_array())
+        {
           $Row['Message'] = str_replace('/', '\\', $Row['Message']);
 …
       // Zobrazení seznamu stránek
       if($Pages > 1)
+      if ($Pages > 1)
+      {
         if($page > 0) $Output .= '<a href="index.php?page=0">&lt;&lt;</a> ';
         if($page > 0) $Output .= '<a href="index.php?page='.($page-1).'">&lt;</a> ';
+        if ($page > 0) $Output .= '<a href="index.php?page=0">&lt;&lt;</a> ';
+        if ($page > 0) $Output .= '<a href="index.php?page='.($page-1).'">&lt;</a> ';
         $PagesMax = $Pages;
         $PagesMin = 0;
         if($PagesMax > ($page + 10)) $PagesMax = $page + 10;
         if($PagesMin < ($page - 10))
+        if ($PagesMax > ($page + 10)) $PagesMax = $page + 10;
+        if ($PagesMin < ($page - 10))
+        {
           $Output .= ' .. ';
           $PagesMin = $page - 10;
+        }
         for($i = $PagesMin; $i <= $PagesMax; $i++)
+        for ($i = $PagesMin; $i <= $PagesMax; $i++)
+        {
           if($i == $page) $Output .= '<strong>';
+          if ($i == $page) $Output .= '<strong>';
           $Output .= '<a href="index.php?page='.$i.'">'.($i + 1).'</a> ';
           if($i == $page) $Output .= '</strong>';
+          if ($i == $page) $Output .= '</strong>';
+        }
         if($PagesMax < $Pages) $Output .= ' .. ';
         if($page < $Pages) $Output .= '<a href="index.php?page='.($page + 1).'">&gt;</a> ';
         if($page < $Pages) $Output .= '<a href="index.php?page='.$Pages.'">&gt;&gt;</a>';
+        if ($PagesMax < $Pages) $Output .= ' .. ';
+        if ($page < $Pages) $Output .= '<a href="index.php?page='.($page + 1).'">&gt;</a> ';
+        if ($page < $Pages) $Output .= '<a href="index.php?page='.$Pages.'">&gt;&gt;</a>';
+      }
+    }
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/NetworkShare/browse.php

-              r790
+              r873
 $MountDir = '/tmp/browse/host'; // Složka, kde se dočasně připojují síťové disky
 $TempDir = '/tmp/browse/';  // Složka, kde se dočasně připojují síťové disky
 if(!is_dir($TempDir)) mkdir($TempDir, 0777);
 if(!is_dir($MountDir)) mkdir($MountDir, 0777);
+if (!is_dir($TempDir)) mkdir($TempDir, 0777);
+if (!is_dir($MountDir)) mkdir($MountDir, 0777);
 // Nacteni seznamu sdileni
 $Host = strtoupper(getenv('browse_host'));
 if($Host=='') die("Musite nastavit browse_host!\n");
+if ($Host=='') die("Musite nastavit browse_host!\n");
 $HostID = getenv('browse_id');
 if($HostID=='') die("Musite nastavit browse_id!\n");
+if ($HostID=='') die("Musite nastavit browse_id!\n");
 //echo("\n================== Prochazec sdileni =================\n\n");
 echo("Nacitam seznam sdileni pro ".$Host.'('.$HostID.')...');
 …
 echo("OK\n");
 //print_r($Output);
 if($Output[0]=='Connection to '.$Host.' failed') die('Pocitac '.$Host." nenalezen!\n");
+if ($Output[0]=='Connection to '.$Host.' failed') die('Pocitac '.$Host." nenalezen!\n");
 $Output = array_slice($Output,3);
 $Shares = array();
 foreach($Output as $Radek)
+{
   if($Radek=='') break;
+foreach ($Output as $Radek)
+{
+  if ($Radek=='') break;
   //$Radek = iconv('UTF-8','ISO-8859-2',$Radek);
   $Title = trim(substr($Radek,1,16));
 …
   $Desc = trim(substr($Radek,26));
   //echo($Title.','.$Type.','.$Desc."\n");
   if(($Type=='Disk') && (substr($Title,-1,1)!='$')) array_push($Shares,$Title);
+  if (($Type=='Disk') && (substr($Title,-1,1)!='$')) array_push($Shares,$Title);
   //ShowArray($Radek);
+}
 …
     //echo(strlen($Nazev).",");
     array_push($Files,$Nazev);
   } while(($Nazev != "\n") && (!feof($Soubor)));
+  } while (($Nazev != "\n") && (!feof($Soubor)));
   array_pop($Files);
   //if(($Pocet-floor($Pocet/10)*10)==9)
+  //if (($Pocet-floor($Pocet/10)*10)==9)
   $Hotovo = floor(ftell($Soubor) / $FileSize * $MaxProgress);
   if($Hotovo >= $Pocet)
+  if ($Hotovo >= $Pocet)
+  {
     echo(str_repeat('#', $Hotovo-$Pocet));
 …
+  }
   //echo('['.memory_get_usage().'] '.$Cesta."\n");
   foreach($Files as $Radek)
+  foreach ($Files as $Radek)
+  {
     //echo($Radek."");
     $Radek = substr($Radek,0,-1);
     //echo($Radek.",\n");
     if($Radek[0] == 'd') $Type = 2; else $Type = 0;
+    if ($Radek[0] == 'd') $Type = 2; else $Type = 0;
     $Prava = substr($Radek,0,strpos($Radek,' '));
     $Radek = ltrim(substr($Radek,strlen($Prava)+1));
 …
     //echo($Date.','.$Time.','.$Radek.' ');
     if((strpos($Nazev,'.') > 0) && ($Type != 2))
+    if ((strpos($Nazev,'.') > 0) && ($Type != 2))
+    {
       $Ext = substr($Nazev,strrpos($Nazev,'.')+1);
 …
     $Citac = $Citac + 1;
     // Pokud jde o sloľku, tak projdi jeji obsah a aktualizuj velikost
     if($Type == 2)
+    if ($Type == 2)
+    {
       //echo($Vlozit);
     //  if($Vlozit!='') DB_Query($Vlozit);  // Vloz vsechny polozky
+    //  if ($Vlozit!='') DB_Query($Vlozit);  // Vloz vsechny polozky
     //  $Vlozit = '';
       $VelikostSlozky += Vetev($Cesta.$Nazev.'/',$Zanoreni+1);
 …
+  }
   //echo($Vlozit);
   //if($Vlozit!='') DB_Query($Vlozit);  // Vloz vsechny polozky
+  //if ($Vlozit!='') DB_Query($Vlozit);  // Vloz vsechny polozky
   // Aktualizuj velikost
 …
   $Database->update('NetworkShareItem', 'id='.$Parent, array('size' => $VelikostSlozky));
   //closedir($Dir);
   return($VelikostSlozky);
+  return ($VelikostSlozky);
+}
 …
 $Parent = $Row[0];
 foreach($Shares as $Share)
+foreach ($Shares as $Share)
+{
   $Pocet = 0;
 …
 //  echo($SambaSbinDir."mount.cifs '".$ShareFull."' ".$MountDir.' -o guest,codepage=cp852,iocharset=iso8859-2');
   passthru('ls -A -R -X -l --time-style=+"%Y-%m-%d %I:%M:%S" '.$MountDir.'>'.$TempDir.$Host.'.list 2>'.$TempDir.'errors/'.$Host.'_'.$Share.'.err',$Result);
   //if($Result==0)
+  //if ($Result==0)
   //{
     echo("OK\n");
     if(file_exists($TempDir.$Host.'.list'))
+    if (file_exists($TempDir.$Host.'.list'))
+    {
       // Přidej poloľku sdílení do datanáze
 …
 $DbResult = $Database->query('SELECT id FROM hosts');
 $Vyber = '';
 while($Row = $DbResult->fetch_array())
+while ($Row = $DbResult->fetch_array())
   $Vyber .= $Row['id'].',';
 …
 echo("Chyby sdílení...\n");
 $Database->delete('NetworkShareError', 'host="'.$Host.'"');
 if(is_dir($TempDir.'errors'))
+if (is_dir($TempDir.'errors'))
+{
   $Dir = scandir($TempDir.'errors');
   foreach($Dir as $File)
+  foreach ($Dir as $File)
+  {
     if(substr($File, 0, strpos($File, '_')) == $Host)
+    if (substr($File, 0, strpos($File, '_')) == $Host)
+    {
       $Share = substr($File, strpos($File, '_')+1, -4);
       $ShareFull = '//'.$Host.'/'.$Share;
       if(filesize($TempDir.'errors/'.$File) > 0)
+      if (filesize($TempDir.'errors/'.$File) > 0)
+      {
         $ErrorFile = fopen($TempDir.'errors/'.$File, 'r+');
         while(!feof($ErrorFile))
+        while (!feof($ErrorFile))
+        {
           $Row = fgets($ErrorFile);
           if($Row != '')
+          if ($Row != '')
+          {
             $Row = substr($ShareFull.'/'.substr($Row, 39), 0, -1);

trunk/Modules/NetworkShare/firefox.php

-              r790
+              r873
   var msg="Přidání vyhledávacího modulu selhalo - ";
   if((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")){
     if(engineURL == null || engineURL == ""){
+  if ((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")){
+    if (engineURL == null || engineURL == ""){
       alert(msg + "nebyla zadána jeho URL.");
       return false;
+    }
     if(iconURL == null || iconURL == ""){
+    if (iconURL == null || iconURL == ""){
       alert(msg + "nebyla zadána URL ikony.");
       return false;
+    }
     if(engineURL.search(/^http:\/\//i) == -1 || engineURL.search(/\.src$/i) == -1){
+    if (engineURL.search(/^http:\/\//i) == -1 || engineURL.search(/\.src$/i) == -1){
       alert(msg + "nebyla zadána platná URL.");
       return false;
+    }
     if(iconURL.search(/^http:\/\//i) == -1 || iconURL.search(/\.(gif|jpg|jpeg|png)$/i) == -1){
+    if (iconURL.search(/^http:\/\//i) == -1 || iconURL.search(/\.(gif|jpg|jpeg|png)$/i) == -1){
       alert(msg + " nebyla platná URL ikony.");
       return false;
+    }
     if(suggestedTitle == null) suggestedTitle = "";
     if(suggestedCategory == null) suggestedCategory = "";
+    if (suggestedTitle == null) suggestedTitle = "";
+    if (suggestedCategory == null) suggestedCategory = "";
     window.sidebar.addSearchEngine(engineURL, iconURL, suggestedTitle, suggestedCategory);
   }else{

trunk/Modules/NetworkShare/online.php

-              r790
+              r873
 //$Database->select_db('share');
 echo("\n====================== Kontrola online pocitacu ============================\n\n");
 //while(true)
+//while (true)
+{
   echo('Nacitam strom sdileni...');
 …
   array_shift($Output);
   $Online = array();    // Seznam online pocitacu
   foreach($Output as $Radek)
+  foreach ($Output as $Radek)
+  {
     if(ord($Radek[0])!=9) continue;
+    if (ord($Radek[0])!=9) continue;
     $Host = explode(' ',substr($Radek,3));
     $Host = $Host[0];
 …
     $Section = 0;
     // Zjisti IP a MAC adresu
     if($Host=='CENTRALA')
+    if ($Host=='CENTRALA')
+    {
       $MAC = '00:E0:4C:20:64:22';
 …
       $Section = 0;
     } else
     if($Host=='CENTRALA2')
+    if ($Host=='CENTRALA2')
+    {
       $MAC = '00:E0:4C:20:64:22';
 …
       //echo('arping -c 1 '.$Host);
       exec('arping -c 1 '.$Host,$Output);
       if(count($Output)!=4)
+      if (count($Output)!=4)
+      {
         $Output = array();
         exec('arping -I wlan0 -c 1 '.$Host,$Output);
         if(count($Output)!=4)
+        if (count($Output)!=4)
+        {
           $Output = array();
           exec('arping -I wlan1 -c 1 '.$Host,$Output);
           if(count($Output)!=4)
+          if (count($Output)!=4)
+          {
             $Output = array();
             exec('arping -I wlan2 -c 1 '.$Host,$Output);
             if(count($Output)!=4)
+            if (count($Output)!=4)
+            {
               $Output = array();
               exec('arping -I eth2 -c 1 '.$Host,$Output);
               if(count($Output)!=4) continue;
+              if (count($Output)!=4) continue;
               else $Section = 4;
             } else $Section = 3;
 …
   //print_r($Online);
   // Aktivuj online pocitace
   foreach($Online as $Item)
+  foreach ($Online as $Item)
+  {
     $DbResult = $Database->query("SELECT * FROM hosts WHERE name='".$Item['host']."'");
     if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
+    {
       $Database->update('hosts',"name='".$Item['host']."'",array( 'IP' => $Item['IP'], 'MAC' => $Item['MAC'], 'online' => 1, 'lastdate' => 'NOW()', 'section' => $Section));
 …
   echo("\nSeznam offline pocitacu:\n");
   $DbResult = $Database->query("SELECT * FROM hosts WHERE online=0");
   while($Row = $DbResult->fetch_array())
+  while ($Row = $DbResult->fetch_array())
+  {
     echo($Row['name'].", ");

trunk/Modules/NetworkShare/playlist.php

-              r790
+              r873
 $Vyber = '';
 $Podminka = '';
 while($Row = $DbResult->fetch_array())
+while ($Row = $DbResult->fetch_array())
   $Vyber .= $Row['id'].',';
 $Podminka .= ' AND (host IN ('.substr($Vyber,0,-1).'))';
 …
   $Cesta = ''; //$Row['name'];
   $i = 0;
   while(($Otec>1)&&($i<$MaxNesting))
+  while (($Otec>1)&&($i<$MaxNesting))
+  {
     $DbResult = $Database->query("SELECT id,name,parent FROM items WHERE id=$Otec");
 …
     $i++;
+  }
   if($i >= $MaxNesting) $Cesta = '?'.'\\'.$Cesta;
   return('\\\\'.$Cesta);
+  if ($i >= $MaxNesting) $Cesta = '?'.'\\'.$Cesta;
+  return ('\\\\'.$Cesta);
+}
 …
+{
   //$FileInfo = new finfo(FILEINFO_MIME);
   //return($FileInfo->file($FileName));
   return('');
+  //return ($FileInfo->file($FileName));
+  return ('');
+}
 …
 $Dir = '';
 $DbResult = $Database->select('items', '*', 'ext="mp3"'.$Podminka); //.' LIMIT 0,1000');
 while($Row = $DbResult->fetch_array())
+while ($Row = $DbResult->fetch_array())
+{
   if($Parent != $Row['parent']) $Dir = PlnaCesta($Row); //echo('d'.PlnaCesta($Row)."\n");
+  if ($Parent != $Row['parent']) $Dir = PlnaCesta($Row); //echo('d'.PlnaCesta($Row)."\n");
   $Parent = $Row['parent'];
   echo($Dir.$Row['name'].'.'.$Row['ext']."\n");

trunk/Modules/NetworkShare/update.php

-              r790
+              r873
 $Dnes = date('Y-m-d');
 //while(1)
+//while (1)
 //{
   $Hosts = array();
   $StartTime = GetMicrotime();
   $DbResult = $Database->query("SELECT * FROM NetworkDevice WHERE Online=1 AND (Block=0 OR Name='centrala') AND (Name!='GATE') AND User>0");
   while($Row = $DbResult->fetch_array())
+  while ($Row = $DbResult->fetch_array())
+  {
     //echo('Host: '.$Host."...\n");
 …
     $HostID = 100;
     $StartTime2 = GetMicrotime();
     if($Dnes != $Row['last_share_check'])
+    if ($Dnes != $Row['last_share_check'])
+    {
       echo("Kontroluji ".$Row['Name']."...\n");

trunk/Modules/NetworkTopology/NetworkTopology.php

-              r738
+              r873
   function Show()
+  {
     if(count($this->System->PathItems) > 1)
+    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());
+  }
 …
     $this->FormatHTML = false;
     if(array_key_exists('debug', $_GET)) $debug = $_GET['debug'];
+    if (array_key_exists('debug', $_GET)) $debug = $_GET['debug'];
       else $debug = 0;
 …
       'FROM NetworkTopology LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkTopology.Host '.
       'LEFT JOIN NetworkDeviceType ON NetworkDevice.Type = NetworkDeviceType.Id');
     while($item = $DbResult->fetch_array())
+    while ($item = $DbResult->fetch_array())
+    {
       $id = $item['Id'];
 …
       $vlast = $item['Last'];
       $xpos = $vleft * $spacex;
       if(($vtop > 0) or ($item['Name'] == $this->TopHostName))
+      if (($vtop > 0) or ($item['Name'] == $this->TopHostName))
+      {
         if($vtop > 0) imageline($im, $xpos + $halfx, $vtop * $spacey, $xpos + $halfx, $vtop * $spacey + 8, $black);
         if($vfirst >= 0)
+        if ($vtop > 0) imageline($im, $xpos + $halfx, $vtop * $spacey, $xpos + $halfx, $vtop * $spacey + 8, $black);
+        if ($vfirst >= 0)
+        {
           imageline($im, $vfirst*$spacex + $halfx, $vtop * $spacey + $spacey, $vlast*$spacex + $halfx, $vtop * $spacey + $spacey, $black);
 …
+        }
         //    $ip = explode('.',$item['IP']);
         //    if(!array_key_exists(3, $ip)) $ip[3] = '';
         if($item['IconName'] == 'comp')
+        //    if (!array_key_exists(3, $ip)) $ip[3] = '';
+        if ($item['IconName'] == 'comp')
+        {
           if($item['Online'] == 1) $color = $green;
+          if ($item['Online'] == 1) $color = $green;
           else $color = $black;
           $image = $im_comp;
         } else $image = $im_dev;
         if($item['IconName'] == 'device')
+        if ($item['IconName'] == 'device')
+        {
           if($item['Online'] == 1) $color = $green;
+          if ($item['Online'] == 1) $color = $green;
           else $color = $red;
           $image = $im_dev;
+        }
         if($item['ShowOnline'] == 0)
+        if ($item['ShowOnline'] == 0)
+        {
           $color = $gray;
 …
     // === Sestavení výsledného souboru ============================================
     if($debug == 0)
+    if ($debug == 0)
+    {
       Header("Content-type: image/png");
 …
       imagedestroy($im_dev);
+    }
     return('');
+    return ('');
+  }
 …
 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-gen.php

-              r548
+              r873
 global $Database, $debug;
 if(array_key_exists('debug', $_GET)) $debug = $_GET['debug'];
+if (array_key_exists('debug', $_GET)) $debug = $_GET['debug'];
 else $debug = 0;
 //$debug = 0;
 …
         $markskip = 0;
+      }
     } while($level >= 1);
+    } while ($level >= 1);
+  }
 …
       $Database->query("INSERT INTO NetworkTopology (Host, Depth, Pos, First, Last) '.
         'VALUES (".$node->index.','.$node->level.','.$this->calc_pos($node).','.$first.','.$last.");");
       foreach($node->children as $key => $value) {
+      foreach ($node->children as $key => $value) {
         $this->store_node($value);
+      }
 …
         $this->setborder($node->level, $this->border[$node->level+1]+1);
+      }
       foreach($node->children as $key => $value) {
+      foreach ($node->children as $key => $value) {
         if ($key == count($node->children)-1) {
           if($this->border[$node->level] > $this->border[$node->level+1]) $this->setborder($node->level+1, $this->border[$node->level]-1);
+          if ($this->border[$node->level] > $this->border[$node->level+1]) $this->setborder($node->level+1, $this->border[$node->level]-1);
+        }
         $this->left_align($value);
         if ($key == 0) {
           if($this->border[$node->level] <= $this->border[$node->level+1]) {
+          if ($this->border[$node->level] <= $this->border[$node->level+1]) {
             $node->pos = $this->border[$node->level+1]-1;
             $this->setborder($node->level, $this->border[$node->level+1]);
 …
         $this->setborder($node->level, $this->border[$node->level+1]+1);
+      }
       for($key=count($node->children)-1;$key>=0;$key--) {
+      for ($key=count($node->children)-1;$key>=0;$key--) {
         $value = $node->children[$key];
         if ((count($value->children)>0) && count($node->order)>0) {
 …
+        }
         if ($key == 0) {
           if($this->border[$node->level] > $this->border[$node->level+1]) $this->setborder($node->level+1, $this->border[$node->level]-1);
+          if ($this->border[$node->level] > $this->border[$node->level+1]) $this->setborder($node->level+1, $this->border[$node->level]-1);
+        }
         $this->right_align($value);
         if ($key == count($node->children)-1) {
           if($this->border[$node->level] <= $this->border[$node->level+1]) {
+          if ($this->border[$node->level] <= $this->border[$node->level+1]) {
             $node->rpos = $this->border[$node->level+1]-1;
             $this->setborder($node->level, $this->border[$node->level+1]);
 …
   /** Reset construction border **/
   function reset_border() {
     foreach($this->border as $key => $value) $this->border[$key] = 0;
+    foreach ($this->border as $key => $value) $this->border[$key] = 0;
     $this->maxborder = 0;
+  }
 …
       $target = 0; // Index cílového uzlu
       $lastindex = 0; // Index poslední vydličky
       foreach($node->children as $key => $value) {
+      foreach ($node->children as $key => $value) {
         if (count($value->children)>0) {
           array_push($forkmap,$value);
 …
+        }
+      }
       for($i=0;$i<$node->forkcnt-1;$i++) {
         for($j=0;$j<count($forkmap);$j++) {
+      for ($i=0;$i<$node->forkcnt-1;$i++) {
+        for ($j=0;$j<count($forkmap);$j++) {
           $this->border = $preborder;
           $this->maxborder = $premax;
           $k = 0; // index zpracovávané vydličky
           foreach($node->children as $key => $value) {
+          foreach ($node->children as $key => $value) {
             if (count($value->children)>0) {
               if ($order[$value->index]) {
 …
+            }
             if ($key == count($node->children)-1) {
               if($this->border[$node->level] > $this->border[$node->level+1]) $this->setborder($node->level+1, $this->border[$node->level]-1);
+              if ($this->border[$node->level] > $this->border[$node->level+1]) $this->setborder($node->level+1, $this->border[$node->level]-1);
+            }
             $this->left_align($value);
             if ($key == 0) {
               if($this->border[$node->level] <= $this->border[$node->level+1]) {
+              if ($this->border[$node->level] <= $this->border[$node->level+1]) {
                 $node->pos = $this->border[$node->level+1]-1;
                 $this->setborder($node->level, $this->border[$node->level+1]);
 …
         $this->setborder($node->level, $this->border[$node->level+1]+1);
+      }
       foreach($node->children as $key => $value) {
+      foreach ($node->children as $key => $value) {
         if ((count($value->children)>0) && count($order)>0) {
           $value = $order[$value->index];
+        }
         if ($key == count($node->children)-1) {
           if($this->border[$node->level] > $this->border[$node->level+1]) $this->setborder($node->level+1, $this->border[$node->level]-1);
+          if ($this->border[$node->level] > $this->border[$node->level+1]) $this->setborder($node->level+1, $this->border[$node->level]-1);
+        }
         $this->reorder($value);
         if ($key == 0) {
           if($this->border[$node->level] <= $this->border[$node->level+1]) {
+          if ($this->border[$node->level] <= $this->border[$node->level+1]) {
             $node->pos = $this->border[$node->level+1]-1;
             $this->setborder($node->level, $this->border[$node->level+1]);
 …
+      }
       $forkcnt = 0; // Fork counter
       foreach($node->children as $key => $value) {
+      foreach ($node->children as $key => $value) {
         if ($forkcnt == count($node->children)-1) {
           if($this->border[$node->level] > $this->border[$node->level+1]) $this->setborder($node->level+1, $this->border[$node->level]-1);
+          if ($this->border[$node->level] > $this->border[$node->level+1]) $this->setborder($node->level+1, $this->border[$node->level]-1);
+        }
         if (count($value->children)>0) {
           $this->left_stub($value);
           if ($forkcnt == 0) {
             if($this->border[$node->level] <= $this->border[$node->level+1]) {
+            if ($this->border[$node->level] <= $this->border[$node->level+1]) {
               $node->pos = $this->border[$node->level+1]-1;
               $this->setborder($node->level, $this->border[$node->level+1]);
 …
       $lastindex = 0; // Index poslední vydličky
       $fact = 1; // Faktoriál kombinací vydliček
       foreach($node->children as $key => $value) {
+      foreach ($node->children as $key => $value) {
         if (count($value->children)>0) {
           if ($key>0) $fact = $fact * ($key+1);
 …
+        }
+      }
       for($i=0;$i<$node->forkcnt-1;$i++) {
         for($j=0;$j<count($forkmap);$j++) {
+      for ($i=0;$i<$node->forkcnt-1;$i++) {
+        for ($j=0;$j<count($forkmap);$j++) {
           $this->border = $preborder;
           $this->maxborder = $premax;
           $k = 0; // index zpracovávané vydličky
           foreach($node->children as $key => $value) {
+          foreach ($node->children as $key => $value) {
             if (count($value->children)>0) {
               if ($order[$value->index]) {
 …
+            }
             if ($key == count($node->children)-1) {
               if($this->border[$node->level] > $this->border[$node->level+1]) $this->setborder($node->level+1, $this->border[$node->level]-1);
+              if ($this->border[$node->level] > $this->border[$node->level+1]) $this->setborder($node->level+1, $this->border[$node->level]-1);
+            }
             $this->left_align($value);
             if ($key == 0) {
               if($this->border[$node->level] <= $this->border[$node->level+1]) {
+              if ($this->border[$node->level] <= $this->border[$node->level+1]) {
                 $node->pos = $this->border[$node->level+1]-1;
                 $this->setborder($node->level, $this->border[$node->level+1]);
 …
         $this->setborder($node->level, $this->border[$node->level+1]+1);
+      }
       foreach($node->children as $key => $value) {
+      foreach ($node->children as $key => $value) {
         if ((count($value->children)>0) && count($order)>0) {
           $value = $order[$value->index];
+        }
         if ($key == count($node->children)-1) {
           if($this->border[$node->level] > $this->border[$node->level+1]) $this->setborder($node->level+1, $this->border[$node->level]-1);
+          if ($this->border[$node->level] > $this->border[$node->level+1]) $this->setborder($node->level+1, $this->border[$node->level]-1);
+        }
         $this->reorder($value);
         if ($key == 0) {
           if($this->border[$node->level] <= $this->border[$node->level+1]) {
+          if ($this->border[$node->level] <= $this->border[$node->level+1]) {
             $node->pos = $this->border[$node->level+1]-1;
             $this->setborder($node->level, $this->border[$node->level+1]);

trunk/Modules/NetworkTopology/topologie-img.php

-              r738
+              r873
 include('../global.php');
 if(array_key_exists('debug', $_GET)) $debug = $_GET['debug'];
+if (array_key_exists('debug', $_GET)) $debug = $_GET['debug'];
 else $debug = 0;
 $TopHostName = 'nix-router';
 …
   global $debug, $bbound;
   if(!array_key_exists($id, $vfirst)) $vfirst[$id] = 0;
   if($i = $vfirst[$id])
+  if (!array_key_exists($id, $vfirst)) $vfirst[$id] = 0;
+  if ($i = $vfirst[$id])
+  {
     //if ($debug==2) echo $id.':'.@$i.','.@$vpred[$i].'-'.@$vleft[@$vpred[$i]]."\n";
 …
       $vleft[$i]+=$diff;
       $limit = balance($i,$level+1, $vlast,$vleft,$vpred, $vfirst,$vnext,$tbound, $width, $limit) + 2;
       if(!array_key_exists($i, $vnext)) $vnext[$i] = 0;
+      if (!array_key_exists($i, $vnext)) $vnext[$i] = 0;
       $i = $vnext[$i];
+    }
 …
     $item = $DbResult->fetch_array();
     //print_r($item);
     if($item)
+    if ($item)
+    {
   // --- Zpracování položky z DB -----------------------------------------------
       if($position[$level] > 0)
+      if ($position[$level] > 0)
+      {
         $vnext[$curr] = $item['id']; // Neprvní položka, nastav předchozí
 …
       $vlast[$parent[$level]] = $curr;
       $vtop[$curr] = $level;
       if(!array_key_exists($level, $tbound)) $tbound[$level] = 0;
+      if (!array_key_exists($level, $tbound)) $tbound[$level] = 0;
       $vleft[$curr] = $tbound[$level];
       if(!array_key_exists($level, $tranger)) $tranger[$level] = 0;
+      if (!array_key_exists($level, $tranger)) $tranger[$level] = 0;
       $vpred[$curr] = $tranger[$level];
       $tranger[$level] = $curr;
 …
+      {
         // Uzelový vrchol
         if(array_key_exists($level + 1, $tbound))
           if($tbound[$level + 1] > $vleft[$curr]) $vleft[$curr] = $tbound[$level + 1];
+        if (array_key_exists($level + 1, $tbound))
+          if ($tbound[$level + 1] > $vleft[$curr]) $vleft[$curr] = $tbound[$level + 1];
+      }
       $tbound[$level] = $vleft[$curr] + 2;
 …
+    {
   // --- Zarovnávání prvků kvůli vzhledu
       if(!array_key_exists($vfirst[$parent[$level]], $vleft)) $vleft[$vfirst[$parent[$level]]] = 0;
       if(!array_key_exists($parent[$level], $vleft)) $vleft[$parent[$level]] = 0;
+      if (!array_key_exists($vfirst[$parent[$level]], $vleft)) $vleft[$vfirst[$parent[$level]]] = 0;
+      if (!array_key_exists($parent[$level], $vleft)) $vleft[$parent[$level]] = 0;
       if ($vleft[$vfirst[$parent[$level]]] > $vleft[$parent[$level]])
+      {
 …
+      }
       $level--;
       if(!array_key_exists($level, $parent)) $parent[$level] = 0;
       if(!array_key_exists($parent[$level], $vlast)) $vlast[$parent[$level]] = 0;
+      if (!array_key_exists($level, $parent)) $parent[$level] = 0;
+      if (!array_key_exists($parent[$level], $vlast)) $vlast[$parent[$level]] = 0;
       $curr = $vlast[$parent[$level]];
       if(!array_key_exists($level, $tbound)) $tbound[$level] = 0;
       if(!array_key_exists($level + 1, $tbound)) $tbound[$level + 1] = 0;
       if($tbound[$level] > $tbound[$level + 1]) $tbound[$level + 1] = $tbound[$level];
+    }
   } while($level >= 0);
+      if (!array_key_exists($level, $tbound)) $tbound[$level] = 0;
+      if (!array_key_exists($level + 1, $tbound)) $tbound[$level + 1] = 0;
+      if ($tbound[$level] > $tbound[$level + 1]) $tbound[$level + 1] = $tbound[$level];
+    }
+  } while ($level >= 0);
   $data = compact('tbound', 'count', 'tbound', 'vfirst', 'vlast', 'vtop', 'vleft', 'height', 'width', 'index', 'maxindex');
   return($data);
+  return ($data);
 };
 …
 $data = gentree(1);
 $datawidth = $data['width'];
 for($i = 0; $i <= $maxindex; $i++)
+{
   if(!array_key_exists($i, $vleft)) $vleft[$i] = 0;
   if(!array_key_exists($i, $data['vleft'])) $data['vleft'][$i] = 0;
+for ($i = 0; $i <= $maxindex; $i++)
+{
+  if (!array_key_exists($i, $vleft)) $vleft[$i] = 0;
+  if (!array_key_exists($i, $data['vleft'])) $data['vleft'][$i] = 0;
   $vleft[$i] = .2 + ($vleft[$i] + ($datawidth - $data['vleft'][$i])) / 2;
+}
 …
 $IconList = array();
 $DbResult = $Database->query('SELECT * FROM HostType');
 while($HostType = $DbResult->fetch_assoc())
+while ($HostType = $DbResult->fetch_assoc())
   $IconList[$HostType['Id']] = imagecreatefrompng('images/'.$HostType['IconName'].'.png');
 …
+{
   global $vleft, $spacex;
   return($vleft[$id] * $spacex);
+  return ($vleft[$id] * $spacex);
+}
 $DbResult = $Database->query('SELECT * FROM hosts JOIN HostType ON HostType.Id = hosts.type WHERE hosts.used=1');
 while($item = $DbResult->fetch_array())
+while ($item = $DbResult->fetch_array())
+{
   $id = $item['id'];
   if(!array_key_exists($id, $vtop)) $vtop[$id] = 0;
   if(($vtop[$id] > 0) || ($item['name'] == $TopHostName))
+  if (!array_key_exists($id, $vtop)) $vtop[$id] = 0;
+  if (($vtop[$id] > 0) || ($item['name'] == $TopHostName))
+  {
     if($vtop[$id] > 0) imageline($im, xpos($id) + $halfx, $vtop[$id] * $spacey, xpos($id) + $halfx, $vtop[$id] * $spacey + 8, $black);
     if(!array_key_exists($id, $vfirst)) $vfirst[$id] = 0;
     if($vfirst[$id] > 0)
+    if ($vtop[$id] > 0) imageline($im, xpos($id) + $halfx, $vtop[$id] * $spacey, xpos($id) + $halfx, $vtop[$id] * $spacey + 8, $black);
+    if (!array_key_exists($id, $vfirst)) $vfirst[$id] = 0;
+    if ($vfirst[$id] > 0)
+    {
       imageline($im, xpos($vfirst[$id]) + $halfx, $vtop[$id] * $spacey + $spacey, xpos($vlast[$id]) + $halfx, $vtop[$id] * $spacey + $spacey, $black);
 …
     $image = $IconList[$item['type']];
     if($item['IP'] == '')
+    if ($item['IP'] == '')
+    {
       $color = $gray;
     } else
     if($item['ShowOnline'] == 1)
+    {
       if($item['online'] == 1) $color = $green; else $color = $black;
     } else
+    {
       if($item['online'] == 1) $color = $green; else $color = $red;
+    if ($item['ShowOnline'] == 1)
+    {
+      if ($item['online'] == 1) $color = $green; else $color = $black;
+    } else
+    {
+      if ($item['online'] == 1) $color = $green; else $color = $red;
+    }
 //      $text='IP: '.$ip[0];
 …
     imagecopy($im, $image, xpos($id) + $halfx - 15, $vtop[$id] * $spacey + 12, 0, 0, 30, 30);
 //    imagerectangle($im,xpos($id)+$halfx-6,$vtop[$id]*$spacey+16,xpos($id)+$halfx+6,$vtop[$id]*$spacey+28,$color);
     if($debug)
+    if ($debug)
+    {
       imagestring($im, 2, xpos($id) + ($spacex - strlen($item['id']) * imagefontwidth(2)) / 2, $vtop[$id] * $spacey + 31 + imagefontheight(2), $item['id'], $color);
 …
 // === Sestavení výsledného souboru ============================================
 if(!($debug > 1))
+if (!($debug > 1))
+{
   header('Content-type: image/png');

trunk/Modules/NetworkTopology/topologie2.php

r858	r873
29	29	$Hosts = array();
30	30	$DbResult = $Database->select('hosts', 'id, name, ip, parent, online', 'used=1');
31		while($DbRow = $DbResult->fetch_array())
	31	while ($DbRow = $DbResult->fetch_array())
32	32	{
33		if(!array_key_exists($DbRow['id'], $Hosts)) $Hosts[$DbRow['id']] = array('subitems' => array());
	33	if (!array_key_exists($DbRow['id'], $Hosts)) $Hosts[$DbRow['id']] = array('subitems' => array());
34	34	$Hosts[$DbRow['id']] = array('id' => $DbRow['id'], 'name' => $DbRow['name'], 'parent' => $DbRow['parent'], 'online' => $DbRow['online'], 'subitems' => $Hosts[$DbRow['id']]['subitems']);
35		if(!array_key_exists($DbRow['parent'], $Hosts)) $Hosts[$DbRow['parent']] = array('subitems' => array());
	35	if (!array_key_exists($DbRow['parent'], $Hosts)) $Hosts[$DbRow['parent']] = array('subitems' => array());
36	36	$Hosts[$DbRow['parent']]['subitems'][] = &$Hosts[$DbRow['id']];
37	37	$Hosts[$DbRow['id']]['parent_node'] = &$Hosts[$DbRow['parent']];
…	…
44	44	{
45	45	$Result = array('min' => $Host['displacement'], 'max' => $Host['displacement']);
46		foreach($Host['subitems'] as $Index => $SubHost)
	46	foreach ($Host['subitems'] as $Index => $SubHost)
47	47	{
48	48	$SubitemResult = $this->CalculateDimension($Host['subitems'][$Index]);
…	…
50	50	$Result['max'] = max($SubitemResult['max'], $Result['max']);
51	51	}
52		return($Result);
	52	return ($Result);
53	53	}
54	54
55	55	function CalculateDisplacement(&$Host, $Level = 0)
56	56	{
57		if(!array_key_exists('displacement', $Host)) $Host['displacement'] = 0;
	57	if (!array_key_exists('displacement', $Host)) $Host['displacement'] = 0;
58	58	$Host['level'] = $Level;
59		foreach($Host['subitems'] as $Index => $SubHost)
	59	foreach ($Host['subitems'] as $Index => $SubHost)
60	60	{
61	61	$Host['subitems'][$Index]['rel_displacement'] = (-(count($Host['subitems']) - 1) * 0.5 + $Index) * $this->HostWidth;
…	…
68	68	{
69	69	$Host['displacement'] = $Host['displacement'] + $Displacement;
70		foreach($Host['subitems'] as $Index => $SubHost)
	70	foreach ($Host['subitems'] as $Index => $SubHost)
71	71	{
72	72	$this->MoveNode($Host['subitems'][$Index], $Displacement);
…	…
76	76	function CheckColision()
77	77	{
78		foreach($this->Levels as $Index => $Level)
	78	foreach ($this->Levels as $Index => $Level)
79	79	{
80		for($I = 0; $I < count($Level) - 1; $I++)
81		if($Level[$I]['displacement'] >= $Level[$I + 1]['displacement'])
	80	for ($I = 0; $I < count($Level) - 1; $I++)
	81	if ($Level[$I]['displacement'] >= $Level[$I + 1]['displacement'])
82	82	{
83	83	// Search for common parent
84	84	$LeftHost = $Level[$I];
85	85	$RightHost = $Level[$I + 1];
86		while(($LeftHost['level'] > 0) and ($LeftHost['parent'] != $RightHost['parent']))
	86	while (($LeftHost['level'] > 0) and ($LeftHost['parent'] != $RightHost['parent']))
87	87	{
88	88	$LeftHost = $LeftHost['parent_node'];
…	…
91	91	$Host = $RightHost['parent_node']['subitems'][0];
92	92	$II = 0;
93		while($RightHost['parent_node']['subitems'][$II]['id'] != $RightHost['id']) $II++;
94		while($II < count($RightHost['parent_node']['subitems']))
	93	while ($RightHost['parent_node']['subitems'][$II]['id'] != $RightHost['id']) $II++;
	94	while ($II < count($RightHost['parent_node']['subitems']))
95	95	{
96	96	$this->MoveNode($RightHost['parent_node']['subitems'][$II], $Level[$I]['displacement'] - $Level[$I + 1]['displacement']);
…	…
104	104	{
105	105	$this->Levels[$Host['level']][] = &$Host;
106		foreach($Host['subitems'] as $Index => $SubHost)
	106	foreach ($Host['subitems'] as $Index => $SubHost)
107	107	{
108	108	$this->BuildLevels($Host['subitems'][$Index]);
…	…
113	113	{
114	114	$ParentHostPos = array('x' => -$this->RelPos['min'] + $Host['displacement'], 'y' => $Host['level'] * $this->HostHeight);
115		foreach($Host['subitems'] as $Index => $SubHost)
	115	foreach ($Host['subitems'] as $Index => $SubHost)
116	116	{
117	117	$HostPos = array('x' => -$this->RelPos['min'] + $SubHost['displacement'], 'y' => $SubHost['level'] * $this->HostHeight);

trunk/Modules/News/ImportKinoVatra.php

-              r790
+              r873
 $doc = new DOMDocument();
 $doc->load($SourceURL);
 foreach($doc->getElementsByTagName('item') as $node)
+foreach ($doc->getElementsByTagName('item') as $node)
+{
   $Title = $node->getElementsByTagName('title')->item(0)->nodeValue;
 …
   $Description = str_replace("\r", '', $Description);
   $Description = str_replace("\n", '<br>', $Description);
   //if(($CommaPos = strpos($Date, ',')) !== FALSE)
+  //if (($CommaPos = strpos($Date, ',')) !== FALSE)
   //  $Date = substr($Date, $CommaPos + 1);
   $Date = TimeToMysqlDateTime(strtotime($Date));
 …
   $Query = 'SELECT Id FROM News WHERE (`Title`="'.$System->Database->real_escape_string($Title).'") AND (`Category`='.$Category.') AND (`Content` = "'.$System->Database->real_escape_string($Description).'") AND (`Link` = "'.$System->Database->real_escape_string($Link).'")';
   $DbResult = $System->Database->query($Query);
   if($DbResult->num_rows == 0)
+  if ($DbResult->num_rows == 0)
+  {
     $System->Database->insert('News', array('Title' => $Title, 'Date' => $Date, 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));

trunk/Modules/News/ImportObecHovezi.php

-              r827
+              r873
 $doc = new DOMDocument();
 @$doc->load($SourceURL);
 foreach($doc->getElementsByTagName('item') as $node)
+foreach ($doc->getElementsByTagName('item') as $node)
+{
   $Title = $node->getElementsByTagName('title')->item(0)->nodeValue;
 …
   $Description = str_replace("\r", '', $Description);
   $Description = str_replace("\n", '<br>', $Description);
   //if(($CommaPos = strpos($Date, ',')) !== FALSE)
+  //if (($CommaPos = strpos($Date, ',')) !== FALSE)
   //  $Date = substr($Date, $CommaPos + 1);
   $Date = TimeToMysqlDateTime(strtotime($Date));
 …
   $DbResult = $System->Database->select('News', 'Id', '(`Title`="'.$System->Database->real_escape_string($Title).'") AND (`Category`='.$Category.') AND (`Content` = "'.$System->Database->real_escape_string($Description).'") AND (`Link` = "'.$System->Database->real_escape_string($Link).'")');
   //echo($System->Database->LastQuery);
   if($DbResult->num_rows == 0)
+  if ($DbResult->num_rows == 0)
+  {
     $System->Database->insert('News', array('Title' => $Title, 'Date' => $Date, 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));
 …
 //$Content = addslashes($Encoding->ToUTF8(file_get_contents($SourceURL), 'win1250'));
 $Content = file_get_contents($SourceURL);
 while(strpos($Content, $StartText) !== false)
+while (strpos($Content, $StartText) !== false)
+{
   $Content = substr($Content, strpos($Content, $StartText) + strlen($StartText));
 …
   $DbResult = $System->Database->select('News', 'Id', '(`Title`="'.$Title.'") AND (`Category`='.$Category.') AND (`Content` = "'.$Description.'") AND (`Link` = "'.$Link.'")');
   //echo($System->Database->LastQuery);
   if($DbResult->num_rows == 0)
+  if ($DbResult->num_rows == 0)
+  {
     $System->Database->insert('News', array('Title' => $Title, 'Date' => 'NOW()', 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));

trunk/Modules/News/ImportTvBeskyd.php

-              r827
+              r873
 //$Content = addslashes($Encoding->ToUTF8(file_get_contents($SourceURL), 'win1250'));
 $Content = @file_get_contents($SourceURL);
 while(strpos($Content, $StartText) !== false)
+while (strpos($Content, $StartText) !== false)
+{
   $Content = substr($Content, strpos($Content, $StartText) + strlen($StartText));
 …
   $DbResult = $System->Database->select('News', 'Id', '`Title`="'.$System->Database->real_escape_string($Title).'" AND `Category`='.$Category);
   //echo($System->Database->LastQuery);
   if($DbResult->num_rows == 0)
+  if ($DbResult->num_rows == 0)
+  {
     $System->Database->insert('News', array('Title' => $Title, 'Date' => 'NOW()', 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));

trunk/Modules/News/ImportZdechovCzNews.php

-              r827
+              r873
 $Author = 'Automat';
 $Content = @file_get_contents($SourceURL);
 while(strpos($Content, $StartText) !== false)
+while (strpos($Content, $StartText) !== false)
+{
   $Content = substr($Content, strpos($Content, $StartText) + strlen($StartText));
 …
   $Content = substr($Content, strpos($Content, $StartLink) + strlen($StartLink));
   $Link = substr($Content, 0, strpos($Content, '"'));
   if(substr($Link, 0, 7) != 'http://') $Link = 'http://www.zdechov.cz/'.$Link;
+  if (substr($Link, 0, 7) != 'http://') $Link = 'http://www.zdechov.cz/'.$Link;
   $Content = substr($Content, strpos($Content, $StartTitle) + strlen($StartTitle));
   $Title = substr($Content, 0, strpos($Content, '<'));
 …
   $DbResult = $System->Database->select('News', 'Id', '`Title`="'.$System->Database->real_escape_string($Title).'" AND `Date`="'.$Date.'" AND `Category`='.$Category);
   //echo($System->Database->LastQuery);
   if($DbResult->num_rows == 0)
+  if ($DbResult->num_rows == 0)
+  {
     $System->Database->insert('News', array('Title' => $Title, 'Date' => $Date, 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));

trunk/Modules/News/ImportZdechovCzRecords.php

-              r827
+              r873
 $Author = 'Automat';
 $Content = @file_get_contents($SourceURL);
 while(strpos($Content, $StartText) !== false)
+while (strpos($Content, $StartText) !== false)
+{
   $Content = substr($Content, strpos($Content, $StartText) + strlen($StartText));
 …
   $Date = substr($Content, 0, strpos($Content, '<'));
   $DateParts = explode('.', $Date);
   if(count($DateParts) >= 3)
+  if (count($DateParts) >= 3)
     $Date = $DateParts[2].'-'.$DateParts[1].'-'.$DateParts[0];
       else break;
   $Content = substr($Content, strpos($Content, $StartLink) + strlen($StartLink));
   $Link = substr($Content, 0, strpos($Content, '"'));
   if(substr($Link, 0, 7) != 'http://') $Link = 'http://www.zdechov.cz/'.$Link;
+  if (substr($Link, 0, 7) != 'http://') $Link = 'http://www.zdechov.cz/'.$Link;
   $Content = substr($Content, strpos($Content, $StartTitle) + strlen($StartTitle));
   $Title = substr($Content, 0, strpos($Content, '<'));
 …
   $DbResult = $System->Database->select('News', 'Id', '`Title`="'.$System->Database->real_escape_string($Title).'" AND `Date`="'.$Date.'" AND `Category`='.$Category);
   //echo($System->Database->LastQuery);
   if($DbResult->num_rows == 0)
+  if ($DbResult->num_rows == 0)
+  {
     $System->Database->insert('News', array('Title' => $Title, 'Date' => $Date, 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));

trunk/Modules/News/News.php

-              r790
+              r873
 function CategoryItemCompare($Item1, $Item2)
+{
   if ($Item1['Index'] == $Item2['Index']) return(0);
+  if ($Item1['Index'] == $Item2['Index']) return (0);
   return ($Item1['Index'] > $Item2['Index']) ? -1 : 1;
+}
 …
     ));
     if($this->System->ModuleManager->ModulePresent('Search'))
+    if ($this->System->ModuleManager->ModulePresent('Search'))
+    {
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('Novinky', 'News', array('Title', 'Content'));
 …
     $Output = '<div class="NewsPanel"><div class="Title">'.$Row['Caption'];
     $Output .= '<div class="Action"><a href="aktuality/?category='.$Category.'">Zobrazit</a>';
     if($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category))
+    if ($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category))
       $Output .= ' <a href="aktuality/?action=add&amp;category='.$Category.'">Přidat</a>';
     $Output .= '</div></div><div class="Content">';
 …
     $Index = 0;
     $FontSize = 12;
     if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
+    {
       $Output .= '<table class="NewsTable">';
       while($Row = $DbResult->fetch_array())
+      {
         if($Row['Name'] == '') $Author = $Row['Author'];
+      while ($Row = $DbResult->fetch_array())
+      {
+        if ($Row['Name'] == '') $Author = $Row['Author'];
           else $Author = $Row['Name'];
         $Output .= '<tr><td onclick="window.location=\'aktuality/?action=view&amp;id='.$Row['Id'].
 …
           '<td align="right" style="font-size: '.$FontSize.'pt">'.$Author.' ('.HumanDate($Row['Date']).')</td></tr></table>';
         $Output .= '<div id="new'.$Category.$Index.'" class="NewsTableItem">'.$this->ModifyContent($Row['Content']);
         if($Row['Link'] != '') $Output .= '<br/><a href="'.$Row['Link'].'">Odkaz</a>';
         if($Row['Enclosure'] != '')
+        if ($Row['Link'] != '') $Output .= '<br/><a href="'.$Row['Link'].'">Odkaz</a>';
+        if ($Row['Enclosure'] != '')
+        {
           $Output .= '<br />Přílohy: ';
           $Enclosures = explode(';', $Row['Enclosure']);
           foreach($Enclosures as $Enclosure)
+          foreach ($Enclosures as $Enclosure)
+          {
             if(file_exists($this->UploadedFilesFolder.$Enclosure))
+            if (file_exists($this->UploadedFilesFolder.$Enclosure))
               $Output .= ' <a href="'.$this->UploadedFilesFolder.$Enclosure.'">'.$Enclosure.'</a>';
+          }
 …
+    }
     $Output .= '</div></div>';
     return($Output);
+    return ($Output);
+  }
 …
     $I = 1;
     $DbResult = $this->Database->select('NewsCategory', '*', '1 ORDER BY Sequence');
     while($NewsCategory = $DbResult->fetch_array())
+    while ($NewsCategory = $DbResult->fetch_array())
+    {
       $this->NewsSetting[] = array('CategoryId' => $NewsCategory['Id'], 'Index' => $I, 'Enabled' => 1,
 …
+    }
     // Merge defaults with user setting
     if(array_key_exists('NewsSetting', $_COOKIE))
+    if (array_key_exists('NewsSetting', $_COOKIE))
+    {
       $NewsSettingCookie = unserialize($_COOKIE['NewsSetting']);
       foreach($this->NewsSetting as $Index => $this->NewSetting)
+      {
         if(array_key_exists($Index, $NewsSettingCookie))
+      foreach ($this->NewsSetting as $Index => $this->NewSetting)
+      {
+        if (array_key_exists($Index, $NewsSettingCookie))
           $this->NewsSetting[$Index] = array_merge($this->NewSetting, $NewsSettingCookie[$Index]);
+      }
 …
     $this->LoadSettingsFromCookies();
     if(array_key_exists('Action', $_GET))
+    if (array_key_exists('Action', $_GET))
+    {
       // Show news customize menu
       if($_GET['Action'] == 'CustomizeNews')
+      if ($_GET['Action'] == 'CustomizeNews')
+      {
         $Output .= $this->ShowCustomizeMenu();
 …
     $ColumnCount = 2;
     $Output .= '<table style="width: 100%"><tr>';
     for($Column = 1; $Column <= $ColumnCount; $Column++)
+    for ($Column = 1; $Column <= $ColumnCount; $Column++)
+    {
       $Output .= '<td style="vertical-align: top; width: '.round(100 / $ColumnCount).'%;">';
       foreach($this->NewsSetting as $SettingItem)
         if(($SettingItem['Enabled'] == 1) and ($SettingItem['Group'] == $Column))
+      foreach ($this->NewsSetting as $SettingItem)
+        if (($SettingItem['Enabled'] == 1) and ($SettingItem['Group'] == $Column))
           $Output .= $this->ShowNews($SettingItem['CategoryId'], $SettingItem['ItemCount'], $SettingItem['DaysAgo']);
       $Output .= '</td>';
 …
     $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);
+  }
 …
     $Output .= '<tr><th>Kategorie</th><th>Pozice</th><th>Zobrazit</th><th>Max. počet</th><th>Posledních dnů</th><th>Sloupec</th></tr>';
     $I = 0;
     foreach($this->NewsSetting as $SettingItem)
+    foreach ($this->NewsSetting as $SettingItem)
+    {
       $DbResult = $this->Database->select('NewsCategory', '*', 'Id='.$SettingItem['CategoryId']);
       $NewsCategory = $DbResult->fetch_array();
       $Output .= '<tr><td>'.$NewsCategory['Caption'].'</td><td align="center"><input type="text" size="2" name="NewsCategoryIndex'.$I.'" value="'.$SettingItem['Index'].'" /></td><td align="center"><input type="checkbox" name="NewsCategoryEnabled'.$I.'"';
       if($SettingItem['Enabled'] == 1) $Output .= ' checked="checked"';
+      if ($SettingItem['Enabled'] == 1) $Output .= ' checked="checked"';
       $Output .= ' /></td>'.
       '<td align="center"><input type="text" size="2" name="NewsCategoryCount'.$I.'" value="'.$SettingItem['ItemCount'].'" />'.
 …
+    }
     $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);
+  }
 …
     $Checkbox = array('' => 0, 'on' => 1);
     $Setting = array();
     for($I = 0; $I < $_POST['NewsCategoryCount']; $I++)
+    {
       if(($_POST['NewsCategoryDaysAgo'.$I] * 1) < 0) $_POST['NewsCategoryIndex'.$I] = 0;
       if(($_POST['NewsCategoryCount'.$I] * 1) < 0) $_POST['NewsCategoryCount'.$I] = 0;
       if(($_POST['NewsColumn'.$I] * 1) < 1) $_POST['NewsColumn'.$I] = 1;
       if(!array_key_exists('NewsCategoryEnabled'.$I, $_POST)) $_POST['NewsCategoryEnabled'.$I] = '';
+    for ($I = 0; $I < $_POST['NewsCategoryCount']; $I++)
+    {
+      if (($_POST['NewsCategoryDaysAgo'.$I] * 1) < 0) $_POST['NewsCategoryIndex'.$I] = 0;
+      if (($_POST['NewsCategoryCount'.$I] * 1) < 0) $_POST['NewsCategoryCount'.$I] = 0;
+      if (($_POST['NewsColumn'.$I] * 1) < 1) $_POST['NewsColumn'.$I] = 1;
+      if (!array_key_exists('NewsCategoryEnabled'.$I, $_POST)) $_POST['NewsCategoryEnabled'.$I] = '';
       $Setting[] = array('CategoryId' => $_POST['NewsCategoryId'.$I], 'Enabled' => $Checkbox[$_POST['NewsCategoryEnabled'.$I]], 'ItemCount' => ($_POST['NewsCategoryCount'.$I]*1), 'DaysAgo' => ($_POST['NewsCategoryDaysAgo'.$I]*1), 'Index' => ($_POST['NewsCategoryIndex'.$I]*1),
       'Group' => $_POST['NewsColumn'.$I]);
 …
     $Setting = array_reverse($Setting);
     // Normalize indexes
     foreach($Setting as $Index => $Item)
+    foreach ($Setting as $Index => $Item)
       $Setting[$Index]['Index'] = $Index + 1;
 …
     // Make HTML link from URL
     $I = 0;
     while(strpos($Content, 'http://') !== false)
+    while (strpos($Content, 'http://') !== false)
+    {
       $I = strpos($Content, 'http://');
       if(($I > 0) and ($Content{$I - 1} != '"'))
+      if (($I > 0) and ($Content{$I - 1} != '"'))
+      {
         $Result .= substr($Content, 0, $I);
         $Content = substr($Content, $I);
         if(strpos($Content, ' ') !== false)
+        if (strpos($Content, ' ') !== false)
           $URL = substr($Content, 0, strpos($Content, ' '));
         else $URL = substr($Content, 0);
 …
+    }
     $Result .= $Content;
     return($Result);
+    return ($Result);
+  }
+}

trunk/Modules/News/NewsPage.php

-              r839
+              r873
+  {
     $this->UploadedFilesFolder = $this->System->ModuleManager->Modules['News']->UploadedFilesFolder;
     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 (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());
+  }
 …
+  {
     $Output = '';
     if(!$this->System->User->CheckPermission('News', 'Display', 'Item')) $Output .= 'Nemáte oprávnění';
+    if (!$this->System->User->CheckPermission('News', 'Display', 'Item')) $Output .= 'Nemáte oprávnění';
     else
+    {
       $Category = $this->GetCategory();
       if(array_key_exists('id', $_GET)) $Id = $_GET['id'] * 1;
+      if (array_key_exists('id', $_GET)) $Id = $_GET['id'] * 1;
       $DbResult = $this->Database->query('SELECT `News`.*, `User`.`Name` FROM `News` '.
         'LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE `News`.`Id`='.$Id);
       if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
+      {
         $Row = $DbResult->fetch_array();
         if($Row['Name'] == '') $Author = $Row['Author'];
+        if ($Row['Name'] == '') $Author = $Row['Author'];
           else $Author = $Row['Name'];
         $Output .= '<div class="Panel"><div class="Title">'.$Row['Title'].' ('.HumanDate($Row['Date']).', '.$Author.')';
         if(($this->System->User->User['Id'] == $Row['User']) and ($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id'])))
+        if (($this->System->User->User['Id'] == $Row['User']) and ($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id'])))
+        {
           $Output .= '<div class="Action">';
 …
+        }
         $Output .= '</div><div class="Content">'.$this->System->ModuleManager->Modules['News']->ModifyContent($Row['Content']).'<br />';
         if($Row['Link'] != '') $Output .= '<br/><a href="'.$Row['Link'].'">Odkaz</a>';
         if($Row['Enclosure'] != '')
+        if ($Row['Link'] != '') $Output .= '<br/><a href="'.$Row['Link'].'">Odkaz</a>';
+        if ($Row['Enclosure'] != '')
+        {
           $Output .= '<br />Přílohy: ';
           $Enclosures = explode(';', $Row['Enclosure']);
           foreach($Enclosures as $Enclosure)
+          foreach ($Enclosures as $Enclosure)
+          {
             if(file_exists($this->UploadedFilesFolder.$Enclosure))
+            if (file_exists($this->UploadedFilesFolder.$Enclosure))
               $Output .= ' <a href="'.$this->System->Link('/'.$this->UploadedFilesFolder.$Enclosure).'">'.$Enclosure.'</a>';
+          }
 …
       } else $Output .= 'Položka nenalezena.';
+    }
     return($Output);
+    return ($Output);
+  }
 …
     $Output = '';
     $Category = $this->GetCategory();
     if($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
+    if ($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
+    {
       $this->System->PageHeaders[] = array($this, 'GetPageHeader');
       $Output = '<strong>Vložení nové aktuality:</strong><br />';
       // TODO: Static reference to dynamic category item
       if($Category['Id'] == 2) $Output .= 'U inzerátů uvádějte co nejvíce informací ať případný zájemce ví co kupuje. Uvádějte kontaktní údaje jako Jméno, email, tel. číslo, ICQ. Dále navrženou cenu, detajlní popis předmětu nejlépe s odkazem na stránky výrobce. Pokud váš inzerát již není platný, připište do něj např. "Prodáno" pomocí editace.';
+      if ($Category['Id'] == 2) $Output .= 'U inzerátů uvádějte co nejvíce informací ať případný zájemce ví co kupuje. Uvádějte kontaktní údaje jako Jméno, email, tel. číslo, ICQ. Dále navrženou cenu, detajlní popis předmětu nejlépe s odkazem na stránky výrobce. Pokud váš inzerát již není platný, připište do něj např. "Prodáno" pomocí editace.';
       $Output .= '<form enctype="multipart/form-data" action="?action=add2" method="post">'.
         'Kategorie: <select name="category">';
       $DbResult = $this->Database->select('NewsCategory', '*');
       while($DbRow = $DbResult->fetch_array())
+      {
         if($this->System->User->CheckPermission('News', 'Insert', 'Group', $DbRow['Id']))
+        {
           if($DbRow['Id'] == $Category['Id']) $Selected = ' selected="1"';
+      while ($DbRow = $DbResult->fetch_array())
+      {
+        if ($this->System->User->CheckPermission('News', 'Insert', 'Group', $DbRow['Id']))
+        {
+          if ($DbRow['Id'] == $Category['Id']) $Selected = ' selected="1"';
             else $Selected = '';
           $Output .= '<option value="'.$DbRow['Id'].'"'.$Selected.'>'.$DbRow['Caption'].'</option>';
 …
         '</form>';
     } else $Output .= 'Do této kategorie nemůžete vkládat aktuality!';
     return($Output);
+    return ($Output);
+  }
 …
     $RemoteAddr = GetRemoteAddress();
     $Category = $this->GetCategory();
     if($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
+    if ($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
+    {
       // Process uploaded file
 …
       $EnclosureFileNames = array('enclosure1', 'enclosure2', 'enclosure3');
       $Enclosures = '';
       foreach($EnclosureFileNames as $EnclosureName)
         if(array_key_exists($EnclosureName, $_FILES) and ($_FILES[$EnclosureName]['name'] != ''))
+      foreach ($EnclosureFileNames as $EnclosureName)
+        if (array_key_exists($EnclosureName, $_FILES) and ($_FILES[$EnclosureName]['name'] != ''))
+        {
           $UploadedFilePath = $this->UploadedFilesFolder.basename($_FILES[$EnclosureName]['name']);
           if(move_uploaded_file($_FILES[$EnclosureName]['tmp_name'], $UploadedFilePath))
+          if (move_uploaded_file($_FILES[$EnclosureName]['tmp_name'], $UploadedFilePath))
+          {
             $Output .= 'Soubor '.basename($_FILES[$EnclosureName]['name']).' byl uložen na serveru.<br />';
 …
         $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',
 …
     $Output = '';
     $Category = $this->GetCategory();
     if($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
+    if ($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
+    {
       $DbResult = $this->Database->query('SELECT * FROM `News` WHERE `Id`='.$_GET['id']);
       $Row = $DbResult->fetch_array();
       if(($this->System->User->User['Id'] == $Row['User']))
+      if (($this->System->User->User['Id'] == $Row['User']))
+      {
         $this->System->PageHeaders[] = array($this, 'GetPageHeader');
 …
       } else $Output .= 'Nepovolená operace!';
     } else $Output .= 'Do této kategorie nemůžete vkládat aktuality!';
     return($Output);
+    return ($Output);
+  }
 …
     $RemoteAddr = GetRemoteAddress();
     $Category = $this->GetCategory();
     if($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
+    if ($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
+    {
       $_POST['id'] = $_POST['id'] * 1;
       $DbResult = $this->Database->select('News', '*', '`Id`='.$_POST['id']);
       if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
+      {
         $Row = $DbResult->fetch_array();
         if($this->System->User->User['Id'] == $Row['User'])
+        if ($this->System->User->User['Id'] == $Row['User'])
+        {
           $this->Database->update('News', 'Id='.$_POST['id'], array('Title' => $_POST['title'],
 …
       } else $Output .= 'ID nenalezeno!';
     } else $Output .= 'Do této kategorie nemůžete vkládat aktuality!';
     return($Output);
+    return ($Output);
+  }
 …
     $Output = '';
     $Category = $this->GetCategory();
     if($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
+    if ($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
+    {
       $DbResult = $this->Database->query('SELECT * FROM `News` WHERE `Id`='.$_GET['id']);
       $Row = $DbResult->fetch_array();
       if($this->System->User->User['Id'] == $Row['User'])
+      if ($this->System->User->User['Id'] == $Row['User'])
+      {
         // TODO: Make upload using general File class
         if($Row['Enclosure'] != '')
+        if ($Row['Enclosure'] != '')
+        {
           $Output .= '<br />Přílohy: ';
           $Enclosures = explode(';', $Row['Enclosure']);
           foreach($Enclosures as $Enclosure)
+          foreach ($Enclosures as $Enclosure)
+          {
             if(file_exists($this->UploadedFilesFolder.$Enclosure)) unlink($this->UploadedFilesFolder.$Enclosure);
+            if (file_exists($this->UploadedFilesFolder.$Enclosure)) unlink($this->UploadedFilesFolder.$Enclosure);
+          }
+        }
 …
       } else $Output .= 'Nemáte oprávnění.';
     } else $Output .= 'Do této kategorie nemůžete vkládat aktuality!';
     return($Output);
+    return ($Output);
+  }
 …
     $Output = '';
     $Category = $this->GetCategory();
     if($this->System->User->CheckPermission('News', 'Display', 'Group', $Category['Id']))
+    if ($this->System->User->CheckPermission('News', 'Display', 'Group', $Category['Id']))
+    {
       $PerPage = 20;
 …
       $RowTotal = $DbResult->fetch_array();
       $PageMax = $RowTotal[0];
       if(array_key_exists('page', $_GET)) $Page = $_GET['page'];
+      if (array_key_exists('page', $_GET)) $Page = $_GET['page'];
         else $Page = 0; //round($PageMax/$PerPage);
       $Output .= '<strong>Seznam aktualit kategorie '.$Category['Caption'].':</strong><div style="font-size: small;">';
 …
       $DbResult = $this->Database->query('SELECT `News`.*, `User`.`Name` FROM `News` '.
         'LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE `Category`='.$Category['Id'].' ORDER BY `News`.`Id` DESC LIMIT '.($Page * $PerPage).','.$PerPage);
       while($Row = $DbResult->fetch_array())
+      {
         if($Row['Name'] == '') $Author = $Row['Author'];
+      while ($Row = $DbResult->fetch_array())
+      {
+        if ($Row['Name'] == '') $Author = $Row['Author'];
           else $Author = $Row['Name'];
         $Output .= '<div class="Panel"><div class="Title"><a href="?action=view&amp;id='.$Row['Id'].'">'.$Row['Title'].'</a> ('.HumanDate($Row['Date']).', '.$Author.')';
         if(($this->System->User->User['Id'] == $Row['User']) and ($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id'])))
+        if (($this->System->User->User['Id'] == $Row['User']) and ($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id'])))
+        {
           $Output .= '<div class="Action">';
 …
+        }
         $Output .= '</div><div class="Content">'.$this->System->ModuleManager->Modules['News']->ModifyContent($Row['Content']).'<br />';
         if($Row['Link'] != '') $Output .= '<br/><a href="'.$Row['Link'].'">Odkaz</a>';
         if($Row['Enclosure'] != '')
+        if ($Row['Link'] != '') $Output .= '<br/><a href="'.$Row['Link'].'">Odkaz</a>';
+        if ($Row['Enclosure'] != '')
+        {
           $Output .= '<br />Přílohy: ';
           $Enclosures = explode(';', $Row['Enclosure']);
           foreach($Enclosures as $Enclosure)
+          foreach ($Enclosures as $Enclosure)
+          {
             if(file_exists($this->UploadedFilesFolder.$Enclosure))
+            if (file_exists($this->UploadedFilesFolder.$Enclosure))
               $Output .= ' <a href="'.$this->System->Link('/'.$this->UploadedFilesFolder.$Enclosure).'">'.$Enclosure.'</a>';
+          }
 …
       $Output .= '</div>';
     } else $Output .= 'Nemáte oprávnění.';
     return($Output);
+    return ($Output);
+  }
 …
+  {
     $Category = array('Id' => 1); // Default category
     if(array_key_exists('category', $_GET)) $Category['Id'] = $_GET['category'] * 1;
     if(array_key_exists('category', $_POST)) $Category['Id'] = $_POST['category'] * 1;
     //if(is_null($Category)) throw new Exception('Kategorie neurčena');
+    if (array_key_exists('category', $_GET)) $Category['Id'] = $_GET['category'] * 1;
+    if (array_key_exists('category', $_POST)) $Category['Id'] = $_POST['category'] * 1;
+    //if (is_null($Category)) throw new Exception('Kategorie neurčena');
     else
+    {
       $DbResult = $this->Database->select('NewsCategory', '*', '`Id`='.$Category['Id'].' ORDER BY `Sequence`');
       if($DbResult->num_rows > 0) $Category = $DbResult->fetch_array();
+      if ($DbResult->num_rows > 0) $Category = $DbResult->fetch_array();
         else $Category = array('Id' => 0); //throw new Exception('Kategorie nenalezena');
+    }
     return($Category);
+    return ($Category);
+  }
 …
+  {
     $Output = '';
     if(array_key_exists('action',$_GET)) $Action = $_GET['action'];
+    if (array_key_exists('action',$_GET)) $Action = $_GET['action'];
       else $Action = '';
     if($Action == 'view') $Output .= $this->ShowView();
     else if($Action == 'add') $Output .= $this->ShowAdd();
     else if($Action == 'add2') $Output .= $this->ShowAdd2();
     else if($Action == 'edit') $Output .= $this->ShowEdit();
     else if($Action == 'update') $Output .= $this->ShowUpdate();
     else if($Action == 'del') $Output .= $this->ShowDelete();
+    if ($Action == 'view') $Output .= $this->ShowView();
+    else if ($Action == 'add') $Output .= $this->ShowAdd();
+    else if ($Action == 'add2') $Output .= $this->ShowAdd2();
+    else if ($Action == 'edit') $Output .= $this->ShowEdit();
+    else if ($Action == 'update') $Output .= $this->ShowUpdate();
+    else if ($Action == 'del') $Output .= $this->ShowDelete();
     else $Output .= $this->ShowList();
     return($Output);
+    return ($Output);
+  }
   function ShowSubscription()
+  {
     if(array_key_exists('build', $_GET))
+    if (array_key_exists('build', $_GET))
+    {
       $Select = '';
       foreach($_POST as $Index => $Item)
+      {
         if(substr($Index, 0, 8) == 'category') $Select .= '-'.substr($Index, 8);
+      foreach ($_POST as $Index => $Item)
+      {
+        if (substr($Index, 0, 8) == 'category') $Select .= '-'.substr($Index, 8);
+      }
       $Select = $this->System->Config['Web']['RootFolder'].'/aktuality/rss/?select='.substr($Select, 1);
 …
       $Output .= '<form action="?build=1" method="post">';
       $DbResult = $this->Database->select('NewsCategory', '*', '1 ORDER BY `Caption`');
       while($Category = $DbResult->fetch_array())
+      while ($Category = $DbResult->fetch_array())
+      {
         $Output .= '<input type="checkbox" name="category'.$Category['Id'].'" />'.$Category['Caption'].'<br />';
 …
         '</form>';
+    }
     return($Output);
+    return ($Output);
+  }
 …
     // Prepare WHERE condition
     if(array_key_exists('select', $_GET))
+    if (array_key_exists('select', $_GET))
+    {
       $Where = '';
       $Parts = explode('-', $_GET['select']);
       foreach($Parts as $Part)
+      foreach ($Parts as $Part)
+      {
         $Where .= 'OR (`Category`='.($Part * 1).')';
 …
     $Categories = array();
     $DbResult = $this->Database->select('NewsCategory', '*');
     while($Category = $DbResult->fetch_array())
+    while ($Category = $DbResult->fetch_array())
+    {
       $Categories[$Category['Id']] = $Category['Caption'];
 …
     $Index = 0;
     //echo(DB_NumRows().',');
     while($Row = $DbResult->fetch_array())
+    while ($Row = $DbResult->fetch_array())
+    {
       $Row['post_text'] = StrTr($Row['post_text'], "\x8A\x8D\x8E\x9A\x9D\x9E", "\xA9\xAB\xAE\xB9\xBB\xBE");
 …
       //echo('category='.$ForumCategory.' AND title="'.addslashes($Title).'" AND content="'.addslashes($Content).'" AND author="'.addslashes($Author).'" AND date="'.$Date.'"');
       $DbResult2 = $Database->select('news', '*', 'category='.$ForumCategory.' AND title="'.addslashes($Title).'" AND content="'.addslashes($Content).'" AND author="'.addslashes($Author).'" AND date="'.$Date.'"');
       if($DbResult2->num_rows == 0) //echo('.'); else echo('x');
+      if ($DbResult2->num_rows == 0) //echo('.'); else echo('x');
         $Database->insert('news', array('category' => $ForumCategory, 'title' => $Title, 'content' => $Content, 'author' => $Author, 'date' => $Date));
         //echo($Date);
 …
     // Get news from database by selected categories
     $DbResult = $this->Database->query('SELECT *, UNIX_TIMESTAMP(`Date`) AS `UnixTime` FROM `News` LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE '.$Where.' ORDER BY News.Date DESC LIMIT 0,'.$NewsCount);
     while($Row = $DbResult->fetch_assoc())
+    while ($Row = $DbResult->fetch_assoc())
+    {
       $EnclosuresText = '';
       if($Row['Enclosure'] != '')
+      if ($Row['Enclosure'] != '')
+      {
         $EnclosuresText .= '<br />Přílohy: ';
         $Enclosures = explode(';', $Row['Enclosure']);
         foreach($Enclosures as $Enclosure)
+        {
           if(file_exists($this->UploadedFilesFolder.$Enclosure))
+        foreach ($Enclosures as $Enclosure)
+        {
+          if (file_exists($this->UploadedFilesFolder.$Enclosure))
             $EnclosuresText .= ' <a href="'.$this->System->Link('/aktuality/'.$this->UploadedFilesFolder.$Enclosure).'">'.$Enclosure.'</a>';
+        }
+      }
       if($Row['Name'] == '') $Author = $Row['Author'];
+      if ($Row['Name'] == '') $Author = $Row['Author'];
         else $Author = $Row['Name'];
       $Items[] = array(
 …
     $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail'];
     $RSS->Items = $Items;
     return($RSS->Generate());
+    return ($RSS->Generate());
+  }
+}

trunk/Modules/Notify/Notify.php

-              r868
+              r873
   function RegisterCheck($Name, $Callback)
+  {
     if(array_key_exists($Name, $this->Checks))
+    if (array_key_exists($Name, $this->Checks))
       throw new Exception('Check function "'.$Name.'" already registered.');
     $this->Checks[$Name] = array('Callback' => $Callback);
 …
   function UnregisterCheck($Name)
+  {
     if(!array_key_exists($Name, $this->Checks))
+    if (!array_key_exists($Name, $this->Checks))
       throw new Exception('Check function "'.$Name.'" not registered.');
     unset($this->Checks[$Name]);
 …
       'LEFT JOIN `User` ON `User`.`Id` = `NotifyUser`.`User` '.
       'LEFT JOIN `Contact` ON `Contact`.`Id` = `NotifyUser`.`Contact`');
     while($User = $DbResult->fetch_assoc())
+    while ($User = $DbResult->fetch_assoc())
+    {
       $Output .= 'User '.$User['Name'].'<br/>';
 …
       $this->Database->update('NotifyUser', '`Id`='.$User['Id'], array('LastTime' => TimeToMysqlDateTime($Time)));
       if(($User['Category'] == CONTACT_CATEGORY_EMAIL) and ($Content != ''))
+      if (($User['Category'] == CONTACT_CATEGORY_EMAIL) and ($Content != ''))
+      {
         $Mail = new Mail();
 …
+    }
     return($Output);
+    return ($Output);
+  }
 …
       ' ORDER BY `Time` DESC LIMIT '.$Count;
     $DbResult = $this->System->Database->query($sql);
     while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
+    {
       $Items[] = array
 …
     $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail'];
     $RSS->Items = $Items;
     return($RSS->Generate());
+    return ($RSS->Generate());
+  }
+}

trunk/Modules/OpeningHours/OpeningHours.php

-              r738
+              r873
     $Hours = floor($Time / 60);
     $Minutes = $Time - $Hours * 60;
     if($Minutes < 10) $Minutes = '0'.$Minutes;
+    if ($Minutes < 10) $Minutes = '0'.$Minutes;
     $Hours = $Hours % 24;
     return($Hours.':'.$Minutes);
+    return ($Hours.':'.$Minutes);
+  }
 …
     $Minutes = $Time;
     $Output = '';
     if($Days > 0) $Output .= $Days.' dnů, ';
     if($Hours > 0) $Output .= $Hours.' hodin, ';
     if($Minutes > 0) $Output .= $Minutes.' minut';
     return($Output);
+    if ($Days > 0) $Output .= $Days.' dnů, ';
+    if ($Hours > 0) $Output .= $Hours.' hodin, ';
+    if ($Minutes > 0) $Output .= $Minutes.' minut';
+    return ($Output);
+  }
   function EditSubject($Id)
+  {
     if($this->System->User->CheckPermission('OpeningHours', 'Edit'))
+    if ($this->System->User->CheckPermission('OpeningHours', 'Edit'))
+    {
       $Output = '<div class="Centred">';
 …
       $Day = array();
       $DbResult = $this->Database->query('SELECT * FROM SubjectOpenTimeDay WHERE Subject = '.$Id);
       while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
         $Day[$DbRow['Day']] = $DbRow;
       foreach($this->DaysOfWeek as $Index => $Name)
+      {
         if(!array_key_exists($Index, $Day)) $Day[$Index] = array('Open1' => 0, 'Close1' => 0, 'Open2' => 0, 'Close2' => 0);
+      foreach ($this->DaysOfWeek as $Index => $Name)
+      {
+        if (!array_key_exists($Index, $Day)) $Day[$Index] = array('Open1' => 0, 'Close1' => 0, 'Open2' => 0, 'Close2' => 0);
         $Output .= '<tr><td>'.$Name.'</td>'.
           '<td><input type="text" name="day'.$Index.'_open1_h" value="'.floor($Day[$Index]['Open1'] / 60).'" size="2" />'.
 …
       '</form></div>';
     } else $Output = 'Nemáte oprávnění';
     return($Output);
+    return ($Output);
+  }
 …
     $Output = '';
     if($this->System->User->CheckPermission('OpeningHours', 'Edit'))
+    if ($this->System->User->CheckPermission('OpeningHours', 'Edit'))
+    {
       $this->Database->delete('SubjectOpenTimeDay', 'Subject='.$Id);
       foreach($this->DaysOfWeek as $Index => $Name)
+      {
         if($_POST['day'.$Index.'_open1_h'] > 24) $_POST['day'.$Index.'_open1_h'] = 24;
         if($_POST['day'.$Index.'_close1_h'] > 24) $_POST['day'.$Index.'_close1_h'] = 24;
         if($_POST['day'.$Index.'_open2_h'] > 24) $_POST['day'.$Index.'_open2_h'] = 24;
         if($_POST['day'.$Index.'_close2_h'] > 24) $_POST['day'.$Index.'_close2_h'] = 24;
         if($_POST['day'.$Index.'_open1_m'] > 59) $_POST['day'.$Index.'_open1_m'] = 59;
         if($_POST['day'.$Index.'_close1_m'] > 59) $_POST['day'.$Index.'_close1_m'] = 59;
         if($_POST['day'.$Index.'_open2_m'] > 59) $_POST['day'.$Index.'_open2_m'] = 59;
         if($_POST['day'.$Index.'_close2_m'] > 59) $_POST['day'.$Index.'_close2_m'] = 59;
+      foreach ($this->DaysOfWeek as $Index => $Name)
+      {
+        if ($_POST['day'.$Index.'_open1_h'] > 24) $_POST['day'.$Index.'_open1_h'] = 24;
+        if ($_POST['day'.$Index.'_close1_h'] > 24) $_POST['day'.$Index.'_close1_h'] = 24;
+        if ($_POST['day'.$Index.'_open2_h'] > 24) $_POST['day'.$Index.'_open2_h'] = 24;
+        if ($_POST['day'.$Index.'_close2_h'] > 24) $_POST['day'.$Index.'_close2_h'] = 24;
+        if ($_POST['day'.$Index.'_open1_m'] > 59) $_POST['day'.$Index.'_open1_m'] = 59;
+        if ($_POST['day'.$Index.'_close1_m'] > 59) $_POST['day'.$Index.'_close1_m'] = 59;
+        if ($_POST['day'.$Index.'_open2_m'] > 59) $_POST['day'.$Index.'_open2_m'] = 59;
+        if ($_POST['day'.$Index.'_close2_m'] > 59) $_POST['day'.$Index.'_close2_m'] = 59;
         $Day = array('Subject' => $Id, 'Day' => $Index);
         $Day['Open1'] = $_POST['day'.$Index.'_open1_m'] + $_POST['day'.$Index.'_open1_h'] * 60;
 …
       $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);
+  }
 …
     $Output = '<div class="Centred">';
     $DbResult = $this->Database->query('SELECT SubjectOpenTime.*, DATE_FORMAT(SubjectOpenTime.UpdateTime, "%e.%c.%Y") as UpdateTime, Subject.Id, Subject.Name as Name FROM SubjectOpenTime JOIN Subject ON Subject.Id = SubjectOpenTime.Subject ORDER BY Name');
     while($Subject = $DbResult->fetch_assoc())
+    while ($Subject = $DbResult->fetch_assoc())
+    {
       $Output .= '<strong>'.$Subject['Name'].':</strong><br />';
 …
       $Events = array();
       $DbResult2 = $this->Database->query('SELECT * FROM `SubjectOpenTimeDay` WHERE Subject='.$Subject['Subject'].' ORDER BY Day ASC');
       while($DbRow = $DbResult2->fetch_assoc())
+      {
         if(($DbRow['Open1'] != $DbRow['Close1']) and ($DbRow['Open1'] < $DbRow['Close1']))
+      while ($DbRow = $DbResult2->fetch_assoc())
+      {
+        if (($DbRow['Open1'] != $DbRow['Close1']) and ($DbRow['Open1'] < $DbRow['Close1']))
+        {
           $Events[] = array('Time' => $DbRow['Open1'] + $DbRow['Day'] * 24 * 60, 'Type' => 1);
           $Events[] = array('Time' => $DbRow['Close1'] + $DbRow['Day'] * 24 * 60, 'Type' => 2);
+        }
         if(($DbRow['Open2'] != $DbRow['Close2']) and ($DbRow['Open2'] < $DbRow['Close2']) and ($DbRow['Close1'] < $DbRow['Open2']))
+        if (($DbRow['Open2'] != $DbRow['Close2']) and ($DbRow['Open2'] < $DbRow['Close2']) and ($DbRow['Close1'] < $DbRow['Open2']))
+        {
           $Events[] = array('Time' => $DbRow['Open2'] + $DbRow['Day'] * 24 * 60, 'Type' => 1);
 …
       // Calculate time to next event
       if(count($Events) > 0)
+      if (count($Events) > 0)
+      {
         $CurrentTime = ((date('w') + 6) % 7) * 24 * 60 + date('G') * 60 + date('i');
         $I = 0;
         while(($I < count($Events)) and ($Events[$I]['Time'] < $CurrentTime))
+        while (($I < count($Events)) and ($Events[$I]['Time'] < $CurrentTime))
           $I++;
         if($I < count($Events))
+        if ($I < count($Events))
+        {
           $NextTime = $Events[$I]['Time'];
 …
         $TimeDelta = $NextTime - $CurrentTime;
         //$Output .= $CurrentTime.' '.$NextTime;
         if($NextEventType == 2) $Output .= 'Zavírá za '.$this->ToHumanTime2($TimeDelta);
+        if ($NextEventType == 2) $Output .= 'Zavírá za '.$this->ToHumanTime2($TimeDelta);
           else $Output .= 'Otevírá za '.$this->ToHumanTime2($TimeDelta);
+      }
 …
       // Show time inteval table
       $Output .= '<table class="WideTable"><tr><th>Den</th><th>Čas</th></tr>';
       foreach($this->DaysOfWeek as $DayIndex => $DayOfWeek)
+      foreach ($this->DaysOfWeek as $DayIndex => $DayOfWeek)
+      {
         $DbResult2 = $this->Database->query('SELECT * FROM SubjectOpenTimeDay WHERE Subject = '.$Subject['Subject'].' AND Day='.$DayIndex);
         $Output .= '<tr><td>'.$DayOfWeek.'</td><td align="center">';
         if($DbResult2->num_rows)
+        if ($DbResult2->num_rows)
+        {
           $DbRow = $DbResult2->fetch_assoc();
           if(($DbRow['Open1'] != $DbRow['Close1']) and ($DbRow['Open1'] < $DbRow['Close1']))
+          if (($DbRow['Open1'] != $DbRow['Close1']) and ($DbRow['Open1'] < $DbRow['Close1']))
+          {
             $Output .= $this->ToHumanTime($DbRow['Open1']).' - '.$this->ToHumanTime($DbRow['Close1']).' &nbsp;&nbsp; ';
+          }
           if(($DbRow['Open2'] != $DbRow['Close2']) and ($DbRow['Open2'] < $DbRow['Close2']) and ($DbRow['Close1'] < $DbRow['Open2']))
+          if (($DbRow['Open2'] != $DbRow['Close2']) and ($DbRow['Open2'] < $DbRow['Close2']) and ($DbRow['Close1'] < $DbRow['Open2']))
+          {
             $Output .= $this->ToHumanTime($DbRow['Open2']).' - '.$this->ToHumanTime($DbRow['Close2']).'';
 …
+      }
       $Output .= '</table>Aktualizováno: '.$Subject['UpdateTime'].'<br />';
       if($Subject['Notice'] != '') $Output .= 'Poznámka: '.$Subject['Notice'].'<br />';
       if($Subject['Photo'] != 0) $Output .= '<a href="file?id='.$Subject['Photo'].'">Fotka</a> ';
       if($this->System->User->CheckPermission('SubjectOpenTime', 'Edit'))
+      if ($Subject['Notice'] != '') $Output .= 'Poznámka: '.$Subject['Notice'].'<br />';
+      if ($Subject['Photo'] != 0) $Output .= '<a href="file?id='.$Subject['Photo'].'">Fotka</a> ';
+      if ($this->System->User->CheckPermission('SubjectOpenTime', 'Edit'))
         $Output .= '<a href="edit?Subject='.$Subject['Id'].'">Editovat</a><br />';
       $Output .= '<br />';
+    }
     $Output .= '</div>';
     return($Output);
+    return ($Output);
+  }
   function Show()
+  {
     if(count($this->System->PathItems) > 1)
+    {
       if($this->System->PathItems[1] == 'edit') $Output = $this->EditSubject($_GET['Subject']);
       else if($this->System->PathItems[1] == 'save')
+    if (count($this->System->PathItems) > 1)
+    {
+      if ($this->System->PathItems[1] == 'edit') $Output = $this->EditSubject($_GET['Subject']);
+      else if ($this->System->PathItems[1] == 'save')
+      {
         $Output = $this->SaveSubject($_GET['Subject']);
 …
       } else $Output = PAGE_NOT_FOUND;
     } else $Output = $this->ShowAll();
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/Portal/Portal.php

-              r860
+              r873
     $DbResult = $this->Database->query('SELECT `Id` FROM `Action` '.
       'WHERE (`Action`.`Group`='.$ActionGroup['Id'].') AND (`Action`.`Enable` = 1)');
     while($Action = $DbResult->fetch_assoc())
+    while ($Action = $DbResult->fetch_assoc())
+    {
       $Output .= $this->System->ShowAction($Action['Id']).'<br/>';
+    }
     return($this->Panel($ActionGroup['Name'], $Output));
+    return ($this->Panel($ActionGroup['Name'], $Output));
+  }
 …
     //$Output .= 'Server běží: '.$this->GetServerUptime().' &nbsp;  &nbsp; ';
     if($this->System->User->CheckPermission('Finance', 'DisplaySubjectState'))
+    if ($this->System->User->CheckPermission('Finance', 'DisplaySubjectState'))
+    {
       $DbResult = $this->Database->select('MemberPayment', 'Cash', 'Member=(SELECT Customer FROM UserCustomerRel WHERE Id='.$this->System->User->User['Id'].')');
       if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
+      {
         $DbRow = $DbResult->fetch_assoc();
 …
     $Output = '<div class="Navigation"><span class="MenuItem">'.$Output.'</span><div class="MenuItem2">&nbsp;'.$Output2.'</div></div>';
     return($Output);
+    return ($Output);
+  }
 …
+  {
     $Output = '<a href="'.$this->System->Link('/user/?Action=UserOptions').'">Profil</a><br />';
     if($this->System->User->CheckPermission('Finance', 'MemberOptions'))
+    if ($this->System->User->CheckPermission('Finance', 'MemberOptions'))
       $Output .= '<a href="'.$this->System->Link('/?Action=MemberOptions').'">Fakturační adresa</a><br />';
     if($this->System->User->CheckPermission('Finance', 'DisplaySubjectState'))
+    if ($this->System->User->CheckPermission('Finance', 'DisplaySubjectState'))
       $Output .= '<a href="'.$this->System->Link('/finance/platby/').'">Finance</a><br />';
     if($this->System->User->CheckPermission('Network', 'RegistredHostList'))
+    if ($this->System->User->CheckPermission('Network', 'RegistredHostList'))
       $Output .= '<a href="'.$this->System->Link('/network/user-hosts/').'">Počítače</a><br />';
     if($this->System->User->CheckPermission('News', 'Insert'))
+    if ($this->System->User->CheckPermission('News', 'Insert'))
       $Output .= '<a href="'.$this->System->Link('/aktuality/?action=add').'">Vložení aktuality</a><br />';
     if($this->System->User->CheckPermission('EatingPlace', 'Edit'))
+    if ($this->System->User->CheckPermission('EatingPlace', 'Edit'))
       $Output .= '<a href="'.$this->System->Link('/jidelna/menuedit.php').'">Úprava jídelníčků</a><br />';
     if($this->System->User->CheckPermission('Finance', 'Manage'))
+    if ($this->System->User->CheckPermission('Finance', 'Manage'))
       $Output .= '<a href="'.$this->System->Link('/finance/sprava/').'">Správa financí</a><br />';
     if($this->System->User->CheckPermission('IS', 'Manage'))
+    if ($this->System->User->CheckPermission('IS', 'Manage'))
       $Output .= '<a href="'.$this->System->Link('/is/').'">Správa dat</a><br />';
     return($Output);
+    return ($Output);
+  }
 …
+  {
     $Output = $this->System->ModuleManager->Modules['WebCam']->ShowImage();
     return($Output);
+    return ($Output);
+  }
 …
+  {
     $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);
+  }
 …
       'LEFT JOIN `NetworkDeviceType` ON `NetworkDeviceType`.`Id` = `NetworkDevice`.`Type` '.
       'WHERE (`NetworkDeviceType`.`ShowOnline` = 1) AND (`NetworkDevice`.`Online` = 1) ORDER BY `NetworkDevice`.`Name`');
     while($Device = $DbResult->fetch_array())
+    while ($Device = $DbResult->fetch_array())
+    {
       $Output .= $Device['Name'].'<br />';
+    }
     $Output .= '</span>';
     return($Output);
+    return ($Output);
+  }
 …
     $Output .= '<div class="PanelTitle">Dlužníci:</div><span style="font-size: smaller;">';
     $DbResult = $Database->select('Subject', 'Name', 'Money < 0 ORDER BY Money');
     while($Row = $DbResult->fetch_array())
+    while ($Row = $DbResult->fetch_array())
+    {
       $Output .= $Row['Name'].'<br />';
+    }
     $Output .= '</span>';
     return($Output);
+    return ($Output);
+  }
   function Panel($Title, $Content, $Menu = array())
+  {
     if(count($Menu) > 0)
       foreach($Menu as $Item)
+    if (count($Menu) > 0)
+      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>');
+  }
 …
+  {
     $Output = '';
     if(array_key_exists('Action', $_GET))
+    if (array_key_exists('Action', $_GET))
+    {
       $Action = $_GET['Action'];
       if($Action == 'CustomizeNewsSave')
+      if ($Action == 'CustomizeNewsSave')
+      {
         $Output .= $this->System->ModuleManager->Modules['News']->CustomizeSave();
       } else
       if($Action == 'MemberOptions')
+      if ($Action == 'MemberOptions')
+      {
         $DbResult = $this->Database->query('SELECT `Customer` FROM `UserCustomerRel` '.
           'WHERE `User`='.$this->System->User->User['Id']);
         while($CustomerUserRel = $DbResult->fetch_assoc())
+        while ($CustomerUserRel = $DbResult->fetch_assoc())
+        {
           $DbResult2 = $this->Database->query('SELECT `Member`.`Id`, '.
 …
           $Form->SetClass('MemberOptions');
           $DbRow = $DbResult2->fetch_array();
           foreach($Form->Definition['Items'] as $Index => $Item)
+          foreach ($Form->Definition['Items'] as $Index => $Item)
+          {
             $Form->Values[$Index] = $DbRow[$Index];
 …
+        }
       } else
       if($Action == 'MemberOptionsSave')
+      if ($Action == 'MemberOptionsSave')
+      {
         $Form = new Form($this->System->FormManager);
         $Form->SetClass('MemberOptions');
         $Form->LoadValuesFromForm();
         if($Form->Values['FamilyMemberCount'] < 0)
+        if ($Form->Values['FamilyMemberCount'] < 0)
           $Form->Values['FamilyMemberCount'] = 0;
 …
           'ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->User->User['Member']);
         $DbRow = $DbResult->fetch_array();
         foreach($Form->Definition['Items'] as $Index => $Item)
+        foreach ($Form->Definition['Items'] as $Index => $Item)
+        {
           $Form->Values[$Index] = $DbRow[$Index];
 …
+      }
     } else $Output = $this->ShowMain();
     return($Output);
+    return ($Output);
+  }
 …
     $Output = '';
     $DbResult = $this->Database->query('SELECT * FROM `ActionGroup`');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
       $ActionGroups[$DbRow['Id']] = $DbRow;
     // Show pannels
     //if(IsInternetAddr()) echo('Internet'); else echo('LAN');
+    //if (IsInternetAddr()) echo('Internet'); else echo('LAN');
     //$Output .= $this->InfoBar();
     $Output .= '<table id="MainTable"><tr>';
     $DbResult = $this->Database->select('PanelColumn', '*');
     while($PanelColumn =  $DbResult->fetch_assoc())
+    {
       if($PanelColumn != '') $Width = ' width="'.$PanelColumn['Width'].'"';
+    while ($PanelColumn =  $DbResult->fetch_assoc())
+    {
+      if ($PanelColumn != '') $Width = ' width="'.$PanelColumn['Width'].'"';
         else $Width = '';
       $Output .= '<td valign="top"'.$Width.'>';
       $DbResult2 = $this->Database->query('SELECT * FROM `Panel` WHERE `PanelColumn`='.$PanelColumn['Id'].' ORDER BY `Order`');
       while($Panel = $DbResult2->fetch_assoc())
+      {
         if($Panel['Module'] == 'ActionGroup') $Output .= $this->ShowActions($ActionGroups[$Panel['Parameters']]);
         else if($Panel['Module'] == 'OnlineHostList') $Output .= $this->Panel('Online počítače', $this->OnlineHostList());
         else if($Panel['Module'] == 'UserOptions')
+      while ($Panel = $DbResult2->fetch_assoc())
+      {
+        if ($Panel['Module'] == 'ActionGroup') $Output .= $this->ShowActions($ActionGroups[$Panel['Parameters']]);
+        else if ($Panel['Module'] == 'OnlineHostList') $Output .= $this->Panel('Online počítače', $this->OnlineHostList());
+        else if ($Panel['Module'] == 'UserOptions')
+        {
           //if($this->System->User->User['Id'] != null) $Output .= $this->Panel('Přihlášený uživatel', $this->UserPanel());
+          //if ($this->System->User->User['Id'] != null) $Output .= $this->Panel('Přihlášený uživatel', $this->UserPanel());
         } else
         if($Panel['Module'] == 'Webcam') $Output .= $this->Panel('Kamery', $this->WebcamPanel());
         if($Panel['Module'] == 'Meteo') $Output .= $this->Panel('Meteostanice', $this->MeteoPanel());
         else if($Panel['Module'] == 'NewsGroupList')
+        if ($Panel['Module'] == 'Webcam') $Output .= $this->Panel('Kamery', $this->WebcamPanel());
+        if ($Panel['Module'] == 'Meteo') $Output .= $this->Panel('Meteostanice', $this->MeteoPanel());
+        else if ($Panel['Module'] == 'NewsGroupList')
           $Output .= $this->Panel('Aktuality', $this->System->ModuleManager->Modules['News']->Show(), array('<a href="?Action=CustomizeNews">Upravit</a>'));
+      }
 …
+    }
     $Output .= '</tr></table>';
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/RSS/RSS.php

r840	r873
27	27	$this->RSSChannels[$Channel['Channel']] = $Channel;
28	28
29		if(is_null($Pos)) $this->RSSChannelsPos[] = $Channel['Channel'];
	29	if (is_null($Pos)) $this->RSSChannelsPos[] = $Channel['Channel'];
30	30	else {
31	31	array_splice($this->RSSChannelsPos, $Pos, 0, $Channel['Channel']);
…	…
42	42	{
43	43	$Output = '';
44		foreach($this->RSSChannels as $Channel)
	44	foreach ($this->RSSChannels as $Channel)
45	45	{
46		//if($this->System->User->Licence($Channel['Permission']))
	46	//if ($this->System->User->Licence($Channel['Permission']))
47	47	$Output .= ' <link rel="alternate" title="'.$Channel['Title'].'" href="'.
48	48	$this->System->Link('/rss/?channel='.$Channel['Channel']).'" type="application/rss+xml" />';
49	49	}
50		return($Output);
	50	return ($Output);
51	51	}
52	52	}
…	…
58	58	$this->ClearPage = true;
59	59
60		if(array_key_exists('channel', $_GET)) $ChannelName = $_GET['channel'];
	60	if (array_key_exists('channel', $_GET)) $ChannelName = $_GET['channel'];
61	61	else $ChannelName = '';
62		if(array_key_exists('token', $_GET)) $Token = $_GET['token'];
	62	if (array_key_exists('token', $_GET)) $Token = $_GET['token'];
63	63	else $Token = '';
64		if(array_key_exists($ChannelName, $this->System->ModuleManager->Modules['RSS']->RSSChannels))
	64	if (array_key_exists($ChannelName, $this->System->ModuleManager->Modules['RSS']->RSSChannels))
65	65	{
66	66	$Channel = $this->System->ModuleManager->Modules['RSS']->RSSChannels[$ChannelName];
67		if($this->System->User->CheckPermission($Channel['Permission']['Module'], $Channel['Permission']['Operation']) or
	67	if ($this->System->User->CheckPermission($Channel['Permission']['Module'], $Channel['Permission']['Operation']) or
68	68	$this->System->User->CheckToken($Channel['Permission']['Module'], $Channel['Permission']['Operation'], $Token))
69	69	{
70		if(is_string($Channel['Callback'][0]))
	70	if (is_string($Channel['Callback'][0]))
71	71	{
72	72	$Class = new $Channel['Callback'][0]($this->System);
…	…
76	76	} else $Output = 'Nemáte oprávnění';
77	77	} else $Output = 'Kanál nenalezen';
78		return($Output);
	78	return ($Output);
79	79	}
80	80	}

trunk/Modules/Scheduler/Scheduler.php

-              r830
+              r873
   function Run($Parameters)
+  {
     while(true)
+    while (true)
+    {
       $DbResult = $this->Database->query('SELECT `Scheduler`.*, `SchedulerAction`.`Class` AS `Class` FROM `Scheduler` '.
 …
         '(`Scheduler`.`ScheduledTime` < "'.TimeToMysqlDateTime(time()).'") OR '.
         '(`Scheduler`.`ScheduledTime` IS NULL))');
       while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
+      {
         echo('Executing '.$DbRow['Name']."\n");
         $Output = '';
         $StartTime = time();
         if(class_exists($DbRow['Class']))
+        if (class_exists($DbRow['Class']))
+        {
           $Class = new $DbRow['Class']($this->System);
 …
           array('Log' => $Output, 'LastExecutedTime' => TimeToMysqlDateTime($StartTime),
             'Duration' => $Duration));
         if($DbRow['Period'] != '') {
           if($DbRow['ScheduledTime'] == '') $NewScheduledTime = $StartTime + $DbRow['Period'];
+        if ($DbRow['Period'] != '') {
+          if ($DbRow['ScheduledTime'] == '') $NewScheduledTime = $StartTime + $DbRow['Period'];
             else $NewScheduledTime = MysqlDateTimeToTime($DbRow['ScheduledTime']) + $DbRow['Period'];
           if($NewScheduledTime < $StopTime) $NewScheduledTime = $StopTime + $DbRow['Period'];
+          if ($NewScheduledTime < $StopTime) $NewScheduledTime = $StopTime + $DbRow['Period'];
           $this->Database->update('Scheduler', 'Id='.$DbRow['Id'],
             array('ScheduledTime' => TimeToMysqlDateTime($NewScheduledTime)));
 …
+  {
     $Output = '#';
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/Search/Search.php

-              r738
+              r873
+  {
     $Output = '';
     if(array_key_exists('t', $_GET)) $Text = $_GET['t'];
+    if (array_key_exists('t', $_GET)) $Text = $_GET['t'];
       else $Text = '';
     $Output .= '<form action="?" method="get">'.
 …
     '<input type="submit" value="Hledat"/>'.
     '</form>';
     if($Text != '')
     foreach($this->System->ModuleManager->Modules['Search']->Items as $Item)
+    if ($Text != '')
+    foreach ($this->System->ModuleManager->Modules['Search']->Items as $Item)
+    {
       $Columns = '';
       $Condition = '';
       foreach($Item['Columns'] as $Column)
+      foreach ($Item['Columns'] as $Column)
+      {
         $Columns .= ', `'.$Column.'`';
 …
       $DbResult = $this->Database->Select($Item['Table'], $Columns, $Condition.' LIMIT '.
         $this->System->ModuleManager->Modules['Search']->MaxItemCount);
       if($DbResult->num_rows > 0) $Output .= '<strong>'.$Item['Name'].'</strong><br/>';
       while($Row = $DbResult->fetch_assoc())
+      if ($DbResult->num_rows > 0) $Output .= '<strong>'.$Item['Name'].'</strong><br/>';
+      while ($Row = $DbResult->fetch_assoc())
+      {
         $Output .= '<p>';
         foreach($Item['Columns'] as $Column)
+        foreach ($Item['Columns'] as $Column)
           $Output .= $Row[$Column].'<br/>';
         $Output .= '</p>';
+      }
+    }
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/SpeedTest/SpeedTest.php

-              r738
+              r873
   function Show()
+  {
     if(count($this->System->PathItems) > 1)
+    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());
+  }
 …
 ## Redirect immediately to download.php if auto_start = 1
 if($config->{'general'}->{'auto_start'}) {
+if ($config->{'general'}->{'auto_start'}) {
     Header("Location: ".$config['general']['base_url']."/download.php");
     exit;
 …
 <body>';
 if(file_exists("header.html")) {
+if (file_exists("header.html")) {
     ## Include "header.html" for a custom header, if the file exists
     include("header.html");
 …
 $Output .= '<div id="speedtest_content">';
 if(file_exists("welcome.html")) {
+if (file_exists("welcome.html")) {
     ## Include "welcome.html" for a custom welcome page, if the file exists
     include("welcome.html");
 …
 </div>';
 if(file_exists("footer.html")) {
+if (file_exists("footer.html")) {
     ## Include "footer.html" for a custom footer, if the file exists
     include("footer.html");
 …
     print "</center>\n";
+}
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/SpeedTest/common.php

-              r560
+              r873
     foreach ($lines as $line_num => $line) {
         $line = rtrim(preg_replace("/#.*/","",$line));
         if(preg_match("/\[.*\]/", $line, $parts)) {
+        if (preg_match("/\[.*\]/", $line, $parts)) {
             $section = $parts[0];
             $section = preg_replace("/[\[\]]/","",$section);
 …
 function Debug($message) {
     global $config;
     if($config->{'general'}->{'debug'}) {
+    if ($config->{'general'}->{'debug'}) {
         BCLog($message);
+    }
 …
     global $config;
     $logfile = $config->{'general'}->{'logfile'};
     if(! $logfile) {
+    if (! $logfile) {
         return;
+    }

trunk/Modules/SpeedTest/download.php

-              r738
+              r873
 $disallow = $config->{'general'}->{'disallow'};
 $allow = $config->{'general'}->{'allow'};
 if( $allow && (! preg_match("/$allow/",$remote_addr)) ) {
+if ( $allow && (! preg_match("/$allow/",$remote_addr)) ) {
     include("unallowed.html");
     exit;
 } elseif( $disallow && preg_match("/$disallow/", $remote_addr) ) {
+} elseif ( $disallow && preg_match("/$disallow/", $remote_addr) ) {
     include("unallowed.html");
     exit;
 …
 ## on initial results
 $config_auto_size = $config->{'general'}->{'auto_size'};
 if($config_auto_size) {
+if ($config_auto_size) {
     ## We're using the auto_size functionality
     if( isset($_GET['auto_size']) && $_GET['auto_size']) {
+    if ( isset($_GET['auto_size']) && $_GET['auto_size']) {
         ## Intial test is done.  Set down/upload sizes to the same as
         ## our initial measured speeds.   That way the test should take
 …
 ## Make sure sizes are below our configured limits
 if($down_kbytes > $config->{'download'}->{'max_kbytes'}) {
+if ($down_kbytes > $config->{'download'}->{'max_kbytes'}) {
     $down_kbytes = $config->{'download'}->{'max_kbytes'};
+}
 if($up_kbytes > $config->{'upload'}->{'max_kbytes'}) {
+if ($up_kbytes > $config->{'upload'}->{'max_kbytes'}) {
     $up_kbytes = $config->{'upload'}->{'max_kbytes'};
+}
 if($config->{'upload'}->{'skip_upload'}) {
+if ($config->{'upload'}->{'skip_upload'}) {
     $up_kbytes = 0;
+}
 …
 <?php
 if(file_exists("header.html")) {
+if (file_exists("header.html")) {
     ## Include "header.html" for a custom header, if the file exists
     include("header.html");
 …
 <?php
 if( ($config_auto_size) && (! isset($_GET['auto_size'])) ) {
+if ( ($config_auto_size) && (! isset($_GET['auto_size'])) ) {
     ## auto_size is performing the initial, small test
     print "<div>Calculating appropriate file sizes for testing</div>\n";
 …
 </div>
 <?php if(file_exists("footer.html")) { include("footer.html"); } ?>
+<?php if (file_exists("footer.html")) { include("footer.html"); } ?>
 <?php /* Begin JavaScript functions that we'll need */ ?>
 …
 function StartUpload() {
     uploadDiv = document.getElementById('upload_message');
     if(uploadDiv) {
+    if (uploadDiv) {
         uploadDiv.style.visibility='visible';
         uploadDiv.style.display='block';
         <?php if($pretty_version) { ?>
+        <?php if ($pretty_version) { ?>
         setInterval("IncrementUploadBar()",200);
         <?php } ?>
 …
 function IncrementDownloadBar() {
     download_barElement = document.getElementById('download_bar');
     if(download_barElement) {
+    if (download_barElement) {
         download_bar_current_width += <?php echo $download_progress_bar_increment; ?>;
         if(download_bar_current_width <= <?php echo $progress_bar_width; ?>) {
+        if (download_bar_current_width <= <?php echo $progress_bar_width; ?>) {
             download_barElement.style.width = download_bar_current_width +"px";
+        }
 …
 function IncrementUploadBar() {
     upload_barElement = document.getElementById('upload_bar');
     if(upload_barElement) {
+    if (upload_barElement) {
         upload_bar_current_width += <?php echo $upload_progress_bar_increment; ?>;
         if(upload_bar_current_width < <?php echo $progress_bar_width; ?>) {
+        if (upload_bar_current_width < <?php echo $progress_bar_width; ?>) {
             upload_barElement.style.width = upload_bar_current_width +"px";
+        }
 …
 function CompleteDownloadBar() {
     download_barElement = document.getElementById('download_bar');
     if(download_barElement) {
+    if (download_barElement) {
         download_barElement.style.width = "100%";
+    }
 …
 <?php
 if($pretty_version) {
+if ($pretty_version) {
 print "
 //-->
 …
     $extra_down_kbytes = $down_kbytes - $up_kbytes;
     $total_kbytes = 0;
     while($total_kbytes <= $extra_down_kbytes) {
         if($pretty_version) {
+    while ($total_kbytes <= $extra_down_kbytes) {
+        if ($pretty_version) {
         print "
 <script language=\"javascript\">
 …
         $total_kbytes += $each_chunk;
+    }
     if(!$pretty_version) {
+    if (!$pretty_version) {
         print "dataElement.value=\"$data\";";
         print "CompleteDownloadBar();\n";
 …
     ## Now, download the remaining bytes ($up_kbytes)  and save it into a
     ## form variable that we will post back to test the upload speed
     while($total_kbytes <= $down_kbytes) {
         if($pretty_version) {
+    while ($total_kbytes <= $down_kbytes) {
+        if ($pretty_version) {
         print "
 <script language=\"javascript\">
 …
+    }
     if(!$pretty_version) {
+    if (!$pretty_version) {
         #print "\";";
     } else {
 …
       downloadtime = (endtime - starttime)/1000;
+  }
     <?php if(! $config->{'upload'}->{'skip_upload'}){ ?> StartUpload(); <?php } ?>
+    <?php if (! $config->{'upload'}->{'skip_upload'}){ ?> StartUpload(); <?php } ?>
   down_size = <?php echo $total_kbytes; ?>;
 …
 <?php
 if($config_auto_size && (! isset($_GET['auto_size'])) ) {
+if ($config_auto_size && (! isset($_GET['auto_size'])) ) {
     $params_auto_size = "&auto_size=1";
 } else {
     $params_auto_size = "";
+}
 if($config->{'upload'}->{'skip_upload'} && (! $params_auto_size)) {
+if ($config->{'upload'}->{'skip_upload'} && (! $params_auto_size)) {
     $next_url = $config->{'general'}->{'base_url'}."results.php";
 } else {

trunk/Modules/SpeedTest/results.php

-              r786
+              r873
 ## Save the results of this speedtest to the database, if enabled
 if($config->{'database'}->{'enable'}) {
+if ($config->{'database'}->{'enable'}) {
     $ip_matches = $config->{'database'}->{'ip_matches'};
     if( (! $ip_matches) || ($ip_matches && preg_match("/$ip_matches/",$_SERVER['REMOTE_ADDR'])) ) {
+    if ( (! $ip_matches) || ($ip_matches && preg_match("/$ip_matches/",$_SERVER['REMOTE_ADDR'])) ) {
         Debug("Saving to database");
         $dbh = mysql_connect(
 …
 <?php
 if(file_exists("header.html")) {
+if (file_exists("header.html")) {
     ## Include "header.html" for a custom header, if the file exists
     include("header.html");
 …
     print "<h2>Download Speed: $clean_down</h2>\n";
     ## Find the biggest value
     foreach($config->{'comparisons-download'} as $key=>$value) {
         if($value > $download_biggest) {
+    foreach ($config->{'comparisons-download'} as $key=>$value) {
+        if ($value > $download_biggest) {
             $download_biggest = $value;
+        }
 …
     ## Print a pretty table with a graph of the results
     print "<center><table>\n";
     foreach($config->{'comparisons-download'} as $key=>$value) {
+    foreach ($config->{'comparisons-download'} as $key=>$value) {
         $this_bar_width = $bar_width / $download_biggest * $value;
         print "<tr><td>$key</td><td>".CleanSpeed($value)."</td><td width=\"400\">\n";
 …
     ## Don't display the upload stuff if we didn't get a speed to compare with
     if(isset($_GET['upspeed'])) {
+    if (isset($_GET['upspeed'])) {
         $clean_up = CleanSpeed($_GET['upspeed']);
         $upload_biggest = $_GET['upspeed'];
         print "<h2>Upload Speed: $clean_up</h2>\n";
         foreach($config->{'comparisons-upload'} as $key=>$value) {
             if($value > $upload_biggest) {
+        foreach ($config->{'comparisons-upload'} as $key=>$value) {
+            if ($value > $upload_biggest) {
                 $upload_biggest = $value;
+            }
+        }
         print "<table>\n";
         foreach($config->{'comparisons-upload'} as $key=>$value) {
+        foreach ($config->{'comparisons-upload'} as $key=>$value) {
             $this_bar_width = $bar_width / $upload_biggest * $value;
             print "<tr><td>$key</td><td>".CleanSpeed($value)."</td>\n";
 …
 </div>
 <?php if(file_exists("footer.html")) { include("footer.html"); } ?>
+<?php if (file_exists("footer.html")) { include("footer.html"); } ?>
 </body>
 …
 ## Convert the raw speed value to a nicer value
 function CleanSpeed($kbps) {
     if($kbps > 1024)   {
+    if ($kbps > 1024)   {
         $cleanspeed = round($kbps / 1024,2) . " Mbps";
     } else {

trunk/Modules/Stock/Stock.php

r807	r873
248	248	function BeforeInsertStockMove($Form)
249	249	{
250		if(array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
	250	if (array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
251	251	else $Year = date("Y", $Form->Values['ValidFrom']);
252	252	$Group = $this->System->Modules['Finance']->GetFinanceGroupById($Form->Values['Group'], 'StockMoveGroup');
253	253	$Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
254		return($Form->Values);
	254	return ($Form->Values);
255	255	}
256	256	}

trunk/Modules/Subject/Subject.php

r761	r873
184	184	$DbRow = $DbResult->fetch_row();
185	185	$Output = 'Subjektů: '.$DbRow['0'].'<br/>';
186		return($Output);
	186	return ($Output);
187	187	}
188	188	}

trunk/Modules/System/System.php

-              r825
+              r873
     $DbResult = $this->Database->query($Query);
     while($Module = $DbResult->fetch_assoc())
+    {
       if($Module['Dependencies'] != '') $Dependencies = $Module['Dependencies'];
+    while ($Module = $DbResult->fetch_assoc())
+    {
+      if ($Module['Dependencies'] != '') $Dependencies = $Module['Dependencies'];
       else $Dependencies = '&nbsp;';
       if($Module['Installed'] == 1) $Installed = 'Ano';
+      if ($Module['Installed'] == 1) $Installed = 'Ano';
       else $Installed = 'Ne';
       if($Module['Installed'] == 1) $Actions = '<a href="?A=Uninstall&amp;Id='.$Module['Id'].'">Odinstalovat</a>';
+      if ($Module['Installed'] == 1) $Actions = '<a href="?A=Uninstall&amp;Id='.$Module['Id'].'">Odinstalovat</a>';
       else $Actions = '<a href="?A=Install&amp;Id='.$Module['Id'].'">Instalovat</a>';
       $Output .= '<tr><td>'.$Module['Name'].'</td>'.
 …
     $Output .= $PageList['Output'];
     $Output .= '<p><a href="?A=SaveToDb">Uložit do databáze</a></p>';
     return($Output);
+    return ($Output);
+  }
 …
+  {
     $Output = '';
     if(array_key_exists('A', $_GET))
+    {
       if($_GET['A'] == 'SaveToDb')
+    if (array_key_exists('A', $_GET))
+    {
+      if ($_GET['A'] == 'SaveToDb')
+      {
         $Output .= $this->System->ModuleManager->Modules['System']->SaveToDatabase();
         $Output .= $this->SystemMessage('Načtení modulů', 'Seznam modulů v databázi zaktualizován');
       } else
       if($_GET['A'] == 'Install')
+      if ($_GET['A'] == 'Install')
+      {
         $this->System->ModuleManager->LoadModules(false);
         $ModuleName = $this->System->ModuleManager->SearchModuleById($_GET['Id']);
         if($ModuleName != '')
+        if ($ModuleName != '')
+        {
           $this->System->Modules[$ModuleName]->Install();
 …
       } else
       if($_GET['A'] == 'Uninstall')
+      if ($_GET['A'] == 'Uninstall')
+      {
         $ModuleName = $this->System->ModuleManager->SearchModuleById($_GET['Id']);
         if($ModuleName != '')
+        if ($ModuleName != '')
+        {
           $this->System->ModuleManager->Modules[$ModuleName]->UnInstall();
 …
+    }
     $Output .= $this->ShowList();
     return($Output);
+    return ($Output);
+  }
+}
 …
   function IsInstalled()
+  {
     if($this->InstalledChecked == false)
+    if ($this->InstalledChecked == false)
+    {
       $DbResult = $this->Database->query('SELECT table_name FROM information_schema.tables
 WHERE table_schema = "'.$this->Database->Database.'" AND table_name = "SystemVersion";');
       if($DbResult->num_rows > 0) $this->Installed = true;
+      if ($DbResult->num_rows > 0) $this->Installed = true;
         else $this->Installed = false;
       $this->InstalledChecked = true;
+    }
     return($this->Installed);
+    return ($this->Installed);
+  }
   function ModuleChange($Module)
+  {
     //if($this->IsInstalled())
+    {
       if($Module->IsInstalled()) $Installed = 1;
+    //if ($this->IsInstalled())
+    {
+      if ($Module->IsInstalled()) $Installed = 1;
         else $Installed = 0;
       $this->Database->query('UPDATE `Module` SET `Installed`=1 WHERE `Name`="'.$Module->Name.'"');
 …
     $Query = 'SELECT `Id`, `Name`,`Installed` FROM `Module`';
     $DbResult = $this->Database->query($Query);
     while($Module = $DbResult->fetch_array())
+    while ($Module = $DbResult->fetch_array())
+    {
       //echo($Module['Name'].',');
 …
     $Modules = array();
     $DbResult = $this->Database->query('SELECT * FROM `Module`');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
       $Modules[$DbRow['Name']] = $DbRow;
       if($this->System->ModuleManager->ModulePresent($DbRow['Name']))
+      if ($this->System->ModuleManager->ModulePresent($DbRow['Name']))
         $this->System->ModuleManager->Modules[$DbRow['Name']]->Id = $DbRow['Id'];
+    }
     // Add missing
     foreach($this->System->ModuleManager->Modules as $Module)
+    {
       if(!array_key_exists($Module->Name, $Modules))
+    foreach ($this->System->ModuleManager->Modules as $Module)
+    {
+      if (!array_key_exists($Module->Name, $Modules))
+      {
         $this->Database->insert('Module', array('Name' => $Module->Name,
 …
     // Remove exceeding
     foreach($Modules as $Module)
     if(!$this->System->ModuleManager->ModulePresent($Module['Name']))
+    foreach ($Modules as $Module)
+    if (!$this->System->ModuleManager->ModulePresent($Module['Name']))
+    {
       $Output .= 'Removing module '.$Module['Name'].' from list</br/>';
 …
       $this->Database->query('DELETE FROM `ModuleLink` WHERE `LinkedModule` = '.$Module['Id']);
       $DbResult = $this->Database->query('SELECT Id FROM `PermissionOperation` WHERE `Module` = '.$Module['Id']);
       while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
+      {
         $this->Database->query('DELETE FROM `PermissionGroupAssignment` WHERE `AssignedOperation` = '.$DbRow['Id']);
 …
       $this->Database->query('DELETE FROM `Model` WHERE `Module` = '.$Module['Id']);
       $DbResult = $this->Database->query('SELECT Id FROM `Model` WHERE `Module` = '.$Module['Id']);
       while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
         $this->Database->query('DELETE FROM `ModelField` WHERE `Model` = '.$DbRow['Id']);
       $this->Database->query('DELETE FROM `Module` WHERE `Id` = '.$Module['Id']);
 …
     $DbDependency = array();
     $DbResult = $this->Database->query('SELECT * FROM `ModuleLink`');
     while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
       $DbDependency[$DbRow['Module']][] = $DbRow['LinkedModule'];
     foreach($this->System->ModuleManager->Modules as $Module)
+    foreach ($this->System->ModuleManager->Modules as $Module)
+    {
       // Add missing
       foreach($Module->Dependencies as $Dependency)
+      {
         if(!array_key_exists($Module->Id, $DbDependency) or
+      foreach ($Module->Dependencies as $Dependency)
+      {
+        if (!array_key_exists($Module->Id, $DbDependency) or
         !in_array($this->System->ModuleManager->Modules[$Dependency]->Id, $DbDependency[$Module->Id]))
+        {
           if(array_key_exists($Dependency, $this->System->ModuleManager->Modules))
+          if (array_key_exists($Dependency, $this->System->ModuleManager->Modules))
             $DependencyId = $this->System->ModuleManager->Modules[$Dependency]->Id;
             else throw new Exception('Dependent module '.$Dependency.' not found');
 …
       // Remove exceeding
       if(array_key_exists($Module->Id, $DbDependency))
       foreach($DbDependency[$Module->Id] as $Dep)
+      if (array_key_exists($Module->Id, $DbDependency))
+      foreach ($DbDependency[$Module->Id] as $Dep)
+      {
         $DepModName = $this->System->ModuleManager->SearchModuleById($Dep);
         if(!in_array($DepModName, $Module->Dependencies))
+        if (!in_array($DepModName, $Module->Dependencies))
         $this->Database->query('DELETE FROM `ModuleLink` WHERE `Module` = '.
           $Module->Id.' AND LinkedModule='.$Dep);
+      }
+    }
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/TV/TV.php

-              r825
+              r873
   function Show()
+  {
     if(count($this->System->PathItems) > 1)
+    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());
+  }
 …
     $DbResult = $this->Database->query($Query);
     while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
+    {
       if($Line['Stream'] <> '') $Line['Show'] = '<a href="playlist.m3u?id='.$Line['ShortName'].'">Naladit</a>';
+      if ($Line['Stream'] <> '') $Line['Show'] = '<a href="playlist.m3u?id='.$Line['ShortName'].'">Naladit</a>';
       else
       if($Line['StreamWeb'] <> '') $Line['Show'] = '<a href="'.$Line['StreamWeb'].'">Naladit</a>';
+      if ($Line['StreamWeb'] <> '') $Line['Show'] = '<a href="'.$Line['StreamWeb'].'">Naladit</a>';
         else $Line['Show'] = '&nbsp;';
 …
     $Output .= 'Další online TV na webu: <a href="http://www.tvinfo.cz/live/televize/evropa/cz">TV info</a><br/>';
     return($Output);
+    return ($Output);
+  }
 …
     echo('#EXTM3U'."\n");
     if(array_key_exists('id', $_GET))
+    if (array_key_exists('id', $_GET))
+    {
       $DbResult = $this->Database->select('TV', '*', ' (`Stream` <> "") AND (`ShortName`="'.addslashes($_GET['id']).'") ');
       if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
+      {
         $Channel = $DbResult->fetch_array();
 …
+    {
       $DbResult = $this->Database->select('TV', '*', ' (`Stream` <> "") ORDER BY `Name` ');
       while($Channel = $DbResult->fetch_array())
+      while ($Channel = $DbResult->fetch_array())
+      {
         echo('#EXTINF:0,'.$Channel['Name']."\n");

trunk/Modules/TV/tkr.php

r738	r873
12	12	'<tr><th>Číslo</th<th>Jméno stanice</th><th>Frekvence [MHz]</th><th>Jazyk</th></tr>';
13	13	$DbResult = $this->Database->select('TV', '*', ' 1 ORDER BY Id');
14		while($Row = $DbResult->fetch_array())
	14	while ($Row = $DbResult->fetch_array())
15	15	{
16	16	$Output .= '<tr><td>'.$Row['Id'].'</td><td><a href="'.$Row['Homepage'].'">'.$Row['Name'].'</a></td><td align="right">'.($Row['Frequency'] / 1000).'</td><td>'.$Row['Language'].'</td></tr>';
17	17	}
18	18	$Output .= '</table>Aktualizováno dne 17.12.2007<br></div>';
19		return($Output);
	19	return ($Output);
20	20	}
21	21	}

trunk/Modules/TimeMeasure/Graph.php

-              r738
+              r873
+  {
     $this->ClearPage = true;
     return($this->Render());
+    return ($this->Render());
+  }
 …
     $PrefixMultiplier = new PrefixMultiplier();
     if(array_key_exists('Debug', $_GET)) $Debug = $_GET['Debug'];
+    if (array_key_exists('Debug', $_GET)) $Debug = $_GET['Debug'];
       else $Debug = 0;
     if(!array_key_exists('From', $_GET)) die('Musíte zadat čas počátku');
+    if (!array_key_exists('From', $_GET)) die('Musíte zadat čas počátku');
     $StartTime = addslashes($_GET['From']);
     if(!array_key_exists('To', $_GET)) die('Musíte zadat čas konce');
+    if (!array_key_exists('To', $_GET)) die('Musíte zadat čas konce');
     $EndTime = addslashes($_GET['To']);
     if($EndTime < $StartTime) $EndTime = $StartTime + 60;
+    if ($EndTime < $StartTime) $EndTime = $StartTime + 60;
     $TimeDifference = $EndTime - $StartTime;
     if(!array_key_exists('Measure', $_GET)) die('Musíte zadat měřenou veličinu');
+    if (!array_key_exists('Measure', $_GET)) die('Musíte zadat měřenou veličinu');
     $MeasureId = addslashes($_GET['Measure']);
     if(!array_key_exists('Width', $_GET)) $Width = $this->DefaultWidth;
+    if (!array_key_exists('Width', $_GET)) $Width = $this->DefaultWidth;
       else $Width = addslashes($_GET['Width']);
     if(!array_key_exists('Height', $_GET)) $Height = $this->DefaultHeight;
+    if (!array_key_exists('Height', $_GET)) $Height = $this->DefaultHeight;
       else $Height = addslashes($_GET['Height']);
     if(!array_key_exists('Differential', $_GET)) $Differential = $this->Config['Application']['DefaultVariables']['Differential'];
+    if (!array_key_exists('Differential', $_GET)) $Differential = $this->Config['Application']['DefaultVariables']['Differential'];
       else $Differential = addslashes($_GET['Differential']);
     $VerticalLinesCount = round($Height / ($this->FontSize + 4));
 …
     $Level = floor(log(($EndTime - $StartTime) / $Measure->DivisionCount / 60) / log($Measure->LevelReducing)) - 1;
     if($Level < 0) $Level = 0;
     if($Level > $Measure->MaxLevel) $Level = $Measure->MaxLevel;
+    if ($Level < 0) $Level = 0;
+    if ($Level > $Measure->MaxLevel) $Level = $Measure->MaxLevel;
     //$Level = 0;
     $Points = $Measure->GetValues($StartTime, $EndTime, $Level);
     if($Debug) echo('Points count: '.count($Points).'<br/>');
     //if($Debug) foreach($Points as $Index => $Item)
+    if ($Debug) echo('Points count: '.count($Points).'<br/>');
+    //if ($Debug) foreach ($Points as $Index => $Item)
     // echo($Index.': '.$Item['min'].'<br>');
 …
     $AvgValue = 0;
     $MinValue = 1000000000000000000;
     foreach($Points as $Index => $Item)
+    foreach ($Points as $Index => $Item)
+    {
       //$Points[$Index]['min'] =  $Points[$Index]['min'] / $Measure['Divider'];
       //$Points[$Index]['avg'] =  $Points[$Index]['avg'] / $Measure['Divider'];
       //$Points[$Index]['max'] =  $Points[$Index]['max'] / $Measure['Divider'];
       if($Points[$Index]['Avg'] > $MaxValue) $MaxValue = $Points[$Index]['Avg'];
       if($Points[$Index]['Avg'] < $MinValue) $MinValue = $Points[$Index]['Avg'];
       if($Points[$Index]['Max'] > $MaxValue) $MaxValue = $Points[$Index]['Max'];
       if($Points[$Index]['Min'] < $MinValue) $MinValue = $Points[$Index]['Min'];
+      if ($Points[$Index]['Avg'] > $MaxValue) $MaxValue = $Points[$Index]['Avg'];
+      if ($Points[$Index]['Avg'] < $MinValue) $MinValue = $Points[$Index]['Avg'];
+      if ($Points[$Index]['Max'] > $MaxValue) $MaxValue = $Points[$Index]['Max'];
+      if ($Points[$Index]['Min'] < $MinValue) $MinValue = $Points[$Index]['Min'];
       $AvgValue = $AvgValue + $Points[$Index]['Avg'];
+    }
 …
     $PointsAvg = array(0, $Height - 1);
     $PointsMax = array(0, $Height - 1);
     if(($MaxValue - $MinValue) == 0) $MaxValue = $MinValue + 1;
+    if (($MaxValue - $MinValue) == 0) $MaxValue = $MinValue + 1;
+    {
       foreach($Points as $Index => $Item)
+      foreach ($Points as $Index => $Item)
+      {
         $PointsMin[] = $Index * $Width / $Measure->DivisionCount;
 …
     // Generate image
     if(!$Debug)
+    if (!$Debug)
+    {
       Header('Content-type: image/png');
 …
       $TimeRange = $EndTime - $StartTime;
       $TimeMarksIndex = 0;
       while(($TimeRange / $TimeMarks[$TimeMarksIndex]) > 1) $TimeMarksIndex += 1;
       if($TimeMarksIndex < 2) $TimeMarksIndex = 2;
+      while (($TimeRange / $TimeMarks[$TimeMarksIndex]) > 1) $TimeMarksIndex += 1;
+      if ($TimeMarksIndex < 2) $TimeMarksIndex = 2;
       $MajorTimeMarks = $TimeMarks[$TimeMarksIndex - 1];
       $MinorTimeMarks = $TimeMarks[$TimeMarksIndex - 2];
 …
       // Zobraz měřítko Y
       $VerticalLinesDistance = $Height / $VerticalLinesCount;
       for($I = 1; $I <= $VerticalLinesCount; $I++)
+      for ($I = 1; $I <= $VerticalLinesCount; $I++)
+      {
         $Y = $Height - 1 - ($VerticalLinesDistance * $I);
         for($X = 1; $X < $Width; $X = $X + 3) imagesetpixel($Image, $X, $Y, $Gray);
+        for ($X = 1; $X < $Width; $X = $X + 3) imagesetpixel($Image, $X, $Y, $Gray);
         //imageline($Image, 30, $Y, $Width-1, $Y, IMG_COLOR_STYLED);
+      }
 …
       // Zobraz měřítko X
       $LastTextEnd = 0;
       for($Time = $StartTime; $Time < $EndTime; $Time += $MajorTimeMarks)
+      for ($Time = $StartTime; $Time < $EndTime; $Time += $MajorTimeMarks)
+      {
         $X = round(($Time - $StartTime + $TimeShift) / $TimeRange * $Width) % $Width;
         //imageline($Image, 30, $Y, $Width-1, $Y, IMG_COLOR_STYLED);
         if(($MajorTimeMarks > 60 * 60 * 24)) $Text = date('j.n.Y', $Time + $TimeShift);
+        if (($MajorTimeMarks > 60 * 60 * 24)) $Text = date('j.n.Y', $Time + $TimeShift);
           else $Text = date('j.n.Y G:i', $Time + $TimeShift);
         $BoundBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
         if($LastTextEnd < ($X - ($BoundBox[2] - $BoundBox[0] + 20) / 2))
+        if ($LastTextEnd < ($X - ($BoundBox[2] - $BoundBox[0] + 20) / 2))
+        {
           for($Y = 0; $Y < $Height; $Y = $Y + 1) imagesetpixel($Image, $X, $Y, $Gray);
+          for ($Y = 0; $Y < $Height; $Y = $Y + 1) imagesetpixel($Image, $X, $Y, $Gray);
           imagettftext($Image, $FontSize, 0, $X - ($BoundBox[2] - $BoundBox[0]) / 2,  $Height - 2, $Black, $FontFile, $Text);
           $LastTextEnd = $X + ($BoundBox[2] - $BoundBox[0]) / 2;
+        }
         else for($Y = 0; $Y < $Height; $Y = $Y + 3) imagesetpixel($Image, $X, $Y, $Gray);
+        else for ($Y = 0; $Y < $Height; $Y = $Y + 3) imagesetpixel($Image, $X, $Y, $Gray);
+      }
       // Popisky osy Y
       for($I = 1; $I <= $VerticalLinesCount; $I++)
+      for ($I = 1; $I <= $VerticalLinesCount; $I++)
+      {
         $Y = $Height - 1 - ($VerticalLinesDistance * $I);
 …
           $this->ValueToImageHeigthCoefficient * ($MaxValue - $MinValue) + $MinValue)), $MeasureMethod['Unit'], 3);
         $BoundBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
         if(($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
+        if (($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
           imagettftext($Image, $FontSize, 0, 2,  $Y - ($BoundBox[5] - $BoundBox[1]) / 2, $Black, $FontFile, $Text);
+      }

trunk/Modules/TimeMeasure/Main.php

-              r825
+              r873
     // Day selection
     $Output .= '<select name="Day">';
     for($I = 1; $I < 32; $I++)
+    {
       if($I == $TimeParts['mday']) $Selected = ' selected="1"'; else $Selected = '';
+    for ($I = 1; $I < 32; $I++)
+    {
+      if ($I == $TimeParts['mday']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
+    }
 …
     // Month selection
     $Output .= '<select name="Month">';
     foreach($MonthNames as $Index => $Month)
+    {
       if($Index == $TimeParts['mon']) $Selected = ' selected="1"'; else $Selected = '';
       if($Index > 0) $Output .= '<option value="'.$Index.'"'.$Selected.'>'.$Month.'</option>';
+    foreach ($MonthNames as $Index => $Month)
+    {
+      if ($Index == $TimeParts['mon']) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Index > 0) $Output .= '<option value="'.$Index.'"'.$Selected.'>'.$Month.'</option>';
+    }
     $Output .= '</select>. ';
 …
     // Day selection
     $Output .= '<select name="Year">';
     for($I = 2000; $I < 2010; $I++)
+    {
       if($I == $TimeParts['year']) $Selected = ' selected="1"'; else $Selected = '';
+    for ($I = 2000; $I < 2010; $I++)
+    {
+      if ($I == $TimeParts['year']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
+    }
 …
     // Hour selection
     $Output .= '<select name="Hour">';
     for($I = 0; $I < 24; $I++)
+    {
       if($I == $TimeParts['hours']) $Selected = ' selected="1"'; else $Selected = '';
+    for ($I = 0; $I < 24; $I++)
+    {
+      if ($I == $TimeParts['hours']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
+    }
 …
     // Minute selection
     $Output .= '<select name="Minute">';
     for($I = 0; $I < 60; $I++)
+    {
       if($I == $TimeParts['minutes']) $Selected = ' selected="1"'; else $Selected = '';
+    for ($I = 0; $I < 60; $I++)
+    {
+      if ($I == $TimeParts['minutes']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
+    }
 …
     $Output .= '</form>';
     return($Output);
+    return ($Output);
+  }
 …
     $Debug = 0;
     foreach($this->DefaultVariables as $Index => $Variable)
+    {
       if(!array_key_exists($Index, $_SESSION)) $_SESSION[$Index] = $Variable;
       if(array_key_exists($Index, $_GET)) $_SESSION[$Index] = $_GET[$Index];
       if(array_key_exists($Index, $_POST)) $_SESSION[$Index] = $_POST[$Index];
+    foreach ($this->DefaultVariables as $Index => $Variable)
+    {
+      if (!array_key_exists($Index, $_SESSION)) $_SESSION[$Index] = $Variable;
+      if (array_key_exists($Index, $_GET)) $_SESSION[$Index] = $_GET[$Index];
+      if (array_key_exists($Index, $_POST)) $_SESSION[$Index] = $_POST[$Index];
       //$$Index = $_SESSION[$Index];
+    }
     if($_SESSION['TimeSpecify'] == 0)
+    if ($_SESSION['TimeSpecify'] == 0)
+    {
       $_SESSION['TimeEnd'] = time() - 60;
 …
     $Output = '<div style="text-align: center;">';
     if(!array_key_exists('Operation', $_GET)) $_GET['Operation'] = '';
     switch($_GET['Operation'])
+    if (!array_key_exists('Operation', $_GET)) $_GET['Operation'] = '';
+    switch ($_GET['Operation'])
+    {
       case 'SetTime':
         if(array_key_exists('Time', $_GET) and array_key_exists('Month', $_POST) and array_key_exists('Day', $_POST) and
+        if (array_key_exists('Time', $_GET) and array_key_exists('Month', $_POST) and array_key_exists('Day', $_POST) and
           array_key_exists('Year', $_POST) and array_key_exists('Hour', $_POST) and array_key_exists('Minute', $_POST))
+        {
           if(($_GET['Time'] == 'TimeStart') or ($_GET['Time'] == 'TimeEnd'))
+          if (($_GET['Time'] == 'TimeStart') or ($_GET['Time'] == 'TimeEnd'))
+          {
             $_SESSION[$_GET['Time']] = mktime($_POST['Hour'], $_POST['Minute'], 0, $_POST['Month'],
 …
         break;
       case 'SetTimeNow':
         if(array_key_exists('Time', $_GET))
+        if (array_key_exists('Time', $_GET))
+        {
           if(($_GET['Time'] == 'TimeStart') or ($_GET['Time'] == 'TimeEnd'))
+          if (($_GET['Time'] == 'TimeStart') or ($_GET['Time'] == 'TimeEnd'))
+          {
             $_SESSION[$_GET['Time']] = time();
 …
     $Output .= '<strong>Časový úsek:</strong><br>';
     // Show graf time range menu
     if($_SESSION['TimeSpecify'] == 0)
+    if ($_SESSION['TimeSpecify'] == 0)
+    {
       $Output .= 'Délka úseku: ';
       foreach($this->GraphTimeRanges as $Index => $Item)
+      foreach ($this->GraphTimeRanges as $Index => $Item)
         $Output .= '<a href="?Period='.$Index.'">'.$Item['caption'].'</a>&nbsp;';
       $Output .= '<br/>';
 …
     $Output .= '<br/>'.$this->MeasureTable();
     return($Output);
+    return ($Output);
+  }
 …
     $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);
+  }
 …
       array('Name' => 'Description', 'Title' => 'Popis'),
     );
     if(array_key_exists('Debug', $_GET))
+    if (array_key_exists('Debug', $_GET))
+    {
       $TableColumns[] = array('Name' => 'ItemCount', 'Title' => 'Počet položek');
 …
     $Result = $this->Database->select('Measure', '*', '`Enabled`=1 '.$Order['SQL'].$PageList['SQLLimit']);
     while($Measure = $Result->fetch_array())
+    while ($Measure = $Result->fetch_array())
+    {
       $DbResult2 = $this->Database->select('MeasureMethod', '*', '`Id`='.$Measure['Method']);
       $MeasureMethod = $DbResult2->fetch_assoc();
       $StopWatchStart = GetMicrotime();
       if(array_key_exists('Debug', $_GET))
+      if (array_key_exists('Debug', $_GET))
+      {
         $DbResult = $this->Database->select($Measure['DataTable'], 'COUNT(*)', 'Measure='.$Measure['Id']);
 …
+      }
       $Result2 = $this->Database->select($Measure['DataTable'], 'Time, Avg', 'Measure='.$Measure['Id'].' AND Level=0 ORDER BY Time DESC LIMIT 1');
       if($Result2->num_rows > 0)
+      if ($Result2->num_rows > 0)
+      {
         $Row = $Result2->fetch_array();
 …
         $LastMeasureValue = '&nbsp;';
+      }
       if($Measure['Continuity'] == 1) $Interpolate = 'Ano';
+      if ($Measure['Continuity'] == 1) $Interpolate = 'Ano';
         else $Interpolate = 'Ne';
       //if($Measure['Description'] == '') $Measure['Description'] = '&nbsp;';
+      //if ($Measure['Description'] == '') $Measure['Description'] = '&nbsp;';
       $GenerationTime = floor((GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
       $Output .= '<tr><td><a href="?Measure='.$Measure['Id'].'&amp;Differential=0">'.$Measure['Name'].'</a></td><td align="center">'.$LastMeasureValue.'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.$Interpolate.'</td><td>'.$Measure['Description'].'</td>';
       if(array_key_exists('Debug', $_GET)) $Output .= '<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td>';
+      if (array_key_exists('Debug', $_GET)) $Output .= '<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td>';
       $Output .= '</tr>';
+    }
 …
     //echo($PrefixMultiplier->Add('-0.000000071112345', 'B'));
     $Output .= '</div>';
     return($Output);
+    return ($Output);
+  }
+}
 …
     $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

-              r790
+              r873
+  {
     $Result = $this->Database->select('Measure', '*', 'Id='.$Id);
     if($Result->num_rows > 0)
+    if ($Result->num_rows > 0)
+    {
       $this->Data = $Result->fetch_assoc();
       if($this->Data['Continuity'] == 0) $this->Data['ContinuityEnabled'] = 0;  // non continuous
+      if ($this->Data['Continuity'] == 0) $this->Data['ContinuityEnabled'] = 0;  // non continuous
         else $this->Data['ContinuityEnabled'] = 2;    // continuous graph
     } else throw new Exception('Measure not found');
 …
   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);
+  }
   function AddValue($Value = array('Min' => 0, 'Avg' => 0, 'Max' => 0), $Level = 0, $Time = 0)
+  {
     if($Time == 0) $Time = time();
+    if ($Time == 0) $Time = time();
     $Result = $this->Database->select($this->Data['DataTable'], '*', 'Measure='.
       $this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 2');
     if($Result->num_rows == 0)
+    if ($Result->num_rows == 0)
+    {
        $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'],
          'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level,
          'Measure' => $this->Data['Id'], 'Time' => TimeToMysqlDateTime($Time), 'Continuity' => 0));
     } else if($Result->num_rows == 1)
+    } else if ($Result->num_rows == 1)
+    {
       $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'],
 …
       $LastValue = $Result->fetch_assoc();
       $NextToLastValue = $Result->fetch_assoc();
       if((($Time - MysqlDateTimeToTime($LastValue['Time'])) < 0.75 * $this->Data['Period']) and ($Level == 0))
+      if ((($Time - MysqlDateTimeToTime($LastValue['Time'])) < 0.75 * $this->Data['Period']) and ($Level == 0))
+      {
         echo('Too short period. Minimal period is '.(0.75 * $this->Data['Period'])." seconds\n");
       } else
+      {
         if(($Time - MysqlDateTimeToTime($LastValue['Time'])) < 1.25 * $this->Data['Period']) $Continuity = 1;
+        if (($Time - MysqlDateTimeToTime($LastValue['Time'])) < 1.25 * $this->Data['Period']) $Continuity = 1;
           else $Continuity = 0;
         if(($LastValue['Min'] == $NextToLastValue['Min']) and ($LastValue['Min'] ==
+        if (($LastValue['Min'] == $NextToLastValue['Min']) and ($LastValue['Min'] ==
           $Value['Min']) and ($LastValue['Avg'] == $NextToLastValue['Avg']) and
           ($LastValue['Avg'] == $Value['Avg']) and ($LastValue['Max'] == $NextToLastValue['Max'])
 …
       // Update next level
       if($Level < $this->MaxLevel)
+      if ($Level < $this->MaxLevel)
+      {
         $Level = $Level + 1;
         $TimeSegment = $this->TimeSegment($this->Data['Period'], 1);
         $EndTime = $this->AlignTime($Time, $TimeSegment);
         //if($EndTime < $Time) $EndTime = $EndTime + $TimeSegment;
+        //if ($EndTime < $Time) $EndTime = $EndTime + $TimeSegment;
         $StartTime = $EndTime - $TimeSegment;
 …
           TimeToMysqlDateTime($StartTime).'") AND (Time < "'.TimeToMysqlDateTime($EndTime).
             '") AND (Measure='.$this->Data['Id'].') AND (Level='.($Level - 1).') ORDER BY Time');
         while($Row = $Result->fetch_assoc())
+        while ($Row = $Result->fetch_assoc())
+        {
           $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
           $Values[] = $Row;
+        }
         //if(count($Values) > 2)
+        //if (count($Values) > 2)
+        {
           //array_pop($Values);
 …
+  {
     $Y = ($Y2 - $Y1) / ($X2 - $X1) * ($X - $X1) + $Y1;
     return($Y);
+    return ($Y);
+  }
 …
     // Trim outside parts
     foreach($this->ValueTypes as $ValueType)
+    foreach ($this->ValueTypes as $ValueType)
+    {
       $Values[0][$ValueType] = $this->Interpolation($Values[0]['Time'], $Values[0][$ValueType], $Values[1]['Time'], $Values[1][$ValueType], $LeftTime);
+    }
     $Values[0]['Time'] = $LeftTime;
     foreach($this->ValueTypes as $ValueType)
+    foreach ($this->ValueTypes as $ValueType)
+    {
         $Values[count($Values) - 1][$ValueType] = $this->Interpolation($Values[count($Values) - 2]['Time'], $Values[count($Values) - 2][$ValueType],
 …
     // Perform computation
     foreach($this->ValueTypes as $ValueType)
+    foreach ($this->ValueTypes as $ValueType)
+    {
       // Compute new value
       for($I = 0; $I < (count($Values) - 1); $I++)
+      {
         if($ValueType == 'Avg')
+        {
           if($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled']);
           else if($this->Differential == 0)
+      for ($I = 0; $I < (count($Values) - 1); $I++)
+      {
+        if ($ValueType == 'Avg')
+        {
+          if ($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled']);
+          else if ($this->Differential == 0)
+          {
             $NewValue[$ValueType] = $NewValue[$ValueType] + ($Values[$I + 1]['Time'] - $Values[$I]['Time']) *
 …
+          }
+        }
         else if($ValueType == 'Max')
+        {
           if($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled'])
+          {
             if(0 > $NewValue[$ValueType]) $NewValue[$ValueType] = 0;
+        else if ($ValueType == 'Max')
+        {
+          if ($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled'])
+          {
+            if (0 > $NewValue[$ValueType]) $NewValue[$ValueType] = 0;
           } else
+          {
             if($this->Differential == 0)
+            if ($this->Differential == 0)
+            {
               if($Values[$I + 1][$ValueType] > $NewValue[$ValueType]) $NewValue[$ValueType] = $Values[$I + 1][$ValueType];
+              if ($Values[$I + 1][$ValueType] > $NewValue[$ValueType]) $NewValue[$ValueType] = $Values[$I + 1][$ValueType];
             } else {
               $Difference = $Values[$I + 1][$ValueType] - $Values[$I][$ValueType];
               if($Difference > $NewValue[$ValueType]) $NewValue[$ValueType] = $Difference;
+              if ($Difference > $NewValue[$ValueType]) $NewValue[$ValueType] = $Difference;
+            }
+          }
+        }
         else if($ValueType == 'Min')
+        {
           if($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled'])
+          {
             if(0 < $NewValue[$ValueType]) $NewValue[$ValueType] = 0;
+        else if ($ValueType == 'Min')
+        {
+          if ($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled'])
+          {
+            if (0 < $NewValue[$ValueType]) $NewValue[$ValueType] = 0;
           } else
+          {
             if($this->Differential == 0)
+            if ($this->Differential == 0)
+            {
               if($Values[$I + 1][$ValueType] < $NewValue[$ValueType]) $NewValue[$ValueType] = $Values[$I + 1][$ValueType];
+              if ($Values[$I + 1][$ValueType] < $NewValue[$ValueType]) $NewValue[$ValueType] = $Values[$I + 1][$ValueType];
             } else {
               $Difference = $Values[$I + 1][$ValueType] - $Values[$I][$ValueType];
               if($Difference < $NewValue[$ValueType]) $NewValue[$ValueType] = $Difference;
+              if ($Difference < $NewValue[$ValueType]) $NewValue[$ValueType] = $Difference;
+            }
+          }
 …
       $NewValue[$ValueType] = $NewValue[$ValueType];
+    }
     //if(($RightTime - $LeftTime) > 0)
     if($this->Data['Cumulative'] == 0)
+    //if (($RightTime - $LeftTime) > 0)
+    if ($this->Data['Cumulative'] == 0)
+    {
       $NewValue['Avg'] = $NewValue['Avg'] / ($RightTime - $LeftTime);
+    }
     return($NewValue);
+    return ($NewValue);
+  }
 …
     // Get first and last time
     $Result = $this->Database->select($this->Data['DataTable'], '*', 'Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time LIMIT 1');
     if($Result->num_rows > 0)
+    if ($Result->num_rows > 0)
+    {
       $Row = $Result->fetch_assoc();
 …
     $Result = $this->Database->select($this->Data['DataTable'], '*', 'Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 1');
     if($Result->num_rows > 0)
+    if ($Result->num_rows > 0)
+    {
       $Row = $Result->fetch_assoc();
 …
     } else $AbsoluteRightTime = 0;
     if($this->Debug)
+    if ($this->Debug)
+    {
       echo('AbsoluteLeftTime: '.$AbsoluteLeftTime.'('.TimeToMysqlDateTime($AbsoluteLeftTime).')<br>');
       echo('AbsoluteRightTime: '.$AbsoluteRightTime.'('.TimeToMysqlDateTime($AbsoluteRightTime).')<br>');
+    }
     return(array('Left' => $AbsoluteLeftTime, 'Right' => $AbsoluteRightTime));
+    return (array('Left' => $AbsoluteLeftTime, 'Right' => $AbsoluteRightTime));
+  }
 …
     $Result = array();
     $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time ASC LIMIT 1');
     if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
+    {
       $Row = $DbResult->fetch_assoc();
       $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
       return(array($Row));
+      return (array($Row));
     } else
+    {
 …
       $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time < "'.
         TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 1');
       if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
+      {
         $Row = $DbResult->fetch_assoc();
         array_unshift($Result, array('Time' => (MysqlDateTimeToTime($Row['Time']) + 10), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
+      }
      // if($Debug) print_r($Result);
       return($Result);
+     // if ($Debug) print_r($Result);
+      return ($Result);
+    }
+  }
 …
     $DbResult = $this->Database->select($this->Data['DataTable'], '*', '(Time < "'.
       TimeToMysqlDateTime($Time).'") AND (Measure='.$this->Data['Id'].') AND (Level='.$Level.') ORDER BY Time DESC LIMIT 1');
     if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
+    {
       $Row = $DbResult->fetch_assoc();
       $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
       return(array($Row));
+      return (array($Row));
     } else
+    {
       //$Time = $Values[0]['Time'] - 60;
       //array_unshift($Values, array('Time' => $Time, 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
       if($this->Debug) echo($this->TimeSegment($this->Data['Period'], $Level));
+      if ($this->Debug) echo($this->TimeSegment($this->Data['Period'], $Level));
       $Result[] = array('Time' => ($Time - $this->TimeSegment($this->Data['Period'], $Level)), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0);
       $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time ASC LIMIT 1');
       if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
+      {
         $Row = $DbResult->fetch_assoc();
         array_push($Result, array('Time' => (MysqlDateTimeToTime($Row['Time']) - 10), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
+      }
       return($Result);
+      return ($Result);
+    }
+  }
 …
   function GetValues($TimeFrom, $TimeTo, $Level)
+  {
     if($this->Debug) echo('TimeFrom: '.$TimeFrom.'('.TimeToMysqlDateTime($TimeFrom).')<br>');
     if($this->Debug) echo('TimeTo: '.$TimeTo.'('.TimeToMysqlDateTime($TimeTo).')<br>');
+    if ($this->Debug) echo('TimeFrom: '.$TimeFrom.'('.TimeToMysqlDateTime($TimeFrom).')<br>');
+    if ($this->Debug) echo('TimeTo: '.$TimeTo.'('.TimeToMysqlDateTime($TimeTo).')<br>');
     //$AbsoluteTime = GetTimeRange($MeasureId);
     //  if(($TimeFrom > $AbsoluteLeftTime) and ($TimeStart < $AbsoluteRightTime) and
+    //  if (($TimeFrom > $AbsoluteLeftTime) and ($TimeStart < $AbsoluteRightTime) and
     //    ($TimeTo > $AbsoluteLeftTime) and ($TimeTo < $AbsoluteRightTime))
     //  {
 …
     //  echo(DB_NumRows());
     //  $III = 0;
     while($Row = $Result->fetch_assoc())
+    while ($Row = $Result->fetch_assoc())
+    {
       //    echo($III.' '.$Row['Time'].' '.memory_get_usage().',');
 …
     //  echo('abc');
     //  die();
     if($this->Debug) echo('Item count: '.count($Values));
+    if ($this->Debug) echo('Item count: '.count($Values));
     $Points = array();
     if(count($Values) > 0)
+    if (count($Values) > 0)
+    {
       $Values = array_merge($this->LoadLeftSideValue($Level, $TimeFrom), $Values, $this->LoadRightSideValue($Level, $TimeTo));
       $StartIndex = 0;
       $Points = array();
       if($this->Debug) print_r($Values);
       for($I = 0; $I < $this->DivisionCount; $I++)
+      if ($this->Debug) print_r($Values);
+      for ($I = 0; $I < $this->DivisionCount; $I++)
+      {
         $TimeStart = $TimeFrom + (($TimeTo - $TimeFrom) / $this->DivisionCount) * $I;
         $TimeEnd = $TimeFrom + (($TimeTo - $TimeFrom) / $this->DivisionCount) * ($I + 1);
         if($this->Debug) echo('TimeEnd '.$I.': '.$TimeEnd.'('.TimeToMysqlDateTime($TimeEnd).')<br>');
+        if ($this->Debug) echo('TimeEnd '.$I.': '.$TimeEnd.'('.TimeToMysqlDateTime($TimeEnd).')<br>');
         $EndIndex = $StartIndex;
         while(($Values[$EndIndex]['Time'] < $TimeEnd) and ($EndIndex < count($Values))) $EndIndex = $EndIndex + 1;
         //while(($Values[$EndIndex]['Time'] < $TimeEnd)) $EndIndex = $EndIndex + 1;
+        while (($Values[$EndIndex]['Time'] < $TimeEnd) and ($EndIndex < count($Values))) $EndIndex = $EndIndex + 1;
+        //while (($Values[$EndIndex]['Time'] < $TimeEnd)) $EndIndex = $EndIndex + 1;
         $SubValues = array_slice($Values, $StartIndex, $EndIndex - $StartIndex + 1);
         $Points[] = $this->ComputeOneValue($TimeStart, $TimeEnd, $SubValues, $Level);
         $StartIndex = $EndIndex - 1;
+      }
       if($this->Debug) print_r($Points);
+      if ($this->Debug) print_r($Points);
     } else $Points[] = array('Min' => 0, 'Avg' => 0, 'Max' => 0);
     return($Points);
+    return ($Points);
+  }
 …
+  {
     echo('Veličina '.$this->Data['Name']."<br>\n");
     if($this->Data['Continuity'] == 0) $this->Data['ContinuityEnabled'] = 0;  // non continuous
+    if ($this->Data['Continuity'] == 0) $this->Data['ContinuityEnabled'] = 0;  // non continuous
       else $this->Data['ContinuityEnabled'] = 2;    // continuous graph
 …
     echo("<br>\n");
     for($Level = 1; $Level <= $this->MaxLevel; $Level++)
+    for ($Level = 1; $Level <= $this->MaxLevel; $Level++)
+    {
       echo('Uroven '.$Level."<br>\n");
 …
       $BurstCount = 500;
       echo('For 0 to '.round(($EndTime - $StartTime) / $TimeSegment / $BurstCount)."<br>\n");
       for($I = 0; $I <= round(($EndTime - $StartTime) / $TimeSegment / $BurstCount); $I++)
+      for ($I = 0; $I <= round(($EndTime - $StartTime) / $TimeSegment / $BurstCount); $I++)
+      {
         echo($I.' ');
 …
         $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.
           TimeToMysqlDateTime($StartTime2).'" AND Time < "'.TimeToMysqlDateTime($EndTime2).'" AND Measure='.$this->Data['Id'].' AND Level='.($Level - 1).' ORDER BY Time');
         while($Row = $DbResult->fetch_assoc())
+        while ($Row = $DbResult->fetch_assoc())
+        {
           $Row['Time'] = MysqlDateTimeToTime($Row['Time']);
 …
+        }
         if(count($Values) > 0)
+        if (count($Values) > 0)
+        {
           $Values = array_merge($this->LoadLeftSideValue($Level - 1, $StartTime2),
 …
           $StartIndex = 0;
           for($B = 0; $B < $BurstCount; $B++)
+          for ($B = 0; $B < $BurstCount; $B++)
+          {
             echo('.');
 …
             $EndIndex = $StartIndex;
             while($Values[$EndIndex]['Time'] < $EndTime3) $EndIndex = $EndIndex + 1;
+            while ($Values[$EndIndex]['Time'] < $EndTime3) $EndIndex = $EndIndex + 1;
             $SubValues = array_slice($Values, $StartIndex, $EndIndex - $StartIndex + 1);
             if(count($SubValues) > 2)
+            if (count($SubValues) > 2)
+            {
               $Point = $this->ComputeOneValue($StartTime3, $EndTime3, $SubValues, $Level);
 …
     $Measures = array();
     $Result = $Database->select('Measure', '*');
     while($Row = $Result->fetch_assoc())
+    while ($Row = $Result->fetch_assoc())
+    {
       $Measures = new Measure();
 …
+    }
     foreach($Measures as $Measure)
+    foreach ($Measures as $Measure)
+    {
       $Measure->RebuildMeasureCache();

trunk/Modules/TimeMeasure/Measurement/MeasureClient.php

-              r738
+              r873
+  {
     $DbResult = $this->Database->select('MeasureClient', '*');
     while($MeasureClient = $DbResult->fetch_assoc())
+    while ($MeasureClient = $DbResult->fetch_assoc())
+    {
       $DbResult2 = $this->Database->select('MeasureMethod', '*', 'Id='.$MeasureClient['Method']);
 …
       include_once(dirname(__FILE__).'/'.$MeasureMethod['MeasureClass'].'.php');
       $MeasureMethod['MeasureClass'] .= 'Measurement';
       if(class_exists($MeasureMethod['MeasureClass']))
+      if (class_exists($MeasureMethod['MeasureClass']))
+      {
         $MeasureClass = new $MeasureMethod['MeasureClass']($this->System);
         if(method_exists($MeasureClass, $MeasureMethod['Method']))
+        if (method_exists($MeasureClass, $MeasureMethod['Method']))
+        {
           if($MeasureClient['Parameter'] != '') $Value = $Measure->$MeasureMethod['Method']($MeasureClient['Parameter']);
+          if ($MeasureClient['Parameter'] != '') $Value = $Measure->$MeasureMethod['Method']($MeasureClient['Parameter']);
             else $Value = $MeasureClass->$MeasureMethod['Method']();
           echo(file_get_contents('http://'.$MeasureClient['Host'].$MeasureClient['Path'].'/?M=Add&MeasureId='.$MeasureClient['MeasureId'].'&Value='.addslashes($Value)));

trunk/Modules/TimeMeasure/Measurement/System.php

r660	r873
11	11	set_error_handler('ErrorHandler');
12	12	//error_reporting(0);
13		if($Fp1 = fsockopen($Ip, $Port, $ERROR_NO, $ERROR_STR, (float)$Timeout))
	13	if ($Fp1 = fsockopen($Ip, $Port, $ERROR_NO, $ERROR_STR, (float)$Timeout))
14	14	{
15	15	fclose($Fp1);
16		return(TRUE);
	16	return (TRUE);
17	17	} else
18	18	{
19	19	//echo($ERROR_NO.','.$ERROR_STR);
20		return(FALSE);
	20	return (FALSE);
21	21	}
22	22	restore_error_handler();
…	…
30	30	// c - ping count
31	31	$Parts = explode(' ', $Row[0]);
32		if(count($Parts) > 6)
	32	if (count($Parts) > 6)
33	33	{
34	34	$Time = $Parts[7];
35	35	$TimeParts = explode('=', $Time);
36		return($TimeParts[1]);
37		} else return(0);
	36	return ($TimeParts[1]);
	37	} else return (0);
38	38	}
39	39
…	…
43	43	exec('free -b', $Output);
44	44	$Row = $Output[2];
45		while(strpos($Row, ' ') !== false) $Row = str_replace(' ', ' ', $Row);
	45	while (strpos($Row, ' ') !== false) $Row = str_replace(' ', ' ', $Row);
46	46	$RowParts = explode(' ', $Row);
47	47	$Row = $Output[3];
48		while(strpos($Row, ' ') !== false) $Row = str_replace(' ', ' ', $Row);
	48	while (strpos($Row, ' ') !== false) $Row = str_replace(' ', ' ', $Row);
49	49	$RowParts2 = explode(' ', $Row);
50		return($RowParts[2] + $RowParts2[2]);
	50	return ($RowParts[2] + $RowParts2[2]);
51	51	}
52	52
…	…
81	81	}
82	82	file_put_contents($CpuStateFileName, serialize($CpuUsage));
83		return(100 - round($CpuUsagePercent['Idle'], 2));
	83	return (100 - round($CpuUsagePercent['Idle'], 2));
84	84	}
85	85
…	…
93	93	array_shift($Output); // Skip header
94	94	array_shift($Output); // Skip header
95		foreach($Output as $Item)
	95	foreach ($Output as $Item)
96	96	{
97		while(strpos($Item, ' ') !== false) $Item = str_replace(' ', ' ', $Item); // Rrmove multiple spaces
	97	while (strpos($Item, ' ') !== false) $Item = str_replace(' ', ' ', $Item); // Rrmove multiple spaces
98	98	$Item = explode(':', $Item);
99	99	$Interface = trim($Item[0]);
100	100	$Item = explode(' ', trim($Item[1]));
101	101	$NetworkState[$Interface] = array('Down' => $Item[0], 'Up' => $Item[8]);
102		if(array_key_exists($Interface, $LastNetworkState))
	102	if (array_key_exists($Interface, $LastNetworkState))
103	103	{
104	104	$Period = time() - $LastNetworkState['Time'];
…	…
110	110	$NetworkState[$Interface]['UpAverage'] = 0;
111	111	}
112		if($NetworkState[$Interface]['DownAverage'] < 0) $NetworkState[$Interface]['DownAverage'] = 0;
113		if($NetworkState[$Interface]['UpAverage'] < 0) $NetworkState[$Interface]['UpAverage'] = 0;
	112	if ($NetworkState[$Interface]['DownAverage'] < 0) $NetworkState[$Interface]['DownAverage'] = 0;
	113	if ($NetworkState[$Interface]['UpAverage'] < 0) $NetworkState[$Interface]['UpAverage'] = 0;
114	114	}
115	115	file_put_contents($NetworkStateFile, serialize($NetworkState));
116		return($NetworkState);
	116	return ($NetworkState);
117	117	}
118	118
…	…
120	120	{
121	121	$NetworkState = $this->GetNetworkState();
122		return($NetworkState['Interface']['DownAverage']);
	122	return ($NetworkState['Interface']['DownAverage']);
123	123	}
124	124
…	…
126	126	{
127	127	$NetworkState = $this->GetNetworkState();
128		return($NetworkState['Interface']['UpAverage']);
	128	return ($NetworkState['Interface']['UpAverage']);
129	129	}
130	130
…	…
134	134	$Output = array();
135	135	exec('cat /proc/net/nf_conntrack\|grep "dst='.$HostIP.' "\|grep "dport='.$Port.' "\|grep "ASSURED"', $Output);
136		return(count($Output));
	136	return (count($Output));
137	137	}
138	138
…	…
142	142	exec('iostat -d '.$Device.' -x -m 2 2', $Output); // 2 second measure delay
143	143	$Row = $Output[6];
144		while(strpos($Row, ' ') !== false) $Row = str_replace(' ', ' ', $Row);
	144	while (strpos($Row, ' ') !== false) $Row = str_replace(' ', ' ', $Row);
145	145	$Parts = explode(' ', $Row);
146	146	$Value = str_replace(',', '.', $Parts[11]);
147		return($Value);
	147	return ($Value);
148	148	}
149	149
150	150	function DiskFree($Path)
151	151	{
152		return(disk_free_space($Path));
	152	return (disk_free_space($Path));
153	153	}
154	154
…	…
157	157	$Output = array();
158	158	exec('/usr/bin/sensors', $Output);
159		foreach($Output as $Line)
	159	foreach ($Output as $Line)
160	160	{
161		if(substr($Line, 0, strlen($Sensor)) == $Sensor)
	161	if (substr($Line, 0, strlen($Sensor)) == $Sensor)
162	162	{
163	163	$Line = substr($Line, strpos($Line, '+') + 1);
164	164	$Line = substr($Line, 0, strpos($Line, '°'));
165		return($Line);
	165	return ($Line);
166	166	}
167	167	}
168		return(0);
	168	return (0);
169	169	}
170	170
…	…
175	175	fclose($File);
176	176	$UptimeParts = explode(' ', $Uptime);
177		return($UptimeParts[0]);
	177	return ($UptimeParts[0]);
178	178	}
179	179	}

trunk/Modules/TimeMeasure/Measurement/WoW.php

r738	r873
12	12	$DbResult = $Database->query('SELECT COUNT(*) FROM account WHERE online=1');
13	13	$Row = $DbResult->fetch_array();
14		return($Row[0]);
	14	return ($Row[0]);
15	15	}
16	16
…	…
20	20	$DbResult = $Database->query('SELECT COUNT(*) FROM account WHERE online=1 AND gmlevel > 0');
21	21	$Row = $DbResult->fetch_array();
22		return($Row[0]);
	22	return ($Row[0]);
23	23	}
24	24
…	…
28	28	$DbResult = $Database->query('SELECT COUNT(*) FROM account');
29	29	$Row = $DbResult->fetch_array();
30		return($Row[0]);
	30	return ($Row[0]);
31	31	}
32	32
…	…
36	36	$DbResult = $Database->query('SELECT COUNT(*) FROM guild');
37	37	$Row = $DbResult->fetch_array();
38		return($Row[0]);
	38	return ($Row[0]);
39	39	}
40	40
…	…
44	44	$DbResult = $Database->query('SELECT COUNT(*) FROM `characters`');
45	45	$Row = $DbResult->fetch_array();
46		return($Row[0]);
	46	return ($Row[0]);
47	47	}
48	48
…	…
52	52	$DbResult = $Database->query('SELECT COUNT(*) FROM uptime');
53	53	$Row = $DbResult->fetch_array();
54		return($Row[0]);
	54	return ($Row[0]);
55	55	}
56	56
57	57	function WoWEmulatorAvailability()
58	58	{
59		if~~(CheckPortStatus('localhost', 8085)) return(100); else return~~(0);
	59	if (CheckPortStatus('localhost', 8085)) return (100); else return (0);
60	60	}
61	61
…	…
69	69	$Row = $DbResult->fetch_array();
70	70	$Value = $Row[0];
71		return($Value);
	71	return ($Value);
72	72	}
73	73	}

trunk/Modules/User/User.php

r858	r873
122	122	/*
123	123
124		if($this->InstalledVersion == '1.0') {
	124	if ($this->InstalledVersion == '1.0') {
125	125	$this->System->Database->Query('SELECT * FROM User WHERE Id=1');
126	126	$this->InstalledVersion = '1.1';
…	…
132	132	{
133	133	$this->System->User = new User($this->System);
134		if(isset($_SERVER['REMOTE_ADDR'])) $this->System->User->Check();
	134	if (isset($_SERVER['REMOTE_ADDR'])) $this->System->User->Check();
135	135	$this->System->RegisterPage('userlist', 'PageUserList');
136	136	$this->System->RegisterPage('user', 'PageUser');
…	…
290	290	function TopBarCallback()
291	291	{
292		if($this->System->User->User['Id'] == null)
	292	if ($this->System->User->User['Id'] == null)
293	293	{
294	294	$Output = '<a href="'.$this->System->Link('/user/?Action=LoginForm').'">Přihlášení</a> '.
…	…
301	301	// <a href="'.$this->System->Link('/?Action=UserOptions').'">Nastavení</a>';
302	302	}
303		return($Output);
	303	return ($Output);
304	304	}
305	305	}

trunk/Modules/User/UserList.php

-              r833
+              r873
   function Show()
+  {
     if(!$this->System->User->CheckPermission('User', 'ShowList'))
       return('Nemáte oprávnění');
+    if (!$this->System->User->CheckPermission('User', 'ShowList'))
+      return ('Nemáte oprávnění');
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `User`');
 …
     $DbResult = $this->Database->query($Query);
     while($User = $DbResult->fetch_assoc())
+    while ($User = $DbResult->fetch_assoc())
+    {
       $Devices = array();
       $DbResult2 = $this->Database->query('SELECT `Id` FROM `Member` WHERE `Member`.`ResponsibleUser` = '.$User['Id']);
       while($Member = $DbResult2->fetch_assoc())
+      while ($Member = $DbResult2->fetch_assoc())
+      {
         $DbResult3 = $this->Database->query('SELECT `Name`, `Id` FROM `NetworkDevice` '.
           'WHERE `Member` = '.$Member['Id'].' AND `Used`=1 ORDER BY `Name`');
         while($Device = $DbResult3->fetch_assoc())
+        while ($Device = $DbResult3->fetch_assoc())
+        {
           $Devices[] = $Device['Name'];
 …
     $Output .= $PageList['Output'];
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/User/UserModel.php

-              r828
+              r873
   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);
+  }
 …
     // Lookup user record
     $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
     if($Query->num_rows > 0)
+    if ($Query->num_rows > 0)
+    {
       // Refresh time of last access
 …
     // Logged permanently?
     if(array_key_exists('LoginHash', $_COOKIE))
+    if (array_key_exists('LoginHash', $_COOKIE))
+    {
       $DbResult = $this->Database->query('SELECT * FROM `UserOnline` WHERE `User`='.$_COOKIE['LoginUserId'].
         ' AND `StayLogged`=1 AND SessionId!="'.$SID.'"');
       if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
+      {
         $DbRow = $DbResult->fetch_assoc();
         if(sha1($_COOKIE['LoginUserId'].$DbRow['StayLoggedHash']) == $_COOKIE['LoginHash'])
+        if (sha1($_COOKIE['LoginUserId'].$DbRow['StayLoggedHash']) == $_COOKIE['LoginHash'])
+        {
           $this->Database->query('DELETE FROM `UserOnline` WHERE `SessionId`="'.$SID.'"');
 …
     $Query = $this->Database->select('UserOnline', '*', '`SessionId`="'.$SID.'"');
     $Row = $Query->fetch_assoc();
     if($Row['User'] != '')
+    if ($Row['User'] != '')
+    {
       $Query = $this->Database->query('SELECT `User`.*, `UserCustomerRel`.`Customer` AS `Member` FROM `User` '.
 …
     // Remove nonactive users
     $DbResult = $this->Database->select('UserOnline', '`Id`, `User`', '(`ActivityTime` < DATE_SUB(NOW(), INTERVAL '.$this->OnlineStateTimeout.' SECOND)) AND (`StayLogged` = 0)');
     while($DbRow = $DbResult->fetch_array())
+    while ($DbRow = $DbResult->fetch_array())
+    {
       $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
       if($DbRow['User'] != null) $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout');
+      if ($DbRow['User'] != null) $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout');
+    }
     //$this->LoadPermission($this->User['Role']);
 …
   function Register($Login, $Password, $Password2, $Email, $Name)
+  {
     if(($Email == '') || ($Login == '') || ($Password == '') || ($Password2 == '')  || ($Name == '')) $Result = DATA_MISSING;
     else if($Password != $Password2) $Result = PASSWORDS_UNMATCHED;
+    if (($Email == '') || ($Login == '') || ($Password == '') || ($Password2 == '')  || ($Name == '')) $Result = DATA_MISSING;
+    else if ($Password != $Password2) $Result = PASSWORDS_UNMATCHED;
     else
+    {
       // Is user registred yet?
       $Query = $this->Database->select('User', '*', 'Login = "'.$Login.'"');
       if($Query->num_rows > 0) $Result = LOGIN_USED;
+      if ($Query->num_rows > 0) $Result = LOGIN_USED;
       else
+      {
         $Query = $this->Database->select('User', '*', 'Name = "'.$Name.'"');
         if($Query->num_rows > 0) $Result = NAME_USED;
+        if ($Query->num_rows > 0) $Result = NAME_USED;
         else
+        {
           $Query = $this->Database->select('User', '*', 'Email = "'.$Email.'"');
           if($Query->num_rows > 0) $Result = EMAIL_USED;
+          if ($Query->num_rows > 0) $Result = EMAIL_USED;
           else
+          {
 …
+      }
+    }
     return($Result);
+    return ($Result);
+  }
 …
+  {
     $DbResult = $this->Database->select('User', 'Id, Login, Password', 'Id = '.$Id);
     if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
+    {
       $Row = $DbResult->fetch_array();
       $NewPassword = substr(sha1(strtoupper($Row['Login'])), 0, 7);
       if($Hash == $NewPassword)
+      if ($Hash == $NewPassword)
+      {
         $this->Database->update('User', 'Id='.$Row['Id'], array('Locked' => 0));
 …
       } else $Output = PASSWORDS_UNMATCHED;
     } else $Output = USER_NOT_FOUND;
     return($Output);
+    return ($Output);
+  }
   function Login($Login, $Password, $StayLogged = false)
+  {
     if($StayLogged) $StayLogged = 1; else $StayLogged = 0;
+    if ($StayLogged) $StayLogged = 1; else $StayLogged = 0;
     $SID = session_id();
     $Query = $this->Database->select('User', '*', 'Login="'.$Login.'"');
     if($Query->num_rows > 0)
+    if ($Query->num_rows > 0)
+    {
       $Row = $Query->fetch_assoc();
       $PasswordHash = new PasswordHash();
       if(!$PasswordHash->Verify($Password, $Row['Salt'], $Row['Password'])) $Result = BAD_PASSWORD;
       else if($Row['Locked'] == 1) $Result = ACCOUNT_LOCKED;
+      if (!$PasswordHash->Verify($Password, $Row['Salt'], $Row['Password'])) $Result = BAD_PASSWORD;
+      else if ($Row['Locked'] == 1) $Result = ACCOUNT_LOCKED;
       else
+      {
 …
         $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array(
           'User' => $Row['Id'], 'StayLogged' => $StayLogged, 'StayLoggedHash' => $StayLoggedSalt));
         if($StayLogged)
+        if ($StayLogged)
+        {
           setcookie('LoginUserId', $Row['Id'], time()+365*24*60*60, $this->System->Link('/'));
 …
+      }
     } else $Result = USER_NOT_REGISTRED;
     return($Result);
+    return ($Result);
+  }
 …
     $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout', $this->User['Login']);
     $this->Check();
     return(USER_LOGGED_OUT);
+    return (USER_LOGGED_OUT);
+  }
 …
     $this->Roles = array();
     $DbResult = $this->Database->select('UserRole', '*');
     while($DbRow = $DbResult->fetch_array())
+    while ($DbRow = $DbResult->fetch_array())
       $this->Roles[] = $DbRow;
+  }
 …
     $this->User['Permission'] = array();
     $DbResult = $this->Database->query('SELECT `UserRolePermission`.*, `PermissionOperation`.`Description` FROM `UserRolePermission` JOIN `PermissionOperation` ON `PermissionOperation`.`Id` = `UserRolePermission`.`Operation` WHERE `UserRolePermission`.`Role` = '.$Role);
     if($DbResult->num_rows > 0)
     while($DbRow = $DbResult->fetch_array())
+    if ($DbResult->num_rows > 0)
+    while ($DbRow = $DbResult->fetch_array())
       $this->User['Permission'][$DbRow['Operation']] = $DbRow;
+  }
 …
     $Result = array();
     $DbResult = $this->Database->query('SELECT `UserRolePermission`.*, `PermissionOperation`.`Description`, `UserRole`.`Title` FROM `UserRolePermission` LEFT JOIN `PermissionOperation` ON `PermissionOperation`.`Id` = `UserRolePermission`.`Operation` LEFT JOIN `UserRole` ON `UserRole`.`Id` = `UserRolePermission`.`Role`');
     while($DbRow = $DbResult->fetch_array())
+    while ($DbRow = $DbResult->fetch_array())
+    {
       $Value = '';
       if($DbRow['Read']) $Value .= 'R';
       if($DbRow['Write']) $Value .= 'W';
+      if ($DbRow['Read']) $Value .= 'R';
+      if ($DbRow['Write']) $Value .= 'W';
       $Result[$DbRow['Description']][$DbRow['Title']] = $Value;
+    }
     return($Result);
+    return ($Result);
+  }
 …
     $PermissionExists = false;
     // First try to check cache group-group relation
     if(array_key_exists($GroupId, $this->PermissionGroupCache))
+    if (array_key_exists($GroupId, $this->PermissionGroupCache))
+    {
       $PermissionExists = true;
 …
         '") AND (`AssignedGroup` IS NOT NULL)');
       $DbRow = array();
       while($DbRow[] = $DbResult->fetch_array());
+      while ($DbRow[] = $DbResult->fetch_array());
         $this->PermissionGroupCache[$GroupId] = $DbRow;
       $PermissionExists = true;
+    }
     if($PermissionExists)
+    {
       foreach($this->PermissionGroupCache[$GroupId] as $DbRow)
+      {
         if($DbRow['AssignedGroup'] != '')
         if($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return(true);
+    if ($PermissionExists)
+    {
+      foreach ($this->PermissionGroupCache[$GroupId] as $DbRow)
+      {
+        if ($DbRow['AssignedGroup'] != '')
+        if ($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return (true);
+      }
+    }
     // Check group-operation relation
     if(array_key_exists($GroupId.','.$OperationId, $this->PermissionGroupCacheOp))
+    if (array_key_exists($GroupId.','.$OperationId, $this->PermissionGroupCacheOp))
+    {
       $PermissionExists = true;
 …
       // 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;
+      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);
+    if ($PermissionExists)
+    {
+      return ($this->PermissionGroupCacheOp[$GroupId.','.$OperationId]);
+    }
+    return (false);
+  }
 …
     // Get module id
     $DbResult = $this->Database->select('Module', 'Id', '`Name`="'.$Module.'"');
     if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
+    {
       $DbRow = $DbResult->fetch_assoc();
       $ModuleId = $DbRow['Id'];
     } else return(false);
+    } else return (false);
     // First try to check cache
     if(in_array(array($Module, $Operation, $ItemType, $ItemType), $this->PermissionCache))
+    if (in_array(array($Module, $Operation, $ItemType, $ItemType), $this->PermissionCache))
+    {
       $OperationId = array_search(array($Module, $Operation, $ItemType, $ItemIndex), $this->PermissionCache);
 …
       $DbResult = $this->Database->select('PermissionOperation', 'Id', '(`Module`="'.$ModuleId.
         '") AND (`Item`="'.$ItemType.'") AND (`ItemId`='.$ItemIndex.') AND (`Operation`="'.$Operation.'")');
       if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
+      {
         $DbRow = $DbResult->fetch_array();
 …
+    }
     if($PermissionExists)
+    {
       if($this->User['Id'] == null) $UserCondition = '(`User` IS NULL)';
+    if ($PermissionExists)
+    {
+      if ($this->User['Id'] == null) $UserCondition = '(`User` IS NULL)';
         else $UserCondition = '(`User`="'.$this->User['Id'].'")';
       // 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
       $DbResult = $this->Database->select('PermissionUserAssignment', 'AssignedGroup', $UserCondition);
       while($DbRow = $DbResult->fetch_array())
+      {
        if($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return(true);
+      }
       return(false);
     } else return(false);
+      while ($DbRow = $DbResult->fetch_array())
+      {
+       if ($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return (true);
+      }
+      return (false);
+    } else return (false);
+  }
 …
+  {
     $DbResult = $this->Database->select('User', 'Login, Name, Id, Email, Password', '`Login`="'.$Login.'" AND `Email`="'.$Email.'"');
     if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
+    {
       $Row = $DbResult->fetch_array();
 …
       $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'PasswordRecoveryRequest', 'Login='.$Login.',Email='.$Email);
     } else $Output = USER_PASSWORD_RECOVERY_FAIL;
     return($Output);
+    return ($Output);
+  }
 …
+  {
     $DbResult = $this->Database->select('User', 'Id, Login, Password', 'Id = '.$Id);
     if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
+    {
       $Row = $DbResult->fetch_array();
       $NewPassword2 = substr(sha1(strtoupper($Row['Login'])), 0, 7);
       if(($NewPassword == $NewPassword2) and ($Hash == $Row['Password']))
+      if (($NewPassword == $NewPassword2) and ($Hash == $Row['Password']))
+      {
         $PasswordHash = new PasswordHash();
 …
       } else $Output = PASSWORDS_UNMATCHED;
     } else $Output = USER_NOT_FOUND;
     return($Output);
+    return ($Output);
+  }
 …
+  {
     $DbResult = $this->Database->select('APIToken', 'User', '`Token`="'.$Token.'"');
     if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
+    {
       $DbRow = $DbResult->fetch_assoc();
       $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

-              r828
+              r873
   function Panel($Title, $Content, $Menu = array())
+  {
     if(count($Menu) > 0)
       foreach($Menu as $Item)
+    if (count($Menu) > 0)
+      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>');
+  }
 …
     $DbResult = $this->Database->query($Query);
     while($Contact = $DbResult->fetch_assoc())
+    while ($Contact = $DbResult->fetch_assoc())
+    {
       $Output .= '<tr>'.
 …
     $Output .= $PageList['Output'];
     return($Output);
+    return ($Output);
+  }
 …
+  {
     $Output = '';
     if($this->System->User->User['Id'] != null)
+    if ($this->System->User->User['Id'] != null)
+    {
       $Actions = '';
       foreach($this->System->ModuleManager->Modules['User']->UserPanel as $Action)
+      {
         if(is_string($Action[0]))
+      foreach ($this->System->ModuleManager->Modules['User']->UserPanel as $Action)
+      {
+        if (is_string($Action[0]))
+        {
           $Class = new $Action[0]($this->System);
 …
       $Output .= $this->Panel('Nabídka uživatele', $Actions);
       $Output .= '</td><td style="vertical-align:top;">';
       if($this->System->User->User['Id'] != null)
+      if ($this->System->User->User['Id'] != null)
+        {
           $Form = new Form($this->System->FormManager);
 …
       $Output .= '</td></tr></table></div>';
     } else $Output .= $this->SystemMessage('Oprávnění', 'Nejste přihlášen');
     return($Output);
+    return ($Output);
+  }
 …
+  {
     $Output = '';
     if(array_key_exists('Action', $_GET))
+    if (array_key_exists('Action', $_GET))
+    {
       $Action = $_GET['Action'];
       if($Action == 'LoginForm')
+      if ($Action == 'LoginForm')
+      {
         $Form = new Form($this->System->FormManager);
 …
         '<a href="?Action=PasswordRecovery">Obnova zapomenutého hesla</a></div>';
       } else
       if($Action == 'Login')
+      {
         if(array_key_exists('Username', $_POST) and array_key_exists('Password', $_POST))
+      if ($Action == 'Login')
+      {
+        if (array_key_exists('Username', $_POST) and array_key_exists('Password', $_POST))
+        {
           $Form = new Form($this->System->FormManager);
           $Form->SetClass('UserLogin');
           $Form->OnSubmit = '?Action=Login';
           if(array_key_exists('StayLogged', $_POST) and ($_POST['StayLogged'] == 'on')) $StayLogged = true;
+          if (array_key_exists('StayLogged', $_POST) and ($_POST['StayLogged'] == 'on')) $StayLogged = true;
             else $StayLogged = false;
           $Result = $this->System->User->Login($_POST['Username'], $_POST['Password'], $StayLogged);
           $Output .= $this->SystemMessage('Přihlášení', $Result);
           if($Result <> USER_LOGGED_IN)
+          if ($Result <> USER_LOGGED_IN)
+          {
             $Form->LoadValuesFromForm();
 …
         } else $Output .= $this->SystemMessage('Přihlášení', 'Nezadány přihlašovací údaje');
       } else
       if($Action == 'Logout')
+      {
         if($this->System->User->User['Id'] != null)
+      if ($Action == 'Logout')
+      {
+        if ($this->System->User->User['Id'] != null)
+        {
           $Output .= $this->SystemMessage('Odhlášení', $this->System->User->Logout());
         } else $Output .= $this->SystemMessage('Nastavení uživatele', 'Nejste přihlášen');
       } else
       if($Action == 'UserOptions')
+      {
         if($this->System->User->User['Id'] != null)
+      if ($Action == 'UserOptions')
+      {
+        if ($this->System->User->User['Id'] != null)
+        {
           $Form = new Form($this->System->FormManager);
 …
         } else $Output .= $this->SystemMessage('Nastavení uživatele', 'Nejste přihlášen');
       } else
       if($Action == 'UserOptionsSave')
+      if ($Action == 'UserOptionsSave')
+      {
         $Form = new Form($this->System->FormManager);
 …
         $Output .= $Form->ShowEditForm();
       } else
       if($Action == 'UserRegister')
+      if ($Action == 'UserRegister')
+      {
         $Form = new Form($this->System->FormManager);
 …
         $Output .= $Form->ShowEditForm();
       } else
       if($Action == 'UserRegisterConfirm')
+      if ($Action == 'UserRegisterConfirm')
+      {
         $Output .= $this->SystemMessage('Potvrzení registrace',
           $this->System->User->RegisterConfirm($_GET['User'], $_GET['H']));
       } else
       if($Action == 'PasswordRecovery')
+      if ($Action == 'PasswordRecovery')
+      {
         $Form = new Form($this->System->FormManager);
 …
         $Output .= $Form->ShowEditForm();
       } else
       if($Action == 'PasswordRecovery2')
+      if ($Action == 'PasswordRecovery2')
+      {
         $Form = new Form($this->System->FormManager);
 …
         $Result = $this->System->User->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
         $Output .= $this->SystemMessage('Obnova hesla', $Result);
         if($Result <> USER_PASSWORD_RECOVERY_SUCCESS)
+        if ($Result <> USER_PASSWORD_RECOVERY_SUCCESS)
+        {
           $Output .= $Form->ShowEditForm();
+        }
       } else
       if($Action == 'PasswordRecoveryConfirm')
+      if ($Action == 'PasswordRecoveryConfirm')
+      {
         $Output .= $this->SystemMessage('Obnova hesla', $this->System->User->PasswordRecoveryConfirm($_GET['User'], $_GET['H'], $_GET['P']));
       } else
       if($Action == 'UserRegisterSave')
+      if ($Action == 'UserRegisterSave')
+      {
         $Form = new Form($this->System->FormManager);
 …
           $Form->Values['Password2'], $Form->Values['Email'], $Form->Values['Name']);
         $Output .= $this->SystemMessage('Registrace nového účtu', $Result);
         if($Result <> USER_REGISTRATED)
+        if ($Result <> USER_REGISTRATED)
+        {
           $Form->OnSubmit = '?Action=UserRegisterSave';
 …
+        }
       } else
       if($Action == 'UserMenu')
+      if ($Action == 'UserMenu')
+      {
         $Output = $this->ShowUserPanel();
       } else $Output = $this->ShowMain();
     } else $Output = $this->ShowMain();
     return($Output);
+    return ($Output);
+  }
 …
+  {
     $Output = 'Nebyla vybrána akce';
     return($Output);
+    return ($Output);
+  }
+}

trunk/Modules/WebCam/WebCam.php

r860	r873
9	9	function Show()
10	10	{
11		if(file_exists($this->System->ModuleManager->Modules['WebCam']->ImageFileName))
	11	if (file_exists($this->System->ModuleManager->Modules['WebCam']->ImageFileName))
12	12	{
13	13	$Output = '<script language="JavaScript">
…	…
38	38	'<a href="http://www.mestovsetin.cz/vismo/dokumenty2.asp?id_org=18676&id=480245">Webové kamery ve Vsetíně</a><br />';
39	39
40		return($Output);
	40	return ($Output);
41	41	}
42	42	}
…	…
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>';
73	73	$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>';
74		return($Output);
	74	return ($Output);
75	75	}
76	76	}

trunk/Modules/WebCam/webcam_refresh.php

-              r738
+              r873
 $Config['Web']['ShowPHPError'] = true;
 while(1)
+while (1)
+{
   $ModifyTime = filemtime('webcam.jpg');
   if((time() - $Config['Web']['WebcamRefresh']) >= $ModifyTime)
+  if ((time() - $Config['Web']['WebcamRefresh']) >= $ModifyTime)
+  {
 //    $Output = shell_exec('wget "http://kamera-stred/Webcam.jpg?MobilePass='.$Config['Web']['WebcamPassword'].'&V=2&Q=2&B=2&U=0" -O webcam_cache.jpg -T '.($Config['Web']['WebcamRefresh']).' --limit-rate=200k');
     $Output = shell_exec('wget "http://kamera-knihovna/cgi-bin/viewer/video.jpg" -O webcam_cache.jpg -T '.($Config['Web']['WebcamRefresh']).' --limit-rate=200k');
     if((strpos($Output, 'failed') === false) and (strpos($Output, 'error') === false))
+    if ((strpos($Output, 'failed') === false) and (strpos($Output, 'error') === false))
       shell_exec('mv -f webcam_cache.jpg webcam.jpg');
+  }

trunk/Modules/Wiki/Wiki.php

r825	r873
60	60	{
61	61	$DbResult = $this->Database->select('WikiPage', '*', 'VisibleInMenu=1');
62		while($DbRow = $DbResult->fetch_assoc())
	62	while ($DbRow = $DbResult->fetch_assoc())
63	63	{
64	64	$this->System->RegisterPage($DbRow['NormalizedName'], 'PageWiki');
…	…
82	82	function Show()
83	83	{
84		if(array_key_exists('Action', $_GET))
85		{
86		if($_GET['Action'] == 'Edit') $Output = $this->EditContent();
87		else if($_GET['Action'] == 'EditSave') $Output = $this->SaveContent();
88		else if($_GET['Action'] == 'History') $Output = $this->ShowHistory();
	84	if (array_key_exists('Action', $_GET))
	85	{
	86	if ($_GET['Action'] == 'Edit') $Output = $this->EditContent();
	87	else if ($_GET['Action'] == 'EditSave') $Output = $this->SaveContent();
	88	else if ($_GET['Action'] == 'History') $Output = $this->ShowHistory();
89	89	else $Output = $this->ShowContent();
90	90	} else $Output = $this->ShowContent();
91		return($Output);
	91	return ($Output);
92	92	}
93	93
…	…
96	96	$PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
97	97	$DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
98		if($DbResult->num_rows > 0)
	98	if ($DbResult->num_rows > 0)
99	99	{
100	100	$DbRow = $DbResult->fetch_assoc();
101		if(array_key_exists('ver', $_GET))
	101	if (array_key_exists('ver', $_GET))
102	102	{
103	103	$DbResult2 = $this->Database->select('WikiPageContent', '', 'Page='.$DbRow['Id'].' AND Id='.$_GET['ver']1);
104		if($DbResult2->num_rows > 0)
	104	if ($DbResult2->num_rows > 0)
105	105	{
106	106	$DbRow2 = $DbResult2->fetch_assoc();
107	107	$Output = '<h3>Archív stránky '.$DbRow['Name'].' ('.HumanDateTime($DbRow2['Time']).')</h3>';
108	108	$Output .= $DbRow2['Content'];
109		if($this->System->User->Licence(LICENCE_MODERATOR))
	109	if ($this->System->User->Licence(LICENCE_MODERATOR))
110	110	$Output .= '<div><a href="?Action=Edit">Upravit nejnovější</a> <a href="?Action=History">Historie</a></div>';
111	111	} else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
…	…
113	113	{
114	114	$DbResult2 = $this->Database->select('WikiPageContent', '*', 'Page='.$DbRow['Id'].' ORDER BY Time DESC LIMIT 1');
115		if($DbResult2->num_rows > 0)
	115	if ($DbResult2->num_rows > 0)
116	116	{
117	117	$DbRow2 = $DbResult2->fetch_assoc();
118	118	$Output = '<h3>'.$DbRow['Name'].'</h3>';
119	119	$Output .= $DbRow2['Content'];
120		if($this->System->User->Licence(LICENCE_MODERATOR))
	120	if ($this->System->User->Licence(LICENCE_MODERATOR))
121	121	$Output .= '<div><a href="?Action=Edit">Upravit</a> <a href="?Action=History">Historie</a></div>';
122	122	} else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
123	123	}
124	124	} else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
125		return($Output);
	125	return ($Output);
126	126	}
127	127
128	128	function EditContent()
129	129	{
130		if($this->System->User->Licence(LICENCE_MODERATOR))
	130	if ($this->System->User->Licence(LICENCE_MODERATOR))
131	131	{
132	132	$PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
133	133	$DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
134		if($DbResult->num_rows > 0)
	134	if ($DbResult->num_rows > 0)
135	135	{
136	136	$DbRow = $DbResult->fetch_assoc();
137	137	$Output = '<h3>Úprava '.$DbRow['Name'].'</h3>';
138	138	$DbResult2 = $this->Database->select('WikiPageContent', '*', 'Page='.$DbRow['Id'].' ORDER BY Time DESC LIMIT 1');
139		if($DbResult2->num_rows > 0)
	139	if ($DbResult2->num_rows > 0)
140	140	{
141	141	$DbRow2 = $DbResult2->fetch_assoc();
…	…
148	148	} else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
149	149	} else $Output = ShowMessage('Nemáte oprávnění', MESSAGE_CRITICAL);
150		return($Output);
	150	return ($Output);
151	151	}
152	152
153	153	function SaveContent()
154	154	{
155		if($this->System->User->Licence(LICENCE_MODERATOR))
	155	if ($this->System->User->Licence(LICENCE_MODERATOR))
156	156	{
157	157	$PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
158	158	$DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
159		if($DbResult->num_rows > 0)
	159	if ($DbResult->num_rows > 0)
160	160	{
161	161	$DbRow = $DbResult->fetch_assoc();
162		if(array_key_exists('content', $_POST) and array_key_exists('save', $_POST))
	162	if (array_key_exists('content', $_POST) and array_key_exists('save', $_POST))
163	163	{
164	164	$DbResult2 = $this->Database->insert('WikiPageContent', array('Content' => stripslashes($_POST['content']),
…	…
169	169	} else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
170	170	} else $Output = ShowMessage('Nemáte oprávnění', MESSAGE_CRITICAL);
171		return($Output);
	171	return ($Output);
172	172	}
173	173
174	174	function ShowHistory()
175	175	{
176		if($this->System->User->Licence(LICENCE_MODERATOR))
	176	if ($this->System->User->Licence(LICENCE_MODERATOR))
177	177	{
178	178	$PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
179	179	$DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
180		if($DbResult->num_rows > 0)
	180	if ($DbResult->num_rows > 0)
181	181	{
182	182	$DbRow = $DbResult->fetch_assoc();
…	…
202	202	' FROM `WikiPageContent` WHERE Page='.
203	203	$DbRow['Id'].' '.$Order['SQL'].$PageList['SQLLimit']);
204		while($PageContent = $DbResult2->fetch_assoc())
	204	while ($PageContent = $DbResult2->fetch_assoc())
205	205	{
206	206	$Output .= '<tr>'.
…	…
215	215	} else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
216	216	} else $Output = ShowMessage('Nemáte oprávnění', MESSAGE_CRITICAL);
217		return($Output);
	217	return ($Output);
218	218	}
219	219
…	…
242	242	$text = str_replace("\r\n", '<br/>', $text);
243	243	$text = '<p>'.$text.'</p>';
244		return($text);
	244	return ($text);
245	245	}
246	246	}

Context Navigation

Legend:

Download in other formats: