diff --git a/ecrire/inc_base.php3 b/ecrire/inc_base.php3 index 2ec350373657449a89d6ac130536adf1b4278ffb..8f348c8d515ee05d00d92fc1c821667b87ee13bc 100644 --- a/ecrire/inc_base.php3 +++ b/ecrire/inc_base.php3 @@ -321,7 +321,6 @@ function creer_base() { $query = "CREATE TABLE spip_referers_temp ( ip INTEGER UNSIGNED NOT NULL, referer VARCHAR(255) NOT NULL, - domaine VARCHAR(255) NOT NULL, referer_md5 BIGINT UNSIGNED NOT NULL, type ENUM('article', 'rubrique', 'breve', 'autre') NOT NULL, id_objet INTEGER UNSIGNED NOT NULL, @@ -333,7 +332,6 @@ function creer_base() { referer_md5 BIGINT UNSIGNED NOT NULL, date DATE NOT NULL, referer VARCHAR(255) NOT NULL, - domaine VARCHAR(255) NOT NULL, visites INTEGER UNSIGNED NOT NULL, visites_jour INTEGER UNSIGNED NOT NULL, maj TIMESTAMP, @@ -345,7 +343,6 @@ function creer_base() { referer_md5 BIGINT UNSIGNED NOT NULL, date DATE NOT NULL, referer VARCHAR(255) NOT NULL, - domaine VARCHAR(255) NOT NULL, visites INTEGER UNSIGNED NOT NULL, maj TIMESTAMP, PRIMARY KEY (id_article, referer_md5), @@ -1354,7 +1351,7 @@ function maj_base() { maj_version (1.709); } - /* le bloc qui suit procede par etapes, car il risque de partir de timeout */ + /* 'domaine' : idee abandonnee if ($version_installee < 1.710) { @set_time_limit(0); spip_query("ALTER TABLE spip_referers ADD domaine varchar(255)"); @@ -1388,11 +1385,20 @@ function maj_base() { 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); } + + if ($version_installee < 1.718) { + spip_query("ALTER TABLE spip_referers DROP domaine"); + spip_query("ALTER TABLE spip_referers_articles DROP domaine"); + spip_query("ALTER TABLE spip_referers_temp DROP domaine"); + maj_version (1.718); + } + } ?> diff --git a/ecrire/inc_statistiques.php3 b/ecrire/inc_statistiques.php3 index 1629785bf818761d00f2cb46339739aa43ceadaa..317bfa0704872d01df5136d109baa6fed1b8578b 100644 --- a/ecrire/inc_statistiques.php3 +++ b/ecrire/inc_statistiques.php3 @@ -165,11 +165,10 @@ function calculer_n_referers($nb_referers) { while ($row = @spip_fetch_array($result)) { $visites = $row['visites']; $referer = addslashes($row['referer']); - $domaine = addslashes($row['domaine']); $referer_md5 = '0x'.$row['md5']; $referer_update[$visites][] = $referer_md5; - $referer_insert[] = "('$date', '$referer', '$domaine', $referer_md5, $visites, $visites)"; + $referer_insert[] = "('$date', '$referer', $referer_md5, $visites, $visites)"; $referer_vus[] = $referer_md5; } @@ -183,7 +182,7 @@ function calculer_n_referers($nb_referers) { } if (is_array($referer_insert)) { $query_insert = "INSERT IGNORE INTO spip_referers ". - "(date, referer, domaine, referer_md5, visites, visites_jour) VALUES ".join(', ', $referer_insert); + "(date, referer, referer_md5, visites, visites_jour) VALUES ".join(', ', $referer_insert); $result_insert = spip_query($query_insert); } @@ -200,11 +199,10 @@ function calculer_n_referers($nb_referers) { $id_article = $row['id_objet']; $visites = $row['visites']; $referer = addslashes($row['referer']); - $domaine = addslashes($row['domaine']); $referer_md5 = '0x'.$row['md5']; $referer_update[$visites][] = "(id_article=$id_article AND referer_md5=$referer_md5)"; - $referer_insert[] = "('$date', '$referer', '$domaine', $referer_md5, $id_article, $visites)"; + $referer_insert[] = "('$date', '$referer', $referer_md5, $id_article, $visites)"; } // Mise a jour de la base @@ -217,7 +215,7 @@ function calculer_n_referers($nb_referers) { } if (is_array($referer_insert)) { $query_insert = "INSERT IGNORE INTO spip_referers_articles ". - "(date, referer, domaine, referer_md5, id_article, visites) VALUES ".join(', ', $referer_insert); + "(date, referer, referer_md5, id_article, visites) VALUES ".join(', ', $referer_insert); $result_insert = spip_query($query_insert); } diff --git a/ecrire/inc_version.php3 b/ecrire/inc_version.php3 index 8ce2a38e857ea0bb69fb4c8d14bb848801e07dea..8387b318826fea9db73577d56b4dd58acea819a1 100644 --- a/ecrire/inc_version.php3 +++ b/ecrire/inc_version.php3 @@ -149,7 +149,7 @@ if ($flag_ecrire) { // (utilise pour les modifs de la base de donnees) // version de la base -$spip_version = 1.717; +$spip_version = 1.718; // version de spip $spip_version_affichee = "1.7a7 CVS"; diff --git a/inc-stats.php3 b/inc-stats.php3 index 01347bd77cde557dfc78093ecf57fdd42fd223b2..169cf37552c6067c1326e4e83aa3a93a46cbbc22 100644 --- a/inc-stats.php3 +++ b/inc-stats.php3 @@ -47,10 +47,8 @@ function ecrire_stats() { if (($url_site_spip<>'') AND strpos('-'.strtolower($log_referer), strtolower($url_site_spip)) AND !$GLOBALS['var_recherche']) $log_referer = ""; if ($log_referer) { $referer_md5 = '0x'.substr(md5($log_referer), 0, 16); - ereg ("/(www\.)?([^/]+)/", $log_referer, $match); - $domaine = addslashes($match[2]); - $query = "INSERT IGNORE INTO spip_referers_temp (ip, referer, domaine, referer_md5, type, id_objet) ". - "VALUES ($log_ip, '$log_referer', '$domaine', $referer_md5, '$log_type', $log_id_num)"; + $query = "INSERT IGNORE INTO spip_referers_temp (ip, referer, referer_md5, type, id_objet) ". + "VALUES ($log_ip, '$log_referer', $referer_md5, '$log_type', $log_id_num)"; spip_query($query); } }