Changeset 3127 for trunk/lib/Doctrine.php

Timestamp:

11/10/07 19:54:34 (14 months ago)

Author:

jwage

Message:

Merged r3122:r3126

Files:

• trunk/lib/Doctrine.php (modified) (6 diffs)

trunk/lib/Doctrine.php

@@ -715 +715 @@
         $connections = $manager->getConnections();
         
+        $results = array();
+        
         foreach ($connections as $name => $connection) {
             if ( ! empty($specifiedConnections) && !in_array($name, $specifiedConnections)) {
@@ -739 +741 @@
                 // Reopen original connection with newly created database
                 $manager->openConnection(new PDO($info['dsn'], $username, $password), $name, true);
+                
+                $results[$name] = true;
             } catch (Exception $e) {
-                
+                $results[$name] = false;
             }
         }
+        
+        return $results;
     }
 
@@ -762 +768 @@
         
         $connections = $manager->getConnections();
+        
+        $results = array();
         
         foreach ($connections as $name => $connection) {
@@ -770 +778 @@
             try {
                 $connection->export->dropDatabase($name);
+                
+                $results[$name] = true;
             } catch (Exception $e) {
-                
+                $results[$name] = false;
             }
         }
+        
+        return $results;
     }
 
@@ -1048 +1060 @@
     public static function makeDirectories($path, $mode = 0777)
     {
+        if (!$path) {
+          return false;
+        }
+        
         if (is_dir($path) || is_file($path)) {
           return true;
@@ -1054 +1070 @@
         return mkdir($path, $mode, true); 
     }
+    
+    function removeDirectories($folderPath)
+    {
+        if (is_dir($folderPath))
+        {
+            foreach (scandir($folderPath) as $value)
+            {
+                if ($value != '.' && $value != '..')
+                {
+                    $value = $folderPath . "/" . $value;
+
+                    if (is_dir($value)) {
+                        self::removeDirectories($value);
+                    } else if (is_file($value)) {
+                        @unlink($value);
+                    }
+                }
+            }
+
+            return rmdir ( $folderPath );
+        } else {
+            return false;
+        }
+    }
 }