X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=100547fd8d824dde9040672d9446bb886361a487;hb=461b072662d5d1fb0e2e7d8cfc24cd63f726343c;hp=2cfa99e735de099e5ddf0330d2d21d3cc4a8ab76;hpb=4d94544c8f156818cc5c016121bc4c45a627ba5d;p=brisk.git diff --git a/web/index.php b/web/index.php index 2cfa99e..100547f 100644 --- a/web/index.php +++ b/web/index.php @@ -42,28 +42,26 @@ function main() $bri = &load_data(); /* Actions */ - if (isset($sess)) { + if (validate_sess($sess)) { $bri->garbage_manager(TRUE); - if (($user = &get_user(&$bri, $sess, &$idx)) != FALSE) { + if (($user = &$bri->get_user($sess, &$idx)) != FALSE) { if ($user->stat == "table") { header ("Location: table.php"); unlock_data($sem); exit; } - $ACTION = "table"; - } - else { - setcookie ("sess", "", time() - 3600); + $ACTION = "room"; } } - else if (isset($name)) { + + if ($ACTION == "login" && isset($name)) { $bri->garbage_manager(TRUE); /* try login */ $name = substr($name, 0, 12); - if (($user = &add_user(&$bri, &$sess, &$idx, $name)) != FALSE) { - $ACTION = "table"; + if (($user = &$bri->add_user(&$sess, &$idx, $name)) != FALSE) { + $ACTION = "room"; - setcookie ("sess", "", time() + 180); + // setcookie ("sess", "", time() + 180); standup_update(&$bri,&$user); if (save_data(&$bri) == FALSE) { @@ -84,13 +82,13 @@ function main() /* Rendering. */ if ($BRISK_DEBUG == "debugtable") { - $ACTION = "table"; + $ACTION = "room"; } else if ($BRISK_DEBUG == "debuglogin") { $ACTION = "login"; } - if ($ACTION == "table") { + if ($ACTION == "room") { $tables .= '