[Fusionforge-commits] FusionForge branch master updated. bce1eb520ed1234cdaf7c37f8ab5a797b24a9f82

Franck VILLAUME nerville at fusionforge.org
Mon Feb 17 15:12:56 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  bce1eb520ed1234cdaf7c37f8ab5a797b24a9f82 (commit)
       via  683fc093ac119b4ff396ad71ad4694df5ab15bb8 (commit)
      from  ec85e27117eeb79bbf86ea3980166379527890f1 (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 bce1eb520ed1234cdaf7c37f8ab5a797b24a9f82
Merge: ec85e27 683fc09
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Feb 17 15:12:32 2014 +0100

    Merge branch 'Branch_5_3' : RBAC, remove double case in switch

diff --cc src/common/include/RBACEngine.class.php
index ee66d39,f07d2ed..10cf355
--- a/src/common/include/RBACEngine.class.php
+++ b/src/common/include/RBACEngine.class.php
@@@ -352,27 -352,20 +352,23 @@@ 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 |    4 ----
 1 file changed, 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list