From 05012c9e6c959162f79ff1d97c800b662196bf2b Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Sun, 19 Jan 2025 21:54:01 +1100
Subject: [PATCH] Consistent naming for modal items and move dn into javascript
 variable for DN entry

---
 .../layouts/partials/contentheader.blade.php  |  2 +-
 .../components/attribute/password.blade.php   |  2 +-
 resources/views/frames/dn.blade.php           | 42 ++++++++++---------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/resources/themes/architect/views/layouts/partials/contentheader.blade.php b/resources/themes/architect/views/layouts/partials/contentheader.blade.php
index ffe80c0..0509fe7 100644
--- a/resources/themes/architect/views/layouts/partials/contentheader.blade.php
+++ b/resources/themes/architect/views/layouts/partials/contentheader.blade.php
@@ -40,7 +40,7 @@
 								@if (isset($page_actions) && $page_actions->contains('export'))
 									<li class="nav-item">
 										<a class="nav-link pt-0 pb-1">
-											<button type="button" class="p-2 m-0 border-0 btn-transition btn btn-outline-dark w-100 text-start" data-bs-toggle="modal" data-bs-target="#entry-export-modal" {{--data-bs-whatever="ldif"--}}>
+											<button type="button" class="p-2 m-0 border-0 btn-transition btn btn-outline-dark w-100 text-start" data-bs-toggle="modal" data-bs-target="#entry_export-modal">
 												<i class="fas fa-fw fa-file-export me-2"></i> @lang('Export')
 											</button>
 										</a>
diff --git a/resources/views/components/attribute/password.blade.php b/resources/views/components/attribute/password.blade.php
index 56f0bad..63dc649 100644
--- a/resources/views/components/attribute/password.blade.php
+++ b/resources/views/components/attribute/password.blade.php
@@ -22,7 +22,7 @@
 	<div class="row">
 		<div class="offset-1 col-4 p-2">
 			<span class="p-0 m-0">
-				<button type="button" class="btn btn-transition btn-sm btn-outline-dark mt-3" data-bs-toggle="modal" data-bs-target="#userpassword-check-modal"><i class="fas fa-user-check"></i> @lang('Check Password')</button>
+				<button type="button" class="btn btn-transition btn-sm btn-outline-dark mt-3" data-bs-toggle="modal" data-bs-target="#userpassword_check-modal"><i class="fas fa-user-check"></i> @lang('Check Password')</button>
 			</span>
 		</div>
 	</div>
diff --git a/resources/views/frames/dn.blade.php b/resources/views/frames/dn.blade.php
index 00d807f..a630120 100644
--- a/resources/views/frames/dn.blade.php
+++ b/resources/views/frames/dn.blade.php
@@ -28,7 +28,7 @@
 						<form id="dn-edit" method="POST" class="needs-validation" action="{{ url('entry/update/pending') }}" novalidate>
 							@csrf
 
-							<input type="hidden" name="dn" value="{{ $o->getDNSecure() }}">
+							<input type="hidden" name="dn" value="">
 
 							@foreach ($o->getVisibleAttributes() as $ao)
 								<x-attribute-type :edit="true" :o="$ao"/>
@@ -113,21 +113,21 @@
 
 @section('page-modals')
 	<!-- EXPORT -->
-	<div class="modal fade" id="entry-export-modal" tabindex="-1" aria-labelledby="entry-export-label" aria-hidden="true">
+	<div class="modal fade" id="entry_export-modal" tabindex="-1" aria-labelledby="entry_export-label" aria-hidden="true">
 		<div class="modal-dialog modal-lg modal-fullscreen-xl-down">
 			<div class="modal-content">
 				<div class="modal-header">
-					<h1 class="modal-title fs-5" id="entry-export-label">LDIF for {{ $dn }}</h1>
+					<h1 class="modal-title fs-5" id="entry_export-label">LDIF for {{ $dn }}</h1>
 					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 				</div>
 
 				<div class="modal-body">
-					<div id="entry-export"><div class="fa-3x"><i class="fas fa-spinner fa-pulse fa-sm"></i></div></div>
+					<div id="entry_export"><div class="fa-3x"><i class="fas fa-spinner fa-pulse fa-sm"></i></div></div>
 				</div>
 
 				<div class="modal-footer">
 					<button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">Close</button>
-					<button type="button" class="btn btn-primary btn-sm" id="entry-export-download">Download</button>
+					<button type="button" class="btn btn-primary btn-sm" id="entry_export-download">Download</button>
 				</div>
 			</div>
 		</div>
