diff --git a/bureau/admin/adm_add.php b/bureau/admin/adm_add.php index 5852707e..e1a77ccb 100644 --- a/bureau/admin/adm_add.php +++ b/bureau/admin/adm_add.php @@ -43,16 +43,16 @@ $fields = array ( getFields($fields); ?> -

+

$error

"; } ?> -
- + +
@@ -64,14 +64,9 @@ if ($error) { - @@ -104,9 +99,9 @@ if ($error) { enum_domains()) { ?> - - - +
- +
+ + >
+ >
- - - + + login.
" />
+ " /> + " onclick="document.location='adm_list.php'" /> +
+ diff --git a/bureau/admin/adm_doedit.php b/bureau/admin/adm_doedit.php index c6f9a4e0..4182e6c1 100644 --- a/bureau/admin/adm_doedit.php +++ b/bureau/admin/adm_doedit.php @@ -48,6 +48,10 @@ if ($pass != $passconf) { include("adm_edit.php"); exit(); } +// When changing its own account, enabled forced to 1. +if ($uid==$mem->user["uid"]) { + $enabled=1; + } if (!$admin->update_mem($uid, $nmail, $nom, $prenom, $pass, $enabled, $canpass, $type, $duration, $notes)){ $error=$err->errstr(); diff --git a/bureau/admin/adm_edit.php b/bureau/admin/adm_edit.php index 23639cea..3edd4069 100644 --- a/bureau/admin/adm_edit.php +++ b/bureau/admin/adm_edit.php @@ -70,8 +70,12 @@ if (!$r=$admin->get($uid)) { + user["uid"]) { ?> + + >
>
+ @@ -122,8 +126,7 @@ if (!$r=$admin->get($uid)) { " /> - " onclick="document.location='adm_list.php'" /> - + " onclick="document.location='adm_list.php'" /> @@ -149,7 +152,7 @@ if (!$r=$admin->get($uid)) {

user["uid"]==2000) { // Only ADMIN (2000) can change the admin status of accounts +if ($mem->user["uid"]==2000 && $r["uid"]!=2000) { // Only ADMIN (2000) can change the admin status of accounts if ($r["su"]) { ?>

@@ -164,7 +167,6 @@ if ($r["su"]) {

-

get($r["creator"]); diff --git a/bureau/admin/adm_list.php b/bureau/admin/adm_list.php index 0aa04e19..0ccfbe90 100644 --- a/bureau/admin/adm_list.php +++ b/bureau/admin/adm_list.php @@ -41,9 +41,16 @@ if (!$admin->enabled) { $fields = array ( "show" => array ("request", "string", ""), "creator" => array("request", "integer", 0), + "short" => array("request", "integer", -1), ); getFields($fields); + +if ($short!=-1) { + $mem->adminpref($short); + $mem->user["admlist"]=$short; + } + $subadmin=variable_get("subadmin_restriction"); if ($subadmin==0 && $show && $cuid != 2000) @@ -56,17 +63,18 @@ if ($subadmin==0 && $show && $cuid != 2000) $r=$admin->get_list($show == 'all' ? 1 : 0, $creator); ?> -

+

$error

"; } ?>

- + () +   ' . _('List all the accounts') . ''; + echo '
' . _('List all AlternC accounts') . ''; if ($subadmin!=0 || $cuid==2000) { $list_creators = $admin->get_creator_list(); $infos_creators = array(); @@ -80,9 +88,9 @@ $r=$admin->get_list($show == 'all' ? 1 : 0, $creator); } } } else { - echo '
' . _('List only my accounts') . ''; + echo '
' . _('List only my AlternC accounts') . ''; } ?> -
+

">

user["admlist"]==0) { // Normal (large) mode ?> - +
+ + + - - - + + + - + - + + - + - + - - - - - - + @@ -148,20 +155,56 @@ while (list($key,$val)=each($r)) + + + + +user["admlist"]==1) { // Short mode TODO : make 3 columns instead of 2 + XHTML compliance instead of 1px img trick ;) +if ($mem->user["admlist"]==1) { // SHORT MODE ?> + [  ]     + [  ]     + [  ]     -
+5) { ?> +" /> + + +   + +
("._("Email address").")"; ?>
   " />" /> ">">">"; - else { - ?> - "> - - >> "> 
renew_get_expiry($val['uid']) ?>
+
+ lst"> + "> +  +   + lst" > + "> +  + lst" > + "> +  + + lst" > + "> +  + +
+
+
+ + + - - - + + + " /> - + "> - + "; @@ -227,17 +261,13 @@ if (is_array($val)) { - + "; @@ -246,11 +276,10 @@ if (is_array($val)) { ?> - +
+50) { ?> +" /> + + +   + +
   
- "> - "> - "; - else { - ?> - " target="_parent"> - + " target="_parent">[  ] + ">[  ] +checkcreator($val['uid'])) { ?> + ">[  ] + ">"> - "> - "> - "; - else { - if($admin->checkcreator($val['uid'])) { - ?> - " target="_parent"> - + " target="_parent">[  ] + ">[  ] +checkcreator($val['uid'])) { ?> + ">[  ] + ">">
"> - "> - "> - "; - else { - ?> - " target="_parent"> - + " target="_parent">[  ] + ">[  ] +checkcreator($val['uid'])) { ?> + ">[  ] + ">">
" />
" />
"._("%s accounts")."

",count($r)); - } + } ?> diff --git a/bureau/admin/styles/style.css b/bureau/admin/styles/style.css index 6de2c9ae..a43677af 100644 --- a/bureau/admin/styles/style.css +++ b/bureau/admin/styles/style.css @@ -33,7 +33,7 @@ td { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #000000; - padding-right: 10px; + padding-right: 6px; } th { @@ -106,33 +106,33 @@ hr { background-color: #BFD3E1; } -.ina { +.ina:hover, .ina, .inav, .inav:hover { border: 1px solid #999; - background-color: #F1F8FD; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - padding: 2px 4px 2px 4px; - color: black; - -} -.ina:hover { - border: 1px solid #999; - background-color: #CFE3F1; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; padding: 2px 4px 2px 4px; color: black; cursor: pointer; } -.ina a { +.ina { + background-color: #F1F8FD; +} +.ina:hover, .inav { + background-color: #CFE3F1; +} +.inav:hover { + background-color: #F1F8FD; +} + +.ina a, .inav a { color: black; } -.ina a:hover { +.ina a:hover, .inav a:hover { text-decoration: none; color: black; } -.ina img { +.ina img, .ina img { vertical-align: middle; padding: 2px; } @@ -366,6 +366,15 @@ a:hover { padding-left: 0; } +#create_dom_list_pfx { + border-right: 0; + padding: 3px; +} +#create_dom_list { + border-left: 0; + padding-left: 0; +} + input#email { @@ -398,7 +407,7 @@ span#emaildom { } .tlist, .tlist td, .tlist th { - padding: 6px; + padding: 4px; margin: 0; border-collapse: collapse; } @@ -415,3 +424,6 @@ input#dir, input#sub_local { width: 300px; } +#admlistbtn { + padding-bottom: 6px; +} \ No newline at end of file diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po index ef4d842b..be3dade7 100644 --- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po +++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po @@ -41,8 +41,8 @@ msgid "This page is restricted to authorized staff" msgstr "Cette page est réservée aux administrateurs" #: ../admin/adm_add.php:46 -msgid "New member" -msgstr "Ajout d'un membre" +msgid "New AlternC account" +msgstr "Créer un compte AlternC" #: ../admin/adm_add.php:54 ../admin/adm_edit.php:61 ../admin/adm_list.php:78 #: ../admin/adm_list.php:131 ../admin/adm_list.php:132 @@ -112,13 +112,13 @@ msgstr "Type de compte" #: ../admin/adm_add.php:102 ../admin/adm_add.php:104 ../admin/adm_add.php:108 #, php-format -msgid "Create the domain username.%s" -msgstr "Installer le domaine login.%s" +msgid "Install the domain" +msgstr "Installer le domaine" #: ../admin/adm_add.php:106 ../admin/adm_list.php:62 ../admin/adm_list.php:59 #: ../admin/adm_add.php:119 ../admin/adm_add.php:124 ../admin/adm_list.php:82 -msgid "Create a new member" -msgstr "Créer un nouveau membre" +msgid "Create this AlternC account" +msgstr "Créer ce compte AlternC" #: ../admin/adm_defquotas.php:43 ../admin/adm_panel.php:50 #: ../admin/adm_panel.php:49 ../admin/adm_defquotas.php:42 @@ -370,16 +370,16 @@ msgid "Back to the account list" msgstr "Retour à la liste des comptes" #: ../admin/adm_list.php:46 ../admin/adm_list.php:56 -msgid "Member list" -msgstr "Liste des membres" +msgid "AlternC account list" +msgstr "Liste des comptes AlternC" #: ../admin/adm_list.php:53 ../admin/adm_list.php:63 -msgid "Here is the list of hosted members" -msgstr "Voici la liste des membres hébergés" +msgid "Here is the list of hosted AlternC accounts" +msgstr "Voici la liste des comptes AlternC hébergés" #: ../admin/adm_list.php:56 ../admin/adm_list.php:55 ../admin/adm_list.php:66 -msgid "List all the accounts" -msgstr "Lister tous les comptes" +msgid "List all AlternC accounts" +msgstr "Liste de tous les comptes AlternC" #: ../admin/adm_list.php:58 ../admin/adm_list.php:57 ../admin/adm_list.php:80 msgid "List only my accounts" @@ -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 "Recent fail" -msgstr "Échec récent" +msgid "Fails" +msgstr "Échecs" #: ../admin/adm_list.php:78 ../admin/adm_list.php:76 ../admin/adm_list.php:107 msgid "Last ip" @@ -424,7 +424,7 @@ msgstr "Compte verrouill #: ../admin/adm_list.php:103 ../admin/adm_list.php:135 msgid "Connect as" -msgstr "Connection" +msgstr "Se connecter" #: ../admin/adm_list.php:153 ../admin/adm_list.php:174 #: ../admin/adm_list.php:199 ../admin/adm_list.php:185 @@ -2376,7 +2376,7 @@ msgid "Update this page" msgstr "Recharger cette page" #: ../admin/adm_list.php:97 ../admin/adm_list.php:128 -msgid "Deactivate" +msgid "Disable" msgstr "Désactiver" #: ../admin/adm_list.php:222 ../admin/adm_list.php:254 @@ -2556,7 +2556,7 @@ msgstr "Notes" #: ../admin/adm_list.php:103 msgid "Created by" -msgstr "Créé par" +msgstr "Créateur" #: ../admin/bro_editor.php:63 msgid "ctrl+click or shift+click and drag to resize the editing zone" @@ -2847,3 +2847,10 @@ msgstr "Cr msgid "Created on" msgstr "Créé le" + +msgid "Account" +msgstr "Compte" + + +msgid "Create a new AlternC account" +msgstr "Créer un nouveau compte AlternC"