[Fusionforge-commits] r11532 - in trunk/src: . common/docman common/docman/actions common/docman/engine common/docman/include common/docman/views plugins/blocks/www www/docman

Franck VILLAUME nerville at libremir.placard.fr.eu.org
Sun Nov 14 15:05:07 CET 2010


Author: nerville
Date: 2010-11-14 15:05:07 +0100 (Sun, 14 Nov 2010)
New Revision: 11532

Modified:
   trunk/src/CHANGES
   trunk/src/common/docman/Document.class.php
   trunk/src/common/docman/DocumentFactory.class.php
   trunk/src/common/docman/DocumentGroup.class.php
   trunk/src/common/docman/DocumentGroupFactory.class.php
   trunk/src/common/docman/Parsedata.class.php
   trunk/src/common/docman/actions/addfile.php
   trunk/src/common/docman/actions/addsubdocgroup.php
   trunk/src/common/docman/actions/deldir.php
   trunk/src/common/docman/actions/editdocgroup.php
   trunk/src/common/docman/actions/editfile.php
   trunk/src/common/docman/actions/enforcereserve.php
   trunk/src/common/docman/actions/forcereindexenginesearch.php
   trunk/src/common/docman/actions/lockfile.php
   trunk/src/common/docman/actions/monitorfile.php
   trunk/src/common/docman/actions/releasefile.php
   trunk/src/common/docman/actions/reservefile.php
   trunk/src/common/docman/actions/trashdir.php
   trunk/src/common/docman/actions/trashfile.php
   trunk/src/common/docman/actions/updatecreateonline.php
   trunk/src/common/docman/actions/updateenginesearch.php
   trunk/src/common/docman/actions/updatewebdavinterface.php
   trunk/src/common/docman/engine/parser_doc.php
   trunk/src/common/docman/engine/parser_html.php
   trunk/src/common/docman/engine/parser_list.txt
   trunk/src/common/docman/engine/parser_oo.php
   trunk/src/common/docman/engine/parser_pdf.php
   trunk/src/common/docman/engine/parser_text.inc.php
   trunk/src/common/docman/engine/parser_text.php
   trunk/src/common/docman/include/DocumentGroupHTML.class.php
   trunk/src/common/docman/include/utils.php
   trunk/src/common/docman/views/addfile.php
   trunk/src/common/docman/views/addsubdocgroup.php
   trunk/src/common/docman/views/editdocgroup.php
   trunk/src/common/docman/views/editfile.php
   trunk/src/common/docman/views/help.php
   trunk/src/common/docman/views/listfile.php
   trunk/src/common/docman/views/listpendingfile.php
   trunk/src/common/docman/views/listtrashfile.php
   trunk/src/common/docman/views/menu.php
   trunk/src/common/docman/views/views.php
   trunk/src/plugins/blocks/www/index.php
   trunk/src/www/docman/index.php
   trunk/src/www/docman/view.php
Log:
minor various cleanup & activate block plugin in help page

Modified: trunk/src/CHANGES
===================================================================
--- trunk/src/CHANGES	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/CHANGES	2010-11-14 14:05:07 UTC (rev 11532)
@@ -24,6 +24,7 @@
 * Unified configuration system, now using standard *.ini files (Roland
   Mas)
 * Reorganised, modular Apache configuration (Roland Mas)
+* New User Widget : documents monitoring (Capgemini)
 
 FusionForge-5.0.2:
 * Maintenance release, bugfixes mostly.

Modified: trunk/src/common/docman/Document.class.php
===================================================================
--- trunk/src/common/docman/Document.class.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/Document.class.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -6,6 +6,7 @@
  * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2009, Roland Mas
  * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -171,7 +172,7 @@
 						$kwords,
                         $user_id));
 		if (!$result) {
-			$this->setError(_('Error Adding Document: ').db_error().$result);
+			$this->setError(_('Error Adding Document:').' '.db_error().$result);
 			db_rollback();
 			return false;
 		}
@@ -184,7 +185,7 @@
                 array(base64_encode($data),
                     $docid));
 		    if (!$result) {
-			    $this->setError(_('Error Adding Document: ').db_error().$result);
+			    $this->setError(_('Error Adding Document:').' '.db_error().$result);
 			    db_rollback();
 			    return false;
 		    }