@@ -135,11 +135,11 @@
 
 	@if($up=$o->getObject('userpassword'))
 		<!-- CHECK USERPASSWORD -->
-		<div class="modal fade" id="userpassword-check-modal" tabindex="-1" aria-labelledby="userpassword-check-label" aria-hidden="true">
+		<div class="modal fade" id="userpassword_check-modal" tabindex="-1" aria-labelledby="userpassword_check-label" aria-hidden="true">
 			<div class="modal-dialog modal-lg modal-fullscreen-lg-down">
 				<div class="modal-content">
 					<div class="modal-header">
-						<h1 class="modal-title fs-5" id="userpassword-check-label">Check Passwords for {{ $dn }}</h1>
+						<h1 class="modal-title fs-5" id="userpassword_check-label">Check Passwords for {{ $dn }}</h1>
 						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 					</div>
 
@@ -162,7 +162,7 @@
 
 					<div class="modal-footer">
 						<button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">Close</button>
-						<button type="button" class="btn btn-primary btn-sm" id="userpassword_check_submit"><i class="fas fa-fw fa-spinner fa-spin d-none"></i> Check</button>
+						<button type="button" class="btn btn-primary btn-sm" id="userpassword_check-submit"><i class="fas fa-fw fa-spinner fa-spin d-none"></i> Check</button>
 					</div>
 				</div>
 			</div>
@@ -172,6 +172,8 @@
 
 @section('page-scripts')
 	<script type="text/javascript">
+		var dn = '{{ $o->getDNSecure() }}';
+
 		function download(filename,text) {
 			var element = document.createElement('a');
 
@@ -185,6 +187,8 @@
 		}
 
 		function editmode() {
+			$('#dn-edit input[name="dn"]').val(dn);
+
 			$('button[id=entry-edit]').addClass('active').removeClass('btn-outline-dark').addClass('btn-outline-light');
 
 			// Find all input items and turn off readonly
@@ -239,33 +243,33 @@
 				editmode();
 			});
 
-			$('#entry-export-download').on('click',function(item) {
+			$('#entry_export-download').on('click',function(item) {
 				item.preventDefault();
 
-				let ldif = $('#entry-export').find('pre:first'); // update this selector in your local version
+				let ldif = $('#entry_export').find('pre:first'); // update this selector in your local version
 				download('ldap-export.ldif',ldif.html());
 			});
 
-			$('#entry-export-modal').on('shown.bs.modal',function() {
+			$('#entry_export-modal').on('shown.bs.modal',function() {
 				$.ajax({
 					type: 'GET',
 					success: function(data) {
-						$('#entry-export').empty().append(data);
+						$('#entry_export').empty().append(data);
 					},
 					error: function(e) {
 						if (e.status != 412)
 							alert('That didnt work? Please try again....');
 					},
-					url: '{{ url('entry/export',$o->getDNSecure()) }}/',
+					url: '{{ url('entry/export') }}/'+dn,
 					cache: false
 				})
 			})
 
 			@if($up)
-				$('button[id=userpassword_check_submit]').on('click',function(item) {
+				$('button[id=userpassword_check-submit]').on('click',function(item) {
 					var that = $(this);
 
-					var passwords = $('#userpassword-check-modal')
+					var passwords = $('#userpassword_check-modal')
 						.find('input[name^="password["')
 						.map((key,item)=>item.value);
 
@@ -284,16 +288,14 @@
 						},
 						success: function(data) {
 							data.forEach(function(item,key) {
-								var i = $('#userpassword-check-modal')
+								var i = $('#userpassword_check-modal')
 									.find('input[name="password['+key+']')
 									.siblings('i');
 
-								var feedback = $('#userpassword-check-modal')
+								var feedback = $('#userpassword_check-modal')
 									.find('input[name="password['+key+']')
 									.siblings('div.invalid-feedback');
 
-								console.log(feedback.attr('display'));
-
 								if (item === 'OK') {
 									i.removeClass('text-danger').addClass('text-success').removeClass('fa-lock').addClass('fa-lock-open');
 									if (feedback.is(':visible'))
@@ -311,7 +313,7 @@
 						},
 						url: '{{ url('entry/password/check') }}',
 						data: {
-							dn: '{{ $o->getDNSecure() }}',
+							dn: dn,
 							password: Array.from(passwords),
 						},
 						dataType: 'json',