G_false reference and all explicit pass by references removed

[brisk.git] / web / Obj / hardban.phh

diff --git a/web/Obj/hardban.phh b/web/Obj/hardban.phh
index 61ddb91..ffec9c6 100644 (file)
--- a/web/Obj/hardban.phh
+++ b/web/Obj/hardban.phh
@@ -2,7 +2,7 @@
 /*
  *  brisk - auth.phh
  *
- *  Copyright (C) 2006-2008 Matteo Nastasi
+ *  Copyright (C) 2006-2011 Matteo Nastasi
  *                          mailto: nastasi@alternativeoutput.it 
  *                                  matteo.nastasi@milug.org
  *                          web: http://www.alternativeoutput.it
@@ -66,8 +66,8 @@ class Hardbans {
 
     log_auth("xxx", sprintf("Hardbans::add [%s]\n", $login));
 
-    if (($chal = new Hardban($login, $ip, $session, $timeout)) == null) {
-      return ($G_false);
+    if (($chal = new Hardban($login, $ip, $session, $timeout)) == FALSE) {
+      return (FALSE);
     }
 
     $this->item[$this->item_n] = $chal;
@@ -143,7 +143,7 @@ class Hardbans {
   }
 
   // Static functions
-  function &init_data()
+  static function create()
   {
     $chal =& new Hardbans();
     
@@ -152,9 +152,9 @@ class Hardbans {
     return $chal;
   }
 
-  function &load_data() 
+  function load_data() 
   {
-    GLOBAL $G_false, $sess;
+    GLOBAL $sess;
     $doexit = FALSE;
     do {
       if (($tok = @ftok(FTOK_PATH."/hardbans", "B")) == -1) {
@@ -178,7 +178,7 @@ class Hardbans {
        if ($hban == FALSE) {
          log_only("INIT HARDBAN DATA");
          
-         $hban =& Hardbans::init_data();
+         $hban =& Hardbans::create();
          if (@shm_put_var($shm, $tok, $hban) == FALSE) {
            log_only("PUT_VAR FALLITA ".strlen(serialize($hban)));
            log_only(serialize($hban));
@@ -191,18 +191,17 @@ class Hardbans {
 
       $hban->garbage_manager(TRUE);
 
-      $ret = &$hban;
-      return ($ret);
+      return ($hban);
     } while (0);
     
     if ($doexit)
       exit();
     
-    return ($G_false);
+    return (FALSE);
   }
   
 
-  function save_data(&$hban) 
+  function save_data($hban) 
   {
     $shm =   FALSE;
     $oldmod = $hban->mod;
@@ -241,13 +240,11 @@ class Hardbans {
   function lock_data()
   {
     if (($tok = @ftok(FTOK_PATH."/hardbans", "B")) == -1) {
-      echo "FTOK FAILED";
-      exit;
+      return (FALSE);
     }
     // echo "FTOK ".$tok."<br>";
     if (($res = sem_get($tok)) == FALSE) {
-      echo "SEM_GET FAILED";
-      exit;
+      return (FALSE);
     }
     if (sem_acquire($res)) {   
       log_lock("LOCK hardbans");