@@ -769,15 +770,20 @@
 			$BCC .= $this->getMonitoredUserEmailAddress();
 		}
 		if (strlen($BCC) > 0) {
-			$subject = '['.$this->Group->getPublicName().'] New document - '.$this->getName();
-			$body = "Project: ".$this->Group->getPublicName()."\n";
-			$body .= "Group: ".$groupname."\n";
-			$body .= "Document title: ".$this->getName()."\n";
-			$body .= "Document description: ".util_unconvert_htmlspecialchars( $this->getDescription() )."\n";
-			$body .= "Submitter: ".$this->getCreatorRealName()." (".$this->getCreatorUserName().") \n";
-			$body .= "\n\n-------------------------------------------------------".
-				"\nFor more info, visit:".
-				"\n\n" . util_make_url('/docman/index.php?group_id='.$this->Group->getID());
+			if ($new) {
+				$status = _('New document');
+			} else {
+				$status = _('Updated document');
+			}
+			$subject = '['.$this->Group->getPublicName().'] '.$status.' - '.$this->getName();
+			$body = _('Project:').' '.$this->Group->getPublicName()."\n";
+			$body .= _('Directory:').' '.$this->getDocGroupName()."\n";
+			$body .= _('Document title:').' '.$this->getName()."\n";
+			$body .= _('Document description:').' '.util_unconvert_htmlspecialchars( $this->getDescription() )."\n";
+			$body .= _('Submitter:').' '.$this->getCreatorRealName()." (".$this->getCreatorUserName().") \n";
+			$body .= "\n\n-------------------------------------------------------\n".
+				_('For more info, visit:').
+				"\n\n" . util_make_url('/docman/?group_id='.$this->Group->getID().'&view=listfile&dirid='.$this->getDocGroupID());
 
 			util_send_message('',$subject,$body,'',$BCC);
 		}
@@ -798,7 +804,7 @@
 		$result = db_query_params ('DELETE FROM doc_data WHERE docid=$1',
 					   array ($this->getID())) ;
 		if (!$result) {
-			$this->setError(_('Error Deleting Document: ').db_error());
+			$this->setError(_('Error Deleting Document:').' '.db_error());
 			db_rollback();
 			return false;
 		}

Modified: trunk/src/common/docman/DocumentFactory.class.php
===================================================================
--- trunk/src/common/docman/DocumentFactory.class.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/DocumentFactory.class.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -5,6 +5,7 @@
  * Copyright 2000, Quentin Cregan/Sourceforge
  * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2009, Roland Mas
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *

Modified: trunk/src/common/docman/DocumentGroup.class.php
===================================================================
--- trunk/src/common/docman/DocumentGroup.class.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/DocumentGroup.class.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -5,6 +5,8 @@
  * Copyright 2000, Quentin Cregan/Sourceforge
  * Copyright 2002, Tim Perdue/GForge, LLC
  * Copyright 2009, Roland Mas
+ * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -56,12 +58,12 @@
 
 		//was Group legit?
 		if (!$Group || !is_object($Group)) {
-			$this->setError(_('DocumentGroup: No Valid Group'));
+			$this->setError(_('Document Directory: No Valid Project'));
 			return false;
 		}
 		//did Group have an error?
 		if ($Group->isError()) {
-			$this->setError('DocumentGroup: '.$Group->getErrorMessage());
+			$this->setError(_('Document Directory:').' '.$Group->getErrorMessage());
 			return false;
 		}
 		$this->Group =& $Group;
@@ -104,7 +106,7 @@
 						array ($parent_doc_group,
 						       $this->Group->getID())) ;
 			if (!$res || db_numrows($res) < 1) {
-				$this->setError(_('DocumentGroup: Invalid DocumentGroup parent ID'));
+				$this->setError(_('DocumentGroup: Invalid Document Directory parent ID'));
 				return false;
 			}
 		} else {
@@ -134,7 +136,7 @@
 		if ($result && db_affected_rows($result) > 0) {
 			$this->clearError();
 		} else {
-			$this->setError(_('DocumentGroup::create() Error Adding Group: ').db_error());
+			$this->setError(_('DocumentGroup::create() Error Adding Directory:').' '.db_error());
 			return false;
 		}
 
@@ -198,7 +200,7 @@
 		$res = db_query_params ('SELECT * FROM doc_groups WHERE doc_group=$1',
 					array ($id)) ;
 		if (!$res || db_numrows($res) < 1) {
-			$this->setError(_('DocumentGroup: Invalid DocumentGroup ID'));
+			$this->setError(_('DocumentGroup: Invalid Document Directory ID'));
 			return false;
 		}
 		$this->data_array = db_fetch_array($res);
@@ -274,7 +276,7 @@
 						array ($parent_doc_group,
 						       $this->Group->getID())) ;
 			if (!$res || db_numrows($res) < 1) {
-				$this->setError(_('DocumentGroup: Invalid DocumentGroup parent ID'));
+				$this->setError(_('DocumentGroup: Invalid Document Directory parent ID'));
 				return false;
 			}
 		} else {
@@ -286,7 +288,7 @@
 						$parent_doc_group,
 						$this->Group->getID()));
 		if ($res && db_numrows($res) > 0) {
-			$this->setError(_("Group name already exists"));
+			$this->setError(_('Directory name already exists'));
 			return false;
 		}
 
@@ -298,7 +300,7 @@
 		if ($result && db_affected_rows($result) > 0) {
 			return true;
 		} else {
-			$this->setOnUpdateError(_('DocumentGroup: ').db_error());
+			$this->setOnUpdateError(_('DocumentGroup:').' '.db_error());
 			return false;
 		}
 	}
