Update of /home/spip-cvs/spip/ecrire
In directory miel:/tmp/cvs-serv25299/ecrire
Modified Files:
inc_config.php3 inc_index.php3 inc_sites.php3 inc_version.php3
index.php3 spip_style.php3
Log Message:
modifs timeout
Index: inc_config.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_config.php3,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- inc_config.php3 22 Sep 2003 01:33:44 -0000 1.37
+++ inc_config.php3 28 Sep 2003 18:07:30 -0000 1.38
@@ -170,7 +170,7 @@
}
// Activer le moteur : dresser la liste des choses a indexer
- if ($activer_moteur == 'oui') {
+ if ($activer_moteur == 'oui' AND ($activer_moteur != lire_meta("activer_moteur"))) {
include_ecrire('inc_index.php3');
creer_liste_indexation();
}
@@ -203,7 +203,7 @@
'creer_preview',
'taille_preview',
'articles_modif',
-
+
'activer_sites',
'proposer_sites',
'activer_syndic',
@@ -269,7 +269,6 @@
ecrire_metas();
fin_admin($admin);
}
-
if ($purger_skel) {
$hash = calculer_action_auteur("purger_squelettes");
Index: inc_index.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_index.php3,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- inc_index.php3 28 Sep 2003 14:01:35 -0000 1.42
+++ inc_index.php3 28 Sep 2003 18:07:30 -0000 1.43
@@ -71,8 +71,8 @@
function deja_indexe($type, $id_objet) {
$table_index = 'spip_index_'.$type.'s';
$col_id = 'id_'.$type;
- $query = "SELECT COUNT(*) FROM $table_index WHERE $col_id=$id_objet";
- list($n) = @spip_fetch_array(@spip_query($query));
+ $query = "SELECT $col_id FROM $table_index WHERE $col_id=$id_objet LIMIT 0,1";
+ $n = @spip_num_rows(@spip_query($query));
return ($n > 0);
}
Index: inc_sites.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_sites.php3,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- inc_sites.php3 28 Sep 2003 14:01:35 -0000 1.62
+++ inc_sites.php3 28 Sep 2003 18:07:30 -0000 1.63
@@ -154,7 +154,7 @@
$moderation = 'publie'; // en ligne sans validation
// Section critique : n'autoriser qu'une seule syndication simultanee pour un site donne
- if (!timeout("syndication $url_syndic")) return;
+ if (!spip_get_lock("syndication $url_syndic")) return;
include_ecrire("inc_filtres.php3");
spip_query("UPDATE spip_syndic SET syndication='$statut', date_syndic=NOW() WHERE id_syndic='$now_id_syndic'");
Index: inc_version.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_version.php3,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- inc_version.php3 28 Sep 2003 15:14:48 -0000 1.266
+++ inc_version.php3 28 Sep 2003 18:07:30 -0000 1.267
@@ -809,7 +809,7 @@
// Savoir si on peut lancer de gros calculs, et eventuellement poser un lock
// Resultat : true=vas-y ; false=stop
//
-function timeout ($lock=false, $action=true, $connect_mysql=true) {
+function timeout($lock=false, $action=true, $connect_mysql=true) {
static $ok = true;
global $db_ok, $dir_ecrire;
@@ -822,30 +822,28 @@
}
// Ne rien faire ?
- if (!$action)
+ if (!$action || !$ok)
return $ok;
+ $ok = false;
+
// Base connectee ?
if ($connect_mysql) {
include_ecrire('inc_connect.php3');
if (!$db_ok)
- return $ok = false;
+ return false;
- // Lock SQL ?
+ // Verrou demande ?
if ($lock) {
- if (spip_get_lock($lock)) {
- // C'est bon
- $ok = false;
- return true;
- } else {
+ spip_debug("test lock mysql $lock");
+ if (!spip_get_lock($lock)) {
spip_debug ("lock mysql $lock");
- return $ok = false;
+ return false;
}
}
}
// C'est bon
- $ok = false;
return true;
}
Index: index.php3
RCS file: /home/spip-cvs/spip/ecrire/index.php3,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- index.php3 28 Sep 2003 14:01:35 -0000 1.82
+++ index.php3 28 Sep 2003 18:07:30 -0000 1.83
@@ -455,11 +455,13 @@
//
// Optimisation periodique de la base de donnees
//
-if (!$bonjour AND timeout('optimisation')) {
+if (!$bonjour) {
if ($optimiser == 'oui' || (time() - lire_meta('date_optimisation')) > 24 * 3600) {
- ecrire_meta("date_optimisation", time());
- ecrire_metas();
- include ("optimiser.php3");
+ if (timeout('optimisation')) {
+ ecrire_meta("date_optimisation", time());
+ ecrire_metas();
+ include ("optimiser.php3");
+ }
}
}
Index: spip_style.php3
RCS file: /home/spip-cvs/spip/ecrire/spip_style.php3,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- spip_style.php3 25 Sep 2003 11:51:12 -0000 1.20
+++ spip_style.php3 28 Sep 2003 18:07:30 -0000 1.21
@@ -1,7 +1,8 @@
<?php
- @header ("Content-Type: text/css");
- @Header ("Expires: ".gmdate("D, d M Y H:i:s", time() + 3600)." GMT");
include ("inc_version.php3"); // pour le register_globals
+ @Header ("Content-Type: text/css");
+ @Header ("Expires: ".gmdate("D, d M Y H:i:s", time() + 7 * 24 * 3600)." GMT");
+ @Header ("Last-Modified: ".gmdate("D, d M Y H:i:s", @filemtime("spip_style.php3"))." GMT");
if (!isset($couleur_claire))
$couleur_claire = "#EDF3FE";
if (!isset($couleur_foncee))