From c6db254ad9c105effd68a66e0ddc2e6538b33cd2 Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Sat, 22 Jul 2006 20:00:58 +0000 Subject: [PATCH] remove more old cruft \o/ git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@571 839d8a87-29fc-0310-9880-83ba4fa771e5 --- include/platal/page.inc.php | 2 +- plugins/block.min_auth.php | 40 ---------------------------------------- plugins/block.only_public.php | 37 ------------------------------------- plugins/block.perms.php | 39 --------------------------------------- templates/fiche.tpl | 4 ++-- templates/include/minifiche.tpl | 14 +++++++------- templates/newsletter/show.tpl | 4 ++-- templates/password_prompt.tpl | 8 ++++---- templates/search/adv.form.tpl | 4 ++-- templates/search/index.tpl | 4 ++-- templates/search/quick.form.tpl | 8 ++++---- templates/search/quick.tpl | 4 ++-- templates/skin/common.footer.tpl | 4 ++-- templates/skin/common.menu.tpl | 10 ++++------ templates/trezo/index.tpl | 4 ++-- templates/xnet/skin.tpl | 4 ++-- 16 files changed, 36 insertions(+), 154 deletions(-) delete mode 100644 plugins/block.min_auth.php delete mode 100644 plugins/block.only_public.php delete mode 100644 plugins/block.perms.php diff --git a/include/platal/page.inc.php b/include/platal/page.inc.php index ccbd60c..83f26a1 100644 --- a/include/platal/page.inc.php +++ b/include/platal/page.inc.php @@ -109,7 +109,7 @@ class PlatalPage extends Smarty exit; case SIMPLE: - $page->assign('simple', true); + $this->assign('simple', true); case SKINNED: $this->register_modifier('escape_html', 'escape_html'); $this->default_modifiers = Array('@escape_html'); diff --git a/plugins/block.min_auth.php b/plugins/block.min_auth.php deleted file mode 100644 index 5caa432..0000000 --- a/plugins/block.min_auth.php +++ /dev/null @@ -1,40 +0,0 @@ - diff --git a/plugins/block.only_public.php b/plugins/block.only_public.php deleted file mode 100644 index 24430a2..0000000 --- a/plugins/block.only_public.php +++ /dev/null @@ -1,37 +0,0 @@ - diff --git a/plugins/block.perms.php b/plugins/block.perms.php deleted file mode 100644 index 51ff85d..0000000 --- a/plugins/block.perms.php +++ /dev/null @@ -1,39 +0,0 @@ - diff --git a/templates/fiche.tpl b/templates/fiche.tpl index 0576af4..4659747 100644 --- a/templates/fiche.tpl +++ b/templates/fiche.tpl @@ -56,11 +56,11 @@ function chgMainWinLoc( strPage ) { Retirer de mes contacts {/if} - {perms level=admin} + {if $smarty.session.perms eq admin} admin - {/perms} + {/if} {/if} {if $logged} diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl index 48a8df8..b16f168 100644 --- a/templates/include/minifiche.tpl +++ b/templates/include/minifiche.tpl @@ -22,7 +22,7 @@ {if !$c.inscrit || $c.dcd}
{/if} -
+
{if $c.sexe}•{/if} @@ -38,15 +38,15 @@ (X {$c.promo}{if $c.app0text}, {applis_fmt type=$c.app0type text=$c.app0text url=$c.app0url} {/if}{if $c.app1text}, {applis_fmt type=$c.app1type text=$c.app1text url=$c.app1url}{/if}) {if $c.dcd}décédé{if $c.sexe}e{/if} le {$c.deces|date_format}{/if} - {min_auth level="cookie"} + {if $smarty.session.auth ge AUTH_COOKIE} {if !$c.dcd && !$c.wasinscrit} clique ici si tu connais son adresse email ! {/if} - {/min_auth} + {/if}
- {min_auth level="cookie"} + {if $smarty.session.auth ge AUTH_COOKIE} {if !$c.wasinscrit && !$c.dcd} {if $show_action eq ajouter} {* @@ -66,9 +66,9 @@ title="{if $show_action eq "ajouter"}Ajouter à mes{else}Retirer de mes{/if} contacts" /> {/if} {/if} - {/min_auth} + {/if} - {perms level='admin'} + {if $smarty.session.perms eq admin} {if !$c.wasinscrit && !$c.dcd} {* *}admin @@ -78,7 +78,7 @@ {/if} {* *}AX - {/perms} + {/if}
diff --git a/templates/newsletter/show.tpl b/templates/newsletter/show.tpl index a24ef6a..ba2200e 100644 --- a/templates/newsletter/show.tpl +++ b/templates/newsletter/show.tpl @@ -31,9 +31,9 @@ {else} [version Texte] {/if} -{perms level='admin'} +{if $smarty.session.perms eq admin} [Editer] -{/perms} +{/if}

diff --git a/templates/password_prompt.tpl b/templates/password_prompt.tpl index 58e39c7..b1378ca 100644 --- a/templates/password_prompt.tpl +++ b/templates/password_prompt.tpl @@ -33,15 +33,15 @@

Accès réservé aux Polytechniciens

-{min_auth level="cookie"} +{if $smarty.session.auth ge AUTH_COOKIE}

Merci de rentrer ton mot de passe pour démarrer une connexion au site. Si tu n'es pas {insert name="getName"}, change le login ci-dessous, ou rends-toi sur la page d'inscription.

-{/min_auth} +{/if} -{only_public} +{if !$smarty.session.auth}

Tu ne connais pas ton mot de passe ?

@@ -58,7 +58,7 @@ Si tu n'es pas {insert name="getName"}, change le login ci-dessous, ou rends-toi paramètres personnels. -{/only_public} +{/if}
diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl index 70aebb4..5930963 100644 --- a/templates/search/adv.form.tpl +++ b/templates/search/adv.form.tpl @@ -301,12 +301,12 @@ - {min_auth level='cookie'} + {if $smarty.session.auth ge AUTH_COOKIE}

mettre les fiches modifiées récemment en premier

- {/min_auth} + {/if}

Tu peux installer la barre de recherche rapide directement dans ton navigateur.

-{/min_auth} +{/if}

Polytechniciens des promotions 1919 et précédentes

Notre base de données ne contient que les polytechniciens depuis la promotion 1920. Pour effectuer des recherches dans les diff --git a/templates/skin/common.footer.tpl b/templates/skin/common.footer.tpl index 71aa3b1..ebfaa6c 100644 --- a/templates/skin/common.footer.tpl +++ b/templates/skin/common.footer.tpl @@ -30,10 +30,10 @@
Services et Ethique | Charte -{min_auth level=cookie} +{if $smarty.session.auth ge AUTH_COOKIE} | Disponibilité | Statistiques -{/min_auth} +{/if}

{* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/skin/common.menu.tpl b/templates/skin/common.menu.tpl index ec918a3..865e4c0 100644 --- a/templates/skin/common.menu.tpl +++ b/templates/skin/common.menu.tpl @@ -20,7 +20,7 @@ {* *} {**************************************************************************} -{only_public} +{if !$smarty.session.auth}
Polytechniciens
Me connecter !
M'inscrire
@@ -35,8 +35,7 @@
A propos du site
Nous contacter
FAQ
- -{/only_public} +{/if} {if $smarty.session.auth == AUTH_MDP}
Déconnexion
@@ -74,8 +73,7 @@
Nous contacter
Carrières
-{perms level=admin} - +{if $smarty.session.perms eq admin}
***
Marketing
Administration
@@ -89,6 +87,6 @@ {insert name="mkStats"} -{/perms} +{/if} {* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/trezo/index.tpl b/templates/trezo/index.tpl index e181c2f..219f999 100644 --- a/templates/trezo/index.tpl +++ b/templates/trezo/index.tpl @@ -22,9 +22,9 @@

Trésorerie pour {$mon_sel}

-{perms level=admin} +{if $smarty.session.perms eq admin}

[éditer les comptes]

-{/perms} +{/if} diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl index 4e694ea..3ba34e0 100644 --- a/templates/xnet/skin.tpl +++ b/templates/xnet/skin.tpl @@ -142,10 +142,10 @@ -- 2.1.4
{list_all_my_groups} - {only_public} + {if !$smarty.session.auth}
Me connecter :
polytechnicien - {/only_public} + {/if} manuel