coral-erm · spaceisntsyntax · Apr 4, 2024 · Nov 8, 2021 · Aug 5, 2021 · Nov 29, 2021
diff --git a/auth/admin.php b/auth/admin.php
@@ -43,8 +43,9 @@
 <link rel="SHORTCUT ICON" href="images/favicon.ico" />
 <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
 <link href='https://fonts.googleapis.com/css?family=Open+Sans:100,400,300,600,700' rel='stylesheet' type='text/css'>
-<script type="text/javascript" src="../js/plugins/jquery-1.8.0.js"></script>
-<script type="text/javascript" src="js/plugins/thickbox.js"></script>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+<link  rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css"></script>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
 <script type="text/javascript" src="js/common.js"></script>
 <script type="text/javascript" src="../js/plugins/Gettext.js"></script>
 <?php

diff --git a/auth/admin/classes/common/DynamicObject.php b/auth/admin/classes/common/DynamicObject.php
@@ -16,7 +16,6 @@
 **************************************************************************************************************************
 */
 
-
 class DynamicObject extends Base_Object {
 
 	protected $properties = array();

diff --git a/auth/ajax_forms.php b/auth/ajax_forms.php
@@ -75,7 +75,7 @@
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
 				<td style='text-align:left;'><input type='button' value='<?php echo _("submit");?>' id ='submitUser' class='submitButton' /></td>
-				<td style='text-align:right;'><input type='button' value='<?php echo _("cancel");?>' onclick="window.parent.tb_remove(); return false;" class='submitButton' /></td>
+				<td style='text-align:right;'><input type='button' value='<?php echo _("cancel");?>' onclick="myCloseDialog(); return false;" class='submitButton' /></td>
 			</tr>
 		</table>
 

diff --git a/auth/ajax_htmldata.php b/auth/ajax_htmldata.php
@@ -50,18 +50,18 @@
 					echo "<tr>";
 					echo "<td>" . $userArray['loginID'] . "</td>";
 					echo "<td>" . $isAdmin . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=" . $userArray['loginID'] . "&height=230&width=315&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit password or admin status")."' title='"._("edit password or admin status")."'></a></td>";
+					echo "<td><a href='javascript:void(0)' onclick='javascript:myDialog(\"ajax_forms.php?action=getAdminUserUpdateForm&loginID=" . $userArray['loginID'] . "&height=230&width=315&modal=true\",400,350)' class='thickbox'><img src='images/edit.gif' alt='"._("edit password or admin status")."' title='"._("edit password or admin status")."'></a></td>";
 					echo "<td><a href='javascript:void(0);' class='deleteUser' id='" . $userArray['loginID'] . "'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
 				?>
 			</table>
-			<a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=&height=215&width=315&modal=true' class='thickbox' id='addUser'><?php echo _("add new user")?></a>
+			<a href='javascript:void(0)' onclick='javascript:myDialog("ajax_forms.php?action=getAdminUserUpdateForm&loginID=&height=215&width=315&modal=true",400,350)' class='thickbox' id='addUser'><?php echo _("add new user")?></a>
 			<?php
 
 		}else{
-			echo "(none found)<br /><a href='ajax_forms.php?action=getUserUpdateForm&loginID=&height=275&width=315&modal=true' class='thickbox' id='addUser'>"._("add new user")."</a>";
+			echo "(none found)<br /><a href='javascript:void(0)' onclick='javascript:myDialog(\"ajax_forms.php?action=getUserUpdateForm&loginID=&height=275&width=315&modal=true\",300,350)' class='thickbox' id='addUser'>"._("add new user")."</a>";
 		}
 
 		break;

diff --git a/auth/ajax_processing.php b/auth/ajax_processing.php
@@ -52,7 +52,7 @@
 				$sUser->passwordPrefix	= $prefix;
 			}
 
