Added deletion on global notification config

Former-commit-id: 2356bbe374e5decf929cfaaf2fc4776611b0652d

pandora_console/godmode/setup/setup_notifications.php

@@ -29,11 +29,13 @@ if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user
 }
 
 // AJAX actions.
+$source_id = get_parameter('source_id', '');
+$users = get_parameter('users', '');
+$elements = get_parameter('elements', array());
+$id = empty($source_id) ? 0 : get_notification_source_id($source_id);
+$is_users = $users === "users";
 if (get_parameter('get_selection_two_ways_form', 0)) {
-	$source_id = get_parameter('source_id', '');
+	$info_selec = $is_users
-	$users = get_parameter('users', '');
-	$id = get_notification_source_id($source_id);
-	$info_selec = $users === "users"
 		? notifications_get_user_source_not_configured($id)
 		: notifications_get_group_source_not_configured($id);
 
@@ -45,11 +47,7 @@ if (get_parameter('get_selection_two_ways_form', 0)) {
 	return;
 }
 if (get_parameter('add_source_to_database', 0)) {
-	$source_id = get_parameter('source_id', '');
+	$res = $is_users
-	$users = get_parameter('users', '');
-	$elements = get_parameter('elements', array());
-	$id = get_notification_source_id($source_id);
-	$res = $users === "users"
 		? notifications_add_users_to_source($id, $elements)
 		: notifications_add_group_to_source($id, $elements);
 	$result = array(
@@ -58,6 +56,16 @@ if (get_parameter('add_source_to_database', 0)) {
 	echo json_encode($result);
 	return;
 }
+if (get_parameter('remove_source_on_database', 0)) {
+	$res = $is_users
+		? notifications_remove_users_from_source($id, $elements)
+		: notifications_remove_group_from_source($id, $elements);
+	$result = array(
+		'result' => $res
+	);
+	echo json_encode($result);
+	return;
+}
 
 // Form actions.
 if (get_parameter('update_config', 0)) {
@@ -118,25 +126,26 @@ function notifications_get_source_id(id) {
 	return matched[1];
 }
 
+// Get index of two ways element dialog.
+function notifications_two_ways_element_get_dialog (id, source_id) {
+	return 'global_config_notifications_dialog_add-' + id + '-' + source_id;
+}
+
+// Get index of two ways element form.
+function notifications_two_ways_element_get_sufix (id, source_id) {
+	return 'multi-' + id + '-' + source_id;
+}
+
 // Disable or enable the select seeing the checked value of notify all users
 function notifications_disable_source(event) {
 	var id = notifications_get_source_id(event.target.id);
 	var is_checked = document.getElementById(event.target.id).checked;
 	var selectors = ['groups', 'users'];
 	selectors.map(function (select) {
-		document.getElementById('multi-' + select + '-' + id).disabled = is_checked;
+		document.getElementById(notifications_two_ways_element_get_sufix(select, id)).disabled = is_checked;
 	});
 }
 
-// Get index of two ways element dialog.
-function notifications_two_ways_element_get_dialog (id, source_id) {
-	return 'global_config_notifications_dialog_add-' + id + '-' + source_id;
-}
-// Get index of two ways element form.
-function notifications_two_ways_element_get_sufix (id, source_id) {
-	return 'multi-' + id + '-' + source_id;
-}
-
 // Open a dialog with selector of source elements.
 function add_source_dialog(users, source_id) {
 	// Display the dialog
@@ -187,7 +196,7 @@ function notifications_modify_two_ways_element (id, source_id, operation) {
 		end_id + index_sufix
 	);
 	for (var i = select.options.length - 1; i >= 0; i--) {
-		if(select.options[i].selected ==true){
+		if(select.options[i].selected){
 			select_end.appendChild(select.options[i]);
 		}
 	}
@@ -211,7 +220,9 @@ function notifications_add_source_element_to_database(id, source_id) {
 		function (data, status) {
 			if (data.result) {
 				// Append to other element
-				var out_select = document.getElementById('multi-' + id + '-' + source_id);
+				var out_select = document.getElementById(
+					notifications_two_ways_element_get_sufix(id, source_id)
+				);
 				for (var i = select.options.length - 1; i >= 0; i--) {
 					out_select.appendChild(select.options[i]);
 				}
@@ -224,4 +235,37 @@ function notifications_add_source_element_to_database(id, source_id) {
 		"json"
 	);
 }
+
+// Add elements to database and remove it form main select
+function remove_source_elements(id, source_id) {
+	var index = notifications_two_ways_element_get_sufix(id, source_id);
+	var select = document.getElementById(index);
+	var selected = [];
+	var selected_index = [];
+	for (var i = select.options.length - 1; i >= 0; i--) {
+		if(select.options[i].selected){
+			selected.push(select.options[i].value);
+			selected_index.push(i);
+		}
+	}
+	jQuery.post ("ajax.php",
+		{"page" : "godmode/setup/setup_notifications",
+			"remove_source_on_database" : 1,
+			"users" : id,
+			"source_id" : source_id,
+			"elements": selected
+		},
+		function (data, status) {
+			if (data.result) {
+				// Append to other element
+				for (var i = selected_index.length - 1; i >= 0; i--) {
+					select.remove(selected_index[i]);
+				}
+			} else {
+				console.log("Cannot delete elements.");
+			}
+		},
+		"json"
+	);
+}
 </script>

pandora_console/include/functions_notifications.php

@@ -250,6 +250,28 @@ function notifications_remove_group_from_source ($source_id, $groups) {
     ) !== false;
 }
 
+/**
+ * Delete a set of users from notification source
+ *
+ * @param int Source id
+ * @param array Id of users to be deleted
+ *
+ * @return bool True if success. False otherwise.
+ */
+function notifications_remove_users_from_source ($source_id, $users) {
+    // Source id is mandatory
+    if (!isset($source_id)) return false;
+
+    // Delete from database
+    return db_process_sql_delete (
+        'tnotification_source_user',
+        array(
+            'id_user' => $users,
+            'id_source' => $source_id
+        )
+    ) !== false;
+}
+
 /**
  * Insert a set of groups to notification source
  *
@@ -444,7 +466,7 @@ function notifications_print_source_select_box($info_selec, $id, $source_id, $di
     $html_select .= "   </div>";
     $html_select .= "   <div class='global-notifications-icons'>";
     $html_select .=         html_print_image('images/input_add.png', true, array('title' => $add_title, 'onclick' => "add_source_dialog('$id', '$source_id')"));
-    $html_select .=         html_print_image('images/input_delete.png', true, array('title' => $delete_title));
+    $html_select .=         html_print_image('images/input_delete.png', true, array('title' => $delete_title, 'onclick' => "remove_source_elements('$id', '$source_id')"));
     $html_select .= "   </div>";
     $html_select .= "</div>";
     return $html_select;