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, master has been updated
via e9e36c5a4cbba32d43842b5d79189b903218a7ee (commit)
from e17bde45c65488e06b3d24d928f880db67c5b43b (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e9e36c5a4cbba32d43842b5d79189b903218a7ee
commit e9e36c5a4cbba32d43842b5d79189b903218a7ee
Author: Franck Villaume <[email protected]>
Date: Thu Aug 19 16:57:01 2021 +0200
docman: use correct format for constant. define new constant for
DOCMAN_BASEURL
diff --git a/src/common/docman/Document.class.php
b/src/common/docman/Document.class.php
index ad8ba8a..bc697d1 100644
--- a/src/common/docman/Document.class.php
+++ b/src/common/docman/Document.class.php
@@ -143,34 +143,34 @@ class Document extends FFObject {
* @return bool success.
*/
function create($filename, $filetype, $data, $doc_group, $title,
$description, $stateid = 0, $vcomment = '', $importData = array()) {
- if (strlen($title) < DOCMAN__TITLE_MIN_SIZE) {
- $this->setError(sprintf(_('Title Must Be At Least %d
Characters'), DOCMAN__TITLE_MIN_SIZE));
+ if (strlen($title) < DOCMAN_TITLE_MIN_SIZE) {
+ $this->setError(sprintf(_('Title Must Be At Least %d
Characters'), DOCMAN_TITLE_MIN_SIZE));
return false;
}
- if (strlen($description) < DOCMAN__DESCRIPTION_MIN_SIZE) {
- $this->setError(sprintf(_('Document Description Must Be
At Least %d Characters'), DOCMAN__DESCRIPTION_MIN_SIZE));
+ if (strlen($description) < DOCMAN_DESCRIPTION_MIN_SIZE) {
+ $this->setError(sprintf(_('Document Description Must Be
At Least %d Characters'), DOCMAN_DESCRIPTION_MIN_SIZE));
return false;
}
- if (strlen($title) > DOCMAN__TITLE_MAX_SIZE) {
- $this->setError(sprintf(_('Title Must Be Max %d
Characters'), DOCMAN__TITLE_MAX_SIZE));
+ if (strlen($title) > DOCMAN_TITLE_MAX_SIZE) {
+ $this->setError(sprintf(_('Title Must Be Max %d
Characters'), DOCMAN_TITLE_MAX_SIZE));
return false;
}
- if (strlen($description) > DOCMAN__DESCRIPTION_MAX_SIZE) {
- $this->setError(sprintf(_('Document Description Must Be
Max %d Characters'), DOCMAN__DESCRIPTION_MAX_SIZE));
+ if (strlen($description) > DOCMAN_DESCRIPTION_MAX_SIZE) {
+ $this->setError(sprintf(_('Document Description Must Be
Max %d Characters'), DOCMAN_DESCRIPTION_MAX_SIZE));
return false;
}
- if (strlen($description) > DOCMAN__COMMENT_MAX_SIZE) {
- $this->setError(sprintf(_('Document Comment Must Be Max
%d Characters'), DOCMAN__COMMENT_MAX_SIZE));
+ if (strlen($description) > DOCMAN_COMMENT_MAX_SIZE) {
+ $this->setError(sprintf(_('Document Comment Must Be Max
%d Characters'), DOCMAN_COMMENT_MAX_SIZE));
return false;
}
if (isset($importData['user'])) {
$user_id = $importData['user'];
} else {
- $user_id = ((session_loggedin()) ? user_getid() :
DOCMAN__INFAMOUS_USER_ID);
+ $user_id = ((session_loggedin()) ? user_getid() :
DOCMAN_INFAMOUS_USER_ID);
}
$perm =& $this->Group->getPermission();
@@ -868,28 +868,28 @@ class Document extends FFObject {
}
}
- if (strlen($title) < DOCMAN__TITLE_MIN_SIZE) {
- $this->setError(sprintf(_('Title Must Be At Least %d
Characters'), DOCMAN__TITLE_MIN_SIZE));
+ if (strlen($title) < DOCMAN_TITLE_MIN_SIZE) {
+ $this->setError(sprintf(_('Title Must Be At Least %d
Characters'), DOCMAN_TITLE_MIN_SIZE));
return false;
}
- if (strlen($description) < DOCMAN__DESCRIPTION_MIN_SIZE) {
- $this->setError(sprintf(_('Document Description Must Be
At Least %d Characters'), DOCMAN__DESCRIPTION_MIN_SIZE));
+ if (strlen($description) < DOCMAN_DESCRIPTION_MIN_SIZE) {
+ $this->setError(sprintf(_('Document Description Must Be
At Least %d Characters'), DOCMAN_DESCRIPTION_MIN_SIZE));
return false;
}
- if (strlen($title) > DOCMAN__TITLE_MAX_SIZE) {
- $this->setError(sprintf(_('Title Must Be Max %d
Characters'), DOCMAN__TITLE_MAX_SIZE));
+ if (strlen($title) > DOCMAN_TITLE_MAX_SIZE) {
+ $this->setError(sprintf(_('Title Must Be Max %d
Characters'), DOCMAN_TITLE_MAX_SIZE));
return false;
}
- if (strlen($description) > DOCMAN__DESCRIPTION_MAX_SIZE) {
- $this->setError(sprintf(_('Document Description Must Be
Max %d Characters'), DOCMAN__DESCRIPTION_MAX_SIZE));
+ if (strlen($description) > DOCMAN_DESCRIPTION_MAX_SIZE) {
+ $this->setError(sprintf(_('Document Description Must Be
Max %d Characters'), DOCMAN_DESCRIPTION_MAX_SIZE));
return false;
}
- if (strlen($description) > DOCMAN__COMMENT_MAX_SIZE) {
- $this->setError(sprintf(_('Document Comment Must Be Max
%d Characters'), DOCMAN__COMMENT_MAX_SIZE));
+ if (strlen($description) > DOCMAN_COMMENT_MAX_SIZE) {
+ $this->setError(sprintf(_('Document Comment Must Be Max
%d Characters'), DOCMAN_COMMENT_MAX_SIZE));
return false;
}
diff --git a/src/common/docman/DocumentGroup.class.php
b/src/common/docman/DocumentGroup.class.php
index cc8ee47..f46383e 100644
--- a/src/common/docman/DocumentGroup.class.php
+++ b/src/common/docman/DocumentGroup.class.php
@@ -28,6 +28,7 @@
require_once $gfcommon.'include/FFError.class.php';
require_once $gfcommon.'include/MonitorElement.class.php';
+require_once $gfcommon.'docman/include/constants.php';
$DOCUMENTGROUP_OBJ = array();
@@ -701,11 +702,10 @@ class DocumentGroup extends FFError {
} else {
$view = 'listfile';
}
- $browselink =
'/docman/?view='.$view.'&dirid='.$this->getID();
+ $browselink =
DOCMAN_BASEURL.$this->Group->getID().'&view='.$view.'&dirid='.$this->getID();
if (isset($GLOBALS['childgroup_id']) &&
$GLOBALS['childgroup_id']) {
$browselink .=
'&childgroup_id='.$GLOBALS['childgroup_id'];
}
- $browselink .=
'&group_id='.$this->Group->getID();
$returnPath .= '/'.util_make_link($browselink,
$this->getName(), array('title' => _('Browse this folder')));
} else {
$returnPath .= '/'.$this->getName();
@@ -818,7 +818,7 @@ class DocumentGroup extends FFError {
}
$body .=
"\n\n-------------------------------------------------------\n".
_('For more info, visit:').
- "\n\n" .
util_make_url('/docman/?group_id='.$this->Group->getID().'&view=listfile&dirid='.$this->getID());
+ "\n\n" .
util_make_url(DOCMAN_BASEURL.$this->Group->getID().'&view=listfile&dirid='.$this->getID());
$BCCarray = explode(',',$BCC);
foreach ($BCCarray as $dest_email) {
diff --git a/src/common/docman/DocumentManager.class.php
b/src/common/docman/DocumentManager.class.php
index be1243d..c4ad4f8 100644
--- a/src/common/docman/DocumentManager.class.php
+++ b/src/common/docman/DocumentManager.class.php
@@ -27,6 +27,7 @@ require_once $gfcommon.'include/FFError.class.php';
require_once $gfcommon.'include/User.class.php';
require_once $gfcommon.'docman/DocumentGroup.class.php';
require_once $gfcommon.'docman/DocumentFactory.class.php';
+require_once $gfcommon.'docman/include/constants.php';
class DocumentManager extends FFError {
@@ -191,9 +192,9 @@ class DocumentManager extends FFError {
}
// support projects-hierarchy plugin
if ($this->Group->getID() != $g->getID()) {
- $link =
'/docman/?group_id='.$g->getID().'&view='.$linkmenu.'&dirid='.$localDg->getID().'&childgroup_id='.$this->Group->getID();
+ $link =
DOCMAN_BASEURL.$g->getID().'&view='.$linkmenu.'&dirid='.$localDg->getID().'&childgroup_id='.$this->Group->getID();
} else {
- $link =
'/docman/?group_id='.$this->Group->getID().'&view='.$linkmenu.'&dirid='.$localDg->getID();
+ $link =
DOCMAN_BASEURL.$this->Group->getID().'&view='.$linkmenu.'&dirid='.$localDg->getID();
}
$nbDocsLabel = '';
$nbDocs =
$localDg->getNumberOfDocuments($stateId);
diff --git a/src/common/docman/DocumentReview.class.php
b/src/common/docman/DocumentReview.class.php
index 96226c4..1fa6356 100644
--- a/src/common/docman/DocumentReview.class.php
+++ b/src/common/docman/DocumentReview.class.php
@@ -2,7 +2,7 @@
/**
* FusionForge Documentation Manager
*
- * Copyright 2016-2017, Franck Villaume - TrivialDev
+ * Copyright 2016-2017,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -269,7 +269,7 @@ class DocumentReview extends FFError {
$return .= $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[][] = _('Conclusion Comment')._(':');
- $cells[][] = html_e('textarea', array('id' =>
'review-completedcomment', 'name' => 'review-completedcomment', 'style' =>
'width: 100%; box-sizing: border-box;', 'rows' => 3, 'required' => 'required',
'pattern' => '.{10,}', 'placeholder' => _('Final comment').' '.sprintf(_('(at
least %s characters)'), DOCMAN__REVIEW_DESCRIPTION_MIN_SIZE), 'maxlength' =>
DOCMAN__REVIEW_DESCRIPTION_MAX_SIZE), '', false);
+ $cells[][] = html_e('textarea', array('id' =>
'review-completedcomment', 'name' => 'review-completedcomment', 'style' =>
'width: 100%; box-sizing: border-box;', 'rows' => 3, 'required' => 'required',
'pattern' => '.{10,}', 'placeholder' => _('Final comment').' '.sprintf(_('(at
least %s characters)'), DOCMAN_REVIEW_DESCRIPTION_MIN_SIZE), 'maxlength' =>
DOCMAN_REVIEW_DESCRIPTION_MAX_SIZE), '', false);
$return .= $HTML->multiTableRow(array(), $cells);
$return .= $HTML->listTableBottom();
$return .= html_ac(html_ap() -1);
@@ -295,11 +295,11 @@ class DocumentReview extends FFError {
$return .= $HTML->listTableTop(array(), array(),
'full');
$cells = array();
$cells[] =
array(_('Title').utils_requiredField()._(':'), 'style' => 'width: 30%;');
- $cells[][] = html_e('input', array('type' => 'text',
'id' => 'review-title', 'name' => 'review-title', 'style' => 'width: 100%;
box-sizing: border-box;', 'required' => 'required', 'pattern' => '.{5,}',
'placeholder' => _('Title').' '.sprintf(_('(at least %s characters)'),
DOCMAN__REVIEW_TITLE_MIN_SIZE), 'maxlength' => DOCMAN__REVIEW_TITLE_MAX_SIZE));
+ $cells[][] = html_e('input', array('type' => 'text',
'id' => 'review-title', 'name' => 'review-title', 'style' => 'width: 100%;
box-sizing: border-box;', 'required' => 'required', 'pattern' => '.{5,}',
'placeholder' => _('Title').' '.sprintf(_('(at least %s characters)'),
DOCMAN_REVIEW_TITLE_MIN_SIZE), 'maxlength' => DOCMAN_REVIEW_TITLE_MAX_SIZE));
$return .= $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[][] =
_('Description').utils_requiredField()._(':');
- $cells[][] = html_e('textarea', array('id' =>
'review-description', 'name' => 'review-description', 'style' => 'width: 100%;
box-sizing: border-box;', 'rows' => 3, 'required' => 'required', 'pattern' =>
'.{10,}', 'placeholder' => _('Description').' '.sprintf(_('(at least %s
characters)'), DOCMAN__REVIEW_DESCRIPTION_MIN_SIZE), 'maxlength' =>
DOCMAN__REVIEW_DESCRIPTION_MAX_SIZE), '', false);
+ $cells[][] = html_e('textarea', array('id' =>
'review-description', 'name' => 'review-description', 'style' => 'width: 100%;
box-sizing: border-box;', 'rows' => 3, 'required' => 'required', 'pattern' =>
'.{10,}', 'placeholder' => _('Description').' '.sprintf(_('(at least %s
characters)'), DOCMAN_REVIEW_DESCRIPTION_MIN_SIZE), 'maxlength' =>
DOCMAN_REVIEW_DESCRIPTION_MAX_SIZE), '', false);
$return .= $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[][] = _('Select Version to
review').utils_requiredField()._(':');
@@ -319,7 +319,7 @@ class DocumentReview extends FFError {
$return .= $HTML->multiTableRow(array('id' =>
'tr-optional-reviewers'), $cells);
$cells = array();
$cells[][] = _('Notification comment')._(':');
- $cells[][] = html_e('textarea', array('id' =>
'review-notificationcomment', 'name' => 'review-notificationcomment', 'style'
=> 'width: 100%; box-sizing: border-box;', 'rows' => 3, 'pattern' => '.{10,}',
'placeholder' => _('Add a specific comment for the mail notification here'),
'maxlength' => DOCMAN__REVIEW_DESCRIPTION_MAX_SIZE), '', false);
+ $cells[][] = html_e('textarea', array('id' =>
'review-notificationcomment', 'name' => 'review-notificationcomment', 'style'
=> 'width: 100%; box-sizing: border-box;', 'rows' => 3, 'pattern' => '.{10,}',
'placeholder' => _('Add a specific comment for the mail notification here'),
'maxlength' => DOCMAN_REVIEW_DESCRIPTION_MAX_SIZE), '', false);
$return .= $HTML->multiTableRow(array('id' =>
'review-notificationcomment-row'), $cells);
$cells = array();
$return .= $HTML->listTableBottom();
@@ -346,7 +346,7 @@ class DocumentReview extends FFError {
$return = $HTML->listTableTop();
$cells = array();
$cells[] = array(_('Comment').utils_requiredField()._(':'),
'style' => 'width: 30%;');
- $cells[][] = html_e('textarea', array('id' => 'review-comment',
'name' => 'review-comment', 'style' => 'width: 100%; box-sizing: border-box;',
'rows' => 3, 'required' => 'required', 'pattern' => '.{10,}', 'placeholder' =>
_('Add your comment').' '.sprintf(_('(at least %s characters)'),
DOCMAN__REVIEW_DESCRIPTION_MIN_SIZE), 'maxlength' =>
DOCMAN__REVIEW_DESCRIPTION_MAX_SIZE), '', false);
+ $cells[][] = html_e('textarea', array('id' => 'review-comment',
'name' => 'review-comment', 'style' => 'width: 100%; box-sizing: border-box;',
'rows' => 3, 'required' => 'required', 'pattern' => '.{10,}', 'placeholder' =>
_('Add your comment').' '.sprintf(_('(at least %s characters)'),
DOCMAN_REVIEW_DESCRIPTION_MIN_SIZE), 'maxlength' =>
DOCMAN_REVIEW_DESCRIPTION_MAX_SIZE), '', false);
$return .= $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[][] = _('Review done')._(':');
@@ -413,12 +413,12 @@ class DocumentReview extends FFError {
$this->setError(_('Missing Version ID to create
review'));
return false;
}
- if (strlen($reviewtitle) < DOCMAN__REVIEW_TITLE_MIN_SIZE ||
strlen($reviewtitle) > DOCMAN__REVIEW_TITLE_MAX_SIZE) {
- $this->setError(sprintf(_('Review Title must be %d
characters minimum and %d characters maximum'), DOCMAN__REVIEW_TITLE_MIN_SIZE,
DOCMAN__REVIEW_TITLE_MAX_SIZE));
+ if (strlen($reviewtitle) < DOCMAN_REVIEW_TITLE_MIN_SIZE ||
strlen($reviewtitle) > DOCMAN_REVIEW_TITLE_MAX_SIZE) {
+ $this->setError(sprintf(_('Review Title must be %d
characters minimum and %d characters maximum'), DOCMAN_REVIEW_TITLE_MIN_SIZE,
DOCMAN_REVIEW_TITLE_MAX_SIZE));
return false;
}
- if (strlen($reviewdescription) <
DOCMAN__REVIEW_DESCRIPTION_MIN_SIZE || strlen($reviewdescription) >
DOCMAN__REVIEW_DESCRIPTION_MAX_SIZE) {
- $this->setError(sprintf(_('Review Description must be
%d characters minimum and %d characters maximum'),
DOCMAN__REVIEW_DESCRIPTION_MIN_SIZE, DOCMAN__REVIEW_DESCRIPTION_MAX_SIZE));
+ if (strlen($reviewdescription) <
DOCMAN_REVIEW_DESCRIPTION_MIN_SIZE || strlen($reviewdescription) >
DOCMAN_REVIEW_DESCRIPTION_MAX_SIZE) {
+ $this->setError(sprintf(_('Review Description must be
%d characters minimum and %d characters maximum'),
DOCMAN_REVIEW_DESCRIPTION_MIN_SIZE, DOCMAN_REVIEW_DESCRIPTION_MAX_SIZE));
return false;
}
if (!isset($importData['enddate']) && $reviewenddate < $now) {
@@ -437,7 +437,7 @@ class DocumentReview extends FFError {
if (isset($importData['user'])) {
$user_id = $importData['user'];
} else {
- $user_id = ((session_loggedin()) ? user_getid() :
DOCMAN__INFAMOUS_USER_ID);
+ $user_id = ((session_loggedin()) ? user_getid() :
DOCMAN_INFAMOUS_USER_ID);
}
if (isset($importData['startdate'])) {
$now = $importData['startdate'];
@@ -592,12 +592,12 @@ class DocumentReview extends FFError {
$this->setError(_('Missing Version ID to create
review'));
return false;
}
- if (strlen($reviewtitle) < DOCMAN__REVIEW_TITLE_MIN_SIZE ||
strlen($reviewtitle) > DOCMAN__REVIEW_TITLE_MAX_SIZE) {
- $this->setError(sprintf(_('Review Title must be %d
characters minimum and %d characters maximum'), DOCMAN__REVIEW_TITLE_MIN_SIZE,
DOCMAN__REVIEW_TITLE_MAX_SIZE));
+ if (strlen($reviewtitle) < DOCMAN_REVIEW_TITLE_MIN_SIZE ||
strlen($reviewtitle) > DOCMAN_REVIEW_TITLE_MAX_SIZE) {
+ $this->setError(sprintf(_('Review Title must be %d
characters minimum and %d characters maximum'), DOCMAN_REVIEW_TITLE_MIN_SIZE,
DOCMAN_REVIEW_TITLE_MAX_SIZE));
return false;
}
- if (strlen($reviewdescription) <
DOCMAN__REVIEW_DESCRIPTION_MIN_SIZE || strlen($reviewdescription) >
DOCMAN__REVIEW_DESCRIPTION_MAX_SIZE) {
- $this->setError(sprintf(_('Review Description must be
%d characters minimum and %d characters maximum'),
DOCMAN__REVIEW_DESCRIPTION_MIN_SIZE, DOCMAN__REVIEW_DESCRIPTION_MAX_SIZE));
+ if (strlen($reviewdescription) <
DOCMAN_REVIEW_DESCRIPTION_MIN_SIZE || strlen($reviewdescription) >
DOCMAN_REVIEW_DESCRIPTION_MAX_SIZE) {
+ $this->setError(sprintf(_('Review Description must be
%d characters minimum and %d characters maximum'),
DOCMAN_REVIEW_DESCRIPTION_MIN_SIZE, DOCMAN_REVIEW_DESCRIPTION_MAX_SIZE));
return false;
}
if ($reviewenddate < time()) {
diff --git a/src/common/docman/actions/addfile.php
b/src/common/docman/actions/addfile.php
index 8933b10..c121fe4 100644
--- a/src/common/docman/actions/addfile.php
+++ b/src/common/docman/actions/addfile.php
@@ -52,7 +52,7 @@ if (!$doc_group) {
$doc_group = $dirid;
}
-$baseurl = '/docman/?group_id='.$group_id;
+$baseurl = DOCMAN_BASEURL.$group_id;
$redirecturl = $baseurl.'&dirid='.$doc_group;
// plugin projects-hierarchy handler
diff --git a/src/common/docman/actions/addsubdocgroup.php
b/src/common/docman/actions/addsubdocgroup.php
index 93ae2de..5332433 100644
--- a/src/common/docman/actions/addsubdocgroup.php
+++ b/src/common/docman/actions/addsubdocgroup.php
@@ -35,7 +35,7 @@ global $error_msg;
global $warning_msg;
global $childgroup_id; // id of child group if any
-$urlredirect = '/docman/?group_id='.$group_id.'&dirid='.$dirid;
+$urlredirect = DOCMAN_BASEURL.$group_id.'&dirid='.$dirid;
// plugin projects-hierarchy support
if ($childgroup_id) {
diff --git a/src/common/docman/actions/deldir.php
b/src/common/docman/actions/deldir.php
index 695f233..1359374 100644
--- a/src/common/docman/actions/deldir.php
+++ b/src/common/docman/actions/deldir.php
@@ -35,7 +35,7 @@ global $feedback;
global $error_msg;
global $warning_msg;
-$urlredirect = '/docman/?group_id='.$group_id;
+$urlredirect = DOCMAN_BASEURL.$group_id;
// plugin projects-hierarchy handler
if ($childgroup_id) {
diff --git a/src/common/docman/actions/deleteassociations.php
b/src/common/docman/actions/deleteassociations.php
index f342c9c..f92040b 100644
--- a/src/common/docman/actions/deleteassociations.php
+++ b/src/common/docman/actions/deleteassociations.php
@@ -32,7 +32,7 @@ global $error_msg;
global $warning_msg;
$dirid = getIntFromRequest('dirid');
-$baseurl = '/docman/?group_id='.$group_id.'&dirid='.$dirid;
+$baseurl = DOCMAN_BASEURL.$group_id.'&dirid='.$dirid;
// plugin projects-hierarchy handler
if ($childgroup_id) {
$g = group_get_object($childgroup_id);
diff --git a/src/common/docman/actions/delfile.php
b/src/common/docman/actions/delfile.php
index 2206b3a..5054b47 100644
--- a/src/common/docman/actions/delfile.php
+++ b/src/common/docman/actions/delfile.php
@@ -29,7 +29,7 @@ global $dirid; // id of doc_group
global $group_id; // id of group
global $childgroup_id; // id of child group if any
-$urlredirect =
'/docman/?group_id='.$group_id.'&view=listtrashfile&dirid='.$dirid;
+$urlredirect = DOCMAN_BASEURL.$group_id.'&view=listtrashfile&dirid='.$dirid;
// plugin projects-hierarchy handler
if ($childgroup_id) {
diff --git a/src/common/docman/actions/editdocgroup.php
b/src/common/docman/actions/editdocgroup.php
index 02007ec..28be10c 100644
--- a/src/common/docman/actions/editdocgroup.php
+++ b/src/common/docman/actions/editdocgroup.php
@@ -31,7 +31,7 @@ global $dirid; // id of doc_group
global $group_id; // id of group
global $childgroup_id; // plugin projects hierarchy handler
-$urlredirect = '/docman/?group_id='.$group_id.'&dirid='.$dirid;
+$urlredirect = DOCMAN_BASEURL.$group_id.'&dirid='.$dirid;
// plugin projects-hierarchy handler
if ($childgroup_id) {
diff --git a/src/common/docman/actions/editfile.php
b/src/common/docman/actions/editfile.php
index 80e8e11..9830116 100644
--- a/src/common/docman/actions/editfile.php
+++ b/src/common/docman/actions/editfile.php
@@ -33,7 +33,7 @@ global $feedback;
global $error_msg;
global $warning_msg;
-$urlparam = '/docman/?group_id='.$group_id;
+$urlparam = DOCMAN_BASEURL.$group_id;
if ($childgroup_id) {
$g = group_get_object($childgroup_id);
diff --git a/src/common/docman/actions/emptytrash.php
b/src/common/docman/actions/emptytrash.php
index 55df2a0..8c05265 100644
--- a/src/common/docman/actions/emptytrash.php
+++ b/src/common/docman/actions/emptytrash.php
@@ -31,7 +31,7 @@ global $feedback;
global $error_msg;
global $warning_msg;
-$redirecturl = '/docman/?group_id='.$group_id;
+$redirecturl = DOCMAN_BASEURL.$group_id;
// plugin projects-hierarchy handler
if ($childgroup_id) {
diff --git a/src/common/docman/actions/enforcereserve.php
b/src/common/docman/actions/enforcereserve.php
index 71be631..b542e3a 100644
--- a/src/common/docman/actions/enforcereserve.php
+++ b/src/common/docman/actions/enforcereserve.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -30,7 +30,7 @@ global $group_id; // id of group
if (!forge_check_perm('docman', $group_id, 'admin')) {
$warning_msg = _('Document Manager Action Denied.');
- session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+ session_redirect(DOCMAN_BASEURL.$group_id.'&dirid='.$dirid);
}
$arr_fileid = explode(',', getStringFromRequest('fileid'));
@@ -40,8 +40,8 @@ foreach ($arr_fileid as $fileid) {
$feedback .= $d->getFileName().' ';
if ($d->isError() || !$d->setReservedBy('0')) {
$error_msg = $d->getErrorMessage();
-
session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+ session_redirect(DOCMAN_BASEURL.$group_id.'&dirid='.$dirid);
}
}
$feedback .= _('reservation enforced successfully.');
-session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+session_redirect(DOCMAN_BASEURL.$group_id.'&dirid='.$dirid);
diff --git a/src/common/docman/actions/forcereindexenginesearch.php
b/src/common/docman/actions/forcereindexenginesearch.php
index 6aa5b56..3029083 100644
--- a/src/common/docman/actions/forcereindexenginesearch.php
+++ b/src/common/docman/actions/forcereindexenginesearch.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2021 Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -29,7 +29,7 @@ global $group_id; // id of group
if ( !forge_check_perm('docman', $group_id, 'admin')) {
$warning_msg = _('Document Manager Action Denied.');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
if ($_POST['status']) {
@@ -39,7 +39,7 @@ if ($_POST['status']) {
if (!$g->setDocmanForceReindexSearch($status)) {
$error_msg = $g->getErrorMessage();
- session_redirect('/docman/?group_id='.$group_id.'&view=admin');
+ session_redirect(DOCMAN_BASEURL.$group_id.'&view=admin');
}
-session_redirect('/docman/?group_id='.$group_id.'&view=admin');
+session_redirect(DOCMAN_BASEURL.$group_id.'&view=admin');
diff --git a/src/common/docman/actions/getassociations.php
b/src/common/docman/actions/getassociations.php
index 5679442..76482fa 100644
--- a/src/common/docman/actions/getassociations.php
+++ b/src/common/docman/actions/getassociations.php
@@ -2,7 +2,7 @@
/**
* FusionForge Documentation Manager
*
- * Copyright 2016, Franck Villaume - TrivialDev
+ * Copyright 2016,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
diff --git a/src/common/docman/actions/getdocreviewcomments.php
b/src/common/docman/actions/getdocreviewcomments.php
index 296272b..fcf5243 100644
--- a/src/common/docman/actions/getdocreviewcomments.php
+++ b/src/common/docman/actions/getdocreviewcomments.php
@@ -2,7 +2,7 @@
/**
* FusionForge Documentation Manager
*
- * Copyright 2016,2017, Franck Villaume - TrivialDev
+ * Copyright 2016-2017,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
diff --git a/src/common/docman/actions/getdocreviewcompleteform.php
b/src/common/docman/actions/getdocreviewcompleteform.php
index 81341c5..a666a22 100644
--- a/src/common/docman/actions/getdocreviewcompleteform.php
+++ b/src/common/docman/actions/getdocreviewcompleteform.php
@@ -2,7 +2,7 @@
/**
* FusionForge Documentation Manager
*
- * Copyright 2016, Franck Villaume - TrivialDev
+ * Copyright 2016,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
diff --git a/src/common/docman/actions/getdocreviews.php
b/src/common/docman/actions/getdocreviews.php
index a2ae2cc..3be97ea 100644
--- a/src/common/docman/actions/getdocreviews.php
+++ b/src/common/docman/actions/getdocreviews.php
@@ -2,7 +2,7 @@
/**
* FusionForge Documentation Manager
*
- * Copyright 2016, Franck Villaume - TrivialDev
+ * Copyright 2016,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
diff --git a/src/common/docman/actions/getdocreviewuserstatus.php
b/src/common/docman/actions/getdocreviewuserstatus.php
index d6fdcf0..1b1a0f9 100644
--- a/src/common/docman/actions/getdocreviewuserstatus.php
+++ b/src/common/docman/actions/getdocreviewuserstatus.php
@@ -2,7 +2,7 @@
/**
* FusionForge Documentation Manager
*
- * Copyright 2016, Franck Villaume - TrivialDev
+ * Copyright 2016,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
diff --git a/src/common/docman/actions/getdocversions.php
b/src/common/docman/actions/getdocversions.php
index 1495cf7..2101364 100644
--- a/src/common/docman/actions/getdocversions.php
+++ b/src/common/docman/actions/getdocversions.php
@@ -2,7 +2,7 @@
/**
* FusionForge Documentation Manager
*
- * Copyright 2016-2017, Franck Villaume - TrivialDev
+ * Copyright 2016-2017,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
diff --git a/src/common/docman/actions/getfile.php
b/src/common/docman/actions/getfile.php
index 991b21a..39b9edd 100644
--- a/src/common/docman/actions/getfile.php
+++ b/src/common/docman/actions/getfile.php
@@ -2,7 +2,7 @@
/**
* FusionForge Documentation Manager
*
- * Copyright 2012,2016, Franck Villaume - TrivialDev
+ * Copyright 2012,2016,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -33,7 +33,7 @@ global $warning_msg;
$sysdebug_enable = false;
-$urlparam = '/docman/?group_id='.$group_id;
+$urlparam = DOCMAN_BASEURL.$group_id;
if ($childgroup_id) {
$g = group_get_object($childgroup_id);
$urlparam .= '&childgroup_id='.$childgroup_id;
diff --git a/src/common/docman/actions/injectzip.php
b/src/common/docman/actions/injectzip.php
index f49a82f..165819e 100644
--- a/src/common/docman/actions/injectzip.php
+++ b/src/common/docman/actions/injectzip.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2014,2015-2017, Franck Villaume - TrivialDev
+ * Copyright 2014,2015-2017,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -31,7 +31,7 @@ global $error_msg;
global $warning_msg;
global $dirid;
-$return_url = '/docman/?group_id='.$group_id.'&dirid='.$dirid;
+$return_url = DOCMAN_BASEURL.$group_id.'&dirid='.$dirid;
if (!forge_check_perm('docman', $group_id, 'approve')) {
$warning_msg = _('Document Manager Action Denied.');
diff --git a/src/common/docman/actions/lock.php
b/src/common/docman/actions/lock.php
index dc1b78f..e071cf6 100644
--- a/src/common/docman/actions/lock.php
+++ b/src/common/docman/actions/lock.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2012,2014, Franck Villaume - TrivialDev
+ * Copyright 2012,2014,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -32,7 +32,7 @@ $sysdebug_enable = false;
if (!forge_check_perm('docman', $group_id, 'approve')) {
$warning_msg = _('Document Manager Action Denied.');
- session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+ session_redirect(DOCMAN_BASEURL.$group_id.'&dirid='.$dirid);
}
$itemid = getIntFromRequest('itemid');
@@ -55,13 +55,13 @@ switch ($type) {
}
default: {
$error_msg = _('Lock failed')._(': ')._('Missing Type');
-
session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+ session_redirect(DOCMAN_BASEURL.$group_id.'&dirid='.$dirid);
}
}
if ($objectType->isError()) {
$error_msg = $objectType->getErrorMessage();
- session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+ session_redirect(DOCMAN_BASEURL.$group_id.'&dirid='.$dirid);
}
if ($lock === 0) {
diff --git a/src/common/docman/actions/monitordirectory.php
b/src/common/docman/actions/monitordirectory.php
index daf3a4c..688336b 100644
--- a/src/common/docman/actions/monitordirectory.php
+++ b/src/common/docman/actions/monitordirectory.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2012,2014, Franck Villaume - TrivialDev
+ * Copyright 2012,2014,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -27,9 +27,11 @@
global $dirid; //id of doc_group
global $group_id; // id of group
+$urlredirect = DOCMAN_BASEURL.$group_id.'&dirid='.$dirid;
+
if (!forge_check_perm('docman', $group_id, 'read')) {
$warning_msg = _('Document Manager Action Denied.');
- session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+ session_redirect($urlredirect);
}
$directoryid = getStringFromRequest('directoryid');
@@ -37,7 +39,7 @@ $option = getStringFromRequest('option');
$dg = documentgroup_get_object($directoryid, $group_id);
if (!$dg || $dg->isError()) {
$error_msg = _('Docman Error: unable to get folder object');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
switch ($option) {
@@ -45,11 +47,11 @@ switch ($option) {
if (!empty($directoryid)) {
if ($dg->isError() ||
!$dg->addMonitoredBy(user_getid())) {
$error_msg = $dg->getErrorMessage();
-
session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+ session_redirect($urlredirect);
}
} else {
$warning_msg = _('No action to perform');
-
session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+ session_redirect($urlredirect);
}
$feedback = _('Folder').' '.$dg->getName()._(':
')._('Monitoring Started');
break;
@@ -58,11 +60,11 @@ switch ($option) {
if (!empty($directoryid)) {
if ($dg->isError() ||
!$dg->removeMonitoredBy(user_getid())) {
$error_msg = $dg->getErrorMessage();
-
session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+ session_redirect($urlredirect);
}
} else {
$warning_msg = _('No action to perform');
-
session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+ session_redirect($urlredirect);
}
$feedback = _('Folder').' '.$dg->getName()._(':
')._('Monitoring Stopped');
break;
@@ -72,4 +74,4 @@ switch ($option) {
}
}
-session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+session_redirect($urlredirect);
diff --git a/src/common/docman/actions/monitorfile.php
b/src/common/docman/actions/monitorfile.php
index 5afd583..cbfb785 100644
--- a/src/common/docman/actions/monitorfile.php
+++ b/src/common/docman/actions/monitorfile.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2012-2015, Franck Villaume - TrivialDev
+ * Copyright 2012-2015,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -29,7 +29,7 @@ global $group_id; // id of group
global $LUSER; // User object
global $childgroup_id; // id of child group if any
-$redirecturl = '/docman/?group_id='.$group_id.'&dirid='.$dirid;
+$redirecturl = DOCMAN_BASEURL.$group_id.'&dirid='.$dirid;
// plugin projects-hierarchy handler
if ($childgroup_id) {
diff --git a/src/common/docman/actions/movefile.php
b/src/common/docman/actions/movefile.php
index 77bfd78..27773f8 100644
--- a/src/common/docman/actions/movefile.php
+++ b/src/common/docman/actions/movefile.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2012-2016, Franck Villaume - TrivialDev
+ * Copyright 2012-2016,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -32,7 +32,7 @@ global $feedback;
global $error_msg;
global $warning_msg;
-$redirecturl = '/docman/?group_id='.$group_id.'&dirid='.$dirid;
+$redirecturl = DOCMAN_BASEURL.$group_id.'&dirid='.$dirid;
// plugin projects-hierarchy handler
if ($childgroup_id) {
diff --git a/src/common/docman/actions/notifyusers.php
b/src/common/docman/actions/notifyusers.php
index 37eba78..42f1c65 100644
--- a/src/common/docman/actions/notifyusers.php
+++ b/src/common/docman/actions/notifyusers.php
@@ -2,7 +2,7 @@
/**
* FusionForge Documentation Manager
*
- * Copyright 2015-2016, Franck Villaume - TrivialDev
+ * Copyright 2015-2016,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -31,7 +31,7 @@ global $feedback;
global $error_msg;
global $warning_msg;
-$urlparam = '/docman/?group_id='.$group_id.'&dirid='.$dirid;
+$urlparam = DOCMAN_BASEURL.$group_id.'&dirid='.$dirid;
if ($childgroup_id) {
$g = group_get_object($childgroup_id);
diff --git a/src/common/docman/actions/releasefile.php
b/src/common/docman/actions/releasefile.php
index c09ddaa..239c535 100644
--- a/src/common/docman/actions/releasefile.php
+++ b/src/common/docman/actions/releasefile.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2013-2015, Franck Villaume - TrivialDev
+ * Copyright 2013-2015,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -32,7 +32,7 @@ global $feedback;
global $error_msg;
global $warning_msg;
-$redirecturl = '/docman/?group_id='.$group_id.'&dirid='.$dirid;
+$redirecturl = DOCMAN_BASEURL.$group_id.'&dirid='.$dirid;
// plugin projects-hierarchy handler
if ($childgroup_id) {
diff --git a/src/common/docman/actions/reservefile.php
b/src/common/docman/actions/reservefile.php
index 6e8acc8..79c96dc 100644
--- a/src/common/docman/actions/reservefile.php
+++ b/src/common/docman/actions/reservefile.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2013-2015, Franck Villaume - TrivialDev
+ * Copyright 2013-2015,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -31,9 +31,11 @@ global $feedback;
global $error_msg;
global $warning_msg;
+$redirecturl = DOCMAN_BASEURL.$group_id.'&dirid='.$dirid;
+
if (!forge_check_perm('docman', $group_id, 'approve')) {
$warning_msg = _('Document Manager Action Denied.');
- session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+ session_redirect($redirecturl);
}
$arr_fileid = explode(',', getStringFromRequest('fileid'));
@@ -44,8 +46,8 @@ foreach ($arr_fileid as $fileid) {
if ($d->isError() || !$d->setReservedBy('1', user_getid())) {
$feedback = '';
$error_msg = $d->getErrorMessage();
-
session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+ session_redirect($redirecturl);
}
}
$feedback .= _('reserved successfully.');
-session_redirect('/docman/?group_id='.$group_id.'&dirid='.$dirid);
+session_redirect($redirecturl);
diff --git a/src/common/docman/actions/trashdir.php
b/src/common/docman/actions/trashdir.php
index 2e2def7..e6fd294 100644
--- a/src/common/docman/actions/trashdir.php
+++ b/src/common/docman/actions/trashdir.php
@@ -5,7 +5,7 @@
* Copyright 2000, Quentin Cregan/Sourceforge
* Copyright 2002-2003, Tim Perdue/GForge, LLC
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2013-2015, Franck Villaume - TrivialDev
+ * Copyright 2013-2015,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -34,7 +34,7 @@ global $error_msg;
global $warning_msg;
global $childgroup_id;
-$redirecturl = '/docman/?group_id='.$group_id;
+$redirecturl = DOCMAN_BASEURL.$group_id;
// plugin projects-hierarchy handler
$childgroup_id = getIntFromRequest('childgroup_id');
diff --git a/src/common/docman/actions/trashfile.php
b/src/common/docman/actions/trashfile.php
index 90ed693..8271540 100644
--- a/src/common/docman/actions/trashfile.php
+++ b/src/common/docman/actions/trashfile.php
@@ -5,7 +5,7 @@
* Copyright 2000, Quentin Cregan/Sourceforge
* Copyright 2002-2003, Tim Perdue/GForge, LLC
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2014-2015, Franck Villaume - TrivialDev
+ * Copyright 2014-2015,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -33,7 +33,7 @@ global $warning_msg;
global $feedback;
global $error_msg;
-$redirecturl = '/docman/?group_id='.$group_id.'&dirid='.$dirid;
+$redirecturl = DOCMAN_BASEURL.$group_id.'&dirid='.$dirid;
// plugin projects-hierarchy handler
$childgroup_id = getIntFromRequest('childgroup_id');
diff --git a/src/common/docman/actions/updatecreateonline.php
b/src/common/docman/actions/updatecreateonline.php
index 9e34f24..87e1798 100644
--- a/src/common/docman/actions/updatecreateonline.php
+++ b/src/common/docman/actions/updatecreateonline.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -32,7 +32,7 @@ global $warning_msg;
if (!forge_check_perm('docman', $group_id, 'admin')) {
$warning_msg = _('Document Manager Action Denied.');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
if ($_POST['status']) {
@@ -46,7 +46,7 @@ if ($_POST['status']) {
if (!$g->setDocmanCreateOnlineStatus($status)) {
$feedback = '';
$warning_msg = $g->getErrorMessage();
- session_redirect('/docman/?group_id='.$group_id.'&view=admin');
+ session_redirect(DOCMAN_BASEURL.$group_id.'&view=admin');
}
-session_redirect('/docman/?group_id='.$group_id.'&view=admin');
+session_redirect(DOCMAN_BASEURL.$group_id.'&view=admin');
diff --git a/src/common/docman/actions/updateenginesearch.php
b/src/common/docman/actions/updateenginesearch.php
index 16a6293..0162b61 100644
--- a/src/common/docman/actions/updateenginesearch.php
+++ b/src/common/docman/actions/updateenginesearch.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -32,7 +32,7 @@ global $warning_msg;
if (!forge_check_perm('docman', $group_id, 'admin')) {
$warning_msg = _('Document Manager Action Denied.');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
if ($_POST['status']) {
@@ -46,7 +46,7 @@ if ($_POST['status']) {
if (!$g->setDocmanSearchStatus($status)) {
$feedback = '';
$error_msg = $g->getErrorMessage();
- session_redirect('/docman/?group_id='.$group_id.'&view=admin');
+ session_redirect(DOCMAN_BASEURL.$group_id.'&view=admin');
}
-session_redirect('/docman/?group_id='.$group_id.'&view=admin');
+session_redirect(DOCMAN_BASEURL.$group_id.'&view=admin');
diff --git a/src/common/docman/actions/updatewebdavinterface.php
b/src/common/docman/actions/updatewebdavinterface.php
index c85093f..f78ca59 100644
--- a/src/common/docman/actions/updatewebdavinterface.php
+++ b/src/common/docman/actions/updatewebdavinterface.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -32,7 +32,7 @@ global $warning_msg;
if (!forge_check_perm('docman', $group_id, 'admin')) {
$warning_msg = _('Document Manager Action Denied.');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
if ($_POST['status']) {
@@ -46,7 +46,7 @@ if ($_POST['status']) {
if (!$g->setDocmanWebdav($status)) {
$feedback = '';
$warning_msg = $g->getErrorMessage();
- session_redirect('/docman/?group_id='.$group_id.'&view=admin');
+ session_redirect(DOCMAN_BASEURL.$group_id.'&view=admin');
}
-session_redirect('/docman/?group_id='.$group_id.'&view=admin');
+session_redirect(DOCMAN_BASEURL.$group_id.'&view=admin');
diff --git a/src/common/docman/actions/validatefile.php
b/src/common/docman/actions/validatefile.php
index d2fbbd6..6a27588 100644
--- a/src/common/docman/actions/validatefile.php
+++ b/src/common/docman/actions/validatefile.php
@@ -32,7 +32,7 @@ global $feedback;
global $error_msg;
global $warning_msg;
-$urlredirect = '/docman/?group_id='.$group_id.'&dirid='.$dirid;
+$urlredirect = DOCMAN_BASEURL.$group_id.'&dirid='.$dirid;
// plugin projects-hierarchy handler
if ($childgroup_id) {
diff --git a/src/common/docman/include/constants.php
b/src/common/docman/include/constants.php
index 36e030e..0bd0506 100644
--- a/src/common/docman/include/constants.php
+++ b/src/common/docman/include/constants.php
@@ -20,13 +20,14 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-define('DOCMAN__TITLE_MIN_SIZE', 5);
-define('DOCMAN__TITLE_MAX_SIZE', 255);
-define('DOCMAN__DESCRIPTION_MIN_SIZE', 10);
-define('DOCMAN__DESCRIPTION_MAX_SIZE', 255);
-define('DOCMAN__COMMENT_MAX_SIZE', 255);
-define('DOCMAN__INFAMOUS_USER_ID', 100);
-define('DOCMAN__REVIEW_TITLE_MIN_SIZE', 5);
-define('DOCMAN__REVIEW_DESCRIPTION_MIN_SIZE', 10);
-define('DOCMAN__REVIEW_TITLE_MAX_SIZE', 255);
-define('DOCMAN__REVIEW_DESCRIPTION_MAX_SIZE', 255);
+define('DOCMAN_TITLE_MIN_SIZE', 5);
+define('DOCMAN_TITLE_MAX_SIZE', 255);
+define('DOCMAN_DESCRIPTION_MIN_SIZE', 10);
+define('DOCMAN_DESCRIPTION_MAX_SIZE', 255);
+define('DOCMAN_COMMENT_MAX_SIZE', 255);
+define('DOCMAN_INFAMOUS_USER_ID', 100);
+define('DOCMAN_REVIEW_TITLE_MIN_SIZE', 5);
+define('DOCMAN_REVIEW_DESCRIPTION_MIN_SIZE', 10);
+define('DOCMAN_REVIEW_TITLE_MAX_SIZE', 255);
+define('DOCMAN_REVIEW_DESCRIPTION_MAX_SIZE', 255);
+define('DOCMAN_BASEURL', '/docman/?group_id=');
diff --git a/src/common/docman/views/addfile.php
b/src/common/docman/views/addfile.php
index dd1c229..af99b4f 100644
--- a/src/common/docman/views/addfile.php
+++ b/src/common/docman/views/addfile.php
@@ -7,7 +7,7 @@
* Copyright 2010-2011, Franck Villaume - Capgemini
* Copyright 2011, Roland Mas
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2012-2016, Franck Villaume - TrivialDev
+ * Copyright 2012-2016,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -38,8 +38,8 @@ global $error_msg;
global $childgroup_id;
global $stateidArr;
-$actionurl = '/docman/?group_id='.$group_id.'&action=addfile&dirid='.$dirid;
-$redirecturl = '/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid;
+$actionurl = DOCMAN_BASEURL.$group_id.'&action=addfile&dirid='.$dirid;
+$redirecturl = DOCMAN_BASEURL.$group_id.'&view=listfile&dirid='.$dirid;
// plugin projects-hierarchy support
if (isset($childgroup_id) && $childgroup_id) {
$g = group_get_object($childgroup_id);
@@ -83,11 +83,11 @@ if ($dgf->getNested($stateidArr) == NULL) {
if ($dg->isError()) {
$error_msg = $dg->getErrorMessage();
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
if ($dg->create(_('Uncategorized Submissions'))) {
-
session_redirect('/docman/?group_id='.$group_id.'&view=additem');
+ session_redirect(DOCMAN_BASEURL.$group_id.'&view=additem');
}
echo $HTML->warning_msg(_('You MUST first create at least one folder to
store your document.'));
@@ -97,15 +97,15 @@ if ($dgf->getNested($stateidArr) == NULL) {
echo $HTML->listTableTop(array(), array(), 'infotable');
$cells = array();
$cells[][] = _('Document Title').utils_requiredField();
- $cells[][] = html_e('input', array('pattern' => '.{5,}', 'placeholder'
=> _('Document Title').' '.sprintf(_('(at least %s characters)'),
DOCMAN__TITLE_MIN_SIZE), 'title' => _('Document Title')._(': ')._('Refers to
the relatively brief title of the document (e.g. How to use the download
server).'), 'type' => 'text', 'name' => 'title', 'size' => 40, 'maxlength' =>
DOCMAN__TITLE_MAX_SIZE, 'required' => 'required'));
+ $cells[][] = html_e('input', array('pattern' => '.{5,}', 'placeholder'
=> _('Document Title').' '.sprintf(_('(at least %s characters)'),
DOCMAN_TITLE_MIN_SIZE), 'title' => _('Document Title')._(': ')._('Refers to the
relatively brief title of the document (e.g. How to use the download
server).'), 'type' => 'text', 'name' => 'title', 'size' => 40, 'maxlength' =>
DOCMAN_TITLE_MAX_SIZE, 'required' => 'required'));
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[][] = _('Description') .utils_requiredField();
- $cells[][] = html_e('textarea', array('minlength' => 10, 'placeholder'
=> _('Description').' '.sprintf(_('(at least %s characters)'),
DOCMAN__DESCRIPTION_MIN_SIZE), 'title' => util_gen_cross_ref_hints(), 'name' =>
'description', 'rows' => 5, 'cols' => 50, 'maxlength' =>
DOCMAN__DESCRIPTION_MAX_SIZE, 'required' => 'required'), '', false);
+ $cells[][] = html_e('textarea', array('minlength' => 10, 'placeholder'
=> _('Description').' '.sprintf(_('(at least %s characters)'),
DOCMAN_DESCRIPTION_MIN_SIZE), 'title' => util_gen_cross_ref_hints(), 'name' =>
'description', 'rows' => 5, 'cols' => 50, 'maxlength' =>
DOCMAN_DESCRIPTION_MAX_SIZE, 'required' => 'required'), '', false);
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[][] = _('Comment');
- $cells[][] = html_e('textarea', array('placeholder' => _('Add free
comment'), 'name' => 'vcomment', 'rows' => 5, 'cols' => 50, 'maxlength' =>
DOCMAN__COMMENT_MAX_SIZE), '', false);
+ $cells[][] = html_e('textarea', array('placeholder' => _('Add free
comment'), 'name' => 'vcomment', 'rows' => 5, 'cols' => 50, 'maxlength' =>
DOCMAN_COMMENT_MAX_SIZE), '', false);
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[][] = _('Type of Document') .utils_requiredField();
diff --git a/src/common/docman/views/additem.php
b/src/common/docman/views/additem.php
index d348da2..bbdd897 100644
--- a/src/common/docman/views/additem.php
+++ b/src/common/docman/views/additem.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2012-2016, Franck Villaume - TrivialDev
+ * Copyright 2012-2016,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -32,7 +32,7 @@ global $gfcommon;
if (!forge_check_perm('docman', $group_id, 'submit')) {
$warning_msg = _('Document Manager Access Denied');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
$stateidArr = array(1);
@@ -81,7 +81,7 @@ if (forge_check_perm('docman', $group_id, 'approve')) {
if ($dgf->getNested($stateidArr) == NULL) {
echo $HTML->warning_msg(_('You MUST first create at least one
folder to upload your archive.'));
} else {
- echo $HTML->openForm(array('id' => 'injectzip', 'name' =>
'injectzip', 'method' => 'post', 'action' =>
'/docman/?group_id='.$group_id.'&action=injectzip&dirid='.$dirid, 'enctype' =>
'multipart/form-data'));
+ echo $HTML->openForm(array('id' => 'injectzip', 'name' =>
'injectzip', 'method' => 'post', 'action' =>
DOCMAN_BASEURL.$group_id.'&action=injectzip&dirid='.$dirid, 'enctype' =>
'multipart/form-data'));
if (forge_get_config('use_manual_uploads')) {
echo html_e('input', array('type' => 'radio', 'id' =>
'buttonFileZip', 'name' => 'type', 'value' => 'httpupload', 'checked' =>
'checked', 'required' => 'required')).html_e('span', array(), _('File'), false);
echo html_e('input', array('type' => 'radio', 'id' =>
'buttonManualUploadZip', 'name' => 'type', 'value' => 'manualupload',
'required' => 'required')).html_e('span', array(), _('Already-uploaded file'),
false);
diff --git a/src/common/docman/views/addsubdocgroup.php
b/src/common/docman/views/addsubdocgroup.php
index 59deb2c..e5743a8 100644
--- a/src/common/docman/views/addsubdocgroup.php
+++ b/src/common/docman/views/addsubdocgroup.php
@@ -6,7 +6,7 @@
* Copyright 2002-2003, Tim Perdue/GForge, LLC
* Copyright 2010-2011, Franck Villaume - Capgemini
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013-2016, Franck Villaume - TrivialDev
+ * Copyright 2013-2016,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -35,7 +35,7 @@ global $childgroup_id;
global $childgroup_id;
global $HTML; // Layout object
-$actionurl =
'/docman/?group_id='.$group_id.'&action=addsubdocgroup&dirid='.$dirid;
+$actionurl = DOCMAN_BASEURL.$group_id.'&action=addsubdocgroup&dirid='.$dirid;
// plugin projects-hierarchy support
if ($childgroup_id) {
@@ -45,7 +45,7 @@ if ($childgroup_id) {
if (!forge_check_perm('docman', $g->getID(), 'approve')) {
$warning_msg = _('Document Manager Access Denied');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
echo html_ao('script', array('type' => 'text/javascript'));
diff --git a/src/common/docman/views/admin.php
b/src/common/docman/views/admin.php
index 1fe4927..49f5ef4 100644
--- a/src/common/docman/views/admin.php
+++ b/src/common/docman/views/admin.php
@@ -6,7 +6,7 @@
* Copyright 2002-2003, Tim Perdue/GForge, LLC
* Copyright 2010-2011, Franck Villaume - Capgemini
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2014-2015, Franck Villaume - TrivialDev
+ * Copyright 2014-2015,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -34,7 +34,7 @@ global $HTML;
if ( !forge_check_perm('docman', $group_id, 'admin')) {
$warning_msg = _('Document Manager Access Denied');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
echo html_ao('div', array('id' => 'principalAdminDiv', 'class' =>
'docmanDivIncluded'));
@@ -56,7 +56,7 @@ if (extension_loaded('zip')) {
echo $HTML->closeForm();
}
-echo $HTML->openForm(array('id' => 'createonline', 'name' => 'createonline',
'method' => 'post', 'action' =>
'/docman/?group_id='.$group_id.'&action=updatecreateonline'));
+echo $HTML->openForm(array('id' => 'createonline', 'name' => 'createonline',
'method' => 'post', 'action' =>
DOCMAN_BASEURL.$group_id.'&action=updatecreateonline'));
echo html_ao('ul');
$createOnlineStatus = '1';
$labelCreateOnline = _('Enable Create Online Documents');
@@ -68,7 +68,7 @@ echo html_e('li', array(), html_e('input', array('name' =>
'status', 'type' => '
echo html_ac(html_ap() -1);
echo $HTML->closeForm();
-echo $HTML->openForm(array('id' => 'searchengine', 'name' => 'searchengine',
'method' => 'post', 'action' =>
'/docman/?group_id='.$group_id.'&action=updateenginesearch'));
+echo $HTML->openForm(array('id' => 'searchengine', 'name' => 'searchengine',
'method' => 'post', 'action' =>
DOCMAN_BASEURL.$group_id.'&action=updateenginesearch'));
echo html_ao('ul');
$searchEngineStatus = '1';
$labelSearchEngine = _('Enable Search Engine');
@@ -81,7 +81,7 @@ echo html_ac(html_ap() -1);
echo $HTML->closeForm();
if ($g->useDocmanSearch()) {
- echo $HTML->openForm(array('id' => 'reindexword', 'name' =>
'reindexword', 'method' => 'post', 'action' =>
'/docman/?group_id='.$group_id.'&action=forcereindexenginesearch'));
+ echo $HTML->openForm(array('id' => 'reindexword', 'name' =>
'reindexword', 'method' => 'post', 'action' =>
DOCMAN_BASEURL.$group_id.'&action=forcereindexenginesearch'));
echo html_ao('ul');
echo html_e('li', array(), html_e('input', array('name' => 'status',
'type' => 'hidden', 'value' => '1')).html_e('input', array('id' =>
'submitreindexword', 'type' => 'button', 'value' => _('Force reindexation
search engine'), 'onclick' => 'javascript:doIt("reindexword")')), false);
echo html_ac(html_ap() -1);
@@ -89,7 +89,7 @@ if ($g->useDocmanSearch()) {
}
if (forge_get_config('use_webdav')) {
- echo $HTML->openForm(array('id' => 'webdavinterface', 'name' =>
'webdavinterface', 'method' => 'post', 'action' =>
'/docman/?group_id='.$group_id.'&action=updatewebdavinterface'));
+ echo $HTML->openForm(array('id' => 'webdavinterface', 'name' =>
'webdavinterface', 'method' => 'post', 'action' =>
DOCMAN_BASEURL.$group_id.'&action=updatewebdavinterface'));
echo html_ao('ul');
$webdavStatus = '1';
$labelWebdavInterface = _('Enable Webdav Interface');
diff --git a/src/common/docman/views/editdocgroup.php
b/src/common/docman/views/editdocgroup.php
index baa62a3..86ad714 100644
--- a/src/common/docman/views/editdocgroup.php
+++ b/src/common/docman/views/editdocgroup.php
@@ -6,7 +6,7 @@
* Copyright 2002-2003, Tim Perdue/GForge, LLC
* Copyright 2010-2011, Franck Villaume - Capgemini
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013-2016, Franck Villaume - TrivialDev
+ * Copyright 2013-2016,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -36,7 +36,7 @@ global $HTML;
global $warning_msg;
global $childgroup_id;
-$actionurl = '/docman/?group_id='.$group_id.'&action=editdocgroup';
+$actionurl = DOCMAN_BASEURL.$group_id.'&action=editdocgroup';
// plugin projects-hierarchy support
if ($childgroup_id) {
@@ -46,13 +46,13 @@ if ($childgroup_id) {
if (!forge_check_perm('docman', $g->getID(), 'approve')) {
$warning_msg = _('Document Manager Access Denied');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
$dg = new DocumentGroup($g, $dirid);
if ($dg->isError()) {
$error_msg = $dg->getErrorMessage();
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
echo html_ao('div', array('class' => 'docmanDivIncluded'));
diff --git a/src/common/docman/views/editfile.php
b/src/common/docman/views/editfile.php
index ffa048d..0c7e8df 100644
--- a/src/common/docman/views/editfile.php
+++ b/src/common/docman/views/editfile.php
@@ -30,7 +30,7 @@ global $warning_msg;
if (!forge_check_perm('docman', $group_id, 'approve')) {
$warning_msg = _('Document Manager Access Denied');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
echo html_ao('script', array('type' => 'text/javascript'));
diff --git a/src/common/docman/views/help.php b/src/common/docman/views/help.php
index d897193..b4c06e6 100644
--- a/src/common/docman/views/help.php
+++ b/src/common/docman/views/help.php
@@ -36,7 +36,7 @@ if ($childgroup_id) {
if (!forge_check_perm('docman', $g->getID(), 'read')) {
$warning_msg = _('Document Manager Access Denied');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
echo html_ao('div', array('class' => 'docmanDivIncluded'));
diff --git a/src/common/docman/views/listfile.php
b/src/common/docman/views/listfile.php
index b8da700..dcdc8c6 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -39,7 +39,7 @@ global $start; // use to set the offset
global $childgroup_id;
$linkmenu = 'listfile';
-$baseredirecturl = '/docman/?group_id='.$group_id;
+$baseredirecturl = DOCMAN_BASEURL.$group_id;
$redirecturl = $baseredirecturl.'&view='.$linkmenu.'&dirid='.$dirid;
echo html_ao('div', array('id' => 'leftdiv'));
@@ -182,7 +182,7 @@ echo html_ac(html_ap() - 1);
if ($DocGroupName) {
$headerPath = '';
if ($childgroup_id) {
- $headerPath .= _('Subproject')._(':
').util_make_link('/docman/?group_id='.$g->getID(), $g->getPublicName()).'::';
+ $headerPath .= _('Subproject')._(':
').util_make_link(DOCMAN_BASEURL.$g->getID(), $g->getPublicName()).'::';
}
$headerPath .= html_e('i', array(), preg_replace('/\/\//','/',
$dgpath.'/'.$DocGroupName), false);
echo html_e('h2', array('class' => 'docman_h2'), $headerPath, false);
@@ -325,14 +325,12 @@ if (isset($nested_docs[$dirid]) &&
is_array($nested_docs[$dirid])) {
if (forge_check_perm('docman', $g->getID(), 'approve')) {
$nextcell = '';
- $editfileaction =
'/docman/?action=editfile&fromview=listfile&dirid='.$d->getDocGroupID();
- $notifyaction =
'/docman/?action=notifyusers&fromview=listfile&dirid='.$d->getDocGroupID();
+ $editfileaction =
DOCMAN_BASEURL.$group_id.'&action=editfile&fromview=listfile&dirid='.$d->getDocGroupID();
+ $notifyaction =
DOCMAN_BASEURL.$group_id.'&action=notifyusers&fromview=listfile&dirid='.$d->getDocGroupID();
if ($childgroup_id) {
$editfileaction .=
'&childgroup_id='.$childgroup_id;
$notifyaction .=
'&childgroup_id='.$childgroup_id;
}
- $editfileaction .= '&group_id='.$group_id;
- $notifyaction .= '&group_id='.$group_id;
if (!$d->getLocked() && !$d->getReserved()) {
$nextcell .=
util_make_link($redirecturl.'&action=trashfile&fileid='.$d->getID(),
$HTML->getDeletePic(_('Move this document to trash'), 'delfile'));
diff --git a/src/common/docman/views/listtrashfile.php
b/src/common/docman/views/listtrashfile.php
index a8a3720..88ba655 100644
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@ -6,7 +6,7 @@
* Copyright 2002-2003, Tim Perdue/GForge, LLC
* Copyright 2010-2011, Franck Villaume - Capgemini
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2011-2017, Franck Villaume - TrivialDev
+ * Copyright 2011-2017,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -38,7 +38,7 @@ global $start; // use to set the offset
$linkmenu = 'listtrashfile';
$childgroup_id = getIntFromRequest('childgroup_id');
-$baseredirecturl = '/docman/?group_id='.$group_id;
+$baseredirecturl = DOCMAN_BASEURL.$group_id;
$redirecturl = $baseredirecturl.'&view='.$linkmenu.'&dirid='.$dirid;
echo html_ao('div', array('id' => 'leftdiv'));
@@ -97,7 +97,7 @@ if (is_array($d_arr) && count($d_arr) > 0) {
echo html_ao('div', array('id' => 'rightdiv'));
echo html_ao('div', array('style' => 'padding:5px'));
-echo $HTML->openForm(array('id' => 'emptytrash', 'name' => 'emptytrash',
'method' => 'post', 'action' =>
'/docman/?group_id='.$group_id.'&action=emptytrash'));
+echo $HTML->openForm(array('id' => 'emptytrash', 'name' => 'emptytrash',
'method' => 'post', 'action' => DOCMAN_BASEURL.$group_id.'&action=emptytrash'));
echo html_e('input', array('id' => 'submitemptytrash', 'type' => 'submit',
'value' => _('Delete permanently all documents and folders with deleted
status.')));
echo $HTML->closeForm();
echo html_ac(html_ap() - 1);
@@ -132,7 +132,7 @@ echo html_ac(html_ap() - 1);
if ($DocGroupName) {
$headerPath = '';
if ($childgroup_id) {
- $headerPath .= _('Subproject')._(':
').util_make_link('/docman/?group_id='.$g->getID(), $g->getPublicName()).'::';
+ $headerPath .= _('Subproject')._(':
').util_make_link(DOCMAN_BASEURL.$g->getID(), $g->getPublicName()).'::';
}
$headerPath .= html_e('i', array(), preg_replace('/\/\//','/',
$dgpath.'/'.$DocGroupName), false).' ';
echo html_e('h2', array('class' => 'docman_h2'), $headerPath, false);
@@ -194,11 +194,10 @@ if (isset($nested_docs[$dirid]) &&
is_array($nested_docs[$dirid])) {
}
}
$newdgf = new DocumentGroupFactory($d->Group);
- $editfileaction =
'/docman/?action=editfile&fromview=listfile&dirid='.$d->getDocGroupID();
+ $editfileaction =
DOCMAN_BASEURL.$GLOBALS['group_id'].'&action=editfile&fromview=listfile&dirid='.$d->getDocGroupID();
if (isset($GLOBALS['childgroup_id']) &&
$GLOBALS['childgroup_id']) {
$editfileaction .=
'&childgroup_id='.$GLOBALS['childgroup_id'];
}
- $editfileaction .= '&group_id='.$GLOBALS['group_id'];
$nextcell = '';
$nextcell .=
util_make_link($redirecturl.'&action=delfile&fileid='.$d->getID(),
$HTML->getRemovePic(_('Delete permanently this document.'), 'delfile'));
$nextcell .= util_make_link('#', $HTML->getEditFilePic(_('Edit
this document'), 'editdocument'), array('onclick' =>
'javascript:controllerListFile.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).'
,id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', statusId:'.$d->getStateID().',
statusDict:'.$dm->getStatusNameList('json','2').',
docgroupDict:'.$dm->getDocGroupList($newdgf->getNested(array(1, 5)), 'json').',
isText:\''.$d->isText().'\', useCreateOnline:'.$d->Group->useCreateOnline().',
docManURL:\''.util_make_uri("docman").'\'})', 'title' => _('Edit this
document')), true);
diff --git a/src/common/docman/views/menu.php b/src/common/docman/views/menu.php
index 2cb656b..ef439e6 100644
--- a/src/common/docman/views/menu.php
+++ b/src/common/docman/views/menu.php
@@ -36,7 +36,7 @@ global $warning_msg;
if (!forge_check_perm('docman', $group_id, 'read')) {
$warning_msg = _('Document Manager Access Denied');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL .$group_id);
}
$dm = new DocumentManager($g);
@@ -47,33 +47,33 @@ $menu_links = array();
$menu_attr = array();
$menu_text[] = _('View Documents');
-$menu_links[] = '/docman/?group_id='.$group_id;
+$menu_links[] = DOCMAN_BASEURL.$group_id;
$menu_attr[] = array('title' => _('View documents and folders in 2 panels.
Left a folder tree, right a list of files of selected folder.'), 'id' =>
'listFileDocmanMenu');
if (forge_check_perm('docman', $group_id, 'submit')) {
$menu_text[] = _('Add new item');
- $menu_links[] = '/docman/?group_id='.$group_id.'&view=additem';
+ $menu_links[] = DOCMAN_BASEURL.$group_id.'&view=additem';
$menu_attr[] = array('title' => _('Add a new item such as file, create
directory, inject a ZIP at root level.'), 'id' => 'addItemDocmanMenu');
}
if ($g->useDocmanSearch()) {
$menu_text[] = _('Search');
- $menu_links[] = '/docman/?group_id='.$group_id.'&view=search';
+ $menu_links[] = DOCMAN_BASEURL.$group_id.'&view=search';
$menu_attr[] = array('title' => _('Search documents in this project
using keywords.'), 'id' => 'searchDocmanMenu');
}
if (forge_check_perm('docman', $group_id, 'approve') && !$dm->isTrashEmpty()) {
$menu_text[] = _('Trash');
- $menu_links[] = '/docman/?group_id='.$group_id.'&view=listtrashfile';
+ $menu_links[] = DOCMAN_BASEURL.$group_id.'&view=listtrashfile';
$menu_attr[] = array('title' => _('Recover or delete permanently files
with deleted status.'), 'id' => 'trashDocmanMenu');
}
if (forge_check_perm('docman', $group_id, 'admin')) {
$menu_text[] = _('Reporting');
- $menu_links[] = '/docman/?group_id='.$group_id.'&view=reporting';
+ $menu_links[] = DOCMAN_BASEURL.$group_id.'&view=reporting';
$menu_attr[] = array('title' => _('Docman module reporting.'), 'id' =>
'reportDocmanMenu');
$menu_text[] = _('Administration');
- $menu_links[] = '/docman/?group_id='.$group_id.'&view=admin';
+ $menu_links[] = DOCMAN_BASEURL.$group_id.'&view=admin';
$menu_attr[] = array('title' => _('Docman module administration.'),
'id' => 'adminDocmanMenu');
}
diff --git a/src/common/docman/views/movefile.php
b/src/common/docman/views/movefile.php
index 1bb370f..8c4281f 100644
--- a/src/common/docman/views/movefile.php
+++ b/src/common/docman/views/movefile.php
@@ -32,7 +32,7 @@ global $HTML; // Layout object
global $warning_msg;
global $childgroup_id;
-$actionurl =
'/docman/?group_id='.$group_id.'&dirid='.$dirid.'&action=movefile';
+$actionurl = DOCMAN_BASEURL.$group_id.'&dirid='.$dirid.'&action=movefile';
// plugin projects-hierarchy support
if ($childgroup_id) {
$g = group_get_object($childgroup_id);
@@ -41,7 +41,7 @@ if ($childgroup_id) {
if (!forge_check_perm('docman', $g->getID(), 'approve')) {
$warning_msg = _('Document Manager Access Denied');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
echo html_ao('div', array('class' => 'docmanDivIncluded'));
diff --git a/src/common/docman/views/notifyusers.php
b/src/common/docman/views/notifyusers.php
index 3fba491..4159dd6 100644
--- a/src/common/docman/views/notifyusers.php
+++ b/src/common/docman/views/notifyusers.php
@@ -30,7 +30,7 @@ global $warning_msg;
if (!forge_check_perm('docman', $group_id, 'approve')) {
$warning_msg = _('Document Manager Access Denied');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
$userObjects = $g->getUsers();
diff --git a/src/common/docman/views/pendingfiles.php
b/src/common/docman/views/pendingfiles.php
index 694246c..2b744a2 100644
--- a/src/common/docman/views/pendingfiles.php
+++ b/src/common/docman/views/pendingfiles.php
@@ -110,11 +110,10 @@ jQuery(document).ready(function() {
}
}
$cells[][] = $d->getDownload();
- $editfileaction =
'/docman/?action=editfile&fromview=listfile&dirid='.$d->getDocGroupID();
+ $editfileaction =
DOCMAN_BASEURL.'&action=editfile&fromview=listfile&dirid='.$d->getDocGroupID();
if ($childgroup_id) {
$editfileaction .=
'&childgroup_id='.$childgroup_id;
}
- $editfileaction .= '&group_id='.$group_id;
$cells[][] = util_make_link('#',
$HTML->getEditFilePic($edittitle, 'editdocument'), array('onclick' =>
'javascript:controllerListPending.toggleEditFileView({action:\''.util_make_uri($editfileaction).'\',
lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).'
,id:'.$d->getID().', groupId:'.$d->Group->getID().',
docgroupId:'.$d->getDocGroupID().', statusId:'.$d->getStateID().',
statusDict:'.$dm->getStatusNameList('json').',
docgroupDict:'.$dm->getDocGroupList($nested_groups, 'json').',
title:\''.addslashes($d->getName()).'\',
filename:\''.addslashes($d->getFileName()).'\',
description:\''.addslashes($d->getDescription()).'\',
isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\',
useCreateOnline:'.$d->Group->useCreateOnline().',
docManURL:\''.util_make_uri("docman").'\'})', 'title' => _('Edit this
document')), true).
util_make_link('#',
html_image('docman/validate.png', 22, 22, array('alt' => _('Activate in this
folder'))), array('onclick' =>
'window.location.href=\''.util_make_uri($redirecturl.'&action=validatefile&fileid='.$d->getID()).'\'',
'title' => _('Activate in this folder')), true);
echo $HTML->multiTableRow(array(), $cells);
diff --git a/src/common/docman/views/reporting.php
b/src/common/docman/views/reporting.php
index 0c1fa79..14764b0 100644
--- a/src/common/docman/views/reporting.php
+++ b/src/common/docman/views/reporting.php
@@ -53,7 +53,7 @@ global $warning_msg;
if ( !forge_check_perm('docman', $group_id, 'admin')) {
$warning_msg = _('Document Manager Access Denied');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
$start = getIntFromRequest('start');
@@ -89,7 +89,7 @@ if ($report->isError()) {
echo $HTML->error_msg($report->getErrorMessage());
} else {
echo html_ao('div', array('id' => 'div_form_reporting'));
- echo $HTML->openForm(array('action' =>
'/docman/?group_id='.$group_id.'&view=reporting', 'method' => 'post', 'class'
=> 'align-center'));
+ echo $HTML->openForm(array('action' =>
DOCMAN_BASEURL.$group_id.'&view=reporting', 'method' => 'post', 'class' =>
'align-center'));
echo html_e('strong', array(), _('Start Date')._(':'), false);
echo report_months_box($report, 'start', $start);
echo html_e('strong', array(), _('End Date')._(':'), false);
diff --git a/src/common/docman/views/search.php
b/src/common/docman/views/search.php
index c587bde..e20c2ee 100644
--- a/src/common/docman/views/search.php
+++ b/src/common/docman/views/search.php
@@ -34,7 +34,7 @@ global $dirid; // id of doc_group
global $HTML; // Layout object
global $warning_msg;
-$redirect_url = '/docman/?group_id='.$group_id;
+$redirect_url = DOCMAN_BASEURL.$group_id;
if (!forge_check_perm('docman', $group_id, 'read')) {
$warning_msg = _('Document Manager Access Denied');
session_redirect($redirect_url);
@@ -87,7 +87,7 @@ jQuery(document).ready(function() {
//]]>
<?php
echo html_ac(html_ap() - 1);
-echo $HTML->openForm(array('method' => 'post', 'action' =>
'/docman/?group_id='.$group_id.'&view=search'));
+echo $HTML->openForm(array('method' => 'post', 'action' =>
DOCMAN_BASEURL.$group_id.'&view=search'));
echo html_e('div', array('id' => 'docman_search_query_words'),
html_e('span', array('id' => 'docman_search_query_label'),
_('Query').utils_requiredField()._(': ')).
html_e('input', array('type' => 'text', 'name' => 'textsearch', 'id' =>
'textsearch', 'size' => 48, 'value' =>
stripslashes(htmlspecialchars($searchString)), 'required' => 'required',
'placeholder' => _('Searched words'))).
diff --git a/src/common/docman/views/tree.php b/src/common/docman/views/tree.php
index 8d1f1d7..69ceadd 100644
--- a/src/common/docman/views/tree.php
+++ b/src/common/docman/views/tree.php
@@ -37,7 +37,7 @@ global $childgroup_id;
if (!forge_check_perm('docman', $group_id, 'read')) {
$warning_msg= _('Document Manager Access Denied');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
echo html_ao('div', array('id' => 'documenttree'));
@@ -63,7 +63,7 @@ if (isset($projectIDsArray) && is_array($projectIDsArray)) {
if ($groupObject->usesDocman() &&
$projectsHierarchy->getDocmanStatus($groupObject->getID())
&& forge_check_perm('docman', $groupObject->getID(),
'read')) {
echo html_e('hr');
- echo html_e('h5', array(), _('Child project')._(':
').util_make_link('/docman/?group_id='.$groupObject->getID(),$groupObject->getPublicName(),
array('title'=>_('Browse document manager for this project.'))), false);
+ echo html_e('h5', array(), _('Child project')._(':
').util_make_link(DOCMAN_BASEURL.$groupObject->getID(),
$groupObject->getPublicName(), array('title'=>_('Browse document manager for
this project.'))), false);
$dmc = new DocumentManager($groupObject);
echo html_ao('ul', array('id' =>
$groupObject->getUnixName().'-tree'));
$dmc->getHTMLTree($dirid, $linkmenu);
diff --git a/src/common/docman/views/views.php
b/src/common/docman/views/views.php
index 37dbdbb..af2a4a5 100644
--- a/src/common/docman/views/views.php
+++ b/src/common/docman/views/views.php
@@ -29,7 +29,7 @@ global $warning_msg;
if (!forge_check_perm('docman', $group_id, 'read')) {
$warning_msg = _('Document Manager Access Denied');
- session_redirect('/docman/?group_id='.$group_id);
+ session_redirect(DOCMAN_BASEURL.$group_id);
}
$view = getStringFromRequest('view', 'listfile');
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/Document.class.php | 42 +++++++++++-----------
src/common/docman/DocumentGroup.class.php | 6 ++--
src/common/docman/DocumentManager.class.php | 5 +--
src/common/docman/DocumentReview.class.php | 30 ++++++++--------
src/common/docman/actions/addfile.php | 2 +-
src/common/docman/actions/addsubdocgroup.php | 2 +-
src/common/docman/actions/deldir.php | 2 +-
src/common/docman/actions/deleteassociations.php | 2 +-
src/common/docman/actions/delfile.php | 2 +-
src/common/docman/actions/editdocgroup.php | 2 +-
src/common/docman/actions/editfile.php | 2 +-
src/common/docman/actions/emptytrash.php | 2 +-
src/common/docman/actions/enforcereserve.php | 8 ++---
.../docman/actions/forcereindexenginesearch.php | 8 ++---
src/common/docman/actions/getassociations.php | 2 +-
src/common/docman/actions/getdocreviewcomments.php | 2 +-
.../docman/actions/getdocreviewcompleteform.php | 2 +-
src/common/docman/actions/getdocreviews.php | 2 +-
.../docman/actions/getdocreviewuserstatus.php | 2 +-
src/common/docman/actions/getdocversions.php | 2 +-
src/common/docman/actions/getfile.php | 4 +--
src/common/docman/actions/injectzip.php | 4 +--
src/common/docman/actions/lock.php | 8 ++---
src/common/docman/actions/monitordirectory.php | 18 +++++-----
src/common/docman/actions/monitorfile.php | 4 +--
src/common/docman/actions/movefile.php | 4 +--
src/common/docman/actions/notifyusers.php | 4 +--
src/common/docman/actions/releasefile.php | 4 +--
src/common/docman/actions/reservefile.php | 10 +++---
src/common/docman/actions/trashdir.php | 4 +--
src/common/docman/actions/trashfile.php | 4 +--
src/common/docman/actions/updatecreateonline.php | 8 ++---
src/common/docman/actions/updateenginesearch.php | 8 ++---
.../docman/actions/updatewebdavinterface.php | 8 ++---
src/common/docman/actions/validatefile.php | 2 +-
src/common/docman/include/constants.php | 21 +++++------
src/common/docman/views/addfile.php | 16 ++++-----
src/common/docman/views/additem.php | 6 ++--
src/common/docman/views/addsubdocgroup.php | 6 ++--
src/common/docman/views/admin.php | 12 +++----
src/common/docman/views/editdocgroup.php | 8 ++---
src/common/docman/views/editfile.php | 2 +-
src/common/docman/views/help.php | 2 +-
src/common/docman/views/listfile.php | 10 +++---
src/common/docman/views/listtrashfile.php | 11 +++---
src/common/docman/views/menu.php | 14 ++++----
src/common/docman/views/movefile.php | 4 +--
src/common/docman/views/notifyusers.php | 2 +-
src/common/docman/views/pendingfiles.php | 3 +-
src/common/docman/views/reporting.php | 4 +--
src/common/docman/views/search.php | 4 +--
src/common/docman/views/tree.php | 4 +--
src/common/docman/views/views.php | 2 +-
53 files changed, 177 insertions(+), 175 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
