From a3ab81d53b603b349958541f82464c65b0800712 Mon Sep 17 00:00:00 2001
From: reliberate <git@reliberate.com>
Date: Sun, 27 Mar 2016 02:54:29 -0600
Subject: [PATCH 1/4] Command: Correct layout & styles.

---
 app/exec/exec.php           | 18 +++++++++---------
 themes/default/template.php |  7 ++++++-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/exec/exec.php b/app/exec/exec.php
index bb64398031..db2988c4ef 100644
--- a/app/exec/exec.php
+++ b/app/exec/exec.php
@@ -229,19 +229,19 @@ else {
 	echo "<form method='post' name='frm' id='frm' action='exec.php' style='margin: 0;' onsubmit='return submit_check();'>\n";
 	echo "<input type='hidden' name='id' value='".$_REQUEST['id']."'>\n"; //sql db id
 	echo "<textarea name='cmd' id='cmd' style='display: none;'></textarea>";
-	echo "<table cellpadding='0' cellspacing='0' border='0' width='100%'>\n";
+	echo "<table cellpadding='0' cellspacing='0' border='0' style='width: 100%;'>\n";
 	echo "	<tr>";
-	echo "		<td width='210' valign='top' nowrap>";
+	echo "		<td style='width: 210px;' valign='top' nowrap>";
 
 	echo "			<table cellpadding='0' cellspacing='0' border='0' width='100%' height='100%'>";
 	if (permission_exists('exec_switch') || permission_exists('exec_php') || permission_exists('exec_command') || permission_exists('exec_sql')) {
 		echo "			<tr>";
 		echo "				<td valign='top'>";
-		echo "					<table cellpadding='0' cellspacing='3' border='0'>\n";
-		if (permission_exists('exec_switch')) { echo "<tr><td valign='middle'><input type='radio' name='handler' id='handler_switch' value='switch' ".(($handler == 'switch') ? 'checked' : null)." onclick=\"set_handler('switch');\"></td><td valign='bottom' style='padding-top: 3px;'><label for='handler_switch'> ".$text['label-switch']."</label></td></tr>\n"; }
-		if (permission_exists('exec_php')) { echo "<tr><td valign='middle'><input type='radio' name='handler' id='handler_php' value='php' ".(($handler == 'php') ? 'checked' : null)." onclick=\"set_handler('php');\"></td><td valign='bottom' style='padding-top: 3px;'><label for='handler_php'> ".$text['label-php']."</label></td></tr>\n"; }
-		if (permission_exists('exec_command')) { echo "<tr><td valign='middle'><input type='radio' name='handler' id='handler_shell' value='shell' ".(($handler == 'shell') ? 'checked' : null)." onclick=\"set_handler('shell');\"></td><td valign='bottom' style='padding-top: 3px;'><label for='handler_shell'> ".$text['label-shell']."</label></td></tr>\n"; }
-		if (permission_exists('exec_sql')) { echo "<tr><td valign='middle'><input type='radio' name='handler' id='handler_sql' value='sql' ".(($handler == 'sql') ? 'checked' : null)." onclick=\"set_handler('sql');\"></td><td valign='bottom' style='padding-top: 3px;'><label for='handler_sql'> ".$text['label-sql']."</label></td></tr>\n"; }
+		echo "					<table cellpadding='0' cellspacing='0' border='0'>\n";
+		if (permission_exists('exec_switch')) { echo "<tr><td valign='middle'><input type='radio' name='handler' id='handler_switch' value='switch' ".(($handler == 'switch') ? 'checked' : null)." onclick=\"set_handler('switch');\"></td><td valign='middle' style='padding: 3px 0 0 3px;'><label for='handler_switch' style='padding-top: 3px;'> ".$text['label-switch']."</label></td></tr>\n"; }
+		if (permission_exists('exec_php')) { echo "<tr><td valign='middle'><input type='radio' name='handler' id='handler_php' value='php' ".(($handler == 'php') ? 'checked' : null)." onclick=\"set_handler('php');\"></td><td valign='middle' style='padding: 4px 0 0 3px;'><label for='handler_php'> ".$text['label-php']."</label></td></tr>\n"; }
+		if (permission_exists('exec_command')) { echo "<tr><td valign='middle'><input type='radio' name='handler' id='handler_shell' value='shell' ".(($handler == 'shell') ? 'checked' : null)." onclick=\"set_handler('shell');\"></td><td valign='middle' style='padding: 4px 0 0 3px;'><label for='handler_shell'> ".$text['label-shell']."</label></td></tr>\n"; }
+		if (permission_exists('exec_sql')) { echo "<tr><td valign='middle'><input type='radio' name='handler' id='handler_sql' value='sql' ".(($handler == 'sql') ? 'checked' : null)." onclick=\"set_handler('sql');\"></td><td valign='middle' style='padding: 4px 0 0 3px;'><label for='handler_sql'> ".$text['label-sql']."</label></td></tr>\n"; }
 		echo "					</table>\n";
 		echo "					<br />";
 		//sql controls
@@ -275,7 +275,7 @@ else {
 		}
 		echo "					<input type='button' class='btn' style='margin-top: 5px;' title=\"".$text['button-execute']." [Ctrl+Enter]\" value=\"    ".$text['button-execute']."    \" onclick=\"$('form#frm').submit();\">";
 		echo "					&nbsp;&nbsp;&nbsp;&nbsp;<a href='javascript:void(0)' onclick='reset_editor();'>".$text['label-reset']."</a>\n";
-		echo "					<br /><br /><br />";
+		echo "					<br /><br />";
 		echo "				</td>";
 		echo "			</tr>";
 	}
@@ -289,7 +289,7 @@ else {
 	echo "			</table>";
 
 	echo "		</td>";
-	echo "		<td width='100%' valign='top' style='height: 450px;'>"
+	echo "		<td valign='top' style='height: 450px;'>"
 	?>
 	<table cellpadding='0' cellspacing='0' border='0' style='width: 100%;'>
 		<tr>
diff --git a/themes/default/template.php b/themes/default/template.php
index c9c53618f3..2c662d0c9f 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -177,7 +177,7 @@
 		?>
 		background-repeat: no-repeat;
 		background-attachment: fixed;
-	}
+		}
 
 	div#footer {
 		background: <?php echo ($_SESSION['theme']['footer_background_color']['text'] != '') ? $_SESSION['theme']['footer_background_color']['text'] : 'rgba(0,0,0,0.2)'; ?>;
