fisharebest / webtrees

admin_site_change.php

Switch Indentation +14 added lines, -14 removed lines

@@ -151,12 +151,12 @@ 
 			// Datatables numbers columns 0, 1, 2
 			// MySQL numbers columns 1, 2, 3
 			switch ($value['dir']) {
-			case 'asc':
-				$order_by .= (1 + $value['column']) . " ASC ";
-				break;
-			case 'desc':
-				$order_by .= (1 + $value['column']) . " DESC ";
-				break;
+			    case 'asc':
+				    $order_by .= (1 + $value['column']) . " ASC ";
+				    break;
+			    case 'desc':
+				    $order_by .= (1 + $value['column']) . " DESC ";
+				    break;
 			}
 		}
 	} else {
@@ -190,14 +190,14 @@ 
 
 		foreach ($differences as $difference) {
 			switch ($difference[1]) {
-			case MyersDiff::DELETE:
-				$diff_lines[] = '<del>' . $difference[0] . '</del>';
-				break;
-			case MyersDiff::INSERT:
-				$diff_lines[] = '<ins>' . $difference[0] . '</ins>';
-				break;
-			default:
-				$diff_lines[] = $difference[0];
+			    case MyersDiff::DELETE:
+				    $diff_lines[] = '<del>' . $difference[0] . '</del>';
+				    break;
+			    case MyersDiff::INSERT:
+				    $diff_lines[] = '<ins>' . $difference[0] . '</ins>';
+				    break;
+			    default:
+				    $diff_lines[] = $difference[0];
 			}
 		}
 

admin_users.php

Switch Indentation +95 added lines, -95 removed lines

@@ -45,95 +45,95 @@ 
 
 // Form actions
 switch (Filter::post('action')) {
-case 'save':
-	if (Filter::checkCsrf()) {
-		$user_id        = Filter::postInteger('user_id');
-		$user           = User::find($user_id);
-		$username       = Filter::post('username');
-		$real_name      = Filter::post('real_name');
-		$email          = Filter::postEmail('email');
-		$pass1          = Filter::post('pass1', WT_REGEX_PASSWORD);
-		$pass2          = Filter::post('pass2', WT_REGEX_PASSWORD);
-		$theme          = Filter::post('theme', implode('|', array_keys(Theme::themeNames())), '');
-		$language       = Filter::post('language');
-		$timezone       = Filter::post('timezone');
-		$contact_method = Filter::post('contact_method');
-		$comment        = Filter::post('comment');
-		$auto_accept    = Filter::postBool('auto_accept');
-		$canadmin       = Filter::postBool('canadmin');
-		$visible_online = Filter::postBool('visible_online');
-		$verified       = Filter::postBool('verified');
-		$approved       = Filter::postBool('approved');
-
-		if ($user_id === 0) {
-			// Create a new user
-			if (User::findByUserName($username)) {
-				FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
-			} elseif (User::findByEmail($email)) {
-				FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
-			} elseif ($pass1 !== $pass2) {
-				FlashMessages::addMessage(I18N::translate('The passwords do not match.'));
-			} else {
-				$user = User::create($username, $real_name, $email, $pass1);
-				$user->setPreference('reg_timestamp', date('U'))->setPreference('sessiontime', '0');
-				Log::addAuthenticationLog('User ->' . $username . '<- created');
-			}
-		} else {
-			$user = User::find($user_id);
-			if ($user && $username && $real_name) {
-				$user->setEmail($email);
-				$user->setUserName($username);
-				$user->setRealName($real_name);
-				if ($pass1 !== null && $pass1 === $pass2) {
-					$user->setPassword($pass1);
-				}
-			}
-		}
-
-		if ($user) {
-			// Approving for the first time? Send a confirmation email
-			if ($approved && !$user->getPreference('verified_by_admin') && $user->getPreference('sessiontime') == 0) {
-				I18N::init($user->getPreference('language'));
-				Mail::systemMessage(
-					$WT_TREE,
-					$user,
-					I18N::translate('Approval of account at %s', WT_BASE_URL),
-					I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', WT_BASE_URL, WT_BASE_URL)
-				);
-			}
-
-			$user
-				->setPreference('theme', $theme)
-				->setPreference('language', $language)
-				->setPreference('TIMEZONE', $timezone)
-				->setPreference('contactmethod', $contact_method)
-				->setPreference('comment', $comment)
-				->setPreference('auto_accept', $auto_accept ? '1' : '0')
-				->setPreference('visibleonline', $visible_online ? '1' : '0')
-				->setPreference('verified', $verified ? '1' : '0')
-				->setPreference('verified_by_admin', $approved ? '1' : '0');
-
-			// We cannot change our own admin status. Another admin will need to do it.
-			if ($user->getUserId() !== Auth::id()) {
-				$user->setPreference('canadmin', $canadmin ? '1' : '0');
-			}
-
-			foreach (Tree::getAll() as $tree) {
-				$tree->setUserPreference($user, 'gedcomid', Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF));
-				$tree->setUserPreference($user, 'canedit', Filter::post('canedit' . $tree->getTreeId(), implode('|', array_keys($ALL_EDIT_OPTIONS))));
-				if (Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF)) {
-					$tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', Filter::postInteger('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId(), 0, 10, 0));
-				} else {
-					// Do not allow a path length to be set if the individual ID is not
-					$tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', null);
-				}
-			}
-		}
-	}
-
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    case 'save':
+	    if (Filter::checkCsrf()) {
+		    $user_id        = Filter::postInteger('user_id');
+		    $user           = User::find($user_id);
+		    $username       = Filter::post('username');
+		    $real_name      = Filter::post('real_name');
+		    $email          = Filter::postEmail('email');
+		    $pass1          = Filter::post('pass1', WT_REGEX_PASSWORD);
+		    $pass2          = Filter::post('pass2', WT_REGEX_PASSWORD);
+		    $theme          = Filter::post('theme', implode('|', array_keys(Theme::themeNames())), '');
+		    $language       = Filter::post('language');
+		    $timezone       = Filter::post('timezone');
+		    $contact_method = Filter::post('contact_method');
+		    $comment        = Filter::post('comment');
+		    $auto_accept    = Filter::postBool('auto_accept');
+		    $canadmin       = Filter::postBool('canadmin');
+		    $visible_online = Filter::postBool('visible_online');
+		    $verified       = Filter::postBool('verified');
+		    $approved       = Filter::postBool('approved');
+
+		    if ($user_id === 0) {
+			    // Create a new user
+			    if (User::findByUserName($username)) {
+				    FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
+			    } elseif (User::findByEmail($email)) {
+				    FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
+			    } elseif ($pass1 !== $pass2) {
+				    FlashMessages::addMessage(I18N::translate('The passwords do not match.'));
+			    } else {
+				    $user = User::create($username, $real_name, $email, $pass1);
+				    $user->setPreference('reg_timestamp', date('U'))->setPreference('sessiontime', '0');
+				    Log::addAuthenticationLog('User ->' . $username . '<- created');
+			    }
+		    } else {
+			    $user = User::find($user_id);
+			    if ($user && $username && $real_name) {
+				    $user->setEmail($email);
+				    $user->setUserName($username);
+				    $user->setRealName($real_name);
+				    if ($pass1 !== null && $pass1 === $pass2) {
+					    $user->setPassword($pass1);
+				    }
+			    }
+		    }
+
+		    if ($user) {
+			    // Approving for the first time? Send a confirmation email
+			    if ($approved && !$user->getPreference('verified_by_admin') && $user->getPreference('sessiontime') == 0) {
+				    I18N::init($user->getPreference('language'));
+				    Mail::systemMessage(
+					    $WT_TREE,
+					    $user,
+					    I18N::translate('Approval of account at %s', WT_BASE_URL),
+					    I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', WT_BASE_URL, WT_BASE_URL)
+				    );
+			    }
+
+			    $user
+				    ->setPreference('theme', $theme)
+				    ->setPreference('language', $language)
+				    ->setPreference('TIMEZONE', $timezone)
+				    ->setPreference('contactmethod', $contact_method)
+				    ->setPreference('comment', $comment)
+				    ->setPreference('auto_accept', $auto_accept ? '1' : '0')
+				    ->setPreference('visibleonline', $visible_online ? '1' : '0')
+				    ->setPreference('verified', $verified ? '1' : '0')
+				    ->setPreference('verified_by_admin', $approved ? '1' : '0');
+
+			    // We cannot change our own admin status. Another admin will need to do it.
+			    if ($user->getUserId() !== Auth::id()) {
+				    $user->setPreference('canadmin', $canadmin ? '1' : '0');
+			    }
+
+			    foreach (Tree::getAll() as $tree) {
+				    $tree->setUserPreference($user, 'gedcomid', Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF));
+				    $tree->setUserPreference($user, 'canedit', Filter::post('canedit' . $tree->getTreeId(), implode('|', array_keys($ALL_EDIT_OPTIONS))));
+				    if (Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF)) {
+					    $tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', Filter::postInteger('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId(), 0, 10, 0));
+				    } else {
+					    // Do not allow a path length to be set if the individual ID is not
+					    $tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', null);
+				    }
+			    }
+		    }
+	    }
+
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+	    return;
 }
 
 switch (Filter::get('action')) {
@@ -173,12 +173,12 @@ 
 			// Datatables numbers columns 0, 1, 2
 			// MySQL numbers columns 1, 2, 3
 			switch ($value['dir']) {
-			case 'asc':
-				$sql_select .= (1 + $value['column']) . " ASC ";
-				break;
-			case 'desc':
-				$sql_select .= (1 + $value['column']) . " DESC ";
-				break;
+			    case 'asc':
+				    $sql_select .= (1 + $value['column']) . " ASC ";
+				    break;
+			    case 'desc':
+				    $sql_select .= (1 + $value['column']) . " DESC ";
+				    break;
 			}
 		}
 	} else {

admin_site_access.php

Switch Indentation +145 added lines, -145 removed lines

@@ -38,75 +38,75 @@ 
 
 // Form actions
 switch (Filter::post('action')) {
-case 'save':
-	if (Filter::checkCsrf()) {
-		$site_access_rule_id = Filter::postInteger('site_access_rule_id');
-		$ip_address_start    = Filter::post('ip_address_start', WT_REGEX_IPV4);
-		$ip_address_end      = Filter::post('ip_address_end', WT_REGEX_IPV4);
-		$user_agent_pattern  = Filter::post('user_agent_pattern');
-		$rule                = Filter::post('rule', 'allow|deny|robot');
-		$comment             = Filter::post('comment');
-		$user_agent_string   = Filter::server('HTTP_USER_AGENT');
-		$ip_address          = WT_CLIENT_IP;
-
-		if ($ip_address_start !== null && $ip_address_end !== null && $user_agent_pattern !== null && $rule !== null) {
-			// This doesn't work with named placeholders. The :user_agent_string parameter is not recognised.
-			$oops = $rule !== 'allow' && Database::prepare(
-				"SELECT INET_ATON(:ip_address) BETWEEN INET_ATON(:ip_address_start) AND INET_ATON(:ip_address_end)" .
-				" AND :user_agent_string LIKE :user_agent_pattern"
-			)->execute(array(
-				'ip_address'         => $ip_address,
-				'ip_address_start'   => $ip_address_start,
-				'ip_address_end'     => $ip_address_end,
-				'user_agent_string'  => $user_agent_string,
-				'user_agent_pattern' => $user_agent_pattern,
-			))->fetchOne();
-
-			if ($oops) {
-				FlashMessages::addMessage(I18N::translate('You cannot create a rule which would prevent yourself from accessing the website.'), 'danger');
-			} elseif ($site_access_rule_id === null) {
-				Database::prepare(
-					"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, rule, comment) VALUES (INET_ATON(:ip_address_start), INET_ATON(:ip_address_end), :user_agent_pattern, :rule, :comment)"
-				)->execute(array(
-					'ip_address_start'    => $ip_address_start,
-					'ip_address_end'      => $ip_address_end,
-					'user_agent_pattern'  => $user_agent_pattern,
-					'rule'                => $rule,
-					'comment'             => $comment,
-				));
-				FlashMessages::addMessage(I18N::translate('The website access rule has been created.'), 'success');
-			} else {
-				Database::prepare(
-					"UPDATE `##site_access_rule` SET ip_address_start = INET_ATON(:ip_address_start), ip_address_end = INET_ATON(:ip_address_end), user_agent_pattern = :user_agent_pattern, rule = :rule, comment = :comment WHERE site_access_rule_id = :site_access_rule_id"
-				)->execute(array(
-					'ip_address_start'    => $ip_address_start,
-					'ip_address_end'      => $ip_address_end,
-					'user_agent_pattern'  => $user_agent_pattern,
-					'rule'                => $rule,
-					'comment'             => $comment,
-					'site_access_rule_id' => $site_access_rule_id,
-				));
-				FlashMessages::addMessage(I18N::translate('The website access rule has been updated.'), 'success');
-			}
-		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
-
-case 'delete':
-	if (Filter::checkCsrf()) {
-		$site_access_rule_id = Filter::postInteger('site_access_rule_id');
-		Database::prepare(
-			"DELETE FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
-		)->execute(array(
-			'site_access_rule_id' => $site_access_rule_id,
-		));
-		FlashMessages::addMessage(I18N::translate('The website access rule has been deleted.'), 'success');
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    case 'save':
+	    if (Filter::checkCsrf()) {
+		    $site_access_rule_id = Filter::postInteger('site_access_rule_id');
+		    $ip_address_start    = Filter::post('ip_address_start', WT_REGEX_IPV4);
+		    $ip_address_end      = Filter::post('ip_address_end', WT_REGEX_IPV4);
+		    $user_agent_pattern  = Filter::post('user_agent_pattern');
+		    $rule                = Filter::post('rule', 'allow|deny|robot');
+		    $comment             = Filter::post('comment');
+		    $user_agent_string   = Filter::server('HTTP_USER_AGENT');
+		    $ip_address          = WT_CLIENT_IP;
+
+		    if ($ip_address_start !== null && $ip_address_end !== null && $user_agent_pattern !== null && $rule !== null) {
+			    // This doesn't work with named placeholders. The :user_agent_string parameter is not recognised.
+			    $oops = $rule !== 'allow' && Database::prepare(
+				    "SELECT INET_ATON(:ip_address) BETWEEN INET_ATON(:ip_address_start) AND INET_ATON(:ip_address_end)" .
+				    " AND :user_agent_string LIKE :user_agent_pattern"
+			    )->execute(array(
+				    'ip_address'         => $ip_address,
+				    'ip_address_start'   => $ip_address_start,
+				    'ip_address_end'     => $ip_address_end,
+				    'user_agent_string'  => $user_agent_string,
+				    'user_agent_pattern' => $user_agent_pattern,
+			    ))->fetchOne();
+
+			    if ($oops) {
+				    FlashMessages::addMessage(I18N::translate('You cannot create a rule which would prevent yourself from accessing the website.'), 'danger');
+			    } elseif ($site_access_rule_id === null) {
+				    Database::prepare(
+					    "INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, rule, comment) VALUES (INET_ATON(:ip_address_start), INET_ATON(:ip_address_end), :user_agent_pattern, :rule, :comment)"
+				    )->execute(array(
+					    'ip_address_start'    => $ip_address_start,
+					    'ip_address_end'      => $ip_address_end,
+					    'user_agent_pattern'  => $user_agent_pattern,
+					    'rule'                => $rule,
+					    'comment'             => $comment,
+				    ));
+				    FlashMessages::addMessage(I18N::translate('The website access rule has been created.'), 'success');
+			    } else {
+				    Database::prepare(
+					    "UPDATE `##site_access_rule` SET ip_address_start = INET_ATON(:ip_address_start), ip_address_end = INET_ATON(:ip_address_end), user_agent_pattern = :user_agent_pattern, rule = :rule, comment = :comment WHERE site_access_rule_id = :site_access_rule_id"
+				    )->execute(array(
+					    'ip_address_start'    => $ip_address_start,
+					    'ip_address_end'      => $ip_address_end,
+					    'user_agent_pattern'  => $user_agent_pattern,
+					    'rule'                => $rule,
+					    'comment'             => $comment,
+					    'site_access_rule_id' => $site_access_rule_id,
+				    ));
+				    FlashMessages::addMessage(I18N::translate('The website access rule has been updated.'), 'success');
+			    }
+		    }
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+	    return;
+
+    case 'delete':
+	    if (Filter::checkCsrf()) {
+		    $site_access_rule_id = Filter::postInteger('site_access_rule_id');
+		    Database::prepare(
+			    "DELETE FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
+		    )->execute(array(
+			    'site_access_rule_id' => $site_access_rule_id,
+		    ));
+		    FlashMessages::addMessage(I18N::translate('The website access rule has been deleted.'), 'success');
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+	    return;
 }
 
 // Delete any "unknown" visitors that are now "known".
@@ -128,50 +128,50 @@ 
 
 $action = Filter::get('action');
 switch ($action) {
-case 'load':
-	// AJAX callback for datatables
-	$search = Filter::get('search');
-	$search = $search['value'];
-	$start  = Filter::getInteger('start');
-	$length = Filter::getInteger('length');
-
-	$sql =
-		"SELECT SQL_CALC_FOUND_ROWS" .
-		" '', INET_NTOA(ip_address_start), ip_address_start, INET_NTOA(ip_address_end), ip_address_end, user_agent_pattern, rule, comment, site_access_rule_id" .
-		" FROM `##site_access_rule`";
-	$args = array();
-
-	if ($search) {
-		$sql .=
-			" WHERE (INET_ATON(:search_1) BETWEEN ip_address_start AND ip_address_end" .
-			" OR INET_NTOA(ip_address_start) LIKE CONCAT('%', :search_2, '%')" .
-			" OR INET_NTOA(ip_address_end) LIKE CONCAT('%', :search_3, '%')" .
-			" OR user_agent_pattern LIKE CONCAT('%', :search_4, '%')" .
-			" OR comment LIKE CONCAT('%', :search_5, '%'))";
-		$args['search_1'] = Filter::escapeLike($search);
-		$args['search_2'] = Filter::escapeLike($search);
-		$args['search_3'] = Filter::escapeLike($search);
-		$args['search_4'] = Filter::escapeLike($search);
-		$args['search_5'] = Filter::escapeLike($search);
-	}
-
-	$order = Filter::getArray('order');
-	$sql .= ' ORDER BY';
-	if ($order) {
-		foreach ($order as $key => $value) {
-			if ($key > 0) {
-				$sql .= ',';
-			}
-			// Datatables numbers columns 0, 1, 2
-			// MySQL numbers columns 1, 2, 3
-			switch ($value['dir']) {
-			case 'asc':
-				$sql .= " :col_" . $key . " ASC";
-				break;
-			case 'desc':
-				$sql .= " :col_" . $key . " DESC";
-				break;
-			}
+    case 'load':
+	    // AJAX callback for datatables
+	    $search = Filter::get('search');
+	    $search = $search['value'];
+	    $start  = Filter::getInteger('start');
+	    $length = Filter::getInteger('length');
+
+	    $sql =
+		    "SELECT SQL_CALC_FOUND_ROWS" .
+		    " '', INET_NTOA(ip_address_start), ip_address_start, INET_NTOA(ip_address_end), ip_address_end, user_agent_pattern, rule, comment, site_access_rule_id" .
+		    " FROM `##site_access_rule`";
+	    $args = array();
+
+	    if ($search) {
+		    $sql .=
+			    " WHERE (INET_ATON(:search_1) BETWEEN ip_address_start AND ip_address_end" .
+			    " OR INET_NTOA(ip_address_start) LIKE CONCAT('%', :search_2, '%')" .
+			    " OR INET_NTOA(ip_address_end) LIKE CONCAT('%', :search_3, '%')" .
+			    " OR user_agent_pattern LIKE CONCAT('%', :search_4, '%')" .
+			    " OR comment LIKE CONCAT('%', :search_5, '%'))";
+		    $args['search_1'] = Filter::escapeLike($search);
+		    $args['search_2'] = Filter::escapeLike($search);
+		    $args['search_3'] = Filter::escapeLike($search);
+		    $args['search_4'] = Filter::escapeLike($search);
+		    $args['search_5'] = Filter::escapeLike($search);
+	    }
+
+	    $order = Filter::getArray('order');
+	    $sql .= ' ORDER BY';
+	    if ($order) {
+		    foreach ($order as $key => $value) {
+			    if ($key > 0) {
+				    $sql .= ',';
+			    }
+			    // Datatables numbers columns 0, 1, 2
+			    // MySQL numbers columns 1, 2, 3
+			    switch ($value['dir']) {
+			        case 'asc':
+				        $sql .= " :col_" . $key . " ASC";
+				        break;
+			        case 'desc':
+				        $sql .= " :col_" . $key . " DESC";
+				        break;
+			    }
 			$args['col_' . $key] = 1 + $value['column'];
 		}
 	} else {
@@ -210,31 +210,31 @@ 
 	));
 	break;
 
-case 'edit':
-case 'create':
-	if (Filter::get('action') === 'edit') {
-		$controller->setPageTitle(I18N::translate('Edit a website access rule'));
-	} else {
-		$controller->setPageTitle(I18N::translate('Create a website access rule'));
-	}
-
-	$controller->pageHeader();
-
-	$site_access_rule = Database::prepare(
-		"SELECT site_access_rule_id, INET_NTOA(ip_address_start) AS ip_address_start, INET_NTOA(ip_address_end) AS ip_address_end, user_agent_pattern, rule, comment" .
-		" FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
-	)->execute(array(
-		'site_access_rule_id' => Filter::getInteger('site_access_rule_id'),
-	))->fetchOneRow();
-
-	$site_access_rule_id = $site_access_rule ? $site_access_rule->site_access_rule_id : null;
-	$ip_address_start    = $site_access_rule ? $site_access_rule->ip_address_start : '0.0.0.0';
-	$ip_address_end      = $site_access_rule ? $site_access_rule->ip_address_end : '255.255.255.255';
-	$user_agent_pattern  = $site_access_rule ? $site_access_rule->user_agent_pattern : '%';
-	$rule                = $site_access_rule ? $site_access_rule->rule : 'allow';
-	$comment             = $site_access_rule ? $site_access_rule->comment : '';
-
-	?>
+    case 'edit':
+    case 'create':
+	    if (Filter::get('action') === 'edit') {
+		    $controller->setPageTitle(I18N::translate('Edit a website access rule'));
+	    } else {
+		    $controller->setPageTitle(I18N::translate('Create a website access rule'));
+	    }
+
+	    $controller->pageHeader();
+
+	    $site_access_rule = Database::prepare(
+		    "SELECT site_access_rule_id, INET_NTOA(ip_address_start) AS ip_address_start, INET_NTOA(ip_address_end) AS ip_address_end, user_agent_pattern, rule, comment" .
+		    " FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
+	    )->execute(array(
+		    'site_access_rule_id' => Filter::getInteger('site_access_rule_id'),
+	    ))->fetchOneRow();
+
+	    $site_access_rule_id = $site_access_rule ? $site_access_rule->site_access_rule_id : null;
+	    $ip_address_start    = $site_access_rule ? $site_access_rule->ip_address_start : '0.0.0.0';
+	    $ip_address_end      = $site_access_rule ? $site_access_rule->ip_address_end : '255.255.255.255';
+	    $user_agent_pattern  = $site_access_rule ? $site_access_rule->user_agent_pattern : '%';
+	    $rule                = $site_access_rule ? $site_access_rule->rule : 'allow';
+	    $comment             = $site_access_rule ? $site_access_rule->comment : '';
+
+	    ?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li><a href="admin_site_access.php"><?php echo I18N::translate('Website access rules'); ?></a></li>
@@ -311,12 +311,12 @@ 
 	</form>
 
 	<?php
-	break;
+	    break;
 
-default:
-	$controller
-		->pageHeader()
-		->addInlineJavascript('
+    default:
+	    $controller
+		    ->pageHeader()
+		    ->addInlineJavascript('
 			jQuery.fn.dataTableExt.oSort["unicode-asc" ]=function(a,b) {return a.replace(/<[^<]*>/, "").localeCompare(b.replace(/<[^<]*>/, ""))};
 			jQuery.fn.dataTableExt.oSort["unicode-desc"]=function(a,b) {return b.replace(/<[^<]*>/, "").localeCompare(a.replace(/<[^<]*>/, ""))};
 			jQuery(".table-site-access-rules").dataTable({
@@ -340,7 +340,7 @@ 
 			});
 		');
 
-	?>
+	    ?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li class="active"><?php echo $controller->getPageTitle(); ?></li>
@@ -381,5 +381,5 @@ 
 		}
 	</script>
 	<?php
-	break;
+	    break;
 }

mediafirewall.php

Switch Indentation +47 added lines, -47 removed lines

@@ -126,53 +126,53 @@
 
 	// vertical and horizontal position of the text
 	switch ($vpos) {
-	default:
-	case 'top':
-		$taille   = textlength($maxsize, $width, $text);
-		$pos_y    = $height * 0.15 + $taille;
-		$pos_x    = $width * 0.15;
-		$rotation = 0;
-		break;
-	case 'middle':
-		$taille   = textlength($maxsize, $width, $text);
-		$pos_y    = ($height + $taille) / 2;
-		$pos_x    = $width * 0.15;
-		$rotation = 0;
-		break;
-	case 'bottom':
-		$taille   = textlength($maxsize, $width, $text);
-		$pos_y    = ($height * .85 - $taille);
-		$pos_x    = $width * 0.15;
-		$rotation = 0;
-		break;
-	case 'across':
-		switch ($hpos) {
-		default:
-		case 'left':
-			$taille   = textlength($maxsize, $hypoth, $text);
-			$pos_y    = ($height * .85 - $taille);
-			$pos_x    = $width * 0.15;
-			$rotation = $calc_angle;
-			break;
-		case 'right':
-			$taille   = textlength($maxsize, $hypoth, $text);
-			$pos_y    = ($height * .15 - $taille);
-			$pos_x    = $width * 0.85;
-			$rotation = $calc_angle + 180;
-			break;
-		case 'top2bottom':
-			$taille   = textlength($maxsize, $height, $text);
-			$pos_y    = ($height * .15 - $taille);
-			$pos_x    = ($width * .90 - $taille);
-			$rotation = -90;
-			break;
-		case 'bottom2top':
-			$taille   = textlength($maxsize, $height, $text);
-			$pos_y    = $height * 0.85;
-			$pos_x    = $width * 0.15;
-			$rotation = 90;
-			break;
-		}
+	    default:
+	    case 'top':
+		    $taille   = textlength($maxsize, $width, $text);
+		    $pos_y    = $height * 0.15 + $taille;
+		    $pos_x    = $width * 0.15;
+		    $rotation = 0;
+		    break;
+	    case 'middle':
+		    $taille   = textlength($maxsize, $width, $text);
+		    $pos_y    = ($height + $taille) / 2;
+		    $pos_x    = $width * 0.15;
+		    $rotation = 0;
+		    break;
+	    case 'bottom':
+		    $taille   = textlength($maxsize, $width, $text);
+		    $pos_y    = ($height * .85 - $taille);
+		    $pos_x    = $width * 0.15;
+		    $rotation = 0;
+		    break;
+	    case 'across':
+		    switch ($hpos) {
+		        default:
+		        case 'left':
+			        $taille   = textlength($maxsize, $hypoth, $text);
+			        $pos_y    = ($height * .85 - $taille);
+			        $pos_x    = $width * 0.15;
+			        $rotation = $calc_angle;
+			        break;
+		        case 'right':
+			        $taille   = textlength($maxsize, $hypoth, $text);
+			        $pos_y    = ($height * .15 - $taille);
+			        $pos_x    = $width * 0.85;
+			        $rotation = $calc_angle + 180;
+			        break;
+		        case 'top2bottom':
+			        $taille   = textlength($maxsize, $height, $text);
+			        $pos_y    = ($height * .15 - $taille);
+			        $pos_x    = ($width * .90 - $taille);
+			        $rotation = -90;
+			        break;
+		        case 'bottom2top':
+			        $taille   = textlength($maxsize, $height, $text);
+			        $pos_y    = $height * 0.85;
+			        $pos_x    = $width * 0.15;
+			        $rotation = 90;
+			        break;
+		    }
 		break;
 	}
 

login.php

Switch Indentation +370 added lines, -370 removed lines

@@ -68,89 +68,89 @@ 
 $message = '';
 
 switch ($action) {
-case 'login':
-	try {
-		if (!$_COOKIE) {
-			Log::addAuthenticationLog('Login failed (no session cookies): ' . $username);
-			throw new \Exception(I18N::translate('You cannot sign in because your browser does not accept cookies.'));
-		}
-
-		$user = User::findByIdentifier($username);
-
-		if (!$user) {
-			Log::addAuthenticationLog('Login failed (no such user/email): ' . $username);
-			throw new \Exception(I18N::translate('The username or password is incorrect.'));
-		}
-
-		if (!$user->checkPassword($password)) {
-			Log::addAuthenticationLog('Login failed (incorrect password): ' . $username);
-			throw new \Exception(I18N::translate('The username or password is incorrect.'));
-		}
-
-		if (!$user->getPreference('verified')) {
-			Log::addAuthenticationLog('Login failed (not verified by user): ' . $username);
-			throw new \Exception(I18N::translate('This account has not been verified. Please check your email for a verification message.'));
-		}
-
-		if (!$user->getPreference('verified_by_admin')) {
-			Log::addAuthenticationLog('Login failed (not approved by admin): ' . $username);
-			throw new \Exception(I18N::translate('This account has not been approved. Please wait for an administrator to approve it.'));
-		}
-
-		Auth::login($user);
-		Log::addAuthenticationLog('Login: ' . Auth::user()->getUserName() . '/' . Auth::user()->getRealName());
-		Auth::user()->setPreference('sessiontime', WT_TIMESTAMP);
-
-		Session::put('locale', Auth::user()->getPreference('language'));
-		Session::put('theme_id', Auth::user()->getPreference('theme'));
-		I18N::init(Auth::user()->getPreference('language'));
-
-		// We're logging in as an administrator
-		if (Auth::isAdmin()) {
-			// Check for updates
-			$latest_version_txt = Functions::fetchLatestVersion();
-			if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
-				list($latest_version, $earliest_version, $download_url) = explode('|', $latest_version_txt);
-				if (version_compare(WT_VERSION, $latest_version) < 0) {
-					FlashMessages::addMessage(
-						I18N::translate('A new version of webtrees is available.') .
-						' <a href="admin_site_upgrade.php"><b>' .
-						I18N::translate('Upgrade to webtrees %s.', '<span dir="ltr">' . $latest_version . '</span>') .
-						'</b></a>'
-					);
-				}
-			}
-		}
-
-		// If we were on a "home page", redirect to "my page"
-		if ($url === '' || strpos($url, 'index.php?ctype=gedcom') === 0) {
-			$url = 'index.php?ctype=user';
-			// Switch to a tree where we have a genealogy record (or keep to the current/default).
-			$tree = Database::prepare(
-				"SELECT gedcom_name FROM `##gedcom` JOIN `##user_gedcom_setting` USING (gedcom_id)" .
-				" WHERE setting_name = 'gedcomid' AND user_id = :user_id" .
-				" ORDER BY gedcom_id = :tree_id DESC"
-			)->execute(array(
-				'user_id' => Auth::user()->getUserId(),
-				'tree_id' => $WT_TREE->getTreeId(),
-			))->fetchOne();
-			$url .= '&ged=' . Filter::escapeUrl($tree);
-		}
-
-		// Redirect to the target URL
-		header('Location: ' . WT_BASE_URL . $url);
-
-		return;
-	} catch (\Exception $ex) {
-		$message = $ex->getMessage();
-	}
-	// No break;
-
-default:
-	$controller
-		->setPageTitle(I18N::translate('Sign in'))
-		->pageHeader()
-		->addInlineJavascript('
+    case 'login':
+	    try {
+		    if (!$_COOKIE) {
+			    Log::addAuthenticationLog('Login failed (no session cookies): ' . $username);
+			    throw new \Exception(I18N::translate('You cannot sign in because your browser does not accept cookies.'));
+		    }
+
+		    $user = User::findByIdentifier($username);
+
+		    if (!$user) {
+			    Log::addAuthenticationLog('Login failed (no such user/email): ' . $username);
+			    throw new \Exception(I18N::translate('The username or password is incorrect.'));
+		    }
+
+		    if (!$user->checkPassword($password)) {
+			    Log::addAuthenticationLog('Login failed (incorrect password): ' . $username);
+			    throw new \Exception(I18N::translate('The username or password is incorrect.'));
+		    }
+
+		    if (!$user->getPreference('verified')) {
+			    Log::addAuthenticationLog('Login failed (not verified by user): ' . $username);
+			    throw new \Exception(I18N::translate('This account has not been verified. Please check your email for a verification message.'));
+		    }
+
+		    if (!$user->getPreference('verified_by_admin')) {
+			    Log::addAuthenticationLog('Login failed (not approved by admin): ' . $username);
+			    throw new \Exception(I18N::translate('This account has not been approved. Please wait for an administrator to approve it.'));
+		    }
+
+		    Auth::login($user);
+		    Log::addAuthenticationLog('Login: ' . Auth::user()->getUserName() . '/' . Auth::user()->getRealName());
+		    Auth::user()->setPreference('sessiontime', WT_TIMESTAMP);
+
+		    Session::put('locale', Auth::user()->getPreference('language'));
+		    Session::put('theme_id', Auth::user()->getPreference('theme'));
+		    I18N::init(Auth::user()->getPreference('language'));
+
+		    // We're logging in as an administrator
+		    if (Auth::isAdmin()) {
+			    // Check for updates
+			    $latest_version_txt = Functions::fetchLatestVersion();
+			    if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
+				    list($latest_version, $earliest_version, $download_url) = explode('|', $latest_version_txt);
+				    if (version_compare(WT_VERSION, $latest_version) < 0) {
+					    FlashMessages::addMessage(
+						    I18N::translate('A new version of webtrees is available.') .
+						    ' <a href="admin_site_upgrade.php"><b>' .
+						    I18N::translate('Upgrade to webtrees %s.', '<span dir="ltr">' . $latest_version . '</span>') .
+						    '</b></a>'
+					    );
+				    }
+			    }
+		    }
+
+		    // If we were on a "home page", redirect to "my page"
+		    if ($url === '' || strpos($url, 'index.php?ctype=gedcom') === 0) {
+			    $url = 'index.php?ctype=user';
+			    // Switch to a tree where we have a genealogy record (or keep to the current/default).
+			    $tree = Database::prepare(
+				    "SELECT gedcom_name FROM `##gedcom` JOIN `##user_gedcom_setting` USING (gedcom_id)" .
+				    " WHERE setting_name = 'gedcomid' AND user_id = :user_id" .
+				    " ORDER BY gedcom_id = :tree_id DESC"
+			    )->execute(array(
+				    'user_id' => Auth::user()->getUserId(),
+				    'tree_id' => $WT_TREE->getTreeId(),
+			    ))->fetchOne();
+			    $url .= '&ged=' . Filter::escapeUrl($tree);
+		    }
+
+		    // Redirect to the target URL
+		    header('Location: ' . WT_BASE_URL . $url);
+
+		    return;
+	    } catch (\Exception $ex) {
+		    $message = $ex->getMessage();
+	    }
+	    // No break;
+
+    default:
+	    $controller
+		    ->setPageTitle(I18N::translate('Sign in'))
+		    ->pageHeader()
+		    ->addInlineJavascript('
 			jQuery("#new_passwd_form").hide();
 			jQuery("#passwd_click").click(function() {
 				jQuery("#new_passwd_form").slideToggle(100, function() {
@@ -160,25 +160,25 @@ 
 			});
 		');
 
-	echo '<div id="login-page">';
-	echo '<div id="login-text">';
-
-	echo '<p class="center"><strong>' . I18N::translate('Welcome to this genealogy website') . '</strong></p>';
-
-	switch (Site::getPreference('WELCOME_TEXT_AUTH_MODE')) {
-	case 1:
-		echo '<p>' . I18N::translate('Anyone with a user account can access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
-		break;
-	case 2:
-		echo '<p>' . I18N::translate('You need to be an authorized user to access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
-		break;
-	case 3:
-		echo '<p>' . I18N::translate('You need to be a family member to access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
-		break;
-	case 4:
-		echo '<p style="white-space: pre-wrap;">', Site::getPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE), '</p>';
-		break;
-	}
+	    echo '<div id="login-page">';
+	    echo '<div id="login-text">';
+
+	    echo '<p class="center"><strong>' . I18N::translate('Welcome to this genealogy website') . '</strong></p>';
+
+	    switch (Site::getPreference('WELCOME_TEXT_AUTH_MODE')) {
+	        case 1:
+		        echo '<p>' . I18N::translate('Anyone with a user account can access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
+		        break;
+	        case 2:
+		        echo '<p>' . I18N::translate('You need to be an authorized user to access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
+		        break;
+	        case 3:
+		        echo '<p>' . I18N::translate('You need to be a family member to access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
+		        break;
+	        case 4:
+		        echo '<p style="white-space: pre-wrap;">', Site::getPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE), '</p>';
+		        break;
+	    }
 
 	echo '</div>';
 	echo '<div id="login-box">';
@@ -233,181 +233,181 @@ 
 	echo '</div>';
 	break;
 
-case 'requestpw':
-	$user_name = Filter::post('new_passwd_username');
-	$user      = User::findByIdentifier($user_name);
-
-	if ($user) {
-		$passchars   = 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-		$user_new_pw = '';
-		$max         = strlen($passchars) - 1;
-		for ($i = 0; $i < 8; $i++) {
-			$index = rand(0, $max);
-			$user_new_pw .= $passchars{$index};
-		}
-
-		$user->setPassword($user_new_pw);
-		Log::addAuthenticationLog('Password request was sent to user: ' . $user->getUserName());
-
-		Mail::systemMessage(
-			$WT_TREE,
-			$user,
-			I18N::translate('Lost password request'),
-			I18N::translate('Hello %s…', $user->getRealNameHtml()) . Mail::EOL . Mail::EOL .
-			I18N::translate('A new password has been requested for your username.') . Mail::EOL . Mail::EOL .
-			I18N::translate('Username') . ": " . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
-			I18N::translate('Password') . ": " . $user_new_pw . Mail::EOL . Mail::EOL .
-			I18N::translate('After you have signed in, select the “My account” link under the “My pages” menu and fill in the password fields to change your password.') . Mail::EOL . Mail::EOL .
-			'<a href="' . WT_BASE_URL . 'login.php?ged=' . $WT_TREE->getNameUrl() . '">' . WT_BASE_URL . 'login.php?ged=' . $WT_TREE->getNameUrl() . '</a>'
-		);
-
-		FlashMessages::addMessage(I18N::translate('A new password has been created and emailed to %s. You can change this password after you sign in.', Filter::escapeHtml($user_name)), 'success');
-	} else {
-		FlashMessages::addMessage(I18N::translate('There is no account with the username or email “%s”.', Filter::escapeHtml($user_name)), 'danger');
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
-	break;
-
-case 'register':
-	if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
-		header('Location: ' . WT_BASE_URL);
-
-		return;
-	}
-
-	$controller->setPageTitle(I18N::translate('Request a new user account'));
-
-	// The form parameters are mandatory, and the validation errors are shown in the client.
-	if (Session::get('good_to_send') && $user_name && $user_password01 && $user_password01 == $user_password02 && $user_realname && $user_email && $user_comments) {
-
-		// These validation errors cannot be shown in the client.
-		if (User::findByUserName($user_name)) {
-			FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
-		} elseif (User::findByEmail($user_email)) {
-			FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
-		} elseif (preg_match('/(?!' . preg_quote(WT_BASE_URL, '/') . ')(((?:ftp|http|https):\/\/)[a-zA-Z0-9.-]+)/', $user_comments, $match)) {
-			FlashMessages::addMessage(
-				I18N::translate('You are not allowed to send messages that contain external links.') . ' ' .
-				I18N::translate('You should delete the “%1$s” from “%2$s” and try again.', $match[2], $match[1])
-			);
-			Log::addAuthenticationLog('Possible spam registration from "' . $user_name . '"/"' . $user_email . '" comments="' . $user_comments . '"');
-		} else {
-			// Everything looks good - create the user
-			$controller->pageHeader();
-			Log::addAuthenticationLog('User registration requested for: ' . $user_name);
-
-			$user = User::create($user_name, $user_realname, $user_email, $user_password01);
-			$user
-				->setPreference('language', WT_LOCALE)
-				->setPreference('verified', '0')
-				->setPreference('verified_by_admin', 0)
-				->setPreference('reg_timestamp', date('U'))
-				->setPreference('reg_hashcode', md5(Uuid::uuid4()))
-				->setPreference('contactmethod', 'messaging2')
-				->setPreference('comment', $user_comments)
-				->setPreference('visibleonline', '1')
-				->setPreference('auto_accept', '0')
-				->setPreference('canadmin', '0')
-				->setPreference('sessiontime', '0');
-
-			// Generate an email in the admin’s language
-			$webmaster = User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'));
-			I18N::init($webmaster->getPreference('language'));
-
-			$mail1_body =
-				I18N::translate('Hello administrator…') . Mail::EOL . Mail::EOL .
-				/* I18N: %s is a server name/URL */
-				I18N::translate('A prospective user has registered with webtrees at %s.', WT_BASE_URL . ' ' . $WT_TREE->getTitleHtml()) . Mail::EOL . Mail::EOL .
-				I18N::translate('Username') . ' ' . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
-				I18N::translate('Real name') . ' ' . $user->getRealNameHtml() . Mail::EOL .
-				I18N::translate('Email address') . ' ' . Filter::escapeHtml($user->getEmail()) . Mail::EOL .
-				I18N::translate('Comments') . ' ' . Filter::escapeHtml($user_comments) . Mail::EOL . Mail::EOL .
-				I18N::translate('The user has been sent an email with the information necessary to confirm the access request.') . Mail::EOL . Mail::EOL .
-				I18N::translate('You will be informed by email when this prospective user has confirmed the request. You can then complete the process by activating the username. The new user will not be able to sign in until you activate the account.');
-
-			$mail1_subject = /* I18N: %s is a server name/URL */ I18N::translate('New registration at %s', WT_BASE_URL . ' ' . $WT_TREE->getTitle());
-			I18N::init(WT_LOCALE);
-
-			echo '<div id="login-register-page">';
-
-			// Generate an email in the user’s language
-			$mail2_body =
-				I18N::translate('Hello %s…', $user->getRealNameHtml()) .
-				Mail::EOL . Mail::EOL .
-				/* I18N: %1$s is the site URL and %2$s is an email address */
-				I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', WT_BASE_URL . ' ' . $WT_TREE->getTitleHtml(), $user->getEmail()) .
-				Mail::EOL . Mail::EOL .
-				I18N::translate('Follow this link to verify your email address.') .
-				Mail::EOL . Mail::EOL .
-				'<a href="' . WT_LOGIN_URL . '?user_name=' . Filter::escapeUrl($user->getUserName()) . '&amp;user_hashcode=' . $user->getPreference('reg_hashcode') . '&amp;action=userverify&amp;ged=' . $WT_TREE->getNameUrl() . '">' .
-				WT_LOGIN_URL . "?user_name=" . Filter::escapeHtml($user->getUserName()) . "&amp;user_hashcode=" . urlencode($user->getPreference('reg_hashcode')) . '&amp;action=userverify&amp;ged=' . $WT_TREE->getNameHtml() .
-				'</a>' . Mail::EOL . Mail::EOL .
-				I18N::translate('Username') . " - " . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
-				I18N::translate('Comments') . " - " . $user->getPreference('comment') . Mail::EOL .
-				I18N::translate('If you didn’t request an account, you can just delete this message.') . Mail::EOL;
-			$mail2_subject = /* I18N: %s is a server name/URL */ I18N::translate('Your registration at %s', WT_BASE_URL);
-			$mail2_to      = $user->getEmail();
-			$mail2_from    = $WT_TREE->getPreference('WEBTREES_EMAIL');
-
-			// Send user message by email only
-			Mail::send(
-				// “From:” header
-				$WT_TREE,
-				// “To:” header
-				$mail2_to,
-				$mail2_to,
-				// “Reply-To:” header
-				$mail2_from,
-				$mail2_from,
-				// Message body
-				$mail2_subject,
-				$mail2_body
-			);
-
-			// Send admin message by email and/or internal messaging
-			Mail::send(
-				// “From:” header
-				$WT_TREE,
-				// “To:” header
-				$webmaster->getEmail(),
-				$webmaster->getRealName(),
-				// “Reply-To:” header
-				$user->getEmail(),
-				$user->getRealName(),
-				// Message body
-				$mail1_subject,
-				$mail1_body
-			);
-			$mail1_method = $webmaster->getPreference('contact_method');
-			if ($mail1_method != 'messaging3' && $mail1_method != 'mailto' && $mail1_method != 'none') {
-				Database::prepare("INSERT INTO `##message` (sender, ip_address, user_id, subject, body) VALUES (? ,? ,? ,? ,?)")
-					->execute(array($user->getEmail(), WT_CLIENT_IP, $webmaster->getUserId(), $mail1_subject, Filter::unescapeHtml($mail1_body)));
-			}
-
-			echo '<div class="confirm"><p>', I18N::translate('Hello %s…<br>Thank you for your registration.', $user->getRealNameHtml()), '</p>';
-			echo '<p>', I18N::translate('We will now send a confirmation email to the address <b>%s</b>. You must verify your account request by following instructions in the confirmation email. If you do not confirm your account request within seven days, your application will be rejected automatically. You will have to apply again.<br><br>After you have followed the instructions in the confirmation email, the administrator still has to approve your request before your account can be used.<br><br>To sign in to this website, you will need to know your username and password.', $user->getEmail()), '</p>';
-			echo '</div>';
-			echo '</div>';
-
-			return;
-		}
-	}
-
-	Session::put('good_to_send', true);
-	$controller
-		->pageHeader()
-		->addInlineJavascript('function regex_quote(str) {return str.replace(/[\\\\.?+*()[\](){}|]/g, "\\\\$&");}');
-
-	?>
+    case 'requestpw':
+	    $user_name = Filter::post('new_passwd_username');
+	    $user      = User::findByIdentifier($user_name);
+
+	    if ($user) {
+		    $passchars   = 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		    $user_new_pw = '';
+		    $max         = strlen($passchars) - 1;
+		    for ($i = 0; $i < 8; $i++) {
+			    $index = rand(0, $max);
+			    $user_new_pw .= $passchars{$index};
+		    }
+
+		    $user->setPassword($user_new_pw);
+		    Log::addAuthenticationLog('Password request was sent to user: ' . $user->getUserName());
+
+		    Mail::systemMessage(
+			    $WT_TREE,
+			    $user,
+			    I18N::translate('Lost password request'),
+			    I18N::translate('Hello %s…', $user->getRealNameHtml()) . Mail::EOL . Mail::EOL .
+			    I18N::translate('A new password has been requested for your username.') . Mail::EOL . Mail::EOL .
+			    I18N::translate('Username') . ": " . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
+			    I18N::translate('Password') . ": " . $user_new_pw . Mail::EOL . Mail::EOL .
+			    I18N::translate('After you have signed in, select the “My account” link under the “My pages” menu and fill in the password fields to change your password.') . Mail::EOL . Mail::EOL .
+			    '<a href="' . WT_BASE_URL . 'login.php?ged=' . $WT_TREE->getNameUrl() . '">' . WT_BASE_URL . 'login.php?ged=' . $WT_TREE->getNameUrl() . '</a>'
+		    );
+
+		    FlashMessages::addMessage(I18N::translate('A new password has been created and emailed to %s. You can change this password after you sign in.', Filter::escapeHtml($user_name)), 'success');
+	    } else {
+		    FlashMessages::addMessage(I18N::translate('There is no account with the username or email “%s”.', Filter::escapeHtml($user_name)), 'danger');
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+	    return;
+	    break;
+
+    case 'register':
+	    if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
+		    header('Location: ' . WT_BASE_URL);
+
+		    return;
+	    }
+
+	    $controller->setPageTitle(I18N::translate('Request a new user account'));
+
+	    // The form parameters are mandatory, and the validation errors are shown in the client.
+	    if (Session::get('good_to_send') && $user_name && $user_password01 && $user_password01 == $user_password02 && $user_realname && $user_email && $user_comments) {
+
+		    // These validation errors cannot be shown in the client.
+		    if (User::findByUserName($user_name)) {
+			    FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
+		    } elseif (User::findByEmail($user_email)) {
+			    FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
+		    } elseif (preg_match('/(?!' . preg_quote(WT_BASE_URL, '/') . ')(((?:ftp|http|https):\/\/)[a-zA-Z0-9.-]+)/', $user_comments, $match)) {
+			    FlashMessages::addMessage(
+				    I18N::translate('You are not allowed to send messages that contain external links.') . ' ' .
+				    I18N::translate('You should delete the “%1$s” from “%2$s” and try again.', $match[2], $match[1])
+			    );
+			    Log::addAuthenticationLog('Possible spam registration from "' . $user_name . '"/"' . $user_email . '" comments="' . $user_comments . '"');
+		    } else {
+			    // Everything looks good - create the user
+			    $controller->pageHeader();
+			    Log::addAuthenticationLog('User registration requested for: ' . $user_name);
+
+			    $user = User::create($user_name, $user_realname, $user_email, $user_password01);
+			    $user
+				    ->setPreference('language', WT_LOCALE)
+				    ->setPreference('verified', '0')
+				    ->setPreference('verified_by_admin', 0)
+				    ->setPreference('reg_timestamp', date('U'))
+				    ->setPreference('reg_hashcode', md5(Uuid::uuid4()))
+				    ->setPreference('contactmethod', 'messaging2')
+				    ->setPreference('comment', $user_comments)
+				    ->setPreference('visibleonline', '1')
+				    ->setPreference('auto_accept', '0')
+				    ->setPreference('canadmin', '0')
+				    ->setPreference('sessiontime', '0');
+
+			    // Generate an email in the admin’s language
+			    $webmaster = User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'));
+			    I18N::init($webmaster->getPreference('language'));
+
+			    $mail1_body =
+				    I18N::translate('Hello administrator…') . Mail::EOL . Mail::EOL .
+				    /* I18N: %s is a server name/URL */
+				    I18N::translate('A prospective user has registered with webtrees at %s.', WT_BASE_URL . ' ' . $WT_TREE->getTitleHtml()) . Mail::EOL . Mail::EOL .
+				    I18N::translate('Username') . ' ' . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
+				    I18N::translate('Real name') . ' ' . $user->getRealNameHtml() . Mail::EOL .
+				    I18N::translate('Email address') . ' ' . Filter::escapeHtml($user->getEmail()) . Mail::EOL .
+				    I18N::translate('Comments') . ' ' . Filter::escapeHtml($user_comments) . Mail::EOL . Mail::EOL .
+				    I18N::translate('The user has been sent an email with the information necessary to confirm the access request.') . Mail::EOL . Mail::EOL .
+				    I18N::translate('You will be informed by email when this prospective user has confirmed the request. You can then complete the process by activating the username. The new user will not be able to sign in until you activate the account.');
+
+			    $mail1_subject = /* I18N: %s is a server name/URL */ I18N::translate('New registration at %s', WT_BASE_URL . ' ' . $WT_TREE->getTitle());
+			    I18N::init(WT_LOCALE);
+
+			    echo '<div id="login-register-page">';
+
+			    // Generate an email in the user’s language
+			    $mail2_body =
+				    I18N::translate('Hello %s…', $user->getRealNameHtml()) .
+				    Mail::EOL . Mail::EOL .
+				    /* I18N: %1$s is the site URL and %2$s is an email address */
+				    I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', WT_BASE_URL . ' ' . $WT_TREE->getTitleHtml(), $user->getEmail()) .
+				    Mail::EOL . Mail::EOL .
+				    I18N::translate('Follow this link to verify your email address.') .
+				    Mail::EOL . Mail::EOL .
+				    '<a href="' . WT_LOGIN_URL . '?user_name=' . Filter::escapeUrl($user->getUserName()) . '&amp;user_hashcode=' . $user->getPreference('reg_hashcode') . '&amp;action=userverify&amp;ged=' . $WT_TREE->getNameUrl() . '">' .
+				    WT_LOGIN_URL . "?user_name=" . Filter::escapeHtml($user->getUserName()) . "&amp;user_hashcode=" . urlencode($user->getPreference('reg_hashcode')) . '&amp;action=userverify&amp;ged=' . $WT_TREE->getNameHtml() .
+				    '</a>' . Mail::EOL . Mail::EOL .
+				    I18N::translate('Username') . " - " . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
+				    I18N::translate('Comments') . " - " . $user->getPreference('comment') . Mail::EOL .
+				    I18N::translate('If you didn’t request an account, you can just delete this message.') . Mail::EOL;
+			    $mail2_subject = /* I18N: %s is a server name/URL */ I18N::translate('Your registration at %s', WT_BASE_URL);
+			    $mail2_to      = $user->getEmail();
+			    $mail2_from    = $WT_TREE->getPreference('WEBTREES_EMAIL');
+
+			    // Send user message by email only
+			    Mail::send(
+				    // “From:” header
+				    $WT_TREE,
+				    // “To:” header
+				    $mail2_to,
+				    $mail2_to,
+				    // “Reply-To:” header
+				    $mail2_from,
+				    $mail2_from,
+				    // Message body
+				    $mail2_subject,
+				    $mail2_body
+			    );
+
+			    // Send admin message by email and/or internal messaging
+			    Mail::send(
+				    // “From:” header
+				    $WT_TREE,
+				    // “To:” header
+				    $webmaster->getEmail(),
+				    $webmaster->getRealName(),
+				    // “Reply-To:” header
+				    $user->getEmail(),
+				    $user->getRealName(),
+				    // Message body
+				    $mail1_subject,
+				    $mail1_body
+			    );
+			    $mail1_method = $webmaster->getPreference('contact_method');
+			    if ($mail1_method != 'messaging3' && $mail1_method != 'mailto' && $mail1_method != 'none') {
+				    Database::prepare("INSERT INTO `##message` (sender, ip_address, user_id, subject, body) VALUES (? ,? ,? ,? ,?)")
+					    ->execute(array($user->getEmail(), WT_CLIENT_IP, $webmaster->getUserId(), $mail1_subject, Filter::unescapeHtml($mail1_body)));
+			    }
+
+			    echo '<div class="confirm"><p>', I18N::translate('Hello %s…<br>Thank you for your registration.', $user->getRealNameHtml()), '</p>';
+			    echo '<p>', I18N::translate('We will now send a confirmation email to the address <b>%s</b>. You must verify your account request by following instructions in the confirmation email. If you do not confirm your account request within seven days, your application will be rejected automatically. You will have to apply again.<br><br>After you have followed the instructions in the confirmation email, the administrator still has to approve your request before your account can be used.<br><br>To sign in to this website, you will need to know your username and password.', $user->getEmail()), '</p>';
+			    echo '</div>';
+			    echo '</div>';
+
+			    return;
+		    }
+	    }
+
+	    Session::put('good_to_send', true);
+	    $controller
+		    ->pageHeader()
+		    ->addInlineJavascript('function regex_quote(str) {return str.replace(/[\\\\.?+*()[\](){}|]/g, "\\\\$&");}');
+
+	    ?>
 	<div id="login-register-page">
 		<h2><?php echo $controller->getPageTitle(); ?></h2>
 
 		<?php if (Site::getPreference('SHOW_REGISTER_CAUTION')): ?>
-		<div id="register-text">
+    		<div id="register-text">
 			<?php echo I18N::translate('<div class="largeError">Notice:</div><div class="error">By completing and submitting this form, you agree:<ul><li>to protect the privacy of living individuals listed on our site;</li><li>and in the text box below, to explain to whom you are related, or to provide us with information on someone who should be listed on our website.</li></ul></div>'); ?>
-		</div>
+    		</div>
 		<?php endif; ?>
 		<div id="register-box">
 			<form id="register-form" name="register-form" method="post" onsubmit="return checkform(this);" autocomplete="off">
@@ -418,7 +418,7 @@ 
 				<div>
 					<label for="user_realname">
 						<?php echo I18N::translate('Real name'); ?>
-						<input type="text" id="user_realname" name="user_realname" required maxlength="64" value="<?php echo Filter::escapeHtml($user_realname); ?>" autofocus>
+    						<input type="text" id="user_realname" name="user_realname" required maxlength="64" value="<?php echo Filter::escapeHtml($user_realname); ?>" autofocus>
 					</label>
 					<p class="small text-muted">
 						<?php echo I18N::translate('This is your real name, as you would like it displayed on screen.'); ?>
@@ -428,7 +428,7 @@ 
 				<div>
 					<label for="user_email">
 						<?php echo I18N::translate('Email address'); ?>
-						<input type="email" id="user_email" name="user_email" required maxlength="64" value="<?php echo Filter::escapeHtml($user_email); ?>">
+    						<input type="email" id="user_email" name="user_email" required maxlength="64" value="<?php echo Filter::escapeHtml($user_email); ?>">
 					</label>
 					<p class="small text-muted">
 						<?php echo I18N::translate('This email address will be used to send password reminders, website notifications, and messages from other family members who are registered on the website.'); ?>
@@ -438,7 +438,7 @@ 
 				<div>
 					<label for="username">
 						<?php echo I18N::translate('Username'); ?>
-						<input type="text" id="username" name="user_name" required maxlength="32" value="<?php Filter::escapeHtml($user_name); ?>">
+    						<input type="text" id="username" name="user_name" required maxlength="32" value="<?php Filter::escapeHtml($user_name); ?>">
 					</label>
 					<p class="small text-muted">
 						<?php echo I18N::translate('Usernames are case-insensitive and ignore accented letters, so that “chloe”, “chloë”, and “Chloe” are considered to be the same.'); ?>
@@ -501,24 +501,24 @@ 
 		</div>
 	</div>
 	<?php
-	break;
+	    break;
 
-case 'userverify':
-	if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
-		header('Location: ' . WT_BASE_URL);
+    case 'userverify':
+	    if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
+		    header('Location: ' . WT_BASE_URL);
 
-		return;
-	}
+		    return;
+	    }
 
-	// Change to the new user’s language
-	$user = User::findByUserName($user_name);
+	    // Change to the new user’s language
+	    $user = User::findByUserName($user_name);
 
-	I18N::init($user->getPreference('language'));
+	    I18N::init($user->getPreference('language'));
 
-	$controller->setPageTitle(I18N::translate('User verification'));
-	$controller->pageHeader();
+	    $controller->setPageTitle(I18N::translate('User verification'));
+	    $controller->pageHeader();
 
-	echo '<div id="login-register-page">
+	    echo '<div id="login-register-page">
 		<form id="verify-form" name="verify-form" method="post" action="', WT_LOGIN_URL, '">
 			<input type="hidden" name="action" value="verify_hash">
 			<h4>', I18N::translate('User verification'), '</h4>
@@ -539,87 +539,87 @@ 
 			</div>
 		</form>
 	</div>';
-	break;
-
-case 'verify_hash':
-	if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
-		header('Location: ' . WT_BASE_URL);
-
-		return;
-	}
-
-	// switch language to webmaster settings
-	$webmaster = User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'));
-	I18N::init($webmaster->getPreference('language'));
-
-	$user          = User::findByUserName($user_name);
-	$edit_user_url = WT_BASE_URL . "admin_users.php?action=edit&amp;user_id=" . $user->getUserId();
-	$mail1_body    =
-		I18N::translate('Hello administrator…') .
-		Mail::EOL . Mail::EOL .
-		/* I18N: %1$s is a real-name, %2$s is a username, %3$s is an email address */ I18N::translate(
-			'A new user (%1$s) has requested an account (%2$s) and verified an email address (%3$s).',
-			$user->getRealNameHtml(),
-			Filter::escapeHtml($user->getUserName()),
-			Filter::escapeHtml($user->getEmail())
-		) .
-		Mail::EOL . Mail::EOL .
-		I18N::translate('You need to review the account details.') .
-		Mail::EOL . Mail::EOL .
-		'<a href="' . $edit_user_url . '">' . $edit_user_url . '</a>' .
-		Mail::EOL . Mail::EOL .
-		/* I18N: You need to: */ I18N::translate('Set the status to “approved”.') .
-		Mail::EOL .
-		/* I18N: You need to: */ I18N::translate('Set the access level for each tree.') .
-		Mail::EOL .
-		/* I18N: You need to: */ I18N::translate('Link the user account to an individual.');
-
-	$mail1_subject = /* I18N: %s is a server name/URL */ I18N::translate('New user at %s', WT_BASE_URL . ' ' . $WT_TREE->getTitle());
-
-	// Change to the new user’s language
-	I18N::init($user->getPreference('language'));
-
-	$controller->setPageTitle(I18N::translate('User verification'));
-	$controller->pageHeader();
-
-	echo '<div id="login-register-page">';
-	echo '<h2>' . I18N::translate('User verification') . '</h2>';
-	echo '<div id="user-verify">';
-	if ($user && $user->checkPassword($user_password) && $user->getPreference('reg_hashcode') === $user_hashcode) {
-		Mail::send(
-		// “From:” header
-			$WT_TREE,
-			// “To:” header
-			$webmaster->getEmail(),
-			$webmaster->getRealName(),
-			// “Reply-To:” header
-			$WT_TREE->getPreference('WEBTREES_EMAIL'),
-			$WT_TREE->getPreference('WEBTREES_EMAIL'),
-			// Message body
-			$mail1_subject,
-			$mail1_body
-		);
-		$mail1_method = $webmaster->getPreference('CONTACT_METHOD');
-		if ($mail1_method != 'messaging3' && $mail1_method != 'mailto' && $mail1_method != 'none') {
-			Database::prepare("INSERT INTO `##message` (sender, ip_address, user_id, subject, body) VALUES (? ,? ,? ,? ,?)")
-				->execute(array($user_name, WT_CLIENT_IP, $webmaster->getUserId(), $mail1_subject, Filter::unescapeHtml($mail1_body)));
-		}
-
-		$user
-			->setPreference('verified', '1')
-			->setPreference('reg_timestamp', date('U'))
-			->deletePreference('reg_hashcode');
-
-		Log::addAuthenticationLog('User ' . $user_name . ' verified their email address');
-
-		echo '<p>', I18N::translate('You have confirmed your request to become a registered user.'), '</p>';
-		echo '<p>', I18N::translate('The administrator has been informed. As soon as they give you permission to sign in, you can sign in with your username and password.'), '</p>';
-	} else {
-		echo '<p class="warning">';
-		echo I18N::translate('Could not verify the information you entered. Please try again or contact the site administrator for more information.');
-		echo '</p>';
-	}
-	echo '</div>';
-	echo '</div>';
-	break;
+	    break;
+
+    case 'verify_hash':
+	    if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
+		    header('Location: ' . WT_BASE_URL);
+
+		    return;
+	    }
+
+	    // switch language to webmaster settings
+	    $webmaster = User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'));
+	    I18N::init($webmaster->getPreference('language'));
+
+	    $user          = User::findByUserName($user_name);
+	    $edit_user_url = WT_BASE_URL . "admin_users.php?action=edit&amp;user_id=" . $user->getUserId();
+	    $mail1_body    =
+		    I18N::translate('Hello administrator…') .
+		    Mail::EOL . Mail::EOL .
+		    /* I18N: %1$s is a real-name, %2$s is a username, %3$s is an email address */ I18N::translate(
+			    'A new user (%1$s) has requested an account (%2$s) and verified an email address (%3$s).',
+			    $user->getRealNameHtml(),
+			    Filter::escapeHtml($user->getUserName()),
+			    Filter::escapeHtml($user->getEmail())
+		    ) .
+		    Mail::EOL . Mail::EOL .
+		    I18N::translate('You need to review the account details.') .
+		    Mail::EOL . Mail::EOL .
+		    '<a href="' . $edit_user_url . '">' . $edit_user_url . '</a>' .
+		    Mail::EOL . Mail::EOL .
+		    /* I18N: You need to: */ I18N::translate('Set the status to “approved”.') .
+		    Mail::EOL .
+		    /* I18N: You need to: */ I18N::translate('Set the access level for each tree.') .
+		    Mail::EOL .
+		    /* I18N: You need to: */ I18N::translate('Link the user account to an individual.');
+
+	    $mail1_subject = /* I18N: %s is a server name/URL */ I18N::translate('New user at %s', WT_BASE_URL . ' ' . $WT_TREE->getTitle());
+
+	    // Change to the new user’s language
+	    I18N::init($user->getPreference('language'));
+
+	    $controller->setPageTitle(I18N::translate('User verification'));
+	    $controller->pageHeader();
+
+	    echo '<div id="login-register-page">';
+	    echo '<h2>' . I18N::translate('User verification') . '</h2>';
+	    echo '<div id="user-verify">';
+	    if ($user && $user->checkPassword($user_password) && $user->getPreference('reg_hashcode') === $user_hashcode) {
+		    Mail::send(
+		    // “From:” header
+			    $WT_TREE,
+			    // “To:” header
+			    $webmaster->getEmail(),
+			    $webmaster->getRealName(),
+			    // “Reply-To:” header
+			    $WT_TREE->getPreference('WEBTREES_EMAIL'),
+			    $WT_TREE->getPreference('WEBTREES_EMAIL'),
+			    // Message body
+			    $mail1_subject,
+			    $mail1_body
+		    );
+		    $mail1_method = $webmaster->getPreference('CONTACT_METHOD');
+		    if ($mail1_method != 'messaging3' && $mail1_method != 'mailto' && $mail1_method != 'none') {
+			    Database::prepare("INSERT INTO `##message` (sender, ip_address, user_id, subject, body) VALUES (? ,? ,? ,? ,?)")
+				    ->execute(array($user_name, WT_CLIENT_IP, $webmaster->getUserId(), $mail1_subject, Filter::unescapeHtml($mail1_body)));
+		    }
+
+		    $user
+			    ->setPreference('verified', '1')
+			    ->setPreference('reg_timestamp', date('U'))
+			    ->deletePreference('reg_hashcode');
+
+		    Log::addAuthenticationLog('User ' . $user_name . ' verified their email address');
+
+		    echo '<p>', I18N::translate('You have confirmed your request to become a registered user.'), '</p>';
+		    echo '<p>', I18N::translate('The administrator has been informed. As soon as they give you permission to sign in, you can sign in with your username and password.'), '</p>';
+	    } else {
+		    echo '<p class="warning">';
+		    echo I18N::translate('Could not verify the information you entered. Please try again or contact the site administrator for more information.');
+		    echo '</p>';
+	    }
+	    echo '</div>';
+	    echo '</div>';
+	    break;
 }

expand_view.php

Switch Indentation +33 added lines, -33 removed lines

@@ -43,38 +43,38 @@
 
 foreach ($facts as $fact) {
 	switch ($fact->getTag()) {
-	case 'ADDR':
-	case 'ALIA':
-	case 'ASSO':
-	case 'CHAN':
-	case 'CHIL':
-	case 'EMAIL':
-	case 'FAMC':
-	case 'FAMS':
-	case 'HUSB':
-	case 'NAME':
-	case 'NOTE':
-	case 'OBJE':
-	case 'PHON':
-	case 'RESI':
-	case 'RESN':
-	case 'SEX':
-	case 'SOUR':
-	case 'SSN':
-	case 'SUBM':
-	case 'TITL':
-	case 'URL':
-	case 'WIFE':
-	case 'WWW':
-	case '_EMAIL':
-	case '_TODO':
-	case '_UID':
-	case '_WT_OBJE_SORT':
-		// Do not show these
-		break;
-	default:
-		// Simple version of FunctionsPrintFacts::print_fact()
-		echo $fact->summary();
-		break;
+	    case 'ADDR':
+	    case 'ALIA':
+	    case 'ASSO':
+	    case 'CHAN':
+	    case 'CHIL':
+	    case 'EMAIL':
+	    case 'FAMC':
+	    case 'FAMS':
+	    case 'HUSB':
+	    case 'NAME':
+	    case 'NOTE':
+	    case 'OBJE':
+	    case 'PHON':
+	    case 'RESI':
+	    case 'RESN':
+	    case 'SEX':
+	    case 'SOUR':
+	    case 'SSN':
+	    case 'SUBM':
+	    case 'TITL':
+	    case 'URL':
+	    case 'WIFE':
+	    case 'WWW':
+	    case '_EMAIL':
+	    case '_TODO':
+	    case '_UID':
+	    case '_WT_OBJE_SORT':
+		    // Do not show these
+		    break;
+	    default:
+		    // Simple version of FunctionsPrintFacts::print_fact()
+		    echo $fact->summary();
+		    break;
 	}
 }

edit_changes.php

Switch Indentation +87 added lines, -87 removed lines

@@ -49,72 +49,72 @@ 
 echo '<div id="pending"><h2>', I18N::translate('Pending changes'), '</h2>';
 
 switch ($action) {
-case 'undo':
-	$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	// Undo a change, and subsequent changes to the same record
-	Database::prepare(
-		"UPDATE `##change`" .
-		" SET   status     = 'rejected'" .
-		" WHERE status     = 'pending'" .
-		" AND   gedcom_id  = ?" .
-		" AND   xref       = ?" .
-		" AND   change_id >= ?"
-	)->execute(array($gedcom_id, $xref, $change_id));
-	break;
-case 'accept':
-	$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	// Accept a change, and all previous changes to the same record
-	$changes = Database::prepare(
-		"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
-		" FROM  `##change` c" .
-		" JOIN  `##gedcom` g USING (gedcom_id)" .
-		" WHERE c.status   = 'pending'" .
-		" AND   gedcom_id  = ?" .
-		" AND   xref       = ?" .
-		" AND   change_id <= ?" .
-		" ORDER BY change_id"
-	)->execute(array($gedcom_id, $xref, $change_id))->fetchAll();
-	foreach ($changes as $change) {
-		if (empty($change->new_gedcom)) {
-			// delete
-			FunctionsImport::updateRecord($change->old_gedcom, $gedcom_id, true);
-		} else {
-			// add/update
-			FunctionsImport::updateRecord($change->new_gedcom, $gedcom_id, false);
-		}
-		Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
-		Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
-	}
-	break;
-case 'undoall':
-	Database::prepare(
-		"UPDATE `##change`" .
-		" SET status='rejected'" .
-		" WHERE status='pending' AND gedcom_id=?"
-	)->execute(array($WT_TREE->getTreeId()));
-	break;
-case 'acceptall':
-	$changes = Database::prepare(
-		"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
-		" FROM `##change` c" .
-		" JOIN `##gedcom` g USING (gedcom_id)" .
-		" WHERE c.status='pending' AND gedcom_id=?" .
-		" ORDER BY change_id"
-	)->execute(array($WT_TREE->getTreeId()))->fetchAll();
-	foreach ($changes as $change) {
-		if (empty($change->new_gedcom)) {
-			// delete
-			FunctionsImport::updateRecord($change->old_gedcom, $change->gedcom_id, true);
-		} else {
-			// add/update
-			FunctionsImport::updateRecord($change->new_gedcom, $change->gedcom_id, false);
-		}
-		Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
-		Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
-	}
-	break;
+    case 'undo':
+	    $gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+	    $xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+	    // Undo a change, and subsequent changes to the same record
+	    Database::prepare(
+		    "UPDATE `##change`" .
+		    " SET   status     = 'rejected'" .
+		    " WHERE status     = 'pending'" .
+		    " AND   gedcom_id  = ?" .
+		    " AND   xref       = ?" .
+		    " AND   change_id >= ?"
+	    )->execute(array($gedcom_id, $xref, $change_id));
+	    break;
+    case 'accept':
+	    $gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+	    $xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+	    // Accept a change, and all previous changes to the same record
+	    $changes = Database::prepare(
+		    "SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
+		    " FROM  `##change` c" .
+		    " JOIN  `##gedcom` g USING (gedcom_id)" .
+		    " WHERE c.status   = 'pending'" .
+		    " AND   gedcom_id  = ?" .
+		    " AND   xref       = ?" .
+		    " AND   change_id <= ?" .
+		    " ORDER BY change_id"
+	    )->execute(array($gedcom_id, $xref, $change_id))->fetchAll();
+	    foreach ($changes as $change) {
+		    if (empty($change->new_gedcom)) {
+			    // delete
+			    FunctionsImport::updateRecord($change->old_gedcom, $gedcom_id, true);
+		    } else {
+			    // add/update
+			    FunctionsImport::updateRecord($change->new_gedcom, $gedcom_id, false);
+		    }
+		    Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
+		    Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
+	    }
+	    break;
+    case 'undoall':
+	    Database::prepare(
+		    "UPDATE `##change`" .
+		    " SET status='rejected'" .
+		    " WHERE status='pending' AND gedcom_id=?"
+	    )->execute(array($WT_TREE->getTreeId()));
+	    break;
+    case 'acceptall':
+	    $changes = Database::prepare(
+		    "SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
+		    " FROM `##change` c" .
+		    " JOIN `##gedcom` g USING (gedcom_id)" .
+		    " WHERE c.status='pending' AND gedcom_id=?" .
+		    " ORDER BY change_id"
+	    )->execute(array($WT_TREE->getTreeId()))->fetchAll();
+	    foreach ($changes as $change) {
+		    if (empty($change->new_gedcom)) {
+			    // delete
+			    FunctionsImport::updateRecord($change->old_gedcom, $change->gedcom_id, true);
+		    } else {
+			    // add/update
+			    FunctionsImport::updateRecord($change->new_gedcom, $change->gedcom_id, false);
+		    }
+		    Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
+		    Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
+	    }
+	    break;
 }
 
 $changed_gedcoms = Database::prepare(
@@ -146,27 +146,27 @@ 
 
 
 		switch ($match[1]) {
-		case 'INDI':
-			$record = new Individual($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'FAM':
-			$record = new Family($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'SOUR':
-			$record = new Source($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'REPO':
-			$record = new Repository($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'OBJE':
-			$record = new Media($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'NOTE':
-			$record = new Note($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		default:
-			$record = new GedcomRecord($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
+		    case 'INDI':
+			    $record = new Individual($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+			    break;
+		    case 'FAM':
+			    $record = new Family($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+			    break;
+		    case 'SOUR':
+			    $record = new Source($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+			    break;
+		    case 'REPO':
+			    $record = new Repository($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+			    break;
+		    case 'OBJE':
+			    $record = new Media($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+			    break;
+		    case 'NOTE':
+			    $record = new Note($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+			    break;
+		    default:
+			    $record = new GedcomRecord($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+			    break;
 		}
 		if ($change->xref != $prev_xref || $change->gedcom_id != $prev_gedcom_id) {
 			if ($prev_xref) {

admin_site_logs.php

Switch Indentation +6 added lines, -6 removed lines

@@ -137,12 +137,12 @@
 			// Datatables numbers columns 0, 1, 2
 			// MySQL numbers columns 1, 2, 3
 			switch ($value['dir']) {
-			case 'asc':
-				$order_by .= (1 + $value['column']) . " ASC ";
-				break;
-			case 'desc':
-				$order_by .= (1 + $value['column']) . " DESC ";
-				break;
+			    case 'asc':
+				    $order_by .= (1 + $value['column']) . " ASC ";
+				    break;
+			    case 'desc':
+				    $order_by .= (1 + $value['column']) . " DESC ";
+				    break;
 			}
 		}
 	} else {

edit_interface.php

Switch Indentation +81 added lines, -81 removed lines

@@ -278,40 +278,40 @@ 
 
 	$level1type = $edit_fact->getTag();
 	switch ($record::RECORD_TYPE) {
-	case 'REPO':
-		// REPO:NAME facts may take a NOTE (but the REPO record may not).
-		if ($level1type === 'NAME') {
-			FunctionsEdit::printAddLayer('NOTE');
-			FunctionsEdit::printAddLayer('SHARED_NOTE');
-		}
-		break;
-	case 'FAM':
-	case 'INDI':
-		// FAM and INDI records have real facts. They can take NOTE/SOUR/OBJE/etc.
-		if ($level1type !== 'SEX' && $level1type !== 'NOTE' && $level1type !== 'ALIA') {
-			if ($level1type !== 'SOUR') {
-				FunctionsEdit::printAddLayer('SOUR');
-			}
-			if ($level1type !== 'OBJE') {
-				FunctionsEdit::printAddLayer('OBJE');
-			}
-			FunctionsEdit::printAddLayer('NOTE');
-			FunctionsEdit::printAddLayer('SHARED_NOTE', 2, $level1type);
-			if ($level1type !== 'ASSO' && $level1type !== 'NOTE' && $level1type !== 'SOUR') {
-				FunctionsEdit::printAddLayer('ASSO');
-			}
-			// allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
-			if (in_array($level1type, Config::twoAssociates())) {
-				FunctionsEdit::printAddLayer('ASSO2');
-			}
-			if ($level1type !== 'SOUR') {
-				FunctionsEdit::printAddLayer('RESN');
-			}
-		}
-		break;
-	default:
-		// Other types of record do not have these lower-level records
-		break;
+	    case 'REPO':
+		    // REPO:NAME facts may take a NOTE (but the REPO record may not).
+		    if ($level1type === 'NAME') {
+			    FunctionsEdit::printAddLayer('NOTE');
+			    FunctionsEdit::printAddLayer('SHARED_NOTE');
+		    }
+		    break;
+	    case 'FAM':
+	    case 'INDI':
+		    // FAM and INDI records have real facts. They can take NOTE/SOUR/OBJE/etc.
+		    if ($level1type !== 'SEX' && $level1type !== 'NOTE' && $level1type !== 'ALIA') {
+			    if ($level1type !== 'SOUR') {
+				    FunctionsEdit::printAddLayer('SOUR');
+			    }
+			    if ($level1type !== 'OBJE') {
+				    FunctionsEdit::printAddLayer('OBJE');
+			    }
+			    FunctionsEdit::printAddLayer('NOTE');
+			    FunctionsEdit::printAddLayer('SHARED_NOTE', 2, $level1type);
+			    if ($level1type !== 'ASSO' && $level1type !== 'NOTE' && $level1type !== 'SOUR') {
+				    FunctionsEdit::printAddLayer('ASSO');
+			    }
+			    // allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
+			    if (in_array($level1type, Config::twoAssociates())) {
+				    FunctionsEdit::printAddLayer('ASSO2');
+			    }
+			    if ($level1type !== 'SOUR') {
+				    FunctionsEdit::printAddLayer('RESN');
+			    }
+		    }
+		    break;
+	    default:
+		    // Other types of record do not have these lower-level records
+		    break;
 	}
 	if (Auth::isAdmin() || $WT_TREE->getPreference('SHOW_GEDCOM_RECORD')) {
 		echo
@@ -1905,9 +1905,9 @@ 
 							<b>
 								<?php
 								switch ($father->getSex()) {
-								case 'M': echo I18N::translate('husband'); break;
-								case 'F': echo I18N::translate('wife'); break;
-								default:  echo I18N::translate('spouse'); break;
+								    case 'M': echo I18N::translate('husband'); break;
+								    case 'F': echo I18N::translate('wife'); break;
+								    default:  echo I18N::translate('spouse'); break;
 								}
 								?>
 							</b>
@@ -1940,9 +1940,9 @@ 
 							<b>
 								<?php
 								switch ($mother->getSex()) {
-								case 'M': echo I18N::translate('husband'); break;
-								case 'F': echo I18N::translate('wife'); break;
-								default:  echo I18N::translate('spouse'); break;
+								    case 'M': echo I18N::translate('husband'); break;
+								    case 'F': echo I18N::translate('wife'); break;
+								    default:  echo I18N::translate('spouse'); break;
 								}
 								?>
 							</b>
@@ -1976,9 +1976,9 @@ 
 							<b>
 								<?php
 								switch ($child->getSex()) {
-								case 'M': echo I18N::translate('son'); break;
-								case 'F': echo I18N::translate('daughter'); break;
-								default:  echo I18N::translate('child'); break;
+								    case 'M': echo I18N::translate('son'); break;
+								    case 'F': echo I18N::translate('daughter'); break;
+								    default:  echo I18N::translate('child'); break;
 								}
 								?>
 							</b>
@@ -2354,35 +2354,35 @@ 
 		}
 
 		switch ($nextaction) {
-		case 'add_child_to_family_action':
-			$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($father_name, $mother_name, $gender));
-			break;
-		case 'add_child_to_individual_action':
-			if ($person->getSex() === 'F') {
-				$name_fields = array_merge($name_fields, $surname_tradition->newChildNames('', $indi_name, $gender));
-			} else {
-				$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($indi_name, '', $gender));
-			}
-			break;
-		case 'add_parent_to_individual_action':
-			$name_fields = array_merge($name_fields, $surname_tradition->newParentNames($indi_name, $gender));
-			break;
-		case 'add_spouse_to_family_action':
-			if ($father) {
-				$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($father_name, $gender));
-			} else {
-				$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($mother_name, $gender));
-			}
-			break;
-		case 'add_spouse_to_individual_action':
-			$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($indi_name, $gender));
-			break;
-		case 'add_unlinked_indi_action':
-		case 'update':
-			if ($surname_tradition->hasSurnames()) {
-				$name_fields['NAME'] = '//';
-			}
-			break;
+		    case 'add_child_to_family_action':
+			    $name_fields = array_merge($name_fields, $surname_tradition->newChildNames($father_name, $mother_name, $gender));
+			    break;
+		    case 'add_child_to_individual_action':
+			    if ($person->getSex() === 'F') {
+				    $name_fields = array_merge($name_fields, $surname_tradition->newChildNames('', $indi_name, $gender));
+			    } else {
+				    $name_fields = array_merge($name_fields, $surname_tradition->newChildNames($indi_name, '', $gender));
+			    }
+			    break;
+		    case 'add_parent_to_individual_action':
+			    $name_fields = array_merge($name_fields, $surname_tradition->newParentNames($indi_name, $gender));
+			    break;
+		    case 'add_spouse_to_family_action':
+			    if ($father) {
+				    $name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($father_name, $gender));
+			    } else {
+				    $name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($mother_name, $gender));
+			    }
+			    break;
+		    case 'add_spouse_to_individual_action':
+			    $name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($indi_name, $gender));
+			    break;
+		    case 'add_unlinked_indi_action':
+		    case 'update':
+			    if ($surname_tradition->hasSurnames()) {
+				    $name_fields['NAME'] = '//';
+			    }
+			    break;
 		}
 	}
 
@@ -2403,15 +2403,15 @@ 
 	echo '<table class="facts_table">';
 
 	switch ($nextaction) {
-	case 'add_child_to_family_action':
-	case 'add_child_to_individual_action':
-		// When adding a new child, specify the pedigree
-		FunctionsEdit::addSimpleTag('0 PEDI');
-		break;
-	case 'update':
-		// When adding/editing a name, specify the type
-		FunctionsEdit::addSimpleTag('0 TYPE ' . $name_type, '', '', null, $person);
-		break;
+	    case 'add_child_to_family_action':
+	    case 'add_child_to_individual_action':
+		    // When adding a new child, specify the pedigree
+		    FunctionsEdit::addSimpleTag('0 PEDI');
+		    break;
+	    case 'update':
+		    // When adding/editing a name, specify the type
+		    FunctionsEdit::addSimpleTag('0 TYPE ' . $name_type, '', '', null, $person);
+		    break;
 	}
 
 	// First - new/existing standard name fields