Merge branch 'master' of http://git.roojs.com:8081/Pman.Core

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 0336296..12c4c57 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -135,6 +135,14 @@ class Pman_Core_UpdateDatabase extends Pman
    
         $ff = HTML_FlexyFramework::get();
         
+//        if(!empty($ff->Core_Notify)){
+//            require_once 'Pman/Core/NotifySmtpCheck.php';
+//            $x = new Pman_Core_NotifySmtpCheck();
+//            $x->check();
+//        }
+//        
+//        EXIT;
+        
         $this->disabled = explode(',', $ff->disable);
         
         //$this->fixSequencesPgsql();exit;
@@ -192,7 +200,6 @@ class Pman_Core_UpdateDatabase extends Pman
         
         $ar = $this->modulesList();
         
-        
         foreach($ar as $m) {
             
             if(in_array($m, $this->disabled)){
@@ -392,7 +399,7 @@ class Pman_Core_UpdateDatabase extends Pman
                     continue;
                 }
                 
-                $cmd = "$mysql_cmd -f < " . escapeshellarg($fn) ;
+                $cmd = "$mysql_cmd -f < " . escapeshellarg($fn) ." 2>&1" ;
                 
                 echo basename($dir).'/'. basename($fn) .    '::' .  $cmd. ($this->cli ? "\n" : "<BR>\n");
                 
@@ -401,13 +408,15 @@ class Pman_Core_UpdateDatabase extends Pman
                 while(!feof($fp)) 
                 { 
                     // send the current file part to the browser 
-                    $line = fgets($fp, 1024);
-                    echo '->>> ' .  $line . " <<<---\n";
-                    echo "--";
+                    $line = trim(fgets($fp, 1024));
+                    $matches = array();
+                    if (!preg_match('/^ERROR\s+([0-9]+)/', $line, $matches)) {
+                        echo "OK - {$line}\n"; flush();
+                        continue;
+                    }
+                    print_r(array($line,$matches));exit;
                     
                     
-                    // flush the content to the browser 
-                    flush(); 
                 }