From e57a97b3b360856cef56884815289531f3bb326f Mon Sep 17 00:00:00 2001 From: "Matteo Nastasi (mop)" Date: Thu, 24 Jul 2014 08:25:28 +0200 Subject: [PATCH] new method nickserv_msg to factorize nickserv messages composition --- web/Obj/brisk.phh | 41 +++++++++++++++++------------------ web/briskin5/Obj/briskin5.phh | 3 +-- web/index_wr.php | 38 ++++++++++++++------------------ 3 files changed, 37 insertions(+), 45 deletions(-) diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 00fde52..9b596a0 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -342,6 +342,10 @@ $G_PG_cons_n = 345; /* printf("\n"); */ /* } */ +function nickserv_msg($dt, $msg) { + return sprintf('chatt_sub("%s",[0x040003,"%s"],"%s");', $dt, NICKSERV, $msg); +} + function passwd_gen($seed = NULL) { GLOBAL $G_PG_vow, $G_PG_vow_n, $G_PG_cons, $G_PG_cons_n; @@ -1598,26 +1602,22 @@ class Brisk $user_tos_vers = $user_item->tos_vers_get(); if (versions_cmp($user_tos_vers, "1.2") < 0) { - $mesg = sprintf('chatt_sub("%s",[2,"%s"],"%s");', - $dt, NICKSERV, sprintf($mlang_brisk['tos_old'][$G_lang], xcape($user_login))); + $mesg = nickserv_msg($dt, sprintf($mlang_brisk['tos_old'][$G_lang], xcape($user_login))); } else if ($guar_login == "") { - $mesg = sprintf('chatt_sub("%s",[2,"%s"],"%s");', - $dt, NICKSERV, sprintf($mlang_brisk['gua_nfd'][$G_lang], xcape($user_login))); + $mesg = nickserv_msg($dt, sprintf($mlang_brisk['gua_nfd'][$G_lang], xcape($user_login))); } else if ($guar_login == $user_login) { - $mesg = sprintf('chatt_sub("%s",[2,"%s"],"%s");', - $dt, NICKSERV, sprintf($mlang_brisk['gua_self'][$G_lang], xcape($user_login))); + $mesg = nickserv_msg($dt, sprintf($mlang_brisk['gua_self'][$G_lang], xcape($user_login))); } else { - $mesg = sprintf('chatt_sub("%s",[2,"%s"],"%s");', - $dt, NICKSERV, sprintf($mlang_brisk['gua_info'][$G_lang], - xcape($user_login), xcape($guar_login))); + $mesg = nickserv_msg($dt, sprintf($mlang_brisk['gua_info'][$G_lang], + xcape($user_login), xcape($guar_login))); } } while (0); if ($ret > 0) { - $mesg = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, sprintf($mlang_brisk['gua_err'][$G_lang], $ret)); + $mesg = nickserv_msg($dt, sprintf($mlang_brisk['gua_err'][$G_lang], $ret)); } $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ".$mesg; @@ -1795,8 +1795,7 @@ class Brisk /* MLANG: "Alarm %s inviato a %s." */ $prestr = sprintf($mlang_brisk['alarret'][$G_lang], xcape(substr($msg, strlen($alarm_check))), ($target == "" ? $mlang_brisk['tit_all'][$G_lang] : xcape($target)) ); - $to_user = sprintf('chatt_sub("%s",[2,"%s"],%s);', - $dt, NICKSERV, $prestr); + $to_user = nickserv_msg($dt, $prestr); $msg = sprintf("
%s

%s

