diff options
Diffstat (limited to 'src/mods/html')
| -rw-r--r-- | src/mods/html/yc_admin.cpp | 4 | ||||
| -rwxr-xr-x | src/mods/html/yc_colors.cpp | 10 | ||||
| -rwxr-xr-x | src/mods/html/yc_help.cpp | 4 | ||||
| -rwxr-xr-x | src/mods/html/yc_options.cpp | 14 | ||||
| -rwxr-xr-x | src/mods/html/yc_register.cpp | 18 |
5 files changed, 20 insertions, 30 deletions
diff --git a/src/mods/html/yc_admin.cpp b/src/mods/html/yc_admin.cpp index b6b979e..1709c6b 100644 --- a/src/mods/html/yc_admin.cpp +++ b/src/mods/html/yc_admin.cpp @@ -21,7 +21,7 @@ extern "C" { dynamic_wrap* p_wrap = (dynamic_wrap*) c->elem[0]; user* p_user = (user*) c->elem[2]; conf* p_conf = (conf*) p_wrap->CONF; - string* p_content = &(*((map<string,string>*) c->elem[1]))["content"]; + string* p_content = &(*((map_string*) c->elem[1]))["content"]; vector<string>* p_vec_keys = p_conf->get_key_vector(); sort(p_vec_keys->begin(), p_vec_keys->end()); @@ -62,8 +62,6 @@ extern "C" { } // while p_content->append( "</table>\n<br>\n" ); - - return 0; } } diff --git a/src/mods/html/yc_colors.cpp b/src/mods/html/yc_colors.cpp index 6d2c5ab..6b2f11b 100755 --- a/src/mods/html/yc_colors.cpp +++ b/src/mods/html/yc_colors.cpp @@ -12,9 +12,9 @@ extern "C" { container* c = (container*) v_arg; dynamic_wrap* p_wrap = (dynamic_wrap*) c->elem[0]; conf* p_conf = (conf*) p_wrap->CONF; - string* p_col1 = &(*((map<string,string>*) c->elem[1]))["col1"]; - string* p_col2 = &(*((map<string,string>*) c->elem[1]))["col2"]; - string* p_flag = &(*((map<string,string>*) c->elem[1]))["flag"]; + string* p_col1 = &(*((map_string*) c->elem[1]))["col1"]; + string* p_col2 = &(*((map_string*) c->elem[1]))["col2"]; + string* p_flag = &(*((map_string*) c->elem[1]))["flag"]; user* p_user = (user*) c->elem[2]; p_col1->erase(0); @@ -25,11 +25,9 @@ extern "C" { if ( *p_flag == "submit" ) { - string* p_msgs = &(*((map<string,string>*) c->elem[1]))["msgs"]; + string* p_msgs = &(*((map_string*) c->elem[1]))["msgs"]; p_msgs->append( p_conf->get_elem( "chat.msgs.optionschanged" ) ); } - - return 0; } } diff --git a/src/mods/html/yc_help.cpp b/src/mods/html/yc_help.cpp index 4d6db03..acb10c2 100755 --- a/src/mods/html/yc_help.cpp +++ b/src/mods/html/yc_help.cpp @@ -15,7 +15,7 @@ extern "C" { modl* p_modl = (modl*) p_wrap->MODL; conf* p_conf = (conf*) p_wrap->CONF; chat* p_chat = (chat*) p_wrap->CHAT; - string* s_content = &(*((map<string,string>*) c->elem[1]))["content"]; + string* s_content = &(*((map_string*) c->elem[1]))["content"]; vector<string>* p_vec_keys = p_modl->get_mod_vector(); @@ -41,8 +41,6 @@ extern "C" { } p_vec_keys_iter++; } - - return 0; } } diff --git a/src/mods/html/yc_options.cpp b/src/mods/html/yc_options.cpp index 47c3153..86aa8b9 100755 --- a/src/mods/html/yc_options.cpp +++ b/src/mods/html/yc_options.cpp @@ -12,16 +12,16 @@ extern "C" { 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<string,string>*) c->elem[1]))["flag"]; - string* p_email = &(*((map<string,string>*) c->elem[1]))["email"]; - string* p_pass = &(*((map<string,string>*) c->elem[1]))["pass"]; - string* p_newpass = &(*((map<string,string>*) c->elem[1]))["newpass"]; - string* p_newpass2 = &(*((map<string,string>*) c->elem[1]))["newpass2"]; + string* p_flag = &(*((map_string*) c->elem[1]))["flag"]; + string* p_email = &(*((map_string*) c->elem[1]))["email"]; + string* p_pass = &(*((map_string*) c->elem[1]))["pass"]; + string* p_newpass = &(*((map_string*) c->elem[1]))["newpass"]; + string* p_newpass2 = &(*((map_string*) c->elem[1]))["newpass2"]; user* p_user = (user*) c->elem[2]; if ( *p_flag == "submit" ) { - string* p_msgs = &(*((map<string,string>*) c->elem[1]))["msgs"]; + string* p_msgs = &(*((map_string*) c->elem[1]))["msgs"]; // If the password has to be changed: if ( *p_pass != "" || *p_newpass != "" || *p_newpass2 != "" ) @@ -48,8 +48,6 @@ extern "C" { { p_email->append( p_user->get_email() ); } - - return 0; } } diff --git a/src/mods/html/yc_register.cpp b/src/mods/html/yc_register.cpp index 5d65b50..98f2b85 100755 --- a/src/mods/html/yc_register.cpp +++ b/src/mods/html/yc_register.cpp @@ -14,12 +14,12 @@ extern "C" { dynamic_wrap* p_wrap = (dynamic_wrap*) c->elem[0]; conf* p_conf = (conf*) p_wrap->CONF; data* p_data = (data*) p_wrap->DATA; - string* p_msgs = &(*((map<string,string>*) c->elem[1]))["INFO"]; - string* p_nick = &(*((map<string,string>*) c->elem[1]))["nick"]; - string* p_email = &(*((map<string,string>*) c->elem[1]))["email"]; - string* p_pass = &(*((map<string,string>*) c->elem[1]))["pass"]; - string* p_pass2 = &(*((map<string,string>*) c->elem[1]))["pass2"]; - string* p_request = &(*((map<string,string>*) c->elem[1]))["request"]; + string* p_msgs = &(*((map_string*) c->elem[1]))["INFO"]; + string* p_nick = &(*((map_string*) c->elem[1]))["nick"]; + string* p_email = &(*((map_string*) c->elem[1]))["email"]; + string* p_pass = &(*((map_string*) c->elem[1]))["pass"]; + string* p_pass2 = &(*((map_string*) c->elem[1]))["pass2"]; + string* p_request = &(*((map_string*) c->elem[1]))["request"]; user* p_user = (user*) c->elem[2]; string s_nick = *p_nick; @@ -57,7 +57,7 @@ extern "C" { else { - map<string,string> result_map = p_data->select_user_data( *p_nick, "selectnick" ); + map_string result_map = p_data->select_user_data( *p_nick, "selectnick" ); if (result_map["nick"] == *p_nick) { p_msgs->append( p_conf->get_elem( "chat.msgs.err.registerexists" ) ); @@ -69,7 +69,7 @@ extern "C" { p_msgs->append( p_conf->get_elem( "chat.msgs.registernick" ) ); p_request->replace( 0, p_request->length(), p_conf->get_elem("httpd.startsite") ); - map<string,string> map_insert = *((map<string,string>*) c->elem[1]); + map_string map_insert = *((map_string*) c->elem[1]); map_insert["password"] = *p_pass; map_insert["color1"] = p_conf->get_elem("chat.html.user.color1"); map_insert["color2"] = p_conf->get_elem("chat.html.user.color2"); @@ -85,8 +85,6 @@ extern "C" { p_data->insert_user_data( *p_nick, "registernick", map_insert ); } } - - return 0; #endif } } |
