Changeset 874 for trunk/Packages/Common

Timestamp:

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

Author:

chronos

Message:

• Modified: Do not use parenthesis around returned value.

Location:

trunk/Packages/Common

Files:

• AppModule.php (modified) (2 diffs)
• Common.php (modified) (1 diff)
• Config.php (modified) (2 diffs)
• Database.php (modified) (8 diffs)
• Image.php (modified) (2 diffs)
• Locale.php (modified) (3 diffs)
• Mail.php (modified) (6 diffs)
• NetworkAddress.php (modified) (6 diffs)
• Page.php (modified) (2 diffs)
• PrefixMultiplier.php (modified) (3 diffs)
• Process.php (modified) (1 diff)
• RSS.php (modified) (1 diff)
• Setup.php (modified) (12 diffs)
• Table.php (modified) (8 diffs)
• UTF8.php (modified) (2 diffs)
• Update.php (modified) (4 diffs)

trunk/Packages/Common/AppModule.php

@@ -315 +315 @@
   function ModulePresent($Name)
   {
-    return (array_key_exists($Name, $this->Modules));
+    return array_key_exists($Name, $this->Modules);
   }
 
   function ModuleEnabled($Name)
   {
-    return (array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Enabled);
+    return array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Enabled;
   }
 
   function ModuleRunning($Name)
   {
-    return (array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Running);
+    return array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Running;
   }
 
@@ -334 +334 @@
     {
       //DebugLog($Module->Name.' '.$Module->Id);
-      if ($Module->Id == $Id) return ($Module->Name);
-    }
-    return ('');
+      if ($Module->Id == $Id) return $Module->Name;
+    }
+    return '';
   }
 

trunk/Packages/Common/Common.php

@@ -125 +125 @@
     $this->SQLLimit = ' LIMIT '.$CurrentPage * $ItemPerPage.', '.$ItemPerPage;
     $this->Page = $CurrentPage;
-    return ($Result);
+    return $Result;
   }
 }

trunk/Packages/Common/Config.php

@@ -19 +19 @@
       $Data = &$Data[$Item];
     }
-    return ($Data[$Last]);
+    return $Data[$Last];
   }
 
@@ -52 +52 @@
   function GetAsArray()
   {
-    return ($this->Data);
+    return $this->Data;
   }
 }

trunk/Packages/Common/Database.php

@@ -7 +7 @@
 {
   list($usec, $sec) = explode(" ", microtime());
-  return ((float)$usec + (float)$sec);
+  return (float)$usec + (float)$sec;
 }
 
@@ -17 +17 @@
   function fetch_assoc()
   {
-    return ($this->PDOStatement->fetch(PDO::FETCH_ASSOC));
+    return $this->PDOStatement->fetch(PDO::FETCH_ASSOC);
   }
 
   function fetch_array()
   {
-    return ($this->PDOStatement->fetch(PDO::FETCH_BOTH));
+    return $this->PDOStatement->fetch(PDO::FETCH_BOTH);
   }
 
   function fetch_row()
   {
-    return ($this->PDOStatement->fetch(PDO::FETCH_NUM));
+    return $this->PDOStatement->fetch(PDO::FETCH_NUM);
   }
 }
@@ -81 +81 @@
   function Connected()
   {
-    return (isset($this->PDO));
+    return isset($this->PDO);
   }
 
@@ -119 +119 @@
         throw new Exception('SQL Error: '.$this->Error.', Query: '.$Query);
     }
-    return ($Result);
+    return $Result;
   }
 
   function select($Table, $What = '*', $Condition = 1)
   {
-    return ($this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition));
+    return $this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);
   }
 
@@ -154 +154 @@
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    return ('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
+    return 'INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')';
   }
 
@@ -175 +175 @@
     }
     $Values = substr($Values, 2);
-    return ('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
+    return 'UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')';
   }
 
@@ -206 +206 @@
   function real_escape_string($Text)
   {
-    return (addslashes($Text));
+    return addslashes($Text);
   }
 
   function quote($Text)
   {
-    return ($this->PDO->quote($Text));
+    return $this->PDO->quote($Text);
   }
 
