diff --git a/evoadmin/htdocs/admin.php b/evoadmin/htdocs/admin.php
index 79c54b5..b7cb5a5 100755
--- a/evoadmin/htdocs/admin.php
+++ b/evoadmin/htdocs/admin.php
@@ -91,9 +91,9 @@ if (isset($_SESSION['login'])) {
}
} else {
- $rdn= "ou=people," .LDAP_BASE;
+ $rdn= "ou=people," .LDAP_BASE;
}
- $_SESSION['rdn'] = $rdn;
+ $_SESSION['rdn'] = $rdn;
include EVOADMIN_BASE . 'debut.php';
@@ -101,7 +101,7 @@ if (isset($_SESSION['login'])) {
$comptes = array();
// tableau contenant tous les alias
$aliases = array();
-
+
$ldapconn = Ldap::lda_connect(LDAP_ADMIN_DN,LDAP_ADMIN_PASS);
//$filter="(objectClass=mailAccount)";
@@ -124,14 +124,14 @@ if (isset($_SESSION['login'])) {
// compatibilite anciens schemas
if ($conf['evoadmin']['version'] == 1) {
$filter="(&(objectClass=mailAlias)(onlyAlias=TRUE))";
- }
+ }
$sr=ldap_search($ldapconn, $rdn, $filter);
$info = ldap_get_entries($ldapconn, $sr);
-
+
for ($i=0;$i<$info["count"];$i++) {
array_push($aliases,$info[$i]["cn"][0]);
}
-
+
ldap_unbind($ldapconn);
//tri alphanumeriques des tableaux
@@ -164,9 +164,9 @@ if (isset($_SESSION['login'])) {
}
if ( (!isset($_POST['viewonly'])) || ($_POST['viewonly']==1) ) {
-
+
?>
-
+
Liste des comptes :
";
} elseif ( (isset($_POST['viewonly'])) && ($_POST['viewonly']==2) ) {
-
+
?>
Liste des alias/groupe de diffusion :
-
+
Nom de l'alias/groupe de diffusion
@@ -244,7 +244,7 @@ if (isset($_SESSION['login'])) {
+?>
diff --git a/evoadmin/htdocs/compte.php b/evoadmin/htdocs/compte.php
index 837542d..752434b 100755
--- a/evoadmin/htdocs/compte.php
+++ b/evoadmin/htdocs/compte.php
@@ -77,20 +77,20 @@ if (isset($_SESSION['login']))
print "Modification en cours...
";
// TODO : contraintes sur cn, sn, etc.
- if ( $cn != Html::clean($_POST['cn']) ) {
+ if ( $cn != Html::clean($_POST['cn']) ) {
$new["cn"] = Html::justclean(Html::purgeaccents(utf8_decode($_POST['cn'])));
-
+
if ($conf['evoadmin']['version'] == 1) {
$new["sn"] = $new["cn"];
}
}
- if ( ($conf['evoadmin']['version'] > 1) && (!$conf['domaines']['ldap']['virtual']) && ( $sn != Html::clean($_POST['sn']) ) ) {
+ if ( ($conf['evoadmin']['version'] > 1) && (!$conf['domaines']['ldap']['virtual']) && ( $sn != Html::clean($_POST['sn']) ) ) {
$new["sn"] = Html::justclean(Html::purgeaccents(utf8_decode($_POST['sn'])));
}
- if ( (!$conf['domaines']['ldap']['virtual']) && ( $mail != Html::clean($_POST['mail']) )) {
+ if ( (!$conf['domaines']['ldap']['virtual']) && ( $mail != Html::clean($_POST['mail']) )) {
$new["mail"] = Html::clean($_POST['mail']);
}
@@ -122,16 +122,16 @@ if (isset($_SESSION['login']))
}
- $postisactive = (isset($_POST['isactive']) ? 'TRUE' : 'FALSE');
- if ( $info[0]["isactive"][0] != $postisactive ) {
+ $postisactive = (isset($_POST['isactive']) ? 'TRUE' : 'FALSE');
+ if ( $info[0]["isactive"][0] != $postisactive ) {
$new["isActive"] = $postisactive;
}
- $postisadmin = (isset($_POST['isadmin']) ? 'TRUE' : 'FALSE');
- if ( $info[0]["isadmin"][0] != $postisadmin ) {
+ $postisadmin = (isset($_POST['isadmin']) ? 'TRUE' : 'FALSE');
+ if ( $info[0]["isadmin"][0] != $postisadmin ) {
$new["isAdmin"] = $postisadmin;
}
-
+
if ($_POST['loginshell'] != $info[0]['loginshell'][0]) {
$new["loginShell"] = Html::clean($_POST['loginshell']);
}
@@ -139,23 +139,23 @@ if (isset($_SESSION['login']))
// only for mail mode
if (($conf['admin']['what'] == 1) || ($conf['admin']['what'] == 3)) {
- $postaccountactive = (isset($_POST['accountactive']) ? 'TRUE' : 'FALSE');
- if ( $info[0]["accountactive"][0] != $postaccountactive ) {
+ $postaccountactive = (isset($_POST['accountactive']) ? 'TRUE' : 'FALSE');
+ if ( $info[0]["accountactive"][0] != $postaccountactive ) {
$new["accountActive"] = $postaccountactive;
}
- $postauthsmtpactive = (isset($_POST['authsmtpactive']) ? 'TRUE' : 'FALSE');
- if ( $info[0]["authsmtpactive"][0] != $postauthsmtpactive ) {
+ $postauthsmtpactive = (isset($_POST['authsmtpactive']) ? 'TRUE' : 'FALSE');
+ if ( $info[0]["authsmtpactive"][0] != $postauthsmtpactive ) {
$new["authsmtpActive"] = $postauthsmtpactive;
}
- $postwebmailactive = (isset($_POST['webmailactive']) ? 'TRUE' : 'FALSE');
- if ( $info[0]["webmailactive"][0] != $postwebmailactive ) {
+ $postwebmailactive = (isset($_POST['webmailactive']) ? 'TRUE' : 'FALSE');
+ if ( $info[0]["webmailactive"][0] != $postwebmailactive ) {
$new["webmailActive"] = $postwebmailactive;
}
- $postcourieractive = (isset($_POST['courieractive']) ? 'TRUE' : 'FALSE');
- if ( $info[0]["courieractive"][0] != $postcourieractive ) {
+ $postcourieractive = (isset($_POST['courieractive']) ? 'TRUE' : 'FALSE');
+ if ( $info[0]["courieractive"][0] != $postcourieractive ) {
$new["courierActive"] = $postcourieractive;
}
@@ -170,7 +170,7 @@ if (isset($_SESSION['login']))
}
$newmailaccept = array_pop($_POST['mailaccept']);
- if ( ($newmailaccept != NULL) |
+ if ( ($newmailaccept != NULL) |
array_diff($info[0]["mailacceptinggeneralid"],$_POST['mailaccept']) ) {
$new["mailacceptinggeneralid"] = $_POST['mailaccept'];
$new["mailacceptinggeneralid"][$count]= $newmailaccept;
@@ -180,7 +180,7 @@ if (isset($_SESSION['login']))
while ( $new["mailacceptinggeneralid"][0] == NULL ) {
array_shift($new["mailacceptinggeneralid"]);
- // on evite une boucle infinie
+ // on evite une boucle infinie
if ( count($new["mailacceptinggeneralid"]) == 0 ) {
print "Erreur, vous devez avoir au moins un mail entrant\n";
exit(1);
@@ -191,7 +191,7 @@ if (isset($_SESSION['login']))
// idem avec maildrop
$count = array_shift($info[0]["maildrop"]);
$newmaildrop = array_pop($_POST['maildrop']);
- if ( ($newmaildrop != NULL) |
+ if ( ($newmaildrop != NULL) |
array_diff($info[0]["maildrop"],$_POST['maildrop']) ) {
$new["maildrop"] = $_POST['maildrop'];
$new["maildrop"][$count]= $newmaildrop;
@@ -214,12 +214,12 @@ if (isset($_SESSION['login']))
// only for samba mode
if (($conf['admin']['what'] == 2) || ($conf['admin']['what'] == 3)) {
- $postsmbactive = (isset($_POST['smbactive']) ? 'TRUE' : 'FALSE');
- if ( $info[0]["smbactive"][0] != $postsmbactive ) {
+ $postsmbactive = (isset($_POST['smbactive']) ? 'TRUE' : 'FALSE');
+ if ( $info[0]["smbactive"][0] != $postsmbactive ) {
$new["smbActive"] = $postsmbactive;
}
- if ( $displayname != Html::clean($_POST['displayname']) ) {
+ if ( $displayname != Html::clean($_POST['displayname']) ) {
$new["displayname"] = Html::clean($_POST['displayname']);
}
}
@@ -242,7 +242,7 @@ if (isset($_SESSION['login']))
} else {
print "Aucune modification nécessaire.
";
}
-
+
print "";
/*
@@ -259,7 +259,7 @@ if (isset($_SESSION['login']))
print "Erreur, compte inexistant
";
EvoLog::log("login $uid unknown");
exit(1);
- }
+ }
print "\n";
print "Modification du compte $uid \n";
@@ -294,7 +294,7 @@ if (isset($_SESSION['login']))
// Compatibilite anciens schemas LDAP
if ($conf['evoadmin']['version'] == 1) {
-
+
print "Mail principal :";
print " $mail \n";
print " ";
@@ -318,16 +318,16 @@ if (isset($_SESSION['login']))
print "Nom dans Samba :
\n";
-
+
print '
Shell :
-
';
-
+
print "Groupe Samba :
$sambagroup \n";
}
@@ -344,7 +344,7 @@ if (isset($_SESSION['login']))
for ($i=0;$i<$info[0]["mailacceptinggeneralid"]['count'];$i++) {
-
+
if (!$conf['domaines']['onlyone']) {
$info[0]['mailacceptinggeneralid'][$i] =
ereg_replace('@'.$_SESSION['domain'],'',$info[0]['mailacceptinggeneralid'][$i]);
@@ -432,7 +432,7 @@ if (isset($_SESSION['login']))
print "
\n";
print " ";
-
+
print "
\n";
print '';
}
@@ -443,7 +443,7 @@ if (isset($_SESSION['login']))
} elseif ( isset($_GET['del']) ) {
$uid = Html::clean($_GET['del']);
-
+
if ( (isset($_GET['modif'])) && ($_GET['modif'] == 'yes')) {
$ldapconn = Ldap::lda_connect(LDAP_ADMIN_DN,LDAP_ADMIN_PASS);
@@ -463,7 +463,7 @@ if (isset($_SESSION['login']))
EvoLog::log("Delete $uid failed (user always in aliases).");
// LDAP deletion
} elseif (Ldap::lda_del($ldapconn,"uid=" .$uid. "," .$rdn)) {
-
+
if (!$conf['domaines']['ldap']['virtual']) {
// script suppression systeme
unix_del($uid);
@@ -473,7 +473,7 @@ if (isset($_SESSION['login']))
// $query = 'delete from horde_prefs where pref_uid="' .$uid. '"';
print "Suppression $uid effectuée.
";
-
+
EvoLog::log("Del user ".$uid);
} else {
@@ -482,13 +482,13 @@ if (isset($_SESSION['login']))
}
print "";
-
+
} else {
- print "";
+ print "";
print "Vous allez effacer complètement l'utilisateur $uid ";
print "Tous ses messages et paramètres seront définitivement perdus.
";
print "Confirmer la suppression ";
- print " ";
+ print " ";
}
// Ajouter un compte
@@ -503,7 +503,7 @@ if (isset($_SESSION['login']))
*/
if ( (isset($_GET['modif'])) && ($_GET['modif'] == 'yes')) {
- // Verification coherence des mots de passe
+ // Verification coherence des mots de passe
if ( $_POST['pass1'] != $_POST['pass2'] ) {
print "";
print "Ajout en cours...";
-
+
// TODO : generer un UID different en LDAP non-virtual !!!
$info["uid"]=$uid;
// recuperer un uid number valide
@@ -592,7 +592,7 @@ if (isset($_SESSION['login']))
}
$info["gidNumber"]= $gid;
$info["objectclass"][0] = "posixAccount";
-
+
if (!$conf['domaines']['ldap']['virtual']) {
$info["objectclass"][1] = "shadowAccount";
$info["objectclass"][2] = "inetorgperson";
@@ -628,7 +628,7 @@ if (isset($_SESSION['login']))
$info["loginShell"] = Html::clean($_POST['loginshell']);
$info["sn"] = $sn;
$info["homeDirectory"] = "/home/" .$uid;
-
+
// TODO: rajouter un isset pour verifier la presence de ce champ optionnel
if ( $mail != '') {
$info["mail"] = $mail;
@@ -640,7 +640,7 @@ if (isset($_SESSION['login']))
// Cas d'un compte mail
if (($conf['admin']['what'] == 1) || ($conf['admin']['what'] == 3)) {
- // Aliases
+ // Aliases
$aliases = $_POST['alias'];
// Compatibilite anciens schemas LDAP et mode "virtuel"
@@ -732,7 +732,7 @@ if (isset($_SESSION['login']))
EvoLog::log("Add user ".$uid);
// notification par mail
- mailnotify($info,$_SESSION['domain'],$_POST['pass1']);
+ mailnotify($info,$_SESSION['domain'],$_POST['pass1']);
} else {
print "
Erreur, envoyez le message d'erreur
@@ -746,13 +746,13 @@ if (isset($_SESSION['login']))
} else {
?>
-
+
Ajout d'un compte