DataObjects/Core_company.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index c73658c..ccbc921 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -108,6 +108,9 @@ class Pman_Core_UpdateDatabase extends Pman
     
     
     var $cli = false;
+    
+    var $local_base_url = false;
+    
     function getAuth() {
         
         
@@ -132,11 +135,20 @@ class Pman_Core_UpdateDatabase extends Pman
    
         $this->checkSystem();
         
+        if (class_exists('PDO_DataObjects_Introspection')) {
+            PDO_DataObject_Introspection::$cache = array();
+        }
         
         HTML_FlexyFramework::get()->generateDataobjectsCache(true);
    
         $ff = HTML_FlexyFramework::get();
         
+        if(!isset($ff->Pman) || !isset($ff->Pman['local_base_url'])){
+            die("Please setup local_base_url");
+        }
+        
+        $this->local_base_url = $ff->Pman['local_base_url'];
+        
         if(!empty($ff->Core_Notify)){
 //            require_once 'Pman/Core/NotifySmtpCheck.php';
 //            $x = new Pman_Core_NotifySmtpCheck();
@@ -170,7 +182,6 @@ class Pman_Core_UpdateDatabase extends Pman
         
         $this->runUpdateModulesData();
         
-        
         if (!empty($opts['add-company']) && !in_array('Core', $this->disabled)) {
             // make sure we have a good cache...?
            
@@ -178,7 +189,9 @@ class Pman_Core_UpdateDatabase extends Pman
         }
         
         $this->runExtensions();
-         
+        
+        $this->generateDataobjectsCache();
+        
          
     }
     function output() {
@@ -197,7 +210,7 @@ class Pman_Core_UpdateDatabase extends Pman
         
         $ff = HTML_Flexyframework::get();
         
-        $dburl = parse_url($ff->DB_DataObject['database']);
+        $dburl = parse_url($ff->database); // used to be DB_DataObject['database'] - but not portable to PDO
         
         //$this->{'import' . $url['scheme']}($url);
         
@@ -268,9 +281,12 @@ class Pman_Core_UpdateDatabase extends Pman
             $this->{$dirmethod}($dburl, $this->rootDir. "/Pman/$m/sql");
             $this->{$dirmethod}($dburl, $this->rootDir. "/Pman/$m/{$dbtype}");
             
-            
+           
             
             if (!empty($this->opts['init']) && file_exists($this->rootDir. "/Pman/$m/{$dbtype}.initdata")) {
+                if (class_exists('PDO_DataObjects_Introspection')) {
+                    PDO_DataObject_Introspection::$cache = array();
+                }
                 HTML_FlexyFramework::get()->generateDataobjectsCache(true);
                 
                 $this->{$dirmethod}($dburl, $this->rootDir. "/Pman/$m/{$dbtype}.initdata");
@@ -281,6 +297,7 @@ class Pman_Core_UpdateDatabase extends Pman
             
         }
         
+        
     }
     
     
@@ -368,7 +385,7 @@ class Pman_Core_UpdateDatabase extends Pman
      * 
      *
      */
-    function importmysqldiri($dburl, $dir) {
+    function importmysqlidir($dburl, $dir) {
         return $this->importmysqldir($dburl, $dir);
     }
     
@@ -621,12 +638,15 @@ class Pman_Core_UpdateDatabase extends Pman
     
     function runUpdateModulesData()
     {
+        if (class_exists('PDO_DataObjects_Introspection')) {
+            PDO_DataObject_Introspection::$cache = array();
+        }
         HTML_FlexyFramework::get()->generateDataobjectsCache(true);
         
         if(!in_array('Core', $this->disabled)){
             echo "Running jsonImportFromArray\n";
             Pman_Core_UpdateDatabase::jsonImportFromArray($this->opts);
-
+            
 
             echo "Running updateData on modules\n";
             // runs core...
@@ -656,7 +676,7 @@ class Pman_Core_UpdateDatabase extends Pman
             echo "$module\n";
             $x->updateData();
         }
-                
+        
     }
     
     
@@ -863,6 +883,9 @@ class Pman_Core_UpdateDatabase extends Pman
     function updateData()
     {
         // fill i18n data..
+        if (class_exists('PDO_DataObjects_Introspection')) {
+            PDO_DataObject_Introspection::$cache = array();
+        }
         HTML_FlexyFramework::get()->generateDataobjectsCache(true);
         $this->updateDataEnums();
         $this->updateDataGroups();
@@ -1026,7 +1049,7 @@ class Pman_Core_UpdateDatabase extends Pman
         
         $ff = HTML_Flexyframework::get();
         
-        $dburl = parse_url($ff->DB_DataObject['database']);
+        $dburl = parse_url($ff->database);
         
         $dbtype = $dburl['scheme'];
        
@@ -1086,7 +1109,7 @@ class Pman_Core_UpdateDatabase extends Pman
             $fail = true;
         }
         if ($res) {
-            $this->jerr("Missing these programs - need installing\n" . implode("\n",$res));
+            die("Missing these programs - need installing\n" . implode("\n",$res). "\n");
         }
         foreach($pref as $r) {
             if (!System::which($r)) {
@@ -1102,5 +1125,49 @@ class Pman_Core_UpdateDatabase extends Pman
         
     }
     
+    function generateDataobjectsCache()
+    {
+        $url = "http://localhost{$this->local_base_url}/Core/RefreshDatabaseCache";
+            
+        $this->curl($url);
+        
+    }
+    
+    function curl($url, $request = array(), $method = 'GET') 
+    {
+        if($method == 'GET'){
+            $request = http_build_query($request);
+            $url = $url . "?" . $request;  
+        }
+        
+        $ch = curl_init($url);
+        
+        if ($method == 'POST') {
+            
+            curl_setopt($ch, CURLOPT_POST, 1);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $request);
+            
+        } else {
+            
+            curl_setopt($ch, CURLOPT_HTTPHEADER,
+                    array("Content-Type: application/x-www-form-urlencoded", "Content-Length: " . strlen($request)));
+            
+        }
+        
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        
+        curl_setopt($ch, CURLOPT_HEADER, false);
+        curl_setopt($ch, CURLOPT_VERBOSE, 0);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+
+        $response = curl_exec($ch);
+        
+        curl_close($ch);
+        
+        return $response;
+    }
+    
+    
     
 }
\ No newline at end of file