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 877e02a262b3894d8ca56e10b1b95a9ea64d59a7 (commit)
via cca2eb13dd558df7ada5901c76dad0a618653f16 (commit)
via 7eb8a12990fcb1fa169279144e9a099c1b22660e (commit)
from 4ed9c1890ec7069267b7acf3be0f5e892a7f0ff9 (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=877e02a262b3894d8ca56e10b1b95a9ea64d59a7
commit 877e02a262b3894d8ca56e10b1b95a9ea64d59a7
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Jul 19 17:48:24 2016 +0200
Check use_home, use_my
diff --git a/src/common/include/Navigation.class.php
b/src/common/include/Navigation.class.php
index b1fe5bb..be87e52 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -224,21 +224,25 @@ class Navigation extends FFError {
$selected = 0;
// Home
- $menu['titles'][] = _('Home');
- $menu['urls'][] = util_make_uri('/');
- $menu['tooltips'][] = _('Main Page');
+ if (forge_get_config('use_home')) {
+ $menu['titles'][] = _('Home');
+ $menu['urls'][] = util_make_uri('/');
+ $menu['tooltips'][] = _('Main Page');
+ }
// My Page
- $menu['titles'][] = _('My Page');
- $menu['urls'][] = util_make_uri('/my/');
- $menu['tooltips'][] = _('Your Page, widgets selected by you to
follow your items.');
- if (strstr($request_uri, util_make_uri('/my/'))
- || strstr($request_uri, util_make_uri('/account/'))
- || strstr($request_uri, util_make_uri('/register/'))
- || strstr($request_uri, util_make_uri('/themes/'))
- )
- {
- $selected = count($menu['urls'])-1;
+ if (forge_get_config('use_my')) {
+ $menu['titles'][] = _('My Page');
+ $menu['urls'][] = util_make_uri('/my/');
+ $menu['tooltips'][] = _('Your Page, widgets selected by
you to follow your items.');
+ if (strstr($request_uri, util_make_uri('/my/'))
+ || strstr($request_uri,
util_make_uri('/account/'))
+ || strstr($request_uri,
util_make_uri('/register/'))
+ || strstr($request_uri,
util_make_uri('/themes/'))
+ )
+ {
+ $selected = count($menu['urls'])-1;
+ }
}
if (forge_get_config('use_trove') ||
forge_get_config('use_project_tags') ||
forge_get_config('use_project_full_list')) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=cca2eb13dd558df7ada5901c76dad0a618653f16
commit cca2eb13dd558df7ada5901c76dad0a618653f16
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Jul 19 17:46:05 2016 +0200
Add {}
diff --git a/src/common/include/SysTasksQ.class.php
b/src/common/include/SysTasksQ.class.php
index 7ce99d6..c6c286b 100644
--- a/src/common/include/SysTasksQ.class.php
+++ b/src/common/include/SysTasksQ.class.php
@@ -30,21 +30,30 @@ class SysTasksQ extends FFError {
$qpa = db_construct_qpa();
$qpa = db_construct_qpa($qpa, 'SELECT * FROM systasks WHERE
status=$1', array('TODO'));
$qpa = db_construct_qpa($qpa, ' AND systask_type=$1',
array($systask_type));
- if ($plugin_id == null) $qpa = db_construct_qpa($qpa, ' AND
plugin_id IS NULL');
- else $qpa = db_construct_qpa($qpa, ' AND
plugin_id=$1', array($plugin_id));
- if ($group_id == null) $qpa = db_construct_qpa($qpa, ' AND
group_id IS NULL');
- else $qpa = db_construct_qpa($qpa, ' AND
group_id=$1', array($group_id));
- if ($user_id == null) $qpa = db_construct_qpa($qpa, ' AND
user_id IS NULL');
- else $qpa = db_construct_qpa($qpa, ' AND
user_id=$1', array($user_id));
+ if ($plugin_id == null) {
+ $qpa = db_construct_qpa($qpa, ' AND plugin_id IS NULL');
+ } else {
+ $qpa = db_construct_qpa($qpa, ' AND plugin_id=$1',
array($plugin_id));
+ }
+ if ($group_id == null) {
+ $qpa = db_construct_qpa($qpa, ' AND group_id IS NULL');
+ } else {
+ $qpa = db_construct_qpa($qpa, ' AND group_id=$1',
array($group_id));
+ }
+ if ($user_id == null) {
+ $qpa = db_construct_qpa($qpa, ' AND user_id IS NULL');
+ } else {
+ $qpa = db_construct_qpa($qpa, ' AND user_id=$1',
array($user_id));
+ }
$res = db_query_qpa($qpa);
if (!$res) {
$this->setError(sprintf(_('Error: Cannot create system
action: %s'),
db_error()));
return false;
}
- if (db_numrows($res) >= 1)
+ if (db_numrows($res) >= 1) {
return true;
-
+ }
$res = db_query_params(
'INSERT INTO systasks (
plugin_id,
@@ -59,6 +68,7 @@ class SysTasksQ extends FFError {
db_error()));
return false;
}
+ return true;
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7eb8a12990fcb1fa169279144e9a099c1b22660e
commit 7eb8a12990fcb1fa169279144e9a099c1b22660e
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Jul 19 17:44:30 2016 +0200
Whitespace
diff --git a/src/common/include/Role.class.php
b/src/common/include/Role.class.php
index aa4403a..433618d 100644
--- a/src/common/include/Role.class.php
+++ b/src/common/include/Role.class.php
@@ -22,8 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once $gfcommon.'include/rbac_texts.php' ;
-require_once $gfcommon.'include/RBAC.php' ;
+require_once $gfcommon.'include/rbac_texts.php';
+require_once $gfcommon.'include/RBAC.php';
/**
* TODO: FusionForge roles - Enter description here ...
-----------------------------------------------------------------------
Summary of changes:
src/common/include/Navigation.class.php | 30 +++++++++++++++++-------------
src/common/include/Role.class.php | 4 ++--
src/common/include/SysTasksQ.class.php | 26 ++++++++++++++++++--------
3 files changed, 37 insertions(+), 23 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
