spip / SPIP

ecrire/inc/chercher_logo.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
 	$mode = preg_replace(",\W,", '', $mode);
 	if ($mode) {
 		// chercher dans la base
-		$mode_document = 'logo' . $mode;
+		$mode_document = 'logo'.$mode;
 		$objet = objet_type($_id_objet);
 		$doc = sql_fetsel('D.*', 'spip_documents AS D JOIN spip_documents_liens AS L ON L.id_document=D.id_document', "D.mode=".sql_quote($mode_document)." AND L.objet=".sql_quote($objet)." AND id_objet=".intval($id));
 		if ($doc) {
@@ -52,10 +52,10 @@ 
 		if ($compat_old_logos) {
 			# attention au cas $id = '0' pour LOGO_SITE_SPIP : utiliser intval()
 			$type = type_du_logo($_id_objet);
-			$nom = $type . $mode . intval($id);
+			$nom = $type.$mode.intval($id);
 
 			foreach ($GLOBALS['formats_logos'] as $format) {
-				if (@file_exists($d = (_DIR_LOGOS . $nom . '.' . $format))) {
+				if (@file_exists($d = (_DIR_LOGOS.$nom.'.'.$format))) {
 					return array($d, _DIR_LOGOS, $nom, $format, @filemtime($d));
 				}
 			}

ecrire/maj/svn10000.php

Spacing +30 added lines, -30 removed lines

@@ -70,10 +70,10 @@ 
 function maj_11388() {
 	$s = sql_select('referer_md5', 'spip_referers_articles', "referer='' OR referer IS NULL");
 	while ($t = sql_fetch($s)) {
-		$k = sql_fetsel('referer', 'spip_referers', 'referer_md5=' . sql_quote($t['referer_md5']));
+		$k = sql_fetsel('referer', 'spip_referers', 'referer_md5='.sql_quote($t['referer_md5']));
 		if ($k['referer']) {
 			sql_query('UPDATE spip_referers_articles
-			SET referer=' . sql_quote($k['referer']) . '
+			SET referer=' . sql_quote($k['referer']).'
 			WHERE referer_md5=' . sql_quote($t['referer_md5'])
 				. " AND (referer='' OR referer IS NULL)"
 			);
@@ -98,7 +98,7 @@ 
 	// mise a jour de ces mots la
 	if ($res) {
 		while ($r = sql_fetch($res)) {
-			sql_updateq('spip_mots', array('type' => $r['type']), 'id_mot=' . sql_quote($r['id_mot']));
+			sql_updateq('spip_mots', array('type' => $r['type']), 'id_mot='.sql_quote($r['id_mot']));
 		}
 	}
 }
@@ -173,8 +173,8 @@ 
 
 	// Recopier les donnees
 	foreach (array('article', 'breve', 'rubrique', 'auteur', 'forum') as $l) {
-		if ($s = sql_select('*', 'spip_documents_' . $l . 's')
-			or $s = sql_select('*', 'spip_documents_' . $l)
+		if ($s = sql_select('*', 'spip_documents_'.$l.'s')
+			or $s = sql_select('*', 'spip_documents_'.$l)
 		) {
 			$tampon = array();
 			while ($t = sql_fetch($s)) {
@@ -378,9 +378,9 @@ 
 	$exceptions_pluriel = array('forum' => 'forum', 'syndic' => 'syndic');
 
 	$pivot = preg_replace(',[^\w],', '', $pivot); // securite
-	$pivots = (isset($exceptions_pluriel[$pivot]) ? $exceptions_pluriel[$pivot] : $pivot . "s");
-	$liens = "spip_" . $pivots . "_liens";
-	$id_pivot = "id_" . $pivot;
+	$pivots = (isset($exceptions_pluriel[$pivot]) ? $exceptions_pluriel[$pivot] : $pivot."s");
+	$liens = "spip_".$pivots."_liens";
+	$id_pivot = "id_".$pivot;
 	// Creer spip_auteurs_liens
 	global $tables_auxiliaires;
 	if (!$l) {
@@ -392,8 +392,8 @@ 
 		$l = preg_replace(',[^\w],', '', $l); // securite
 		$primary = "id_$l";
 		$objet = ($l == 'syndic' ? 'site' : $l);
-		$ls = (isset($exceptions_pluriel[$l]) ? $exceptions_pluriel[$l] : $l . "s");
-		$ancienne_table = 'spip_' . $pivots . '_' . $ls;
+		$ls = (isset($exceptions_pluriel[$l]) ? $exceptions_pluriel[$l] : $l."s");
+		$ancienne_table = 'spip_'.$pivots.'_'.$ls;
 		$pool = 400;
 
 		$trouver_table = charger_fonction('trouver_table', 'base');
@@ -429,12 +429,12 @@ 
 		while ($ids = array_map('reset', sql_allfetsel("$primary", $ancienne_table, '', '', '', "0,$sub_pool"))) {
 			$insert = array();
 			foreach ($ids as $id) {
-				$n = sql_countsel($liens, "objet='$objet' AND id_objet=" . intval($id));
-				while ($t = sql_allfetsel($champs, $ancienne_table, "$primary=" . intval($id), '', $id_pivot, "$n,$pool")) {
+				$n = sql_countsel($liens, "objet='$objet' AND id_objet=".intval($id));
+				while ($t = sql_allfetsel($champs, $ancienne_table, "$primary=".intval($id), '', $id_pivot, "$n,$pool")) {
 					$n += count($t);
 					// empiler en s'assurant a minima de l'unicite
 					while ($r = array_shift($t)) {
-						$insert[$r[$id_pivot] . ':' . $r['id_objet']] = $r;
+						$insert[$r[$id_pivot].':'.$r['id_objet']] = $r;
 					}
 					if (count($insert) >= $sub_pool) {
 						maj_liens_insertq_multi_check($liens, $insert, $tables_auxiliaires[$liens]);
@@ -581,13 +581,13 @@ 
 
 	// cas particulier spip_auteurs : retablir le collate binary sur le login
 	$desc = $trouver_table("spip_auteurs");
-	spip_log("spip_auteurs : " . var_export($desc['field'], true), "maj." . _LOG_INFO_IMPORTANTE);
+	spip_log("spip_auteurs : ".var_export($desc['field'], true), "maj."._LOG_INFO_IMPORTANTE);
 	if (stripos($desc['field']['login'], "BINARY") === false) {
 		spip_log("Retablir champ login BINARY sur table spip_auteurs", "maj");
 		sql_alter("table spip_auteurs change login login VARCHAR(255) BINARY");
 		$trouver_table('');
 		$new_desc = $trouver_table("spip_auteurs");
-		spip_log("Apres conversion spip_auteurs : " . var_export($new_desc['field'], true), "maj." . _LOG_INFO_IMPORTANTE);
+		spip_log("Apres conversion spip_auteurs : ".var_export($new_desc['field'], true), "maj."._LOG_INFO_IMPORTANTE);
 	}
 
 	foreach ($tables as $table) {
@@ -606,24 +606,24 @@ 
 					$data = sql_allfetsel("*", "spip_urls", '', '', 'date DESC');
 					$urls = array();
 					foreach ($data as $d) {
-						$key = $d['id_parent'] . "::" . strtolower($d['url']);
+						$key = $d['id_parent']."::".strtolower($d['url']);
 						if (!isset($urls[$key])) {
 							$urls[$key] = true;
 						} else {
-							spip_log("Suppression doublon dans spip_urls avant conversion : " . serialize($d),
-								"maj." . _LOG_INFO_IMPORTANTE);
-							sql_delete("spip_urls", "id_parent=" . sql_quote($d['id_parent']) . " AND url=" . sql_quote($d['url']));
+							spip_log("Suppression doublon dans spip_urls avant conversion : ".serialize($d),
+								"maj."._LOG_INFO_IMPORTANTE);
+							sql_delete("spip_urls", "id_parent=".sql_quote($d['id_parent'])." AND url=".sql_quote($d['url']));
 						}
 					}
 				}
 				foreach ($desc['field'] as $field => $type) {
 					if ($desc['field'][$field] !== $desc_collate[$field]) {
-						spip_log("Conversion COLLATE table $table", "maj." . _LOG_INFO_IMPORTANTE);
-						sql_alter("table $table change $field $field " . $desc_collate[$field]);
+						spip_log("Conversion COLLATE table $table", "maj."._LOG_INFO_IMPORTANTE);
+						sql_alter("table $table change $field $field ".$desc_collate[$field]);
 						$trouver_table('');
 						$new_desc = $trouver_table($table);
-						spip_log("Apres conversion $table : " . var_export($new_desc['field'], true),
-							"maj." . _LOG_INFO_IMPORTANTE);
+						spip_log("Apres conversion $table : ".var_export($new_desc['field'], true),
+							"maj."._LOG_INFO_IMPORTANTE);
 						continue 2; // inutile de continuer pour cette table : un seul alter remet tout a jour en sqlite
 					}
 				}
@@ -639,7 +639,7 @@ 
 
 $GLOBALS['maj'][19236] = array(
 	array('sql_updateq', 'spip_meta', array('impt' => 'oui'), "nom='version_installee'"), // version base principale
-	array('sql_updateq', 'spip_meta', array('impt' => 'oui'), "nom LIKE '%_base_version'"),  // version base plugins
+	array('sql_updateq', 'spip_meta', array('impt' => 'oui'), "nom LIKE '%_base_version'"), // version base plugins
 	array('maj_collation_sqlite'),
 );
 
@@ -656,7 +656,7 @@ 
 	spip_log("supprimer sessions auteur");
 	if ($dir = opendir(_DIR_SESSIONS)) {
 		while (($f = readdir($dir)) !== false) {
-			spip_unlink(_DIR_SESSIONS . $f);
+			spip_unlink(_DIR_SESSIONS.$f);
 			if (time() >= _TIME_OUT) {
 				return;
 			}
@@ -675,17 +675,17 @@ 
  */
 function ranger_cache_gd2() {
 	spip_log("ranger_cache_gd2");
-	$base = _DIR_VAR . "cache-gd2/";
+	$base = _DIR_VAR."cache-gd2/";
 	if (is_dir($base) and is_readable($base)) {
 		if ($dir = opendir($base)) {
 			while (($f = readdir($dir)) !== false) {
-				if (!is_dir($base . $f) and strncmp($f, ".", 1) !== 0
+				if (!is_dir($base.$f) and strncmp($f, ".", 1) !== 0
 					and preg_match(",[0-9a-f]{32}\.\w+,", $f)
 				) {
 					$sub = substr($f, 0, 2);
 					$sub = sous_repertoire($base, $sub);
-					@rename($base . $f, $sub . substr($f, 2));
-					@unlink($base . $f); // au cas ou le rename a foire (collision)
+					@rename($base.$f, $sub.substr($f, 2));
+					@unlink($base.$f); // au cas ou le rename a foire (collision)
 				}
 				if (time() >= _TIME_OUT) {
 					return;
@@ -712,6 +712,6 @@ 
 // upgrade des logos
 $GLOBALS['maj'][24351] = [];
 $tables_objets_sql = lister_tables_objets_sql();
-foreach(array_keys($tables_objets_sql) as $table) {
+foreach (array_keys($tables_objets_sql) as $table) {
 	$GLOBALS['maj'][24351][] = ['upgrade_logo_objet', objet_type($table)];
 };
\ No newline at end of file

ecrire/action/editer_logo.php

Spacing +11 added lines, -11 removed lines

@@ -81,14 +81,14 @@ 
 	include_spip('inc/chercher_logo');
 
 	$mode = preg_replace(",\W,", '', $etat);
-	if (!$mode){
+	if (!$mode) {
 		spip_log("logo_modifier : etat $etat invalide", 'logo');
 		$erreur = 'etat invalide';
 
 		return $erreur;
 	}
 	// chercher dans la base
-	$mode_document = 'logo' . $mode;
+	$mode_document = 'logo'.$mode;
 
 	include_spip('inc/documents');
 	$erreur = '';
@@ -105,7 +105,7 @@ 
 		$tmp_name = false;
 		if (file_exists($source)) {
 			$tmp_name = $source;
-		} elseif (file_exists($f = determine_upload() . $source)) {
+		} elseif (file_exists($f = determine_upload().$source)) {
 			$tmp_name = $f;
 		}
 		if (!$tmp_name) {
@@ -160,27 +160,27 @@ 
 	$type = type_du_logo($_id_objet);
 
 	foreach (['on', 'off'] as $mode) {
-		$nom_base = $type . $mode;
+		$nom_base = $type.$mode;
 		$dir = (defined('_DIR_LOGOS') ? _DIR_LOGOS : _DIR_IMG);
 
 		$deja = array();
-		$files = glob($dir . $nom_base . "*");
+		$files = glob($dir.$nom_base."*");
 
 		foreach ($files as $file) {
-			$logo = substr($file, strlen($dir . $nom_base));
+			$logo = substr($file, strlen($dir.$nom_base));
 			$logo = explode('.', $logo);
 			if (is_numeric($logo[0])
 			  and $id_objet = intval($logo[0])) {
 				if (!isset($deja[$id_objet])) {
 					$logo = $chercher_logo($id_objet, $_id_objet, $mode);
 					// if no logo in base
-					if (!$logo or count($logo)<6) {
+					if (!$logo or count($logo) < 6) {
 						foreach ($formats_logos as $format) {
-							if (@file_exists($d = ($dir . ($nom = $nom_base . intval($id_objet) . '.' . $format)))) {
+							if (@file_exists($d = ($dir.($nom = $nom_base.intval($id_objet).'.'.$format)))) {
 								// logo_modifier commence par supprimer le logo existant, donc on le deplace pour pas le perdre
-								@rename($d, $dir_logos . $nom);
+								@rename($d, $dir_logos.$nom);
 								// et on le declare comme nouveau logo
-								logo_modifier($objet, $id_objet, $mode, $dir_logos . $nom);
+								logo_modifier($objet, $id_objet, $mode, $dir_logos.$nom);
 								break;
 							}
 						}
@@ -190,7 +190,7 @@ 
 			}
 			// si le fichier est encore la on le move : rien a faire ici
 			if (file_exists($file)) {
-				@rename($file, $dir_logos_erreurs . basename($file));
+				@rename($file, $dir_logos_erreurs.basename($file));
 			}
 
 			if ($time_limit and time() > $time_limit) {