@@ -389,7 +391,7 @@
 								array ($stateid,$this->getID(),$this->Group->getID()));
 
 		if (!$res || db_affected_rows($res) < 1) {
-			$this->setOnUpdateError(_('DocumentGroup :').db_error());
+			$this->setOnUpdateError(_('DocumentGroup:').' '.db_error());
 			return false;
 		}
 		return true;

Modified: trunk/src/common/docman/DocumentGroupFactory.class.php
===================================================================
--- trunk/src/common/docman/DocumentGroupFactory.class.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/DocumentGroupFactory.class.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -6,6 +6,7 @@
  * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2009, Roland Mas
  * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -30,7 +31,6 @@
 */
 
 require_once $gfcommon.'include/Error.class.php';
-require_once $gfcommon.'forum/ForumMessage.class.php';
 
 class DocumentGroupFactory extends Error {
 	/**
@@ -57,11 +57,11 @@
 		$this->Error();
 		
 		if (!$Group || !is_object($Group)) {
-			$this->setError(_("DocumentGroupFactory:: Invalid Group"));
+			$this->setError(_("DocumentGroupFactory:: Invalid Project"));
 			return false;
 		}
 		if ($Group->isError()) {
-			$this->setError('DocumentGroupFactory:: '.$Group->getErrorMessage());
+			$this->setError('DocumentGroupFactory::'.' '.$Group->getErrorMessage());
 			return false;
 		}
 		$this->Group =& $Group;
@@ -85,7 +85,7 @@
 		$rows = db_numrows($result);
 		
 		if (!$result) {
-			$this->setError(_('No DocumentGroup Found ').db_error());
+			$this->setError(_('No Document Directory Found').' '.db_error());
 			return false;
 		} else {
 			while ($arr = db_fetch_array($result)) {
@@ -119,7 +119,7 @@
 		$rows = db_numrows($result);
 
 		if (!$result || $rows < 1) {
-			$this->setError(_('No DocumentGroup Found ').db_error());
+			$this->setError(_('No Document Directory Found').' '.db_error());
 			return false;
 		} else {
 			while ($arr = db_fetch_array($result)) {

Modified: trunk/src/common/docman/Parsedata.class.php
===================================================================
--- trunk/src/common/docman/Parsedata.class.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/Parsedata.class.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -4,6 +4,7 @@
  *
  * Copyright 2005, Fabio Bertagnin
  * Copyright 2009-2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *

Modified: trunk/src/common/docman/actions/addfile.php
===================================================================
--- trunk/src/common/docman/actions/addfile.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/addfile.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,11 +1,11 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
  * Copyright 2000, Quentin Cregan/Sourceforge
  * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -44,7 +44,7 @@
 
 if (!$doc_group || $doc_group == 100) {
 	//cannot add a doc unless an appropriate group is provided		
-    $return_msg= _('No valid Document Group was selected.');
+    $return_msg= _('No valid Document Directory was selected.');
     session_redirect('/docman/?group_id='.$group_id.'&error_msg='.urlencode($return_msg));
 }
 	

Modified: trunk/src/common/docman/actions/addsubdocgroup.php
===================================================================
--- trunk/src/common/docman/actions/addsubdocgroup.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/addsubdocgroup.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,11 +1,11 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
  * Copyright 2000, Quentin Cregan/Sourceforge
  * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -49,10 +49,10 @@
 		session_redirect('/docman/?group_id='.$group_id.'&error_msg='.urlencode($dg->getErrorMessage()));
 
 	if ($dirid) {
-		$return_msg = _('Document Sub Group successfully created');
+		$return_msg = _('Document Sub Directory successfully created');
 		session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&feedback='.urlencode($return_msg));
 	} else {
-		$return_msg = _('Document Group successfully created');
+		$return_msg = _('Document Directory successfully created');
 		session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dg->getID().'&feedback='.urlencode($return_msg));
 	}
 }

Modified: trunk/src/common/docman/actions/deldir.php
===================================================================
--- trunk/src/common/docman/actions/deldir.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/deldir.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,11 +1,11 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
  * Copyright 2000, Quentin Cregan/Sourceforge
  * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -31,7 +31,7 @@
 global $group_id; // id of group
 
 if (!forge_check_perm('docman', $group_id, 'approve')) {
-	$return_msg = _('Document Action Denied');
+	$return_msg = _('Docman Action Denied');
 	session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&warning_msg='.urlencode($return_msg));
 } else {
 
@@ -42,7 +42,7 @@
 	if (!$dg->delete($dirid,$group_id))
 	    session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&error_msg='.urlencode($dg->getErrorMessage()));
 
-	$return_msg = _('Document Group deleted successfully');
+	$return_msg = _('Document Directory deleted successfully');
 	session_redirect('/docman/?group_id='.$group_id.'&feedback='.urlencode($return_msg));
 }
 ?>

Modified: trunk/src/common/docman/actions/editdocgroup.php
===================================================================
--- trunk/src/common/docman/actions/editdocgroup.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/editdocgroup.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
@@ -40,6 +39,6 @@
 if (!$dg->update($groupname,$parent_dirid))
     session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&error_msg='.urlencode($dg->getErrorMessage()));
 
-$return_msg = _('Document Group Updated successfully');
+$return_msg = _('Document Directory Updated successfully');
 session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&feedback='.urlencode($return_msg));
 ?>

Modified: trunk/src/common/docman/actions/editfile.php
===================================================================
--- trunk/src/common/docman/actions/editfile.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/editfile.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *

Modified: trunk/src/common/docman/actions/enforcereserve.php
===================================================================
--- trunk/src/common/docman/actions/enforcereserve.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/enforcereserve.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,9 +1,9 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
  * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -29,7 +29,7 @@
 global $group_id; // id of group
 
 if (!forge_check_perm ('docman', $group_id, 'admin')) {
-	$return_msg = _('Document Action Denied');
+	$return_msg = _('Docman Action Denied');
 	session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&warning_msg='.urlencode($return_msg));
 } else {
 

Modified: trunk/src/common/docman/actions/forcereindexenginesearch.php
===================================================================
--- trunk/src/common/docman/actions/forcereindexenginesearch.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/forcereindexenginesearch.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,9 +1,9 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
  * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *

Modified: trunk/src/common/docman/actions/lockfile.php
===================================================================
--- trunk/src/common/docman/actions/lockfile.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/lockfile.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -29,7 +29,7 @@
 global $LUSER; // User object
 
 if (!forge_check_perm ('docman', $group_id, 'approve')) {
-	$return_msg = _('Document Action Denied');
+	$return_msg = _('Docman Action Denied');
 	session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&warning_msg='.urlencode($return_msg));
 } else {
 

Modified: trunk/src/common/docman/actions/monitorfile.php
===================================================================
--- trunk/src/common/docman/actions/monitorfile.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/monitorfile.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -29,7 +29,7 @@
 global $LUSER; // User object
 
 if (!forge_check_perm ('docman', $group_id, 'approve')) {
-	$return_msg = _('Document Action Denied');
+	$return_msg = _('Docman Action Denied');
 	session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&warning_msg='.urlencode($return_msg));
 } else {
 

Modified: trunk/src/common/docman/actions/releasefile.php
===================================================================
--- trunk/src/common/docman/actions/releasefile.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/releasefile.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
@@ -29,7 +28,7 @@
 global $group_id; // id of group
 
 if (!forge_check_perm ('docman', $group_id, 'approve')) {
-	$return_msg = _('Document Action Denied');
+	$return_msg = _('Docman Action Denied');
 	session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&warning_msg='.urlencode($return_msg));
 } else {
 

Modified: trunk/src/common/docman/actions/reservefile.php
===================================================================
--- trunk/src/common/docman/actions/reservefile.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/reservefile.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
@@ -30,7 +29,7 @@
 global $LUSER; // User object
 
 if (!forge_check_perm ('docman', $group_id, 'approve')) {
-	$return_msg = _('Document Action Denied');
+	$return_msg = _('Docman Action Denied');
 	session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&warning_msg='.urlencode($return_msg));
 } else {
 

Modified: trunk/src/common/docman/actions/trashdir.php
===================================================================
--- trunk/src/common/docman/actions/trashdir.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/trashdir.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,11 +1,11 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
  * Copyright 2000, Quentin Cregan/Sourceforge
  * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -41,7 +41,7 @@
 	/* Get the document groups info */
 	$trashnested_groups =& $dgf->getNested();
 	$trashnested_docs=array();
-	/* put the doc objects into an array keyed off the docgroup */
+	/* put the doc objects into an array keyed of the docgroup */
 	foreach ($d_arr as $doc) {
 		$trashnested_docs[$doc->getDocGroupID()][] = $doc;
 	}
@@ -53,7 +53,7 @@
 	$dg = new DocumentGroup($g,$dirid);
 	$dg->setStateID('2');
 
-	$return_msg = _('Document Group moved to trash successfully');
+	$return_msg = _('Document Directory moved to trash successfully');
 	session_redirect('/docman/?group_id='.$group_id.'&feedback='.urlencode($return_msg));
 }
 ?>

