[Fusionforge-commits] r11177 - in trunk/src: common/docman/include common/docman/views www/docman

Franck VILLAUME nerville at libremir.placard.fr.eu.org
Mon Oct 25 10:54:32 CEST 2010


Author: nerville
Date: 2010-10-25 10:54:31 +0200 (Mon, 25 Oct 2010)
New Revision: 11177

Modified:
   trunk/src/common/docman/include/utils.php
   trunk/src/common/docman/views/menu.php
   trunk/src/www/docman/view.php
Log:
cleanup

Modified: trunk/src/common/docman/include/utils.php
===================================================================
--- trunk/src/common/docman/include/utils.php	2010-10-24 16:54:04 UTC (rev 11176)
+++ trunk/src/common/docman/include/utils.php	2010-10-25 08:54:31 UTC (rev 11177)
@@ -6,7 +6,7 @@
  * Copyright 1999-2001, VA Linux Systems
  * Copyright 2000, Quentin Cregan/SourceForge
  * Copyright 2002-2004, GForge Team
- * Copyright 2010, Franck Villaume
+ * Copyright 2010, Franck Villaume - Capgemini
  *
  * This file is part of FusionForge.
  *
@@ -89,18 +89,21 @@
  * @param	$integer	documentgroup id : default value = 0
  * @param	$string		documentgroup parent name : default value = empty
  */
-function docman_fill_zip($zip,$nested_groups,$document_factory,$docgroup = 0,$parent_docname = '') {
+function docman_fill_zip($zip, $nested_groups, $document_factory, $docgroup = 0, $parent_docname = '') {
 	if (is_array(@$nested_groups[$docgroup])) {
 		foreach ($nested_groups[$docgroup] as $dg) {
-			$zip->addEmptyDir($parent_docname.'/'.$dg->getName());
+            if (!$zip->addEmptyDir($parent_docname.'/'.$dg->getName()))
+                return false;
+
 			$document_factory->setDocGroupID($dg->getID());
 			$docs = $document_factory->getDocuments();
 			if (is_array($docs) && count($docs) > 0) {      // this group has documents
 				foreach ($docs as $doc) {
-					$zip->addFromString($parent_docname.'/'.$dg->getName().'/'.$doc->getFileName(),$doc->getFileData());
+                    if ( !$zip->addFromString($parent_docname.'/'.$dg->getName().'/'.$doc->getFileName(),$doc->getFileData()))
+                        return false;
 				}
 			}
-			docman_fill_zip($zip,$nested_groups,$document_factory,$dg->getID(),$parent_docname.'/'.$dg->getName());
+			docman_fill_zip($zip, $nested_groups, $document_factory, $dg->getID(), $parent_docname.'/'.$dg->getName());
 		}
 	}
 	return true;

Modified: trunk/src/common/docman/views/menu.php
===================================================================
--- trunk/src/common/docman/views/menu.php	2010-10-24 16:54:04 UTC (rev 11176)
+++ trunk/src/common/docman/views/menu.php	2010-10-25 08:54:31 UTC (rev 11177)
@@ -6,7 +6,7 @@
  * Copyright 1999-2001, VA Linux Systems
  * Copyright 2000, Quentin Cregan/SourceForge
  * Copyright 2002-2004, GForge Team
- * Copyright 2010, Franck Villaume
+ * Copyright 2010, Franck Villaume - Capgemini
  *
  * This file is part of FusionForge.
  *
@@ -30,6 +30,7 @@
 global $HTML; // html object
 global $d_arr; // document array
 global $group_id; // id of group
+global $g; // project group object
 
 /* create the submenu following role, rules and content */
 $menu_text=array();

Modified: trunk/src/www/docman/view.php
===================================================================
--- trunk/src/www/docman/view.php	2010-10-24 16:54:04 UTC (rev 11176)
+++ trunk/src/www/docman/view.php	2010-10-25 08:54:31 UTC (rev 11177)
@@ -103,11 +103,11 @@
 			exit_error(_('Unable to open zip archive for backup'),'docman');
 		}
 
-		docman_fill_zip($zip,$nested_groups,$df);
+        if ( !docman_fill_zip($zip,$nested_groups,$df))
+            exit_error(_('Unable to fill zip archive for backup'),'docman');
 
-		if ( !$zip->close()) {
+		if ( !$zip->close())
 			exit_error(_('Unable to close zip archive for backup'),'docman');
-		}
 
 		Header ('Content-disposition: filename="'.$filename.'"');
 		Header ('Content-type: application/binary');




More information about the Fusionforge-commits mailing list