@@ -687,6 +687,11 @@
 		padding: 1px;
 		}
 
+	label {
+		font-weight: normal;
+		vertical-align: middle;
+		}
+
 /* TABLES *****************************************************************/
 
 	.vncell {

From 0899a8e5da26cb10bf210f530df1d80d50cbf212 Mon Sep 17 00:00:00 2001
From: reliberate <git@reliberate.com>
Date: Sun, 27 Mar 2016 03:00:05 -0600
Subject: [PATCH 2/4] Import Contacts: Fix layout issue.

---
 app/contacts/contact_import.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php
index 66517dd769..c7ffe35bf5 100644
--- a/app/contacts/contact_import.php
+++ b/app/contacts/contact_import.php
@@ -329,7 +329,7 @@ else {
 			echo "</td>\n";
 			echo "</tr>\n";
 			echo "<tr>\n";
-			echo "<td align=\"left\" colspan='2'>\n";
+			echo "<td align='left' colspan='2'>\n";
 			echo "	".$text['message-results']."<br /><br />\n";
 			echo "</td>\n";
 			echo "</tr>\n";
@@ -380,14 +380,14 @@ else {
 	echo "	</td>\n";
 	echo "	<td valign='top' width='70%' align='right'>\n";
 	echo "		<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='contacts.php?".$_GET["query_string"]."'\" value='".$text['button-back']."'>\n";
-	echo "		<input name=\"submit\" type=\"submit\" class=\"btn\" id=\"upload\" value=\"".$text['button-upload']."\">\n";
+	echo "		<input name='submit' type='submit' class='btn' id='upload' value=\"".$text['button-upload']."\">\n";
 	echo "	</td>\n";
 	echo "	</tr>\n";
 	echo "</table>";
 
 	echo "<br />\n";
 
-	echo "<form action=\"\" method=\"POST\" enctype=\"multipart/form-data\" name=\"frmUpload\" onSubmit=\"\">\n";
+	echo "<form action='' method='POST' enctype='multipart/form-data' name='frmUpload' onSubmit=''>\n";
 	echo "	<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
 
 	echo "<tr>\n";
@@ -423,21 +423,21 @@ else {
 	echo "			".$text['label-import_file_upload']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "			<input name=\"ulfile\" type=\"file\" class=\"formfld fileinput\" id=\"ulfile\">\n";
+	echo "			<input name='ulfile' type='file' class='formfld fileinput' id='ulfile'>\n";
 	echo "<br />\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "	<tr>\n";
-	echo "		<td valign=\"bottom\" class=\"label\">\n";
+	echo "		<td valign='bottom'>\n";
 	if (function_exists('curl_version') && $_SESSION['contact']['google_oauth_client_id']['text'] != '' && $_SESSION['contact']['google_oauth_client_secret']['text'] != '') {
 		echo "		<a href='contact_import_google.php'><img src='resources/images/icon_gcontacts.png' style='width: 21px; height: 21px; border: none; text-decoration: none; margin-right: 5px;' align='absmiddle'>".$text['header-contacts_import_google']."</a>\n";
 	}
 	echo "		</td>\n";
-	echo "		<td valign=\"bottom\" align='right' class=\"label\" nowrap>\n";
-	echo "			<input name=\"type\" type=\"hidden\" value=\"csv\">\n";
+	echo "		<td valign='bottom' align='right' nowrap>\n";
+	echo "			<input name='type' type='hidden' value='csv'>\n";
 	echo "			<br />\n";
-	echo "			<input name=\"submit\" type=\"submit\"  class=\"btn\" id=\"upload\" value=\"".$text['button-upload']."\">\n";
+	echo "			<input name='submit' type='submit' class='btn' id='upload' value=\"".$text['button-upload']."\">\n";
 	echo "		</td>\n";
 	echo "	</tr>\n";
 	echo "	</table>\n";

From 8b360459e159894733b47bd645462d8227b4ea92 Mon Sep 17 00:00:00 2001
From: reliberate <git@reliberate.com>
Date: Sun, 27 Mar 2016 03:09:50 -0600
Subject: [PATCH 3/4] Theme: Restore footer/copyright on Login page.

---
 themes/default/template.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/themes/default/template.php b/themes/default/template.php
index 2c662d0c9f..229a9cfcbe 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -1836,8 +1836,14 @@
 						</span>
 					</td>
 				</tr>
+				<tr>
+					<td style='width: 100%; height: 40px; vertical-align: bottom;'>
+						<div id='footer' style='width: 100%;'><span class='footer'>&copy; Copyright 2008 - <?php echo date("Y"); ?> <a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a>. All rights reserved.</span></div>
+					</td>
+				</tr>
 			</table>
 		</div>
+
 		<?php
 	}
 	?>

From 9acbe5a366ec5d2eec5929061a9fa1920e82ca0a Mon Sep 17 00:00:00 2001
From: reliberate <git@reliberate.com>
Date: Sun, 27 Mar 2016 03:22:42 -0600
Subject: [PATCH 4/4] Theme: Fix js confirmation on logout icon click (set
 language variable as global inside menu function).

---
 themes/default/template.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/themes/default/template.php b/themes/default/template.php
index 229a9cfcbe..11b3ddb0ae 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -1559,23 +1559,21 @@
 		</div>
 		<?php
 	}
-	?>
 
-	<?php
+
 	// qr code container for contacts
 	echo "<div id='qr_code_container' style='display: none;' onclick='$(this).fadeOut(400);'>";
 	echo "	<table cellpadding='0' cellspacing='0' border='0' width='100%' height='100%'><tr><td align='center' valign='middle'>";
 	echo "		<span id='qr_code' onclick=\"$('#qr_code_container').fadeOut(400);\"></span>";
 	echo "	</td></tr></table>";
 	echo "</div>";
-	?>
 
-	<?php
 
 	if (!$default_login) {
 
 		//*************** BOOTSTRAP MENU ********************************
 		function show_menu($menu_array, $menu_style, $menu_position) {
+			global $text;
 
 			//determine menu behavior
 				switch ($menu_style) {
@@ -1687,7 +1685,7 @@
 							//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 "<li class='hidden-xs'><a href='".PROJECT_PATH."/logout.php' onclick=\"return confirm('".$text['theme-confirm-logout']."')\"><span class='glyphicon glyphicon-log-out'></span></a></li>";
+									echo "<li class='hidden-xs'><a 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></li>";
 									unset($username_full);
 								}
 							?>