Modified: trunk/src/common/docman/actions/trashfile.php
===================================================================
--- trunk/src/common/docman/actions/trashfile.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/trashfile.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,11 +1,11 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
  * Copyright 2000, Quentin Cregan/Sourceforge
  * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -31,7 +31,7 @@
 global $group_id; // id of group
 
 if (!forge_check_perm ('docman', $group_id, 'approve')) {
-	$return_msg = _('Document Action Denied');
+	$return_msg = _('Docman Action Denied');
 	session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&warning_msg='.urlencode($return_msg));
 } else {
 

Modified: trunk/src/common/docman/actions/updatecreateonline.php
===================================================================
--- trunk/src/common/docman/actions/updatecreateonline.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/updatecreateonline.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,9 +1,9 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
  * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *

Modified: trunk/src/common/docman/actions/updateenginesearch.php
===================================================================
--- trunk/src/common/docman/actions/updateenginesearch.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/updateenginesearch.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,9 +1,9 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
  * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *

Modified: trunk/src/common/docman/actions/updatewebdavinterface.php
===================================================================
--- trunk/src/common/docman/actions/updatewebdavinterface.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/actions/updatewebdavinterface.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -3,6 +3,7 @@
  * FusionForge Documentation Manager
  *
  * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *

Modified: trunk/src/common/docman/engine/parser_doc.php
===================================================================
--- trunk/src/common/docman/engine/parser_doc.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/engine/parser_doc.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -4,6 +4,7 @@
  * FusionForge document search engine
  *
  * Copyright 2005, Fabio Bertagnin
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *

Modified: trunk/src/common/docman/engine/parser_html.php
===================================================================
--- trunk/src/common/docman/engine/parser_html.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/engine/parser_html.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -5,6 +5,7 @@
  *
  * Copyright 2005, Fabio Bertagnin
  * Copyright 2009-2010, Franck Villaume
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *

Modified: trunk/src/common/docman/engine/parser_list.txt
===================================================================
--- trunk/src/common/docman/engine/parser_list.txt	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/engine/parser_list.txt	2010-11-14 14:05:07 UTC (rev 11532)
@@ -4,6 +4,7 @@
 #
 # Copyright 2005, Fabio Bertagnin
 # Copyright 2009-2010, Franck Villaume
+# http://fusionforge.org
 #
 # This file is part of FusionForge.
 #

Modified: trunk/src/common/docman/engine/parser_oo.php
===================================================================
--- trunk/src/common/docman/engine/parser_oo.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/engine/parser_oo.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -4,6 +4,7 @@
  * FusionForge document search engine
  *
  * Copyright 2010, Franck Villaume
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *

Modified: trunk/src/common/docman/engine/parser_pdf.php
===================================================================
--- trunk/src/common/docman/engine/parser_pdf.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/engine/parser_pdf.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -5,6 +5,7 @@
  *
  * Copyright 2005, Fabio Bertagnin
  * Copyright 2009-2010, Franck Villaume
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *

Modified: trunk/src/common/docman/engine/parser_text.inc.php
===================================================================
--- trunk/src/common/docman/engine/parser_text.inc.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/engine/parser_text.inc.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -3,6 +3,7 @@
  * FusionForge document search engine
  *
  * Copyright 2005, Fabio Bertagnin
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *

Modified: trunk/src/common/docman/engine/parser_text.php
===================================================================
--- trunk/src/common/docman/engine/parser_text.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/engine/parser_text.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -5,6 +5,7 @@
  *
  * Copyright 2005, Fabio Bertagnin
  * Copyright 2009-2010, Franck Villaume
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *

Modified: trunk/src/common/docman/include/DocumentGroupHTML.class.php
===================================================================
--- trunk/src/common/docman/include/DocumentGroupHTML.class.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/include/DocumentGroupHTML.class.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -36,7 +36,7 @@
 		$this->Error();
 		
 		if (!$Group || !is_object($Group)) {
-			$this->setError("DocumentGroupHTML:: Invalid Group");
+			$this->setError(_('DocumentGroupHTML:: Invalid Project'));
 			return false;
 		}
 		if ($Group->isError()) {
@@ -45,52 +45,10 @@
 		}
 		$this->Group =& $Group;
 
-
 		return true;
 	}
 
 	/**
-	 * showTableNestedGroups - Display the tree of document groups
-	 *
-	 * This is a recursive function that is used to display the tree
-	 *
-	 * @param array Array of groups. This array contains information about the groups and their childs.
-	 * @param int The number of row that is currently being showed. It is used for formatting purposes
-	 * @param int The ID of the parent whose childs are being showed (0 for root groups)
-	 * @param int The current level
-	 */
-	function showTableNestedGroups (&$group_arr, &$rowno, $parent=0, $level=0) {
-		// No childs to display
-		if (!is_array($group_arr) || !array_key_exists("$parent", $group_arr)) return;
-
-		$child_count = count($group_arr["$parent"]);
-		for ($i = 0; $i < $child_count; $i++) {
-			$rowno++;
-			$doc_group =& $group_arr["$parent"][$i];
-			
-			$margin = str_repeat("&nbsp;&nbsp;&nbsp;", $level);
-			
-			$img = "cfolder15.png";
-/*
-			// Display the folder icon opened or closed?
-			if (array_key_exists("".$doc_group->getID(),$group_arr)) $img = "ofolder15.png";
-			else $img = "cfolder15.png";
-*/
-
-			echo '<tr '. $GLOBALS['HTML']->boxGetAltRowStyle($rowno) .'>'.
-				'<td>'.$doc_group->getID().'</td>'.
-				'<td>'.$margin.html_image('ic/'.$img,"15","13",array("border"=>"0")).' '.
-				'<a href="index.php?editgroup=1&amp;doc_group='.
-					$doc_group->getID().'&amp;group_id='.$doc_group->Group->getID().'">'.
-					$doc_group->getName().'</a></td>'.
-				'<td><a href="index.php?deletegroup=1&amp;doc_group='.$doc_group->getID().'&amp;group_id='.$doc_group->Group->getID().'">'.
-				'<img src="/images/ic/trash.png"/></a></td></tr>';
-			// Show childs (if any)
-			$this->showTableNestedGroups($group_arr, $rowno, $doc_group->getID(), $level+1);
-		}
-	}
-	
-	/**
 	 * showSelectNestedGroups - Display the tree of document groups inside a <select> tag
 	 *
 	 * @param array	Array of groups.

Modified: trunk/src/common/docman/include/utils.php
===================================================================
--- trunk/src/common/docman/include/utils.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/include/utils.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
@@ -7,6 +6,7 @@
  * Copyright 2000, Quentin Cregan/SourceForge
  * Copyright 2002-2004, GForge Team
  * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -213,8 +213,14 @@
 
 ?>
 <div class="docmanDivIncluded">
-<p>
-<?php echo _("<strong>Document Title</strong>:  Refers to the relatively brief title of the document (e.g. How to use the download server)<br /><strong>Description:</strong> A brief description to be placed just under the title.") ?>
+<p><strong>
+<?php echo _('Document Title:') ?>
+</strong>
+<?php echo _(' Refers to the relatively brief title of the document (e.g. How to use the download server).') ?>
+</p><p><strong>
+<?php echo _('Description:') ?>
+</strong>
+<?php echo _(' A brief description to be placed just under the title.') ?>
 </p>
 <?php
 	if ($g->useDocmanSearch())
@@ -289,18 +295,15 @@
 		    	</tr>';
 		}
 	}
-
 ?>
-
     <tr>
 		<td style="text-align:right;">
-            <strong><?php echo _('Group that document belongs in') ?></strong>
+            <strong><?php echo _('Directory that document belongs in') ?></strong>
         </td>
         <td>
             <?php $dgh->showSelectNestedGroups($dgf->getNested(), 'doc_group', false, $document->getDocGroupID()); ?>
         </td>
     </tr>
-
     <tr>
 		<td style="text-align:right;">
             <strong><?php echo _('State') ?></strong>
@@ -339,7 +342,6 @@
     <input type="submit" id="submiteditdata<?php echo $document->getID(); ?>" value="<?php echo _('Submit Edit') ?>" /><br /><br />
     </form>
 </div>
-
 <?php
 }
 ?>

Modified: trunk/src/common/docman/views/addfile.php
===================================================================
--- trunk/src/common/docman/views/addfile.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/views/addfile.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
@@ -60,7 +59,8 @@
 	</script>
 <?php
 	echo '<div class="docmanDivIncluded">';
-	echo '<p>'. _('<strong>Document Title</strong>:  Refers to the relatively brief title of the document (e.g. How to use the download server)<br /><strong>Description:</strong> A brief description to be placed just under the title<br />') .'</p>';
+	echo '<p><strong>'. _('Document Title:') .'</strong> '. _('Refers to the relatively brief title of the document (e.g. How to use the download server).'). '</p>';
+	echo '<p><strong>'. _('Description:') .'</strong> '. _('A brief description to be placed just under the title.') .'</p>';
 
 	if ($g->useDocmanSearch()) 
 		echo '<p>'. _('Both fields are used by document search engine.'). '</p>';

Modified: trunk/src/common/docman/views/addsubdocgroup.php
===================================================================
--- trunk/src/common/docman/views/addsubdocgroup.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/views/addsubdocgroup.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
@@ -40,12 +39,12 @@
 echo '<div class="docmanDivIncluded" >';
 echo '<form id="addsubgroup" name="addsubgroup" method="post" action="?group_id='.$group_id.'&action=addsubdocgroup&dirid='.$dirid.'">';
 if ($dirid) {
-	echo _('Name of the document subgroup to create : ');
+	echo _('Name of the document subdirectory to create:'). ' ';
 } else {
-	echo _('Name of the document group to create : ');
+	echo _('Name of the document directory to create:'). ' ';
 }
 echo '<input type="text" name="groupname" size="40" maxlength="255" >';
-echo '<input id="submitaddsubgroup" type="button" value="create" onclick="javascript:doItAddSubGroup()" />';
+echo '<input id="submitaddsubgroup" type="button" value="'. _('Create') .'" onclick="javascript:doItAddSubGroup()" />';
 echo '</form>';
 echo '</div>';
 ?>

Modified: trunk/src/common/docman/views/editdocgroup.php
===================================================================
--- trunk/src/common/docman/views/editdocgroup.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/views/editdocgroup.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -29,8 +29,8 @@
 global $g; //group object
 global $group_id; // id of the group
 global $dirid; // id of doc_group
-global $dgf; // document group factory of this group
-global $dgh; // document group html
+global $dgf; // document directory factory of this group
+global $dgh; // document directory html
 
 if (forge_check_perm ('docman', $group_id, 'approve')) {
 	$dg = new DocumentGroup($g,$dirid);

Modified: trunk/src/common/docman/views/editfile.php
===================================================================
--- trunk/src/common/docman/views/editfile.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/views/editfile.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
@@ -30,8 +29,8 @@
 global $g; //group object
 global $group_id; // id of the group
 global $dirid; // id of doc_group
-global $dgf; // document group factory of this group
-global $dgh; // document group html
+global $dgf; // document directory factory of this group
+global $dgh; // document directory html
 global $nested_docs; // flat docs array
 
 foreach ($nested_docs[$dirid] as $d) {
@@ -45,7 +44,14 @@
 </script>
 <div id="editfile<?php echo $d->getID(); ?>" style="display:none" class="docman_div_include">
 <p>
-<?php echo _("<strong>Document Title</strong>:  Refers to the relatively brief title of the document (e.g. How to use the download server)<br /><strong>Description:</strong> A brief description to be placed just under the title.") ?>
+<strong>
+<?php echo _('Document Title:') ?>
+</strong>
+<?php echo _('Refers to the relatively brief title of the document (e.g. How to use the download server).') ?>
+<p><strong>
+<?php echo _('Description:') ?>
+</strong>
+<?php echo _('A brief description to be placed just under the title.') ?>
 </p>
 <?php
 	if ($g->useDocmanSearch())
@@ -57,7 +63,7 @@
 <table border="0">
 	<tr>
 		<td>
-			<strong><?php echo _('Document Title') ?>: </strong><?php echo utils_requiredField(); ?> <?php printf(_('(at least %1$s characters)'), 5) ?><br />
+			<strong><?php echo _('Document Title:') ?> </strong><?php echo utils_requiredField(); ?> <?php printf(_('(at least %1$s characters)'), 5) ?><br />
 			<input type="text" name="title" size="40" maxlength="255" value="<?php echo $d->getName(); ?>" />
 			<br />
 		</td>
@@ -65,7 +71,7 @@
 
     <tr>
         <td>
-        <strong><?php echo _('Description') ?></strong><?php echo utils_requiredField(); ?> <?php printf(_('(at least %1$s characters)'), 10) ?><br />
+        <strong><?php echo _('Description:') ?> </strong><?php echo utils_requiredField(); ?> <?php printf(_('(at least %1$s characters)'), 10) ?><br />
         <input type="text" name="description" size="50" maxlength="255" value="<?php echo $d->getDescription(); ?>" />
         <br /></td>
     </tr>
@@ -114,16 +120,14 @@
 		}
 	}
 ?>
-
     <tr>
         <td>
-        <strong><?php echo _('Group that document belongs in') ?></strong><br />
+        <strong><?php echo _('Directory that document belongs in') ?></strong><br />
         <?php
 				$dgh->showSelectNestedGroups($dgf->getNested(), 'doc_group', false, $d->getDocGroupID());
 
 	     ?></td>
     </tr>
-
     <tr>
         <td>
         <br /><strong><?php echo _('State') ?>:</strong><br />
@@ -153,12 +157,10 @@
         </td>
     </tr>
     </table>
-
     <input type="hidden" name="docid" value="<?php echo $d->getID(); ?>" />
     <input type="button" id="submiteditdata<?php echo $d->getID(); ?>" value="<?php echo _('Submit Edit') ?>" onclick="javascript:doItEditData<?php echo $d->getID(); ?>()" /><br /><br />
     </form>
 </div>
-
 <?php
 }
 ?>

Modified: trunk/src/common/docman/views/help.php
===================================================================
--- trunk/src/common/docman/views/help.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/views/help.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,11 +1,9 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
- * Copyright 2000, Quentin Cregan/Sourceforge
- * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2010, Franck Villaume - Capgemini
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -25,9 +23,10 @@
  */
 
 echo '<div class="docmanDivIncluded">';
