From de52214b46428598be8fe34a8e2b8769f89d91ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Nana?= <sebastien.nana@maarch.org>
Date: Thu, 9 Sep 2010 16:41:17 +0000
Subject: [PATCH] Evol : code refactoring for users and usergroups
administration
---
entities/trunk/class/class_users_entities.php | 8 ++++----
entities/trunk/remove_user_entities.php | 2 +-
entities/trunk/service_user_entities.php | 9 ++++-----
entities/trunk/xml/services.xml | 2 +-
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/entities/trunk/class/class_users_entities.php b/entities/trunk/class/class_users_entities.php
index 31724fe953d..aad5a3a54f4 100644
--- a/entities/trunk/class/class_users_entities.php
+++ b/entities/trunk/class/class_users_entities.php
@@ -24,9 +24,9 @@ class users_entities extends dbquery
if($mode == 'up')
{
- if (($_SESSION['m_admin']['load_entities'] == true || ! isset($_SESSION['m_admin']['load_entities'] )) && $_SESSION['m_admin']['users']['UserId'] <> "superadmin")
+ if (($_SESSION['m_admin']['load_entities'] == true || ! isset($_SESSION['m_admin']['load_entities'] )) && $_SESSION['m_admin']['users']['user_id'] <> "superadmin")
{
- $this->load_entities_session($_SESSION['m_admin']['users']['UserId']);
+ $this->load_entities_session($_SESSION['m_admin']['users']['user_id']);
}
}
else
@@ -285,7 +285,7 @@ class users_entities extends dbquery
if(!$from_module_entities_page)
{
- $this->query("DELETE FROM ".$_SESSION['tablename']['ent_users_entities'] ." where user_id = '".$this->protect_string_db(trim($_SESSION['m_admin']['users']['UserId']))."'");
+ $this->query("DELETE FROM ".$_SESSION['tablename']['ent_users_entities'] ." where user_id = '".$this->protect_string_db(trim($_SESSION['m_admin']['users']['user_id']))."'");
}
else
{
@@ -296,7 +296,7 @@ class users_entities extends dbquery
$tmp_r = $this->protect_string_db($_SESSION['m_admin']['entity']['entities'][$i]['ROLE']);
if(!$from_module_entities_page)
{
- $this->query("INSERT INTO ".$_SESSION['tablename']['ent_users_entities']." VALUES ('".$_SESSION['m_admin']['users']['UserId']."', '".$_SESSION['m_admin']['entity']['entities'][$i]['ENTITY_ID']."', '".$tmp_r."', '".$_SESSION['m_admin']['entity']['entities'][$i]['PRIMARY']."')");
+ $this->query("INSERT INTO ".$_SESSION['tablename']['ent_users_entities']." VALUES ('".$_SESSION['m_admin']['users']['user_id']."', '".$_SESSION['m_admin']['entity']['entities'][$i]['ENTITY_ID']."', '".$tmp_r."', '".$_SESSION['m_admin']['entity']['entities'][$i]['PRIMARY']."')");
}
else
{
diff --git a/entities/trunk/remove_user_entities.php b/entities/trunk/remove_user_entities.php
index cfb1b94ad3e..5be68f6d5e5 100644
--- a/entities/trunk/remove_user_entities.php
+++ b/entities/trunk/remove_user_entities.php
@@ -20,7 +20,7 @@ if(isset($_REQUEST['entities']) && $_REQUEST['entities'] >= 0)
{
unset($_SESSION['m_admin']['entity']['entities'][$to_unset[$i]]);
}
- array_unique($_SESSION['m_admin']['entity']['entities']);
+ $_SESSION['m_admin']['entity']['entities'] = array_values($_SESSION['m_admin']['entity']['entities']);
$_SESSION['m_admin']['load_entities'] = false;
echo "{ status : 0 }";
}
diff --git a/entities/trunk/service_user_entities.php b/entities/trunk/service_user_entities.php
index c2c09b71448..0312c66321e 100644
--- a/entities/trunk/service_user_entities.php
+++ b/entities/trunk/service_user_entities.php
@@ -1,11 +1,10 @@
<?php
require_once('modules/entities/class/EntityControler.php');
-
if($_SESSION['service_tag'] == 'user_init')
{
$_SESSION['m_admin']['nbentities'] = EntityControler::getEntitiesCount();
- $tmp_array = EntityControler::getUsersEntities($_SESSION['m_admin']['users']['UserId']);
+ $tmp_array = EntityControler::getUsersEntities($_SESSION['m_admin']['users']['user_id']);
for($i=0; $i<count($tmp_array);$i++)
{
$ent = EntityControler::get($tmp_array[$i]['ENTITY_ID']);
@@ -50,9 +49,9 @@ elseif($_SESSION['service_tag'] == 'user_check')
}
}
}
-elseif($_SESSION['service_tag'] == 'user_add_' || $_SESSION['service_tag'] == 'user_up')
+elseif($_SESSION['service_tag'] == 'user_add' || $_SESSION['service_tag'] == 'user_up')
{
- EntityControler::cleanUsersentities($_SESSION['m_admin']['users']['UserId'], 'user_id');
- EntityControler::loadDbUsersentities($_SESSION['m_admin']['users']['UserId'], $_SESSION['m_admin']['entity']['entities']);
+ EntityControler::cleanUsersentities($_SESSION['m_admin']['users']['user_id'], 'user_id');
+ EntityControler::loadDbUsersentities($_SESSION['m_admin']['users']['user_id'], $_SESSION['m_admin']['entity']['entities']);
}
?>
diff --git a/entities/trunk/xml/services.xml b/entities/trunk/xml/services.xml
index 32a4cb76d9b..3d1600c1356 100644
--- a/entities/trunk/xml/services.xml
+++ b/entities/trunk/xml/services.xml
@@ -152,7 +152,7 @@
<nature>include</nature>
</WHEREAMIUSED>
<WHEREAMIUSED>
- <page>users_add_db.php</page>
+ <page>users_add_db</page>
<nature>include</nature>
</WHEREAMIUSED>
</SERVICE>
--
GitLab