use user->is_appr() when needed

[brisk.git] / web / Obj / sac-a-push.phh

diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh
index 66b340d..80db1f4 100644 (file)
--- a/web/Obj/sac-a-push.phh
+++ b/web/Obj/sac-a-push.phh
@@ -40,7 +40,7 @@ function global_dump()
     GLOBAL $G_splash_h, $G_splash_idx, $G_splash_interval, $G_splash_timeout;
     GLOBAL $G_splash_w, $G_topbanner, $G_with_donors, $G_with_poll;
     GLOBAL $G_with_splash, $G_sidebanner, $G_sidebanner_idx;
-    GLOBAL $G_with_topbanner;
+    GLOBAL $G_with_topbanner, $G_selfreg_tout;
 
     fprintf(STDERR, "G_alarm_passwd = [%s]\n", print_r($G_alarm_passwd, TRUE));
     fprintf(STDERR, "G_ban_list = [%s]\n", print_r($G_ban_list, TRUE));
@@ -73,6 +73,10 @@ function global_dump()
     fprintf(STDERR, "G_sidebanner_idx = [%s]\n", print_r($G_sidebanner_idx, TRUE));
     fprintf(STDERR, "G_with_splash = [%s]\n", print_r($G_with_splash, TRUE));
     fprintf(STDERR, "G_with_topbanner = [%s]\n", print_r($G_with_topbanner, TRUE));
+    fprintf(STDERR, "G_selfreg_mask = [%x]\n", print_r($G_selfreg_mask, TRUE));
+
+    fprintf(STDERR, "G_selfreg_tout = [%s]\n", print_r($G_selfreg_tout, TRUE));
+
 }
 
 function pid_save()
@@ -455,10 +459,8 @@ class Sac_a_push {
         }
     }
 
-    static function create(&$app, $sockname, $debug, $blocking_mode, $argv)
+    static function create(&$app, $sockname, $debug, $blocking_mode, $provider_proxy, $argv)
     {        
-        GLOBAL $G_provider_proxy;
-
         $thiz = new Sac_a_push();
         
         $thiz->app = $app;
@@ -524,7 +526,7 @@ class Sac_a_push {
         }
 
         $thiz->main_loop = FALSE;
-        $thiz->reload(TRUE, $G_provider_proxy);
+        $thiz->reload(TRUE, $provider_proxy);
 
         return ($thiz);
     }
@@ -721,7 +723,7 @@ class Sac_a_push {
                             // FOR TEST $header['X-Forwarded-For'] = '154.155.22.33';
                             $addr = $this->pproxy_realip($header, addrtoipv4($addr_full));
 
-                            printf("PATH: [%s]\n", $path);
+                            printf("PATH: [%s] [%s]\n", $path, print_r($header, TRUE));
                             if ($method == "POST" && $rest > 0) {
                                 if (isset($header['Expect']) && $header['Expect'] == '100-continue') {
                                     fprintf(STDERR, "\nPOSTA DE CHE\n\n");
@@ -965,7 +967,7 @@ class Sac_a_push {
         }  // while (...
     }  // function run(...
 
-    function pproxy_realip($header, $ip_str)
+    function pproxy_realip(&$header, $ip_str)
     {
         return ($this->provider_proxy->realip($header, $ip_str));
     }