Permalink
Browse files

Fixed msn profile links by using the cs_html_msnmail function everywhere

  • Loading branch information...
hajo-p committed Jul 31, 2012
1 parent fa6e118 commit ad6c22008ed36e0a0efbdd68afea93f865e479ea
View
@@ -6,6 +6,7 @@ ___________________________________________________________
-> Fixed head messages not shown in board listcat (reported by rapid)
-> Fixed icq profile links and removed status images as they don't work anymore (hajo)
+-> Fixed msn profile links by using the cs_html_msnmail function everywhere (hajo)
-> Updated CKEditor to 3.6.4
View
@@ -57,7 +57,7 @@ function getUserIcons($cs_lang,$users_id,$nick,$hidden = 0,$email=0,$icq=0, $msn
$icons .= !empty($email) ? cs_html_mail($email,cs_icon('mail_generic')) : '';
$icons .= $account['access_users'] >= 2 ? cs_link(cs_icon('mail_send'),'messages','create','to_id=' . $users_id,0,$cs_lang['send_message']) : '';
$icons .= !empty($icq) ? cs_html_link('http://www.icq.com/people/' . $icq,cs_icon('licq'),1,0,$cs_lang['icq']) : '';
- $icons .= !empty($msn) ? cs_html_link('http://members.msn.com/' . $msn,cs_icon('msn_protocol')) : '';
+ $icons .= !empty($msn) ? cs_html_msnmail($msn, cs_icon('msn_protocol')) : '';
$icons .= !empty($skype) ? cs_html_link('skype:' . $skype . '?userinfo',cs_html_img('http://mystatus.skype.com/smallicon/' . $skype,'16','16','0','Skype'),0,0,$cs_lang['skype']) : '';
$icons .= !empty($url) ? cs_html_link('http://' . $url,cs_icon('gohome'),1,0,$cs_lang['homepage']) : '';
View
@@ -29,8 +29,7 @@
}
if(!empty($cs_fightus['fightus_msn'])) {
- $cs_fightus['fightus_msn'] = cs_secure($cs_fightus['fightus_msn']);
- $data['fightus']['msn'] = cs_html_link('http://members.msn.com/' . $cs_fightus['fightus_msn'],$cs_fightus['fightus_msn']);
+ $data['fightus']['msn'] = cs_html_msnmail($cs_fightus['fightus_msn']);
} else {
$data['fightus']['msn'] = '-';
}
View
@@ -55,7 +55,7 @@
$icq = cs_secure($cs_gbook[$run]['gbook_icq']);
$gbook[$run]['icon_icq'] = empty($icq) ? '' : cs_html_link("http://www.icq.com/$icq",cs_icon('licq'));
$msn = cs_secure($cs_gbook[$run]['gbook_msn']);
- $gbook[$run]['icon_msn'] = empty($msn) ? '' : cs_html_link("http://members.msn.com/$msn",cs_icon('msn_protocol'));
+ $gbook[$run]['icon_msn'] = empty($msn) ? '' : cs_html_msnmail($msn,cs_icon('msn_protocol'));
$skype = cs_secure($cs_gbook[$run]['gbook_skype']);
$url = 'http://mystatus.skype.com/smallicon/' . $skype;
$gbook[$run]['icon_skype'] = empty($skype) ? '' : cs_html_link("skype:$skype?userinfo",cs_html_img($url,'16','16','0','Skype'),'0');
@@ -87,7 +87,7 @@
if(in_array('users_msn',$hidden)) {
$msn = empty($allow) ? '' : $msn;
}
- $gbook[$run]['icon_msn'] = empty($msn) ? '' : cs_html_link("http://members.msn.com/$msn",cs_icon('msn_protocol'));
+ $gbook[$run]['icon_msn'] = empty($msn) ? '' : cs_html_msnmail($msn,cs_icon('msn_protocol'));
$skype = cs_secure($cs_gbook[$run]['users_skype']);
$url = 'http://mystatus.skype.com/smallicon/' . $skype;
$skype = cs_html_link('skype:' . $cs_gbook[$run]['users_skype'] . '?userinfo',cs_html_img($url,'16','16','0','Skype'),'0');
View
@@ -118,7 +118,7 @@
$data['gbook']['icon_mail'] = cs_html_link('mailto:' . $cs_gbook['gbook_email'],cs_icon('mail_generic'));
$icq = cs_html_link('http://www.icq.com/people/' . $cs_gbook['gbook_icq'],cs_icon('licq'));
$data['gbook']['icon_icq'] = empty($cs_gbook['gbook_icq']) ? '' : $icq;
- $msn = cs_html_link('http://members.msn.com/' . $cs_gbook['gbook_msn'],cs_icon('msn_protocol'));
+ $msn = cs_html_msnmail($cs_gbook['gbook_msn'],cs_icon('msn_protocol'));
$data['gbook']['icon_msn'] = empty($cs_gbook['gbook_msn']) ? '' : $msn;
$url = 'http://mystatus.skype.com/smallicon/' . $cs_gbook['gbook_skype'];
$skype = cs_html_link('skype:' . $cs_gbook['gbook_skype'] . '?userinfo',cs_html_img($url,'16','16','0','Skype'),'0');
View
@@ -201,7 +201,7 @@
$data['gbook']['icon_mail'] = cs_html_link('mailto:' . $cs_gbook['gbook_email'],cs_icon('mail_generic'));
$icq = cs_html_link('http://www.icq.com/people/' . $cs_gbook['gbook_icq'],cs_icon('licq'));
$data['gbook']['icon_icq'] = empty($cs_gbook['gbook_icq']) ? '' : $icq;
- $msn = cs_html_link('http://members.msn.com/' . $cs_gbook['gbook_msn'],cs_icon('msn_protocol'));
+ $msn = cs_html_msnmail($cs_gbook['gbook_msn'],cs_icon('msn_protocol'));
$data['gbook']['icon_msn'] = empty($cs_gbook['gbook_msn']) ? '' : $msn;
$url = 'http://mystatus.skype.com/smallicon/' . $cs_gbook['gbook_skype'];
$skype = cs_html_link('skype:' . $cs_gbook['gbook_skype'] . '?userinfo',cs_html_img($url,'16','16','0','Skype'),'0');
View
@@ -46,7 +46,7 @@
$icq = cs_secure($cs_gbook[$run]['gbook_icq']);
$gbook[$run]['icon_icq'] = empty($icq) ? '' : cs_html_link("http://www.icq.com/$icq",cs_icon('licq'));
$msn = cs_secure($cs_gbook[$run]['gbook_msn']);
- $gbook[$run]['icon_msn'] = empty($msn) ? '' : cs_html_link("http://members.msn.com/$msn",cs_icon('msn_protocol'));
+ $gbook[$run]['icon_msn'] = empty($msn) ? '' : cs_html_msnmail($msn,cs_icon('msn_protocol'));
$skype = cs_secure($cs_gbook[$run]['gbook_skype']);
$url = 'http://mystatus.skype.com/smallicon/' . $skype;
$gbook[$run]['icon_skype'] = empty($skype) ? '' : cs_html_link("skype:$skype?userinfo",cs_html_img($url,'16','16','0','Skype'),'0');
@@ -72,7 +72,7 @@
$icq = empty($allow) ? '' : $icq;
}
$gbook[$run]['icon_icq'] = empty($cs_gbook[$run]['users_icq']) ? '' : $icq;
- $msn = cs_html_link('http://members.msn.com/' . $cs_gbook[$run]['users_msn'],cs_icon('msn_protocol'));
+ $msn = cs_html_msnmail($cs_gbook[$run]['users_msn'],cs_icon('msn_protocol'));
if(in_array('users_msn',$hidden)) {
$msn = empty($allow) ? '' : $msn;
}
View
@@ -56,7 +56,7 @@
$icq = cs_secure($cs_gbook[$run]['gbook_icq']);
$gbook[$run]['icon_icq'] = empty($icq) ? '' : cs_html_link("http://www.icq.com/$icq",cs_icon('licq'));
$msn = cs_secure($cs_gbook[$run]['gbook_msn']);
- $gbook[$run]['icon_msn'] = empty($msn) ? '' : cs_html_link("http://members.msn.com/$msn",cs_icon('msn_protocol'));
+ $gbook[$run]['icon_msn'] = empty($msn) ? '' : cs_html_msnmail($msn,cs_icon('msn_protocol'));
$skype = cs_secure($cs_gbook[$run]['gbook_skype']);
$url = 'http://mystatus.skype.com/smallicon/' . $skype;
$gbook[$run]['icon_skype'] = empty($skype) ? '' : cs_html_link("skype:$skype?userinfo",cs_html_img($url,'16','16','0','Skype'),'0');
@@ -88,7 +88,7 @@
if(in_array('users_msn',$hidden)) {
$msn = empty($allow) ? '' : $msn;
}
- $gbook[$run]['icon_msn'] = empty($msn) ? '' : cs_html_link("http://members.msn.com/$msn",cs_icon('msn_protocol'));
+ $gbook[$run]['icon_msn'] = empty($msn) ? '' : cs_html_msnmail($msn,cs_icon('msn_protocol'));
$skype = cs_secure($cs_gbook[$run]['users_skype']);
$url = 'http://mystatus.skype.com/smallicon/' . $skype;
$skype = cs_html_link('skype:' . $cs_gbook[$run]['users_skype'] . '?userinfo',cs_html_img($url,'16','16','0','Skype'),'0');
View
@@ -48,7 +48,7 @@
if(empty($cs_joinus['joinus_msn'])) { $data['join']['msn'] = '-'; }
else {
$cs_joinus['joinus_msn'] = cs_secure($cs_joinus['joinus_msn']);
- $data['join']['msn'] = cs_html_link('http://members.msn.com/' . $cs_joinus['joinus_msn'],$cs_joinus['joinus_msn']);
+ $data['join']['msn'] = cs_html_msnmail($cs_joinus['joinus_msn']);
}
if(empty($cs_joinus['games_id'])) { $data['join']['game'] = '-'; }
View
@@ -153,7 +153,6 @@
$data['users']['icq'] = empty($cs_user['users_icq']) ? '--' : $content;
$cs_user['users_msn'] = cs_secure($cs_user['users_msn']);
-# $content = cs_html_link('http://members.msn.com/' . $cs_user['users_msn'],$cs_user['users_msn']);
$content = cs_html_msnmail($cs_user['users_msn']);
if(in_array('users_msn',$hidden)) {
$content = empty($allow) ? '--' : cs_html_italic(1) . $content . cs_html_italic(0);
@@ -13,7 +13,7 @@ function cs_html_mail($mail, $link = '')
}
function cs_html_msnmail($mail, $link = '')
{
- return cs_ajax_mail($mail, $link, 'http://members.msn.com/');
+ return cs_ajax_mail($mail, $link, 'http://profile.live.com/');
}
function cs_html_br($run = 1)

0 comments on commit ad6c220

Please sign in to comment.