From 0516f63c43ca34fe34718c070e39225ce7b19abf Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Wed, 27 Mar 2019 13:21:25 -0600
Subject: [PATCH] Default Theme updates. Enable URLs on top-level items (where
 defined) on Side menu. Code cleanup.

---
 themes/default/css.php               |   3 +-
 themes/default/images/logo_login.png | Bin 0 -> 21985 bytes
 themes/default/template.php          | 761 ++++++++++++++-------------
 3 files changed, 382 insertions(+), 382 deletions(-)
 create mode 100644 themes/default/images/logo_login.png

diff --git a/themes/default/css.php b/themes/default/css.php
index 30b647de20..898ecbb3f8 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -829,8 +829,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		}
 
 	#login_logo {
-		width: 250px;
-		height: auto;
+		text-decoration: none;
 		}
 
 	a.login_link {
diff --git a/themes/default/images/logo_login.png b/themes/default/images/logo_login.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dcd520efa187e33fbeb2a2a85250d013b9e5cc5
GIT binary patch
literal 21985
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
JPDHLkV1hHOkih@|

literal 0
HcmV?d00001

diff --git a/themes/default/template.php b/themes/default/template.php
index 24d6530e15..3ebd56548c 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -21,19 +21,19 @@
 	if (strlen(PROJECT_PATH) > 0) {
 		$php_self_dir = substr($php_self_dir, strlen(PROJECT_PATH), strlen($php_self_dir));
 	}
-?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1">
 
-<link rel="stylesheet" type="text/css" href="<!--{project_path}-->/resources/bootstrap/css/bootstrap.min.css">
-<link rel="stylesheet" type="text/css" href="<!--{project_path}-->/resources/bootstrap/css/bootstrap-datetimepicker.min.css" />
-<link rel="stylesheet" type="text/css" href="<!--{project_path}-->/resources/bootstrap/css/bootstrap-colorpicker.min.css">
-<link rel="stylesheet" type="text/css" href="<!--{project_path}-->/themes/<?php echo escape($_SESSION['domain']['template']['name']); ?>/css.php<?php echo ($default_login) ? '?login=default' : null; ?>">
-<?php
+echo "<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n";
+echo "<head>\n";
+echo "<meta charset='utf-8'>\n";
+echo "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>\n";
+echo "<meta http-equiv='X-UA-Compatible' content='IE=edge'>\n";
+echo "<meta name='viewport' content='width=device-width, initial-scale=1'>\n";
+
+echo "<link rel='stylesheet' type='text/css' href='<!--{project_path}-->/resources/bootstrap/css/bootstrap.min.css'>\n";
+echo "<link rel='stylesheet' type='text/css' href='<!--{project_path}-->/resources/bootstrap/css/bootstrap-datetimepicker.min.css'>\n";
+echo "<link rel='stylesheet' type='text/css' href='<!--{project_path}-->/resources/bootstrap/css/bootstrap-colorpicker.min.css'>\n";
+echo "<link rel='stylesheet' type='text/css' href='<!--{project_path}-->/themes/".escape($_SESSION['domain']['template']['name'])."/css.php".($default_login ? '?login=default' : null)."'>\n";
+
 //load custom css
 	if ($_SESSION['theme']['custom_css']['text'] != '') {
 		echo "<link rel='stylesheet' type='text/css' href='".escape($_SESSION['theme']['custom_css']['text'])."'>\n\n";
@@ -42,18 +42,17 @@
 //set fav icon
 	$favicon = (isset($_SESSION['theme']['favicon']['text'])) ? escape($_SESSION['theme']['favicon']['text']) : '<!--{project_path}-->/themes/default/favicon.ico';
 	echo "<link rel='icon' href='".$favicon."'>\n";
-?>
 
-<title><!--{title}--></title>
+echo "<title><!--{title}--></title>\n";
+
+echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/jquery/jquery-1.11.1.js'></script>\n";
+echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/jquery/jquery.autosize.input.js'></script>\n";
+echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/momentjs/moment.js'></script>\n";
+echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/bootstrap/js/bootstrap.min.js'></script>\n";
+echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/bootstrap/js/bootstrap-datetimepicker.min.js'></script>\n";
+echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/bootstrap/js/bootstrap-colorpicker.js'></script>\n";
+echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/bootstrap/js/bootstrap-pwstrength.min.js'></script>\n";
 
-<script language="JavaScript" type="text/javascript" src="<!--{project_path}-->/resources/jquery/jquery-1.11.1.js"></script>
-<script language="JavaScript" type="text/javascript" src="<!--{project_path}-->/resources/jquery/jquery.autosize.input.js"></script>
-<script language="JavaScript" type="text/javascript" src="<!--{project_path}-->/resources/momentjs/moment.js"></script>
-<script language="JavaScript" type="text/javascript" src="<!--{project_path}-->/resources/bootstrap/js/bootstrap.min.js"></script>
-<script language="JavaScript" type="text/javascript" src="<!--{project_path}-->/resources/bootstrap/js/bootstrap-datetimepicker.min.js"></script>
-<script language="JavaScript" type="text/javascript" src="<!--{project_path}-->/resources/bootstrap/js/bootstrap-colorpicker.js"></script>
-<script language="JavaScript" type="text/javascript" src="<!--{project_path}-->/resources/bootstrap/js/bootstrap-pwstrength.min.js"></script>
-<?php
 //web font loader
 	if ($_SESSION['theme']['font_loader']['text'] == 'true') {
 		if ($_SESSION['theme']['font_retrieval']['text'] != 'asynchronous') {
@@ -63,6 +62,7 @@
 		echo "<script language='JavaScript' type='text/javascript' src='<!--{project_path}-->/resources/fonts/web_font_loader.php?v=".escape($font_loader_version)."'></script>\n";
 	}
 ?>
+
 <script language="JavaScript" type="text/javascript">
 
 	//display message bar via js
@@ -350,83 +350,79 @@
 
 </script>
 
-<!--{head}-->
-
-</head>
-
 <?php
+
+echo "<!--{head}-->\n";
+echo "</head>\n";
+
 //add multilingual support
 	$language = new text;
 	$text = $language->get(null,'themes/default');
-?>
 
-<body onload="<?php echo $onload;?>">
+echo "<body onload=\"".$onload."\">\n";
 
-	<div id='message_container'></div>
+echo "	<div id='message_container'></div>\n";
 
-	<?php
-	//logged in show the domains block
+//logged in, show the domains block
 	if (strlen($_SESSION["username"]) > 0 && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
-		?>
-		<div id="domains_container">
-			<input type="hidden" id="domains_visible" value="0">
-			<div id="domains_block">
-				<div id="domains_header">
-					<input id="domains_hide" type="button" class="btn" style="float: right" value="<?php echo $text['theme-button-close']; ?>">
-					<?php
-					if (file_exists($_SERVER["DOCUMENT_ROOT"]."/app/domains/domains.php")) {
-						$href = '/app/domains/domains.php';
-					}
-					else {
-						$href = '/core/domain_settings/domains.php';
-					}
-					echo "<a href=\"".$href."\"><b style=\"color: #000;\">".$text['theme-title-domains']."</b></a> (".sizeof($_SESSION['domains']).")";
-					?>
-					<br><br>
-					<input type="text" id="domain_filter" class="formfld" style="margin-left: 0; min-width: 100%; width: 100%;" placeholder="<?php echo $text['theme-label-search']; ?>" onkeyup="domain_search(this.value);">
-				</div>
-				<div id="domains_list">
-					<?php
-					$bgcolor1 = "#eaedf2";
-					$bgcolor2 = "#fff";
-					foreach($_SESSION['domains'] as $domain) {
-						$bgcolor = ($bgcolor == $bgcolor1) ? $bgcolor2 : $bgcolor1;
-						$bgcolor = ($domain['domain_uuid'] == $_SESSION['domain_uuid']) ? "#eeffee" : $bgcolor;
-						echo "<div id=\"".escape($domain['domain_name'])."\" class='domains_list_item' style='background-color: ".$bgcolor."' onclick=\"document.location.href='".PROJECT_PATH."/core/domain_settings/domains.php?domain_uuid=".escape($domain['domain_uuid'])."&domain_change=true';\">";
-						echo "<a href='".PROJECT_PATH."/core/domain_settings/domains.php?domain_uuid=".escape($domain['domain_uuid'])."&domain_change=true' ".(($domain['domain_uuid'] == $_SESSION['domain_uuid']) ? "style='font-weight: bold;'" : null).">".escape($domain['domain_name'])."</a>\n";
-						if ($domain['domain_description'] != '') {
-							echo "<span class=\"domain_list_item_description\"> - ".escape($domain['domain_description'])."</span>\n";
-						}
-						echo "</div>\n";
-						$ary_domain_names[] = escape($domain['domain_name']);
-						$ary_domain_descs[] = str_replace('"','\"',escape($domain['domain_description']));
-					}
-					?>
-				</div>
 
-				<script>
-					var domain_names = new Array("<?php echo implode('","', $ary_domain_names)?>");
-					var domain_descs = new Array("<?php echo implode('","', $ary_domain_descs)?>");
+		echo "<div id='domains_container'>\n";
+		echo "	<input type='hidden' id='domains_visible' value='0'>\n";
+		echo "	<div id='domains_block'>\n";
+		echo "		<div id='domains_header'>\n";
+		echo "			<input id='domains_hide' type='button' class='btn' style='float: right' value=\"".$text['theme-button-close']."\">\n";
 
-					function domain_search(criteria) {
-						for (var x = 0; x < domain_names.length; x++) {
-							if (domain_names[x].toLowerCase().match(criteria.toLowerCase()) || domain_descs[x].toLowerCase().match(criteria.toLowerCase())) {
-								document.getElementById(domain_names[x]).style.display = '';
-							}
-							else {
-								document.getElementById(domain_names[x]).style.display = 'none';
-							}
-						}
-					}
-				</script>
+		if (file_exists($_SERVER["DOCUMENT_ROOT"]."/app/domains/domains.php")) {
+			$href = '/app/domains/domains.php';
+		}
+		else {
+			$href = '/core/domain_settings/domains.php';
+		}
+		echo "<a href=\"".$href."\"><b style=\"color: #000;\">".$text['theme-title-domains']."</b></a> (".sizeof($_SESSION['domains']).")";
+
+		echo "			<br><br>\n";
+		echo "			<input type='text' id='domain_filter' class='formfld' style='margin-left: 0; min-width: 100%; width: 100%;' placeholder=\"".$text['theme-label-search']."\" onkeyup='domain_search(this.value)'>\n";
+		echo "		</div>\n";
+		echo "		<div id='domains_list'>\n";
+
+		$bgcolor1 = "#eaedf2";
+		$bgcolor2 = "#fff";
+		foreach($_SESSION['domains'] as $domain) {
+			$bgcolor = ($bgcolor == $bgcolor1) ? $bgcolor2 : $bgcolor1;
+			$bgcolor = ($domain['domain_uuid'] == $_SESSION['domain_uuid']) ? "#eeffee" : $bgcolor;
+			echo "<div id=\"".escape($domain['domain_name'])."\" class='domains_list_item' style='background-color: ".$bgcolor."' onclick=\"document.location.href='".PROJECT_PATH."/core/domain_settings/domains.php?domain_uuid=".escape($domain['domain_uuid'])."&domain_change=true';\">";
+			echo "<a href='".PROJECT_PATH."/core/domain_settings/domains.php?domain_uuid=".escape($domain['domain_uuid'])."&domain_change=true' ".(($domain['domain_uuid'] == $_SESSION['domain_uuid']) ? "style='font-weight: bold;'" : null).">".escape($domain['domain_name'])."</a>\n";
+			if ($domain['domain_description'] != '') {
+				echo "<span class=\"domain_list_item_description\"> - ".escape($domain['domain_description'])."</span>\n";
+			}
+			echo "</div>\n";
+			$ary_domain_names[] = escape($domain['domain_name']);
+			$ary_domain_descs[] = str_replace('"','\"',escape($domain['domain_description']));
+		}
+
+		echo "		</div>\n";
+
+		echo "		<script>\n";
+		echo "			var domain_names = new Array(\"".implode('","', $ary_domain_names)."\");\n";
+		echo "			var domain_descs = new Array(\"".implode('","', $ary_domain_descs)."\");\n";
+		echo "			function domain_search(criteria) {\n";
+		echo "				for (var x = 0; x < domain_names.length; x++) {\n";
+		echo "					if (domain_names[x].toLowerCase().match(criteria.toLowerCase()) || domain_descs[x].toLowerCase().match(criteria.toLowerCase())) {\n";
+		echo "						document.getElementById(domain_names[x]).style.display = '';\n";
+		echo "					}\n";
+		echo "					else {\n";
+		echo "						document.getElementById(domain_names[x]).style.display = 'none';\n";
+		echo "					}\n";
+		echo "				}\n";
+		echo "			}\n";
+		echo "		</script>\n";
+
+		echo "	</div>\n";
+		echo "</div>\n";
 
-			</div>
-		</div>
-		<?php
 	}
 
-
-	// qr code container for contacts
+// qr code container for contacts
 	echo "<div id='qr_code_container' style='display: none;' onclick='$(this).fadeOut(400);'>\n";
 	echo "	<table cellpadding='0' cellspacing='0' border='0' width='100%' height='100%'><tr><td align='center' valign='middle'>\n";
 	echo "		<span id='qr_code' onclick=\"$('#qr_code_container').fadeOut(400);\"></span>\n";
@@ -434,313 +430,318 @@
 	echo "</div>\n";
 
 
-	if (!$default_login) {
+if (!$default_login) {
 
-		//*************** BOOTSTRAP MENU ********************************
-		function show_menu($menu_array, $menu_style, $menu_position) {
-			global $text;
-
-			//determine menu behavior
-				switch ($menu_style) {
-					case 'inline':
-						$menu_type = 'default';
-						$menu_width = 'calc(100% - 20px)';
-						$menu_brand = false;
-						$menu_corners = null;
-						break;
-					case 'static':
-						$menu_type = 'static-top';
-						$menu_width = 'calc(100% - 40px)';
-						$menu_brand = true;
-						$menu_corners = "style='-webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;'";
-						break;
-					case 'fixed':
-					default:
-						$menu_position = ($menu_position != '') ? $menu_position : 'top';
-						$menu_type = 'fixed-'.$menu_position;
-						$menu_width = 'calc(90% - 20px)';
-						$menu_brand = true;
-						$menu_corners = null;
-				}
-			?>
-
-			<nav class="navbar navbar-inverse navbar-<?php echo $menu_type; ?>" <?php echo $menu_corners; ?>>
-				<div class="container-fluid" style='width: <?php echo $menu_width; ?>; padding: 0;'>
-					<div class="navbar-header">
-						<button type="button" class="navbar-toggle collapsed" <?php echo ($menu_style == 'fixed') ? "style='margin-right: -2%;'" : null; ?> data-toggle="collapse" data-target="#main_navbar" aria-expanded="false" aria-controls="navbar">
-							<span class="sr-only">Toggle navigation</span>
-							<span class="icon-bar" style='margin-top: 1px;'></span>
-							<span class="icon-bar"></span>
-							<span class="icon-bar"></span>
-						</button>
-						<?php
-						if ($menu_brand) {
-							//define menu brand link
-								if (strlen(PROJECT_PATH) > 0) {
-									$menu_brand_link = PROJECT_PATH;
-								}
-								else if (!$default_login) {
-									$menu_brand_link = '/';
-								}
-							//define menu brand mark
-								$menu_brand_text = ($_SESSION['theme']['menu_brand_text']['text'] != '') ? escape($_SESSION['theme']['menu_brand_text']['text']) : "FusionPBX";
-								if ($_SESSION['theme']['menu_brand_type']['text'] == 'image' || $_SESSION['theme']['menu_brand_type']['text'] == '') {
-									$menu_brand_image = ($_SESSION['theme']['menu_brand_image']['text'] != '') ? escape($_SESSION['theme']['menu_brand_image']['text']) : PROJECT_PATH."/themes/default/images/logo.png";
-									echo "<a href='".$menu_brand_link."'>";
-									echo "<img id='menu_brand_image' class='navbar-logo' ".(($menu_style == 'fixed') ? "style='margin-right: -2%;'" : null)." src='".$menu_brand_image."' title=\"".escape($menu_brand_text)."\">";
-									if ($_SESSION['theme']['menu_brand_image_hover']['text'] != '') {
-										echo "<img id='menu_brand_image_hover' class='navbar-logo' style='display: none;' src='".$_SESSION['theme']['menu_brand_image_hover']['text']."' title=\"".escape($menu_brand_text)."\">";
-									}
-									echo "</a>";
-								}
-								else if ($_SESSION['theme']['menu_brand_type']['text'] == 'text') {
-									echo "<div class='pull-left'><a class='navbar-brand' href=\"".$menu_brand_link."\">".$menu_brand_text."</a></div>\n";
-								}
-						}
-						//domain name/selector (xs)
-							if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
-								echo "<span class='pull-right visible-xs'><a href='#' class='domain_selector_domain' title='".escape($text['theme-label-open_selector'])."'>".escape($_SESSION['domain_name'])."</a></span>\n";
-							}
-						?>
-					</div>
-					<div class="collapse navbar-collapse" id="main_navbar">
-						<ul class="nav navbar-nav">
-							<?php
-							foreach ($menu_array as $index_main => $menu_parent) {
-								$mod_li = "";
-								$mod_a_1 = "";
-								$submenu = false;
-								if (is_array($menu_parent['menu_items']) && sizeof($menu_parent['menu_items']) > 0) {
-									$mod_li = "class='dropdown' ";
-									$mod_a_1 = "class='dropdown-toggle text-left' data-toggle='dropdown' ";
-									$submenu = true;
-								}
-								$mod_a_2 = ($menu_parent['menu_item_link'] != '' && !$submenu) ? $menu_parent['menu_item_link'] : '#';
-								$mod_a_3 = ($menu_parent['menu_item_category'] == 'external') ? "target='_blank' " : null;
-								if ($_SESSION['theme']['menu_main_icons']['boolean'] != 'false') {
-									if ($menu_parent['menu_item_icon'] != '' && substr_count($menu_parent['menu_item_icon'], 'glyphicon-') > 0) {
-										$menu_main_icon = "<span class='glyphicon ".$menu_parent['menu_item_icon']."' title=\"".escape($menu_parent['menu_language_title'])."\"></span>";
-									}
-									else {
-										$menu_main_icon = null;
-									}
-									$menu_main_item = "<span class='hidden-sm' style='margin-left: 5px;'>".$menu_parent['menu_language_title']."</span>";
-								}
-								else {
-									$menu_main_item = $menu_parent['menu_language_title'];
-								}
-								echo "<li ".$mod_li.">\n";
-								echo "<a ".$mod_a_1." href='".$mod_a_2."' ".$mod_a_3.">".$menu_main_icon.$menu_main_item."</a>\n";
-								if ($submenu) {
-									echo "<ul class='dropdown-menu'>\n";
-									foreach ($menu_parent['menu_items'] as $index_sub => $menu_sub) {
-										$mod_a_2 = $menu_sub['menu_item_link'];
-										if ($mod_a_2 == '') {
-											$mod_a_2 = '#';
-										}
-										else if (($menu_sub['menu_item_category'] == 'internal') || (($menu_sub['menu_item_category'] == 'external') && substr($mod_a_2,0,1) == '/')) {
-											// accomodate adminer auto-login, if enabled
-												if (substr($mod_a_2,0,22) == '/app/adminer/index.php') {
-													global $db_type;
-													$mod_a_2 .= '?'.(($db_type == 'mysql') ? 'server' : $db_type).'&db=fusionpbx&ns=public';
-													$mod_a_2 .= ($_SESSION['adminer']['auto_login']['boolean'] == 'true') ? "&username=auto" : null;
-												}
-											$mod_a_2 = PROJECT_PATH.$mod_a_2;
-										}
-										$mod_a_3 = ($menu_sub['menu_item_category'] == 'external') ? "target='_blank' " : null;
-										if ($_SESSION['theme']['menu_sub_icons']['boolean'] != 'false') {
-											if ($menu_sub['menu_item_icon'] != '' && substr_count($menu_sub['menu_item_icon'], 'glyphicon-') > 0) {
-												$menu_sub_icon = "<span class='glyphicon ".escape($menu_sub['menu_item_icon'])."'></span>";
-											}
-											else {
-												$menu_sub_icon = null;
-											}
-										}
-										echo "<li><a href='".$mod_a_2."' ".$mod_a_3.">".(($_SESSION['theme']['menu_sub_icons']) ? "<span class='glyphicon glyphicon-minus visible-xs pull-left' style='margin: 4px 10px 0 25px;'></span>" : null).escape($menu_sub['menu_language_title']).$menu_sub_icon."</a></li>\n";
-									}
-									echo "</ul>\n";
-								}
-								echo "</li>\n";
-							}
-							?>
-						</ul>
-						<?php
-						echo "<span class='pull-right hidden-xs' style='white-space: nowrap;'>";
-						//domain name/selector (sm+)
-							if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1 && $_SESSION['theme']['domain_visible']['text'] == 'true') {
-								echo "<a href='#' class='domain_selector_domain' title='".$text['theme-label-open_selector']."'>".escape($_SESSION['domain_name'])."</a>";
-							}
-						//logout icon
-							if ($_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
-								$username_full = $_SESSION['username'].((count($_SESSION['domains']) > 1) ? "@".$_SESSION["user_context"] : null);
-								echo "<a href='".PROJECT_PATH."/logout.php' class='logout_icon' title=\"".$text['theme-label-logout']."\" onclick=\"return confirm('".$text['theme-confirm-logout']."')\"><span class='glyphicon glyphicon-log-out'></span></a>";
-								unset($username_full);
-							}
-						echo "</span>";
-						?>
-					</div>
-				</div>
-			</nav>
-
-			<?php
-		}
-
-
-		//determine menu configuration
-			$menu = new menu;
-			$menu->db = $db;
-			$menu->menu_uuid = $_SESSION['domain']['menu']['uuid'];
-			$menu_array = $menu->menu_array();
-			unset($menu);
-
-			$menu_style = ($_SESSION['theme']['menu_style']['text'] != '') ? $_SESSION['theme']['menu_style']['text'] : 'fixed';
-			$menu_position = ($_SESSION['theme']['menu_position']['text']) ? $_SESSION['theme']['menu_position']['text'] : 'top';
+	//top fixed, static or inline boostrap menu
+	function show_menu($menu_array, $menu_style, $menu_position) {
+		global $text;
 
+		//determine menu behavior
 			switch ($menu_style) {
 				case 'inline':
-					$logo_align = ($_SESSION['theme']['logo_align']['text'] != '') ? $_SESSION['theme']['logo_align']['text'] : 'left';
-					$logo_style = ($_SESSION['theme']['logo_style']['text'] != '') ? $_SESSION['theme']['logo_style']['text'] : '';
-					echo "<div class='container-fluid' style='padding: 0;' align='".$logo_align."'>\n";
-					if ($_SERVER['PHP_SELF'] != PROJECT_PATH."/core/install/install.php") {
-						$logo = ($_SESSION['theme']['logo']['text'] != '') ? $_SESSION['theme']['logo']['text'] : PROJECT_PATH."/themes/default/images/logo.png";
-						echo "<a href='".((PROJECT_PATH != '') ? PROJECT_PATH : '/')."'><img src='".$logo."' style='padding: 15px 20px;$logo_style'></a>";
-					}
-
-					show_menu($menu_array, $menu_style, $menu_position);
+					$menu_type = 'default';
+					$menu_width = 'calc(100% - 20px)';
+					$menu_brand = false;
+					$menu_corners = null;
 					break;
 				case 'static':
-					echo "<div class='container-fluid' style='padding: 0;' align='center'>\n";
-					show_menu($menu_array, $menu_style, $menu_position);
+					$menu_type = 'static-top';
+					$menu_width = 'calc(100% - 40px)';
+					$menu_brand = true;
+					$menu_corners = "style='-webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;'";
 					break;
 				case 'fixed':
-					show_menu($menu_array, $menu_style, $menu_position);
-					echo "<div class='container-fluid' style='padding: 0;' align='center'>\n";
-					break;
-				case 'side':
-					echo "<div id='menu_side_container'>\n";
-					//menu brand image and/or text
-						if ($_SESSION['theme']['menu_brand_type']['text'] == 'none') {
-							echo "<div style='height: 75px;'>\n";
-							echo "<a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='display: none;'><i class='glyphicon glyphicon-menu-hamburger' style='z-index: 99800; padding-right: 8px;'></i></a>";
-							echo "<a class='menu_side_item_main menu_side_expand' onclick='menu_side_expand();'><i class='glyphicon glyphicon-menu-hamburger' style='z-index: 99800; padding-right: 8px;'></i></a>";
-							echo "</div>\n";
-						}
-						else {
-							echo "<div id='menu_side_brand_container'>\n";
-							//menu toggle buttons
-								if ($_SESSION['theme']['menu_brand_type']['text'] != 'none') {
-									echo "<div style='float: right; margin-right: -20px; margin-top: -20px;'>\n";
-									echo "<a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='display: none;'><i class='glyphicon glyphicon-menu-hamburger'></i></a>";
-									echo "</div>\n";
-								}
-							//define the menu brand link
-								if (strlen(PROJECT_PATH) > 0) {
-									$menu_brand_link = PROJECT_PATH;
-								}
-								else if (!$default_login) {
-									$menu_brand_link = '/';
-								}
-							//show the menu brand image and/or text
-								$menu_brand_image_contracted =  $_SESSION['theme']['menu_side_brand_image_contracted']['text'] != '' ? $_SESSION['theme']['menu_side_brand_image_contracted']['text'] : PROJECT_PATH."/themes/default/images/logo_side_contracted.png";
-								$menu_brand_image_expanded =  $_SESSION['theme']['menu_side_brand_image_expanded']['text'] != '' ? $_SESSION['theme']['menu_side_brand_image_expanded']['text'] : PROJECT_PATH."/themes/default/images/logo_side_expanded.png";
-								$menu_brand_text = ($_SESSION['theme']['menu_brand_text']['text'] != '') ? escape($_SESSION['theme']['menu_brand_text']['text']) : "FusionPBX";
-								if ($_SESSION['theme']['menu_brand_type']['text'] == 'image' || $_SESSION['theme']['menu_brand_type']['text'] == '') {
-									echo "<a href='".$menu_brand_link."' style='text-decoration: none;'>";
-									echo "<img id='menu_brand_image_contracted' style='width: 20px; margin-left: -2px; margin-top: -5px;' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
-									echo "<img id='menu_brand_image_expanded' style='display: none;' src='".escape($menu_brand_image_expanded)."' title=\"".escape($menu_brand_text)."\">";
-									echo "</a>\n";
-								}
-								else if ($_SESSION['theme']['menu_brand_type']['text'] == 'image_text') {
-									echo "<a href='".$menu_brand_link."' style='text-decoration: none;'>";
-									echo "<img id='menu_brand_image_contracted' style='width: 20px; margin-left: -2px; margin-top: -5px;' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
-									echo "<span class='menu_brand_text' style='display: none;'>".$menu_brand_text."</span>";
-									echo "</a>\n";
-								}
-								else if ($_SESSION['theme']['menu_brand_type']['text'] == 'text') {
-									echo "<a class='menu_brand_text' style='display: none;' href=\"".$menu_brand_link."\">".$menu_brand_text."</a>\n";
-								}
-							echo "</div>\n";
-						}
-
-						//main menu items
-							if (is_array($menu_array) && sizeof($menu_array) != 0) {
-								foreach ($menu_array as $menu_index_main => $menu_item_main) {
-									echo "<a class='menu_side_item_main' onclick=\"menu_side_expand(); $('#sub_".$menu_item_main['menu_item_uuid']."').slideToggle(180, function() { if (!$(this).is(':hidden')) { $('.menu_side_sub').not($(this)).slideUp(180); } });\" title=\"".$menu_item_main['menu_language_title']."\">";
-									if ($menu_item_main['menu_item_icon'] != '') {
-										echo "<i class='glyphicon ".$menu_item_main['menu_item_icon']."' style='z-index: 99800; padding-right: 8px;'></i>";
-									}
-									echo "<span class='menu_side_item_title' style='display: none;'>".$menu_item_main['menu_language_title']."</span>";
-									echo "</a>\n";
-									//sub menu items
-										if (is_array($menu_item_main['menu_items']) && sizeof($menu_item_main['menu_items']) != 0) {
-											echo "<div id='sub_".$menu_item_main['menu_item_uuid']."' class='menu_side_sub' style='display: none;'>\n";
-											foreach ($menu_item_main['menu_items'] as $menu_index_sub => $menu_item_sub) {
-												echo "<a class='menu_side_item_sub' ".($menu_item_sub['menu_item_category'] == 'external' ? "target='_blank'" : null)." href='".$menu_item_sub['menu_item_link']."'>";
-												echo "<span class='menu_side_item_title' style='display: none;'>".$menu_item_sub['menu_language_title']."</span>";
-												echo "</a>\n";
-											}
-											echo "</div>\n";
-										}
-								}
-								echo "<div style='height: 100px;'></div>\n";
-							}
-					echo "</div>\n";
-					echo "<div id='content_container' style='padding: 0; width: calc(100% - ".(is_numeric($_SESSION['theme']['menu_side_width_contracted']['text']) ? $_SESSION['theme']['menu_side_width_contracted']['text'] : '55')."px); float: right; padding-top: 0px; text-align: center;'>\n";
-					echo "	<div id='content_header'>\n";
-					//header: left
-						echo "<div style='float: left;'>\n";
-						echo "</div>\n";
-					//header: right
-						echo "<span class='pull-right' style='white-space: nowrap;'>";
-						//current user
-							echo "<span style='display: inline-block; padding-right: 20px; font-size: 85%;'>\n";
-							echo "<strong>".$text['theme-label-user']."</strong>: ";
-							echo "<a href='".PROJECT_PATH."/core/users/user_edit.php?id=user'>".$_SESSION['username']."</a>";
-							echo "</span>\n";
-						//domain name/selector (sm+)
-							if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1 && $_SESSION['theme']['domain_visible']['text'] == 'true') {
-								echo "<span style='display: inline-block; padding-right: 10px; font-size: 85%;'>\n";
-								echo "<strong>".$text['theme-label-domain']."</strong>: ";
-								echo "<a id='header_domain_selector_domain' title='".$text['theme-label-open_selector']."'>".escape($_SESSION['domain_name'])."</a>";
-								echo "</span>\n";
-							}
-						//logout icon
-							if ($_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
-								echo "<a id='header_logout_icon' href='".PROJECT_PATH."/logout.php' title=\"".$text['theme-label-logout']."\" onclick=\"return confirm('".$text['theme-confirm-logout']."')\"><span class='glyphicon glyphicon-log-out'></span></a>";
-							}
-						echo "</span>";
-					echo "	</div>\n";
-					break;
+				default:
+					$menu_position = ($menu_position != '') ? $menu_position : 'top';
+					$menu_type = 'fixed-'.$menu_position;
+					$menu_width = 'calc(90% - 20px)';
+					$menu_brand = true;
+					$menu_corners = null;
 			}
-			?>
 
-			<div id='main_content'>
-				<!--{body}-->
-			</div>
-			<div id='footer'>
-				<span class='footer'><?php echo (isset($_SESSION['theme']['footer']['text'])) ? $_SESSION['theme']['footer']['text'] : "&copy; ".$text['theme-label-copyright']." 2008 - ".date("Y")." <a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a> ".$text['theme-label-all_rights_reserved']; ?></span>
-			</div>
-		</div>
+		//begin navbar code
+			echo "<nav class='navbar navbar-inverse navbar-".$menu_type."' ".$menu_corners.">\n";
+			echo "	<div class='container-fluid' style='width: ".$menu_width."; padding: 0;'>\n";
+			echo "		<div class='navbar-header'>\n";
+			echo "			<button type='button' class='navbar-toggle collapsed' ".($menu_style == 'fixed' ? "style='margin-right: -2%;'" : null)." data-toggle='collapse' data-target='#main_navbar' aria-expanded='false' aria-controls='navbar'>\n";
+			echo "				<span class='sr-only'>Toggle navigation</span>\n";
+			echo "				<span class='icon-bar' style='margin-top: 1px;'></span>\n";
+			echo "				<span class='icon-bar'></span>\n";
+			echo "				<span class='icon-bar'></span>\n";
+			echo "			</button>\n";
 
-		<?php
-		// note: div above matches $open_container
+			if ($menu_brand) {
+				//define menu brand link
+					if (strlen(PROJECT_PATH) > 0) {
+						$menu_brand_link = PROJECT_PATH;
+					}
+					else if (!$default_login) {
+						$menu_brand_link = '/';
+					}
+				//define menu brand mark
+					$menu_brand_text = ($_SESSION['theme']['menu_brand_text']['text'] != '') ? escape($_SESSION['theme']['menu_brand_text']['text']) : "FusionPBX";
+					if ($_SESSION['theme']['menu_brand_type']['text'] == 'image' || $_SESSION['theme']['menu_brand_type']['text'] == '') {
+						$menu_brand_image = ($_SESSION['theme']['menu_brand_image']['text'] != '') ? escape($_SESSION['theme']['menu_brand_image']['text']) : PROJECT_PATH."/themes/default/images/logo.png";
+						echo "<a href='".$menu_brand_link."'>";
+						echo "<img id='menu_brand_image' class='navbar-logo' ".(($menu_style == 'fixed') ? "style='margin-right: -2%;'" : null)." src='".$menu_brand_image."' title=\"".escape($menu_brand_text)."\">";
+						if ($_SESSION['theme']['menu_brand_image_hover']['text'] != '') {
+							echo "<img id='menu_brand_image_hover' class='navbar-logo' style='display: none;' src='".$_SESSION['theme']['menu_brand_image_hover']['text']."' title=\"".escape($menu_brand_text)."\">";
+						}
+						echo "</a>";
+					}
+					else if ($_SESSION['theme']['menu_brand_type']['text'] == 'text') {
+						echo "<div class='pull-left'><a class='navbar-brand' href=\"".$menu_brand_link."\">".$menu_brand_text."</a></div>\n";
+					}
+			}
+			//domain name/selector (xs)
+				if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
+					echo "<span class='pull-right visible-xs'><a href='#' class='domain_selector_domain' title='".escape($text['theme-label-open_selector'])."'>".escape($_SESSION['domain_name'])."</a></span>\n";
+				}
+
+			echo "		</div>\n";
+			echo "		<div class='collapse navbar-collapse' id='main_navbar'>\n";
+			echo "			<ul class='nav navbar-nav'>\n";
+
+			foreach ($menu_array as $index_main => $menu_parent) {
+				$mod_li = "";
+				$mod_a_1 = "";
+				$submenu = false;
+				if (is_array($menu_parent['menu_items']) && sizeof($menu_parent['menu_items']) > 0) {
+					$mod_li = "class='dropdown' ";
+					$mod_a_1 = "class='dropdown-toggle text-left' data-toggle='dropdown' ";
+					$submenu = true;
+				}
+				$mod_a_2 = ($menu_parent['menu_item_link'] != '' && !$submenu) ? $menu_parent['menu_item_link'] : '#';
+				$mod_a_3 = ($menu_parent['menu_item_category'] == 'external') ? "target='_blank' " : null;
+				if ($_SESSION['theme']['menu_main_icons']['boolean'] != 'false') {
+					if ($menu_parent['menu_item_icon'] != '' && substr_count($menu_parent['menu_item_icon'], 'glyphicon-') > 0) {
+						$menu_main_icon = "<span class='glyphicon ".$menu_parent['menu_item_icon']."' title=\"".escape($menu_parent['menu_language_title'])."\"></span>";
+					}
+					else {
+						$menu_main_icon = null;
+					}
+					$menu_main_item = "<span class='hidden-sm' style='margin-left: 5px;'>".$menu_parent['menu_language_title']."</span>";
+				}
+				else {
+					$menu_main_item = $menu_parent['menu_language_title'];
+				}
+				echo "			<li ".$mod_li.">\n";
+				echo "				<a ".$mod_a_1." href='".$mod_a_2."' ".$mod_a_3.">".$menu_main_icon.$menu_main_item."</a>\n";
+				if ($submenu) {
+					echo "			<ul class='dropdown-menu'>\n";
+					foreach ($menu_parent['menu_items'] as $index_sub => $menu_sub) {
+						$mod_a_2 = $menu_sub['menu_item_link'];
+						if ($mod_a_2 == '') {
+							$mod_a_2 = '#';
+						}
+						else if (($menu_sub['menu_item_category'] == 'internal') || (($menu_sub['menu_item_category'] == 'external') && substr($mod_a_2,0,1) == '/')) {
+							// accomodate adminer auto-login, if enabled
+								if (substr($mod_a_2,0,22) == '/app/adminer/index.php') {
+									global $db_type;
+									$mod_a_2 .= '?'.(($db_type == 'mysql') ? 'server' : $db_type).'&db=fusionpbx&ns=public';
+									$mod_a_2 .= ($_SESSION['adminer']['auto_login']['boolean'] == 'true') ? "&username=auto" : null;
+								}
+							$mod_a_2 = PROJECT_PATH.$mod_a_2;
+						}
+						$mod_a_3 = ($menu_sub['menu_item_category'] == 'external') ? "target='_blank' " : null;
+						if ($_SESSION['theme']['menu_sub_icons']['boolean'] != 'false') {
+							if ($menu_sub['menu_item_icon'] != '' && substr_count($menu_sub['menu_item_icon'], 'glyphicon-') > 0) {
+								$menu_sub_icon = "<span class='glyphicon ".escape($menu_sub['menu_item_icon'])."'></span>";
+							}
+							else {
+								$menu_sub_icon = null;
+							}
+						}
+						echo "			<li><a href='".$mod_a_2."' ".$mod_a_3.">".(($_SESSION['theme']['menu_sub_icons']) ? "<span class='glyphicon glyphicon-minus visible-xs pull-left' style='margin: 4px 10px 0 25px;'></span>" : null).escape($menu_sub['menu_language_title']).$menu_sub_icon."</a></li>\n";
+					}
+					echo "			</ul>\n";
+				}
+				echo "			</li>\n";
+			}
+
+			echo "			</ul>\n";
+			echo "			<span class='pull-right hidden-xs' style='white-space: nowrap;'>\n";
+			//domain name/selector (sm+)
+				if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1 && $_SESSION['theme']['domain_visible']['text'] == 'true') {
+					echo "		<a href='#' class='domain_selector_domain' title='".$text['theme-label-open_selector']."'>".escape($_SESSION['domain_name'])."</a>";
+				}
+			//logout icon
+				if ($_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
+					$username_full = $_SESSION['username'].((count($_SESSION['domains']) > 1) ? "@".$_SESSION["user_context"] : null);
+					echo "		<a href='".PROJECT_PATH."/logout.php' class='logout_icon' title=\"".$text['theme-label-logout']."\" onclick=\"return confirm('".$text['theme-confirm-logout']."')\"><span class='glyphicon glyphicon-log-out'></span></a>";
+					unset($username_full);
+				}
+			echo "			</span>\n";
+
+			echo "		</div>\n";
+			echo "	</div>\n";
+			echo "</nav>\n";
 	}
 
