diff --git a/ecrire/exec/recherche.php b/ecrire/exec/recherche.php index a7968c89e1cfd0322f58f005547073b975512dae..eefb375fe28f37f1e5218dd496f48ad60ef7b321 100644 --- a/ecrire/exec/recherche.php +++ b/ecrire/exec/recherche.php @@ -10,12 +10,10 @@ * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. * \***************************************************************************/ - if (!defined("_ECRIRE_INC_VERSION")) return; include_spip('inc/presentation'); include_spip('inc/sites_voir'); - // http://doc.spip.org/@exec_recherche_dist function exec_recherche_dist() { $recherche = _request('recherche'); @@ -46,11 +44,10 @@ function exec_recherche_dist() { if (!strlen($recherche)) { $recherche_aff = _T('info_rechercher'); $onfocus = " onfocus=\"this.value='';\""; - } + } else $onfocus = ''; - echo generer_form_ecrire("recherche", - ('<input type="text" size="10" value="'.$recherche_aff.'" name="recherche" class="spip_recherche" accesskey="r"' . $onfocus . ' />'), - " method='get'"); + $onfocus = '<input type="text" size="10" value="'.$recherche_aff.'" name="recherche" class="spip_recherche" accesskey="r"' . $onfocus . ' />'; + echo generer_form_ecrire("recherche", $onfocus, " method='get'"); /* // Si on est autorise a modifier, proposer le choix de REMPLACER @@ -59,7 +56,6 @@ function exec_recherche_dist() { echo '<br /><input type="text" size="10" value="'.entites_html(_request('remplacer')).'" name="remplacer" class="spip_recherche" />'; } */ - echo "</div></form>"; debut_droite(); @@ -96,7 +92,7 @@ function exec_recherche_dist() { break; } - echo $a = $fn($titre, + echo $fn($titre, array( // gasp: la requete spip_articles exige AS articles... 'FROM' => 'spip_'.table_objet($table).' AS '.$table.'s', diff --git a/ecrire/exec/valider_xml.php b/ecrire/exec/valider_xml.php index 594a773bc846ead2cd2f1cded4a69a0ae7f6179e..a8992d378760d37789cb9dd6a895b97e999668eb 100644 --- a/ecrire/exec/valider_xml.php +++ b/ecrire/exec/valider_xml.php @@ -21,6 +21,11 @@ function exec_valider_xml_dist() exit; } + $titre = _T('analyse_xml'); + $commencer_page = charger_fonction('commencer_page', 'inc'); + + echo $commencer_page($titre); + $url = urldecode(_request('var_url')); if (!$url) { @@ -30,41 +35,38 @@ function exec_valider_xml_dist() } else { - list($server, $script) = preg_split('/[?]/', $url); - if ((!$server) OR ($server == './') - OR strpos($server, url_de_base()) === 0) { - include_spip('inc/headers'); - redirige_par_entete(parametre_url($url,'transformer_xml','valider_xml', '&')); - } + list($server, $script) = preg_split('/[?]/', $url); + if ((!$server) OR ($server == './') + OR strpos($server, url_de_base()) === 0) { + include_spip('inc/headers'); + redirige_par_entete(parametre_url($url,'transformer_xml','valider_xml', '&')); + } - include_spip('public/debug'); - include_spip('inc/distant'); - $url_aff = entites_html($url); - $onfocus = "this.value='" . addslashes($url) . "';"; + include_spip('public/debug'); + include_spip('inc/distant'); + $url_aff = entites_html($url); + $onfocus = "this.value='" . addslashes($url) . "';"; - $transformer_xml = charger_fonction('valider_xml', 'inc'); + $transformer_xml = charger_fonction('valider_xml', 'inc'); - if (preg_match(',^[a-z][0-9a-z_]*$,i', $url)) - $texte = $transformer_xml(charger_fonction($url, 'exec'), true); - else $texte = $transformer_xml(recuperer_page($url)); + if (preg_match(',^[a-z][0-9a-z_]*$,i', $url)) + $texte = $transformer_xml(charger_fonction($url, 'exec'), true); + else $texte = $transformer_xml(recuperer_page($url)); - if (isset($GLOBALS['xhtml_error'])) - list($texte, $err) = emboite_texte($texte); - else { - $err = '<h3>' . _T('spip_conforme_dtd') . '</h3>'; - list($texte, ) = emboite_texte($texte); - } + if (isset($GLOBALS['xhtml_error'])) + list($texte, $err) = emboite_texte($texte); + else { + $err = '<h3>' . _T('spip_conforme_dtd') . '</h3>'; + list($texte, ) = emboite_texte($texte); + } } - $titre = _T('analyse_xml'); - $commencer_page = charger_fonction('commencer_page', 'inc'); - echo $commencer_page($titre); - echo "<div style='margin: 10px; text-align: center'>", "<h1>", $titre, '</h1>'; - echo generer_form_ecrire('valider_xml', - ('<input type="text" size="70" value="' .$url_aff .'" name="var_url" onfocus="'.$onfocus . '" />'), - "method='get'"); + $onfocus = '<input type="text" size="70" value="' .$url_aff .'" name="var_url" onfocus="'.$onfocus . '" />'; + $onfocus = generer_form_ecrire('valider_xml', $onfocus, " method='get'"); - echo $err, "</div>"; - echo "<div style='margin: 10px; text-align: left'>",$texte, '</div>', fin_page(); + echo "<h1>", $titre, '</h1>', + "<div style='text-align: center'>", $onfocus, $err, "</div>", + "<div style='margin: 10px; text-align: left'>", $texte, '</div>', + fin_page(); } ?> diff --git a/ecrire/inc/texte.php b/ecrire/inc/texte.php index 360850656e87aa495b4783a57a5722fca1551f09..6483cfec03af78febf8622ceeaec957332f919e8 100644 --- a/ecrire/inc/texte.php +++ b/ecrire/inc/texte.php @@ -143,7 +143,7 @@ function traiter_echap_cadre_dist($regs) { $echap = trim(entites_html($regs[3])); $n = substr_count($echap, "\n") + 1; $echap = "\n<textarea readonly='readonly' cols='40' rows='$n' class='spip_cadre' dir='ltr'>$echap</textarea>"; - return generer_form_ecrire('', $echap, "action='' method='get'"); + return generer_form_ecrire('', $echap, " method='get'"); } // http://doc.spip.org/@traiter_echap_frame_dist function traiter_echap_frame_dist($regs) {