diff --git a/ecrire/exec/forum.php b/ecrire/exec/forum.php
index 3c3d39b3c8c297ac9c812473b02a0a5692ae8910..496f7ac5e0b4d058ba2ac1433b48857e3b6be9db 100644
--- a/ecrire/exec/forum.php
+++ b/ecrire/exec/forum.php
@@ -24,7 +24,7 @@ function liste_numeros_forum($script, $debut, $total)
for ($i = 0; $i < $total; $i = $i + 10){
if ($i > 0) echo " | ";
if ($i == $debut)
- echo "\n<FONT SIZE='3'><B>$i</B></FONT>";
+ echo "\n<font size='3'><b>$i</b></font>";
else
echo "\n<a href='", generer_url_ecrire($script, "debut=$i"), "'>$i</a>";
}
@@ -38,14 +38,13 @@ function exec_forum_dist()
$debut = intval($debut);
+ $commencer_page = charger_fonction('commencer_page', 'inc');
if ($admin) {
- $commencer_page = charger_fonction('commencer_page', 'inc');
echo $commencer_page(_T('titre_page_forum'), "forum", "privadm");
$statutforum = 'privadm';
$logo = "forum-admin-24.gif";
$script = 'forum_admin';
} else {
- $commencer_page = charger_fonction('commencer_page', 'inc');
echo $commencer_page(_T('titre_forum'), "forum", "forum-interne");
$statutforum = 'privrac';
$logo = "forum-interne-24.gif";
@@ -75,17 +74,17 @@ function exec_forum_dist()
if ($total > 10) liste_numeros_forum($script, $debut, $total);
- echo "<p><div align='center'>";
+ echo "\n<p><div align='center'>\n";
icone (_T('icone_poster_message'), generer_url_ecrire("forum_envoi", "statut=$statutforum&script=$script"), $logo, "creer.gif");
- echo "</div></p>";
+ echo "\n</div></p>";
- echo "<p align='left'>";
+ echo "\n<p align='left'>";
$limit = $debut ? "LIMIT $debut,10" : "LIMIT 10" ;
$result_forum = spip_query("SELECT * FROM spip_forum WHERE statut='$statutforum' AND id_parent=0 ORDER BY date_heure DESC $limit");
echo afficher_forum($result_forum,$script,'');
- echo "</div>";
+ echo "</p></div>";
echo fin_page();
}
diff --git a/ecrire/exec/recherche.php b/ecrire/exec/recherche.php
index ddc50a2d8e5fa08719311d296ee5dd58740f9978..d2514cbd41471f30f4effc6aebf7844864645540 100644
--- a/ecrire/exec/recherche.php
+++ b/ecrire/exec/recherche.php
@@ -35,15 +35,15 @@ function exec_recherche_dist()
}
echo "<form method='get' style='margin: 0px;' action='" . generer_url_ecrire("recherche","") . "'>";
echo "<input type='hidden' name='exec' value='recherche' />";
- echo '<input type="text" size="10" value="'.$recherche_aff.'" name="recherche" class="spip_recherche" accesskey="r" onfocus="'.$onfocus . '">';
+ echo '<input type="text" size="10" value="'.$recherche_aff.'" name="recherche" class="spip_recherche" accesskey="r" onfocus="'.$onfocus . '" />';
echo "</form>";
debut_droite();
if (strlen($recherche) > 0) {
- echo "<FONT FACE='Verdana,Arial,Sans,sans-serif'><B>"._T('info_resultat_recherche')."</B><BR>";
- echo "<FONT SIZE=5 COLOR='$couleur_foncee'><B>$recherche_aff</B></FONT><p>";
+ echo "<font face='Verdana,Arial,Sans,sans-serif'><b>"._T('info_resultat_recherche')."</b><br />";
+ echo "<font size='5' color='$couleur_foncee'><b>$recherche_aff</b></font><p>";
$query_articles['FROM'] = 'spip_articles AS articles';
$query_breves['FROM'] = 'spip_breves';
diff --git a/ecrire/exec/sites.php b/ecrire/exec/sites.php
index 8b32fbd3a3840938f9513410b1de382423cc4ed9..c7c48400812b65b4b30f41e6bef0db1c35aaa588 100644
--- a/ecrire/exec/sites.php
+++ b/ecrire/exec/sites.php
@@ -298,7 +298,7 @@ if ($syndication == "oui" OR $syndication == "off" OR $syndication == "sus") {
echo "<center>";
echo generer_action_auteur('editer_site',
$id_syndic,
- $redirect = generer_url_ecrire('sites'),
+ generer_url_ecrire('sites'),
"<input type='hidden' name='reload' value='oui' />
<input type='submit' value=\""
. attribut_html(_T('lien_nouvelle_recuperation'))
@@ -321,7 +321,7 @@ if ($syndication == "oui" OR $syndication == "off" OR $syndication == "sus") {
echo "<div align='right'>\n";
echo generer_action_auteur('editer_site',
$id_syndic,
- $redirect = generer_url_ecrire('sites'),
+ generer_url_ecrire('sites'),
"<input type='hidden' name='reload' value='oui' />
<input type='submit' value=\""
. attribut_html(_T('lien_mise_a_jour_syndication'))
diff --git a/ecrire/exec/sites_edit.php b/ecrire/exec/sites_edit.php
index 8abf2a89c003daeaabb414405120b015007b4bba..2a639d282475019eadd9e99e0bd16f4ced2c65cf 100644
--- a/ecrire/exec/sites_edit.php
+++ b/ecrire/exec/sites_edit.php
@@ -89,7 +89,7 @@ AND (
$form_auto = generer_action_auteur('editer_site',
'auto',
- $redirect = generer_url_ecrire('sites'),
+ generer_url_ecrire('sites'),
$form_auto,
" method='post' name='formulaireauto'"
);
@@ -198,11 +198,11 @@ if ($GLOBALS['champs_extra']) {
}
-$form .= "\n<div ALIGN='right'><INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_enregistrer')."' CLASS='fondo'></div>";
+$form .= "\n<div align='right'><input type='submit' value='"._T('bouton_enregistrer')."' class='fondo' /></div>";
$form = generer_action_auteur('editer_site',
($new == 'oui') ? $new : $id_syndic,
- $redirect = generer_url_ecrire('sites'),
+ generer_url_ecrire('sites'),
$form,
" method='post' name='formulaire'"
);
diff --git a/ecrire/inc/auth.php b/ecrire/inc/auth.php
index cd1bc04b3988cd6e673dd87093b65350aa7cfb9e..893c4b00e3ab1622966508f3d9f1a34add7f1114 100644
--- a/ecrire/inc/auth.php
+++ b/ecrire/inc/auth.php
@@ -130,7 +130,7 @@ function inc_auth_dist() {
//
// Session valide en cours ?
- if ($_COOKIE['spip_session']) {
+ if (isset($_COOKIE['spip_session'])) {
$session = charger_fonction('session', 'inc');
if ($connect_id_auteur = $session()) {
$auth_can_disconnect = true;
@@ -140,15 +140,15 @@ function inc_auth_dist() {
// Essayer auth http si significatif
// (ignorer les login d'intranet independants de spip)
if (!$ignore_auth_http AND !$connect_id_auteur) {
- if ($_SERVER['PHP_AUTH_USER'] AND $_SERVER['PHP_AUTH_PW']) {
+ if (isset($_SERVER['PHP_AUTH_USER'])
+ AND isset($_SERVER['PHP_AUTH_PW'])) {
include_spip('inc/actions');
if (verifier_php_auth()) {
$connect_login = $_SERVER['PHP_AUTH_USER'];
$auth_can_disconnect = true;
$_SERVER['PHP_AUTH_PW'] = '';
}
-
- } else if ($_SERVER['REMOTE_USER'])
+ } else if (isset($_SERVER['REMOTE_USER']))
// Authentification .htaccess old style, car .htaccess semble
// souvent definir *aussi* PHP_AUTH_USER et PHP_AUTH_PW
@@ -238,6 +238,6 @@ function auth_arefaire()
{
$url = rawurlencode(str_replace('/./', '/',
(_DIR_RESTREINT ? "" : _DIR_RESTREINT_ABS) . str_replace('&', '&', self())));
- return generer_url_public('login', "url=$url" . ($_GET['bonjour'] == 'oui' ? '&var_echec_cookie=true' : ''),true);
+ return generer_url_public('login', "url=$url" . (isset($_GET['bonjour']) ? '&var_echec_cookie=true' : ''),true);
}
?>
diff --git a/ecrire/inc/boutons.php b/ecrire/inc/boutons.php
index bd26a1a4dca246457dbc39fb3f587d27e5db8f80..b4ad8e080c03f2acc9b42e33049325d8925692dc 100644
--- a/ecrire/inc/boutons.php
+++ b/ecrire/inc/boutons.php
@@ -267,7 +267,7 @@ function definir_barre_onglets($rubrique) {
generer_url_ecrire("auteurs_edit","id_auteur=$id_auteur"));
$onglets['infos']=
new Bouton('fiche-perso-24.gif', 'icone_informations_personnelles',
- generer_url_ecrire("auteurs_infos","id_auteur=$id_auteur"));
+ generer_url_ecrire("auteur_infos","id_auteur=$id_auteur"));
break;
case 'configuration':
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index 68f4d01889859d4ec52c947f01ee0cebbddf077b..1df2bf310d309d42bd0fd9bd0bfca142a39ec8f2 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -1427,7 +1427,7 @@ function icone($texte, $lien, $fond, $fonction="", $align="", $afficher='oui'){
else if ($spip_display == 3){
$hauteur = 30;
$largeur = 30;
- $title = "title=\"$texte\"";
+ $title = "\ntitle=\"$texte\"";
$alt = $texte;
}
else {
@@ -1439,7 +1439,7 @@ function icone($texte, $lien, $fond, $fonction="", $align="", $afficher='oui'){
if ($spip_display != 1 AND $spip_display != 4){
if ($fonction != "rien.gif"){
- $icone = http_img_pack($fonction, $alt, "$title width='24' height='24'" .
+ $icone = http_img_pack($fonction, $alt, "$title width='24' height='24'\n" .
http_style_background($fond, "no-repeat center center"));
}
else {
@@ -1537,7 +1537,7 @@ function debut_grand_cadre($return=false){
if ($spip_ecran == "large") $largeur = 974;
else $largeur = 750;
- $res = "\n<br /><br /><table width='$largeur' cellpadding='0' cellspacing='0' border='0'>\n<tr><td width='$largeur' class='serif'>";
+ $res = "\n<br /><br />\n<table width='$largeur' cellpadding='0' cellspacing='0' border='0'>\n<tr><td width='$largeur' class='serif'>";
if ($return) return $res; else echo $res;
}
@@ -1619,7 +1619,7 @@ function creer_colonne_droite($rubrique="", $return= false){
global $flag_3_colonnes, $flag_centre_large;
global $spip_lang_rtl, $spip_lang_left;
- if (!$flag_3_colonnes OR $deja_colonne_droite) return '';
+ if ((!$flag_3_colonnes) OR $deja_colonne_droite) return '';
$deja_colonne_droite = true;
if ($flag_centre_large) {
@@ -1636,7 +1636,7 @@ function creer_colonne_droite($rubrique="", $return= false){
. "\n<td rowspan='1' class='colonne_etroite'></td>"
. "\n<td width='"
. $espacement
- . "'rowspan='2' class='colonne_etroite'> </td>"
+ . "' rowspan='2' class='colonne_etroite'> </td>"
. "\n<td width='"
. $largeur
. "' rowspan='2' align='"
@@ -1670,7 +1670,7 @@ function debut_droite($rubrique="", $return= false) {
}
else {
$res .= creer_colonne_droite($rubrique, true)
- . "</td></tr><tr>";
+ . "</td></tr>\n<tr>";
}
if ($spip_ecran == 'large' AND $flag_centre_large)
@@ -1678,7 +1678,7 @@ function debut_droite($rubrique="", $return= false) {
else
$largeur = 500;
- $res .= '<td width="'.$largeur.'" valign="top" align="'.$spip_lang_left.'" rowspan="1" class="serif">';
+ $res .= "\n<td width=\"".$largeur.'" valign="top" align="'.$spip_lang_left.'" rowspan="1" class="serif">';
// touche d'acces rapide au debut du contenu
$res .= "\n<a name='saut' href='#saut' accesskey='s'></a>\n";
diff --git a/ecrire/inc/sax.php b/ecrire/inc/sax.php
index 15c96e61df010a951ed55120487f3328667bb105..8ca87552f2b6d39c4cb2ad28fcfd39fc85533986 100644
--- a/ecrire/inc/sax.php
+++ b/ecrire/inc/sax.php
@@ -73,7 +73,7 @@ function finElement($parser, $name)
$t = ereg_replace("[\n\t ]+$", "\n" . $depth, $t);
// fusion <balise></balise> en <balise />
// ATTENTION, ne pas le faire s'il y a des attributs
- // ca trompe completement les clients http
+ // ca trompe completement les clients http
if ($t || ($ouv !=$name))
$res .= ($ouv ? ('<' . $ouv . '>') : '') . $t . "</" . $name . ">";
else
@@ -116,6 +116,7 @@ function defautElement($parser, $data)
$depth = &$phraseur_xml->depth;
$contenu = &$phraseur_xml->contenu;
+ if (!isset($contenu[$depth])) $contenu[$depth]='';
$contenu[$depth] .= $data;
}
@@ -139,6 +140,8 @@ function xml_parsefile($xml_parser, $file)
function xml_parsestring($xml_parser, $data)
{
global $phraseur_xml;
+
+ $phraseur_xml->contenu[$phraseur_xml->depth] ='';
$r = "";
if (!xml_parse($xml_parser, $data, true)) {
// ne pas commencer le message par un "<" (cf inc_sax_dist)
diff --git a/ecrire/index.php b/ecrire/index.php
index 34d1b61fa41d70776675fe51f072db052181f314..38194f4dd01aa64ec7890c73948cbeb421598e34 100644
--- a/ecrire/index.php
+++ b/ecrire/index.php
@@ -83,10 +83,10 @@ if (autoriser_sans_cookie($exec)) {
$var_auth = true;
} else {
$auth = charger_fonction('auth', 'inc');
- $auth = $auth();
- if ($auth) {
+ $var_auth = $auth();
+ if ($var_auth) {
include_spip('inc/headers');
- redirige_par_entete($auth);
+ redirige_par_entete($var_auth);
}
}