Gere les domaines jusqu'a 255 caractères (tld compris).

Indentation du CSS

Should fix #1428
This commit is contained in:
Alan Garcia 2013-01-28 15:05:00 +00:00
parent dc0079f7b2
commit 07d6b8d7a9
5 changed files with 265 additions and 260 deletions

View File

@ -58,7 +58,7 @@ else {
<p>
<?php
__("You can set passwords to protect some of your folders.<br/>This will create .htaccess and .htpassword files that restrict access to these directory and to any sub-elements.");
__("You can set passwords to protect some of your folders.<br/>This will create .htaccess and .htpasswd files that restrict access to these directory and to any sub-elements.");
// __("help_hta_list");
$mem->show_help("hta_list2");
?>

View File

@ -37,16 +37,14 @@ if ($q["t"] > 0 || $q['u'] > 0)
<div class="menu-content" id="menu-dom">
<ul>
<?php if ($quota->cancreate("dom")) { ?>
<li><a href="dom_add.php"><img src="images/new.png" alt="<?php __("Add a domain"); ?>" />&nbsp;<?php __("Add a domain"); ?></a></li>
<li><a href="dom_add.php"><img src="images/new.png" alt="<?php __("Add a domain"); ?>" />&nbsp;<?php __("Add a domain"); ?></a></li>
<?php }
/* Enumeration des domaines : */
$domlist = $dom->enum_domains();
reset($domlist);
while (list($key, $val) = each($domlist))
{
?>
<li><a href="dom_edit.php?domain=<?php echo urlencode($val) ?>"><?php echo $val ?></a></li>
while (list($key, $val) = each($domlist)) { ?>
<li><a href="dom_edit.php?domain=<?php echo urlencode($val) ?>" title="<?php echo htmlentities($val); ?>"><?php echo $val; ?></a></li>
<?php } ?>
</ul>
</div>

View File

@ -43,7 +43,7 @@ if ($q["u"] > 0 || ( $r["u"] > 0 && $q['t'] > 0 )) {
$domlist = $mail->enum_domains();
foreach($domlist as $l => $v){
?>
<li><a href="mail_list.php?domain_id=<?php echo urlencode($v["id"]) ?>"><?php echo $v["domaine"] ?> (<?php echo $v["nb_mail"]; ?>)</a></li>
<li><a href="mail_list.php?domain_id=<?php echo urlencode($v["id"]) ?>" title='<?php echo htmlentities($v["domaine"]).'&nbsp;'.htmlentities("(".$v["nb_mail"].")"); ?>'><?php echo $v['domaine']; ?> (<?php echo $v["nb_mail"]; ?>)</a></li>
<?php
}?>
</ul>

View File

@ -1,500 +1,504 @@
html, body {
margin: 0px;
padding: 0px;
margin: 0px;
padding: 0px;
}
body {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
color: #000000;
background-color: #F0F0FA;
/* background-color: cyan; */
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
color: #000000;
background-color: #F0F0FA;
/* background-color: cyan; */
}
body.light {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
color: #000000;
background-color: #F0F0FA;
/* background-color: cyan; */
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
color: #000000;
background-color: #F0F0FA;
/* background-color: cyan; */
}
.hlp {
font-family: Helvetica, Tahoma, sans-serif;
font-size: 11px;
color: #202020;
font-family: Helvetica, Tahoma, sans-serif;
font-size: 11px;
color: #202020;
}
table {
border-collapse: collapse;
border-collapse: collapse;
}
td {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
color: #000000;
padding-right: 6px;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
color: #000000;
padding-right: 6px;
}
th {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
color: black;
background: #ABCDE4;
font-weight: normal;
text-align: left;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
color: black;
background: #ABCDE4;
font-weight: normal;
text-align: left;
}
h3 {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 18px;
font-weight: bold;
color: #10507C;
text-align: left;
padding: 11px;
padding-left: 0;
margin: 0px;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 18px;
font-weight: bold;
color: #10507C;
text-align: left;
padding: 11px;
padding-left: 0;
margin: 0px;
}
.trbtn {
text-align: right;
text-align: right;
}
h4 {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 16px;
font-weight: bold;
color: #007777
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 16px;
font-weight: bold;
color: #007777
}
hr {
color: #007799;
height: 1px;
border: 1px solid #007799;
color: #007799;
height: 1px;
border: 1px solid #007799;
}
.inp {
/* Should not be use anymore !!! */
border-color: blue;
border-width: 5px;
background-color: #500000;
color: white;
/* Should not be use anymore !!! */
border-color: blue;
border-width: 5px;
background-color: #500000;
color: white;
}
.inc, .inl {
border: 1px solid black;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
border-style: none;
color: black;
background: white;
border: 1px solid black;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
border-style: none;
color: black;
background: white;
}
.inb {
border: 1px solid #999;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
padding: 4px;
padding-left: 6px;
padding-right: 6px;
color: black;
background-color: #CFE3F1;
cursor: pointer;
margin-right: 4px;
border: 1px solid #999;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
padding: 4px;
padding-left: 6px;
padding-right: 6px;
color: black;
background-color: #CFE3F1;
cursor: pointer;
margin-right: 4px;
}
.inb:hover {
background-color: #BFD3E1;
background-color: #BFD3E1;
}
input.ina:hover, input.ina, input.inav, input.inav:hover {
border: 1px solid #999;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
padding: 2px 4px 2px 4px;
color: black;
cursor: pointer;
/*float: right;*/
border: 1px solid #999;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
padding: 2px 4px 2px 4px;
color: black;
cursor: pointer;
/*float: right;*/
}
input.ina, .ina a {
background-color: #F1F8FD;
background-color: #F1F8FD;
}
input.ina:hover, .ina a:hover,
input.inav, .inav a {
background-color: #CFE3F1;
background-color: #CFE3F1;
}
input.inav:hover, .inav a:hover, a.inav:hover {
background-color: #F1F8FD;
background-color: #F1F8FD;
}
.ina-active a, a.ina-active, input.ina-active {
background-color: #C1FFCD;
background-color: #C1FFCD;
}
.ina a, a.ina, .inav a, a.inav {
color: black;
white-space: nowrap;
color: black;
white-space: nowrap;
border: 1px solid #999;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
padding: 4px;
color: black;
cursor: pointer;
border: 1px solid #999;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
padding: 4px;
color: black;
cursor: pointer;
}
.ina a:hover, a.ina:hover, .inav a:hover, a.inav:hover {
text-decoration: none;
color: black;
text-decoration: none;
color: black;
}
.ina img, .ina img {
vertical-align: middle;
padding: 2px;
vertical-align: middle;
padding: 2px;
}
.bff {
border: 1px solid #999;
background-color: #F1F8FD;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
padding-left: 2px;
padding-right: 4px;
color: black;
cursor: pointer;
border: 1px solid #999;
background-color: #F1F8FD;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
padding-left: 2px;
padding-right: 4px;
color: black;
cursor: pointer;
}
.int {
border: 1px dotted black;
background-color: white;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
padding: 2px;
border: 1px dotted black;
background-color: white;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
padding: 2px;
}
.intleft {
border-right: 0px;
padding-right: 0px;
border-right: 0px;
padding-right: 0px;
}
.intright {
border-left: 0px;
padding-left: 0px;
border-left: 0px;
padding-left: 0px;
}
.lst2 {
/*background-color: #F1F8FD;*/
background-color: #E7F0F9;
/*background-color: #F1F8FD;*/
background-color: #E7F0F9;
}
.lst1 {
background-color: #CFE3F1;
background-color: #CFE3F1;
}
.dlogin {
text-align: center;
text-align: center;
}
.login {
margin-left: auto;
margin-right: auto;
margin-left: auto;
margin-right: auto;
}
img {
border: 0px;
vertical-align: middle;
border: 0px;
vertical-align: middle;
}
.error {
color: red;
font-weight: bold;
color: red;
font-weight: bold;
}
/* Over quota class */
.over {
color: red;
color: red;
}
.code {
font-size: 16px;
font-family: Courier New, Fixed;
font-weight: bold;
text-align: center;
font-size: 16px;
font-family: Courier New, Fixed;
font-weight: bold;
text-align: center;
}
#global {
display: block;
margin-left: auto;
margin-right: auto;
margin-top: 20px;
margin-bottom: 20px;
width: 1020px;
border: 5px solid #1D6A9F;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color: #F0F0FA;
/* background: #F1F8FD url(/admin/images/bgborder.gif) repeat-y scroll top left; */
display: block;
margin-left: auto;
margin-right: auto;
margin-top: 20px;
margin-bottom: 20px;
width: 1020px;
border: 5px solid #1D6A9F;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color: #F0F0FA;
/* background: #F1F8FD url(/admin/images/bgborder.gif) repeat-y scroll top left; */
}
/* Main container */
#tdMenu, #tdContent {
vertical-align: top;
vertical-align: top;
}
#tdMenu {
border-right: 1px dotted #1D6A9F;
border-right: 1px dotted #1D6A9F;
}
#content {
display: block;
width: 770px;
padding-left: 10px;
padding-right: 10px;
vertical-align: top;
display: block;
width: 770px;
padding-left: 10px;
padding-right: 10px;
vertical-align: top;
}
/* Menu */
#menu {
display: block;
float: left;
padding: 0px;
margin: 0px;
width: 200px;
padding-right: 10px;
padding-bottom: 10px;
padding-left: 10px;
display: block;
float: left;
padding: 0px;
margin: 0px;
width: 200px;
padding-right: 10px;
padding-bottom: 10px;
padding-left: 10px;
}
.menu-box {
margin-bottom: 10px;
font-size: 11px;
margin-bottom: 10px;
font-size: 11px;
}
.menu-box .menu-title {
color: #000000;
border: 1px solid #1D6A9F;
background-color: #C0DCF0;
padding: 3px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
color: #000000;
border: 1px solid #1D6A9F;
background-color: #C0DCF0;
padding: 3px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.menu-box .menu-content {
margin-top: 1px;
margin-top: 1px;
}
.menu-box ul {
margin: 0px;
padding: 0px;
list-style-type: none;
margin: 0px;
padding: 0px;
list-style-type: none;
}
.menu-box a {
text-decoration: none;
color: #0D5689;
text-decoration: none;
color: #0D5689;
}
.menu-box a:hover {
text-decoration: underline;
color: #000000;
text-decoration: underline;
color: #000000;
}
.menu-box li a {
display: block;
display: block;
padding-top: 6px;
padding-bottom: 6px;
color: #0D5689;
padding-left: 2px;
text-decoration: none;
border: 1px solid #F1F8FD;
color: #0D5689;
padding-left: 2px;
text-decoration: none;
border: 1px solid #F1F8FD;
line-height: 0.75em;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-o-text-overflow: ellipsis; /* Opera 9*/
}
.menu-box li a img {
float: left;
width: 16px;
height: 16px;
margin: 0px;
padding: 0px;
top: -3px;
float: left;
width: 16px;
height: 16px;
margin: 0px;
padding: 0px;
top: -3px;
position: relative;
}
.menu-box li a:hover {
color: #000000;
border: 1px solid #1D6A9F;
text-decoration: none;
background-color: #DFEEF8;
color: #000000;
border: 1px solid #1D6A9F;
text-decoration: none;
background-color: #DFEEF8;
}
.menu-box .full {
color: red;
color: red;
}
/* Bars */
.barempty {
background-color: white;
border: 1px solid black;
height: 8px;
-webkit-border-radius:4px;
-moz-border-radius: 4px;
border-radius: 4px;
background-color: white;
border: 1px solid black;
height: 8px;
-webkit-border-radius:4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.barfill {
float: left;
background-color: red;
height: 8px;
float: left;
background-color: red;
height: 8px;
}
/* Infos */
#recap table {
text-align: center;
margin-left: auto;
margin-right: auto;
text-align: center;
margin-left: auto;
margin-right: auto;
}
table.searchtable {
width: 700px;
border: 1px dotted #99f;
margin: 20px 0 20px 0px;
width: 700px;
border: 1px dotted #99f;
margin: 20px 0 20px 0px;
}
table.searchtable td {
padding: 5px;
padding: 5px;
}
/* Others */
.center {
text-align: center;
margin-left: auto;
margin-right: auto;
text-align: center;
margin-left: auto;
margin-right: auto;
}
a {
text-decoration: none;
color: #0D5689;
text-decoration: none;
color: #0D5689;
}
a:hover {
text-decoration: underline;
color: #000000;
text-decoration: underline;
color: #000000;
}
.border {
border: 1px solid #C0DCF0;
border: 1px solid #C0DCF0;
}
.bold {
font-weight: bold;
font-weight: bold;
}
#sendthisfile {
margin-top: 6px;
margin-top: 6px;
}
.breadcrumb {
font-size: 12px;
font-size: 12px;
}
#newdomwww, #sub, #usernpfx, #dbnpfx {
border-right: 0;
padding-right: 0;
border-right: 0;
padding-right: 0;
}
#newdomain, #newsubname, #usern, #dbn {
border-left: 0;
padding-left: 0;
border-left: 0;
padding-left: 0;
}
#create_dom_list_pfx {
border-right: 0;
padding: 3px;
border-right: 0;
padding: 3px;
}
#create_dom_list {
border-left: 0;
padding-left: 0;
border-left: 0;
padding-left: 0;
}
input#email {
border-right: 0;
padding-right: 0;
text-align: right;
border-right: 0;
padding-right: 0;
text-align: right;
}
span#emaildom {
border-left: 0;
padding-left: 2px;
border-left: 0;
padding-left: 2px;
}
.tedit {
border: 1px solid #aaa;
padding: 6px;
margin: 0;
border-collapse: collapse;
border: 1px solid #aaa;
padding: 6px;
margin: 0;
border-collapse: collapse;
}
.tedit td, .tedit th {
border: 1px solid #aaa;
padding: 10px;
margin: 0;
}
border: 1px solid #aaa;
padding: 10px;
margin: 0;
}
.formcell {
vertical-align: top;
border: 1px solid #aaa;
padding: 10px;
}
vertical-align: top;
border: 1px solid #aaa;
padding: 10px;
}
.tlist, .tlist td, .tlist th,
.tlist2, .tlist2 td, .tlist2 th {
padding: 4px;
margin: 0;
border-collapse: collapse;
}
padding: 4px;
margin: 0;
border-collapse: collapse;
}
.tlist {
width: 100%;
}
width: 100%;
}
.tlistb, .tlistb td, .tlistb th {
padding: 4px;
margin: 0;
border-collapse: collapse;
}
padding: 4px;
margin: 0;
border-collapse: collapse;
}
table.tlistb, .tlistb tr {
border: solid 1px #AAA;
border: solid 1px #AAA;
}
.tlist tr:hover, .tlist2 tr:hover {
background-color: #F1D5CF;
}
background-color: #F1D5CF;
}
.tlist th, .tlist2 th {
font-weight: bold;
font-weight: bold;
}
input#dir, input#sub_local {
width: 200px;
}
width: 200px;
}
.warningmsg {
width: 500px;
width: 500px;
}
#mx {
width: 300px;
width: 300px;
}
#admlistbtn {
padding-bottom: 6px;
padding-bottom: 6px;
}
.advdom {
padding-top: 6px;
padding-top: 6px;
}
.grey, .grey td {
color: #999;
color: #999;
}

View File

@ -200,6 +200,9 @@ ALTER TABLE `domaines_type` ADD create_tmpdir BOOLEAN NOT NULL DEFAULT FALSE ;
ALTER TABLE `domaines_type` ADD create_targetdir BOOLEAN NOT NULL DEFAULT FALSE ;
UPDATE domaines_type SET create_tmpdir=true, create_targetdir=true WHERE target='DIRECTORY';
-- Allow 255 caracters in the tld
ALTER IGNORE TABLE domaines MODIFY domaine VARCHAR(255);
-- Defaults subdomains to create when a domain is added
CREATE TABLE IF NOT EXISTS `default_subdomains` (
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,