philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add FORMAT_WHOIS_SECURE for SSL connection info from ratbox, unreal and freenode servers (RPL_WHOISSECURE). Does not support

Browse Source 
hybrid yet because it uses numeric 275, which clashes with unreal's RPL_STATSDLINE.

RIP dmr.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@144 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2011-10-13 12:45:27 +00:00
parent 15f6d8ac06
commit 71cc2bf5f4
5 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog
View File

@@ -1,5 +1,8 @@
[Changes 1.2c01] [Changes 1.2c01]
* Add /FSET WHOIS_SECURE for SSL connection info on ratbox, unreal and
freenode. (caf)
* Add /FSET CHANNEL_URL for services channel URL numeric. (caf) * Add /FSET CHANNEL_URL for services channel URL numeric. (caf)
* Fix crash bug in $mircansi() scripting function. (caf) * Fix crash bug in $mircansi() scripting function. (caf)

3
include/color.h
View File

@@ -308,6 +308,7 @@
#define DEFAULT_FORMAT_WHOIS_SIGNON_FSET "%K: %Ws%nignon %K:%n $0-" #define DEFAULT_FORMAT_WHOIS_SIGNON_FSET "%K: %Ws%nignon %K:%n $0-"
#define DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET "%K| %Wa%nctually %K:%n $0-" #define DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET "%K| %Wa%nctually %K:%n $0-"
#define DEFAULT_FORMAT_WHOIS_CALLERID_FSET "%K! %Wc%nallerid %K:%n $0-" #define DEFAULT_FORMAT_WHOIS_CALLERID_FSET "%K! %Wc%nallerid %K:%n $0-"
#define DEFAULT_FORMAT_WHOIS_SECURE_FSET "%K! %Ws%necure %K:%n $0-"
#define DEFAULT_FORMAT_WHOIS_NAME_FSET "%G<> %Wi%nrcname %K:%n $0-" #define DEFAULT_FORMAT_WHOIS_NAME_FSET "%G<> %Wi%nrcname %K:%n $0-"
#define DEFAULT_FORMAT_WHOIS_NICK_FSET "%G<> %W$0 %K(%n$1@$2%K) (%n$3-%K)" #define DEFAULT_FORMAT_WHOIS_NICK_FSET "%G<> %W$0 %K(%n$1@$2%K) (%n$3-%K)"
#define DEFAULT_FORMAT_WHOIS_OPER_FSET "%K| %Wo%nperator %K:%n $0 $1-" #define DEFAULT_FORMAT_WHOIS_OPER_FSET "%K| %Wo%nperator %K:%n $0 $1-"
@@ -732,6 +733,7 @@
#define DEFAULT_FORMAT_WHOIS_SIGNON_FSET ansi?"%K| %Ws%nignon : $0-":"| signon : $0-" #define DEFAULT_FORMAT_WHOIS_SIGNON_FSET ansi?"%K| %Ws%nignon : $0-":"| signon : $0-"
#define DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET ansi?"%K: %Wa%nctually : $0-":": actually : $0-" #define DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET ansi?"%K: %Wa%nctually : $0-":": actually : $0-"
#define DEFAULT_FORMAT_WHOIS_CALLERID_FSET ansi?"%K! %Wc%nallerid : $0-":"! callerid : $0-" #define DEFAULT_FORMAT_WHOIS_CALLERID_FSET ansi?"%K! %Wc%nallerid : $0-":"! callerid : $0-"
#define DEFAULT_FORMAT_WHOIS_SECURE_FSET ansi?"%K! %Ws%necure : $0-":"! secure : $0-"
#define DEFAULT_FORMAT_WHOIS_NAME_FSET ansi?"%G: %Wi%nrcname : $0-":": ircname : $0-" #define DEFAULT_FORMAT_WHOIS_NAME_FSET ansi?"%G: %Wi%nrcname : $0-":": ircname : $0-"
#define DEFAULT_FORMAT_WHOIS_NICK_FSET ansi?"%G| %W$0 %K(%n$1@$2%K) %K(%W$3-%K)":"| $0 ($1@$2) ($3-)" #define DEFAULT_FORMAT_WHOIS_NICK_FSET ansi?"%G| %W$0 %K(%n$1@$2%K) %K(%W$3-%K)":"| $0 ($1@$2) ($3-)"
#define DEFAULT_FORMAT_WHOIS_OPER_FSET ansi?"%K| %Wo%nperator : $0 $1-":"| operator : $0 $1-" #define DEFAULT_FORMAT_WHOIS_OPER_FSET ansi?"%K| %Wo%nperator : $0 $1-":"| operator : $0 $1-"
@@ -755,6 +757,7 @@
#define DEFAULT_FORMAT_WHOIS_SIGNON_FSET ansi?"%K %Ws%nignon : $0-":" signon : $0-" #define DEFAULT_FORMAT_WHOIS_SIGNON_FSET ansi?"%K %Ws%nignon : $0-":" signon : $0-"
#define DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET ansi?"%K| %Wa%nctually : $0-":"| actually : $0-" #define DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET ansi?"%K| %Wa%nctually : $0-":"| actually : $0-"
#define DEFAULT_FORMAT_WHOIS_CALLERID_FSET ansi?"%K! %Wc%nallerid : $0-":"! callerid : $0-" #define DEFAULT_FORMAT_WHOIS_CALLERID_FSET ansi?"%K! %Wc%nallerid : $0-":"! callerid : $0-"
#define DEFAULT_FORMAT_WHOIS_SECURE_FSET ansi?"%K! %Ws%necure : $0-":"! secure : $0-"
#define DEFAULT_FORMAT_WHOIS_NAME_FSET ansi?"%G<> %Wi%nrcname : $0-":"<02> ircname : $0-" #define DEFAULT_FORMAT_WHOIS_NAME_FSET ansi?"%G<> %Wi%nrcname : $0-":"<02> ircname : $0-"
#define DEFAULT_FORMAT_WHOIS_NICK_FSET ansi?"%G| %W$0 %K(%n$1@$2%K) %K(%W$3-%K)":"| $0 ($1@$2) ($3-)" #define DEFAULT_FORMAT_WHOIS_NICK_FSET ansi?"%G| %W$0 %K(%n$1@$2%K) %K(%W$3-%K)":"| $0 ($1@$2) ($3-)"
#define DEFAULT_FORMAT_WHOIS_OPER_FSET ansi?"%K| %Wo%nperator : $0 $1-":"| operator : $0 $1-" #define DEFAULT_FORMAT_WHOIS_OPER_FSET ansi?"%K| %Wo%nperator : $0 $1-":"| operator : $0 $1-"

