Process/Php7.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index e13af7c..2385354 100644 (file)
--- 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();
@@ -842,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);
@@ -1205,7 +1214,8 @@ class Pman_Core_UpdateDatabase extends Pman
             'pdftoppm',
             'rsvg-convert',  //librsvg2-bin
             'strings',
-            'oathtool'
+            'oathtool',
+            'gifsicle', // used for gif conversions
         );
          
          
@@ -1254,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;
         }