Merge pull request #122 from dterweij/6.1.x

Version Bump & Login page html error free
lxcenter · Mar 21, 2014 · 0543f2a · 0543f2a
2 parents 9441c4a + c1263a2
commit 0543f2a
Show file tree

Hide file tree

Showing 6 changed files with 138 additions and 142 deletions.
diff --git a/kloxo/RELEASEINFO/Changelog b/kloxo/RELEASEINFO/Changelog
@@ -1,5 +1,17 @@
 Changelog
 
+Kloxo 6.1.19 - 22-mar-2014
+##################################
+Bug #519: Spamdyke On Additional Smtp Port affects also primary port
+Bug #781: Upgrade slave fails
+Bug #900: post_max_size is definied two times in php.ini.temp
+Bug #941: Forgot Password in Kloxo doesn't work
+Bug #992: wrong package installing tinydns
+Bug #994: Apache optimization causes crashing hold
+Bug #1098: Client file manager - No files
+Bug #788: Partial fix for pure-ftpd
+Enhancement #1099: Improvement GUI (part 1)
+
 Kloxo 6.1.18 - 23-feb-2014
 ##################################
 Bug #863: Adding parked/redirected domain breaks Apache config

diff --git a/kloxo/file/default_index.php b/kloxo/file/default_index.php
@@ -13,56 +13,16 @@
 		$incfile = "./inc.php";
 	}
 ?>
+<!DOCTYPE html>
 <html>
-
-<head>
-<title>Kloxo Control Panel</title>
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-</head>
-
-<style>
-body {
-	font-family: Tahoma, Verdana, Arial, Helvertica, sans-serif;
-	font-size: 8pt;
-	font-weight: 100;
-	background: #ddeeff;
-	margin: 0;
-}
-a {
-	text-decoration: none;
-}
-img {
-	border: 0;
-}
-
-img.logo {
-	margin: 5px;
-	padding: 0;
-}
-
-table.header {
-	border-collapse: collapse;
-	border-spacing: 0;
-	background-color: #66aadd;
-	/* height: 110px; */
-	width: 100%;
-	font-family: Tahoma, Verdana, Arial, Helvertica, sans-serif;
-	font-size: 8pt;
-	font-weight: 100;
-}
-
-table.content {
-	border-collapse: collapse;
-	border-spacing: 0;
-	width: 100%;
-	font-family: Tahoma, Verdana, Arial, Helvertica, sans-serif;
-	font-size: 8pt;
-	font-weight: 100;
-}
-</style>
+	<head>
+		<title>Kloxo Control Panel</title>
+			<meta http-equiv="Content-Language" content="en-us">
+			<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+			<link href="/htmllib/css/skin/default/missing-common.css" rel="stylesheet" type="text/css">
+			<link href="/htmllib/lib/admin_login.css" rel="stylesheet" type="text/css">
+	</head>
 <body>
-
 <table class="header">
 	<tr>
 		<td valign="top" width="100%"><img class="logo" src="images/logo.png" height="75" alt="hosting-logo"></td>

diff --git a/kloxo/file/login_inc.php b/kloxo/file/login_inc.php
@@ -1,7 +1,5 @@
-
-<link href=/htmllib/css/common.css rel=stylesheet type=text/css>
-<script language=javascript src="/htmllib/js/login.js"></script>
-<script language=javascript src="/htmllib/js/preop.js"></script>
+<script language="javascript" src="/htmllib/js/login.js"></script>
+<script language="javascript" src="/htmllib/js/preop.js"></script>
 
 <?php 
 

