diff --git a/ecrire/auth/spip.php b/ecrire/auth/spip.php index e380982ec4d641c8d24f8853649cc1351c837a8e..d552d9cdcb4d88bd9aae930a87c676f080522393 100644 --- a/ecrire/auth/spip.php +++ b/ecrire/auth/spip.php @@ -258,14 +258,14 @@ function auth_spip_formulaire_login($flux) { // javascript qui gere la securite du login en evitant de faire circuler le pass en clair $js = file_get_contents(find_in_path('prive/javascript/login.js')); $flux['data'] .= - '<script type="text/javascript">/*<![CDATA[*/' + '<script type="text/javascript"> . "$js\n" . "var login_info={'login':'" . $flux['args']['contexte']['var_login'] . "'," . "'page_auteur': '" . generer_url_public('informer_auteur') . "'," . "'informe_auteur_en_cours':false," . "'attente_informe':0};" . "jQuery(function(){jQuery('#var_login').change(actualise_auteur);});" - . '/*]]>*/</script>'; + . '</script>'; return $flux; } diff --git a/ecrire/inc/cvt_autosave.php b/ecrire/inc/cvt_autosave.php index be146cacc96f5c63b2ad27c13104df012c5654c3..4c47081f5a3683feb023435bc13708965116c188 100644 --- a/ecrire/inc/cvt_autosave.php +++ b/ecrire/inc/cvt_autosave.php @@ -83,9 +83,9 @@ function cvtautosave_formulaire_charger($flux) { * Envoyer le input hidden et le bout de js qui l'utilisera */ $flux['data']['_hidden'] .= "<input type='hidden' name='autosave' class='autosaveactive' value='$cle_autosave' />" - . '<script type="text/javascript">/*<![CDATA[*/if (window.jQuery) jQuery(function(){ + . '<script type="text/javascript">if (window.jQuery) jQuery(function(){ $("input.autosaveactive").closest("form:not(.autosaveon)").autosave({url:"' . $GLOBALS['meta']['adresse_site'] . '/"}).addClass("autosaveon"); - });/*]]>*/</script>'; + });</script>'; } return $flux; diff --git a/ecrire/inc/editer.php b/ecrire/inc/editer.php index c22025438bed82d86d3b2119e8b66972baea99f5..7e58c9a028957b7d64312108c1603f09b815c217 100644 --- a/ecrire/inc/editer.php +++ b/ecrire/inc/editer.php @@ -99,7 +99,7 @@ function formulaires_editer_objet_traiter( $res['message_ok'] = _T('info_modification_enregistree'); if ($retour) { if (strncmp($retour, 'javascript:', 11) == 0) { - $res['message_ok'] .= '<script type="text/javascript">/*<![CDATA[*/' . substr($retour, 11) . '/*]]>*/</script>'; + $res['message_ok'] .= '<script type="text/javascript">' . substr($retour, 11) . '</script>'; $res['editable'] = true; } else { $res['redirect'] = parametre_url($retour, $id_table_objet, $id); diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php index 43c90503b4db7cf960a64ecee39dee6207115108..29b694b2a979e85e2334a1c9d149c67b7df156a8 100644 --- a/ecrire/inc/utils.php +++ b/ecrire/inc/utils.php @@ -1272,9 +1272,7 @@ function http_script($script, $src = '', $noscript = '') { $src = ''; } if ($script) { - $script = ("/*<![CDATA[*/\n" . - preg_replace(',</([^>]*)>,', '<\/\1>', $script) . - '/*]]>*/'); + $script = preg_replace(',</([^>]*)>,', '<\/\1>', $script); } if ($noscript) { $noscript = "<noscript>\n\t$noscript\n</noscript>\n"; diff --git a/prive/echafaudage/contenu/objet.html b/prive/echafaudage/contenu/objet.html index 004f50a43751d0dddf620d08bc514548fdd5d5b9..4ed8495d25656c4052c780f9abfb041d39cba1f1 100644 --- a/prive/echafaudage/contenu/objet.html +++ b/prive/echafaudage/contenu/objet.html @@ -53,7 +53,9 @@ [(#PIPELINE{affiche_enfants,[(#ARRAY{args,#ARRAY{exec,#ENV**{exec},objet,#OBJET,id_objet,#ID_OBJET},data,#GET{enfants}})]})] [(#CONST{_AJAX}|oui) - <script type="text/javascript">/*<!\[CDATA\[*/reloadExecPage('[(#OBJET|objet_info{url_voir})]','#navigation,#chemin,#extra');/*\]\]>*/</script> + <script type="text/javascript"> + reloadExecPage('[(#OBJET|objet_info{url_voir})]','#navigation,#chemin,#extra'); + </script> ] #SET{ok,' '} ][ diff --git a/prive/echafaudage/contenu/objet_edit.html b/prive/echafaudage/contenu/objet_edit.html index 2c2ced0216da0d141804e036063430d9813220b8..c87de441ad9b30dead678de406a9bf2faa167a3b 100644 --- a/prive/echafaudage/contenu/objet_edit.html +++ b/prive/echafaudage/contenu/objet_edit.html @@ -25,6 +25,8 @@ [(#FORMULAIRE_{[editer_(#OBJET)],#ENV{id_objet,oui},#GET{id_rubrique},#GET{redirect},#ENV{lier_trad}})] [(#ENV{retourajax,''}|oui) </div> - <script type="text/javascript">/*<!\[CDATA\[*/reloadExecPage('#ENV{exec}');/*\]\]>*/</script> + <script type="text/javascript"> + reloadExecPage('#ENV{exec}'); + </script> ] </div> diff --git a/prive/echafaudage/contenu/objet_edit.sans_rubrique.html b/prive/echafaudage/contenu/objet_edit.sans_rubrique.html index caee12ec61a225f2c2e701fc5176a9b25e41be80..7408a2da0ebcc8f9d60bb32d40810f7ffb60b1f1 100644 --- a/prive/echafaudage/contenu/objet_edit.sans_rubrique.html +++ b/prive/echafaudage/contenu/objet_edit.sans_rubrique.html @@ -24,6 +24,8 @@ [(#FORMULAIRE_{[editer_(#OBJET)],#ENV{id_objet,oui},#GET{redirect},#ENV{lier_trad}})] [(#ENV{retourajax,''}|oui) </div> - <script type="text/javascript">/*<!\[CDATA\[*/reloadExecPage('#ENV{exec}','#navigation,#chemin,#extra');/*\]\]>*/</script> + <script type="text/javascript"> + reloadExecPage('#ENV{exec}','#navigation,#chemin,#extra'); + </script> ] </div> diff --git a/prive/formulaires/dateur/inc-dateur.html b/prive/formulaires/dateur/inc-dateur.html index 5346dfa3a1b404eddb66e3983faf41362aebd16c..49dd4e8a8d8fff661bb74b72009e3743ac4b1920 100644 --- a/prive/formulaires/dateur/inc-dateur.html +++ b/prive/formulaires/dateur/inc-dateur.html @@ -1,4 +1,4 @@ -<script type='text/javascript'>/*<![CDATA[*/ +<script type='text/javascript'> function date_picker_options(){ return { closeText: '<:bouton_fermer|texte_script:>', @@ -178,7 +178,7 @@ if (window.jQuery){ } }); } -/*]]>*/</script> +</script> <style type="text/css"> [(#INCLURE{formulaires/dateur/time_picker.css}|compacte{css})] [(#INCLURE{formulaires/dateur/bootstrap-datepicker.standalone.css}|compacte{css})] diff --git a/prive/formulaires/editer_liens.html b/prive/formulaires/editer_liens.html index 16a52196717b8a2b759d968cedac923d201cee50..e074493a6b542264131ee200733b63e0bf68f302 100644 --- a/prive/formulaires/editer_liens.html +++ b/prive/formulaires/editer_liens.html @@ -51,7 +51,7 @@ </div></form> ] </div> -<script> - jQuery('.formulaire_#FORM .action .delete').click(function(){jQuery(this).parents('tr').eq(0).animateRemove();}); - jQuery('.formulaire_#FORM .append').animateAppend(); +<script type="text/javascript"> +jQuery('.formulaire_#FORM .action .delete').click(function(){jQuery(this).parents('tr').eq(0).animateRemove();}); +jQuery('.formulaire_#FORM .append').animateAppend(); </script> diff --git a/prive/formulaires/inc-instituer_auteur.html b/prive/formulaires/inc-instituer_auteur.html index 0237c2b520d6fb76e230f6b127288cdf00cc9d66..36df0b9cae4725134c28fe0d0c35d371232cfa45 100644 --- a/prive/formulaires/inc-instituer_auteur.html +++ b/prive/formulaires/inc-instituer_auteur.html @@ -42,7 +42,7 @@ [(#REM) Masquer/afficher le selecteur de rubriques restreintes, ou le choix webmestre ] -<script type="text/javascript">/*<![CDATA[*/ +<script type="text/javascript"> function update_saisie_statut_auteur(node,value){ var statut_auteur_rubrique="[(#GET{statuts_auteurs}|implode{|})]"; var reg = new RegExp("^("+statut_auteur_rubrique+")$"); @@ -56,4 +56,4 @@ function update_saisie_statut_auteur(node,value){ else jQuery(node).next('.choix-webmestre:visible').slideUp(); } -/*]]>*/</script> \ No newline at end of file +</script> \ No newline at end of file diff --git a/prive/formulaires/inc-instituer_auteur_fonctions.php b/prive/formulaires/inc-instituer_auteur_fonctions.php index 3b55483e096460b43dadf091d5c74b6da473ae66..46a10dbbf3c449732d420a7c716cc1fdab97d6df 100644 --- a/prive/formulaires/inc-instituer_auteur_fonctions.php +++ b/prive/formulaires/inc-instituer_auteur_fonctions.php @@ -49,7 +49,7 @@ function choisir_rubriques_admin_restreint( // onchange = pour le menu // l'evenement doit etre provoque a la main par le selecteur ajax - . "<script type='text/javascript'>/*<![CDATA[*/ + . "<script type='text/javascript'> jQuery(function($){ $('#id_parent').on('change', function(){ var id_parent = parseInt(this.value); @@ -67,7 +67,7 @@ jQuery(function($){ }) .attr('name','noname'); }); -/*]]>*/</script>"; +</script>"; } return $res; diff --git a/prive/formulaires/inscription.html b/prive/formulaires/inscription.html index c9f7cce022c1ef3f2ed2d298309eb4de090facbb..a2f4226a68f2327f341b36d50719fa6add037558 100644 --- a/prive/formulaires/inscription.html +++ b/prive/formulaires/inscription.html @@ -35,11 +35,11 @@ document.getElementById('(#ENV{focus})').focus(); </div> [(#ENV{focus,''}|?{' '}) <div style="text-align: #LANG_RIGHT;"> -<script type="text/javascript">/*<!\[CDATA\[*/ +<script type="text/javascript"> document.write("<a style='color: #e86519' href='") document.write((window.opener) ? "javascript:close()" : "./") document.write("'><:pass_quitter_fenetre:><" + "/a>"); -/*\]\]>*/</script> +</script> <noscript> [<a href='./'><:pass_retour_public:></a>] </noscript> diff --git a/prive/squelettes/contenu/article.html b/prive/squelettes/contenu/article.html index e0b42bb3a6c5cc199aeefdf7207082aa022a2f5e..404cda5035d7c70c8bbfced0ac35ffe8d04bb2d2 100644 --- a/prive/squelettes/contenu/article.html +++ b/prive/squelettes/contenu/article.html @@ -71,7 +71,9 @@ [(#PIPELINE{affiche_enfants,[(#ARRAY{args,#ARRAY{exec,#ENV**{exec},objet,article,id_objet,#ID_ARTICLE},data,#GET{enfants}})]})] [(#CONST{_AJAX}|oui) - <script type="text/javascript">/*<!\[CDATA\[*/reloadExecPage('#ENV{exec}','#navigation,#chemin,#extra');/*\]\]>*/</script> + <script type="text/javascript"> + reloadExecPage('#ENV{exec}','#navigation,#chemin,#extra'); + </script> ] </BOUCLE_article> [(#ENV**{exec}|=={article_edit}|?{#INCLURE{fond=prive/squelettes/contenu/article_edit,redirect='',env,retourajax=oui},#REM|sinon_interdire_acces{'',<:info_aucun_article:>}})] diff --git a/prive/squelettes/contenu/auteur.html b/prive/squelettes/contenu/auteur.html index 9cc5c94b5b1aeed0e4a2060d6dc70f4b45dac315..80dba775eb463e864842b1359ebfec7f2d4678b8 100644 --- a/prive/squelettes/contenu/auteur.html +++ b/prive/squelettes/contenu/auteur.html @@ -44,7 +44,9 @@ ] [(#CONST{_AJAX}|oui) - <script type="text/javascript">/*<!\[CDATA\[*/reloadExecPage('#ENV{exec}','#navigation,#extra');/*\]\]>*/</script> + <script type="text/javascript"> + reloadExecPage('#ENV{exec}','#navigation,#extra'); + </script> ] </BOUCLE_auteur> [(#ENV**{exec}|=={auteur_edit}|?{#INCLURE{fond=prive/squelettes/contenu/auteur_edit,env,retourajax=oui},#REM|sinon_interdire_acces{'',<:info_aucun_auteur:>}})] diff --git a/prive/squelettes/contenu/auteur_edit.html b/prive/squelettes/contenu/auteur_edit.html index afb0a26bffb359fc301b25f9f5d14ba47843eac7..3839402043e1a7efa56c1589f83717a4ace45820 100644 --- a/prive/squelettes/contenu/auteur_edit.html +++ b/prive/squelettes/contenu/auteur_edit.html @@ -22,7 +22,9 @@ #FORMULAIRE_EDITER_AUTEUR{#ENV{id_auteur,oui},#GET{redirect},#ENV{associer_objet}} [(#ENV{retourajax,''}|oui) </div> - <script type="text/javascript">/*<!\[CDATA\[*/reloadExecPage('#ENV{exec}','#navigation,#extra');/*\]\]>*/</script> + <script type="text/javascript"> + reloadExecPage('#ENV{exec}','#navigation,#extra'); + </script> ] </div> diff --git a/prive/squelettes/contenu/job_queue.html b/prive/squelettes/contenu/job_queue.html index 4bac007ec15508e73231a769878d3d93a064de3e..60e6b7b9e56c69d2c6453d01e428e99dde34d3bc 100644 --- a/prive/squelettes/contenu/job_queue.html +++ b/prive/squelettes/contenu/job_queue.html @@ -5,7 +5,7 @@ <INCLURE{fond=prive/objets/liste/jobs, ajax, env} /> -<script type="text/javascript">/*<![CDATA[*/ +<script type="text/javascript"> function queue_reload(){jQuery('h1').ajaxReload();} if (window.jQuery) setTimeout(queue_reload,60000); -/*]]>*/</script> +</script> diff --git a/prive/squelettes/contenu/rubrique.html b/prive/squelettes/contenu/rubrique.html index 5b4362cf3e7c8a5dc8c80205a7a097430054307c..727b04f3776cace881868c8d1c9ba8e91e1a07df 100644 --- a/prive/squelettes/contenu/rubrique.html +++ b/prive/squelettes/contenu/rubrique.html @@ -29,7 +29,9 @@ #PIPELINE{afficher_complement_objet,#ARRAY{args,#ARRAY{type,rubrique,id,#ID_RUBRIQUE},data,'<div class="nettoyeur"></div>'}} [(#CONST{_AJAX}|oui) - <script type="text/javascript">/*<!\[CDATA\[*/reloadExecPage('#ENV{exec}','#navigation,#chemin,#extra');/*\]\]>*/</script> + <script type="text/javascript"> + reloadExecPage('#ENV{exec}','#navigation,#chemin,#extra'); + </script> ] </BOUCLE_rubrique> [(#ENV**{exec}|=={rubrique_edit}|?{#INCLURE{fond=prive/squelettes/contenu/rubrique_edit,redirect='',env,retourajax=oui},#REM|sinon_interdire_acces{'',<:info_aucun_rubrique:>}})] diff --git a/prive/squelettes/inclure/head.html b/prive/squelettes/inclure/head.html index 1247c290df9f0008fb070c646c8fbaa96ad6f0f0..bc203e3b7ccb409bc10de35390a912598f1ba3b5 100644 --- a/prive/squelettes/inclure/head.html +++ b/prive/squelettes/inclure/head.html @@ -4,7 +4,7 @@ Appel au script php en attendant de reecrire le head ici [<title>(#ENV{titre,''})</title> ] <meta http-equiv="Content-Type" content="text/html[; charset=(#CONFIG{charset})]" /> -<script type='text/javascript'>/*<![CDATA[*/ +<script type='text/javascript'> var url_menu_rubrique="[(#VAL{menu_rubriques}|generer_url_action{[date=(#CONFIG{date_calcul_rubriques})],1})]"; (function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement); [(#EVAL{$_COOKIE}|table_valeur{spip_accepte_ajax}|>={1}|non) @@ -27,7 +27,7 @@ spipConfig.core = { confirm_changer_statut: confirm_changer_statut, error_on_ajaxform: error_on_ajaxform }; -/*]]>*/</script> +</script> <meta name="viewport" content="width=device-width" /> [<link rel="stylesheet" type="text/css" href="(#VAL{reset.css}|find_in_theme|timestamp|url_absolue)" id="csspriveereset" />] #PIPELINE{header_prive_css,''}