parameter checking in subdomain creation, + translations added in dom_subdodel.php
This commit is contained in:
Benjamin Sonntag
parent
b851385d72
commit
d2c5c63811
|
|
@ -41,15 +41,15 @@ include("head.php");
|
|||
?>
|
||||
</head>
|
||||
<body>
|
||||
<h3>Suppression du sous-domaine http://<?php ecif($sub,$sub."."); echo $domain; ?> : </h3>
|
||||
<h3><?=sprintf(_("Deleting the subdomain %s:"),"http://".(($sub)?$sub.".":$sub).$domain); ?></h3>
|
||||
<?php
|
||||
if ($error) {
|
||||
echo "<p class=\"error\">$error</p></body></html>";
|
||||
exit();
|
||||
} else {
|
||||
echo "<p class=\"error\">Le sous-domaine a ete supprime, les modifications seront prises en comptes dans 5 minutes.</p>";
|
||||
echo "<p class=\"error\">"._("The subdomain has been deleted. Changes will take place in 5 minutes.")."</p>";
|
||||
}
|
||||
?>
|
||||
<p><a href="dom_edit.php?domain=<?php echo urlencode($domain) ?>">Continuer</a></p>
|
||||
<p><a href="dom_edit.php?domain=<?php echo urlencode($domain) ?>"><?php __("Click here to continue"); ?></a></p>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -165,11 +165,12 @@ function checkfqdn($fqdn) {
|
|||
// Retourne 0 si tout va bien, sinon, retourne un code erreur...
|
||||
// 1. Nom de domaine complet trop long.
|
||||
// 2. L'un des membres est trop long.
|
||||
// 3. Caract?re interdit dans l'un des membres.
|
||||
// 3. Caractere interdit dans l'un des membres.
|
||||
// 4. Le fqdn ne fait qu'un seul membre (il n'est donc pas fq...)
|
||||
if (strlen($fqdn)>255)
|
||||
return 1;
|
||||
$members=explode(".", $fqdn);
|
||||
if (count($members)>1) {
|
||||
if (count($members)>1) $ret=0; else $ret=4;
|
||||
reset($members);
|
||||
while (list ($key, $val) = each ($members)) {
|
||||
if (strlen($val)>63)
|
||||
|
|
@ -178,10 +179,7 @@ function checkfqdn($fqdn) {
|
|||
/*"*/ return 3;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return 4;
|
||||
}
|
||||
return 0;
|
||||
return $ret;
|
||||
}
|
||||
|
||||
function checkuserpath($path) {
|
||||
|
|
|
|||
|
|
@ -631,11 +631,13 @@ class m_dom {
|
|||
return false;
|
||||
}
|
||||
$dest=trim($dest);
|
||||
$sub=trim(trim($sub),".");
|
||||
$dom=strtolower($dom);
|
||||
$sub=strtolower($sub);
|
||||
|
||||
// if (!(($sub == '*') || ($sub=="") || (preg_match('/([a-z0-9][\.\-a-z0-9]*)?[a-z0-9]/', $sub)))) {
|
||||
if (($sub != '*') && checkfqdn($sub)) {
|
||||
$fqdn=checkfqdn($sub);
|
||||
if (($sub != '*') && !($fqdn==0 || $fqdn==4)) {
|
||||
$err->raise("dom",24);
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -860,7 +860,7 @@ msgstr "The requested raw statistic set has not been found."
|
|||
#~ msgid "No files in this folder"
|
||||
#~ msgstr "No files in this folder"
|
||||
|
||||
msgid "help_dns_mx"
|
||||
msgid "help_dns_mx %s %s"
|
||||
msgstr ""
|
||||
"If we manage your DNS <br />You can manage your mails elsewhere if you "
|
||||
"want (MX field).<br />Write <b><code>%s</code></b> in this field if your "
|
||||
|
|
@ -872,11 +872,11 @@ msgid "help_dns_mail"
|
|||
msgstr ""
|
||||
"If we don't manage the DNS for this domain <br />do we manage your mails?"
|
||||
|
||||
#~ msgid "help_domain_del"
|
||||
#~ msgstr ""
|
||||
#~ "If you want to delete the domain %s, click the button below.Warning : "
|
||||
#~ "this delete all the ftp, mails, mailing-lists ... associated with "
|
||||
#~ "thisdomain and all its subdomains!"
|
||||
msgid "help_domain_del %s"
|
||||
msgstr ""
|
||||
"If you want to delete the domain %s, click the button below.Warning : "
|
||||
"this delete all the ftp, mails, mailing-lists ... associated with "
|
||||
"thisdomain and all its subdomains!"
|
||||
|
||||
#~ msgid "Domain hosting"
|
||||
#~ msgstr "Domain hosting"
|
||||
|
|
@ -1192,7 +1192,7 @@ msgstr ""
|
|||
msgid "help_sql_list_ok"
|
||||
msgstr ""
|
||||
"You can create various databases<br />Click on 'SQL Admin' in the menu to "
|
||||
manage them<br />or use the table below to backup, retrieve or delete "
|
||||
"manage them<br />or use the table below to backup, retrieve or delete "
|
||||
"them:"
|
||||
|
||||
msgid "help_sql_list_no"
|
||||
|
|
|
|||
|
|
@ -2211,3 +2211,8 @@ msgstr "Nouveau nom : "
|
|||
msgid "Image_Graph not installed. use 'aptitude install php-pear' then 'pear --alldeps install Image_Graph-devel' to see the graph."
|
||||
msgstr "Image_Graph n'est pas installée. Lancez 'aptitude install php-pear' puis 'pear --alldeps install Image_Graph-devel' pour voir le graphique."
|
||||
|
||||
msgstr "The subdomain has been deleted. Changes will take place in 5 minutes."
|
||||
msgid "Le sous-domaine a ete supprime, les modifications seront prises en comptes dans 5 minutes."
|
||||
|
||||
msgstr "Deleting the subdomain %s:"
|
||||
msgid "Effacement du sous-domaine %s : "
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
alternc (0.9.6.5) testing; urgency=low
|
||||
|
||||
* parameter checking in subdomain creation (#1037)
|
||||
* Changing ownership of /var/alternc/tmp, makes file upload work again (#1058)
|
||||
* Force the restart of apache & apache-ssl (#1000)
|
||||
* Redirect are now done on http://$url$1 base, not $url/$1 (#1054)
|
||||
|
|
|
|||
Loading…
Reference in New Issue