projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
garbage_timeout variable replaces file storaged value
[brisk.git]
/
web
/
Obj
/
dbase_pgsql.phh
diff --git
a/web/Obj/dbase_pgsql.phh
b/web/Obj/dbase_pgsql.phh
index
004edb9
..
ba59e9a
100644
(file)
--- a/
web/Obj/dbase_pgsql.phh
+++ b/
web/Obj/dbase_pgsql.phh
@@
-2,7
+2,7
@@
/*
* brisk - dbase_pgsql.phh
*
/*
* brisk - dbase_pgsql.phh
*
- * Copyright (C) 2006-201
1
Matteo Nastasi
+ * Copyright (C) 2006-201
2
Matteo Nastasi
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
@@
-55,7
+55,7
@@
class DBConn
}
$out = new DBConn();
}
$out = new DBConn();
-
+
return $out;
}
function db()
return $out;
}
function db()
@@
-84,8
+84,9
@@
class BriskDB
log_main("BriskDB create:start");
do {
log_main("BriskDB create:start");
do {
- if (($dbconn = DBConn::create()) == FALSE)
+ if (($dbconn = DBConn::create()) == FALSE)
{
break;
break;
+ }
$ret = new BriskDB($dbconn);
} while (0);
$ret = new BriskDB($dbconn);
} while (0);
@@
-150,29
+151,22
@@
class BriskDB
log_main("login[".$user_obj->code."]: ".$user_obj->login);
/* if it exists check for a valid challenge */
log_main("login[".$user_obj->code."]: ".$user_obj->login);
/* if it exists check for a valid challenge */
- if (($a_sem = Challenges::lock_data()) != FALSE) {
- // error_log("loop-2", 0);
+ if (($a_sem = Challenges::lock_data(TRUE)) != FALSE) {
if (($chals = &Challenges::load_data()) != FALSE) {
if (($chals = &Challenges::load_data()) != FALSE) {
- // error_log("loop-1", 0);
for ($e = 0 ; $e < $chals->item_n ; $e++) {
for ($e = 0 ; $e < $chals->item_n ; $e++) {
- // error_log("loop", 0);
log_main("challenge[".$e."]: ".$chals->item[$e]->login);
if (strcmp($login, $chals->item[$e]->login) == 0) {
log_main("challenge[".$e."]: ".$chals->item[$e]->login);
if (strcmp($login, $chals->item[$e]->login) == 0) {
- // error_log("loop2", 0);
log_main("login_verify [".$pass."] with [".md5($chals->item[$e]->token.$user_obj->pass)."]");
if (strcmp($pass, md5($chals->item[$e]->token.$user_obj->pass)) == 0) {
log_main("login_verify [".$pass."] with [".md5($chals->item[$e]->token.$user_obj->pass)."]");
if (strcmp($pass, md5($chals->item[$e]->token.$user_obj->pass)) == 0) {
- // error_log("loop3", 0);
log_main("login_verify SUCCESS for ".$login);
$chals->rem($login);
$ret = LoginDBItem::LoginDBItemFromRecord($user_obj);
log_main("login_verify SUCCESS for ".$login);
$chals->rem($login);
$ret = LoginDBItem::LoginDBItemFromRecord($user_obj);
- // error_log("dbitem: ".print_r($ret, TRUE));
break;
}
}
} // end for ($e = 0 ...
break;
}
}
} // end for ($e = 0 ...
- // error_log("end loop-1", 0);
}
if ($chals->ismod()) {
}
if ($chals->ismod()) {