elkarte / Elkarte

sources/controllers/ProfileOptions.controller.php

Spacing +52 added lines, -52 removed lines

@@ -140,11 +140,11 @@ 
 
 			// Make the changes.
 			$user_profile[$this->_memID]['buddy_list'] = implode(',', $buddiesArray);
-			require_once(SUBSDIR . '/Members.subs.php');
+			require_once(SUBSDIR.'/Members.subs.php');
 			updateMemberData($this->_memID, array('buddy_list' => $user_profile[$this->_memID]['buddy_list']));
 
 			// Redirect off the page because we don't like all this ugly query stuff to stick in the history.
-			redirectexit('action=profile;area=lists;sa=buddies;u=' . $this->_memID);
+			redirectexit('action=profile;area=lists;sa=buddies;u='.$this->_memID);
 		}
 		// Or adding a new one
 		elseif (isset($this->_req->post->new_buddy))
@@ -169,17 +169,17 @@ 
 			if (!empty($new_buddies))
 			{
 				// Now find out the id_member of the buddy.
-				require_once(SUBSDIR . '/ProfileOptions.subs.php');
+				require_once(SUBSDIR.'/ProfileOptions.subs.php');
 				$buddiesArray = getBuddiesID($new_buddies);
 
 				// Now update the current users buddy list.
 				$user_profile[$this->_memID]['buddy_list'] = implode(',', $buddiesArray);
-				require_once(SUBSDIR . '/Members.subs.php');
+				require_once(SUBSDIR.'/Members.subs.php');
 				updateMemberData($this->_memID, array('buddy_list' => $user_profile[$this->_memID]['buddy_list']));
 			}
 
 			// Back to the buddy list!
-			redirectexit('action=profile;area=lists;sa=buddies;u=' . $this->_memID);
+			redirectexit('action=profile;area=lists;sa=buddies;u='.$this->_memID);
 		}
 
 		// Get all the users "buddies"...
@@ -187,7 +187,7 @@ 
 
 		if (!empty($buddiesArray))
 		{
-			require_once(SUBSDIR . '/Members.subs.php');
+			require_once(SUBSDIR.'/Members.subs.php');
 			$result = getBasicMemberData($buddiesArray, array('sort' => 'real_name', 'limit' => substr_count($user_profile[$this->_memID]['buddy_list'], ',') + 1));
 			foreach ($result as $row)
 				$buddies[] = $row['id_member'];
@@ -246,11 +246,11 @@ 
 
 			// Make the changes.
 			$user_profile[$this->_memID]['pm_ignore_list'] = implode(',', $ignoreArray);
-			require_once(SUBSDIR . '/Members.subs.php');
+			require_once(SUBSDIR.'/Members.subs.php');
 			updateMemberData($this->_memID, array('pm_ignore_list' => $user_profile[$this->_memID]['pm_ignore_list']));
 
 			// Redirect off the page because we don't like all this ugly query stuff to stick in the history.
-			redirectexit('action=profile;area=lists;sa=ignore;u=' . $this->_memID);
+			redirectexit('action=profile;area=lists;sa=ignore;u='.$this->_memID);
 		}
 		elseif (isset($this->_req->post->new_ignore))
 		{
@@ -272,17 +272,17 @@ 
 			if (!empty($new_entries))
 			{
 				// Now find out the id_member for the members in question.
-				require_once(SUBSDIR . '/ProfileOptions.subs.php');
+				require_once(SUBSDIR.'/ProfileOptions.subs.php');
 				$ignoreArray = getBuddiesID($new_entries, false);
 
 				// Now update the current users buddy list.
 				$user_profile[$this->_memID]['pm_ignore_list'] = implode(',', $ignoreArray);
-				require_once(SUBSDIR . '/Members.subs.php');
+				require_once(SUBSDIR.'/Members.subs.php');
 				updateMemberData($this->_memID, array('pm_ignore_list' => $user_profile[$this->_memID]['pm_ignore_list']));
 			}
 
 			// Back to the list of pitiful people!
-			redirectexit('action=profile;area=lists;sa=ignore;u=' . $this->_memID);
+			redirectexit('action=profile;area=lists;sa=ignore;u='.$this->_memID);
 		}
 
 		// Initialise the list of members we're ignoring.
