diff --git a/bureau/admin/adm_deactivate.php b/bureau/admin/adm_deactivate.php index ef743ac7..d0bb249e 100644 --- a/bureau/admin/adm_deactivate.php +++ b/bureau/admin/adm_deactivate.php @@ -56,8 +56,9 @@ if (! ($confirmed = ($_GET['submit'] == _("Confirm")) ) ) { ?>
- - " /> + + " /> + " onclick="document.location='adm_list.php'"/>
" . _("Domains of user: ") . $r["login"] . ""; @@ -96,32 +97,34 @@ foreach ($domains as $key => $domain) { } $dom->unlock(); # 2. for each subdomain - foreach ($r['sub'] as $k => $sub) { - # shortcuts - $type = $sub['type']; - $dest = $sub['dest']; - $sub = $sub['name']; - # if it's a real website - if ($type == $dom->type_local) { - if (!$confirmed) { - print "
  • "; - if ($sub) { - print $sub . '.'; - } - print "$domain -> $dest
  • "; - } else { + if (is_array($r['sub'])) { + foreach ($r['sub'] as $k => $sub) { +# shortcuts + $type = $sub['type']; + $dest = $sub['dest']; + $sub = $sub['name']; +# if it's a real website + if ($type == $dom->type_local) { + if (!$confirmed) { + print "
  • "; + if ($sub) { + print $sub . '.'; + } + print "$domain -> $dest
  • "; + } else { - # 2.1 keep a copy of where it was, in an SQL request - $backup .= "UPDATE `sub_domaines` SET `type`='$type', valeur='$dest' WHERE `domaine`='$domain' AND sub='$sub';\n"; - $backup .= "DELETE FROM `sub_domaines_standby` WHERE domaine='$domain' and sub='$sub';\n"; - $backup .= "INSERT INTO sub_domaines_standby (compte,domaine,sub,valeur,type,action) values ('$cuid','$domain','$sub','$dest','$type',1);\n"; // UPDATE - - # 2.2 change the subdomain to redirect to http://spam.koumbit.org/ - $dom->lock(); - if (!$dom->set_sub_domain($domain, $sub, $dom->type_url, "edit", $redirect)) { - print "-- error in $sub.$domain: " . $err->errstr() . "\n"; +# 2.1 keep a copy of where it was, in an SQL request + $backup .= "UPDATE `sub_domaines` SET `type`='$type', valeur='$dest' WHERE `domaine`='$domain' AND sub='$sub';\n"; + $backup .= "DELETE FROM `sub_domaines_standby` WHERE domaine='$domain' and sub='$sub';\n"; + $backup .= "INSERT INTO sub_domaines_standby (compte,domaine,sub,valeur,type,action) values ('$cuid','$domain','$sub','$dest','$type',1);\n"; // UPDATE + +# 2.2 change the subdomain to redirect to http://spam.koumbit.org/ + $dom->lock(); + if (!$dom->set_sub_domain($domain, $sub, $dom->type_url, "edit", $redirect)) { + print "-- error in $sub.$domain: " . $err->errstr() . "\n"; + } + $dom->unlock(); } - $dom->unlock(); } } } diff --git a/bureau/admin/adm_list.php b/bureau/admin/adm_list.php index 15d5879d..0aa04e19 100644 --- a/bureau/admin/adm_list.php +++ b/bureau/admin/adm_list.php @@ -100,15 +100,15 @@ if ($mem->user["admlist"]==0) { // Normal (large) mode ?> - + - + - + setquota($key,$$var); + $quota->setquota($key,$_REQUEST[$var]); } $mem->unsu(); $error=_("The quotas has been successfully edited"); diff --git a/bureau/admin/adm_quotaedit.php b/bureau/admin/adm_quotaedit.php index 15e57ef6..28469535 100644 --- a/bureau/admin/adm_quotaedit.php +++ b/bureau/admin/adm_quotaedit.php @@ -61,10 +61,10 @@ $mem->unsu(); } ?> -
      ("._("Email address").")"; ?>
    renew_get_expiry($val['uid']) ?>
    +
    - +qlist(); reset($ql); @@ -80,7 +80,10 @@ while (list($key,$val)=each($ql)) { echo ""; } ?> -
     
    " /> +
    + " /> + " onclick="document.location='adm_list.php'" /> +
    diff --git a/bureau/locales/fr_FR/LC_MESSAGES/manual.po b/bureau/locales/fr_FR/LC_MESSAGES/manual.po index 3adf90dd..d64aae24 100644 --- a/bureau/locales/fr_FR/LC_MESSAGES/manual.po +++ b/bureau/locales/fr_FR/LC_MESSAGES/manual.po @@ -772,7 +772,7 @@ msgstr "%1$d/%2$d/%3$d %4$d:%5$d" #. 1 2 3 #. eg: english : %3$d/%1$d/%2$d msgid "%3$d-%2$d-%1$d" -msgstr "%1$d/%2$d/%3$d" +msgstr "%1$02d/%2$02d/%3$04d" msgid "AlternC's account password" msgstr "Mots de passe des comptes AlternC" diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po index 11b05372..ef4d842b 100644 --- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po +++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po @@ -394,8 +394,8 @@ msgid "Last login" msgstr "Dernière connexion" #: ../admin/adm_list.php:78 ../admin/adm_list.php:76 ../admin/adm_list.php:106 -msgid "Last fail" -msgstr "Dernier échec" +msgid "Recent fail" +msgstr "Échec récent" #: ../admin/adm_list.php:78 ../admin/adm_list.php:76 ../admin/adm_list.php:107 msgid "Last ip" @@ -2845,3 +2845,5 @@ msgstr "qui existe dans ce r msgid "Create this new MySQL user" msgstr "Créer ce nouvel utilisateur MySQL" +msgid "Created on" +msgstr "Créé le"