Completed
Push — 1.7 ( 1f092b...e26692 )
by Greg
10:32
created
app/Module/BatchUpdate/BatchUpdateBasePlugin.php 1 patch
Switch Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -101,14 +101,14 @@
 block discarded – undo
101 101
 
102 102
 		foreach ($differences as $difference) {
103 103
 			switch ($difference[1]) {
104
-			case MyersDiff::DELETE:
105
-				$diff_lines[] = self::decorateDeletedText($difference[0]);
106
-				break;
107
-			case MyersDiff::INSERT:
108
-				$diff_lines[] = self::decorateInsertedText($difference[0]);
109
-				break;
110
-			default:
111
-				$diff_lines[] = $difference[0];
104
+				case MyersDiff::DELETE:
105
+					$diff_lines[] = self::decorateDeletedText($difference[0]);
106
+					break;
107
+				case MyersDiff::INSERT:
108
+					$diff_lines[] = self::decorateInsertedText($difference[0]);
109
+					break;
110
+				default:
111
+					$diff_lines[] = $difference[0];
112 112
 			}
113 113
 		}
114 114
 
Please login to merge, or discard this patch.
app/Module/OnThisDayModule.php 1 patch
Switch Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -68,16 +68,16 @@
 block discarded – undo
68 68
 		$tags = $filter ? 'BIRT MARR' : 'BIRT MARR DEAT';
69 69
 
70 70
 		switch ($infoStyle) {
71
-		case 'list':
72
-			// Output style 1:  Old format, no visible tables, much smaller text. Better suited to right side of page.
73
-			$content .= FunctionsPrintLists::eventsList($todayjd, $todayjd, $tags, $filter, $sortStyle);
74
-			break;
75
-		case 'table':
76
-			// Style 2: New format, tables, big text, etc. Not too good on right side of page
77
-			ob_start();
78
-			$content .= FunctionsPrintLists::eventsTable($todayjd, $todayjd, $tags, $filter, $sortStyle);
79
-			$content .= ob_get_clean();
80
-			break;
71
+			case 'list':
72
+				// Output style 1:  Old format, no visible tables, much smaller text. Better suited to right side of page.
73
+				$content .= FunctionsPrintLists::eventsList($todayjd, $todayjd, $tags, $filter, $sortStyle);
74
+				break;
75
+			case 'table':
76
+				// Style 2: New format, tables, big text, etc. Not too good on right side of page
77
+				ob_start();
78
+				$content .= FunctionsPrintLists::eventsTable($todayjd, $todayjd, $tags, $filter, $sortStyle);
79
+				$content .= ob_get_clean();
80
+				break;
81 81
 		}
82 82
 
83 83
 		if ($template) {
Please login to merge, or discard this patch.
app/Module/RelationshipsChartModule.php 1 patch
Switch Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -115,15 +115,15 @@
 block discarded – undo
115 115
 	 */
116 116
 	public function modAction($mod_action) {
117 117
 		switch ($mod_action) {
118
-		case 'admin':
119
-			if ($_SERVER['REQUEST_METHOD'] === 'POST') {
120
-				$this->saveConfig();
121
-			} else {
122
-				$this->editConfig();
123
-			}
124
-			break;
125
-		default:
126
-			http_response_code(404);
118
+			case 'admin':
119
+				if ($_SERVER['REQUEST_METHOD'] === 'POST') {
120
+					$this->saveConfig();
121
+				} else {
122
+					$this->editConfig();
123
+				}
124
+				break;
125
+			default:
126
+				http_response_code(404);
127 127
 		}
128 128
 	}
129 129
 
Please login to merge, or discard this patch.
app/Module/ExtraInformationModule.php 1 patch
Switch Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -86,17 +86,17 @@
 block discarded – undo
86 86
 	 */
87 87
 	public static function showFact(Fact $fact) {
88 88
 		switch ($fact->getTag()) {
89
-		case 'AFN':
90
-		case 'CHAN':
91
-		case 'IDNO':
92
-		case 'REFN':
93
-		case 'RFN':
94
-		case 'RIN':
95
-		case 'SSN':
96
-		case '_UID':
97
-			return true;
98
-		default:
99
-			return false;
89
+			case 'AFN':
90
+			case 'CHAN':
91
+			case 'IDNO':
92
+			case 'REFN':
93
+			case 'RFN':
94
+			case 'RIN':
95
+			case 'SSN':
96
+			case '_UID':
97
+				return true;
98
+			default:
99
+				return false;
100 100
 		}
101 101
 	}
102 102
 }
