Brisk: new mailed users management.

From 5a7a4f289eed1a6b1e16acf07c92ecf1b0e114cb Mon Sep 17 00:00:00 2001 From: "Matteo Nastasi (mop)" Date: Tue, 27 May 2014 09:20:47 +0200 Subject: [PATCH] resend check email added --- web/Obj/brisk.phh | 4 +- web/usermgmt.php | 134 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 131 insertions(+), 7 deletions(-) diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 6a9547d..a00f700 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -150,10 +150,10 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi', $G_lng = langtolng($G_lang); $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 ); -$G_brisk_version = "4.14.1"; +$G_brisk_version = "4.14.2"; /* MLANG: ALL THE INFO STRINGS IN brisk.phh */ -$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': nuovo sistema di registrazione degli utenti', +$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': nuovo sistema di registrazione degli utenti, aggiunto reinvio dell\' email di verifica', 'Se vuoi iscriverti alla Mailing List, cliccala!' ), 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: new users subscription system.', 'If you want to subscribe our Mailing List, click it!' ) ); diff --git a/web/usermgmt.php b/web/usermgmt.php index 4741ec5..ec9a83e 100644 --- a/web/usermgmt.php +++ b/web/usermgmt.php @@ -47,6 +47,7 @@ require_once($G_base."Obj/brisk.phh"); require_once($G_base."Obj/user.phh"); require_once($G_base."Obj/auth.phh"); require_once($G_base."Obj/mail.phh"); +require_once($G_base."Obj/dbase_base.phh"); require_once($G_base."Obj/dbase_${G_dbasetype}.phh"); require_once($G_base."briskin5/Obj/briskin5.phh"); require_once($G_base."briskin5/Obj/placing.phh"); @@ -105,6 +106,11 @@ function main() { exit; } + $nocheck = FALSE; + if (isset($_GET['f_nocheck'])) { + $nocheck = TRUE; + } + if (isset($_GET['do']) && $_GET['do'] == 'newuser') { if (isset($_POST['f_accept'])) { $action = "accept"; @@ -232,8 +238,9 @@ SELECT usr.*, guar.login AS guar_login for ($i = 0 ; $i < $usr_n ; $i++) { $usr_obj = pg_fetch_object($usr_pg, $i); - $tab_lines .= sprintf("%s%s%s\n", - $usr_obj->code, eschtml($usr_obj->login), eschtml($usr_obj->guar_login), $usr_obj->lintm); + $tab_lines .= sprintf("%s%s%s\n", + $usr_obj->code, ($nocheck ? "" : "CHECKED"), + eschtml($usr_obj->login), eschtml($usr_obj->guar_login), $usr_obj->lintm); } ?> @@ -255,6 +262,123 @@ SELECT usr.*, guar.login AS guar_login + $value) { + if (substr($key, 0, 9) != "f_newuser") + continue; + + $id = (int)substr($key, 9); + if ($id <= 0) + continue; + + $res = FALSE; + do { + if (($bdb = BriskDB::create()) == FALSE) { + $status .= "1
"; + break; + } + // retrieve list added users + $mai_sql = sprintf(" +SELECT mail.*, usr.email AS email + FROM %susers AS usr + JOIN %smails AS mail ON mail.ucode = usr.code + WHERE mail.ucode = %d AND mail.type = %d", + $G_dbpfx, $G_dbpfx, $id, MAIL_TYP_CHECK); + if (($mai_pg = pg_query($bdb->dbconn->db(), $mai_sql)) == FALSE) { + log_crit("retrieve mail failed"); + $status .= "2
"; + break; + } + $mai_n = pg_numrows($mai_pg); + if ($mai_n != 1) { + $status .= sprintf("Inconsistency for code %d, returned %d records, skipped.
", + $id, $mai_n); + break; + } + $mai_obj = pg_fetch_object($mai_pg, 0); + $mail = MailDBItem::MailDBItemFromRecord($mai_obj); + + if (brisk_mail($mai_obj->email, $mail->subj, $mail->body_txt, $mail->body_htm) == FALSE) { + // mail error + $status .= sprintf("Send mail filed for user id %d
\n", $id); + break; + } + $res = TRUE; + } while(FALSE); + if ($res == FALSE) { + $status .= sprintf("Error occurred during resend action
"); + break; + } + } // foreach + } + + do { + if (($bdb = BriskDB::create()) == FALSE) { + log_crit("stat-day: database connection failed"); + break; + } + + // retrieve list added users + $usr_sql = sprintf(" +SELECT usr.*, guar.login AS guar_login + FROM %susers AS usr + JOIN %susers AS guar ON guar.code = usr.guar_code + WHERE ( (usr.type & (CAST (X'%x' as integer))) = (CAST (X'%x' as integer)) ) + AND usr.disa_reas = %d;", + $G_dbpfx, $G_dbpfx, + USER_FLAG_TY_DISABLE, USER_FLAG_TY_DISABLE, + USER_DIS_REA_NU_MAILED); + if (($usr_pg = pg_query($bdb->dbconn->db(), $usr_sql)) == FALSE) { + log_crit("stat-day: select from tournaments failed"); + break; + } + $usr_n = pg_numrows($usr_pg); + $tab_lines = "UserGuarDate"; + for ($i = 0 ; $i < $usr_n ; $i++) { + $usr_obj = pg_fetch_object($usr_pg, $i); + + $tab_lines .= sprintf("%s%s%s\n", + $usr_obj->code, ($nocheck ? "" : "CHECKED"), + eschtml($usr_obj->login), eschtml($usr_obj->guar_login), $usr_obj->lintm); + } + ?> + + + +Brisk: new mailed users management. + + +

New mailed users management.

+ + + + %s%s%s\n", - $usr_obj->code, eschtml($usr_obj->login), eschtml($usr_obj->guar_login), - $usr_obj->lintm); + $tab_lines .= sprintf("%s%s%s\n", + $usr_obj->code, ($nocheck ? "" : "CHECKED"), + eschtml($usr_obj->login), eschtml($usr_obj->guar_login), $usr_obj->lintm); } ?> -- 2.17.1