move curl-de-sac stuff optionally included

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

diff --git a/web/spush/brisk-spush.php b/web/spush/brisk-spush.php
index 9a65d21..6e07d92 100755 (executable)
--- a/web/spush/brisk-spush.php
+++ b/web/spush/brisk-spush.php
@@ -28,10 +28,11 @@ $G_base = "../";
 require_once($G_base."Obj/sac-a-push.phh");
 require_once("./brisk-spush.phh");
 require_once($G_base."Obj/user.phh");
+@include_once($G_base."Obj/curl-de-brisk.phh");
 require_once($G_base."Obj/brisk.phh");
 require_once($G_base."Obj/auth.phh");
 require_once($G_base."Obj/zlibstream.phh");
-// require_once("../Obj/proxyscan.phh");
+require_once($G_base."Obj/mail.phh");
 require_once($G_base."index.php");
 require_once($G_base."index_wr.php");
 require_once($G_base."briskin5/Obj/briskin5.phh");
@@ -39,17 +40,19 @@ require_once($G_base."briskin5/index.php");
 require_once($G_base."briskin5/index_wr.php");
 
 
-function main()
+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)) === FALSE) {
+        if (($s_a_p = Sac_a_push::create($brisk, USOCK_PATH, 0, 0, $argv)) === FALSE) {
             $ret = 2;
             break;
         }
@@ -61,5 +64,5 @@ function main()
     exit($ret);
 }
 
-main();
+main($argv);
 ?>