X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fusermgmt.php;h=3f52c363110f254fefe9166e51d8369967702d69;hb=4d039a689e6a9a735608bffba118bfbab1fafb10;hp=4741ec5e60a5f5897a766d2bc2381707f50254f0;hpb=ae6cd6df390ee9272ea19459da9a28f0fb97fabb;p=brisk.git
diff --git a/web/usermgmt.php b/web/usermgmt.php
index 4741ec5..3f52c36 100644
--- a/web/usermgmt.php
+++ b/web/usermgmt.php
@@ -35,7 +35,7 @@ d\'ora in poi potrai utilizzare l\' utente \'%s\' e la password \'%s\'.
Benvenuto e buone partite, mop.',
'en' => 'EN ptext [%s] [%s]'),
'nu_phtml' => array( 'it' => 'Ciao, sono l\' amministratore del sito di Brisk.
-La verifica del tuo indirizzo di posta elettronica e del tuo nickname è andata a buon fine, per accedere al sito d\'ora in poi potrai usare l\' utente \'%s\' e la password \'%s\'.
+La verifica del tuo indirizzo di posta elettronica e del tuo nickname è andata a buon fine.
Per accedere al sito d\'ora in poi potrai usare l\' utente \'%s\' e la password \'%s\'.
Benvenuto e buone partite, mop.
',
'en' => 'EN phtml [%s] [%s]')
);
@@ -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");
@@ -93,10 +94,24 @@ function check_auth()
return ($ret);
}
+$s_style = "
+";
+
function main() {
- GLOBAL $G_dbpfx, $G_lang, $G_alarm_passwd, $G_domain, $G_webbase;
+ GLOBAL $s_style, $G_dbpfx, $G_lang, $G_alarm_passwd, $G_domain, $G_webbase;
GLOBAL $mlang_umgmt, $mlang_indwr, $f_mailusers, $sess, $_POST, $_SERVER;
+
$curtime = time();
$status = "";
@@ -105,6 +120,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";
@@ -137,7 +157,7 @@ function main() {
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)) )
+ WHERE usr.type & (CAST (X'%x' as integer)) = (CAST (X'%x' as integer))
AND usr.disa_reas = %d AND usr.code = %d;",
$G_dbpfx, $G_dbpfx,
USER_FLAG_TY_DISABLE, USER_FLAG_TY_DISABLE,
@@ -159,9 +179,9 @@ SELECT usr.*, guar.login AS guar_login
$is_trans = TRUE;
- if (($bdb->user_update_flag_ty($usr_obj->code,
- USER_FLAG_TY_DISABLE, USER_DIS_REA_NU_ADDED,
- USER_FLAG_TY_DISABLE, USER_DIS_REA_NU_MAILED)) == FALSE) {
+ if (($bdb->user_update_flag_ty($usr_obj->code, USER_FLAG_TY_DISABLE,
+ TRUE, USER_DIS_REA_NU_ADDED,
+ TRUE, USER_DIS_REA_NU_MAILED)) == FALSE) {
echo "fail 2
";
break;
}
@@ -175,10 +195,18 @@ SELECT usr.*, guar.login AS guar_login
$confirm_page = sprintf("http://%s/%s/mailmgr.php?f_act=checkmail&f_code=%d&f_hash=%s",
$G_domain, $G_webbase, $mail_code, $hash);
$subj = $mlang_indwr['nu_msubj'][$G_lang];
- $body_txt = sprintf($mlang_indwr['nu_mtext'][$G_lang],
- $usr_obj->guar_login, $usr_obj->login, $confirm_page);
- $body_htm = sprintf($mlang_indwr['nu_mhtml'][$G_lang],
- $usr_obj->guar_login, $usr_obj->login, $confirm_page);
+ if (($usr_obj->type & USER_FLAG_TY_APPR) == USER_FLAG_TY_APPR) {
+ $body_txt = sprintf($mlang_indwr['ap_mtext'][$G_lang],
+ $cli_name, $confirm_page);
+ $body_htm = sprintf($mlang_indwr['ap_mhtml'][$G_lang],
+ $cli_name, $confirm_page);
+ }
+ else {
+ $body_txt = sprintf($mlang_indwr['nu_mtext'][$G_lang],
+ $usr_obj->guar_login, $usr_obj->login, $confirm_page);
+ $body_htm = sprintf($mlang_indwr['nu_mhtml'][$G_lang],
+ $usr_obj->guar_login, $usr_obj->login, $confirm_page);
+ }
$mail_item = new MailDBItem($mail_code, $usr_obj->code, MAIL_TYP_CHECK,
$curtime, $subj, $body_txt, $body_htm, $hash);
@@ -218,8 +246,8 @@ SELECT usr.*, guar.login AS guar_login
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;",
+ WHERE usr.type & (CAST (X'%x' as integer)) = (CAST (X'%x' as integer))
+ AND usr.disa_reas = %d ORDER BY usr.lintm;",
$G_dbpfx, $G_dbpfx,
USER_FLAG_TY_DISABLE, USER_FLAG_TY_DISABLE,
USER_DIS_REA_NU_ADDED);
@@ -232,20 +260,24 @@ 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("