Changeset 94 for trunk/Packages/Common

Timestamp:

May 25, 2020, 9:54:02 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Missing return statement in Setup CheckState method.
• Fixed: Global $System variable is not used anymore.

Location:

trunk/Packages/Common

Files:

• Base.php (modified) (1 diff)
• Common.php (modified) (2 diffs)
• Setup.php (modified) (1 diff)
• Table.php (modified) (2 diffs)

trunk/Packages/Common/Base.php

@@ -21 +21 @@
   function __construct(Application $System)
   {
-    $this->System = &$System;
-    $this->Database = &$System->Database;
+    $this->System = $System;
+    $this->Database = $System->Database;
   }
 }

trunk/Packages/Common/Common.php

@@ -41 +41 @@
 }
 
-class Paging
+class Paging extends Base
 {
   var $TotalCount;
@@ -49 +49 @@
   var $Page;
 
-  function __construct()
+  function __construct(Application &$System)
   {
-    global $System;
+    parent::__construct($System);
 
     $this->ItemPerPage = $System->Config['Web']['ItemsPerPage'];

trunk/Packages/Common/Setup.php

@@ -402 +402 @@
   function CheckState()
   {
-    $this->Database->Connected() and $this->UpdateManager->IsInstalled() and
+    return $this->Database->Connected() and $this->UpdateManager->IsInstalled() and
       $this->UpdateManager->IsUpToDate();
   }

trunk/Packages/Common/Table.php

@@ -1 +1 @@
 <?php
 
-class Control
+class Control extends Base
 {
   var $Name;
@@ -98 +98 @@
   var $Style;
 
-  function __construct()
+  function __construct(Application $System)
   {
-    global $System;
+    parent::__construct($System);
 
     $this->Columns = array();
     $this->Table = new TableMemory();
     $this->OrderDirSQL = array('ASC', 'DESC');
-    $this->OrderArrowImage = array($System->Link('/images/sort_asc.png'),
-      $System->Link('/images/sort_desc.png'));
+    $this->OrderArrowImage = array($this->System->Link('/images/sort_asc.png'),
+      $this->System->Link('/images/sort_desc.png'));
     $this->DefaultOrder = 0;
     $this->Style = 'BaseTable';