From: Alan Knowles <alan@roojs.com>
Date: Thu, 14 Jul 2016 05:15:59 +0000 (+0800)
Subject: Merge branch 'master' of http://git.roojs.com:8081/Pman.Core
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=d61801d952d884abf30fbe70774f69ebfcfa59ad;hp=-c;p=Pman.Core

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

d61801d952d884abf30fbe70774f69ebfcfa59ad
diff --combined UpdateDatabase.php
index 72c1b9c0,ee10758d..12c4c575
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@@ -135,6 -135,14 +135,14 @@@ class Pman_Core_UpdateDatabase extends 
     
          $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 +200,6 @@@
          
          $ar = $this->modulesList();
          
-         
          foreach($ar as $m) {
              
              if(in_array($m, $this->disabled)){
@@@ -392,26 -399,11 +399,26 @@@
                      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");
                  
 -                passthru($cmd);
 +                
 +                $fp = popen($cmd, "r"); 
 +                while(!feof($fp)) 
 +                { 
 +                    // send the current file part to the browser 
 +                    $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;
 +                    
 +                    
 +                } 
 +                
              
                  
          }