Inspection of "SPIP 3.0.27" - spip/SPIP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — spip-3.0 ( cd2822...016705 )

by cam

created 2018-03-14 18:00 UTC

Status

Indentation +85 added lines, -85 removed lines patch added patch discarded remove patch

@@ -15,109 +15,109 @@
 block discarded – undo
 // http://doc.spip.org/@base_admin_repair_dist
 function base_repair_dist($titre='', $reprise='') {
 
-	$res = admin_repair_tables();
-	if (!$res) {
-		$res = "<div class='error'>"._T('avis_erreur_mysql').' '.sql_errno().': '.sql_error() ."</div>\n";
-	} else {
-		include_spip('inc/rubriques');
-		calculer_rubriques();
-		propager_les_secteurs();
-	}
-	include_spip('inc/minipres');
-	$res .= pipeline('base_admin_repair',$res);
-	echo minipres(_T('texte_tentative_recuperation'),
-	$res . generer_form_ecrire('accueil', '','',_T('public:accueil_site')));
+    $res = admin_repair_tables();
+    if (!$res) {
+        $res = "<div class='error'>"._T('avis_erreur_mysql').' '.sql_errno().': '.sql_error() ."</div>\n";
+    } else {
+        include_spip('inc/rubriques');
+        calculer_rubriques();
+        propager_les_secteurs();
+    }
+    include_spip('inc/minipres');
+    $res .= pipeline('base_admin_repair',$res);
+    echo minipres(_T('texte_tentative_recuperation'),
+    $res . generer_form_ecrire('accueil', '','',_T('public:accueil_site')));
 }
 
 // http://doc.spip.org/@admin_repair_plat
 function admin_repair_plat(){
-	spip_log( "verification des documents joints", _LOG_INFO_IMPORTANTE);
-	$out = "";
-	$repertoire = array();
-	include_spip('inc/getdocument');
-	$res = sql_select('*','spip_documents',"fichier REGEXP CONCAT('^',extension,'[^/\]') AND distant='non'");
+    spip_log( "verification des documents joints", _LOG_INFO_IMPORTANTE);
+    $out = "";
+    $repertoire = array();
+    include_spip('inc/getdocument');
+    $res = sql_select('*','spip_documents',"fichier REGEXP CONCAT('^',extension,'[^/\]') AND distant='non'");
 
-	while ($row=sql_fetch($res)){
-		$ext = $row['extension'];
-		if (!$ext) {
-			spip_log("document sans extension: " . $row['id_document'], _LOG_INFO_IMPORTANTE);
-			continue;
-		}
-		if (!isset($repertoire[$ext])){
-			if (@file_exists($plat = _DIR_IMG. $ext .".plat"))
-				spip_unlink($plat);
-			$repertoire[$ext] = creer_repertoire_documents($ext);
-			if (preg_match(',_$,',$repertoire[$ext]))
-				$repertoire[$ext] = false;
-		}
-		if ($d=$repertoire[$ext]){
-			$d = substr($d,strlen(_DIR_IMG));
-			$src = $row['fichier'];
-			$dest = $d . substr($src,strlen($d));
-			if (@copy(_DIR_IMG . $src, _DIR_IMG . $dest)
-			  AND file_exists(_DIR_IMG . $dest)) {
-				sql_updateq('spip_documents',array('fichier'=>$dest),'id_document='.intval($row['id_document']));
-				spip_unlink(_DIR_IMG . $src);
-				$out .= "$src => $dest<br />";
-			}
-		}
-	}
+    while ($row=sql_fetch($res)){
+        $ext = $row['extension'];
+        if (!$ext) {
+            spip_log("document sans extension: " . $row['id_document'], _LOG_INFO_IMPORTANTE);
+            continue;
+        }
+        if (!isset($repertoire[$ext])){
+            if (@file_exists($plat = _DIR_IMG. $ext .".plat"))
+                spip_unlink($plat);
+            $repertoire[$ext] = creer_repertoire_documents($ext);
+            if (preg_match(',_$,',$repertoire[$ext]))
+                $repertoire[$ext] = false;
+        }
+        if ($d=$repertoire[$ext]){
+            $d = substr($d,strlen(_DIR_IMG));
+            $src = $row['fichier'];
+            $dest = $d . substr($src,strlen($d));
+            if (@copy(_DIR_IMG . $src, _DIR_IMG . $dest)
+              AND file_exists(_DIR_IMG . $dest)) {
+                sql_updateq('spip_documents',array('fichier'=>$dest),'id_document='.intval($row['id_document']));
+                spip_unlink(_DIR_IMG . $src);
+                $out .= "$src => $dest<br />";
+            }
+        }
+    }
 
-	return $out;
+    return $out;
 }
 
 // http://doc.spip.org/@admin_repair_tables
 function admin_repair_tables() {
 
-	$repair = sql_repair('repair', NULL, 'continue');
+    $repair = sql_repair('repair', NULL, 'continue');
 
-	// recreer les tables manquantes eventuelles
-	include_spip('base/create');
-	creer_base();
+    // recreer les tables manquantes eventuelles
+    include_spip('base/create');
+    creer_base();
 
-	$connexion = $GLOBALS['connexions'][0];
-	$prefixe = $connexion['prefixe'];
-	$res1 = sql_showbase();
-	$res = "";
-	if ($res1) {
-		while ($r = sql_fetch($res1)) {
-			$tab = array_shift($r);
+    $connexion = $GLOBALS['connexions'][0];
+    $prefixe = $connexion['prefixe'];
+    $res1 = sql_showbase();
+    $res = "";
+    if ($res1) {
+        while ($r = sql_fetch($res1)) {
+            $tab = array_shift($r);
 
-			$class = "";
-			$m = "<strong>$tab</strong> ";
-			spip_log("Repare $tab", _LOG_INFO_IMPORTANTE);
-			// supprimer la meta avant de lancer la reparation
-			// car le repair peut etre long ; on ne veut pas boucler
-			effacer_meta('admin_repair');
-			if ($repair){
-				$result_repair = sql_repair($tab);
-				if (!$result_repair) return false;
-			}
+            $class = "";
+            $m = "<strong>$tab</strong> ";
+            spip_log("Repare $tab", _LOG_INFO_IMPORTANTE);
+            // supprimer la meta avant de lancer la reparation
+            // car le repair peut etre long ; on ne veut pas boucler
+            effacer_meta('admin_repair');
+            if ($repair){
+                $result_repair = sql_repair($tab);
+                if (!$result_repair) return false;
+            }
 
-			// essayer de maj la table (creation de champs manquants)
-			maj_tables($tab);
+            // essayer de maj la table (creation de champs manquants)
+            maj_tables($tab);
 
-			$count = sql_countsel($tab);
+            $count = sql_countsel($tab);
 	
-			if ($count>1)
-				$m .= "("._T('texte_compte_elements', array('count' => $count)).")\n";
-			else if ($count==1)
-				$m .= "("._T('texte_compte_element', array('count' => $count)).")\n";
-			else
-				$m .= "("._T('texte_vide').")\n";
+            if ($count>1)
+                $m .= "("._T('texte_compte_elements', array('count' => $count)).")\n";
+            else if ($count==1)
+                $m .= "("._T('texte_compte_element', array('count' => $count)).")\n";
+            else
+                $m .= "("._T('texte_vide').")\n";
 	
-			if ($result_repair
-			  AND $msg = join(" ", sql_fetch($result_repair)) . ' '
-				AND strpos($msg, ' OK ')==FALSE){
-				$class = " class='notice'";
-				$m .= "<br /><tt>".spip_htmlentities($msg)."</tt>\n";
-			}
-			else
-				$m .= " "._T('texte_table_ok');
+            if ($result_repair
+              AND $msg = join(" ", sql_fetch($result_repair)) . ' '
+                AND strpos($msg, ' OK ')==FALSE){
+                $class = " class='notice'";
+                $m .= "<br /><tt>".spip_htmlentities($msg)."</tt>\n";
+            }
+            else
+                $m .= " "._T('texte_table_ok');
 
-			$res .="<div$class>$m</div>";
-	  }
-	}
-	return $res;
+            $res .="<div$class>$m</div>";
+        }
+    }
+    return $res;
 }
 ?>

Please login to merge, or discard this patch.

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -13,51 +13,51 @@  discard block
 block discarded – undo
 if (!defined('_ECRIRE_INC_VERSION')) return;
 
 // http://doc.spip.org/@base_admin_repair_dist
-function base_repair_dist($titre='', $reprise='') {
+function base_repair_dist($titre = '', $reprise = '') {
 
 	$res = admin_repair_tables();
 	if (!$res) {
-		$res = "<div class='error'>"._T('avis_erreur_mysql').' '.sql_errno().': '.sql_error() ."</div>\n";
+		$res = "<div class='error'>"._T('avis_erreur_mysql').' '.sql_errno().': '.sql_error()."</div>\n";
 	} else {
 		include_spip('inc/rubriques');
 		calculer_rubriques();
 		propager_les_secteurs();
 	}
 	include_spip('inc/minipres');
-	$res .= pipeline('base_admin_repair',$res);
+	$res .= pipeline('base_admin_repair', $res);
 	echo minipres(_T('texte_tentative_recuperation'),
-	$res . generer_form_ecrire('accueil', '','',_T('public:accueil_site')));
+	$res.generer_form_ecrire('accueil', '', '', _T('public:accueil_site')));
 }
 
 // http://doc.spip.org/@admin_repair_plat
