projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
load_data return allways, all exit() calls removed, all load_data calls are protected
[brisk.git]
/
web
/
Obj
/
auth.phh
diff --git
a/web/Obj/auth.phh
b/web/Obj/auth.phh
index
29769a2
..
8e74ffd
100644
(file)
--- a/
web/Obj/auth.phh
+++ b/
web/Obj/auth.phh
@@
-47,6
+47,8
@@
class Challenge {
}
class Challenges {
}
class Challenges {
+ static $delta_t;
+
var $item;
var $item_n;
var $mod;
var $item;
var $item_n;
var $mod;
@@
-70,13
+72,13
@@
class Challenges {
log_auth("xxx", sprintf("Challenges::add [%s]\n", $login));
// FIXME Checks here
if ($login == '') {
log_auth("xxx", sprintf("Challenges::add [%s]\n", $login));
// FIXME Checks here
if ($login == '') {
- return (
$G_false
);
+ return (
FALSE
);
}
// log_auth("xxx", "LOOPI tstamp: ".$this->item[$i]->tstamp." curtime: ".$curtime);
}
// log_auth("xxx", "LOOPI tstamp: ".$this->item[$i]->tstamp." curtime: ".$curtime);
- if (($chal = new Challenge($login, $token, $ip, $tstamp)) ==
null
) {
- return (
$G_false
);
+ if (($chal = new Challenge($login, $token, $ip, $tstamp)) ==
FALSE
) {
+ return (
FALSE
);
}
$this->item[$this->item_n] = $chal;
}
$this->item[$this->item_n] = $chal;
@@
-151,7
+153,7
@@
class Challenges {
}
// Static functions
}
// Static functions
- static function
&
create()
+ static function create()
{
$chal =& new Challenges();
{
$chal =& new Challenges();
@@
-160,14
+162,12
@@
class Challenges {
return $chal;
}
return $chal;
}
- function
&
load_data()
+ function load_data()
{
{
- GLOBAL $G_false, $sess;
- $doexit = FALSE;
+ GLOBAL $sess;
do {
if (($tok = @ftok(FTOK_PATH."/challenges", "B")) == -1) {
log_main("ftok failed");
do {
if (($tok = @ftok(FTOK_PATH."/challenges", "B")) == -1) {
log_main("ftok failed");
- $doexit = TRUE;
break;
}
break;
}
@@
-199,18
+199,14
@@
class Challenges {
$chals->garbage_manager();
$chals->garbage_manager();
- $ret = &$chals;
- return ($ret);
+ return ($chals);
} while (0);
} while (0);
- if ($doexit)
- exit();
-
- return ($G_false);
+ return (FALSE);
}
}
- function save_data(
&
$chals)
+ function save_data($chals)
{
$shm = FALSE;
$oldmod = $chals->mod;
{
$shm = FALSE;
$oldmod = $chals->mod;
@@
-256,7
+252,8
@@
class Challenges {
return (FALSE);
}
if (sem_acquire($res)) {
return (FALSE);
}
if (sem_acquire($res)) {
- log_lock("LOCK challenges");
+ self::$delta_t = microtime(TRUE);
+ log_lock("LOCK challenges [".self::$delta_t."]");
return ($res);
}
else
return ($res);
}
else
@@
-267,7
+264,7
@@
class Challenges {
{
GLOBAL $sess;
{
GLOBAL $sess;
- log_lock("UNLOCK challenges");
+ log_lock("UNLOCK challenges
[".(microtime(TRUE) - (self::$delta_t))."]
");
return (sem_release($res));
}
return (sem_release($res));
}