DataObjects/Core_company.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 7ee8b2a..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();
         }
@@ -303,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}");
             
            
             
@@ -1260,7 +1263,7 @@ class Pman_Core_UpdateDatabase extends Pman
         return $response;
     }
     
-    function verifyExtensions($extensions)
+    static function verifyExtensions($extensions)
     {
         $error = array();
         
@@ -1270,15 +1273,15 @@ class Pman_Core_UpdateDatabase extends Pman
                 continue;
             }
             
-            $error[] = "Error: Please install php {$e} extensions";
+            $error[] = "Error: Please install php extension: {$e}";
         }
         
-        print_R($error);exit;
         if(empty($error)){
-           return; 
+           return true; 
         }
+        $ff = HTML_FLexyFramework::get();
         
-        die(implode('\n', $error));
+        $ff->page->jerr(implode('\n', $error));
     }
     
 }