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, 6.1 has been updated
via 97cb64cece3782828f7954abd9e11b49b3d5ae54 (commit)
from fc916e98d92a40e5beef58a638c90fa438a21818 (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=97cb64cece3782828f7954abd9e11b49b3d5ae54
commit 97cb64cece3782828f7954abd9e11b49b3d5ae54
Author: Franck Villaume <[email protected]>
Date: Mon Jan 22 16:57:00 2018 +0000
fix admin vhost: tweaking a vhost. clean-up strings
diff --git a/src/www/admin/vhost.php b/src/www/admin/vhost.php
index c6832d2..8d8f181 100644
--- a/src/www/admin/vhost.php
+++ b/src/www/admin/vhost.php
@@ -43,7 +43,6 @@ session_require_global_perm ('forge_admin');
if (getStringFromRequest('add')) {
$groupname = getStringFromRequest('groupname');
$vhost_name = getStringFromRequest('vhost_name');
- //$group_id = getIntFromRequest('group_id');
if ($groupname) {
@@ -72,7 +71,7 @@ if (getStringFromRequest('add')) {
$group_id)) ;
if (!$res || db_affected_rows($res) < 1) {
- $error_msg .= _('Error adding VHOST: ')
.db_error();
+ $error_msg .= _('Error adding VHOST')._(':
').db_error();
} else {
$feedback .= _('Virtual Host').'
'.$vhost_name._(' scheduled for creation on group ').$group->getUnixName();
$systasksq = new SysTasksQ();
@@ -90,6 +89,7 @@ if (getStringFromRequest('tweakcommit')) {
$vhostid = getIntFromRequest('vhostid');
$docdir = getStringFromRequest('docdir');
$cgidir = getStringFromRequest('cgidir');
+ $group_id = getIntFromRequest('group_id');
$res = db_query_params ('
UPDATE prweb_vhost
@@ -102,7 +102,7 @@ if (getStringFromRequest('tweakcommit')) {
$vhostid)) ;
if (!$res || db_affected_rows($res) < 1) {
- $error_msg .= _('Error updating VHOST entry: ') .db_error();
+ $error_msg .= _('Error updating VHOST entry')._(':
').db_error();
} else {
$feedback .= _('Virtual Host entry updated.');
$systasksq = new SysTasksQ();
@@ -194,7 +194,8 @@ if (getStringFromRequest('tweak')) {
'.$HTML->listTableBottom().'
<input type="hidden" name="tweakcommit" value="1" />
- <input type="hidden" name="vhostid"
value="'.$row_vh['vhostid'].'" />';
+ <input type="hidden" name="vhostid"
value="'.$row_vh['vhostid'].'" />
+ <input type="hidden" name="group_id"
value="'.$row_vh['group_id'].'" />';
echo $HTML->closeForm();
} else {
echo $HTML->warning_msg(_('No such VHOST')._(': ').$vhost_name);
-----------------------------------------------------------------------
Summary of changes:
src/www/admin/vhost.php | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
