[Fusionforge-commits] FusionForge branch Branch_5_3 updated. e7d568d1b387245b5b2e3afab19d416708943907

[Franck Villaume]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_3 has been updated
       via  e7d568d1b387245b5b2e3afab19d416708943907 (commit)
      from  bb26f2108a8535f7345c8d4e15ba51fabc9890c9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e7d568d1b387245b5b2e3afab19d416708943907
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Mar 21 12:25:43 2015 +0100

    fix [#763]: move files to fs script: variable was overwritten in the loop. thank to Markus Köhl for reporting and providing the fix

diff --git a/src/CHANGES b/src/CHANGES
index 9a291c1..dd71232 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -6,6 +6,7 @@ Fusionforge-5.3.3:
 * SCM stats: fix order in stats block [#736] (TrivialDev)
 * System replication: refresh nscd cache before applying changes, fix spurious warning output from cron jobs (Inria)
 * Docman: fix edit file when filename has quote [#750] (TrivialDev)
+* Docman: fix move to files to fs script [#763] (TrivialDev)
 * FRS: wrong tooltip displayed in admin page [#703] (TrivialDev)
 * PM: fix test on success [#762] (TrivialDev)
 * Plugin AuthLDAP: error and warning messages displayed twice [#732] (TrivialDev)
diff --git a/src/db/20120603-docman-file-moved-in-fs.php b/src/db/20120603-docman-file-moved-in-fs.php
index 91ab2b9..7240e3b 100644
--- a/src/db/20120603-docman-file-moved-in-fs.php
+++ b/src/db/20120603-docman-file-moved-in-fs.php
@@ -35,14 +35,14 @@ if (!$res) {
 	exit(1);
 }
 
-$data = forge_get_config('data_path');
-if (!is_dir($data)) {
-	system("mkdir -p $data");
-	system("chmod 0755 $data");
+$datadir = forge_get_config('data_path');
+if (!is_dir($datadir)) {
+	system("mkdir -p $datadir");
+	system("chmod 0755 $datadir");
 }
-if (!is_dir("$data/docman")) {
-	system("mkdir $data/docman");
-	system("chmod 0700 $data/docman");
+if (!is_dir("$datadir/docman")) {
+	system("mkdir $datadir/docman");
+	system("chmod 0700 $datadir/docman");
 }
 
 $ds = new DocumentStorage();
@@ -76,6 +76,6 @@ while($row = db_fetch_array($res)) {
 
 $ds->commit();
 
-system("chown -R ".forge_get_config('apache_user').':'.forge_get_config('apache_group')." $data/docman");
+system("chown -R ".forge_get_config('apache_user').':'.forge_get_config('apache_group')." $datadir/docman");
 
 echo "SUCCESS\n";

-----------------------------------------------------------------------

Summary of changes:
 src/CHANGES                                 |    1 +
 src/db/20120603-docman-file-moved-in-fs.php |   16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
FusionForge