Browse Source

adding message when adding/deleting users into a URL see BT#3685

Julio Montoya 13 years ago
parent
commit
b917b209cd
2 changed files with 75 additions and 41 deletions
  1. 43 11
      main/admin/access_url_edit_users_to_url.php
  2. 32 30
      main/inc/lib/urlmanager.lib.php

+ 43 - 11
main/admin/access_url_edit_users_to_url.php

@@ -90,28 +90,60 @@ function remove_item(origin)
 
 $form_sent=0;
 $errorMsg='';
-$UserList=$SessionList=array();
-$users=$sessions=array();
+$UserList=array();
 
-if($_POST['form_sent']) {
-	$form_sent=$_POST['form_sent'];
-	$UserList=$_POST['sessionUsersList'];
-	if(!is_array($UserList)) {
+$message = '';
+
+if ($_POST['form_sent']) {
+	$form_sent  = $_POST['form_sent'];
+	$UserList   = $_POST['sessionUsersList'];
+    
+	if (!is_array($UserList)) {
 		$UserList=array();
 	}
-	if($form_sent == 1) {
+	if ($form_sent == 1) {
 		if ($access_url_id==0) {
 			header('Location: access_url_edit_users_to_url.php?action=show_message&message='.get_lang('SelectURL'));
-		}
-		elseif(is_array($UserList) ) {
-			UrlManager::update_urls_rel_user($UserList,$access_url_id);
-			header('Location: access_urls.php?action=show_message&message='.get_lang('UsersWereEdited'));
+		} elseif (is_array($UserList)) {
+			$result = UrlManager::update_urls_rel_user($UserList, $access_url_id);
+            
+            if (!empty($result['users_added'])) {
+                $message .=  '<h4>'.get_lang('UsersAdded').':</h4>';
+                $i = 1;
+                $user_added_list = array();
+                foreach($result['users_added'] as $user) {
+                    $user_info = api_get_user_info($user);
+                    $user_added_list[] = $i.' '.api_get_person_name($user_info['firstname'], $user_info['lastname']);
+                    $i++;
+                }
+                if (!empty($user_added_list)) {
+                    $message .= implode(', ', $user_added_list);
+                }                
+            }
+            
+            if (!empty($result['users_deleted'])) {
+                $message .= '<br /><h4>'.get_lang('UsersDeleted').': </h4>';
+                $user_deleted_list = array();
+                $i = 1;
+                foreach($result['users_deleted'] as $user) {
+                    $user_info = api_get_user_info($user);
+                    $user_deleted_list [] = $i.' '.api_get_person_name($user_info['firstname'], $user_info['lastname']);
+                    $i++;
+                }
+                 if (!empty($user_deleted_list)) {
+                    $message .= implode(', ', $user_deleted_list);
+                }
+            }
 		}
 	}
 }
 
 Display::display_header($tool_name);
 
+if (!empty($message)) {
+    Display::display_normal_message($message, false);
+}
+
 echo '<div class="actions" style="height:22px;">';
 echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/access_url_add_users_to_url.php">'.Display::return_icon('view_more_stats.gif',get_lang('AddUserToURL'),'').' '.get_lang('AddUsersToURL').'</a>';
 echo '</div>';

+ 32 - 30
main/inc/lib/urlmanager.lib.php

@@ -255,8 +255,7 @@ class UrlManager
 	* @param int url id
 	* @return boolean true if success
 	* */
-	public static function relation_url_user_exist($user_id, $url_id)
-	{
+	public static function relation_url_user_exist($user_id, $url_id) 	{
 		$table_url_rel_user= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 		$sql= "SELECT user_id FROM $table_url_rel_user WHERE access_url_id = ".Database::escape_string($url_id)." AND  user_id = ".Database::escape_string($user_id)." ";
 		$result = Database::query($sql);
@@ -391,8 +390,6 @@ class UrlManager
 		return 	$result_array;
 	}
 
-
-
 	/**
 	 * Add a user into a url
 	 * @author Julio Montoya
@@ -400,14 +397,13 @@ class UrlManager
 	 * @param  url_id
 	 * @return boolean true if success
 	 * */
-	public static function add_user_to_url($user_id, $url_id=1)
-	{
+	public static function add_user_to_url($user_id, $url_id = 1) {
 		$table_url_rel_user= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-		if (empty($url_id)) $url_id=1;
+		if (empty($url_id)) $url_id = 1;
 		$count = UrlManager::relation_url_user_exist($user_id,$url_id);
+        $result = true;
 		if (empty($count)) {
-			$sql = "INSERT INTO $table_url_rel_user
-           			SET user_id = ".Database::escape_string($user_id).", access_url_id = ".Database::escape_string($url_id);
+			$sql = "INSERT INTO $table_url_rel_user (user_id, access_url_id)  VALUES ('".Database::escape_string($user_id)."', '".Database::escape_string($url_id)."') ";
 			$result = Database::query($sql);
 		}
 		return $result;
@@ -432,11 +428,10 @@ class UrlManager
      * @param   int     URL ID
      * @return  bool    True on success, false session already exists or insert failed
      */
-	public static function add_session_to_url($session_id, $url_id = 1)
-	{
+	public static function add_session_to_url($session_id, $url_id = 1) {
 		$table_url_rel_session= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 		if (empty($url_id)) $url_id=1;
-		$return = false;
+		$result = false;
 		$count = UrlManager::relation_url_session_exist($session_id,$url_id);
 		$session_id	= intval($session_id);
 		if (empty($count) && !empty($session_id)) {			
@@ -456,10 +451,9 @@ class UrlManager
 	* @param int url id
 	* @return boolean true if success
 	* */
-	public static function delete_url_rel_user($user_id, $url_id)
-	{
+	public static function delete_url_rel_user($user_id, $url_id) {
 		$table_url_rel_user= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-		$sql= "DELETE FROM $table_url_rel_user WHERE user_id = ".Database::escape_string($user_id)." AND access_url_id=".Database::escape_string($url_id)."  ";
+		$sql= "DELETE FROM $table_url_rel_user WHERE user_id = ".Database::escape_string($user_id)." AND access_url_id = ".Database::escape_string($url_id);
 		$result = Database::query($sql);
 		return $result;
 	}
@@ -501,31 +495,39 @@ class UrlManager
 	 * @param array user list
 	 * @param int access_url_id
 	 * */
-	public static function update_urls_rel_user($user_list,$access_url_id)
-	{
-		$table_access_url	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+	public static function update_urls_rel_user($user_list, $access_url_id) {		
 		$table_url_rel_user	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-
-		$sql = "SELECT user_id FROM $table_url_rel_user WHERE access_url_id=".Database::escape_string($access_url_id);
+		$sql = "SELECT user_id FROM $table_url_rel_user WHERE access_url_id = ".intval($access_url_id);
 		$result = Database::query($sql);
-		$existingUsers = array();
-
+		$existing_users = array();
+        
+        //Getting all users
 		while($row = Database::fetch_array($result)){
-			$existingUsers[] = $row['user_id'];
+			$existing_users[] = $row['user_id'];
 		}
 
-		//adding users
-		foreach($user_list as $enreg_user) {
-			if(!in_array($enreg_user, $existingUsers)) {
-				UrlManager::add_user_to_url($enreg_user,$access_url_id);
+		//Adding users
+        $users_added = array();
+		foreach($user_list as $user_id_to_add) {
+			if (!in_array($user_id_to_add, $existing_users)) {
+				$result = UrlManager::add_user_to_url($user_id_to_add, $access_url_id);
+                if ($result) {
+                    $users_added[] = $user_id_to_add;
+                }
 			}
 		}
+        
+        $users_deleted = array();
 		//deleting old users
-		foreach($existingUsers as $existing_user) {
-			if(!in_array($existing_user, $user_list)) {
-				UrlManager::delete_url_rel_user($existing_user,$access_url_id);
+		foreach($existing_users as $user_id_to_delete) {
+			if (!in_array($user_id_to_delete, $user_list)) {
+				$result = UrlManager::delete_url_rel_user($user_id_to_delete, $access_url_id);
+                if ($result) {
+                    $users_deleted[] = $user_id_to_delete;
+                }
 			}
 		}
+        return array('users_added' => $users_added, 'users_deleted' => $users_deleted);
 	}