#4589 Remove IP2Tor shoplist (#4595)

* remove shop list
* add CHANGES
This commit is contained in:
/rootzoll 2024-05-28 22:25:37 +02:00 committed by GitHub
parent 3de15bed49
commit 4f7ce2b8a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 30 additions and 17 deletions

View file

@ -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) - 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: 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? ## What's new in Version 1.11.0 of RaspiBlitz?

View file

@ -632,30 +632,42 @@ def menuMakeSubscription(blitzServiceName, torAddress, torPort):
# enter own shop address option # enter own shop address option
choices.append(("X", "Enter a new Shop URL")) choices.append(("X", "Enter a new Shop URL"))
# select dialog # show a dialog info box
d = Dialog(dialog="dialog", autowidgetsize=True) d = Dialog(dialog="dialog", autowidgetsize=True)
d.set_background_title("IP2TOR - Select Shop") d.set_background_title("IP2TOR - Select Shop")
code, selected = d.menu( d.msgbox('''
"\nChoose your IP2Tor provider/shop:", At the moment there are no public IP2TOR services to link to.
choices=choices, width=75, height=10, title="Select IP2Tor Shop") 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 user canceled
if code != d.OK: #if code != d.OK:
sys.exit(0) # sys.exit(0)
if selected == "A" : shopurl=choice_url_ip2torcom #if selected == "A" : shopurl=choice_url_ip2torcom
if selected == "B" : shopurl=choice_url_fulmo #if selected == "B" : shopurl=choice_url_fulmo
if selected == "Y" : shopurl=lastusedShop #if selected == "Y" : shopurl=lastusedShop
# input shop url # input shop url
if selected == "X": #if selected == "X":
d = Dialog(dialog="dialog", autowidgetsize=True) d = Dialog(dialog="dialog", autowidgetsize=True)
d.set_background_title("IP2TOR - Add new Shop") d.set_background_title("IP2TOR - Add new Shop")
code, shopurl = d.inputbox( code, shopurl = d.inputbox(
"Enter Address of the IP2TOR Shop (OR JUST PRESS OK):", "Enter Address of the IP2TOR Shop (OR JUST PRESS OK):",
height=10, width=72, init=shopurl, height=10, width=72, init=shopurl,
title="Shop Address") title="Shop Address")
if shopurl.find("://") > 0: shopurl = shopurl[shopurl.find("://") + 3:] 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 # try & get host list from shop
os.system('clear') os.system('clear')