X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fusermgmt.php;h=24948a135f3ead414c8ca09b2af43f7d57011109;hb=e05f4fd4c244ac0a8db49584315212231e03bf80;hp=413e173d850e69ba06c8b00c72bdf0509a54162a;hpb=d30248bea653c6a0d4f784810dda00b660368941;p=brisk.git
diff --git a/web/usermgmt.php b/web/usermgmt.php
index 413e173..24948a1 100644
--- a/web/usermgmt.php
+++ b/web/usermgmt.php
@@ -22,6 +22,30 @@
*
*/
+foreach (array("HTTP_HOST", "DOCUMENT_ROOT") as $i) {
+ if (isset($_SERVER[$i])) {
+ $$i = $_SERVER[$i];
+ }
+ }
+
+foreach (array("pazz") as $i) {
+ if (isset($_POST[$i])) {
+ $$i = $_POST[$i];
+ }
+ }
+
+foreach (array("sess") as $i) {
+ if (isset($_COOKIE[$i])) {
+ $$i = $_COOKIE[$i];
+ }
+ }
+
+foreach (array("sess") as $i) {
+ if (isset($_COOKIE[$i])) {
+ $$i = $_COOKIE[$i];
+ }
+ }
+
$G_base = "";
$mlang_umgmt = array( 'nu_psubj' => array( 'it' => 'Brisk: credenziali di accesso.',
@@ -35,7 +59,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 +71,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");
@@ -59,7 +84,12 @@ function check_auth()
$socket = FALSE;
$ret = FALSE;
- $ip = $_SERVER["REMOTE_ADDR"];
+ if (array_key_exists("HTTP_X_REAL_IP", $_SERVER)) {
+ $ip = $_SERVER["HTTP_X_REAL_IP"];
+ }
+ else {
+ $ip = $_SERVER["REMOTE_ADDR"];
+ }
$stp = 0;
$private = md5($G_alarm_passwd.$ip.$sess);
$cmd = array ("cmd" => "userauth", "sess" => $sess, "private" => $private, "the_end" => "true");
@@ -67,7 +97,7 @@ function check_auth()
$cmd_len = mb_strlen($cmd_ser, "ASCII");
do {
- if (($socket = stream_socket_client("unix://".USOCK_PATH."2")) == FALSE)
+ if (($socket = stream_socket_client('unix://'.USOCK_PATH_PFX.'_admin.sock')) == FALSE)
break;
$stp = 1;
if (($rwr = fwrite($socket, $cmd_ser, $cmd_len)) == FALSE
@@ -93,10 +123,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_proto, $G_domain, $G_webbase;
GLOBAL $mlang_umgmt, $mlang_indwr, $f_mailusers, $sess, $_POST, $_SERVER;
+
$curtime = time();
$status = "";
@@ -105,6 +149,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 +186,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 +208,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;
}
@@ -172,13 +221,21 @@ SELECT usr.*, guar.login AS guar_login
}
$hash = md5($curtime . $G_alarm_passwd . $usr_obj->login . $usr_obj->email);
- $confirm_page = sprintf("http://%s/%s/mailmgr.php?f_act=checkmail&f_code=%d&f_hash=%s",
- $G_domain, $G_webbase, $mail_code, $hash);
+ $confirm_page = sprintf("%s://%s/%s/mailmgr.php?f_act=checkmail&f_code=%d&f_hash=%s",
+ $G_proto, $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],
+ $usr_obj->login, $confirm_page);
+ $body_htm = sprintf($mlang_indwr['ap_mhtml'][$G_lang],
+ $usr_obj->login, $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);
@@ -205,7 +262,75 @@ SELECT usr.*, guar.login AS guar_login
break;
}
}
- }
+ } // else if ($action == "accept") {
+ else if ($action == "delete") {
+ foreach($_POST as $key => $value) {
+ if (substr($key, 0, 9) != "f_newuser")
+ continue;
+
+ $id = (int)substr($key, 9);
+ if ($id <= 0)
+ continue;
+
+ // check existence of username or email
+ $is_trans = FALSE;
+ $res = FALSE;
+ do {
+ if (($bdb = BriskDB::create()) == FALSE)
+ 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 AND usr.code = %d;",
+ $G_dbpfx, $G_dbpfx,
+ USER_FLAG_TY_DISABLE, USER_FLAG_TY_DISABLE,
+ USER_DIS_REA_NU_ADDED, $id);
+ 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);
+ if ($usr_n != 1) {
+ $status .= sprintf("Inconsistency for code %d, returned %d records, skipped.
",
+ $id, $usr_n);
+ break;
+ }
+
+ $usr_obj = pg_fetch_object($usr_pg, 0);
+
+ $bdb->transaction('BEGIN');
+ $is_trans = TRUE;
+
+ // retrieve list added users
+ $usr_sql = sprintf("
+ DELETE FROM %susers
+ WHERE (type & (CAST (X'%x' as integer))) = (CAST (X'%x' as integer))
+ AND disa_reas = %d AND code = %d;",
+ $G_dbpfx, USER_FLAG_TY_DISABLE, USER_FLAG_TY_DISABLE,
+ USER_DIS_REA_NU_ADDED, $id);
+ if (($usr_pg = pg_query($bdb->dbconn->db(), $usr_sql)) == FALSE) {
+ log_crit(sprintf("Delete of user %d failed", $id));
+ break;
+ }
+
+ $status .= sprintf("User %s removed: SUCCESS
", $usr_obj->login);
+ $bdb->transaction('COMMIT');
+ $res = TRUE;
+ } while(FALSE);
+ if ($res == FALSE) {
+ $status .= sprintf("Error occurred during delete action
");
+ if ($is_trans)
+ $bdb->transaction('ROLLBACK');
+ break;
+ }
+ }
+ } // else if ($action == "accept") {
+
+
do {
if (($bdb = BriskDB::create()) == FALSE) {
@@ -218,8 +343,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);
@@ -228,20 +353,28 @@ SELECT usr.*, guar.login AS guar_login
break;
}
$usr_n = pg_numrows($usr_pg);
- $tab_lines = "";
+ $tab_lines = "