UpdateDatabase.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 0c4f672..ce2f0f6 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -94,7 +94,7 @@ class Pman_Core_UpdateDatabase extends Pman
     static function cli_opts()
     {
         
-        $ret = $this->cli_opts;
+        $ret = self::$cli_opts;
         $ff = HTML_FlexyFramework::get();
         $a = new Pman();
         $mods = $a->modulesList();
@@ -155,9 +155,9 @@ class Pman_Core_UpdateDatabase extends Pman
         if (class_exists('PDO_DataObjects_Introspection')) {
             PDO_DataObject_Introspection::$cache = array();
         }
-        
+        echo "Generate DB　cache\n";
         HTML_FlexyFramework::get()->generateDataobjectsCache(true);
-   
+        echo "Generated DB　cache\n";
         $ff = HTML_FlexyFramework::get();
         
         if(!isset($ff->Pman) || !isset($ff->Pman['local_base_url'])){
@@ -182,7 +182,7 @@ class Pman_Core_UpdateDatabase extends Pman
         }
         
         // ask all the modules to verify the opts
-        
+        echo "Checi options\n";
         $this->checkOpts($opts);
         
           
@@ -216,8 +216,9 @@ class Pman_Core_UpdateDatabase extends Pman
         
         $this->clearApacheDataobjectsCache();
         
-         
+        $this->clearApacheAssetCache();
     }
+    
     function output() {
         echo "\nUpdate Completed SUCCESS\n";
         return '';
@@ -1189,23 +1190,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 +1241,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 +1260,24 @@ class Pman_Core_UpdateDatabase extends Pman
         return $response;
     }
     
-    
+    function verifyExtensions($extensions)
+    {
+        $error = array();
+        
+        foreach ($extensions as $e){
+            
+            if(extension_loaded($e)) {
+                continue;
+            }
+            
+            $error[] = "Error: Please install php {$e} extensions";
+        }
+        
+        if(empty($error)){
+           return; 
+        }
+        
+        die(implode('\n', $error));
+    }
     
 }