+plugin_hook ("blocks", "doc help");
 if ($g->useWebdav()) {
-	echo '<p>'. _('Documents parsing is also available thru webdav').'</p>';
-	echo '<p>' . util_make_link('/docman/view.php/'.$group_id.'/webdav',_('Direct Webdav URL')) . '</p>';
+	echo '<p>'. _('Documents parsing is also available thru webdav') .'</p>';
+	echo '<p>'. util_make_link('/docman/view.php/'.$group_id.'/webdav',_('Direct Webdav URL')) .'</p>';
 }
 echo '</div>';
 ?>

Modified: trunk/src/common/docman/views/listfile.php
===================================================================
--- trunk/src/common/docman/views/listfile.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/views/listfile.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
@@ -79,6 +78,7 @@
 if (forge_check_perm ('docman', $group_id, 'approve')) {
 	echo '<a href="#" id="docman-editdirectory" title="'._('Edit this directory').'">'. html_image('docman/configure-directory.png',22,22,array('alt'=>'edit')). '</a>';
 	echo '<a href="#" id="docman-addsubdirectory" title="'._('Add a new subdirectory').'">'. html_image('docman/insert-directory.png',22,22,array('alt'=>'addsubdir')). '</a>';
+	// do not uncomment the line : trash directory is not correctly implemented
 	//echo '<a href="?group_id='.$group_id.'&action=trashdir&dirid='.$dirid.'">'. html_image('docman/trash-empty.png',22,22,array('alt'=>'trashdir')). '</a>';
 	if (!isset($nested_docs[$dirid]) && !isset($nested_groups[$dirid]))
 		echo '<a href="?group_id='.$group_id.'&action=deldir&dirid='.$dirid.'" id="docman-deletedirectory" title="'._('Permanently delete this directory').'" >'. html_image('docman/delete-directory.png',22,22,array('alt'=>'deldir')). '</a>';
@@ -249,5 +249,4 @@
 	echo '<div class="docmanDiv">'.html_image('docman/new.png',14,14,array('alt'=>'new')).' : ' . _('Created or updated since less than 7 days') .'</div>';
     include ($gfcommon.'docman/views/editfile.php');
 }
