From cf39943f36aba006ea11f4c878c5bf584d7b1271 Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Tue, 24 Aug 2004 09:07:57 +0000 Subject: [PATCH] escape is now the default, no need to tell it twice --- include/xorg.page.inc.php | 9 +++++---- templates/evenements.tpl | 8 ++++---- templates/include/form.valid.aliases.tpl | 4 ++-- templates/include/form.valid.emploi.tpl | 8 ++++---- templates/include/form.valid.ml.tpl | 4 ++-- templates/include/x_inscrit.tpl | 10 +++++----- templates/logger-view.tpl | 4 ++-- templates/rss.tpl | 4 ++-- templates/sendmail.tpl | 16 ++++++++-------- templates/table-editor.tpl | 6 +++--- 10 files changed, 37 insertions(+), 36 deletions(-) diff --git a/include/xorg.page.inc.php b/include/xorg.page.inc.php index 017fce6..4ddd950 100644 --- a/include/xorg.page.inc.php +++ b/include/xorg.page.inc.php @@ -35,10 +35,11 @@ class XorgPage extends DiogenesCorePage { $this->plugins_dir[]= $globals->spoolroot."/plugins/"; $this->config_dir = $globals->spoolroot."/configs/"; $this->cache_dir = $globals->spoolroot."/cache/"; - - $this->config_overwrite=false; - $this->compile_check = isset($site_dev); - $this->caching = ($type == SKINNED); + + $this->default_modifiers = Array('escape'); + $this->config_overwrite = false; + $this->compile_check = isset($site_dev); + $this->caching = ($type == SKINNED); $this->_page_type = $type; $this->_tpl = $tpl; diff --git a/templates/evenements.tpl b/templates/evenements.tpl index 3a8a567..56bd23d 100644 --- a/templates/evenements.tpl +++ b/templates/evenements.tpl @@ -1,4 +1,4 @@ -{* $Id: evenements.tpl,v 1.1 2004-07-19 13:35:35 x2000habouzit Exp $ *} +{* $Id: evenements.tpl,v 1.2 2004-08-24 09:07:57 x2000habouzit Exp $ *}
Proposition d'information événementielle @@ -38,12 +38,12 @@ Tu as ajout {/if}
- - + + - +
diff --git a/templates/include/form.valid.aliases.tpl b/templates/include/form.valid.aliases.tpl index cd07356..b081f3e 100644 --- a/templates/include/form.valid.aliases.tpl +++ b/templates/include/form.valid.aliases.tpl @@ -1,4 +1,4 @@ -{* $Id: form.valid.aliases.tpl,v 1.3 2004-02-11 15:35:33 x2000habouzit Exp $ *} +{* $Id: form.valid.aliases.tpl,v 1.4 2004-08-24 09:07:58 x2000habouzit Exp $ *}
@@ -20,7 +20,7 @@ Motif : - {$this->raison|escape:"html"|nl2br} + {$this->raison|nl2br} diff --git a/templates/include/form.valid.emploi.tpl b/templates/include/form.valid.emploi.tpl index 1ff0b12..b4b1bcb 100644 --- a/templates/include/form.valid.emploi.tpl +++ b/templates/include/form.valid.emploi.tpl @@ -1,4 +1,4 @@ -{* $Id: form.valid.emploi.tpl,v 1.1 2004-02-07 17:18:16 x2000habouzit Exp $ *} +{* $Id: form.valid.emploi.tpl,v 1.2 2004-08-24 09:07:58 x2000habouzit Exp $ *} @@ -13,14 +13,14 @@ Demandeur - {$valid->entreprise|escape:"html"} ({$valid->mail|escape:"html"}) + {$valid->entreprise} ({$valid->mail}) Titre du post - {$valid->titre|escape:"html"} + {$valid->titre} - 
{$valid->text|escape:"html"}
+ 
{$valid->text}
diff --git a/templates/include/form.valid.ml.tpl b/templates/include/form.valid.ml.tpl index 455bcaa..1f107ac 100644 --- a/templates/include/form.valid.ml.tpl +++ b/templates/include/form.valid.ml.tpl @@ -1,4 +1,4 @@ -{* $Id: form.valid.ml.tpl,v 1.2 2004-02-11 15:35:33 x2000habouzit Exp $ *} +{* $Id: form.valid.ml.tpl,v 1.3 2004-08-24 09:07:58 x2000habouzit Exp $ *} @@ -15,7 +15,7 @@ Motif : - {$valid->comment|escape:"html"|nl2br} + {$valid->comment|nl2br} diff --git a/templates/include/x_inscrit.tpl b/templates/include/x_inscrit.tpl index 06a76c0..588ca19 100644 --- a/templates/include/x_inscrit.tpl +++ b/templates/include/x_inscrit.tpl @@ -1,4 +1,4 @@ -{* $Id: x_inscrit.tpl,v 1.2 2004-02-19 13:42:58 x2000habouzit Exp $ *} +{* $Id: x_inscrit.tpl,v 1.3 2004-08-24 09:07:58 x2000habouzit Exp $ *}
@@ -62,16 +62,16 @@ Profession: - {$c.entreprise|escape:"html"} - {if $c.secteur}( {$c.secteur|escape:"html"} ){/if} - {if $c.fonction}
{$c.fonction|escape:"html"} ){/if} + {$c.entreprise} + {if $c.secteur}( {$c.secteur} ){/if} + {if $c.fonction}
{$c.fonction} ){/if} {/if} {if $c.libre} Commentaire: - {$c.libre|escape:"html"|nl2br} + {$c.libre|nl2br} {/if} diff --git a/templates/logger-view.tpl b/templates/logger-view.tpl index 3301dec..96bb96a 100644 --- a/templates/logger-view.tpl +++ b/templates/logger-view.tpl @@ -1,4 +1,4 @@ -{* $Id: logger-view.tpl,v 1.2 2004-02-20 03:01:10 x2000habouzit Exp $ *} +{* $Id: logger-view.tpl,v 1.3 2004-08-24 09:07:57 x2000habouzit Exp $ *}
Parcours des logs du site @@ -38,7 +38,7 @@ {$myevent.stamp|date_format:"%Y-%m-%d %H:%M:%S"} {$myevent.text} - {$myevent.data|escape} + {$myevent.data} {/foreach} diff --git a/templates/rss.tpl b/templates/rss.tpl index a6e0578..df08ec0 100644 --- a/templates/rss.tpl +++ b/templates/rss.tpl @@ -1,4 +1,4 @@ -{* $Id: rss.tpl,v 1.2 2004-02-19 13:22:05 x2000habouzit Exp $ *} +{* $Id: rss.tpl,v 1.3 2004-08-24 09:07:57 x2000habouzit Exp $ *} -{$line.titre|strip_tags|escape:"html"} +{$line.titre|strip_tags} http://{$smarty.server.SERVER_NAME}/login.php#newsid{$line.id} {/foreach} diff --git a/templates/sendmail.tpl b/templates/sendmail.tpl index dc8e033..9ab2bc0 100644 --- a/templates/sendmail.tpl +++ b/templates/sendmail.tpl @@ -1,4 +1,4 @@ -{* $Id: sendmail.tpl,v 1.2 2004-02-09 17:47:06 x2000habouzit Exp $ *} +{* $Id: sendmail.tpl,v 1.3 2004-08-24 09:07:57 x2000habouzit Exp $ *} {dynamic} @@ -31,34 +31,34 @@ de : à : - + copie : - + copie cachée : - + sujet : - + @@ -79,7 +79,7 @@ {/if} {$contact.prenom} {$contact.nom} (X{$contact.promo}) diff --git a/templates/table-editor.tpl b/templates/table-editor.tpl index 4ee60e2..4981732 100644 --- a/templates/table-editor.tpl +++ b/templates/table-editor.tpl @@ -1,4 +1,4 @@ -{* $Id: table-editor.tpl,v 1.5 2004-07-17 11:23:09 x2000habouzit Exp $ *} +{* $Id: table-editor.tpl,v 1.6 2004-08-24 09:07:57 x2000habouzit Exp $ *} {dynamic} @@ -101,7 +101,7 @@ {if $myval.type=="textarea"} - + {elseif $myval.type=="set"} {if $myval.trans} {flags table=$table field=$mykey name="$prefix$mykey" selected=$myval.trans[$myval.value] trans=$myval.trans} @@ -115,7 +115,7 @@ {elseif $myval.type=="password"} {else} - + {/if} -- 2.1.4