From 97d20199febc5e964e92b4b4630381bc5afdceb4 Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Tue, 1 Mar 2011 19:10:46 +0100
Subject: [PATCH 1/7] Fixed missing nginx in installer

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
---
 install/install.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/install/install.php b/install/install.php
index c9cd4b2a..fe7ecfe0 100644
--- a/install/install.php
+++ b/install/install.php
@@ -931,8 +931,12 @@ else
 					<input type="radio" name="webserver" id="apache" value="apache2" <?php echo $webserver == "apache2" ? 'checked="checked"' : "" ?>/>Apache2
 				</p>
 				<p>
-					<label for="lighty"<?php echo ((!empty($_POST['installstep']) && $webserver == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['webserver']; ?> ligHTTPd:</label>&nbsp;
-					<input type="radio" name="webserver" id="lighty" value="lighttpd" <?php echo $webserver == "lighttpd" ? 'checked="checked"' : "" ?>/>ligHTTPd
+					<label for="lighty"<?php echo ((!empty($_POST['installstep']) && $webserver == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['webserver']; ?> LigHTTPd:</label>&nbsp;
+					<input type="radio" name="webserver" id="lighty" value="lighttpd" <?php echo $webserver == "lighttpd" ? 'checked="checked"' : "" ?>/>LigHTTPd
+				</p>
+				<p>
+					<label for="nginx"<?php echo ((!empty($_POST['installstep']) && $webserver == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['webserver']; ?> Nginx:</label>&nbsp;
+					<input type="radio" name="webserver" id="nginx" value="nginx" <?php echo $webserver == "nginx" ? 'checked="checked"' : "" ?>/>Nginx
 				</p>
 				<p>
 					<label for="httpuser"<?php echo ((!empty($_POST['installstep']) && $httpuser == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['httpuser']; ?>:</label>&nbsp;

From 9503ae0ac5d0e0e0713683fd7792ff95bdcd2dc6 Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Tue, 1 Mar 2011 19:12:04 +0100
Subject: [PATCH 2/7] Fixed syntax error in configfiles_index

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
---
 lib/configfiles_index.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/configfiles_index.inc.php b/lib/configfiles_index.inc.php
index d5344c23..e845fe17 100644
--- a/lib/configfiles_index.inc.php
+++ b/lib/configfiles_index.inc.php
@@ -22,7 +22,7 @@ $configcommand = array();
 if(isConfigDir($settings['system']['apacheconf_vhost']))
 {
 	$configcommand['vhost'] = 'mkdir -p ' . $settings['system']['apacheconf_vhost'];
-	$configcommand['include'] = 'echo -e "\\nInclude ' . makeCorrectDir($settings['system']['apacheconf_vhost']) . '*.conf" >> ' . makeCorrectFile(makeCorrectDir('/etc/apache2/httpd.conf');
+	$configcommand['include'] = 'echo -e "\\nInclude ' . makeCorrectDir($settings['system']['apacheconf_vhost']) . '*.conf" >> ' . makeCorrectFile(makeCorrectDir('/etc/apache2/httpd.conf'));
 	$configcommand['v_inclighty'] = 'echo -e \'\\ninclude_shell "cat ' . makeCorrectDir($settings['system']['apacheconf_vhost']) . '*.conf"\' >> /etc/lighttpd/lighttpd.conf';
 }
 else

From 9d457596134ecc86448b8630044fd9efb83b54a6 Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Tue, 1 Mar 2011 19:28:34 +0100
Subject: [PATCH 3/7] Fixing paths in CSS, now relative instead of absolute

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
---
 templates/Classic/main.css    | 14 +++++++-------
 templates/Froxlor/froxlor.css | 32 ++++++++++++++++----------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/templates/Classic/main.css b/templates/Classic/main.css
index 9fd766fd..efdb0ab2 100644
--- a/templates/Classic/main.css
+++ b/templates/Classic/main.css
@@ -5,7 +5,7 @@ body {
 }
 
 .header {
-	background-image	: url( '/images/Classic/header_r.gif' );
+	background-image	: url( '../../images/Classic/header_r.gif' );
 	background-repeat	: repeat-x;
 }
 
@@ -16,7 +16,7 @@ body {
 	border-width		: 1px;
 	border-right		: none;
 	border-left			: none;
-	background			: url('/images/Classic/footer.gif') repeat-y #FFFFFF;
+	background			: url('../../images/Classic/footer.gif') repeat-y #FFFFFF;
 }
 
 a,a:visited,a:active {
@@ -97,24 +97,24 @@ ul {
 }
 
 .line_shadow {
-	background-image	: url( '/images/Classic/shadow.gif' );
+	background-image	: url( '../../images/Classic/shadow.gif' );
 	background-repeat	: repeat-y;
 	background-position	: top left;
 }
 
 .section {
 	height				: 25px;
-	background-image	: url( '/images/Classic/section.gif' );
+	background-image	: url( '../../images/Classic/section.gif' );
 }
 
 .subsection {
 	padding-top			: 8px;
-	background-image	: url( '/images/Classic/subsection.gif' );
+	background-image	: url( '../../images/Classic/subsection.gif' );
 }
 
 .endsection {
 	height				: 10px;
-	background-image	: url( '/images/Classic/endsection.gif' );
+	background-image	: url( '../../images/Classic/endsection.gif' );
 	background-position : bottom;
 }
 
@@ -420,7 +420,7 @@ TR.RowOverSelected {
 	padding: 20px 20px 20px 60px;
 	background-color: #f1baba;
 	border: 1px solid #ce1d1d;
-	background-image: url('/images/Classic/error.png');
+	background-image: url('../../images/Classic/error.png');
 	background-repeat: no-repeat;
 	background-position: 15px 50%;
 }
diff --git a/templates/Froxlor/froxlor.css b/templates/Froxlor/froxlor.css
index 06119be6..7ca949ee 100644
--- a/templates/Froxlor/froxlor.css
+++ b/templates/Froxlor/froxlor.css
@@ -78,7 +78,7 @@ td a {
 }
 
 .topheader {
-	background: #cccccc url('/images/Froxlor/header_g.png') 0 bottom repeat-x;
+	background: #cccccc url('../../images/Froxlor/header_g.png') 0 bottom repeat-x;
 	padding-left: 5px;
 	padding-top: 2px;
 	margin-bottom: 12px;
@@ -290,7 +290,7 @@ p.submit {
  * error message display
  */
 .errorcontainer {
-	background: url('/images/Froxlor/icons/bad.png') 10px center no-repeat #ffedef;
+	background: url('../../images/Froxlor/icons/bad.png') 10px center no-repeat #ffedef;
 	border: 1px solid #ffc2ca;
 	padding: 10px 10px 10px 68px !important;
 	margin: .75em !important;
@@ -312,7 +312,7 @@ p.submit {
  * warning message display 
  */
 .warningcontainer {
-	background: url('/images/Froxlor/icons/warning.png') 10px center no-repeat #fffecc;
+	background: url('../../images/Froxlor/icons/warning.png') 10px center no-repeat #fffecc;
 	border: 1px solid #f3c37e;
 	padding: 10px 10px 10px 68px !important;
 	margin: .75em !important;
@@ -333,7 +333,7 @@ p.submit {
  * success message display 
  */
 .successcontainer {
-	background: url('/images/Froxlor/icons/ok.png') 10px center no-repeat #E2F9E3;
+	background: url('../../images/Froxlor/icons/ok.png') 10px center no-repeat #E2F9E3;
 	border: 1px solid #9C9;
 	padding: 10px 10px 10px 68px !important;
 	margin: .75em !important;
@@ -354,7 +354,7 @@ p.submit {
  * neutral/info message display 
  */
 .neutralcontainer {
-	background: url('/images/Froxlor/icons/info.png') 10px center no-repeat #d2eaf6;
+	background: url('../../images/Froxlor/icons/info.png') 10px center no-repeat #d2eaf6;
 	border: 1px solid #b7d8ed;
 	padding: 10px 10px 10px 68px !important;
 	margin: .75em !important;
@@ -398,7 +398,7 @@ a:hover {
 }
 
 .menuelement h4 {
-	background: transparent url('/images/Froxlor/icons/tag_blue.png') no-repeat center left;
+	background: transparent url('../../images/Froxlor/icons/tag_blue.png') no-repeat center left;
 	margin: 0;
 	padding: 0 0 0 20px;
 }
@@ -528,7 +528,7 @@ table tfoot td {
 
 /* input elements */
 input {
-	background: #dae7ee url('/images/Froxlor/icons/text_align_left.png') no-repeat 5px 4px;
+	background: #dae7ee url('../../images/Froxlor/icons/text_align_left.png') no-repeat 5px 4px;
 	padding: 2px 4px 2px 22px;
 	border: 1px solid #666666;
 	height: 22px;
@@ -539,7 +539,7 @@ input {
 }
 
 textarea {
-	background: #dae7ee url('/images/Froxlor/icons/text_align_left.png') no-repeat 5px 4px;
+	background: #dae7ee url('../../images/Froxlor/icons/text_align_left.png') no-repeat 5px 4px;
 	padding: 4px 4px 2px 22px;
 	border: 1px solid #666666;
 	-moz-border-radius: 5px;
@@ -549,7 +549,7 @@ textarea {
 }
 
 input[type="password"] {
-	background: #dae7ee url('/images/Froxlor/icons/password.png') no-repeat 4px 4px;
+	background: #dae7ee url('../../images/Froxlor/icons/password.png') no-repeat 4px 4px;
 }
 
 input[type="button"],input[type="submit"],input[type="reset"] {
@@ -566,14 +566,14 @@ input[type="button"],input[type="submit"],input[type="reset"] {
 
 input[type="submit"] {
 	color: green;
-	background: #ccc url('/images/Froxlor/icons/button_ok.png') no-repeat 4px 8px;
+	background: #ccc url('../../images/Froxlor/icons/button_ok.png') no-repeat 4px 8px;
 	padding-left: 20px;
 }
 
 input[class="nobutton"],
 input[type="reset"] {
 	color: red;
-	background: #ccc url('/images/Froxlor/icons/cancel.png') no-repeat 4px 8px;
+	background: #ccc url('../../images/Froxlor/icons/cancel.png') no-repeat 4px 8px;
 	padding-left: 20px;
 }
 
@@ -630,7 +630,7 @@ select {
 }
 
 .cronjobtask {
-	list-style: url('/images/Froxlor/icons/clock.png') inside;
+	list-style: url('../../images/Froxlor/icons/clock.png') inside;
 	margin: 0;
 	padding: 0;
 }
@@ -658,7 +658,7 @@ select {
 	display:block;
 	width:200px;
 	height:15px;
-	background:url('/images/Froxlor/bar.gif') no-repeat 0 0;
+	background:url('../../images/Froxlor/bar.gif') no-repeat 0 0;
 	top:8px; 
 	left:8px;
 	overflow:hidden;
@@ -666,11 +666,11 @@ select {
 }
 
 .progressBar span.redbar {
-	background:url('/images/Froxlor/barred.gif') no-repeat 0 0;
+	background:url('../../images/Froxlor/barred.gif') no-repeat 0 0;
 }
 
 .progressBar span.greybar {
-	background:url('/images/Froxlor/bargrey.gif') no-repeat 0 0;
+	background:url('../../images/Froxlor/bargrey.gif') no-repeat 0 0;
 }
 
 .progressBar em {
@@ -678,7 +678,7 @@ select {
 	display:block;
 	width:200px;
 	height:15px;
-	background:url('/images/Froxlor/bg_cover.gif') repeat-x 0 0;
+	background:url('../../images/Froxlor/bg_cover.gif') repeat-x 0 0;
 	top:0;
 }
 

From 357e60c054b72fc04294fabde91ec2a3906abe99 Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Tue, 1 Mar 2011 19:52:34 +0100
Subject: [PATCH 4/7] Reworked admin -> customerslist, fixes #619

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
---
 .../admin/customers/customers_customer.tpl    | 38 ++++++++-----------
 templates/Froxlor/froxlor.css                 |  9 +++--
 templates/Froxlor/js/froxlor.js               | 13 ++++++-
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/templates/Froxlor/admin/customers/customers_customer.tpl b/templates/Froxlor/admin/customers/customers_customer.tpl
index 8ae17344..069e55d8 100644
--- a/templates/Froxlor/admin/customers/customers_customer.tpl
+++ b/templates/Froxlor/admin/customers/customers_customer.tpl
@@ -9,21 +9,8 @@
 		</if>
 		&nbsp;(<a href="$filename?s=$s&amp;page=$page&amp;action=su&amp;id={$row['customerid']}" rel="external">{$row['loginname']}</a> | {$row['adminname']})
 		</strong>
-	</td>
-	<td rowspan="2">
-		<a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['customerid']}" style="text-decoration:none;">
-			<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
-		</a>&nbsp;
-		<a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['customerid']}" style="text-decoration:none;">
-			<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
-		</a>
-	</td>
-</tr>
-<tr>
-	<td>
-		<table class="overviewcustomerextras">
-		<tr>
-			<td style="width: 300px;">
+		<div>
+			<span class="overviewcustomerextras">
 				Webspace:&nbsp;
 				<if $row['diskspace'] != 'UL'>
 					<span class="progressBar" title="{$row['diskspace_used']} / {$row['diskspace']} MB">
@@ -39,8 +26,8 @@
 						<span class="greybar"><em style="left: 200px;">100%</em></span>
 					</span>
 				</if>
-			</td>
-			<td style="width: 300px;">
+			</span>
+			<span class="overviewcustomerextras">
 				Traffic:&nbsp;
 				<if $row['traffic'] != 'UL'>
 					<span class="progressBar" title="{$row['traffic_used']} / {$row['traffic']} GB">
@@ -56,11 +43,18 @@
 						<span class="greybar"><em style="left: 200px;">100%</em></span>
 					</span>
 				</if>
-			</td>
-			<td>
+			</span>
+			<span style="clear: both !important;">
 				{$last_login}
-			</td>
-		</tr>
-		</table>
+			</span>
+		</div>
+	</td>
+	<td>
+		<a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['customerid']}" style="text-decoration:none;">
+			<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
+		</a>&nbsp;
+		<a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['customerid']}" style="text-decoration:none;">
+			<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
+		</a>
 	</td>
 </tr>
diff --git a/templates/Froxlor/froxlor.css b/templates/Froxlor/froxlor.css
index 7ca949ee..dee49fa6 100644
--- a/templates/Froxlor/froxlor.css
+++ b/templates/Froxlor/froxlor.css
@@ -502,10 +502,13 @@ table tbody td {
 	text-align: left;
 }
 
-.overviewcustomerextras,.overviewcustomerextras tbody td {
-	line-height: 11px;
+.overviewcustomerextras {
+	line-height: 15px;
 	font-size: 10px;
-	border: 0;
+	width: 300px; 
+	float: left;
+	padding-top: 8px;
+	padding-bottom: 12px;
 }
 
 td {
diff --git a/templates/Froxlor/js/froxlor.js b/templates/Froxlor/js/froxlor.js
index 1c229973..f5408a2c 100644
--- a/templates/Froxlor/js/froxlor.js
+++ b/templates/Froxlor/js/froxlor.js
@@ -14,7 +14,16 @@ $(document).ready(function(){
 			$(this).css("background-color", "#fff");
 		},
 		function() {
-			$(this).css("background-color", "#f8f8f8");
+			$(this).css("background-color", "#f5f5f5");
+		}
+		);
+	}
+	if($("table.bradiusodd").length != 0) {
+		$("table.bradiusodd tr").hover(function() {
+			$(this).css("background-color", "#fff");
+		},
+		function() {
+			$(this).css("background-color", "#f5f5f5");
 		}
 		);
 	}
@@ -24,7 +33,7 @@ $(document).ready(function(){
                         $(this).css("background-color", "#fff");
                 },
                 function() {
-                        $(this).css("background-color", "#f8f8f8");
+                        $(this).css("background-color", "#f5f5f5");
                 }
                 );
         }

From 0afbad5ff1eb012cc7dd3f2e8a0c70696250295d Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Tue, 1 Mar 2011 20:07:48 +0100
Subject: [PATCH 5/7] Fixed adding of email-forwarding, fixes #626

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
---
 templates/Froxlor/customer/email/forwarder_add.tpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/Froxlor/customer/email/forwarder_add.tpl b/templates/Froxlor/customer/email/forwarder_add.tpl
index 90cb5861..a9ec39ed 100644
--- a/templates/Froxlor/customer/email/forwarder_add.tpl
+++ b/templates/Froxlor/customer/email/forwarder_add.tpl
@@ -21,6 +21,7 @@ $header
 					<input type="hidden" name="s" value="$s" />
 					<input type="hidden" name="page" value="$page" />
 					<input type="hidden" name="action" value="$action" />
+					<input type="hidden" name="id" value="$id" />
 					<input type="hidden" name="send" value="send" />
 				</p>
 			</fieldset>

From 207e9e1b43d940c3070a6da175bc7ef980d76945 Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Tue, 1 Mar 2011 20:15:07 +0100
Subject: [PATCH 6/7] Fixed adding of email-forwarding in classic template,
 too, fixes #626 again

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
---
 templates/Classic/customer/email/forwarder_add.tpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/Classic/customer/email/forwarder_add.tpl b/templates/Classic/customer/email/forwarder_add.tpl
index 4c0dcf1e..9c484316 100644
--- a/templates/Classic/customer/email/forwarder_add.tpl
+++ b/templates/Classic/customer/email/forwarder_add.tpl
@@ -4,6 +4,7 @@ $header
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
 		<input type="hidden" name="id" value="$id" />
+		<input type="hidden" name="send" value="send" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
 			<tr>
 				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>

From 00edba1d0dba12413ef6a78290015cf02ff96b7b Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Tue, 1 Mar 2011 20:38:09 +0100
Subject: [PATCH 7/7] Fixing dynamic selection of themes in settings, fixes
 #628

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
---
 actions/admin/settings/100.panel.php         | 3 +--
 lib/functions/froxlor/function.getThemes.php | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/actions/admin/settings/100.panel.php b/actions/admin/settings/100.panel.php
index 9bb4a0a5..3c09fa75 100644
--- a/actions/admin/settings/100.panel.php
+++ b/actions/admin/settings/100.panel.php
@@ -39,8 +39,7 @@ return array(
 					'type' => 'option',
 					'default' => 'Froxlor',
 					'option_mode' => 'one',
-					'option_options' => array('Classic' => 'Classic', 'Froxlor' => 'Froxlor'),
-					/* 'option_options_method' => 'getThemes', // iterate through templates/ and dynamically display all folders found */
+					'option_options_method' => 'getThemes',
 					'save_method' => 'storeSettingField',
 					),
 				'panel_natsorting' => array(
diff --git a/lib/functions/froxlor/function.getThemes.php b/lib/functions/froxlor/function.getThemes.php
index d15e92a6..3f3cdd4c 100644
--- a/lib/functions/froxlor/function.getThemes.php
+++ b/lib/functions/froxlor/function.getThemes.php
@@ -37,7 +37,7 @@ function getThemes()
 				&& $it->getFilename() != '.svn'
 				&& $it->getFilename() != 'misc'
 			) {
-				$themes_available[] = $it->getFilename();
+				$themes_available[$it->getFilename()] = $it->getFilename();
 			}
 		}
 	}