-
 ?>

Modified: trunk/src/common/docman/views/listpendingfile.php
===================================================================
--- trunk/src/common/docman/views/listpendingfile.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/views/listpendingfile.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
@@ -37,5 +36,4 @@
 } else {
 	docman_display_documents($nested_groups,$df,true,3,0);
 }
-
 ?>

Modified: trunk/src/common/docman/views/listtrashfile.php
===================================================================
--- trunk/src/common/docman/views/listtrashfile.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/views/listtrashfile.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *
@@ -27,7 +26,6 @@
 /* please do not add require here : use www/docman/index.php to add require */
 /* global variables used */
 global $df; // document factory
-global $dgf; // document factory
 global $nested_groups; // flat groups array
 
 $df->setStateID('2');
@@ -49,15 +47,14 @@
 <?php
 	echo '<form id="emptytrash" name="emptytrash" method="post" action="?group_id='.$group_id.'&action=emptytrash" >';
 	echo '<ul>';
-	echo '<li><input id="submitemptytrash" type="button" value="'. _('Delete permanently all documents and document groups with deleted status ') .'" onclick="javascript:doIt(\'emptytrash\')" ></li>';
+	echo '<li><input id="submitemptytrash" type="button" value="'. _('Delete permanently all documents with deleted status.') .'" onclick="javascript:doIt(\'emptytrash\')" ></li>';
 	echo '</ul>';
 	echo '</form>';
 	echo '<ul>';
