Fixed GuildGUI in-game functon and minor bugs

Nyut0n · Nov 16, 2019 · f28e651 · f28e651
1 parent 444c854
commit f28e651
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/guildgui.php b/guildgui.php
@@ -94,6 +94,7 @@
 					$char['MemberCount'] = count($guild->get_members());
 				}
 			}
+			sort($mychars); // Rebuild array index
 
 			$content->assign('characters', $mychars)
 			->assign('has_chars', (bool)$mychars)

diff --git a/html/guildman.html b/html/guildman.html
@@ -41,8 +41,10 @@ <h3>{ui_208}</h3>
 	</div>
 	{ENDLOOP:characters}
 
+	{IFNOT:INGAME}
 	<br><br>
 	<button id="logout-button"><span class="ui-icon ui-icon-arrowreturnthick-1-s"></span> {ui_17}</button>
+	{ENDIFNOT:INGAME}
 
 </div>
 
@@ -197,7 +199,7 @@ <h3>{ui_208}</h3>
 		$("#guild-privcheck-dialog").dialog( {
 			modal: true, width: "auto", height: "auto",
 			buttons: { 
-				"{ui_221}": function() { $(this).dialog("close"); }
+				"{ui_18}": function() { $(this).dialog("close"); }
 			}
 		} );
 		$("#guild-privcheck-input").autocomplete( {
@@ -248,7 +250,7 @@ <h3>{ui_208}</h3>
 		var dialog = $("#guild-charter-dialog");
 		// Find char and guild info
 		for( var i = 0; i < MyCharacters.length; i++ ) {
-			if( MyCharacters[i].GuildID === this.dataset.guild ) break;
+			if( MyCharacters[i].GuildID == this.dataset.guild ) break;
 		}
 		var mychar = MyCharacters[i];
 		// Update dialog 

diff --git a/html/main_ingame.html b/html/main_ingame.html
@@ -4,10 +4,18 @@
 <meta charset="utf-8">
 <link rel="stylesheet" href="css/jquery-ui.min.css">
 <link rel="stylesheet" href="css/style.css">
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
+<link rel="stylesheet" href="css/tabulator.css">
+<script src="https://code.jquery.com/jquery-3.4.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
+<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js" integrity="sha256-VazP97ZCwtekAsvgPBSUwPFKdrwD3unUfSGVYrahUqU=" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js"></script>
+<script src="https://unpkg.com/tabulator-tables@4.4.1/dist/js/tabulator.min.js"></script>
 <script src="js/controller.js"></script>
+<style>
+	.content-page { 
+		padding-top: 20px !important;
+		min-width: 700px !important;
+	}
+</style>
 </head>
 <body>
 

diff --git a/includes/action.handler.php b/includes/action.handler.php
@@ -117,16 +117,14 @@
 		if( ! isSet($_GET['Token']) || strlen($_GET['Token']) !== 64 ) die($errormsg);
 
 		$token = $cdb->esc($_GET['Token']);
-
 		$details = $server->get_token_details($token) or die($errormsg);
 
-		$_SESSION['SteamAuth'] = array( 'steam_id' => $details['SteamID'] );
+		Livemap::set_steam_id($details['SteamID']);
 		$_SESSION['InGame'] = TRUE;
 		$_SESSION['CharID'] = intval($details['CharID']);
 
-		$redirect = "index.php?livemap_id=$livemap_id&s=guildman";
-		header("Location: $redirect");
-		die;
+		Livemap::$redirect = "index.php?livemap_id=$livemap_id&s=guildman";
+		Livemap::success_redirect();
 
 	break;
 

diff --git a/includes/guildgui.handler.php b/includes/guildgui.handler.php
@@ -38,7 +38,7 @@
 			if( ! isSet($_POST['charter'], $_POST['public']) ) Livemap::error_redirect();
 
 			// Process action in database
-			$code = $guild->update_charter($_POST['charter'], (bool)$_POST['public']));
+			$code = $guild->update_charter($_POST['charter'], (bool)$_POST['public']);
 			($code === 1) && Livemap::success_redirect(Livemap::get_ui_string(242));
 			Livemap::error_redirect(Livemap::get_ui_string(241+$code));