@@ -290,7 +290,7 @@ 
 
 		if (!empty($ignoreArray))
 		{
-			require_once(SUBSDIR . '/Members.subs.php');
+			require_once(SUBSDIR.'/Members.subs.php');
 			$result = getBasicMemberData($ignoreArray, array('sort' => 'real_name', 'limit' => substr_count($user_profile[$this->_memID]['pm_ignore_list'], ',') + 1));
 			foreach ($result as $row)
 				$ignored[] = $row['id_member'];
@@ -347,7 +347,7 @@ 
 				if (secret)
 				{
 					var qrcode = new QRCode("qrcode", {
-						text: "otpauth://totp/' . $context['forum_name'] . '?secret=" + secret,
+						text: "otpauth://totp/' . $context['forum_name'].'?secret=" + secret,
 						width: 80,
 						height: 80,
 						colorDark : "#000000",
@@ -373,7 +373,7 @@ 
 					}
 
 					var qrcode = new QRCode("qrcode", {
-						text: "otpauth://totp/' . $context['forum_name'] . '?secret=" + text,
+						text: "otpauth://totp/' . $context['forum_name'].'?secret=" + text,
 						width: 80,
 						height: 80,
 						colorDark: "#000000",
@@ -507,12 +507,12 @@ 
 				// Is it valid?
 				else
 				{
-					require_once(SUBSDIR . '/Auth.subs.php');
+					require_once(SUBSDIR.'/Auth.subs.php');
 					$passwordErrors = validatePassword($this->_req->post->passwrd1, $cur_profile['member_name'], array($cur_profile['real_name'], $cur_profile['email_address']));
 
 					// Were there errors?
 					if ($passwordErrors != null)
-						$post_errors[] = 'password_' . $passwordErrors;
+						$post_errors[] = 'password_'.$passwordErrors;
 				}
 
 				if (empty($post_errors))
@@ -521,20 +521,20 @@ 
 					call_integration_hook('integrate_reset_pass', array($cur_profile['member_name'], $cur_profile['member_name'], $this->_req->post->passwrd1));
 
 					// Go then.
-					require_once(SUBSDIR . '/Auth.subs.php');
+					require_once(SUBSDIR.'/Auth.subs.php');
 					$new_pass = $this->_req->post->passwrd1;
 					$passwd = validateLoginPassword($new_pass, '', $cur_profile['member_name'], true);
 
 					// Do the important bits.
-					require_once(SUBSDIR . '/Members.subs.php');
+					require_once(SUBSDIR.'/Members.subs.php');
 					updateMemberData($this->_memID, array('openid_uri' => '', 'passwd' => $passwd));
 					if ($context['user']['is_owner'])
 					{
-						setLoginCookie(60 * $modSettings['cookieTime'], $this->_memID, hash('sha256', $new_pass . $cur_profile['password_salt']));
+						setLoginCookie(60 * $modSettings['cookieTime'], $this->_memID, hash('sha256', $new_pass.$cur_profile['password_salt']));
 						redirectexit('action=profile;area=authentication;updated');
 					}
 					else
-						redirectexit('action=profile;u=' . $this->_memID);
+						redirectexit('action=profile;u='.$this->_memID);
 				}
 
 				return true;
@@ -542,8 +542,8 @@ 
 			// Not right yet!
 			elseif ($this->_req->post->authenticate === 'openid' && !empty($this->_req->post->openid_identifier))
 			{
-				require_once(SUBSDIR . '/OpenID.subs.php');
-				require_once(SUBSDIR . '/Members.subs.php');
+				require_once(SUBSDIR.'/OpenID.subs.php');
+				require_once(SUBSDIR.'/Members.subs.php');
 
 				$openID = new OpenID();
 				$this->_req->post->openid_identifier = $openID->canonize($this->_req->post->openid_identifier);
@@ -581,9 +581,9 @@ 
 		loadTemplate('ProfileOptions');
 
 		// Going to need this for the list.
-		require_once(SUBSDIR . '/Boards.subs.php');
-		require_once(SUBSDIR . '/Topic.subs.php');
-		require_once(SUBSDIR . '/Profile.subs.php');
+		require_once(SUBSDIR.'/Boards.subs.php');
+		require_once(SUBSDIR.'/Topic.subs.php');
+		require_once(SUBSDIR.'/Profile.subs.php');
 
 		$context['mention_types'] = getMemberNotificationsProfile($this->_memID);
 
@@ -591,9 +591,9 @@ 
 		$listOptions = array(
 			'id' => 'board_notification_list',
 			'width' => '100%',
-			'no_items_label' => $txt['notifications_boards_none'] . '<br /><br />' . $txt['notifications_boards_howto'],
+			'no_items_label' => $txt['notifications_boards_none'].'<br /><br />'.$txt['notifications_boards_howto'],
 			'no_items_align' => 'left',
-			'base_href' => $scripturl . '?action=profile;u=' . $this->_memID . ';area=notification',
+			'base_href' => $scripturl.'?action=profile;u='.$this->_memID.';area=notification',
 			'default_sort_col' => 'board_name',
 			'get_items' => array(
 				'function' => array($this, 'list_getBoardNotifications'),
@@ -608,13 +608,13 @@ 
 						'class' => 'lefttext',
 					),
 					'data' => array(
-						'function' => function ($board) {
+						'function' => function($board) {
 							global $txt;
 
 							$link = $board['link'];
 
 							if ($board['new'])
-								$link .= ' <a href="' . $board['href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+								$link .= ' <a href="'.$board['href'].'"><span class="new_posts">'.$txt['new'].'</span></a>';
 
 							return $link;
 						},
@@ -643,7 +643,7 @@ 
 				),
 			),
 			'form' => array(
-				'href' => $scripturl . '?action=profile;area=notification',
+				'href' => $scripturl.'?action=profile;area=notification',
 				'include_sort' => true,
 				'include_start' => true,
 				'hidden_fields' => array(
@@ -658,12 +658,12 @@ 
 					'class' => 'submitbutton',
 					'position' => 'bottom_of_list',
 					'value' => '
-						<input type="submit" name="edit_notify_boards" value="' . $txt['notifications_boards_update'] . '" />
+						<input type="submit" name="edit_notify_boards" value="' . $txt['notifications_boards_update'].'" />
 						<input type="hidden" name="save" value="save" />',
 				),
 				array(
 					'position' => 'after_title',
-					'value' => getBoardNotificationsCount($this->_memID) == 0 ? $txt['notifications_boards_none'] . '<br />' . $txt['notifications_boards_howto'] : $txt['notifications_boards_current'],
+					'value' => getBoardNotificationsCount($this->_memID) == 0 ? $txt['notifications_boards_none'].'<br />'.$txt['notifications_boards_howto'] : $txt['notifications_boards_current'],
 				),
 			),
 		);
@@ -676,9 +676,9 @@ 
 			'id' => 'topic_notification_list',
 			'width' => '100%',
 			'items_per_page' => $modSettings['defaultMaxMessages'],
-			'no_items_label' => $txt['notifications_topics_none'] . '<br /><br />' . $txt['notifications_topics_howto'],
+			'no_items_label' => $txt['notifications_topics_none'].'<br /><br />'.$txt['notifications_topics_howto'],
 			'no_items_align' => 'left',
-			'base_href' => $scripturl . '?action=profile;u=' . $this->_memID . ';area=notification',
+			'base_href' => $scripturl.'?action=profile;u='.$this->_memID.';area=notification',
 			'default_sort_col' => 'last_post',
 			'get_items' => array(
 				'function' => array($this, 'list_getTopicNotifications'),
@@ -699,15 +699,15 @@ 
 						'class' => 'lefttext',
 					),
 					'data' => array(
-						'function' => function ($topic) {
+						'function' => function($topic) {
 							global $txt;
 
 							$link = $topic['link'];
 
 							if ($topic['new'])
-								$link .= ' <a href="' . $topic['new_href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+								$link .= ' <a href="'.$topic['new_href'].'"><span class="new_posts">'.$txt['new'].'</span></a>';
 
-							$link .= '<br /><span class="smalltext"><em>' . $txt['in'] . ' ' . $topic['board_link'] . '</em></span>';
+							$link .= '<br /><span class="smalltext"><em>'.$txt['in'].' '.$topic['board_link'].'</em></span>';
 
 							return $link;
 						},
@@ -737,7 +737,7 @@ 
 					),
 					'data' => array(
 						'sprintf' => array(
-							'format' => '<span class="smalltext">%1$s<br />' . $txt['by'] . ' %2$s</span>',
+							'format' => '<span class="smalltext">%1$s<br />'.$txt['by'].' %2$s</span>',
 							'params' => array(
 								'updated' => false,
 								'poster_updated_link' => false,
@@ -767,7 +767,7 @@ 
 				),
 			),
 			'form' => array(
-				'href' => $scripturl . '?action=profile;area=notification',
+				'href' => $scripturl.'?action=profile;area=notification',
 				'include_sort' => true,
 				'include_start' => true,
 				'hidden_fields' => array(
@@ -782,7 +782,7 @@ 
 					'class' => 'submitbutton',
 					'position' => 'bottom_of_list',
 					'value' => '
-						<input type="submit" name="edit_notify_topics" value="' . $txt['notifications_update'] . '" />
+						<input type="submit" name="edit_notify_topics" value="' . $txt['notifications_update'].'" />
 						<input type="hidden" name="save" value="save" />',
 				),
 			),
@@ -862,7 +862,7 @@ 
 		loadTemplate('ProfileOptions');
 
 		$context['sub_template'] = 'ignoreboards';
-		require_once(SUBSDIR . '/Boards.subs.php');
+		require_once(SUBSDIR.'/Boards.subs.php');
 		$context += getBoardList(array('not_redirection' => true, 'ignore' => !empty($cur_profile['ignore_boards']) ? explode(',', $cur_profile['ignore_boards']) : array()));
 
 		// Include a list of boards per category for easy toggling.
@@ -892,7 +892,7 @@ 
 		$context['can_manage_membergroups'] = allowedTo('manage_membergroups');
 		$context['can_manage_protected'] = allowedTo('admin_forum');
 		$context['can_edit_primary'] = $context['can_manage_protected'];
-		$context['update_message'] = isset($this->_req->query->msg) && isset($txt['group_membership_msg_' . $this->_req->query->msg]) ? $txt['group_membership_msg_' . $this->_req->query->msg] : '';
+		$context['update_message'] = isset($this->_req->query->msg) && isset($txt['group_membership_msg_'.$this->_req->query->msg]) ? $txt['group_membership_msg_'.$this->_req->query->msg] : '';
 
 		// Get all the groups this user is a member of.
 		$groups = explode(',', $curMember['additional_groups']);
@@ -906,7 +906,7 @@ 
 		$groups = array_map('intval', $groups);
 
 		// Get all the membergroups they can join.
-		require_once(SUBSDIR . '/ProfileOptions.subs.php');
+		require_once(SUBSDIR.'/ProfileOptions.subs.php');
 		$context['groups'] = loadMembergroupsJoin($groups, $this->_memID);
 
 		// Add registered members on the end.
@@ -954,7 +954,7 @@ 
 		// GID may be from a link or a form
 		checkSession(isset($this->_req->query->gid) ? 'get' : 'post');
 
-		require_once(SUBSDIR . '/Membergroups.subs.php');
+		require_once(SUBSDIR.'/Membergroups.subs.php');
 
 		$old_profile = &$user_profile[$this->_memID];
 		$context['can_manage_membergroups'] = allowedTo('manage_membergroups');
@@ -1021,7 +1021,7 @@ 
 			Errors::instance()->fatal_lang_error('no_access', false);
 
 		// Final security check, don't allow users to promote themselves to admin.
-		require_once(SUBSDIR . '/ProfileOptions.subs.php');
+		require_once(SUBSDIR.'/ProfileOptions.subs.php');
 		if ($context['can_manage_membergroups'] && !allowedTo('admin_forum'))
 		{
 			$disallow = checkMembergroupChange($group_id);
@@ -1036,22 +1036,22 @@ 
 				Errors::instance()->fatal_lang_error('profile_error_already_requested_group');
 
 			// Send an email to all group moderators etc.
-			require_once(SUBSDIR . '/Mail.subs.php');
+			require_once(SUBSDIR.'/Mail.subs.php');
 
 			// Do we have any group moderators?
-			require_once(SUBSDIR . '/Membergroups.subs.php');
+			require_once(SUBSDIR.'/Membergroups.subs.php');
 			$moderators = array_keys(getGroupModerators($group_id));
 
 			// Otherwise this is the backup!
 			if (empty($moderators))
 			{
-				require_once(SUBSDIR . '/Members.subs.php');
+				require_once(SUBSDIR.'/Members.subs.php');
 				$moderators = membersAllowedTo('manage_membergroups');
 			}
 
 			if (!empty($moderators))
 			{
-				require_once(SUBSDIR . '/Members.subs.php');
+				require_once(SUBSDIR.'/Members.subs.php');
 				$members = getBasicMemberData($moderators, array('preferences' => true, 'sort' => 'lngfile'));
 
 				foreach ($members as $member)
@@ -1072,7 +1072,7 @@ 
 						'APPYNAME' => $old_profile['member_name'],
 						'GROUPNAME' => $group_name,
 						'REASON' => $this->_req->post->reason,
-						'MODLINK' => $scripturl . '?action=moderate;area=groups;sa=requests',
+						'MODLINK' => $scripturl.'?action=moderate;area=groups;sa=requests',
 					);
 
 					$emaildata = loadEmailTemplate('request_membership', $replacements, empty($member['lngfile']) || empty($modSettings['userLanguage']) ? $language : $member['lngfile']);
@@ -1132,7 +1132,7 @@ 
 		else
 			updateSettings(array('settings_updated' => time()));
 
-		require_once(SUBSDIR . '/Members.subs.php');
+		require_once(SUBSDIR.'/Members.subs.php');
 		updateMemberData($this->_memID, array('id_group' => $newPrimary, 'additional_groups' => $addGroups));
 
 		return $changeType;
@@ -1160,7 +1160,7 @@ 
 		}
 		else
 		{
-			require_once(SUBSDIR . '/Themes.subs.php');
+			require_once(SUBSDIR.'/Themes.subs.php');
 			$context['member']['options'] = loadThemeOptionsInto(array(1, (int) $cur_profile['id_theme']), array(-1, $this->_memID), $context['member']['options']);
 
 			if (isset($this->_req->post->options))

sources/controllers/Auth.controller.php

Spacing +46 added lines, -46 removed lines

@@ -73,7 +73,7 @@ 
 
 		// Add the login chain to the link tree.
 		$context['linktree'][] = array(
-			'url' => $scripturl . '?action=login',
+			'url' => $scripturl.'?action=login',
 			'name' => $txt['login'],
 		);
 
@@ -105,7 +105,7 @@ 
 		global $txt, $scripturl, $user_info, $user_settings, $modSettings, $context, $sc;
 
 		// Load cookie authentication and all stuff.
-		require_once(SUBSDIR . '/Auth.subs.php');
+		require_once(SUBSDIR.'/Auth.subs.php');
 
 		// Beyond this point you are assumed to be a guest trying to login.
 		if (!$user_info['is_guest'])
@@ -146,14 +146,14 @@ 
 
 		// Add the login chain to the link tree.
 		$context['linktree'][] = array(
-			'url' => $scripturl . '?action=login',
+			'url' => $scripturl.'?action=login',
 			'name' => $txt['login'],
 		);
 
 		// This is an OpenID login. Let's validate...
 		if (!empty($_POST['openid_identifier']) && !empty($modSettings['enableOpenID']))
 		{
-			require_once(SUBSDIR . '/OpenID.subs.php');
+			require_once(SUBSDIR.'/OpenID.subs.php');
 			$open_id = new OpenID();
 
 			if (($open_id->validate($_POST['openid_identifier'])) !== 'no_data')
@@ -210,7 +210,7 @@ 
 		$user_settings = loadExistingMember($_POST['user']);
 
 		// User using 2FA for login? Let's validate the token...
-		if (!empty($modSettings['enableOTP']) &&!empty($user_settings['enable_otp']) && empty($_POST['otp_token']))
+		if (!empty($modSettings['enableOTP']) && !empty($user_settings['enable_otp']) && empty($_POST['otp_token']))
 		{
 			$context['login_errors'] = array($txt['otp_required']);
 			return false;
@@ -218,7 +218,7 @@ 
 
 		if (!empty($_POST['otp_token']))
 		{
-			require_once(EXTDIR . '/GoogleAuthenticator.php');
+			require_once(EXTDIR.'/GoogleAuthenticator.php');
 			$ga = New GoogleAuthenticator();
 
 			$ga->GetCode($user_settings['otp_secret']);
@@ -256,7 +256,7 @@ 
 				$valid_password = true;
 			}
 			// Maybe is an old SHA-1 and needs upgrading if the db string is an actual 40 hexchar SHA-1
-			elseif (preg_match('/^[0-9a-f]{40}$/i', $user_settings['passwd']) && isset($_POST['old_hash_passwrd']) && $_POST['old_hash_passwrd'] === hash('sha1', $user_settings['passwd'] . $sc))
+			elseif (preg_match('/^[0-9a-f]{40}$/i', $user_settings['passwd']) && isset($_POST['old_hash_passwrd']) && $_POST['old_hash_passwrd'] === hash('sha1', $user_settings['passwd'].$sc))
 			{
 				// Old password passed, turn off hashing and ask for it again so we can update the db to something more secure.
 				$context['login_errors'] = array($txt['login_hash_error']);
@@ -278,7 +278,7 @@ 
 					redirectexit('action=reminder');
 				else
 				{
-					Errors::instance()->log_error($txt['incorrect_password'] . ' - <span class="remove">' . $user_settings['member_name'] . '</span>', 'user');
+					Errors::instance()->log_error($txt['incorrect_password'].' - <span class="remove">'.$user_settings['member_name'].'</span>', 'user');
 
 					// Wrong password, lets enable plain text responses in case form hashing is causing problems
 					$context['disable_login_hashing'] = true;
@@ -314,7 +314,7 @@ 
 				$user_settings['password_salt'] = $tokenizer->generate_hash(4);
 
 				// Update the password hash and set up the salt.
-				require_once(SUBSDIR . '/Members.subs.php');
+				require_once(SUBSDIR.'/Members.subs.php');
 				updateMemberData($user_settings['id_member'], array('passwd' => $user_settings['passwd'], 'password_salt' => $user_settings['password_salt'], 'passwd_flood' => ''));
 			}
 			// Okay, they for sure didn't enter the password!
@@ -330,7 +330,7 @@ 
 				else
 				{
 					// Log an error so we know that it didn't go well in the error log.
-					Errors::instance()->log_error($txt['incorrect_password'] . ' - <span class="remove">' . $user_settings['member_name'] . '</span>', 'user');
+					Errors::instance()->log_error($txt['incorrect_password'].' - <span class="remove">'.$user_settings['member_name'].'</span>', 'user');
 
 					$context['login_errors'] = array($txt['incorrect_password']);
 					return false;
@@ -343,7 +343,7 @@ 
 			validatePasswordFlood($user_settings['id_member'], $user_settings['passwd_flood'], true);
 
 			// If we got here then we can reset the flood counter.
-			require_once(SUBSDIR . '/Members.subs.php');
+			require_once(SUBSDIR.'/Members.subs.php');
 			updateMemberData($user_settings['id_member'], array('passwd_flood' => ''));
 		}
 
@@ -358,7 +358,7 @@ 
 		// Let's track the last used one-time password.
 		if (!empty($_POST['otp_token']))
 		{
-			require_once(SUBSDIR . '/Members.subs.php');
+			require_once(SUBSDIR.'/Members.subs.php');
 			updateMemberData($user_settings['id_member'], array('otp_used' => $_POST['otp_token']));
 		}
 		// Check their activation status.
@@ -387,7 +387,7 @@ 
 		if (!$internal)
 			checkSession('get');
 
-		require_once(SUBSDIR . '/Auth.subs.php');
+		require_once(SUBSDIR.'/Auth.subs.php');
 
 		if (isset($_SESSION['pack_ftp']))
 			$_SESSION['pack_ftp'] = null;
@@ -406,7 +406,7 @@ 
 			call_integration_hook('integrate_logout', array($user_settings['member_name']));
 
 			// If you log out, you aren't online anymore :P.
-			require_once(SUBSDIR . '/Logging.subs.php');
+			require_once(SUBSDIR.'/Logging.subs.php');
 			logOnline($user_info['id'], false);
 		}
 
@@ -414,7 +414,7 @@ 
 		$types = array('admin', 'moderate');
 		call_integration_hook('integrate_validateSession', array(&$types));
 		foreach ($types as $type)
-			unset($_SESSION[$type . '_time']);
+			unset($_SESSION[$type.'_time']);
 
 		$_SESSION['log_time'] = 0;
 
@@ -426,7 +426,7 @@ 
 		if (!empty($user_info['id']))
 		{
 			$tokenizer = new Token_Hash();
-			require_once(SUBSDIR . '/Members.subs.php');
+			require_once(SUBSDIR.'/Members.subs.php');
 			updateMemberData($user_info['id'], array('password_salt' => $tokenizer->generate_hash(4)));
 		}
 
@@ -572,7 +572,7 @@ 
 			$other_passwords[] = md5($_POST['passwrd']);
 			$other_passwords[] = sha1($_POST['passwrd']);
 			$other_passwords[] = md5_hmac($_POST['passwrd'], strtolower($user_settings['member_name']));
-			$other_passwords[] = md5($_POST['passwrd'] . strtolower($user_settings['member_name']));
+			$other_passwords[] = md5($_POST['passwrd'].strtolower($user_settings['member_name']));
 			$other_passwords[] = md5(md5($_POST['passwrd']));
 			$other_passwords[] = $_POST['passwrd'];
 
@@ -602,29 +602,29 @@ 
 		elseif (!empty($modSettings['enable_password_conversion']) && $pw_strlen === 32)
 		{
 			// vBulletin 3 style hashing?  Let's welcome them with open arms \o/.
-			$other_passwords[] = md5(md5($_POST['passwrd']) . stripslashes($user_settings['password_salt']));
+			$other_passwords[] = md5(md5($_POST['passwrd']).stripslashes($user_settings['password_salt']));
 
 			// Hmm.. p'raps it's Invision 2 style?
-			$other_passwords[] = md5(md5($user_settings['password_salt']) . md5($_POST['passwrd']));
+			$other_passwords[] = md5(md5($user_settings['password_salt']).md5($_POST['passwrd']));
 
 			// Some common md5 ones.
-			$other_passwords[] = md5($user_settings['password_salt'] . $_POST['passwrd']);
-			$other_passwords[] = md5($_POST['passwrd'] . $user_settings['password_salt']);
+			$other_passwords[] = md5($user_settings['password_salt'].$_POST['passwrd']);
+			$other_passwords[] = md5($_POST['passwrd'].$user_settings['password_salt']);
 		}
 		// The hash is 40 characters, lets try some SHA-1 style auth
 		elseif ($pw_strlen === 40)
 		{
 			// Maybe they are using a hash from before our password upgrade
-			$other_passwords[] = sha1(strtolower($user_settings['member_name']) . un_htmlspecialchars($_POST['passwrd']));
-			$other_passwords[] = sha1($user_settings['passwd'] . $sc);
+			$other_passwords[] = sha1(strtolower($user_settings['member_name']).un_htmlspecialchars($_POST['passwrd']));
+			$other_passwords[] = sha1($user_settings['passwd'].$sc);
 
 			if (!empty($modSettings['enable_password_conversion']))
 			{
 				// BurningBoard3 style of hashing.
-				$other_passwords[] = sha1($user_settings['password_salt'] . sha1($user_settings['password_salt'] . sha1($_POST['passwrd'])));
+				$other_passwords[] = sha1($user_settings['password_salt'].sha1($user_settings['password_salt'].sha1($_POST['passwrd'])));
 
 				// PunBB 1.4 and later
-				$other_passwords[] = sha1($user_settings['password_salt'] . sha1($_POST['passwrd']));
+				$other_passwords[] = sha1($user_settings['password_salt'].sha1($_POST['passwrd']));
 			}
 
 			// Perhaps we converted from a non UTF-8 db and have a valid password being hashed differently.
@@ -632,11 +632,11 @@ 
 			{
 				// Try iconv first, for no particular reason.
 				if (function_exists('iconv'))
-					$other_passwords['iconv'] = sha1(strtolower(iconv('UTF-8', $modSettings['previousCharacterSet'], $user_settings['member_name'])) . un_htmlspecialchars(iconv('UTF-8', $modSettings['previousCharacterSet'], $_POST['passwrd'])));
+					$other_passwords['iconv'] = sha1(strtolower(iconv('UTF-8', $modSettings['previousCharacterSet'], $user_settings['member_name'])).un_htmlspecialchars(iconv('UTF-8', $modSettings['previousCharacterSet'], $_POST['passwrd'])));
 
 				// Say it aint so, iconv failed!
 				if (empty($other_passwords['iconv']) && function_exists('mb_convert_encoding'))
-					$other_passwords[] = sha1(strtolower(mb_convert_encoding($user_settings['member_name'], 'UTF-8', $modSettings['previousCharacterSet'])) . un_htmlspecialchars(mb_convert_encoding($_POST['passwrd'], 'UTF-8', $modSettings['previousCharacterSet'])));
+					$other_passwords[] = sha1(strtolower(mb_convert_encoding($user_settings['member_name'], 'UTF-8', $modSettings['previousCharacterSet'])).un_htmlspecialchars(mb_convert_encoding($_POST['passwrd'], 'UTF-8', $modSettings['previousCharacterSet'])));
 			}
 		}
 		// SHA-256 will be 64 characters long, lets check some of these possibilities
@@ -646,18 +646,18 @@ 
 			$other_passwords[] = hash_hmac('sha256', $_POST['passwrd'], $user_settings['password_salt']);
 
 			// Plain SHA-256?
-			$other_passwords[] = hash('sha256', $_POST['passwrd'] . $user_settings['password_salt']);
+			$other_passwords[] = hash('sha256', $_POST['passwrd'].$user_settings['password_salt']);
 
 			// Xenforo?
-			$other_passwords[] = sha1(sha1($_POST['passwrd']) . $user_settings['password_salt']);
-			$other_passwords[] = hash('sha256', (hash('sha256', ($_POST['passwrd']) . $user_settings['password_salt'])));
+			$other_passwords[] = sha1(sha1($_POST['passwrd']).$user_settings['password_salt']);
+			$other_passwords[] = hash('sha256', (hash('sha256', ($_POST['passwrd']).$user_settings['password_salt'])));
 		}
 
 		// ElkArte's sha1 function can give a funny result on Linux (Not our fault!). If we've now got the real one let the old one be valid!
 		if (stripos(PHP_OS, 'win') !== 0)
 		{
-			require_once(SUBSDIR . '/Compat.subs.php');
-			$other_passwords[] = sha1_smf(strtolower($user_settings['member_name']) . un_htmlspecialchars($_POST['passwrd']));
+			require_once(SUBSDIR.'/Compat.subs.php');
+			$other_passwords[] = sha1_smf(strtolower($user_settings['member_name']).un_htmlspecialchars($_POST['passwrd']));
 		}
 
 		// Allows mods to easily extend the $other_passwords array
@@ -695,7 +695,7 @@ 
 	// Check if the account is activated - COPPA first...
 	if ($activation_status == 5)
 	{
-		$context['login_errors'][] = $txt['coppa_no_concent'] . ' <a href="' . $scripturl . '?action=register;sa=coppa;member=' . $user_settings['id_member'] . '">' . $txt['coppa_need_more_details'] . '</a>';
+		$context['login_errors'][] = $txt['coppa_no_concent'].' <a href="'.$scripturl.'?action=register;sa=coppa;member='.$user_settings['id_member'].'">'.$txt['coppa_need_more_details'].'</a>';
 		return false;
 	}
 	// Awaiting approval still?
@@ -706,7 +706,7 @@ 
 	{
 		if (isset($_REQUEST['undelete']))
 		{
-			require_once(SUBSDIR . '/Members.subs.php');
+			require_once(SUBSDIR.'/Members.subs.php');
 			updateMemberData($user_settings['id_member'], array('is_activated' => 1));
 			updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 0 ? $modSettings['unapprovedMembers'] - 1 : 0)));
 		}
@@ -721,9 +721,9 @@ 
 	// Standard activation?
 	elseif ($activation_status != 1)
 	{
-		Errors::instance()->log_error($txt['activate_not_completed1'] . ' - <span class="remove">' . $user_settings['member_name'] . '</span>', false);
+		Errors::instance()->log_error($txt['activate_not_completed1'].' - <span class="remove">'.$user_settings['member_name'].'</span>', false);
 
-		$context['login_errors'][] = $txt['activate_not_completed1'] . ' <a href="' . $scripturl . '?action=register;sa=activate;resend;u=' . $user_settings['id_member'] . '">' . $txt['activate_not_completed2'] . '</a>';
+		$context['login_errors'][] = $txt['activate_not_completed1'].' <a href="'.$scripturl.'?action=register;sa=activate;resend;u='.$user_settings['id_member'].'">'.$txt['activate_not_completed2'].'</a>';
 		return false;
 	}
 	return true;
@@ -742,7 +742,7 @@ 
 	global $user_info, $user_settings, $maintenance, $modSettings, $context;
 
 	// Load authentication stuffs.
-	require_once(SUBSDIR . '/Auth.subs.php');
+	require_once(SUBSDIR.'/Auth.subs.php');
 
 	// Call login integration functions.
 	call_integration_hook('integrate_login', array($user_settings['member_name'], isset($_POST['hash_passwrd']) && strlen($_POST['hash_passwrd']) == 64 ? $_POST['hash_passwrd'] : null, $modSettings['cookieTime']));
@@ -751,7 +751,7 @@ 
 	$user_info['id'] = $user_settings['id_member'];
 
 	// Bam!  Cookie set.  A session too, just in case.
-	setLoginCookie(60 * $modSettings['cookieTime'], $user_settings['id_member'], hash('sha256', ($user_settings['passwd'] . $user_settings['password_salt'])));
+	setLoginCookie(60 * $modSettings['cookieTime'], $user_settings['id_member'], hash('sha256', ($user_settings['passwd'].$user_settings['password_salt'])));
 
 	// Reset the login threshold.
 	if (isset($_SESSION['failed_login']))
@@ -787,12 +787,12 @@ 
 	$req = request();
 
 	// You've logged in, haven't you?
-	require_once(SUBSDIR . '/Members.subs.php');
+	require_once(SUBSDIR.'/Members.subs.php');
 	updateMemberData($user_info['id'], array('last_login' => time(), 'member_ip' => $user_info['ip'], 'member_ip2' => $req->ban_ip()));
 
 	// Get rid of the online entry for that old guest....
-	require_once(SUBSDIR . '/Logging.subs.php');
-	deleteOnline('ip' . $user_info['ip']);
+	require_once(SUBSDIR.'/Logging.subs.php');
+	deleteOnline('ip'.$user_info['ip']);
 	$_SESSION['log_time'] = 0;
 
 	// Log this entry, only if we have it enabled.
@@ -801,9 +801,9 @@ 
 
 	// Just log you back out if it's in maintenance mode and you AREN'T an admin.
 	if (empty($maintenance) || allowedTo('admin_forum'))
-		redirectexit('action=auth;sa=check;member=' . $user_info['id'], detectServer()->is('needs_login_fix'));
+		redirectexit('action=auth;sa=check;member='.$user_info['id'], detectServer()->is('needs_login_fix'));
 	else
-		redirectexit('action=logout;' . $context['session_var'] . '=' . $context['session_id'], detectServer()->is('needs_login_fix'));
+		redirectexit('action=logout;'.$context['session_var'].'='.$context['session_id'], detectServer()->is('needs_login_fix'));
 }
 
 /**
@@ -817,7 +817,7 @@ 
 function md5_hmac($data, $key)
 {
 	$key = str_pad(strlen($key) <= 64 ? $key : pack('H*', md5($key)), 64, chr(0x00));
-	return md5(($key ^ str_repeat(chr(0x5c), 64)) . pack('H*', md5(($key ^ str_repeat(chr(0x36), 64)) . $data)));
+	return md5(($key ^ str_repeat(chr(0x5c), 64)).pack('H*', md5(($key ^ str_repeat(chr(0x36), 64)).$data)));
 }
 
 /**
@@ -842,9 +842,9 @@ 
 	$count = 1 << $strpos;
 	$salt = substr($passwd_hash, 4, 8);
 
-	$hash = md5($salt . $passwd, true);
+	$hash = md5($salt.$passwd, true);
 	for (; $count != 0; --$count)
-		$hash = md5($hash . $passwd, true);
+		$hash = md5($hash.$passwd, true);
 
 	$output = substr($passwd_hash, 0, 12);
 	$i = 0;

themes/default/Theme.php

Spacing +104 added lines, -104 removed lines

@@ -61,7 +61,7 @@ 
 		if (empty($context['no_last_modified']))
 		{
 			header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-			header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+			header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
 
 			if ($this->headerSent('Content-Type') === false)
 			{
@@ -96,7 +96,7 @@ 
 
 		foreach (\Template_Layers::getInstance()->prepareContext() as $layer)
 		{
-			loadSubTemplate($layer . '_above', 'ignore');
+			loadSubTemplate($layer.'_above', 'ignore');
 		}
 
 		if (isset($settings['use_default_images']) && $settings['use_default_images'] == 'defaults' && isset($settings['default_template']))
@@ -171,7 +171,7 @@ 
 
 		foreach (\Template_Layers::getInstance()->reverseLayers() as $layer)
 		{
-			loadSubTemplate($layer . '_below', 'ignore');
+			loadSubTemplate($layer.'_below', 'ignore');
 		}
 	}
 
@@ -193,28 +193,28 @@ 
 			// Only getting the files from the CDN?
 			case 'cdn':
 				echo '
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/' . $jquery_version . '/jquery.min.js" id="jquery"></script>',
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/' . $jquery_version.'/jquery.min.js" id="jquery"></script>',
 				(!empty($modSettings['jquery_include_ui']) ? '
-	<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/' . $jqueryui_version . '/jquery-ui.min.js" id="jqueryui"></script>' : '');
+	<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/' . $jqueryui_version.'/jquery-ui.min.js" id="jqueryui"></script>' : '');
 				break;
 			// Just use the local file
 			case 'local':
 				echo '
-	<script src="', $settings['default_theme_url'], '/scripts/jquery-' . $jquery_version . '.min.js" id="jquery"></script>',
+	<script src="', $settings['default_theme_url'], '/scripts/jquery-'.$jquery_version.'.min.js" id="jquery"></script>',
 				(!empty($modSettings['jquery_include_ui']) ? '
-	<script src="' . $settings['default_theme_url'] . '/scripts/jquery-ui-' . $jqueryui_version . '.min.js" id="jqueryui"></script>' : '');
+	<script src="' . $settings['default_theme_url'].'/scripts/jquery-ui-'.$jqueryui_version.'.min.js" id="jqueryui"></script>' : '');
 				break;
 			// CDN with local fallback
 			case 'auto':
 				echo '
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/' . $jquery_version . '/jquery.min.js" id="jquery"></script>',
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/' . $jquery_version.'/jquery.min.js" id="jquery"></script>',
 				(!empty($modSettings['jquery_include_ui']) ? '
-	<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/' . $jqueryui_version . '/jquery-ui.min.js" id="jqueryui"></script>' : '');
+	<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/' . $jqueryui_version.'/jquery-ui.min.js" id="jqueryui"></script>' : '');
 				echo '
 	<script><!-- // --><![CDATA[
-		window.jQuery || document.write(\'<script src="', $settings['default_theme_url'], '/scripts/jquery-' . $jquery_version . '.min.js"><\/script>\');',
+		window.jQuery || document.write(\'<script src="', $settings['default_theme_url'], '/scripts/jquery-'.$jquery_version.'.min.js"><\/script>\');',
 				(!empty($modSettings['jquery_include_ui']) ? '
-		window.jQuery.ui || document.write(\'<script src="' . $settings['default_theme_url'] . '/scripts/jquery-ui-' . $jqueryui_version . '.min.js"><\/script>\')' : ''), '
+		window.jQuery.ui || document.write(\'<script src="' . $settings['default_theme_url'].'/scripts/jquery-ui-'.$jqueryui_version.'.min.js"><\/script>\')' : ''), '
 	// ]]></script>';
 				break;
 		}
@@ -235,7 +235,7 @@ 
 		// Combine and minify javascript source files to save bandwidth and requests
 		if (!empty($modSettings['minify_css_js']))
 		{
-			$combiner = new \Site_Combiner(CACHEDIR, $boardurl . '/cache');
+			$combiner = new \Site_Combiner(CACHEDIR, $boardurl.'/cache');
 			$combine_name = $combiner->site_js_combine($this->js_files, $do_deferred);
 
 			call_integration_hook('post_javascript_combine', array(&$combine_name, $combiner));
@@ -305,10 +305,10 @@ 
 		if (!empty($this->js_vars) && !$do_deferred)
 		{
 			foreach ($this->js_vars as $var => $value)
-				$js_vars[] = $var . ' = ' . $value;
+				$js_vars[] = $var.' = '.$value;
 
 			// Newlines and tabs are here to make it look nice in the page source view, stripped if minimized though
-			$this->js_inline['standard'][] = 'var ' . implode(",\n\t\t\t", $js_vars) . ';';
+			$this->js_inline['standard'][] = 'var '.implode(",\n\t\t\t", $js_vars).';';
 		}
 
 		// Inline JavaScript - Actually useful some times!
@@ -360,7 +360,7 @@ 
 		{
 			if (!empty($modSettings['minify_css_js']))
 			{
-				$combiner = new \Site_Combiner(CACHEDIR, $boardurl . '/cache');
+				$combiner = new \Site_Combiner(CACHEDIR, $boardurl.'/cache');
 				$combine_name = $combiner->site_css_combine($this->css_files);
 
 				call_integration_hook('post_css_combine', array(&$combine_name, $combiner));
@@ -396,7 +396,7 @@ 
 		{
 			if (!empty($this->css_rules['all']))
 			{
-				$style_tag .=  '
+				$style_tag .= '
 	' . $this->css_rules['all'];
 			}
 			if (!empty($this->css_rules['media']))
@@ -404,8 +404,8 @@ 
 				foreach ($this->css_rules['media'] as $key => $val)
 				{
 					$style_tag .= '
-	@media ' . $key . '{
-		' . $val . '
+	@media ' . $key.'{
+		' . $val.'
 	}';
 				}
 			}
@@ -414,7 +414,7 @@ 
 		if (!empty($style_tag))
 		{
 			echo '
-	<style>' . $style_tag . '
+	<style>' . $style_tag.'
 	</style>';
 		}
 	}
@@ -490,12 +490,12 @@ 
 		{
 			addInlineJavascript('
 			var oEmbedtext = ({
-				preview_image : ' . JavaScriptEscape($txt['preview_image']) . ',
-				ctp_video : ' . JavaScriptEscape($txt['ctp_video']) . ',
-				hide_video : ' . JavaScriptEscape($txt['hide_video']) . ',
-				youtube : ' . JavaScriptEscape($txt['youtube']) . ',
-				vimeo : ' . JavaScriptEscape($txt['vimeo']) . ',
-				dailymotion : ' . JavaScriptEscape($txt['dailymotion']) . '
+				preview_image : ' . JavaScriptEscape($txt['preview_image']).',
+				ctp_video : ' . JavaScriptEscape($txt['ctp_video']).',
+				hide_video : ' . JavaScriptEscape($txt['hide_video']).',
+				youtube : ' . JavaScriptEscape($txt['youtube']).',
+				vimeo : ' . JavaScriptEscape($txt['vimeo']).',
+				dailymotion : ' . JavaScriptEscape($txt['dailymotion']).'
 			});', true);
 
 			loadJavascriptFile('elk_jquery_embed.js', array('defer' => true));
@@ -534,7 +534,7 @@ 
 		function elkAutoTask()
 		{
 			var tempImage = new Image();
-			tempImage.src = elk_scripturl + "?scheduled=' . $type . ';ts=' . $ts . '";
+			tempImage.src = elk_scripturl + "?scheduled=' . $type.';ts='.$ts.'";
 		}
 		window.setTimeout("elkAutoTask();", 1);', true);
 		}
@@ -552,20 +552,20 @@ 
 		{
 			addInlineJavascript('
 			var oRttime = ({
-				referenceTime : ' . forum_time() * 1000 . ',
-				now : ' . JavaScriptEscape($txt['rt_now']) . ',
-				minute : ' . JavaScriptEscape($txt['rt_minute']) . ',
-				minutes : ' . JavaScriptEscape($txt['rt_minutes']) . ',
-				hour : ' . JavaScriptEscape($txt['rt_hour']) . ',
-				hours : ' . JavaScriptEscape($txt['rt_hours']) . ',
-				day : ' . JavaScriptEscape($txt['rt_day']) . ',
-				days : ' . JavaScriptEscape($txt['rt_days']) . ',
-				week : ' . JavaScriptEscape($txt['rt_week']) . ',
-				weeks : ' . JavaScriptEscape($txt['rt_weeks']) . ',
-				month : ' . JavaScriptEscape($txt['rt_month']) . ',
-				months : ' . JavaScriptEscape($txt['rt_months']) . ',
-				year : ' . JavaScriptEscape($txt['rt_year']) . ',
-				years : ' . JavaScriptEscape($txt['rt_years']) . ',
+				referenceTime : ' . forum_time() * 1000.',
+				now : ' . JavaScriptEscape($txt['rt_now']).',
+				minute : ' . JavaScriptEscape($txt['rt_minute']).',
+				minutes : ' . JavaScriptEscape($txt['rt_minutes']).',
+				hour : ' . JavaScriptEscape($txt['rt_hour']).',
+				hours : ' . JavaScriptEscape($txt['rt_hours']).',
+				day : ' . JavaScriptEscape($txt['rt_day']).',
+				days : ' . JavaScriptEscape($txt['rt_days']).',
+				week : ' . JavaScriptEscape($txt['rt_week']).',
+				weeks : ' . JavaScriptEscape($txt['rt_weeks']).',
+				month : ' . JavaScriptEscape($txt['rt_month']).',
+				months : ' . JavaScriptEscape($txt['rt_months']).',
+				year : ' . JavaScriptEscape($txt['rt_year']).',
+				years : ' . JavaScriptEscape($txt['rt_years']).',
 			});
 			updateRelativeTime();', true);
 
@@ -694,8 +694,8 @@ 
 			addInlineJavascript('
 			$(document).ready(function(){
 				new smc_Popup({
-					heading: ' . JavaScriptEscape($txt['show_personal_messages_heading']) . ',
-					content: ' . JavaScriptEscape(sprintf($txt['show_personal_messages'], $context['user']['unread_messages'], $scripturl . '?action=pm')) . ',
+					heading: ' . JavaScriptEscape($txt['show_personal_messages_heading']).',
+					content: ' . JavaScriptEscape(sprintf($txt['show_personal_messages'], $context['user']['unread_messages'], $scripturl.'?action=pm')).',
 					icon: elk_images_url + \'/im_sm_newmsg.png\'
 				});
 			});', true);
@@ -705,8 +705,8 @@ 
 		$context['common_stats']['latest_member'] = array(
 			'id' => $modSettings['latestMember'],
 			'name' => $modSettings['latestRealName'],
-			'href' => $scripturl . '?action=profile;u=' . $modSettings['latestMember'],
-			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $modSettings['latestMember'] . '">' . $modSettings['latestRealName'] . '</a>',
+			'href' => $scripturl.'?action=profile;u='.$modSettings['latestMember'],
+			'link' => '<a href="'.$scripturl.'?action=profile;u='.$modSettings['latestMember'].'">'.$modSettings['latestRealName'].'</a>',
 		);
 
 		$context['common_stats'] = array(
@@ -720,7 +720,7 @@ 
 
 		if (empty($settings['theme_version']))
 		{
-			addJavascriptVar(array('elk_scripturl' => '\'' . $scripturl . '\''));
+			addJavascriptVar(array('elk_scripturl' => '\''.$scripturl.'\''));
 		}
 
 		if (!isset($context['page_title']))
@@ -729,17 +729,17 @@ 
 		}
 
 		// Set some specific vars.
-		$context['page_title_html_safe'] = \Util::htmlspecialchars(un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
+		$context['page_title_html_safe'] = \Util::htmlspecialchars(un_htmlspecialchars($context['page_title'])).(!empty($context['current_page']) ? ' - '.$txt['page'].' '.($context['current_page'] + 1) : '');
 
 		// Load a custom CSS file?
-		if (file_exists($settings['theme_dir'] . '/css/custom.css'))
+		if (file_exists($settings['theme_dir'].'/css/custom.css'))
 		{
 			loadCSSFile('custom.css');
 		}
 
-		if (!empty($context['theme_variant']) && file_exists($settings['theme_dir'] . '/css/' . $context['theme_variant'] . '/custom' . $context['theme_variant'] . '.css'))
+		if (!empty($context['theme_variant']) && file_exists($settings['theme_dir'].'/css/'.$context['theme_variant'].'/custom'.$context['theme_variant'].'.css'))
 		{
-			loadCSSFile($context['theme_variant'] . '/custom' . $context['theme_variant'] . '.css');
+			loadCSSFile($context['theme_variant'].'/custom'.$context['theme_variant'].'.css');
 		}
 
 		// Since it's nice to have avatars all of the same size, and in some cases the size detection may fail,
@@ -751,8 +751,8 @@ 
 		{
 			theme()->addCSSRules('
 		.avatarresize {' . (!empty($modSettings['avatar_max_width']) ? '
-			max-width:' . $modSettings['avatar_max_width'] . 'px;' : '') . (!empty($modSettings['avatar_max_height']) ? '
-			max-height:' . $modSettings['avatar_max_height'] . 'px;' : '') . '
+			max-width:' . $modSettings['avatar_max_width'].'px;' : '').(!empty($modSettings['avatar_max_height']) ? '
+			max-height:' . $modSettings['avatar_max_height'].'px;' : '').'
 		}');
 		}
 
@@ -760,7 +760,7 @@ 
 		if (!empty($settings['forum_width']))
 		{
 			theme()->addCSSRules('
-		.wrapper {width: ' . $settings['forum_width'] . ';}');
+		.wrapper {width: ' . $settings['forum_width'].';}');
 		}
 	}
 
@@ -797,7 +797,7 @@ 
 		if ($context['allow_moderation_center'])
 		{
 			// Get the numbers for the menu ...
-			require_once(SUBSDIR . '/Moderation.subs.php');
+			require_once(SUBSDIR.'/Moderation.subs.php');
 			$menu_count = loadModeratorMenuCounts();
 		}
 
@@ -805,10 +805,10 @@ 
 		$menu_count['mentions'] = $context['user']['mentions'];
 
 		// All the buttons we can possible want and then some, try pulling the final list of buttons from cache first.
-		if (($menu_buttons = cache_get_data('menu_buttons-' . implode('_', $user_info['groups']) . '-' . $user_info['language'], $cacheTime)) === null || time() - $cacheTime <= $modSettings['settings_updated'])
+		if (($menu_buttons = cache_get_data('menu_buttons-'.implode('_', $user_info['groups']).'-'.$user_info['language'], $cacheTime)) === null || time() - $cacheTime <= $modSettings['settings_updated'])
 		{
 			// Start things up: this is what we know by default
-			require_once(SUBSDIR . '/Menu.subs.php');
+			require_once(SUBSDIR.'/Menu.subs.php');
 			$buttons = array(
 				'home' => array(
 					'title' => $txt['community'],
@@ -818,37 +818,37 @@ 
 					'sub_buttons' => array(
 						'help' => array(
 							'title' => $txt['help'],
-							'href' => $scripturl . '?action=help',
+							'href' => $scripturl.'?action=help',
 							'show' => true,
 						),
 						'search' => array(
 							'title' => $txt['search'],
-							'href' => $scripturl . '?action=search',
+							'href' => $scripturl.'?action=search',
 							'show' => $context['allow_search'],
 						),
 						'calendar' => array(
 							'title' => $txt['calendar'],
-							'href' => $scripturl . '?action=calendar',
+							'href' => $scripturl.'?action=calendar',
 							'show' => $context['allow_calendar'],
 						),
 						'memberlist' => array(
 							'title' => $txt['members_title'],
-							'href' => $scripturl . '?action=memberlist',
+							'href' => $scripturl.'?action=memberlist',
 							'show' => $context['allow_memberlist'],
 						),
 						'recent' => array(
 							'title' => $txt['recent_posts'],
-							'href' => $scripturl . '?action=recent',
+							'href' => $scripturl.'?action=recent',
 							'show' => true,
 						),
 						'like_stats' => array(
 							'title' => $txt['like_post_stats'],
-							'href' => $scripturl . '?action=likes;sa=likestats',
+							'href' => $scripturl.'?action=likes;sa=likestats',
 							'show' => allowedTo('like_posts_stats'),
 						),
 						'contact' => array(
 							'title' => $txt['contact'],
-							'href' => $scripturl . '?action=register;sa=contact',
+							'href' => $scripturl.'?action=register;sa=contact',
 							'show' => $user_info['is_guest'] && !empty($modSettings['enable_contactform']) && $modSettings['enable_contactform'] == 'menu',
 						),
 					),
@@ -862,68 +862,68 @@ 
 				$buttons['admin'] = array(
 					'title' => $context['current_action'] !== 'moderate' ? $txt['admin'] : $txt['moderate'],
 					'counter' => 'grand_total',
-					'href' => $scripturl . '?action=admin',
+					'href' => $scripturl.'?action=admin',
 					'data-icon' => 'cog',
 					'show' => true,
 					'sub_buttons' => array(
 						'admin_center' => array(
 							'title' => $txt['admin_center'],
-							'href' => $scripturl . '?action=admin',
+							'href' => $scripturl.'?action=admin',
 							'show' => $context['allow_admin'],
 						),
 						'featuresettings' => array(
 							'title' => $txt['modSettings_title'],
-							'href' => $scripturl . '?action=admin;area=featuresettings',
+							'href' => $scripturl.'?action=admin;area=featuresettings',
 							'show' => allowedTo('admin_forum'),
 						),
 						'packages' => array(
 							'title' => $txt['package'],
-							'href' => $scripturl . '?action=admin;area=packages',
+							'href' => $scripturl.'?action=admin;area=packages',
 							'show' => allowedTo('admin_forum'),
 						),
 						'permissions' => array(
 							'title' => $txt['edit_permissions'],
-							'href' => $scripturl . '?action=admin;area=permissions',
+							'href' => $scripturl.'?action=admin;area=permissions',
 							'show' => allowedTo('manage_permissions'),
 						),
 						'errorlog' => array(
 							'title' => $txt['errlog'],
-							'href' => $scripturl . '?action=admin;area=logs;sa=errorlog;desc',
+							'href' => $scripturl.'?action=admin;area=logs;sa=errorlog;desc',
 							'show' => allowedTo('admin_forum') && !empty($modSettings['enableErrorLogging']),
 						),
 						'moderate_sub' => array(
 							'title' => $txt['moderate'],
 							'counter' => 'grand_total',
-							'href' => $scripturl . '?action=moderate',
+							'href' => $scripturl.'?action=moderate',
 							'show' => $context['allow_moderation_center'],
 							'sub_buttons' => array(
 								'reports' => array(
 									'title' => $txt['mc_reported_posts'],
 									'counter' => 'reports',
-									'href' => $scripturl . '?action=moderate;area=reports',
+									'href' => $scripturl.'?action=moderate;area=reports',
 									'show' => !empty($user_info['mod_cache']) && $user_info['mod_cache']['bq'] != '0=1',
 								),
 								'modlog' => array(
 									'title' => $txt['modlog_view'],
-									'href' => $scripturl . '?action=moderate;area=modlog',
+									'href' => $scripturl.'?action=moderate;area=modlog',
 									'show' => !empty($modSettings['modlog_enabled']) && !empty($user_info['mod_cache']) && $user_info['mod_cache']['bq'] != '0=1',
 								),
 								'attachments' => array(
 									'title' => $txt['mc_unapproved_attachments'],
 									'counter' => 'attachments',
-									'href' => $scripturl . '?action=moderate;area=attachmod;sa=attachments',
+									'href' => $scripturl.'?action=moderate;area=attachmod;sa=attachments',
 									'show' => $modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap']),
 								),
 								'poststopics' => array(
 									'title' => $txt['mc_unapproved_poststopics'],
 									'counter' => 'postmod',
-									'href' => $scripturl . '?action=moderate;area=postmod;sa=posts',
+									'href' => $scripturl.'?action=moderate;area=postmod;sa=posts',
 									'show' => $modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap']),
 								),
 								'postbyemail' => array(
 									'title' => $txt['mc_emailerror'],
 									'counter' => 'emailmod',
-									'href' => $scripturl . '?action=admin;area=maillist;sa=emaillist',
+									'href' => $scripturl.'?action=admin;area=maillist;sa=emaillist',
 									'show' => !empty($modSettings['maillist_enabled']) && allowedTo('approve_emails'),
 								),
 							),
@@ -936,37 +936,37 @@ 
 				$buttons['admin'] = array(
 					'title' => $txt['moderate'],
 					'counter' => 'grand_total',
-					'href' => $scripturl . '?action=moderate',
+					'href' => $scripturl.'?action=moderate',
 					'data-icon' => 'cog',
 					'show' => $context['allow_moderation_center'],
 					'sub_buttons' => array(
 						'reports' => array(
 							'title' => $txt['mc_reported_posts'],
 							'counter' => 'reports',
-							'href' => $scripturl . '?action=moderate;area=reports',
+							'href' => $scripturl.'?action=moderate;area=reports',
 							'show' => !empty($user_info['mod_cache']) && $user_info['mod_cache']['bq'] != '0=1',
 						),
 						'modlog' => array(
 							'title' => $txt['modlog_view'],
-							'href' => $scripturl . '?action=moderate;area=modlog',
+							'href' => $scripturl.'?action=moderate;area=modlog',
 							'show' => !empty($modSettings['modlog_enabled']) && !empty($user_info['mod_cache']) && $user_info['mod_cache']['bq'] != '0=1',
 						),
 						'attachments' => array(
 							'title' => $txt['mc_unapproved_attachments'],
 							'counter' => 'attachments',
-							'href' => $scripturl . '?action=moderate;area=attachmod;sa=attachments',
+							'href' => $scripturl.'?action=moderate;area=attachmod;sa=attachments',
 							'show' => $modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap']),
 						),
 						'poststopics' => array(
 							'title' => $txt['mc_unapproved_poststopics'],
 							'counter' => 'postmod',
-							'href' => $scripturl . '?action=moderate;area=postmod;sa=posts',
+							'href' => $scripturl.'?action=moderate;area=postmod;sa=posts',
 							'show' => $modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap']),
 						),
 						'postbyemail' => array(
 							'title' => $txt['mc_emailerror'],
 							'counter' => 'emailmod',
-							'href' => $scripturl . '?action=admin;area=maillist;sa=emaillist',
+							'href' => $scripturl.'?action=admin;area=maillist;sa=emaillist',
 							'show' => !empty($modSettings['maillist_enabled']) && allowedTo('approve_emails'),
 						),
 					),
@@ -978,40 +978,40 @@ 
 				theme()->addCSSRules('
 	.i-account:before {
 		content: "";
-		background-image: url("' . $user_info['avatar']['href'] . '");
+		background-image: url("' . $user_info['avatar']['href'].'");
 	}');
 			}
 
 			$buttons += array(
 				'profile' => array(
 					'title' => !empty($modSettings['displayMemberNames']) ? $user_info['name'] : $txt['account_short'],
-					'href' => $scripturl . '?action=profile',
+					'href' => $scripturl.'?action=profile',
 					'data-icon' => 'account',
 					'show' => $context['allow_edit_profile'],
 					'sub_buttons' => array(
 						'account' => array(
 							'title' => $txt['account'],
-							'href' => $scripturl . '?action=profile;area=account',
+							'href' => $scripturl.'?action=profile;area=account',
 							'show' => allowedTo(array('profile_identity_any', 'profile_identity_own', 'manage_membergroups')),
 						),
 						'drafts' => array(
 							'title' => $txt['mydrafts'],
-							'href' => $scripturl . '?action=profile;area=showdrafts',
+							'href' => $scripturl.'?action=profile;area=showdrafts',
 							'show' => !empty($modSettings['drafts_enabled']) && !empty($modSettings['drafts_post_enabled']) && allowedTo('post_draft'),
 						),
 						'forumprofile' => array(
 							'title' => $txt['forumprofile'],
-							'href' => $scripturl . '?action=profile;area=forumprofile',
+							'href' => $scripturl.'?action=profile;area=forumprofile',
 							'show' => allowedTo(array('profile_extra_any', 'profile_extra_own')),
 						),
 						'theme' => array(
 							'title' => $txt['theme'],
-							'href' => $scripturl . '?action=profile;area=theme',
+							'href' => $scripturl.'?action=profile;area=theme',
 							'show' => allowedTo(array('profile_extra_any', 'profile_extra_own', 'profile_extra_any')),
 						),
 						'logout' => array(
 							'title' => $txt['logout'],
-							'href' => $scripturl . '?action=logout',
+							'href' => $scripturl.'?action=logout',
 							'show' => !$user_info['is_guest'],
 						),
 					),
@@ -1021,18 +1021,18 @@ 
 				'pm' => array(
 					'title' => $txt['pm_short'],
 					'counter' => 'unread_messages',
-					'href' => $scripturl . '?action=pm',
+					'href' => $scripturl.'?action=pm',
 					'data-icon' => ($context['user']['unread_messages'] ? 'envelope' : 'envelope-blank'),
 					'show' => $context['allow_pm'],
 					'sub_buttons' => array(
 						'pm_read' => array(
 							'title' => $txt['pm_menu_read'],
-							'href' => $scripturl . '?action=pm',
+							'href' => $scripturl.'?action=pm',
 							'show' => allowedTo('pm_read'),
 						),
 						'pm_send' => array(
 							'title' => $txt['pm_menu_send'],
-							'href' => $scripturl . '?action=pm;sa=send',
+							'href' => $scripturl.'?action=pm;sa=send',
 							'show' => allowedTo('pm_send'),
 						),
 					),
@@ -1040,7 +1040,7 @@ 
 				'mentions' => array(
 					'title' => $txt['mention'],
 					'counter' => 'mentions',
-					'href' => $scripturl . '?action=mentions',
+					'href' => $scripturl.'?action=mentions',
 					'data-icon' => ($context['user']['mentions'] ? 'bell' : 'bell-blank'),
 					'show' => !$user_info['is_guest'] && !empty($modSettings['mentions_enabled']),
 				),
@@ -1049,7 +1049,7 @@ 
 				// of old unread posts, and they wont be reached from this button.
 				'unread' => array(
 					'title' => $txt['view_unread_category'],
-					'href' => $scripturl . '?action=unread',
+					'href' => $scripturl.'?action=unread',
 					'data-icon' => 'comments',
 					'show' => !$user_info['is_guest'],
 				),
@@ -1058,20 +1058,20 @@ 
 				// that the user has never posted in and doesn't care about.
 				'unreadreplies' => array(
 					'title' => $txt['view_replies_category'],
-					'href' => $scripturl . '?action=unreadreplies',
+					'href' => $scripturl.'?action=unreadreplies',
 					'data-icon' => 'comments-blank',
 					'show' => !$user_info['is_guest'],
 				),
 				'login' => array(
 					'title' => $txt['login'],
-					'href' => $scripturl . '?action=login',
+					'href' => $scripturl.'?action=login',
 					'data-icon' => 'sign-in',
 					'show' => $user_info['is_guest'],
 				),
 
 				'register' => array(
 					'title' => $txt['register'],
-					'href' => $scripturl . '?action=register',
+					'href' => $scripturl.'?action=register',
 					'data-icon' => 'register',
 					'show' => $user_info['is_guest'] && $context['can_register'],
 				),
@@ -1096,7 +1096,7 @@ 
 
 					if (isset($button['counter']) && !empty($menu_count[$button['counter']]))
 					{
-						$button['alttitle'] = $button['title'] . ' [' . $menu_count[$button['counter']] . ']';
+						$button['alttitle'] = $button['title'].' ['.$menu_count[$button['counter']].']';
 						if (!empty($settings['menu_numeric_notice'][0]))
 						{
 							$button['title'] .= sprintf($settings['menu_numeric_notice'][0], $menu_count[$button['counter']]);
@@ -1115,7 +1115,7 @@ 
 							}
 							elseif (isset($subbutton['counter']) && !empty($menu_count[$subbutton['counter']]))
 							{
-								$button['sub_buttons'][$key]['alttitle'] = $subbutton['title'] . ' [' . $menu_count[$subbutton['counter']] . ']';
+								$button['sub_buttons'][$key]['alttitle'] = $subbutton['title'].' ['.$menu_count[$subbutton['counter']].']';
 								if (!empty($settings['menu_numeric_notice'][1]))
 								{
 									$button['sub_buttons'][$key]['title'] .= sprintf($settings['menu_numeric_notice'][1], $menu_count[$subbutton['counter']]);
@@ -1133,7 +1133,7 @@ 
 										}
 										elseif (isset($subbutton2['counter']) && !empty($menu_count[$subbutton2['counter']]))
 										{
-											$button['sub_buttons'][$key]['sub_buttons'][$key2]['alttitle'] = $subbutton2['title'] . ' [' . $menu_count[$subbutton2['counter']] . ']';
+											$button['sub_buttons'][$key]['sub_buttons'][$key2]['alttitle'] = $subbutton2['title'].' ['.$menu_count[$subbutton2['counter']].']';
 											if (!empty($settings['menu_numeric_notice'][2]))
 											{
 												$button['sub_buttons'][$key]['sub_buttons'][$key2]['title'] .= sprintf($settings['menu_numeric_notice'][2], $menu_count[$subbutton2['counter']]);
@@ -1152,13 +1152,13 @@ 
 
 			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
 			{
-				cache_put_data('menu_buttons-' . implode('_', $user_info['groups']) . '-' . $user_info['language'], $menu_buttons, $cacheTime);
+				cache_put_data('menu_buttons-'.implode('_', $user_info['groups']).'-'.$user_info['language'], $menu_buttons, $cacheTime);
 			}
 		}
 
 		if (!empty($menu_buttons['profile']['sub_buttons']['logout']))
 		{
-			$menu_buttons['profile']['sub_buttons']['logout']['href'] .= ';' . $context['session_var'] . '=' . $context['session_id'];
+			$menu_buttons['profile']['sub_buttons']['logout']['href'] .= ';'.$context['session_var'].'='.$context['session_id'];
 		}
 
 		$context['menu_buttons'] = $menu_buttons;
@@ -1220,7 +1220,7 @@ 
 				'elk_default_theme_url' => JavaScriptEscape($settings['default_theme_url']),
 				'elk_images_url' => JavaScriptEscape($settings['images_url']),
 				'elk_smiley_url' => JavaScriptEscape($modSettings['smileys_url']),
-				'elk_scripturl' => '\'' . $scripturl . '\'',
+				'elk_scripturl' => '\''.$scripturl.'\'',
 				'elk_iso_case_folding' => detectServer()->is('iso_case_folding') ? 'true' : 'false',
 				'elk_charset' => '"UTF-8"',
 				'elk_session_id' => JavaScriptEscape($context['session_id']),
@@ -1350,13 +1350,13 @@ 
 		}
 
 		// Do this to keep things easier in the templates.
-		$context['theme_variant'] = '_' . $context['theme_variant'];
-		$context['theme_variant_url'] = $context['theme_variant'] . '/';
+		$context['theme_variant'] = '_'.$context['theme_variant'];
+		$context['theme_variant_url'] = $context['theme_variant'].'/';
 
 		// The most efficient way of writing multi themes is to use a master index.css plus variant.css files.
 		if (!empty($context['theme_variant']))
 		{
-			loadCSSFile($context['theme_variant'] . '/index' . $context['theme_variant'] . '.css');
+			loadCSSFile($context['theme_variant'].'/index'.$context['theme_variant'].'.css');
 		}
 	}
 }
\ No newline at end of file