diff --git a/ecrire/articles.php3 b/ecrire/articles.php3
index fcf107b9be744c1c1db0c656012431e294a34c19..5581608f9c1a23fa45d1bbc9d46e5f0ffa94c511 100644
--- a/ecrire/articles.php3
+++ b/ecrire/articles.php3
@@ -440,7 +440,7 @@ if ($connect_statut == '0minirezo' AND acces_rubrique($rubrique_article) AND $op
echo fin_block();
if ($statut_article == 'publie' AND $connect_statut=='0minirezo' AND acces_rubrique($id_rubrique)) {
- $req = "SELECT count(*) FROM spip_forum WHERE id_article=$id_article AND FIND_IN_SET(statut,'publie,off,prop')";
+ $req = "SELECT count(*) FROM spip_forum WHERE id_article=$id_article AND statut IN ('publie', 'off', 'prop')";
if ($row = mysql_fetch_row(spip_query($req))) {
$nb_forums = $row[0];
if ($nb_forums) {
diff --git a/ecrire/articles_forum.php3 b/ecrire/articles_forum.php3
index 5f870417062cdcaca00398902a2ebbcf36d36353..05314e89820fff06d781b14740875898dff71dfc 100644
--- a/ecrire/articles_forum.php3
+++ b/ecrire/articles_forum.php3
@@ -69,7 +69,7 @@ echo "<p>";
$mots_cles_forums = lire_meta("mots_cles_forums");
if ($connect_statut == "0minirezo") {
- $query_forum = "SELECT * FROM spip_forum WHERE id_article='$id_article' AND id_parent=0 AND FIND_IN_SET(statut,'publie,off,prop') ORDER BY date_heure DESC";
+ $query_forum = "SELECT * FROM spip_forum WHERE id_article='$id_article' AND id_parent=0 AND statut IN ('publie', 'off', 'prop') ORDER BY date_heure DESC";
$result_forum = spip_query($query_forum);
afficher_forum($result_forum, $forum_retour, 'oui');
}
diff --git a/ecrire/auteurs.php3 b/ecrire/auteurs.php3
index 13d8f1156ac23c45a550ea45d8720043d15a6af7..4ab825249abe2abbca7bebb0a6b4da109b77979b 100644
--- a/ecrire/auteurs.php3
+++ b/ecrire/auteurs.php3
@@ -53,10 +53,10 @@ debut_droite();
// limiter les statuts affiches
if ($connect_statut != '0minirezo') {
- $sql_statut_auteurs = " AND FIND_IN_SET(auteurs.statut,'0minirezo,1comite')";
- $sql_statut_articles = " AND FIND_IN_SET(articles.statut,'prop,publie')";
+ $sql_statut_auteurs = " AND auteurs.statut IN ('0minirezo', '1comite')";
+ $sql_statut_articles = " AND articles.statut IN ('prop', 'publie')";
} else {
- $sql_statut_auteurs = " AND FIND_IN_SET(auteurs.statut,'0minirezo,1comite,5poubelle')";
+ $sql_statut_auteurs = " AND auteurs.statut IN ('0minirezo', '1comite', '5poubelle')";
$sql_statut_articles = "";
}
@@ -144,7 +144,7 @@ if ($type_requete == 'auteur') {
if ($connect_statut == '0minirezo')
$sql_statut_auteurs_ajout = $sql_statut_auteurs;
else
- $sql_statut_auteurs_ajout = " AND FIND_IN_SET(auteurs.statut,'0minirezo')";
+ $sql_statut_auteurs_ajout = " AND auteurs.statut = '0minirezo'";
$result_auteurs = spip_query("SELECT auteurs.*, UPPER(nom) AS unom, 0 as compteur
FROM spip_auteurs AS auteurs
diff --git a/ecrire/inc_base.php3 b/ecrire/inc_base.php3
index 6d2aaebf3d6ad9b9a5016f4ab5ad8857924be092..4ca3a0e94175f7f6dc63f8f913453c768b43e60d 100644
--- a/ecrire/inc_base.php3
+++ b/ecrire/inc_base.php3
@@ -982,11 +982,6 @@ function maj_base() {
}
}
- if ($version_installee < 1.461) {
- // recuperer les sites indiques 'sus'pendus : ils doivent etre 'off'
- spip_query ("UPDATE spip_syndic SET syndication='off' WHERE syndication='sus'");
- }
-
//
// Mettre a jour le numero de version installee
//
diff --git a/ecrire/inc_index.php3 b/ecrire/inc_index.php3
index 7982ade83868bcb0db9f0f00e174e6234d74ef91..01362e0fbc4af23e67a65d1f9489ac797abac6aa 100644
--- a/ecrire/inc_index.php3
+++ b/ecrire/inc_index.php3
@@ -239,7 +239,7 @@ function creer_liste_indexation() {
$statut = "WHERE statut='publie'";
break;
case 'auteur':
- $statut = "WHERE FIND_IN_SET(statut,'0minirezo,1comite')";
+ $statut = "WHERE statut IN ('0minirezo', '1comite')";
break;
default:
$statut = '';
diff --git a/ecrire/inc_sites.php3 b/ecrire/inc_sites.php3
index d8a49bc5d9750623445a21d0511e6f34d5b15b0d..77a4a6b17dd2fd83a8761d6a7ec7162ed8260799 100644
--- a/ecrire/inc_sites.php3
+++ b/ecrire/inc_sites.php3
@@ -16,7 +16,7 @@ if ($ajouter_lien = $GLOBALS["ajouter_lien"]) {
function recuperer_page($url) {
- $http_proxy=lire_meta("http_proxy");
+ $http_proxy = lire_meta("http_proxy");
if (!eregi("^http://", $http_proxy))
$http_proxy = '';
@@ -41,7 +41,7 @@ function recuperer_page($url) {
if (!$f) return;
if ($http_proxy) {
- fputs($f, "GET http://$host:$port$path" . ($query ? "?$query" : "") . " HTTP/1.0\nHost: $host\n\n");
+ fputs($f, "GET http://$host" . (($port != 80) ? ":$port" : "") . $path . ($query ? "?$query" : "") . " HTTP/1.0\nHost: $host\n\n");
}
else
fputs($f, "GET $path" . ($query ? "?$query" : "") . " HTTP/1.0\nHost: $host\n\n");
@@ -106,12 +106,11 @@ function analyser_site($url) {
}
-function syndic_a_jour($now_id_syndic, $statut = 'off'){
-
+function syndic_a_jour($now_id_syndic, $statut = 'off') {
spip_query("UPDATE spip_syndic SET syndication='$statut', date_syndic=NOW() WHERE id_syndic='$now_id_syndic'");
- $query="SELECT * FROM spip_syndic WHERE id_syndic='$now_id_syndic'";
- $result=spip_query($query);
+ $query = "SELECT * FROM spip_syndic WHERE id_syndic='$now_id_syndic'";
+ $result = spip_query($query);
if ($row = mysql_fetch_array($result))
$la_query=$row["url_syndic"];
else
@@ -485,7 +484,7 @@ function afficher_syndic_articles($titre_table, $requete, $afficher_site = false
//
function executer_une_syndication() {
- $query_syndic = "SELECT * FROM spip_syndic WHERE syndication='off' AND statut='publie' ".
+ $query_syndic = "SELECT * FROM spip_syndic WHERE syndication='sus' AND statut='publie' ".
"AND date_syndic < DATE_SUB(NOW(), INTERVAL 24 HOUR) ORDER BY date_syndic LIMIT 0,1";
if ($result_syndic = spip_query($query_syndic)) {
while ($row = mysql_fetch_array($result_syndic)) {
@@ -498,7 +497,7 @@ function executer_une_syndication() {
if ($result_syndic = spip_query($query_syndic)) {
while ($row = mysql_fetch_array($result_syndic)) {
$id_syndic = $row["id_syndic"];
- syndic_a_jour($id_syndic, 'off');
+ syndic_a_jour($id_syndic, 'sus');
}
}
}
diff --git a/ecrire/message.php3 b/ecrire/message.php3
index fd712b23aad23049c6ea7642ffc9d644503d642e..8199dc6b3c7a9450f52f28e9c5fe663e74fdb6d1 100644
--- a/ecrire/message.php3
+++ b/ecrire/message.php3
@@ -378,7 +378,7 @@ while($row = mysql_fetch_array($result_message)) {
if ($statut == 'redac' OR $forcer_dest) {
$query_ajout_auteurs = "SELECT * FROM spip_auteurs WHERE ";
if ($les_auteurs) $query_ajout_auteurs .= "id_auteur NOT IN ($ze_auteurs) AND ";
- $query_ajout_auteurs .= " messagerie<>'non' AND FIND_IN_SET(statut,'0minirezo,1comite') ORDER BY statut, nom";
+ $query_ajout_auteurs .= " messagerie<>'non' AND statut IN ('0minirezo', '1comite') ORDER BY statut, nom";
$result_ajout_auteurs = spip_query($query_ajout_auteurs);
if (mysql_num_rows($result_ajout_auteurs) > 0) {
diff --git a/ecrire/sites.php3 b/ecrire/sites.php3
index 044eb5da3cd64958934d5017cfecd495bab30e25..0c1bc674d6320612d632b8faf7768ca9e9151fd5 100644
--- a/ecrire/sites.php3
+++ b/ecrire/sites.php3
@@ -142,8 +142,6 @@ if ($nouveau_statut AND $flag_administrable) {
indexer_syndic($id_syndic);
}
}
-
-
}
if ($nom_site AND $modifier_site == 'oui' AND $flag_editable) {
@@ -195,7 +193,7 @@ if ($redirect AND $redirect_ok == 'oui') {
// recalcul
//
if ($recalcul == "oui") {
- $result = spip_query ("SELECT * FROM spip_syndic WHERE id_syndic='$id_syndic' AND FIND_IN_SET(syndication, 'oui,off')");
+ $result = spip_query ("SELECT * FROM spip_syndic WHERE id_syndic='$id_syndic' AND syndication IN ('oui', 'sus', 'off')");
if ($result AND mysql_num_rows($result)>0)
$erreur_syndic = syndic_a_jour ($id_syndic);
}
@@ -407,7 +405,7 @@ if ($flag_administrable) {
echo "</form>\n";
}
-if ($syndication == "oui" OR $syndication == "off") {
+if ($syndication == "oui" OR $syndication == "off" OR $syndication == "sus") {
echo "<p><font size=3 face='Verdana,Arial,Helvetica,sans-serif'><b>Ce site est syndiqué...</b></font>";
if ($erreur_syndic)
diff --git a/ecrire/upgrade.php3 b/ecrire/upgrade.php3
index 292bba01f981891ba9636a72c7e9d0e50633c6ee..5707e3ff690bc65c608d9fe5e8618aed44efed8b 100644
--- a/ecrire/upgrade.php3
+++ b/ecrire/upgrade.php3
@@ -39,11 +39,11 @@ creer_base();
maj_base();
ecrire_acces();
-$hash = calculer_action_auteur("purger_squelettes");
+$hash = calculer_action_auteur("purger_cache");
$redirect = rawurlencode("index.php3");
fin_admin($upgrade_titre);
-@header ("Location: ../spip_cache.php3?purger_squelettes=oui&id_auteur=$connect_id_auteur&hash=$hash&redirect=$redirect");
+@header ("Location: ../spip_cache.php3?purger_cache=oui&id_auteur=$connect_id_auteur&hash=$hash&redirect=$redirect");
?>