remove AIM support completely

7 files changed, 10 insertions, 12 deletions

diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
index 2d614c7e92..db0845e745 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
@@ -205,7 +205,6 @@ Scripts\winapi.dll
 Icons\flags_icons.dll
 Icons\fp_icons.dll
 Icons\historypp_icons.dll
-Icons\proto_aim.dll
 Icons\proto_discord.dll
 Icons\proto_dummy.dll
 Icons\proto_facebook.dll
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
index 8b2decb06d..195eff681f 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
@@ -203,7 +203,6 @@ Scripts\winapi.dll
 Icons\flags_icons.dll
 Icons\fp_icons.dll
 Icons\historypp_icons.dll
-Icons\proto_aim.dll
 Icons\proto_discord.dll
 Icons\proto_dummy.dll
 Icons\proto_facebook.dll
diff --git a/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini b/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini
index 15ec526273..f569997e66 100644
--- a/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini
+++ b/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini
@@ -70,8 +70,8 @@ Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar
 ;Unsafe

 ;A space-separated list of database module names that could be alter to

 ;malicious purposes (e.g., by faking a login server to steal passwords).

-;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

-Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

+;Default: Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

+Unsafe=Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

 

 ;OverrideSecurityFilename

 ;System admins may find it desirable to install settings without prompting

diff --git a/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini b/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini
index e0497130f8..1868a973b0 100644
--- a/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini
+++ b/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini
@@ -70,8 +70,8 @@ Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar
 ;Unsafe

 ;A space-separated list of database module names that could be alter to

 ;malicious purposes (e.g., by faking a login server to steal passwords).

-;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

-Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

+;Default: Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

+Unsafe=Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

 

 ;OverrideSecurityFilename

 ;System admins may find it desirable to install settings without prompting

diff --git a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini
index 15ec526273..f569997e66 100644
--- a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini
+++ b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini
@@ -70,8 +70,8 @@ Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar
 ;Unsafe

 ;A space-separated list of database module names that could be alter to

 ;malicious purposes (e.g., by faking a login server to steal passwords).

-;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

-Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

+;Default: Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

+Unsafe=Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

 

 ;OverrideSecurityFilename

 ;System admins may find it desirable to install settings without prompting

diff --git a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini
index e0497130f8..1868a973b0 100644
--- a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini
+++ b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini
@@ -70,8 +70,8 @@ Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar
 ;Unsafe

 ;A space-separated list of database module names that could be alter to

 ;malicious purposes (e.g., by faking a login server to steal passwords).

-;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

-Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

+;Default: Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

+Unsafe=Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte

 

 ;OverrideSecurityFilename

 ;System admins may find it desirable to install settings without prompting

diff --git a/tools/lpgen/lpgen.js b/tools/lpgen/lpgen.js
index 2dbe58325c..4c3134f03f 100644
--- a/tools/lpgen/lpgen.js
+++ b/tools/lpgen/lpgen.js
@@ -487,7 +487,7 @@ function ParseRCFile(FileTextVar, array) {
     //now make a job, till end of matching regexp

     while ((string = find.exec(FileTextVar)) !== null) {

         // check for some garbage like "List1","Tab1" etc. in *.rc files, we do not need this.

-        onestring = string[2].replace(/^(((List|Tab|Tree|Spin|Custom|Slider|DateTimePicker|Radio|Check|HotKey|Progress)\d)|(whiterect|IndSndList|&?[Oo][Kk]|AOL|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|Google Talk|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|Miranda NG|mRadio|MSN|NickServ|OSD|OTR|PCS|PGP|S.ms|SMS|SSL|Steam|Steam Guard|Tox|Twitter|Yahoo|Winamp \(\*\)|Windows|X400|&\w)|(%.(.*%)?))$/g, "");

+        onestring = string[2].replace(/^(((List|Tab|Tree|Spin|Custom|Slider|DateTimePicker|Radio|Check|HotKey|Progress)\d)|(whiterect|IndSndList|&?[Oo][Kk]|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|Google Talk|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|Miranda NG|mRadio|MSN|NickServ|OSD|OTR|PCS|PGP|S.ms|SMS|SSL|Steam|Steam Guard|Tox|Twitter|Yahoo|Winamp \(\*\)|Windows|X400|&\w)|(%.(.*%)?))$/g, "");

         // ignore some popup menu craps

         if (string[1] == "POPUP" && onestring.match(/^([a-zA-Z ]*(menu|context|popup(?!s)))|([A-Z][a-z]+([A-Z][a-z]*)+)|(new item)$/g)) {

             continue;

@@ -546,7 +546,7 @@ function ParseSourceFile(FileTextVar, array) {
 //filter _T() function results

 function filter_T(string) {

     //filter for exact matched strings

-    var filter1 = /^(&?[Oo][Kk]|AOL|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|MirandaG15|Miranda NG|mRadio|MSN|NickServ|OSD|OTR|PCS|PGP|SMS|SSL|SteamID|Steam Guard|Tox|Twitter|Yahoo|Winamp \(\*\)|Windows|X400)$/g;

+    var filter1 = /^(&?[Oo][Kk]|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|MirandaG15|Miranda NG|mRadio|MSN|NickServ|OSD|OTR|PCS|PGP|SMS|SSL|SteamID|Steam Guard|Tox|Twitter|Yahoo|Winamp \(\*\)|Windows|X400)$/g;

     //filter string starting from following words

     var filter2 = /^(SOFTWARE\\|SYSTEM\\|http|ftp|UTF-|utf-|TEXT|EXE|exe|txt|css|html|dat[^a]|txt|MS\x20|CLVM|TM_|CLCB|CLSID|CLUI|HKEY_|MButton|BUTTON|WindowClass|MHeader|RichEdit|RICHEDIT|STATIC|EDIT|CList|listbox|LISTBOX|combobox|COMBOBOX|TitleB|std\w|iso-|windows-|<div|<html|<img|<span|<hr|<a\x20|<table|<td|miranda_|kernel32|user32|muc|pubsub|shlwapi|Tahoma|NBRichEdit|CreatePopup|&?[Oo][Kk]|<\/|<\w>|\w\\\w|urn\:|<\?xml|<\!|h\d|\.!\.).*$/g;

     //filter string ending with following words