kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
mlutfy 2009-04-02 16:00:05 +00:00
parent 77d0707915
commit 721a7b6e81
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bureau/class/m_bro.php
View File

@ -276,7 +276,7 @@ class m_bro {
/* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */
/** Retourne la taille du fichier $file /** Retourne la taille du fichier $file
* si $file est un dossier, retourne la taille de ce dossier et de tous * 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 * @param string $file Fichier dont on souhaite connaitre la taille
* @return integer Taille du fichier en octets. * @return integer Taille du fichier en octets.
* TODO : create a du cache ... * 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) { function dirsize($dir) {
$totalsize = 0; $totalsize = 0;
@ -563,7 +558,15 @@ class m_bro {
$err->raise("bro",1); $err->raise("bro",1);
return false; 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) { if (!$new) {
$err->raise("bro",1); $err->raise("bro",1);
return false; return false;
@ -655,6 +658,7 @@ class m_bro {
$dest = escapeshellarg($dest); $dest = escapeshellarg($dest);
// TODO: write a recursive copy function(?) // TODO: write a recursive copy function(?)
exec("cp -Rpf '$src' '$dest'", $void, $ret); exec("cp -Rpf '$src' '$dest'", $void, $ret);
echo "cp -Rpf '$src' '$dest'";
if ($ret) { if ($ret) {
$err->raise("bro","Errors happened while copying the source to destination. cp return value: %d", $ret); $err->raise("bro","Errors happened while copying the source to destination. cp return value: %d", $ret);
return false; return false;