[evolvis-commits] r18393: upstream pending merges:↵ [#2979] Roland Mas 2012-05-11 Normalize role permissions after linking an external role into a project↵ nerville 2012-05-05 fix encoding in dirname and filename due to ZipArchive limitations↵ nerville 2012-05-05 new try to fix #314

mirabilos at evolvis.org mirabilos at evolvis.org
Fri May 11 17:15:14 CEST 2012


Author: mirabilos
Date: 2012-05-11 17:15:13 +0200 (Fri, 11 May 2012)
New Revision: 18393

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/docman/include/utils.php
   trunk/gforge_base/evolvisforge-5.1/src/common/include/RBAC.php
   trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/www/docman/view.php
Log:
upstream pending merges:
[#2979]  Roland Mas 2012-05-11 Normalize role permissions after linking an external role into a project
    nerville 2012-05-05 fix encoding in dirname and filename due to ZipArchive limitations
    nerville 2012-05-05 new try to fix #314

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/docman/include/utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/docman/include/utils.php	2012-05-11 15:15:08 UTC (rev 18392)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/docman/include/utils.php	2012-05-11 15:15:13 UTC (rev 18393)
@@ -7,6 +7,7 @@
  * Copyright 2002-2004, GForge Team
  * Copyright 2010, Franck Villaume - Capgemini
  * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
+ * Copyright 2012, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -79,7 +80,7 @@
 	}
 }
 
-/*
+/**
  * docman_fill_zip - Recursive function to add docgroup and documents inside zip for backup
  *
  * @param	$object	zip
@@ -91,18 +92,18 @@
 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) {
-			if (!$zip->addEmptyDir($parent_docname.'/'.$dg->getName()))
+			if (!$zip->addEmptyDir(iconv("UTF-8", "ASCII//TRANSLIT", $parent_docname).'/'.iconv("UTF-8", "ASCII//TRANSLIT", $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) {
-					if ( !$zip->addFromString($parent_docname.'/'.$dg->getName().'/'.$doc->getFileName(),$doc->getFileData()))
+					if (!$zip->addFromString(iconv("UTF-8", "ASCII//TRANSLIT", $parent_docname).'/'.iconv("UTF-8", "ASCII//TRANSLIT", $dg->getName()).'/'.iconv("UTF-8", "ASCII//TRANSLIT", $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(), iconv("UTF-8", "ASCII//TRANSLIT", $parent_docname).'/'.iconv("UTF-8", "ASCII//TRANSLIT", $dg->getName()));
 		}
 	}
 	return true;

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/RBAC.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/RBAC.php	2012-05-11 15:15:08 UTC (rev 18392)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/RBAC.php	2012-05-11 15:15:13 UTC (rev 18393)
@@ -299,6 +299,7 @@
 				return false;
 			}
 		}
+		$this->normalizeData();
 
 		return true ;
 	}

Modified: trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl	2012-05-11 15:15:08 UTC (rev 18392)
+++ trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl	2012-05-11 15:15:13 UTC (rev 18393)
@@ -17,7 +17,7 @@
 
 sub debug ( $ ) ;
 
-require ("/usr/share/gforge/lib/include.pl") ; # Include all the predefined functions 
+require ("/usr/share/gforge/lib/include.pl") ; # Include all the predefined functions
 
 &db_connect ;
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-05-11 15:15:08 UTC (rev 18392)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-05-11 15:15:13 UTC (rev 18393)
@@ -1,5 +1,17 @@
 fusionforge (1:5.1.1+evolvis58) xunstable; urgency=low
 
+  [ Roland Mas ]
+  * [#2979] Normalize role permissions after linking an external role
+    into a project
+
+  [ Alain Peyrat ]
+  * Fix FF #354 News appears under Forum
+
+  [ Franck Villaume ]
+  * new try to fix #314
+  * fix encoding in dirname and filename due to ZipArchive limitations
+
+  [ Thorsten Glaser ]
   * Evolvis Theme: add support for nerville’s method of making
     tooltips in the submenu, which is kinda pointless, but for
     the sake of compatibility, oh my…
@@ -9,7 +21,7 @@
     git’s, and do not display it in an IFRAME any more since we’ve got
     the backlink now
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Fri, 11 May 2012 15:31:28 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Fri, 11 May 2012 15:38:21 +0200
 
 fusionforge (1:5.1.1+evolvis57) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/docman/view.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/docman/view.php	2012-05-11 15:15:08 UTC (rev 18392)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/docman/view.php	2012-05-11 15:15:13 UTC (rev 18393)
@@ -6,6 +6,7 @@
  * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2010, Franck Villaume - Capgemini
  * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright 2012, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -98,12 +99,12 @@
 		$filename = 'docman-'.$g->getUnixName().'-'.$docid.'.zip';
 		$file = forge_get_config('data_path').'/'.$filename;
 		$zip = new ZipArchive;
-		if ( !$zip->open($file, ZIPARCHIVE::OVERWRITE)) {
+		if ( !$zip->open($file, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)) {
 			exit_error(_('Unable to open zip archive for backup'),'docman');
 		}
 
-        if ( !docman_fill_zip($zip,$nested_groups,$df))
-            exit_error(_('Unable to fill zip archive for backup'),'docman');
+		if ( !docman_fill_zip($zip,$nested_groups,$df))
+			exit_error(_('Unable to fill zip archive for backup'),'docman');
 
 		if ( !$zip->close())
 			exit_error(_('Unable to close zip archive for backup'),'docman');



More information about the evolvis-commits mailing list