Nettoyage des commentaires

This commit is contained in:
Daniel Berteaud 2012-07-18 20:35:42 +02:00
parent e5c19b4f7c
commit 2f68dd9269

View File

@ -8,11 +8,11 @@ if(isset($_SERVER['QUERY_STRING']) && preg_match('/^.+@' . DOMAIN . '$/', $_SERV
$temp = explode('@', $_SERVER['QUERY_STRING']);
$uid = $temp[0];
//Connexion a l'annuaire LDAP
$link = @ldap_connect(LDAP_SERVER) or die ('connexion echouee');
// Bind to the LDAP server
$link = @ldap_connect(LDAP_SERVER) or die ("Couldn't connect to the LDAP server");
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, 3);
@ldap_bind($link) or die ('identification echouee');
// Recherche de l'utilisateur demandé
@ldap_bind($link) or die ("Couldn't bind to the LDAP server");
// Lookup the user
$result = ldap_search($link, USER_BASE, "uid=" . $uid);
$user = ldap_get_entries($link, $result);
if($user['count'] == 0) {
@ -36,7 +36,7 @@ else {
var path_profile = getenv("USERPROFILE");
}
// Compte local
// Local Account
<?php echo PREF;?>("mail.account.account1.server", "server1");
<?php echo PREF;?>("mail.accountmanager.localfoldersserver", "server1");
<?php echo PREF;?>("mail.server.server1.directory-rel", "[ProfD]Mail/Local Folders");
@ -45,7 +45,7 @@ else {
<?php echo PREF;?>("mail.server.server1.type", "none");
<?php echo PREF;?>("mail.server.server1.userName", "nobody");
// SMTP
// SMTP config
<?php echo PREF;?>("mail.smtp.defaultserver", "smtp1");
<?php echo PREF;?>("mail.smtpservers", "smtp1");
<?php echo PREF;?>("mail.smtpserver.smtp1.try_ssl", 3);
@ -53,7 +53,7 @@ else {
<?php echo PREF;?>("mail.smtpserver.smtp1.hostname", "<?php echo SMTP_SERVER; ?>");
<?php echo PREF;?>("mail.smtpserver.smtp1.username", "<?php echo $uid; ?>");
// Compte par défaut
// Default account is acocunt2 (the personal account)
<?php echo PREF;?>("mail.accountmanager.defaultaccount", "account2");
@ -66,7 +66,7 @@ $accountlist = 'account1';
$identities = ''
?>
// Compte personnel
// Personnal account
<?php echo PREF;?>("mail.account.account2.server", "server<?php echo $server?>");
<?php echo PREF;?>("mail.server.server2.hostname", "<?php echo IMAP_SERVER; ?>");
<?php echo PREF;?>("mail.server.server2.name", "<?php echo $user[0]['mail'][0]; ?>");
@ -90,7 +90,6 @@ defaultPref("mail.identity.id<?php echo $id; ?>.stationery_folder", "imap://<?ph
defaultPref("mail.identity.id<?php echo $id; ?>.attach_signature", true);
defaultPref("mail.identity.id<?php echo $id; ?>.sig_file", path_profile+path_sep+"signature"+path_sep+"email.html");
<?php
//$accountlist .= ',account' . $account;
$identities .= ',id' . $id;
$account++;
$id++;
@ -99,11 +98,11 @@ $id++;
<?php echo PREF;?>("mail.account.account2.identities", "<?php echo $identities;?>");
<?php echo PREF;?>("mail.accountmanager.accounts", "account1,account2");
// Mise a jour
// Disable auto updates
<?php echo PREF;?>("app.update.enabled", false);
<?php echo PREF;?>("app.update.auto", false);
// Extension
// Extensions
<?php echo PREF;?>("extensions.installDistroAddons", true);
<?php echo PREF;?>("extensions.enabledScopes", 13);
<?php echo PREF;?>("extensions.autoDisableScopes", 2);
@ -111,13 +110,13 @@ $id++;
// Spam
<?php echo PREF;?>("mail.adaptivefilters.junk_threshold", 500);
// Checks
// Checks IMAP folders
defaultPref("mail.check_all_imap_folders_for_new", true);
// Composition
defaultPref("mail.default_html_action", 3);
// Pièces jointes
// Attachments
defaultPref("mail.content_disposition_type ", 1);
// Expunge
@ -125,6 +124,7 @@ defaultPref("mail.imap.expunge_option", 3);
defaultPref("mail.imap.expunge_threshold_number", 100);
<?php
// Include other conf fragment if they exist
if (is_array(glob("thunderbird.mod.*.php"))){
foreach (glob("thunderbird.mod.*.php") as $filename){
require($filename);