From 56f3b9d2013cb1cb8a7b2cc9bfddd232637f3b12 Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Wed, 17 Oct 2012 09:44:52 +0000 Subject: [PATCH] removing unused file on mail account management --- .gitattributes | 7 -- bureau/admin/mail_alias_create.inc.php | 58 ----------- bureau/admin/mail_alias_doedit.php | 54 ---------- bureau/admin/mail_edit.inc.php | 111 --------------------- bureau/admin/mail_localbox_doedit.php | 74 -------------- bureau/admin/mail_localbox_edit.inc.php | 73 -------------- bureau/admin/mail_redirection_doedit.php | 51 ---------- bureau/admin/mail_redirection_edit.inc.php | 93 ----------------- 8 files changed, 521 deletions(-) delete mode 100644 bureau/admin/mail_alias_create.inc.php delete mode 100644 bureau/admin/mail_alias_doedit.php delete mode 100644 bureau/admin/mail_edit.inc.php delete mode 100644 bureau/admin/mail_localbox_doedit.php delete mode 100644 bureau/admin/mail_localbox_edit.inc.php delete mode 100644 bureau/admin/mail_redirection_doedit.php delete mode 100644 bureau/admin/mail_redirection_edit.inc.php diff --git a/.gitattributes b/.gitattributes index 1e7c7619..5280837c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -283,19 +283,12 @@ bureau/admin/logo2.png -text bureau/admin/logs_download.php -text bureau/admin/logs_list.php -text bureau/admin/mail_add.php -text -bureau/admin/mail_alias_create.inc.php -text -bureau/admin/mail_alias_doedit.php -text bureau/admin/mail_del.php -text bureau/admin/mail_doadd.php -text bureau/admin/mail_doedit.php -text -bureau/admin/mail_edit.inc.php -text bureau/admin/mail_edit.php -text bureau/admin/mail_list.php -text -bureau/admin/mail_localbox_doedit.php -text -bureau/admin/mail_localbox_edit.inc.php -text bureau/admin/mail_properties.php -text -bureau/admin/mail_redirection_doedit.php -text -bureau/admin/mail_redirection_edit.inc.php -text bureau/admin/mail_undelete.php -text bureau/admin/main.php -text bureau/admin/mem_admin.php -text diff --git a/bureau/admin/mail_alias_create.inc.php b/bureau/admin/mail_alias_create.inc.php deleted file mode 100644 index 01286418..00000000 --- a/bureau/admin/mail_alias_create.inc.php +++ /dev/null @@ -1,58 +0,0 @@ -mail_get_details($mail_id)) { - $error=$err->errstr(); - echo $error; -} -?> -$error

"; -} - -$dom_list = $mail->enum_domains; -?> -
- - - - -
- - - " />
- -" /> - - -
diff --git a/bureau/admin/mail_alias_doedit.php b/bureau/admin/mail_alias_doedit.php deleted file mode 100644 index 5c835cd0..00000000 --- a/bureau/admin/mail_alias_doedit.php +++ /dev/null @@ -1,54 +0,0 @@ - array ("request", "string",0), - "mail_id" => array ("request", "integer",0), - "domain" => array ("request", "string",0), - "address_full" => array ("request", "string",0), - "dom_id" => array ("request", "integer",0), - "rcp" =>array("request", "array", "") -); -getFields($fields); - -$alias_retour=array (); -$alias_retour=$mail->create($dom_id,$mail_arg); -//setting up the alias. -if(!$mail_alias->setalias($alias_retour["mail_id"],$address_full)){ -//if fails redirect to creation with error message. -$error=sprintf(_("Alias: %s already created"), $mail_arg); -include("mail_alias_create.inc.php"); -}else{ -//redirection to the properties list. -header ("Location: mail_properties.php?mail_id=$mail_id"); -} - - - - diff --git a/bureau/admin/mail_edit.inc.php b/bureau/admin/mail_edit.inc.php deleted file mode 100644 index 03ef2d8f..00000000 --- a/bureau/admin/mail_edit.inc.php +++ /dev/null @@ -1,111 +0,0 @@ -mail_get_details($mail_id)) { - $error=$err->errstr(); -} -if(isset($error) && $error){ - echo "

$error

 

"; -} - -?> -
-
- -

- Having a mail disabled forbid consultation or reception, but do not remove the mailbox or his configuration."); ?> -

- onclick="show('enabletbl');"> - onclick="show('enabletbl');"> -
-
-
-

