provider_proxy management added

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

diff --git a/web/spush/brisk-spush.php b/web/spush/brisk-spush.php
index 7b1ddc0..3a43b19 100755 (executable)
--- a/web/spush/brisk-spush.php
+++ b/web/spush/brisk-spush.php
@@ -28,12 +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($G_base."Obj/mail.phh");
-require_once($G_base."Obj/curl-de-brisk.phh");
-// require_once("../Obj/proxyscan.phh");
 require_once($G_base."index.php");
 require_once($G_base."index_wr.php");
 require_once($G_base."briskin5/Obj/briskin5.phh");
@@ -43,24 +42,11 @@ require_once($G_base."briskin5/index_wr.php");
 
 function main($argv)
 {
-    GLOBAL $G_ban_list, $G_black_list;
-
-    // create cds
-    $cds = new Curl_de_sac();
-
-    // create tor_chk_cls
-    $tor_chk_cls = new tor_chk_cmd_cls();
-
-    // registrer tor_chk_cls
-    printf("MAIN: Register 'tor_chk_cls'\n");
-    if (($cds->cmd_cls_register($tor_chk_cls)) == FALSE) {
-        fprintf(STDERR, "MAIN: 'tor_chk_cls' registration failed\n");
-        exit(1);
-    }
+    GLOBAL $G_ban_list, $G_black_list, $G_provider_proxy;
 
     pid_save();
     do {
-        if (($brisk = Brisk::create(LEGAL_PATH."/brisk-crystal.data", $G_ban_list, $G_black_list)) == FALSE) {
+        if (($brisk = Brisk::create(LEGAL_PATH."/brisk-crystal.data", $G_ban_list, $G_black_list, $G_provider_proxy)) == FALSE) {
             log_crit("Brisk::create failed");
             $ret = 1;
             break;