@@ -239 +239 @@
 function TimeToMysqlDateTime($Time)
 {
-  if ($Time == NULL) return (NULL);
-    else return (date('Y-m-d H:i:s', $Time));
+  if ($Time == NULL) return NULL;
+    else return date('Y-m-d H:i:s', $Time);
 }
 
 function TimeToMysqlDate($Time)
 {
-  if ($Time == NULL) return (NULL);
-    else return (date('Y-m-d', $Time));
+  if ($Time == NULL) return NULL;
+    else return date('Y-m-d', $Time);
 }
 
 function TimeToMysqlTime($Time)
 {
-  if ($Time == NULL) return (NULL);
-    else return (date('H:i:s', $Time));
+  if ($Time == NULL) return NULL;
+    else return date('H:i:s', $Time);
 }
 
 function MysqlDateTimeToTime($DateTime)
 {
-  if ($DateTime == '') return (NULL);
+  if ($DateTime == '') return NULL;
   $Parts = explode(' ', $DateTime);
   $DateParts = explode('-', $Parts[0]);
   $TimeParts = explode(':', $Parts[1]);
   $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]);
-  return ($Result);
+  return $Result;
 }
 
 function MysqlDateToTime($Date)
 {
-  if ($Date == '') return (NULL);
-  return (MysqlDateTimeToTime($Date.' 0:0:0'));
+  if ($Date == '') return NULL;
+  return MysqlDateTimeToTime($Date.' 0:0:0');
 }
 
 function MysqlTimeToTime($Time)
 {
-  if ($Time == '') return (NULL);
-  return (MysqlDateTimeToTime('0000-00-00 '.$Time));
-}
+  if ($Time == '') return NULL;
+  return MysqlDateTimeToTime('0000-00-00 '.$Time);
+}

trunk/Packages/Common/Image.php

@@ -112 +112 @@
   function GetWidth()
   {
-    return (imagesx($this->Image));
+    return imagesx($this->Image);
   }
 
   function GetHeight()
   {
-    return (imagesy($this->Image));
+    return imagesy($this->Image);
   }
 
@@ -127 +127 @@
   function ConvertColor($Color)
   {
-    return (imagecolorallocate($this->Image, ($Color >> 16) & 0xff, ($Color >> 8) & 0xff, $Color & 0xff));
+    return imagecolorallocate($this->Image, ($Color >> 16) & 0xff, ($Color >> 8) & 0xff, $Color & 0xff);
   }
 

trunk/Packages/Common/Locale.php

@@ -21 +21 @@
   {
     if (array_key_exists($Text, $this->Data[$Group]) and ($this->Data[$Group][$Text] != ''))
-      return ($this->Data[$Group][$Text]);
-      else return ($Text);
+      return $this->Data[$Group][$Text];
+      else return $Text;
   }
 
@@ -28 +28 @@
   {
     $Key = array_search($Text, $this->Data[$Group]);
-    if (($Key === FALSE) or ($this->Data[$Group][$Key] == '')) return ($Text);
-      else return ($Key);
+    if (($Key === FALSE) or ($this->Data[$Group][$Key] == '')) return $Text;
+      else return $Key;
   }
 }
@@ -245 +245 @@
   global $GlobalLocaleManager;
 
-  if (isset($GlobalLocaleManager)) return ($GlobalLocaleManager->CurrentLocale->Texts->Translate($Text, $Group));
-    else return ($Text);
-}
+  if (isset($GlobalLocaleManager)) return $GlobalLocaleManager->CurrentLocale->Texts->Translate($Text, $Group);
+    else return $Text;
+}

trunk/Packages/Common/Mail.php

@@ -74 +74 @@
   function Priority($Priority)
   {
-    if (!intval($Priority)) return (false);
-
-    if (!isset($this->priorities[$Priority - 1])) return (false);
+    if (!intval($Priority)) return false;
+
+    if (!isset($this->priorities[$Priority - 1])) return false;
 
     $this->xheaders['X-Priority'] = $this->priorities[$Priority - 1];
-    return (true);
+    return true;
   }
 
@@ -146 +146 @@
 
     $res = mail($To, $this->Subject, $Body, $Headers);
-    return ($res);
+    return $res;
   }
 
@@ -153 +153 @@
     if (ereg(".*<(.+)>", $Address, $regs)) $Address = $regs[1];
     if (ereg("^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$", $Address))
-      return (true);
-      else return (false);
+      return true;
+      else return false;
   }
 
@@ -168 +168 @@
   private function ContentEncoding($Charset)
   {
-    if ($Charset != CHARSET_ASCII) return ('8bit');
-      else return ('7bit');
+    if ($Charset != CHARSET_ASCII) return '8bit';
+      else return '7bit';
   }
 
@@ -203 +203 @@
       }
     } else $Result = $Body;
-    return ($Result);
+    return $Result;
   }
 
