From c2831007e76a874fb4f83097ecf13a54f5525ae0 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Tue, 1 Oct 2013 18:43:41 +0200
Subject: [PATCH 1/2] update sparkle theme to reflect latest changes + some
 minor bugfixes

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 templates/Sparkle/customer/email/emails_email.tpl |  2 +-
 templates/Sparkle/header.tpl                      |  8 ++++----
 templates/Sparkle/index.tpl                       |  2 +-
 templates/Sparkle/misc/alreadyinstalledhint.tpl   | 12 ++++++------
 templates/Sparkle/misc/configurehint.tpl          | 12 ++++++------
 templates/Sparkle/misc/form/table_section.tpl     |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/templates/Sparkle/customer/email/emails_email.tpl b/templates/Sparkle/customer/email/emails_email.tpl
index bf6a6dbf..6fccd44f 100644
--- a/templates/Sparkle/customer/email/emails_email.tpl
+++ b/templates/Sparkle/customer/email/emails_email.tpl
@@ -1,7 +1,7 @@
 <tr>
 	<td>{$row['email_full']}</td>
 	<td><if $row['destination'] == ''>&nbsp;<else>{$row['destination']}</if></td>
-	<td><if $row['popaccountid'] != 0>{$lng['panel']['yes']}</if><if $row['popaccountid'] == 0>{$lng['panel']['no']}</if></td>
+	<td><if $row['popaccountid'] != 0>{$lng['panel']['yes']} ({$row['mboxsize']})</if><if $row['popaccountid'] == 0>{$lng['panel']['no']}</if></td>
 	<if $settings['catchall']['catchall_enabled'] == '1'><td><if $row['iscatchall'] != 0>{$lng['panel']['yes']}</if><if $row['iscatchall'] == 0>{$lng['panel']['no']}</if></td></if>
 	<if $settings['system']['mail_quota_enabled'] == '1'><td><if $row['quota'] == 0>{$lng['emails']['noquota']}<else>{$row['quota']} MB</if></if></td>
 	<td>
diff --git a/templates/Sparkle/header.tpl b/templates/Sparkle/header.tpl
index 4ae31d28..cc5ab12d 100644
--- a/templates/Sparkle/header.tpl
+++ b/templates/Sparkle/header.tpl
@@ -9,14 +9,14 @@
 	</if>
 	<script type="text/javascript" src="js/jquery.min.js"></script>
 	<script type="text/javascript" src="js/jquery-ui.min.js"></script>
-	<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+	<!--[if lt IE 9]><script src="js/html5shiv.js"></script><![endif]-->
 	<if isset($intrafficpage)>
-	<!--[if lt IE 9]><script language="javascript" type="text/javascript" src="js/excanvas.js"></script><![endif]-->
+	<!--[if lt IE 9]><script language="javascript" type="text/javascript" src="js/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="js/jquery.jqplot.min.js"></script>
 	<script language="javascript" type="text/javascript" src="js/plugins/jqplot.barRenderer.min.js"></script>
 	<script language="javascript" type="text/javascript" src="js/plugins/jqplot.categoryAxisRenderer.min.js"></script>
 	<script language="javascript" type="text/javascript" src="js/plugins/jqplot.pointLabels.min.js"></script>
-	<link rel="stylesheet" type="text/css" href="css/jquery.jqplot.css" />
+	<link rel="stylesheet" type="text/css" href="css/jquery.jqplot.min.css" />
 	<script language="javascript" type="text/javascript" src="templates/{$theme}/assets/js/traffic.js"></script>
 	</if>
 	<if $settings['panel']['use_webfonts'] == '1'>
@@ -24,7 +24,7 @@
 	</if>
 	<link href="templates/{$theme}/assets/css/main.css" rel="stylesheet" type="text/css" />
 	<!--[if IE]><link rel="stylesheet" href="templates/{$theme}/css/main_ie.css" type="text/css" /><![endif]-->
-	<link href="css/jquery.jquery-ui.css" rel="stylesheet" type="text/css"/>
+	<link href="css/jquery-ui.min.css" rel="stylesheet" type="text/css"/>
 	<script type="text/javascript" src="templates/{$theme}/assets/js/main.js"></script>
 	<link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<title><if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor Server Management Panel</title>