diff --git a/kloxo/httpdocs/htmllib/lib/admin_login.css b/kloxo/httpdocs/htmllib/lib/admin_login.css
@@ -1,128 +1,158 @@
+/*
+ * This CSS file is used by the /login/ page.
+ * Refactoring is needed. Wrong place, wrong name
+ */
 body {
- 	margin: 0px;
-	padding: 0px;
-	color : #333;
-	background-color : #FFF;
-	font-size : 11px;
-	font-family : Arial, Helvetica, sans-serif;
-		 }
+    font-family: Tahoma, Verdana, Arial, Helvertica, sans-serif;
+    font-size: 8pt;
+    font-weight: 100;
+    background: #ddeeff;
+    margin: 0;
+}
+
+a {
+    text-decoration: none;
+}
+
+img {
+    border: 0;
+}
+
+img.logo {
+    margin: 5px;
+    padding: 0;
+}
+
+table.header {
+    border-collapse: collapse;
+    border-spacing: 0;
+    background-color: #66aadd;
+    /* height: 110px; */
+    width: 100%;
+    font-family: Tahoma, Verdana, Arial, Helvertica, sans-serif;
+    font-size: 8pt;
+    font-weight: 100;
+}
+
+table.content {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 100%;
+    font-family: Tahoma, Verdana, Arial, Helvertica, sans-serif;
+    font-size: 8pt;
+    font-weight: 100;
+}
 
 #wrapper {
-    border: 0px;
-    margin: 0px;
+    border: 0;
+    margin: 0;
     margin-left: auto;
     margin-right: auto;
-    padding: 0px;
+    padding: 0;
 }
 
 #break {
-	height: 20px;
+    height: 20px;
 }
 
 form {
-	margin: 0px;
+    margin: 0;
 }
 
 .button {
-	border : solid 1px #cccccc;
-	background: #E9ECEF;
-	color : #666666;
-	font-weight : bold;
-	font-size : 11px;
-	padding: 4px;
+    border: solid 1px #cccccc;
+    background: #E9ECEF;
+    color: #666666;
+    font-weight: bold;
+    font-size: 11px;
+    padding: 4px;
 }
 
 .login {
-	margin-left: auto;
-	margin-right: auto;
-	margin-top: 6em;
-	padding: 15px;
-	border: 1px solid #cccccc;
-	width: 429px;
-	background: #F1F3F5;
-}
-	
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 6em;
+    padding: 15px;
+    border: 1px solid #cccccc;
+    width: 429px;
+    background: #F1F3F5;
+}
+
 .login p {
-	padding: 0 1em 0 1em;
+    padding: 0 1em 0 1em;
 }
-					
+
 .form-block {
-	border: 1px solid #cccccc;
-	background: #E9ECEF;
-	padding-top: 15px;
-	padding-left: 10px;
-	padding-bottom: 10px;
-	padding-right: 10px;
+    border: 1px solid #cccccc;
+    background: #E9ECEF;
+    padding: 15px 10px 10px 10px;
 }
 
 .login-form {
-	text-align: left;
-	float: right;
-	width: 60%;
+    text-align: left;
+    float: right;
+    width: 60%;
 }
 
 .login-text {
-	text-align: left;
-	width: 40%;
-	float: left;
+    text-align: left;
+    width: 40%;
+    float: left;
 }
 
 .inputlabel {
-	font-weight: bold;
-	text-align: left;
+    font-weight: bold;
+    text-align: left;
 }
 
 .inputbox {
-	COLOR: #000000;
-	FONT-FAMILY: Verdana, Tahoma;
-	FONT-SIZE: 11px;
-	BORDER: 1px SOLID #666666;
-	WIDTH: 190px;
-	PADDING: 2px 2px 3px 2px;
-	MARGIN: 0px;
-	BACKGROUND: URL(/img/login/user.gif) no-repeat;
-	BACKGROUND-POSITION: 1px 1px;
-	BACKGROUND-COLOR: #FFFFFF;
-	PADDING-LEFT: 18px;
-	VERTICAL-ALIGN: middle;
-	margin: 0 0 1em 0;
-	border: 1px solid #cccccc;
+    COLOR: #000000;
+    font-family: verdana, tahoma, arial, helvetica, sans-serif;
+    FONT-SIZE: 11px;
+    WIDTH: 190px;
+    PADDING: 2px 2px 3px 2px;
+    BACKGROUND: URL(/img/login/user.gif) no-repeat;
+    BACKGROUND-POSITION: 1px 1px;
+    BACKGROUND-COLOR: #FFFFFF;
+    PADDING-LEFT: 18px;
+    VERTICAL-ALIGN: middle;
+    margin: 0 0 1em 0;
+    border: 1px solid #cccccc;
 }