Please login to merge, or discard this patch.
app/Module/DescendancyModule.php 1 patch
Switch Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -51,19 +51,19 @@
 block discarded – undo
51 51
 		header('Content-Type: text/html; charset=UTF-8');
52 52
 
53 53
 		switch ($mod_action) {
54
-		case 'search':
55
-			$search = Filter::get('search');
56
-			echo $this->search($search, $WT_TREE);
57
-			break;
58
-		case 'descendants':
59
-			$individual = Individual::getInstance(Filter::get('xref', WT_REGEX_XREF), $WT_TREE);
60
-			if ($individual) {
61
-				echo $this->loadSpouses($individual, 1);
62
-			}
63
-			break;
64
-		default:
65
-			http_response_code(404);
66
-			break;
54
+			case 'search':
55
+				$search = Filter::get('search');
56
+				echo $this->search($search, $WT_TREE);
57
+				break;
58
+			case 'descendants':
59
+				$individual = Individual::getInstance(Filter::get('xref', WT_REGEX_XREF), $WT_TREE);
60
+				if ($individual) {
61
+					echo $this->loadSpouses($individual, 1);
62
+				}
63
+				break;
64
+			default:
65
+				http_response_code(404);
66
+				break;
67 67
 		}
68 68
 	}
69 69
 
Please login to merge, or discard this patch.
app/Module/TopSurnamesModule.php 1 patch
Switch Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -84,23 +84,23 @@
 block discarded – undo
84 84
 		}
85 85
 
86 86
 		switch ($infoStyle) {
87
-		case 'tagcloud':
88
-			uksort($all_surnames, '\Fisharebest\Webtrees\I18N::strcasecmp');
89
-			$content = FunctionsPrintLists::surnameTagCloud($all_surnames, 'indilist.php', true, $WT_TREE);
90
-			break;
91
-		case 'list':
92
-			uasort($all_surnames, '\Fisharebest\Webtrees\Module\TopSurnamesModule::surnameCountSort');
93
-			$content = FunctionsPrintLists::surnameList($all_surnames, 1, true, 'indilist.php', $WT_TREE);
94
-			break;
95
-		case 'array':
96
-			uasort($all_surnames, '\Fisharebest\Webtrees\Module\TopSurnamesModule::surnameCountSort');
97
-			$content = FunctionsPrintLists::surnameList($all_surnames, 2, true, 'indilist.php', $WT_TREE);
98
-			break;
99
-		case 'table':
100
-		default:
101
-			uasort($all_surnames, '\Fisharebest\Webtrees\Module\TopSurnamesModule::surnameCountSort');
102
-			$content = FunctionsPrintLists::surnameTable($all_surnames, 'indilist.php', $WT_TREE);
103
-			break;
87
+			case 'tagcloud':
88
+				uksort($all_surnames, '\Fisharebest\Webtrees\I18N::strcasecmp');
89
+				$content = FunctionsPrintLists::surnameTagCloud($all_surnames, 'indilist.php', true, $WT_TREE);
90
+				break;
91
+			case 'list':
92
+				uasort($all_surnames, '\Fisharebest\Webtrees\Module\TopSurnamesModule::surnameCountSort');
93
+				$content = FunctionsPrintLists::surnameList($all_surnames, 1, true, 'indilist.php', $WT_TREE);
94
+				break;
95
+			case 'array':
96
+				uasort($all_surnames, '\Fisharebest\Webtrees\Module\TopSurnamesModule::surnameCountSort');
97
+				$content = FunctionsPrintLists::surnameList($all_surnames, 2, true, 'indilist.php', $WT_TREE);
98
+				break;
99
+			case 'table':
100
+			default:
101
+				uasort($all_surnames, '\Fisharebest\Webtrees\Module\TopSurnamesModule::surnameCountSort');
102
+				$content = FunctionsPrintLists::surnameTable($all_surnames, 'indilist.php', $WT_TREE);
103
+				break;
104 104
 		}