diff --git a/templates/Sparkle/index.tpl b/templates/Sparkle/index.tpl
index 641c28f6..ec9fb6fa 100644
--- a/templates/Sparkle/index.tpl
+++ b/templates/Sparkle/index.tpl
@@ -10,7 +10,7 @@
 	<link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<link rel="stylesheet" href="templates/{$theme}/assets/css/main.css" />
 	<!--[if IE]><link rel="stylesheet" href="templates/{$theme}/assets/css/main_ie.css"  /><![endif]-->
-	<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+	<!--[if lt IE 9]><script src="js/html5shiv.js"></script><![endif]-->
 	<script type="text/javascript" src="js/jquery.min.js"></script>
 	<script type="text/javascript" src="templates/{$theme}/assets/js/main.js"></script>
 	<title>{$title}Froxlor Server Management Panel</title>
diff --git a/templates/Sparkle/misc/alreadyinstalledhint.tpl b/templates/Sparkle/misc/alreadyinstalledhint.tpl
index 438e7bae..590783ff 100644
--- a/templates/Sparkle/misc/alreadyinstalledhint.tpl
+++ b/templates/Sparkle/misc/alreadyinstalledhint.tpl
@@ -3,12 +3,12 @@
 <head>
 	<meta charset="utf-8" />
 	<meta http-equiv="Default-Style" content="text/css" />
-	<link rel="stylesheet" href="../templates/Froxlor/assets/css/main.css" />
-	<!--[if IE]><link rel="stylesheet" href="../templates/Froxlor/assets/css/main_ie.css" /><![endif]-->
-	<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+	<link rel="stylesheet" href="../templates/Sparkle/assets/css/main.css" />
+	<!--[if IE]><link rel="stylesheet" href="../templates/Sparkle/assets/css/main_ie.css" /><![endif]-->
+	<!--[if lt IE 9]><script src="js/html5shiv.js"></script><![endif]-->
 	<script type="text/javascript" src="js/jquery.min.js"></script>
