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 d8966dc4425694cbe6a63be930426d3f3ed4f3ec (commit)
from cdd89f7d1fa43fd19bb38939cc3b59564002809b (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=d8966dc4425694cbe6a63be930426d3f3ed4f3ec
commit d8966dc4425694cbe6a63be930426d3f3ed4f3ec
Author: Franck Villaume <[email protected]>
Date: Sat Sep 3 14:54:36 2016 +0200
use HTML helpers
diff --git a/src/plugins/projects-hierarchy/view/docman_project_link.php
b/src/plugins/projects-hierarchy/view/docman_project_link.php
index b8a2e32..e4eba31 100644
--- a/src/plugins/projects-hierarchy/view/docman_project_link.php
+++ b/src/plugins/projects-hierarchy/view/docman_project_link.php
@@ -3,7 +3,7 @@
* docman hierarchy view
*
* Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2014,2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -24,11 +24,12 @@
global $g; //group object
global $group_id; // id of the group
+global $HTML;
$projectsHierarchy = plugin_get_object('projects-hierarchy');
$globalConfArray = $projectsHierarchy->getGlobalConf();
if ($globalConfArray['docman']) {
- echo html_ao('form', array('id' => 'projectsHierarchyDocman', 'name' =>
'projectsHierarchyDocman', 'method' => 'post', 'action' =>
'/plugins/'.$projectsHierarchy->name.'/?action=projectsHierarchyDocman&id='.$group_id.'&type=group'));
+ echo $HTML->openForm(array('id' => 'projectsHierarchyDocman', 'name' =>
'projectsHierarchyDocman', 'method' => 'post', 'action' =>
'/plugins/'.$projectsHierarchy->name.'/?action=projectsHierarchyDocman&id='.$group_id.'&type=group'));
echo html_ao('ul');
$label = _('Enable hierarchical browsing');
$status = 1;
@@ -39,5 +40,6 @@ if ($globalConfArray['docman']) {
echo html_e('input', array('name' => 'status', 'type' => 'hidden',
'value' => $status));
echo html_ao('li');
echo html_e('input', array('id' => 'projectsHierarchyDocmanSubmit',
'type' => 'submit', 'value' => $label));
- echo html_ac(html_ap() - 3);
+ echo html_ac(html_ap() - 2);
+ echo $HTML->closeForm();
}
diff --git a/src/www/admin/index.php b/src/www/admin/index.php
index 230c87c..6a59e76 100644
--- a/src/www/admin/index.php
+++ b/src/www/admin/index.php
@@ -147,7 +147,7 @@ echo html_ac(html_ap() - 1);
</li>
<li><?php echo util_make_link('/register/',_('Register New Project'));
?></li>
<li><?php echo util_make_link('/admin/approve-pending.php', _('Pending
projects (new project approval)')); ?></li>
- <li><form name="projectsearch" action="/admin/search.php">
+ <li><?php echo $HTML->openForm(array('name' => 'projectsearch',
'action' => '/admin/search.php', 'method' => 'post')); ?>
<label for="status">
<?php echo _('Projects with status'); ?>
</label>
@@ -159,7 +159,7 @@ echo html_ac(html_ap() - 1);
<input type="hidden" name="groupsearch" value="1"/>
<input type="hidden" name="search" value="%"/>
<input type="submit" value="<?php echo _('Submit');?> "/>
- </form></li>
+ <?php echo $HTML->closeForm(); ?></li>
<li><?php echo
util_make_link('/admin/search.php?groupsearch=1&is_public=0', _('Private
Projects')); ?></li>
</ul>
<?php
@@ -228,9 +228,8 @@ echo html_ac(html_ap() - 1);
<?php } ?>
</ul>
</div>
-<?php }
-?>
<?php
+}
site_admin_footer();
// Local Variables:
diff --git a/src/www/people/editjob.php b/src/www/people/editjob.php
index 954510f..5b57639 100644
--- a/src/www/people/editjob.php
+++ b/src/www/people/editjob.php
@@ -4,7 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2002-2004 (c) GForge Team
- * Copyright 2010-2014, Franck Villaume - TrivialDev
+ * Copyright 2010-2014,2016, Franck Villaume - TrivialDev
* http://fusionforge.org/
*
* This file is part of FusionForge. FusionForge is free software;
@@ -27,6 +27,8 @@ require_once '../env.inc.php';
require_once $gfcommon.'include/pre.php';
require_once $gfwww.'people/people_utils.php';
+global $HTML;
+
if (!forge_get_config('use_people')) {
exit_disabled('home');
}
@@ -58,7 +60,7 @@ if ($group_id && (forge_check_perm('project_admin',
$group_id))) {
VALUES ($1, $2, $3, $4, $5, $6, $7)",
array($group_id, user_getid(),
htmlspecialchars($title), htmlspecialchars($description), time(),
'1',$category_id));
if (!$result || db_affected_rows($result) < 1) {
- $error_msg .= sprintf(_('Job insert failed:
%s'),db_error());
+ $error_msg .= _('Job skill insert failed')._(':
').db_error();
form_release_key(getStringFromRequest("form_key"));
} else {
$job_id=db_insertid($result,'people_job','job_id');
@@ -77,7 +79,7 @@ if ($group_id && (forge_check_perm('project_admin',
$group_id))) {
$result=db_query_params("UPDATE people_job SET
title=$1,description=$2,status_id=$3,category_id=$4 WHERE job_id=$5 AND
group_id=$6",
array(htmlspecialchars($title),
htmlspecialchars($description), $status_id, $category_id, $job_id, $group_id));
if (!$result || db_affected_rows($result) < 1) {
- $error_msg = sprintf(_('Job update failed:
%s'),db_error());
+ $error_msg = _('Job skill update failed')._(':
').db_error();
} else {
$feedback = _('Job updated successfully');
}
@@ -112,7 +114,7 @@ if ($group_id && (forge_check_perm('project_admin',
$group_id))) {
$result=db_query_params("UPDATE people_job_inventory
SET skill_level_id=$1,skill_year_id=$2 WHERE job_id=$3 AND job_inventory_id=$4",
array($skill_level_id, $skill_year_id, $job_id,
$job_inventory_id));
if (!$result || db_affected_rows($result) < 1) {
- $error_msg .= sprintf(_('Job skill update
failed: %s'), db_error());
+ $error_msg .= _('Job skill update failed')._(':
').db_error();
} else {
$feedback .= _('Job skill updated
successfully');
}
@@ -132,7 +134,7 @@ if ($group_id && (forge_check_perm('project_admin',
$group_id))) {
if (people_verify_job_group($job_id,$group_id)) {
$result = db_query_params("DELETE FROM
people_job_inventory WHERE job_id=$1 AND job_inventory_id=$2", array($job_id,
$job_inventory_id));
if (!$result || db_affected_rows($result) < 1) {
- $error_msg .= sprintf(_('Job skill delete
failed: %s'),db_error());
+ $error_msg .= _('Job skill delete failed')._(':
').db_error();
} else {
$feedback .= _('Job skill deleted
successfully');
}
@@ -150,7 +152,7 @@ if ($group_id && (forge_check_perm('project_admin',
$group_id))) {
//for security, include group_id
$result=db_query_params("SELECT * FROM people_job WHERE job_id=$1 AND
group_id=$2", array($job_id, $group_id));
if (!$result || db_numrows($result) < 1) {
- $error_msg .= sprintf(_('Posting fetch failed: %s'),db_error());
+ $error_msg .= _('Posting fetch failed')._(': ').db_error();
echo '<h2>'._('No such posting for this project').'</h2>';
} else {
@@ -178,8 +180,9 @@ if ($group_id && (forge_check_perm('project_admin',
$group_id))) {
//now show the list of desired skills
echo '<p>'.people_edit_job_inventory($job_id,$group_id).'</p>';
- echo '<form action="/people/" method="post"><input
type="submit" name="submit" value="'._('Finished').'" /></form>';
-
+ echo $HTML->openForm(array('action' => '/people/', 'method' =>
'post'));
+ echo '<input type="submit" name="submit"
value="'._('Finished').'" />';
+ echo $HTML->closeForm();
}
people_footer();
diff --git a/src/www/pm/calendar.php b/src/www/pm/calendar.php
index 87bab6b..59eac10 100644
--- a/src/www/pm/calendar.php
+++ b/src/www/pm/calendar.php
@@ -3,6 +3,7 @@
* Project Management Facility : Display Calendar
*
* Copyright 2002 GForge, LLC
+ * Copyright 2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -157,7 +158,7 @@ function make_task_link($task, $type) {
*
*/
function display_month($m, $y) {
- global $today, $month, $day, $year, $pt_arr;
+ global $today, $month, $day, $year, $pt_arr, $HTML;
$dow = array(_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'),
_('Thursday'), _('Friday'), _('Saturday'));
$tstamp = mktime(0, 0, 0, $m + 1, 0, $y) ;
@@ -242,9 +243,8 @@ function display_month($m, $y) {
<?php
}
-
+ echo $HTML->openForm(array('action' => '/pm/calendar.php', 'method' =>
'get'));
?>
- <form action="/pm/calendar.php" method="get">
<table class="fullwidth">
<tr>
<td><?php echo _('Period'); ?><br />
@@ -296,9 +296,9 @@ function display_month($m, $y) {
<input type="hidden" name="group_id" value="'. $group_id .'" />
<input type="hidden" name="group_project_id" value="'.
$group_project_id .'" />';
}
-?>
+ echo $HTML->closeForm();
+ ?>
- </form>
<table class="fullwidth">
<tr>
<td style="width:20px" class="selected"></td>
diff --git a/src/www/pm/format_csv.php b/src/www/pm/format_csv.php
index 8d4ae97..46b29ed 100644
--- a/src/www/pm/format_csv.php
+++ b/src/www/pm/format_csv.php
@@ -1,6 +1,7 @@
<?php
/**
* Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent
+ * Copyright 2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -46,6 +47,8 @@
// so a user can choose a file to upload a .csv file and store it in task
mgr
//
+global $HTML;
+
pm_header(array('title'=>_('Update CSV Format'), 'modal'=>1,
'group_project_id'=>$group_project_id));
$headers = getIntFromRequest('headers', 1);
@@ -57,7 +60,7 @@ $sep = getStringFromRequest('sep', ',');
<tr>
<td>
<fieldset><legend><strong><?php echo _('CSV Format');
?></strong></legend>
- <form action="/pm/task.php" method="get">
+ <?php echo $HTML->openForm(array('action' => '/pm/task.php',
'method' => 'get')); ?>
<input type="hidden" name="group_id" value="<?php echo
$group_id ?>" />
<input type="hidden" name="group_project_id"
value="<?php echo $group_project_id ?>" />
<input type="hidden" name="func" value="csv" />
@@ -108,7 +111,7 @@ $sep = getStringFromRequest('sep', ',');
</td>
</tr>
</table>
- <input type="submit" name="Submit" /></form>
+ <input type="submit" name="Submit" /><?php echo
$HTML->closeForm(); ?>
</fieldset>
</td>
</tr>
diff --git a/src/www/survey/include/SurveyHTML.class.php
b/src/www/survey/include/SurveyHTML.class.php
index 8b18ea5..72a86df 100644
--- a/src/www/survey/include/SurveyHTML.class.php
+++ b/src/www/survey/include/SurveyHTML.class.php
@@ -6,7 +6,7 @@
* The rest Copyright 2002-2004 (c) GForge Team - Sung Kim
* Copyright 2008-2010 (c) FusionForge Team
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright 2013-2014,2016, Franck Villaume - TrivialDev
* http://fusionforge.org/
*
* This file is part of FusionForge. FusionForge is free software;
@@ -471,7 +471,7 @@ class SurveyHTML extends FFError {
if ($s->isUserVote(user_getid())) {
$ret.= $HTML->warning_msg(_('Warning - you are about to
vote a second time on this survey.'));
}
- $ret.= '<form action="/survey/survey_resp.php" method="post">'.
+ $ret.= $HTML->openForm(array('action' =>
'/survey/survey_resp.php', 'method' =>'post')).
'<input type="hidden" name="group_id"
value="'.$group_id.'" />'.
'<input type="hidden" name="survey_id"
value="'.$survey_id. '" />';
@@ -551,8 +551,8 @@ class SurveyHTML extends FFError {
$ret.='<tr><td class="align-center" colspan="2">'.
'<input type="submit" name="submit"
value="'._('Submit').'" />'.
'<br
/>'.util_make_link('/survey/privacy.php?group_id='.$group_id, _('Survey
Privacy')).
- '</td></tr></form></table>';
-
+ '</td></tr></table>';
+ echo $HTML->closeForm();
return $ret;
}
-----------------------------------------------------------------------
Summary of changes:
.../projects-hierarchy/view/docman_project_link.php | 8 +++++---
src/www/admin/index.php | 7 +++----
src/www/people/editjob.php | 19 +++++++++++--------
src/www/pm/calendar.php | 10 +++++-----
src/www/pm/format_csv.php | 7 +++++--
src/www/survey/include/SurveyHTML.class.php | 8 ++++----
6 files changed, 33 insertions(+), 26 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
