Completed
Push — master ( 3a7980...c8fa57 )
by cam
04:18
created
ecrire/maj/legacy/v016.php 2 patches
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
  * @package SPIP\Core\SQL\Upgrade
17 17
  **/
18 18
 if (!defined('_ECRIRE_INC_VERSION')) {
19
-	return;
19
+    return;
20 20
 }
21 21
 
22 22
 /**
@@ -27,37 +27,37 @@  discard block
 block discarded – undo
27 27
  **/
28 28
 function maj_legacy_v016_dist($version_installee, $version_cible) {
29 29
 
30
-	if (upgrade_vers(1.600, $version_installee, $version_cible)) {
30
+    if (upgrade_vers(1.600, $version_installee, $version_cible)) {
31 31
 #8/08/07  plus d'indexation dans le core
32 32
 #		include_spip('inc/indexation');
33 33
 #		purger_index();
34 34
 #		creer_liste_indexation();
35
-		maj_version(1.600);
36
-	}
35
+        maj_version(1.600);
36
+    }
37 37
 
38
-	if (upgrade_vers(1.601, $version_installee, $version_cible)) {
39
-		sql_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
40
-		maj_version(1.601);
41
-	}
38
+    if (upgrade_vers(1.601, $version_installee, $version_cible)) {
39
+        sql_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
40
+        maj_version(1.601);
41
+    }
42 42
 
43
-	if (upgrade_vers(1.603, $version_installee, $version_cible)) {
44
-		// supprimer les fichiers deplaces
45
-		spip_unlink('inc_meta_cache.php');
46
-		spip_unlink('inc_meta_cache.php3');
47
-		spip_unlink('data/engines-list.ini');
48
-		maj_version(1.603);
49
-	}
43
+    if (upgrade_vers(1.603, $version_installee, $version_cible)) {
44
+        // supprimer les fichiers deplaces
45
+        spip_unlink('inc_meta_cache.php');
46
+        spip_unlink('inc_meta_cache.php3');
47
+        spip_unlink('data/engines-list.ini');
48
+        maj_version(1.603);
49
+    }
50 50
 
51
-	if (upgrade_vers(1.604, $version_installee, $version_cible)) {
52
-		sql_query("ALTER TABLE spip_auteurs ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
53
-		$u = sql_query("SELECT * FROM spip_auteurs WHERE prefs LIKE '%spip_lang%'");
54
-		while ($row = sql_fetch($u)) {
55
-			$prefs = unserialize($row['prefs']);
56
-			$l = $prefs['spip_lang'];
57
-			unset($prefs['spip_lang']);
58
-			sql_query("UPDATE spip_auteurs SET lang=" . sql_quote($l) . ", prefs='" . sql_quote(serialize($prefs)) . "' WHERE id_auteur=" . $row['id_auteur']);
59
-		}
60
-		$u = sql_query("SELECT lang FROM spip_auteurs");
61
-		maj_version(1.604, $u);
62
-	}
51
+    if (upgrade_vers(1.604, $version_installee, $version_cible)) {
52
+        sql_query("ALTER TABLE spip_auteurs ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
53
+        $u = sql_query("SELECT * FROM spip_auteurs WHERE prefs LIKE '%spip_lang%'");
54
+        while ($row = sql_fetch($u)) {
55
+            $prefs = unserialize($row['prefs']);
56
+            $l = $prefs['spip_lang'];
57
+            unset($prefs['spip_lang']);
58
+            sql_query("UPDATE spip_auteurs SET lang=" . sql_quote($l) . ", prefs='" . sql_quote(serialize($prefs)) . "' WHERE id_auteur=" . $row['id_auteur']);
59
+        }
60
+        $u = sql_query("SELECT lang FROM spip_auteurs");
61
+        maj_version(1.604, $u);
62
+    }
63 63
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
 			$prefs = unserialize($row['prefs']);
56 56
 			$l = $prefs['spip_lang'];
57 57
 			unset($prefs['spip_lang']);
58
-			sql_query("UPDATE spip_auteurs SET lang=" . sql_quote($l) . ", prefs='" . sql_quote(serialize($prefs)) . "' WHERE id_auteur=" . $row['id_auteur']);
58
+			sql_query("UPDATE spip_auteurs SET lang=".sql_quote($l).", prefs='".sql_quote(serialize($prefs))."' WHERE id_auteur=".$row['id_auteur']);
59 59
 		}
60 60
 		$u = sql_query("SELECT lang FROM spip_auteurs");
61 61
 		maj_version(1.604, $u);
Please login to merge, or discard this patch.
ecrire/maj/legacy/v009.php 2 patches
Indentation   +122 added lines, -122 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
  * @package SPIP\Core\SQL\Upgrade
17 17
  **/
18 18
 if (!defined('_ECRIRE_INC_VERSION')) {
19
-	return;
19
+    return;
20 20
 }
21 21
 
22 22
 /**
@@ -26,125 +26,125 @@  discard block
 block discarded – undo
26 26
  * @param float $version_cible Version de destination
27 27
  **/
28 28
 function maj_legacy_v009_dist($version_installee, $version_cible) {
29
-	if (upgrade_vers(0.98, $version_installee, $version_cible)) {
30
-
31
-		sql_query("ALTER TABLE spip_articles ADD maj TIMESTAMP");
32
-		sql_query("ALTER TABLE spip_articles ADD export VARCHAR(10) DEFAULT 'oui'");
33
-		sql_query("ALTER TABLE spip_articles ADD images TEXT DEFAULT ''");
34
-		sql_query("ALTER TABLE spip_articles ADD date_redac datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
35
-		sql_query("ALTER TABLE spip_articles DROP INDEX id_article");
36
-		sql_query("ALTER TABLE spip_articles ADD INDEX id_rubrique (id_rubrique)");
37
-		sql_query("ALTER TABLE spip_articles ADD visites INTEGER DEFAULT '0' NOT NULL");
38
-		sql_query("ALTER TABLE spip_articles ADD referers BLOB NOT NULL");
39
-
40
-		sql_query("ALTER TABLE spip_auteurs ADD maj TIMESTAMP");
41
-		sql_query("ALTER TABLE spip_auteurs ADD pgp BLOB NOT NULL");
42
-
43
-		sql_query("ALTER TABLE spip_auteurs_articles ADD INDEX id_auteur (id_auteur), ADD INDEX id_article (id_article)");
44
-
45
-		sql_query("ALTER TABLE spip_rubriques ADD maj TIMESTAMP");
46
-		sql_query("ALTER TABLE spip_rubriques ADD export VARCHAR(10) DEFAULT 'oui', ADD id_import BIGINT DEFAULT '0'");
47
-
48
-		sql_query("ALTER TABLE spip_breves ADD maj TIMESTAMP");
49
-		sql_query("ALTER TABLE spip_breves DROP INDEX id_breve");
50
-		sql_query("ALTER TABLE spip_breves DROP INDEX id_breve_2");
51
-		sql_query("ALTER TABLE spip_breves ADD INDEX id_rubrique (id_rubrique)");
52
-
53
-		sql_query("ALTER TABLE spip_forum ADD ip VARCHAR(16)");
54
-		sql_query("ALTER TABLE spip_forum ADD maj TIMESTAMP");
55
-		sql_query("ALTER TABLE spip_forum DROP INDEX id_forum");
56
-		sql_query("ALTER TABLE spip_forum ADD INDEX id_parent (id_parent), ADD INDEX id_rubrique (id_rubrique), ADD INDEX id_article(id_article), ADD INDEX id_breve(id_breve)");
57
-		maj_version(0.98);
58
-	}
59
-
60
-	if (upgrade_vers(0.99, $version_installee, $version_cible)) {
61
-
62
-		$result = sql_query("SELECT DISTINCT id_article FROM spip_forum WHERE id_article!=0 AND id_parent=0");
63
-
64
-		while ($row = sql_fetch($result)) {
65
-			unset($forums_article);
66
-			$id_article = $row['id_article'];
67
-			$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_article=$id_article");
68
-			for (; ;) {
69
-				unset($forums);
70
-				while ($row2 = sql_fetch($result2)) {
71
-					$forums[] = $row2['id_forum'];
72
-				}
73
-				if (!$forums) {
74
-					break;
75
-				}
76
-				$forums = join(',', $forums);
77
-				$forums_article[] = $forums;
78
-				$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
79
-			}
80
-			$forums_article = join(',', $forums_article);
81
-			sql_query("UPDATE spip_forum SET id_article=$id_article WHERE id_forum IN ($forums_article)");
82
-		}
83
-
84
-		$result = sql_query("SELECT DISTINCT id_breve FROM spip_forum WHERE id_breve!=0 AND id_parent=0");
85
-
86
-		while ($row = sql_fetch($result)) {
87
-			unset($forums_breve);
88
-			$id_breve = $row['id_breve'];
89
-			$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_breve=$id_breve");
90
-			for (; ;) {
91
-				unset($forums);
92
-				while ($row2 = sql_fetch($result2)) {
93
-					$forums[] = $row2['id_forum'];
94
-				}
95
-				if (!$forums) {
96
-					break;
97
-				}
98
-				$forums = join(',', $forums);
99
-				$forums_breve[] = $forums;
100
-				$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
101
-			}
102
-			$forums_breve = join(',', $forums_breve);
103
-			sql_query("UPDATE spip_forum SET id_breve=$id_breve WHERE id_forum IN ($forums_breve)");
104
-		}
105
-
106
-		$result = sql_query("SELECT DISTINCT id_rubrique FROM spip_forum WHERE id_rubrique!=0 AND id_parent=0");
107
-
108
-		while ($row = sql_fetch($result)) {
109
-			unset($forums_rubrique);
110
-			$id_rubrique = $row['id_rubrique'];
111
-			$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_rubrique=$id_rubrique");
112
-			for (; ;) {
113
-
114
-				unset($forums);
115
-				while ($row2 = sql_fetch($result2)) {
116
-					$forums[] = $row2['id_forum'];
117
-				}
118
-				if (!$forums) {
119
-					break;
120
-				}
121
-				$forums = join(',', $forums);
122
-				$forums_rubrique[] = $forums;
123
-				$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
124
-			}
125
-			$forums_rubrique = join(',', $forums_rubrique);
126
-			sql_query("UPDATE spip_forum SET id_rubrique=$id_rubrique WHERE id_forum IN ($forums_rubrique)");
127
-
128
-		}
129
-		maj_version(0.99);
130
-	}
131
-
132
-	if (upgrade_vers(0.997, $version_installee, $version_cible)) {
133
-		sql_query("DROP TABLE spip_index");
134
-		maj_version(0.997);
135
-	}
136
-
137
-	if (upgrade_vers(0.999, $version_installee, $version_cible)) {
138
-
139
-		sql_query("ALTER TABLE spip_auteurs CHANGE pass pass tinyblob NOT NULL");
140
-		sql_query("ALTER TABLE spip_auteurs ADD htpass tinyblob NOT NULL");
141
-		$result = sql_query("SELECT id_auteur, pass FROM spip_auteurs WHERE pass!=''");
142
-
143
-		while ($r = sql_fetch($result)) {
144
-			$htpass = generer_htpass($r['pass']);
145
-			$pass = md5($pass);
146
-			sql_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=" . $r['id_auteur']);
147
-		}
148
-		maj_version(0.999);
149
-	}
29
+    if (upgrade_vers(0.98, $version_installee, $version_cible)) {
30
+
31
+        sql_query("ALTER TABLE spip_articles ADD maj TIMESTAMP");
32
+        sql_query("ALTER TABLE spip_articles ADD export VARCHAR(10) DEFAULT 'oui'");
33
+        sql_query("ALTER TABLE spip_articles ADD images TEXT DEFAULT ''");
34
+        sql_query("ALTER TABLE spip_articles ADD date_redac datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
35
+        sql_query("ALTER TABLE spip_articles DROP INDEX id_article");
36
+        sql_query("ALTER TABLE spip_articles ADD INDEX id_rubrique (id_rubrique)");
37
+        sql_query("ALTER TABLE spip_articles ADD visites INTEGER DEFAULT '0' NOT NULL");
38
+        sql_query("ALTER TABLE spip_articles ADD referers BLOB NOT NULL");
39
+
40
+        sql_query("ALTER TABLE spip_auteurs ADD maj TIMESTAMP");
41
+        sql_query("ALTER TABLE spip_auteurs ADD pgp BLOB NOT NULL");
42
+
43
+        sql_query("ALTER TABLE spip_auteurs_articles ADD INDEX id_auteur (id_auteur), ADD INDEX id_article (id_article)");
44
+
45
+        sql_query("ALTER TABLE spip_rubriques ADD maj TIMESTAMP");
46
+        sql_query("ALTER TABLE spip_rubriques ADD export VARCHAR(10) DEFAULT 'oui', ADD id_import BIGINT DEFAULT '0'");
47
+
48
+        sql_query("ALTER TABLE spip_breves ADD maj TIMESTAMP");
49
+        sql_query("ALTER TABLE spip_breves DROP INDEX id_breve");
50
+        sql_query("ALTER TABLE spip_breves DROP INDEX id_breve_2");
51
+        sql_query("ALTER TABLE spip_breves ADD INDEX id_rubrique (id_rubrique)");
52
+
53
+        sql_query("ALTER TABLE spip_forum ADD ip VARCHAR(16)");
54
+        sql_query("ALTER TABLE spip_forum ADD maj TIMESTAMP");
55
+        sql_query("ALTER TABLE spip_forum DROP INDEX id_forum");
56
+        sql_query("ALTER TABLE spip_forum ADD INDEX id_parent (id_parent), ADD INDEX id_rubrique (id_rubrique), ADD INDEX id_article(id_article), ADD INDEX id_breve(id_breve)");
57
+        maj_version(0.98);
58
+    }
59
+
60
+    if (upgrade_vers(0.99, $version_installee, $version_cible)) {
61
+
62
+        $result = sql_query("SELECT DISTINCT id_article FROM spip_forum WHERE id_article!=0 AND id_parent=0");
63
+
64
+        while ($row = sql_fetch($result)) {
65
+            unset($forums_article);
66
+            $id_article = $row['id_article'];
67
+            $result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_article=$id_article");
68
+            for (; ;) {
69
+                unset($forums);
70
+                while ($row2 = sql_fetch($result2)) {
71
+                    $forums[] = $row2['id_forum'];
72
+                }
73
+                if (!$forums) {
74
+                    break;
75
+                }
76
+                $forums = join(',', $forums);
77
+                $forums_article[] = $forums;
78
+                $result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
79
+            }
80
+            $forums_article = join(',', $forums_article);
81
+            sql_query("UPDATE spip_forum SET id_article=$id_article WHERE id_forum IN ($forums_article)");
82
+        }
83
+
84
+        $result = sql_query("SELECT DISTINCT id_breve FROM spip_forum WHERE id_breve!=0 AND id_parent=0");
85
+
86
+        while ($row = sql_fetch($result)) {
87
+            unset($forums_breve);
88
+            $id_breve = $row['id_breve'];
89
+            $result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_breve=$id_breve");
90
+            for (; ;) {
91
+                unset($forums);
92
+                while ($row2 = sql_fetch($result2)) {
93
+                    $forums[] = $row2['id_forum'];
94
+                }
95
+                if (!$forums) {
96
+                    break;
97
+                }
98
+                $forums = join(',', $forums);
99
+                $forums_breve[] = $forums;
100
+                $result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
101
+            }
102
+            $forums_breve = join(',', $forums_breve);
103
+            sql_query("UPDATE spip_forum SET id_breve=$id_breve WHERE id_forum IN ($forums_breve)");
104
+        }
105
+
106
+        $result = sql_query("SELECT DISTINCT id_rubrique FROM spip_forum WHERE id_rubrique!=0 AND id_parent=0");
107
+
108
+        while ($row = sql_fetch($result)) {
109
+            unset($forums_rubrique);
110
+            $id_rubrique = $row['id_rubrique'];
111
+            $result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_rubrique=$id_rubrique");
112
+            for (; ;) {
113
+
114
+                unset($forums);
115
+                while ($row2 = sql_fetch($result2)) {
116
+                    $forums[] = $row2['id_forum'];
117
+                }
118
+                if (!$forums) {
119
+                    break;
120
+                }
121
+                $forums = join(',', $forums);
122
+                $forums_rubrique[] = $forums;
123
+                $result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
124
+            }
125
+            $forums_rubrique = join(',', $forums_rubrique);
126
+            sql_query("UPDATE spip_forum SET id_rubrique=$id_rubrique WHERE id_forum IN ($forums_rubrique)");
127
+
128
+        }
129
+        maj_version(0.99);
130
+    }
131
+
132
+    if (upgrade_vers(0.997, $version_installee, $version_cible)) {
133
+        sql_query("DROP TABLE spip_index");
134
+        maj_version(0.997);
135
+    }
136
+
137
+    if (upgrade_vers(0.999, $version_installee, $version_cible)) {
138
+
139
+        sql_query("ALTER TABLE spip_auteurs CHANGE pass pass tinyblob NOT NULL");
140
+        sql_query("ALTER TABLE spip_auteurs ADD htpass tinyblob NOT NULL");
141
+        $result = sql_query("SELECT id_auteur, pass FROM spip_auteurs WHERE pass!=''");
142
+
143
+        while ($r = sql_fetch($result)) {
144
+            $htpass = generer_htpass($r['pass']);
145
+            $pass = md5($pass);
146
+            sql_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=" . $r['id_auteur']);
147
+        }
148
+        maj_version(0.999);
149
+    }
150 150
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 			unset($forums_article);
66 66
 			$id_article = $row['id_article'];
67 67
 			$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_article=$id_article");
68
-			for (; ;) {
68
+			for (;;) {
69 69
 				unset($forums);
70 70
 				while ($row2 = sql_fetch($result2)) {
71 71
 					$forums[] = $row2['id_forum'];
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 			unset($forums_breve);
88 88
 			$id_breve = $row['id_breve'];
89 89
 			$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_breve=$id_breve");
90
-			for (; ;) {
90
+			for (;;) {
91 91
 				unset($forums);
92 92
 				while ($row2 = sql_fetch($result2)) {
93 93
 					$forums[] = $row2['id_forum'];
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 			unset($forums_rubrique);
110 110
 			$id_rubrique = $row['id_rubrique'];
111 111
 			$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_rubrique=$id_rubrique");
112
-			for (; ;) {
112
+			for (;;) {
113 113
 
114 114
 				unset($forums);
115 115
 				while ($row2 = sql_fetch($result2)) {
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 		while ($r = sql_fetch($result)) {
144 144
 			$htpass = generer_htpass($r['pass']);
145 145
 			$pass = md5($pass);
146
-			sql_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=" . $r['id_auteur']);
146
+			sql_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=".$r['id_auteur']);
147 147
 		}
148 148
 		maj_version(0.999);
149 149
 	}
Please login to merge, or discard this patch.
ecrire/maj/legacy/v011.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
  * @package SPIP\Core\SQL\Upgrade
17 17
  **/
18 18
 if (!defined('_ECRIRE_INC_VERSION')) {
19
-	return;
19
+    return;
20 20
 }
21 21
 
22 22
 /**
@@ -27,9 +27,9 @@  discard block
 block discarded – undo
27 27
  **/
28 28
 function maj_legacy_v011_dist($version_installee, $version_cible) {
29 29
 
30
-	if (upgrade_vers(1.1, $version_installee, $version_cible)) {
31
-		sql_query("DROP TABLE spip_petition");
32
-		sql_query("DROP TABLE spip_signatures_petition");
33
-		maj_version(1.1);
34
-	}
30
+    if (upgrade_vers(1.1, $version_installee, $version_cible)) {
31
+        sql_query("DROP TABLE spip_petition");
32
+        sql_query("DROP TABLE spip_signatures_petition");
33
+        maj_version(1.1);
34
+    }
35 35
 }
Please login to merge, or discard this patch.
ecrire/maj/legacy/v014.php 2 patches
Indentation   +302 added lines, -302 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
  * @package SPIP\Core\SQL\Upgrade
17 17
  **/
18 18
 if (!defined('_ECRIRE_INC_VERSION')) {
19
-	return;
19
+    return;
20 20
 }
21 21
 
22 22
 /**
@@ -26,311 +26,311 @@  discard block
 block discarded – undo
26 26
  * @param float $version_cible Version de destination
27 27
  **/
28 28
 function maj_legacy_v014_dist($version_installee, $version_cible) {
29
-	if (upgrade_vers(1.404, $version_installee, $version_cible)) {
30
-		sql_query("UPDATE spip_mots SET type='Mots sans groupe...' WHERE type=''");
31
-
32
-		$result = sql_query("SELECT * FROM spip_mots GROUP BY type");
33
-		while ($row = sql_fetch($result)) {
34
-			$type = addslashes($row['type']);
35
-			// Old style, doit echouer
36
-			spip_log('ne pas tenir compte de l erreur spip_groupes_mots ci-dessous:', 'mysql');
37
-			sql_query("INSERT INTO spip_groupes_mots 					(titre, unseul, obligatoire, articles, breves, rubriques, syndic, 0minirezo, 1comite, 6forum)					VALUES (\"$type\", 'non', 'non', 'oui', 'oui', 'non', 'oui', 'oui', 'oui', 'non')");
38
-			// New style, devrait marcher
39
-			sql_query("INSERT INTO spip_groupes_mots 					(titre, unseul, obligatoire, articles, breves, rubriques, syndic, minirezo, comite, forum)					VALUES (\"$type\", 'non', 'non', 'oui', 'oui', 'non', 'oui', 'oui', 'oui', 'non')");
40
-		}
41
-		sql_delete("spip_mots", "titre='kawax'");
42
-		maj_version(1.404);
43
-	}
44
-
45
-	if (upgrade_vers(1.405, $version_installee, $version_cible)) {
46
-		sql_query("ALTER TABLE spip_mots ADD id_groupe bigint(21) NOT NULL");
47
-
48
-		$result = sql_query("SELECT * FROM spip_groupes_mots");
49
-		while ($row = sql_fetch($result)) {
50
-			$id_groupe = addslashes($row['id_groupe']);
51
-			$type = addslashes($row['titre']);
52
-			sql_query("UPDATE spip_mots SET id_groupe = '$id_groupe' WHERE type='$type'");
53
-		}
54
-		maj_version(1.405);
55
-	}
56
-
57
-	if (upgrade_vers(1.408, $version_installee, $version_cible)) {
58
-		// Images articles passent dans spip_documents
59
-		$result = sql_query("SELECT id_article, images FROM spip_articles WHERE LENGTH(images) > 0");
60
-
61
-
62
-		$types = array('jpg' => 1, 'png' => 2, 'gif' => 3);
63
-
64
-		while ($row = @sql_fetch($result)) {
65
-			$id_article = $row['id_article'];
66
-			$images = $row['images'];
67
-			$images = explode(",", $images);
68
-			reset($images);
69
-			$replace = '_orig_';
70
-			foreach ($images as $val) {
71
-				$image = explode("|", $val);
72
-				$fichier = $image[0];
73
-				$largeur = $image[1];
74
-				$hauteur = $image[2];
75
-				preg_match(",-([0-9]+)\.(gif|jpg|png)$,i", $fichier, $match);
76
-				$id_type = intval($types[$match[2]]);
77
-				$num_img = $match[1];
78
-				$fichier = _DIR_IMG . $fichier;
79
-				$taille = @filesize($fichier);
80
-				// ici on n'a pas les fonctions absctract !
81
-				sql_query("INSERT INTO spip_documents (titre, id_type, fichier, mode, largeur, hauteur, taille) VALUES ('image $largeur x $hauteur', $id_type, '$fichier', 'vignette', '$largeur', '$hauteur', '$taille')");
82
-				$id_document = mysqli_insert_id(_mysql_link());
83
-				if ($id_document > 0) {
84
-					sql_query("INSERT INTO spip_documents_articles (id_document, id_article) VALUES ($id_document, $id_article)");
85
-					$replace = "REPLACE($replace, '<IMG$num_img|', '<IM_$id_document|')";
86
-				} else {
87
-					echo _T('texte_erreur_mise_niveau_base', array('fichier' => $fichier, 'id_article' => $id_article));
88
-					exit;
89
-				}
90
-			}
91
-			$replace = "REPLACE($replace, '<IM_', '<IMG')";
92
-			$replace_chapo = str_replace('_orig_', 'chapo', $replace);
93
-			$replace_descriptif = str_replace('_orig_', 'descriptif', $replace);
94
-			$replace_texte = str_replace('_orig_', 'texte', $replace);
95
-			$replace_ps = str_replace('_orig_', 'ps', $replace);
96
-			sql_query("UPDATE spip_articles SET chapo=$replace_chapo, descriptif=$replace_descriptif, texte=$replace_texte, ps=$replace_ps WHERE id_article=$id_article");
97
-
98
-		}
99
-		sql_query("ALTER TABLE spip_articles DROP images");
100
-		maj_version(1.408);
101
-	}
102
-
103
-	if (upgrade_vers(1.414, $version_installee, $version_cible)) {
104
-		// Forum par defaut "en dur" dans les spip_articles
105
-		// -> non, prio (priori), pos (posteriori), abo (abonnement)
106
-		$accepter_forum = substr($GLOBALS['meta']["forums_publics"], 0, 3);
107
-		$result = sql_query("ALTER TABLE spip_articles CHANGE accepter_forum accepter_forum CHAR(3) NOT NULL");
108
-
109
-		$result = sql_query("UPDATE spip_articles SET accepter_forum='$accepter_forum' WHERE accepter_forum != 'non'");
110
-
111
-		maj_version(1.414);
112
-	}
113
-
114
-	/*
29
+    if (upgrade_vers(1.404, $version_installee, $version_cible)) {
30
+        sql_query("UPDATE spip_mots SET type='Mots sans groupe...' WHERE type=''");
31
+
32
+        $result = sql_query("SELECT * FROM spip_mots GROUP BY type");
33
+        while ($row = sql_fetch($result)) {
34
+            $type = addslashes($row['type']);
35
+            // Old style, doit echouer
36
+            spip_log('ne pas tenir compte de l erreur spip_groupes_mots ci-dessous:', 'mysql');
37
+            sql_query("INSERT INTO spip_groupes_mots 					(titre, unseul, obligatoire, articles, breves, rubriques, syndic, 0minirezo, 1comite, 6forum)					VALUES (\"$type\", 'non', 'non', 'oui', 'oui', 'non', 'oui', 'oui', 'oui', 'non')");
38
+            // New style, devrait marcher
39
+            sql_query("INSERT INTO spip_groupes_mots 					(titre, unseul, obligatoire, articles, breves, rubriques, syndic, minirezo, comite, forum)					VALUES (\"$type\", 'non', 'non', 'oui', 'oui', 'non', 'oui', 'oui', 'oui', 'non')");
40
+        }
41
+        sql_delete("spip_mots", "titre='kawax'");
42
+        maj_version(1.404);
43
+    }
44
+
45
+    if (upgrade_vers(1.405, $version_installee, $version_cible)) {
46
+        sql_query("ALTER TABLE spip_mots ADD id_groupe bigint(21) NOT NULL");
47
+
48
+        $result = sql_query("SELECT * FROM spip_groupes_mots");
49
+        while ($row = sql_fetch($result)) {
50
+            $id_groupe = addslashes($row['id_groupe']);
51
+            $type = addslashes($row['titre']);
52
+            sql_query("UPDATE spip_mots SET id_groupe = '$id_groupe' WHERE type='$type'");
53
+        }
54
+        maj_version(1.405);
55
+    }
56
+
57
+    if (upgrade_vers(1.408, $version_installee, $version_cible)) {
58
+        // Images articles passent dans spip_documents
59
+        $result = sql_query("SELECT id_article, images FROM spip_articles WHERE LENGTH(images) > 0");
60
+
61
+
62
+        $types = array('jpg' => 1, 'png' => 2, 'gif' => 3);
63
+
64
+        while ($row = @sql_fetch($result)) {
65
+            $id_article = $row['id_article'];
66
+            $images = $row['images'];
67
+            $images = explode(",", $images);
68
+            reset($images);
69
+            $replace = '_orig_';
70
+            foreach ($images as $val) {
71
+                $image = explode("|", $val);
72
+                $fichier = $image[0];
73
+                $largeur = $image[1];
74
+                $hauteur = $image[2];
75
+                preg_match(",-([0-9]+)\.(gif|jpg|png)$,i", $fichier, $match);
76
+                $id_type = intval($types[$match[2]]);
77
+                $num_img = $match[1];
78
+                $fichier = _DIR_IMG . $fichier;
79
+                $taille = @filesize($fichier);
80
+                // ici on n'a pas les fonctions absctract !
81
+                sql_query("INSERT INTO spip_documents (titre, id_type, fichier, mode, largeur, hauteur, taille) VALUES ('image $largeur x $hauteur', $id_type, '$fichier', 'vignette', '$largeur', '$hauteur', '$taille')");
82
+                $id_document = mysqli_insert_id(_mysql_link());
83
+                if ($id_document > 0) {
84
+                    sql_query("INSERT INTO spip_documents_articles (id_document, id_article) VALUES ($id_document, $id_article)");
85
+                    $replace = "REPLACE($replace, '<IMG$num_img|', '<IM_$id_document|')";
86
+                } else {
87
+                    echo _T('texte_erreur_mise_niveau_base', array('fichier' => $fichier, 'id_article' => $id_article));
88
+                    exit;
89
+                }
90
+            }
91
+            $replace = "REPLACE($replace, '<IM_', '<IMG')";
92
+            $replace_chapo = str_replace('_orig_', 'chapo', $replace);
93
+            $replace_descriptif = str_replace('_orig_', 'descriptif', $replace);
94
+            $replace_texte = str_replace('_orig_', 'texte', $replace);
95
+            $replace_ps = str_replace('_orig_', 'ps', $replace);
96
+            sql_query("UPDATE spip_articles SET chapo=$replace_chapo, descriptif=$replace_descriptif, texte=$replace_texte, ps=$replace_ps WHERE id_article=$id_article");
97
+
98
+        }
99
+        sql_query("ALTER TABLE spip_articles DROP images");
100
+        maj_version(1.408);
101
+    }
102
+
103
+    if (upgrade_vers(1.414, $version_installee, $version_cible)) {
104
+        // Forum par defaut "en dur" dans les spip_articles
105
+        // -> non, prio (priori), pos (posteriori), abo (abonnement)
106
+        $accepter_forum = substr($GLOBALS['meta']["forums_publics"], 0, 3);
107
+        $result = sql_query("ALTER TABLE spip_articles CHANGE accepter_forum accepter_forum CHAR(3) NOT NULL");
108
+
109
+        $result = sql_query("UPDATE spip_articles SET accepter_forum='$accepter_forum' WHERE accepter_forum != 'non'");
110
+
111
+        maj_version(1.414);
112
+    }
113
+
114
+    /*
115 115
 	if ($version_installee == 1.415) {
116 116
 		sql_query("ALTER TABLE spip_documents DROP inclus");
117 117
 		maj_version (1.415);
118 118
 	}
119 119
 	*/
120 120
 
121
-	if (upgrade_vers(1.417, $version_installee, $version_cible)) {
122
-		sql_query("ALTER TABLE spip_syndic_articles DROP date_index");
123
-		maj_version(1.417);
124
-	}
125
-
126
-	if (upgrade_vers(1.418, $version_installee, $version_cible)) {
127
-		$result = sql_query("SELECT * FROM spip_auteurs WHERE statut = '0minirezo' AND email != '' ORDER BY id_auteur LIMIT 1");
128
-
129
-		if ($webmaster = sql_fetch($result)) {
130
-			ecrire_meta('email_webmaster', $webmaster['email']);
131
-		}
132
-		maj_version(1.418);
133
-	}
134
-
135
-	if (upgrade_vers(1.419, $version_installee, $version_cible)) {
136
-		sql_query("ALTER TABLE spip_auteurs ADD alea_actuel TINYTEXT DEFAULT ''");
137
-		sql_query("ALTER TABLE spip_auteurs ADD alea_futur TINYTEXT DEFAULT ''");
138
-		sql_query("UPDATE spip_auteurs SET alea_futur = FLOOR(32000*RAND())");
139
-		maj_version(1.419);
140
-	}
141
-
142
-	if (upgrade_vers(1.420, $version_installee, $version_cible)) {
143
-		sql_query("UPDATE spip_auteurs SET alea_actuel='' WHERE statut='nouveau'");
144
-		maj_version(1.420);
145
-	}
146
-
147
-	if (upgrade_vers(1.421, $version_installee, $version_cible)) {
148
-		sql_query("ALTER TABLE spip_articles ADD auteur_modif bigint(21) DEFAULT '0' NOT NULL");
149
-		sql_query("ALTER TABLE spip_articles ADD date_modif datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
150
-		maj_version(1.421);
151
-	}
152
-
153
-	if (upgrade_vers(1.432, $version_installee, $version_cible)) {
154
-		sql_query("ALTER TABLE spip_articles DROP referers");
155
-		sql_query("ALTER TABLE spip_articles ADD referers INTEGER DEFAULT '0' NOT NULL");
156
-		sql_query("ALTER TABLE spip_articles ADD popularite INTEGER DEFAULT '0' NOT NULL");
157
-		maj_version(1.432);
158
-	}
159
-
160
-	if (upgrade_vers(1.436, $version_installee, $version_cible)) {
161
-		sql_query("ALTER TABLE spip_documents ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
162
-		maj_version(1.436);
163
-	}
164
-
165
-	if (upgrade_vers(1.437, $version_installee, $version_cible)) {
166
-		sql_query("ALTER TABLE spip_visites ADD maj TIMESTAMP");
167
-		sql_query("ALTER TABLE spip_visites_referers ADD maj TIMESTAMP");
168
-		maj_version(1.437);
169
-	}
170
-
171
-	if (upgrade_vers(1.438, $version_installee, $version_cible)) {
172
-		sql_query("ALTER TABLE spip_articles ADD INDEX id_secteur (id_secteur)");
173
-		sql_query("ALTER TABLE spip_articles ADD INDEX statut (statut, date)");
174
-		maj_version(1.438);
175
-	}
176
-
177
-	if (upgrade_vers(1.439, $version_installee, $version_cible)) {
178
-		sql_query("ALTER TABLE spip_syndic ADD INDEX statut (statut, date_syndic)");
179
-		sql_query("ALTER TABLE spip_syndic_articles ADD INDEX statut (statut)");
180
-		sql_query("ALTER TABLE spip_syndic_articles CHANGE url url VARCHAR(255) NOT NULL");
181
-		sql_query("ALTER TABLE spip_syndic_articles ADD INDEX url (url)");
182
-		maj_version(1.439);
183
-	}
184
-
185
-	if (upgrade_vers(1.440, $version_installee, $version_cible)) {
186
-		sql_query("ALTER TABLE spip_visites_temp CHANGE ip ip INTEGER UNSIGNED NOT NULL");
187
-		maj_version(1.440);
188
-	}
189
-
190
-	if (upgrade_vers(1.441, $version_installee, $version_cible)) {
191
-		sql_query("ALTER TABLE spip_visites_temp CHANGE date date DATE NOT NULL");
192
-		sql_query("ALTER TABLE spip_visites CHANGE date date DATE NOT NULL");
193
-		sql_query("ALTER TABLE spip_visites_referers CHANGE date date DATE NOT NULL");
194
-		maj_version(1.441);
195
-	}
196
-
197
-	if (upgrade_vers(1.442, $version_installee, $version_cible)) {
198
-		sql_query("ALTER TABLE spip_auteurs ADD prefs TINYTEXT NOT NULL");
199
-		maj_version(1.442);
200
-	}
201
-
202
-	if (upgrade_vers(1.443, $version_installee, $version_cible)) {
203
-		sql_query("ALTER TABLE spip_auteurs CHANGE login login VARCHAR(255) BINARY NOT NULL");
204
-		sql_query("ALTER TABLE spip_auteurs CHANGE statut statut VARCHAR(255) NOT NULL");
205
-		sql_query("ALTER TABLE spip_auteurs ADD INDEX login (login)");
206
-		sql_query("ALTER TABLE spip_auteurs ADD INDEX statut (statut)");
207
-		maj_version(1.443);
208
-	}
209
-
210
-	if (upgrade_vers(1.444, $version_installee, $version_cible)) {
211
-		sql_query("ALTER TABLE spip_syndic ADD moderation VARCHAR(3) NOT NULL");
212
-		maj_version(1.444);
213
-	}
214
-
215
-	if (upgrade_vers(1.457, $version_installee, $version_cible)) {
216
-		sql_query("DROP TABLE spip_visites");
217
-		sql_query("DROP TABLE spip_visites_temp");
218
-		sql_query("DROP TABLE spip_visites_referers");
219
-		creer_base(); // crade, a ameliorer :-((
220
-		maj_version(1.457);
221
-	}
222
-
223
-	if (upgrade_vers(1.458, $version_installee, $version_cible)) {
224
-		sql_query("ALTER TABLE spip_auteurs ADD cookie_oubli TINYTEXT NOT NULL");
225
-		maj_version(1.458);
226
-	}
227
-
228
-	if (upgrade_vers(1.459, $version_installee, $version_cible)) {
229
-		$result = sql_query("SELECT type FROM spip_mots GROUP BY type");
230
-		while ($row = sql_fetch($result)) {
231
-			$type = addslashes($row['type']);
232
-			$res = sql_query("SELECT * FROM spip_groupes_mots WHERE titre='$type'");
233
-			if (sql_count($res) == 0) {
234
-				sql_query("INSERT INTO spip_groupes_mots (titre, unseul, obligatoire, articles, breves, rubriques, syndic, minirezo, comite, forum) VALUES ('$type', 'non', 'non', 'oui', 'oui', 'non', 'oui', 'oui', 'oui', 'non')");
235
-				if ($id_groupe = mysqli_insert_id(_mysql_link())) {
236
-					sql_query("UPDATE spip_mots SET id_groupe = '$id_groupe' WHERE type='$type'");
237
-				}
238
-			}
239
-		}
240
-		sql_query("UPDATE spip_articles SET popularite=0");
241
-		maj_version(1.459);
242
-	}
243
-
244
-	if (upgrade_vers(1.460, $version_installee, $version_cible)) {
245
-		// remettre les mots dans les groupes dupliques par erreur
246
-		// dans la precedente version du paragraphe de maj 1.459
247
-		// et supprimer ceux-ci
248
-		$result = sql_query("SELECT * FROM spip_groupes_mots ORDER BY id_groupe");
249
-		while ($row = sql_fetch($result)) {
250
-			$titre = addslashes($row['titre']);
251
-			if (!$vu[$titre]) {
252
-				$vu[$titre] = true;
253
-				$id_groupe = $row['id_groupe'];
254
-				sql_query("UPDATE spip_mots SET id_groupe=$id_groupe WHERE type='$titre'");
255
-				sql_delete("spip_groupes_mots", "titre='$titre' AND id_groupe<>$id_groupe");
256
-			}
257
-		}
258
-		maj_version(1.460);
259
-	}
260
-
261
-	if (upgrade_vers(1.462, $version_installee, $version_cible)) {
262
-		sql_query("UPDATE spip_types_documents SET inclus='embed' WHERE inclus!='non' AND extension IN ('aiff', 'asf', 'avi', 'mid', 'mov', 'mp3', 'mpg', 'ogg', 'qt', 'ra', 'ram', 'rm', 'swf', 'wav', 'wmv')");
263
-		maj_version(1.462);
264
-	}
265
-
266
-	if (upgrade_vers(1.463, $version_installee, $version_cible)) {
267
-		sql_query("ALTER TABLE spip_articles CHANGE popularite popularite DOUBLE");
268
-		sql_query("ALTER TABLE spip_visites_temp ADD maj TIMESTAMP");
269
-		sql_query("ALTER TABLE spip_referers_temp ADD maj TIMESTAMP");
270
-		maj_version(1.463);
271
-	}
272
-
273
-	// l'upgrade < 1.462 ci-dessus etait fausse, d'ou correctif
274
-	if (upgrade_vers(1.464, $version_installee, $version_cible) and ($version_installee >= 1.462)) {
275
-		$res = sql_query("SELECT id_type, extension FROM spip_types_documents WHERE id_type NOT IN (1,2,3)");
276
-		while ($row = sql_fetch($res)) {
277
-			$extension = $row['extension'];
278
-			$id_type = $row['id_type'];
279
-			sql_query("UPDATE spip_documents SET id_type=$id_type	WHERE fichier like '%.$extension'");
280
-		}
281
-		maj_version(1.464);
282
-	}
283
-
284
-	if (upgrade_vers(1.465, $version_installee, $version_cible)) {
285
-		sql_query("ALTER TABLE spip_articles CHANGE popularite popularite DOUBLE NOT NULL");
286
-		maj_version(1.465);
287
-	}
288
-
289
-	if (upgrade_vers(1.466, $version_installee, $version_cible)) {
290
-		sql_query("ALTER TABLE spip_auteurs ADD source VARCHAR(10) DEFAULT 'spip' NOT NULL");
291
-		maj_version(1.466);
292
-	}
293
-
294
-	if (upgrade_vers(1.468, $version_installee, $version_cible)) {
295
-		sql_query("ALTER TABLE spip_auteurs ADD INDEX en_ligne (en_ligne)");
296
-		sql_query("ALTER TABLE spip_forum ADD INDEX statut (statut, date_heure)");
297
-		maj_version(1.468);
298
-	}
299
-
300
-	if (upgrade_vers(1.470, $version_installee, $version_cible)) {
301
-		if ($version_installee >= 1.467) {  // annule les "listes de diff"
302
-			sql_query("DROP TABLE spip_listes");
303
-			sql_query("ALTER TABLE spip_auteurs DROP abonne");
304
-			sql_query("ALTER TABLE spip_auteurs DROP abonne_pass");
305
-		}
306
-		maj_version(1.470);
307
-	}
308
-
309
-	if (upgrade_vers(1.471, $version_installee, $version_cible)) {
310
-		if ($version_installee >= 1.470) {  // annule les "maj"
311
-			sql_query("ALTER TABLE spip_auteurs_articles DROP maj TIMESTAMP");
312
-			sql_query("ALTER TABLE spip_auteurs_rubriques DROP maj TIMESTAMP");
313
-			sql_query("ALTER TABLE spip_auteurs_messages DROP maj TIMESTAMP");
314
-			sql_query("ALTER TABLE spip_documents_articles DROP maj TIMESTAMP");
315
-			sql_query("ALTER TABLE spip_documents_rubriques DROP maj TIMESTAMP");
316
-			sql_query("ALTER TABLE spip_documents_breves DROP maj TIMESTAMP");
317
-			sql_query("ALTER TABLE spip_mots_articles DROP maj TIMESTAMP");
318
-			sql_query("ALTER TABLE spip_mots_breves DROP maj TIMESTAMP");
319
-			sql_query("ALTER TABLE spip_mots_rubriques DROP maj TIMESTAMP");
320
-			sql_query("ALTER TABLE spip_mots_syndic DROP maj TIMESTAMP");
321
-			sql_query("ALTER TABLE spip_mots_forum DROP maj TIMESTAMP");
322
-		}
323
-		maj_version(1.471);
324
-	}
325
-
326
-	if (upgrade_vers(1.472, $version_installee, $version_cible)) {
327
-		sql_query("ALTER TABLE spip_referers ADD visites_jour INTEGER UNSIGNED NOT NULL");
328
-		maj_version(1.472);
329
-	}
330
-
331
-	if (upgrade_vers(1.473, $version_installee, $version_cible)) {
332
-		sql_query("UPDATE spip_syndic_articles SET url = REPLACE(url, '&amp;', '&')");
333
-		sql_query("UPDATE spip_syndic SET url_site = REPLACE(url_site, '&amp;', '&')");
334
-		maj_version(1.473);
335
-	}
121
+    if (upgrade_vers(1.417, $version_installee, $version_cible)) {
122
+        sql_query("ALTER TABLE spip_syndic_articles DROP date_index");
123
+        maj_version(1.417);
124
+    }
125
+
126
+    if (upgrade_vers(1.418, $version_installee, $version_cible)) {
127
+        $result = sql_query("SELECT * FROM spip_auteurs WHERE statut = '0minirezo' AND email != '' ORDER BY id_auteur LIMIT 1");
128
+
129
+        if ($webmaster = sql_fetch($result)) {
130
+            ecrire_meta('email_webmaster', $webmaster['email']);
131
+        }
132
+        maj_version(1.418);
133
+    }
134
+
135
+    if (upgrade_vers(1.419, $version_installee, $version_cible)) {
136
+        sql_query("ALTER TABLE spip_auteurs ADD alea_actuel TINYTEXT DEFAULT ''");
137
+        sql_query("ALTER TABLE spip_auteurs ADD alea_futur TINYTEXT DEFAULT ''");
138
+        sql_query("UPDATE spip_auteurs SET alea_futur = FLOOR(32000*RAND())");
139
+        maj_version(1.419);
140
+    }
141
+
142
+    if (upgrade_vers(1.420, $version_installee, $version_cible)) {
143
+        sql_query("UPDATE spip_auteurs SET alea_actuel='' WHERE statut='nouveau'");
144
+        maj_version(1.420);
145
+    }
146
+
147
+    if (upgrade_vers(1.421, $version_installee, $version_cible)) {
148
+        sql_query("ALTER TABLE spip_articles ADD auteur_modif bigint(21) DEFAULT '0' NOT NULL");
149
+        sql_query("ALTER TABLE spip_articles ADD date_modif datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
150
+        maj_version(1.421);
151
+    }
152
+
153
+    if (upgrade_vers(1.432, $version_installee, $version_cible)) {
154
+        sql_query("ALTER TABLE spip_articles DROP referers");
155
+        sql_query("ALTER TABLE spip_articles ADD referers INTEGER DEFAULT '0' NOT NULL");
156
+        sql_query("ALTER TABLE spip_articles ADD popularite INTEGER DEFAULT '0' NOT NULL");
157
+        maj_version(1.432);
158
+    }
159
+
160
+    if (upgrade_vers(1.436, $version_installee, $version_cible)) {
161
+        sql_query("ALTER TABLE spip_documents ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
162
+        maj_version(1.436);
163
+    }
164
+
165
+    if (upgrade_vers(1.437, $version_installee, $version_cible)) {
166
+        sql_query("ALTER TABLE spip_visites ADD maj TIMESTAMP");
167
+        sql_query("ALTER TABLE spip_visites_referers ADD maj TIMESTAMP");
168
+        maj_version(1.437);
169
+    }
170
+
171
+    if (upgrade_vers(1.438, $version_installee, $version_cible)) {
172
+        sql_query("ALTER TABLE spip_articles ADD INDEX id_secteur (id_secteur)");
173
+        sql_query("ALTER TABLE spip_articles ADD INDEX statut (statut, date)");
174
+        maj_version(1.438);
175
+    }
176
+
177
+    if (upgrade_vers(1.439, $version_installee, $version_cible)) {
178
+        sql_query("ALTER TABLE spip_syndic ADD INDEX statut (statut, date_syndic)");
179
+        sql_query("ALTER TABLE spip_syndic_articles ADD INDEX statut (statut)");
180
+        sql_query("ALTER TABLE spip_syndic_articles CHANGE url url VARCHAR(255) NOT NULL");
181
+        sql_query("ALTER TABLE spip_syndic_articles ADD INDEX url (url)");
182
+        maj_version(1.439);
183
+    }
184
+
185
+    if (upgrade_vers(1.440, $version_installee, $version_cible)) {
186
+        sql_query("ALTER TABLE spip_visites_temp CHANGE ip ip INTEGER UNSIGNED NOT NULL");
187
+        maj_version(1.440);
188
+    }
189
+
190
+    if (upgrade_vers(1.441, $version_installee, $version_cible)) {
191
+        sql_query("ALTER TABLE spip_visites_temp CHANGE date date DATE NOT NULL");
192
+        sql_query("ALTER TABLE spip_visites CHANGE date date DATE NOT NULL");
193
+        sql_query("ALTER TABLE spip_visites_referers CHANGE date date DATE NOT NULL");
194
+        maj_version(1.441);
195
+    }
196
+
197
+    if (upgrade_vers(1.442, $version_installee, $version_cible)) {
198
+        sql_query("ALTER TABLE spip_auteurs ADD prefs TINYTEXT NOT NULL");
199
+        maj_version(1.442);
200
+    }
201
+
202
+    if (upgrade_vers(1.443, $version_installee, $version_cible)) {
203
+        sql_query("ALTER TABLE spip_auteurs CHANGE login login VARCHAR(255) BINARY NOT NULL");
204
+        sql_query("ALTER TABLE spip_auteurs CHANGE statut statut VARCHAR(255) NOT NULL");
205
+        sql_query("ALTER TABLE spip_auteurs ADD INDEX login (login)");
206
+        sql_query("ALTER TABLE spip_auteurs ADD INDEX statut (statut)");
207
+        maj_version(1.443);
208
+    }
209
+
210
+    if (upgrade_vers(1.444, $version_installee, $version_cible)) {
211
+        sql_query("ALTER TABLE spip_syndic ADD moderation VARCHAR(3) NOT NULL");
212
+        maj_version(1.444);
213
+    }
214
+
215
+    if (upgrade_vers(1.457, $version_installee, $version_cible)) {
216
+        sql_query("DROP TABLE spip_visites");
217
+        sql_query("DROP TABLE spip_visites_temp");
218
+        sql_query("DROP TABLE spip_visites_referers");
219
+        creer_base(); // crade, a ameliorer :-((
220
+        maj_version(1.457);
221
+    }
222
+
223
+    if (upgrade_vers(1.458, $version_installee, $version_cible)) {
224
+        sql_query("ALTER TABLE spip_auteurs ADD cookie_oubli TINYTEXT NOT NULL");
225
+        maj_version(1.458);
226
+    }
227
+
228
+    if (upgrade_vers(1.459, $version_installee, $version_cible)) {
229
+        $result = sql_query("SELECT type FROM spip_mots GROUP BY type");
230
+        while ($row = sql_fetch($result)) {
231
+            $type = addslashes($row['type']);
232
+            $res = sql_query("SELECT * FROM spip_groupes_mots WHERE titre='$type'");
233
+            if (sql_count($res) == 0) {
234
+                sql_query("INSERT INTO spip_groupes_mots (titre, unseul, obligatoire, articles, breves, rubriques, syndic, minirezo, comite, forum) VALUES ('$type', 'non', 'non', 'oui', 'oui', 'non', 'oui', 'oui', 'oui', 'non')");
235
+                if ($id_groupe = mysqli_insert_id(_mysql_link())) {
236
+                    sql_query("UPDATE spip_mots SET id_groupe = '$id_groupe' WHERE type='$type'");
237
+                }
238
+            }
239
+        }
240
+        sql_query("UPDATE spip_articles SET popularite=0");
241
+        maj_version(1.459);
242
+    }
243
+
244
+    if (upgrade_vers(1.460, $version_installee, $version_cible)) {
245
+        // remettre les mots dans les groupes dupliques par erreur
246
+        // dans la precedente version du paragraphe de maj 1.459
247
+        // et supprimer ceux-ci
248
+        $result = sql_query("SELECT * FROM spip_groupes_mots ORDER BY id_groupe");
249
+        while ($row = sql_fetch($result)) {
250
+            $titre = addslashes($row['titre']);
251
+            if (!$vu[$titre]) {
252
+                $vu[$titre] = true;
253
+                $id_groupe = $row['id_groupe'];
254
+                sql_query("UPDATE spip_mots SET id_groupe=$id_groupe WHERE type='$titre'");
255
+                sql_delete("spip_groupes_mots", "titre='$titre' AND id_groupe<>$id_groupe");
256
+            }
257
+        }
258
+        maj_version(1.460);
259
+    }
260
+
261
+    if (upgrade_vers(1.462, $version_installee, $version_cible)) {
262
+        sql_query("UPDATE spip_types_documents SET inclus='embed' WHERE inclus!='non' AND extension IN ('aiff', 'asf', 'avi', 'mid', 'mov', 'mp3', 'mpg', 'ogg', 'qt', 'ra', 'ram', 'rm', 'swf', 'wav', 'wmv')");
263
+        maj_version(1.462);
264
+    }
265
+
266
+    if (upgrade_vers(1.463, $version_installee, $version_cible)) {
267
+        sql_query("ALTER TABLE spip_articles CHANGE popularite popularite DOUBLE");
268
+        sql_query("ALTER TABLE spip_visites_temp ADD maj TIMESTAMP");
269
+        sql_query("ALTER TABLE spip_referers_temp ADD maj TIMESTAMP");
270
+        maj_version(1.463);
271
+    }
272
+
273
+    // l'upgrade < 1.462 ci-dessus etait fausse, d'ou correctif
274
+    if (upgrade_vers(1.464, $version_installee, $version_cible) and ($version_installee >= 1.462)) {
275
+        $res = sql_query("SELECT id_type, extension FROM spip_types_documents WHERE id_type NOT IN (1,2,3)");
276
+        while ($row = sql_fetch($res)) {
277
+            $extension = $row['extension'];
278
+            $id_type = $row['id_type'];
279
+            sql_query("UPDATE spip_documents SET id_type=$id_type	WHERE fichier like '%.$extension'");
280
+        }
281
+        maj_version(1.464);
282
+    }
283
+
284
+    if (upgrade_vers(1.465, $version_installee, $version_cible)) {
285
+        sql_query("ALTER TABLE spip_articles CHANGE popularite popularite DOUBLE NOT NULL");
286
+        maj_version(1.465);
287
+    }
288
+
289
+    if (upgrade_vers(1.466, $version_installee, $version_cible)) {
290
+        sql_query("ALTER TABLE spip_auteurs ADD source VARCHAR(10) DEFAULT 'spip' NOT NULL");
291
+        maj_version(1.466);
292
+    }
293
+
294
+    if (upgrade_vers(1.468, $version_installee, $version_cible)) {
295
+        sql_query("ALTER TABLE spip_auteurs ADD INDEX en_ligne (en_ligne)");
296
+        sql_query("ALTER TABLE spip_forum ADD INDEX statut (statut, date_heure)");
297
+        maj_version(1.468);
298
+    }
299
+
300
+    if (upgrade_vers(1.470, $version_installee, $version_cible)) {
301
+        if ($version_installee >= 1.467) {  // annule les "listes de diff"
302
+            sql_query("DROP TABLE spip_listes");
303
+            sql_query("ALTER TABLE spip_auteurs DROP abonne");
304
+            sql_query("ALTER TABLE spip_auteurs DROP abonne_pass");
305
+        }
306
+        maj_version(1.470);
307
+    }
308
+
309
+    if (upgrade_vers(1.471, $version_installee, $version_cible)) {
310
+        if ($version_installee >= 1.470) {  // annule les "maj"
311
+            sql_query("ALTER TABLE spip_auteurs_articles DROP maj TIMESTAMP");
312
+            sql_query("ALTER TABLE spip_auteurs_rubriques DROP maj TIMESTAMP");
313
+            sql_query("ALTER TABLE spip_auteurs_messages DROP maj TIMESTAMP");
314
+            sql_query("ALTER TABLE spip_documents_articles DROP maj TIMESTAMP");
315
+            sql_query("ALTER TABLE spip_documents_rubriques DROP maj TIMESTAMP");
316
+            sql_query("ALTER TABLE spip_documents_breves DROP maj TIMESTAMP");
317
+            sql_query("ALTER TABLE spip_mots_articles DROP maj TIMESTAMP");
318
+            sql_query("ALTER TABLE spip_mots_breves DROP maj TIMESTAMP");
319
+            sql_query("ALTER TABLE spip_mots_rubriques DROP maj TIMESTAMP");
320
+            sql_query("ALTER TABLE spip_mots_syndic DROP maj TIMESTAMP");
321
+            sql_query("ALTER TABLE spip_mots_forum DROP maj TIMESTAMP");
322
+        }
323
+        maj_version(1.471);
324
+    }
325
+
326
+    if (upgrade_vers(1.472, $version_installee, $version_cible)) {
327
+        sql_query("ALTER TABLE spip_referers ADD visites_jour INTEGER UNSIGNED NOT NULL");
328
+        maj_version(1.472);
329
+    }
330
+
331
+    if (upgrade_vers(1.473, $version_installee, $version_cible)) {
332
+        sql_query("UPDATE spip_syndic_articles SET url = REPLACE(url, '&amp;', '&')");
333
+        sql_query("UPDATE spip_syndic SET url_site = REPLACE(url_site, '&amp;', '&')");
334
+        maj_version(1.473);
335
+    }
336 336
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
 				preg_match(",-([0-9]+)\.(gif|jpg|png)$,i", $fichier, $match);
76 76
 				$id_type = intval($types[$match[2]]);
77 77
 				$num_img = $match[1];
78
-				$fichier = _DIR_IMG . $fichier;
78
+				$fichier = _DIR_IMG.$fichier;
79 79
 				$taille = @filesize($fichier);
80 80
 				// ici on n'a pas les fonctions absctract !
81 81
 				sql_query("INSERT INTO spip_documents (titre, id_type, fichier, mode, largeur, hauteur, taille) VALUES ('image $largeur x $hauteur', $id_type, '$fichier', 'vignette', '$largeur', '$hauteur', '$taille')");
Please login to merge, or discard this patch.
ecrire/maj/legacy/v019_pre193.php 2 patches
Indentation   +262 added lines, -262 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
  * @package SPIP\Core\SQL\Upgrade
17 17
  **/
18 18
 if (!defined('_ECRIRE_INC_VERSION')) {
19
-	return;
19
+    return;
20 20
 }
21 21
 
22 22
 /**
@@ -26,61 +26,61 @@  discard block
 block discarded – undo
26 26
  * @param float $version_cible Version de destination
27 27
  **/
28 28
 function maj_legacy_v019_pre193($version_installee, $version_cible) {
29
-	// Syndication : ajout de l'option resume=oui/non et de la langue
30
-	if (upgrade_vers(1.901, $version_installee, $version_cible)) {
31
-		sql_query("ALTER TABLE spip_syndic ADD `resume` VARCHAR(3) DEFAULT 'oui'");
32
-		sql_query("ALTER TABLE spip_syndic_articles ADD `lang` VARCHAR(10) DEFAULT '' NOT NULL");
33
-		maj_version(1.901);
34
-	}
29
+    // Syndication : ajout de l'option resume=oui/non et de la langue
30
+    if (upgrade_vers(1.901, $version_installee, $version_cible)) {
31
+        sql_query("ALTER TABLE spip_syndic ADD `resume` VARCHAR(3) DEFAULT 'oui'");
32
+        sql_query("ALTER TABLE spip_syndic_articles ADD `lang` VARCHAR(10) DEFAULT '' NOT NULL");
33
+        maj_version(1.901);
34
+    }
35 35
 
36
-	// Syndication : ajout de source, url_source, tags
37
-	if (upgrade_vers(1.902, $version_installee, $version_cible)) {
38
-		sql_query("ALTER TABLE spip_syndic_articles ADD `url_source` TINYTEXT DEFAULT '' NOT NULL");
39
-		sql_query("ALTER TABLE spip_syndic_articles ADD `source` TINYTEXT DEFAULT '' NOT NULL");
40
-		sql_query("ALTER TABLE spip_syndic_articles ADD `tags` TEXT DEFAULT '' NOT NULL");
41
-		maj_version(1.902);
42
-	}
36
+    // Syndication : ajout de source, url_source, tags
37
+    if (upgrade_vers(1.902, $version_installee, $version_cible)) {
38
+        sql_query("ALTER TABLE spip_syndic_articles ADD `url_source` TINYTEXT DEFAULT '' NOT NULL");
39
+        sql_query("ALTER TABLE spip_syndic_articles ADD `source` TINYTEXT DEFAULT '' NOT NULL");
40
+        sql_query("ALTER TABLE spip_syndic_articles ADD `tags` TEXT DEFAULT '' NOT NULL");
41
+        maj_version(1.902);
42
+    }
43 43
 
44
-	// URLs propres des sites (sait-on jamais)
45
-	// + oubli des KEY url_propre sur les auteurs si installation neuve
46
-	if (upgrade_vers(1.903, $version_installee, $version_cible)) {
47
-		sql_query("ALTER TABLE spip_syndic ADD `url_propre` VARCHAR(255) NOT NULL");
48
-		sql_query("ALTER TABLE spip_syndic ADD INDEX `url_propre` (`url_propre`)");
49
-		sql_query("ALTER TABLE spip_auteurs ADD INDEX `url_propre` (`url_propre`)");
50
-		maj_version(1.903);
51
-	}
44
+    // URLs propres des sites (sait-on jamais)
45
+    // + oubli des KEY url_propre sur les auteurs si installation neuve
46
+    if (upgrade_vers(1.903, $version_installee, $version_cible)) {
47
+        sql_query("ALTER TABLE spip_syndic ADD `url_propre` VARCHAR(255) NOT NULL");
48
+        sql_query("ALTER TABLE spip_syndic ADD INDEX `url_propre` (`url_propre`)");
49
+        sql_query("ALTER TABLE spip_auteurs ADD INDEX `url_propre` (`url_propre`)");
50
+        maj_version(1.903);
51
+    }
52 52
 
53
-	// suppression des anciennes tables temporaires des visites
54
-	// (maintenant stockees sous forme de fichiers)
55
-	if (upgrade_vers(1.904, $version_installee, $version_cible)) {
56
-		sql_query("DROP TABLE IF EXISTS spip_visites_temp");
57
-		sql_query("DROP TABLE IF EXISTS spip_referers_temp");
58
-		maj_version(1.904);
59
-	}
53
+    // suppression des anciennes tables temporaires des visites
54
+    // (maintenant stockees sous forme de fichiers)
55
+    if (upgrade_vers(1.904, $version_installee, $version_cible)) {
56
+        sql_query("DROP TABLE IF EXISTS spip_visites_temp");
57
+        sql_query("DROP TABLE IF EXISTS spip_referers_temp");
58
+        maj_version(1.904);
59
+    }
60 60
 
61
-	// fusion des 10 tables index en une seule
62
-	// pour fonctions futures evoluees du moteur de recherche
63
-	if (upgrade_vers(1.905, $version_installee, $version_cible)) {
64
-		// agrandir le champ "valeur" de spip_meta pour pouvoir y stocker
65
-		// des choses plus sympa
66
-		sql_query("ALTER TABLE spip_meta DROP INDEX `valeur`");
67
-		sql_query("ALTER TABLE spip_meta CHANGE `valeur` `valeur` TEXT");
68
-		// table des correspondances table->id_table
69
-		$liste_tables = array();
70
-		$liste_tables[1] = 'spip_articles';
71
-		$liste_tables[2] = 'spip_auteurs';
72
-		$liste_tables[3] = 'spip_breves';
73
-		$liste_tables[4] = 'spip_documents';
74
-		$liste_tables[5] = 'spip_forum';
75
-		$liste_tables[6] = 'spip_mots';
76
-		$liste_tables[7] = 'spip_rubriques';
77
-		$liste_tables[8] = 'spip_signatures';
78
-		$liste_tables[9] = 'spip_syndic';
61
+    // fusion des 10 tables index en une seule
62
+    // pour fonctions futures evoluees du moteur de recherche
63
+    if (upgrade_vers(1.905, $version_installee, $version_cible)) {
64
+        // agrandir le champ "valeur" de spip_meta pour pouvoir y stocker
65
+        // des choses plus sympa
66
+        sql_query("ALTER TABLE spip_meta DROP INDEX `valeur`");
67
+        sql_query("ALTER TABLE spip_meta CHANGE `valeur` `valeur` TEXT");
68
+        // table des correspondances table->id_table
69
+        $liste_tables = array();
70
+        $liste_tables[1] = 'spip_articles';
71
+        $liste_tables[2] = 'spip_auteurs';
72
+        $liste_tables[3] = 'spip_breves';
73
+        $liste_tables[4] = 'spip_documents';
74
+        $liste_tables[5] = 'spip_forum';
75
+        $liste_tables[6] = 'spip_mots';
76
+        $liste_tables[7] = 'spip_rubriques';
77
+        $liste_tables[8] = 'spip_signatures';
78
+        $liste_tables[9] = 'spip_syndic';
79 79
 
80
-		ecrire_meta('index_table', serialize($liste_tables));
80
+        ecrire_meta('index_table', serialize($liste_tables));
81 81
 
82 82
 ## devenu inutile car suppression totale de l'indexation
83
-		/*
83
+        /*
84 84
 				sql_query("INSERT INTO spip_index (`hash`,`points`,`id_objet`,`id_table`) SELECT `hash`,`points`,`id_article` as id_objet,'1' as id_table FROM spip_index_articles");
85 85
 				sql_query("DROP TABLE IF EXISTS spip_index_articles");
86 86
 
@@ -108,234 +108,234 @@  discard block
 block discarded – undo
108 108
 				sql_query("INSERT INTO spip_index (`hash`,`points`,`id_objet`,`id_table`) SELECT `hash`,`points`,`id_syndic` as id_objet,'9' as `id_table FROM spip_index_syndic");
109 109
 				sql_query("DROP TABLE IF EXISTS spip_index_syndic");
110 110
 		*/
111
-		maj_version(1.905);
112
-	}
111
+        maj_version(1.905);
112
+    }
113 113
 
114 114
 
115
-	// cette table est desormais geree par le plugin "podcast_client", on la
116
-	// supprime si le plugin n'est pas active ; risque inherent a l'utilisation
117
-	// de versions alpha :-)
118
-	if (upgrade_vers(1.906, $version_installee, $version_cible)) {
119
-		if (!@in_array('podcast_client', $GLOBALS['plugins'])) {
120
-			sql_query("DROP TABLE spip_documents_syndic");
121
-		}
122
-		maj_version(1.906);
123
-	}
124
-	if (upgrade_vers(1.907, $version_installee, $version_cible)) {
125
-		sql_query("ALTER TABLE spip_forum ADD INDEX `idx` (`idx`)");
126
-		maj_version(1.907);
127
-	}
128
-	// Oups ! on stockait les tags de syndication sous la forme rel="category"
129
-	// au lieu de rel="directory" - http://microformats.org/wiki/rel-directory
130
-	if (upgrade_vers(1.908, $version_installee, $version_cible)) {
131
-		sql_query("UPDATE spip_syndic_articles SET `tags` = REPLACE(`tags`, 'rel=\"category\">', 'rel=\"directory\">') WHERE `tags` like '%category%'");
132
-		maj_version(1.908);
133
-	}
134
-	if (upgrade_vers(1.909, $version_installee, $version_cible)) {
135
-		sql_query("ALTER IGNORE TABLE spip_mots_articles ADD PRIMARY KEY (`id_article`, `id_mot`)");
136
-		sql_query("ALTER IGNORE TABLE spip_mots_breves ADD PRIMARY KEY (`id_breve`, `id_mot`)");
137
-		sql_query("ALTER IGNORE TABLE spip_mots_rubriques ADD PRIMARY KEY (`id_rubrique`, `id_mot`)");
138
-		sql_query("ALTER IGNORE TABLE spip_mots_syndic ADD PRIMARY KEY (`id_syndic`, `id_mot`)");
139
-		sql_query("ALTER IGNORE TABLE spip_mots_documents ADD PRIMARY KEY (`id_document`, `id_mot`)");
140
-		sql_query("ALTER IGNORE TABLE spip_mots_forum ADD PRIMARY KEY (`id_forum`, `id_mot`)");
141
-		maj_version(1.909);
142
-	}
115
+    // cette table est desormais geree par le plugin "podcast_client", on la
116
+    // supprime si le plugin n'est pas active ; risque inherent a l'utilisation
117
+    // de versions alpha :-)
118
+    if (upgrade_vers(1.906, $version_installee, $version_cible)) {
119
+        if (!@in_array('podcast_client', $GLOBALS['plugins'])) {
120
+            sql_query("DROP TABLE spip_documents_syndic");
121
+        }
122
+        maj_version(1.906);
123
+    }
124
+    if (upgrade_vers(1.907, $version_installee, $version_cible)) {
125
+        sql_query("ALTER TABLE spip_forum ADD INDEX `idx` (`idx`)");
126
+        maj_version(1.907);
127
+    }
128
+    // Oups ! on stockait les tags de syndication sous la forme rel="category"
129
+    // au lieu de rel="directory" - http://microformats.org/wiki/rel-directory
130
+    if (upgrade_vers(1.908, $version_installee, $version_cible)) {
131
+        sql_query("UPDATE spip_syndic_articles SET `tags` = REPLACE(`tags`, 'rel=\"category\">', 'rel=\"directory\">') WHERE `tags` like '%category%'");
132
+        maj_version(1.908);
133
+    }
134
+    if (upgrade_vers(1.909, $version_installee, $version_cible)) {
135
+        sql_query("ALTER IGNORE TABLE spip_mots_articles ADD PRIMARY KEY (`id_article`, `id_mot`)");
136
+        sql_query("ALTER IGNORE TABLE spip_mots_breves ADD PRIMARY KEY (`id_breve`, `id_mot`)");
137
+        sql_query("ALTER IGNORE TABLE spip_mots_rubriques ADD PRIMARY KEY (`id_rubrique`, `id_mot`)");
138
+        sql_query("ALTER IGNORE TABLE spip_mots_syndic ADD PRIMARY KEY (`id_syndic`, `id_mot`)");
139
+        sql_query("ALTER IGNORE TABLE spip_mots_documents ADD PRIMARY KEY (`id_document`, `id_mot`)");
140
+        sql_query("ALTER IGNORE TABLE spip_mots_forum ADD PRIMARY KEY (`id_forum`, `id_mot`)");
141
+        maj_version(1.909);
142
+    }
143 143
 
144
-	if (upgrade_vers(1.910, $version_installee, $version_cible)) {
145
-		sql_query("ALTER IGNORE TABLE spip_auteurs_articles ADD PRIMARY KEY (`id_auteur`, `id_article`)");
146
-		sql_query("ALTER IGNORE TABLE spip_auteurs_rubriques ADD PRIMARY KEY (`id_auteur`, `id_rubrique`)");
147
-		sql_query("ALTER IGNORE TABLE spip_auteurs_messages ADD PRIMARY KEY (`id_auteur`, `id_message`)");
148
-		maj_version(1.910);
149
-	}
144
+    if (upgrade_vers(1.910, $version_installee, $version_cible)) {
145
+        sql_query("ALTER IGNORE TABLE spip_auteurs_articles ADD PRIMARY KEY (`id_auteur`, `id_article`)");
146
+        sql_query("ALTER IGNORE TABLE spip_auteurs_rubriques ADD PRIMARY KEY (`id_auteur`, `id_rubrique`)");
147
+        sql_query("ALTER IGNORE TABLE spip_auteurs_messages ADD PRIMARY KEY (`id_auteur`, `id_message`)");
148
+        maj_version(1.910);
149
+    }
150 150
 
151
-	if (upgrade_vers(1.911, $version_installee, $version_cible)) {
151
+    if (upgrade_vers(1.911, $version_installee, $version_cible)) {
152 152
 
153
-		sql_query("ALTER IGNORE TABLE spip_auteurs_articles DROP INDEX `id_auteur`");
154
-		sql_query("ALTER IGNORE TABLE spip_auteurs_rubriques DROP INDEX `id_auteur`");
155
-		sql_query("ALTER IGNORE TABLE spip_auteurs_messages DROP INDEX `id_auteur`");
156
-		sql_query("ALTER IGNORE TABLE spip_mots_articles DROP INDEX `id_article`");
157
-		sql_query("ALTER IGNORE TABLE spip_mots_breves DROP INDEX `id_breve`");
158
-		sql_query("ALTER IGNORE TABLE spip_mots_rubriques DROP INDEX `id_rubrique`");
159
-		sql_query("ALTER IGNORE TABLE spip_mots_syndic DROP INDEX `id_syndic`");
160
-		sql_query("ALTER IGNORE TABLE spip_mots_forum DROP INDEX `id_forum`");
161
-		sql_query("ALTER IGNORE TABLE spip_mots_documents DROP INDEX `id_document`");
153
+        sql_query("ALTER IGNORE TABLE spip_auteurs_articles DROP INDEX `id_auteur`");
154
+        sql_query("ALTER IGNORE TABLE spip_auteurs_rubriques DROP INDEX `id_auteur`");
155
+        sql_query("ALTER IGNORE TABLE spip_auteurs_messages DROP INDEX `id_auteur`");
156
+        sql_query("ALTER IGNORE TABLE spip_mots_articles DROP INDEX `id_article`");
157
+        sql_query("ALTER IGNORE TABLE spip_mots_breves DROP INDEX `id_breve`");
158
+        sql_query("ALTER IGNORE TABLE spip_mots_rubriques DROP INDEX `id_rubrique`");
159
+        sql_query("ALTER IGNORE TABLE spip_mots_syndic DROP INDEX `id_syndic`");
160
+        sql_query("ALTER IGNORE TABLE spip_mots_forum DROP INDEX `id_forum`");
161
+        sql_query("ALTER IGNORE TABLE spip_mots_documents DROP INDEX `id_document`");
162 162
 # 18 juillet 2007: table depreciee
163 163
 #		sql_query("ALTER IGNORE TABLE spip_caches DROP	INDEX fichier");
164
-		maj_version(1.911);
165
-	}
164
+        maj_version(1.911);
165
+    }
166 166
 
167
-	// Le logo du site n'est plus le logo par defaut des rubriques
168
-	// mais pour assurer la compatibilite ascendante, on le duplique
169
-	if (upgrade_vers(1.912, $version_installee, $version_cible)) {
170
-		@copy(_DIR_LOGOS . 'rubon0.gif', _DIR_LOGOS . 'siteon0.gif');
171
-		@copy(_DIR_LOGOS . 'ruboff0.gif', _DIR_LOGOS . 'siteoff0.gif');
172
-		@copy(_DIR_LOGOS . 'rubon0.jpg', _DIR_LOGOS . 'siteon0.jpg');
173
-		@copy(_DIR_LOGOS . 'ruboff0.jpg', _DIR_LOGOS . 'siteoff0.jpg');
174
-		@copy(_DIR_LOGOS . 'rubon0.png', _DIR_LOGOS . 'siteon0.png');
175
-		@copy(_DIR_LOGOS . 'ruboff0.png', _DIR_LOGOS . 'siteoff0.png');
176
-		maj_version(1.912);
177
-	}
167
+    // Le logo du site n'est plus le logo par defaut des rubriques
168
+    // mais pour assurer la compatibilite ascendante, on le duplique
169
+    if (upgrade_vers(1.912, $version_installee, $version_cible)) {
170
+        @copy(_DIR_LOGOS . 'rubon0.gif', _DIR_LOGOS . 'siteon0.gif');
171
+        @copy(_DIR_LOGOS . 'ruboff0.gif', _DIR_LOGOS . 'siteoff0.gif');
172
+        @copy(_DIR_LOGOS . 'rubon0.jpg', _DIR_LOGOS . 'siteon0.jpg');
173
+        @copy(_DIR_LOGOS . 'ruboff0.jpg', _DIR_LOGOS . 'siteoff0.jpg');
174
+        @copy(_DIR_LOGOS . 'rubon0.png', _DIR_LOGOS . 'siteon0.png');
175
+        @copy(_DIR_LOGOS . 'ruboff0.png', _DIR_LOGOS . 'siteoff0.png');
176
+        maj_version(1.912);
177
+    }
178 178
 
179
-	// suppression de auteur_modif qui n'est plus utilise nulle part
180
-	if (upgrade_vers(1.913, $version_installee, $version_cible)) {
181
-		sql_query("ALTER TABLE spip_articles DROP `auteur_modif`");
182
-		maj_version(1.913);
183
-	}
179
+    // suppression de auteur_modif qui n'est plus utilise nulle part
180
+    if (upgrade_vers(1.913, $version_installee, $version_cible)) {
181
+        sql_query("ALTER TABLE spip_articles DROP `auteur_modif`");
182
+        maj_version(1.913);
183
+    }
184 184
 
185
-	// Ajout de SVG
186
-	if (upgrade_vers(1.914, $version_installee, $version_cible)) {
187
-		sql_query("INSERT IGNORE INTO spip_types_documents (`extension`, `titre`, `inclus`) VALUES ('svg', 'Scalable Vector Graphics', 'embed')");
188
-		sql_query("UPDATE spip_types_documents SET `mime_type`='image/svg+xml' WHERE `extension`='svg'");
189
-		maj_version(1.914);
190
-	}
185
+    // Ajout de SVG
186
+    if (upgrade_vers(1.914, $version_installee, $version_cible)) {
187
+        sql_query("INSERT IGNORE INTO spip_types_documents (`extension`, `titre`, `inclus`) VALUES ('svg', 'Scalable Vector Graphics', 'embed')");
188
+        sql_query("UPDATE spip_types_documents SET `mime_type`='image/svg+xml' WHERE `extension`='svg'");
189
+        maj_version(1.914);
190
+    }
191 191
 
192
-	// Ajout de plein de type mime
193
-	if (upgrade_vers(1.915, $version_installee, $version_cible)) {
194
-		maj_version(1.915);
195
-	}
196
-	// refaire l'upgrade 1.905 qui a pu foirer en partie a cause de la requete ALTER sur spip_meta
197
-	if (upgrade_vers(1.916, $version_installee, $version_cible)) {
198
-		// agrandir le champ "valeur" de spip_meta pour pouvoir y stocker
199
-		// des choses plus sympa
200
-		sql_query("ALTER TABLE spip_meta DROP INDEX `valeur`");
201
-		sql_query("ALTER TABLE spip_meta CHANGE `valeur` `valeur` TEXT");
192
+    // Ajout de plein de type mime
193
+    if (upgrade_vers(1.915, $version_installee, $version_cible)) {
194
+        maj_version(1.915);
195
+    }
196
+    // refaire l'upgrade 1.905 qui a pu foirer en partie a cause de la requete ALTER sur spip_meta
197
+    if (upgrade_vers(1.916, $version_installee, $version_cible)) {
198
+        // agrandir le champ "valeur" de spip_meta pour pouvoir y stocker
199
+        // des choses plus sympa
200
+        sql_query("ALTER TABLE spip_meta DROP INDEX `valeur`");
201
+        sql_query("ALTER TABLE spip_meta CHANGE `valeur` `valeur` TEXT");
202 202
 #8/08/07  plus d'indexation dans le core
203
-		//include_spip('inc/indexation'); 
204
-		//update_index_tables();
205
-		maj_version(1.916);
206
-	}
207
-	if (upgrade_vers(1.917, $version_installee, $version_cible)) {
208
-		sql_query("ALTER TABLE spip_documents DROP `inclus`");
209
-		maj_version(1.917);
210
-	}
203
+        //include_spip('inc/indexation'); 
204
+        //update_index_tables();
205
+        maj_version(1.916);
206
+    }
207
+    if (upgrade_vers(1.917, $version_installee, $version_cible)) {
208
+        sql_query("ALTER TABLE spip_documents DROP `inclus`");
209
+        maj_version(1.917);
210
+    }
211 211
 
212
-	// Permettre d'enregistrer un numero IP dans les revisions d'articles
213
-	// a la place de l'id_auteur
214
-	if (upgrade_vers(1.918, $version_installee, $version_cible)) {
215
-		sql_query("ALTER TABLE spip_versions CHANGE `id_auteur` `id_auteur` VARCHAR(23)");
216
-		maj_version(1.918);
217
-	}
212
+    // Permettre d'enregistrer un numero IP dans les revisions d'articles
213
+    // a la place de l'id_auteur
214
+    if (upgrade_vers(1.918, $version_installee, $version_cible)) {
215
+        sql_query("ALTER TABLE spip_versions CHANGE `id_auteur` `id_auteur` VARCHAR(23)");
216
+        maj_version(1.918);
217
+    }
218 218
 
219
-	if (upgrade_vers(1.919, $version_installee, $version_cible)) {
220
-		sql_query("ALTER TABLE spip_ajax_fonc DROP `id_auteur`");
221
-		maj_version('1.919');
222
-	}
219
+    if (upgrade_vers(1.919, $version_installee, $version_cible)) {
220
+        sql_query("ALTER TABLE spip_ajax_fonc DROP `id_auteur`");
221
+        maj_version('1.919');
222
+    }
223 223
 
224
-	if (upgrade_vers(1.920, $version_installee, $version_cible)) {
225
-		sql_query("ALTER IGNORE TABLE spip_documents_articles ADD PRIMARY KEY (`id_article`, `id_document`)");
226
-		sql_query("ALTER IGNORE TABLE spip_documents_breves ADD PRIMARY KEY (`id_breve`, `id_document`)");
227
-		sql_query("ALTER IGNORE TABLE spip_documents_rubriques ADD PRIMARY KEY (`id_rubrique`, `id_document`)");
228
-		sql_query("ALTER IGNORE TABLE spip_documents_articles DROP INDEX `id_article`");
229
-		sql_query("ALTER IGNORE TABLE spip_documents_breves DROP INDEX `id_breve`");
230
-		sql_query("ALTER IGNORE TABLE spip_documents_rubriques DROP INDEX `id_rubrique`");
231
-		maj_version('1.920');
232
-	}
233
-	if (upgrade_vers(1.922, $version_installee, $version_cible)) {
234
-		sql_query("ALTER TABLE spip_meta ADD `impt` ENUM('non', 'oui') DEFAULT 'oui' NOT NULL AFTER `valeur`");
235
-		$meta_serveur = array(
236
-			'version_installee',
237
-			'adresse_site',
238
-			'alea_ephemere_ancien',
239
-			'alea_ephemere',
240
-			'alea_ephemere_date',
241
-			'langue_site',
242
-			'langues_proposees',
243
-			'date_calcul_rubriques',
244
-			'derniere_modif',
245
-			'optimiser_table',
246
-			'drapeau_edition',
247
-			'creer_preview',
248
-			'taille_preview',
249
-			'creer_htpasswd',
250
-			'creer_htaccess',
251
-			'gd_formats_read',
252
-			'gd_formats',
253
-			'netpbm_formats',
254
-			'formats_graphiques',
255
-			'image_process',
256
-			'plugin_header',
257
-			'plugin'
258
-		);
259
-		foreach ($meta_serveur as $nom) {
260
-			sql_query("UPDATE spip_meta SET `impt`='non' WHERE `nom`=" . sql_quote($nom));
261
-		}
262
-		maj_version('1.922');
263
-	}
264
-	if (upgrade_vers(1.923, $version_installee, $version_cible)) {
265
-		if (isset($GLOBALS['meta']['IMPORT_tables_noimport'])) {
266
-			$IMPORT_tables_noimport = unserialize($GLOBALS['meta']['IMPORT_tables_noimport']);
267
-			foreach ($IMPORT_tables_noimport as $key => $table) {
268
-				if ($table == 'spip_meta') {
269
-					unset($IMPORT_tables_noimport[$key]);
270
-				}
271
-			}
272
-			ecrire_meta('IMPORT_tables_noimport', serialize($IMPORT_tables_noimport), 'non');
273
-		}
274
-		maj_version('1.923');
275
-	}
224
+    if (upgrade_vers(1.920, $version_installee, $version_cible)) {
225
+        sql_query("ALTER IGNORE TABLE spip_documents_articles ADD PRIMARY KEY (`id_article`, `id_document`)");
226
+        sql_query("ALTER IGNORE TABLE spip_documents_breves ADD PRIMARY KEY (`id_breve`, `id_document`)");
227
+        sql_query("ALTER IGNORE TABLE spip_documents_rubriques ADD PRIMARY KEY (`id_rubrique`, `id_document`)");
228
+        sql_query("ALTER IGNORE TABLE spip_documents_articles DROP INDEX `id_article`");
229
+        sql_query("ALTER IGNORE TABLE spip_documents_breves DROP INDEX `id_breve`");
230
+        sql_query("ALTER IGNORE TABLE spip_documents_rubriques DROP INDEX `id_rubrique`");
231
+        maj_version('1.920');
232
+    }
233
+    if (upgrade_vers(1.922, $version_installee, $version_cible)) {
234
+        sql_query("ALTER TABLE spip_meta ADD `impt` ENUM('non', 'oui') DEFAULT 'oui' NOT NULL AFTER `valeur`");
235
+        $meta_serveur = array(
236
+            'version_installee',
237
+            'adresse_site',
238
+            'alea_ephemere_ancien',
239
+            'alea_ephemere',
240
+            'alea_ephemere_date',
241
+            'langue_site',
242
+            'langues_proposees',
243
+            'date_calcul_rubriques',
244
+            'derniere_modif',
245
+            'optimiser_table',
246
+            'drapeau_edition',
247
+            'creer_preview',
248
+            'taille_preview',
249
+            'creer_htpasswd',
250
+            'creer_htaccess',
251
+            'gd_formats_read',
252
+            'gd_formats',
253
+            'netpbm_formats',
254
+            'formats_graphiques',
255
+            'image_process',
256
+            'plugin_header',
257
+            'plugin'
258
+        );
259
+        foreach ($meta_serveur as $nom) {
260
+            sql_query("UPDATE spip_meta SET `impt`='non' WHERE `nom`=" . sql_quote($nom));
261
+        }
262
+        maj_version('1.922');
263
+    }
264
+    if (upgrade_vers(1.923, $version_installee, $version_cible)) {
265
+        if (isset($GLOBALS['meta']['IMPORT_tables_noimport'])) {
266
+            $IMPORT_tables_noimport = unserialize($GLOBALS['meta']['IMPORT_tables_noimport']);
267
+            foreach ($IMPORT_tables_noimport as $key => $table) {
268
+                if ($table == 'spip_meta') {
269
+                    unset($IMPORT_tables_noimport[$key]);
270
+                }
271
+            }
272
+            ecrire_meta('IMPORT_tables_noimport', serialize($IMPORT_tables_noimport), 'non');
273
+        }
274
+        maj_version('1.923');
275
+    }
276 276
 
277
-	if (upgrade_vers(1.924, $version_installee, $version_cible)) {
278
-		sql_query('DROP TABLE spip_ajax_fonc');
279
-		maj_version('1.924');
280
-	}
277
+    if (upgrade_vers(1.924, $version_installee, $version_cible)) {
278
+        sql_query('DROP TABLE spip_ajax_fonc');
279
+        maj_version('1.924');
280
+    }
281 281
 
282
-	if (upgrade_vers(1.925, $version_installee, $version_cible)) {
283
-		include_spip('inc/flock');
284
-		/* deplacement des sessions */
285
-		$f_session = preg_files('data', 'session_');
286
-		$repertoire = _DIR_SESSIONS;
287
-		if (!@file_exists($repertoire)) {
288
-			$repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
289
-			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
290
-		}
291
-		foreach ($f_session as $f) {
292
-			$d = basename($f);
293
-			@copy($f, $repertoire . $d);
294
-		}
295
-		/* deplacement des visites */
296
-		$f_visites = preg_files('data/visites');
297
-		$repertoire = sous_repertoire(_DIR_TMP, 'visites');
298
-		foreach ($f_visites as $f) {
299
-			$d = basename($f);
300
-			@copy($f, $repertoire . $d);
301
-		}
302
-		/* deplacement des upload */
303
-		$auteurs = array();
304
-		$req = sql_query("SELECT `login` FROM spip_auteurs WHERE `statut` = '0minirezo'");
305
-		while ($row = sql_fetch($req)) {
306
-			$auteurs[] = $row['login'];
307
-		}
308
-		$f_upload = preg_files('upload', -1, 10000, $auteurs);
309
-		$repertoire = _DIR_TRANSFERT;
310
-		if (!@file_exists($repertoire)) {
311
-			$repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
312
-			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
313
-		}
314
-		foreach ($auteurs as $login) {
315
-			if (is_dir('upload/' . $login)) {
316
-				$sous_repertoire = sous_repertoire(_DIR_TRANSFERT, $login);
317
-			}
318
-		}
319
-		foreach ($f_upload as $f) {
320
-			@copy($f, _DIR_TMP . $f);
321
-		}
322
-		/* deplacement des dumps */
323
-		$f_session = preg_files('data', 'dump');
324
-		$repertoire = _DIR_DUMP;
325
-		if (!@file_exists($repertoire)) {
326
-			$repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
327
-			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
328
-		}
329
-		foreach ($f_session as $f) {
330
-			$d = basename($f);
331
-			@copy($f, $repertoire . $d);
332
-		}
333
-		maj_version('1.925');
334
-	}
335
-	// Ajout de MP4
336
-	if (upgrade_vers(1.926, $version_installee, $version_cible)) {
337
-		sql_query("INSERT IGNORE INTO spip_types_documents (`extension`, `titre`, `inclus`) VALUES ('mp4', 'MPEG4', 'embed')");
338
-		sql_query("UPDATE spip_types_documents SET `mime_type`='application/mp4' WHERE `extension`='mp4'");
339
-		maj_version('1.926');
340
-	}
282
+    if (upgrade_vers(1.925, $version_installee, $version_cible)) {
283
+        include_spip('inc/flock');
284
+        /* deplacement des sessions */
285
+        $f_session = preg_files('data', 'session_');
286
+        $repertoire = _DIR_SESSIONS;
287
+        if (!@file_exists($repertoire)) {
288
+            $repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
289
+            $repertoire = sous_repertoire(_DIR_TMP, $repertoire);
290
+        }
291
+        foreach ($f_session as $f) {
292
+            $d = basename($f);
293
+            @copy($f, $repertoire . $d);
294
+        }
295
+        /* deplacement des visites */
296
+        $f_visites = preg_files('data/visites');
297
+        $repertoire = sous_repertoire(_DIR_TMP, 'visites');
298
+        foreach ($f_visites as $f) {
299
+            $d = basename($f);
300
+            @copy($f, $repertoire . $d);
301
+        }
302
+        /* deplacement des upload */
303
+        $auteurs = array();
304
+        $req = sql_query("SELECT `login` FROM spip_auteurs WHERE `statut` = '0minirezo'");
305
+        while ($row = sql_fetch($req)) {
306
+            $auteurs[] = $row['login'];
307
+        }
308
+        $f_upload = preg_files('upload', -1, 10000, $auteurs);
309
+        $repertoire = _DIR_TRANSFERT;
310
+        if (!@file_exists($repertoire)) {
311
+            $repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
312
+            $repertoire = sous_repertoire(_DIR_TMP, $repertoire);
313
+        }
314
+        foreach ($auteurs as $login) {
315
+            if (is_dir('upload/' . $login)) {
316
+                $sous_repertoire = sous_repertoire(_DIR_TRANSFERT, $login);
317
+            }
318
+        }
319
+        foreach ($f_upload as $f) {
320
+            @copy($f, _DIR_TMP . $f);
321
+        }
322
+        /* deplacement des dumps */
323
+        $f_session = preg_files('data', 'dump');
324
+        $repertoire = _DIR_DUMP;
325
+        if (!@file_exists($repertoire)) {
326
+            $repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
327
+            $repertoire = sous_repertoire(_DIR_TMP, $repertoire);
328
+        }
329
+        foreach ($f_session as $f) {
330
+            $d = basename($f);
331
+            @copy($f, $repertoire . $d);
332
+        }
333
+        maj_version('1.925');
334
+    }
335
+    // Ajout de MP4
336
+    if (upgrade_vers(1.926, $version_installee, $version_cible)) {
337
+        sql_query("INSERT IGNORE INTO spip_types_documents (`extension`, `titre`, `inclus`) VALUES ('mp4', 'MPEG4', 'embed')");
338
+        sql_query("UPDATE spip_types_documents SET `mime_type`='application/mp4' WHERE `extension`='mp4'");
339
+        maj_version('1.926');
340
+    }
341 341
 }
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -167,12 +167,12 @@  discard block
 block discarded – undo
167 167
 	// Le logo du site n'est plus le logo par defaut des rubriques
168 168
 	// mais pour assurer la compatibilite ascendante, on le duplique
169 169
 	if (upgrade_vers(1.912, $version_installee, $version_cible)) {
170
-		@copy(_DIR_LOGOS . 'rubon0.gif', _DIR_LOGOS . 'siteon0.gif');
171
-		@copy(_DIR_LOGOS . 'ruboff0.gif', _DIR_LOGOS . 'siteoff0.gif');
172
-		@copy(_DIR_LOGOS . 'rubon0.jpg', _DIR_LOGOS . 'siteon0.jpg');
173
-		@copy(_DIR_LOGOS . 'ruboff0.jpg', _DIR_LOGOS . 'siteoff0.jpg');
174
-		@copy(_DIR_LOGOS . 'rubon0.png', _DIR_LOGOS . 'siteon0.png');
175
-		@copy(_DIR_LOGOS . 'ruboff0.png', _DIR_LOGOS . 'siteoff0.png');
170
+		@copy(_DIR_LOGOS.'rubon0.gif', _DIR_LOGOS.'siteon0.gif');
171
+		@copy(_DIR_LOGOS.'ruboff0.gif', _DIR_LOGOS.'siteoff0.gif');
172
+		@copy(_DIR_LOGOS.'rubon0.jpg', _DIR_LOGOS.'siteon0.jpg');
173
+		@copy(_DIR_LOGOS.'ruboff0.jpg', _DIR_LOGOS.'siteoff0.jpg');
174
+		@copy(_DIR_LOGOS.'rubon0.png', _DIR_LOGOS.'siteon0.png');
175
+		@copy(_DIR_LOGOS.'ruboff0.png', _DIR_LOGOS.'siteoff0.png');
176 176
 		maj_version(1.912);
177 177
 	}
178 178
 
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 			'plugin'
258 258
 		);
259 259
 		foreach ($meta_serveur as $nom) {
260
-			sql_query("UPDATE spip_meta SET `impt`='non' WHERE `nom`=" . sql_quote($nom));
260
+			sql_query("UPDATE spip_meta SET `impt`='non' WHERE `nom`=".sql_quote($nom));
261 261
 		}
262 262
 		maj_version('1.922');
263 263
 	}
@@ -285,19 +285,19 @@  discard block
 block discarded – undo
285 285
 		$f_session = preg_files('data', 'session_');
286 286
 		$repertoire = _DIR_SESSIONS;
287 287
 		if (!@file_exists($repertoire)) {
288
-			$repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
288
+			$repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire);
289 289
 			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
290 290
 		}
291 291
 		foreach ($f_session as $f) {
292 292
 			$d = basename($f);
293
-			@copy($f, $repertoire . $d);
293
+			@copy($f, $repertoire.$d);
294 294
 		}
295 295
 		/* deplacement des visites */
296 296
 		$f_visites = preg_files('data/visites');
297 297
 		$repertoire = sous_repertoire(_DIR_TMP, 'visites');
298 298
 		foreach ($f_visites as $f) {
299 299
 			$d = basename($f);
300
-			@copy($f, $repertoire . $d);
300
+			@copy($f, $repertoire.$d);
301 301
 		}
302 302
 		/* deplacement des upload */
303 303
 		$auteurs = array();
@@ -308,27 +308,27 @@  discard block
 block discarded – undo
308 308
 		$f_upload = preg_files('upload', -1, 10000, $auteurs);
309 309
 		$repertoire = _DIR_TRANSFERT;
310 310
 		if (!@file_exists($repertoire)) {
311
-			$repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
311
+			$repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire);
312 312
 			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
313 313
 		}
314 314
 		foreach ($auteurs as $login) {
315
-			if (is_dir('upload/' . $login)) {
315
+			if (is_dir('upload/'.$login)) {
316 316
 				$sous_repertoire = sous_repertoire(_DIR_TRANSFERT, $login);
317 317
 			}
318 318
 		}
319 319
 		foreach ($f_upload as $f) {
320
-			@copy($f, _DIR_TMP . $f);
320
+			@copy($f, _DIR_TMP.$f);
321 321
 		}
322 322
 		/* deplacement des dumps */
323 323
 		$f_session = preg_files('data', 'dump');
324 324
 		$repertoire = _DIR_DUMP;
325 325
 		if (!@file_exists($repertoire)) {
326
-			$repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
326
+			$repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire);
327 327
 			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
328 328
 		}
329 329
 		foreach ($f_session as $f) {
330 330
 			$d = basename($f);
331
-			@copy($f, $repertoire . $d);
331
+			@copy($f, $repertoire.$d);
332 332
 		}
333 333
 		maj_version('1.925');
334 334
 	}
Please login to merge, or discard this patch.
ecrire/maj/legacy/v015.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
  * @package SPIP\Core\SQL\Upgrade
17 17
  **/
18 18
 if (!defined('_ECRIRE_INC_VERSION')) {
19
-	return;
19
+    return;
20 20
 }
21 21
 
22 22
 /**
Please login to merge, or discard this patch.
ecrire/maj/legacy/v013.php 1 patch
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
  * @package SPIP\Core\SQL\Upgrade
17 17
  **/
18 18
 if (!defined('_ECRIRE_INC_VERSION')) {
19
-	return;
19
+    return;
20 20
 }
21 21
 
22 22
 /**
@@ -26,48 +26,48 @@  discard block
 block discarded – undo
26 26
  * @param float $version_cible Version de destination
27 27
  **/
28 28
 function maj_legacy_v013_dist($version_installee, $version_cible) {
29
-	if (upgrade_vers(1.3, $version_installee, $version_cible)) {
30
-		// Modifier la syndication (pour liste de sites)
31
-		sql_query("ALTER TABLE spip_syndic ADD syndication VARCHAR(3) NOT NULL");
32
-		sql_query("ALTER TABLE spip_syndic ADD statut VARCHAR(10) NOT NULL");
33
-		sql_query("ALTER TABLE spip_syndic ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
34
-		sql_query("UPDATE spip_syndic SET syndication='oui', statut='publie', date=NOW()");
29
+    if (upgrade_vers(1.3, $version_installee, $version_cible)) {
30
+        // Modifier la syndication (pour liste de sites)
31
+        sql_query("ALTER TABLE spip_syndic ADD syndication VARCHAR(3) NOT NULL");
32
+        sql_query("ALTER TABLE spip_syndic ADD statut VARCHAR(10) NOT NULL");
33
+        sql_query("ALTER TABLE spip_syndic ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
34
+        sql_query("UPDATE spip_syndic SET syndication='oui', statut='publie', date=NOW()");
35 35
 
36
-		// Statut pour articles syndication, pour pouvoir desactiver un article
37
-		sql_query("ALTER TABLE spip_syndic_articles ADD statut VARCHAR(10) NOT NULL");
38
-		sql_query("UPDATE spip_syndic_articles SET statut='publie'");
39
-		maj_version(1.3);
40
-	}
36
+        // Statut pour articles syndication, pour pouvoir desactiver un article
37
+        sql_query("ALTER TABLE spip_syndic_articles ADD statut VARCHAR(10) NOT NULL");
38
+        sql_query("UPDATE spip_syndic_articles SET statut='publie'");
39
+        maj_version(1.3);
40
+    }
41 41
 
42
-	if (upgrade_vers(1.301, $version_installee, $version_cible)) {
43
-		sql_query("ALTER TABLE spip_forum ADD id_syndic bigint(21) DEFAULT '0' NOT NULL");
44
-		maj_version(1.301);
45
-	}
42
+    if (upgrade_vers(1.301, $version_installee, $version_cible)) {
43
+        sql_query("ALTER TABLE spip_forum ADD id_syndic bigint(21) DEFAULT '0' NOT NULL");
44
+        maj_version(1.301);
45
+    }
46 46
 
47
-	if (upgrade_vers(1.302, $version_installee, $version_cible)) {
48
-		# sql_query("ALTER TABLE spip_forum_cache DROP PRIMARY KEY");
49
-		# sql_query("ALTER TABLE spip_forum_cache DROP INDEX fichier");
50
-		# sql_query("ALTER TABLE spip_forum_cache ADD PRIMARY KEY (fichier, id_forum, id_article, id_rubrique, id_breve, id_syndic)");
51
-		sql_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
52
-		maj_version(1.302);
53
-	}
47
+    if (upgrade_vers(1.302, $version_installee, $version_cible)) {
48
+        # sql_query("ALTER TABLE spip_forum_cache DROP PRIMARY KEY");
49
+        # sql_query("ALTER TABLE spip_forum_cache DROP INDEX fichier");
50
+        # sql_query("ALTER TABLE spip_forum_cache ADD PRIMARY KEY (fichier, id_forum, id_article, id_rubrique, id_breve, id_syndic)");
51
+        sql_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
52
+        maj_version(1.302);
53
+    }
54 54
 
55
-	if (upgrade_vers(1.303, $version_installee, $version_cible)) {
56
-		sql_query("ALTER TABLE spip_rubriques ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
57
-		sql_query("ALTER TABLE spip_syndic ADD date_syndic datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
58
-		sql_query("UPDATE spip_syndic SET date_syndic=date");
59
-		maj_version(1.303);
60
-	}
55
+    if (upgrade_vers(1.303, $version_installee, $version_cible)) {
56
+        sql_query("ALTER TABLE spip_rubriques ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
57
+        sql_query("ALTER TABLE spip_syndic ADD date_syndic datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
58
+        sql_query("UPDATE spip_syndic SET date_syndic=date");
59
+        maj_version(1.303);
60
+    }
61 61
 
62
-	if (upgrade_vers(1.306, $version_installee, $version_cible)) {
63
-		sql_query("DROP TABLE spip_index_syndic_articles");
64
-		sql_query("ALTER TABLE spip_syndic ADD date_index datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
65
-		sql_query("ALTER TABLE spip_syndic ADD INDEX date_index (date_index)");
66
-		maj_version(1.306);
67
-	}
62
+    if (upgrade_vers(1.306, $version_installee, $version_cible)) {
63
+        sql_query("DROP TABLE spip_index_syndic_articles");
64
+        sql_query("ALTER TABLE spip_syndic ADD date_index datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
65
+        sql_query("ALTER TABLE spip_syndic ADD INDEX date_index (date_index)");
66
+        maj_version(1.306);
67
+    }
68 68
 
69
-	if (upgrade_vers(1.307, $version_installee, $version_cible)) {
70
-		sql_query("ALTER TABLE spip_syndic_articles ADD descriptif blob NOT NULL");
71
-		maj_version(1.307);
72
-	}
69
+    if (upgrade_vers(1.307, $version_installee, $version_cible)) {
70
+        sql_query("ALTER TABLE spip_syndic_articles ADD descriptif blob NOT NULL");
71
+        maj_version(1.307);
72
+    }
73 73
 }
Please login to merge, or discard this patch.
ecrire/maj/legacy/v012.php 1 patch
Indentation   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
  * @package SPIP\Core\SQL\Upgrade
17 17
  **/
18 18
 if (!defined('_ECRIRE_INC_VERSION')) {
19
-	return;
19
+    return;
20 20
 }
21 21
 
22 22
 /**
@@ -26,66 +26,66 @@  discard block
 block discarded – undo
26 26
  * @param float $version_cible Version de destination
27 27
  **/
28 28
 function maj_legacy_v012_dist($version_installee, $version_cible) {
29
-	// Correction de l'oubli des modifs creations depuis 1.04
30
-	if (upgrade_vers(1.204, $version_installee, $version_cible)) {
31
-		sql_query("ALTER TABLE spip_articles ADD accepter_forum VARCHAR(3) NOT NULL");
32
-		sql_query("ALTER TABLE spip_forum ADD id_message bigint(21) NOT NULL");
33
-		sql_query("ALTER TABLE spip_forum ADD INDEX id_message (id_message)");
34
-		sql_query("ALTER TABLE spip_auteurs ADD en_ligne datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
35
-		sql_query("ALTER TABLE spip_auteurs ADD imessage VARCHAR(3) not null");
36
-		sql_query("ALTER TABLE spip_auteurs ADD messagerie VARCHAR(3) not null");
37
-		maj_version(1.204);
38
-	}
29
+    // Correction de l'oubli des modifs creations depuis 1.04
30
+    if (upgrade_vers(1.204, $version_installee, $version_cible)) {
31
+        sql_query("ALTER TABLE spip_articles ADD accepter_forum VARCHAR(3) NOT NULL");
32
+        sql_query("ALTER TABLE spip_forum ADD id_message bigint(21) NOT NULL");
33
+        sql_query("ALTER TABLE spip_forum ADD INDEX id_message (id_message)");
34
+        sql_query("ALTER TABLE spip_auteurs ADD en_ligne datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
35
+        sql_query("ALTER TABLE spip_auteurs ADD imessage VARCHAR(3) not null");
36
+        sql_query("ALTER TABLE spip_auteurs ADD messagerie VARCHAR(3) not null");
37
+        maj_version(1.204);
38
+    }
39 39
 
40
-	if (upgrade_vers(1.207, $version_installee, $version_cible)) {
41
-		sql_query("ALTER TABLE spip_rubriques DROP INDEX id_rubrique");
42
-		sql_query("ALTER TABLE spip_rubriques ADD INDEX id_parent (id_parent)");
43
-		sql_query("ALTER TABLE spip_rubriques ADD statut VARCHAR(10) NOT NULL");
44
-		// Declencher le calcul des rubriques publiques
45
-		include_spip('inc/rubriques');
46
-		calculer_rubriques();
47
-		maj_version(1.207);
48
-	}
40
+    if (upgrade_vers(1.207, $version_installee, $version_cible)) {
41
+        sql_query("ALTER TABLE spip_rubriques DROP INDEX id_rubrique");
42
+        sql_query("ALTER TABLE spip_rubriques ADD INDEX id_parent (id_parent)");
43
+        sql_query("ALTER TABLE spip_rubriques ADD statut VARCHAR(10) NOT NULL");
44
+        // Declencher le calcul des rubriques publiques
45
+        include_spip('inc/rubriques');
46
+        calculer_rubriques();
47
+        maj_version(1.207);
48
+    }
49 49
 
50
-	if (upgrade_vers(1.208, $version_installee, $version_cible)) {
51
-		sql_query("ALTER TABLE spip_auteurs_messages CHANGE forum vu CHAR(3) NOT NULL");
52
-		sql_query("UPDATE spip_auteurs_messages SET vu='oui'");
53
-		sql_query("UPDATE spip_auteurs_messages SET vu='non' WHERE statut='a'");
50
+    if (upgrade_vers(1.208, $version_installee, $version_cible)) {
51
+        sql_query("ALTER TABLE spip_auteurs_messages CHANGE forum vu CHAR(3) NOT NULL");
52
+        sql_query("UPDATE spip_auteurs_messages SET vu='oui'");
53
+        sql_query("UPDATE spip_auteurs_messages SET vu='non' WHERE statut='a'");
54 54
 
55
-		sql_query("ALTER TABLE spip_messages ADD id_auteur bigint(21) NOT NULL");
56
-		sql_query("ALTER TABLE spip_messages ADD INDEX id_auteur (id_auteur)");
57
-		$result = sql_query("SELECT id_auteur, id_message FROM spip_auteurs_messages WHERE statut='de'");
58
-		while ($row = sql_fetch($result)) {
59
-			$id_auteur = $row['id_auteur'];
60
-			$id_message = $row['id_message'];
61
-			sql_query("UPDATE spip_messages SET id_auteur=$id_auteur WHERE id_message=$id_message");
62
-		}
55
+        sql_query("ALTER TABLE spip_messages ADD id_auteur bigint(21) NOT NULL");
56
+        sql_query("ALTER TABLE spip_messages ADD INDEX id_auteur (id_auteur)");
57
+        $result = sql_query("SELECT id_auteur, id_message FROM spip_auteurs_messages WHERE statut='de'");
58
+        while ($row = sql_fetch($result)) {
59
+            $id_auteur = $row['id_auteur'];
60
+            $id_message = $row['id_message'];
61
+            sql_query("UPDATE spip_messages SET id_auteur=$id_auteur WHERE id_message=$id_message");
62
+        }
63 63
 
64
-		sql_query("ALTER TABLE spip_auteurs_messages DROP statut");
65
-		maj_version(1.208);
66
-	}
64
+        sql_query("ALTER TABLE spip_auteurs_messages DROP statut");
65
+        maj_version(1.208);
66
+    }
67 67
 
68
-	if (upgrade_vers(1.209, $version_installee, $version_cible)) {
69
-		sql_query("ALTER TABLE spip_syndic ADD maj TIMESTAMP");
70
-		sql_query("ALTER TABLE spip_syndic_articles ADD maj TIMESTAMP");
71
-		sql_query("ALTER TABLE spip_messages ADD maj TIMESTAMP");
72
-		maj_version(1.209);
73
-	}
68
+    if (upgrade_vers(1.209, $version_installee, $version_cible)) {
69
+        sql_query("ALTER TABLE spip_syndic ADD maj TIMESTAMP");
70
+        sql_query("ALTER TABLE spip_syndic_articles ADD maj TIMESTAMP");
71
+        sql_query("ALTER TABLE spip_messages ADD maj TIMESTAMP");
72
+        maj_version(1.209);
73
+    }
74 74
 
75
-	if (upgrade_vers(1.210, $version_installee, $version_cible)) {
76
-		sql_query("ALTER TABLE spip_messages DROP page");
75
+    if (upgrade_vers(1.210, $version_installee, $version_cible)) {
76
+        sql_query("ALTER TABLE spip_messages DROP page");
77 77
 
78
-		stripslashes_base('spip_articles', array('surtitre', 'titre', 'soustitre', 'descriptif', 'chapo', 'texte', 'ps'));
79
-		stripslashes_base('spip_auteurs', array('nom', 'bio', 'nom_site'));
80
-		stripslashes_base('spip_breves', array('titre', 'texte', 'lien_titre'));
81
-		stripslashes_base('spip_forum', array('titre', 'texte', 'auteur', 'nom_site'));
82
-		stripslashes_base('spip_messages', array('titre', 'texte'));
83
-		stripslashes_base('spip_mots', array('type', 'titre', 'descriptif', 'texte'));
84
-		stripslashes_base('spip_petitions', array('texte'));
85
-		stripslashes_base('spip_rubriques', array('titre', 'descriptif', 'texte'));
86
-		stripslashes_base('spip_signatures', array('nom_email', 'nom_site', 'message'));
87
-		stripslashes_base('spip_syndic', array('nom_site', 'descriptif'));
88
-		stripslashes_base('spip_syndic_articles', array('titre', 'lesauteurs'));
89
-		maj_version(1.210);
90
-	}
78
+        stripslashes_base('spip_articles', array('surtitre', 'titre', 'soustitre', 'descriptif', 'chapo', 'texte', 'ps'));
79
+        stripslashes_base('spip_auteurs', array('nom', 'bio', 'nom_site'));
80
+        stripslashes_base('spip_breves', array('titre', 'texte', 'lien_titre'));
81
+        stripslashes_base('spip_forum', array('titre', 'texte', 'auteur', 'nom_site'));
82
+        stripslashes_base('spip_messages', array('titre', 'texte'));
83
+        stripslashes_base('spip_mots', array('type', 'titre', 'descriptif', 'texte'));
84
+        stripslashes_base('spip_petitions', array('texte'));
85
+        stripslashes_base('spip_rubriques', array('titre', 'descriptif', 'texte'));
86
+        stripslashes_base('spip_signatures', array('nom_email', 'nom_site', 'message'));
87
+        stripslashes_base('spip_syndic', array('nom_site', 'descriptif'));
88
+        stripslashes_base('spip_syndic_articles', array('titre', 'lesauteurs'));
89
+        maj_version(1.210);
90
+    }
91 91
 }
Please login to merge, or discard this patch.
ecrire/maj/legacy/v017.php 1 patch
Indentation   +174 added lines, -174 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
  * @package SPIP\Core\SQL\Upgrade
17 17
  **/
18 18
 if (!defined('_ECRIRE_INC_VERSION')) {
19
-	return;
19
+    return;
20 20
 }
21 21
 
22 22
 /**
@@ -26,177 +26,177 @@  discard block
 block discarded – undo
26 26
  * @param float $version_cible Version de destination
27 27
  **/
28 28
 function maj_legacy_v017_dist($version_installee, $version_cible) {
29
-	if (upgrade_vers(1.702, $version_installee, $version_cible)) {
30
-		sql_query("ALTER TABLE spip_articles ADD extra longblob NULL");
31
-		sql_query("ALTER TABLE spip_auteurs ADD extra longblob NULL");
32
-		sql_query("ALTER TABLE spip_breves ADD extra longblob NULL");
33
-		sql_query("ALTER TABLE spip_rubriques ADD extra longblob NULL");
34
-		sql_query("ALTER TABLE spip_mots ADD extra longblob NULL");
35
-
36
-		// recuperer les eventuels 'supplement' installes en 1.701
37
-		if ($version_installee == 1.701) {
38
-			sql_query("UPDATE spip_articles SET extra = supplement");
39
-			sql_query("ALTER TABLE spip_articles DROP supplement");
40
-			sql_query("UPDATE spip_auteurs SET extra = supplement");
41
-			sql_query("ALTER TABLE spip_auteurs DROP supplement");
42
-			sql_query("UPDATE spip_breves SET extra = supplement");
43
-			sql_query("ALTER TABLE spip_breves DROP supplement");
44
-			sql_query("UPDATE spip_rubriques SET extra = supplement");
45
-			sql_query("ALTER TABLE spip_rubriques DROP supplement");
46
-			sql_query("UPDATE spip_mots SET extra = supplement");
47
-			sql_query("ALTER TABLE spip_mots DROP supplement");
48
-		}
49
-
50
-		$u = sql_query("SELECT extra FROM spip_articles");
51
-		$u &= sql_query("SELECT extra FROM spip_auteurs");
52
-		$u &= sql_query("SELECT extra FROM spip_breves");
53
-		$u &= sql_query("SELECT extra FROM spip_rubriques");
54
-		$u &= sql_query("SELECT extra FROM spip_mots");
55
-		maj_version(1.702, $u);
56
-	}
57
-
58
-	if (upgrade_vers(1.703, $version_installee, $version_cible)) {
59
-		sql_query("ALTER TABLE spip_articles ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
60
-		sql_query("ALTER TABLE spip_rubriques ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
61
-		maj_version(1.703);
62
-	}
63
-
64
-	if (upgrade_vers(1.704, $version_installee, $version_cible)) {
65
-		sql_query("ALTER TABLE spip_articles ADD INDEX lang (lang)");
66
-		sql_query("ALTER TABLE spip_auteurs ADD INDEX lang (lang)");
67
-		sql_query("ALTER TABLE spip_rubriques ADD INDEX lang (lang)");
68
-		maj_version(1.704);
69
-	}
70
-
71
-	if (upgrade_vers(1.705, $version_installee, $version_cible)) {
72
-		sql_query("ALTER TABLE spip_articles ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
73
-		sql_query("ALTER TABLE spip_rubriques ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
74
-		maj_version(1.705);
75
-	}
76
-
77
-	if (upgrade_vers(1.707, $version_installee, $version_cible)) {
78
-		sql_query("UPDATE spip_articles SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
79
-		sql_query("UPDATE spip_articles SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
80
-		sql_query("UPDATE spip_rubriques SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
81
-		sql_query("UPDATE spip_rubriques SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
82
-		maj_version(1.707);
83
-	}
84
-
85
-	if (upgrade_vers(1.708, $version_installee, $version_cible)) {
86
-		sql_query("ALTER TABLE spip_breves ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
87
-		sql_query("ALTER TABLE spip_breves ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
88
-		maj_version(1.708);
89
-	}
90
-
91
-	if (upgrade_vers(1.709, $version_installee, $version_cible)) {
92
-		sql_query("ALTER TABLE spip_articles ADD id_trad bigint(21) DEFAULT '0' NOT NULL");
93
-		sql_query("ALTER TABLE spip_articles ADD INDEX id_trad (id_trad)");
94
-		maj_version(1.709);
95
-	}
96
-
97
-	if (upgrade_vers(1.717, $version_installee, $version_cible)) {
98
-		sql_query("ALTER TABLE spip_articles ADD INDEX date_modif (date_modif)");
99
-		maj_version(1.717);
100
-	}
101
-
102
-	if (upgrade_vers(1.718, $version_installee, $version_cible)) {
103
-		sql_query("ALTER TABLE spip_referers DROP domaine");
104
-		sql_query("ALTER TABLE spip_referers_articles DROP domaine");
105
-		sql_query("ALTER TABLE spip_referers_temp DROP domaine");
106
-		maj_version(1.718);
107
-	}
108
-
109
-	if (upgrade_vers(1.722, $version_installee, $version_cible)) {
110
-		sql_query("ALTER TABLE spip_articles ADD nom_site tinytext NOT NULL");
111
-		sql_query("ALTER TABLE spip_articles ADD url_site VARCHAR(255) NOT NULL");
112
-		sql_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site)");
113
-		if ($version_installee >= 1.720) {
114
-			sql_query("UPDATE spip_articles SET url_site=url_ref");
115
-			sql_query("ALTER TABLE spip_articles DROP INDEX url_ref");
116
-			sql_query("ALTER TABLE spip_articles DROP url_ref");
117
-		}
118
-		maj_version(1.722);
119
-	}
120
-
121
-	if (upgrade_vers(1.723, $version_installee, $version_cible)) {
122
-		if ($version_installee == 1.722) {
123
-			sql_query("ALTER TABLE spip_articles MODIFY url_site VARCHAR(255) NOT NULL");
124
-			sql_query("ALTER TABLE spip_articles DROP INDEX url_site;");
125
-			sql_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site);");
126
-		}
127
-		maj_version(1.723);
128
-	}
129
-
130
-	if (upgrade_vers(1.724, $version_installee, $version_cible)) {
131
-		sql_query("ALTER TABLE spip_messages ADD date_fin datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
132
-		maj_version(1.724);
133
-	}
134
-
135
-	if (upgrade_vers(1.726, $version_installee, $version_cible)) {
136
-		sql_query("ALTER TABLE spip_auteurs ADD low_sec tinytext NOT NULL");
137
-		maj_version(1.726);
138
-	}
139
-
140
-	if (upgrade_vers(1.727, $version_installee, $version_cible)) {
141
-		// occitans : oci_xx -> oc_xx
142
-		sql_query("UPDATE spip_auteurs SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
143
-		sql_query("UPDATE spip_rubriques SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
144
-		sql_query("UPDATE spip_articles SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
145
-		sql_query("UPDATE spip_breves SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
146
-		maj_version(1.727);
147
-	}
148
-
149
-	// Ici version 1.7 officielle
150
-	if (upgrade_vers(1.728, $version_installee, $version_cible)) {
151
-		sql_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
152
-		maj_version(1.728);
153
-	}
154
-
155
-	if (upgrade_vers(1.730, $version_installee, $version_cible)) {
156
-		sql_query("ALTER TABLE spip_articles ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
157
-		sql_query("ALTER TABLE spip_articles ADD INDEX idx (idx)");
158
-		sql_query("ALTER TABLE spip_auteurs ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
159
-		sql_query("ALTER TABLE spip_auteurs ADD INDEX idx (idx)");
160
-		sql_query("ALTER TABLE spip_breves ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
161
-		sql_query("ALTER TABLE spip_breves ADD INDEX idx (idx)");
162
-		sql_query("ALTER TABLE spip_mots ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
163
-		sql_query("ALTER TABLE spip_mots ADD INDEX idx (idx)");
164
-		sql_query("ALTER TABLE spip_rubriques ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
165
-		sql_query("ALTER TABLE spip_rubriques ADD INDEX idx (idx)");
166
-		sql_query("ALTER TABLE spip_syndic ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
167
-		sql_query("ALTER TABLE spip_syndic ADD INDEX idx (idx)");
168
-		sql_query("ALTER TABLE spip_forum ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
169
-		sql_query("ALTER TABLE spip_forum ADD INDEX idx (idx)");
170
-		sql_query("ALTER TABLE spip_signatures ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
171
-		sql_query("ALTER TABLE spip_signatures ADD INDEX idx (idx)");
172
-		maj_version(1.730);
173
-	}
174
-
175
-	if (upgrade_vers(1.731, $version_installee, $version_cible)) {
176
-		sql_query("UPDATE spip_articles SET idx='1' where lang IN ('de','vi')");
177
-		sql_query("UPDATE spip_rubriques SET idx='1' where lang IN ('de','vi')");
178
-		sql_query("UPDATE spip_breves SET idx='1' where lang IN ('de','vi')");
179
-		sql_query("UPDATE spip_auteurs SET idx='1' where lang IN ('de','vi')");
180
-		maj_version(1.731);
181
-	}
182
-
183
-	if (upgrade_vers(1.732, $version_installee,
184
-		$version_cible)) { // en correction d'un vieux truc qui avait fait sauter le champ inclus sur les bases version 1.415
185
-		sql_query("ALTER TABLE spip_documents ADD inclus  VARCHAR(3) DEFAULT 'non'");
186
-		maj_version(1.732);
187
-	}
188
-
189
-	if (upgrade_vers(1.733, $version_installee, $version_cible)) {
190
-		// sql_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
191
-		sql_query("DROP TABLE spip_versions");
192
-		sql_query("DROP TABLE spip_versions_fragments");
193
-		creer_base();
194
-		maj_version(1.733);
195
-	}
196
-
197
-	#if ($version_installee < 1.734) {
198
-	#	// integrer nouvelles tables auxiliaires du compilateur ESJ
199
-	#	creer_base();
200
-	#	maj_version(1.734);
201
-	#}
29
+    if (upgrade_vers(1.702, $version_installee, $version_cible)) {
30
+        sql_query("ALTER TABLE spip_articles ADD extra longblob NULL");
31
+        sql_query("ALTER TABLE spip_auteurs ADD extra longblob NULL");
32
+        sql_query("ALTER TABLE spip_breves ADD extra longblob NULL");
33
+        sql_query("ALTER TABLE spip_rubriques ADD extra longblob NULL");
34
+        sql_query("ALTER TABLE spip_mots ADD extra longblob NULL");
35
+
36
+        // recuperer les eventuels 'supplement' installes en 1.701
37
+        if ($version_installee == 1.701) {
38
+            sql_query("UPDATE spip_articles SET extra = supplement");
39
+            sql_query("ALTER TABLE spip_articles DROP supplement");
40
+            sql_query("UPDATE spip_auteurs SET extra = supplement");
41
+            sql_query("ALTER TABLE spip_auteurs DROP supplement");
42
+            sql_query("UPDATE spip_breves SET extra = supplement");
43
+            sql_query("ALTER TABLE spip_breves DROP supplement");
44
+            sql_query("UPDATE spip_rubriques SET extra = supplement");
45
+            sql_query("ALTER TABLE spip_rubriques DROP supplement");
46
+            sql_query("UPDATE spip_mots SET extra = supplement");
47
+            sql_query("ALTER TABLE spip_mots DROP supplement");
48
+        }
49
+
50
+        $u = sql_query("SELECT extra FROM spip_articles");
51
+        $u &= sql_query("SELECT extra FROM spip_auteurs");
52
+        $u &= sql_query("SELECT extra FROM spip_breves");
53
+        $u &= sql_query("SELECT extra FROM spip_rubriques");
54
+        $u &= sql_query("SELECT extra FROM spip_mots");
55
+        maj_version(1.702, $u);
56
+    }
57
+
58
+    if (upgrade_vers(1.703, $version_installee, $version_cible)) {
59
+        sql_query("ALTER TABLE spip_articles ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
60
+        sql_query("ALTER TABLE spip_rubriques ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
61
+        maj_version(1.703);
62
+    }
63
+
64
+    if (upgrade_vers(1.704, $version_installee, $version_cible)) {
65
+        sql_query("ALTER TABLE spip_articles ADD INDEX lang (lang)");
66
+        sql_query("ALTER TABLE spip_auteurs ADD INDEX lang (lang)");
67
+        sql_query("ALTER TABLE spip_rubriques ADD INDEX lang (lang)");
68
+        maj_version(1.704);
69
+    }
70
+
71
+    if (upgrade_vers(1.705, $version_installee, $version_cible)) {
72
+        sql_query("ALTER TABLE spip_articles ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
73
+        sql_query("ALTER TABLE spip_rubriques ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
74
+        maj_version(1.705);
75
+    }
76
+
77
+    if (upgrade_vers(1.707, $version_installee, $version_cible)) {
78
+        sql_query("UPDATE spip_articles SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
79
+        sql_query("UPDATE spip_articles SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
80
+        sql_query("UPDATE spip_rubriques SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
81
+        sql_query("UPDATE spip_rubriques SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
82
+        maj_version(1.707);
83
+    }
84
+
85
+    if (upgrade_vers(1.708, $version_installee, $version_cible)) {
86
+        sql_query("ALTER TABLE spip_breves ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
87
+        sql_query("ALTER TABLE spip_breves ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
88
+        maj_version(1.708);
89
+    }
90
+
91
+    if (upgrade_vers(1.709, $version_installee, $version_cible)) {
92
+        sql_query("ALTER TABLE spip_articles ADD id_trad bigint(21) DEFAULT '0' NOT NULL");
93
+        sql_query("ALTER TABLE spip_articles ADD INDEX id_trad (id_trad)");
94
+        maj_version(1.709);
95
+    }
96
+
97
+    if (upgrade_vers(1.717, $version_installee, $version_cible)) {
98
+        sql_query("ALTER TABLE spip_articles ADD INDEX date_modif (date_modif)");
99
+        maj_version(1.717);
100
+    }
101
+
102
+    if (upgrade_vers(1.718, $version_installee, $version_cible)) {
103
+        sql_query("ALTER TABLE spip_referers DROP domaine");
104
+        sql_query("ALTER TABLE spip_referers_articles DROP domaine");
105
+        sql_query("ALTER TABLE spip_referers_temp DROP domaine");
106
+        maj_version(1.718);
107
+    }
108
+
109
+    if (upgrade_vers(1.722, $version_installee, $version_cible)) {
110
+        sql_query("ALTER TABLE spip_articles ADD nom_site tinytext NOT NULL");
111
+        sql_query("ALTER TABLE spip_articles ADD url_site VARCHAR(255) NOT NULL");
112
+        sql_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site)");
113
+        if ($version_installee >= 1.720) {
114
+            sql_query("UPDATE spip_articles SET url_site=url_ref");
115
+            sql_query("ALTER TABLE spip_articles DROP INDEX url_ref");
116
+            sql_query("ALTER TABLE spip_articles DROP url_ref");
117
+        }
118
+        maj_version(1.722);
119
+    }
120
+
121
+    if (upgrade_vers(1.723, $version_installee, $version_cible)) {
122
+        if ($version_installee == 1.722) {
123
+            sql_query("ALTER TABLE spip_articles MODIFY url_site VARCHAR(255) NOT NULL");
124
+            sql_query("ALTER TABLE spip_articles DROP INDEX url_site;");
125
+            sql_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site);");
126
+        }
127
+        maj_version(1.723);
128
+    }
129
+
130
+    if (upgrade_vers(1.724, $version_installee, $version_cible)) {
131
+        sql_query("ALTER TABLE spip_messages ADD date_fin datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
132
+        maj_version(1.724);
133
+    }
134
+
135
+    if (upgrade_vers(1.726, $version_installee, $version_cible)) {
136
+        sql_query("ALTER TABLE spip_auteurs ADD low_sec tinytext NOT NULL");
137
+        maj_version(1.726);
138
+    }
139
+
140
+    if (upgrade_vers(1.727, $version_installee, $version_cible)) {
141
+        // occitans : oci_xx -> oc_xx
142
+        sql_query("UPDATE spip_auteurs SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
143
+        sql_query("UPDATE spip_rubriques SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
144
+        sql_query("UPDATE spip_articles SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
145
+        sql_query("UPDATE spip_breves SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
146
+        maj_version(1.727);
147
+    }
148
+
149
+    // Ici version 1.7 officielle
150
+    if (upgrade_vers(1.728, $version_installee, $version_cible)) {
151
+        sql_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
152
+        maj_version(1.728);
153
+    }
154
+
155
+    if (upgrade_vers(1.730, $version_installee, $version_cible)) {
156
+        sql_query("ALTER TABLE spip_articles ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
157
+        sql_query("ALTER TABLE spip_articles ADD INDEX idx (idx)");
158
+        sql_query("ALTER TABLE spip_auteurs ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
159
+        sql_query("ALTER TABLE spip_auteurs ADD INDEX idx (idx)");
160
+        sql_query("ALTER TABLE spip_breves ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
161
+        sql_query("ALTER TABLE spip_breves ADD INDEX idx (idx)");
162
+        sql_query("ALTER TABLE spip_mots ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
163
+        sql_query("ALTER TABLE spip_mots ADD INDEX idx (idx)");
164
+        sql_query("ALTER TABLE spip_rubriques ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
165
+        sql_query("ALTER TABLE spip_rubriques ADD INDEX idx (idx)");
166
+        sql_query("ALTER TABLE spip_syndic ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
167
+        sql_query("ALTER TABLE spip_syndic ADD INDEX idx (idx)");
168
+        sql_query("ALTER TABLE spip_forum ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
169
+        sql_query("ALTER TABLE spip_forum ADD INDEX idx (idx)");
170
+        sql_query("ALTER TABLE spip_signatures ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
171
+        sql_query("ALTER TABLE spip_signatures ADD INDEX idx (idx)");
172
+        maj_version(1.730);
173
+    }
174
+
175
+    if (upgrade_vers(1.731, $version_installee, $version_cible)) {
176
+        sql_query("UPDATE spip_articles SET idx='1' where lang IN ('de','vi')");
177
+        sql_query("UPDATE spip_rubriques SET idx='1' where lang IN ('de','vi')");
178
+        sql_query("UPDATE spip_breves SET idx='1' where lang IN ('de','vi')");
179
+        sql_query("UPDATE spip_auteurs SET idx='1' where lang IN ('de','vi')");
180
+        maj_version(1.731);
181
+    }
182
+
183
+    if (upgrade_vers(1.732, $version_installee,
184
+        $version_cible)) { // en correction d'un vieux truc qui avait fait sauter le champ inclus sur les bases version 1.415
185
+        sql_query("ALTER TABLE spip_documents ADD inclus  VARCHAR(3) DEFAULT 'non'");
186
+        maj_version(1.732);
187
+    }
188
+
189
+    if (upgrade_vers(1.733, $version_installee, $version_cible)) {
190
+        // sql_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
191
+        sql_query("DROP TABLE spip_versions");
192
+        sql_query("DROP TABLE spip_versions_fragments");
193
+        creer_base();
194
+        maj_version(1.733);
195
+    }
196
+
197
+    #if ($version_installee < 1.734) {
198
+    #	// integrer nouvelles tables auxiliaires du compilateur ESJ
199
+    #	creer_base();
200
+    #	maj_version(1.734);
201
+    #}
202 202
 }
Please login to merge, or discard this patch.