[Fusionforge-commits] FusionForge branch master updated. a3c080df78b6438469418398b2a505b3097920a0
Franck VILLAUME
nerville at fusionforge.org
Mon Feb 17 15:37:38 CET 2014
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 a3c080df78b6438469418398b2a505b3097920a0 (commit)
via a43fd654638ea289bc0ca7e9f511e31f1e306725 (commit)
via bd6da099ca8f9b7239bc96a19aab65d55b06ee7d (commit)
from bce1eb520ed1234cdaf7c37f8ab5a797b24a9f82 (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 -----------------------------------------------------------------
commit a3c080df78b6438469418398b2a505b3097920a0
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Mon Feb 17 15:37:26 2014 +0100
rbac: really drop double vote
diff --git a/src/common/include/RBACEngine.class.php b/src/common/include/RBACEngine.class.php
index ee66d39..989d815 100644
--- a/src/common/include/RBACEngine.class.php
+++ b/src/common/include/RBACEngine.class.php
@@ -369,9 +369,6 @@ class RBACEngine extends Error implements PFO_RBACEngine {
case 'vote':
$qpa = db_construct_qpa ($qpa, 'AND (perm_val & 16) = 16');
break;
- case 'vote':
- $qpa = db_construct_qpa ($qpa, 'AND (perm_val & 16) = 16');
- break;
}
break;
case 'pm':
commit a43fd654638ea289bc0ca7e9f511e31f1e306725
Merge: bce1eb5 bd6da09
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Mon Feb 17 15:36:37 2014 +0100
Merge branch 'Branch_5_3'
diff --cc src/common/include/RBACEngine.class.php
index 10cf355,e814d40..ee66d39
--- a/src/common/include/RBACEngine.class.php
+++ b/src/common/include/RBACEngine.class.php
@@@ -352,23 -352,24 +352,27 @@@ class RBACEngine extends Error implemen
case 'tracker':
switch ($action) {
case 'ANY':
- $qpa = db_construct_qpa ($qpa, 'AND perm_val != 0');
+ $qpa = db_construct_qpa($qpa, 'AND perm_val != 0');
break;
case 'read':
- $qpa = db_construct_qpa ($qpa, 'AND (perm_val & 1) = 1');
+ $qpa = db_construct_qpa($qpa, 'AND (perm_val & 1) = 1');
break;
case 'tech':
- $qpa = db_construct_qpa ($qpa, 'AND (perm_val & 2) = 2');
+ $qpa = db_construct_qpa($qpa, 'AND (perm_val & 2) = 2');
break;
case 'manager':
- $qpa = db_construct_qpa ($qpa, 'AND (perm_val & 4) = 4');
+ $qpa = db_construct_qpa($qpa, 'AND (perm_val & 4) = 4');
break;
case 'submit':
- $qpa = db_construct_qpa ($qpa, 'AND (perm_val & 8) = 8');
+ $qpa = db_construct_qpa($qpa, 'AND (perm_val & 8) = 8');
+ break;
+ case 'vote':
+ $qpa = db_construct_qpa ($qpa, 'AND (perm_val & 16) = 16');
break;
+ case 'vote':
+ $qpa = db_construct_qpa ($qpa, 'AND (perm_val & 16) = 16');
+ break;
+ }
break;
case 'pm':
switch ($action) {
-----------------------------------------------------------------------
Summary of changes:
src/common/include/RBACEngine.class.php | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list