fisharebest / webtrees

admin_site_upgrade.php

Spacing +2 added lines, -2 removed lines

@@ -29,10 +29,10 @@
 // Check for updates
 $latest_version_txt = Functions::fetchLatestVersion();
 if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
-	list($latest_version, , $download_url) = explode('|', $latest_version_txt);
+	list($latest_version,, $download_url) = explode('|', $latest_version_txt);
 } else {
 	// Cannot determine the latest version
-	list($latest_version, , $download_url) = explode('|', '||');
+	list($latest_version,, $download_url) = explode('|', '||');
 }
 
 $latest_version_html = '<span dir="ltr">' . $latest_version . '</span>';

Switch Indentation +46 added lines, -46 removed lines

@@ -118,18 +118,18 @@ 
 foreach (Module::getInstalledModules('disabled') as $module) {
 	if (!in_array($module->getName(), Module::getCoreModuleNames())) {
 		switch ($modules_action) {
-		case 'disable':
-			Database::prepare(
-				"UPDATE `##module` SET status = 'disabled' WHERE module_name = ?"
-			)->execute([$module->getName()]);
-			break;
-		case 'ignore':
-			echo '<br>', I18N::translate('Custom module'), ' — ', WT_MODULES_DIR, $module->getName(), ' — ', $module->getTitle(), $icon_success;
-			break;
-		default:
-			echo '<br>', I18N::translate('Custom module'), ' — ', WT_MODULES_DIR, $module->getName(), ' — ', $module->getTitle(), $icon_failure;
-			$custom_modules = true;
-			break;
+			case 'disable':
+				Database::prepare(
+					"UPDATE `##module` SET status = 'disabled' WHERE module_name = ?"
+				)->execute([$module->getName()]);
+				break;
+			case 'ignore':
+				echo '<br>', I18N::translate('Custom module'), ' — ', WT_MODULES_DIR, $module->getName(), ' — ', $module->getTitle(), $icon_success;
+				break;
+			default:
+				echo '<br>', I18N::translate('Custom module'), ' — ', WT_MODULES_DIR, $module->getName(), ' — ', $module->getTitle(), $icon_failure;
+				$custom_modules = true;
+				break;
 		}
 	}
 }
