UpdateDatabase.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index e2630fa..c54a4d1 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -152,6 +152,8 @@ class Pman_Core_UpdateDatabase extends Pman
    
         $this->checkSystem();
         
+        $this->verifyExtensions(array('curl'));
+        
         if (class_exists('PDO_DataObjects_Introspection')) {
             PDO_DataObject_Introspection::$cache = array();
         }
@@ -216,8 +218,9 @@ class Pman_Core_UpdateDatabase extends Pman
         
         $this->clearApacheDataobjectsCache();
         
-         
+        $this->clearApacheAssetCache();
     }
+    
     function output() {
         echo "\nUpdate Completed SUCCESS\n";
         return '';
@@ -302,9 +305,10 @@ class Pman_Core_UpdateDatabase extends Pman
             // new -- sql directory..
             // new style will not support migrate ... they have to go into mysql-migrate.... directories..
             // new style will not support pg.sql etc.. naming - that's what the direcotries are for..
+            $dbdir = $dbtype == 'mysqli' ? 'mysql' : $dbtype;
             
             $this->{$dirmethod}($dburl, $this->rootDir. "/Pman/$m/sql");
-            $this->{$dirmethod}($dburl, $this->rootDir. "/Pman/$m/{$dbtype}");
+            $this->{$dirmethod}($dburl, $this->rootDir. "/Pman/$m/{$dbdir}");
             
            
             
@@ -1189,23 +1193,42 @@ class Pman_Core_UpdateDatabase extends Pman
     
     function clearApacheDataobjectsCache()
     {
-        
+        echo "Clearing Database Cache\n";
         // this needs to clear it's own cache along with remote one..
   
-        $url = "http://localhost{$this->local_base_url}/Core/RefreshDatabaseCache";
         
-        $response = $this->curl($url);
+        $response = $this->curl("http://localhost{$this->local_base_url}/Core/RefreshDatabaseCache");
         
         $json = json_decode($response, true);
         
         if(empty($json['data']) || $json['data'] != 'DONE'){
             echo $response. "\n";
-            echo "CURL clear cache failed\n";
+            echo "Clear DataObjects Cache failed\n";
+            exit;
+        }
+        
+    }
+    
+    
+    function clearApacheAssetCache()
+    {
+        echo "Clearing Asset Cache\n";
+        $response = $this->curl(
+            "http://localhost{$this->local_base_url}/Core/Asset",
+            array( '_clear_cache' => 1 ,'returnHTML' => 'NO' ),
+            'POST'
+        );
+        $json = json_decode($response, true);
+        
+        if(empty($json['success']) || !$json['success']) {
+            echo $response. "\n";
+            echo "CURL Clear Asset cache failed\n";
             exit;
         }
         
     }
     
+    
     function curl($url, $request = array(), $method = 'GET') 
     {
         if($method == 'GET'){
@@ -1221,7 +1244,6 @@ class Pman_Core_UpdateDatabase extends Pman
             curl_setopt($ch, CURLOPT_POSTFIELDS, $request);
             
         } else {
-            
             curl_setopt($ch, CURLOPT_HTTPHEADER,
                     array("Content-Type: application/x-www-form-urlencoded", "Content-Length: " . strlen($request)));
             
@@ -1241,6 +1263,25 @@ class Pman_Core_UpdateDatabase extends Pman
         return $response;
     }
     
-    
+    static function verifyExtensions($extensions)
+    {
+        $error = array();
+        
+        foreach ($extensions as $e){
+            
+            if(extension_loaded($e)) {
+                continue;
+            }
+            
+            $error[] = "Error: Please install php extension: {$e}";
+        }
+        
+        if(empty($error)){
+           return true; 
+        }
+        $ff = HTML_FLexyFramework::get();
+        
+        $ff->page->jerr(implode('\n', $error));
+    }
     
 }