spip / SPIP

ecrire/maj/v016.php

Spacing +5 added lines, -5 removed lines

@@ -20,12 +20,12 @@ 
 #		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 @@ 
 		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 @@ 
 			$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);
 	}
 }
 

ecrire/maj/v011.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 	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);
 	}
 }
 

ecrire/maj/v012.php

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
 		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 @@ 
 		// 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 @@ 
 		}
 
 		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 @@ 
 		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);
 	}
 }
 

ecrire/maj/v009.php

Spacing +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
 		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 @@ 
 			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 @@ 
 		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);
 	}
 }
 

ecrire/maj/v014.php

Spacing +38 added lines, -38 removed lines

@@ -20,7 +20,7 @@ 
 		spip_query("UPDATE spip_mots SET type='Mots sans groupe...' WHERE type=''");
 
 		$result = spip_query("SELECT * FROM spip_mots GROUP BY type");
-		while($row = sql_fetch($result)) {
+		while ($row = sql_fetch($result)) {
 				$type = addslashes($row['type']);
 				// Old style, doit echouer
 				spip_log('ne pas tenir compte de l erreur spip_groupes_mots ci-dessous:', 'mysql');
@@ -29,19 +29,19 @@ 
 				spip_query("INSERT INTO spip_groupes_mots 					(titre, unseul, obligatoire, articles, breves, rubriques, syndic, minirezo, comite, forum)					VALUES (\"$type\", 'non', 'non', 'oui', 'oui', 'non', 'oui', 'oui', 'oui', 'non')");
 		}
 		sql_delete("spip_mots", "titre='kawax'");
-		maj_version (1.404);
+		maj_version(1.404);
 	}
 
 	if (upgrade_vers(1.405, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_mots ADD id_groupe bigint(21) NOT NULL");
 	
 		$result = spip_query("SELECT * FROM spip_groupes_mots");
-		while($row = sql_fetch($result)) {
+		while ($row = sql_fetch($result)) {
 				$id_groupe = addslashes($row['id_groupe']);
 				$type = addslashes($row['titre']);
 				spip_query("UPDATE spip_mots SET id_groupe = '$id_groupe' WHERE type='$type'");
 		}
-		maj_version (1.405);
+		maj_version(1.405);
 	}
 
 	if (upgrade_vers(1.408, $version_installee, $version_cible)) {
@@ -65,7 +65,7 @@ 
 				preg_match(",-([0-9]+)\.(gif|jpg|png)$,i", $fichier, $match);
 				$id_type = intval($types[$match[2]]);
 				$num_img = $match[1];
-				$fichier = _DIR_IMG . $fichier;
+				$fichier = _DIR_IMG.$fichier;
 				$taille = @filesize($fichier);
 				// ici on n'a pas les fonctions absctract !
 				$s = spip_query("INSERT INTO spip_documents (titre, id_type, fichier, mode, largeur, hauteur, taille) VALUES ('image $largeur x $hauteur', $id_type, '$fichier', 'vignette', '$largeur', '$hauteur', '$taille')");
@@ -87,18 +87,18 @@ 
 
 		}
 		spip_query("ALTER TABLE spip_articles DROP images");
-		maj_version (1.408);
+		maj_version(1.408);
 	}
 
 	if (upgrade_vers(1.414, $version_installee, $version_cible)) {
 		// Forum par defaut "en dur" dans les spip_articles
 		// -> non, prio (priori), pos (posteriori), abo (abonnement)
-		$accepter_forum = substr($GLOBALS['meta']["forums_publics"],0,3) ;
+		$accepter_forum = substr($GLOBALS['meta']["forums_publics"], 0, 3);
 		$result = spip_query("ALTER TABLE spip_articles CHANGE accepter_forum accepter_forum CHAR(3) NOT NULL");
 
 		$result = spip_query("UPDATE spip_articles SET accepter_forum='$accepter_forum' WHERE accepter_forum != 'non'");
 
-		maj_version (1.414);
+		maj_version(1.414);
 	}
 
 	/*
@@ -110,7 +110,7 @@ 
 
 	if (upgrade_vers(1.417, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_syndic_articles DROP date_index");
-		maj_version (1.417);
+		maj_version(1.417);
 	}
 
 	if (upgrade_vers(1.418, $version_installee, $version_cible)) {
@@ -119,49 +119,49 @@ 
 		if ($webmaster = sql_fetch($result)) {
 			ecrire_meta('email_webmaster', $webmaster['email']);
 		}
-		maj_version (1.418);
+		maj_version(1.418);
 	}
 
 	if (upgrade_vers(1.419, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_auteurs ADD alea_actuel TINYTEXT DEFAULT ''");
 		spip_query("ALTER TABLE spip_auteurs ADD alea_futur TINYTEXT DEFAULT ''");
 		spip_query("UPDATE spip_auteurs SET alea_futur = FLOOR(32000*RAND())");
-		maj_version (1.419);
+		maj_version(1.419);
 	}
 
 	if (upgrade_vers(1.420, $version_installee, $version_cible)) {
 		spip_query("UPDATE spip_auteurs SET alea_actuel='' WHERE statut='nouveau'");
-		maj_version (1.420);
+		maj_version(1.420);
 	}
 	
 	if (upgrade_vers(1.421, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_articles ADD auteur_modif bigint(21) DEFAULT '0' NOT NULL");
 		spip_query("ALTER TABLE spip_articles ADD date_modif datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		maj_version (1.421);
+		maj_version(1.421);
 	}
 
 	if (upgrade_vers(1.432, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_articles DROP referers");
 		spip_query("ALTER TABLE spip_articles ADD referers INTEGER DEFAULT '0' NOT NULL");
 		spip_query("ALTER TABLE spip_articles ADD popularite INTEGER DEFAULT '0' NOT NULL");
-		maj_version (1.432);
+		maj_version(1.432);
 	}
 
 	if (upgrade_vers(1.436, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_documents ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		maj_version (1.436);
+		maj_version(1.436);
 	}
 
 	if (upgrade_vers(1.437, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_visites ADD maj TIMESTAMP");
 		spip_query("ALTER TABLE spip_visites_referers ADD maj TIMESTAMP");
-		maj_version (1.437);
+		maj_version(1.437);
 	}
 
 	if (upgrade_vers(1.438, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_articles ADD INDEX id_secteur (id_secteur)");
 		spip_query("ALTER TABLE spip_articles ADD INDEX statut (statut, date)");
-		maj_version (1.438);
+		maj_version(1.438);
 	}
 
 	if (upgrade_vers(1.439, $version_installee, $version_cible)) {
@@ -169,24 +169,24 @@ 
 		spip_query("ALTER TABLE spip_syndic_articles ADD INDEX statut (statut)");
 		spip_query("ALTER TABLE spip_syndic_articles CHANGE url url VARCHAR(255) NOT NULL");
 		spip_query("ALTER TABLE spip_syndic_articles ADD INDEX url (url)");
-		maj_version (1.439);
+		maj_version(1.439);
 	}
 
 	if (upgrade_vers(1.440, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_visites_temp CHANGE ip ip INTEGER UNSIGNED NOT NULL");
-		maj_version (1.440);
+		maj_version(1.440);
 	}
 
 	if (upgrade_vers(1.441, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_visites_temp CHANGE date date DATE NOT NULL");
 		spip_query("ALTER TABLE spip_visites CHANGE date date DATE NOT NULL");
 		spip_query("ALTER TABLE spip_visites_referers CHANGE date date DATE NOT NULL");
-		maj_version (1.441);
+		maj_version(1.441);
 	}
 
 	if (upgrade_vers(1.442, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_auteurs ADD prefs TINYTEXT NOT NULL");
-		maj_version (1.442);
+		maj_version(1.442);
 	}
 
 	if (upgrade_vers(1.443, $version_installee, $version_cible)) {
@@ -194,12 +194,12 @@ 
 		spip_query("ALTER TABLE spip_auteurs CHANGE statut statut VARCHAR(255) NOT NULL");
 		spip_query("ALTER TABLE spip_auteurs ADD INDEX login (login)");
 		spip_query("ALTER TABLE spip_auteurs ADD INDEX statut (statut)");
-		maj_version (1.443);
+		maj_version(1.443);
 	}
 
 	if (upgrade_vers(1.444, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_syndic ADD moderation VARCHAR(3) NOT NULL");
-		maj_version (1.444);
+		maj_version(1.444);
 	}
 
 	if (upgrade_vers(1.457, $version_installee, $version_cible)) {
@@ -207,12 +207,12 @@ 
 		spip_query("DROP TABLE spip_visites_temp");
 		spip_query("DROP TABLE spip_visites_referers");
 		creer_base(); // crade, a ameliorer :-((
-		maj_version (1.457);
+		maj_version(1.457);
 	}
 
 	if (upgrade_vers(1.458, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_auteurs ADD cookie_oubli TINYTEXT NOT NULL");
-		maj_version (1.458);
+		maj_version(1.458);
 	}
 
 	if (upgrade_vers(1.459, $version_installee, $version_cible)) {
@@ -227,7 +227,7 @@ 
 			}
 		}
 		spip_query("UPDATE spip_articles SET popularite=0");
-		maj_version (1.459);
+		maj_version(1.459);
 	}
 
 	if (upgrade_vers(1.460, $version_installee, $version_cible)) {
@@ -237,26 +237,26 @@ 
 		$result = spip_query("SELECT * FROM spip_groupes_mots ORDER BY id_groupe");
 		while ($row = sql_fetch($result)) {
 			$titre = addslashes($row['titre']);
-			if (! $vu[$titre] ) {
+			if (!$vu[$titre]) {
 				$vu[$titre] = true;
 				$id_groupe = $row['id_groupe'];
 				spip_query("UPDATE spip_mots SET id_groupe=$id_groupe WHERE type='$titre'");
 				sql_delete("spip_groupes_mots", "titre='$titre' AND id_groupe<>$id_groupe");
 			}
 		}
-		maj_version (1.460);
+		maj_version(1.460);
 	}
 
 	if (upgrade_vers(1.462, $version_installee, $version_cible)) {
 		spip_query("UPDATE spip_types_documents SET inclus='embed' WHERE inclus!='non' AND extension IN ('aiff', 'asf', 'avi', 'mid', 'mov', 'mp3', 'mpg', 'ogg', 'qt', 'ra', 'ram', 'rm', 'swf', 'wav', 'wmv')");
-		maj_version (1.462);
+		maj_version(1.462);
 	}
 
 	if (upgrade_vers(1.463, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_articles CHANGE popularite popularite DOUBLE");
 		spip_query("ALTER TABLE spip_visites_temp ADD maj TIMESTAMP");
 		spip_query("ALTER TABLE spip_referers_temp ADD maj TIMESTAMP");
-		maj_version (1.463);
+		maj_version(1.463);
 	}
 
 	// l'upgrade < 1.462 ci-dessus etait fausse, d'ou correctif
@@ -267,23 +267,23 @@ 
 			$id_type = $row['id_type'];
 			spip_query("UPDATE spip_documents SET id_type=$id_type	WHERE fichier like '%.$extension'");
 		}
-		maj_version (1.464);
+		maj_version(1.464);
 	}
 
 	if (upgrade_vers(1.465, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_articles CHANGE popularite popularite DOUBLE NOT NULL");
-		maj_version (1.465);
+		maj_version(1.465);
 	}
 
 	if (upgrade_vers(1.466, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_auteurs ADD source VARCHAR(10) DEFAULT 'spip' NOT NULL");
-		maj_version (1.466);
+		maj_version(1.466);
 	}
 
 	if (upgrade_vers(1.468, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_auteurs ADD INDEX en_ligne (en_ligne)");
 		spip_query("ALTER TABLE spip_forum ADD INDEX statut (statut, date_heure)");
-		maj_version (1.468);
+		maj_version(1.468);
 	}
 
 	if (upgrade_vers(1.470, $version_installee, $version_cible)) {
@@ -292,7 +292,7 @@ 
 			spip_query("ALTER TABLE spip_auteurs DROP abonne");
 			spip_query("ALTER TABLE spip_auteurs DROP abonne_pass");
 		}
-		maj_version (1.470);
+		maj_version(1.470);
 	}
 
 	if (upgrade_vers(1.471, $version_installee, $version_cible)) {
@@ -309,18 +309,18 @@ 
 			spip_query("ALTER TABLE spip_mots_syndic DROP maj TIMESTAMP");
 			spip_query("ALTER TABLE spip_mots_forum DROP maj TIMESTAMP");
 		}
-		maj_version (1.471);
+		maj_version(1.471);
 	}
 
 	if (upgrade_vers(1.472, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_referers ADD visites_jour INTEGER UNSIGNED NOT NULL");
-		maj_version (1.472);
+		maj_version(1.472);
 	}
 
 	if (upgrade_vers(1.473, $version_installee, $version_cible)) {
 		spip_query("UPDATE spip_syndic_articles SET url = REPLACE(url, '&amp;', '&')");
 		spip_query("UPDATE spip_syndic SET url_site = REPLACE(url_site, '&amp;', '&')");
-		maj_version (1.473);
+		maj_version(1.473);
 	}
 }
 

ecrire/maj/v019_pre193.php

Spacing +25 added lines, -25 removed lines

@@ -55,15 +55,15 @@ 
 		spip_query("ALTER TABLE spip_meta CHANGE `valeur` `valeur` TEXT");
 		// table des correspondances table->id_table
 		$liste_tables = array();
-		$liste_tables[1]='spip_articles';
-		$liste_tables[2]='spip_auteurs';
-		$liste_tables[3]='spip_breves';
-		$liste_tables[4]='spip_documents';
-		$liste_tables[5]='spip_forum';
-		$liste_tables[6]='spip_mots';
-		$liste_tables[7]='spip_rubriques';
-		$liste_tables[8]='spip_signatures';
-		$liste_tables[9]='spip_syndic';
+		$liste_tables[1] = 'spip_articles';
+		$liste_tables[2] = 'spip_auteurs';
+		$liste_tables[3] = 'spip_breves';
+		$liste_tables[4] = 'spip_documents';
+		$liste_tables[5] = 'spip_forum';
+		$liste_tables[6] = 'spip_mots';
+		$liste_tables[7] = 'spip_rubriques';
+		$liste_tables[8] = 'spip_signatures';
+		$liste_tables[9] = 'spip_syndic';
 
 		ecrire_meta('index_table', serialize($liste_tables));
 
@@ -220,18 +220,18 @@ 
 	}
 	if (upgrade_vers(1.922, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_meta ADD `impt` ENUM('non', 'oui') DEFAULT 'oui' NOT NULL AFTER `valeur`");
-		$meta_serveur = array('version_installee','adresse_site','alea_ephemere_ancien','alea_ephemere','alea_ephemere_date','langue_site','langues_proposees','date_calcul_rubriques','derniere_modif','optimiser_table','drapeau_edition','creer_preview','taille_preview','creer_htpasswd','creer_htaccess','gd_formats_read','gd_formats',
-		'netpbm_formats','formats_graphiques','image_process','plugin_header','plugin');
-		foreach($meta_serveur as $nom)
+		$meta_serveur = array('version_installee', 'adresse_site', 'alea_ephemere_ancien', 'alea_ephemere', 'alea_ephemere_date', 'langue_site', 'langues_proposees', 'date_calcul_rubriques', 'derniere_modif', 'optimiser_table', 'drapeau_edition', 'creer_preview', 'taille_preview', 'creer_htpasswd', 'creer_htaccess', 'gd_formats_read', 'gd_formats',
+		'netpbm_formats', 'formats_graphiques', 'image_process', 'plugin_header', 'plugin');
+		foreach ($meta_serveur as $nom)
 			spip_query("UPDATE spip_meta SET `impt`='non' WHERE `nom`="._q($nom));
 		maj_version('1.922');
 	}
 	if (upgrade_vers(1.923, $version_installee, $version_cible)) {
-		if (isset($GLOBALS['meta']['IMPORT_tables_noimport'])){
+		if (isset($GLOBALS['meta']['IMPORT_tables_noimport'])) {
 			$IMPORT_tables_noimport = unserialize($GLOBALS['meta']['IMPORT_tables_noimport']);
 			foreach ($IMPORT_tables_noimport as $key=>$table)
-				if ($table=='spip_meta') unset($IMPORT_tables_noimport[$key]);
-			ecrire_meta('IMPORT_tables_noimport',serialize($IMPORT_tables_noimport),'non');
+				if ($table == 'spip_meta') unset($IMPORT_tables_noimport[$key]);
+			ecrire_meta('IMPORT_tables_noimport', serialize($IMPORT_tables_noimport), 'non');
 		}
 		maj_version('1.923');
 	}
@@ -246,47 +246,47 @@ 
 		/* deplacement des sessions */
 		$f_session = preg_files('data', 'session_');
 		$repertoire = _DIR_SESSIONS;
-		if(!@file_exists($repertoire)) {
+		if (!@file_exists($repertoire)) {
 			$repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire);
 			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
 		}
-		foreach($f_session as $f) {
+		foreach ($f_session as $f) {
 			$d = basename($f);
 			@copy($f, $repertoire.$d);
 		}
 		/* deplacement des visites */
 		$f_visites = preg_files('data/visites');
 		$repertoire = sous_repertoire(_DIR_TMP, 'visites');
-		foreach($f_visites as $f) {
+		foreach ($f_visites as $f) {
 			$d = basename($f);
 			@copy($f, $repertoire.$d);
 		}
 		/* deplacement des upload */
 		$auteurs = array();
 		$req = spip_query("SELECT `login` FROM spip_auteurs WHERE `statut` = '0minirezo'");
-		while($row = sql_fetch($req))
+		while ($row = sql_fetch($req))
 			$auteurs[] = $row['login']; 
 		$f_upload = preg_files('upload', -1, 10000, $auteurs);
 		$repertoire = _DIR_TRANSFERT;
-		if(!@file_exists($repertoire)) {
+		if (!@file_exists($repertoire)) {
 			$repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire);
 			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
 		}
-		foreach($auteurs as $login) {
-			if(is_dir('upload/'.$login))
+		foreach ($auteurs as $login) {
+			if (is_dir('upload/'.$login))
 				$sous_repertoire = sous_repertoire(_DIR_TRANSFERT, $login);
 		}
-		foreach($f_upload as $f) {
+		foreach ($f_upload as $f) {
 			@copy($f, _DIR_TMP.$f);
 		}
 		/* deplacement des dumps */
 		$f_session = preg_files('data', 'dump');
 		$repertoire = _DIR_DUMP;
-		if(!@file_exists($repertoire)) {
+		if (!@file_exists($repertoire)) {
 			$repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire);
 			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
 		}
-		foreach($f_session as $f) {
+		foreach ($f_session as $f) {
 			$d = basename($f);
 			@copy($f, $repertoire.$d);
 		}

ecrire/maj/v018.php

Spacing +2 added lines, -2 removed lines

@@ -65,10 +65,10 @@
 		do {
 			$discussion = "0";
 			$precedent = 0;
-			$r = sql_select("fille.id_forum AS id,	maman.id_thread AS thread", 'spip_forum AS fille, spip_forum AS maman', "fille.id_parent = maman.id_forum AND fille.id_thread <> maman.id_thread",'', "thread");
+			$r = sql_select("fille.id_forum AS id,	maman.id_thread AS thread", 'spip_forum AS fille, spip_forum AS maman', "fille.id_parent = maman.id_forum AND fille.id_thread <> maman.id_thread", '', "thread");
 			while ($row = sql_fetch($r)) {
 				if ($row['thread'] == $precedent)
-					$discussion .= "," . $row['id'];
+					$discussion .= ",".$row['id'];
 				else {
 					if ($precedent)
 						sql_updateq("spip_forum", array("id_thread" => $precedent), "id_forum IN ($discussion)");

ecrire/maj/v010.php

Spacing +5 added lines, -5 removed lines

@@ -17,28 +17,28 @@
 	
 	if (upgrade_vers(1.01, $version_installee, $version_cible)) {
 		spip_query("UPDATE spip_forum SET statut='publie' WHERE statut=''");
-		maj_version (1.01);
+		maj_version(1.01);
 	}
 	
 	if (upgrade_vers(1.02, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_forum ADD id_auteur BIGINT DEFAULT '0' NOT NULL");
-		maj_version (1.02);
+		maj_version(1.02);
 	}
 
 	if (upgrade_vers(1.03, $version_installee, $version_cible)) {
 		spip_query("DROP TABLE spip_maj");
-		maj_version (1.03);
+		maj_version(1.03);
 	}
 
 	if (upgrade_vers(1.04, $version_installee, $version_cible)) {
 		spip_query("ALTER TABLE spip_articles ADD accepter_forum VARCHAR(3)");
-		maj_version (1.04);
+		maj_version(1.04);
 	}
 
 	if (upgrade_vers(1.05, $version_installee, $version_cible)) {
 		spip_query("DROP TABLE spip_petition");
 		spip_query("DROP TABLE spip_signatures_petition");
-		maj_version (1.05);
+		maj_version(1.05);
 	}
 }
 

ecrire/auth/sha256.inc.php

Spacing +80 added lines, -80 removed lines

@@ -83,7 +83,7 @@ 
                            : ((defined('_NANO_SHA2_UPPER')) ? true : false);
 
             // Deteremine if the system is 32 or 64 bit.
-            $tmpInt = (int)4294967295;
+            $tmpInt = (int) 4294967295;
             $this->platform = ($tmpInt > 0) ? 64 : 32;
         }
 
@@ -94,12 +94,12 @@ 
 
             if ($x < 0) {
                 $x &= 0x7FFFFFFF;
-                $x = (float)$x + $mask;
+                $x = (float) $x + $mask;
             }
 
             if ($y < 0) {
                 $y &= 0x7FFFFFFF;
-                $y = (float)$y + $mask;
+                $y = (float) $y + $mask;
             }
 
             $r = $x + $y;
@@ -110,52 +110,52 @@ 
                 }
             }
 
-            return (int)$r;
+            return (int) $r;
         }
 
         // Logical bitwise right shift (PHP default is arithmetic shift)
         function SHR($x, $n)        // x >> n
         {
             if ($n >= 32) {      // impose some limits to keep it 32-bit
-                return (int)0;
+                return (int) 0;
             }
 
             if ($n <= 0) {
-                return (int)$x;
+                return (int) $x;
             }
 
             $mask = 0x40000000;
 
             if ($x < 0) {
                 $x &= 0x7FFFFFFF;
-                $mask = $mask >> ($n-1);
+                $mask = $mask >> ($n - 1);
                 return ($x >> $n) | $mask;
             }
 
-            return (int)$x >> (int)$n;
+            return (int) $x >> (int) $n;
         }
 
-        function ROTR($x, $n) { return (int)(($this->SHR($x, $n) | ($x << (32-$n)) & 0xFFFFFFFF)); }
+        function ROTR($x, $n) { return (int) (($this->SHR($x, $n) | ($x << (32 - $n)) & 0xFFFFFFFF)); }
         function Ch($x, $y, $z) { return ($x & $y) ^ ((~$x) & $z); }
         function Maj($x, $y, $z) { return ($x & $y) ^ ($x & $z) ^ ($y & $z); }
-        function Sigma0($x) { return (int) ($this->ROTR($x, 2)^$this->ROTR($x, 13)^$this->ROTR($x, 22)); }
-        function Sigma1($x) { return (int) ($this->ROTR($x, 6)^$this->ROTR($x, 11)^$this->ROTR($x, 25)); }
-        function sigma_0($x) { return (int) ($this->ROTR($x, 7)^$this->ROTR($x, 18)^$this->SHR($x, 3)); }
-        function sigma_1($x) { return (int) ($this->ROTR($x, 17)^$this->ROTR($x, 19)^$this->SHR($x, 10)); }
+        function Sigma0($x) { return (int) ($this->ROTR($x, 2) ^ $this->ROTR($x, 13) ^ $this->ROTR($x, 22)); }
+        function Sigma1($x) { return (int) ($this->ROTR($x, 6) ^ $this->ROTR($x, 11) ^ $this->ROTR($x, 25)); }
+        function sigma_0($x) { return (int) ($this->ROTR($x, 7) ^ $this->ROTR($x, 18) ^ $this->SHR($x, 3)); }
+        function sigma_1($x) { return (int) ($this->ROTR($x, 17) ^ $this->ROTR($x, 19) ^ $this->SHR($x, 10)); }
 
 
-				function string2ordUTF8($s,&$byteSize){
+				function string2ordUTF8($s, &$byteSize) {
 					$chars = array();
 					// par defaut sur 8bits
 					$byteSize = 8;
 					$i = 0;
-					while ($i<strlen($s)){
+					while ($i < strlen($s)) {
 						$chars[] = $this->ordUTF8($s, $i, $bytes);
-						$i+=$bytes;
+						$i += $bytes;
 						// mais si un char necessite 16bits, on passe tout sur 16
 						// sinon on ne concorde pas avec le lecture de la chaine en js
 						// et le sha256 js
-						if ($bytes>1) $byteSize = 16;
+						if ($bytes > 1) $byteSize = 16;
 					}
 					return $chars;
 				}
@@ -174,14 +174,14 @@ 
 						$bytes = 1;
 						return $h;
 					}
-					else if ($h < 0xC2){
+					else if ($h < 0xC2) {
 						// pas utf mais renvoyer quand meme ce qu'on a
 						$bytes = 1;
 						return $h;
 					}
 					else if ($h <= 0xDF && $index < $len - 1) {
 						$bytes = 2;
-						return ($h & 0x1F) <<  6 | (ord($c{$index + 1}) & 0x3F);
+						return ($h & 0x1F) << 6 | (ord($c{$index + 1}) & 0x3F);
 					}
 					else if ($h <= 0xEF && $index < $len - 2) {
 						$bytes = 3;
@@ -201,33 +201,33 @@ 
 					}
 				}
 
-				function string2binint ($str,$npad=512) {
+				function string2binint($str, $npad = 512) {
 					$bin = array();
-					$ords = $this->string2ordUTF8($str,$this->bytesString);
-					$npad = $npad/$this->bytesString;
+					$ords = $this->string2ordUTF8($str, $this->bytesString);
+					$npad = $npad / $this->bytesString;
 					$length = count($ords);
 					$ords[] = 0x80; // append the "1" bit followed by 7 0's
-					$pad = ceil(($length+1+32/$this->bytesString)/$npad)*$npad-32/$this->bytesString;
-					$ords = array_pad($ords,$pad,0);
+					$pad = ceil(($length + 1 + 32 / $this->bytesString) / $npad) * $npad - 32 / $this->bytesString;
+					$ords = array_pad($ords, $pad, 0);
 					$mask = (1 << $this->bytesString) - 1;
-					for($i = 0; $i < count($ords) * $this->bytesString; $i += $this->bytesString) {
-						if (!isset($bin[$i>>5])) { $bin[$i>>5] = 0; } // pour eviter des notices.
-						$bin[$i>>5] |= ($ords[$i / $this->bytesString] & $mask) << (24 - $i%32);
+					for ($i = 0; $i < count($ords) * $this->bytesString; $i += $this->bytesString) {
+						if (!isset($bin[$i >> 5])) { $bin[$i >> 5] = 0; } // pour eviter des notices.
+						$bin[$i >> 5] |= ($ords[$i / $this->bytesString] & $mask) << (24 - $i % 32);
 					}
-					$bin[] = $length*$this->bytesString;
+					$bin[] = $length * $this->bytesString;
 					return $bin;
 				}
 
 				function array_split($a, $n) {
 					$split = array();
-					while (count($a)>$n) {
+					while (count($a) > $n) {
 						$s = array();
-						for($i = 0;$i<$n;$i++)
+						for ($i = 0; $i < $n; $i++)
 							$s[] = array_shift($a);
 						$split[] = $s;
 					}
-					if (count($a)){
-						$a = array_pad($a,$n,0);
+					if (count($a)) {
+						$a = array_pad($a, $n, 0);
 						$split[] = $a;
 					}
 					return $split;
@@ -242,12 +242,12 @@ 
          */
         function hash($str, $ig_func = true)
         {
-            unset($binStr);     // binary representation of input string
-            unset($hexStr);     // 256-bit message digest in readable hex format
+            unset($binStr); // binary representation of input string
+            unset($hexStr); // 256-bit message digest in readable hex format
 
             // check for php's internal sha256 function, ignore if ig_func==true
             if ($ig_func == false) {
-                if (version_compare(PHP_VERSION,'5.1.2','>=') AND !defined('_NO_HASH_DEFINED')) {
+                if (version_compare(PHP_VERSION, '5.1.2', '>=') AND !defined('_NO_HASH_DEFINED')) {
                     return hash("sha256", $str, false);
                 } else if (function_exists('mhash') && defined('MHASH_SHA256')) {
                     return base64_encode(bin2hex(mhash(MHASH_SHA256, $str)));
@@ -260,44 +260,44 @@ 
              *  first thirty-two bits of the fractional parts of the cube roots
              *  of the first sixtyfour prime numbers.
              */
-            $K = array((int)0x428a2f98, (int)0x71374491, (int)0xb5c0fbcf,
-                       (int)0xe9b5dba5, (int)0x3956c25b, (int)0x59f111f1,
-                       (int)0x923f82a4, (int)0xab1c5ed5, (int)0xd807aa98,
-                       (int)0x12835b01, (int)0x243185be, (int)0x550c7dc3,
-                       (int)0x72be5d74, (int)0x80deb1fe, (int)0x9bdc06a7,
-                       (int)0xc19bf174, (int)0xe49b69c1, (int)0xefbe4786,
-                       (int)0x0fc19dc6, (int)0x240ca1cc, (int)0x2de92c6f,
-                       (int)0x4a7484aa, (int)0x5cb0a9dc, (int)0x76f988da,
-                       (int)0x983e5152, (int)0xa831c66d, (int)0xb00327c8,
-                       (int)0xbf597fc7, (int)0xc6e00bf3, (int)0xd5a79147,
-                       (int)0x06ca6351, (int)0x14292967, (int)0x27b70a85,
-                       (int)0x2e1b2138, (int)0x4d2c6dfc, (int)0x53380d13,
-                       (int)0x650a7354, (int)0x766a0abb, (int)0x81c2c92e,
-                       (int)0x92722c85, (int)0xa2bfe8a1, (int)0xa81a664b,
-                       (int)0xc24b8b70, (int)0xc76c51a3, (int)0xd192e819,
-                       (int)0xd6990624, (int)0xf40e3585, (int)0x106aa070,
-                       (int)0x19a4c116, (int)0x1e376c08, (int)0x2748774c,
-                       (int)0x34b0bcb5, (int)0x391c0cb3, (int)0x4ed8aa4a,
-                       (int)0x5b9cca4f, (int)0x682e6ff3, (int)0x748f82ee,
-                       (int)0x78a5636f, (int)0x84c87814, (int)0x8cc70208,
-                       (int)0x90befffa, (int)0xa4506ceb, (int)0xbef9a3f7,
-                       (int)0xc67178f2);
+            $K = array((int) 0x428a2f98, (int) 0x71374491, (int) 0xb5c0fbcf,
+                       (int) 0xe9b5dba5, (int) 0x3956c25b, (int) 0x59f111f1,
+                       (int) 0x923f82a4, (int) 0xab1c5ed5, (int) 0xd807aa98,
+                       (int) 0x12835b01, (int) 0x243185be, (int) 0x550c7dc3,
+                       (int) 0x72be5d74, (int) 0x80deb1fe, (int) 0x9bdc06a7,
+                       (int) 0xc19bf174, (int) 0xe49b69c1, (int) 0xefbe4786,
+                       (int) 0x0fc19dc6, (int) 0x240ca1cc, (int) 0x2de92c6f,
+                       (int) 0x4a7484aa, (int) 0x5cb0a9dc, (int) 0x76f988da,
+                       (int) 0x983e5152, (int) 0xa831c66d, (int) 0xb00327c8,
+                       (int) 0xbf597fc7, (int) 0xc6e00bf3, (int) 0xd5a79147,
+                       (int) 0x06ca6351, (int) 0x14292967, (int) 0x27b70a85,
+                       (int) 0x2e1b2138, (int) 0x4d2c6dfc, (int) 0x53380d13,
+                       (int) 0x650a7354, (int) 0x766a0abb, (int) 0x81c2c92e,
+                       (int) 0x92722c85, (int) 0xa2bfe8a1, (int) 0xa81a664b,
+                       (int) 0xc24b8b70, (int) 0xc76c51a3, (int) 0xd192e819,
+                       (int) 0xd6990624, (int) 0xf40e3585, (int) 0x106aa070,
+                       (int) 0x19a4c116, (int) 0x1e376c08, (int) 0x2748774c,
+                       (int) 0x34b0bcb5, (int) 0x391c0cb3, (int) 0x4ed8aa4a,
+                       (int) 0x5b9cca4f, (int) 0x682e6ff3, (int) 0x748f82ee,
+                       (int) 0x78a5636f, (int) 0x84c87814, (int) 0x8cc70208,
+                       (int) 0x90befffa, (int) 0xa4506ceb, (int) 0xbef9a3f7,
+                       (int) 0xc67178f2);
 
             // Pre-processing: Padding the string
-            $binStr = $this->string2binint($str,512);
+            $binStr = $this->string2binint($str, 512);
 
             // Parsing the Padded Message (Break into N 512-bit blocks)
             $M = $this->array_split($binStr, 16);
 
             // Set the initial hash values
-            $h[0] = (int)0x6a09e667;
-            $h[1] = (int)0xbb67ae85;
-            $h[2] = (int)0x3c6ef372;
-            $h[3] = (int)0xa54ff53a;
-            $h[4] = (int)0x510e527f;
-            $h[5] = (int)0x9b05688c;
-            $h[6] = (int)0x1f83d9ab;
-            $h[7] = (int)0x5be0cd19;
+            $h[0] = (int) 0x6a09e667;
+            $h[1] = (int) 0xbb67ae85;
+            $h[2] = (int) 0x3c6ef372;
+            $h[3] = (int) 0xa54ff53a;
+            $h[4] = (int) 0x510e527f;
+            $h[5] = (int) 0x9b05688c;
+            $h[6] = (int) 0x1f83d9ab;
+            $h[7] = (int) 0x5be0cd19;
 
             // loop through message blocks and compute hash. ( For i=1 to N : )
             $N = count($M);
@@ -307,14 +307,14 @@ 
                 $MI = $M[$i];
 
                 // Initialize working variables
-                $_a = (int)$h[0];
-                $_b = (int)$h[1];
-                $_c = (int)$h[2];
-                $_d = (int)$h[3];
-                $_e = (int)$h[4];
-                $_f = (int)$h[5];
-                $_g = (int)$h[6];
-                $_h = (int)$h[7];
+                $_a = (int) $h[0];
+                $_b = (int) $h[1];
+                $_c = (int) $h[2];
+                $_d = (int) $h[3];
+                $_e = (int) $h[4];
+                $_f = (int) $h[5];
+                $_g = (int) $h[6];
+                $_h = (int) $h[7];
                 unset($_s0);
                 unset($_s1);
                 unset($_T1);
@@ -339,15 +339,15 @@ 
                 for (; $t < 64; $t++)
                 {
                     // Continue building the message schedule as we loop
-                    $_s0 = $W[($t+1)&0x0F];
+                    $_s0 = $W[($t + 1) & 0x0F];
                     $_s0 = $this->sigma_0($_s0);
-                    $_s1 = $W[($t+14)&0x0F];
+                    $_s1 = $W[($t + 14) & 0x0F];
                     $_s1 = $this->sigma_1($_s1);
 
-                    $W[$t&0xF] = $this->addmod2n($this->addmod2n($this->addmod2n($W[$t&0xF], $_s0), $_s1), $W[($t+9)&0x0F]);
+                    $W[$t & 0xF] = $this->addmod2n($this->addmod2n($this->addmod2n($W[$t & 0xF], $_s0), $_s1), $W[($t + 9) & 0x0F]);
 
                     // Compute hash
-                    $_T1 = $this->addmod2n($this->addmod2n($this->addmod2n($this->addmod2n($_h, $this->Sigma1($_e)), $this->Ch($_e, $_f, $_g)), $K[$t]), $W[$t&0xF]);
+                    $_T1 = $this->addmod2n($this->addmod2n($this->addmod2n($this->addmod2n($_h, $this->Sigma1($_e)), $this->Ch($_e, $_f, $_g)), $K[$t]), $W[$t & 0xF]);
                     $_T2 = $this->addmod2n($this->Sigma0($_a), $this->Maj($_a, $_b, $_c));
 
                     // Update working variables
@@ -397,7 +397,7 @@ 
             for ($i = 0; $i < $strlen; $i++)
             {
                 $i = (($sign < 0) ? $i + $length : $i);
-                $result[] = substr($string, $sign*$i, $length);
+                $result[] = substr($string, $sign * $i, $length);
                 $i--;
                 $i = (($sign < 0) ? $i : $i + $length);
 
@@ -434,7 +434,7 @@ 
 // support to give php4 the hash() routine which abstracts this code.
 if (!function_exists('hash'))
 {
-    define('_NO_HASH_DEFINED',true);
+    define('_NO_HASH_DEFINED', true);
     function hash($algo, $data)
     {
         if (empty($algo) || !is_string($algo) || !is_string($data)) {