Changeset 63 for trunk/Global.php

Timestamp:

Aug 3, 2021, 11:20:41 AM (3 years ago)

Author:

chronos

Message:

• Modified: Used explicit types where possible for better error reporting.
• Modified: Updated Common packaged to newer version.
• Modified: Simplified pages title.
• Added: Simple keyword based spam filter for meet items.

Location:

trunk

Files:

• . (modified) (1 prop)
• Global.php (modified) (12 diffs)

trunk

@@ -1 @@
-nbproject
-Config.php
 .settings
 .project
 .buildpath
+.htaccess

@@ -1 @@
-nbproject
-Config.php
 .settings
 .project
 .buildpath
+.htaccess

trunk/Global.php

@@ -1 +1 @@
 <?php
 
-function HumanDate($Time)
+function HumanDate(int $Time): string
 {
   return date('j.n.Y', $Time);
 }
 
-function HumanTime($Time)
+function HumanTime(int $Time): string
 {
   return date('H:i:s', $Time);
 }
 
-function HumanDateTime($Time)
+function HumanDateTime(int $Time): string
 {
   $Output = HumanDate($Time);
@@ -19 +19 @@
 }
 
-function Link2($URL)
+function Link2(string $URL): string
 {
   global $Config;
@@ -26 +26 @@
 }
 
-function ProcessURL()
+function ProcessURL(): array
 {
   if (array_key_exists('REDIRECT_QUERY_STRING', $_SERVER))
@@ -40 +40 @@
 }
 
-function GetQueryStringArray($QueryString)
+function GetQueryStringArray(string $QueryString): array
 {
   $Result = array();
@@ -56 +56 @@
 }
 
-function SetQueryStringArray($QueryStringArray)
+function SetQueryStringArray(array $QueryStringArray): string
 {
   $Parts = array();
@@ -66 +66 @@
 }
 
-function GetPageList($TotalCount)
+function HumanSize(int $Value): string
+{
+  global $UnitNames;
+
+  $UnitIndex = 0;
+  while ($Value > 1024)
+  {
+    $Value = round($Value / 1024, 3);
+    $UnitIndex++;
+  }
+  return $Value.' '.$UnitNames[$UnitIndex];
+}
+
+function GetPageList(int $TotalCount): array
 {
   global $Config;
@@ -72 +85 @@
   $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
 
-  $ItemPerPage = $Config['ItemsPerPage'];
-  $Around = round($Config['VisiblePagingItems'] / 2);
+  $ItemPerPage = (int)$Config['ItemsPerPage'];
+  $Around = round((int)$Config['VisiblePagingItems'] / 2);
   $Result = '';
   $PageCount = floor($TotalCount / $ItemPerPage) + 1;
@@ -131 +144 @@
 $OrderArrowImage = array('sort_asc.png', 'sort_desc.png');
 
-function GetOrderTableHeader($Columns, $DefaultColumn, $DefaultOrder = 0)
+function GetOrderTableHeader(array $Columns, string $DefaultColumn, int $DefaultOrder = 0): array
 {
   global $OrderDirSQL, $OrderArrowImage, $Config;
@@ -179 +192 @@
 }
 
-function GetMicrotime()
+function GetMicrotime(): float
 {
   list($Usec, $Sec) = explode(' ', microtime());
@@ -189 +202 @@
   var $Items = array();
 
-  function GetOutput($Link)
+  function GetOutput(string $Link): string
   {
     $Output = '';
@@ -355 +368 @@
             '<input value="'.$_SESSION[$Item['Name'].'do'].'" onkeyup="'.
             'if (event.keyCode!=9) upf(\''.$Item['Name'].'do\',$(this).val(),(event.keyCode==13?0:1));" '.
-            'id="'.$Item['Name'].'do" autocomplete="off" type="text"/>'.
-            '<div class="label-box">'.$Item['Units'].'</div>'.
-            '</div> ';
+            'id="'.$Item['Name'].'do" autocomplete="off" type="text"/>';
+            if (array_key_exists('Units', $Item))
+            {
+              $Output .= '<div class="label-box">'.$Item['Units'].'</div>';
+            }
+            $Output .= '</div> ';
         }
       }
@@ -365 +381 @@
   }
 
-  function GetWhere($Database)
+  function GetWhere(Database $Database): string
   {
     $Where = '';

@@ -1 @@
-nbproject
-Config.php
 .settings
 .project
 .buildpath
+.htaccess