Changeset 3147

Timestamp:

05/09/12 18:31:58 (13 months ago)

Author:

squidly

Message:

Ajout configuration squirrelmail + bugfixes pour postfix

Location:

alternc/trunk

Files:

• bureau/class/m_mail_jabber.php (modified) (1 diff)
• bureau/class/m_mail_localbox.php (modified) (2 diffs)
• bureau/class/m_mail_squirrelmail.php (added)
• bureau/class/m_quota.php (modified) (1 diff)
• debian/alternc.postinst (modified) (2 diffs)
• etc/alternc/postfix.cf (modified) (1 diff)
• install/alternc.install (modified) (1 diff)

alternc/trunk/bureau/class/m_mail_jabber.php

@@ -66 +66 @@
         "label"         => "jabberdemo",      // an internal label 
         "short_desc"    => _("Jabber Demo"),  // A human short description
+        "class"         => "mail_jabber",
         "human_desc"    => _("This is just a demo.<br/>Look at m_mail_jabber.php"), // A human long description
+        "form_param"  => Array($mail_id),
         "url"           => "javascript:alert('Ici un renvoie vers le formulaire adequat de cette entrée.');", // The URL to go
         "pass_required" => true,                    // This feature require the mail to have a global password ?

alternc/trunk/bureau/class/m_mail_localbox.php

@@ -60 +60 @@
    */
   function set_localbox($mail_id){
-    global $db, $err;
-    $err->log("localbox","set_localbox");
+    global $db, $err, $hooks;
+    $err->log("localbox","set_localbox!!!!!!!!");
     $path="mail/";
     if(!$db->query("select distinct left(ad.address,1) as letter,ad.address ,d.domaine from address ad, domaines d where ad.domain_id = d.id  and ad.id = $mail_id order by letter;"));
@@ -68 +68 @@
         return null;
     }
+    //FIXME passer par un hooks pour squirel
+                $hooks->invoke('hooks_squirrelmail_init',(array($db->f('address'),$db->f('domaine') )));   
     $path="/var/alternc/mail/".$db->f('letter')."/".$db->f('address')."_".$db->f('domaine');
-    //FIXME faire un touch de la maildir si dovecot ne sait pas le faire.
     if(!$db->query("INSERT into mailbox (address_id,path,quota) values ($mail_id,'$path',50);"));     
-
+        
   }
 
   /*
-   * Set a localbox
+   * Unset a localbox
    * @param integer $mail_id
    */
   function unset_localbox($mail_id){
-    global $db, $err;
-    $err->log("localbox","set_localbox");
+    global $db, $err,$hooks;
+    $err->log("localbox","unset_localbox");
+    if(!$db->query("select address,domaine from address,domaines where address.domain_id=domaines.id and address.id=$mail_id   ;"));
+
+    if(! $db->next_record()){
+        return null;
+    }
+                $hooks->invoke('hooks_squirrelmail_delete',(array($db->f('address'),$db->f('domaine') )));   
     if(!$db->query("DELETE from  mailbox where address_id=$mail_id;"));     
 

alternc/trunk/bureau/class/m_quota.php

@@ -185 +185 @@
       // Now we check that the value has been written properly : 
       exec("/usr/lib/alternc/quota_get ".$cuid,$a);
-        echo "quota get :::::ciud: $cuid :::: size: $size :::: a?: $a ";
+        print_r($a);
     if ($size!=$a[1]) {
         $err->raise("quota",1);

alternc/trunk/debian/alternc.postinst

@@ -241 +241 @@
     # Update l18n files
     /usr/share/alternc/install/dopo.sh
-                
-                #sudo stuff allowing alterncpanel to use quota
+
+          #squirrelmail fix             
+                chown -R :alterncpanel /var/lib/squirrelmail/data
+                chmod -R g+w /var/lib/squirrelmail
+                                #sudo stuff allowing alterncpanel to use quota
                 if [ -d /etc/sudoers.d ]; then
                         cp /etc/alternc/alternc-sudoers /etc/sudoers.d/alternc-sudoers
@@ -250 +253 @@
                         #FIXME
                         echo "copy content of /usr/share/doc/examples/example.sudoers into /etc/sudoers.d for to run properly"
-          fi
+         fi
 
     # important: postinst gele sans ca

alternc/trunk/etc/alternc/postfix.cf

@@ -20 +20 @@
 smtp_tls_dkey_file = $smtpd_tls_dcert_file
 smtp_tls_CApath = $smtpd_tls_CApath
-smtpd_tls_auth_only = yes
+smtpd_tls_auth_only = no
 #SASL options
 smtpd_sasl_auth_enable = yes

alternc/trunk/install/alternc.install

@@ -296 +296 @@
 
 # Conviguring delivery used bu Postfix FIXME change script name
-echo `/usr/bin/postfix-add-policy dovecot pipe DRhu vmail:vmail  '/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