From 4f7ce2b8a724cb9fba709849d5dc467c14d331a2 Mon Sep 17 00:00:00 2001
From: /rootzoll <christian@geektank.de>
Date: Tue, 28 May 2024 22:25:37 +0200
Subject: [PATCH] #4589 Remove IP2Tor shoplist (#4595)

* remove shop list
* add CHANGES
---
 CHANGES.md                                    |  1 +
 .../blitz.subscriptions.ip2tor.py             | 46 ++++++++++++-------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 6209f946c..d0ad0a884 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 - Update: Specter Desktop 2.0.4 with reactivated UPDATE option [details](https://github.com/cryptoadvance/specter-desktop/releases/tag/v2.0.4)
 - Remove: Tallycoin-Connect [see service shutdown](https://x.com/djbooth007/status/1784409117563720082)
+- Remove: IP2Tor Shoplist [details](https://github.com/raspiblitz/raspiblitz/issues/4589)
 
 ## What's new in Version 1.11.0 of RaspiBlitz?
 
diff --git a/home.admin/config.scripts/blitz.subscriptions.ip2tor.py b/home.admin/config.scripts/blitz.subscriptions.ip2tor.py
index fb9ae2fa9..e2b0401f5 100755
--- a/home.admin/config.scripts/blitz.subscriptions.ip2tor.py
+++ b/home.admin/config.scripts/blitz.subscriptions.ip2tor.py
@@ -632,30 +632,42 @@ def menuMakeSubscription(blitzServiceName, torAddress, torPort):
         # enter own shop address option
         choices.append(("X", "Enter a new Shop URL"))
 
-        # select dialog
+        # show a dialog info box
         d = Dialog(dialog="dialog", autowidgetsize=True)
         d.set_background_title("IP2TOR - Select Shop")
-        code, selected = d.menu(
-            "\nChoose your IP2Tor provider/shop:",
-            choices=choices, width=75, height=10, title="Select IP2Tor Shop")
+        d.msgbox('''
+At the moment there are no public IP2TOR services to link to.
+You could run one yourself - please check the GitHub repo:
+https://github.com/raulcano/docker-ip2tor-shop''', height=10, width=72)
+
+        # select dialog
+        #d = Dialog(dialog="dialog", autowidgetsize=True)
+        #d.set_background_title("IP2TOR - Select Shop")
+        #code, selected = d.menu(
+        #    "\nChoose your IP2Tor provider/shop:",
+        #    choices=choices, width=75, height=10, title="Select IP2Tor Shop")
 
         # if user canceled
-        if code != d.OK:
-            sys.exit(0)
+        #if code != d.OK:
+        #    sys.exit(0)
 
-        if selected == "A" : shopurl=choice_url_ip2torcom
-        if selected == "B" : shopurl=choice_url_fulmo
-        if selected == "Y" : shopurl=lastusedShop
+        #if selected == "A" : shopurl=choice_url_ip2torcom
+        #if selected == "B" : shopurl=choice_url_fulmo
+        #if selected == "Y" : shopurl=lastusedShop
 
         # input shop url
-        if selected == "X":
-            d = Dialog(dialog="dialog", autowidgetsize=True)
-            d.set_background_title("IP2TOR - Add new Shop")
-            code, shopurl = d.inputbox(
-                "Enter Address of the IP2TOR Shop (OR JUST PRESS OK):",
-                height=10, width=72, init=shopurl,
-                title="Shop Address")
-            if shopurl.find("://") > 0: shopurl = shopurl[shopurl.find("://") + 3:]
+        #if selected == "X":
+        d = Dialog(dialog="dialog", autowidgetsize=True)
+        d.set_background_title("IP2TOR - Add new Shop")
+        code, shopurl = d.inputbox(
+            "Enter Address of the IP2TOR Shop (OR JUST PRESS OK):",
+            height=10, width=72, init=shopurl,
+            title="Shop Address")
+        if shopurl.find("://") > 0: shopurl = shopurl[shopurl.find("://") + 3:]
+
+        # if user choose cancel
+        if code != d.OK:
+            sys.exit(0)
 
         # try & get host list from shop
         os.system('clear')