+
 .passbox {
-	COLOR: #000000;
-	FONT-FAMILY: Verdana, Tahoma;
-	FONT-SIZE: 11px;
-	BORDER: 1px SOLID #666666;
-	WIDTH: 190px;
-	PADDING: 2px 2px 3px 2px;
-	MARGIN: 0px;
-	BACKGROUND-POSITION: 1px 1px;
-	BACKGROUND-COLOR: #FFFFFF;
-	VERTICAL-ALIGN: middle;
-	margin: 0 0 1em 0;
-	border: 1px solid #cccccc;
+    COLOR: #000000;
+    font-family: verdana, tahoma, arial, helvetica, sans-serif;
+    FONT-SIZE: 11px;
+    WIDTH: 190px;
+    PADDING: 2px 2px 3px 2px;
+    BACKGROUND-POSITION: 1px 1px;
+    BACKGROUND-COLOR: #FFFFFF;
+    VERTICAL-ALIGN: middle;
+    margin: 0 0 1em 0;
+    border: 1px solid #cccccc;
 }
 
 .clr {
-    clear:both;
+    clear: both;
 }
 
 .ctr {
-	text-align: center;
+    text-align: center;
 }
 
 .version {
-	font-size: 0.8em;
+    font-size: 0.8em;
 }
 
 .message {
-	margin-top: 10px; 
-	padding: 7px; 
-	width: 400px;
-	border: 1px solid #B22222;
-	background: #F1F3F5;
-	color: #B22222;	
-	font-weight: bold;
-	font-size: 13px;
+    margin-top: 10px;
+    padding: 7px;
+    width: 400px;
+    border: 1px solid #B22222;
+    background: #F1F3F5;
+    color: #B22222;
+    font-weight: bold;
+    font-size: 13px;
 }
 
diff --git a/kloxo/httpdocs/htmllib/lib/indexcontent.php b/kloxo/httpdocs/htmllib/lib/indexcontent.php
@@ -1,4 +1,8 @@
 <?php
+/*
+ * This file is used by the /login/ page.
+ * Refactoring is needed. Wrong place, wrong name
+ */
 
 $accountlist = array('client' => "Kloxo Account",'domain' => 'Domain Owner', 'mailaccount' => "Mail Account");
 $progname = $sgbl->__var_program_name;
@@ -18,10 +22,6 @@
     } else {
         ?>
 
-        <style type="text/css">
-            @import url("/htmllib/lib/admin_login.css");
-        </style>
-
         <div id="ctr" align="center">
             <div class="login">
                 <div class="login-form">
@@ -62,10 +62,6 @@
 elseif ($cgi_forgotpwd == 1) {
     ?>
 
-    <style type="text/css">
-        @import url(/htmllib/lib/admin_login.css);
-    </style>
-
     <div id="ctr" align="center">
         <div class="login">
             <div class="login-form">
@@ -84,7 +80,7 @@
                 </form>
             </div>
             <div class="login-text">
-                <div class="ctr"><img src="/img/login/icon1.gif" width="64" height="64" alt="security" /></div>
+                <div class="ctr"><img border=0 src="/img/login/icon1.gif" width="64" height="64" alt="security" /></div>
                 <p>Welcome to <?php echo  $sgbl->__var_program_name; ?></p>
                 <p>Use a valid username and email-id to get password.</p>
                 <br />

diff --git a/kloxo/httpdocs/lib/sgbl.php b/kloxo/httpdocs/lib/sgbl.php
@@ -24,7 +24,7 @@ function __construct()
 		$this->__var_program_name = 'kloxo';
 		$this->__ver_major = "6";
 		$this->__ver_minor = "1";
-		$this->__ver_release = "18";
+		$this->__ver_release = "19";
 		$this->__ver_enterprise = "Single Server Edition";
 		$this->__ver_type = "production";
 		$this->__ver_extra = "Stable";