", $dt.NICKSERV, xcape(substr($msg, strlen($alarm_check)))); @@ -1811,7 +1810,7 @@ class Brisk $flags_old = 0; if ($user->stat == 'room' && $user->subst == 'sitdown' && $user->table >= TABLES_AUTH_N) { - $to_user = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['listmust'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['listmust'][$G_lang]); } else { @@ -1844,7 +1843,7 @@ class Brisk } else { /* MLANG: "Per autenticare qualcuno devi a tua volta essere autenticato.", "Il nickname deve contenere almeno una lettera dell\'alfabeto o una cifra.", "Nickname %s già in uso." */ - $to_user = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['authmust'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['authmust'][$G_lang]); } } else if (strncmp($msg, "/mesgtoadm", 8) == 0) { @@ -1853,7 +1852,7 @@ class Brisk } else { /* MLANG: "Per inviare un messaggio devi essere autenticato." */ - $to_user = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['mesgmust'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['mesgmust'][$G_lang]); } } else if (strncmp($msg, "/nick ", 6) == 0) { @@ -1861,7 +1860,7 @@ class Brisk do { if (($name_new = validate_name(substr($msg, 6))) == FALSE) { - $to_user = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['nickmust'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['nickmust'][$G_lang]); break; } @@ -1876,7 +1875,7 @@ class Brisk } if ($i < MAX_PLAYERS) { $prestr = sprintf($mlang_brisk['nickdupl'][$G_lang], xcape($name_new)); - $to_user = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $prestr); + $to_user = nickserv_msg($dt, $prestr); break; } @@ -1894,7 +1893,7 @@ class Brisk } } else { - $to_user = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['authchan'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['authchan'][$G_lang]); break; } } @@ -1907,7 +1906,7 @@ class Brisk /* MLANG: "Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN." */ if ($bdb->login_exists($name_new)) { $prestr = sprintf($mlang_brisk['nickjust'][$G_lang], xcape($name_new)); - $to_user .= sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $prestr); + $to_user .= nickserv_msg($dt, $prestr); } } } @@ -1978,7 +1977,7 @@ class Brisk } else { /* MLANG: "Questo stato non esiste." */ - $to_user = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['statunkn'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['statunkn'][$G_lang]); break; } @@ -3090,7 +3089,7 @@ function root_welcome($user) $dt = date("H:i ", $curtime); for ($i = 0 ; $i < count($root_wellarr[$G_lang]) ; $i++) - $ret .= sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, str_replace('"', '\"', $root_wellarr[$G_lang][$i])); + $ret .= nickserv_msg($dt, str_replace('"', '\"', $root_wellarr[$G_lang][$i])); return ($ret); } diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh index fc1b2a8..05ecdf1 100644 --- a/web/briskin5/Obj/briskin5.phh +++ b/web/briskin5/Obj/briskin5.phh @@ -791,8 +791,7 @@ class Bin5_table extends Table { continue; $user_cur = &$bri->user[$this->player[$i]]; $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; "; - $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', - $dt, NICKSERV, $msg); + $user_cur->comm[$user_cur->step % COMM_N] .= nickserv_msg($dt, $msg); $user_cur->step_inc(); } } diff --git a/web/index_wr.php b/web/index_wr.php index 4ababaa..eae9bfe 100644 --- a/web/index_wr.php +++ b/web/index_wr.php @@ -318,7 +318,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie) } else { /* MLANG: "E\' occorso un errore durante il salvataggio, riprova o contatta l\'amministratore." */ - $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['commerr'][$G_lang]); + $mesg_to_user = nickserv_msg($dt, $mlang_indwr['commerr'][$G_lang]); } } // 0 == 1 else { @@ -333,10 +333,9 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie) // check for already used fields if (($idret = $bdb->check_record_by_login_or_email($cli_name, $cli_email)) != 0) { - $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, - ($idret == 1 ? "login già in uso" : - ($idret == 2 ? "email già utilizzata" : "errore sconosciuto")) - ); + $mesg_to_user = nickserv_msg($dt, ($idret == 1 ? "login già in uso" : + ($idret == 2 ? "email già utilizzata" + : "errore sconosciuto"))); break; } $bdb->transaction('BEGIN'); @@ -389,7 +388,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie) } else { /* MLANG: "Per autenticare qualcuno devi a tua volta essere autenticato." */ - $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['warrmust'][$G_lang]); + $mesg_to_user = nickserv_msg($dt, $mlang_indwr['warrmust'][$G_lang]); } if ($mesg_to_user != "") { @@ -436,19 +435,19 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie) } else { /* MLANG: "Il database è temporaneamente irraggiungibile, riprova più tardi o contatta l\'amministratore." */ - $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['coerrdb'][$G_lang]); + $mesg_to_user = nickserv_msg($dt, $mlang_indwr['coerrdb'][$G_lang]); $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; "; } } else { /* MLANG: "E\' occorso un errore durante il salvataggio, riprova o contatta l\'amministratore." */ - $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['commerr'][$G_lang]); + $mesg_to_user = nickserv_msg($dt, $mlang_indwr['commerr'][$G_lang]); } } else { /* MLANG: "Per autenticare qualcuno devi a tua volta essere autenticato." */ - $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['mesgmust'][$G_lang]); + $mesg_to_user = nickserv_msg($dt, $mlang_indwr['mesgmust'][$G_lang]); } if ($mesg_to_user != "") { @@ -492,7 +491,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie) log_wr("INFO:SKIP:argz == poll name: [".$cli_poll_name."] AUTH: ".$user->is_auth()); if ( ! $user->is_auth() ) { // MLANG: Per partecipare al sondaggio devi essere autenticato. - $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['pollmust'][$G_lang]); + $mesg_to_user = nickserv_msg($dt, $mlang_indwr['pollmust'][$G_lang]); log_wr("break1"); break; } @@ -511,7 +510,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie) if (($poll_lock = Poll::lock_data(TRUE)) == FALSE) { /* MLANG: "E\' occorso un errore durante il salvataggio, riprova o contatta l\'amministratore." */ - $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['commerr'][$G_lang]); + $mesg_to_user = nickserv_msg($dt, $mlang_indwr['commerr'][$G_lang]); log_wr("break3"); break; } @@ -520,7 +519,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie) $fp = @fopen(LEGAL_PATH."/".$G_poll_name.".txt", 'w+'); if ($fp == FALSE) { - $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['commerr'][$G_lang]); + $mesg_to_user = nickserv_msg($dt, $mlang_indwr['commerr'][$G_lang]); log_wr("break4"); break; } @@ -694,25 +693,20 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie) $not_allowed_msg = ""; if ($G_shutdown) { - $not_allowed_msg = sprintf('chatt_sub("%s", [2, "%s"],"%s");', - $dt, NICKSERV, $mlang_indwr['shutmsg'][$G_lang]); + $not_allowed_msg = nickserv_msg($dt, $mlang_indwr['shutmsg'][$G_lang]); } else if ($table->wakeup_time > $curtime) { - $not_allowed_msg = sprintf('chatt_sub("%s", [2, "%s"],"%s%d%s");', - $dt, NICKSERV, $mlang_indwr['tabwait_a'][$G_lang], + $not_allowed_msg = nickserv_msg($dt, $mlang_indwr['tabwait_a'][$G_lang], $table->wakeup_time - $curtime, $mlang_indwr['tabwait_b'][$G_lang]); } else if ($table->auth_type == TABLE_AUTH_TY_CERT && ( ! $user->is_cert() ) ) { - $not_allowed_msg = sprintf('chatt_sub("%s", [2, "%s"],"%s");', - $dt, NICKSERV, $mlang_indwr['mustcert'][$G_lang]); + $not_allowed_msg = nickserv_msg($dt, $mlang_indwr['mustcert'][$G_lang]); } else if ($table->auth_type == TABLE_AUTH_TY_AUTH && ( ! $user->is_auth() ) ) { - $not_allowed_msg = sprintf('chatt_sub("%s", [2, "%s"],"%s");', - $dt, NICKSERV, $mlang_indwr['mustauth'][$G_lang]); + $not_allowed_msg = nickserv_msg($dt, $mlang_indwr['mustauth'][$G_lang]); } else if ($user->flags & USER_FLAG_TY_FIRONLY && $table->player_n > 0) { - $not_allowed_msg = sprintf('chatt_sub("%s", [2, "%s"], "%s");', - $dt, NICKSERV, $mlang_indwr['mustfirst'][$G_lang]); + $not_allowed_msg = nickserv_msg($dt, $mlang_indwr['mustfirst'][$G_lang]); } if ($not_allowed_msg != "") { $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ".$not_allowed_msg; -- 2.17.1