-	<script type="text/javascript" src="../templates/Froxlor/assets/js/main.js"></script>
-	<link href="../templates/Froxlor/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
+	<script type="text/javascript" src="../templates/Sparkle/assets/js/main.js"></script>
+	<link href="../templates/Sparkle/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<title>Froxlor Server Management Panel - Installation</title>
         body {
 		font-family: Verdana, Geneva, sans-serif;
@@ -18,7 +18,7 @@
 <div class="loginpage">
 	<article class="login bradius">
 		<header class="dark">
-			<img src="../templates/Froxlor/assets/img/logo.png" alt="Froxlor Server Management Panel" />
+			<img src="../templates/Sparkle/assets/img/logo.png" alt="Froxlor Server Management Panel" />
 		</header>
 
 		<section class="loginsec">
diff --git a/templates/Sparkle/misc/configurehint.tpl b/templates/Sparkle/misc/configurehint.tpl
index 2df701c5..3c77f6e0 100644
--- a/templates/Sparkle/misc/configurehint.tpl
+++ b/templates/Sparkle/misc/configurehint.tpl
@@ -3,12 +3,12 @@
 <head>
 	<meta charset="utf-8" />
 	<meta http-equiv="Default-Style" content="text/css" />
-	<link rel="stylesheet" href="templates/Froxlor/assets/css/main.css" />
-	<!--[if IE]><link rel="stylesheet" href="templates/Froxlor/assets/css/main_ie.css" /><![endif]-->
-	<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+	<link rel="stylesheet" href="templates/Sparkle/assets/css/main.css" />
+	<!--[if IE]><link rel="stylesheet" href="templates/Sparkle/assets/css/main_ie.css" /><![endif]-->
+	<!--[if lt IE 9]><script src="js/html5shiv.js"></script><![endif]-->
 	<script type="text/javascript" src="js/jquery.min.js"></script>
-	<script type="text/javascript" src="templates/Froxlor/assets/js/main.js"></script>
-	<link href="templates/Froxlor/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
+	<script type="text/javascript" src="templates/Sparkle/assets/js/main.js"></script>
+	<link href="templates/Sparkle/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<title>Froxlor Server Management Panel - Installation</title>
 	<style type="text/css">
 	body {
@@ -20,7 +20,7 @@
 <div class="loginpage">
 	<article class="login bradius">
 		<header class="dark">
-			<img src="templates/Froxlor/assets/img/logo.png" alt="Froxlor Server Management Panel" />
+			<img src="templates/Sparkle/assets/img/logo.png" alt="Froxlor Server Management Panel" />
 		</header>
 
 		<section class="loginsec">
diff --git a/templates/Sparkle/misc/form/table_section.tpl b/templates/Sparkle/misc/form/table_section.tpl
index 2f20cbe8..4b7e36c3 100644
--- a/templates/Sparkle/misc/form/table_section.tpl
+++ b/templates/Sparkle/misc/form/table_section.tpl
@@ -6,4 +6,4 @@
 		<input type="reset" value="{$lng['panel']['reset']}" />
 		<input type="submit" value="{$lng['panel']['save']}" />
 	</th>
-</tr>
\ No newline at end of file
+</tr>

From b19e226609277a4930b7e4b99933db8c93562f1e Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Tue, 1 Oct 2013 18:44:09 +0200
Subject: [PATCH 2/2] fix webftp template (Froxlor and Sparkle theme)

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 templates/Froxlor/index.tpl | 8 ++++++++
 templates/Sparkle/index.tpl | 8 ++++++++
 webftp.php                  | 6 ++++++
 3 files changed, 22 insertions(+)

diff --git a/templates/Froxlor/index.tpl b/templates/Froxlor/index.tpl
index ec9fb6fa..18a81088 100644
--- a/templates/Froxlor/index.tpl
+++ b/templates/Froxlor/index.tpl
@@ -7,6 +7,9 @@
 	<meta name="robots" content="noindex, nofollow, noarchive" />
 	<meta name="GOOGLEBOT" content="nosnippet" />
 	{/if}
+	{if $settings.panel.use_webfonts == 1}
+		<link href="//fonts.googleapis.com/css?family={$settings.panel.webfont}" rel="stylesheet">
+	{/if}
 	<link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<link rel="stylesheet" href="templates/{$theme}/assets/css/main.css" />
 	<!--[if IE]><link rel="stylesheet" href="templates/{$theme}/assets/css/main_ie.css"  /><![endif]-->
@@ -14,6 +17,11 @@
 	<script type="text/javascript" src="js/jquery.min.js"></script>
 	<script type="text/javascript" src="templates/{$theme}/assets/js/main.js"></script>
 	<title>{$title}Froxlor Server Management Panel</title>
+	<style type="text/css">
+	body {
+		font-family: {if $settings.panel.use_webfonts == 1}{$webfont},{/if} Verdana, Geneva, sans-serif;
+	}
+	</style>
 </head>
 <body>
 
diff --git a/templates/Sparkle/index.tpl b/templates/Sparkle/index.tpl
index ec9fb6fa..18a81088 100644
--- a/templates/Sparkle/index.tpl
+++ b/templates/Sparkle/index.tpl
@@ -7,6 +7,9 @@
 	<meta name="robots" content="noindex, nofollow, noarchive" />
 	<meta name="GOOGLEBOT" content="nosnippet" />
 	{/if}
+	{if $settings.panel.use_webfonts == 1}
+		<link href="//fonts.googleapis.com/css?family={$settings.panel.webfont}" rel="stylesheet">
+	{/if}
 	<link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<link rel="stylesheet" href="templates/{$theme}/assets/css/main.css" />
 	<!--[if IE]><link rel="stylesheet" href="templates/{$theme}/assets/css/main_ie.css"  /><![endif]-->
@@ -14,6 +17,11 @@
 	<script type="text/javascript" src="js/jquery.min.js"></script>
 	<script type="text/javascript" src="templates/{$theme}/assets/js/main.js"></script>
 	<title>{$title}Froxlor Server Management Panel</title>
+	<style type="text/css">
+	body {
+		font-family: {if $settings.panel.use_webfonts == 1}{$webfont},{/if} Verdana, Geneva, sans-serif;
+	}
+	</style>
 </head>
 <body>
 
diff --git a/webftp.php b/webftp.php
index 4e3a7c4d..f16b461b 100644
--- a/webftp.php
+++ b/webftp.php
@@ -149,6 +149,12 @@ if ($result = $db->query("SELECT `value` FROM `panel_settings` WHERE `settinggro
 {
 	list($settings['panel']['no_robots']) = $result->fetch_array();
 }
+$settings['panel']['use_webfonts'] = 0;
+if ($result = $db->query("SELECT `value` FROM `panel_settings` WHERE `settinggroup` = 'panel' AND `varname` = 'use_webfonts'"))
+{
+	list($settings['panel']['use_webfonts']) = $result->fetch_array();
+}
+
 
 // We don't need the database anymore
 $db->close();