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 94db8ae8c98b164c5ba4712b5c4691d1d224c09a (commit)
from d1d7b9a6f4475dca7893ec8a179a05ee332a9de4 (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=94db8ae8c98b164c5ba4712b5c4691d1d224c09a
commit 94db8ae8c98b164c5ba4712b5c4691d1d224c09a
Author: Franck Villaume <[email protected]>
Date: Sat Sep 10 23:42:54 2016 +0200
use HTML helpers: openForm, closeForm, util_make_link
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index e03e9d8..b7f59d7 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -1029,6 +1029,7 @@ if (isset($params['group']) && $params['group']) {
}
function confirmBox($msg, $params, $buttons, $image='*none*') {
+ global $HTML;
if ($image == '*none*') {
$image = html_image('stop.png', 48, 48);
}
@@ -1052,11 +1053,10 @@ if (isset($params['group']) && $params['group']) {
</tr>
<tr>
<td colspan="2" align="center">
- <br />
- <form action="' . getStringFromServer('PHP_SELF') . '"
method="get" >
- '.$prm.'
- '.$btn.'
- </form>
+ <br />'.$HTML->openForm(array('action' =>
getStringFromServer('PHP_SELF'), 'method' => 'get'))
+ .$prm.'
+ '.$btn.
+ $HTML->closeForm().'
</td>
</tr>
</table>
diff --git a/src/www/include/tool_reports.php b/src/www/include/tool_reports.php
index 91b830e..76493b2 100644
--- a/src/www/include/tool_reports.php
+++ b/src/www/include/tool_reports.php
@@ -4,7 +4,7 @@
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2010, FusionForge Team
* Copyright (C) 2010-2012 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -71,8 +71,9 @@ function reports_header($group_id, $vals, $titles, $html='') {
global $what;
global $period;
global $span;
+ global $HTML;
- print '<form method="get"
action="'.getStringFromServer('PHP_SELF').'">';
+ echo $HTML->openForm(array('method' => 'get', 'action' =>
getStringFromServer('PHP_SELF')));
print $html;
@@ -98,7 +99,7 @@ function reports_header($group_id, $vals, $titles, $html='') {
print "<input type=\"hidden\" name=\"group_id\" value=\"$group_id\" />";
print ' <input type="submit" value="'._('Show').'" />';
- print "</form>\n";
+ echo $HTML->closeForm();
}
// Local Variables:
diff --git a/src/www/pm/msproject/xmlparser.php
b/src/www/pm/msproject/xmlparser.php
index aa0f779..1691311 100644
--- a/src/www/pm/msproject/xmlparser.php
+++ b/src/www/pm/msproject/xmlparser.php
@@ -3,6 +3,7 @@
* MS Project Integration Facility
*
* Copyright 2004 GForge, LLC
+ * Copyright 2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* Provides some fuctions for Ms Project Plugin.
@@ -27,21 +28,23 @@ require_once $gfwww.'pm/msproject/msp.php';
$send_task_email=false;
+global $HTML;
+
if (getStringFromRequest('showform')) {
?>
<html>
- <title>XML Parser</title>
+ <title><?php echo _('XML Parser'); ?></title>
<body>
- <h2>XML Parser</h2>
+ <h2><?php echo _('XML Parser'); ?></h2>
<p>
- <form name="xmlparser" method="post" action="<?php echo
getStringFromServer('PHP_SELF'); ?>">
+ <?php echo $HTML->openForm(array('name' => 'xmlparser', 'method' =>
'post', 'action' => getStringFromServer('PHP_SELF'))); ?>
Text: <br />
<textarea name="document" cols="50" rows="10"></textarea>
<br />
<input type="hidden" name="parser" value="yes">
<input type="submit" value="Parser">
- </form>
<?php
+ echo $HTML->closeForm();
} elseif (getStringFromRequest("parser") == "yes") {
$data = getStringFromRequest("document");
diff --git a/src/www/project/admin/group_trove.php
b/src/www/project/admin/group_trove.php
index f1a2640..07b922b 100644
--- a/src/www/project/admin/group_trove.php
+++ b/src/www/project/admin/group_trove.php
@@ -6,6 +6,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2002-2004 (c) GForge Team
+ * Copyright 2016, Franck Villaume - TrivialDev
* http://fusionforge.org/
*
* This file is part of FusionForge. FusionForge is free software;
@@ -29,7 +30,7 @@ require_once $gfcommon.'include/pre.php';
require_once $gfwww.'include/trove.php';
require_once $gfwww.'project/admin/project_admin_utils.php';
-global $use_tooltips;
+global $use_tooltips, $HTML;
$group_id = getIntFromRequest('group_id');
session_require_perm('project_admin', $group_id);
@@ -77,17 +78,17 @@ project_admin_header(array('title'=>_('Edit Trove
Categorization'),'group'=>$gro
<p><?php echo _('Select up to three locations for this project in each of the
Trove root categories. If the project does not require any or all of these
locations, simply select “None Selected”.') ?></p>
<p><?php echo _('IMPORTANT: Projects should be categorized in the most
specific locations available in the map. Simultaneous categorization in a
specific category AND a parent category will result in only the more specific
categorization being accepted.') ?></p>
-<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="post">
-
<?php
+echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'post'));
$CATROOTS = trove_getallroots();
while (list($catroot,$fullname) = each($CATROOTS)) {
- $res_cat = db_query_params ('SELECT * FROM trove_cat WHERE
trove_cat_id=$1', array($catroot));
- if (db_numrows($res_cat)>=1 && $use_tooltips) {
- $title = db_result($res_cat, 0, 'description');
- } else {
- $title = '';
+ $title = '';
+ if ($use_tooltips) {
+ $res_cat = db_query_params ('SELECT * FROM trove_cat WHERE
trove_cat_id=$1', array($catroot));
+ if (db_numrows($res_cat)>=1 && $use_tooltips) {
+ $title = db_result($res_cat, 0, 'description');
+ }
}
print "\n<h2>".$fullname."</h2>\n";
@@ -117,9 +118,8 @@ while (list($catroot,$fullname) = each($CATROOTS)) {
<input type="hidden" name="form_key" value="<?php echo
form_generate_key();?>"/>
<input type="hidden" name="group_id" value="<?php echo $group_id; ?>" />
<p><input type="submit" name="submit" value="<?php echo _('Update All Category
Changes') ?>" /></p>
-</form>
-
<?php
+echo $HTML->closeForm();
project_admin_footer();
diff --git a/src/www/project/admin/index.php b/src/www/project/admin/index.php
index 68f32e9..5686b61 100644
--- a/src/www/project/admin/index.php
+++ b/src/www/project/admin/index.php
@@ -9,6 +9,7 @@
* Copyright 2004 GForge, LLC - Tim Perdue
* Copyright 2010, Franck Villaume - Capgemini
* Copyright 2010-2011, Alain Peyrat - Alcatel-Lucent
+ * Copyright 2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -125,9 +126,9 @@ if (forge_get_config('use_shell')) {
<p><?php echo _('Project WWW directory on shell server:') ?><br
/><strong><?php echo account_group_homedir($group->getUnixName()).'/htdocs';
?></strong></p>
<?php
} //end of use_shell condition
-?>
-<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="post">
+ echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'post'));
+?>
<input type="hidden" name="group_id" value="<?php echo $group->getID(); ?>" />
@@ -310,9 +311,8 @@ if(forge_get_config('use_tracker')) {
<input type="submit" name="submit" value="<?php echo _('Update') ?>" />
</p>
-</form>
-
<?php
+echo $HTML->closeForm();
plugin_hook('hierarchy_views', array($group_id, 'admin'));
echo $HTML->boxBottom();
diff --git a/src/www/project/admin/roledelete.php
b/src/www/project/admin/roledelete.php
index 4f10e8d..5764580 100644
--- a/src/www/project/admin/roledelete.php
+++ b/src/www/project/admin/roledelete.php
@@ -4,7 +4,7 @@
*
* Copyright 2010 (c) Alcatel-Lucent
* Copyright 2011, Roland Mas
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2016, Franck Villaume - TrivialDev
*
* @author Alain Peyrat
* @date 2010-05-18
@@ -35,6 +35,8 @@ $role_id = getIntFromRequest('role_id');
session_require_perm ('project_admin', $group_id) ;
+global $HTML, $error_msg, $feedback;
+
if (!$role_id) {
session_redirect('/project/admin/users.php?group_id='.$group_id);
}
@@ -83,7 +85,7 @@ printf(_('You are about to permanently delete role %s'),
$role->getName()); ?>
<td>
<fieldset>
<legend><?php echo _('Confirm Delete') ?></legend>
-<form action="<?php echo getStringFromServer('PHP_SELF') ?>?group_id=<?php
echo $group_id ?>&role_id=<?php echo $role_id ?>" method="post">
+<?php echo $HTML-> openForm(array('action' =>
getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&role_id='.$role_id,
'method' => 'post')); ?>
<p>
<input id="sure" type="checkbox" value="1" name="sure" />
<label for="sure">
@@ -94,7 +96,7 @@ printf(_('You are about to permanently delete role %s'),
$role->getName()); ?>
<p>
<input type="submit" name="submit" value="<?php echo _('Submit') ?>" />
</p>
-</form>
+<?php echo $HTML->closeForm(); ?>
</fieldset>
</td>
</tr>
diff --git a/src/www/project/admin/roleedit.php
b/src/www/project/admin/roleedit.php
index 0f6105d..9d8dae1 100644
--- a/src/www/project/admin/roleedit.php
+++ b/src/www/project/admin/roleedit.php
@@ -8,7 +8,7 @@
* Copyright © 2011
* Thorsten Glaser <[email protected]>
* Copyright 2014, Stéphane-Eymeric Bredthauer
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2016, Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -119,8 +119,7 @@ $msg = _('Use this page to edit the permissions attached to
each role. Note tha
project_admin_header(array('title'=> $title, 'group'=>$group_id));
echo '<p>'.$msg.'</p>';
-echo '
-<form
action="'.getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&role_id='.
$role_id .'" method="post">';
+echo $HTML->openForm(array('action' =>
getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&role_id='.$role_id,
'method' => 'post'));
if ($role->getHomeProject() == NULL
|| $role->getHomeProject()->getID() != $group_id) {
@@ -282,27 +281,23 @@ for ($i=0; $i<count($keys); $i++) {
false);
echo $HTML->multiTableRow(array('class' =>
$HTML->boxGetAltRowStyle($j++, true)), $cells);
}
-
//
// Handle all other settings for all roles
//
} else {
-
echo '<tr '. $HTML->boxGetAltRowStyle($j++) . '>
<td
colspan="2"><strong>'.$rbac_edit_section_names[$keys[$i]].'</strong></td>
<td>';
echo
html_build_select_box_from_assoc($role->getRoleVals($keys[$i]),
"data[".$keys[$i]."][$group_id]", $role->getVal($keys[$i],$group_id), false,
false ) ;
echo '</td>
</tr>';
-
}
-
}
echo $HTML->listTableBottom();
-echo '<p><input type="submit" name="submit" value="'._('Submit').'" /></p>
-</form>';
+echo '<p><input type="submit" name="submit" value="'._('Submit').'" /></p>';
+echo $HTML->closeForm();
project_admin_footer();
diff --git a/src/www/project/admin/tools.php b/src/www/project/admin/tools.php
index f00f34e..f4f9c54 100644
--- a/src/www/project/admin/tools.php
+++ b/src/www/project/admin/tools.php
@@ -5,6 +5,7 @@
* Portions Copyright 1999-2001 (c) VA Linux Systems
* The rest Copyright 2002-2004 (c) GForge Team
* Copyright 2010, Franck Villaume - Capgemini
+ * Copyright 2016, Franck Villaume - TrivialDev
* http://fusionforge.org/
*
* This file is part of FusionForge. FusionForge is free software;
@@ -27,6 +28,8 @@ require_once '../../env.inc.php';
require_once $gfcommon.'include/pre.php';
require_once $gfwww.'project/admin/project_admin_utils.php';
+global $HTML, $error_msg, $feedback;
+
$group_id = getIntFromRequest('group_id');
session_require_perm('project_admin', $group_id);
$group = group_get_object($group_id);
@@ -113,10 +116,9 @@ echo '<tr class="top">';
echo '<td class="halfwidth">';
echo $HTML->boxTop(_('Active Tools'));
+echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'post'));
?>
-<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="post">
-
<input type="hidden" name="group_id" value="<?php echo $group->getID(); ?>" />
<input type="hidden" name="form_group_name" value="<?php echo
$group->getPublicName(); ?>" />
<input type="hidden" name="form_shortdesc" value="<?php echo
$group->getDescription(); ?>" />
@@ -327,7 +329,7 @@ plugin_hook("groupisactivecheckbox",$hookParams);
<input type="hidden" name="send_all_docs" value="1" <?php echo
c($group->docEmailAll()); ?> />
<input type="submit" name="submit" value="<?php echo _('Update') ?>" />
-</form>
+<?php echo $HTML->closeForm(); ?>
<br />
diff --git a/src/www/reporting/groupadded.php b/src/www/reporting/groupadded.php
index bed2aa7..08d760b 100644
--- a/src/www/reporting/groupadded.php
+++ b/src/www/reporting/groupadded.php
@@ -30,6 +30,8 @@ require_once $gfcommon.'reporting/ReportGroupAdded.class.php';
session_require_global_perm ('forge_stats', 'read') ;
+global $HTML, $error_msg;
+
$report=new Report();
if ($report->isError()) {
exit_error($report->getErrorMessage());
@@ -58,17 +60,17 @@ html_use_jqueryjqplotpluginhighlighter();
report_header(_('Projects Added'));
+echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'get'));
?>
-
-<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo
report_span_box('SPAN',$SPAN); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
-</form>
<?php
+echo $HTML->closeForm();
+
if ($start != $end) {
report_graph('groupadded', $SPAN, $start, $end);
}
diff --git a/src/www/reporting/groupcum.php b/src/www/reporting/groupcum.php
index b81abb5..871242b 100644
--- a/src/www/reporting/groupcum.php
+++ b/src/www/reporting/groupcum.php
@@ -3,7 +3,7 @@
* Reporting System
*
* Copyright 2003-2004 (c) GForge LLC
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -30,6 +30,8 @@ require_once $gfcommon.'reporting/ReportGroupCum.class.php';
session_require_global_perm ('forge_stats', 'read') ;
+global $HTML, $error_msg;
+
$report=new Report();
if ($report->isError()) {
exit_error($report->getErrorMessage());
@@ -58,17 +60,17 @@ html_use_jqueryjqplotpluginhighlighter();
report_header(_('Cumulative Projects'));
+echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'get'));
?>
-
-<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo
report_span_box('SPAN',$SPAN); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
-</form>
<?php
+echo $HTML->closeForm();
+
if ($start != $end) {
report_graph('groupcumul', $SPAN, $start, $end);
}
diff --git a/src/www/reporting/projecttime.php
b/src/www/reporting/projecttime.php
index ac32c3b..0363192 100644
--- a/src/www/reporting/projecttime.php
+++ b/src/www/reporting/projecttime.php
@@ -3,7 +3,7 @@
* Reporting System
*
* Copyright 2003-2004 (c) GForge LLC
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -29,6 +29,8 @@ require_once
$gfcommon.'reporting/ReportProjectTime.class.php';
session_require_global_perm ('forge_stats', 'read') ;
+global $HTML, $error_msg;
+
$report=new Report();
if ($report->isError()) {
exit_error($report->getErrorMessage());
@@ -71,9 +73,8 @@ $a2[]='category';
$a2[]='subproject';
$a2[]='user';
+echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'get'));
?>
-
-<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<input type="hidden" name="typ" value="<?php echo $typ; ?>" />
<table><tr>
<td><strong><?php echo _('Project')._(':'); ?></strong><br /><?php echo
report_group_box('g_id',$g_id); ?></td>
@@ -82,8 +83,9 @@ $a2[]='user';
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
-</form>
<?php
+echo $HTML->closeForm();
+
if ($g_id && $typ=='r') {
$report=new ReportProjectTime($g_id,$type,$start,$end);
diff --git a/src/www/reporting/rebuild.php b/src/www/reporting/rebuild.php
index 0d286ae..bb180f5 100644
--- a/src/www/reporting/rebuild.php
+++ b/src/www/reporting/rebuild.php
@@ -5,6 +5,7 @@
* Copyright 2003-2004 (c) GForge LLC
* Copyright 2010 (c) Franck Villaume
* Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright 2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -31,6 +32,8 @@ require_once $gfcommon.'reporting/ReportSetup.class.php';
session_require_global_perm ('forge_stats', 'admin') ;
+global $HTML, $feedback, $error_msg;
+
if (getStringFromRequest('submit') && getStringFromRequest('im_sure')) {
$r = new ReportSetup();
@@ -55,9 +58,9 @@ echo '</p>';
echo '<p>';
echo _('This could take a couple minutes, so DO NOT CLICK MORE THAN ONCE.');
echo '</p>';
-?>
-<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="post">
+echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'post'));
+?>
<p>
<label for="im_sure">
<input type="checkbox" id="im_sure" name="im_sure" value="1" /><?php echo _('I
am Sure'); ?>
@@ -66,9 +69,8 @@ echo '</p>';
<p>
<input type="submit" name="submit" value="<?php echo _('Press ONLY ONCE'); ?>"
/>
</p>
-</form>
-
<?php
+echo $HTML->closeForm();
report_footer();
diff --git a/src/www/reporting/sitetime.php b/src/www/reporting/sitetime.php
index 5f54db1..c837e7f 100644
--- a/src/www/reporting/sitetime.php
+++ b/src/www/reporting/sitetime.php
@@ -4,7 +4,7 @@
*
* Copyright 2003-2004 (c) GForge LLC
* Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -30,6 +30,8 @@ require_once $gfcommon.'reporting/ReportSiteTime.class.php';
session_require_global_perm ('forge_stats', 'read') ;
+global $HTML, $error_msg;
+
$report=new Report();
if ($report->isError()) {
exit_error($report->getErrorMessage());
@@ -71,9 +73,8 @@ $a2[]='category';
$a2[]='subproject';
$a2[]='user';
+echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'get'));
?>
-
-<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo
html_build_select_box_from_arrays($a2,$a,'type',$type,false); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
@@ -83,9 +84,9 @@ $a2[]='user';
<input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/>
</td>
</tr></table>
-</form>
-
<?php
+echo $HTML->closeForm();
+
if ($typ =='r') {
$report=new ReportSiteTime($type,$start,$end);
$labels = $report->labels;
diff --git a/src/www/reporting/sitetimebar.php
b/src/www/reporting/sitetimebar.php
index 771d5ee..909c74c 100644
--- a/src/www/reporting/sitetimebar.php
+++ b/src/www/reporting/sitetimebar.php
@@ -3,7 +3,7 @@
* Reporting System
*
* Copyright 2003-2004 (c) GForge LLC
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -29,6 +29,8 @@ require_once $gfcommon.'reporting/Report.class.php';
session_require_global_perm ('forge_stats', 'read') ;
+global $HTML, $error_msg;
+
$report=new Report();
if ($report->isError()) {
exit_error($report->getErrorMessage());
@@ -59,17 +61,17 @@ html_use_jqueryjqplotpluginBar();
report_header(_('Site-Wide Time Tracking'));
+echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'get'));
?>
-<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<input type="hidden" name="typ" value="<?php echo $typ; ?>" />
<table><tr>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
-</form>
-
<?php
+echo $HTML->closeForm();
+
if ($typ=='r') {
if (!$start) {
diff --git a/src/www/reporting/timecategory.php
b/src/www/reporting/timecategory.php
index c3e6ff9..13a689b 100644
--- a/src/www/reporting/timecategory.php
+++ b/src/www/reporting/timecategory.php
@@ -4,6 +4,7 @@
*
* Copyright 2003-2004 (c) GForge LLC
* Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright 2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -82,7 +83,7 @@ echo $HTML->listTableBottom();
<p>
<?php echo _('You can create categories for how time might be spent when
completing a particular task. Examples of categories include “Meeting”,
“Coding”, “Testing”.'); ?>
</p>
-<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="post">
+<?php echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'post')); ?>
<p>
<input type="hidden" name="submit" value="1" />
<input type="hidden" name="time_code" value="<?php echo $time_code; ?>" />
@@ -103,9 +104,8 @@ if ($time_code) {
?>
</p>
-</form>
-
<?php
+echo $HTML->closeForm();
report_footer();
diff --git a/src/www/reporting/toolspie.php b/src/www/reporting/toolspie.php
index 5145b0f..22cda0d 100644
--- a/src/www/reporting/toolspie.php
+++ b/src/www/reporting/toolspie.php
@@ -3,7 +3,7 @@
* Reporting System
*
* Copyright 2003-2004 (c) GForge LLC
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -29,6 +29,8 @@ require_once $gfcommon.'reporting/Report.class.php';
session_require_global_perm ('forge_stats', 'read') ;
+global $HTML, $error_msg;
+
$report=new Report();
if ($report->isError()) {
exit_error($report->getErrorMessage());
@@ -59,16 +61,17 @@ html_use_jqueryjqplotplugindateAxisRenderer();
report_header(_('Tool Pie Graphs'));
+echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'get'));
?>
-<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
<td><strong><?php echo _('Trackers')._(':'); ?></strong><br /><?php echo
report_tracker_box('datatype',$datatype); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
-</form>
<?php
+echo $HTML->closeForm();
+
if ($start != $end) {
report_toolspiegraph($datatype, $start, $end);
}
diff --git a/src/www/reporting/useradded.php b/src/www/reporting/useradded.php
index ea75943..b32e0f6 100644
--- a/src/www/reporting/useradded.php
+++ b/src/www/reporting/useradded.php
@@ -3,7 +3,7 @@
* Reporting System
*
* Copyright 2003-2004 (c) GForge LLC
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -30,6 +30,8 @@ require_once $gfcommon.'reporting/ReportUserAdded.class.php';
session_require_global_perm ('forge_stats', 'read') ;
+global $HTML, $error_msg;
+
$report=new Report();
if ($report->isError()) {
exit_error($report->getErrorMessage());
@@ -58,16 +60,17 @@ html_use_jqueryjqplotpluginhighlighter();
report_header(_('Users Added'));
+echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'get'));
?>
-<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="get">
<table><tr>
<td><strong><?php echo _('Type')._(':'); ?></strong><br /><?php echo
report_span_box('SPAN',$SPAN); ?></td>
<td><strong><?php echo _('Start Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php echo
report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh'); ?>"
/></td>
</tr></table>
-</form>
<?php
+echo $HTML->closeForm();
+
if ($start != $end) {
report_graph('useradded', $SPAN, $start, $end);
}
diff --git a/src/www/reporting/usertime.php b/src/www/reporting/usertime.php
index 1d6ffe6..e7dc8c9 100644
--- a/src/www/reporting/usertime.php
+++ b/src/www/reporting/usertime.php
@@ -3,6 +3,7 @@
* Reporting System
*
* Copyright 2003-2004 (c) GForge LLC
+ * Copyright 2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -28,6 +29,8 @@ require_once $gfcommon.'reporting/ReportUserTime.class.php';
session_require_global_perm ('forge_stats', 'read') ;
+global $HTML, $error_msg;
+
$report=new Report();
if ($report->isError()) {
exit_error($report->getErrorMessage());
@@ -70,7 +73,7 @@ for ($i=0; $i<count($abc_array); $i++) {
if ($sw == $abc_array[$i]) {
echo '<strong>'.$abc_array[$i].'</strong> ';
} else {
- echo '<a
href="usertime.php?sw='.$abc_array[$i].'&typ='.$typ.'">'.$abc_array[$i].'</a> ';
+ echo
util_make_link('/reporting/usertime.php?sw='.$abc_array[$i].'&typ='.$typ,
$abc_array[$i]).' ';
}
}
@@ -84,9 +87,8 @@ if ($sw) {
$a2[]='category';
$a2[]='subproject';
+ echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'get'));
?>
-
- <form action="<?php echo getStringFromServer('PHP_SELF'); ?>"
method="get">
<input type="hidden" name="sw" value="<?php echo $sw; ?>" />
<input type="hidden" name="typ" value="<?php echo $typ; ?>" />
<table><tr>
@@ -96,8 +98,9 @@ if ($sw) {
<td><strong><?php echo _('End Date')._(':'); ?></strong><br /><?php
echo report_months_box($report, 'end', $end); ?></td>
<td><input type="submit" name="submit" value="<?php echo _('Refresh');
?>" /></td>
</tr></table>
- </form>
<?php
+ echo $HTML->closeForm();
+
if ($dev_id && $typ=='r') {
$report=new ReportUserTime($dev_id,$type,$start,$end);
$labels = $report->labels;
diff --git
a/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
index 03ed9e3..747adc8 100644
---
a/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
+++
b/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
@@ -331,11 +331,11 @@ class AdvancedSearchHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
}
function getAdvancedSearchBox($sectionsArray, $group_id, $words,
$isExact) {
+ global $HTML;
$res = '';
// display the searchmask
- $res .= '
- <form class="ff" name="advancedsearch"
action="'.getStringFromServer('PHP_SELF').'" method="post">
- <input class="ff" type="hidden" name="search"
value="1"/>
+ $res .= $HTML->openForm(array('class' => 'ff', 'name' =>
'advancedsearch', 'action' => getStringFromServer('PHP_SELF'), 'method' =>
'post'));
+ $res .= '<input class="ff" type="hidden" name="search"
value="1"/>
<input class="ff" type="hidden" name="group_id"
value="'.$group_id.'"/>
<div align="center"><br />
<table id="advsearchinput">
@@ -355,9 +355,8 @@ class AdvancedSearchHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
</tr>
</table><br />'
. $this->createSubSections($sectionsArray) .'
- </div>
- </form>
- ';
+ </div>';
+ $res .= $HTML->closeForm();
// Add jquery javascript method for select none/all
$res .= <<< EOS
diff --git a/src/www/sendmessage.php b/src/www/sendmessage.php
index 18c1623..9533a3a 100644
--- a/src/www/sendmessage.php
+++ b/src/www/sendmessage.php
@@ -4,7 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2002-2004 (c) GForge Team
- * Copyright 2010-2013, Franck Villaume - TrivialDev
+ * Copyright 2010-2013,2016, Franck Villaume - TrivialDev
* http://fusionforge.org/
*
* This file is part of FusionForge. FusionForge is free software;
@@ -139,8 +139,7 @@ $HTML->header(array('title' =>
forge_get_config('forge_name').' '._('Contact')))
<p class="important">
<?php echo _('<strong>IF YOU ARE WRITING FOR HELP:</strong> Did you read the
site documentation? Did you include your <strong>user_id</strong> and
<strong>user_name?</strong> If you are writing about a project, include your
<strong>project id</strong> (<strong>group_id</strong>) and <strong>Project
Name</strong>.'); ?>
</p>
-
-<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="post">
+<?php echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'post')); ?>
<p>
<input type="hidden" name="form_key" value="<?php echo form_generate_key();
?>" />
-----------------------------------------------------------------------
Summary of changes:
src/www/include/Layout.class.php | 10 +++++-----
src/www/include/tool_reports.php | 7 ++++---
src/www/pm/msproject/xmlparser.php | 11 +++++++----
src/www/project/admin/group_trove.php | 20 ++++++++++----------
src/www/project/admin/index.php | 8 ++++----
src/www/project/admin/roledelete.php | 8 +++++---
src/www/project/admin/roleedit.php | 13 ++++---------
src/www/project/admin/tools.php | 8 +++++---
src/www/reporting/groupadded.php | 8 +++++---
src/www/reporting/groupcum.php | 10 ++++++----
src/www/reporting/projecttime.php | 10 ++++++----
src/www/reporting/rebuild.php | 10 ++++++----
src/www/reporting/sitetime.php | 11 ++++++-----
src/www/reporting/sitetimebar.php | 10 ++++++----
src/www/reporting/timecategory.php | 6 +++---
src/www/reporting/toolspie.php | 9 ++++++---
src/www/reporting/useradded.php | 9 ++++++---
src/www/reporting/usertime.php | 11 +++++++----
.../AdvancedSearchHtmlSearchRenderer.class.php | 11 +++++------
src/www/sendmessage.php | 5 ++---
20 files changed, 108 insertions(+), 87 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
