From 721a7b6e813a74f358928cab7d4552122ef611ee Mon Sep 17 00:00:00 2001
From: mlutfy <>
Date: Thu, 2 Apr 2009 16:00:05 +0000
Subject: [PATCH] allow to copy a file, say default.settings.php, to
 settings.php, by specifying only a relative path (ex: current directory), and
 not require to always browse to the current directory

---
 bureau/class/m_bro.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/bureau/class/m_bro.php b/bureau/class/m_bro.php
index b4fd248e..b14aecda 100644
--- a/bureau/class/m_bro.php
+++ b/bureau/class/m_bro.php
@@ -276,7 +276,7 @@ class m_bro {
   /* ----------------------------------------------------------------- */
   /** Retourne la taille du fichier $file
    * si $file est un dossier, retourne la taille de ce dossier et de tous
-   * ses sous dossiers (mais seulement si l'utilisateur en a fait la demande).
+   * ses sous dossiers.
    * @param string $file Fichier dont on souhaite connaitre la taille
    * @return integer Taille du fichier en octets.
    * TODO : create a du cache ...
@@ -293,11 +293,6 @@ class m_bro {
     }
   }
 
-  /* ----------------------------------------------------------------- */
-  /** Retourne la taille du repertoire $dir (fonction recursive)
-   * @param string $dir Repertoire dont on souhaite connaitre la taille
-   * @return integer Taille du repertoire en octets.
-   */
   function dirsize($dir) {
     $totalsize = 0;
 
@@ -563,7 +558,15 @@ class m_bro {
       $err->raise("bro",1);
       return false;
     }
-    $new=$this->convertabsolute($new,0);
+
+    // If the destionation (new) doesn't have an absolute path, give it the prefix (old) from the first file found
+    if ($new[0] != '/') {
+      // Ex: settings.php will become /var/alternc/html/f/foo/www/example.org/drupal-6.10/sites/default/settings.php
+      $new = $old . '/' . $new;
+    } else {
+      $new = $this->convertabsolute($new,0);
+    }
+
     if (!$new) {
       $err->raise("bro",1);
       return false;
@@ -655,6 +658,7 @@ class m_bro {
     $dest = escapeshellarg($dest);
     // TODO: write a recursive copy function(?)
     exec("cp -Rpf '$src' '$dest'", $void, $ret);
+    echo "cp -Rpf '$src' '$dest'";
     if ($ret) {
       $err->raise("bro","Errors happened while copying the source to destination. cp return value: %d", $ret);
       return false;