-function admin_repair_plat(){
-	spip_log( "verification des documents joints", _LOG_INFO_IMPORTANTE);
+function admin_repair_plat() {
+	spip_log("verification des documents joints", _LOG_INFO_IMPORTANTE);
 	$out = "";
 	$repertoire = array();
 	include_spip('inc/getdocument');
-	$res = sql_select('*','spip_documents',"fichier REGEXP CONCAT('^',extension,'[^/\]') AND distant='non'");
+	$res = sql_select('*', 'spip_documents', "fichier REGEXP CONCAT('^',extension,'[^/\]') AND distant='non'");
 
-	while ($row=sql_fetch($res)){
+	while ($row = sql_fetch($res)) {
 		$ext = $row['extension'];
 		if (!$ext) {
-			spip_log("document sans extension: " . $row['id_document'], _LOG_INFO_IMPORTANTE);
+			spip_log("document sans extension: ".$row['id_document'], _LOG_INFO_IMPORTANTE);
 			continue;
 		}
-		if (!isset($repertoire[$ext])){
-			if (@file_exists($plat = _DIR_IMG. $ext .".plat"))
+		if (!isset($repertoire[$ext])) {
+			if (@file_exists($plat = _DIR_IMG.$ext.".plat"))
 				spip_unlink($plat);
 			$repertoire[$ext] = creer_repertoire_documents($ext);
-			if (preg_match(',_$,',$repertoire[$ext]))
+			if (preg_match(',_$,', $repertoire[$ext]))
 				$repertoire[$ext] = false;
 		}
-		if ($d=$repertoire[$ext]){
-			$d = substr($d,strlen(_DIR_IMG));
+		if ($d = $repertoire[$ext]) {
+			$d = substr($d, strlen(_DIR_IMG));
 			$src = $row['fichier'];
-			$dest = $d . substr($src,strlen($d));
-			if (@copy(_DIR_IMG . $src, _DIR_IMG . $dest)
-			  AND file_exists(_DIR_IMG . $dest)) {
-				sql_updateq('spip_documents',array('fichier'=>$dest),'id_document='.intval($row['id_document']));
-				spip_unlink(_DIR_IMG . $src);
+			$dest = $d.substr($src, strlen($d));
+			if (@copy(_DIR_IMG.$src, _DIR_IMG.$dest)
+			  AND file_exists(_DIR_IMG.$dest)) {
+				sql_updateq('spip_documents', array('fichier'=>$dest), 'id_document='.intval($row['id_document']));
+				spip_unlink(_DIR_IMG.$src);
 				$out .= "$src => $dest<br />";
 			}
 		}
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
 			// supprimer la meta avant de lancer la reparation
 			// car le repair peut etre long ; on ne veut pas boucler
 			effacer_meta('admin_repair');
-			if ($repair){
+			if ($repair) {
 				$result_repair = sql_repair($tab);
 				if (!$result_repair) return false;
 			}
@@ -99,23 +99,23 @@  discard block
 block discarded – undo
 
 			$count = sql_countsel($tab);
 	
-			if ($count>1)
+			if ($count > 1)
 				$m .= "("._T('texte_compte_elements', array('count' => $count)).")\n";
-			else if ($count==1)
+			else if ($count == 1)
 				$m .= "("._T('texte_compte_element', array('count' => $count)).")\n";
 			else
 				$m .= "("._T('texte_vide').")\n";
 	
 			if ($result_repair
-			  AND $msg = join(" ", sql_fetch($result_repair)) . ' '
-				AND strpos($msg, ' OK ')==FALSE){
+			  AND $msg = join(" ", sql_fetch($result_repair)).' '
+				AND strpos($msg, ' OK ') == FALSE) {
 				$class = " class='notice'";
 				$m .= "<br /><tt>".spip_htmlentities($msg)."</tt>\n";
 			}
 			else
 				$m .= " "._T('texte_table_ok');
 
-			$res .="<div$class>$m</div>";
+			$res .= "<div$class>$m</div>";
 	  }
 	}
 	return $res;

Please login to merge, or discard this patch.

Braces +21 added lines, -14 removed lines patch added patch discarded remove patch

@@ -10,7 +10,9 @@  discard block
 block discarded – undo
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 // http://doc.spip.org/@base_admin_repair_dist
 function base_repair_dist($titre='', $reprise='') {
@@ -44,11 +46,13 @@  discard block
 block discarded – undo
 			continue;
 		}
 		if (!isset($repertoire[$ext])){
-			if (@file_exists($plat = _DIR_IMG. $ext .".plat"))
-				spip_unlink($plat);
+			if (@file_exists($plat = _DIR_IMG. $ext .".plat")) {
+							spip_unlink($plat);
+			}
 			$repertoire[$ext] = creer_repertoire_documents($ext);
-			if (preg_match(',_$,',$repertoire[$ext]))
-				$repertoire[$ext] = false;
+			if (preg_match(',_$,',$repertoire[$ext])) {
+							$repertoire[$ext] = false;
+			}
 		}
 		if ($d=$repertoire[$ext]){
 			$d = substr($d,strlen(_DIR_IMG));
@@ -91,7 +95,9 @@  discard block
 block discarded – undo
 			effacer_meta('admin_repair');
 			if ($repair){
 				$result_repair = sql_repair($tab);
-				if (!$result_repair) return false;
+				if (!$result_repair) {
+				    return false;
+				}
 			}
 
 			// essayer de maj la table (creation de champs manquants)
@@ -99,21 +105,22 @@  discard block
 block discarded – undo
 
 			$count = sql_countsel($tab);
 	
-			if ($count>1)
-				$m .= "("._T('texte_compte_elements', array('count' => $count)).")\n";
-			else if ($count==1)
-				$m .= "("._T('texte_compte_element', array('count' => $count)).")\n";
-			else
-				$m .= "("._T('texte_vide').")\n";
+			if ($count>1) {
+							$m .= "("._T('texte_compte_elements', array('count' => $count)).")\n";
+			} else if ($count==1) {
+							$m .= "("._T('texte_compte_element', array('count' => $count)).")\n";
+			} else {
+							$m .= "("._T('texte_vide').")\n";
+			}
 	
 			if ($result_repair
 			  AND $msg = join(" ", sql_fetch($result_repair)) . ' '
 				AND strpos($msg, ' OK ')==FALSE){
 				$class = " class='notice'";
 				$m .= "<br /><tt>".spip_htmlentities($msg)."</tt>\n";
+			} else {
+							$m .= " "._T('texte_table_ok');
 			}
-			else
-				$m .= " "._T('texte_table_ok');
 
 			$res .="<div$class>$m</div>";
 	  }

Please login to merge, or discard this patch.

ecrire/base/delete_all.php 3 patches

Indentation +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -15,26 +15,26 @@
 block discarded – undo
 // http://doc.spip.org/@base_delete_all_dist
 function base_delete_all_dist($titre)
 {
-	$delete = _request('delete');
-	$res = array();
-	if (is_array($delete)) {
-		foreach ($delete as $table) {
-			if (sql_drop_table($table))
-				$res[] = $table;
-			else spip_log( "SPIP n'a pas pu detruire $table.", _LOG_ERREUR);
-		}
+    $delete = _request('delete');
+    $res = array();
+    if (is_array($delete)) {
+        foreach ($delete as $table) {
+            if (sql_drop_table($table))
+                $res[] = $table;
+            else spip_log( "SPIP n'a pas pu detruire $table.", _LOG_ERREUR);
+        }
 
-	// un pipeline pour detruire les tables installees par les plugins
-		pipeline('delete_tables', '');
+    // un pipeline pour detruire les tables installees par les plugins
+        pipeline('delete_tables', '');
 
-		spip_unlink(_FILE_CONNECT);
-		spip_unlink(_FILE_CHMOD);
-		spip_unlink(_FILE_META);
-		spip_unlink(_ACCESS_FILE_NAME);
-		spip_unlink(_CACHE_RUBRIQUES);
-	}
-	$d = count($delete);
-	$r = count($res);
-	spip_log("Tables detruites: $r sur $d: " . join(', ',$res), _LOG_INFO_IMPORTANTE);
+        spip_unlink(_FILE_CONNECT);
+        spip_unlink(_FILE_CHMOD);
+        spip_unlink(_FILE_META);
+        spip_unlink(_ACCESS_FILE_NAME);
+        spip_unlink(_CACHE_RUBRIQUES);
+    }
+    $d = count($delete);
+    $r = count($res);
+    spip_log("Tables detruites: $r sur $d: " . join(', ',$res), _LOG_INFO_IMPORTANTE);
 }
 ?>

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 		foreach ($delete as $table) {
 			if (sql_drop_table($table))
 				$res[] = $table;
-			else spip_log( "SPIP n'a pas pu detruire $table.", _LOG_ERREUR);
+			else spip_log("SPIP n'a pas pu detruire $table.", _LOG_ERREUR);
 		}
 
 	// un pipeline pour detruire les tables installees par les plugins
@@ -35,6 +35,6 @@  discard block
 block discarded – undo
 	}
 	$d = count($delete);
 	$r = count($res);
-	spip_log("Tables detruites: $r sur $d: " . join(', ',$res), _LOG_INFO_IMPORTANTE);
+	spip_log("Tables detruites: $r sur $d: ".join(', ', $res), _LOG_INFO_IMPORTANTE);
 }
 ?>

Please login to merge, or discard this patch.

Braces +8 added lines, -4 removed lines patch added patch discarded remove patch

@@ -10,7 +10,9 @@  discard block
 block discarded – undo
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 // http://doc.spip.org/@base_delete_all_dist
 function base_delete_all_dist($titre)
@@ -19,9 +21,11 @@  discard block
 block discarded – undo
 	$res = array();
 	if (is_array($delete)) {
 		foreach ($delete as $table) {
-			if (sql_drop_table($table))
-				$res[] = $table;
-			else spip_log( "SPIP n'a pas pu detruire $table.", _LOG_ERREUR);
+			if (sql_drop_table($table)) {
+							$res[] = $table;
+			} else {
+			    spip_log( "SPIP n'a pas pu detruire $table.", _LOG_ERREUR);
+			}
 		}
 
 	// un pipeline pour detruire les tables installees par les plugins

Please login to merge, or discard this patch.

ecrire/maj/v015.php 1 patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -10,7 +10,9 @@
 block discarded – undo
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 function maj_v015_dist($version_installee, $version_cible)
 {

Please login to merge, or discard this patch.

ecrire/maj/v013.php 3 patches

Indentation +38 added lines, -38 removed lines patch added patch discarded remove patch

@@ -15,50 +15,50 @@
 block discarded – undo
 
 function maj_v013_dist($version_installee, $version_cible)
 {
-	if (upgrade_vers(1.3, $version_installee, $version_cible)) {
-		// Modifier la syndication (pour liste de sites)
-		spip_query("ALTER TABLE spip_syndic ADD syndication VARCHAR(3) NOT NULL");
-		spip_query("ALTER TABLE spip_syndic ADD statut VARCHAR(10) NOT NULL");
-		spip_query("ALTER TABLE spip_syndic ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		spip_query("UPDATE spip_syndic SET syndication='oui', statut='publie', date=NOW()");
+    if (upgrade_vers(1.3, $version_installee, $version_cible)) {
+        // Modifier la syndication (pour liste de sites)
+        spip_query("ALTER TABLE spip_syndic ADD syndication VARCHAR(3) NOT NULL");
+        spip_query("ALTER TABLE spip_syndic ADD statut VARCHAR(10) NOT NULL");
+        spip_query("ALTER TABLE spip_syndic ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
+        spip_query("UPDATE spip_syndic SET syndication='oui', statut='publie', date=NOW()");
 
-		// Statut pour articles syndication, pour pouvoir desactiver un article
-		spip_query("ALTER TABLE spip_syndic_articles ADD statut VARCHAR(10) NOT NULL");
-		spip_query("UPDATE spip_syndic_articles SET statut='publie'");
-		maj_version (1.3);
-	}
+        // Statut pour articles syndication, pour pouvoir desactiver un article
+        spip_query("ALTER TABLE spip_syndic_articles ADD statut VARCHAR(10) NOT NULL");
+        spip_query("UPDATE spip_syndic_articles SET statut='publie'");
+        maj_version (1.3);
+    }
 
-	if (upgrade_vers(1.301, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_forum ADD id_syndic bigint(21) DEFAULT '0' NOT NULL");
-		maj_version (1.301);
-	}
+    if (upgrade_vers(1.301, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_forum ADD id_syndic bigint(21) DEFAULT '0' NOT NULL");
+        maj_version (1.301);
+    }
 
-	if (upgrade_vers(1.302, $version_installee, $version_cible)) {
-		# spip_query("ALTER TABLE spip_forum_cache DROP PRIMARY KEY");
-		# spip_query("ALTER TABLE spip_forum_cache DROP INDEX fichier");
-		# spip_query("ALTER TABLE spip_forum_cache ADD PRIMARY KEY (fichier, id_forum, id_article, id_rubrique, id_breve, id_syndic)");
-		spip_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
-		maj_version (1.302);
-	}
+    if (upgrade_vers(1.302, $version_installee, $version_cible)) {
+        # spip_query("ALTER TABLE spip_forum_cache DROP PRIMARY KEY");
+        # spip_query("ALTER TABLE spip_forum_cache DROP INDEX fichier");
+        # spip_query("ALTER TABLE spip_forum_cache ADD PRIMARY KEY (fichier, id_forum, id_article, id_rubrique, id_breve, id_syndic)");
+        spip_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
+        maj_version (1.302);
+    }
 
-	if (upgrade_vers(1.303, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_rubriques ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		spip_query("ALTER TABLE spip_syndic ADD date_syndic datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		spip_query("UPDATE spip_syndic SET date_syndic=date");
-		maj_version (1.303);
-	}
+    if (upgrade_vers(1.303, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_rubriques ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
+        spip_query("ALTER TABLE spip_syndic ADD date_syndic datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
+        spip_query("UPDATE spip_syndic SET date_syndic=date");
+        maj_version (1.303);
+    }
 
-	if (upgrade_vers(1.306, $version_installee, $version_cible)) {
-		spip_query("DROP TABLE spip_index_syndic_articles");
-		spip_query("ALTER TABLE spip_syndic ADD date_index datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		spip_query("ALTER TABLE spip_syndic ADD INDEX date_index (date_index)");
-		maj_version (1.306);
-	}
+    if (upgrade_vers(1.306, $version_installee, $version_cible)) {
+        spip_query("DROP TABLE spip_index_syndic_articles");
+        spip_query("ALTER TABLE spip_syndic ADD date_index datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
+        spip_query("ALTER TABLE spip_syndic ADD INDEX date_index (date_index)");
+        maj_version (1.306);
+    }
 
-	if (upgrade_vers(1.307, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_syndic_articles ADD descriptif blob NOT NULL");
-		maj_version (1.307);
-	}
+    if (upgrade_vers(1.307, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_syndic_articles ADD descriptif blob NOT NULL");
+        maj_version (1.307);
+    }
 }
 
 

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -25,12 +25,12 @@  discard block
 block discarded – undo
 		// Statut pour articles syndication, pour pouvoir desactiver un article
 		spip_query("ALTER TABLE spip_syndic_articles ADD statut VARCHAR(10) NOT NULL");
 		spip_query("UPDATE spip_syndic_articles SET statut='publie'");
-		maj_version (1.3);
+		maj_version(1.3);
 	}
 
 	if (upgrade_vers(1.301, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_forum ADD id_syndic bigint(21) DEFAULT '0' NOT NULL");
-		maj_version (1.301);
+		maj_version(1.301);
 	}
 
 	if (upgrade_vers(1.302, $version_installee, $version_cible)) {
@@ -38,26 +38,26 @@  discard block
 block discarded – undo
 		# spip_query("ALTER TABLE spip_forum_cache DROP INDEX fichier");
 		# spip_query("ALTER TABLE spip_forum_cache ADD PRIMARY KEY (fichier, id_forum, id_article, id_rubrique, id_breve, id_syndic)");
 		spip_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
-		maj_version (1.302);
+		maj_version(1.302);
 	}
 
 	if (upgrade_vers(1.303, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_rubriques ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
 		spip_query("ALTER TABLE spip_syndic ADD date_syndic datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
 		spip_query("UPDATE spip_syndic SET date_syndic=date");
-		maj_version (1.303);
+		maj_version(1.303);
 	}
 
 	if (upgrade_vers(1.306, $version_installee, $version_cible)) {
 		spip_query("DROP TABLE spip_index_syndic_articles");
 		spip_query("ALTER TABLE spip_syndic ADD date_index datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
 		spip_query("ALTER TABLE spip_syndic ADD INDEX date_index (date_index)");
-		maj_version (1.306);
+		maj_version(1.306);
 	}
 
 	if (upgrade_vers(1.307, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_syndic_articles ADD descriptif blob NOT NULL");
-		maj_version (1.307);
+		maj_version(1.307);
 	}
 }
 

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -10,7 +10,9 @@
 block discarded – undo
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 
 function maj_v013_dist($version_installee, $version_cible)

Please login to merge, or discard this patch.

ecrire/maj/v017.php 3 patches

Indentation +171 added lines, -171 removed lines patch added patch discarded remove patch

@@ -14,178 +14,178 @@
 block discarded – undo
 
 function maj_v017_dist($version_installee, $version_cible)
 {
-	if (upgrade_vers(1.702, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_articles ADD extra longblob NULL");
-		spip_query("ALTER TABLE spip_auteurs ADD extra longblob NULL");
-		spip_query("ALTER TABLE spip_breves ADD extra longblob NULL");
-		spip_query("ALTER TABLE spip_rubriques ADD extra longblob NULL");
-		spip_query("ALTER TABLE spip_mots ADD extra longblob NULL");
-
-		// recuperer les eventuels 'supplement' installes en 1.701
-		if ($version_installee == 1.701) {
-			spip_query("UPDATE spip_articles SET extra = supplement");
-			spip_query("ALTER TABLE spip_articles DROP supplement");
-			spip_query("UPDATE spip_auteurs SET extra = supplement");
-			spip_query("ALTER TABLE spip_auteurs DROP supplement");
-			spip_query("UPDATE spip_breves SET extra = supplement");
-			spip_query("ALTER TABLE spip_breves DROP supplement");
-			spip_query("UPDATE spip_rubriques SET extra = supplement");
-			spip_query("ALTER TABLE spip_rubriques DROP supplement");
-			spip_query("UPDATE spip_mots SET extra = supplement");
-			spip_query("ALTER TABLE spip_mots DROP supplement");
-		}
+    if (upgrade_vers(1.702, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_articles ADD extra longblob NULL");
+        spip_query("ALTER TABLE spip_auteurs ADD extra longblob NULL");
+        spip_query("ALTER TABLE spip_breves ADD extra longblob NULL");
+        spip_query("ALTER TABLE spip_rubriques ADD extra longblob NULL");
+        spip_query("ALTER TABLE spip_mots ADD extra longblob NULL");
+
+        // recuperer les eventuels 'supplement' installes en 1.701
+        if ($version_installee == 1.701) {
+            spip_query("UPDATE spip_articles SET extra = supplement");
+            spip_query("ALTER TABLE spip_articles DROP supplement");
+            spip_query("UPDATE spip_auteurs SET extra = supplement");
+            spip_query("ALTER TABLE spip_auteurs DROP supplement");
+            spip_query("UPDATE spip_breves SET extra = supplement");
+            spip_query("ALTER TABLE spip_breves DROP supplement");
+            spip_query("UPDATE spip_rubriques SET extra = supplement");
+            spip_query("ALTER TABLE spip_rubriques DROP supplement");
+            spip_query("UPDATE spip_mots SET extra = supplement");
+            spip_query("ALTER TABLE spip_mots DROP supplement");
+        }
 		
-		$u = spip_query("SELECT extra FROM spip_articles");
-		$u&= spip_query("SELECT extra FROM spip_auteurs");
-		$u&= spip_query("SELECT extra FROM spip_breves");
-		$u&= spip_query("SELECT extra FROM spip_rubriques");
-		$u&= spip_query("SELECT extra FROM spip_mots");
-		maj_version (1.702,$u);
-	}
-
-	if (upgrade_vers(1.703, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_articles ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
-		spip_query("ALTER TABLE spip_rubriques ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
-		maj_version (1.703);
-	}
-
-	if (upgrade_vers(1.704, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_articles ADD INDEX lang (lang)");
-		spip_query("ALTER TABLE spip_auteurs ADD INDEX lang (lang)");
-		spip_query("ALTER TABLE spip_rubriques ADD INDEX lang (lang)");
-		maj_version (1.704);
-	}
-
-	if (upgrade_vers(1.705, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_articles ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
-		spip_query("ALTER TABLE spip_rubriques ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
-		maj_version (1.705);
-	}
-
-	if (upgrade_vers(1.707, $version_installee, $version_cible)) {
-		spip_query("UPDATE spip_articles SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
-		spip_query("UPDATE spip_articles SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
-		spip_query("UPDATE spip_rubriques SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
-		spip_query("UPDATE spip_rubriques SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
-		maj_version (1.707);
-	}
-
-	if (upgrade_vers(1.708, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_breves ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
-		spip_query("ALTER TABLE spip_breves ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
-		maj_version (1.708);
-	}
-
-	if (upgrade_vers(1.709, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_articles ADD id_trad bigint(21) DEFAULT '0' NOT NULL");
-		spip_query("ALTER TABLE spip_articles ADD INDEX id_trad (id_trad)");
-		maj_version (1.709);
-	}
-
-	if (upgrade_vers(1.717, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_articles ADD INDEX date_modif (date_modif)");
-		maj_version (1.717);
-	}
-
-	if (upgrade_vers(1.718, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_referers DROP domaine");
-		spip_query("ALTER TABLE spip_referers_articles DROP domaine");
-		spip_query("ALTER TABLE spip_referers_temp DROP domaine");
-		maj_version (1.718);
-	}
-
-	if (upgrade_vers(1.722, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_articles ADD nom_site tinytext NOT NULL");
-		spip_query("ALTER TABLE spip_articles ADD url_site VARCHAR(255) NOT NULL");
-		spip_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site)");
-		if ($version_installee >= 1.720) {
-			spip_query("UPDATE spip_articles SET url_site=url_ref");
-			spip_query("ALTER TABLE spip_articles DROP INDEX url_ref");
-			spip_query("ALTER TABLE spip_articles DROP url_ref");
-		}
-		maj_version (1.722);
-	}
-
-	if (upgrade_vers(1.723, $version_installee, $version_cible)) {
-		if ($version_installee == 1.722) {
-			spip_query("ALTER TABLE spip_articles MODIFY url_site VARCHAR(255) NOT NULL");
-			spip_query("ALTER TABLE spip_articles DROP INDEX url_site;");
-			spip_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site);");
-		}
-		maj_version (1.723);
-	}
-
-	if (upgrade_vers(1.724, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_messages ADD date_fin datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		maj_version (1.724);
-	}
-
-	if (upgrade_vers(1.726, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_auteurs ADD low_sec tinytext NOT NULL");
-		maj_version (1.726);
-	}
-
-	if (upgrade_vers(1.727, $version_installee, $version_cible)) {
-		// occitans : oci_xx -> oc_xx
-		spip_query("UPDATE spip_auteurs SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
-		spip_query("UPDATE spip_rubriques SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
-		spip_query("UPDATE spip_articles SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
-		spip_query("UPDATE spip_breves SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
-		maj_version (1.727);
-	}
-
-	// Ici version 1.7 officielle
-	if (upgrade_vers(1.728, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
-		maj_version (1.728);
-	}
-
-	if (upgrade_vers(1.730, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_articles ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		spip_query("ALTER TABLE spip_articles ADD INDEX idx (idx)");
-		spip_query("ALTER TABLE spip_auteurs ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		spip_query("ALTER TABLE spip_auteurs ADD INDEX idx (idx)");
-		spip_query("ALTER TABLE spip_breves ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		spip_query("ALTER TABLE spip_breves ADD INDEX idx (idx)");
-		spip_query("ALTER TABLE spip_mots ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		spip_query("ALTER TABLE spip_mots ADD INDEX idx (idx)");
-		spip_query("ALTER TABLE spip_rubriques ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		spip_query("ALTER TABLE spip_rubriques ADD INDEX idx (idx)");
-		spip_query("ALTER TABLE spip_syndic ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		spip_query("ALTER TABLE spip_syndic ADD INDEX idx (idx)");
-		spip_query("ALTER TABLE spip_forum ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		spip_query("ALTER TABLE spip_forum ADD INDEX idx (idx)");
-		spip_query("ALTER TABLE spip_signatures ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		spip_query("ALTER TABLE spip_signatures ADD INDEX idx (idx)");
-		maj_version (1.730);
-	}
-
-	if (upgrade_vers(1.731, $version_installee, $version_cible)) {
-		spip_query("UPDATE spip_articles SET idx='1' where lang IN ('de','vi')");
-		spip_query("UPDATE spip_rubriques SET idx='1' where lang IN ('de','vi')");
-		spip_query("UPDATE spip_breves SET idx='1' where lang IN ('de','vi')");
-		spip_query("UPDATE spip_auteurs SET idx='1' where lang IN ('de','vi')");
-		maj_version (1.731);
-	}
-
-	if (upgrade_vers(1.732, $version_installee, $version_cible)) { // en correction d'un vieux truc qui avait fait sauter le champ inclus sur les bases version 1.415
-		spip_query("ALTER TABLE spip_documents ADD inclus  VARCHAR(3) DEFAULT 'non'");
-		maj_version (1.732);
-	}
-
-	if (upgrade_vers(1.733, $version_installee, $version_cible)) {
-		// spip_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
-		spip_query("DROP TABLE spip_versions");
-		spip_query("DROP TABLE spip_versions_fragments");
-		creer_base();
-		maj_version(1.733);
-	}
-
-	#if ($version_installee < 1.734) {
-	#	// integrer nouvelles tables auxiliaires du compilateur ESJ
-	#	creer_base();
-	#	maj_version(1.734);
-	#}
+        $u = spip_query("SELECT extra FROM spip_articles");
+        $u&= spip_query("SELECT extra FROM spip_auteurs");
+        $u&= spip_query("SELECT extra FROM spip_breves");
+        $u&= spip_query("SELECT extra FROM spip_rubriques");
+        $u&= spip_query("SELECT extra FROM spip_mots");
+        maj_version (1.702,$u);
+    }
+
+    if (upgrade_vers(1.703, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_articles ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
+        spip_query("ALTER TABLE spip_rubriques ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
+        maj_version (1.703);
+    }
+
+    if (upgrade_vers(1.704, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_articles ADD INDEX lang (lang)");
+        spip_query("ALTER TABLE spip_auteurs ADD INDEX lang (lang)");
+        spip_query("ALTER TABLE spip_rubriques ADD INDEX lang (lang)");
+        maj_version (1.704);
+    }
+
+    if (upgrade_vers(1.705, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_articles ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
+        spip_query("ALTER TABLE spip_rubriques ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
+        maj_version (1.705);
+    }
+
+    if (upgrade_vers(1.707, $version_installee, $version_cible)) {
+        spip_query("UPDATE spip_articles SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
+        spip_query("UPDATE spip_articles SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
+        spip_query("UPDATE spip_rubriques SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
+        spip_query("UPDATE spip_rubriques SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
+        maj_version (1.707);
+    }
+
+    if (upgrade_vers(1.708, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_breves ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
+        spip_query("ALTER TABLE spip_breves ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
+        maj_version (1.708);
+    }
+
+    if (upgrade_vers(1.709, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_articles ADD id_trad bigint(21) DEFAULT '0' NOT NULL");
+        spip_query("ALTER TABLE spip_articles ADD INDEX id_trad (id_trad)");
+        maj_version (1.709);
+    }
+
+    if (upgrade_vers(1.717, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_articles ADD INDEX date_modif (date_modif)");
+        maj_version (1.717);
+    }
+
+    if (upgrade_vers(1.718, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_referers DROP domaine");
+        spip_query("ALTER TABLE spip_referers_articles DROP domaine");
+        spip_query("ALTER TABLE spip_referers_temp DROP domaine");
+        maj_version (1.718);
+    }
+
+    if (upgrade_vers(1.722, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_articles ADD nom_site tinytext NOT NULL");
+        spip_query("ALTER TABLE spip_articles ADD url_site VARCHAR(255) NOT NULL");
+        spip_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site)");
+        if ($version_installee >= 1.720) {
+            spip_query("UPDATE spip_articles SET url_site=url_ref");
+            spip_query("ALTER TABLE spip_articles DROP INDEX url_ref");
+            spip_query("ALTER TABLE spip_articles DROP url_ref");
+        }
+        maj_version (1.722);
+    }
+
+    if (upgrade_vers(1.723, $version_installee, $version_cible)) {
+        if ($version_installee == 1.722) {
+            spip_query("ALTER TABLE spip_articles MODIFY url_site VARCHAR(255) NOT NULL");
+            spip_query("ALTER TABLE spip_articles DROP INDEX url_site;");
+            spip_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site);");
+        }
+        maj_version (1.723);
+    }
+
+    if (upgrade_vers(1.724, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_messages ADD date_fin datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
+        maj_version (1.724);
+    }
+
+    if (upgrade_vers(1.726, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_auteurs ADD low_sec tinytext NOT NULL");
+        maj_version (1.726);
+    }
+
+    if (upgrade_vers(1.727, $version_installee, $version_cible)) {
+        // occitans : oci_xx -> oc_xx
+        spip_query("UPDATE spip_auteurs SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
+        spip_query("UPDATE spip_rubriques SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
+        spip_query("UPDATE spip_articles SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
+        spip_query("UPDATE spip_breves SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
+        maj_version (1.727);
+    }
+
+    // Ici version 1.7 officielle
+    if (upgrade_vers(1.728, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
+        maj_version (1.728);
+    }
+
+    if (upgrade_vers(1.730, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_articles ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        spip_query("ALTER TABLE spip_articles ADD INDEX idx (idx)");
+        spip_query("ALTER TABLE spip_auteurs ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        spip_query("ALTER TABLE spip_auteurs ADD INDEX idx (idx)");
+        spip_query("ALTER TABLE spip_breves ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        spip_query("ALTER TABLE spip_breves ADD INDEX idx (idx)");
+        spip_query("ALTER TABLE spip_mots ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        spip_query("ALTER TABLE spip_mots ADD INDEX idx (idx)");
+        spip_query("ALTER TABLE spip_rubriques ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        spip_query("ALTER TABLE spip_rubriques ADD INDEX idx (idx)");
+        spip_query("ALTER TABLE spip_syndic ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        spip_query("ALTER TABLE spip_syndic ADD INDEX idx (idx)");
+        spip_query("ALTER TABLE spip_forum ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        spip_query("ALTER TABLE spip_forum ADD INDEX idx (idx)");
+        spip_query("ALTER TABLE spip_signatures ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        spip_query("ALTER TABLE spip_signatures ADD INDEX idx (idx)");
+        maj_version (1.730);
+    }
+
+    if (upgrade_vers(1.731, $version_installee, $version_cible)) {
+        spip_query("UPDATE spip_articles SET idx='1' where lang IN ('de','vi')");
+        spip_query("UPDATE spip_rubriques SET idx='1' where lang IN ('de','vi')");
+        spip_query("UPDATE spip_breves SET idx='1' where lang IN ('de','vi')");
+        spip_query("UPDATE spip_auteurs SET idx='1' where lang IN ('de','vi')");
+        maj_version (1.731);
+    }
+
+    if (upgrade_vers(1.732, $version_installee, $version_cible)) { // en correction d'un vieux truc qui avait fait sauter le champ inclus sur les bases version 1.415
+        spip_query("ALTER TABLE spip_documents ADD inclus  VARCHAR(3) DEFAULT 'non'");
+        maj_version (1.732);
+    }
+
+    if (upgrade_vers(1.733, $version_installee, $version_cible)) {
+        // spip_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
+        spip_query("DROP TABLE spip_versions");
+        spip_query("DROP TABLE spip_versions_fragments");
+        creer_base();
+        maj_version(1.733);
+    }
+
+    #if ($version_installee < 1.734) {
+    #	// integrer nouvelles tables auxiliaires du compilateur ESJ
+    #	creer_base();
+    #	maj_version(1.734);
+    #}
 }
 
 

Please login to merge, or discard this patch.

Spacing +22 added lines, -22 removed lines patch added patch discarded remove patch

@@ -36,30 +36,30 @@  discard block
 block discarded – undo
 		}
 		
 		$u = spip_query("SELECT extra FROM spip_articles");
-		$u&= spip_query("SELECT extra FROM spip_auteurs");
-		$u&= spip_query("SELECT extra FROM spip_breves");
-		$u&= spip_query("SELECT extra FROM spip_rubriques");
-		$u&= spip_query("SELECT extra FROM spip_mots");
-		maj_version (1.702,$u);
+		$u &= spip_query("SELECT extra FROM spip_auteurs");
+		$u &= spip_query("SELECT extra FROM spip_breves");
+		$u &= spip_query("SELECT extra FROM spip_rubriques");
+		$u &= spip_query("SELECT extra FROM spip_mots");
+		maj_version(1.702, $u);
 	}
 
 	if (upgrade_vers(1.703, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_articles ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
 		spip_query("ALTER TABLE spip_rubriques ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
-		maj_version (1.703);
+		maj_version(1.703);
 	}
 
 	if (upgrade_vers(1.704, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_articles ADD INDEX lang (lang)");
 		spip_query("ALTER TABLE spip_auteurs ADD INDEX lang (lang)");
 		spip_query("ALTER TABLE spip_rubriques ADD INDEX lang (lang)");
-		maj_version (1.704);
+		maj_version(1.704);
 	}
 
 	if (upgrade_vers(1.705, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_articles ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
 		spip_query("ALTER TABLE spip_rubriques ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
-		maj_version (1.705);
+		maj_version(1.705);
 	}
 
 	if (upgrade_vers(1.707, $version_installee, $version_cible)) {
@@ -67,31 +67,31 @@  discard block
 block discarded – undo
 		spip_query("UPDATE spip_articles SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
 		spip_query("UPDATE spip_rubriques SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
 		spip_query("UPDATE spip_rubriques SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
-		maj_version (1.707);
+		maj_version(1.707);
 	}
 
 	if (upgrade_vers(1.708, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_breves ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
 		spip_query("ALTER TABLE spip_breves ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
-		maj_version (1.708);
+		maj_version(1.708);
 	}
 
 	if (upgrade_vers(1.709, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_articles ADD id_trad bigint(21) DEFAULT '0' NOT NULL");
 		spip_query("ALTER TABLE spip_articles ADD INDEX id_trad (id_trad)");
-		maj_version (1.709);
+		maj_version(1.709);
 	}
 
 	if (upgrade_vers(1.717, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_articles ADD INDEX date_modif (date_modif)");
-		maj_version (1.717);
+		maj_version(1.717);
 	}
 
 	if (upgrade_vers(1.718, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_referers DROP domaine");
 		spip_query("ALTER TABLE spip_referers_articles DROP domaine");
 		spip_query("ALTER TABLE spip_referers_temp DROP domaine");
-		maj_version (1.718);
+		maj_version(1.718);
 	}
 
 	if (upgrade_vers(1.722, $version_installee, $version_cible)) {
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
 			spip_query("ALTER TABLE spip_articles DROP INDEX url_ref");
 			spip_query("ALTER TABLE spip_articles DROP url_ref");
 		}
-		maj_version (1.722);
+		maj_version(1.722);
 	}
 
 	if (upgrade_vers(1.723, $version_installee, $version_cible)) {
@@ -112,17 +112,17 @@  discard block
 block discarded – undo
 			spip_query("ALTER TABLE spip_articles DROP INDEX url_site;");
 			spip_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site);");
 		}
-		maj_version (1.723);
+		maj_version(1.723);
 	}
 
 	if (upgrade_vers(1.724, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_messages ADD date_fin datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		maj_version (1.724);
+		maj_version(1.724);
 	}
 
 	if (upgrade_vers(1.726, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_auteurs ADD low_sec tinytext NOT NULL");
-		maj_version (1.726);
+		maj_version(1.726);
 	}
 
 	if (upgrade_vers(1.727, $version_installee, $version_cible)) {
@@ -131,13 +131,13 @@  discard block
 block discarded – undo
 		spip_query("UPDATE spip_rubriques SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
 		spip_query("UPDATE spip_articles SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
 		spip_query("UPDATE spip_breves SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
-		maj_version (1.727);
+		maj_version(1.727);
 	}
 
 	// Ici version 1.7 officielle
 	if (upgrade_vers(1.728, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
-		maj_version (1.728);
+		maj_version(1.728);
 	}
 
 	if (upgrade_vers(1.730, $version_installee, $version_cible)) {
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
 		spip_query("ALTER TABLE spip_forum ADD INDEX idx (idx)");
 		spip_query("ALTER TABLE spip_signatures ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
 		spip_query("ALTER TABLE spip_signatures ADD INDEX idx (idx)");
-		maj_version (1.730);
+		maj_version(1.730);
 	}
 
 	if (upgrade_vers(1.731, $version_installee, $version_cible)) {
@@ -165,12 +165,12 @@  discard block
 block discarded – undo
 		spip_query("UPDATE spip_rubriques SET idx='1' where lang IN ('de','vi')");
 		spip_query("UPDATE spip_breves SET idx='1' where lang IN ('de','vi')");
 		spip_query("UPDATE spip_auteurs SET idx='1' where lang IN ('de','vi')");
-		maj_version (1.731);
+		maj_version(1.731);
 	}
 
 	if (upgrade_vers(1.732, $version_installee, $version_cible)) { // en correction d'un vieux truc qui avait fait sauter le champ inclus sur les bases version 1.415
 		spip_query("ALTER TABLE spip_documents ADD inclus  VARCHAR(3) DEFAULT 'non'");
-		maj_version (1.732);
+		maj_version(1.732);
 	}
 
 	if (upgrade_vers(1.733, $version_installee, $version_cible)) {

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -10,7 +10,9 @@
 block discarded – undo
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 function maj_v017_dist($version_installee, $version_cible)
 {

Please login to merge, or discard this patch.

ecrire/maj/v016.php 3 patches

Indentation +29 added lines, -29 removed lines patch added patch discarded remove patch

@@ -15,39 +15,39 @@
 block discarded – undo
 function maj_v016_dist($version_installee, $version_cible)
 {
 
-	if (upgrade_vers(1.600, $version_installee, $version_cible)) {
+    if (upgrade_vers(1.600, $version_installee, $version_cible)) {
 #8/08/07  plus d'indexation dans le core
 #		include_spip('inc/indexation');
 #		purger_index();
 #		creer_liste_indexation();
-		maj_version (1.600);
-	}
-
-	if (upgrade_vers(1.601, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
-		maj_version (1.601);
-	}
-
-	if (upgrade_vers(1.603, $version_installee, $version_cible)) {
-		// supprimer les fichiers deplaces
-		spip_unlink('inc_meta_cache.php');
-		spip_unlink('inc_meta_cache.php3');
-		spip_unlink('data/engines-list.ini');
-		maj_version (1.603);
-	}
-
-	if (upgrade_vers(1.604, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_auteurs ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
-		$u = spip_query("SELECT * FROM spip_auteurs WHERE prefs LIKE '%spip_lang%'");
-		while ($row = sql_fetch($u)) {
-			$prefs = unserialize($row['prefs']);
-			$l = $prefs['spip_lang'];
-			unset ($prefs['spip_lang']);
-			spip_query("UPDATE spip_auteurs SET lang=" . _q($l) . ", prefs='".addslashes(serialize($prefs))."' WHERE id_auteur=".$row['id_auteur']);
-		}
-		$u = spip_query("SELECT lang FROM spip_auteurs");
-		maj_version (1.604, $u);
-	}
+        maj_version (1.600);
+    }
+
+    if (upgrade_vers(1.601, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
+        maj_version (1.601);
+    }
+
+    if (upgrade_vers(1.603, $version_installee, $version_cible)) {
+        // supprimer les fichiers deplaces
+        spip_unlink('inc_meta_cache.php');
+        spip_unlink('inc_meta_cache.php3');
+        spip_unlink('data/engines-list.ini');
+        maj_version (1.603);
+    }
+
+    if (upgrade_vers(1.604, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_auteurs ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
+        $u = spip_query("SELECT * FROM spip_auteurs WHERE prefs LIKE '%spip_lang%'");
+        while ($row = sql_fetch($u)) {
+            $prefs = unserialize($row['prefs']);
+            $l = $prefs['spip_lang'];
+            unset ($prefs['spip_lang']);
+            spip_query("UPDATE spip_auteurs SET lang=" . _q($l) . ", prefs='".addslashes(serialize($prefs))."' WHERE id_auteur=".$row['id_auteur']);
+        }
+        $u = spip_query("SELECT lang FROM spip_auteurs");
+        maj_version (1.604, $u);
+    }
 }
 
 

Please login to merge, or discard this patch.

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -20,12 +20,12 @@  discard block
 block discarded – undo
 #		include_spip('inc/indexation');
 #		purger_index();
 #		creer_liste_indexation();
-		maj_version (1.600);
+		maj_version(1.600);
 	}
 
 	if (upgrade_vers(1.601, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
-		maj_version (1.601);
+		maj_version(1.601);
 	}
 
 	if (upgrade_vers(1.603, $version_installee, $version_cible)) {
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
 		spip_unlink('inc_meta_cache.php');
 		spip_unlink('inc_meta_cache.php3');
 		spip_unlink('data/engines-list.ini');
-		maj_version (1.603);
+		maj_version(1.603);
 	}
 
 	if (upgrade_vers(1.604, $version_installee, $version_cible)) {
@@ -43,10 +43,10 @@  discard block
 block discarded – undo
 			$prefs = unserialize($row['prefs']);
 			$l = $prefs['spip_lang'];
 			unset ($prefs['spip_lang']);
-			spip_query("UPDATE spip_auteurs SET lang=" . _q($l) . ", prefs='".addslashes(serialize($prefs))."' WHERE id_auteur=".$row['id_auteur']);
+			spip_query("UPDATE spip_auteurs SET lang="._q($l).", prefs='".addslashes(serialize($prefs))."' WHERE id_auteur=".$row['id_auteur']);
 		}
 		$u = spip_query("SELECT lang FROM spip_auteurs");
-		maj_version (1.604, $u);
+		maj_version(1.604, $u);
 	}
 }
 

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -10,7 +10,9 @@
 block discarded – undo
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 function maj_v016_dist($version_installee, $version_cible)
 {

Please login to merge, or discard this patch.

ecrire/maj/v011.php 3 patches

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -16,11 +16,11 @@
 block discarded – undo
 function maj_v011_dist($version_installee, $version_cible)
 {
 
-	if (upgrade_vers(1.1, $version_installee, $version_cible)) {
-		spip_query("DROP TABLE spip_petition");
-		spip_query("DROP TABLE spip_signatures_petition");
-		maj_version (1.1);
-	}
+    if (upgrade_vers(1.1, $version_installee, $version_cible)) {
+        spip_query("DROP TABLE spip_petition");
+        spip_query("DROP TABLE spip_signatures_petition");
+        maj_version (1.1);
+    }
 }
 
 

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -19,7 +19,7 @@
 block discarded – undo
 	if (upgrade_vers(1.1, $version_installee, $version_cible)) {
 		spip_query("DROP TABLE spip_petition");
 		spip_query("DROP TABLE spip_signatures_petition");
-		maj_version (1.1);
+		maj_version(1.1);
 	}
 }
 

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -10,7 +10,9 @@
 block discarded – undo
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 
 function maj_v011_dist($version_installee, $version_cible)

Please login to merge, or discard this patch.

ecrire/maj/v012.php 3 patches

Indentation +55 added lines, -55 removed lines patch added patch discarded remove patch

@@ -14,68 +14,68 @@
 block discarded – undo
 
 function maj_v012_dist($version_installee, $version_cible)
 {
-	// Correction de l'oubli des modifs creations depuis 1.04
-	if (upgrade_vers(1.204, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_articles ADD accepter_forum VARCHAR(3) NOT NULL");
-		spip_query("ALTER TABLE spip_forum ADD id_message bigint(21) NOT NULL");
-		spip_query("ALTER TABLE spip_forum ADD INDEX id_message (id_message)");
-		spip_query("ALTER TABLE spip_auteurs ADD en_ligne datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		spip_query("ALTER TABLE spip_auteurs ADD imessage VARCHAR(3) not null");
-		spip_query("ALTER TABLE spip_auteurs ADD messagerie VARCHAR(3) not null");
-		maj_version (1.204);
-	}
+    // Correction de l'oubli des modifs creations depuis 1.04
+    if (upgrade_vers(1.204, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_articles ADD accepter_forum VARCHAR(3) NOT NULL");
+        spip_query("ALTER TABLE spip_forum ADD id_message bigint(21) NOT NULL");
+        spip_query("ALTER TABLE spip_forum ADD INDEX id_message (id_message)");
+        spip_query("ALTER TABLE spip_auteurs ADD en_ligne datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
+        spip_query("ALTER TABLE spip_auteurs ADD imessage VARCHAR(3) not null");
+        spip_query("ALTER TABLE spip_auteurs ADD messagerie VARCHAR(3) not null");
+        maj_version (1.204);
+    }
 
-	if (upgrade_vers(1.207, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_rubriques DROP INDEX id_rubrique");
-		spip_query("ALTER TABLE spip_rubriques ADD INDEX id_parent (id_parent)");
-		spip_query("ALTER TABLE spip_rubriques ADD statut VARCHAR(10) NOT NULL");
-		// Declencher le calcul des rubriques publiques
-		include_spip('inc/rubriques');
-		calculer_rubriques();
-		maj_version (1.207);
-	}
+    if (upgrade_vers(1.207, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_rubriques DROP INDEX id_rubrique");
+        spip_query("ALTER TABLE spip_rubriques ADD INDEX id_parent (id_parent)");
+        spip_query("ALTER TABLE spip_rubriques ADD statut VARCHAR(10) NOT NULL");
+        // Declencher le calcul des rubriques publiques
+        include_spip('inc/rubriques');
+        calculer_rubriques();
+        maj_version (1.207);
+    }
 
-	if (upgrade_vers(1.208, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_auteurs_messages CHANGE forum vu CHAR(3) NOT NULL");
-		spip_query("UPDATE spip_auteurs_messages SET vu='oui'");
-		spip_query("UPDATE spip_auteurs_messages SET vu='non' WHERE statut='a'");
+    if (upgrade_vers(1.208, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_auteurs_messages CHANGE forum vu CHAR(3) NOT NULL");
+        spip_query("UPDATE spip_auteurs_messages SET vu='oui'");
+        spip_query("UPDATE spip_auteurs_messages SET vu='non' WHERE statut='a'");
 
-		spip_query("ALTER TABLE spip_messages ADD id_auteur bigint(21) NOT NULL");
-		spip_query("ALTER TABLE spip_messages ADD INDEX id_auteur (id_auteur)");
-		$result = spip_query("SELECT id_auteur, id_message FROM spip_auteurs_messages WHERE statut='de'");
-		while ($row = sql_fetch($result)) {
-			$id_auteur = $row['id_auteur'];
-			$id_message = $row['id_message'];
-			spip_query("UPDATE spip_messages SET id_auteur=$id_auteur WHERE id_message=$id_message");
-		}
+        spip_query("ALTER TABLE spip_messages ADD id_auteur bigint(21) NOT NULL");
+        spip_query("ALTER TABLE spip_messages ADD INDEX id_auteur (id_auteur)");
+        $result = spip_query("SELECT id_auteur, id_message FROM spip_auteurs_messages WHERE statut='de'");
+        while ($row = sql_fetch($result)) {
+            $id_auteur = $row['id_auteur'];
+            $id_message = $row['id_message'];
+            spip_query("UPDATE spip_messages SET id_auteur=$id_auteur WHERE id_message=$id_message");
+        }
 
-		spip_query("ALTER TABLE spip_auteurs_messages DROP statut");
-		maj_version (1.208);
-	}
+        spip_query("ALTER TABLE spip_auteurs_messages DROP statut");
+        maj_version (1.208);
+    }
 
-	if (upgrade_vers(1.209, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_syndic ADD maj TIMESTAMP");
-		spip_query("ALTER TABLE spip_syndic_articles ADD maj TIMESTAMP");
-		spip_query("ALTER TABLE spip_messages ADD maj TIMESTAMP");
-		maj_version (1.209);
-	}
+    if (upgrade_vers(1.209, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_syndic ADD maj TIMESTAMP");
+        spip_query("ALTER TABLE spip_syndic_articles ADD maj TIMESTAMP");
+        spip_query("ALTER TABLE spip_messages ADD maj TIMESTAMP");
+        maj_version (1.209);
+    }
 
-	if (upgrade_vers(1.210, $version_installee, $version_cible)) {
-		spip_query("ALTER TABLE spip_messages DROP page");
+    if (upgrade_vers(1.210, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_messages DROP page");
 
-		stripslashes_base('spip_articles', array('surtitre', 'titre', 'soustitre', 'descriptif', 'chapo', 'texte', 'ps'));
-		stripslashes_base('spip_auteurs', array('nom', 'bio', 'nom_site'));
-		stripslashes_base('spip_breves', array('titre', 'texte', 'lien_titre'));
-		stripslashes_base('spip_forum', array('titre', 'texte', 'auteur', 'nom_site'));
-		stripslashes_base('spip_messages', array('titre', 'texte'));
-		stripslashes_base('spip_mots', array('type', 'titre', 'descriptif', 'texte'));
-		stripslashes_base('spip_petitions', array('texte'));
-		stripslashes_base('spip_rubriques', array('titre', 'descriptif', 'texte'));
-		stripslashes_base('spip_signatures', array('nom_email', 'nom_site', 'message'));
-		stripslashes_base('spip_syndic', array('nom_site', 'descriptif'));
-		stripslashes_base('spip_syndic_articles', array('titre', 'lesauteurs'));
-		maj_version (1.210);
-	}
+        stripslashes_base('spip_articles', array('surtitre', 'titre', 'soustitre', 'descriptif', 'chapo', 'texte', 'ps'));
+        stripslashes_base('spip_auteurs', array('nom', 'bio', 'nom_site'));
+        stripslashes_base('spip_breves', array('titre', 'texte', 'lien_titre'));
+        stripslashes_base('spip_forum', array('titre', 'texte', 'auteur', 'nom_site'));
+        stripslashes_base('spip_messages', array('titre', 'texte'));
+        stripslashes_base('spip_mots', array('type', 'titre', 'descriptif', 'texte'));
+        stripslashes_base('spip_petitions', array('texte'));
+        stripslashes_base('spip_rubriques', array('titre', 'descriptif', 'texte'));
+        stripslashes_base('spip_signatures', array('nom_email', 'nom_site', 'message'));
+        stripslashes_base('spip_syndic', array('nom_site', 'descriptif'));
+        stripslashes_base('spip_syndic_articles', array('titre', 'lesauteurs'));
+        maj_version (1.210);
+    }
 }
 
 

Please login to merge, or discard this patch.

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 		spip_query("ALTER TABLE spip_auteurs ADD en_ligne datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
 		spip_query("ALTER TABLE spip_auteurs ADD imessage VARCHAR(3) not null");
 		spip_query("ALTER TABLE spip_auteurs ADD messagerie VARCHAR(3) not null");
-		maj_version (1.204);
+		maj_version(1.204);
 	}
 
 	if (upgrade_vers(1.207, $version_installee, $version_cible)) {
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
 		// Declencher le calcul des rubriques publiques
 		include_spip('inc/rubriques');
 		calculer_rubriques();
-		maj_version (1.207);
+		maj_version(1.207);
 	}
 
 	if (upgrade_vers(1.208, $version_installee, $version_cible)) {
@@ -50,14 +50,14 @@  discard block
 block discarded – undo
 		}
 
 		spip_query("ALTER TABLE spip_auteurs_messages DROP statut");
-		maj_version (1.208);
+		maj_version(1.208);
 	}
 
 	if (upgrade_vers(1.209, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_syndic ADD maj TIMESTAMP");
 		spip_query("ALTER TABLE spip_syndic_articles ADD maj TIMESTAMP");
 		spip_query("ALTER TABLE spip_messages ADD maj TIMESTAMP");
-		maj_version (1.209);
+		maj_version(1.209);
 	}
 
 	if (upgrade_vers(1.210, $version_installee, $version_cible)) {
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
 		stripslashes_base('spip_signatures', array('nom_email', 'nom_site', 'message'));
 		stripslashes_base('spip_syndic', array('nom_site', 'descriptif'));
 		stripslashes_base('spip_syndic_articles', array('titre', 'lesauteurs'));
-		maj_version (1.210);
+		maj_version(1.210);
 	}
 }
 

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -10,7 +10,9 @@
 block discarded – undo
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 function maj_v012_dist($version_installee, $version_cible)
 {

Please login to merge, or discard this patch.

ecrire/maj/v009.php 3 patches

Indentation +100 added lines, -100 removed lines patch added patch discarded remove patch

@@ -14,115 +14,115 @@
 block discarded – undo
 
 function maj_v009_dist($version_installee, $version_cible)
 {
-	if (upgrade_vers(0.98, $version_installee, $version_cible)) {
+    if (upgrade_vers(0.98, $version_installee, $version_cible)) {
 
-		spip_query("ALTER TABLE spip_articles ADD maj TIMESTAMP");
-		spip_query("ALTER TABLE spip_articles ADD export VARCHAR(10) DEFAULT 'oui'");
-		spip_query("ALTER TABLE spip_articles ADD images TEXT DEFAULT ''");
-		spip_query("ALTER TABLE spip_articles ADD date_redac datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		spip_query("ALTER TABLE spip_articles DROP INDEX id_article");
-		spip_query("ALTER TABLE spip_articles ADD INDEX id_rubrique (id_rubrique)");
-		spip_query("ALTER TABLE spip_articles ADD visites INTEGER DEFAULT '0' NOT NULL");
-		spip_query("ALTER TABLE spip_articles ADD referers BLOB NOT NULL");
+        spip_query("ALTER TABLE spip_articles ADD maj TIMESTAMP");
+        spip_query("ALTER TABLE spip_articles ADD export VARCHAR(10) DEFAULT 'oui'");
+        spip_query("ALTER TABLE spip_articles ADD images TEXT DEFAULT ''");
+        spip_query("ALTER TABLE spip_articles ADD date_redac datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
+        spip_query("ALTER TABLE spip_articles DROP INDEX id_article");
+        spip_query("ALTER TABLE spip_articles ADD INDEX id_rubrique (id_rubrique)");
+        spip_query("ALTER TABLE spip_articles ADD visites INTEGER DEFAULT '0' NOT NULL");
+        spip_query("ALTER TABLE spip_articles ADD referers BLOB NOT NULL");
 
-		spip_query("ALTER TABLE spip_auteurs ADD maj TIMESTAMP");
-		spip_query("ALTER TABLE spip_auteurs ADD pgp BLOB NOT NULL");
+        spip_query("ALTER TABLE spip_auteurs ADD maj TIMESTAMP");
+        spip_query("ALTER TABLE spip_auteurs ADD pgp BLOB NOT NULL");
 
-		spip_query("ALTER TABLE spip_auteurs_articles ADD INDEX id_auteur (id_auteur), ADD INDEX id_article (id_article)");
+        spip_query("ALTER TABLE spip_auteurs_articles ADD INDEX id_auteur (id_auteur), ADD INDEX id_article (id_article)");
 	
-		spip_query("ALTER TABLE spip_rubriques ADD maj TIMESTAMP");
-		spip_query("ALTER TABLE spip_rubriques ADD export VARCHAR(10) DEFAULT 'oui', ADD id_import BIGINT DEFAULT '0'");
+        spip_query("ALTER TABLE spip_rubriques ADD maj TIMESTAMP");
+        spip_query("ALTER TABLE spip_rubriques ADD export VARCHAR(10) DEFAULT 'oui', ADD id_import BIGINT DEFAULT '0'");
 	
-		spip_query("ALTER TABLE spip_breves ADD maj TIMESTAMP");
-		spip_query("ALTER TABLE spip_breves DROP INDEX id_breve");
-		spip_query("ALTER TABLE spip_breves DROP INDEX id_breve_2");
-		spip_query("ALTER TABLE spip_breves ADD INDEX id_rubrique (id_rubrique)");
+        spip_query("ALTER TABLE spip_breves ADD maj TIMESTAMP");
+        spip_query("ALTER TABLE spip_breves DROP INDEX id_breve");
+        spip_query("ALTER TABLE spip_breves DROP INDEX id_breve_2");
+        spip_query("ALTER TABLE spip_breves ADD INDEX id_rubrique (id_rubrique)");
 	
-		spip_query("ALTER TABLE spip_forum ADD ip VARCHAR(16)");
-		spip_query("ALTER TABLE spip_forum ADD maj TIMESTAMP");
-		spip_query("ALTER TABLE spip_forum DROP INDEX id_forum");
-		spip_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)");
-		maj_version (0.98);
-	}
-
-	if (upgrade_vers(0.99, $version_installee, $version_cible)) {
+        spip_query("ALTER TABLE spip_forum ADD ip VARCHAR(16)");
+        spip_query("ALTER TABLE spip_forum ADD maj TIMESTAMP");
+        spip_query("ALTER TABLE spip_forum DROP INDEX id_forum");
+        spip_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)");
+        maj_version (0.98);
+    }
+
+    if (upgrade_vers(0.99, $version_installee, $version_cible)) {
 	
-		$result = spip_query("SELECT DISTINCT id_article FROM spip_forum WHERE id_article!=0 AND id_parent=0");
-
-		while ($row = sql_fetch($result)) {
-			unset($forums_article);
-			$id_article = $row['id_article'];
-			$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_article=$id_article");
-			for (;;) {
-				unset($forums);
-				while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
-				if (!$forums) break;
-				$forums = join(',', $forums);
-				$forums_article[] = $forums;
-				$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
-			}
-			$forums_article = join(',', $forums_article);
-			spip_query("UPDATE spip_forum SET id_article=$id_article WHERE id_forum IN ($forums_article)");
-		}
+        $result = spip_query("SELECT DISTINCT id_article FROM spip_forum WHERE id_article!=0 AND id_parent=0");
+
+        while ($row = sql_fetch($result)) {
+            unset($forums_article);
+            $id_article = $row['id_article'];
+            $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_article=$id_article");
+            for (;;) {
+                unset($forums);
+                while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
+                if (!$forums) break;
+                $forums = join(',', $forums);
+                $forums_article[] = $forums;
+                $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
+            }
+            $forums_article = join(',', $forums_article);
+            spip_query("UPDATE spip_forum SET id_article=$id_article WHERE id_forum IN ($forums_article)");
+        }
 	
-		$result = spip_query("SELECT DISTINCT id_breve FROM spip_forum WHERE id_breve!=0 AND id_parent=0");
-
-		while ($row = sql_fetch($result)) {
-			unset($forums_breve);
-			$id_breve = $row['id_breve'];
-			$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_breve=$id_breve");
-			for (;;) {
-				unset($forums);
-				while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
-				if (!$forums) break;
-				$forums = join(',', $forums);
-				$forums_breve[] = $forums;
-				$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
-			}
-			$forums_breve = join(',', $forums_breve);
-			spip_query("UPDATE spip_forum SET id_breve=$id_breve WHERE id_forum IN ($forums_breve)");
-		}
+        $result = spip_query("SELECT DISTINCT id_breve FROM spip_forum WHERE id_breve!=0 AND id_parent=0");
+
+        while ($row = sql_fetch($result)) {
+            unset($forums_breve);
+            $id_breve = $row['id_breve'];
+            $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_breve=$id_breve");
+            for (;;) {
+                unset($forums);
+                while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
+                if (!$forums) break;
+                $forums = join(',', $forums);
+                $forums_breve[] = $forums;
+                $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
+            }
+            $forums_breve = join(',', $forums_breve);
+            spip_query("UPDATE spip_forum SET id_breve=$id_breve WHERE id_forum IN ($forums_breve)");
+        }
 	
-		$result = spip_query("SELECT DISTINCT id_rubrique FROM spip_forum WHERE id_rubrique!=0 AND id_parent=0");
-
-		while ($row = sql_fetch($result)) {
-			unset($forums_rubrique);
-			$id_rubrique = $row['id_rubrique'];
-			$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_rubrique=$id_rubrique");
-			for (;;) {
-
-				unset($forums);
-				while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
-				if (!$forums) break;
-				$forums = join(',', $forums);
-				$forums_rubrique[] = $forums;
-				$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
-			}
-			$forums_rubrique = join(',', $forums_rubrique);
-			spip_query("UPDATE spip_forum SET id_rubrique=$id_rubrique WHERE id_forum IN ($forums_rubrique)");
-
-		}
-		maj_version (0.99);
-	}
-
-	if (upgrade_vers(0.997, $version_installee, $version_cible)) {
-		spip_query("DROP TABLE spip_index");
-		maj_version (0.997);
-	}
-
-	if (upgrade_vers(0.999, $version_installee, $version_cible)) {
-
-		spip_query("ALTER TABLE spip_auteurs CHANGE pass pass tinyblob NOT NULL");
-		spip_query("ALTER TABLE spip_auteurs ADD htpass tinyblob NOT NULL");
-		$result = spip_query("SELECT id_auteur, pass FROM spip_auteurs WHERE pass!=''");
-
-		while ($r= sql_fetch($result)) {
-			$htpass = generer_htpass($r['pass']);
-			$pass = md5($pass);
-			spip_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=" . $r['id_auteur']);
-		}
-		maj_version (0.999);
-	}
+        $result = spip_query("SELECT DISTINCT id_rubrique FROM spip_forum WHERE id_rubrique!=0 AND id_parent=0");
+
+        while ($row = sql_fetch($result)) {
+            unset($forums_rubrique);
+            $id_rubrique = $row['id_rubrique'];
+            $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_rubrique=$id_rubrique");
+            for (;;) {
+
+                unset($forums);
+                while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
+                if (!$forums) break;
+                $forums = join(',', $forums);
+                $forums_rubrique[] = $forums;
+                $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
+            }
+            $forums_rubrique = join(',', $forums_rubrique);
+            spip_query("UPDATE spip_forum SET id_rubrique=$id_rubrique WHERE id_forum IN ($forums_rubrique)");
+
+        }
+        maj_version (0.99);
+    }
+
+    if (upgrade_vers(0.997, $version_installee, $version_cible)) {
+        spip_query("DROP TABLE spip_index");
+        maj_version (0.997);
+    }
+
+    if (upgrade_vers(0.999, $version_installee, $version_cible)) {
+
+        spip_query("ALTER TABLE spip_auteurs CHANGE pass pass tinyblob NOT NULL");
+        spip_query("ALTER TABLE spip_auteurs ADD htpass tinyblob NOT NULL");
+        $result = spip_query("SELECT id_auteur, pass FROM spip_auteurs WHERE pass!=''");
+
+        while ($r= sql_fetch($result)) {
+            $htpass = generer_htpass($r['pass']);
+            $pass = md5($pass);
+            spip_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=" . $r['id_auteur']);
+        }
+        maj_version (0.999);
+    }
 }
 
 ?>

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -42,7 +42,7 @@  discard block
 block discarded – undo
 		spip_query("ALTER TABLE spip_forum ADD maj TIMESTAMP");
 		spip_query("ALTER TABLE spip_forum DROP INDEX id_forum");
 		spip_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)");
-		maj_version (0.98);
+		maj_version(0.98);
 	}
 
 	if (upgrade_vers(0.99, $version_installee, $version_cible)) {
@@ -102,12 +102,12 @@  discard block
 block discarded – undo
 			spip_query("UPDATE spip_forum SET id_rubrique=$id_rubrique WHERE id_forum IN ($forums_rubrique)");
 
 		}
-		maj_version (0.99);
+		maj_version(0.99);
 	}
 
 	if (upgrade_vers(0.997, $version_installee, $version_cible)) {
 		spip_query("DROP TABLE spip_index");
-		maj_version (0.997);
+		maj_version(0.997);
 	}
 
 	if (upgrade_vers(0.999, $version_installee, $version_cible)) {
@@ -116,12 +116,12 @@  discard block
 block discarded – undo
 		spip_query("ALTER TABLE spip_auteurs ADD htpass tinyblob NOT NULL");
 		$result = spip_query("SELECT id_auteur, pass FROM spip_auteurs WHERE pass!=''");
 
-		while ($r= sql_fetch($result)) {
+		while ($r = sql_fetch($result)) {
 			$htpass = generer_htpass($r['pass']);
 			$pass = md5($pass);
-			spip_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=" . $r['id_auteur']);
+			spip_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=".$r['id_auteur']);
 		}
-		maj_version (0.999);
+		maj_version(0.999);
 	}
 }
 

Please login to merge, or discard this patch.

Braces +21 added lines, -7 removed lines patch added patch discarded remove patch

@@ -10,7 +10,9 @@  discard block
 block discarded – undo
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 function maj_v009_dist($version_installee, $version_cible)
 {
@@ -55,8 +57,12 @@  discard block
 block discarded – undo
 			$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_article=$id_article");
 			for (;;) {
 				unset($forums);
-				while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
-				if (!$forums) break;
+				while ($row2 = sql_fetch($result2)) {
+				    $forums[] = $row2['id_forum'];
+				}
+				if (!$forums) {
+				    break;
+				}
 				$forums = join(',', $forums);
 				$forums_article[] = $forums;
 				$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
@@ -73,8 +79,12 @@  discard block
 block discarded – undo
 			$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_breve=$id_breve");
 			for (;;) {
 				unset($forums);
-				while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
-				if (!$forums) break;
+				while ($row2 = sql_fetch($result2)) {
+				    $forums[] = $row2['id_forum'];
+				}
+				if (!$forums) {
+				    break;
+				}
 				$forums = join(',', $forums);
 				$forums_breve[] = $forums;
 				$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
@@ -92,8 +102,12 @@  discard block
 block discarded – undo
 			for (;;) {
 
 				unset($forums);
-				while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
-				if (!$forums) break;
+				while ($row2 = sql_fetch($result2)) {
+				    $forums[] = $row2['id_forum'];
+				}
+				if (!$forums) {
+				    break;
+				}
 				$forums = join(',', $forums);
 				$forums_rubrique[] = $forums;
 				$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");

Please login to merge, or discard this patch.

		@@ -15,109 +15,109 @@
		block discarded – undo
15	15	// http://doc.spip.org/@base_admin_repair_dist
16	16	function base_repair_dist($titre='', $reprise='') {
17	17
18		- $res = admin_repair_tables();
19		- if (!$res) {
20		- $res = "<div class='error'>"._T('avis_erreur_mysql').' '.sql_errno().': '.sql_error() ."</div>\n";
21		- } else {
22		- include_spip('inc/rubriques');
23		- calculer_rubriques();
24		- propager_les_secteurs();
25		- }
26		- include_spip('inc/minipres');
27		- $res .= pipeline('base_admin_repair',$res);
28		- echo minipres(_T('texte_tentative_recuperation'),
29		- $res . generer_form_ecrire('accueil', '','',_T('public:accueil_site')));
	18	+ $res = admin_repair_tables();
	19	+ if (!$res) {
	20	+ $res = "<div class='error'>"._T('avis_erreur_mysql').' '.sql_errno().': '.sql_error() ."</div>\n";
	21	+ } else {
	22	+ include_spip('inc/rubriques');
	23	+ calculer_rubriques();
	24	+ propager_les_secteurs();
	25	+ }
	26	+ include_spip('inc/minipres');
	27	+ $res .= pipeline('base_admin_repair',$res);
	28	+ echo minipres(_T('texte_tentative_recuperation'),
	29	+ $res . generer_form_ecrire('accueil', '','',_T('public:accueil_site')));
30	30	}
31	31
32	32	// http://doc.spip.org/@admin_repair_plat
33	33	function admin_repair_plat(){
34		- spip_log( "verification des documents joints", _LOG_INFO_IMPORTANTE);
35		- $out = "";
36		- $repertoire = array();
37		- include_spip('inc/getdocument');
38		- $res = sql_select('*','spip_documents',"fichier REGEXP CONCAT('^',extension,'[^/\]') AND distant='non'");
	34	+ spip_log( "verification des documents joints", _LOG_INFO_IMPORTANTE);
	35	+ $out = "";
	36	+ $repertoire = array();
	37	+ include_spip('inc/getdocument');
	38	+ $res = sql_select('*','spip_documents',"fichier REGEXP CONCAT('^',extension,'[^/\]') AND distant='non'");
39	39
40		- while ($row=sql_fetch($res)){
41		- $ext = $row['extension'];
42		- if (!$ext) {
43		- spip_log("document sans extension: " . $row['id_document'], _LOG_INFO_IMPORTANTE);
44		- continue;
45		- }
46		- if (!isset($repertoire[$ext])){
47		- if (@file_exists($plat = _DIR_IMG. $ext .".plat"))
48		- spip_unlink($plat);
49		- $repertoire[$ext] = creer_repertoire_documents($ext);
50		- if (preg_match(',_$,',$repertoire[$ext]))
51		- $repertoire[$ext] = false;
52		- }
53		- if ($d=$repertoire[$ext]){
54		- $d = substr($d,strlen(_DIR_IMG));
55		- $src = $row['fichier'];
56		- $dest = $d . substr($src,strlen($d));
57		- if (@copy(_DIR_IMG . $src, _DIR_IMG . $dest)
58		- AND file_exists(_DIR_IMG . $dest)) {
59		- sql_updateq('spip_documents',array('fichier'=>$dest),'id_document='.intval($row['id_document']));
60		- spip_unlink(_DIR_IMG . $src);
61		- $out .= "$src => $dest<br />";
62		- }
63		- }
64		- }
	40	+ while ($row=sql_fetch($res)){
	41	+ $ext = $row['extension'];
	42	+ if (!$ext) {
	43	+ spip_log("document sans extension: " . $row['id_document'], _LOG_INFO_IMPORTANTE);
	44	+ continue;
	45	+ }
	46	+ if (!isset($repertoire[$ext])){
	47	+ if (@file_exists($plat = _DIR_IMG. $ext .".plat"))
	48	+ spip_unlink($plat);
	49	+ $repertoire[$ext] = creer_repertoire_documents($ext);
	50	+ if (preg_match(',_$,',$repertoire[$ext]))
	51	+ $repertoire[$ext] = false;
	52	+ }
	53	+ if ($d=$repertoire[$ext]){
	54	+ $d = substr($d,strlen(_DIR_IMG));
	55	+ $src = $row['fichier'];
	56	+ $dest = $d . substr($src,strlen($d));
	57	+ if (@copy(_DIR_IMG . $src, _DIR_IMG . $dest)
	58	+ AND file_exists(_DIR_IMG . $dest)) {
	59	+ sql_updateq('spip_documents',array('fichier'=>$dest),'id_document='.intval($row['id_document']));
	60	+ spip_unlink(_DIR_IMG . $src);
	61	+ $out .= "$src => $dest<br />";
	62	+ }
	63	+ }
	64	+ }
65	65
66		- return $out;
	66	+ return $out;
67	67	}
68	68
69	69	// http://doc.spip.org/@admin_repair_tables
70	70	function admin_repair_tables() {
71	71
72		- $repair = sql_repair('repair', NULL, 'continue');
	72	+ $repair = sql_repair('repair', NULL, 'continue');
73	73
74		- // recreer les tables manquantes eventuelles
75		- include_spip('base/create');
76		- creer_base();
	74	+ // recreer les tables manquantes eventuelles
	75	+ include_spip('base/create');
	76	+ creer_base();
77	77
78		- $connexion = $GLOBALS['connexions'][0];
79		- $prefixe = $connexion['prefixe'];
80		- $res1 = sql_showbase();
81		- $res = "";
82		- if ($res1) {
83		- while ($r = sql_fetch($res1)) {
84		- $tab = array_shift($r);
	78	+ $connexion = $GLOBALS['connexions'][0];
	79	+ $prefixe = $connexion['prefixe'];
	80	+ $res1 = sql_showbase();
	81	+ $res = "";
	82	+ if ($res1) {
	83	+ while ($r = sql_fetch($res1)) {
	84	+ $tab = array_shift($r);
85	85
86		- $class = "";
87		- $m = "<strong>$tab</strong> ";
88		- spip_log("Repare $tab", _LOG_INFO_IMPORTANTE);
89		- // supprimer la meta avant de lancer la reparation
90		- // car le repair peut etre long ; on ne veut pas boucler
91		- effacer_meta('admin_repair');
92		- if ($repair){
93		- $result_repair = sql_repair($tab);
94		- if (!$result_repair) return false;
95		- }
	86	+ $class = "";
	87	+ $m = "<strong>$tab</strong> ";
	88	+ spip_log("Repare $tab", _LOG_INFO_IMPORTANTE);
	89	+ // supprimer la meta avant de lancer la reparation
	90	+ // car le repair peut etre long ; on ne veut pas boucler
	91	+ effacer_meta('admin_repair');
	92	+ if ($repair){
	93	+ $result_repair = sql_repair($tab);
	94	+ if (!$result_repair) return false;
	95	+ }
96	96
97		- // essayer de maj la table (creation de champs manquants)
98		- maj_tables($tab);
	97	+ // essayer de maj la table (creation de champs manquants)
	98	+ maj_tables($tab);
99	99
100		- $count = sql_countsel($tab);
	100	+ $count = sql_countsel($tab);
101	101
102		- if ($count>1)
103		- $m .= "("._T('texte_compte_elements', array('count' => $count)).")\n";
104		- else if ($count==1)
105		- $m .= "("._T('texte_compte_element', array('count' => $count)).")\n";
106		- else
107		- $m .= "("._T('texte_vide').")\n";
	102	+ if ($count>1)
	103	+ $m .= "("._T('texte_compte_elements', array('count' => $count)).")\n";
	104	+ else if ($count==1)
	105	+ $m .= "("._T('texte_compte_element', array('count' => $count)).")\n";
	106	+ else
	107	+ $m .= "("._T('texte_vide').")\n";
108	108
109		- if ($result_repair
110		- AND $msg = join(" ", sql_fetch($result_repair)) . ' '
111		- AND strpos($msg, ' OK ')==FALSE){
112		- $class = " class='notice'";
113		- $m .= "<br /><tt>".spip_htmlentities($msg)."</tt>\n";
114		- }
115		- else
116		- $m .= " "._T('texte_table_ok');
	109	+ if ($result_repair
	110	+ AND $msg = join(" ", sql_fetch($result_repair)) . ' '
	111	+ AND strpos($msg, ' OK ')==FALSE){
	112	+ $class = " class='notice'";
	113	+ $m .= "<br /><tt>".spip_htmlentities($msg)."</tt>\n";
	114	+ }
	115	+ else
	116	+ $m .= " "._T('texte_table_ok');
117	117
118		- $res .="<div$class>$m</div>";
119		- }
120		- }
121		- return $res;
	118	+ $res .="<div$class>$m</div>";
	119	+ }
	120	+ }
	121	+ return $res;
122	122	}
123	123	?>

		@@ -13,51 +13,51 @@ discard block
		block discarded – undo
13	13	if (!defined('_ECRIRE_INC_VERSION')) return;
14	14
15	15	// http://doc.spip.org/@base_admin_repair_dist
16		-function base_repair_dist($titre='', $reprise='') {
	16	+function base_repair_dist($titre = '', $reprise = '') {
17	17
18	18	$res = admin_repair_tables();
19	19	if (!$res) {
20		- $res = "<div class='error'>"._T('avis_erreur_mysql').' '.sql_errno().': '.sql_error() ."</div>\n";
	20	+ $res = "<div class='error'>"._T('avis_erreur_mysql').' '.sql_errno().': '.sql_error()."</div>\n";
21	21	} else {
22	22	include_spip('inc/rubriques');
23	23	calculer_rubriques();
24	24	propager_les_secteurs();
25	25	}
26	26	include_spip('inc/minipres');
27		- $res .= pipeline('base_admin_repair',$res);
	27	+ $res .= pipeline('base_admin_repair', $res);
28	28	echo minipres(_T('texte_tentative_recuperation'),
29		- $res . generer_form_ecrire('accueil', '','',_T('public:accueil_site')));
	29	+ $res.generer_form_ecrire('accueil', '', '', _T('public:accueil_site')));
30	30	}
31	31
32	32	// http://doc.spip.org/@admin_repair_plat
33		-function admin_repair_plat(){
34		- spip_log( "verification des documents joints", _LOG_INFO_IMPORTANTE);
	33	+function admin_repair_plat() {
	34	+ spip_log("verification des documents joints", _LOG_INFO_IMPORTANTE);
35	35	$out = "";
36	36	$repertoire = array();
37	37	include_spip('inc/getdocument');
38		- $res = sql_select('*','spip_documents',"fichier REGEXP CONCAT('^',extension,'[^/\]') AND distant='non'");
	38	+ $res = sql_select('*', 'spip_documents', "fichier REGEXP CONCAT('^',extension,'[^/\]') AND distant='non'");
39	39
40		- while ($row=sql_fetch($res)){
	40	+ while ($row = sql_fetch($res)) {
41	41	$ext = $row['extension'];
42	42	if (!$ext) {
43		- spip_log("document sans extension: " . $row['id_document'], _LOG_INFO_IMPORTANTE);
	43	+ spip_log("document sans extension: ".$row['id_document'], _LOG_INFO_IMPORTANTE);
44	44	continue;
45	45	}
46		- if (!isset($repertoire[$ext])){
47		- if (@file_exists($plat = _DIR_IMG. $ext .".plat"))
	46	+ if (!isset($repertoire[$ext])) {
	47	+ if (@file_exists($plat = _DIR_IMG.$ext.".plat"))
48	48	spip_unlink($plat);
49	49	$repertoire[$ext] = creer_repertoire_documents($ext);
50		- if (preg_match(',_$,',$repertoire[$ext]))
	50	+ if (preg_match(',_$,', $repertoire[$ext]))
51	51	$repertoire[$ext] = false;
52	52	}
53		- if ($d=$repertoire[$ext]){
54		- $d = substr($d,strlen(_DIR_IMG));
	53	+ if ($d = $repertoire[$ext]) {
	54	+ $d = substr($d, strlen(_DIR_IMG));
55	55	$src = $row['fichier'];
56		- $dest = $d . substr($src,strlen($d));
57		- if (@copy(_DIR_IMG . $src, _DIR_IMG . $dest)
58		- AND file_exists(_DIR_IMG . $dest)) {
59		- sql_updateq('spip_documents',array('fichier'=>$dest),'id_document='.intval($row['id_document']));
60		- spip_unlink(_DIR_IMG . $src);
	56	+ $dest = $d.substr($src, strlen($d));
	57	+ if (@copy(_DIR_IMG.$src, _DIR_IMG.$dest)
	58	+ AND file_exists(_DIR_IMG.$dest)) {
	59	+ sql_updateq('spip_documents', array('fichier'=>$dest), 'id_document='.intval($row['id_document']));
	60	+ spip_unlink(_DIR_IMG.$src);
61	61	$out .= "$src => $dest<br />";
62	62	}
63	63	}
		@@ -89,7 +89,7 @@ discard block
		block discarded – undo
89	89	// supprimer la meta avant de lancer la reparation
90	90	// car le repair peut etre long ; on ne veut pas boucler
91	91	effacer_meta('admin_repair');
92		- if ($repair){
	92	+ if ($repair) {
93	93	$result_repair = sql_repair($tab);
94	94	if (!$result_repair) return false;
95	95	}
		@@ -99,23 +99,23 @@ discard block
		block discarded – undo
99	99
100	100	$count = sql_countsel($tab);
101	101
102		- if ($count>1)
	102	+ if ($count > 1)
103	103	$m .= "("._T('texte_compte_elements', array('count' => $count)).")\n";
104		- else if ($count==1)
	104	+ else if ($count == 1)
105	105	$m .= "("._T('texte_compte_element', array('count' => $count)).")\n";
106	106	else
107	107	$m .= "("._T('texte_vide').")\n";
108	108
109	109	if ($result_repair
110		- AND $msg = join(" ", sql_fetch($result_repair)) . ' '
111		- AND strpos($msg, ' OK ')==FALSE){
	110	+ AND $msg = join(" ", sql_fetch($result_repair)).' '
	111	+ AND strpos($msg, ' OK ') == FALSE) {
112	112	$class = " class='notice'";
113	113	$m .= "<br /><tt>".spip_htmlentities($msg)."</tt>\n";
114	114	}
115	115	else
116	116	$m .= " "._T('texte_table_ok');
117	117
118		- $res .="<div$class>$m</div>";
	118	+ $res .= "<div$class>$m</div>";
119	119	}
120	120	}
121	121	return $res;

		@@ -10,7 +10,9 @@ discard block
		block discarded – undo
10	10	* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
11	11	\***************************************************************************/
12	12
13		-if (!defined('_ECRIRE_INC_VERSION')) return;
	13	+if (!defined('_ECRIRE_INC_VERSION')) {
	14	+ return;
	15	+}
14	16
15	17	// http://doc.spip.org/@base_admin_repair_dist
16	18	function base_repair_dist($titre='', $reprise='') {
		@@ -44,11 +46,13 @@ discard block
		block discarded – undo
44	46	continue;
45	47	}
46	48	if (!isset($repertoire[$ext])){
47		- if (@file_exists($plat = _DIR_IMG. $ext .".plat"))
48		- spip_unlink($plat);
	49	+ if (@file_exists($plat = _DIR_IMG. $ext .".plat")) {
	50	+ spip_unlink($plat);
	51	+ }
49	52	$repertoire[$ext] = creer_repertoire_documents($ext);
50		- if (preg_match(',_$,',$repertoire[$ext]))
51		- $repertoire[$ext] = false;
	53	+ if (preg_match(',_$,',$repertoire[$ext])) {
	54	+ $repertoire[$ext] = false;
	55	+ }
52	56	}
53	57	if ($d=$repertoire[$ext]){
54	58	$d = substr($d,strlen(_DIR_IMG));
		@@ -91,7 +95,9 @@ discard block
		block discarded – undo
91	95	effacer_meta('admin_repair');
92	96	if ($repair){
93	97	$result_repair = sql_repair($tab);
94		- if (!$result_repair) return false;
	98	+ if (!$result_repair) {
	99	+ return false;
	100	+ }
95	101	}
96	102
97	103	// essayer de maj la table (creation de champs manquants)
		@@ -99,21 +105,22 @@ discard block
		block discarded – undo
99	105
100	106	$count = sql_countsel($tab);
101	107
102		- if ($count>1)
103		- $m .= "("._T('texte_compte_elements', array('count' => $count)).")\n";
104		- else if ($count==1)
105		- $m .= "("._T('texte_compte_element', array('count' => $count)).")\n";
106		- else
107		- $m .= "("._T('texte_vide').")\n";
	108	+ if ($count>1) {
	109	+ $m .= "("._T('texte_compte_elements', array('count' => $count)).")\n";
	110	+ } else if ($count==1) {
	111	+ $m .= "("._T('texte_compte_element', array('count' => $count)).")\n";
	112	+ } else {
	113	+ $m .= "("._T('texte_vide').")\n";
	114	+ }
108	115
109	116	if ($result_repair
110	117	AND $msg = join(" ", sql_fetch($result_repair)) . ' '
111	118	AND strpos($msg, ' OK ')==FALSE){
112	119	$class = " class='notice'";
113	120	$m .= "<br /><tt>".spip_htmlentities($msg)."</tt>\n";
	121	+ } else {
	122	+ $m .= " "._T('texte_table_ok');
114	123	}
115		- else
116		- $m .= " "._T('texte_table_ok');
117	124
118	125	$res .="<div$class>$m</div>";
119	126	}

		@@ -15,26 +15,26 @@
		block discarded – undo
15	15	// http://doc.spip.org/@base_delete_all_dist
16	16	function base_delete_all_dist($titre)
17	17	{
18		- $delete = _request('delete');
19		- $res = array();
20		- if (is_array($delete)) {
21		- foreach ($delete as $table) {
22		- if (sql_drop_table($table))
23		- $res[] = $table;
24		- else spip_log( "SPIP n'a pas pu detruire $table.", _LOG_ERREUR);
25		- }
	18	+ $delete = _request('delete');
	19	+ $res = array();
	20	+ if (is_array($delete)) {
	21	+ foreach ($delete as $table) {
	22	+ if (sql_drop_table($table))
	23	+ $res[] = $table;
	24	+ else spip_log( "SPIP n'a pas pu detruire $table.", _LOG_ERREUR);
	25	+ }
26	26
27		- // un pipeline pour detruire les tables installees par les plugins
28		- pipeline('delete_tables', '');
	27	+ // un pipeline pour detruire les tables installees par les plugins
	28	+ pipeline('delete_tables', '');
29	29
30		- spip_unlink(_FILE_CONNECT);
31		- spip_unlink(_FILE_CHMOD);
32		- spip_unlink(_FILE_META);
33		- spip_unlink(_ACCESS_FILE_NAME);
34		- spip_unlink(_CACHE_RUBRIQUES);
35		- }
36		- $d = count($delete);
37		- $r = count($res);
38		- spip_log("Tables detruites: $r sur $d: " . join(', ',$res), _LOG_INFO_IMPORTANTE);
	30	+ spip_unlink(_FILE_CONNECT);
	31	+ spip_unlink(_FILE_CHMOD);
	32	+ spip_unlink(_FILE_META);
	33	+ spip_unlink(_ACCESS_FILE_NAME);
	34	+ spip_unlink(_CACHE_RUBRIQUES);
	35	+ }
	36	+ $d = count($delete);
	37	+ $r = count($res);
	38	+ spip_log("Tables detruites: $r sur $d: " . join(', ',$res), _LOG_INFO_IMPORTANTE);
39	39	}
40	40	?>

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	foreach ($delete as $table) {
22	22	if (sql_drop_table($table))
23	23	$res[] = $table;
24		- else spip_log( "SPIP n'a pas pu detruire $table.", _LOG_ERREUR);
	24	+ else spip_log("SPIP n'a pas pu detruire $table.", _LOG_ERREUR);
25	25	}
26	26
27	27	// un pipeline pour detruire les tables installees par les plugins
		@@ -35,6 +35,6 @@ discard block
		block discarded – undo
35	35	}
36	36	$d = count($delete);
37	37	$r = count($res);
38		- spip_log("Tables detruites: $r sur $d: " . join(', ',$res), _LOG_INFO_IMPORTANTE);
	38	+ spip_log("Tables detruites: $r sur $d: ".join(', ', $res), _LOG_INFO_IMPORTANTE);
39	39	}
40	40	?>

		@@ -10,7 +10,9 @@
		block discarded – undo
10	10	* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
11	11	\***************************************************************************/
12	12
13		-if (!defined('_ECRIRE_INC_VERSION')) return;
	13	+if (!defined('_ECRIRE_INC_VERSION')) {
	14	+ return;
	15	+}
14	16
15	17	function maj_v015_dist($version_installee, $version_cible)
16	18	{

		@@ -15,50 +15,50 @@
		block discarded – undo
15	15
16	16	function maj_v013_dist($version_installee, $version_cible)
17	17	{
18		- if (upgrade_vers(1.3, $version_installee, $version_cible)) {
19		- // Modifier la syndication (pour liste de sites)
20		- spip_query("ALTER TABLE spip_syndic ADD syndication VARCHAR(3) NOT NULL");
21		- spip_query("ALTER TABLE spip_syndic ADD statut VARCHAR(10) NOT NULL");
22		- spip_query("ALTER TABLE spip_syndic ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
23		- spip_query("UPDATE spip_syndic SET syndication='oui', statut='publie', date=NOW()");
	18	+ if (upgrade_vers(1.3, $version_installee, $version_cible)) {
	19	+ // Modifier la syndication (pour liste de sites)
	20	+ spip_query("ALTER TABLE spip_syndic ADD syndication VARCHAR(3) NOT NULL");
	21	+ spip_query("ALTER TABLE spip_syndic ADD statut VARCHAR(10) NOT NULL");
	22	+ spip_query("ALTER TABLE spip_syndic ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
	23	+ spip_query("UPDATE spip_syndic SET syndication='oui', statut='publie', date=NOW()");
24	24
25		- // Statut pour articles syndication, pour pouvoir desactiver un article
26		- spip_query("ALTER TABLE spip_syndic_articles ADD statut VARCHAR(10) NOT NULL");
27		- spip_query("UPDATE spip_syndic_articles SET statut='publie'");
28		- maj_version (1.3);
29		- }
	25	+ // Statut pour articles syndication, pour pouvoir desactiver un article
	26	+ spip_query("ALTER TABLE spip_syndic_articles ADD statut VARCHAR(10) NOT NULL");
	27	+ spip_query("UPDATE spip_syndic_articles SET statut='publie'");
	28	+ maj_version (1.3);
	29	+ }
30	30
31		- if (upgrade_vers(1.301, $version_installee, $version_cible)) {
32		- spip_query("ALTER TABLE spip_forum ADD id_syndic bigint(21) DEFAULT '0' NOT NULL");
33		- maj_version (1.301);
34		- }
	31	+ if (upgrade_vers(1.301, $version_installee, $version_cible)) {
	32	+ spip_query("ALTER TABLE spip_forum ADD id_syndic bigint(21) DEFAULT '0' NOT NULL");
	33	+ maj_version (1.301);
	34	+ }
35	35
36		- if (upgrade_vers(1.302, $version_installee, $version_cible)) {
37		- # spip_query("ALTER TABLE spip_forum_cache DROP PRIMARY KEY");
38		- # spip_query("ALTER TABLE spip_forum_cache DROP INDEX fichier");
39		- # spip_query("ALTER TABLE spip_forum_cache ADD PRIMARY KEY (fichier, id_forum, id_article, id_rubrique, id_breve, id_syndic)");
40		- spip_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
41		- maj_version (1.302);
42		- }
	36	+ if (upgrade_vers(1.302, $version_installee, $version_cible)) {
	37	+ # spip_query("ALTER TABLE spip_forum_cache DROP PRIMARY KEY");
	38	+ # spip_query("ALTER TABLE spip_forum_cache DROP INDEX fichier");
	39	+ # spip_query("ALTER TABLE spip_forum_cache ADD PRIMARY KEY (fichier, id_forum, id_article, id_rubrique, id_breve, id_syndic)");
	40	+ spip_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
	41	+ maj_version (1.302);
	42	+ }
43	43
44		- if (upgrade_vers(1.303, $version_installee, $version_cible)) {
45		- spip_query("ALTER TABLE spip_rubriques ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
46		- spip_query("ALTER TABLE spip_syndic ADD date_syndic datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
47		- spip_query("UPDATE spip_syndic SET date_syndic=date");
48		- maj_version (1.303);
49		- }
	44	+ if (upgrade_vers(1.303, $version_installee, $version_cible)) {
	45	+ spip_query("ALTER TABLE spip_rubriques ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
	46	+ spip_query("ALTER TABLE spip_syndic ADD date_syndic datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
	47	+ spip_query("UPDATE spip_syndic SET date_syndic=date");
	48	+ maj_version (1.303);
	49	+ }
50	50
51		- if (upgrade_vers(1.306, $version_installee, $version_cible)) {
52		- spip_query("DROP TABLE spip_index_syndic_articles");
53		- spip_query("ALTER TABLE spip_syndic ADD date_index datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
54		- spip_query("ALTER TABLE spip_syndic ADD INDEX date_index (date_index)");
55		- maj_version (1.306);
56		- }
	51	+ if (upgrade_vers(1.306, $version_installee, $version_cible)) {
	52	+ spip_query("DROP TABLE spip_index_syndic_articles");
	53	+ spip_query("ALTER TABLE spip_syndic ADD date_index datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
	54	+ spip_query("ALTER TABLE spip_syndic ADD INDEX date_index (date_index)");
	55	+ maj_version (1.306);
	56	+ }
57	57
58		- if (upgrade_vers(1.307, $version_installee, $version_cible)) {
59		- spip_query("ALTER TABLE spip_syndic_articles ADD descriptif blob NOT NULL");
60		- maj_version (1.307);
61		- }
	58	+ if (upgrade_vers(1.307, $version_installee, $version_cible)) {
	59	+ spip_query("ALTER TABLE spip_syndic_articles ADD descriptif blob NOT NULL");
	60	+ maj_version (1.307);
	61	+ }
62	62	}
63	63
64	64

		@@ -25,12 +25,12 @@ discard block
		block discarded – undo
25	25	// Statut pour articles syndication, pour pouvoir desactiver un article
26	26	spip_query("ALTER TABLE spip_syndic_articles ADD statut VARCHAR(10) NOT NULL");
27	27	spip_query("UPDATE spip_syndic_articles SET statut='publie'");
28		- maj_version (1.3);
	28	+ maj_version(1.3);
29	29	}
30	30
31	31	if (upgrade_vers(1.301, $version_installee, $version_cible)) {
32	32	spip_query("ALTER TABLE spip_forum ADD id_syndic bigint(21) DEFAULT '0' NOT NULL");
33		- maj_version (1.301);
	33	+ maj_version(1.301);
34	34	}
35	35
36	36	if (upgrade_vers(1.302, $version_installee, $version_cible)) {
		@@ -38,26 +38,26 @@ discard block
		block discarded – undo
38	38	# spip_query("ALTER TABLE spip_forum_cache DROP INDEX fichier");
39	39	# spip_query("ALTER TABLE spip_forum_cache ADD PRIMARY KEY (fichier, id_forum, id_article, id_rubrique, id_breve, id_syndic)");
40	40	spip_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
41		- maj_version (1.302);
	41	+ maj_version(1.302);
42	42	}
43	43
44	44	if (upgrade_vers(1.303, $version_installee, $version_cible)) {
45	45	spip_query("ALTER TABLE spip_rubriques ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
46	46	spip_query("ALTER TABLE spip_syndic ADD date_syndic datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
47	47	spip_query("UPDATE spip_syndic SET date_syndic=date");
48		- maj_version (1.303);
	48	+ maj_version(1.303);
49	49	}
50	50
51	51	if (upgrade_vers(1.306, $version_installee, $version_cible)) {
52	52	spip_query("DROP TABLE spip_index_syndic_articles");
53	53	spip_query("ALTER TABLE spip_syndic ADD date_index datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
54	54	spip_query("ALTER TABLE spip_syndic ADD INDEX date_index (date_index)");
55		- maj_version (1.306);
	55	+ maj_version(1.306);
56	56	}
57	57
58	58	if (upgrade_vers(1.307, $version_installee, $version_cible)) {
59	59	spip_query("ALTER TABLE spip_syndic_articles ADD descriptif blob NOT NULL");
60		- maj_version (1.307);
	60	+ maj_version(1.307);
61	61	}
62	62	}
63	63

		@@ -14,178 +14,178 @@
		block discarded – undo
14	14
15	15	function maj_v017_dist($version_installee, $version_cible)
16	16	{
17		- if (upgrade_vers(1.702, $version_installee, $version_cible)) {
18		- spip_query("ALTER TABLE spip_articles ADD extra longblob NULL");
19		- spip_query("ALTER TABLE spip_auteurs ADD extra longblob NULL");
20		- spip_query("ALTER TABLE spip_breves ADD extra longblob NULL");
21		- spip_query("ALTER TABLE spip_rubriques ADD extra longblob NULL");
22		- spip_query("ALTER TABLE spip_mots ADD extra longblob NULL");
23		-
24		- // recuperer les eventuels 'supplement' installes en 1.701
25		- if ($version_installee == 1.701) {
26		- spip_query("UPDATE spip_articles SET extra = supplement");
27		- spip_query("ALTER TABLE spip_articles DROP supplement");
28		- spip_query("UPDATE spip_auteurs SET extra = supplement");
29		- spip_query("ALTER TABLE spip_auteurs DROP supplement");
30		- spip_query("UPDATE spip_breves SET extra = supplement");
31		- spip_query("ALTER TABLE spip_breves DROP supplement");
32		- spip_query("UPDATE spip_rubriques SET extra = supplement");
33		- spip_query("ALTER TABLE spip_rubriques DROP supplement");
34		- spip_query("UPDATE spip_mots SET extra = supplement");
35		- spip_query("ALTER TABLE spip_mots DROP supplement");
36		- }
	17	+ if (upgrade_vers(1.702, $version_installee, $version_cible)) {
	18	+ spip_query("ALTER TABLE spip_articles ADD extra longblob NULL");
	19	+ spip_query("ALTER TABLE spip_auteurs ADD extra longblob NULL");
	20	+ spip_query("ALTER TABLE spip_breves ADD extra longblob NULL");
	21	+ spip_query("ALTER TABLE spip_rubriques ADD extra longblob NULL");
	22	+ spip_query("ALTER TABLE spip_mots ADD extra longblob NULL");
	23	+
	24	+ // recuperer les eventuels 'supplement' installes en 1.701
	25	+ if ($version_installee == 1.701) {
	26	+ spip_query("UPDATE spip_articles SET extra = supplement");
	27	+ spip_query("ALTER TABLE spip_articles DROP supplement");
	28	+ spip_query("UPDATE spip_auteurs SET extra = supplement");
	29	+ spip_query("ALTER TABLE spip_auteurs DROP supplement");
	30	+ spip_query("UPDATE spip_breves SET extra = supplement");
	31	+ spip_query("ALTER TABLE spip_breves DROP supplement");
	32	+ spip_query("UPDATE spip_rubriques SET extra = supplement");
	33	+ spip_query("ALTER TABLE spip_rubriques DROP supplement");
	34	+ spip_query("UPDATE spip_mots SET extra = supplement");
	35	+ spip_query("ALTER TABLE spip_mots DROP supplement");
	36	+ }
37	37
38		- $u = spip_query("SELECT extra FROM spip_articles");
39		- $u&= spip_query("SELECT extra FROM spip_auteurs");
40		- $u&= spip_query("SELECT extra FROM spip_breves");
41		- $u&= spip_query("SELECT extra FROM spip_rubriques");
42		- $u&= spip_query("SELECT extra FROM spip_mots");
43		- maj_version (1.702,$u);
44		- }
45		-
46		- if (upgrade_vers(1.703, $version_installee, $version_cible)) {
47		- spip_query("ALTER TABLE spip_articles ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
48		- spip_query("ALTER TABLE spip_rubriques ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
49		- maj_version (1.703);
50		- }
51		-
52		- if (upgrade_vers(1.704, $version_installee, $version_cible)) {
53		- spip_query("ALTER TABLE spip_articles ADD INDEX lang (lang)");
54		- spip_query("ALTER TABLE spip_auteurs ADD INDEX lang (lang)");
55		- spip_query("ALTER TABLE spip_rubriques ADD INDEX lang (lang)");
56		- maj_version (1.704);
57		- }
58		-
59		- if (upgrade_vers(1.705, $version_installee, $version_cible)) {
60		- spip_query("ALTER TABLE spip_articles ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
61		- spip_query("ALTER TABLE spip_rubriques ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
62		- maj_version (1.705);
63		- }
64		-
65		- if (upgrade_vers(1.707, $version_installee, $version_cible)) {
66		- spip_query("UPDATE spip_articles SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
67		- spip_query("UPDATE spip_articles SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
68		- spip_query("UPDATE spip_rubriques SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
69		- spip_query("UPDATE spip_rubriques SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
70		- maj_version (1.707);
71		- }
72		-
73		- if (upgrade_vers(1.708, $version_installee, $version_cible)) {
74		- spip_query("ALTER TABLE spip_breves ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
75		- spip_query("ALTER TABLE spip_breves ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
76		- maj_version (1.708);
77		- }
78		-
79		- if (upgrade_vers(1.709, $version_installee, $version_cible)) {
80		- spip_query("ALTER TABLE spip_articles ADD id_trad bigint(21) DEFAULT '0' NOT NULL");
81		- spip_query("ALTER TABLE spip_articles ADD INDEX id_trad (id_trad)");
82		- maj_version (1.709);
83		- }
84		-
85		- if (upgrade_vers(1.717, $version_installee, $version_cible)) {
86		- spip_query("ALTER TABLE spip_articles ADD INDEX date_modif (date_modif)");
87		- maj_version (1.717);
88		- }
89		-
90		- if (upgrade_vers(1.718, $version_installee, $version_cible)) {
91		- spip_query("ALTER TABLE spip_referers DROP domaine");
92		- spip_query("ALTER TABLE spip_referers_articles DROP domaine");
93		- spip_query("ALTER TABLE spip_referers_temp DROP domaine");
94		- maj_version (1.718);
95		- }
96		-
97		- if (upgrade_vers(1.722, $version_installee, $version_cible)) {
98		- spip_query("ALTER TABLE spip_articles ADD nom_site tinytext NOT NULL");
99		- spip_query("ALTER TABLE spip_articles ADD url_site VARCHAR(255) NOT NULL");
100		- spip_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site)");
101		- if ($version_installee >= 1.720) {
102		- spip_query("UPDATE spip_articles SET url_site=url_ref");
103		- spip_query("ALTER TABLE spip_articles DROP INDEX url_ref");
104		- spip_query("ALTER TABLE spip_articles DROP url_ref");
105		- }
106		- maj_version (1.722);
107		- }
108		-
109		- if (upgrade_vers(1.723, $version_installee, $version_cible)) {
110		- if ($version_installee == 1.722) {
111		- spip_query("ALTER TABLE spip_articles MODIFY url_site VARCHAR(255) NOT NULL");
112		- spip_query("ALTER TABLE spip_articles DROP INDEX url_site;");
113		- spip_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site);");
114		- }
115		- maj_version (1.723);
116		- }
117		-
118		- if (upgrade_vers(1.724, $version_installee, $version_cible)) {
119		- spip_query("ALTER TABLE spip_messages ADD date_fin datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
120		- maj_version (1.724);
121		- }
122		-
123		- if (upgrade_vers(1.726, $version_installee, $version_cible)) {
124		- spip_query("ALTER TABLE spip_auteurs ADD low_sec tinytext NOT NULL");
125		- maj_version (1.726);
126		- }
127		-
128		- if (upgrade_vers(1.727, $version_installee, $version_cible)) {
129		- // occitans : oci_xx -> oc_xx
130		- spip_query("UPDATE spip_auteurs SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
131		- spip_query("UPDATE spip_rubriques SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
132		- spip_query("UPDATE spip_articles SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
133		- spip_query("UPDATE spip_breves SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
134		- maj_version (1.727);
135		- }
136		-
137		- // Ici version 1.7 officielle
138		- if (upgrade_vers(1.728, $version_installee, $version_cible)) {
139		- spip_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
140		- maj_version (1.728);
141		- }
142		-
143		- if (upgrade_vers(1.730, $version_installee, $version_cible)) {
144		- spip_query("ALTER TABLE spip_articles ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
145		- spip_query("ALTER TABLE spip_articles ADD INDEX idx (idx)");
146		- spip_query("ALTER TABLE spip_auteurs ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
147		- spip_query("ALTER TABLE spip_auteurs ADD INDEX idx (idx)");
148		- spip_query("ALTER TABLE spip_breves ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
149		- spip_query("ALTER TABLE spip_breves ADD INDEX idx (idx)");
150		- spip_query("ALTER TABLE spip_mots ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
151		- spip_query("ALTER TABLE spip_mots ADD INDEX idx (idx)");
152		- spip_query("ALTER TABLE spip_rubriques ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
153		- spip_query("ALTER TABLE spip_rubriques ADD INDEX idx (idx)");
154		- spip_query("ALTER TABLE spip_syndic ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
155		- spip_query("ALTER TABLE spip_syndic ADD INDEX idx (idx)");
156		- spip_query("ALTER TABLE spip_forum ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
157		- spip_query("ALTER TABLE spip_forum ADD INDEX idx (idx)");
158		- spip_query("ALTER TABLE spip_signatures ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
159		- spip_query("ALTER TABLE spip_signatures ADD INDEX idx (idx)");
160		- maj_version (1.730);
161		- }
162		-
163		- if (upgrade_vers(1.731, $version_installee, $version_cible)) {
164		- spip_query("UPDATE spip_articles SET idx='1' where lang IN ('de','vi')");
165		- spip_query("UPDATE spip_rubriques SET idx='1' where lang IN ('de','vi')");
166		- spip_query("UPDATE spip_breves SET idx='1' where lang IN ('de','vi')");
167		- spip_query("UPDATE spip_auteurs SET idx='1' where lang IN ('de','vi')");
168		- maj_version (1.731);
169		- }
170		-
171		- if (upgrade_vers(1.732, $version_installee, $version_cible)) { // en correction d'un vieux truc qui avait fait sauter le champ inclus sur les bases version 1.415
172		- spip_query("ALTER TABLE spip_documents ADD inclus VARCHAR(3) DEFAULT 'non'");
173		- maj_version (1.732);
174		- }
175		-
176		- if (upgrade_vers(1.733, $version_installee, $version_cible)) {
177		- // spip_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
178		- spip_query("DROP TABLE spip_versions");
179		- spip_query("DROP TABLE spip_versions_fragments");
180		- creer_base();
181		- maj_version(1.733);
182		- }
183		-
184		- #if ($version_installee < 1.734) {
185		- # // integrer nouvelles tables auxiliaires du compilateur ESJ
186		- # creer_base();
187		- # maj_version(1.734);
188		- #}
	38	+ $u = spip_query("SELECT extra FROM spip_articles");
	39	+ $u&= spip_query("SELECT extra FROM spip_auteurs");
	40	+ $u&= spip_query("SELECT extra FROM spip_breves");
	41	+ $u&= spip_query("SELECT extra FROM spip_rubriques");
	42	+ $u&= spip_query("SELECT extra FROM spip_mots");
	43	+ maj_version (1.702,$u);
	44	+ }
	45	+
	46	+ if (upgrade_vers(1.703, $version_installee, $version_cible)) {
	47	+ spip_query("ALTER TABLE spip_articles ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
	48	+ spip_query("ALTER TABLE spip_rubriques ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
	49	+ maj_version (1.703);
	50	+ }
	51	+
	52	+ if (upgrade_vers(1.704, $version_installee, $version_cible)) {
	53	+ spip_query("ALTER TABLE spip_articles ADD INDEX lang (lang)");
	54	+ spip_query("ALTER TABLE spip_auteurs ADD INDEX lang (lang)");
	55	+ spip_query("ALTER TABLE spip_rubriques ADD INDEX lang (lang)");
	56	+ maj_version (1.704);
	57	+ }
	58	+
	59	+ if (upgrade_vers(1.705, $version_installee, $version_cible)) {
	60	+ spip_query("ALTER TABLE spip_articles ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
	61	+ spip_query("ALTER TABLE spip_rubriques ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
	62	+ maj_version (1.705);
	63	+ }
	64	+
	65	+ if (upgrade_vers(1.707, $version_installee, $version_cible)) {
	66	+ spip_query("UPDATE spip_articles SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
	67	+ spip_query("UPDATE spip_articles SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
	68	+ spip_query("UPDATE spip_rubriques SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
	69	+ spip_query("UPDATE spip_rubriques SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
	70	+ maj_version (1.707);
	71	+ }
	72	+
	73	+ if (upgrade_vers(1.708, $version_installee, $version_cible)) {
	74	+ spip_query("ALTER TABLE spip_breves ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
	75	+ spip_query("ALTER TABLE spip_breves ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
	76	+ maj_version (1.708);
	77	+ }
	78	+
	79	+ if (upgrade_vers(1.709, $version_installee, $version_cible)) {
	80	+ spip_query("ALTER TABLE spip_articles ADD id_trad bigint(21) DEFAULT '0' NOT NULL");
	81	+ spip_query("ALTER TABLE spip_articles ADD INDEX id_trad (id_trad)");
	82	+ maj_version (1.709);
	83	+ }
	84	+
	85	+ if (upgrade_vers(1.717, $version_installee, $version_cible)) {
	86	+ spip_query("ALTER TABLE spip_articles ADD INDEX date_modif (date_modif)");
	87	+ maj_version (1.717);
	88	+ }
	89	+
	90	+ if (upgrade_vers(1.718, $version_installee, $version_cible)) {
	91	+ spip_query("ALTER TABLE spip_referers DROP domaine");
	92	+ spip_query("ALTER TABLE spip_referers_articles DROP domaine");
	93	+ spip_query("ALTER TABLE spip_referers_temp DROP domaine");
	94	+ maj_version (1.718);
	95	+ }
	96	+
	97	+ if (upgrade_vers(1.722, $version_installee, $version_cible)) {
	98	+ spip_query("ALTER TABLE spip_articles ADD nom_site tinytext NOT NULL");
	99	+ spip_query("ALTER TABLE spip_articles ADD url_site VARCHAR(255) NOT NULL");
	100	+ spip_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site)");
	101	+ if ($version_installee >= 1.720) {
	102	+ spip_query("UPDATE spip_articles SET url_site=url_ref");
	103	+ spip_query("ALTER TABLE spip_articles DROP INDEX url_ref");
	104	+ spip_query("ALTER TABLE spip_articles DROP url_ref");
	105	+ }
	106	+ maj_version (1.722);
	107	+ }
	108	+
	109	+ if (upgrade_vers(1.723, $version_installee, $version_cible)) {
	110	+ if ($version_installee == 1.722) {
	111	+ spip_query("ALTER TABLE spip_articles MODIFY url_site VARCHAR(255) NOT NULL");
	112	+ spip_query("ALTER TABLE spip_articles DROP INDEX url_site;");
	113	+ spip_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site);");
	114	+ }
	115	+ maj_version (1.723);
	116	+ }
	117	+
	118	+ if (upgrade_vers(1.724, $version_installee, $version_cible)) {
	119	+ spip_query("ALTER TABLE spip_messages ADD date_fin datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
	120	+ maj_version (1.724);
	121	+ }
	122	+
	123	+ if (upgrade_vers(1.726, $version_installee, $version_cible)) {
	124	+ spip_query("ALTER TABLE spip_auteurs ADD low_sec tinytext NOT NULL");
	125	+ maj_version (1.726);
	126	+ }
	127	+
	128	+ if (upgrade_vers(1.727, $version_installee, $version_cible)) {
	129	+ // occitans : oci_xx -> oc_xx
	130	+ spip_query("UPDATE spip_auteurs SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
	131	+ spip_query("UPDATE spip_rubriques SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
	132	+ spip_query("UPDATE spip_articles SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
	133	+ spip_query("UPDATE spip_breves SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
	134	+ maj_version (1.727);
	135	+ }
	136	+
	137	+ // Ici version 1.7 officielle
	138	+ if (upgrade_vers(1.728, $version_installee, $version_cible)) {
	139	+ spip_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
	140	+ maj_version (1.728);
	141	+ }
	142	+
	143	+ if (upgrade_vers(1.730, $version_installee, $version_cible)) {
	144	+ spip_query("ALTER TABLE spip_articles ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
	145	+ spip_query("ALTER TABLE spip_articles ADD INDEX idx (idx)");
	146	+ spip_query("ALTER TABLE spip_auteurs ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
	147	+ spip_query("ALTER TABLE spip_auteurs ADD INDEX idx (idx)");
	148	+ spip_query("ALTER TABLE spip_breves ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
	149	+ spip_query("ALTER TABLE spip_breves ADD INDEX idx (idx)");
	150	+ spip_query("ALTER TABLE spip_mots ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
	151	+ spip_query("ALTER TABLE spip_mots ADD INDEX idx (idx)");
	152	+ spip_query("ALTER TABLE spip_rubriques ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
	153	+ spip_query("ALTER TABLE spip_rubriques ADD INDEX idx (idx)");
	154	+ spip_query("ALTER TABLE spip_syndic ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
	155	+ spip_query("ALTER TABLE spip_syndic ADD INDEX idx (idx)");
	156	+ spip_query("ALTER TABLE spip_forum ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
	157	+ spip_query("ALTER TABLE spip_forum ADD INDEX idx (idx)");
	158	+ spip_query("ALTER TABLE spip_signatures ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
	159	+ spip_query("ALTER TABLE spip_signatures ADD INDEX idx (idx)");
	160	+ maj_version (1.730);
	161	+ }
	162	+
	163	+ if (upgrade_vers(1.731, $version_installee, $version_cible)) {
	164	+ spip_query("UPDATE spip_articles SET idx='1' where lang IN ('de','vi')");
	165	+ spip_query("UPDATE spip_rubriques SET idx='1' where lang IN ('de','vi')");
	166	+ spip_query("UPDATE spip_breves SET idx='1' where lang IN ('de','vi')");
	167	+ spip_query("UPDATE spip_auteurs SET idx='1' where lang IN ('de','vi')");
	168	+ maj_version (1.731);
	169	+ }
	170	+
	171	+ if (upgrade_vers(1.732, $version_installee, $version_cible)) { // en correction d'un vieux truc qui avait fait sauter le champ inclus sur les bases version 1.415
	172	+ spip_query("ALTER TABLE spip_documents ADD inclus VARCHAR(3) DEFAULT 'non'");
	173	+ maj_version (1.732);
	174	+ }
	175	+
	176	+ if (upgrade_vers(1.733, $version_installee, $version_cible)) {
	177	+ // spip_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
	178	+ spip_query("DROP TABLE spip_versions");
	179	+ spip_query("DROP TABLE spip_versions_fragments");
	180	+ creer_base();
	181	+ maj_version(1.733);
	182	+ }
	183	+
	184	+ #if ($version_installee < 1.734) {
	185	+ # // integrer nouvelles tables auxiliaires du compilateur ESJ
	186	+ # creer_base();
	187	+ # maj_version(1.734);
	188	+ #}
189	189	}
190	190
191	191

		@@ -36,30 +36,30 @@ discard block
		block discarded – undo
36	36	}
37	37
38	38	$u = spip_query("SELECT extra FROM spip_articles");
39		- $u&= spip_query("SELECT extra FROM spip_auteurs");
40		- $u&= spip_query("SELECT extra FROM spip_breves");
41		- $u&= spip_query("SELECT extra FROM spip_rubriques");
42		- $u&= spip_query("SELECT extra FROM spip_mots");
43		- maj_version (1.702,$u);
	39	+ $u &= spip_query("SELECT extra FROM spip_auteurs");
	40	+ $u &= spip_query("SELECT extra FROM spip_breves");
	41	+ $u &= spip_query("SELECT extra FROM spip_rubriques");
	42	+ $u &= spip_query("SELECT extra FROM spip_mots");
	43	+ maj_version(1.702, $u);
44	44	}
45	45
46	46	if (upgrade_vers(1.703, $version_installee, $version_cible)) {
47	47	spip_query("ALTER TABLE spip_articles ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
48	48	spip_query("ALTER TABLE spip_rubriques ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
49		- maj_version (1.703);
	49	+ maj_version(1.703);
50	50	}
51	51
52	52	if (upgrade_vers(1.704, $version_installee, $version_cible)) {
53	53	spip_query("ALTER TABLE spip_articles ADD INDEX lang (lang)");
54	54	spip_query("ALTER TABLE spip_auteurs ADD INDEX lang (lang)");
55	55	spip_query("ALTER TABLE spip_rubriques ADD INDEX lang (lang)");
56		- maj_version (1.704);
	56	+ maj_version(1.704);
57	57	}
58	58
59	59	if (upgrade_vers(1.705, $version_installee, $version_cible)) {
60	60	spip_query("ALTER TABLE spip_articles ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
61	61	spip_query("ALTER TABLE spip_rubriques ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
62		- maj_version (1.705);
	62	+ maj_version(1.705);
63	63	}
64	64
65	65	if (upgrade_vers(1.707, $version_installee, $version_cible)) {
		@@ -67,31 +67,31 @@ discard block
		block discarded – undo
67	67	spip_query("UPDATE spip_articles SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
68	68	spip_query("UPDATE spip_rubriques SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
69	69	spip_query("UPDATE spip_rubriques SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
70		- maj_version (1.707);
	70	+ maj_version(1.707);
71	71	}
72	72
73	73	if (upgrade_vers(1.708, $version_installee, $version_cible)) {
74	74	spip_query("ALTER TABLE spip_breves ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
75	75	spip_query("ALTER TABLE spip_breves ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
76		- maj_version (1.708);
	76	+ maj_version(1.708);
77	77	}
78	78
79	79	if (upgrade_vers(1.709, $version_installee, $version_cible)) {
80	80	spip_query("ALTER TABLE spip_articles ADD id_trad bigint(21) DEFAULT '0' NOT NULL");
81	81	spip_query("ALTER TABLE spip_articles ADD INDEX id_trad (id_trad)");
82		- maj_version (1.709);
	82	+ maj_version(1.709);
83	83	}
84	84
85	85	if (upgrade_vers(1.717, $version_installee, $version_cible)) {
86	86	spip_query("ALTER TABLE spip_articles ADD INDEX date_modif (date_modif)");
87		- maj_version (1.717);
	87	+ maj_version(1.717);
88	88	}
89	89
90	90	if (upgrade_vers(1.718, $version_installee, $version_cible)) {
91	91	spip_query("ALTER TABLE spip_referers DROP domaine");
92	92	spip_query("ALTER TABLE spip_referers_articles DROP domaine");
93	93	spip_query("ALTER TABLE spip_referers_temp DROP domaine");
94		- maj_version (1.718);
	94	+ maj_version(1.718);
95	95	}
96	96
97	97	if (upgrade_vers(1.722, $version_installee, $version_cible)) {
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	spip_query("ALTER TABLE spip_articles DROP INDEX url_ref");
104	104	spip_query("ALTER TABLE spip_articles DROP url_ref");
105	105	}
106		- maj_version (1.722);
	106	+ maj_version(1.722);
107	107	}
108	108
109	109	if (upgrade_vers(1.723, $version_installee, $version_cible)) {
		@@ -112,17 +112,17 @@ discard block
		block discarded – undo
112	112	spip_query("ALTER TABLE spip_articles DROP INDEX url_site;");
113	113	spip_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site);");
114	114	}
115		- maj_version (1.723);
	115	+ maj_version(1.723);
116	116	}
117	117
118	118	if (upgrade_vers(1.724, $version_installee, $version_cible)) {
119	119	spip_query("ALTER TABLE spip_messages ADD date_fin datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
120		- maj_version (1.724);
	120	+ maj_version(1.724);
121	121	}
122	122
123	123	if (upgrade_vers(1.726, $version_installee, $version_cible)) {
124	124	spip_query("ALTER TABLE spip_auteurs ADD low_sec tinytext NOT NULL");
125		- maj_version (1.726);
	125	+ maj_version(1.726);
126	126	}
127	127
128	128	if (upgrade_vers(1.727, $version_installee, $version_cible)) {
		@@ -131,13 +131,13 @@ discard block
		block discarded – undo
131	131	spip_query("UPDATE spip_rubriques SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
132	132	spip_query("UPDATE spip_articles SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
133	133	spip_query("UPDATE spip_breves SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
134		- maj_version (1.727);
	134	+ maj_version(1.727);
135	135	}
136	136
137	137	// Ici version 1.7 officielle
138	138	if (upgrade_vers(1.728, $version_installee, $version_cible)) {
139	139	spip_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
140		- maj_version (1.728);
	140	+ maj_version(1.728);
141	141	}
142	142
143	143	if (upgrade_vers(1.730, $version_installee, $version_cible)) {
		@@ -157,7 +157,7 @@ discard block
		block discarded – undo
157	157	spip_query("ALTER TABLE spip_forum ADD INDEX idx (idx)");
158	158	spip_query("ALTER TABLE spip_signatures ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
159	159	spip_query("ALTER TABLE spip_signatures ADD INDEX idx (idx)");
160		- maj_version (1.730);
	160	+ maj_version(1.730);
161	161	}
162	162
163	163	if (upgrade_vers(1.731, $version_installee, $version_cible)) {
		@@ -165,12 +165,12 @@ discard block
		block discarded – undo
165	165	spip_query("UPDATE spip_rubriques SET idx='1' where lang IN ('de','vi')");
166	166	spip_query("UPDATE spip_breves SET idx='1' where lang IN ('de','vi')");
167	167	spip_query("UPDATE spip_auteurs SET idx='1' where lang IN ('de','vi')");
168		- maj_version (1.731);
	168	+ maj_version(1.731);
169	169	}
170	170
171	171	if (upgrade_vers(1.732, $version_installee, $version_cible)) { // en correction d'un vieux truc qui avait fait sauter le champ inclus sur les bases version 1.415
172	172	spip_query("ALTER TABLE spip_documents ADD inclus VARCHAR(3) DEFAULT 'non'");
173		- maj_version (1.732);
	173	+ maj_version(1.732);
174	174	}
175	175
176	176	if (upgrade_vers(1.733, $version_installee, $version_cible)) {

		@@ -15,39 +15,39 @@
		block discarded – undo
15	15	function maj_v016_dist($version_installee, $version_cible)
16	16	{
17	17
18		- if (upgrade_vers(1.600, $version_installee, $version_cible)) {
	18	+ if (upgrade_vers(1.600, $version_installee, $version_cible)) {
19	19	#8/08/07 plus d'indexation dans le core
20	20	# include_spip('inc/indexation');
21	21	# purger_index();
22	22	# creer_liste_indexation();
23		- maj_version (1.600);
24		- }
25		-
26		- if (upgrade_vers(1.601, $version_installee, $version_cible)) {
27		- spip_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
28		- maj_version (1.601);
29		- }
30		-
31		- if (upgrade_vers(1.603, $version_installee, $version_cible)) {
32		- // supprimer les fichiers deplaces
33		- spip_unlink('inc_meta_cache.php');
34		- spip_unlink('inc_meta_cache.php3');
35		- spip_unlink('data/engines-list.ini');
36		- maj_version (1.603);
37		- }
38		-
39		- if (upgrade_vers(1.604, $version_installee, $version_cible)) {
40		- spip_query("ALTER TABLE spip_auteurs ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
41		- $u = spip_query("SELECT * FROM spip_auteurs WHERE prefs LIKE '%spip_lang%'");
42		- while ($row = sql_fetch($u)) {
43		- $prefs = unserialize($row['prefs']);
44		- $l = $prefs['spip_lang'];
45		- unset ($prefs['spip_lang']);
46		- spip_query("UPDATE spip_auteurs SET lang=" . _q($l) . ", prefs='".addslashes(serialize($prefs))."' WHERE id_auteur=".$row['id_auteur']);
47		- }
48		- $u = spip_query("SELECT lang FROM spip_auteurs");
49		- maj_version (1.604, $u);
50		- }
	23	+ maj_version (1.600);
	24	+ }
	25	+
	26	+ if (upgrade_vers(1.601, $version_installee, $version_cible)) {
	27	+ spip_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
	28	+ maj_version (1.601);
	29	+ }
	30	+
	31	+ if (upgrade_vers(1.603, $version_installee, $version_cible)) {
	32	+ // supprimer les fichiers deplaces
	33	+ spip_unlink('inc_meta_cache.php');
	34	+ spip_unlink('inc_meta_cache.php3');
	35	+ spip_unlink('data/engines-list.ini');
	36	+ maj_version (1.603);
	37	+ }
	38	+
	39	+ if (upgrade_vers(1.604, $version_installee, $version_cible)) {
	40	+ spip_query("ALTER TABLE spip_auteurs ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
	41	+ $u = spip_query("SELECT * FROM spip_auteurs WHERE prefs LIKE '%spip_lang%'");
	42	+ while ($row = sql_fetch($u)) {
	43	+ $prefs = unserialize($row['prefs']);
	44	+ $l = $prefs['spip_lang'];
	45	+ unset ($prefs['spip_lang']);
	46	+ spip_query("UPDATE spip_auteurs SET lang=" . _q($l) . ", prefs='".addslashes(serialize($prefs))."' WHERE id_auteur=".$row['id_auteur']);
	47	+ }
	48	+ $u = spip_query("SELECT lang FROM spip_auteurs");
	49	+ maj_version (1.604, $u);
	50	+ }
51	51	}
52	52
53	53

		@@ -20,12 +20,12 @@ discard block
		block discarded – undo
20	20	# include_spip('inc/indexation');
21	21	# purger_index();
22	22	# creer_liste_indexation();
23		- maj_version (1.600);
	23	+ maj_version(1.600);
24	24	}
25	25
26	26	if (upgrade_vers(1.601, $version_installee, $version_cible)) {
27	27	spip_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
28		- maj_version (1.601);
	28	+ maj_version(1.601);
29	29	}
30	30
31	31	if (upgrade_vers(1.603, $version_installee, $version_cible)) {
		@@ -33,7 +33,7 @@ discard block
		block discarded – undo
33	33	spip_unlink('inc_meta_cache.php');
34	34	spip_unlink('inc_meta_cache.php3');
35	35	spip_unlink('data/engines-list.ini');
36		- maj_version (1.603);
	36	+ maj_version(1.603);
37	37	}
38	38
39	39	if (upgrade_vers(1.604, $version_installee, $version_cible)) {
		@@ -43,10 +43,10 @@ discard block
		block discarded – undo
43	43	$prefs = unserialize($row['prefs']);
44	44	$l = $prefs['spip_lang'];
45	45	unset ($prefs['spip_lang']);
46		- spip_query("UPDATE spip_auteurs SET lang=" . _q($l) . ", prefs='".addslashes(serialize($prefs))."' WHERE id_auteur=".$row['id_auteur']);
	46	+ spip_query("UPDATE spip_auteurs SET lang="._q($l).", prefs='".addslashes(serialize($prefs))."' WHERE id_auteur=".$row['id_auteur']);
47	47	}
48	48	$u = spip_query("SELECT lang FROM spip_auteurs");
49		- maj_version (1.604, $u);
	49	+ maj_version(1.604, $u);
50	50	}
51	51	}
52	52

		@@ -16,11 +16,11 @@
		block discarded – undo
16	16	function maj_v011_dist($version_installee, $version_cible)
17	17	{
18	18
19		- if (upgrade_vers(1.1, $version_installee, $version_cible)) {
20		- spip_query("DROP TABLE spip_petition");
21		- spip_query("DROP TABLE spip_signatures_petition");
22		- maj_version (1.1);
23		- }
	19	+ if (upgrade_vers(1.1, $version_installee, $version_cible)) {
	20	+ spip_query("DROP TABLE spip_petition");
	21	+ spip_query("DROP TABLE spip_signatures_petition");
	22	+ maj_version (1.1);
	23	+ }
24	24	}
25	25
26	26

		@@ -19,7 +19,7 @@
		block discarded – undo
19	19	if (upgrade_vers(1.1, $version_installee, $version_cible)) {
20	20	spip_query("DROP TABLE spip_petition");
21	21	spip_query("DROP TABLE spip_signatures_petition");
22		- maj_version (1.1);
	22	+ maj_version(1.1);
23	23	}
24	24	}
25	25

		@@ -14,68 +14,68 @@
		block discarded – undo
14	14
15	15	function maj_v012_dist($version_installee, $version_cible)
16	16	{
17		- // Correction de l'oubli des modifs creations depuis 1.04
18		- if (upgrade_vers(1.204, $version_installee, $version_cible)) {
19		- spip_query("ALTER TABLE spip_articles ADD accepter_forum VARCHAR(3) NOT NULL");
20		- spip_query("ALTER TABLE spip_forum ADD id_message bigint(21) NOT NULL");
21		- spip_query("ALTER TABLE spip_forum ADD INDEX id_message (id_message)");
22		- spip_query("ALTER TABLE spip_auteurs ADD en_ligne datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
23		- spip_query("ALTER TABLE spip_auteurs ADD imessage VARCHAR(3) not null");
24		- spip_query("ALTER TABLE spip_auteurs ADD messagerie VARCHAR(3) not null");
25		- maj_version (1.204);
26		- }
	17	+ // Correction de l'oubli des modifs creations depuis 1.04
	18	+ if (upgrade_vers(1.204, $version_installee, $version_cible)) {
	19	+ spip_query("ALTER TABLE spip_articles ADD accepter_forum VARCHAR(3) NOT NULL");
	20	+ spip_query("ALTER TABLE spip_forum ADD id_message bigint(21) NOT NULL");
	21	+ spip_query("ALTER TABLE spip_forum ADD INDEX id_message (id_message)");
	22	+ spip_query("ALTER TABLE spip_auteurs ADD en_ligne datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
	23	+ spip_query("ALTER TABLE spip_auteurs ADD imessage VARCHAR(3) not null");
	24	+ spip_query("ALTER TABLE spip_auteurs ADD messagerie VARCHAR(3) not null");
	25	+ maj_version (1.204);
	26	+ }
27	27
28		- if (upgrade_vers(1.207, $version_installee, $version_cible)) {
29		- spip_query("ALTER TABLE spip_rubriques DROP INDEX id_rubrique");
30		- spip_query("ALTER TABLE spip_rubriques ADD INDEX id_parent (id_parent)");
31		- spip_query("ALTER TABLE spip_rubriques ADD statut VARCHAR(10) NOT NULL");
32		- // Declencher le calcul des rubriques publiques
33		- include_spip('inc/rubriques');
34		- calculer_rubriques();
35		- maj_version (1.207);
36		- }
	28	+ if (upgrade_vers(1.207, $version_installee, $version_cible)) {
	29	+ spip_query("ALTER TABLE spip_rubriques DROP INDEX id_rubrique");
	30	+ spip_query("ALTER TABLE spip_rubriques ADD INDEX id_parent (id_parent)");
	31	+ spip_query("ALTER TABLE spip_rubriques ADD statut VARCHAR(10) NOT NULL");
	32	+ // Declencher le calcul des rubriques publiques
	33	+ include_spip('inc/rubriques');
	34	+ calculer_rubriques();
	35	+ maj_version (1.207);
	36	+ }
37	37
38		- if (upgrade_vers(1.208, $version_installee, $version_cible)) {
39		- spip_query("ALTER TABLE spip_auteurs_messages CHANGE forum vu CHAR(3) NOT NULL");
40		- spip_query("UPDATE spip_auteurs_messages SET vu='oui'");
41		- spip_query("UPDATE spip_auteurs_messages SET vu='non' WHERE statut='a'");
	38	+ if (upgrade_vers(1.208, $version_installee, $version_cible)) {
	39	+ spip_query("ALTER TABLE spip_auteurs_messages CHANGE forum vu CHAR(3) NOT NULL");
	40	+ spip_query("UPDATE spip_auteurs_messages SET vu='oui'");
	41	+ spip_query("UPDATE spip_auteurs_messages SET vu='non' WHERE statut='a'");
42	42
43		- spip_query("ALTER TABLE spip_messages ADD id_auteur bigint(21) NOT NULL");
44		- spip_query("ALTER TABLE spip_messages ADD INDEX id_auteur (id_auteur)");
45		- $result = spip_query("SELECT id_auteur, id_message FROM spip_auteurs_messages WHERE statut='de'");
46		- while ($row = sql_fetch($result)) {
47		- $id_auteur = $row['id_auteur'];
48		- $id_message = $row['id_message'];
49		- spip_query("UPDATE spip_messages SET id_auteur=$id_auteur WHERE id_message=$id_message");
50		- }
	43	+ spip_query("ALTER TABLE spip_messages ADD id_auteur bigint(21) NOT NULL");
	44	+ spip_query("ALTER TABLE spip_messages ADD INDEX id_auteur (id_auteur)");
	45	+ $result = spip_query("SELECT id_auteur, id_message FROM spip_auteurs_messages WHERE statut='de'");
	46	+ while ($row = sql_fetch($result)) {
	47	+ $id_auteur = $row['id_auteur'];
	48	+ $id_message = $row['id_message'];
	49	+ spip_query("UPDATE spip_messages SET id_auteur=$id_auteur WHERE id_message=$id_message");
	50	+ }
51	51
52		- spip_query("ALTER TABLE spip_auteurs_messages DROP statut");
53		- maj_version (1.208);
54		- }
	52	+ spip_query("ALTER TABLE spip_auteurs_messages DROP statut");
	53	+ maj_version (1.208);
	54	+ }
55	55
56		- if (upgrade_vers(1.209, $version_installee, $version_cible)) {
57		- spip_query("ALTER TABLE spip_syndic ADD maj TIMESTAMP");
58		- spip_query("ALTER TABLE spip_syndic_articles ADD maj TIMESTAMP");
59		- spip_query("ALTER TABLE spip_messages ADD maj TIMESTAMP");
60		- maj_version (1.209);
61		- }
	56	+ if (upgrade_vers(1.209, $version_installee, $version_cible)) {
	57	+ spip_query("ALTER TABLE spip_syndic ADD maj TIMESTAMP");
	58	+ spip_query("ALTER TABLE spip_syndic_articles ADD maj TIMESTAMP");
	59	+ spip_query("ALTER TABLE spip_messages ADD maj TIMESTAMP");
	60	+ maj_version (1.209);
	61	+ }
62	62
63		- if (upgrade_vers(1.210, $version_installee, $version_cible)) {
64		- spip_query("ALTER TABLE spip_messages DROP page");
	63	+ if (upgrade_vers(1.210, $version_installee, $version_cible)) {
	64	+ spip_query("ALTER TABLE spip_messages DROP page");
65	65
66		- stripslashes_base('spip_articles', array('surtitre', 'titre', 'soustitre', 'descriptif', 'chapo', 'texte', 'ps'));
67		- stripslashes_base('spip_auteurs', array('nom', 'bio', 'nom_site'));
68		- stripslashes_base('spip_breves', array('titre', 'texte', 'lien_titre'));
69		- stripslashes_base('spip_forum', array('titre', 'texte', 'auteur', 'nom_site'));
70		- stripslashes_base('spip_messages', array('titre', 'texte'));
71		- stripslashes_base('spip_mots', array('type', 'titre', 'descriptif', 'texte'));
72		- stripslashes_base('spip_petitions', array('texte'));
73		- stripslashes_base('spip_rubriques', array('titre', 'descriptif', 'texte'));
74		- stripslashes_base('spip_signatures', array('nom_email', 'nom_site', 'message'));
75		- stripslashes_base('spip_syndic', array('nom_site', 'descriptif'));
76		- stripslashes_base('spip_syndic_articles', array('titre', 'lesauteurs'));
77		- maj_version (1.210);
78		- }
	66	+ stripslashes_base('spip_articles', array('surtitre', 'titre', 'soustitre', 'descriptif', 'chapo', 'texte', 'ps'));
	67	+ stripslashes_base('spip_auteurs', array('nom', 'bio', 'nom_site'));
	68	+ stripslashes_base('spip_breves', array('titre', 'texte', 'lien_titre'));
	69	+ stripslashes_base('spip_forum', array('titre', 'texte', 'auteur', 'nom_site'));
	70	+ stripslashes_base('spip_messages', array('titre', 'texte'));
	71	+ stripslashes_base('spip_mots', array('type', 'titre', 'descriptif', 'texte'));
	72	+ stripslashes_base('spip_petitions', array('texte'));
	73	+ stripslashes_base('spip_rubriques', array('titre', 'descriptif', 'texte'));
	74	+ stripslashes_base('spip_signatures', array('nom_email', 'nom_site', 'message'));
	75	+ stripslashes_base('spip_syndic', array('nom_site', 'descriptif'));
	76	+ stripslashes_base('spip_syndic_articles', array('titre', 'lesauteurs'));
	77	+ maj_version (1.210);
	78	+ }
79	79	}
80	80
81	81

		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	spip_query("ALTER TABLE spip_auteurs ADD en_ligne datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
23	23	spip_query("ALTER TABLE spip_auteurs ADD imessage VARCHAR(3) not null");
24	24	spip_query("ALTER TABLE spip_auteurs ADD messagerie VARCHAR(3) not null");
25		- maj_version (1.204);
	25	+ maj_version(1.204);
26	26	}
27	27
28	28	if (upgrade_vers(1.207, $version_installee, $version_cible)) {
		@@ -32,7 +32,7 @@ discard block
		block discarded – undo
32	32	// Declencher le calcul des rubriques publiques
33	33	include_spip('inc/rubriques');
34	34	calculer_rubriques();
35		- maj_version (1.207);
	35	+ maj_version(1.207);
36	36	}
37	37
38	38	if (upgrade_vers(1.208, $version_installee, $version_cible)) {
		@@ -50,14 +50,14 @@ discard block
		block discarded – undo
50	50	}
51	51
52	52	spip_query("ALTER TABLE spip_auteurs_messages DROP statut");
53		- maj_version (1.208);
	53	+ maj_version(1.208);
54	54	}
55	55
56	56	if (upgrade_vers(1.209, $version_installee, $version_cible)) {
57	57	spip_query("ALTER TABLE spip_syndic ADD maj TIMESTAMP");
58	58	spip_query("ALTER TABLE spip_syndic_articles ADD maj TIMESTAMP");
59	59	spip_query("ALTER TABLE spip_messages ADD maj TIMESTAMP");
60		- maj_version (1.209);
	60	+ maj_version(1.209);
61	61	}
62	62
63	63	if (upgrade_vers(1.210, $version_installee, $version_cible)) {
		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	stripslashes_base('spip_signatures', array('nom_email', 'nom_site', 'message'));
75	75	stripslashes_base('spip_syndic', array('nom_site', 'descriptif'));
76	76	stripslashes_base('spip_syndic_articles', array('titre', 'lesauteurs'));
77		- maj_version (1.210);
	77	+ maj_version(1.210);
78	78	}
79	79	}
80	80

		@@ -14,115 +14,115 @@
		block discarded – undo
14	14
15	15	function maj_v009_dist($version_installee, $version_cible)
16	16	{
17		- if (upgrade_vers(0.98, $version_installee, $version_cible)) {
	17	+ if (upgrade_vers(0.98, $version_installee, $version_cible)) {
18	18
19		- spip_query("ALTER TABLE spip_articles ADD maj TIMESTAMP");
20		- spip_query("ALTER TABLE spip_articles ADD export VARCHAR(10) DEFAULT 'oui'");
21		- spip_query("ALTER TABLE spip_articles ADD images TEXT DEFAULT ''");
22		- spip_query("ALTER TABLE spip_articles ADD date_redac datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
23		- spip_query("ALTER TABLE spip_articles DROP INDEX id_article");
24		- spip_query("ALTER TABLE spip_articles ADD INDEX id_rubrique (id_rubrique)");
25		- spip_query("ALTER TABLE spip_articles ADD visites INTEGER DEFAULT '0' NOT NULL");
26		- spip_query("ALTER TABLE spip_articles ADD referers BLOB NOT NULL");
	19	+ spip_query("ALTER TABLE spip_articles ADD maj TIMESTAMP");
	20	+ spip_query("ALTER TABLE spip_articles ADD export VARCHAR(10) DEFAULT 'oui'");
	21	+ spip_query("ALTER TABLE spip_articles ADD images TEXT DEFAULT ''");
	22	+ spip_query("ALTER TABLE spip_articles ADD date_redac datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
	23	+ spip_query("ALTER TABLE spip_articles DROP INDEX id_article");
	24	+ spip_query("ALTER TABLE spip_articles ADD INDEX id_rubrique (id_rubrique)");
	25	+ spip_query("ALTER TABLE spip_articles ADD visites INTEGER DEFAULT '0' NOT NULL");
	26	+ spip_query("ALTER TABLE spip_articles ADD referers BLOB NOT NULL");
27	27
28		- spip_query("ALTER TABLE spip_auteurs ADD maj TIMESTAMP");
29		- spip_query("ALTER TABLE spip_auteurs ADD pgp BLOB NOT NULL");
	28	+ spip_query("ALTER TABLE spip_auteurs ADD maj TIMESTAMP");
	29	+ spip_query("ALTER TABLE spip_auteurs ADD pgp BLOB NOT NULL");
30	30
31		- spip_query("ALTER TABLE spip_auteurs_articles ADD INDEX id_auteur (id_auteur), ADD INDEX id_article (id_article)");
	31	+ spip_query("ALTER TABLE spip_auteurs_articles ADD INDEX id_auteur (id_auteur), ADD INDEX id_article (id_article)");
32	32
33		- spip_query("ALTER TABLE spip_rubriques ADD maj TIMESTAMP");
34		- spip_query("ALTER TABLE spip_rubriques ADD export VARCHAR(10) DEFAULT 'oui', ADD id_import BIGINT DEFAULT '0'");
	33	+ spip_query("ALTER TABLE spip_rubriques ADD maj TIMESTAMP");
	34	+ spip_query("ALTER TABLE spip_rubriques ADD export VARCHAR(10) DEFAULT 'oui', ADD id_import BIGINT DEFAULT '0'");
35	35
36		- spip_query("ALTER TABLE spip_breves ADD maj TIMESTAMP");
37		- spip_query("ALTER TABLE spip_breves DROP INDEX id_breve");
38		- spip_query("ALTER TABLE spip_breves DROP INDEX id_breve_2");
39		- spip_query("ALTER TABLE spip_breves ADD INDEX id_rubrique (id_rubrique)");
	36	+ spip_query("ALTER TABLE spip_breves ADD maj TIMESTAMP");
	37	+ spip_query("ALTER TABLE spip_breves DROP INDEX id_breve");
	38	+ spip_query("ALTER TABLE spip_breves DROP INDEX id_breve_2");
	39	+ spip_query("ALTER TABLE spip_breves ADD INDEX id_rubrique (id_rubrique)");
40	40
41		- spip_query("ALTER TABLE spip_forum ADD ip VARCHAR(16)");
42		- spip_query("ALTER TABLE spip_forum ADD maj TIMESTAMP");
43		- spip_query("ALTER TABLE spip_forum DROP INDEX id_forum");
44		- spip_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)");
45		- maj_version (0.98);
46		- }
47		-
48		- if (upgrade_vers(0.99, $version_installee, $version_cible)) {
	41	+ spip_query("ALTER TABLE spip_forum ADD ip VARCHAR(16)");
	42	+ spip_query("ALTER TABLE spip_forum ADD maj TIMESTAMP");
	43	+ spip_query("ALTER TABLE spip_forum DROP INDEX id_forum");
	44	+ spip_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)");
	45	+ maj_version (0.98);
	46	+ }
	47	+
	48	+ if (upgrade_vers(0.99, $version_installee, $version_cible)) {
49	49
50		- $result = spip_query("SELECT DISTINCT id_article FROM spip_forum WHERE id_article!=0 AND id_parent=0");
51		-
52		- while ($row = sql_fetch($result)) {
53		- unset($forums_article);
54		- $id_article = $row['id_article'];
55		- $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_article=$id_article");
56		- for (;;) {
57		- unset($forums);
58		- while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
59		- if (!$forums) break;
60		- $forums = join(',', $forums);
61		- $forums_article[] = $forums;
62		- $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
63		- }
64		- $forums_article = join(',', $forums_article);
65		- spip_query("UPDATE spip_forum SET id_article=$id_article WHERE id_forum IN ($forums_article)");
66		- }
	50	+ $result = spip_query("SELECT DISTINCT id_article FROM spip_forum WHERE id_article!=0 AND id_parent=0");
	51	+
	52	+ while ($row = sql_fetch($result)) {
	53	+ unset($forums_article);
	54	+ $id_article = $row['id_article'];
	55	+ $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_article=$id_article");
	56	+ for (;;) {
	57	+ unset($forums);
	58	+ while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
	59	+ if (!$forums) break;
	60	+ $forums = join(',', $forums);
	61	+ $forums_article[] = $forums;
	62	+ $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
	63	+ }
	64	+ $forums_article = join(',', $forums_article);
	65	+ spip_query("UPDATE spip_forum SET id_article=$id_article WHERE id_forum IN ($forums_article)");
	66	+ }
67	67
68		- $result = spip_query("SELECT DISTINCT id_breve FROM spip_forum WHERE id_breve!=0 AND id_parent=0");
69		-
70		- while ($row = sql_fetch($result)) {
71		- unset($forums_breve);
72		- $id_breve = $row['id_breve'];
73		- $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_breve=$id_breve");
74		- for (;;) {
75		- unset($forums);
76		- while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
77		- if (!$forums) break;
78		- $forums = join(',', $forums);
79		- $forums_breve[] = $forums;
80		- $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
81		- }
82		- $forums_breve = join(',', $forums_breve);
83		- spip_query("UPDATE spip_forum SET id_breve=$id_breve WHERE id_forum IN ($forums_breve)");
84		- }
	68	+ $result = spip_query("SELECT DISTINCT id_breve FROM spip_forum WHERE id_breve!=0 AND id_parent=0");
	69	+
	70	+ while ($row = sql_fetch($result)) {
	71	+ unset($forums_breve);
	72	+ $id_breve = $row['id_breve'];
	73	+ $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_breve=$id_breve");
	74	+ for (;;) {
	75	+ unset($forums);
	76	+ while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
	77	+ if (!$forums) break;
	78	+ $forums = join(',', $forums);
	79	+ $forums_breve[] = $forums;
	80	+ $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
	81	+ }
	82	+ $forums_breve = join(',', $forums_breve);
	83	+ spip_query("UPDATE spip_forum SET id_breve=$id_breve WHERE id_forum IN ($forums_breve)");
	84	+ }
85	85
86		- $result = spip_query("SELECT DISTINCT id_rubrique FROM spip_forum WHERE id_rubrique!=0 AND id_parent=0");
87		-
88		- while ($row = sql_fetch($result)) {
89		- unset($forums_rubrique);
90		- $id_rubrique = $row['id_rubrique'];
91		- $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_rubrique=$id_rubrique");
92		- for (;;) {
93		-
94		- unset($forums);
95		- while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
96		- if (!$forums) break;
97		- $forums = join(',', $forums);
98		- $forums_rubrique[] = $forums;
99		- $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
100		- }
101		- $forums_rubrique = join(',', $forums_rubrique);
102		- spip_query("UPDATE spip_forum SET id_rubrique=$id_rubrique WHERE id_forum IN ($forums_rubrique)");
103		-
104		- }
105		- maj_version (0.99);
106		- }
107		-
108		- if (upgrade_vers(0.997, $version_installee, $version_cible)) {
109		- spip_query("DROP TABLE spip_index");
110		- maj_version (0.997);
111		- }
112		-
113		- if (upgrade_vers(0.999, $version_installee, $version_cible)) {
114		-
115		- spip_query("ALTER TABLE spip_auteurs CHANGE pass pass tinyblob NOT NULL");
116		- spip_query("ALTER TABLE spip_auteurs ADD htpass tinyblob NOT NULL");
117		- $result = spip_query("SELECT id_auteur, pass FROM spip_auteurs WHERE pass!=''");
118		-
119		- while ($r= sql_fetch($result)) {
120		- $htpass = generer_htpass($r['pass']);
121		- $pass = md5($pass);
122		- spip_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=" . $r['id_auteur']);
123		- }
124		- maj_version (0.999);
125		- }
	86	+ $result = spip_query("SELECT DISTINCT id_rubrique FROM spip_forum WHERE id_rubrique!=0 AND id_parent=0");
	87	+
	88	+ while ($row = sql_fetch($result)) {
	89	+ unset($forums_rubrique);
	90	+ $id_rubrique = $row['id_rubrique'];
	91	+ $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_rubrique=$id_rubrique");
	92	+ for (;;) {
	93	+
	94	+ unset($forums);
	95	+ while ($row2 = sql_fetch($result2)) $forums[] = $row2['id_forum'];
	96	+ if (!$forums) break;
	97	+ $forums = join(',', $forums);
	98	+ $forums_rubrique[] = $forums;
	99	+ $result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
	100	+ }
	101	+ $forums_rubrique = join(',', $forums_rubrique);
	102	+ spip_query("UPDATE spip_forum SET id_rubrique=$id_rubrique WHERE id_forum IN ($forums_rubrique)");
	103	+
	104	+ }
	105	+ maj_version (0.99);
	106	+ }
	107	+
	108	+ if (upgrade_vers(0.997, $version_installee, $version_cible)) {
	109	+ spip_query("DROP TABLE spip_index");
	110	+ maj_version (0.997);
	111	+ }
	112	+
	113	+ if (upgrade_vers(0.999, $version_installee, $version_cible)) {
	114	+
	115	+ spip_query("ALTER TABLE spip_auteurs CHANGE pass pass tinyblob NOT NULL");
	116	+ spip_query("ALTER TABLE spip_auteurs ADD htpass tinyblob NOT NULL");
	117	+ $result = spip_query("SELECT id_auteur, pass FROM spip_auteurs WHERE pass!=''");
	118	+
	119	+ while ($r= sql_fetch($result)) {
	120	+ $htpass = generer_htpass($r['pass']);
	121	+ $pass = md5($pass);
	122	+ spip_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=" . $r['id_auteur']);
	123	+ }
	124	+ maj_version (0.999);
	125	+ }
126	126	}
127	127
128	128	?>

		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42	spip_query("ALTER TABLE spip_forum ADD maj TIMESTAMP");
43	43	spip_query("ALTER TABLE spip_forum DROP INDEX id_forum");
44	44	spip_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)");
45		- maj_version (0.98);
	45	+ maj_version(0.98);
46	46	}
47	47
48	48	if (upgrade_vers(0.99, $version_installee, $version_cible)) {
		@@ -102,12 +102,12 @@ discard block
		block discarded – undo
102	102	spip_query("UPDATE spip_forum SET id_rubrique=$id_rubrique WHERE id_forum IN ($forums_rubrique)");
103	103
104	104	}
105		- maj_version (0.99);
	105	+ maj_version(0.99);
106	106	}
107	107
108	108	if (upgrade_vers(0.997, $version_installee, $version_cible)) {
109	109	spip_query("DROP TABLE spip_index");
110		- maj_version (0.997);
	110	+ maj_version(0.997);
111	111	}
112	112
113	113	if (upgrade_vers(0.999, $version_installee, $version_cible)) {
		@@ -116,12 +116,12 @@ discard block
		block discarded – undo
116	116	spip_query("ALTER TABLE spip_auteurs ADD htpass tinyblob NOT NULL");
117	117	$result = spip_query("SELECT id_auteur, pass FROM spip_auteurs WHERE pass!=''");
118	118
119		- while ($r= sql_fetch($result)) {
	119	+ while ($r = sql_fetch($result)) {
120	120	$htpass = generer_htpass($r['pass']);
121	121	$pass = md5($pass);
122		- spip_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=" . $r['id_auteur']);
	122	+ spip_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=".$r['id_auteur']);
123	123	}
124		- maj_version (0.999);
	124	+ maj_version(0.999);
125	125	}
126	126	}
127	127

spip / SPIP

Push — spip-3.0 ( cd2822...016705 )

Status

Category

Indentation +85 added lines, -85 removed lines patch added patch discarded remove patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

Braces +21 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +19 added lines, -19 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +8 added lines, -4 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +38 added lines, -38 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +171 added lines, -171 removed lines patch added patch discarded remove patch

Spacing +22 added lines, -22 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +29 added lines, -29 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +55 added lines, -55 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +100 added lines, -100 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +21 added lines, -7 removed lines patch added patch discarded remove patch