homogenized $remote_addr and $remote_addr_full usage, add ban_list, reload() method...

[brisk.git] / web / spush / brisk-spush.php

diff --git a/web/spush/brisk-spush.php b/web/spush/brisk-spush.php
index 35c2584..cbbce76 100755 (executable)
--- a/web/spush/brisk-spush.php
+++ b/web/spush/brisk-spush.php
@@ -31,6 +31,7 @@ require_once($G_base."Obj/user.phh");
 require_once($G_base."Obj/brisk.phh");
 require_once($G_base."Obj/auth.phh");
 require_once($G_base."Obj/zlibstream.phh");
+require_once($G_base."Obj/mail.phh");
 // require_once("../Obj/proxyscan.phh");
 require_once($G_base."index.php");
 require_once($G_base."index_wr.php");
@@ -41,15 +42,17 @@ require_once($G_base."briskin5/index_wr.php");
 
 function main($argv)
 {
+    GLOBAL $G_ban_list, $G_black_list;
+
     pid_save();
     do {
-        if (($room = Room::create(LEGAL_PATH."/brisk-crystal.data")) == FALSE) {
-            log_crit("room::create failed");
+        if (($brisk = Brisk::create(LEGAL_PATH."/brisk-crystal.data", $G_ban_list, $G_black_list)) == FALSE) {
+            log_crit("Brisk::create failed");
             $ret = 1;
             break;
         }
 
-        if (($s_a_p = Sac_a_push::create($room, USOCK_PATH, 0, 0, $argv)) === FALSE) {
+        if (($s_a_p = Sac_a_push::create($brisk, USOCK_PATH, 0, 0, $argv)) === FALSE) {
             $ret = 2;
             break;
         }