DataObjects/I18n.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index b53eb20..8dcb826 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -61,6 +61,13 @@ class Pman_Core_UpdateDatabase extends Pman
             'min' => 1,
             'max' => 1,
         ),
+        'procedures-only' => array(
+            'desc' => 'Only import procedures (not supported by most modules yet) - ignores sql directory',
+            'default' => '',
+            'min' => 1,
+            'max' => 1,
+        ),
+        
         
         'json-person' => array(
             'desc' => 'Person JSON file',
@@ -121,7 +128,6 @@ class Pman_Core_UpdateDatabase extends Pman
      
     function get($args, $opts)
     {
-        
         PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, array($this, 'onPearError'));
    
         
@@ -194,9 +200,12 @@ class Pman_Core_UpdateDatabase extends Pman
             (!empty($dburl['pass']) ? ' -p' . escapeshellarg($dburl['pass'])  :  '') .
             ' ' . basename($dburl['path']);
         //echo $mysql_cmd . "\n" ;
+        
+        $files = glob($dir.'/*.sql');
+        uksort($files, 'strcasecmp');
+        
        
-       
-        foreach(glob($dir.'/*.sql') as $fn) {
+        foreach($files as $fn) {
                 
                  
                 if (preg_match('/migrate/i', basename($fn))) { // skip migration scripts at present..
@@ -641,7 +650,10 @@ class Pman_Core_UpdateDatabase extends Pman
                 'name' => 'bcc-email', // group who are bcc'ed on all requests.
                 'type' => 0, // system
             ),
-            
+            array(
+                'name' => 'system-email-from',
+                'type' => 0, // system
+            ),
         ));
         
     }
@@ -672,7 +684,7 @@ class Pman_Core_UpdateDatabase extends Pman
         $c->query("
             UPDATE Companies 
                 SET
-                    comptype_id = (SELECT id FROM core_enum where etype='comptype' and name=Companies.comptype)
+                    comptype_id = (SELECT id FROM core_enum where etype='comptype' and name=Companies.comptype LIMIT 1)
                 WHERE
                     comptype_id = 0
                     AND