-	// default login being used
+
+	//determine menu configuration
+		$menu = new menu;
+		$menu->db = $db;
+		$menu->menu_uuid = $_SESSION['domain']['menu']['uuid'];
+		$menu_array = $menu->menu_array();
+		unset($menu);
+
+		$menu_style = ($_SESSION['theme']['menu_style']['text'] != '') ? $_SESSION['theme']['menu_style']['text'] : 'fixed';
+		$menu_position = ($_SESSION['theme']['menu_position']['text']) ? $_SESSION['theme']['menu_position']['text'] : 'top';
+
+		switch ($menu_style) {
+			case 'inline':
+				$logo_align = ($_SESSION['theme']['logo_align']['text'] != '') ? $_SESSION['theme']['logo_align']['text'] : 'left';
+				$logo_style = ($_SESSION['theme']['logo_style']['text'] != '') ? $_SESSION['theme']['logo_style']['text'] : '';
+				echo "<div class='container-fluid' style='padding: 0;' align='".$logo_align."'>\n";
+				if ($_SERVER['PHP_SELF'] != PROJECT_PATH."/core/install/install.php") {
+					$logo = ($_SESSION['theme']['logo']['text'] != '') ? $_SESSION['theme']['logo']['text'] : PROJECT_PATH."/themes/default/images/logo.png";
+					echo "<a href='".((PROJECT_PATH != '') ? PROJECT_PATH : '/')."'><img src='".$logo."' style='padding: 15px 20px;$logo_style'></a>";
+				}
+
+				show_menu($menu_array, $menu_style, $menu_position);
+				break;
+			case 'static':
+				echo "<div class='container-fluid' style='padding: 0;' align='center'>\n";
+				show_menu($menu_array, $menu_style, $menu_position);
+				break;
+			case 'fixed':
+				show_menu($menu_array, $menu_style, $menu_position);
+				echo "<div class='container-fluid' style='padding: 0;' align='center'>\n";
+				break;
+			case 'side':
+				echo "<div id='menu_side_container'>\n";
+				//menu brand image and/or text
+					if ($_SESSION['theme']['menu_brand_type']['text'] == 'none') {
+						echo "<div style='height: 75px;'>\n";
+						echo "<a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='display: none;'><i class='glyphicon glyphicon-menu-hamburger' style='z-index: 99800; padding-right: 8px;'></i></a>";
+						echo "<a class='menu_side_item_main menu_side_expand' onclick='menu_side_expand();'><i class='glyphicon glyphicon-menu-hamburger' style='z-index: 99800; padding-right: 8px;'></i></a>";
+						echo "</div>\n";
+					}
+					else {
+						echo "<div id='menu_side_brand_container'>\n";
+						//menu toggle buttons
+							if ($_SESSION['theme']['menu_brand_type']['text'] != 'none') {
+								echo "<div style='float: right; margin-right: -20px; margin-top: -20px;'>\n";
+								echo "<a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='display: none;'><i class='glyphicon glyphicon-menu-hamburger'></i></a>";
+								echo "</div>\n";
+							}
+						//define the menu brand link
+							if (strlen(PROJECT_PATH) > 0) {
+								$menu_brand_link = PROJECT_PATH;
+							}
+							else if (!$default_login) {
+								$menu_brand_link = '/';
+							}
+						//show the menu brand image and/or text
+							$menu_brand_image_contracted =  $_SESSION['theme']['menu_side_brand_image_contracted']['text'] != '' ? $_SESSION['theme']['menu_side_brand_image_contracted']['text'] : PROJECT_PATH."/themes/default/images/logo_side_contracted.png";
+							$menu_brand_image_expanded =  $_SESSION['theme']['menu_side_brand_image_expanded']['text'] != '' ? $_SESSION['theme']['menu_side_brand_image_expanded']['text'] : PROJECT_PATH."/themes/default/images/logo_side_expanded.png";
+							$menu_brand_text = ($_SESSION['theme']['menu_brand_text']['text'] != '') ? escape($_SESSION['theme']['menu_brand_text']['text']) : "FusionPBX";
+							if ($_SESSION['theme']['menu_brand_type']['text'] == 'image' || $_SESSION['theme']['menu_brand_type']['text'] == '') {
+								echo "<a href='".$menu_brand_link."' style='text-decoration: none;'>";
+								echo "<img id='menu_brand_image_contracted' style='width: 20px; margin-left: -2px; margin-top: -5px;' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
+								echo "<img id='menu_brand_image_expanded' style='display: none;' src='".escape($menu_brand_image_expanded)."' title=\"".escape($menu_brand_text)."\">";
+								echo "</a>\n";
+							}
+							else if ($_SESSION['theme']['menu_brand_type']['text'] == 'image_text') {
+								echo "<a href='".$menu_brand_link."' style='text-decoration: none;'>";
+								echo "<img id='menu_brand_image_contracted' style='width: 20px; margin-left: -2px; margin-top: -5px;' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
+								echo "<span class='menu_brand_text' style='display: none;'>".$menu_brand_text."</span>";
+								echo "</a>\n";
+							}
+							else if ($_SESSION['theme']['menu_brand_type']['text'] == 'text') {
+								echo "<a class='menu_brand_text' style='display: none;' href=\"".$menu_brand_link."\">".$menu_brand_text."</a>\n";
+							}
+						echo "</div>\n";
+					}
+
+					//main menu items
+						if (is_array($menu_array) && sizeof($menu_array) != 0) {
+							foreach ($menu_array as $menu_index_main => $menu_item_main) {
+								echo "<a class='menu_side_item_main' ".($menu_item_main['menu_item_link'] != '' ? "href='".$menu_item_main['menu_item_link']."'" : "onclick=\"menu_side_expand(); $('#sub_".$menu_item_main['menu_item_uuid']."').slideToggle(180, function() { if (!$(this).is(':hidden')) { $('.menu_side_sub').not($(this)).slideUp(180); } });\"")." title=\"".$menu_item_main['menu_language_title']."\">";
+								if ($menu_item_main['menu_item_icon'] != '') {
+									echo "<i class='glyphicon ".$menu_item_main['menu_item_icon']."' style='z-index: 99800; padding-right: 8px;'></i>";
+								}
+								echo "<span class='menu_side_item_title' style='display: none;'>".$menu_item_main['menu_language_title']."</span>";
+								echo "</a>\n";
+								//sub menu items
+									if (is_array($menu_item_main['menu_items']) && sizeof($menu_item_main['menu_items']) != 0) {
+										echo "<div id='sub_".$menu_item_main['menu_item_uuid']."' class='menu_side_sub' style='display: none;'>\n";
+										foreach ($menu_item_main['menu_items'] as $menu_index_sub => $menu_item_sub) {
+											echo "<a class='menu_side_item_sub' ".($menu_item_sub['menu_item_category'] == 'external' ? "target='_blank'" : null)." href='".$menu_item_sub['menu_item_link']."'>";
+											echo "<span class='menu_side_item_title' style='display: none;'>".$menu_item_sub['menu_language_title']."</span>";
+											echo "</a>\n";
+										}
+										echo "</div>\n";
+									}
+							}
+							echo "<div style='height: 100px;'></div>\n";
+						}
+				echo "</div>\n";
+				echo "<div id='content_container' style='padding: 0; width: calc(100% - ".(is_numeric($_SESSION['theme']['menu_side_width_contracted']['text']) ? $_SESSION['theme']['menu_side_width_contracted']['text'] : '55')."px); float: right; padding-top: 0px; text-align: center;'>\n";
+				echo "	<div id='content_header'>\n";
+				//header: left
+					echo "<div style='float: left;'>\n";
+					echo "</div>\n";
+				//header: right
+					echo "<span class='pull-right' style='white-space: nowrap;'>";
+					//current user
+						echo "<span style='display: inline-block; padding-right: 20px; font-size: 85%;'>\n";
+						echo "<strong>".$text['theme-label-user']."</strong>: ";
+						echo "<a href='".PROJECT_PATH."/core/users/user_edit.php?id=user'>".$_SESSION['username']."</a>";
+						echo "</span>\n";
+					//domain name/selector (sm+)
+						if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1 && $_SESSION['theme']['domain_visible']['text'] == 'true') {
+							echo "<span style='display: inline-block; padding-right: 10px; font-size: 85%;'>\n";
+							echo "<strong>".$text['theme-label-domain']."</strong>: ";
+							echo "<a id='header_domain_selector_domain' title='".$text['theme-label-open_selector']."'>".escape($_SESSION['domain_name'])."</a>";
+							echo "</span>\n";
+						}
+					//logout icon
+						if ($_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
+							echo "<a id='header_logout_icon' href='".PROJECT_PATH."/logout.php' title=\"".$text['theme-label-logout']."\" onclick=\"return confirm('".$text['theme-confirm-logout']."')\"><span class='glyphicon glyphicon-log-out'></span></a>";
+						}
+					echo "</span>";
+				echo "	</div>\n";
+				break;
+		}
+
+		echo "<div id='main_content'>\n";
+		echo "	<!--{body}-->\n";
+		echo "</div>\n";
+		echo "<div id='footer'>\n";
+		echo "	<span class='footer'>".($_SESSION['theme']['footer']['text'] != '' ? $_SESSION['theme']['footer']['text'] : "&copy; ".$text['theme-label-copyright']." 2008 - ".date("Y")." <a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a> ".$text['theme-label-all_rights_reserved'])."</span>\n";
+		echo "</div>\n";
+
+		echo "</div>\n"; //initial div from switch statement above
+
+}
+
+// default login being used
+else {
+
+	if ($_SESSION['theme']['logo_login']['text'] != '') {
+		$logo = $_SESSION['theme']['logo_login']['text'];
+	}
+	else if ($_SESSION['theme']['logo']['text'] != '') {
+		$logo = $_SESSION['theme']['logo']['text'];
+	}
 	else {
-		$logo = (isset($_SESSION['theme']['logo']['text'])) ? $_SESSION['theme']['logo']['text'] : PROJECT_PATH."/themes/default/images/logo.png";
-		?>
-		<div id='default_login'>
-			<a href='<?php echo PROJECT_PATH; ?>/'><img id='login_logo' src='<?php echo escape($logo); ?>'></a><br />
-			<!--{body}-->
-		</div>
-		<div id='footer_login'>
-			<span class='footer'><?php echo (isset($_SESSION['theme']['footer']['text'])) ? $_SESSION['theme']['footer']['text'] : "&copy; ".$text['theme-label-copyright']." 2008 - ".date("Y")." <a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a> ".$text['theme-label-all_rights_reserved']; ?></span>
-		</div>
-		<?php
-		unset($_SESSION['background_image']);
+		$logo = PROJECT_PATH."/themes/default/images/logo_login.png";
 	}
-	?>
 
-</body>
-</html>
+	echo "<div id='default_login'>\n";
+	echo "	<a href='".PROJECT_PATH."/'><img id='login_logo' src='".escape($logo)."'></a><br />\n";
+	echo "	<!--{body}-->\n";
+	echo "</div>\n";
+	echo "<div id='footer_login'>\n";
+	echo "	<span class='footer'>".($_SESSION['theme']['footer']['text'] != '' ? $_SESSION['theme']['footer']['text'] : "&copy; ".$text['theme-label-copyright']." 2008 - ".date("Y")." <a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a> ".$text['theme-label-all_rights_reserved'])."</span>\n";
+	echo "</div>\n";
+
+	unset($_SESSION['background_image']);
+
+}
+
+echo "</body>\n";
+echo "</html>\n";
+?>
\ No newline at end of file