php7 fixes

[Pman.Builder] / Generator.php

diff --git a/Generator.php b/Generator.php
index eb3b5ee..bd15eaf 100644 (file)
--- a/Generator.php
+++ b/Generator.php
@@ -91,7 +91,9 @@ class Pman_Builder_Generator extends DB_DataObject_Generator
         
         $proj = 'pman'; //ucfirst(basename($options['database']));
         // we are going to generate all of the code into a temporay foldler..
-        $options['rootDir'] = ini_get('session.save_path').'/temp_'. $proj;
+        $user = posix_getpwuid(posix_getuid());
+        
+        $options['rootDir'] = ini_get('session.save_path').'/temp_'. $proj.'_'. $user['name'];
         $options['cli'] = $cli;
         $options['mods'] = empty($mods) ? array() : explode('/',$mods);
        
@@ -222,7 +224,8 @@ class Pman_Builder_Generator extends DB_DataObject_Generator
         require_once 'System.php';
         $cat = System::which('cat');
         $mysql = System::which('mysql');
-        print_r($options['mods'] );
+        //print_r($ff);
+        //print_r($options['mods'] );
         foreach($this->modsql as $m => $fl)
         {
             if ($cli && isset($options['database_'. $m])) {
@@ -329,7 +332,7 @@ class Pman_Builder_Generator extends DB_DataObject_Generator
             $this->scanModules();
         }
          $options = &PEAR::getStaticProperty('DB_DataObject','options');
-        $builder_options = &PEAR::getStaticProperty('Pman_Builder','options');
+        $builder_options = PEAR::getStaticProperty('Pman_Builder','options');
         $ignore = empty($builder_options['skip_tables']) ? array() : $builder_options['skip_tables'];
         
          $mods = $options['mods'];
@@ -344,7 +347,7 @@ class Pman_Builder_Generator extends DB_DataObject_Generator
             
             if (!isset($this->modmap[$tn])) {
                 
-                if (in_array($tn, $builder_options)) {
+                if (in_array($this->table, $ignore)) {
                     continue;
                 }
              
@@ -507,8 +510,8 @@ touch Pman/????/DataObjects/".ucfirst($this->table).".php
     
     function _generateReaders($m)
     {
-         
-        $udb = ucfirst($this->_database);
+        $ff = HTML_FlexyFramework::get();
+        
         $ret = $this->jsHeader;
         $j = new Pman_Builder_Generator_JSON();
         $j->indent = 0;
@@ -532,7 +535,7 @@ touch Pman/????/DataObjects/".ucfirst($this->table).".php
                 }
             }
             $this->readersArgs[$this->table]['xtype'] = 'JsonReader';
-            $ret.="\n$udb.Readers.$utable = ";
+            $ret.="\n{$ff->project}.Readers.$utable = ";
             $x = $j->encodeUnsafe($this->readersArgs[$this->table]);
             $ret .=  trim(substr($x, 0, -1)) . ",\n"; // strip of trailing ;};
             $ret .=  $j->tab . "fields : [\n". $j->tab.$j->tab;