|
@@ -111,7 +111,7 @@ discard block |
|
|
block discarded – undo |
|
111
|
111
|
|
|
112
|
112
|
foreach ($array as $callback) |
|
113
|
113
|
{ |
|
114
|
|
- $func = 'template_' . $id . '_' . $callback; |
|
|
114
|
+ $func = 'template_'.$id.'_'.$callback; |
|
115
|
115
|
if (function_exists($func)) |
|
116
|
116
|
$func(); |
|
117
|
117
|
} |
|
@@ -148,7 +148,7 @@ discard block |
|
|
block discarded – undo |
|
148
|
148
|
// OpenID enabled? Advertise the location of our endpoint using YADIS protocol. |
|
149
|
149
|
if (!empty($modSettings['enableOpenID'])) |
|
150
|
150
|
echo ' |
|
151
|
|
- <meta http-equiv="x-xrds-location" content="' . $scripturl . '?action=xrds" />'; |
|
|
151
|
+ <meta http-equiv="x-xrds-location" content="' . $scripturl.'?action=xrds" />'; |
|
152
|
152
|
|
|
153
|
153
|
// Please don't index these Mr Robot. |
|
154
|
154
|
if (!empty($context['robot_no_index'])) |
|
@@ -162,10 +162,10 @@ discard block |
|
|
block discarded – undo |
|
162
|
162
|
|
|
163
|
163
|
// Show all the relative links, such as help, search, contents, and the like. |
|
164
|
164
|
echo ' |
|
165
|
|
- <link rel="shortcut icon" sizes="196x196" href="' . $settings['images_url'] . '/mobile.png" /> |
|
|
165
|
+ <link rel="shortcut icon" sizes="196x196" href="' . $settings['images_url'].'/mobile.png" /> |
|
166
|
166
|
<link rel="help" href="', $scripturl, '?action=help" /> |
|
167
|
167
|
<link rel="contents" href="', $scripturl, '" />', ($context['allow_search'] ? ' |
|
168
|
|
- <link rel="search" href="' . $scripturl . '?action=search" />' : ''); |
|
|
168
|
+ <link rel="search" href="' . $scripturl.'?action=search" />' : ''); |
|
169
|
169
|
|
|
170
|
170
|
// If RSS feeds are enabled, advertise the presence of one. |
|
171
|
171
|
if (!empty($context['newsfeed_urls'])) |
|
@@ -202,7 +202,7 @@ discard block |
|
|
block discarded – undo |
|
202
|
202
|
</head> |
|
203
|
203
|
<body id="', $context['browser_body_id'], '" class="action_', !empty($context['current_action']) ? htmlspecialchars($context['current_action'], ENT_COMPAT, 'UTF-8') : (!empty($context['current_board']) ? |
|
204
|
204
|
'messageindex' : (!empty($context['current_topic']) ? 'display' : 'home')), |
|
205
|
|
- !empty($context['current_board']) ? ' board_' . htmlspecialchars($context['current_board'], ENT_COMPAT, 'UTF-8') : '', '">'; |
|
|
205
|
+ !empty($context['current_board']) ? ' board_'.htmlspecialchars($context['current_board'], ENT_COMPAT, 'UTF-8') : '', '">'; |
|
206
|
206
|
} |
|
207
|
207
|
|
|
208
|
208
|
/** |
|
@@ -234,7 +234,7 @@ discard block |
|
|
block discarded – undo |
|
234
|
234
|
echo ' |
|
235
|
235
|
<span id="logobox"> |
|
236
|
236
|
<img id="logo" src="', $context['header_logo_url_html_safe'], '" alt="', $context['forum_name_html_safe'], '" title="', $context['forum_name_html_safe'], '" />', empty($settings['site_slogan']) ? '' : ' |
|
237
|
|
- <span id="siteslogan">' . $settings['site_slogan'] . '</span>', ' |
|
|
237
|
+ <span id="siteslogan">' . $settings['site_slogan'].'</span>', ' |
|
238
|
238
|
</span> |
|
239
|
239
|
</h1>'; |
|
240
|
240
|
|
|
@@ -278,7 +278,7 @@ discard block |
|
|
block discarded – undo |
|
278
|
278
|
|
|
279
|
279
|
echo ' |
|
280
|
280
|
<div id="top_section_notice" class="user"> |
|
281
|
|
- <form action="', $scripturl, '?action=login2;quicklogin" method="post" accept-charset="UTF-8" ', empty($context['disable_login_hashing']) ? ' onsubmit="hashLoginPassword(this, \'' . $context['session_id'] . '\');"' : '', '> |
|
|
281
|
+ <form action="', $scripturl, '?action=login2;quicklogin" method="post" accept-charset="UTF-8" ', empty($context['disable_login_hashing']) ? ' onsubmit="hashLoginPassword(this, \''.$context['session_id'].'\');"' : '', '> |
|
282
|
282
|
<div id="password_login"> |
|
283
|
283
|
<input type="text" name="user" size="10" class="input_text" placeholder="', $txt['username'], '" /> |
|
284
|
284
|
<input type="password" name="passwrd" size="10" class="input_password" placeholder="', $txt['password'], '" /> |
|
@@ -297,7 +297,7 @@ discard block |
|
|
block discarded – undo |
|
297
|
297
|
|
|
298
|
298
|
if (!empty($modSettings['enableOpenID'])) |
|
299
|
299
|
echo ' |
|
300
|
|
- <a class="icon icon-big icon-margin i-openid" href="', $scripturl, '?action=login;openid" title="' . $txt['openid'] . '"><s>' . $txt['openid'] . '"</s></a>'; |
|
|
300
|
+ <a class="icon icon-big icon-margin i-openid" href="', $scripturl, '?action=login;openid" title="'.$txt['openid'].'"><s>'.$txt['openid'].'"</s></a>'; |
|
301
|
301
|
echo ' |
|
302
|
302
|
</div> |
|
303
|
303
|
</form> |
|
@@ -402,7 +402,7 @@ discard block |
|
|
block discarded – undo |
|
402
|
402
|
theme_copyright(), ' |
|
403
|
403
|
</li>', |
|
404
|
404
|
!empty($context['newsfeed_urls']['rss']) ? '<li> |
|
405
|
|
- <a id="button_rss" href="' . $context['newsfeed_urls']['rss'] . '" class="rssfeeds new_win"><i class="icon icon-margin i-rss icon-big"><s>' . $txt['rss'] . '</s></i></a> |
|
|
405
|
+ <a id="button_rss" href="' . $context['newsfeed_urls']['rss'].'" class="rssfeeds new_win"><i class="icon icon-margin i-rss icon-big"><s>'.$txt['rss'].'</s></i></a> |
|
406
|
406
|
</li>' : '', |
|
407
|
407
|
'</ul>'; |
|
408
|
408
|
|
|
@@ -468,7 +468,7 @@ discard block |
|
|
block discarded – undo |
|
468
|
468
|
echo $tree['extra_before']; |
|
469
|
469
|
|
|
470
|
470
|
// Show the link, including a URL if it should have one. |
|
471
|
|
- echo $settings['linktree_link'] && isset($tree['url']) ? '<a href="' . $tree['url'] . '">' . ($pos == 0 ? '<i class="icon i-home icon-big"><s>' . $txt['home'] . '</s></i>' : $tree['name']) . '</a>' : $tree['name']; |
|
|
471
|
+ echo $settings['linktree_link'] && isset($tree['url']) ? '<a href="'.$tree['url'].'">'.($pos == 0 ? '<i class="icon i-home icon-big"><s>'.$txt['home'].'</s></i>' : $tree['name']).'</a>' : $tree['name']; |
|
472
|
472
|
|
|
473
|
473
|
// Show something after the link...? |
|
474
|
474
|
if (isset($tree['extra_after'])) |
|
@@ -506,7 +506,7 @@ discard block |
|
|
block discarded – undo |
|
506
|
506
|
{ |
|
507
|
507
|
echo ' |
|
508
|
508
|
<li id="button_', $act, '" class="listlevel1', !empty($button['sub_buttons']) ? ' subsections" aria-haspopup="true"' : '"', ' role="menuitem"> |
|
509
|
|
- <a class="linklevel1', !empty($button['active_button']) ? ' active' : '', (!empty($button['indicator']) ? ' indicator' : ''), '" href="', $button['href'], '" ', isset($button['target']) ? 'target="' . $button['target'] . '"' : '', '>', (!empty($button['data-icon']) ? '<i class="icon icon-menu icon-big i-' . $button['data-icon'] . '"></i> ' : ''), '<span class="button_title">', $button['title'], '</span></a>'; |
|
|
509
|
+ <a class="linklevel1', !empty($button['active_button']) ? ' active' : '', (!empty($button['indicator']) ? ' indicator' : ''), '" href="', $button['href'], '" ', isset($button['target']) ? 'target="'.$button['target'].'"' : '', '>', (!empty($button['data-icon']) ? '<i class="icon icon-menu icon-big i-'.$button['data-icon'].'"></i> ' : ''), '<span class="button_title">', $button['title'], '</span></a>'; |
|
510
|
510
|
|
|
511
|
511
|
// Any 2nd level menus? |
|
512
|
512
|
if (!empty($button['sub_buttons'])) |
|
@@ -518,7 +518,7 @@ discard block |
|
|
block discarded – undo |
|
518
|
518
|
{ |
|
519
|
519
|
echo ' |
|
520
|
520
|
<li id="button_', $childact, '" class="listlevel2', !empty($childbutton['sub_buttons']) ? ' subsections" aria-haspopup="true"' : '"', ' role="menuitem"> |
|
521
|
|
- <a class="linklevel2" href="', $childbutton['href'], '" ', isset($childbutton['target']) ? 'target="' . $childbutton['target'] . '"' : '', '>', $childbutton['title'], '</a>'; |
|
|
521
|
+ <a class="linklevel2" href="', $childbutton['href'], '" ', isset($childbutton['target']) ? 'target="'.$childbutton['target'].'"' : '', '>', $childbutton['title'], '</a>'; |
|
522
|
522
|
|
|
523
|
523
|
// 3rd level menus :) |
|
524
|
524
|
if (!empty($childbutton['sub_buttons'])) |
|
@@ -529,7 +529,7 @@ discard block |
|
|
block discarded – undo |
|
529
|
529
|
foreach ($childbutton['sub_buttons'] as $grandchildact => $grandchildbutton) |
|
530
|
530
|
echo ' |
|
531
|
531
|
<li id="button_', $grandchildact, '" class="listlevel3" role="menuitem"> |
|
532
|
|
- <a class="linklevel3" href="', $grandchildbutton['href'], '" ', isset($grandchildbutton['target']) ? 'target="' . $grandchildbutton['target'] . '"' : '', '>', $grandchildbutton['title'], '</a> |
|
|
532
|
+ <a class="linklevel3" href="', $grandchildbutton['href'], '" ', isset($grandchildbutton['target']) ? 'target="'.$grandchildbutton['target'].'"' : '', '>', $grandchildbutton['title'], '</a> |
|
533
|
533
|
</li>'; |
|
534
|
534
|
|
|
535
|
535
|
echo ' |
|
@@ -612,7 +612,7 @@ discard block |
|
|
block discarded – undo |
|
612
|
612
|
{ |
|
613
|
613
|
if (!isset($value['test']) || !empty($context[$value['test']])) |
|
614
|
614
|
$buttons[] = ' |
|
615
|
|
- <li role="menuitem"><a' . (isset($value['id']) ? ' id="button_strip_' . $value['id'] . '"' : '') . ' class="linklevel1 button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . '" href="' . $value['url'] . '"' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . $txt[$value['text']] . '</a></li>'; |
|
|
615
|
+ <li role="menuitem"><a' . (isset($value['id']) ? ' id="button_strip_'.$value['id'].'"' : '').' class="linklevel1 button_strip_'.$key.(!empty($value['active']) ? ' active' : '').'" href="'.$value['url'].'"'.(isset($value['custom']) ? ' '.$value['custom'] : '').'>'.$txt[$value['text']].'</a></li>'; |
|
616
|
616
|
} |
|
617
|
617
|
|
|
618
|
618
|
// No buttons? No button strip either. |
|
@@ -620,7 +620,7 @@ discard block |
|
|
block discarded – undo |
|
620
|
620
|
return; |
|
621
|
621
|
|
|
622
|
622
|
echo ' |
|
623
|
|
- <ul role="menubar" class="buttonlist', !empty($direction) ? ' float' . $direction : '', (empty($buttons) ? ' hide"' : '"'), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"' : ''), '> |
|
|
623
|
+ <ul role="menubar" class="buttonlist', !empty($direction) ? ' float'.$direction : '', (empty($buttons) ? ' hide"' : '"'), (!empty($strip_options['id']) ? ' id="'.$strip_options['id'].'"' : ''), '> |
|
624
|
624
|
', implode('', $buttons), ' |
|
625
|
625
|
</ul>'; |
|
626
|
626
|
} |
|
@@ -657,14 +657,14 @@ discard block |
|
|
block discarded – undo |
|
657
|
657
|
{ |
|
658
|
658
|
if (!empty($value['checkbox']) && ((!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) || $value['checkbox'] === 'always')) |
|
659
|
659
|
$buttons[] = ' |
|
660
|
|
- <li class="listlevel1 ' . $key . '"> |
|
661
|
|
- <input class="input_check ' . $key . '_check" type="checkbox" name="' . $value['name'] . '[]" value="' . $value['value'] . '" /> |
|
|
660
|
+ <li class="listlevel1 ' . $key.'"> |
|
|
661
|
+ <input class="input_check ' . $key.'_check" type="checkbox" name="'.$value['name'].'[]" value="'.$value['value'].'" /> |
|
662
|
662
|
</li>'; |
|
663
|
663
|
} |
|
664
|
664
|
elseif (!isset($value['test']) || !empty($tests[$value['test']])) |
|
665
|
665
|
$buttons[] = ' |
|
666
|
666
|
<li class="listlevel1"> |
|
667
|
|
- <a href="' . $value['href'] . '" class="linklevel1 ' . $key . '_button"' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . $value['text'] . '</a> |
|
|
667
|
+ <a href="' . $value['href'].'" class="linklevel1 '.$key.'_button"'.(isset($value['custom']) ? ' '.$value['custom'] : '').'>'.$value['text'].'</a> |
|
668
|
668
|
</li>'; |
|
669
|
669
|
} |
|
670
|
670
|
|
|
@@ -688,12 +688,12 @@ discard block |
|
|
block discarded – undo |
|
688
|
688
|
|
|
689
|
689
|
echo ' |
|
690
|
690
|
<p class="floatleft">', !empty($modSettings['enableParticipation']) && $context['user']['is_logged'] ? ' |
|
691
|
|
- <span class="topicicon img_profile"></span>' . $txt['participation_caption'] : '<span class="topicicon img_normal"> </span>' . $txt['normal_topic'], '<br /> |
|
692
|
|
- ' . (!empty($modSettings['pollMode']) ? '<span class="topicicon img_poll"> </span>' . $txt['poll'] : '') . ' |
|
|
691
|
+ <span class="topicicon img_profile"></span>' . $txt['participation_caption'] : '<span class="topicicon img_normal"> </span>'.$txt['normal_topic'], '<br /> |
|
|
692
|
+ ' . (!empty($modSettings['pollMode']) ? '<span class="topicicon img_poll"> </span>'.$txt['poll'] : '').' |
|
693
|
693
|
</p> |
|
694
|
694
|
<p> |
|
695
|
|
- <span class="topicicon img_locked"> </span>' . $txt['locked_topic'] . '<br /> |
|
696
|
|
- <span class="topicicon img_sticky"> </span>' . $txt['sticky_topic'] . '<br /> |
|
|
695
|
+ <span class="topicicon img_locked"> </span>' . $txt['locked_topic'].'<br /> |
|
|
696
|
+ <span class="topicicon img_sticky"> </span>' . $txt['sticky_topic'].'<br /> |
|
697
|
697
|
</p>'; |
|
698
|
698
|
} |
|
699
|
699
|
|
|
@@ -773,12 +773,12 @@ discard block |
|
|
block discarded – undo |
|
773
|
773
|
// Hmmm. I'm a tad wary of having floatleft here but anyway............ |
|
774
|
774
|
// @todo - Try using table-cell display here. Should do auto rtl support. Less markup, less css. :) |
|
775
|
775
|
if (!empty($options['page_index_markup'])) |
|
776
|
|
- $pages = '<ul ' . (isset($options['page_index_id']) ? 'id="' . $options['page_index_id'] . '" ' : '') . 'class="pagelinks floatleft" role="menubar">' . $options['page_index_markup'] . '</ul>'; |
|
|
776
|
+ $pages = '<ul '.(isset($options['page_index_id']) ? 'id="'.$options['page_index_id'].'" ' : '').'class="pagelinks floatleft" role="menubar">'.$options['page_index_markup'].'</ul>'; |
|
777
|
777
|
else |
|
778
|
778
|
{ |
|
779
|
779
|
if (!isset($options['page_index'])) |
|
780
|
780
|
$options['page_index'] = 'page_index'; |
|
781
|
|
- $pages = empty($context[$options['page_index']]) ? '' : '<ul ' . (isset($options['page_index_id']) ? 'id="' . $options['page_index_id'] . '" ' : '') . 'class="pagelinks floatleft" role="menubar">' . $context[$options['page_index']] . '</ul>'; |
|
|
781
|
+ $pages = empty($context[$options['page_index']]) ? '' : '<ul '.(isset($options['page_index_id']) ? 'id="'.$options['page_index_id'].'" ' : '').'class="pagelinks floatleft" role="menubar">'.$context[$options['page_index']].'</ul>'; |
|
782
|
782
|
} |
|
783
|
783
|
|
|
784
|
784
|
if (!isset($options['extra'])) |
|
@@ -823,8 +823,8 @@ discard block |
|
|
block discarded – undo |
|
823
|
823
|
{ |
|
824
|
824
|
global $context; |
|
825
|
825
|
|
|
826
|
|
- return ((!empty($context['can_send_pm']) && $link) ? '<a href="' . $member['online']['href'] . '" title="' . $member['online']['text'] . '">' : '') . |
|
827
|
|
- '<i class="' . ($member['online']['is_online'] ? 'iconline' : 'icoffline') . '" title="' . $member['online']['text'] . '"></i>' . |
|
|
826
|
+ return ((!empty($context['can_send_pm']) && $link) ? '<a href="'.$member['online']['href'].'" title="'.$member['online']['text'].'">' : ''). |
|
|
827
|
+ '<i class="'.($member['online']['is_online'] ? 'iconline' : 'icoffline').'" title="'.$member['online']['text'].'"></i>'. |
|
828
|
828
|
((!empty($context['can_send_pm']) && $link) ? '</a>' : ''); |
|
829
|
829
|
} |
|
830
|
830
|
|
|
@@ -847,11 +847,11 @@ discard block |
|
|
block discarded – undo |
|
847
|
847
|
{ |
|
848
|
848
|
if ($member['show_email'] == 'no_through_forum') |
|
849
|
849
|
{ |
|
850
|
|
- return '<a class="linkbutton" href="' . $scripturl . '?action=emailuser;sa=email;uid=' . $member['id'] . '">' . $txt['email'] . '</a>'; |
|
|
850
|
+ return '<a class="linkbutton" href="'.$scripturl.'?action=emailuser;sa=email;uid='.$member['id'].'">'.$txt['email'].'</a>'; |
|
851
|
851
|
} |
|
852
|
852
|
elseif ($member['show_email'] == 'yes_permission_override' || $member['show_email'] == 'yes') |
|
853
|
853
|
{ |
|
854
|
|
- return '<a class="linkbutton" href="' . $scripturl . '?action=emailuser;sa=email;uid=' . $member['id'] . '">' . $member['email'] . '</a>'; |
|
|
854
|
+ return '<a class="linkbutton" href="'.$scripturl.'?action=emailuser;sa=email;uid='.$member['id'].'">'.$member['email'].'</a>'; |
|
855
|
855
|
} |
|
856
|
856
|
else |
|
857
|
857
|
{ |
|
@@ -862,11 +862,11 @@ discard block |
|
|
block discarded – undo |
|
862
|
862
|
{ |
|
863
|
863
|
if ($member['show_email'] != 'no') |
|
864
|
864
|
{ |
|
865
|
|
- return '<a href="' . $scripturl . '?action=emailuser;sa=email;uid=' . $member['id'] . '" class="icon i-envelope-o' . ($member['online']['is_online'] ? '' : '-blank') . '" title="' . $txt['email'] . ' ' . $member['name'] . '"><s>' . $txt['email'] . ' ' . $member['name'] . '</s></a>'; |
|
|
865
|
+ return '<a href="'.$scripturl.'?action=emailuser;sa=email;uid='.$member['id'].'" class="icon i-envelope-o'.($member['online']['is_online'] ? '' : '-blank').'" title="'.$txt['email'].' '.$member['name'].'"><s>'.$txt['email'].' '.$member['name'].'</s></a>'; |
|
866
|
866
|
} |
|
867
|
867
|
else |
|
868
|
868
|
{ |
|
869
|
|
- return '<i class="icon i-envelope-o" title="' . $txt['email'] . ' ' . $txt['hidden'] . '"><s>' . $txt['email'] . ' ' . $txt['hidden'] . '</s></i>'; |
|
|
869
|
+ return '<i class="icon i-envelope-o" title="'.$txt['email'].' '.$txt['hidden'].'"><s>'.$txt['email'].' '.$txt['hidden'].'</s></i>'; |
|
870
|
870
|
} |
|
871
|
871
|
} |
|
872
|
872
|
} |
|
@@ -890,11 +890,11 @@ discard block |
|
|
block discarded – undo |
|
890
|
890
|
{ |
|
891
|
891
|
if ($member === false || $member['show_email'] != 'no') |
|
892
|
892
|
{ |
|
893
|
|
- return '<a href="' . $scripturl . '?action=emailuser;sa=email;msg=' . $id . '" class="icon i-envelope-o' . (($member !== false && $member['online']['is_online']) ? '' : '-blank') . '" title="' . $txt['email'] . '"><s>' . $txt['email'] . '</s></a>'; |
|
|
893
|
+ return '<a href="'.$scripturl.'?action=emailuser;sa=email;msg='.$id.'" class="icon i-envelope-o'.(($member !== false && $member['online']['is_online']) ? '' : '-blank').'" title="'.$txt['email'].'"><s>'.$txt['email'].'</s></a>'; |
|
894
|
894
|
} |
|
895
|
895
|
else |
|
896
|
896
|
{ |
|
897
|
|
- return '<i class="icon i-envelope-o" title="' . $txt['email'] . ' ' . $txt['hidden'] . '"><s>' . $txt['email'] . ' ' . $txt['hidden'] . '</s></i>'; |
|
|
897
|
+ return '<i class="icon i-envelope-o" title="'.$txt['email'].' '.$txt['hidden'].'"><s>'.$txt['email'].' '.$txt['hidden'].'</s></i>'; |
|
898
|
898
|
} |
|
899
|
899
|
} |
|
900
|
900
|
|
elkarte /
Elkarte
