Changeset 3148

Timestamp:

05/11/12 17:40:06 (13 months ago)

Author:

squidly

Message:

Correction template pour postfix + bugfixes des classes de gestion des mails

Location:

alternc/trunk

Files:

• bureau/admin/mail_alias_doedit.php (modified) (2 diffs)
• bureau/admin/mail_localbox_doedit.php (modified) (2 diffs)
• bureau/class/m_mail_alias.php (modified) (1 diff)
• etc/alternc/templates/postfix/myquota.cf (modified) (1 diff)
• install/alternc.install (modified) (1 diff)

alternc/trunk/bureau/admin/mail_alias_doedit.php

@@ -29 +29 @@
 require_once("../class/config.php");
 $fields = array (
-        "alias" => array ("request", "string",0),
+        "mail_arg" => array ("request", "string",0),
         "mail_id" => array ("request", "integer",0),
         "domain" => array ("request", "string",0),
@@ -39 +39 @@
 
 $alias_retour=array ();
-$alias_retour=$mail->create($dom_id,$alias);
+$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"), $alias);
-include("mail_alias_create.php");
+$error=sprintf(_("Alias: %s already created"), $mail_arg);
+include("mail_alias_create.inc.php");
 }else{
 //redirection to the properties list.

alternc/trunk/bureau/admin/mail_localbox_doedit.php

@@ -52 +52 @@
         if($local == 1){
                 $error = _("Already Activated");
-                include ("mail_edit.php");
-                exit();
+                header ("Location: /mail_properties.php?mail_id=$mail_id");
         }else{
                 $mail_localbox->unset_localbox($mail_id);
@@ -61 +60 @@
 
         if($local == 0){
-                $error = _("Already Activated");
-                include ("mail_edit.php");
-                exit();
+                $error = _("Already disactivated");
+                header ("Location: /mail_properties.php?mail_id=$mail_id");
         }else{
                 //echo "processing mail to localbox";

alternc/trunk/bureau/class/m_mail_alias.php

@@ -76 +76 @@
     global $mail,$err;
     if ($edit_id) {
-      echo "<a href='mail_redirection_edit.php?mail_id=$edit_id'>";__("Edit");echo "</a>";
+      //echo "<a href='mail_redirection_edit.inc.php?mail_id=$edit_id'>";__("Edit");echo "</a>";
+      echo "<a href='mail_properties.php?mail_id=$edit_id'>";__("Edit");echo "</a>";
     } else {
       include('mail_alias_create.inc.php');

alternc/trunk/etc/alternc/templates/postfix/myquota.cf

@@ -4 +4 @@
 #
 
-user = sysusr
-password = bGwD2GlLOX
-hosts =127.0.0.1
-dbname = alternc
+user = %%db_mail_user%%
+password = %%db_mail_pwd%%
+hosts =%%dbhost%%
+dbname = %%dbname%%
 query = select quota from mailbox join address on mailbox.id = address.id join domaines on domaines.id = address.id where concat(address.address,'@',domaines.domaine) = '%s'
 

alternc/trunk/install/alternc.install

@@ -296 +296 @@
 
 # Conviguring delivery used bu Postfix FIXME change script name
-echo `/usr/bin/postfix-add-policy dovecot vmail:vmail DRhu pipe'/usr/bin/sudo /usr/lib/dovecot/deliver -f ${sender} -d ${recipient} '`
+echo `/usr/bin/postfix-add-policy dovecot vmail:vmail DRhu pipe '/usr/bin/sudo /usr/lib/dovecot/deliver -f ${sender} -d ${recipient} '`
 
 # Bug #1215: configure mydestination when $FQDN is not in