Changeset 783

Timestamp:

Jan 9, 2016, 12:33:50 PM (9 years ago)

Author:

chronos

Message:

• Moved: Generic class Page is now part of Common package.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Application/View.php (modified) (1 diff)
• Common/Global.php (modified) (2 diffs)
• Packages/Common/Common.php (modified) (1 diff)
• Packages/Common/Page.php (added)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 781; // Subversion revision
+$Revision = 782; // Subversion revision
 $DatabaseRevision = 770; // SQL structure revision
-$ReleaseTime = strtotime('2016-01-01');
+$ReleaseTime = strtotime('2016-01-09');

trunk/Application/View.php

@@ -125 +125 @@
   function GetOutput($Page)
   {
+    $Page->OnSystemMessage = array($this->System->BaseView, 'SystemMessage');
+
     $Output = $Page->Show();
     if($Page->ClearPage == false)

trunk/Common/Global.php

@@ -8 +8 @@
 include_once(dirname(__FILE__).'/../Packages/Package.php');
 include_once(dirname(__FILE__).'/../Packages/Common/Common.php');
-include_once(dirname(__FILE__).'/Page.php');
 include_once(dirname(__FILE__).'/Table.php');
 include_once(dirname(__FILE__).'/Form/Form.php');
@@ -368 +367 @@
   global $Database;
 
-  $DbResult = $Database->query('SELECT Id FROM Member WHERE '.
-  '(SELECT Member FROM NetworkDevice WHERE (SELECT Device FROM NetworkInterface '.
-  'WHERE LocalIP = "'.$IP.'") = NetworkDevice.Id) = Member.Id');
+  $DbResult = $Database->query('SELECT `Id` FROM `Member` WHERE '.
+  '(SELECT `Member` FROM `NetworkDevice` WHERE (SELECT `Device` FROM `NetworkInterface` '.
+  'WHERE `LocalIP` = "'.$IP.'") = `NetworkDevice`.`Id`) = `Member`.`Id`');
   if($DbResult->num_rows > 0)
   {

trunk/Packages/Common/Common.php

@@ -13 +13 @@
 include_once(dirname(__FILE__).'/AppModule.php');
 include_once(dirname(__FILE__).'/Config.php');
+include_once(dirname(__FILE__).'/Page.php');
 
 class PackageCommon extends Package