X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=UpdateDatabase.php;h=2385354e5afd5049a7a2707d71e67d17d7a815c8;hb=b341a92085a9d4a5cfb1d2043e599420472aa6c8;hp=4b258b1e35cee82b325e635ca51089f9ee5751c5;hpb=6ba0e5248528d84142e71fdbd98913f7ff17416d;p=Pman.Core

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 4b258b1e..2385354e 100644
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -137,6 +137,11 @@ class Pman_Core_UpdateDatabase extends Pman
         )
     );
     
+    var $required_extensions = array(
+        'curl',
+        'gd'
+    );
+    
     function getAuth() {
         
         
@@ -161,7 +166,7 @@ class Pman_Core_UpdateDatabase extends Pman
    
         $this->checkSystem();
         
-        $this->verifyExtensions(array('curl'));
+        $this->verifyExtensions($this->required_extensions);
         
         if (class_exists('PDO_DataObjects_Introspection')) {
             PDO_DataObject_Introspection::$cache = array();
@@ -201,9 +206,11 @@ class Pman_Core_UpdateDatabase extends Pman
         
         if(empty($json['data']) || $json['data'] != 'DONE'){
             echo "\nError: Missing php extensions:\n";
-            print_r($json['errorMsg']);
+            print_r($response);
             echo "Please install the above extensions and restart the apache.\n";
-            exit;
+            sleep(5);
+            
+            //exit;
         }
         
         echo "Checking Setup Requirements\n";
@@ -840,17 +847,21 @@ class Pman_Core_UpdateDatabase extends Pman
         $c = DB_DataObject::Factory('core_company');
         $c->selectAdd();
         $c->selectAdd('distinct(comptype) as comptype');
-        $c->whereAdd("comptype != ''");
+        $c->whereAdd("
+                comptype != '' 
+            AND 
+                comptype != 'undefined' 
+            AND 
+                comptype != 'undefine'
+        ");
         
         $ctb = array();
         foreach($c->fetchAll('comptype') as $cts) {
             
-            
-            
-           $ctb[]= array( 'etype'=>'COMPTYPE', 'name' => $cts, 'display_name' => ucfirst(strtolower($cts)));
+            $ctb[]= array( 'etype'=>'COMPTYPE', 'name' => $cts, 'display_name' => ucfirst(strtolower($cts)));
         
         }
-         $c = DB_DataObject::Factory('core_enum');
+        $c = DB_DataObject::Factory('core_enum');
          
         $c->initEnums($ctb);
         //DB_DataObject::debugLevel(1);
@@ -1053,7 +1064,9 @@ class Pman_Core_UpdateDatabase extends Pman
                     in_array('STRICT_TRANS_TABLES', $modes) || 
                     !in_array('ALLOW_INVALID_DATES', $modes)
             ){
-                die("Error: set sql_mode include 'ALLOW_INVALID_DATES', remove 'NO_ZERO_IN_DATE' AND 'STRICT_TRANS_TABLES' AND 'NO_ZERO_DATE' in my.cnf\n\n");
+                die("Error: set sql_mode include 'ALLOW_INVALID_DATES', remove 'NO_ZERO_IN_DATE' AND 'STRICT_TRANS_TABLES' AND 'NO_ZERO_DATE' in my.cnf\n\n".
+                    "Recommended line: \n\nsql_mode = ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION,ALLOW_INVALID_DATES\n\n"
+                );
             }
         }
         
@@ -1201,7 +1214,8 @@ class Pman_Core_UpdateDatabase extends Pman
             'pdftoppm',
             'rsvg-convert',  //librsvg2-bin
             'strings',
-            'oathtool'
+            'oathtool',
+            'gifsicle', // used for gif conversions
         );
          
          
@@ -1250,13 +1264,14 @@ class Pman_Core_UpdateDatabase extends Pman
         echo "Clearing Database Cache\n";
         // this needs to clear it's own cache along with remote one..
   
-        
-        $response = $this->curl("http://localhost{$this->local_base_url}/Core/RefreshDatabaseCache");
+        $url = "http://localhost{$this->local_base_url}/Core/RefreshDatabaseCache";
+        $response = $this->curl($url);
         
         $json = json_decode($response, true);
         
         if(empty($json['data']) || $json['data'] != 'DONE'){
-            echo $response. "\n";
+            echo "fetching $url\n";
+            echo "GOT:" . $response. "\n";
             echo "Clear DataObjects Cache failed\n";
             exit;
         }