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.0 has been updated
via 78e5d21a4dc0c55153745694c7434d9c4bbe9043 (commit)
via 4b0cd272d5e798adea7dfa4384fb9f8f6685fc90 (commit)
from 76441ae2acab9c6f3a34a051038956e37465d717 (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=78e5d21a4dc0c55153745694c7434d9c4bbe9043
commit 78e5d21a4dc0c55153745694c7434d9c4bbe9043
Author: Matthieu Imbert <[email protected]>
Date: Thu Jan 14 17:15:00 2016 +0100
add missing systasks for vhost creation/update in site_admin
Signed-off-by: Franck Villaume <[email protected]>
diff --git a/src/www/admin/vhost.php b/src/www/admin/vhost.php
index 9f1c271..0b23156 100644
--- a/src/www/admin/vhost.php
+++ b/src/www/admin/vhost.php
@@ -75,6 +75,8 @@ if (getStringFromRequest('add')) {
$error_msg .= _('Error adding VHOST: ')
.db_error();
} else {
$feedback .= _('Virtual Host').'
'.$vhost_name._(' scheduled for creation on group ').$group->getUnixName();
+ $systasksq = new SysTasksQ();
+ $systasksq->add(SYSTASK_CORE, 'WEB_VHOSTS',
$group_id);
}
} else {
$error_msg .= _('Vhost not valid');
@@ -103,6 +105,8 @@ if (getStringFromRequest('tweakcommit')) {
$error_msg .= _('Error updating VHOST entry: ') .db_error();
} else {
$feedback .= _('Virtual Host entry updated.');
+ $systasksq = new SysTasksQ();
+ $systasksq->add(SYSTASK_CORE, 'WEB_VHOSTS', $group_id);
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4b0cd272d5e798adea7dfa4384fb9f8f6685fc90
commit 4b0cd272d5e798adea7dfa4384fb9f8f6685fc90
Author: Matthieu Imbert <[email protected]>
Date: Thu Jan 14 17:13:54 2016 +0100
fix bad link for project admin vhost deletion
Signed-off-by: Franck Villaume <[email protected]>
diff --git a/src/www/project/admin/vhost.php b/src/www/project/admin/vhost.php
index 6d8b3af..2305c40 100644
--- a/src/www/project/admin/vhost.php
+++ b/src/www/project/admin/vhost.php
@@ -147,7 +147,7 @@ if (db_numrows($res_db) > 0) {
while ($row_db = db_fetch_array($res_db)) {
$cells = array();
$cells[][] = $row_db['vhost_name'];
- $cells[][] = '[
<strong>'.util_make_link('/project/admin/?group_id='.$group->getID().'&vhostid='.$row_db['vhostid'].'&deletevhost=1',
_('Delete')).'</strong>]';
+ $cells[][] = '[
<strong>'.util_make_link('/project/admin/vhost.php?group_id='.$group->getID().'&vhostid='.$row_db['vhostid'].'&deletevhost=1',
_('Delete')).'</strong>]';
echo $HTML->multiTableRow(array(), $cells);
}
echo $HTML->listTableBottom();
-----------------------------------------------------------------------
Summary of changes:
src/www/admin/vhost.php | 4 ++++
src/www/project/admin/vhost.php | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
