X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fdbase_pgsql.phh;h=1647617e95518edbbc2f3966a56455ecdd09fb0e;hb=43cab39ea58529cd2442c28f4157bb7efc97856f;hp=004edb91a89f343bd4151ed9654d3b1f06a5ec0d;hpb=9cbf3bfaad0cad7feaf6413eb53df0a1475c6303;p=brisk.git

diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh
index 004edb9..1647617 100644
--- a/web/Obj/dbase_pgsql.phh
+++ b/web/Obj/dbase_pgsql.phh
@@ -55,7 +55,7 @@ class DBConn
         }
 
         $out = new DBConn();
-        
+
         return $out;
     }
     function db()
@@ -84,8 +84,9 @@ class BriskDB
         log_main("BriskDB create:start");
         
         do {
-            if (($dbconn = DBConn::create()) == FALSE) 
+            if (($dbconn = DBConn::create()) == FALSE) {
                 break;
+            }
             
             $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 */
-        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) {
-                // error_log("loop-1", 0);
                 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) {
-                        // 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) {
-                            // error_log("loop3", 0);
                             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 ...
-                // error_log("end loop-1", 0);
             }
             
             if ($chals->ismod()) {