@@ -227 +227 @@
         "\nContent-Transfer-Encoding: ".$this->ContentEncoding($Body['Charset'])."\n\n".$Body['Content']."\n";
     }
-    return ($Result);
+    return $Result;
   }
 }

trunk/Packages/Common/NetworkAddress.php

@@ -16 +16 @@
   function GetNetMask()
   {
-    return (((1 << IPV4_BIT_WIDTH) - 1) ^ ((1 << (IPV4_BIT_WIDTH - $this->Prefix)) - 1));
+    return ((1 << IPV4_BIT_WIDTH) - 1) ^ ((1 << (IPV4_BIT_WIDTH - $this->Prefix)) - 1);
   }
 
   function AddressToString()
   {
-    return (implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255))));
+    return implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255)));
   }
 
@@ -39 +39 @@
     $To->Address = $From->Address + $HostMask;
     $To->Prefix = IPV4_BIT_WIDTH;
-    return (array('From' => $From, 'To' => $To));
+    return array('From' => $From, 'To' => $To);
   }
 
@@ -55 +55 @@
     if (($this->Prefix < $Address->Prefix) and (($Address->Address & $UpperNetmask) == ($this->Address & $UpperNetmask))) $Result = true;
       else $Result = false;
-    return ($Result);
+    return $Result;
   }
 }
@@ -74 +74 @@
   function GetNetMask()
   {
-    return (Int128Xor(Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH)), IntToInt128(1)),
-      Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH - $this->Prefix)), IntToInt128(1))));
+    return Int128Xor(Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH)), IntToInt128(1)),
+      Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH - $this->Prefix)), IntToInt128(1)));
   }
 
   function AddressToString()
   {
-    return (inet_ntop($this->Address));
+    return inet_ntop($this->Address);
   }
 
@@ -106 +106 @@
       $Result[] = dechex(($Item >> 4) & 15);
     }
-    return ($Result);
+    return $Result;
   }
 
@@ -129 +129 @@
     if (($this->Prefix < $Address->Prefix) and ((Int128Equal(Int128And($Address->Address, $UpperNetmask), Int128And($this->Address, $UpperNetmask))))) $Result = true;
       else $Result = false;
-    return ($Result);
+    return $Result;
   }
 }

trunk/Packages/Common/Page.php

@@ -20 +20 @@
   function Show()
   {
-    return ('');
+    return '';
   }
 
@@ -26 +26 @@
   {
     $Output = $this->Show();
-    return ($Output);
+    return $Output;
   }
 
   function SystemMessage($Title, $Text)
   {
-    return (call_user_func_array($this->OnSystemMessage, array($Title, $Text)));
+    return call_user_func_array($this->OnSystemMessage, array($Title, $Text));
   }
 }

trunk/Packages/Common/PrefixMultiplier.php

@@ -84 +84 @@
       }
     }
-    return ($Value);
+    return $Value;
   }
 
@@ -94 +94 @@
     $Value = abs($Value);
     if (($Unit == '') and ($PrefixType != 'Time'))
-      return ($this->TruncateDigits($Value, $Digits));
+      return $this->TruncateDigits($Value, $Digits);
 
     $I = $PrefixMultipliers[$PrefixType]['BaseIndex'];
-    if ($Value == 0) return ($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
+    if ($Value == 0) return $Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit;
 
     if ($Value > 1)
@@ -114 +114 @@
     $Value = $this->TruncateDigits($Value, $Digits);
     if ($Negative) $Value = -$Value;
-    return ($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
+    return $Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit;
   }
 }

trunk/Packages/Common/Process.php

@@ -47 +47 @@
   function IsRunning()
   {
-    return (is_resource($this->Handle));
+    return is_resource($this->Handle);
   }
 }

trunk/Packages/Common/RSS.php

@@ -39 +39 @@
     $Result .= "  </channel>\n".
     "</rss>";
-    return ($Result);
+    return $Result;
   }
 }

trunk/Packages/Common/Setup.php

@@ -29 +29 @@
       '<input type="submit" name="login" value="'.T('Login').'"/>'.
       '</form>';
-    return ($Output);
+    return $Output;
   }
 
@@ -59 +59 @@
     $Output .= '<a href="'.$this->System->Link('/').'">'.T('Go to main page').'</a> ';
     $Output .= '';
-    return ($Output);
+    return $Output;
   }
 
@@ -160 +160 @@
       }
     }
-    return ($Output);
+    return $Output;
   }
 
@@ -200 +200 @@
     $Output .= '<h3>Správa modulů</h3>';
     $Output .= $this->ShowList();
