From 0025a0c5b80edf65ca41afa3db296fe59a2497ae Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Wed, 5 Jul 2006 06:50:51 +0000 Subject: [PATCH] fix a bug in the uri exploder. use more semantic uri's in marketing (promo) fix some typos don't use gassign, it's broken in our context. git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@376 839d8a87-29fc-0310-9880-83ba4fa771e5 --- classes/Platal.php | 10 +++++-- htdocs/images/24/first-page.png | Bin 0 -> 821 bytes htdocs/images/24/last-page.png | Bin 0 -> 802 bytes htdocs/images/24/next.png | Bin 0 -> 841 bytes htdocs/images/24/previous.png | Bin 0 -> 849 bytes modules/marketing.php | 16 +++++------ templates/marketing/private.tpl | 2 +- templates/marketing/promo.tpl | 59 ++++++++++------------------------------ 8 files changed, 31 insertions(+), 56 deletions(-) create mode 100644 htdocs/images/24/first-page.png create mode 100644 htdocs/images/24/last-page.png create mode 100644 htdocs/images/24/next.png create mode 100644 htdocs/images/24/previous.png diff --git a/classes/Platal.php b/classes/Platal.php index fe55885..cf888cc 100644 --- a/classes/Platal.php +++ b/classes/Platal.php @@ -34,7 +34,7 @@ class Platal function Platal() { - $this->path = Get::_get('p', null); + $this->path = trim(Get::_get('p', null), '/'); $this->__mods = array(); $this->__hooks = array(); @@ -74,8 +74,12 @@ class Platal return PL_NOT_FOUND; } - $args = array_merge(array(&$page), - explode('/', substr($this->path, strlen($p) + 1))); + $args = explode('/', substr($this->path, strlen($p) + 1)); + if ($args[0] != '') { + array_unshift($args, &$page); + } else { + $args = array(&$page); + } if ($hook['auth'] > Session::get('auth', AUTH_PUBLIC)) { $_SESSION['session']->doAuth($page); diff --git a/htdocs/images/24/first-page.png b/htdocs/images/24/first-page.png new file mode 100644 index 0000000000000000000000000000000000000000..a253e353ae17ef9a613660cea7663572e052de6e GIT binary patch literal 821 zcmV-51Iqk~P)Y#P&FwPQrMs_1D4oDsD-HCfNm=B z8CdrdbYH29euOq@tR!7_QJhCZvS1li4R9$!Eh0P*v3H8jC3@kuBx+j`#WbUNDUoM@+W zqB}b~8it{+t*z0_%j?IA5*DR0GOYjXJut27#bS-4j2JU`Mkuasu#hS09CqL_NU z-uu}dpbkW)8%s|GR;7m^xfjQlH*fx8duxm5FaE#)e}|iV|HF?V@CC3@KFi`1IMo@G z?5JXb02RmR=qOWDx43rwBlh<8IN1LO;4)AGOkcJ|93tYyF+5zMQmLXMnXI-}sZ^?n z2=%Kq#>U6_^yW=!S4O#dr3!E@B`Eh3ec%ArT112(FkN?xE4b)D`}Ogo_ZozK1lC!svpDC_ zf>n*iERP;GdrI0@n{!Dyqd0MA6FBD(=WsS5$-@!TXf$X(xStbt#3*#H0MBq zD2g(RKrt9F;6yOS_;Ha}ObU#ju!$FEcyM%d>8MZ zFbqK@ua1IfVb9KmH$t;Hrh`3r`s6n*4Vxs^nm)Y-QE##D|KvB5#XAKR6<)l2l@(cU ze!qFgNB=DO7Wf>fnjUYidl~wl|72odAK3p7(Qc{ua@VV#00000NkvXXu0mjfW)ghm literal 0 HcmV?d00001 diff --git a/htdocs/images/24/last-page.png b/htdocs/images/24/last-page.png new file mode 100644 index 0000000000000000000000000000000000000000..f346c4515bb6ddc30f583d26fbf95ab4cbc10ee8 GIT binary patch literal 802 zcmV+-1Ks?IP)2@y0gK$yop$3^GSLR%nuCnxvj&YAN+kN>%M;6IGn z*;(f#diMZ5h3o@=%H^_-jg9Ht+}vlN2$)U)y0*5a`}_NP-0*#0eg8mx|3Ei4H`Vhz zU0q$(k&zJ(xB#?`=tRadkOTew`hhbgNmiE zuaD8uYYdz}$M*I%zjl5CoB?uxIZ|yAi-^Qx>FFs@U#g=bsT51S6beN|gv!}67X}Bp zGBiZFzmK#1MSy`W0Fr`eT+CZjQ`GBqL?taSKrWZVb@PN_NE8NK9Ui7PBg#=0B>;)1 zqM5PVcc!T?Ew}6ifsY^f1YwZwUA}ZNS(^3$)?&qCtwpS~yt^|!&GPbci!*_LfQ>9U zw>=@FT}M%bh~PM;tuCEfy4!gD>gB2Qk3Ie`7LFy4G1_K7H2*#NBxX2ij zHe-CkHlpYf!S3#ES_4cYMULYjZ2(MM167Tk%FeEiH1#|WR8n>{i#E;ay6KM4^c>U9 z5xjf*hTb02$h9U{uR%2SIPU+(JCo)+F)AvoeEgJ>>~MYWpYqc0CJ%t?K+znE=6o#q gfBcgPfgNDyFJ_FXgsy?9cK`qY07*qoM6N<$f`q_zLI3~& literal 0 HcmV?d00001 diff --git a/htdocs/images/24/next.png b/htdocs/images/24/next.png new file mode 100644 index 0000000000000000000000000000000000000000..31256ab41a387db0c668440779051a908b0e5f2a GIT binary patch literal 841 zcmV-P1GfB$P)4VzH=W zV`Dl$KmQfT1Ew8;uCA`?;o+fn8=mK>=N+l%9qH!grn;`HD=RBHGBV-<=Yf_Mod~=} za-@5EySljeLbtZIR8_THF6-pvqy>rz$uXuvq0rWUs+!(KB%Z^;!2vxzJpfEiO|h`B z;N)_-CqMx(*=~VR)mQ{$98`svi)=QF?+27hrN(WyffC@G<5=1fSd|8XXk8G5tgU@x zV||?upFU!MpY9KyK6~y0)4=y^Cyf)}tl5EDg)=vvc0{{?#?fO z(?A9=P0<#yh)68aTt&#|3sl}!P!U9h!1oamN@t3k9~|WJ&=AG`KF;*#0R}n{90yJS z0q#ssQ>j!C8$D+-8M4_NK@boIK39f^>8&M7a~358^}r&M0s`EcVHlz! zO&e!tAF#X}kvNV?YojZ{NynSlWp3TN*>zo$U7-!rJSR@iu&zE5@bU5MXdELILF3Dc z?Mz^;O@SNR1VDM|B@+`j2*WULn-OSID`*!B#M-)ElXT{2EWKJ}VqzSzHqu@dYi(U| z>IqyF22I)DNSmN5x1F=1py2MhN1 z_tO|)BJCZ=L0S+Ph=QBCsn)yNrm5??pps@sD;H?}yzY$9w2x_f3*J}X(tFBaFm(Yo zh{hVn^&fpRslO9YQQ_0)FKPH1=x43=<*q6kBHg3uu48B+5E^hgxE0-FIrM-yz8 zK#`JyB?D1J76~OzJag|o6mw_1$7~}V&DHqK|DWYQXAJ-0nwy*Re#h?yAb(&D;Af#w zkjcqOnV+Bk2xI{@h(MN?m!;8Y$gr!~Y)Z4aC(Y)btgfz#@B6Z}v?LP~6Fx8o^v&qE zz*{7HvbD7-4<6i?wY4=75vf+IQZAPbP>4x7m~y$?!1{?ua<|sHGwkf_FfuX%!1VMq z3kwTgCX=}hLyR#NxO}r_%&MNU>P#e(f?)1OnBGC4GTK=pu;x!cg=1 z^C!NotnlXDTNLo!|H_@a_k3Um_>$f);utu7rc`uC1m$^%HRSVo&YwTWkz+?$Utec) z;|IV&AO)zNZd+@x);f#M(q@Z`i)3@7gh7C{mg3<8W8>qTK6Q%1p*)8VWdV-F1nFLa zR>Z{FAcz&}uj|arTuFRWsT7c6cejBK1J0f~!)Qw=9zb7$ZeS7NRjo#)ay9V_br@v@ z1YwXoKY8MKd{q4jj7fk21ff=|QK?+(?3F8H7zP+^NTt<$S2BxI{#Huhr_z&R(aV zpVk^{EuN>6+33E8E~#?)5-*-V`|Cy6L!gaD8;vn0QBJ8;;@Q(`r=JcHacVOrk~4y_ zW`6=>4AvNoj!0t3Uc5NPlj`FRKd}}Zs4@gXfLA~~p z(E|#FO3DNZD=uO;|Iu$Msdo%&#q#d`hopVo{k{2zAN~F87H|Q`s;+E~Im`UxKba8N b05*OBx7XL+%eR3400000NkvXXu0mjf0pWZd literal 0 HcmV?d00001 diff --git a/modules/marketing.php b/modules/marketing.php index 8fbcebc..b26040e 100644 --- a/modules/marketing.php +++ b/modules/marketing.php @@ -96,10 +96,10 @@ class MarketingModule extends PLModule if (list($nom, $prenom, $promo, $matricule) = $res->fetchOneRow()) { require_once('register.inc.php'); $matricule_X = get_X_mat($matricule); - $page->gassign('nom'); - $page->gassign('prenom'); - $page->gassign('promo'); - $page->gassign('matricule'); + $page->assign('nom', $nom); + $page->assign('prenom', $prenom); + $page->assign('promo', $promo); + $page->assign('matricule', $matricule); $page->assign('matricule_X',$matricule_X); } else { $page->kill('uid invalide'); @@ -156,8 +156,8 @@ class MarketingModule extends PLModule $res = $globals->xdb->query("SELECT date, relance FROM register_pending WHERE uid = {?}", $uid); if (list($pending, $relance) = $res->fetchOneCell()) { - $page->gassign('pending'); - $page->gassign('relance'); + $page->assign('pending', $pending); + $page->assign('relance', $relance); } return PL_OK; @@ -169,8 +169,8 @@ class MarketingModule extends PLModule $page->changeTpl('marketing/promo.tpl'); - if (!$promo) { - $promo = Env::has('promo') ? Env::getInt('promo') : Session::getInt('promo'); + if (is_null($promo)) { + $promo = Session::getInt('promo'); } $page->assign('promo', $promo); diff --git a/templates/marketing/private.tpl b/templates/marketing/private.tpl index 0549d73..11fa083 100644 --- a/templates/marketing/private.tpl +++ b/templates/marketing/private.tpl @@ -96,7 +96,7 @@ sa derni {if $rel_to} -
+ diff --git a/templates/marketing/promo.tpl b/templates/marketing/promo.tpl index 66c4b50..d0d35fc 100644 --- a/templates/marketing/promo.tpl +++ b/templates/marketing/promo.tpl @@ -20,50 +20,19 @@ {* *} {**************************************************************************} -
Edition du mail de relance
- - - - - - - -
- -
- - -
- - 		-
-
- - -
-
- 		-
-
- Promotion : - -
-
- 		-
-
- - -
-
- 		-
-
- - -
-
-
+
+
+ [<<] + [<] + +   + Promo: +   + + [>] + [>>] +
+

@@ -73,6 +42,8 @@ +
+
-- 2.1.4