this just can't work !?

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

diff --git a/hooks/banana.inc.php b/hooks/banana.inc.php
index b809e7e..cd1a9bf 100644 (file)
--- a/hooks/banana.inc.php
+++ b/hooks/banana.inc.php
@@ -71,7 +71,7 @@ function banana_subscribe($forlife, $uid, $promo, $password)
        list($effau, $effid) = $res->fetchOneRow();
        if (5*$effau>$effid) { // + de 20% d'inscrits
            require_once("xorg.mailer.inc.php");
-           $mymail = new XOrgMailer('forums.promo.tpl');
+           $mymail = new XOrgMailer('mails/forums.promo.tpl');
            $mymail->assign('promo', $promo);
            $mymail->send();
        }

diff --git a/htdocs/register/end.php b/htdocs/register/end.php
index d5e34df..b7256f8 100644 (file)
--- a/htdocs/register/end.php
+++ b/htdocs/register/end.php
@@ -78,7 +78,7 @@ $globals->xdb->execute('UPDATE register_pending SET hash="INSCRIT" WHERE uid={?}
 $globals->hook->subscribe($forlife, $uid, $promo, $password);
 
 require_once('xorg.mailer.inc.php');
-$mymail = new XOrgMailer('inscription.reussie.tpl');
+$mymail = new XOrgMailer('mails/inscription.reussie.tpl');
 $mymail->assign('forlife', $forlife);
 $mymail->assign('prenom', $prenom);
 $mymail->send();

diff --git a/include/marketing.inc.php b/include/marketing.inc.php
index a683f8b..79fb0a4 100644 (file)
--- a/include/marketing.inc.php
+++ b/include/marketing.inc.php
@@ -134,7 +134,7 @@ function relance($uid, $nbx = -1)
     $pass_encrypted = hash_encrypt($pass);
     $fdate    = strftime('%d %B %Y', strtotime($date));
     
-    $mymail = new XOrgMailer('marketing.relance.tpl');
+    $mymail = new XOrgMailer('marketing/mail.relance.tpl');
     $mymail->assign('nbdix',      $nbx);
     $mymail->assign('fdate',      $fdate);
     $mymail->assign('lusername',  $alias);

diff --git a/include/register.inc.php b/include/register.inc.php
index a05f8f5..0565759 100644 (file)
--- a/include/register.inc.php
+++ b/include/register.inc.php
@@ -266,7 +266,7 @@ function finish_ins($sub_state)
             $uid, $forlife, $bestalias, $mailorg2, $pass_encrypted, $email, $naissance, $hash);
 
     require_once('xorg.mailer.inc.php');
-    $mymail = new XOrgMailer('inscrire.mail.tpl');
+    $mymail = new XOrgMailer('mails/inscrire.mail.tpl');
     $mymail->assign('mailorg', $bestalias);
     $mymail->assign('lemail',  $email);
     $mymail->assign('pass',    $pass);

diff --git a/modules/marketing.php b/modules/marketing.php
index 4ce614e..2947472 100644 (file)
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -134,7 +134,7 @@ class MarketingModule extends PLModule
         }
 
         if ($action == 'insrel') {
-            require_once('marketing.inc.php');
+            require_once 'marketing.inc.php';
             if (relance($uid)) {
                 $page->trig('relance faite');
             }
@@ -289,6 +289,8 @@ class MarketingModule extends PLModule
         $page->changeTpl('marketing/relance.tpl');
 
         if (Post::has('relancer')) {
+            require_once 'marketing.inc.php';
+
             $res   = $globals->xdb->query("SELECT COUNT(*) FROM auth_user_md5 WHERE deces=0");
             $nbdix = $res->fetchOneCell();
 

diff --git a/templates/mails/marketing.relance.tpl b/templates/marketing/mail.relance.tpl
similarity index 100%
rename from templates/mails/marketing.relance.tpl
rename to templates/marketing/mail.relance.tpl