Completed
Pull Request — development (#2514)
by Thorsten
13:19
created
themes/default/Theme.php 1 patch
Spacing   +103 added lines, -103 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 		if (empty($context['no_last_modified']))
62 62
 		{
63 63
 			header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
64
-			header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
64
+			header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
65 65
 
66 66
 			// Are we debugging the template/html content?
67 67
 			if ((!isset($_REQUEST['xml']) || !isset($_REQUEST['api'])) && isset($_GET['debug']) && !isBrowser('ie'))
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 		}
90 90
 
91 91
 		foreach (\Template_Layers::getInstance()->prepareContext() as $layer)
92
-			loadSubTemplate($layer . '_above', 'ignore');
92
+			loadSubTemplate($layer.'_above', 'ignore');
93 93
 
94 94
 		if (isset($settings['use_default_images']) && $settings['use_default_images'] == 'defaults' && isset($settings['default_template']))
95 95
 		{
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 
143 143
 		foreach (\Template_Layers::getInstance()->reverseLayers() as $layer)
144 144
 		{
145
-			loadSubTemplate($layer . '_below', 'ignore');
145
+			loadSubTemplate($layer.'_below', 'ignore');
146 146
 		}
147 147
 	}
148 148
 
@@ -164,28 +164,28 @@  discard block
 block discarded – undo
164 164
 			// Only getting the files from the CDN?
165 165
 			case 'cdn':
166 166
 				echo '
167
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/' . $jquery_version . '/jquery.min.js" id="jquery"></script>',
167
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/' . $jquery_version.'/jquery.min.js" id="jquery"></script>',
168 168
 				(!empty($modSettings['jquery_include_ui']) ? '
169
-	<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/' . $jqueryui_version . '/jquery-ui.min.js" id="jqueryui"></script>' : '');
169
+	<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/' . $jqueryui_version.'/jquery-ui.min.js" id="jqueryui"></script>' : '');
170 170
 				break;
171 171
 			// Just use the local file
172 172
 			case 'local':
173 173
 				echo '
174
-	<script src="', $settings['default_theme_url'], '/scripts/jquery-' . $jquery_version . '.min.js" id="jquery"></script>',
174
+	<script src="', $settings['default_theme_url'], '/scripts/jquery-'.$jquery_version.'.min.js" id="jquery"></script>',
175 175
 				(!empty($modSettings['jquery_include_ui']) ? '
176
-	<script src="' . $settings['default_theme_url'] . '/scripts/jquery-ui-' . $jqueryui_version . '.min.js" id="jqueryui"></script>' : '');
176
+	<script src="' . $settings['default_theme_url'].'/scripts/jquery-ui-'.$jqueryui_version.'.min.js" id="jqueryui"></script>' : '');
177 177
 				break;
178 178
 			// CDN with local fallback
179 179
 			case 'auto':
180 180
 				echo '
181
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/' . $jquery_version . '/jquery.min.js" id="jquery"></script>',
181
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/' . $jquery_version.'/jquery.min.js" id="jquery"></script>',
182 182
 				(!empty($modSettings['jquery_include_ui']) ? '
183
-	<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/' . $jqueryui_version . '/jquery-ui.min.js" id="jqueryui"></script>' : '');
183
+	<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/' . $jqueryui_version.'/jquery-ui.min.js" id="jqueryui"></script>' : '');
184 184
 				echo '
185 185
 	<script><!-- // --><![CDATA[
186
-		window.jQuery || document.write(\'<script src="', $settings['default_theme_url'], '/scripts/jquery-' . $jquery_version . '.min.js"><\/script>\');',
186
+		window.jQuery || document.write(\'<script src="', $settings['default_theme_url'], '/scripts/jquery-'.$jquery_version.'.min.js"><\/script>\');',
187 187
 				(!empty($modSettings['jquery_include_ui']) ? '
188
-		window.jQuery.ui || document.write(\'<script src="' . $settings['default_theme_url'] . '/scripts/jquery-ui-' . $jqueryui_version . '.min.js"><\/script>\')' : ''), '
188
+		window.jQuery.ui || document.write(\'<script src="' . $settings['default_theme_url'].'/scripts/jquery-ui-'.$jqueryui_version.'.min.js"><\/script>\')' : ''), '
189 189
 	// ]]></script>';
190 190
 				break;
191 191
 		}
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 		// Combine and minify javascript source files to save bandwidth and requests
207 207
 		if (!empty($modSettings['minify_css_js']))
208 208
 		{
209
-			$combiner = new \Site_Combiner(CACHEDIR, $boardurl . '/cache');
209
+			$combiner = new \Site_Combiner(CACHEDIR, $boardurl.'/cache');
210 210
 			$combine_name = $combiner->site_js_combine($this->js_files, $do_deferred);
211 211
 
212 212
 			call_integration_hook('post_javascript_combine', array(&$combine_name, $combiner));
@@ -276,10 +276,10 @@  discard block
 block discarded – undo
276 276
 		if (!empty($this->js_vars) && !$do_deferred)
277 277
 		{
278 278
 			foreach ($this->js_vars as $var => $value)
279
-				$js_vars[] = $var . ' = ' . $value;
279
+				$js_vars[] = $var.' = '.$value;
280 280
 
281 281
 			// Newlines and tabs are here to make it look nice in the page source view, stripped if minimized though
282
-			$this->js_inline['standard'][] = 'var ' . implode(",\n\t\t\t", $js_vars) . ';';
282
+			$this->js_inline['standard'][] = 'var '.implode(",\n\t\t\t", $js_vars).';';
283 283
 		}
284 284
 
285 285
 		// Inline JavaScript - Actually useful some times!
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 		{
332 332
 			if (!empty($modSettings['minify_css_js']))
333 333
 			{
334
-				$combiner = new \Site_Combiner(CACHEDIR, $boardurl . '/cache');
334
+				$combiner = new \Site_Combiner(CACHEDIR, $boardurl.'/cache');
335 335
 				$combine_name = $combiner->site_css_combine($this->css_files);
336 336
 
337 337
 				call_integration_hook('post_css_combine', array(&$combine_name, $combiner));
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
 		{
368 368
 			if (!empty($this->css_rules['all']))
369 369
 			{
370
-				$style_tag .=  '
370
+				$style_tag .= '
371 371
 	' . $this->css_rules['all'];
372 372
 			}
373 373
 			if (!empty($this->css_rules['media']))
@@ -375,8 +375,8 @@  discard block
 block discarded – undo
375 375
 				foreach ($this->css_rules['media'] as $key => $val)
376 376
 				{
377 377
 					$style_tag .= '
378
-	@media ' . $key . '{
379
-		' . $val . '
378
+	@media ' . $key.'{
379
+		' . $val.'
380 380
 	}';
381 381
 				}
382 382
 			}
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
 		if (!empty($style_tag))
386 386
 		{
387 387
 			echo '
388
-	<style>' . $style_tag . '
388
+	<style>' . $style_tag.'
389 389
 	</style>';
390 390
 		}
391 391
 	}
@@ -461,12 +461,12 @@  discard block
 block discarded – undo
461 461
 		{
462 462
 			addInlineJavascript('
463 463
 			var oEmbedtext = ({
464
-				preview_image : ' . JavaScriptEscape($txt['preview_image']) . ',
465
-				ctp_video : ' . JavaScriptEscape($txt['ctp_video']) . ',
466
-				hide_video : ' . JavaScriptEscape($txt['hide_video']) . ',
467
-				youtube : ' . JavaScriptEscape($txt['youtube']) . ',
468
-				vimeo : ' . JavaScriptEscape($txt['vimeo']) . ',
469
-				dailymotion : ' . JavaScriptEscape($txt['dailymotion']) . '
464
+				preview_image : ' . JavaScriptEscape($txt['preview_image']).',
465
+				ctp_video : ' . JavaScriptEscape($txt['ctp_video']).',
466
+				hide_video : ' . JavaScriptEscape($txt['hide_video']).',
467
+				youtube : ' . JavaScriptEscape($txt['youtube']).',
468
+				vimeo : ' . JavaScriptEscape($txt['vimeo']).',
469
+				dailymotion : ' . JavaScriptEscape($txt['dailymotion']).'
470 470
 			});', true);
471 471
 
472 472
 			loadJavascriptFile('elk_jquery_embed.js', array('defer' => true));
@@ -505,7 +505,7 @@  discard block
 block discarded – undo
505 505
 		function elkAutoTask()
506 506
 		{
507 507
 			var tempImage = new Image();
508
-			tempImage.src = elk_scripturl + "?scheduled=' . $type . ';ts=' . $ts . '";
508
+			tempImage.src = elk_scripturl + "?scheduled=' . $type.';ts='.$ts.'";
509 509
 		}
510 510
 		window.setTimeout("elkAutoTask();", 1);', true);
511 511
 		}
@@ -523,20 +523,20 @@  discard block
 block discarded – undo
523 523
 		{
524 524
 			addInlineJavascript('
525 525
 			var oRttime = ({
526
-				referenceTime : ' . forum_time() * 1000 . ',
527
-				now : ' . JavaScriptEscape($txt['rt_now']) . ',
528
-				minute : ' . JavaScriptEscape($txt['rt_minute']) . ',
529
-				minutes : ' . JavaScriptEscape($txt['rt_minutes']) . ',
530
-				hour : ' . JavaScriptEscape($txt['rt_hour']) . ',
531
-				hours : ' . JavaScriptEscape($txt['rt_hours']) . ',
532
-				day : ' . JavaScriptEscape($txt['rt_day']) . ',
533
-				days : ' . JavaScriptEscape($txt['rt_days']) . ',
534
-				week : ' . JavaScriptEscape($txt['rt_week']) . ',
535
-				weeks : ' . JavaScriptEscape($txt['rt_weeks']) . ',
536
-				month : ' . JavaScriptEscape($txt['rt_month']) . ',
537
-				months : ' . JavaScriptEscape($txt['rt_months']) . ',
538
-				year : ' . JavaScriptEscape($txt['rt_year']) . ',
539
-				years : ' . JavaScriptEscape($txt['rt_years']) . ',
526
+				referenceTime : ' . forum_time() * 1000.',
527
+				now : ' . JavaScriptEscape($txt['rt_now']).',
528
+				minute : ' . JavaScriptEscape($txt['rt_minute']).',
529
+				minutes : ' . JavaScriptEscape($txt['rt_minutes']).',
530
+				hour : ' . JavaScriptEscape($txt['rt_hour']).',
531
+				hours : ' . JavaScriptEscape($txt['rt_hours']).',
532
+				day : ' . JavaScriptEscape($txt['rt_day']).',
533
+				days : ' . JavaScriptEscape($txt['rt_days']).',
534
+				week : ' . JavaScriptEscape($txt['rt_week']).',
535
+				weeks : ' . JavaScriptEscape($txt['rt_weeks']).',
536
+				month : ' . JavaScriptEscape($txt['rt_month']).',
537
+				months : ' . JavaScriptEscape($txt['rt_months']).',
538
+				year : ' . JavaScriptEscape($txt['rt_year']).',
539
+				years : ' . JavaScriptEscape($txt['rt_years']).',
540 540
 			});
541 541
 			updateRelativeTime();', true);
542 542
 
@@ -665,8 +665,8 @@  discard block
 block discarded – undo
665 665
 			addInlineJavascript('
666 666
 			$(document).ready(function(){
667 667
 				new smc_Popup({
668
-					heading: ' . JavaScriptEscape($txt['show_personal_messages_heading']) . ',
669
-					content: ' . JavaScriptEscape(sprintf($txt['show_personal_messages'], $context['user']['unread_messages'], $scripturl . '?action=pm')) . ',
668
+					heading: ' . JavaScriptEscape($txt['show_personal_messages_heading']).',
669
+					content: ' . JavaScriptEscape(sprintf($txt['show_personal_messages'], $context['user']['unread_messages'], $scripturl.'?action=pm')).',
670 670
 					icon: elk_images_url + \'/im_sm_newmsg.png\'
671 671
 				});
672 672
 			});', true);
@@ -676,8 +676,8 @@  discard block
 block discarded – undo
676 676
 		$context['common_stats']['latest_member'] = array(
677 677
 			'id' => $modSettings['latestMember'],
678 678
 			'name' => $modSettings['latestRealName'],
679
-			'href' => $scripturl . '?action=profile;u=' . $modSettings['latestMember'],
680
-			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $modSettings['latestMember'] . '">' . $modSettings['latestRealName'] . '</a>',
679
+			'href' => $scripturl.'?action=profile;u='.$modSettings['latestMember'],
680
+			'link' => '<a href="'.$scripturl.'?action=profile;u='.$modSettings['latestMember'].'">'.$modSettings['latestRealName'].'</a>',
681 681
 		);
682 682
 
683 683
 		$context['common_stats'] = array(
@@ -691,7 +691,7 @@  discard block
 block discarded – undo
691 691
 
692 692
 		if (empty($settings['theme_version']))
693 693
 		{
694
-			addJavascriptVar(array('elk_scripturl' => '\'' . $scripturl . '\''));
694
+			addJavascriptVar(array('elk_scripturl' => '\''.$scripturl.'\''));
695 695
 		}
696 696
 
697 697
 		if (!isset($context['page_title']))
@@ -700,17 +700,17 @@  discard block
 block discarded – undo
700 700
 		}
701 701
 
702 702
 		// Set some specific vars.
703
-		$context['page_title_html_safe'] = \Util::htmlspecialchars(un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
703
+		$context['page_title_html_safe'] = \Util::htmlspecialchars(un_htmlspecialchars($context['page_title'])).(!empty($context['current_page']) ? ' - '.$txt['page'].' '.($context['current_page'] + 1) : '');
704 704
 
705 705
 		// Load a custom CSS file?
706
-		if (file_exists($settings['theme_dir'] . '/css/custom.css'))
706
+		if (file_exists($settings['theme_dir'].'/css/custom.css'))
707 707
 		{
708 708
 			loadCSSFile('custom.css');
709 709
 		}
710 710
 
711
-		if (!empty($context['theme_variant']) && file_exists($settings['theme_dir'] . '/css/' . $context['theme_variant'] . '/custom' . $context['theme_variant'] . '.css'))
711
+		if (!empty($context['theme_variant']) && file_exists($settings['theme_dir'].'/css/'.$context['theme_variant'].'/custom'.$context['theme_variant'].'.css'))
712 712
 		{
713
-			loadCSSFile($context['theme_variant'] . '/custom' . $context['theme_variant'] . '.css');
713
+			loadCSSFile($context['theme_variant'].'/custom'.$context['theme_variant'].'.css');
714 714
 		}
715 715
 
716 716
 		// Since it's nice to have avatars all of the same size, and in some cases the size detection may fail,
@@ -722,8 +722,8 @@  discard block
 block discarded – undo
722 722
 		{
723 723
 			theme()->addCSSRules('
724 724
 		.avatarresize {' . (!empty($modSettings['avatar_max_width']) ? '
725
-			max-width:' . $modSettings['avatar_max_width'] . 'px;' : '') . (!empty($modSettings['avatar_max_height']) ? '
726
-			max-height:' . $modSettings['avatar_max_height'] . 'px;' : '') . '
725
+			max-width:' . $modSettings['avatar_max_width'].'px;' : '').(!empty($modSettings['avatar_max_height']) ? '
726
+			max-height:' . $modSettings['avatar_max_height'].'px;' : '').'
727 727
 		}');
728 728
 		}
729 729
 
@@ -731,7 +731,7 @@  discard block
 block discarded – undo
731 731
 		if (!empty($settings['forum_width']))
732 732
 		{
733 733
 			theme()->addCSSRules('
734
-		.wrapper {width: ' . $settings['forum_width'] . ';}');
734
+		.wrapper {width: ' . $settings['forum_width'].';}');
735 735
 		}
736 736
 	}
737 737
 
@@ -768,7 +768,7 @@  discard block
 block discarded – undo
768 768
 		if ($context['allow_moderation_center'])
769 769
 		{
770 770
 			// Get the numbers for the menu ...
771
-			require_once(SUBSDIR . '/Moderation.subs.php');
771
+			require_once(SUBSDIR.'/Moderation.subs.php');
772 772
 			$menu_count = loadModeratorMenuCounts();
773 773
 		}
774 774
 
@@ -776,10 +776,10 @@  discard block
 block discarded – undo
776 776
 		$menu_count['mentions'] = $context['user']['mentions'];
777 777
 
778 778
 		// All the buttons we can possible want and then some, try pulling the final list of buttons from cache first.
779
-		if (($menu_buttons = cache_get_data('menu_buttons-' . implode('_', $user_info['groups']) . '-' . $user_info['language'], $cacheTime)) === null || time() - $cacheTime <= $modSettings['settings_updated'])
779
+		if (($menu_buttons = cache_get_data('menu_buttons-'.implode('_', $user_info['groups']).'-'.$user_info['language'], $cacheTime)) === null || time() - $cacheTime <= $modSettings['settings_updated'])
780 780
 		{
781 781
 			// Start things up: this is what we know by default
782
-			require_once(SUBSDIR . '/Menu.subs.php');
782
+			require_once(SUBSDIR.'/Menu.subs.php');
783 783
 			$buttons = array(
784 784
 				'home' => array(
785 785
 					'title' => $txt['community'],
@@ -789,37 +789,37 @@  discard block
 block discarded – undo
789 789
 					'sub_buttons' => array(
790 790
 						'help' => array(
791 791
 							'title' => $txt['help'],
792
-							'href' => $scripturl . '?action=help',
792
+							'href' => $scripturl.'?action=help',
793 793
 							'show' => true,
794 794
 						),
795 795
 						'search' => array(
796 796
 							'title' => $txt['search'],
797
-							'href' => $scripturl . '?action=search',
797
+							'href' => $scripturl.'?action=search',
798 798
 							'show' => $context['allow_search'],
799 799
 						),
800 800
 						'calendar' => array(
801 801
 							'title' => $txt['calendar'],
802
-							'href' => $scripturl . '?action=calendar',
802
+							'href' => $scripturl.'?action=calendar',
803 803
 							'show' => $context['allow_calendar'],
804 804
 						),
805 805
 						'memberlist' => array(
806 806
 							'title' => $txt['members_title'],
807
-							'href' => $scripturl . '?action=memberlist',
807
+							'href' => $scripturl.'?action=memberlist',
808 808
 							'show' => $context['allow_memberlist'],
809 809
 						),
810 810
 						'recent' => array(
811 811
 							'title' => $txt['recent_posts'],
812
-							'href' => $scripturl . '?action=recent',
812
+							'href' => $scripturl.'?action=recent',
813 813
 							'show' => true,
814 814
 						),
815 815
 						'like_stats' => array(
816 816
 							'title' => $txt['like_post_stats'],
817
-							'href' => $scripturl . '?action=likes;sa=likestats',
817
+							'href' => $scripturl.'?action=likes;sa=likestats',
818 818
 							'show' => allowedTo('like_posts_stats'),
819 819
 						),
820 820
 						'contact' => array(
821 821
 							'title' => $txt['contact'],
822
-							'href' => $scripturl . '?action=register;sa=contact',
822
+							'href' => $scripturl.'?action=register;sa=contact',
823 823
 							'show' => $user_info['is_guest'] && !empty($modSettings['enable_contactform']) && $modSettings['enable_contactform'] == 'menu',
824 824
 						),
825 825
 					),
@@ -833,68 +833,68 @@  discard block
 block discarded – undo
833 833
 				$buttons['admin'] = array(
834 834
 					'title' => $context['current_action'] !== 'moderate' ? $txt['admin'] : $txt['moderate'],
835 835
 					'counter' => 'grand_total',
836
-					'href' => $scripturl . '?action=admin',
836
+					'href' => $scripturl.'?action=admin',
837 837
 					'data-icon' => 'cog',
838 838
 					'show' => true,
839 839
 					'sub_buttons' => array(
840 840
 						'admin_center' => array(
841 841
 							'title' => $txt['admin_center'],
842
-							'href' => $scripturl . '?action=admin',
842
+							'href' => $scripturl.'?action=admin',
843 843
 							'show' => $context['allow_admin'],
844 844
 						),
845 845
 						'featuresettings' => array(
846 846
 							'title' => $txt['modSettings_title'],
847
-							'href' => $scripturl . '?action=admin;area=featuresettings',
847
+							'href' => $scripturl.'?action=admin;area=featuresettings',
848 848
 							'show' => allowedTo('admin_forum'),
849 849
 						),
850 850
 						'packages' => array(
851 851
 							'title' => $txt['package'],
852
-							'href' => $scripturl . '?action=admin;area=packages',
852
+							'href' => $scripturl.'?action=admin;area=packages',
853 853
 							'show' => allowedTo('admin_forum'),
854 854
 						),
855 855
 						'permissions' => array(
856 856
 							'title' => $txt['edit_permissions'],
857
-							'href' => $scripturl . '?action=admin;area=permissions',
857
+							'href' => $scripturl.'?action=admin;area=permissions',
858 858
 							'show' => allowedTo('manage_permissions'),
859 859
 						),
860 860
 						'errorlog' => array(
861 861
 							'title' => $txt['errlog'],
862
-							'href' => $scripturl . '?action=admin;area=logs;sa=errorlog;desc',
862
+							'href' => $scripturl.'?action=admin;area=logs;sa=errorlog;desc',
863 863
 							'show' => allowedTo('admin_forum') && !empty($modSettings['enableErrorLogging']),
864 864
 						),
865 865
 						'moderate_sub' => array(
866 866
 							'title' => $txt['moderate'],
867 867
 							'counter' => 'grand_total',
868
-							'href' => $scripturl . '?action=moderate',
868
+							'href' => $scripturl.'?action=moderate',
869 869
 							'show' => $context['allow_moderation_center'],
870 870
 							'sub_buttons' => array(
871 871
 								'reports' => array(
872 872
 									'title' => $txt['mc_reported_posts'],
873 873
 									'counter' => 'reports',
874
-									'href' => $scripturl . '?action=moderate;area=reports',
874
+									'href' => $scripturl.'?action=moderate;area=reports',
875 875
 									'show' => !empty($user_info['mod_cache']) && $user_info['mod_cache']['bq'] != '0=1',
876 876
 								),
877 877
 								'modlog' => array(
878 878
 									'title' => $txt['modlog_view'],
879
-									'href' => $scripturl . '?action=moderate;area=modlog',
879
+									'href' => $scripturl.'?action=moderate;area=modlog',
880 880
 									'show' => !empty($modSettings['modlog_enabled']) && !empty($user_info['mod_cache']) && $user_info['mod_cache']['bq'] != '0=1',
881 881
 								),
882 882
 								'attachments' => array(
883 883
 									'title' => $txt['mc_unapproved_attachments'],
884 884
 									'counter' => 'attachments',
885
-									'href' => $scripturl . '?action=moderate;area=attachmod;sa=attachments',
885
+									'href' => $scripturl.'?action=moderate;area=attachmod;sa=attachments',
886 886
 									'show' => $modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap']),
887 887
 								),
888 888
 								'poststopics' => array(
889 889
 									'title' => $txt['mc_unapproved_poststopics'],
890 890
 									'counter' => 'postmod',
891
-									'href' => $scripturl . '?action=moderate;area=postmod;sa=posts',
891
+									'href' => $scripturl.'?action=moderate;area=postmod;sa=posts',
892 892
 									'show' => $modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap']),
893 893
 								),
894 894
 								'postbyemail' => array(
895 895
 									'title' => $txt['mc_emailerror'],
896 896
 									'counter' => 'emailmod',
897
-									'href' => $scripturl . '?action=admin;area=maillist;sa=emaillist',
897
+									'href' => $scripturl.'?action=admin;area=maillist;sa=emaillist',
898 898
 									'show' => !empty($modSettings['maillist_enabled']) && allowedTo('approve_emails'),
899 899
 								),
900 900
 							),
@@ -907,37 +907,37 @@  discard block
 block discarded – undo
907 907
 				$buttons['admin'] = array(
908 908
 					'title' => $txt['moderate'],
909 909
 					'counter' => 'grand_total',
910
-					'href' => $scripturl . '?action=moderate',
910
+					'href' => $scripturl.'?action=moderate',
911 911
 					'data-icon' => 'cog',
912 912
 					'show' => $context['allow_moderation_center'],
913 913
 					'sub_buttons' => array(
914 914
 						'reports' => array(
915 915
 							'title' => $txt['mc_reported_posts'],
916 916
 							'counter' => 'reports',
917
-							'href' => $scripturl . '?action=moderate;area=reports',
917
+							'href' => $scripturl.'?action=moderate;area=reports',
918 918
 							'show' => !empty($user_info['mod_cache']) && $user_info['mod_cache']['bq'] != '0=1',
919 919
 						),
920 920
 						'modlog' => array(
921 921
 							'title' => $txt['modlog_view'],
922
-							'href' => $scripturl . '?action=moderate;area=modlog',
922
+							'href' => $scripturl.'?action=moderate;area=modlog',
923 923
 							'show' => !empty($modSettings['modlog_enabled']) && !empty($user_info['mod_cache']) && $user_info['mod_cache']['bq'] != '0=1',
924 924
 						),
925 925
 						'attachments' => array(
926 926
 							'title' => $txt['mc_unapproved_attachments'],
927 927
 							'counter' => 'attachments',
928
-							'href' => $scripturl . '?action=moderate;area=attachmod;sa=attachments',
928
+							'href' => $scripturl.'?action=moderate;area=attachmod;sa=attachments',
929 929
 							'show' => $modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap']),
930 930
 						),
931 931
 						'poststopics' => array(
932 932
 							'title' => $txt['mc_unapproved_poststopics'],
933 933
 							'counter' => 'postmod',
934
-							'href' => $scripturl . '?action=moderate;area=postmod;sa=posts',
934
+							'href' => $scripturl.'?action=moderate;area=postmod;sa=posts',
935 935
 							'show' => $modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap']),
936 936
 						),
937 937
 						'postbyemail' => array(
938 938
 							'title' => $txt['mc_emailerror'],
939 939
 							'counter' => 'emailmod',
940
-							'href' => $scripturl . '?action=admin;area=maillist;sa=emaillist',
940
+							'href' => $scripturl.'?action=admin;area=maillist;sa=emaillist',
941 941
 							'show' => !empty($modSettings['maillist_enabled']) && allowedTo('approve_emails'),
942 942
 						),
943 943
 					),
@@ -949,35 +949,35 @@  discard block
 block discarded – undo
949 949
 				theme()->addCSSRules('
950 950
 	.i-account:before {
951 951
 		content: "";
952
-		background-image: url("' . $user_info['avatar']['href'] . '");
952
+		background-image: url("' . $user_info['avatar']['href'].'");
953 953
 	}');
954 954
 			}
955 955
 
956 956
 			$buttons += array(
957 957
 				'profile' => array(
958 958
 					'title' => !empty($modSettings['displayMemberNames']) ? $user_info['name'] : $txt['account_short'],
959
-					'href' => $scripturl . '?action=profile',
959
+					'href' => $scripturl.'?action=profile',
960 960
 					'data-icon' => 'account',
961 961
 					'show' => $context['allow_edit_profile'],
962 962
 					'sub_buttons' => array(
963 963
 						'account' => array(
964 964
 							'title' => $txt['account'],
965
-							'href' => $scripturl . '?action=profile;area=account',
965
+							'href' => $scripturl.'?action=profile;area=account',
966 966
 							'show' => allowedTo(array('profile_identity_any', 'profile_identity_own', 'manage_membergroups')),
967 967
 						),
968 968
 						'forumprofile' => array(
969 969
 							'title' => $txt['forumprofile'],
970
-							'href' => $scripturl . '?action=profile;area=forumprofile',
970
+							'href' => $scripturl.'?action=profile;area=forumprofile',
971 971
 							'show' => allowedTo(array('profile_extra_any', 'profile_extra_own')),
972 972
 						),
973 973
 						'theme' => array(
974 974
 							'title' => $txt['theme'],
975
-							'href' => $scripturl . '?action=profile;area=theme',
975
+							'href' => $scripturl.'?action=profile;area=theme',
976 976
 							'show' => allowedTo(array('profile_extra_any', 'profile_extra_own', 'profile_extra_any')),
977 977
 						),
978 978
 						'logout' => array(
979 979
 							'title' => $txt['logout'],
980
-							'href' => $scripturl . '?action=logout',
980
+							'href' => $scripturl.'?action=logout',
981 981
 							'show' => !$user_info['is_guest'],
982 982
 						),
983 983
 					),
@@ -987,18 +987,18 @@  discard block
 block discarded – undo
987 987
 				'pm' => array(
988 988
 					'title' => $txt['pm_short'],
989 989
 					'counter' => 'unread_messages',
990
-					'href' => $scripturl . '?action=pm',
990
+					'href' => $scripturl.'?action=pm',
991 991
 					'data-icon' => ($context['user']['unread_messages'] ? 'comment' : 'comment-blank'),
992 992
 					'show' => $context['allow_pm'],
993 993
 					'sub_buttons' => array(
994 994
 						'pm_read' => array(
995 995
 							'title' => $txt['pm_menu_read'],
996
-							'href' => $scripturl . '?action=pm',
996
+							'href' => $scripturl.'?action=pm',
997 997
 							'show' => allowedTo('pm_read'),
998 998
 						),
999 999
 						'pm_send' => array(
1000 1000
 							'title' => $txt['pm_menu_send'],
1001
-							'href' => $scripturl . '?action=pm;sa=send',
1001
+							'href' => $scripturl.'?action=pm;sa=send',
1002 1002
 							'show' => allowedTo('pm_send'),
1003 1003
 						),
1004 1004
 					),
@@ -1006,7 +1006,7 @@  discard block
 block discarded – undo
1006 1006
 				'mentions' => array(
1007 1007
 					'title' => $txt['mention'],
1008 1008
 					'counter' => 'mentions',
1009
-					'href' => $scripturl . '?action=mentions',
1009
+					'href' => $scripturl.'?action=mentions',
1010 1010
 					'data-icon' => ($context['user']['mentions'] ? 'bell' : 'bell-blank'),
1011 1011
 					'show' => !$user_info['is_guest'] && !empty($modSettings['mentions_enabled']),
1012 1012
 				),
@@ -1015,7 +1015,7 @@  discard block
 block discarded – undo
1015 1015
 				// of old unread posts, and they wont be reached from this button.
1016 1016
 				'unread' => array(
1017 1017
 					'title' => $txt['view_unread_category'],
1018
-					'href' => $scripturl . '?action=unread',
1018
+					'href' => $scripturl.'?action=unread',
1019 1019
 					'data-icon' => 'comments',
1020 1020
 					'show' => !$user_info['is_guest'],
1021 1021
 				),
@@ -1024,20 +1024,20 @@  discard block
 block discarded – undo
1024 1024
 				// that the user has never posted in and doesn't care about.
1025 1025
 				'unreadreplies' => array(
1026 1026
 					'title' => $txt['view_replies_category'],
1027
-					'href' => $scripturl . '?action=unreadreplies',
1027
+					'href' => $scripturl.'?action=unreadreplies',
1028 1028
 					'data-icon' => 'comments-blank',
1029 1029
 					'show' => !$user_info['is_guest'],
1030 1030
 				),
1031 1031
 				'login' => array(
1032 1032
 					'title' => $txt['login'],
1033
-					'href' => $scripturl . '?action=login',
1033
+					'href' => $scripturl.'?action=login',
1034 1034
 					'data-icon' => 'sign-in',
1035 1035
 					'show' => $user_info['is_guest'],
1036 1036
 				),
1037 1037
 
1038 1038
 				'register' => array(
1039 1039
 					'title' => $txt['register'],
1040
-					'href' => $scripturl . '?action=register',
1040
+					'href' => $scripturl.'?action=register',
1041 1041
 					'data-icon' => 'register',
1042 1042
 					'show' => $user_info['is_guest'] && $context['can_register'],
1043 1043
 				),
@@ -1062,7 +1062,7 @@  discard block
 block discarded – undo
1062 1062
 
1063 1063
 					if (isset($button['counter']) && !empty($menu_count[$button['counter']]))
1064 1064
 					{
1065
-						$button['alttitle'] = $button['title'] . ' [' . $menu_count[$button['counter']] . ']';
1065
+						$button['alttitle'] = $button['title'].' ['.$menu_count[$button['counter']].']';
1066 1066
 						if (!empty($settings['menu_numeric_notice'][0]))
1067 1067
 						{
1068 1068
 							$button['title'] .= sprintf($settings['menu_numeric_notice'][0], $menu_count[$button['counter']]);
@@ -1081,7 +1081,7 @@  discard block
 block discarded – undo
1081 1081
 							}
1082 1082
 							elseif (isset($subbutton['counter']) && !empty($menu_count[$subbutton['counter']]))
1083 1083
 							{
1084
-								$button['sub_buttons'][$key]['alttitle'] = $subbutton['title'] . ' [' . $menu_count[$subbutton['counter']] . ']';
1084
+								$button['sub_buttons'][$key]['alttitle'] = $subbutton['title'].' ['.$menu_count[$subbutton['counter']].']';
1085 1085
 								if (!empty($settings['menu_numeric_notice'][1]))
1086 1086
 								{
1087 1087
 									$button['sub_buttons'][$key]['title'] .= sprintf($settings['menu_numeric_notice'][1], $menu_count[$subbutton['counter']]);
@@ -1099,7 +1099,7 @@  discard block
 block discarded – undo
1099 1099
 										}
1100 1100
 										elseif (isset($subbutton2['counter']) && !empty($menu_count[$subbutton2['counter']]))
1101 1101
 										{
1102
-											$button['sub_buttons'][$key]['sub_buttons'][$key2]['alttitle'] = $subbutton2['title'] . ' [' . $menu_count[$subbutton2['counter']] . ']';
1102
+											$button['sub_buttons'][$key]['sub_buttons'][$key2]['alttitle'] = $subbutton2['title'].' ['.$menu_count[$subbutton2['counter']].']';
1103 1103
 											if (!empty($settings['menu_numeric_notice'][2]))
1104 1104
 											{
1105 1105
 												$button['sub_buttons'][$key]['sub_buttons'][$key2]['title'] .= sprintf($settings['menu_numeric_notice'][2], $menu_count[$subbutton2['counter']]);
@@ -1118,13 +1118,13 @@  discard block
 block discarded – undo
1118 1118
 
1119 1119
 			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
1120 1120
 			{
1121
-				cache_put_data('menu_buttons-' . implode('_', $user_info['groups']) . '-' . $user_info['language'], $menu_buttons, $cacheTime);
1121
+				cache_put_data('menu_buttons-'.implode('_', $user_info['groups']).'-'.$user_info['language'], $menu_buttons, $cacheTime);
1122 1122
 			}
1123 1123
 		}
1124 1124
 
1125 1125
 		if (!empty($menu_buttons['profile']['sub_buttons']['logout']))
1126 1126
 		{
1127
-			$menu_buttons['profile']['sub_buttons']['logout']['href'] .= ';' . $context['session_var'] . '=' . $context['session_id'];
1127
+			$menu_buttons['profile']['sub_buttons']['logout']['href'] .= ';'.$context['session_var'].'='.$context['session_id'];
1128 1128
 		}
1129 1129
 
1130 1130
 		$context['menu_buttons'] = $menu_buttons;
@@ -1186,7 +1186,7 @@  discard block
 block discarded – undo
1186 1186
 				'elk_default_theme_url' => JavaScriptEscape($settings['default_theme_url']),
1187 1187
 				'elk_images_url' => JavaScriptEscape($settings['images_url']),
1188 1188
 				'elk_smiley_url' => JavaScriptEscape($modSettings['smileys_url']),
1189
-				'elk_scripturl' => '\'' . $scripturl . '\'',
1189
+				'elk_scripturl' => '\''.$scripturl.'\'',
1190 1190
 				'elk_iso_case_folding' => detectServer()->is('iso_case_folding') ? 'true' : 'false',
1191 1191
 				'elk_charset' => '"UTF-8"',
1192 1192
 				'elk_session_id' => JavaScriptEscape($context['session_id']),
@@ -1316,13 +1316,13 @@  discard block
 block discarded – undo
1316 1316
 		}
1317 1317
 
1318 1318
 		// Do this to keep things easier in the templates.
1319
-		$context['theme_variant'] = '_' . $context['theme_variant'];
1320
-		$context['theme_variant_url'] = $context['theme_variant'] . '/';
1319
+		$context['theme_variant'] = '_'.$context['theme_variant'];
1320
+		$context['theme_variant_url'] = $context['theme_variant'].'/';
1321 1321
 
1322 1322
 		// The most efficient way of writing multi themes is to use a master index.css plus variant.css files.
1323 1323
 		if (!empty($context['theme_variant']))
1324 1324
 		{
1325
-			loadCSSFile($context['theme_variant'] . '/index' . $context['theme_variant'] . '.css');
1325
+			loadCSSFile($context['theme_variant'].'/index'.$context['theme_variant'].'.css');
1326 1326
 		}
1327 1327
 	}
1328 1328
 }
1329 1329
\ No newline at end of file
Please login to merge, or discard this patch.