X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fspush%2Fbrisk-spush.php;h=f814d00f311ffecda03c01fec5102440ce4c07f0;hb=7f9618888f9963c4a7daebeb9e3d14ef0a56b968;hp=8eece0c1c5538a5e3780446f3181f5ab89b97569;hpb=5251efdfad905c4ef44de1efd5c274688132a776;p=brisk.git

diff --git a/web/spush/brisk-spush.php b/web/spush/brisk-spush.php
index 8eece0c..f814d00 100755
--- a/web/spush/brisk-spush.php
+++ b/web/spush/brisk-spush.php
@@ -28,10 +28,12 @@ $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."Obj/provider_proxy.phh");
 require_once($G_base."index.php");
 require_once($G_base."index_wr.php");
 require_once($G_base."briskin5/Obj/briskin5.phh");
@@ -39,21 +41,29 @@ require_once($G_base."briskin5/index.php");
 require_once($G_base."briskin5/index_wr.php");
 
 
-function main()
+function main($argv)
 {
-    if (($room = Room::create(LEGAL_PATH."/brisk-crystal.data")) == FALSE) {
-        log_crit("room::create failed");
-        exit(1);
-    }
+    GLOBAL $G_ban_list, $G_black_list, $G_cloud_smasher, $G_provider_proxy;
 
-    if (($s_a_p = Sac_a_push::create($room, USOCK_PATH, 0, 0)) === FALSE) {
-        exit(1);
-    }
+    pid_save();
+    do {
+        if (($brisk = Brisk::create(LEGAL_PATH."/brisk-crystal.data", $G_ban_list, $G_black_list, $G_cloud_smasher)) == FALSE) {
+            log_crit("Brisk::create failed");
+            $ret = 1;
+            break;
+        }
 
-    $s_a_p->run();
+        if (($s_a_p = Sac_a_push::create($brisk, USOCK_PATH, 0, 0, $G_provider_proxy, $argv)) === FALSE) {
+            $ret = 2;
+            break;
+        }
 
-    exit(0);
+        $ret = $s_a_p->run();
+    } while (0);
+
+    pid_remove();
+    exit($ret);
 }
 
-main();
+main($argv);
 ?>