1 files changed, 12 insertions, 26 deletions

diff --git a/src/web/_views/header.php b/src/web/_views/header.php
index 7315afb..4ba15ed 100644
--- a/src/web/_views/header.php
+++ b/src/web/_views/header.php
@@ -1,7 +1,6 @@
 <?php /* Copyright (c) 2024 Freya Murphy */ ?>
 <?php /* vim: syntax=php */ ?>
 <?php
-	$self = $this->main->user();
 	$this->view('head', $data);
 ?>
 		<header id="header">
@@ -11,41 +10,29 @@
 			<div class="center" :class="{hidden: !visible}">
 				<a
 					id="action-home"
-					class="btn <?=$this->main->info['app'] == 'home' ? 'btn-primary btn-border' : ''?>"
+					class="btn <?=ROUTER->req['app'] == 'home' ? 'btn-primary btn-border' : ''?>"
 					href="/home"
-					title="<?=ucfirst(lang('action_home_tip'))?>"
-				>
+					title="<?=ucfirst(lang('action_home_tip'))?>">
 					<i class="mi mi-lg">home</i>
 					<span><?=ucfirst(lang('action_home_text'))?></span>
 				</a>
 				<a
 					id="action-people"
-					class="btn <?=$this->main->info['app'] == 'people' ? 'btn-primary btn-border' : ''?>"
+					class="btn <?=ROUTER->req['app'] == 'people' ? 'btn-primary btn-border' : ''?>"
 					href="/people"
-					title="<?=ucfirst(lang('action_people_tip'))?>"
-				>
+					title="<?=ucfirst(lang('action_people_tip'))?>">
 					<i class="mi mi-lg">people</i>
 					<span><?=ucfirst(lang('action_people_text'))?></span>
 				</a>
-				<!--a
-					id="action-chat"
-					class="btn <?=$this->main->info['app'] == 'chat' ? 'btn-primary btn-border' : ''?>"
-					href="/chat"
-					title="<?=lang('action_chat_tip')?>"
-				>
-					<i class="mi mi-lg">chat</i>
-					<span><?=lang('action_chat_text')?></span>
-				</a-->
 			</div>
 			<div class="right">
 				<button
 					id="action-hamburger"
 					title="<?=ucfirst(lang('action_hamburger_tip'))?>"
-					class="btn mr"
-				>
+					class="btn mr">
 					<i class="mi mi-lg">menu</i>
 				</button>
-			<?php if($self): ?>
+			<?php if($session): ?>
 				<script>
 					var userMenu = null;
 
@@ -53,13 +40,13 @@
 						userMenu.toggleClass('hidden');
 					}
 				</script>
-				<?=pfp($self, FALSE, 'toggleUserMenu()')?>
+				<?=pfp($session, FALSE, 'toggleUserMenu()')?>
 				<div class="card col hidden" id="user-menu">
 					<span class="user-menu-header row mr">
-						<?=pfp($self, FALSE)?>
+						<?=pfp($session, FALSE)?>
 						<span class="col">
-							<strong><?=$this->format_model->name($self)?></strong>
-							<span class="subtext"><?=$self['username']?></span>
+							<strong><?=$this->format_name($session)?></strong>
+							<span class="subtext"><?=$session['username']?></span>
 						</span>
 					</span>
 					<hr>
@@ -67,13 +54,12 @@
 						'action_profile',
 						id: 'action-profile',
 						class: 'btn',
-						href: '/profile?id=' . $self['id']
+						href: '/profile?id=' . $session['id']
 					)?>
 					<?=ilang(
 						'action_xssbook_about',
 						id: 'action-xssbook-about',
 						class: 'btn',
-						click: 'viewAbout'
 					)?>
 					<?=ilang(
 						'action_settings',
@@ -94,7 +80,7 @@
 			</div>
 			<script>
 				$('#action-xssbook-about').on('click', function() {
-					$.get( "/modal/about", function (data) {
+					$.get( "/_modal/about", function (data) {
 						$(document.body).append(data);
 					});
 				})