-			if ($_POST['adminInd'] == "1"){
+			if ($_POST['adminInd'] == "1" || $_POST['adminInd'] == "Y"){
 				$sUser->adminInd 		= "Y";
 			}else{
 				$sUser->adminInd 		= "N";

diff --git a/auth/css/style.css b/auth/css/style.css
@@ -154,7 +154,7 @@ table.surroundBox {
 	border-color: #e6e5e9;
 	border-collapse: collapse;
 	border-spacing: 0;
-	font-size:100%;
+	font-size:90%;
 	width: 100% !important;
 }
 
@@ -442,3 +442,7 @@ p.fontText {
     border: solid 1px #306d9c;
     padding: 20px;
 }
+
+.no-titlebar .ui-dialog-titlebar {
+    display: none;
+}
diff --git a/auth/index.php b/auth/index.php
@@ -172,8 +172,9 @@
 <link rel="SHORTCUT ICON" href="images/favicon.ico" />
 <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
 <link href='https://fonts.googleapis.com/css?family=Open+Sans:100,400,300,600,700' rel='stylesheet' type='text/css'>
-<script type="text/javascript" src="../js/plugins/jquery-1.8.0.js"></script>
-<script type="text/javascript" src="js/plugins/thickbox.js"></script>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+<link  rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css"></script>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
 <script type="text/javascript" src="js/common.js"></script>
 <script type="text/javascript" src="../js/plugins/Gettext.js"></script>
 <?php

diff --git a/auth/install/auth.php b/auth/install/auth.php
@@ -21,7 +21,7 @@ function register_auth_provider()
 								"default_value" => "coral_auth"
 							],
 							"config_file" => [
-								"path" => $protected_module_data{"config_file_path"},
+								"path" => $protected_module_data["config_file_path"],
 							]
 						],
 						"function" => function($shared_module_info) use ($MODULE_VARS, $protected_module_data, $version) {

diff --git a/auth/js/admin.js b/auth/js/admin.js
@@ -37,7 +37,6 @@ function updateUsers() {
 	 data:       "action=getUsers",
 	 success:    function(html) {
 		$("#div_users").html(html);
-		tb_reinit();
 		bind_removes();
 	 }
 
@@ -51,7 +50,7 @@ function submitUserForm(){
 	// ajax call to add/update
 	$.post("ajax_processing.php?action=submitUser", { loginID: $("#textLoginID").val(), editLoginID: $("#editLoginID").val(), password: $("#password").val(), adminInd: getCheckboxValue('adminInd')  } ,
 		function(data){
-			tb_remove();
+			myCloseDialog();
 			updateUsers();
 			return false;
 		}

diff --git a/auth/js/common.js b/auth/js/common.js
@@ -86,7 +86,7 @@ if (!Array.prototype.indexOf)
 }
 
 function getCheckboxValue(field){
-	if ($('#' + field + ':checked').attr('checked')) {
+	if ($('#' + field)[0].checked) {
 		return 1;
 	}else{
 		return 0;
@@ -155,3 +155,31 @@ function postwith (to,p) {
   myForm.submit() ;
   document.body.removeChild(myForm) ;
 }
+
+
+function myDialog(loadForm, h,w){
+       if (h < 800) h = 'auto';
+       if (w < 800) w = w * 1.2;
+
+       $('<div/>').dialog({
+            modal: true,
+            open: function ()
+            {
+            if ($(this).is(':empty')) {
+                $(this).load(loadForm);
+                }
+            },
+            height: h,
+            width: w,
+        //    title:"JQuery Dialog"
+           dialogClass: "no-titlebar"
+        });
+}
+
+function myCloseDialog(){
+        //$(this).dialog('close')
+//$(this).closest('.ui-dialog-content').dialog('close');
+//      $(formName).dialog( "close" )
+     $('.ui-dialog-content').dialog('destroy');
+}
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ @@
     **************************************************************************************************************************
     */
     class DynamicObject extends Base_Object {
     	protected $properties = array();
@@ Expand Down @@