1
include/cset.h
View File

@@ -376,6 +376,7 @@ FORMAT_WHOIS_NAME_FSET,
FORMAT_WHOIS_NICK_FSET, FORMAT_WHOIS_NICK_FSET,
FORMAT_WHOIS_OPER_FSET, FORMAT_WHOIS_OPER_FSET,
FORMAT_WHOIS_REGISTER_FSET, FORMAT_WHOIS_REGISTER_FSET,
FORMAT_WHOIS_SECURE_FSET,
FORMAT_WHOIS_SERVER_FSET, FORMAT_WHOIS_SERVER_FSET,
FORMAT_WHOIS_SERVICE_FSET, FORMAT_WHOIS_SERVICE_FSET,
FORMAT_WHOIS_SHIT_FSET, FORMAT_WHOIS_SHIT_FSET,

2
source/fset.c
View File

@@ -253,6 +253,7 @@ IrcVariable fset_array[] =
{ "WHOIS_NICK", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0}, { "WHOIS_NICK", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_OPER", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0}, { "WHOIS_OPER", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_REGISTER", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0}, { "WHOIS_REGISTER", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_SECURE", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_SERVER", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0}, { "WHOIS_SERVER", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_SERVICE", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0}, { "WHOIS_SERVICE", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_SHIT", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0}, { "WHOIS_SHIT", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
@@ -755,6 +756,7 @@ void create_fsets(Window *win, int ansi)
fset_string_var(FORMAT_WHOIS_NAME_FSET, DEFAULT_FORMAT_WHOIS_NAME_FSET); fset_string_var(FORMAT_WHOIS_NAME_FSET, DEFAULT_FORMAT_WHOIS_NAME_FSET);
fset_string_var(FORMAT_WHOIS_NICK_FSET, DEFAULT_FORMAT_WHOIS_NICK_FSET); fset_string_var(FORMAT_WHOIS_NICK_FSET, DEFAULT_FORMAT_WHOIS_NICK_FSET);
fset_string_var(FORMAT_WHOIS_OPER_FSET, DEFAULT_FORMAT_WHOIS_OPER_FSET); fset_string_var(FORMAT_WHOIS_OPER_FSET, DEFAULT_FORMAT_WHOIS_OPER_FSET);
fset_string_var(FORMAT_WHOIS_SECURE_FSET, DEFAULT_FORMAT_WHOIS_SECURE_FSET);
fset_string_var(FORMAT_WHOIS_SERVER_FSET, DEFAULT_FORMAT_WHOIS_SERVER_FSET); fset_string_var(FORMAT_WHOIS_SERVER_FSET, DEFAULT_FORMAT_WHOIS_SERVER_FSET);
fset_string_var(FORMAT_WHOLEFT_HEADER_FSET, DEFAULT_FORMAT_WHOLEFT_HEADER_FSET); fset_string_var(FORMAT_WHOLEFT_HEADER_FSET, DEFAULT_FORMAT_WHOLEFT_HEADER_FSET);
fset_string_var(FORMAT_WHOLEFT_USER_FSET, DEFAULT_FORMAT_WHOLEFT_USER_FSET); fset_string_var(FORMAT_WHOLEFT_USER_FSET, DEFAULT_FORMAT_WHOLEFT_USER_FSET);

6
source/numbers.c
View File

@@ -1676,6 +1676,12 @@ void numbered_command(char *from, int comm, char **ArgList)
display_msg(from, ArgList); display_msg(from, ArgList);
break; break;
} }
case 671: /* #define RPL_WHOISSECURE 671 */
{
/* ratbox / unreal / freenode: <nick> :is using a secure connection */
put_it("%s", convert_output_format(fget_string_var(FORMAT_WHOIS_SECURE_FSET),"%s %s", ArgList[0], ArgList[1]));
break;
}
default: default:
display_msg(from, ArgList); display_msg(from, ArgList);
} }