Merge some of these changes

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();

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'];

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(

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";

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>

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>