From c8b2ef7b899766d04562f7e04a84251cea8fa701 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 6 Apr 2013 13:14:44 +0200 Subject: tagging ychat-0.8.0 --- src/mods/html/yc_options.cpp | 81 ++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 40 deletions(-) (limited to 'src/mods/html/yc_options.cpp') diff --git a/src/mods/html/yc_options.cpp b/src/mods/html/yc_options.cpp index 638a2f7..ec9ab5e 100755 --- a/src/mods/html/yc_options.cpp +++ b/src/mods/html/yc_options.cpp @@ -6,50 +6,51 @@ using namespace std; -extern "C" { - int extern_function(void *v_arg) - { - container* c = (container*) v_arg; - dynamic_wrap* p_wrap = (dynamic_wrap*) c->elem[0]; - conf* p_conf = (conf*) p_wrap->CONF; - string* p_flag = &(*((hashmap*) c->elem[1]))["flag"]; - string* p_email = &(*((hashmap*) c->elem[1]))["email"]; - string* p_pass = &(*((hashmap*) c->elem[1]))["pass"]; - string* p_newpass = &(*((hashmap*) c->elem[1]))["newpass"]; - string* p_newpass2 = &(*((hashmap*) c->elem[1]))["newpass2"]; - user* p_user = (user*) c->elem[2]; - - if ( *p_flag == "submit" ) +extern "C" +{ + int extern_function(void *v_arg) + { + container* c = (container*) v_arg; + dynamic_wrap* p_wrap = (dynamic_wrap*) c->elem[0]; + conf* p_conf = (conf*) p_wrap->CONF; + string* p_flag = &(*((map*) c->elem[1]))["flag"]; + string* p_email = &(*((map*) c->elem[1]))["email"]; + string* p_pass = &(*((map*) c->elem[1]))["pass"]; + string* p_newpass = &(*((map*) c->elem[1]))["newpass"]; + string* p_newpass2 = &(*((map*) c->elem[1]))["newpass2"]; + user* p_user = (user*) c->elem[2]; + + if ( *p_flag == "submit" ) + { + string* p_msgs = &(*((map*) c->elem[1]) + )["msgs"]; + + // If the password has to be changed: + if ( *p_pass != "" || *p_newpass != "" || *p_newpass2 != "" ) + { + if ( p_user->get_pass() != *p_pass ) { - string* p_msgs = &(*((hashmap*) c->elem[1]))["msgs"]; - - // If the password has to be changed: - if ( *p_pass != "" || *p_newpass != "" || *p_newpass2 != "" ) - { - if ( p_user->get_pass() != *p_pass ) - { - p_msgs->append( p_conf->get_elem( "chat.msgs.err.changepassword" ) ); - return 0; - } - - if ( *p_newpass != *p_newpass2 ) - { - p_msgs->append( p_conf->get_elem( "chat.msgs.err.changepassword2" ) ); - return 0; - } - p_user->set_pass( *p_newpass ); - } - - p_user->set_email( *p_email ); - p_msgs->append( p_conf->get_elem( "chat.msgs.optionschanged" ) ); + p_msgs->append( p_conf->get_elem( "chat.msgs.err.changepassword" ) ); + return 0; } - else + if ( *p_newpass != *p_newpass2 ) { - p_email->append( p_user->get_email() ); + p_msgs->append( p_conf->get_elem( "chat.msgs.err.changepassword2" ) ); + return 0; } - - return 0; - } + p_user->set_pass( *p_newpass ); + } + + p_user->set_email( *p_email ); + p_msgs->append( p_conf->get_elem( "chat.msgs.optionschanged" ) ); + } + else + { + p_email->append( p_user->get_email() ); + } + + return 0; + } } -- cgit v1.2.3