s/globals\(->\|\.\)mails/globals\1mail/g

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1899 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/bin/cron/cron_validations.php b/bin/cron/cron_validations.php
index 4a45df5..dce1a64 100755 (executable)
--- a/bin/cron/cron_validations.php
+++ b/bin/cron/cron_validations.php
@@ -39,8 +39,8 @@ if (empty($nb)) {
 $plural = $nb == 1 ? "" : "s";
 
 $mymail = new PlMailer();
-$mymail->setFrom('validation@' . $globals->mails->domain);
-$mymail->addTo("validation@" . $globals->mails->domain);
+$mymail->setFrom('validation@' . $globals->mail->domain);
+$mymail->addTo("validation@" . $globals->mail->domain);
 $mymail->setSubject((empty($nbveryold)?"":"[urgent] ")."il y a $nb validation$plural non effectuée$plural");
 
 $message =

diff --git a/bin/cron/notifs.send.php b/bin/cron/notifs.send.php
index 61b4620..583f0e1 100755 (executable)
--- a/bin/cron/notifs.send.php
+++ b/bin/cron/notifs.send.php
@@ -83,8 +83,8 @@ EOF;
 EOF;
     
     $mailer = new PlMailer();
-    $mailer->setFrom('Carnet Polytechnicien <support_carnet@' . $globals->mails->domain . '>');
-    $mailer->addTo("\"$u['prenom']} {$u['nom']}\" <{$u['bestalias']}@" . $globals->mails->domain . '>');
+    $mailer->setFrom('Carnet Polytechnicien <support_carnet@' . $globals->mail->domain . '>');
+    $mailer->addTo("\"$u['prenom']} {$u['nom']}\" <{$u['bestalias']}@" . $globals->mail->domain . '>');
     $mailer->setSubject("Notifications de la semaine $week");
     $mailer->setTxtBody($text);
     if ($u['mail_fmt'] == 'html') { $mailer->setHtmlBody($html); }

diff --git a/bin/emails.broken.php b/bin/emails.broken.php
index 982ddc7..41cbcc5 100755 (executable)
--- a/bin/emails.broken.php
+++ b/bin/emails.broken.php
@@ -75,7 +75,7 @@ foreach ($emails as $_email) {
             echo "$email : seule adresse active de {$x['prenom']} {$x['nom']}\n";
         } else {
             $mail = new PlMailer('emails/broken.mail.tpl');
-            $mail->addTo("\"{$x['prenom']} {$x['nom']}\" <{$x['alias']}@" . $globals->mails->domain . '>');
+            $mail->addTo("\"{$x['prenom']} {$x['nom']}\" <{$x['alias']}@" . $globals->mail->domain . '>');
             $mail->assign('x', $x);
             $mail->assign('email', $email);
             $mail->send();

diff --git a/include/banana/forum.inc.php b/include/banana/forum.inc.php
index 51a862a..1a493c6 100644 (file)
--- a/include/banana/forum.inc.php
+++ b/include/banana/forum.inc.php
@@ -70,7 +70,7 @@ class ForumsBanana extends Banana
                             WHERE  uid={?}", S::i('uid'));
         if (!(list($nom,$mail,$sig,$disp,$maj) = $req->fetchOneRow())) {
             $nom  = S::v('prenom')." ".S::v('nom');
-            $mail = S::v('forlife')."@" . $globals->mails->domain;
+            $mail = S::v('forlife')."@" . $globals->mail->domain;
             $sig  = $nom." (".S::v('promo').")";
             $disp = 0;
             $maj  = 1;

diff --git a/include/homonymes.inc.php b/include/homonymes.inc.php
index b9a84d0..dd592f0 100644 (file)
--- a/include/homonymes.inc.php
+++ b/include/homonymes.inc.php
@@ -29,24 +29,24 @@ function select_if_homonyme($uid) {
 }
 
 function send_warning_homonyme($prenom, $nom, $forlife, $loginbis) {
-    $cc = "support+homonyme@" . $globals->mails->domain;
+    $cc = "support+homonyme@" . $globals->mail->domain;
     $FROM = "\"Support Polytechnique.org\" <$cc>";
     $mymail = new PlMailer();
     $mymail->setFrom($FROM);
-    $mymail->setSubject("Dans 2 semaines, suppression de $loginbis@" . $globals->mails->domain);
-    $mymail->addTo("$prenom $nom <$forlife@" . $globals->mails->domain . '>');
+    $mymail->setSubject("Dans 2 semaines, suppression de $loginbis@" . $globals->mail->domain);
+    $mymail->addTo("$prenom $nom <$forlife@" . $globals->mail->domain . '>');
     $mymail->addCc($cc);
     $mymail->setTxtBody(Env::v('mailbody'));
     $mymail->send();
 }
 
 function send_robot_homonyme($prenom, $nom, $forlife, $loginbis) {
-    $cc = "support+homonyme@" . $globals->mails->domain;
+    $cc = "support+homonyme@" . $globals->mail->domain;
     $FROM = "\"Support Polytechnique.org\" <$cc>";
     $mymail = new PlMailer();
     $mymail->setFrom($FROM);
-    $mymail->setSubject("Mise en place du robot $loginbis@" . $globals->mails->domain);
-    $mymail->addTo("$prenom $nom <$forlife@" . $globals->mails->domain . '>');
+    $mymail->setSubject("Mise en place du robot $loginbis@" . $globals->mail->domain);
+    $mymail->addTo("$prenom $nom <$forlife@" . $globals->mail->domain . '>');
     $mymail->addCc($cc);
     $mymail->setTxtBody(Env::v('mailbody'));
     $mymail->send();

diff --git a/include/marketing.inc.php b/include/marketing.inc.php
index beca023..a339842 100644 (file)
--- a/include/marketing.inc.php
+++ b/include/marketing.inc.php
@@ -71,17 +71,17 @@ class Marketing
     private function getFrom($from, $sender)
     {
         if ($from == 'staff') {
-            return '"Equipe Polytechnique.org" <register@' . $globals->mails->domain . '>';
+            return '"Equipe Polytechnique.org" <register@' . $globals->mail->domain . '>';
         } else {
             $res = XDB::query("SELECT  u.nom, u.prenom, a.alias
                                  FROM  auth_user_md5 AS u
                            INNER JOIN  aliases       AS a ON (a.id = u.user_id AND FIND_IN_SET('bestalias', a.flags))
                                 WHERE  u.user_id = {?}", $sender);
             if (!$res->numRows()) {
-                return '"Equipe Polytechnique.org" <register@' . $globals->mails->domain . '>';
+                return '"Equipe Polytechnique.org" <register@' . $globals->mail->domain . '>';
             }
             $sender = $res->fetchOneAssoc();
-            return '"' . $sender['prenom'] . ' ' . $sender['nom'] . '" <' . $sender['alias'] . '@' . $globals->mails->domain . '>';
+            return '"' . $sender['prenom'] . ' ' . $sender['nom'] . '" <' . $sender['alias'] . '@' . $globals->mail->domain . '>';
         }
     }
 

diff --git a/include/validations/broken.inc.php b/include/validations/broken.inc.php
index a72e67d..9dc5dca 100644 (file)
--- a/include/validations/broken.inc.php
+++ b/include/validations/broken.inc.php
@@ -107,7 +107,7 @@ class BrokenReq extends Validate
         if (XDB::affectedRows() > 0) {
             $this->m_reactive = true;
             $mailer = new PlMailer();
-            $mailer->setFrom('"Association Polytechnique.org" <register@' . $globals->mails->domain . '>');
+            $mailer->setFrom('"Association Polytechnique.org" <register@' . $globals->mail->domain . '>');
             $mailer->addTo($email);
             $mailer->setSubject("Mise à jour de ton adresse $email");
             $mailer->setTxtBody(wordwrap("Cher Camarade,\n\n"
@@ -154,7 +154,7 @@ class BrokenReq extends Validate
               . "-- \nTrès Cordialement,\nL'Equipe de Polytechnique.org\n";
         $body = wordwrap($body, 78);
         $mailer = new PlMailer();
-        $mailer->setFrom('"Association Polytechnique.org" <register@' . $globals->mails->domain . '>');
+        $mailer->setFrom('"Association Polytechnique.org" <register@' . $globals->mail->domain . '>');
         $mailer->addTo($this->m_email);
         $mailer->setSubject($subject);
         $mailer->setTxtBody($body);

diff --git a/include/validations/homonymes.inc.php b/include/validations/homonymes.inc.php
index 0141bc9..8fe93e6 100644 (file)
--- a/include/validations/homonymes.inc.php
+++ b/include/validations/homonymes.inc.php
@@ -69,7 +69,7 @@ class HomonymeReq extends Validate
 
     protected function _mail_subj()
     {
-        return "[Polytechnique.org/Support] ".($this->warning?"Dans une semaine : suppression de l'alias":"Mise en place du robot")." $loginbis@" . $globals->mails->domain;
+        return "[Polytechnique.org/Support] ".($this->warning?"Dans une semaine : suppression de l'alias":"Mise en place du robot")." $loginbis@" . $globals->mail->domain;
     }
 
     // }}}

diff --git a/include/xorg.misc.inc.php b/include/xorg.misc.inc.php
index bc02c95..48be415 100644 (file)
--- a/include/xorg.misc.inc.php
+++ b/include/xorg.misc.inc.php
@@ -292,7 +292,7 @@ function check_redirect($red = null)
 function send_warning_mail($title)
 {
     $mailer = new PlMailer();
-    $mailer->setFrom("webmaster@" . $globals->mails->domain);
+    $mailer->setFrom("webmaster@" . $globals->mail->domain);
     $mailer->addTo($globals->core->admin_email);
     $mailer->setSubject("[Plat/al Security Alert] $title");
     $mailer->setTxtBody("Identifiants de session :\n" . var_export($_SESSION, true) . "\n\n"

diff --git a/modules/axletter.php b/modules/axletter.php
index 0608f46..945a55b 100644 (file)
--- a/modules/axletter.php
+++ b/modules/axletter.php
@@ -159,7 +159,7 @@ class AXLetterModule extends PLModule
                              $id, $shortname, $subject, $title, $body, $signature, $promo_min, $promo_max, $echeance);
                 if (!$saved) {
                     $mailer = new PlMailer();
-                    $mailer->setFrom("support@" . $globals->mails->domain);
+                    $mailer->setFrom("support@" . $globals->mail->domain);
                     $mailer->setSubject("Un nouveau projet de mail de l'AX vient d'être proposé");
                     $mailer->setTxtBody("Un nouveau mail vient d'être rédigé en prévision d'un envoi prochain. Vous pouvez "
                                       . "le modifier jusqu'à ce qu'il soit verrouillé pour l'envoi\n\n"

diff --git a/modules/core.php b/modules/core.php
index 91c3e0d..3bd6e76 100644 (file)
--- a/modules/core.php
+++ b/modules/core.php
@@ -114,9 +114,9 @@ class CoreModule extends PLModule
                   . "Skin        : " . S::v('skin') . "\n";
             $page->assign('bug_sent',1);
             $mymail = new PlMailer();
-            $mymail->setFrom('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@' . $globals->mails->domain . '>');
-            $mymail->addTo('support+platal@' . $globals->mails->domain);
-            $mymail->addCc('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@' . $globals->mails->domain . '>');
+            $mymail->setFrom('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@' . $globals->mail->domain . '>');
+            $mymail->addTo('support+platal@' . $globals->mail->domain);
+            $mymail->addCc('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@' . $globals->mail->domain . '>');
             $mymail->setSubject('Plat/al '.Env::v('task_type').' : '.Env::v('item_summary'));
             $mymail->setTxtBody($body);
             $mymail->send();

diff --git a/modules/email.php b/modules/email.php
index 597df36..b735816 100644 (file)
--- a/modules/email.php
+++ b/modules/email.php
@@ -424,11 +424,11 @@ consulter la page <{$globals->baseurl}/emails/broken>.
 
 
 A bientôt sur Polytechnique.org !
-L'équipe d'administration <support@" . $globals->mails->domain . '>';
+L'équipe d'administration <support@" . $globals->mail->domain . '>';
 
                 $mail = new PlMailer();
-                $mail->setFrom('"Polytechnique.org" <support@' . $globals->mails->domain . '>');
-                $mail->addTo("$dest@" . $globals->mails->domain);
+                $mail->setFrom('"Polytechnique.org" <support@' . $globals->mail->domain . '>');
+                $mail->addTo("$dest@" . $globals->mail->domain);
                 $mail->setSubject("Une de tes adresse de redirection Polytechnique.org ne marche plus !!");
                 $mail->setTxtBody($message);
                 $mail->send();

diff --git a/modules/marketing.php b/modules/marketing.php
index 6a5f744..bbf9808 100644 (file)
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -118,7 +118,7 @@ class MarketingModule extends PLModule
                 $from  = $market->sender_mail;
                 $page->assign('rel_from_user', $from);
                 $page->assign('rel_from_staff',
-                              '"Equipe Polytechnique.org" <register@' . $globals->mails->domain . '>');
+                              '"Equipe Polytechnique.org" <register@' . $globals->mail->domain . '>');
                 $page->assign('rel_to', $to);
                 $page->assign('rel_title', $title);
                 $page->assign('rel_text', $text);

diff --git a/modules/payment.php b/modules/payment.php
index 713130c..5ecc7f4 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -23,7 +23,7 @@
 function cb_erreur($text) {
     $mymail = new PlMailer();
     $mymail->addTo($globals->money->email);
-    $mymail->setFrom("webmaster@" . $globals->mails->domain);
+    $mymail->setFrom("webmaster@" . $globals->mail->domain);
     $mymail->setSubject("erreur lors d'un télépaiement (CyberPaiement)");
     $mymail->setTxtBody("\n\n".var_export($_REQUEST,true));
     $mymail->send();
@@ -40,7 +40,7 @@ function paypal_erreur($text, $send=true)
 
     $mymail = new PlMailer();
     $mymail->addTo($globals->money->email);
-    $mymail->setFrom("webmaster@" . $globals->mails->domain);
+    $mymail->setFrom("webmaster@" . $globals->mail->domain);
     $mymail->setSubject("erreur lors d'un télépaiement (PayPal)");
     $mymail->setTxtBody("\n\n".var_export($_REQUEST,true));
     $mymail->send();
@@ -220,7 +220,7 @@ class PaymentModule extends PLModule
 
         $mymail = new PlMailer();
         $mymail->setFrom($conf_mail);
-        $mymail->addTo("\"$prenom $nom\" <$forlife@" . $globals->mails->domain . '>');
+        $mymail->addTo("\"$prenom $nom\" <$forlife@" . $globals->mail->domain . '>');
         $mymail->addCc($conf_mail);
         $mymail->setSubject($conf_title);
         $mymail->setWikiBody($conf_text);
@@ -228,7 +228,7 @@ class PaymentModule extends PLModule
 
         /* on envoie les details de la transaction à telepaiement@ */
         $mymail = new PlMailer();
-        $mymail->setFrom("webmaster@" . $globals->mails->domain);
+        $mymail->setFrom("webmaster@" . $globals->mail->domain);
         $mymail->addTo($globals->money->email);
         $mymail->setSubject($conf_title);
         $msg = "utilisateur : $prenom $nom ($uid)\n".
@@ -309,7 +309,7 @@ class PaymentModule extends PLModule
 
         $mymail = new PlMailer();
         $mymail->setFrom($conf_mail);
-        $mymail->addTo("\"$prenom $nom\" <$forlife@" . $globals->mails->domain . '>');
+        $mymail->addTo("\"$prenom $nom\" <$forlife@" . $globals->mail->domain . '>');
         $mymail->addCc($conf_mail);
         $mymail->setSubject($conf_title);
         $mymail->setWikiBody($conf_text);
@@ -317,7 +317,7 @@ class PaymentModule extends PLModule
 
         /* on envoie les details de la transaction à telepaiement@ */
         $mymail = new PlMailer();
-        $mymail->setFrom("webmaster@" . $globals->mails->domain);
+        $mymail->setFrom("webmaster@" . $globals->mail->domain);
         $mymail->addTo($globals->money->email);
         $mymail->setSubject($conf_title);
         $msg = "utilisateur : $prenom $nom ($uid)\n".

diff --git a/modules/payment/money/cyberpaiement.inc.php b/modules/payment/money/cyberpaiement.inc.php
index b798596..ff37371 100644 (file)
--- a/modules/payment/money/cyberpaiement.inc.php
+++ b/modules/payment/money/cyberpaiement.inc.php
@@ -75,7 +75,7 @@ class CyberPayment
                'CHAMP101' => S::v('prenom'),
                'CHAMP102' => '.',
                'CHAMP103' => '.',
-               'CHAMP104' => S::v('bestalias').'@' . $globals->mails->domain,
+               'CHAMP104' => S::v('bestalias').'@' . $globals->mail->domain,
                'CHAMP106' => '.',
                'CHAMP107' => '.',
                'CHAMP108' => '.',

diff --git a/modules/payment/money/paypal.inc.php b/modules/payment/money/paypal.inc.php
index bc17eca..9bc7b03 100644 (file)
--- a/modules/payment/money/paypal.inc.php
+++ b/modules/payment/money/paypal.inc.php
@@ -75,7 +75,7 @@ class PayPal
        $info_client = Array(
                'first_name' => S::v('prenom'),
                'last_name'  => $name,
-               'email'      => S::v('bestalias').'@' . $globals->mails->domain);
+               'email'      => S::v('bestalias').'@' . $globals->mail->domain);
                
        $res = XDB::query(
                "SELECT a.adr1 AS address1, a.adr2 AS address2,

diff --git a/modules/platal.php b/modules/platal.php
index 2a159d8..e2de116 100644 (file)
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -299,7 +299,7 @@ class PlatalModule extends PLModule
                 $mails = implode(', ', $res->fetchColumn());
             }
             $mymail = new PlMailer();
-            $mymail->setFrom('"Gestion des mots de passe" <support+password@' . $globals->mails->domain . '>');
+            $mymail->setFrom('"Gestion des mots de passe" <support+password@' . $globals->mail->domain . '>');
             $mymail->addTo($mails);
             $mymail->setSubject('Ton certificat d\'authentification');
             $mymail->setTxtBody("Visite la page suivante qui expire dans six heures :

diff --git a/modules/register.php b/modules/register.php
index 4dea3ae..7074f41 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -192,8 +192,8 @@ class RegisterModule extends PLModule
                         $sub_state['email']     = Post::v('email');
                         if (check_ip('unsafe')) {
                             $err = "Une erreur s'est produite lors de l'inscription."
-                                 . " Merci de contacter <a href='mailto:register@{$globals->mails->domain}>"
-                                 . " register@{$globals->mails->domain}</a>"
+                                 . " Merci de contacter <a href='mailto:register@{$globals->mail->domain}>"
+                                 . " register@{$globals->mail->domain}</a>"
                                  . " pour nous faire part de cette erreur";
                             $alert .= "Tentative d'inscription depuis une IP surveillee";
                         } else {
@@ -329,7 +329,7 @@ class RegisterModule extends PLModule
         while (list($salias, $snom, $sprenom, $sfemme) = $res->next()) {
             $mymail = new PlMailer();
             $mymail->setSubject("$prenom $nom s'est inscrit à Polytechnique.org !");
-            $mymail->setFrom('"Marketing Polytechnique.org" <register@' . $globals->mails->domain . '>');
+            $mymail->setFrom('"Marketing Polytechnique.org" <register@' . $globals->mail->domain . '>');
             $mymail->addTo("\"$sprenom $snom\" <$salias@{$globals->mail->domain}>");
             $msg = ($sfemme?'Chère':'Cher')." $sprenom,\n\n"
                  . "Nous t'écrivons pour t'informer que $prenom $nom (X$promo), "
@@ -346,7 +346,7 @@ class RegisterModule extends PLModule
         if ($globals->register->notif) {
             $mymail = new PlMailer();
             $mymail->setSubject("Inscription de $prenom $nom (X$promo)");
-            $mymail->setFrom('"Webmaster Polytechnique.org" <web@' . $globals->mails->domain . '>');
+            $mymail->setFrom('"Webmaster Polytechnique.org" <web@' . $globals->mail->domain . '>');
             $mymail->addTo($globals->register->notif);
             $msg = "$prenom $nom (X$promo) a terminé son inscription avec les données suivantes :\n"
                  . " - nom       : $nom\n"

diff --git a/modules/register/register.inc.php b/modules/register/register.inc.php
index 1bc4ce8..f96cce7 100644 (file)
--- a/modules/register/register.inc.php
+++ b/modules/register/register.inc.php
@@ -176,10 +176,10 @@ function create_aliases (&$sub)
             $als = $res->fetchColumn();
 
             $mailer = new PlMailer();
-            $mailer->setFrom('"Support Polytechnique.org" <support@' . $globals->mails->domain . '>');
-            $mailer->addTo("$mailorg@" . $globals->mails->domain);
+            $mailer->setFrom('"Support Polytechnique.org" <support@' . $globals->mail->domain . '>');
+            $mailer->addTo("$mailorg@" . $globals->mail->domain);
             $mailer->setSubject("perte de ton alias $mailorg dans un mois !");
-            $mailer->addCc('"Support Polytechnique.org" <support@' . $globals->mails->domain . '>');
+            $mailer->addCc('"Support Polytechnique.org" <support@' . $globals->mail->domain . '>');
             $msg =
                 "Bonjour,\n\n".
                 
@@ -246,7 +246,7 @@ function finish_ins($sub_state)
     $mymail->assign('pass',    $pass);
     $mymail->assign('baseurl', $globals->baseurl);
     $mymail->assign('hash',    $hash);
-    $mymail->assign('subj',    $bestalias."@" . $globals->mails->domain);
+    $mymail->assign('subj',    $bestalias."@" . $globals->mail->domain);
     $mymail->send();
 }
 

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index d78eee0..9cf8435 100644 (file)
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -214,7 +214,7 @@ class XnetListsModule extends ListsModule
                   "SELECT  if (m.origine='X',if (u.nom_usage<>'', u.nom_usage, u.nom) ,m.nom) AS nom,
                            if (m.origine='X',u.prenom,m.prenom) AS prenom,
                            if (m.origine='X',u.promo,'extérieur') AS promo,
-                           if (m.origine='X',CONCAT(a.alias, '@{$globals->mails->domain}),m.email) AS email,
+                           if (m.origine='X',CONCAT(a.alias, '@{$globals->mail->domain}),m.email) AS email,
                            if (m.origine='X',FIND_IN_SET('femme', u.flags),0) AS femme,
                            m.perms='admin' AS admin,
                            m.origine='X' AS x
@@ -267,7 +267,7 @@ class XnetListsModule extends ListsModule
                                WHERE  alias={?}", "$alias@m4x.org", $lfull);
                    $page->trig("$alias@m4x.org ajouté");
                 } else {
-                    $page->trig("$mbox@{$globals->mails->domain} n'existe pas.");
+                    $page->trig("$mbox@{$globals->mail->domain} n'existe pas.");
                 }
             } else {
                 XDB::query(