Fixed MANTIS-4715 (Some inconsistencies with "link opens in a new window" wording) (f585df83) · Commits · Composr ecosystem / Composr

_tests/tests/unit_tests/template_xss.php

+2 −8

Original line number	Diff line number	Diff line
		@@ -30,10 +30,7 @@ class template_xss_test_set extends cms_test_case
		{
		$templates = array();

		$paths = array(
		get_file_base() . '/themes/default/templates',
		get_file_base() . '/themes/default/templates_custom',
		);
		$paths = array();
		$themes = find_all_themes();
		foreach (array_keys($themes) as $theme) {
		$paths = array_merge($paths, array(
		@@ -107,10 +104,7 @@ class template_xss_test_set extends cms_test_case
		{
		$templates = array();

		$paths = array(
		get_file_base() . '/themes/default/templates',
		get_file_base() . '/themes/default/templates_custom',
		);
		$paths = array();
		$themes = find_all_themes();
		foreach (array_keys($themes) as $theme) {
		$paths = array_merge($paths, array(

sources_custom/hooks/systems/addon_registry/testing_platform.php

+1 −0

Original line number	Diff line number	Diff line
		@@ -589,6 +589,7 @@ class Hook_addon_registry_testing_platform
		'_tests/tests/regression_tests/input_filter_post_block.php',
		'_tests/tests/unit_tests/privilege_existence.php',
		'_tests/tests/unit_tests/lang_missing_parameters.php',
		'_tests/tests/unit_tests/new_window_labels.php',
		);
		}

themes/default/templates/BLOCK_MAIN_TOP_SITES.tpl

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,10 +26,10 @@

		{+START,IF,{$NOT,{$LT,{_loop_key},20}}}
		{+START,IF_NON_EMPTY,{DESCRIPTION}}
		<p><a target="_blank" title="{$STRIP_TAGS,{DESCRIPTION}}: {!NEW_WINDOW}" href="{URL*}">{DESCRIPTION}</a></p>
		<p><a target="_blank" title="{$STRIP_TAGS,{DESCRIPTION}} {!LINK_NEW_WINDOW}" href="{URL*}">{DESCRIPTION}</a></p>
		{+END}
		{+START,IF_EMPTY,{DESCRIPTION}}
		<p><a target="_blank" title="{NAME}: {!NEW_WINDOW}" href="{URL}">{NAME*}</a></p>
		<p><a target="_blank" title="{NAME} {!LINK_NEW_WINDOW}" href="{URL}">{NAME*}</a></p>
		{+END}
		{+END}
		</td>

themes/default/templates/CNS_MEMBER_PROFILE_ABOUT.tpl

+5 −5

Original line number	Diff line number	Diff line
		@@ -22,11 +22,11 @@
		{+START,IF,{$GET,is_messenger_field}}
		{+START,SET,messenger_fields}{+START,IF_NON_EMPTY,{RAW_VALUE}}
		{$GET,messenger_fields}
		{+START,IF,{$EQ,{NAME},{!cns_special_cpf:DEFAULT_CPF_im_skype_NAME}}}<li><img alt="" src="{$IMG,icons/24x24/links/skype}" srcset="{$IMG,icons/48x48/links/skype} 2x"/> <a title="{!PHONE_THEM_UP} {!LINK_NEW_WINDOW}" href="skype:{RAW_VALUE*}?call">{!PHONE_THEM_UP}</a> (Skype)</li>{+END}
		{+START,IF,{$EQ,{NAME},{!cns_special_cpf:DEFAULT_CPF_im_jabber_NAME}}}<li><img alt="" src="{$IMG,icons/24x24/links/xmpp}" srcset="{$IMG,icons/48x48/links/xmpp} 2x"/> <a title="{!MESSAGE_THEM} {!LINK_NEW_WINDOW}" href="xmpp:{RAW_VALUE*}">{!MESSAGE_THEM}</a> (Jabber/XMPP)</li>{+END}
		{+START,IF,{$EQ,{NAME},{!cns_special_cpf:DEFAULT_CPF_sn_twitter_NAME}}}<li><img alt="" src="{$IMG,icons/24x24/links/twitter}" srcset="{$IMG,icons/48x48/links/twitter} 2x"/> <a title="{!MESSAGE_THEM} {!LINK_NEW_WINDOW}" href="http://twitter.com/{RAW_VALUE}" rel="me">@{RAW_VALUE}</a> (Twitter)</li>{+END}
		{+START,IF,{$EQ,{NAME},{!cns_special_cpf:DEFAULT_CPF_sn_facebook_NAME}}}<li><img alt="" src="{$IMG,icons/24x24/links/facebook}" srcset="{$IMG,icons/48x48/links/facebook} 2x"/> <a title="{!MESSAGE_THEM} {!LINK_NEW_WINDOW}" href="{RAW_VALUE*}" rel="me">Facebook</a></li>{+END}
		{+START,IF,{$EQ,{NAME},{!cns_special_cpf:DEFAULT_CPF_sn_google_NAME}}}<li><img alt="" src="{$IMG,icons/24x24/links/google_plus}" srcset="{$IMG,icons/48x48/links/google_plus} 2x"/> <a title="{!MESSAGE_THEM} {!LINK_NEW_WINDOW}" href="{RAW_VALUE*}" rel="me">Google+</a></li>{+END}
		{+START,IF,{$EQ,{NAME},{!cns_special_cpf:DEFAULT_CPF_im_skype_NAME}}}<li><img alt="" src="{$IMG,icons/24x24/links/skype}" srcset="{$IMG,icons/48x48/links/skype} 2x"/> <a title="{!PHONE_THEM_UP} {!LINK_NEW_WINDOW}" href="skype:{RAW_VALUE*}?call" target="_blank">{!PHONE_THEM_UP}</a> (Skype)</li>{+END}
		{+START,IF,{$EQ,{NAME},{!cns_special_cpf:DEFAULT_CPF_im_jabber_NAME}}}<li><img alt="" src="{$IMG,icons/24x24/links/xmpp}" srcset="{$IMG,icons/48x48/links/xmpp} 2x"/> <a title="{!MESSAGE_THEM} {!LINK_NEW_WINDOW}" href="xmpp:{RAW_VALUE*}" target="_blank">{!MESSAGE_THEM}</a> (Jabber/XMPP)</li>{+END}
		{+START,IF,{$EQ,{NAME},{!cns_special_cpf:DEFAULT_CPF_sn_twitter_NAME}}}<li><img alt="" src="{$IMG,icons/24x24/links/twitter}" srcset="{$IMG,icons/48x48/links/twitter} 2x"/> <a title="{!MESSAGE_THEM} {!LINK_NEW_WINDOW}" href="http://twitter.com/{RAW_VALUE}" rel="me" target="_blank">@{RAW_VALUE}</a> (Twitter)</li>{+END}
		{+START,IF,{$EQ,{NAME},{!cns_special_cpf:DEFAULT_CPF_sn_facebook_NAME}}}<li><img alt="" src="{$IMG,icons/24x24/links/facebook}" srcset="{$IMG,icons/48x48/links/facebook} 2x"/> <a title="{!MESSAGE_THEM} {!LINK_NEW_WINDOW}" href="{RAW_VALUE*}" rel="me" target="_blank">Facebook</a></li>{+END}
		{+START,IF,{$EQ,{NAME},{!cns_special_cpf:DEFAULT_CPF_sn_google_NAME}}}<li><img alt="" src="{$IMG,icons/24x24/links/google_plus}" srcset="{$IMG,icons/48x48/links/google_plus} 2x"/> <a title="{!MESSAGE_THEM} {!LINK_NEW_WINDOW}" href="{RAW_VALUE*}" rel="me" target="_blank">Google+</a></li>{+END}
		{+END}{+END}
		{+END}
		{+END}

themes/default/templates/COMCODE_TOOLTIP.tpl

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,5 +2,5 @@
		<a title="{$STRIP_TAGS,{TOOLTIP}} {!LINK_NEW_WINDOW}" target="_blank" class="non_link" href="{URL}"><span class="comcode_concept_inline" onmouseover="if (typeof window.activate_tooltip!='undefined') activate_tooltip(this,event,'{TOOLTIP;^}','700px');">{CONTENT}</span></a>
		{+END}
		{+START,IF_EMPTY,{URL}}
		<span title="{$STRIP_TAGS,{TOOLTIP}} {!LINK_NEW_WINDOW}" class="comcode_concept_inline" onmouseover="if (typeof window.activate_tooltip!='undefined') activate_tooltip(this,event,'{TOOLTIP;^*}','700px');">{CONTENT}</span>
		<span title="{$STRIP_TAGS,{TOOLTIP}}" class="comcode_concept_inline" onmouseover="if (typeof window.activate_tooltip!='undefined') activate_tooltip(this,event,'{TOOLTIP;^*}','700px');">{CONTENT}</span>
		{+END}