From a3ef1ed558d90ac609f5c56fd825c069053e7f70 Mon Sep 17 00:00:00 2001 From: Franck VILLAUME Date: Sun, 19 Sep 2010 17:57:10 +0000 Subject: [PATCH] exit functions migration --- src/www/mail/admin/deletelist.php | 33 +++++++++++--- src/www/project/admin/group_trove.php | 5 ++- src/www/project/admin/index.php | 62 ++++++++++++++------------- src/www/softwaremap/trove_list.php | 7 +-- 4 files changed, 63 insertions(+), 44 deletions(-) diff --git a/src/www/mail/admin/deletelist.php b/src/www/mail/admin/deletelist.php index 813d7bc62f..6cc9305fef 100644 --- a/src/www/mail/admin/deletelist.php +++ b/src/www/mail/admin/deletelist.php @@ -1,11 +1,27 @@ isError()) { +if (!$group || !is_object($group)) { exit_no_group(); +} else if ($group->isError()) { + exit_error($group->getErrorMessage(),'home'); } session_require_perm ('project_admin', $group->getID()) ; @@ -35,9 +53,10 @@ if (getStringFromPost('submit')) { $sure = getStringFromPost('sure'); $really_sure = getStringFromPost('really_sure'); if (!$ml->delete($sure,$really_sure)) { - exit_error('Error',$ml->getErrorMessage()); + exit_error($ml->getErrorMessage(),'home'); } else { - header("Location: index.php?group_id=$group_id&feedback=Mailing+List+successfully+deleted"); + $feedback= _('Mailing List Successfully deleted'); + session_redirect('?group_id='.$group_id.'&feedback='.urlencode($feedback)); } } diff --git a/src/www/project/admin/group_trove.php b/src/www/project/admin/group_trove.php index 2acee7e0b2..d103007beb 100644 --- a/src/www/project/admin/group_trove.php +++ b/src/www/project/admin/group_trove.php @@ -37,7 +37,7 @@ session_require_perm ('project_admin', $group_id) ; if (getStringFromRequest('submit') && getStringFromRequest('root1')) { if (!form_key_is_valid(getStringFromRequest('form_key'))) { - exit_form_double_submit(); + exit_form_double_submit('home'); } group_add_history ('Changed Trove', '', $group_id); @@ -66,7 +66,8 @@ if (getStringFromRequest('submit') && getStringFromRequest('root1')) { } } } - session_redirect('/project/admin/?group_id='.$group_id); + $feedback = _('Trove Update Success'); + session_redirect('/project/admin/?group_id='.$group_id.'&feedback='.urlencode($feedback)); } project_admin_header(array('title'=>_('Edit Trove Categorization'),'group'=>$group_id)); diff --git a/src/www/project/admin/index.php b/src/www/project/admin/index.php index 6e22b3c267..0c4c7630da 100644 --- a/src/www/project/admin/index.php +++ b/src/www/project/admin/index.php @@ -6,24 +6,23 @@ * as allows to manage it. This page should be accessible to all project * members, but only admins may perform most functions. * - * Copyright 2004 GForge, LLC + * Copyright 2004 GForge, LLC - Tim Perdue + * Copyright 2010 (c), Franck Villaume * - * @author Tim Perdue tim@gforge.org + * This file is part of FusionForge. * - * This file is part of GForge. - * - * GForge is free software; you can redistribute it and/or modify + * FusionForge is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GForge is distributed in the hope that it will be useful, + * FusionForge is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with GForge; if not, write to the Free Software + * along with FusionForge; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -34,6 +33,8 @@ require_once $gfwww.'project/admin/project_admin_utils.php'; require_once $gfcommon.'include/GroupJoinRequest.class.php'; $group_id = getIntFromRequest('group_id'); +$feedback = htmlspecialchars(getStringFromRequest('feedback')); + session_require_perm ('project_admin', $group_id) ; // get current information @@ -41,34 +42,14 @@ $group =& group_get_object($group_id); if (!$group || !is_object($group)) { exit_no_group(); } elseif ($group->isError()) { - exit_error('Error',$group->getErrorMessage()); + exit_error($group->getErrorMessage(),'home'); } $group->clearError(); $adminheadertitle=sprintf(_('Project Admin: %1$s'), $group->getPublicName() ); project_admin_header(array('title'=>$adminheadertitle, 'group'=>$group->getID())); -?> - - - -
- -boxTop(_('Misc. Project Information')); ?> - - -

getUnixName().'.'.forge_get_config('web_host'); ?>

-


getUnixName()); ?>

-


getUnixName()).'/htdocs'; ?>

- - -getErrorMessage(); + $submit_error = $group->getErrorMessage(); } else { - $feedback .= _('Project information updated'); + $submit_feedback = _('Project information updated'); } } +if (isset($submit_error)) { + echo '
'.$submit_error.'
'; +} +if (isset($submit_feedback)) { + echo ''; +} ?> + + +
+ +boxTop(_('Misc. Project Information')); + +if (forge_get_config('use_shell')) { +?> +

getUnixName().'.'.forge_get_config('web_host'); ?>

+


getUnixName()); ?>

+


getUnixName()).'/htdocs'; ?>

+ +
diff --git a/src/www/softwaremap/trove_list.php b/src/www/softwaremap/trove_list.php index 44af8aded7..5345180dcf 100644 --- a/src/www/softwaremap/trove_list.php +++ b/src/www/softwaremap/trove_list.php @@ -33,7 +33,7 @@ plugin_hook('tree'); require_once $gfwww.'include/trove.php'; if (!forge_get_config('use_trove')) { - exit_disabled(); + exit_disabled('home'); } $form_cat = getIntFromRequest('form_cat'); @@ -53,10 +53,7 @@ $res_trove_cat = db_query_params (' array($form_cat)); if (db_numrows($res_trove_cat) < 1) { - exit_error( - _('Invalid Trove Category'), - _('That Trove category does not exist').': '.db_error() - ); + exit_error(_('That Trove category does not exist').': '.db_error(),'trove'); } $HTML->header(array('title'=>_('Software Map'))); -- 2.30.2