- -

-

- - - -

- - - - - - - - - - -

-
- -
- - - - -" /> -" onclick="document.location='mail_properties.php?mail_id='"/> -
- - - - - - - diff --git a/bureau/admin/mail_localbox_doedit.php b/bureau/admin/mail_localbox_doedit.php deleted file mode 100644 index 8589f532..00000000 --- a/bureau/admin/mail_localbox_doedit.php +++ /dev/null @@ -1,74 +0,0 @@ - array ("request", "integer",0), - "mail_id" => array ("request", "integer",0), - "is_local" => array ("request", "integer",0) -); -getFields($fields); -/*si local vaut non = - si boite pas deja locale : ne rien faire - si boite locale: suprimmer entré dans mailbox - niveau system virer le dossier. - si local vaut oui = - si boite pas deja local: ajout entré table mailbox - si boite locale: dire a l'utilisateur que c'est deja le cas. -*/ -print_r($is_local); -//if we are already processing a localy hosted mail -if(isset($is_local) && intval($is_local) == 1){ - //if user chose yes to localbox - if($local == 1){ - $error = _("Already Activated"); - header ("Location: /mail_properties.php?mail_id=$mail_id"); - }else{ - $mail_localbox->unset_localbox($mail_id); - header ("Location: /mail_properties.php?mail_id=$mail_id"); - } -}elseif( intval($is_local) == 0 ){ - - if($local == 0){ - $error = _("Already disactivated"); - header ("Location: /mail_properties.php?mail_id=$mail_id"); - }else{ - //echo "processing mail to localbox"; - $mail_localbox->set_localbox($mail_id); - header ("Location: /mail_properties.php?mail_id=$mail_id"); - } - - - -} - - diff --git a/bureau/admin/mail_localbox_edit.inc.php b/bureau/admin/mail_localbox_edit.inc.php deleted file mode 100644 index 2806d1e8..00000000 --- a/bureau/admin/mail_localbox_edit.inc.php +++ /dev/null @@ -1,73 +0,0 @@ -mail_get_details($mail_id); -if (!$mail_details) die ("error on mail details"); - -if (isset($error) && $error) { - echo "

$error

 

"; -} - -echo "

"; -echo sprintf(_("Edition of %s")."
",$mail_details['address_full']); -echo "

";?> -
- - - - - - - - -
- "._("WARNING: turning POP/IMAP off will DELETE the stored messages in this email address. This email address will become a simple redirection.").""; - }else{ - echo "
"._("Activate the localbox, will allow you to store your mails on this server. \n It is a very conveniant way to check your mails while roaming, - thince they can be accesed remotely by POP or IMAP. It consume space on the server so be sure to verify your quota attribution.")."
"; - } -?> -

- onclick="show('localtbl');"> - onclick="show('localtbl');"> -

-
-
- - " /> - " /> - " onclick="document.location='mail_properties.php?mail_id='"/> -
- -
diff --git a/bureau/admin/mail_redirection_doedit.php b/bureau/admin/mail_redirection_doedit.php deleted file mode 100644 index e37ca9d7..00000000 --- a/bureau/admin/mail_redirection_doedit.php +++ /dev/null @@ -1,51 +0,0 @@ - array ("request", "string",0), - "mail_id" => array ("request", "integer",0), - "domain" => array ("request", "string",0), - "address_full" => array ("request", "string",0), - "dom_id" => array ("request", "integer",0), - "rcp" =>array("request", "array", "") -); -getFields($fields); -//obon on crée les redirect.. -$tst=$mail_redirection->setredirection($mail_id, $rcp); -if($tst==false){ - $error="One ore more redirection could not be added"; -} - - - -//redirection si tout se passe bien. -header ("Location: mail_properties.php?mail_id=$mail_id"); - -?> diff --git a/bureau/admin/mail_redirection_edit.inc.php b/bureau/admin/mail_redirection_edit.inc.php deleted file mode 100644 index 47d2fe2f..00000000 --- a/bureau/admin/mail_redirection_edit.inc.php +++ /dev/null @@ -1,93 +0,0 @@ - - -
- -recipients_get_array($mail_id) ; -$nb_rcp=count($lst_rcp); -for ($ii=0;$ii <= count($lst_rcp)+10; $ii++) { - ?> - - - - - - - - - - - - -
- -
- " onclick="javascript:delete_all_recipients();"/> -
- - " /> - " onclick="document.location='mail_properties.php?mail_id='"/> -
- -