Changeset 5 for Common

Timestamp:

Jan 10, 2016, 12:16:44 AM (9 years ago)

Author:

chronos

Message:

• Added: Logging support to Database class.
• Modified: Page class use just $Title field instead two Short and Long titles.
• Modified: Page class use RawPage instead ClearPage field.

Location:

Common

Files:

• AppModule.php (modified) (2 diffs)
• Database.php (modified) (4 diffs)
• Error.php (modified) (2 diffs)
• Page.php (modified) (1 diff)

Common/AppModule.php

@@ -231 +231 @@
     foreach($Module->Dependencies as $Dependency)
     {
+      if(!array_key_exists($Dependency, $this->Modules))
+        throw new Exception('Module "'.$Module->Name.'" dependency "'.$Dependency.'" not found');
       $DepModule = $this->Modules[$Dependency];
       if(in_array(ModuleCondition::All, $Conditions) or
@@ -287 +289 @@
   }
 
+  function InstallAll()
+  {
+    $this->Perform($this->Modules, array(ModuleAction::Install));
+    $this->SaveState();
+  }
+
   function UninstallAll()
   {
     $this->Perform($this->Modules, array(ModuleAction::Uninstall));
+    $this->SaveState();
+  }
+
+  function EnableAll()
+  {
+    $this->Perform($this->Modules, array(ModuleAction::Enable));
+    $this->SaveState();
+  }
+
+  function DisableAll()
+  {
+    $this->Perform($this->Modules, array(ModuleAction::Disable));
     $this->SaveState();
   }

Common/Database.php

@@ -2 +2 @@
 
 // Extended database class
-// Date: 2011-11-25
+// Date: 2016-01-11
 
 class DatabaseResult
@@ -27 +27 @@
 class Database
 {
-  var $Prefix = '';
+  var $Prefix;
   var $Functions;
   var $Type;
   var $PDO;
-  var $Error = '';
+  var $Error;
   var $insert_id;
-  var $LastQuery = '';
+  var $LastQuery;
   var $ShowSQLError;
   var $ShowSQLQuery;
+  var $LogSQLQuery;
+  var $LogFile;
 
   function __construct()
   {
+    $this->Prefix = '';
+    $this->Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
     $this->Type = 'mysql';  // mysql, pgsql
+    $this->Error = '';
+    $this->LastQuery = '';
     $this->ShowSQLError = false;
     $this->ShowSQLQuery = false;
-    $this->Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
+    $this->LogSQLQuery = false;
+    $this->LogFile = dirname(__FILE__).'/../../Query.log';
   }
 
@@ -78 +85 @@
   {
     if(!$this->Connected()) throw new Exception('Not connected to database');
+    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime();
     $this->LastQuery = $Query;
+    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
+      $Duration = ' ; '.round(microtime() - $QueryStartTime, 4). ' s';
+    if($this->LogSQLQuery == true)
+      file_put_contents($this->LogFile, $Query.$Duration."\n", FILE_APPEND);
     if($this->ShowSQLQuery == true)
-      echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.'</div>'."\n");
+      echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; '.
+      'padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.$Duration.'</div>'."\n");
     $Result = new DatabaseResult();
     $Result->PDOStatement = $this->PDO->query($Query);
@@ -175 +188 @@
   }
 
+  function quote($Text)
+  {
+    return($this->PDO->quote($Text));
+  }
+
   public function __sleep()
   {

Common/Error.php

@@ -74 +74 @@
     die();
   }
-  
+
   function ShowDefaultError($Message)
   {
@@ -112 +112 @@
 
     foreach($this->OnError as $OnError)
-      $OnError[0]->$OnError[1]($Error);
+      call_user_func($OnError, $Error);
   }
 }

Common/Page.php

@@ -3 +3 @@
 class Page extends View
 {
-  var $FullTitle;
-  var $ShortTitle;
+  var $Title;
   var $ParentClass;
-  var $ClearPage;
+  var $RawPage;
   var $OnSystemMessage;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
-    $this->ClearPage = false;
+    $this->RawPage = false;
     $this->OnSystemMessage = array();
   }