[Fusionforge-commits] r10300 - in trunk/src/common/docman: actions include views

Franck VILLAUME nerville at libremir.placard.fr.eu.org
Tue Aug 3 11:46:20 CEST 2010


Author: nerville
Date: 2010-08-03 11:46:19 +0200 (Tue, 03 Aug 2010)
New Revision: 10300

Modified:
   trunk/src/common/docman/actions/addsubdocgroup.php
   trunk/src/common/docman/include/utils.php
   trunk/src/common/docman/views/editdocgroup.php
   trunk/src/common/docman/views/listfile.php
Log:
- fix access rules
- fix $this call

Modified: trunk/src/common/docman/actions/addsubdocgroup.php
===================================================================
--- trunk/src/common/docman/actions/addsubdocgroup.php	2010-08-03 08:13:44 UTC (rev 10299)
+++ trunk/src/common/docman/actions/addsubdocgroup.php	2010-08-03 09:46:19 UTC (rev 10300)
@@ -32,7 +32,11 @@
 
 if (!forge_check_perm ('docman', $group_id, 'approve')) {
 	$feedback = _('Document Action Denied');
-	Header('Location: '.util_make_url('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&feedback='.urlencode($feedback)));
+	if ($dirid) {
+		Header('Location: '.util_make_url('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&feedback='.urlencode($feedback)));
+	} else {
+		Header('Location: '.util_make_url('/docman/?group_id='.$group_id.'&feedback='.urlencode($feedback)));
+	}
 	exit;
 } else {
 	$groupname = $_POST['groupname'];

Modified: trunk/src/common/docman/include/utils.php
===================================================================
--- trunk/src/common/docman/include/utils.php	2010-08-03 08:13:44 UTC (rev 10299)
+++ trunk/src/common/docman/include/utils.php	2010-08-03 09:46:19 UTC (rev 10300)
@@ -28,10 +28,11 @@
 /* tooling library */
 
 function getNameDocGroup($id,$group) {
+	$group_object = & group_get_object($group);;
 	$res = db_query_params ('SELECT groupname FROM doc_groups WHERE doc_group=$1 AND group_id=$2',
 							array ($id,$group));
 	if (!$res || db_numrows($res) < 1) {
-		$this->setError(_('DocumentGroup: Invalid DocumentGroup ID'));
+		$group_object->setError(_('DocumentGroup: Invalid DocumentGroup ID'));
 		return false;
 	} else {
 		return (db_result($res,0,'groupname'));
@@ -39,10 +40,11 @@
 }
 
 function getStateDocGroup($id,$group) {
+	$group_object = & group_get_object($group);;
 	$res = db_query_params ('SELECT stateid FROM doc_groups WHERE doc_group=$1 AND group_id=$2',
 							array ($id,$group));
 	if (!$res || db_numrows($res) < 1) {
-		$this->setError(_('DocumentGroup: Invalid DocumentGroup ID'));
+		$group_object->setError(_('DocumentGroup: Invalid DocumentGroup ID'));
 		return false;
 	} else {
 		return (db_result($res,0,'stateid'));

Modified: trunk/src/common/docman/views/editdocgroup.php
===================================================================
--- trunk/src/common/docman/views/editdocgroup.php	2010-08-03 08:13:44 UTC (rev 10299)
+++ trunk/src/common/docman/views/editdocgroup.php	2010-08-03 09:46:19 UTC (rev 10300)
@@ -32,11 +32,7 @@
 global $dgf; // document group factory of this group
 global $dgh; // document group html
 
-if (!forge_check_perm ('docman', $group_id, 'approve')) {
-	$feedback = _('Docman Access Denied');
-	Header('Location: '.util_make_url('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&feedback='.urlencode($feedback)));
-	exit;
-} else {
+if (forge_check_perm ('docman', $group_id, 'approve')) {
 	$dg = new DocumentGroup($g,$dirid);
 	if ($dg->isError())
     		exit_error('Error',$dg->getErrorMessage());

Modified: trunk/src/common/docman/views/listfile.php
===================================================================
--- trunk/src/common/docman/views/listfile.php	2010-08-03 08:13:44 UTC (rev 10299)
+++ trunk/src/common/docman/views/listfile.php	2010-08-03 09:46:19 UTC (rev 10300)
@@ -31,6 +31,12 @@
 global $dirid; // id of doc_group
 global $nested_docs; // flat docs array
 
+$DocGroupName = getNameDocGroup($dirid,$group_id);
+if (!$DocGroupName) {
+	$feedback = $g->getErrorMessage();
+	Header('Location: '.util_make_url('/docman/?group_id='.$group_id.'&feedback='.urlencode($feedback)));
+	exit;
+}
 ?>
 
 <script language="javascript">
@@ -72,7 +78,7 @@
 </script>
 
 <?php
-echo '<h3>Directory : <i>'.getNameDocGroup($dirid,$group_id).'</i>&nbsp;';
+echo '<h3>Directory : <i>'.$DocGroupName.'</i>&nbsp;';
 if (forge_check_perm ('docman', $group_id, 'approve')) {
 	echo '<a href="#" onclick="javascript:displayEditDocGroup()" >'. html_image('docman/configure-directory.png',22,22,array('alt'=>'edit')). '</a>';
 	echo '<a href="#" onclick="javascript:displaySubGroup()" >'. html_image('docman/insert-directory.png',22,22,array('alt'=>'addsubdir')). '</a>';




More information about the Fusionforge-commits mailing list