Update of /home/spip-cvs/spip/ecrire
In directory miel:/tmp/cvs-serv986/ecrire
Modified Files:
inc_base.php3 inc_mail.php3 inc_version.php3
Log Message:
pas testés
Index: inc_base.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_base.php3,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- inc_base.php3 18 Oct 2003 14:06:25 -0000 1.92
+++ inc_base.php3 19 Oct 2003 16:42:34 -0000 1.93
@@ -44,14 +44,14 @@
id_trad bigint(21) DEFAULT '0' NOT NULL,
extra longblob NULL,
nom_site tinytext NOT NULL,
- url_site text NOT NULL,
+ url_site VARCHAR(255) NOT NULL,
PRIMARY KEY (id_article),
KEY id_rubrique (id_rubrique),
KEY id_secteur (id_secteur),
KEY id_trad (id_trad),
KEY lang (lang),
KEY statut (statut, date),
- KEY url_site (url_site (25)),
+ KEY url_site (url_site),
KEY date_modif (date_modif))";
$result = spip_query($query);
@@ -1197,15 +1197,6 @@
maj_version (1.466);
}
- /* ANNULE
- if ($version_installee < 1.467) {
- // gestion de listes de diff
- spip_query("ALTER TABLE spip_auteurs ADD abonne TEXT NOT NULL");
- spip_query("ALTER TABLE spip_auteurs ADD abonne_pass TINYTEXT NOT NULL");
- maj_version (1.467);
- }
- */
-
if ($version_installee < 1.468) {
spip_query("ALTER TABLE spip_auteurs ADD INDEX en_ligne (en_ligne)");
spip_query("ALTER TABLE spip_forum ADD INDEX statut (statut, date_heure)");
@@ -1213,19 +1204,6 @@
}
if ($version_installee < 1.470) {
- /* ANNULE
- spip_query("ALTER TABLE spip_auteurs_articles ADD maj TIMESTAMP");
- spip_query("ALTER TABLE spip_auteurs_rubriques ADD maj TIMESTAMP");
- spip_query("ALTER TABLE spip_auteurs_messages ADD maj TIMESTAMP");
- spip_query("ALTER TABLE spip_documents_articles ADD maj TIMESTAMP");
- spip_query("ALTER TABLE spip_documents_rubriques ADD maj TIMESTAMP");
- spip_query("ALTER TABLE spip_documents_breves ADD maj TIMESTAMP");
- spip_query("ALTER TABLE spip_mots_articles ADD maj TIMESTAMP");
- spip_query("ALTER TABLE spip_mots_breves ADD maj TIMESTAMP");
- spip_query("ALTER TABLE spip_mots_rubriques ADD maj TIMESTAMP");
- spip_query("ALTER TABLE spip_mots_syndic ADD maj TIMESTAMP");
- spip_query("ALTER TABLE spip_mots_forum ADD maj TIMESTAMP");*/
-
if ($version_installee >= 1.467) { // annule les "listes de diff"
spip_query("DROP TABLE spip_listes");
spip_query("ALTER TABLE spip_auteurs DROP abonne");
@@ -1274,11 +1252,6 @@
maj_version (1.601);
}
- /* if ($version_installee < 1.602) {
- // juste des types de documents en plus (creer_base())
- maj_version (1.602);
- } */
-
if ($version_installee < 1.603) {
// supprimer les fichiers deplaces
@unlink('inc_meta_cache.php3');
@@ -1368,42 +1341,6 @@
maj_version (1.709);
}
- /* 'domaine' : idee abandonnee
- if ($version_installee < 1.710) {
- @set_time_limit(0);
- spip_query("ALTER TABLE spip_referers ADD domaine varchar(255)");
- spip_query("ALTER TABLE spip_referers_articles ADD domaine varchar(255)");
- spip_query("UPDATE spip_referers SET domaine='-'");
- spip_query("UPDATE spip_referers_articles SET domaine='-'");
- spip_query("ALTER TABLE spip_referers_temp ADD domaine varchar(255);");
- maj_version (1.710);
- }
- if ($version_installee < 1.711) {
- spip_query("UPDATE spip_referers SET domaine = CONCAT(RIGHT(referer,LENGTH(referer) - locate('://',referer)-2), ' -') WHERE domaine = '-' AND referer LIKE '%://%'");
- maj_version (1.711);
- }
- if ($version_installee < 1.712) {
- spip_query("UPDATE spip_referers SET domaine = LEFT(domaine, locate('/',domaine)-1) WHERE domaine LIKE '%/% -'");
- maj_version (1.712);
- }
- if ($version_installee < 1.713) {
- spip_query("UPDATE spip_referers SET domaine = REPLACE(domaine, 'www.', '') WHERE domaine LIKE 'www.%'");
- maj_version (1.713);
- }
- if ($version_installee < 1.714) {
- spip_query("UPDATE spip_referers_articles SET domaine = CONCAT(RIGHT(referer,LENGTH(referer) - locate('://',referer)-2), ' -') WHERE domaine = '-' AND referer LIKE '%://%'");
- maj_version (1.714);
- }
- if ($version_installee < 1.715) {
- spip_query("UPDATE spip_referers_articles SET domaine = LEFT(domaine, locate('/',domaine)-1) WHERE domaine LIKE '%/% -'");
- maj_version (1.715);
- }
- if ($version_installee < 1.716) {
- spip_query("UPDATE spip_referers_articles SET domaine = REPLACE(domaine, 'www.', '') WHERE domaine LIKE 'www.%'");
- maj_version (1.716);
- }
- */
-
if ($version_installee < 1.717) {
spip_query("ALTER TABLE spip_articles ADD INDEX date_modif (date_modif)");
maj_version (1.717);
@@ -1416,22 +1353,10 @@
maj_version (1.718);
}
- /*
- if ($version_installee < 1.720) {
- spip_query("ALTER TABLE spip_articles ADD url_ref text NOT NULL");
- maj_version (1.720);
- }
-
- if ($version_installee < 1.721) {
- spip_query("ALTER TABLE spip_articles ADD INDEX url_ref (url_ref (25))");
- maj_version (1.721);
- }
- */
-
if ($version_installee < 1.722) {
spip_query("ALTER TABLE spip_articles ADD nom_site tinytext NOT NULL");
- spip_query("ALTER TABLE spip_articles ADD url_site text NOT NULL");
- spip_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site (25))");
+ spip_query("ALTER TABLE spip_articles ADD url_site VARCHAR(255) NOT NULL");
+ spip_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site)");
if ($version_installee >= 1.720) {
spip_query("UPDATE spip_articles SET url_site=url_ref");
spip_query("ALTER TABLE spip_articles DROP INDEX url_ref");
@@ -1439,7 +1364,6 @@
}
maj_version (1.722);
}
-
return true;
}
Index: inc_mail.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_mail.php3,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- inc_mail.php3 16 Sep 2003 20:40:04 -0000 1.35
+++ inc_mail.php3 19 Oct 2003 16:42:34 -0000 1.36
@@ -41,12 +41,11 @@
include_ecrire("inc_filtres.php3");
if (!$from) {
- $from = $email;
$email_envoi = lire_meta("email_envoi");
$from = email_valide($email_envoi) ? $email_envoi : $email;
}
if (!email_valide($email)) return false;
- if ($email == _T('info_mail_fournisseur')) return false;
+ if ($email == _T('info_mail_fournisseur')) return false; // tres fort
spip_log("mail ($email): $sujet");
Index: inc_version.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_version.php3,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- inc_version.php3 18 Oct 2003 14:06:25 -0000 1.274
+++ inc_version.php3 19 Oct 2003 16:42:34 -0000 1.275
@@ -227,7 +227,7 @@
else
@setcookie ($name, $value);
}
-if ($cookie_prefix <> 'spip') {
+if ($cookie_prefix != 'spip') {
reset ($HTTP_COOKIE_VARS);
while (list($name,$value) = each($HTTP_COOKIE_VARS)) {
if (ereg('^spip', $name)) {
@@ -272,15 +272,15 @@
$hebergeur = 'free';
$login_hebergeur = $regs[1];
}
-// Online
-else if (ereg('pro\.proxad\.net$', $HTTP_HOST) || ereg('pro\.proxad\.net$', $SERVER_NAME)) {
- $hebergeur = 'online';
-}
// NexenServices
else if ($SERVER_ADMIN == 'www@nexenservices.com') {
if (!function_exists('email'))
include ('mail.inc');
$hebergeur = 'nexenservices';
+}
+// Online
+else if (function_exists('email')) {
+ $hebergeur = 'online';
}
if (eregi('\(Win', $HTTP_SERVER_VARS['SERVER_SOFTWARE']))