-    return ($Output);
+    return $Output;
   }
 
@@ -244 +244 @@
     $Output .= $Pageing->Show();
     //$Output .= '<p><a href="?A=SaveToDb">Uložit do databáze</a></p>';
-    return ($Output);
+    return $Output;
   }
 
@@ -281 +281 @@
         '</table>'.
         '</form>';
-    return ($Output);
+    return $Output;
   }
 
@@ -319 +319 @@
     file_put_contents($this->ConfigDir.'/Config.php', $ConfigText);
     $Output = 'Konfigurace nastavena<br/>';
-    return ($Output);
+    return $Output;
   }
 
@@ -353 +353 @@
     }
     $Output .= "\n\n";
-    return ($Output);
+    return $Output;
   }
 }
@@ -371 +371 @@
     }
     $Output .= sprintf(T('Front page was not configured. Continue to %s'), '<a href="'.$this->System->Link('/setup/').'">'.T('setup').'</a>');
-    return ($Output);
+    return $Output;
   }
 }
@@ -402 +402 @@
   function CheckState()
   {
-    return ($this->Database->Connected() and $this->UpdateManager->IsInstalled() and
-      $this->UpdateManager->IsUpToDate());
+    return $this->Database->Connected() and $this->UpdateManager->IsInstalled() and
+      $this->UpdateManager->IsUpToDate();
   }
 
@@ -435 +435 @@
   {
     $DbResult = $this->Database->query('SHOW TABLES LIKE "'.$this->UpdateManager->VersionTable.'"');
-    return ($DbResult->num_rows > 0);
+    return $DbResult->num_rows > 0;
   }
 
@@ -443 +443 @@
     $this->UpdateManager->Trace = $Updates->Get();
     $Output = $this->UpdateManager->Upgrade();
-    return ($Output);
+    return $Output;
   }
 }

trunk/Packages/Common/Table.php

@@ -7 +7 @@
   function Show()
   {
-    return ('');
+    return '';
   }
 }
@@ -15 +15 @@
   function GetCell($Y, $X)
   {
-    return ('');
+    return '';
   }
 
@@ -28 +28 @@
   function RowsCount()
   {
-    return (0);
+    return 0;
   }
 }
@@ -38 +38 @@
   function GetCell($Y, $X)
   {
-    return ($this->Cells[$Y][$X]);
+    return $this->Cells[$Y][$X];
   }
 
   function RowsCount()
   {
-    return (count($this->Cells));
+    return count($this->Cells);
   }
 }
@@ -55 +55 @@
   function GetCell($Y, $X)
   {
-    return ($this->Cells[$Y][$X]);
+    return $this->Cells[$Y][$X];
   }
 
@@ -75 +75 @@
   function RowsCount()
   {
-    return (count($this->Cells));
+    return count($this->Cells);
   }
 }
@@ -145 +145 @@
     $this->Table->EndRead();
     $Output .= '</table>';
-    return ($Output);
+    return $Output;
   }
 
@@ -190 +190 @@
     $this->OrderDirection = $_SESSION['OrderDir'];
 
-    return ('<tr>'.$Result.'</tr>');
+    return '<tr>'.$Result.'</tr>';
   }
 }

trunk/Packages/Common/UTF8.php

@@ -537 +537 @@
        }
     }
-    return ($Result);
+    return $Result;
   }
 
@@ -561 +561 @@
       }
     }
-    return ($Result);
+    return $Result;
   }
 }

trunk/Packages/Common/Update.php

@@ -23 +23 @@
     $DbResult = $this->Database->select($this->VersionTable, '*', 'Id=1');
     $Version = $DbResult->fetch_assoc();
-    return ($Version['Revision']);
+    return $Version['Revision'];
   }
 
@@ -29 +29 @@
   {
     $DbResult = $this->Database->query('SHOW TABLES LIKE "'.$this->VersionTable.'"');
-    return ($DbResult->num_rows > 0);
+    return $DbResult->num_rows > 0;
   }
 
   function IsUpToDate()
   {
-    return ($this->Revision <= $this->GetDbVersion());
+    return $this->Revision <= $this->GetDbVersion();
   }
 
@@ -56 +56 @@
         $TraceItem['Revision'].' WHERE `Id`=1');
     }
-    return ($Output);
+    return $Output;
   }
 
@@ -81 +81 @@
     echo($Query.';<br/>');
     flush();
-    return ($this->Database->query($Query));
+    return $this->Database->query($Query);
   }
 }