From 9d29dc1ba716f4e1eca0830060a1196c77749ec1 Mon Sep 17 00:00:00 2001
From: "Matteo Nastasi (mop)" <nastasi@alternativeoutput.it>
Date: Wed, 17 Sep 2014 18:30:12 +0200
Subject: [PATCH] add $is_auth variable and renamed callback from
 cds_postprocess to more specific tor_chk_postprocess

---
 web/Obj/curl-de-brisk.phh | 15 +++++++++------
 webtest/tor_mock.php      |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/web/Obj/curl-de-brisk.phh b/web/Obj/curl-de-brisk.phh
index 0b720c5..cf4bc52 100755
--- a/web/Obj/curl-de-brisk.phh
+++ b/web/Obj/curl-de-brisk.phh
@@ -9,14 +9,16 @@ class tor_chk_cmd extends CDS_cmd {
     var $user_idx;
     var $user_sess;
     var $conn_ip;
+    var $is_auth;
 
-    function tor_chk_cmd($cmd_cls, $ch, $ctx, $user_idx, $user_sess, $conn_ip)
+    function tor_chk_cmd($cmd_cls, $ch, $ctx, $user_idx, $user_sess, $conn_ip, $is_auth)
     {
         parent::__construct($cmd_cls, $ch);
         $this->ctx       = $ctx;
         $this->user_idx  = $user_idx;
         $this->user_sess = $user_sess;
         $this->conn_ip   = $conn_ip;
+        $this->is_auth   = $is_auth;
     }
 }
 
@@ -26,7 +28,7 @@ class tor_chk_cmd_cls extends CDS_cmd_cls {
         parent::__construct("tor_chk", 10);
     }
 
-    function create($cds, $ctx, $user_idx, $user_sess, $conn_ip)
+    function create($cds, $ctx, $user_idx, $user_sess, $conn_ip, $is_auth)
     {
         if ($cds->dbg_get() > 0) {
             printf("'tor_chk'::create url:[%s]\n", 'TOR_CHK_URL');
@@ -46,7 +48,7 @@ class tor_chk_cmd_cls extends CDS_cmd_cls {
             if (parent::create($cds, $ch) == FALSE)
                 break;
 
-            $cmd = new tor_chk_cmd($this, $ch, $ctx, $user_idx, $user_sess, $conn_ip);
+            $cmd = new tor_chk_cmd($this, $ch, $ctx, $user_idx, $user_sess, $conn_ip, $is_auth);
 
             return $cmd;
         } while (FALSE);
@@ -68,7 +70,7 @@ class tor_chk_cmd_cls extends CDS_cmd_cls {
         if (mb_strpos($content,
                        "The IP Address you entered matches one or more active Tor servers",
                        0, "UTF-8") !== FALSE) {
-            printf("WARNING: stripos ok\n");
+            // printf("WARNING: stripos ok\n");
             $is_tor = TRUE;
         }
         else if (mb_strpos($content,
@@ -77,10 +79,11 @@ class tor_chk_cmd_cls extends CDS_cmd_cls {
             printf("WARNING: tor check disabled\n");
         }
         else {
-            printf("WARNING: NOT an active ...\n");
+            // printf("WARNING: NOT an active Tor server on IP [%s]\n", $cmd->conn_ip);
+            ;
         }
 
-        $cmd->ctx->cds_postprocess($cmd->user_idx, $cmd->user_sess, $cmd->conn_ip, $is_tor);
+        $cmd->ctx->tor_chk_postprocess($cmd->user_idx, $cmd->user_sess, $cmd->conn_ip, $cmd->is_auth, $is_tor);
 
         return TRUE;
     }
diff --git a/webtest/tor_mock.php b/webtest/tor_mock.php
index 2b75bd7..50a9b37 100644
--- a/webtest/tor_mock.php
+++ b/webtest/tor_mock.php
@@ -17,4 +17,4 @@ else if ($query_ip == "178.162.193.214") {
 else {
     readfile("Data/tor_mock_bad.html");
 }
-?>
\ No newline at end of file
+?>
-- 
2.17.1