diff options
author | Andreas Fischer <bantu@phpbb.com> | 2013-02-04 01:30:04 +0100 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2013-02-04 01:31:43 +0100 |
commit | 336187151a2010197ddda1bcdabc311fd10c1c87 (patch) | |
tree | 6f16d15999e6ac5f158643619213acbf2a7daf7c /phpBB/styles/prosilver/template/memberlist_im.html | |
parent | 34c564062a95b9306487fbc6bbd17c7c9c8a63c4 (diff) | |
download | forums-336187151a2010197ddda1bcdabc311fd10c1c87.tar forums-336187151a2010197ddda1bcdabc311fd10c1c87.tar.gz forums-336187151a2010197ddda1bcdabc311fd10c1c87.tar.bz2 forums-336187151a2010197ddda1bcdabc311fd10c1c87.tar.xz forums-336187151a2010197ddda1bcdabc311fd10c1c87.zip |
[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
- 460470229d972b93ef5a98b0d1d97a2a970d684f
- 9affd6f7e7b95442f1ef14894858d8213f3fbd2a
which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2.
PHPBB3-11201
Diffstat (limited to 'phpBB/styles/prosilver/template/memberlist_im.html')
-rw-r--r-- | phpBB/styles/prosilver/template/memberlist_im.html | 82 |
1 files changed, 81 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html index 61b4a1469b..68aed0b3dd 100644 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ b/phpBB/styles/prosilver/template/memberlist_im.html @@ -1,5 +1,6 @@ <!-- INCLUDE simple_header.html --> +<!-- MSNM info from http://www.cdolive.net/ - doesn't seem to work with MSN Messenger --> <h2 class="solo">{L_SEND_IM}</h2> <form method="post" action="{S_IM_ACTION}"> @@ -12,7 +13,7 @@ <fieldset> <dl class="fields2"> <dt><label>{L_IM_RECIPIENT}{L_COLON}</label></dt> - <dd><strong>{USERNAME}</strong><!-- IF S_SEND_ICQ or S_SEND_AIM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd> + <dd><strong>{USERNAME}</strong><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd> </dl> <!-- IF S_SEND_ICQ --> @@ -42,6 +43,15 @@ </dl> <!-- ENDIF --> + <!-- IF S_SEND_MSNM --> + <dl class="fields2"> + <dt> </dt> + <dd><object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object></dd> + <dd><a href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a></dd> + <dd><a href="#" onclick="im_contact('{A_IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a></dd> + </dl> + <!-- ENDIF --> + <!-- IF S_SEND_JABBER --> <dl class="fields2"> <dt><label for="message">{L_IM_MESSAGE}{L_COLON}</label></dt> @@ -75,4 +85,74 @@ <a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a> +<script type="text/javascript"> +// <![CDATA[ + + /** The following will not work with Windows Vista **/ + + 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> + <!-- INCLUDE simple_footer.html --> |