[Mapbender-commits] r7707 - trunk/mapbender/http/php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Tue Mar 15 10:19:14 EDT 2011
Author: armin11
Date: 2011-03-15 07:19:14 -0700 (Tue, 15 Mar 2011)
New Revision: 7707
Modified:
trunk/mapbender/http/php/mod_filteredGroup_User.php
trunk/mapbender/http/php/mod_filteredGroup_filteredUser.php
trunk/mapbender/http/php/mod_filteredUser_Group.php
trunk/mapbender/http/php/mod_filteredUser_filteredGroup.php
trunk/mapbender/http/php/mod_group_filteredUser.php
trunk/mapbender/http/php/mod_user_filteredGroup.php
Log:
Bugfix for new role concept - don't show entries which are not standard role or no role.
Modified: trunk/mapbender/http/php/mod_filteredGroup_User.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredGroup_User.php 2011-03-15 13:44:54 UTC (rev 7706)
+++ trunk/mapbender/http/php/mod_filteredGroup_User.php 2011-03-15 14:19:14 UTC (rev 7707)
@@ -139,7 +139,7 @@
if(count($selected_user)>0){
for($i=0; $i<count($selected_user); $i++){
$exists = false;
- $sql_insert = "SELECT * from mb_user_mb_group where fkey_mb_group_id = $1 and fkey_mb_user_id = $2 ";
+ $sql_insert = "SELECT * from mb_user_mb_group where fkey_mb_group_id = $1 and fkey_mb_user_id = $2 AND (mb_user_mb_group_type = 1 or mb_user_mb_group_type IS NULL) ";
$v = array($selected_group,$selected_user[$i]);
$t = array('i','i');
$res_insert = db_prep_query($sql_insert,$v,$t);
@@ -156,7 +156,7 @@
if($remove){
if(count($remove_user)>0){
for($i=0; $i<count($remove_user); $i++){
- $sql_remove = "DELETE FROM mb_user_mb_group WHERE fkey_mb_user_id = $1 and fkey_mb_group_id = $2 ";
+ $sql_remove = "DELETE FROM mb_user_mb_group WHERE fkey_mb_user_id = $1 and fkey_mb_group_id = $2 AND fkey_mb_group_id = $2 AND (mb_user_mb_group_type = 1 or mb_user_mb_group_type IS NULL)";
$v = array($remove_user[$i],$selected_group);
$t = array('i','i');
db_prep_query($sql_remove,$v,$t);
@@ -192,7 +192,7 @@
if(count($group_id)>0){
$sql_mb_user_mb_group = "SELECT mb_user.mb_user_id, mb_user.mb_user_name, mb_user.mb_user_email, mb_user_mb_group.fkey_mb_group_id FROM mb_user_mb_group ";
$sql_mb_user_mb_group .= "INNER JOIN mb_user ON mb_user_mb_group.fkey_mb_user_id = mb_user.mb_user_id ";
- $sql_mb_user_mb_group .= "WHERE mb_user_mb_group.fkey_mb_group_id = $1 ";
+ $sql_mb_user_mb_group .= "WHERE mb_user_mb_group.fkey_mb_group_id = $1 AND (mb_user_mb_group.mb_user_mb_group_type = 1 or mb_user_mb_group.mb_user_mb_group_type IS NULL) ";
$sql_mb_user_mb_group .= " ORDER BY mb_user.mb_user_name";
if(!$selected_group){$v = array($group_id[0]);}
@@ -281,4 +281,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_filteredGroup_filteredUser.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredGroup_filteredUser.php 2011-03-15 13:44:54 UTC (rev 7706)
+++ trunk/mapbender/http/php/mod_filteredGroup_filteredUser.php 2011-03-15 14:19:14 UTC (rev 7707)
@@ -146,7 +146,7 @@
if(count($selected_user)>0){
for($i=0; $i<count($selected_user); $i++){
$exists = false;
- $sql_insert = "SELECT * from mb_user_mb_group where fkey_mb_group_id = $1 and fkey_mb_user_id = $2 ";
+ $sql_insert = "SELECT * from mb_user_mb_group where fkey_mb_group_id = $1 and fkey_mb_user_id = $2 AND (mb_user_mb_group_type = 1 or mb_user_mb_group_type IS NULL) ";
$v = array($selected_group,$selected_user[$i]);
$t = array('i','i');
$res_insert = db_prep_query($sql_insert,$v,$t);
@@ -163,7 +163,7 @@
if($remove){
if(count($remove_user)>0){
for($i=0; $i<count($remove_user); $i++){
- $sql_remove = "DELETE FROM mb_user_mb_group WHERE fkey_mb_user_id = $1 and fkey_mb_group_id = $2 ";
+ $sql_remove = "DELETE FROM mb_user_mb_group WHERE fkey_mb_user_id = $1 and fkey_mb_group_id = $2 AND fkey_mb_group_id = $2 AND (mb_user_mb_group_type = 1 or mb_user_mb_group_type IS NULL)";
$v = array($remove_user[$i],$selected_group);
$t = array('i','i');
db_prep_query($sql_remove,$v,$t);
@@ -202,7 +202,7 @@
$t = array();
$sql_mb_user_mb_group = "SELECT mb_user.mb_user_id, mb_user.mb_user_name, mb_user.mb_user_email, mb_user_mb_group.fkey_mb_group_id FROM mb_user_mb_group ";
$sql_mb_user_mb_group .= "INNER JOIN mb_user ON mb_user_mb_group.fkey_mb_user_id = mb_user.mb_user_id ";
- $sql_mb_user_mb_group .= "WHERE mb_user_mb_group.fkey_mb_group_id = $1 ";
+ $sql_mb_user_mb_group .= "WHERE mb_user_mb_group.fkey_mb_group_id = $1 AND (mb_user_mb_group.mb_user_mb_group_type = 1 or mb_user_mb_group.mb_user_mb_group_type IS NULL) ";
if(!$selected_group){array_push($v,$group_id[0]); array_push($t,'i');}
if($selected_group){array_push($v,$selected_group); array_push($t,'i');}
$sql_mb_user_mb_group .= " AND mb_user.mb_user_owner = $2 ";
@@ -290,4 +290,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_filteredUser_Group.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredUser_Group.php 2011-03-15 13:44:54 UTC (rev 7706)
+++ trunk/mapbender/http/php/mod_filteredUser_Group.php 2011-03-15 14:19:14 UTC (rev 7707)
@@ -141,7 +141,7 @@
if(count($selected_group)>0){
for($i=0; $i<count($selected_group); $i++){
$exists = false;
- $sql_insert = "SELECT * from mb_user_mb_group where fkey_mb_user_id = $1 and fkey_mb_group_id = $2";
+ $sql_insert = "SELECT * from mb_user_mb_group where fkey_mb_user_id = $1 and fkey_mb_group_id = $2 AND (mb_user_mb_group_type = 1 or mb_user_mb_group_type IS NULL) ";
$v = array($selected_user,$selected_group[$i]);
$t = array('i','i');
$res_insert = db_prep_query($sql_insert,$v,$t);
@@ -158,7 +158,7 @@
if($remove){
if(count($remove_group)>0){
for($i=0; $i<count($remove_group); $i++){
- $sql_remove = "DELETE FROM mb_user_mb_group WHERE fkey_mb_group_id = $1 and fkey_mb_user_id = $2";
+ $sql_remove = "DELETE FROM mb_user_mb_group WHERE fkey_mb_group_id = $1 and fkey_mb_user_id = $2 AND fkey_mb_group_id = $2 AND (mb_user_mb_group_type = 1 or mb_user_mb_group_type IS NULL)";
$v = array($remove_group[$i],$selected_user);
$t = array('i','i');
db_prep_query($sql_remove,$v,$t);
@@ -194,7 +194,7 @@
if(count($user_id)>0){
$sql_user_mb_group = "SELECT mb_group.mb_group_id, mb_group.mb_group_name, mb_user_mb_group.fkey_mb_user_id FROM mb_user_mb_group ";
$sql_user_mb_group .= "INNER JOIN mb_group ON mb_user_mb_group.fkey_mb_group_id = mb_group.mb_group_id ";
- $sql_user_mb_group .= "WHERE mb_user_mb_group.fkey_mb_user_id = $1 ";
+ $sql_user_mb_group .= "WHERE mb_user_mb_group.fkey_mb_user_id = $1 AND (mb_user_mb_group.mb_user_mb_group_type = 1 or mb_user_mb_group.mb_user_mb_group_type IS NULL) ";
$sql_user_mb_group .= "ORDER BY mb_group.mb_group_name";
if(!$selected_user){$v = array($user_id[0]);}
if($selected_user){$v = array($selected_user);}
@@ -270,4 +270,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_filteredUser_filteredGroup.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredUser_filteredGroup.php 2011-03-15 13:44:54 UTC (rev 7706)
+++ trunk/mapbender/http/php/mod_filteredUser_filteredGroup.php 2011-03-15 14:19:14 UTC (rev 7707)
@@ -141,7 +141,7 @@
if(count($selected_group)>0){
for($i=0; $i<count($selected_group); $i++){
$exists = false;
- $sql_insert = "SELECT * from mb_user_mb_group where fkey_mb_user_id = $1 and fkey_mb_group_id = $2";
+ $sql_insert = "SELECT * from mb_user_mb_group where fkey_mb_user_id = $1 and fkey_mb_group_id = $2 AND (mb_user_mb_group_type = 1 or mb_user_mb_group_type IS NULL) ";
$v = array($selected_user,$selected_group[$i]);
$t = array('i','i');
$res_insert = db_prep_query($sql_insert,$v,$t);
@@ -158,7 +158,7 @@
if($remove){
if(count($remove_group)>0){
for($i=0; $i<count($remove_group); $i++){
- $sql_remove = "DELETE FROM mb_user_mb_group WHERE fkey_mb_group_id = $1 and fkey_mb_user_id = $2";
+ $sql_remove = "DELETE FROM mb_user_mb_group WHERE fkey_mb_group_id = $1 and fkey_mb_user_id = $2 AND fkey_mb_group_id = $2 AND (mb_user_mb_group_type = 1 or mb_user_mb_group_type IS NULL)";
$v = array($remove_group[$i],$selected_user);
$t = array('i','i');
db_prep_query($sql_remove,$v,$t);
@@ -195,7 +195,7 @@
if (count($user_id) == 0 AND count($group_id) == 0){ die("There is no group or user available for this user");}
$sql_user_mb_group = "SELECT mb_group.mb_group_id, mb_group.mb_group_name, mb_user_mb_group.fkey_mb_user_id FROM mb_user_mb_group ";
$sql_user_mb_group .= "INNER JOIN mb_group ON mb_user_mb_group.fkey_mb_group_id = mb_group.mb_group_id ";
-$sql_user_mb_group .= "WHERE mb_user_mb_group.fkey_mb_user_id = $1 ";
+$sql_user_mb_group .= "WHERE mb_user_mb_group.fkey_mb_user_id = $1 AND (mb_user_mb_group.mb_user_mb_group_type = 1 or mb_user_mb_group.mb_user_mb_group_type IS NULL) ";
if(!$selected_user){$v = array($user_id[0]);}
if($selected_user){$v = array($selected_user);}
$t = array('i');
@@ -274,4 +274,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_group_filteredUser.php
===================================================================
--- trunk/mapbender/http/php/mod_group_filteredUser.php 2011-03-15 13:44:54 UTC (rev 7706)
+++ trunk/mapbender/http/php/mod_group_filteredUser.php 2011-03-15 14:19:14 UTC (rev 7707)
@@ -139,7 +139,7 @@
if(count($selected_user)>0){
for($i=0; $i<count($selected_user); $i++){
$exists = false;
- $sql_insert = "SELECT * from mb_user_mb_group where fkey_mb_group_id = $1 and fkey_mb_user_id = $2";
+ $sql_insert = "SELECT * from mb_user_mb_group where fkey_mb_group_id = $1 and fkey_mb_user_id = $2 AND (mb_user_mb_group_type = 1 or mb_user_mb_group_type IS NULL)";
$v = array($selected_group,$selected_user[$i]);
$t = array('i','i');
$res_insert = db_prep_query($sql_insert,$v,$t);
@@ -156,7 +156,7 @@
if($remove){
if(count($remove_user)>0){
for($i=0; $i<count($remove_user); $i++){
- $sql_remove = "DELETE FROM mb_user_mb_group WHERE fkey_mb_user_id = $1 and fkey_mb_group_id = $2";
+ $sql_remove = "DELETE FROM mb_user_mb_group WHERE fkey_mb_user_id = $1 AND fkey_mb_group_id = $2 AND (mb_user_mb_group_type = 1 or mb_user_mb_group_type IS NULL)";
$v = array($remove_user[$i],$selected_group);
$t = array('i','i');
db_prep_query($sql_remove,$v,$t);
@@ -189,7 +189,7 @@
/*get only owner user from selected group**********************************************************/
$sql_mb_user_mb_group = "SELECT mb_user.mb_user_id, mb_user.mb_user_name, mb_user.mb_user_email, mb_user_mb_group.fkey_mb_group_id FROM mb_user_mb_group ";
$sql_mb_user_mb_group .= "INNER JOIN mb_user ON mb_user_mb_group.fkey_mb_user_id = mb_user.mb_user_id ";
-$sql_mb_user_mb_group .= "WHERE mb_user_mb_group.fkey_mb_group_id = $1 ";
+$sql_mb_user_mb_group .= "WHERE mb_user_mb_group.fkey_mb_group_id = $1 AND (mb_user_mb_group.mb_user_mb_group_type = 1 or mb_user_mb_group.mb_user_mb_group_type IS NULL)";
if(!$selected_group){$v = array($group_id[0]);}
if($selected_group){$v = array($selected_group);}
$t = array('i');
@@ -274,4 +274,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_user_filteredGroup.php
===================================================================
--- trunk/mapbender/http/php/mod_user_filteredGroup.php 2011-03-15 13:44:54 UTC (rev 7706)
+++ trunk/mapbender/http/php/mod_user_filteredGroup.php 2011-03-15 14:19:14 UTC (rev 7707)
@@ -139,7 +139,7 @@
if(count($selected_group)>0){
for($i=0; $i<count($selected_group); $i++){
$exists = false;
- $sql_insert = "SELECT * from mb_user_mb_group where fkey_mb_user_id = $1 and fkey_mb_group_id = $2 ";
+ $sql_insert = "SELECT * from mb_user_mb_group where fkey_mb_user_id = $1 and fkey_mb_group_id = $2 AND (mb_user_mb_group_type = 1 or mb_user_mb_group_type IS NULL)";
$v = array($selected_user,$selected_group[$i]);
$t = array('i','i');
$res_insert = db_prep_query($sql_insert,$v,$t);
@@ -156,7 +156,7 @@
if($remove){
if(count($remove_group)>0){
for($i=0; $i<count($remove_group); $i++){
- $sql_remove = "DELETE FROM mb_user_mb_group WHERE fkey_mb_group_id = $1 and fkey_mb_user_id = $2";
+ $sql_remove = "DELETE FROM mb_user_mb_group WHERE fkey_mb_group_id = $1 and fkey_mb_user_id = $2 AND (mb_user_mb_group_type = 1 or mb_user_mb_group_type IS NULL)";
$v = array($remove_group[$i],$selected_user);
$t = array('i','i');
db_prep_query($sql_remove,$v,$t);
@@ -190,7 +190,7 @@
$t = array();
$sql_user_mb_group = "SELECT mb_group.mb_group_id, mb_group.mb_group_name, mb_user_mb_group.fkey_mb_user_id FROM mb_user_mb_group ";
$sql_user_mb_group .= "INNER JOIN mb_group ON mb_user_mb_group.fkey_mb_group_id = mb_group.mb_group_id ";
-$sql_user_mb_group .= "WHERE mb_user_mb_group.fkey_mb_user_id = $1 ";
+$sql_user_mb_group .= "WHERE mb_user_mb_group.fkey_mb_user_id = $1 AND (mb_user_mb_group.mb_user_mb_group_type = 1 or mb_user_mb_group.mb_user_mb_group_type IS NULL)";
if(!$selected_user){array_push($v,$user_id[0]);}
if($selected_user){array_push($v,$selected_user);}
array_push($t,'i');
@@ -266,4 +266,4 @@
// -->
</script>
</body>
-</html>
\ No newline at end of file
+</html>
More information about the Mapbender_commits
mailing list