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 866fe9309f14a9a76569561b03b107373d8657e9 (commit)
via 220e930ac72cfebd8fdb28979854a6e12869e472 (commit)
via 3b3f2dc575042bc28c45e886f45e792203d011e9 (commit)
from ec6499875bbe23919f1edd10ffb848faf0369894 (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=866fe9309f14a9a76569561b03b107373d8657e9
commit 866fe9309f14a9a76569561b03b107373d8657e9
Author: Franck Villaume <[email protected]>
Date: Sat Oct 1 13:30:25 2016 +0200
moinmoin plugin: make it systasksd aware
diff --git a/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
b/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
index fd59984..3e8ffba 100644
--- a/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
+++ b/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
@@ -26,8 +26,12 @@ forge_define_config_item('use_frame', 'moinmoin', false);
forge_set_config_item_bool('use_frame', 'moinmoin');
class MoinMoinPlugin extends Plugin {
- function __construct() {
- parent::__construct();
+ public $systask_types = array(
+ 'MOINMOIN_CREATE_WIKI' => 'create-wikis.php',
+ );
+
+ function __construct($id = 0) {
+ parent::__construct($id);
$this->name = "moinmoin";
$this->text = _("MoinMoinWiki") ; // To show in the tabs, use...
$this->pkg_desc =
@@ -158,6 +162,17 @@ _("This plugin allows each project to embed MoinMoinWiki
under a tab.");
}
}
}
+
+ function groupisactivecheckboxpost(&$params) {
+ if (!parent::groupisactivecheckboxpost($params))
+ return false;
+ if (getIntFromRequest('use_moinmoin') == 1) {
+ $systasksq = new SystasksQ();
+ $group_id = $params['group'];
+ $systasksq->add($this->getID(),
'MOINMOIN_CREATE_WIKI', $group_id);
+ }
+ return true;
+ }
}
// Local Variables:
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=220e930ac72cfebd8fdb28979854a6e12869e472
commit 220e930ac72cfebd8fdb28979854a6e12869e472
Author: Franck Villaume <[email protected]>
Date: Sat Oct 1 13:29:38 2016 +0200
code style
diff --git a/src/plugins/mediawiki/cronjobs/create-wikis.php
b/src/plugins/mediawiki/cronjobs/create-wikis.php
index e59c5b9..ce08bdc 100755
--- a/src/plugins/mediawiki/cronjobs/create-wikis.php
+++ b/src/plugins/mediawiki/cronjobs/create-wikis.php
@@ -1,6 +1,6 @@
#! /usr/bin/php
<?php
-/*
+/**
* Copyright (C) 2010 Olaf Lenz
*
* This file is part of FusionForge.
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3b3f2dc575042bc28c45e886f45e792203d011e9
commit 3b3f2dc575042bc28c45e886f45e792203d011e9
Author: Franck Villaume <[email protected]>
Date: Sat Oct 1 13:29:21 2016 +0200
sprintf not needed
diff --git a/src/common/include/SysTasksQ.class.php
b/src/common/include/SysTasksQ.class.php
index c6c286b..2268579 100644
--- a/src/common/include/SysTasksQ.class.php
+++ b/src/common/include/SysTasksQ.class.php
@@ -47,8 +47,7 @@ class SysTasksQ extends FFError {
}
$res = db_query_qpa($qpa);
if (!$res) {
- $this->setError(sprintf(_('Error: Cannot create system
action: %s'),
-
db_error()));
+ $this->setError(_('Error: Cannot create system
action')._(': ').db_error());
return false;
}
if (db_numrows($res) >= 1) {
@@ -64,8 +63,7 @@ class SysTasksQ extends FFError {
) VALUES ($1, $2, $3, $4, now())',
array($plugin_id, $systask_type, $group_id, $user_id));
if (!$res || db_affected_rows($res) < 1) {
- $this->setError(sprintf(_('Error: Cannot create system
action: %s'),
-
db_error()));
+ $this->setError(_('Error: Cannot create system
action')._(': ').db_error());
return false;
}
return true;
-----------------------------------------------------------------------
Summary of changes:
src/common/include/SysTasksQ.class.php | 6 ++----
src/plugins/mediawiki/cronjobs/create-wikis.php | 2 +-
src/plugins/moinmoin/common/MoinMoinPlugin.class.php | 19 +++++++++++++++++--
3 files changed, 20 insertions(+), 7 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
