mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
[ticket/11201] Revert WLM dropping because it is still used in China.
Windows Live Messenger is still in use in china which accounts for ~20% of world population. Revert WLM dropping which has been merged under the assumption that WLM data and features are completely useless. This commit reverts commits -460470229d
-9affd6f7e7
which have been merged byd59431691c
. PHPBB3-11201
This commit is contained in:
@@ -2,6 +2,8 @@
|
||||
|
||||
<br clear="all" />
|
||||
|
||||
<!-- MSNM info from http://www.cdolive.net/ - doesn't seem to work with MSN Messenger -->
|
||||
|
||||
<form method="post" action="{S_IM_ACTION}">
|
||||
<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
|
||||
<tr>
|
||||
@@ -12,7 +14,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="genmed">{L_IM_RECIPIENT}{L_COLON} </b></td>
|
||||
<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_SEND_ICQ or S_SEND_AIM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>
|
||||
<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>
|
||||
</tr>
|
||||
|
||||
<!-- IF S_SEND_AIM -->
|
||||
@@ -24,6 +26,85 @@
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- IF S_SEND_MSNM -->
|
||||
<tr>
|
||||
<td class="row1" colspan="2" align="center">
|
||||
<object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object>
|
||||
<script type="text/javascript">
|
||||
// <![CDATA[
|
||||
var app = document.getElementById('objMessengerApp');
|
||||
|
||||
/**
|
||||
* Check whether the browser supports this and whether MSNM is connected
|
||||
*/
|
||||
function msn_supported()
|
||||
{
|
||||
// Does the browser support the MSNM object?
|
||||
if (app.MyStatus)
|
||||
{
|
||||
// Is MSNM connected?
|
||||
if (app.MyStatus == 1)
|
||||
{
|
||||
alert('{LA_IM_MSNM_CONNECT}');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
alert('{LA_IM_MSNM_BROWSER}');
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add to your contact list
|
||||
*/
|
||||
function add_contact(address)
|
||||
{
|
||||
if (msn_supported())
|
||||
{
|
||||
// Could return an error while MSNM is connecting, don't want that
|
||||
try
|
||||
{
|
||||
app.AddContact(0, address);
|
||||
}
|
||||
catch (e)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Write IM to contact
|
||||
*/
|
||||
function im_contact(address)
|
||||
{
|
||||
if (msn_supported())
|
||||
{
|
||||
// Could return an error while MSNM is connecting, don't want that
|
||||
try
|
||||
{
|
||||
app.InstantMessage(address);
|
||||
}
|
||||
catch (e)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
// ]]>
|
||||
</script>
|
||||
|
||||
<a class="gen" href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="#" onclick="im_contact('{A_IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cat" colspan="2" align="center"> </td>
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- IF S_SEND_JABBER -->
|
||||
<tr>
|
||||
<td class="row1"><b class="genmed">{L_IM_MESSAGE}{L_COLON} </b></td>
|
||||
|
@@ -102,14 +102,14 @@
|
||||
<!-- ELSE -->
|
||||
<td colspan="2" class="row1"> </td>
|
||||
<!-- ENDIF -->
|
||||
<td class="row1"><b class="genmed">{L_JABBER}{L_COLON}</b></td>
|
||||
<td class="row2"><input class="post" type="text" name="jabber" value="{JABBER}" /></td>
|
||||
<td class="row1"><b class="genmed">{L_MSNM}{L_COLON}</b></td>
|
||||
<td class="row2"><input class="post" type="text" name="msn" value="{MSNM}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="genmed">{L_POSTS}{L_COLON}</b></td>
|
||||
<td class="row2"><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="post" type="text" name="count" value="{COUNT}" /></td>
|
||||
<td class="row1"> </td>
|
||||
<td class="row2"> </td>
|
||||
<td class="row1"><b class="genmed">{L_JABBER}{L_COLON}</b></td>
|
||||
<td class="row2"><input class="post" type="text" name="jabber" value="{JABBER}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="genmed">{L_SORT_BY}{L_COLON}</b></td>
|
||||
|
@@ -116,6 +116,10 @@
|
||||
<td><a href="{U_PM}" class="imageset">{PM_IMG}</a></td>
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
<tr>
|
||||
<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_MSNM}{L_COLON} </td>
|
||||
<td><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false" class="imageset">{MSN_IMG}</a><!-- ELSEIF USER_MSN -->{USER_MSN}<!-- ENDIF --></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_YIM}{L_COLON} </td>
|
||||
<td><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false" class="imageset">{YIM_IMG}</a><!-- ELSEIF USER_YIM -->{USER_YIM}<!-- ENDIF --></td>
|
||||
|
@@ -20,6 +20,10 @@
|
||||
<td class="row1" width="35%"><b class="genmed">{L_UCP_AIM}{L_COLON} </b></td>
|
||||
<td class="row2"><input class="post" type="text" name="aim" size="30" maxlength="255" value="{AIM}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1" width="35%"><b class="genmed">{L_UCP_MSNM}{L_COLON} </b></td>
|
||||
<td class="row2"><input class="post" type="text" name="msn" size="30" maxlength="255" value="{MSN}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1" width="35%"><b class="genmed">{L_UCP_YIM}{L_COLON} </b></td>
|
||||
<td class="row2"><input class="post" type="text" name="yim" size="30" maxlength="255" value="{YIM}" /></td>
|
||||
|
Reference in New Issue
Block a user