105 105
 
106 106
 		if ($template) {
Please login to merge, or discard this patch.
includes/session.php 1 patch
Switch Indentation   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -200,29 +200,29 @@  discard block
 block discarded – undo
200 200
 		$frame += array('args' => array(), 'file' => 'unknown', 'line' => 'unknown');
201 201
 		array_walk($frame['args'], function (&$arg) {
202 202
 			switch (gettype($arg)) {
203
-			case 'boolean':
204
-			case 'integer':
205
-			case 'double':
206
-			case 'null':
207
-				$arg = var_export($arg, true);
208
-				break;
209
-			case 'string':
210
-				if (mb_strlen($arg) > 30) {
211
-					$arg = substr($arg, 0, 30) . '…';
212
-				}
213
-				$arg = var_export($arg, true);
214
-				break;
215
-			case 'object':
216
-				$reflection = new \ReflectionClass($arg);
217
-				if (is_object($arg) && method_exists($arg, '__toString')) {
218
-					$arg = '[' . $reflection->getShortName() . ' ' . (string) $arg . ']';
219
-				} else {
220
-					$arg = '[' . $reflection->getShortName() . ']';
221
-				}
222
-				break;
223
-			default:
224
-				$arg = '[' . gettype($arg) . ']';
225
-				break;
203
+				case 'boolean':
204
+				case 'integer':
205
+				case 'double':
206
+				case 'null':
207
+					$arg = var_export($arg, true);
208
+					break;
209
+				case 'string':
210
+					if (mb_strlen($arg) > 30) {
211
+						$arg = substr($arg, 0, 30) . '…';
212
+					}
213
+					$arg = var_export($arg, true);
214
+					break;
215
+				case 'object':
216
+					$reflection = new \ReflectionClass($arg);
217
+					if (is_object($arg) && method_exists($arg, '__toString')) {
218
+						$arg = '[' . $reflection->getShortName() . ' ' . (string) $arg . ']';
219
+					} else {
220
+						$arg = '[' . $reflection->getShortName() . ']';
221
+					}
222
+					break;
223
+				default:
224
+					$arg = '[' . gettype($arg) . ']';
225
+					break;
226 226
 			}
227 227
 		});
228 228
 		$frame['file'] = str_replace(dirname(__DIR__), '', $frame['file']);
@@ -319,25 +319,25 @@  discard block
 block discarded – undo
319 319
 )->execute(array(WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')))->fetchOne();
320 320
 
321 321
 switch ($rule) {
322
-case 'allow':
323
-	$SEARCH_SPIDER = false;
324
-	break;
325
-case 'deny':
326
-	http_response_code(403);
327
-	exit;
328
-case 'robot':
329
-case 'unknown':
330
-	// Search engines don’t send cookies, and so create a new session with every visit.
331
-	// Make sure they always use the same one
332
-	Session::setId('search-engine-' . str_replace('.', '-', WT_CLIENT_IP));
333
-	$SEARCH_SPIDER = true;
334
-	break;
335
-case '':
336
-	Database::prepare(
337
-		"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, comment) VALUES (IFNULL(INET_ATON(?), 0), IFNULL(INET_ATON(?), 4294967295), ?, '')"
338
-	)->execute(array(WT_CLIENT_IP, WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')));
339
-	$SEARCH_SPIDER = true;
340
-	break;
322
+	case 'allow':
323
+		$SEARCH_SPIDER = false;
324
+		break;
325
+	case 'deny':
326
+		http_response_code(403);
327
+		exit;
328
+	case 'robot':
329
+	case 'unknown':
330
+		// Search engines don’t send cookies, and so create a new session with every visit.
331
+		// Make sure they always use the same one
332
+		Session::setId('search-engine-' . str_replace('.', '-', WT_CLIENT_IP));
333
+		$SEARCH_SPIDER = true;
334
+		break;
335
+	case '':
336
+		Database::prepare(
337
+			"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, comment) VALUES (IFNULL(INET_ATON(?), 0), IFNULL(INET_ATON(?), 4294967295), ?, '')"
338
+		)->execute(array(WT_CLIENT_IP, WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')));
339
+		$SEARCH_SPIDER = true;
340
+		break;
341 341
 }
342 342
 
343 343
 // Store our session data in the database.
Please login to merge, or discard this patch.
admin_site_config.php 1 patch
Switch Indentation   +73 added lines, -73 removed lines patch added patch discarded remove patch
@@ -25,85 +25,85 @@
 block discarded – undo
25 25
 $controller->restrictAccess(Auth::isAdmin());
26 26
 
27 27
 switch (Filter::post('action')) {
28
-case 'site':
29
-	if (Filter::checkCsrf()) {
30
-		$INDEX_DIRECTORY = Filter::post('INDEX_DIRECTORY');
31
-		if (substr($INDEX_DIRECTORY, -1) !== '/') {
32
-			$INDEX_DIRECTORY .= '/';
28
+	case 'site':
29
+		if (Filter::checkCsrf()) {
30
+			$INDEX_DIRECTORY = Filter::post('INDEX_DIRECTORY');
31
+			if (substr($INDEX_DIRECTORY, -1) !== '/') {
32
+				$INDEX_DIRECTORY .= '/';
33
+			}
34
+			if (File::mkdir($INDEX_DIRECTORY)) {
35
+				Site::setPreference('INDEX_DIRECTORY', $INDEX_DIRECTORY);
36
+			} else {
37
+				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Filter::escapeHtml($INDEX_DIRECTORY)), 'danger');
38
+			}
39
+			Site::setPreference('MEMORY_LIMIT', Filter::post('MEMORY_LIMIT'));
40
+			Site::setPreference('MAX_EXECUTION_TIME', Filter::post('MAX_EXECUTION_TIME'));
41
+			Site::setPreference('ALLOW_USER_THEMES', Filter::postBool('ALLOW_USER_THEMES'));
42
+			Site::setPreference('THEME_DIR', Filter::post('THEME_DIR'));
43
+			Site::setPreference('ALLOW_CHANGE_GEDCOM', Filter::postBool('ALLOW_CHANGE_GEDCOM'));
44
+			Site::setPreference('SESSION_TIME', Filter::post('SESSION_TIME'));
45
+			Site::setPreference('SERVER_URL', Filter::post('SERVER_URL'));
46
+			Site::setPreference('TIMEZONE', Filter::post('TIMEZONE'));
47
+			FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
33 48
 		}
34
-		if (File::mkdir($INDEX_DIRECTORY)) {
35
-			Site::setPreference('INDEX_DIRECTORY', $INDEX_DIRECTORY);
36
-		} else {
37
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Filter::escapeHtml($INDEX_DIRECTORY)), 'danger');
49
+		header('Location: ' . WT_BASE_URL . 'admin.php');
50
+
51
+		return;
52
+
53
+	case 'email':
54
+		if (Filter::checkCsrf()) {
55
+			Site::setPreference('SMTP_ACTIVE', Filter::post('SMTP_ACTIVE'));
56
+			Site::setPreference('SMTP_FROM_NAME', Filter::post('SMTP_FROM_NAME'));
57
+			Site::setPreference('SMTP_HOST', Filter::post('SMTP_HOST'));
58
+			Site::setPreference('SMTP_PORT', Filter::post('SMTP_PORT'));
59
+			Site::setPreference('SMTP_AUTH', Filter::post('SMTP_AUTH'));
60
+			Site::setPreference('SMTP_AUTH_USER', Filter::post('SMTP_AUTH_USER'));
61
+			Site::setPreference('SMTP_SSL', Filter::post('SMTP_SSL'));
62
+			Site::setPreference('SMTP_HELO', Filter::post('SMTP_HELO'));
63
+			if (Filter::post('SMTP_AUTH_PASS')) {
64
+				Site::setPreference('SMTP_AUTH_PASS', Filter::post('SMTP_AUTH_PASS'));
65
+			}
66
+			FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
38 67
 		}
39
-		Site::setPreference('MEMORY_LIMIT', Filter::post('MEMORY_LIMIT'));
40
-		Site::setPreference('MAX_EXECUTION_TIME', Filter::post('MAX_EXECUTION_TIME'));
41
-		Site::setPreference('ALLOW_USER_THEMES', Filter::postBool('ALLOW_USER_THEMES'));
42
-		Site::setPreference('THEME_DIR', Filter::post('THEME_DIR'));
43
-		Site::setPreference('ALLOW_CHANGE_GEDCOM', Filter::postBool('ALLOW_CHANGE_GEDCOM'));
44
-		Site::setPreference('SESSION_TIME', Filter::post('SESSION_TIME'));
45
-		Site::setPreference('SERVER_URL', Filter::post('SERVER_URL'));
46
-		Site::setPreference('TIMEZONE', Filter::post('TIMEZONE'));
47
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
48
-	}
49
-	header('Location: ' . WT_BASE_URL . 'admin.php');
50
-
51
-	return;
52
-
53
-case 'email':
54
-	if (Filter::checkCsrf()) {
55
-		Site::setPreference('SMTP_ACTIVE', Filter::post('SMTP_ACTIVE'));
56
-		Site::setPreference('SMTP_FROM_NAME', Filter::post('SMTP_FROM_NAME'));
57
-		Site::setPreference('SMTP_HOST', Filter::post('SMTP_HOST'));
58
-		Site::setPreference('SMTP_PORT', Filter::post('SMTP_PORT'));
59
-		Site::setPreference('SMTP_AUTH', Filter::post('SMTP_AUTH'));
60
-		Site::setPreference('SMTP_AUTH_USER', Filter::post('SMTP_AUTH_USER'));
61
-		Site::setPreference('SMTP_SSL', Filter::post('SMTP_SSL'));
62
-		Site::setPreference('SMTP_HELO', Filter::post('SMTP_HELO'));
63
-		if (Filter::post('SMTP_AUTH_PASS')) {
64
-			Site::setPreference('SMTP_AUTH_PASS', Filter::post('SMTP_AUTH_PASS'));
68
+		header('Location: ' . WT_BASE_URL . 'admin.php');
69
+
70
+		return;
71
+	case 'login':
72
+		if (Filter::checkCsrf()) {
73
+			Site::setPreference('LOGIN_URL', Filter::post('LOGIN_URL'));
74
+			Site::setPreference('WELCOME_TEXT_AUTH_MODE', Filter::post('WELCOME_TEXT_AUTH_MODE'));
75
+			Site::setPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE, Filter::post('WELCOME_TEXT_AUTH_MODE_4'));
76
+			Site::setPreference('USE_REGISTRATION_MODULE', Filter::post('USE_REGISTRATION_MODULE'));
77
+			Site::setPreference('SHOW_REGISTER_CAUTION', Filter::post('SHOW_REGISTER_CAUTION'));
78
+			FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
65 79
 		}
66
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
67
-	}
68
-	header('Location: ' . WT_BASE_URL . 'admin.php');
69
-
70
-	return;
71
-case 'login':
72
-	if (Filter::checkCsrf()) {
73
-		Site::setPreference('LOGIN_URL', Filter::post('LOGIN_URL'));
74
-		Site::setPreference('WELCOME_TEXT_AUTH_MODE', Filter::post('WELCOME_TEXT_AUTH_MODE'));
75
-		Site::setPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE, Filter::post('WELCOME_TEXT_AUTH_MODE_4'));
76
-		Site::setPreference('USE_REGISTRATION_MODULE', Filter::post('USE_REGISTRATION_MODULE'));
77
-		Site::setPreference('SHOW_REGISTER_CAUTION', Filter::post('SHOW_REGISTER_CAUTION'));
78
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
79
-	}
80
-	header('Location: ' . WT_BASE_URL . 'admin.php');
81
-
82
-	return;
80
+		header('Location: ' . WT_BASE_URL . 'admin.php');
81
+
82
+		return;
83
+
84
+	case 'tracking':
85
+		if (Filter::checkCsrf()) {
86
+			Site::setPreference('BING_WEBMASTER_ID', Filter::post('BING_WEBMASTER_ID'));
87
+			Site::setPreference('GOOGLE_WEBMASTER_ID', Filter::post('GOOGLE_WEBMASTER_ID'));
88
+			Site::setPreference('GOOGLE_ANALYTICS_ID', Filter::post('GOOGLE_ANALYTICS_ID'));
89
+			Site::setPreference('PIWIK_URL', Filter::post('PIWIK_URL'));
90
+			Site::setPreference('PIWIK_SITE_ID', Filter::post('PIWIK_SITE_ID'));
91
+			Site::setPreference('STATCOUNTER_PROJECT_ID', Filter::post('STATCOUNTER_PROJECT_ID'));
92
+			Site::setPreference('STATCOUNTER_SECURITY_ID', Filter::post('STATCOUNTER_SECURITY_ID'));
93
+			FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
94
+		}
95
+		header('Location: ' . WT_BASE_URL . 'admin.php');
83 96
 
84
-case 'tracking':
85
-	if (Filter::checkCsrf()) {
86
-		Site::setPreference('BING_WEBMASTER_ID', Filter::post('BING_WEBMASTER_ID'));
87
-		Site::setPreference('GOOGLE_WEBMASTER_ID', Filter::post('GOOGLE_WEBMASTER_ID'));
88
-		Site::setPreference('GOOGLE_ANALYTICS_ID', Filter::post('GOOGLE_ANALYTICS_ID'));
89
-		Site::setPreference('PIWIK_URL', Filter::post('PIWIK_URL'));
90
-		Site::setPreference('PIWIK_SITE_ID', Filter::post('PIWIK_SITE_ID'));
91
-		Site::setPreference('STATCOUNTER_PROJECT_ID', Filter::post('STATCOUNTER_PROJECT_ID'));
92
-		Site::setPreference('STATCOUNTER_SECURITY_ID', Filter::post('STATCOUNTER_SECURITY_ID'));
93
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
94
-	}
95
-	header('Location: ' . WT_BASE_URL . 'admin.php');
97
+		return;
96 98
 
97
-	return;
98
-
99
-case 'languages':
100
-	if (Filter::checkCsrf()) {
101
-		Site::setPreference('LANGUAGES', implode(',', Filter::postArray('LANGUAGES')));
102
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
103
-	}
104
-	header('Location: ' . WT_BASE_URL . 'admin.php');
99
+	case 'languages':
100
+		if (Filter::checkCsrf()) {
101
+			Site::setPreference('LANGUAGES', implode(',', Filter::postArray('LANGUAGES')));
102
+			FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
103
+		}
104
+		header('Location: ' . WT_BASE_URL . 'admin.php');
105 105
 
106
-	return;
106
+		return;
107 107
 }
108 108
 
109 109
 // Lists of options for <select> controls.
Please login to merge, or discard this patch.
admin_site_upgrade.php 1 patch
Switch Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -117,18 +117,18 @@  discard block
 block discarded – undo
117 117
 foreach (Module::getInstalledModules('disabled') as $module) {
118 118
 	if (!in_array($module->getName(), Module::getCoreModuleNames())) {
119 119
 		switch ($modules_action) {
120
-		case 'disable':
121
-			Database::prepare(
122
-				"UPDATE `##module` SET status = 'disabled' WHERE module_name = ?"
123
-			)->execute(array($module->getName()));
124
-			break;
125
-		case 'ignore':
126
-			echo '<br>', I18N::translate('Custom module'), ' — ', WT_MODULES_DIR, $module->getName(), ' — ', $module->getTitle(), $icon_success;
127
-			break;
128
-		default:
129
-			echo '<br>', I18N::translate('Custom module'), ' — ', WT_MODULES_DIR, $module->getName(), ' — ', $module->getTitle(), $icon_failure;
130
-			$custom_modules = true;
131
-			break;
120
+			case 'disable':
121
+				Database::prepare(
122
+					"UPDATE `##module` SET status = 'disabled' WHERE module_name = ?"
123
+				)->execute(array($module->getName()));
124
+				break;
125
+			case 'ignore':
126
+				echo '<br>', I18N::translate('Custom module'), ' — ', WT_MODULES_DIR, $module->getName(), ' — ', $module->getTitle(), $icon_success;
127
+				break;
128
+			default:
129
+				echo '<br>', I18N::translate('Custom module'), ' — ', WT_MODULES_DIR, $module->getName(), ' — ', $module->getTitle(), $icon_failure;
130
+				$custom_modules = true;
131
+				break;
132 132
 		}
133 133
 	}
134 134
 }
@@ -157,40 +157,40 @@  discard block
 block discarded – undo
157 157
 $custom_themes = false;
158 158
 foreach (Theme::themeNames() as $theme_id => $theme_name) {
159 159
 	switch ($theme_id) {
160
-	case 'clouds':
161
-	case 'colors':
162
-	case 'fab':
163
-	case 'minimal':
164
-	case 'webtrees':
165
-	case 'xenea':
166
-		break;
167
-	default:
168
-		$theme_used = Database::prepare(
169
-			"SELECT EXISTS (SELECT 1 FROM `##site_setting`   WHERE setting_name='THEME_DIR' AND setting_value=?)" .
170
-			" OR    EXISTS (SELECT 1 FROM `##gedcom_setting` WHERE setting_name='THEME_DIR' AND setting_value=?)" .
171
-			" OR    EXISTS (SELECT 1 FROM `##user_setting`   WHERE setting_name='theme'     AND setting_value=?)"
172
-		)->execute(array($theme_id, $theme_id, $theme_id))->fetchOne();
173
-		if ($theme_used) {
174
-			switch ($themes_action) {
175
-			case 'disable':
176
-				Database::prepare(
177
-					"DELETE FROM `##site_setting`   WHERE setting_name = 'THEME_DIR' AND setting_value = ?"
178
-				)->execute(array($theme_id));
179
-				Database::prepare(
180
-					"DELETE FROM `##gedcom_setting` WHERE setting_name = 'THEME_DIR' AND setting_value = ?"
181
-				)->execute(array($theme_id));
182
-				Database::prepare(
183
-					"DELETE FROM `##user_setting`   WHERE setting_name = 'theme'     AND setting_value = ?"
184
-				)->execute(array($theme_id));
185
-				break;
186
-			case 'ignore':
187
-				echo '<br>', I18N::translate('Custom theme'), ' — ', $theme_id, ' — ', $theme_name, $icon_success;
188
-				break;
189
-			default:
190
-				echo '<br>', I18N::translate('Custom theme'), ' — ', $theme_id, ' — ', $theme_name, $icon_failure;
191
-				$custom_themes = true;
192
-				break;
193
-			}
160
+		case 'clouds':
161
+		case 'colors':
162
+		case 'fab':
163
+		case 'minimal':
164
+		case 'webtrees':
165
+		case 'xenea':
166
+			break;
167
+		default:
168
+			$theme_used = Database::prepare(
169
+				"SELECT EXISTS (SELECT 1 FROM `##site_setting`   WHERE setting_name='THEME_DIR' AND setting_value=?)" .
170
+				" OR    EXISTS (SELECT 1 FROM `##gedcom_setting` WHERE setting_name='THEME_DIR' AND setting_value=?)" .
171
+				" OR    EXISTS (SELECT 1 FROM `##user_setting`   WHERE setting_name='theme'     AND setting_value=?)"
172
+			)->execute(array($theme_id, $theme_id, $theme_id))->fetchOne();
173
+			if ($theme_used) {
174
+				switch ($themes_action) {
175
+					case 'disable':
176
+						Database::prepare(
177
+							"DELETE FROM `##site_setting`   WHERE setting_name = 'THEME_DIR' AND setting_value = ?"
178
+						)->execute(array($theme_id));
179
+						Database::prepare(
180
+							"DELETE FROM `##gedcom_setting` WHERE setting_name = 'THEME_DIR' AND setting_value = ?"
181
+						)->execute(array($theme_id));
182
+						Database::prepare(
183
+							"DELETE FROM `##user_setting`   WHERE setting_name = 'theme'     AND setting_value = ?"
184
+						)->execute(array($theme_id));
185
+						break;
186
+					case 'ignore':
187
+						echo '<br>', I18N::translate('Custom theme'), ' — ', $theme_id, ' — ', $theme_name, $icon_success;
188
+						break;
189
+					default:
190
+						echo '<br>', I18N::translate('Custom theme'), ' — ', $theme_id, ' — ', $theme_name, $icon_failure;
191
+						$custom_themes = true;
192
+						break;
193
+				}
194 194
 		}
195 195
 		break;
196 196
 	}
Please login to merge, or discard this patch.