spip / SPIP

ecrire/inc/editer.php

Braces +1 added lines, -2 removed lines

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

ecrire/inc/autoriser.php

Braces +3 added lines, -6 removed lines

@@ -237,8 +237,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]);
 		}
@@ -592,8 +591,7 @@ 
 function autoriser_rubrique_creer_dist($faire, $type, $id, $qui, $opt) {
 	if (!empty($opt['id_parent'])) {
 		return autoriser('creerrubriquedans', 'rubrique', $opt['id_parent'], $qui);
-	}
-	else {
+	} else {
 		return autoriser('defaut', null, null, $qui, $opt);
 	}
 }
@@ -739,8 +737,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'], array('0minirezo', '1comite')));
 	}
 }

ecrire/inc/minipres.php

Braces +2 added lines, -4 removed lines

@@ -192,11 +192,9 @@
 
 		if ($statut AND test_espace_prive()) {
 			$corps = bouton_action(_T('public:accueil_site'),generer_url_ecrire('accueil'));
-		}
-		elseif (!empty($_COOKIE['spip_admin'])) {
+		} elseif (!empty($_COOKIE['spip_admin'])) {
 			$corps = bouton_action(_T('public:lien_connecter'),generer_url_public('login'));
-		}
-		else {
+		} else {
 			$corps = bouton_action(_T('public:accueil_site'),$GLOBALS['meta']['adresse_site']);
 		}
 		$corps = "<div class='boutons'>$corps</div>";

ecrire/inc/securiser_action.php

Braces +1 added lines, -2 removed lines

@@ -85,8 +85,7 @@
 		$url_action = self();
 		$action = _request('action');
 		$url_action = parametre_url($url_action, 'action', $action, '&');
-	}
-	else {
+	} else {
 		$action = parametre_url($url_action, 'action');
 	}
 

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 = rand() . '_' . md5($to . $texte) . $domain;

ecrire/inc/acces.php

Braces +1 added lines, -2 removed lines

@@ -359,8 +359,7 @@
 function generer_htpass($pass) {
 	if ($generer_htpass = charger_fonction('generer_htpass', 'inc', true)) {
 		return $generer_htpass($pass);
-	}
-	elseif (function_exists('crypt')) {
+	} elseif (function_exists('crypt')) {
 		return crypt($pass, initialiser_sel());
 	}
 	return '';

ecrire/inc/rubriques.php

Braces +4 added lines, -3 removed lines

@@ -77,8 +77,7 @@ 
 				break; // stop on a trouvé le bon champ
 			}
 		}
-	}
-	else {
+	} else {
 		$statuts_publies = array('publie');
 	}
 	
@@ -105,10 +104,12 @@ 
 		}
 	}
 
-	if ($neuf) // Sauver la date de la derniere mise a jour (pour menu_rubriques)
+	if ($neuf) {
+	    // Sauver la date de la derniere mise a jour (pour menu_rubriques)
 	{
 		ecrire_meta("date_calcul_rubriques", date("U"));
 	}
+	}
 
 	$langues = calculer_langues_utilisees();
 	ecrire_meta('langues_utilisees', $langues);

ecrire/public/fonctions.php

Braces +5 added lines, -5 removed lines

@@ -115,10 +115,12 @@ 
 
 	// et reparagrapher si necessaire (coherence avec le cas descriptif)
 	// une introduction a tojours un <p>
-	if ($GLOBALS['toujours_paragrapher']) // Fermer les paragraphes
+	if ($GLOBALS['toujours_paragrapher']) {
+	    // Fermer les paragraphes
 	{
 		$texte = paragrapher($texte, $GLOBALS['toujours_paragrapher']);
 	}
+	}
 
 	return $texte;
 }
@@ -207,8 +209,7 @@ 
 		$pagination['type_pagination'] = $modele;
 		if (trouver_fond('pagination_'.$modele, 'modeles')) {
 			$modele = '_' . $modele;
-		}
-		else {
+		} else {
 			$modele = '';
 		}
 	}
@@ -295,8 +296,7 @@ 
 	if ($ids) {
 		$ids = array_column($ids, 'id_objet');
 		return implode(',', $ids);
-	}
-	else {
+	} else {
 		return "0";
 	}
 }

ecrire/base/objets.php

Braces +4 added lines, -4 removed lines

@@ -981,8 +981,9 @@ 
 	static $tables = array();
 	if (!isset($tables[$serveur])){
 		$tables[$serveur] = array();
-		if (!function_exists("sql_alltable"))
-			include_spip("base/abstract_sql");
+		if (!function_exists("sql_alltable")) {
+					include_spip("base/abstract_sql");
+		}
 		$ts = sql_alltable('%',$serveur); // toutes les tables
 		foreach ($ts as $t){
 			$tables[$serveur][$t] = $t;
@@ -1384,8 +1385,7 @@ 
 							'champ' 	=> $parent_methode['champ'],
 							'table'    => $table,
 						);
-					}
-					elseif (isset($parent_methode['champ_type'])) {
+					} elseif (isset($parent_methode['champ_type'])) {
 						$parent = array(
 							'objet' 	 => $ligne[$parent_methode['champ_type']],
 							'id_objet' 	 => intval($ligne[$parent_methode['champ']]),