Remove dependence of marketing.php on register.inc.php

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

diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index 8cd8954..f481ff1 100644 (file)
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -273,6 +273,8 @@ function get_user_details_pro($uid, $view = 'private')
 }
 
 // }}}
+// {{{ function get_user_details_adr()
+
 function get_user_details_adr($uid, $view = 'private') {
     $sql  = "SELECT  a.adrid, a.adr1,a.adr2,a.adr3,a.postcode,a.city,
                      gp.pays AS countrytxt,a.region, a.regiontxt,
@@ -313,6 +315,8 @@ function get_user_details_adr($uid, $view = 'private') {
     }
     return $all_adr;
 }
+
+// }}}
 // {{{ function get_user_details()
 
 function &get_user_details($login, $from_uid = '', $view = 'private')
@@ -694,6 +698,7 @@ function user_reindex($uid) {
 }
 
 // }}}
+// {{{ function set_new_usage()
 
 function set_new_usage($uid, $usage, $alias=false) { 
     XDB::execute("UPDATE auth_user_md5 set nom_usage={?} WHERE user_id={?}",$usage ,$uid);
@@ -711,5 +716,30 @@ function set_new_usage($uid, $usage, $alias=false) {
     user_reindex($uid);
 }
 
+// }}}
+// {{{ function get_X_mat
+function get_X_mat($ourmat)
+{
+    if (!preg_match('/^[0-9]{8}$/', $ourmat)) { 
+        // le matricule de notre base doit comporter 8 chiffres
+        return 0;
+    }   
+    
+    $year = intval(substr($ourmat, 0, 4));
+    $rang = intval(substr($ourmat, 5, 3));
+    if ($year < 1996) {
+        return; 
+    } elseif ($year < 2000) {
+        $year = intval(substr(1900 - $year, 1, 3));
+        return sprintf('%02u0%03u', $year, $rang);
+    } else {
+        $year = intval(substr(1900 - $year, 1, 3));
+        return sprintf('%03u%03u', $year, $rang);
+    }
+}           
+    
+// }}}
+
+
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
 ?>

diff --git a/modules/marketing.php b/modules/marketing.php
index 894497b..303655c 100644 (file)
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -92,7 +92,7 @@ class MarketingModule extends PLModule
                                       WHERE user_id={?} AND perms='pending'", $uid);
 
         if (list($nom, $prenom, $promo, $matricule) = $res->fetchOneRow()) {
-            require_once('register.inc.php');
+            require_once('user.func.inc.php');
             $matricule_X = get_X_mat($matricule);
             $page->assign('nom', $nom);
             $page->assign('prenom', $prenom);

diff --git a/modules/register.php b/modules/register.php
index 6d73d7f..b8376d1 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -76,7 +76,7 @@ class RegisterModule extends PLModule
                     $sub_state['step'] = 1;
                     if (isset($sub_state['hash'])) {
                         $sub_state['step'] = 3;
-                        require_once('register.inc.php');
+                        require_once(dirname(__FILE__) . '/register/register.inc.php');
                         create_aliases($sub_state);
                     }
                 }
@@ -106,7 +106,7 @@ class RegisterModule extends PLModule
 
             case 2:
                 if (count($_POST)) {
-                    require_once('register.inc.php');
+                    require_once(dirname(__FILE__) . '/register/register.inc.php');
                     $sub_state['prenom'] = Post::v('prenom');
                     $sub_state['nom']    = Post::v('nom');
                     $sub_state['mat']    = Post::v('mat');
@@ -124,7 +124,7 @@ class RegisterModule extends PLModule
             case 3:
                 $alert = null;
                 if (count($_POST)) {
-                    require_once('register.inc.php');
+                    require_once(dirname(__FILE__) . '/register/register.inc.php');
                     if (!isvalid_email(Post::v('email'))) {
                         $err[] = "Le champ 'E-mail' n'est pas valide.";
                     } elseif (!isvalid_email_redirection(Post::v('email'))) {

diff --git a/include/register.inc.php b/modules/register/register.inc.php
similarity index 94%
rename from include/register.inc.php
rename to modules/register/register.inc.php
index d073be3..9f3a1f9 100644 (file)
--- a/include/register.inc.php
+++ b/modules/register/register.inc.php
@@ -44,28 +44,6 @@ function user_cmp($prenom, $nom, $_prenom, $_nom)
 }
 
 // }}}
-// {{{ function get_X_mat
-function get_X_mat($ourmat)
-{
-    if (!preg_match('/^[0-9]{8}$/', $ourmat)) {
-       // le matricule de notre base doit comporter 8 chiffres
-        return 0;
-    }
-
-    $year = intval(substr($ourmat, 0, 4));
-    $rang = intval(substr($ourmat, 5, 3));
-    if ($year < 1996) {
-        return;
-    } elseif ($year < 2000) {
-        $year = intval(substr(1900 - $year, 1, 3));
-        return sprintf('%02u0%03u', $year, $rang);
-    } else {
-        $year = intval(substr(1900 - $year, 1, 3));
-        return sprintf('%03u%03u', $year, $rang);
-    }
-}
-    
-// }}}
 // {{{ function check_mat
 
 function check_mat($promo, $mat, $nom, $prenom, &$ourmat, &$ourid)