From 9a8fd0a9b4fdd1b38ca220107581ee83f4654dab Mon Sep 17 00:00:00 2001
From: Kyle <kyle@nocturnalnerd.xyz>
Date: Thu, 13 Jul 2023 08:55:50 -0400
Subject: [PATCH 1/4] Logout Button

---
 pagesection.php  | 1 +
 routes.php       | 1 +
 views/logout.php | 6 ++++++
 3 files changed, 8 insertions(+)
 create mode 100644 views/logout.php

diff --git a/pagesection.php b/pagesection.php
index 131fd0f..23038bf 100644
--- a/pagesection.php
+++ b/pagesection.php
@@ -39,6 +39,7 @@ public function __construct($template) {
 			$this->data->menu_items['/tools'] = 'Tools';
 		}
 		$this->data->menu_items['/help'] = 'Help';
+		$this->data->menu_items['/logout'] = 'logout';
 		$this->data->relative_request_url = $relative_request_url;
 		$this->data->active_user = $active_user;
 		$this->data->web_config = $config['web'];
diff --git a/routes.php b/routes.php
index da75557..b465dab 100644
--- a/routes.php
+++ b/routes.php
@@ -45,6 +45,7 @@
 	'/users/{username}/pubkeys.{format}' => 'user_pubkeys',
 	'/users/{username}/pubkeys/{key}' => 'pubkey',
 	'/users/{username}/pubkeys/{key}.{format}' => 'pubkey',
+	'/logout' => 'logout'
 );
 
 $public_routes = array(
diff --git a/views/logout.php b/views/logout.php
new file mode 100644
index 0000000..0f39eb7
--- /dev/null
+++ b/views/logout.php
@@ -0,0 +1,6 @@
+<script>
+var currentURL = window.location.href;
+var domain = currentURL.replace(/^https?:\/\/(?:www\.)?([^:/?]+).*/, "$1");
+var redirectURL = "http://log:out@" + domain;
+window.location.href = redirectURL;
+</script>
\ No newline at end of file

From 2c76a1a291e2a20a69b5360d8ebaf5139bbbd7d2 Mon Sep 17 00:00:00 2001
From: Kyle <kyle@nocturnalnerd.xyz>
Date: Thu, 13 Jul 2023 08:56:14 -0400
Subject: [PATCH 2/4] Stop LDAP managed servers from erroneous Syncing

---
 scripts/sync.php     | 5 ++++-
 templates/pubkey.php | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/sync.php b/scripts/sync.php
index 5efe71f..c188fe6 100755
--- a/scripts/sync.php
+++ b/scripts/sync.php
@@ -213,7 +213,10 @@ function sync_server($id, $only_username = null, $preview = false) {
 					if(count($keys) > 0) {
 						if($user->active) {
 							foreach($keys as $key) {
-								$keyfile .= $prefix.$key->export()."\n";
+								if (!$key->list_destination_rules()){
+								}else{
+									$keyfile .= $prefix.$key->export()."\n";
+								}
 							}
 						} else {
 							$keyfile .= "# Inactive account\n";
diff --git a/templates/pubkey.php b/templates/pubkey.php
index bed232d..6b879d6 100644
--- a/templates/pubkey.php
+++ b/templates/pubkey.php
@@ -35,7 +35,7 @@
 	}
 	?>
 </h1>
-<?php if($this->get('user_is_owner') || $this->get('admin')) { ?>
+<?php if($this->get('admin')) { ?>
 <ul class="nav nav-tabs">
 	<li><a href="#info" data-toggle="tab">Information</a></li>
 	<li><a href="#sig" data-toggle="tab">Key signing</a></li>

From 8270235a5d0415b54c5edfe1cd8b4a9fab13be6c Mon Sep 17 00:00:00 2001
From: kyle <kyle@nocturnalnerd.xyz>
Date: Tue, 18 Jul 2023 08:40:28 -0400
Subject: [PATCH 3/4] changed case on logout for consistency

---
 pagesection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pagesection.php b/pagesection.php
index 23038bf..5b7b7cf 100644
--- a/pagesection.php
+++ b/pagesection.php
@@ -39,7 +39,7 @@ public function __construct($template) {
 			$this->data->menu_items['/tools'] = 'Tools';
 		}
 		$this->data->menu_items['/help'] = 'Help';
-		$this->data->menu_items['/logout'] = 'logout';
+		$this->data->menu_items['/logout'] = 'Logout';
 		$this->data->relative_request_url = $relative_request_url;
 		$this->data->active_user = $active_user;
 		$this->data->web_config = $config['web'];

From 16cfab68057191f39dc8b747e3634423b8d801d3 Mon Sep 17 00:00:00 2001
From: Kyle Robinson <84939608+kylernocturnalnerd@users.noreply.github.com>
Date: Wed, 16 Aug 2023 10:50:55 -0400
Subject: [PATCH 4/4] Update serveraccount.php to resolve null issue

If the value doesn't exist it fails all syncing
---
 model/serveraccount.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/model/serveraccount.php b/model/serveraccount.php
index afd3b8f..0869e9e 100644
--- a/model/serveraccount.php
+++ b/model/serveraccount.php
@@ -51,9 +51,11 @@ public function &__get($field) {
 	public function update() {
 		global $config;
 		// Make it impossible to set default accounts to inactive
-		if(is_array($config['defaults']['account_groups'])) {
-			if(array_key_exists($this->data['name'], $config['defaults']['account_groups'])) {
-				$this->data['active'] = true;
+		if(isset($config['defaults']['account_groups'])){ # Fix null issue
+			if(is_array($config['defaults']['account_groups'])) {
+				if(array_key_exists($this->data['name'], $config['defaults']['account_groups'])) {
+					$this->data['active'] = true;
+				}
 			}
 		}
 		$changes = parent::update();