spip / SPIP

prive/formulaires/configurer_ecran_connexion.php

Braces +4 added lines, -12 removed lines

@@ -32,13 +32,9 @@ 
 
 	if (_request('supprimer_image_fond_login')) {
 		// rien à tester
-	}
-
-	elseif (_request('supprimer_couleur_login')) {
+	} elseif (_request('supprimer_couleur_login')) {
 		// rien à tester
-	}
-
-	elseif (!empty($_FILES['upload_image_fond_login'])) {
+	} elseif (!empty($_FILES['upload_image_fond_login'])) {
 		$file = $_FILES['upload_image_fond_login'];
 		include_spip('inc/documents');
 		$extension = pathinfo($file['name'], PATHINFO_EXTENSION);
@@ -74,14 +70,10 @@ 
 
 	if (_request('supprimer_image_fond_login')) {
 		@unlink($dest);
-	}
-
-	elseif (_request('supprimer_couleur_login')) {
+	} elseif (_request('supprimer_couleur_login')) {
 		effacer_config('couleur_login');
 		set_request('couleur_login', null);
-	}
-
-	elseif (!empty($_FILES['upload_image_fond_login'])) {
+	} elseif (!empty($_FILES['upload_image_fond_login'])) {
 		$file = $_FILES['upload_image_fond_login'];
 		include_spip('inc/documents');
 		deplacer_fichier_upload($file['tmp_name'], $dest);

ecrire/inc/envoyer_mail.php

Braces +1 added lines, -2 removed lines

@@ -205,8 +205,7 @@
 	// Marie Toto <Marie@toto.com> => @toto.com
 	if (preg_match('/@[^\s>]+/', $from, $domain)) {
 		$domain = $domain[0];
-	}
-	else {
+	} else {
 		$domain = '@unknown-' . md5($from) . '.org';
 	}
 	$uniq = random_int(0, mt_getrandmax()) . '_' . md5($to . $texte) . $domain;

ecrire/req/mysql.php

Braces +2 added lines, -4 removed lines

@@ -553,16 +553,14 @@
 		if (stripos($suite, 'SELECT') !== false) {
 			if ($echappe_textes) {
 				[$suite_echap, $textes] = query_echappe_textes($suite);
-			}
-			else {
+			} else {
 				$suite_echap = $suite;
 			}
 			if (preg_match('/^(.*?)([(]\s*SELECT\b.*)$/si', $suite_echap, $r)) {
 				$suite_echap = $r[1] . _mysql_traite_query($r[2], $db, $prefixe, false);
 				if ($echappe_textes) {
 					$suite = query_reinjecte_textes($suite_echap, $textes);
-				}
-				else {
+				} else {
 					$suite = $suite_echap;
 				}
 			}

ecrire/public/balises.php

Braces +1 added lines, -2 removed lines

@@ -2868,8 +2868,7 @@
 	$_const = interprete_argument_balise(1, $p);
 	if (!strlen($_const ?? '')) {
 		$p->code = "''";
-	}
-	else {
+	} else {
 		$p->code = "(defined($_const)?constant($_const):'')";
 	}
 	$p->interdire_scripts = false;

ecrire/inc/autoriser.php

Braces +3 added lines, -6 removed lines

@@ -267,8 +267,7 @@ 
 		if ($id === '*') {
 			unset($GLOBALS['autoriser_exception'][$faire][$type]);
 			unset($autorisation[$faire][$type]);
-		}
-		else {
+		} else {
 			unset($GLOBALS['autoriser_exception'][$faire][$type][$id]);
 			unset($autorisation[$faire][$type][$id]);
 		}
@@ -652,8 +651,7 @@ 
 function autoriser_rubrique_creer_dist(string $faire, string $type, $id, array $qui, array $opt): bool {
 	if (!empty($opt['id_parent'])) {
 		return autoriser('creerrubriquedans', 'rubrique', $opt['id_parent'], $qui);
-	}
-	else {
+	} else {
 		return autoriser('defaut', null, 0, $qui, $opt);
 	}
 }
@@ -814,8 +812,7 @@ 
 	if (!empty($opt['id_parent'])) {
 		// creerarticledans rappelle autoriser(creer,article) sans id, donc on verifiera condition du else aussi
 		return autoriser('creerarticledans', 'rubrique', $opt['id_parent'], $qui);
-	}
-	else {
+	} else {
 		return (sql_countsel('spip_rubriques') > 0 and in_array($qui['statut'], ['0minirezo', '1comite']));
 	}
 }

ecrire/inc/editer.php

Braces +1 added lines, -2 removed lines

@@ -339,8 +339,7 @@
 		if (!autoriser('modifier', $type, intval($id))) {
 			$contexte['editable'] = '';
 		}
-	}
-	else {
+	} else {
 		if (!autoriser('creer', $type, 0, null, ['id_parent' => $id_parent])) {
 			$contexte['editable'] = '';
 		}

ecrire/install/etape_ldap2.php

Braces +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
 		} else {
 			$tls = true;
 		}
-	}
-	else {
+	} else {
 		$tls_ldap == 'non';
 	}
 

ecrire/inc/distant.php

Braces +2 added lines, -4 removed lines

@@ -121,8 +121,7 @@ 
 		if (!$res or (!$res['length'] and $res['status'] != 304)) {
 			spip_log("copie_locale : Echec recuperation $source sur $localrac_tmp status : " . ($res ? $res['status'] : '-'), 'distant' . _LOG_INFO_IMPORTANTE);
 			@unlink($localrac_tmp);
-		}
-		else {
+		} else {
 			spip_log("copie_locale : recuperation $source sur $localrac_tmp OK | taille " . $res['length'] . ' status ' . $res['status'], 'distant');
 		}
 		if (!$res or !$res['length']) {
@@ -240,8 +239,7 @@ 
 						break;
 					}
 				}
-			}
-			else {
+			} else {
 				$ip = false;
 			}
 		}

ecrire/inc/config.php

Braces +1 added lines, -2 removed lines

@@ -312,8 +312,7 @@
 					ecrire_meta($casier, $serialized_store, null, $table);
 				}
 			}
-		}
-		else {
+		} else {
 			ecrire_meta($casier, $store, null, $table);
 		}
 	}