@@ -158,40 +158,40 @@ 
 $custom_themes = false;
 foreach (Theme::themeNames() as $theme_id => $theme_name) {
 	switch ($theme_id) {
-	case 'clouds':
-	case 'colors':
-	case 'fab':
-	case 'minimal':
-	case 'webtrees':
-	case 'xenea':
-		break;
-	default:
-		$theme_used = Database::prepare(
-			"SELECT EXISTS (SELECT 1 FROM `##site_setting`   WHERE setting_name='THEME_DIR' AND setting_value=?)" .
-			" OR EXISTS (SELECT 1 FROM `##gedcom_setting` WHERE setting_name='THEME_DIR' AND setting_value=?)" .
-			" OR EXISTS (SELECT 1 FROM `##user_setting`   WHERE setting_name='theme'     AND setting_value=?)"
-		)->execute([$theme_id, $theme_id, $theme_id])->fetchOne();
-		if ($theme_used) {
-			switch ($themes_action) {
-			case 'disable':
-				Database::prepare(
-					"DELETE FROM `##site_setting`   WHERE setting_name = 'THEME_DIR' AND setting_value = ?"
-				)->execute([$theme_id]);
-				Database::prepare(
-					"DELETE FROM `##gedcom_setting` WHERE setting_name = 'THEME_DIR' AND setting_value = ?"
-				)->execute([$theme_id]);
-				Database::prepare(
-					"DELETE FROM `##user_setting`   WHERE setting_name = 'theme'     AND setting_value = ?"
-				)->execute([$theme_id]);
-				break;
-			case 'ignore':
-				echo '<br>', I18N::translate('Custom theme'), ' — ', $theme_id, ' — ', $theme_name, $icon_success;
-				break;
-			default:
-				echo '<br>', I18N::translate('Custom theme'), ' — ', $theme_id, ' — ', $theme_name, $icon_failure;
-				$custom_themes = true;
-				break;
-			}
+		case 'clouds':
+		case 'colors':
+		case 'fab':
+		case 'minimal':
+		case 'webtrees':
+		case 'xenea':
+			break;
+		default:
+			$theme_used = Database::prepare(
+				"SELECT EXISTS (SELECT 1 FROM `##site_setting`   WHERE setting_name='THEME_DIR' AND setting_value=?)" .
+				" OR EXISTS (SELECT 1 FROM `##gedcom_setting` WHERE setting_name='THEME_DIR' AND setting_value=?)" .
+				" OR EXISTS (SELECT 1 FROM `##user_setting`   WHERE setting_name='theme'     AND setting_value=?)"
+			)->execute([$theme_id, $theme_id, $theme_id])->fetchOne();
+			if ($theme_used) {
+				switch ($themes_action) {
+					case 'disable':
+						Database::prepare(
+							"DELETE FROM `##site_setting`   WHERE setting_name = 'THEME_DIR' AND setting_value = ?"
+						)->execute([$theme_id]);
+						Database::prepare(
+							"DELETE FROM `##gedcom_setting` WHERE setting_name = 'THEME_DIR' AND setting_value = ?"
+						)->execute([$theme_id]);
+						Database::prepare(
+							"DELETE FROM `##user_setting`   WHERE setting_name = 'theme'     AND setting_value = ?"
+						)->execute([$theme_id]);
+						break;
+					case 'ignore':
+						echo '<br>', I18N::translate('Custom theme'), ' — ', $theme_id, ' — ', $theme_name, $icon_success;
+						break;
+					default:
+						echo '<br>', I18N::translate('Custom theme'), ' — ', $theme_id, ' — ', $theme_name, $icon_failure;
+						$custom_themes = true;
+						break;
+				}
 		}
 		break;
 	}

editnews.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
 switch ($action) {
 case 'delete':
-	Database::prepare("DELETE FROM `##news` WHERE news_id = :news_id")->execute(['news_id' => $news_id,]);
+	Database::prepare("DELETE FROM `##news` WHERE news_id = :news_id")->execute(['news_id' => $news_id, ]);
 
 	header('Location: index.php?ctype=' . $ctype . '&ged=' . $controller->tree()->getNameUrl());
 

mediafirewall.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 	// Caution - $media_dir may contain relative paths: ../../
 	$source_dir = new Filesystem(new Local(WT_DATA_DIR . $media_dir));
 	$cache_dir  = new Filesystem(new Local(WT_DATA_DIR . 'thumbnail-cache/' . md5($media_dir)));
-	$assets_dir = new Filesystem(new Local( 'assets'));
+	$assets_dir = new Filesystem(new Local('assets'));
 
 	$server = ServerFactory::create([
 		'driver'     => $driver,

app/Controller/IndividualController.php

Spacing +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 	public function getTabs() {
 		$active_tabs = Module::getActiveTabs($this->record->getTree());
 
-		return array_filter($active_tabs, function(ModuleTabInterface $tab) {
+		return array_filter($active_tabs, function (ModuleTabInterface $tab) {
 			return $tab->hasTabContent();
 		});
 	}
@@ -247,7 +247,7 @@ 
 		}
 
 		if ($individual->canEdit() && !$fact->isPendingDeletion()) {
-			$edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=edit&xref=' . $individual->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $individual->getTree()->getNameHtml() ]);
+			$edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=edit&xref=' . $individual->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $individual->getTree()->getNameHtml()]);
 		} else {
 			$edit_links = '';
 		}

Switch Indentation +35 added lines, -35 removed lines

@@ -166,23 +166,23 @@ 
 					$name = str_replace('/', '', $name);
 					$name = preg_replace('/(\S*)\*/', '<span class="starredname">\\1</span>', $name);
 					switch ($tag) {
-					case 'TYPE':
-						echo GedcomCodeName::getValue($name, $this->record);
-						break;
-					case 'SURN':
-						// The SURN field is not necessarily the surname.
-						// Where it is not a substring of the real surname, show it after the real surname.
-						$surname = Html::escape($dummy->getAllNames()[0]['surname']);
-						$surns   = preg_replace('/, */', ' ', $nmatch[$i][2]);
-						if (strpos($dummy->getAllNames()[0]['surname'], $surns) !== false) {
-							echo '<span dir="auto">' . $surname . '</span>';
-						} else {
-							echo I18N::translate('%1$s (%2$s)', '<span dir="auto">' . $surname . '</span>', '<span dir="auto">' . $name . '</span>');
-						}
-						break;
-					default:
-						echo '<span dir="auto">' . $name . '</span>';
-						break;
+						case 'TYPE':
+							echo GedcomCodeName::getValue($name, $this->record);
+							break;
+						case 'SURN':
+							// The SURN field is not necessarily the surname.
+							// Where it is not a substring of the real surname, show it after the real surname.
+							$surname = Html::escape($dummy->getAllNames()[0]['surname']);
+							$surns   = preg_replace('/, */', ' ', $nmatch[$i][2]);
+							if (strpos($dummy->getAllNames()[0]['surname'], $surns) !== false) {
+								echo '<span dir="auto">' . $surname . '</span>';
+							} else {
+								echo I18N::translate('%1$s (%2$s)', '<span dir="auto">' . $surname . '</span>', '<span dir="auto">' . $name . '</span>');
+							}
+							break;
+						default:
+							echo '<span dir="auto">' . $name . '</span>';
+							break;
 					}
 				}
 				echo '</dd>';
@@ -228,15 +228,15 @@ 
 		$individual = $fact->getParent();
 
 		switch ($fact->getValue()) {
-		case 'M':
-			$sex = I18N::translate('Male');
-			break;
-		case 'F':
-			$sex = I18N::translate('Female');
-			break;
-		default:
-			$sex = I18N::translateContext('unknown gender', 'Unknown');
-			break;
+			case 'M':
+				$sex = I18N::translate('Male');
+				break;
+			case 'F':
+				$sex = I18N::translate('Female');
+				break;
+			default:
+				$sex = I18N::translateContext('unknown gender', 'Unknown');
+				break;
 		}
 
 		$container_class = 'card';
@@ -296,15 +296,15 @@ 
 	 */
 	public function getPersonStyle($person) {
 		switch ($person->getSex()) {
-		case 'M':
-			$class = 'person_box';
-			break;
-		case 'F':
-			$class = 'person_boxF';
-			break;
-		default:
-			$class = 'person_boxNN';
-			break;
+			case 'M':
+				$class = 'person_box';
+				break;
+			case 'F':
+				$class = 'person_boxF';
+				break;
+			default:
+				$class = 'person_boxNN';
+				break;
 		}
 		if ($person->isPendingDeletion()) {
 			$class .= ' old';

message.php

Spacing +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
 $controller->restrictAccess(!in_array($to, ['all', 'never_logged', 'last_6mo']) || Auth::isAdmin());
 $controller->pageHeader();
 
-$to_names = implode(I18N::$list_separator, array_map(function(User $user) {
+$to_names = implode(I18N::$list_separator, array_map(function (User $user) {
 	return $user->getRealName();
 }, recipients($to)));
 
@@ -184,11 +184,11 @@ 
 	if ($to === 'all') {
 		$recipients = User::all();
 	} elseif ($to === 'last_6mo') {
-		$recipients = array_filter(User::all(), function(User $user) {
+		$recipients = array_filter(User::all(), function (User $user) {
 			return $user->getPreference('sessiontime') > 0 && WT_TIMESTAMP - $user->getPreference('sessiontime') > 60 * 60 * 24 * 30 * 6;
 		});
 	} elseif ($to === 'never_logged') {
-		$recipients = array_filter(User::all(), function(User $user) {
+		$recipients = array_filter(User::all(), function (User $user) {
 			return $user->getPreference('verified_by_admin') && $user->getPreference('reg_timestamp') > $user->getPreference('sessiontime');
 		});
 	} else {

app/View.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	 * @return string
 	 */
 	public static function getFilenameForView($view_name) {
-		$view_file  = $view_name . '.php';
+		$view_file = $view_name . '.php';
 		//$theme_view = WT_THEMES_DIR . Theme::theme()->themeId() . '/resources/views/' . $view_file;
 
 		//if (file_exists($theme_view)) {

index.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Fisharebest\Webtrees;
 

routes/web.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Fisharebest\Webtrees;
 

app/Database.php

Spacing +1 added lines, -2 removed lines

@@ -78,8 +78,7 @@
 		// Create the underlying PDO object
 		self::$pdo = new PDO(
 			(substr($config['dbhost'], 0, 1) === '/' ?
-				"mysql:unix_socket={$config['dbhost']};dbname={$config['dbname']}" :
-				"mysql:host={$config['dbhost']};dbname={$config['dbname']};port={$config['dbport']}"
+				"mysql:unix_socket={$config['dbhost']};dbname={$config['dbname']}" : "mysql:host={$config['dbhost']};dbname={$config['dbname']};port={$config['dbport']}"
 			),
 			$config['dbuser'], $config['dbpass'],
 			[