Completed
Push — master ( b35b89...18f6a0 )
by cam
01:02
created
ecrire/base/connect_sql.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -448,8 +448,7 @@
 block discarded – undo
448 448
 					and strpos($query_echappees, $part . $next, $currentpos) === $nextpos
449 449
 				) {
450 450
 					$part .= array_shift($textes);
451
-				}
452
-				else {
451
+				} else {
453 452
 					break;
454 453
 				}
455 454
 			}
Please login to merge, or discard this patch.
ecrire/inc/editer.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -339,8 +339,7 @@
 block discarded – undo
339 339
 		if (!autoriser('modifier', $type, intval($id))) {
340 340
 			$contexte['editable'] = '';
341 341
 		}
342
-	}
343
-	else {
342
+	} else {
344 343
 		if (!autoriser('creer', $type, 0, null, ['id_parent' => $id_parent])) {
345 344
 			$contexte['editable'] = '';
346 345
 		}
Please login to merge, or discard this patch.
ecrire/auth/spip.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -101,8 +101,7 @@  discard block
 block discarded – undo
101 101
 				if ($cles->restore($row['backup_cles'], $pass, $row['pass'], $row['id_auteur'])) {
102 102
 					spip_log('Les cles secretes ont ete restaurées avec le backup du webmestre #' . $row['id_auteur'], 'auth' . _LOG_INFO_IMPORTANTE);
103 103
 					$cles->save();
104
-				}
105
-				else {
104
+				} else {
106 105
 					spip_log('Pas de cle secrete disponible (fichier config/cle.php absent ?) mais le backup du webmestre #' . $row['id_auteur'] . " n'est pas valide", 'auth' . _LOG_ERREUR);
107 106
 					sql_updateq('spip_auteurs', ['backup_cles' => ''], 'id_auteur=' . intval($row['id_auteur']));
108 107
 				}
@@ -202,8 +201,7 @@  discard block
 block discarded – undo
202 201
 		spip_log("Pas de cle secrete disponible, et aucun webmestre n'a de backup, on regenere une nouvelle cle - tous les mots de passe sont invalides", 'auth' . _LOG_INFO_IMPORTANTE);
203 202
 		$secret = $cles->getSecretAuth(true);
204 203
 		return true;
205
-	}
206
-	else {
204
+	} else {
207 205
 		spip_log('Pas de cle secrete disponible (fichier config/cle.php absent ?) un des webmestres #' . implode(', #', $has_backup) . ' doit se connecter pour restaurer son backup des cles', 'auth' . _LOG_ERREUR);
208 206
 		return false;
209 207
 	}
@@ -443,8 +441,7 @@  discard block
 block discarded – undo
443 441
 	if (!$secret) {
444 442
 		if (auth_spip_initialiser_secret()) {
445 443
 			$secret = $cles->getSecretAuth();
446
-		}
447
-		else {
444
+		} else {
448 445
 			return false;
449 446
 		}
450 447
 	}
Please login to merge, or discard this patch.
ecrire/install/etape_ldap2.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,8 +39,7 @@
 block discarded – undo
39 39
 		} else {
40 40
 			$tls = true;
41 41
 		}
42
-	}
43
-	else {
42
+	} else {
44 43
 		$tls_ldap == 'non';
45 44
 	}
46 45
 
Please login to merge, or discard this patch.
ecrire/inc/distant.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -121,8 +121,7 @@  discard block
 block discarded – undo
121 121
 		if (!$res or (!$res['length'] and $res['status'] != 304)) {
122 122
 			spip_log("copie_locale : Echec recuperation $source sur $localrac_tmp status : " . ($res ? $res['status'] : '-'), 'distant' . _LOG_INFO_IMPORTANTE);
123 123
 			@unlink($localrac_tmp);
124
-		}
125
-		else {
124
+		} else {
126 125
 			spip_log("copie_locale : recuperation $source sur $localrac_tmp OK | taille " . $res['length'] . ' status ' . $res['status'], 'distant');
127 126
 		}
128 127
 		if (!$res or !$res['length']) {
@@ -240,8 +239,7 @@  discard block
 block discarded – undo
240 239
 						break;
241 240
 					}
242 241
 				}
243
-			}
244
-			else {
242
+			} else {
245 243
 				$ip = false;
246 244
 			}
247 245
 		}
Please login to merge, or discard this patch.
ecrire/action/editer_logo.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,7 @@
 block discarded – undo
42 42
 		if ((is_countable($logo) ? count($logo) : 0) < 6) {
43 43
 			spip_log("Supprimer ancien logo " . json_encode($logo, JSON_THROW_ON_ERROR), 'logo');
44 44
 			spip_unlink($logo[0]);
45
-		}
46
-		elseif (
45
+		} elseif (
47 46
 			$doc = $logo[5]
48 47
 			and isset($doc['id_document'])
49 48
 			and $id_document = $doc['id_document']
Please login to merge, or discard this patch.
ecrire/inc/config.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -312,8 +312,7 @@
 block discarded – undo
312 312
 					ecrire_meta($casier, $serialized_store, null, $table);
313 313
 				}
314 314
 			}
315
-		}
316
-		else {
315
+		} else {
317 316
 			ecrire_meta($casier, $store, null, $table);
318 317
 		}
319 318
 	}
Please login to merge, or discard this patch.