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 52e92f4c6b487307f6dffcc4bd25882f5f55ce58 (commit)
from eec57a8653b5395b6ecfd964efa7ac34837a4a60 (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=52e92f4c6b487307f6dffcc4bd25882f5f55ce58
commit 52e92f4c6b487307f6dffcc4bd25882f5f55ce58
Author: Franck Villaume <[email protected]>
Date: Sun Nov 15 18:22:46 2015 +0100
docman cleanup: missing global var, indent, space
diff --git a/src/common/docman/actions/addsubdocgroup.php
b/src/common/docman/actions/addsubdocgroup.php
index 9c10666..619b04c 100644
--- a/src/common/docman/actions/addsubdocgroup.php
+++ b/src/common/docman/actions/addsubdocgroup.php
@@ -5,7 +5,7 @@
* Copyright 2000, Quentin Cregan/Sourceforge
* Copyright 2002-2003, Tim Perdue/GForge, LLC
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2011,2014, Franck Villaume - TrivialDev
+ * Copyright 2011,2015, Franck Villaume - TrivialDev
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* http://fusionforge.org
*
@@ -30,6 +30,10 @@
global $g; // group object
global $dirid; // id of doc_group
global $group_id; // id of group
+global $feedback;
+global $error_msg;
+global $warning_msg;
+global $childgroup_id;
if ($dirid) {
$urlredirect =
'/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid;
@@ -37,8 +41,7 @@ if ($dirid) {
$urlredirect = '/docman/?group_id='.$group_id;
}
-// plugin projects-hierarchy handler
-$childgroup_id = getIntFromRequest('childgroup_id');
+// plugin projects-hierarchy support
if ($childgroup_id) {
$g = group_get_object($childgroup_id);
$urlredirect .= '&childgroup_id='.$childgroup_id;
diff --git a/src/common/docman/views/addfile.php
b/src/common/docman/views/addfile.php
index 163fd3d..7d07050 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-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -32,12 +32,14 @@ global $g; // group object
global $group_id; // id of the group
global $dirid; //id of the doc_group
global $dm; // the Document Manager object
-global $HTML;
+global $HTML; // Layout object
+global $warning_msg;
+global $childgroup_id;
-// plugin projects-hierarchy
$actionurl = '/docman/?group_id='.$group_id.'&action=addfile&dirid='.$dirid;
$redirecturl = '/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid;
-if (isset($childgroup_id) && $childgroup_id) {
+// plugin projects-hierarchy support
+if ($childgroup_id) {
$g = group_get_object($childgroup_id);
$actionurl .= '&childgroup_id='.$childgroup_id;
$redirecturl .= '&childgroup_id='.$childgroup_id;
diff --git a/src/common/docman/views/additem.php
b/src/common/docman/views/additem.php
index c891e21..c007721 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-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -26,6 +26,9 @@
/* global variables used */
global $group_id; // id of the group
global $dirid; // id of the doc_group
+global $HTML; // Layout object
+global $warning_msg;
+global $gfcommon;
if (!forge_check_perm('docman', $group_id, 'submit')) {
$warning_msg = _('Document Manager Access Denied');
diff --git a/src/common/docman/views/addsubdocgroup.php
b/src/common/docman/views/addsubdocgroup.php
index c9a46f6..54e0a79 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-2014, Franck Villaume - TrivialDev
+ * Copyright 2013-2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -29,16 +29,18 @@
/* global variables used */
global $group_id; // id of the group
global $dirid; // id of the doc_group
+global $warning_msg;
+global $childgroup_id;
if (!forge_check_perm('docman', $group_id, 'approve')) {
$warning_msg = _('Document Manager Access Denied');
session_redirect('/docman/?group_id='.$group_id);
}
-// plugin projects-hierarchy
$actionurl =
'/docman/?group_id='.$group_id.'&action=addsubdocgroup&dirid='.$dirid;
-if (isset($childgroup_id) && $childgroup_id) {
- $g = group_get_object($childgroup_id);
+
+// plugin projects-hierarchy support
+if ($childgroup_id) {
$actionurl .= '&childgroup_id='.$childgroup_id;
}
@@ -59,7 +61,7 @@ if ($dirid) {
} else {
$folderMessage = _('Name of the document folder to create');
}
-echo html_e('span', array(), $folderMessage._(': '), false);
+echo html_e('span', array(), $folderMessage.utils_requiredField(), false);
echo html_e('input', array('required' => 'required', 'type' => 'text', 'name'
=> 'groupname', 'size' => 40, 'maxlength' => 255, 'placeholder' =>
$folderMessage));
echo html_e('input', array('id' => 'submitaddsubgroup', 'type' => 'button',
'value' => _('Create'), 'onclick' => 'javascript:doItAddSubGroup()'));
echo $HTML->closeForm();
diff --git a/src/common/docman/views/admin.php
b/src/common/docman/views/admin.php
index d713f6a..741b679 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, Franck Villaume - TrivialDev
+ * Copyright 2014-2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -29,6 +29,8 @@
/* global variables used */
global $g; //group object
global $group_id; // id of the group
+global $warning_msg;
+global $HTML;
if ( !forge_check_perm('docman', $group_id, 'admin')) {
$warning_msg = _('Document Manager Access Denied');
diff --git a/src/common/docman/views/editdocgroup.php
b/src/common/docman/views/editdocgroup.php
index 0d5efd0..908e77b 100644
--- a/src/common/docman/views/editdocgroup.php
+++ b/src/common/docman/views/editdocgroup.php
@@ -7,7 +7,7 @@
* Copyright 2002-2003, Tim Perdue/GForge, LLC
* Copyright 2010-2011, Franck Villaume - Capgemini
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright 2013-2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -34,14 +34,17 @@ global $dirid; // id of doc_group
global $dgf; // document directory factory of this group
global $dm; // the Document Manager object
global $HTML;
+global $warning_msg;
+global $childgroup_id;
if (!forge_check_perm('docman', $group_id, 'approve')) {
$warning_msg = _('Document Manager Access Denied');
session_redirect('/docman/?group_id='.$group_id);
}
-// plugin projects-hierarchy
$actionurl = '/docman/?group_id='.$group_id.'&action=editdocgroup';
+
+// plugin projects-hierarchy support
if ($childgroup_id) {
$g = group_get_object($childgroup_id);
$actionurl .= '&childgroup_id='.$childgroup_id;
diff --git a/src/common/docman/views/editfile.php
b/src/common/docman/views/editfile.php
index 0bef110..96a8099 100644
--- a/src/common/docman/views/editfile.php
+++ b/src/common/docman/views/editfile.php
@@ -2,7 +2,7 @@
/**
* FusionForge Documentation Manager
*
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -26,6 +26,7 @@
global $g; //group object
global $group_id; // id of the group
global $HTML;
+global $warning_msg;
if (!forge_check_perm('docman', $group_id, 'approve')) {
$warning_msg = _('Document Manager Access Denied');
diff --git a/src/common/docman/views/help.php b/src/common/docman/views/help.php
index 68126f9..6af482e 100644
--- a/src/common/docman/views/help.php
+++ b/src/common/docman/views/help.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright 2013-2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -26,6 +26,7 @@
/* global variables used */
global $group_id; // id of the group
global $g; // the project object
+global $warning_msg;
if (!forge_check_perm('docman', $group_id, 'read')) {
$warning_msg = _('Document Manager Access Denied');
diff --git a/src/common/docman/views/menu.php b/src/common/docman/views/menu.php
index 926ccb5..db35f4e 100644
--- a/src/common/docman/views/menu.php
+++ b/src/common/docman/views/menu.php
@@ -7,6 +7,7 @@
* Copyright 2002-2004, GForge Team
* Copyright 2010-2011, Franck Villaume - Capgemini
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
+ * Copyright 2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -27,9 +28,11 @@
/* please do not add require here : use www/docman/index.php to add require */
/* global variables used */
-global $HTML; // html object
+global $HTML; // Layout object
global $d_arr; // document array
global $group_id; // id of group
+global $g; // Group object
+global $warning_msg;
if (!forge_check_perm('docman', $group_id, 'read')) {
$warning_msg = _('Document Manager Access Denied');
diff --git a/src/common/docman/views/movefile.php
b/src/common/docman/views/movefile.php
index 9f77ff9..50888c5 100644
--- a/src/common/docman/views/movefile.php
+++ b/src/common/docman/views/movefile.php
@@ -2,7 +2,7 @@
/**
* FusionForge Documentation Manager
*
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014-2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -28,15 +28,17 @@ global $group_id; // id of the group
global $dirid; // id of doc_group
global $dgf; // document directory factory of this group
global $dm; // the Document Manager object
-global $HTML;
+global $HTML; // Layout object
+global $warning_msg;
+global $childgroup_id;
if (!forge_check_perm('docman', $group_id, 'approve')) {
$warning_msg = _('Document Manager Access Denied');
session_redirect('/docman/?group_id='.$group_id);
}
-// plugin projects-hierarchy
$actionurl =
'/docman/?group_id='.$group_id.'&dirid='.$dirid.'&action=movefile';
+// plugin projects-hierarchy support
if ($childgroup_id) {
$g = group_get_object($childgroup_id);
$actionurl .= '&childgroup_id='.$childgroup_id;
@@ -45,10 +47,8 @@ if ($childgroup_id) {
echo html_ao('div', array('class' => 'docmanDivIncluded'));
echo $HTML->openForm(array('name' => 'movefile', 'action' =>
util_make_uri($actionurl), 'method' => 'post'));
echo html_e('input', array('type' => 'hidden', 'name' => 'fileid', 'id' =>
'movefileinput'));
-echo html_ao('p', array());
-echo _('Move files to');
-echo $dm->showSelectNestedGroups($dgf->getNested(), 'moveto_dirid', false);
-echo html_e('input', array('type' => 'submit', 'value' => _('Go'), 'name' =>
'submit'));
-echo html_ac(html_ap() - 1);
+echo html_e('p', array(), _('Move files to').
+ $dm->showSelectNestedGroups($dgf->getNested(),
'moveto_dirid', false).
+ html_e('input', array('type' => 'submit', 'value' =>
_('Go'), 'name' => 'submit')));
echo $HTML->closeForm();
echo html_ac(html_ap() - 1);
diff --git a/src/common/docman/views/pendingfiles.php
b/src/common/docman/views/pendingfiles.php
index 91583cd..814793f 100644
--- a/src/common/docman/views/pendingfiles.php
+++ b/src/common/docman/views/pendingfiles.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -31,6 +31,8 @@ global $HTML; // Layout object
global $nested_pending_docs;
global $nested_groups;
global $redirecturl; // built url from listfile.php (handle the hierarchy)
+global $warning_msg;
+global $childgroup_id;
if (!forge_check_perm('docman', $g->getID(), 'approve')) {
$warning_msg = _('Document Manager Access Denied');
@@ -68,7 +70,7 @@ jQuery(document).ready(function() {
$cells = array();
$cells[][] = html_e('input', array('type' =>
'checkbox', 'value' => $d->getID(), 'class' => 'checkeddocidpending', 'title'
=> _('Select / Deselect this document for massaction'), 'onClick' =>
'controllerListPending.checkgeneral("pending")'));
switch ($d->getFileType()) {
- case "URL": {
+ case 'URL': {
$cells[][] =
util_make_link($d->getFileName(), html_image($d->getFileTypeImage(), '22',
'22', array('alt'=>$d->getFileType())), array('title' => _('Visit this link')),
true);
break;
}
@@ -91,8 +93,8 @@ jQuery(document).ready(function() {
}
$cells[][] =$d->getStateName();
switch ($d->getFileType()) {
- case "URL": {
- $cells[][] = "--";
+ case 'URL': {
+ $cells[][] = '--';
break;
}
default: {
@@ -100,15 +102,13 @@ jQuery(document).ready(function() {
break;
}
}
- $nextcell = '';
$editfileaction =
'/docman/?action=editfile&fromview=listfile&dirid='.$d->getDocGroupID();
- if (isset($GLOBALS['childgroup_id']) &&
$GLOBALS['childgroup_id']) {
- $editfileaction .=
'&childgroup_id='.$GLOBALS['childgroup_id'];
+ if ($childgroup_id) {
+ $editfileaction .=
'&childgroup_id='.$childgroup_id;
}
- $editfileaction .= '&group_id='.$GLOBALS['group_id'];
- $nextcell .= util_make_link('#',
html_image('docman/edit-file.png', 22, 22, array('alt' => _('Edit this
document'))), 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);
- $nextcell .= 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);
- $cells[][] = $nextcell;
+ $editfileaction .= '&group_id='.$group_id;
+ $cells[][] = util_make_link('#',
html_image('docman/edit-file.png', 22, 22, array('alt' => _('Edit this
document'))), 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);
}
echo $HTML->listTableBottom();
diff --git a/src/common/docman/views/reporting.php
b/src/common/docman/views/reporting.php
index 99e0033..773ccd9 100644
--- a/src/common/docman/views/reporting.php
+++ b/src/common/docman/views/reporting.php
@@ -1,7 +1,7 @@
<?php
/**
* Copyright (C) 2009-2012 Alain Peyrat, Alcatel-Lucent
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -44,10 +44,11 @@
/* please do not add require here : use www/docman/index.php to add require */
/* global variables used */
-global $HTML; // html object
+global $HTML; // Layout object
global $d_arr; // document array
global $group_id; // id of group
global $g; // the group object
+global $warning_msg;
if ( !forge_check_perm('docman', $group_id, 'admin')) {
$warning_msg = _('Document Manager Access Denied');
@@ -82,7 +83,6 @@ $report = new ReportPerGroupDocmanDownloads($group_id,
$start, $end);
if ($report->isError()) {
echo $HTML->error_msg($report->getErrorMessage());
} else {
-
echo html_ao('div', array('id' => 'div_form_reporting'));
echo $HTML->openForm(array('action' =>
util_make_uri('/docman/?group_id='.$group_id.'&view=reporting'), 'method' =>
'post', 'class' => 'align-center'));
echo html_e('strong', array(), _('Start Date')._(':'), false);
@@ -93,92 +93,91 @@ if ($report->isError()) {
echo $HTML->closeForm();
echo html_ac(html_ap() -1);
-$data = $report->getData();
+ $data = $report->getData();
-if (count($data) == 0) {
- echo $HTML->information(_('There have been no viewed documents for this
project yet.'));
-} else {
- echo html_ao('script', array('type' => 'text/javascript'));
- echo '//<![CDATA['."\n";
- echo 'var ticks = new Array();';
- echo 'var values = new Array();';
- $arr =& $report->getMonthStartArr();
- $arr2 = array();
- $valuesArr = array();
- for ($i=0; $i < count($arr); $i++) {
- if ($arr[$i] >= $start && $arr[$i] <= $end) {
- $arr2[$i] = date(_('Y-m'), $arr[$i]);
- $valuesArr[$i] = 0;
+ if (count($data) == 0) {
+ echo $HTML->information(_('There have been no viewed documents
for this project yet.'));
+ } else {
+ echo html_ao('script', array('type' => 'text/javascript'));
+ echo '//<![CDATA['."\n";
+ echo 'var ticks = new Array();';
+ echo 'var values = new Array();';
+ $arr =& $report->getMonthStartArr();
+ $arr2 = array();
+ $valuesArr = array();
+ for ($i=0; $i < count($arr); $i++) {
+ if ($arr[$i] >= $start && $arr[$i] <= $end) {
+ $arr2[$i] = date(_('Y-m'), $arr[$i]);
+ $valuesArr[$i] = 0;
+ }
}
- }
- foreach ($arr2 as $key) {
- echo 'ticks.push("'.$key.'");';
- }
- for ($i=0; $i < count($data); $i++) {
- $this_date = date(_('Y-m'), mktime(0, 0, 0,
substr($data[$i][2], 4, 2), 0, substr($data[$i][2], 0, 4)));
- $index_key = array_search($this_date, $arr2);
- $valuesArr[$index_key+1]++;
- }
- foreach ($valuesArr as $key) {
- echo 'values.push('.$key.');';
- }
- echo 'var plot1;';
- echo 'jQuery(document).ready(function(){
- plot1 = jQuery.jqplot (\'chart1\', [values], {
- axesDefaults: {
- tickOptions: {
- angle: -90,
- fontSize: \'8px\',
- showGridline: false,
- showMark: false,
- },
- },
- axes: {
- xaxis: {
- label: "'._('Month').'",
- renderer:
jQuery.jqplot.CategoryAxisRenderer,
- ticks: ticks,
- pad: 0,
- },
- yaxis: {
- label:
"'._('Downloads').'",
- padMin: 0,
+ foreach ($arr2 as $key) {
+ echo 'ticks.push("'.$key.'");';
+ }
+ for ($i=0; $i < count($data); $i++) {
+ $this_date = date(_('Y-m'), mktime(0, 0, 0,
substr($data[$i][2], 4, 2), 0, substr($data[$i][2], 0, 4)));
+ $index_key = array_search($this_date, $arr2);
+ $valuesArr[$index_key+1]++;
+ }
+ foreach ($valuesArr as $key) {
+ echo 'values.push('.$key.');';
+ }
+ echo 'var plot1;';
+ echo 'jQuery(document).ready(function(){
+ plot1 = jQuery.jqplot (\'chart1\', [values], {
+ axesDefaults: {
tickOptions: {
- angle: 0,
- showMark: true,
+ angle: -90,
+ fontSize:
\'8px\',
+ showGridline:
false,
+ showMark: false,
+ },
+ },
+ axes: {
+ xaxis: {
+ label:
"'._('Month').'",
+ renderer:
jQuery.jqplot.CategoryAxisRenderer,
+ ticks: ticks,
+ pad: 0,
+ },
+ yaxis: {
+ label:
"'._('Downloads').'",
+ padMin: 0,
+ tickOptions: {
+ angle:
0,
+
showMark: true,
+ }
}
- }
- },
- highlighter: {
- show: true,
- sizeAdjust: 2.5,
- },
- });
- });';
- echo 'jQuery(window).resize(function() {
- plot1.replot( { resetAxes: true } );
- });'."\n";
- echo '//]]>';
- echo html_ac(html_ap() -1);
- echo $HTML->html_chartid('chart1');
- $tabletop = array(_('Folder'), _('Document'), _('User'), _('Date'));
- $classth = array('', '', '', '');
- echo $HTML->listTableTop($tabletop, false, 'sortable_docman_listfile',
'sortable', $classth);
- for ($i = 0; $i < count($data); $i++) {
- $ndg = documentgroup_get_object($data[$i][3]);
- $cells = array();
- $cells[][] = $ndg->getPath(true);
- $cells[][] = $data[$i][0];
- if ( $data[$i][1] != 100) {
- $userObject = user_get_object($data[$i][1]);
- $cells[][] =
util_display_user($userObject->getUnixName(), $data[$i][1],
$userObject->getRealName());
- } else {
- $cells[][] = _('Anonymous user');
+ },
+ highlighter: {
+ show: true,
+ sizeAdjust: 2.5,
+ },
+ });
+ });';
+ echo 'jQuery(window).resize(function() {
+ plot1.replot( { resetAxes: true } );
+ });'."\n";
+ echo '//]]>';
+ echo html_ac(html_ap() -1);
+ echo $HTML->html_chartid('chart1');
+ $tabletop = array(_('Folder'), _('Document'), _('User'),
_('Date'));
+ $classth = array('', '', '', '');
+ echo $HTML->listTableTop($tabletop, false,
'sortable_docman_listfile', 'sortable', $classth);
+ for ($i = 0; $i < count($data); $i++) {
+ $ndg = documentgroup_get_object($data[$i][3]);
+ $cells = array();
+ $cells[][] = $ndg->getPath(true);
+ $cells[][] = $data[$i][0];
+ if ( $data[$i][1] != 100) {
+ $userObject = user_get_object($data[$i][1]);
+ $cells[][] =
util_display_user($userObject->getUnixName(), $data[$i][1],
$userObject->getRealName());
+ } else {
+ $cells[][] = _('Anonymous user');
+ }
+ $cells[] = array(preg_replace('/^(....)(..)(..)$/',
'\1-\2-\3', $data[$i][2]), 'class' => 'align-center');
+ echo $HTML->multiTableRow(array(), $cells);
}
- $cells[] = array(preg_replace('/^(....)(..)(..)$/', '\1-\2-\3',
$data[$i][2]), 'class' => 'align-center');
- echo $HTML->multiTableRow(array(), $cells);
+ echo $HTML->listTableBottom();
}
- echo $HTML->listTableBottom();
-}
-
}
diff --git a/src/common/docman/views/search.php
b/src/common/docman/views/search.php
index 3c9b916..8b6548b 100644
--- a/src/common/docman/views/search.php
+++ b/src/common/docman/views/search.php
@@ -26,10 +26,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-global $g;
-global $group_id;
-global $gfcommon;
-global $HTML;
+/* please do not add require here : use www/docman/index.php to add require */
+/* global variables used */
+global $group_id; // id of the group
+global $g; // the group object
+global $dirid; // id of doc_group
+global $HTML; // Layout object
+global $warning_msg;
if (!forge_check_perm('docman', $group_id, 'read')) {
$warning_msg = _('Document Manager Access Denied');
diff --git a/src/common/docman/views/views.php
b/src/common/docman/views/views.php
index 0709dea..37dbdbb 100644
--- a/src/common/docman/views/views.php
+++ b/src/common/docman/views/views.php
@@ -3,7 +3,7 @@
* FusionForge Documentation Manager
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2012, Franck Villaume - TrivialDev
+ * Copyright 2012,2015, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -21,6 +21,12 @@
* with FusionForge; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+
+/* please do not add require here : use www/docman/index.php to add require */
+/* global variables used */
+global $group_id; // id of group
+global $warning_msg;
+
if (!forge_check_perm('docman', $group_id, 'read')) {
$warning_msg = _('Document Manager Access Denied');
session_redirect('/docman/?group_id='.$group_id);
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/actions/addsubdocgroup.php | 9 +-
src/common/docman/views/addfile.php | 10 +-
src/common/docman/views/additem.php | 5 +-
src/common/docman/views/addsubdocgroup.php | 12 +-
src/common/docman/views/admin.php | 4 +-
src/common/docman/views/editdocgroup.php | 7 +-
src/common/docman/views/editfile.php | 3 +-
src/common/docman/views/help.php | 3 +-
src/common/docman/views/menu.php | 5 +-
src/common/docman/views/movefile.php | 16 +--
src/common/docman/views/pendingfiles.php | 22 ++--
src/common/docman/views/reporting.php | 169 +++++++++++++--------------
src/common/docman/views/search.php | 11 +-
src/common/docman/views/views.php | 8 +-
14 files changed, 156 insertions(+), 128 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
