From b7fdd7297083a6b18971f93c64a8e97adadd92c7 Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Wed, 25 Mar 2020 16:52:07 -0600
Subject: [PATCH] Contacts: Update to use reworked modal.

---
 app/contacts/contact_edit.php       | 57 +++++++++++++++++------------
 app/contacts/contact_phone_edit.php |  2 +-
 app/contacts/contacts.php           |  7 +++-
 3 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php
index dddb174622..1a72a23e20 100644
--- a/app/contacts/contact_edit.php
+++ b/app/contacts/contact_edit.php
@@ -505,29 +505,22 @@
 		if (permission_exists('contact_attachment_add')) { echo "<option value='attachment'>".$text['label-attachment']."</option>\n"; }
 		echo "		</select>";
 	}
-	if ($action == "update") {
-		if (
-			permission_exists('contact_delete') ||
-			permission_exists('contact_user_delete') ||
-			permission_exists('contact_group_delete') ||
-			permission_exists('contact_phone_delete') ||
-			permission_exists('contact_address_delete') ||
-			permission_exists('contact_email_delete') ||
-			permission_exists('contact_url_delete') ||
-			permission_exists('contact_relation_delete') ||
-			permission_exists('contact_note_delete') ||
-			permission_exists('contact_time_delete') ||
-			permission_exists('contact_setting_delete') ||
-			permission_exists('contact_attachment_delete')
-			) {
-			echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','collapse'=>'hide-sm-dn','onclick'=>"document.location.href='#modal-delete'; document.getElementById('btn_delete').focus();"]);
-			echo modal::create([
-				'id'=>'modal-delete',
-				'type'=>'delete',
-				'actions'=>
-					button::create(['type'=>'submit','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','name'=>'action','value'=>'delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close();"])
-				]);
-		}
+	if (
+		$action == "update" && (
+		permission_exists('contact_delete') ||
+		permission_exists('contact_user_delete') ||
+		permission_exists('contact_group_delete') ||
+		permission_exists('contact_phone_delete') ||
+		permission_exists('contact_address_delete') ||
+		permission_exists('contact_email_delete') ||
+		permission_exists('contact_url_delete') ||
+		permission_exists('contact_relation_delete') ||
+		permission_exists('contact_note_delete') ||
+		permission_exists('contact_time_delete') ||
+		permission_exists('contact_setting_delete') ||
+		permission_exists('contact_attachment_delete')
+		)) {
+		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','collapse'=>'hide-sm-dn','onclick'=>"modal_open('modal-delete','btn_delete');"]);
 	}
 	if (permission_exists('contact_edit') || permission_exists('contact_add')) {
 		echo button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','style'=>($action != 'update' ?: 'margin-left: 15px;'),'collapse'=>'hide-sm-dn','onclick'=>"document.getElementById('frm').submit();"]);
@@ -536,6 +529,24 @@
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
+	if (
+		$action == "update" && (
+		permission_exists('contact_delete') ||
+		permission_exists('contact_user_delete') ||
+		permission_exists('contact_group_delete') ||
+		permission_exists('contact_phone_delete') ||
+		permission_exists('contact_address_delete') ||
+		permission_exists('contact_email_delete') ||
+		permission_exists('contact_url_delete') ||
+		permission_exists('contact_relation_delete') ||
+		permission_exists('contact_note_delete') ||
+		permission_exists('contact_time_delete') ||
+		permission_exists('contact_setting_delete') ||
+		permission_exists('contact_attachment_delete')
+		)) {
+		echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'submit','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','name'=>'action','value'=>'delete','onclick'=>"modal_close();"])]);
+	}
+
 	if ($action == "add") {
 		echo $text['description-contact-add']."\n";
 	}
diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php
index 44439488e4..d184461e26 100644
--- a/app/contacts/contact_phone_edit.php
+++ b/app/contacts/contact_phone_edit.php
@@ -235,7 +235,7 @@
 	echo "</script>";
 
 //show the content
-	echo "<form method='post' name='frm'>\n";
+	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'>";
diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php
index 4e557e3b8d..c94dcad1e0 100644
--- a/app/contacts/contacts.php
+++ b/app/contacts/contacts.php
@@ -259,8 +259,7 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','collapse'=>'hide-sm-dn','link'=>'contact_edit.php']);
 	}
 	if (permission_exists('contact_delete') && $contacts) {
-		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','collapse'=>'hide-sm-dn','onclick'=>"document.location.href='#modal-delete'; document.getElementById('btn_delete').focus();"]);
-		echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]);
+		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','collapse'=>'hide-sm-dn','onclick'=>"modal_open('modal-delete','btn_delete');"]);
 	}
 	echo 		"<form id='form_search' class='inline' method='get'>\n";
 	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
@@ -274,6 +273,10 @@
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
+	if (permission_exists('contact_delete') && $contacts) {
+		echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]);
+	}
+
 	echo $text['description-contacts']."\n";
 	echo "<br /><br />\n";