-	echo '<li><a href="#" onclick="javascript:displayTrashDiv()">'. _('Select dir or files to be resurrected from deleted status') .'</a></li>';
+	echo '<li><a href="#" onclick="javascript:displayTrashDiv()">'. _('Select documents to be resurrected from deleted status.') .'</a></li>';
 	echo '</ul>';
 	echo '<div id="listtrash" style="display:none;" >';
     docman_display_documents($nested_groups,$df,true,2,0);
 	echo '</div>';
 }
-
 ?>

Modified: trunk/src/common/docman/views/menu.php
===================================================================
--- trunk/src/common/docman/views/menu.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/views/menu.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *

Modified: trunk/src/common/docman/views/views.php
===================================================================
--- trunk/src/common/docman/views/views.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/common/docman/views/views.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * FusionForge Documentation Manager
  *

Modified: trunk/src/plugins/blocks/www/index.php
===================================================================
--- trunk/src/plugins/blocks/www/index.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/plugins/blocks/www/index.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -104,6 +104,7 @@
 	if ($group->usesDocman()) {
 		// Get the blocks in the doc.
 		$blocks['doc index'] = _("Display block at the top of the listing");
+		$blocks['doc help'] = _("Display block at the top of the main page");
 	}
 
 	if ($group->usesSurvey()) {

Modified: trunk/src/www/docman/index.php
===================================================================
--- trunk/src/www/docman/index.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/www/docman/index.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -6,6 +6,7 @@
  * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2010, Franck Villaume - Capgemini
  * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *

Modified: trunk/src/www/docman/view.php
===================================================================
--- trunk/src/www/docman/view.php	2010-11-14 12:40:37 UTC (rev 11531)
+++ trunk/src/www/docman/view.php	2010-11-14 14:05:07 UTC (rev 11532)
@@ -6,6 +6,7 @@
  * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2010, Franck Villaume - Capgemini
  * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * http://fusionforge.org
  *
  * This file is part of FusionForge.
  *
@@ -34,7 +35,6 @@
 require_once $gfcommon.'docman/include/utils.php';
 require_once $gfcommon.'docman/include/webdav.php';
 
-
 $arr=explode('/',getStringFromServer('REQUEST_URI'));
 $group_id=$arr[3];
 $docid=$arr[4];




More information about the Fusionforge-commits mailing list