Merge branch 'master' into v073

.github/FUNDING.yml

@@ -1 +1,2 @@
-custom: https://zeronet.io/docs/help_zeronet/donate/
+liberapay: caryoscelus
+custom: https://caryoscelus.github.io/donate/

README.md

@@ -10,7 +10,7 @@ This fork is intended as temporary measure and will possibly stop being maintain
 
 ## Why 0net?
 
-* We believe in open, free, and uncensored network and communication.
+* We believe in open, free, and uncensored networks and communication.
 * No single point of failure: Site remains online so long as at least 1 peer is
   serving it.
 * No hosting costs: Sites are served by visitors.
@@ -64,17 +64,34 @@ Following links relate to original ZeroNet:
 
 ## How to join
 
-### Install from source
+### Install from source (recommended)
 
- - clone this repo
- - install python3 and pip if needed (the following instructions are for apt-based distributions)
+#### System dependencies
+
+##### Generic unix-like
+
+Install autoconf and other basic development tools, python3 and pip.
+
+##### Apt-based (debian, ubuntu, etc)
  - `sudo apt update`
-   - `sudo apt install python3-pip`
- - `python3 -m pip install -r requirements.txt`
- - Start with: `python3 zeronet.py`
- - Open the ZeroHello landing page in your browser by navigating to: http://127.0.0.1:43110/
+ - `sudo apt install python3-pip build-essential`
 
-It is recommended to use python environments instead of installing all dependencies globally (TODO: find/write up the detailed instructions)
+##### Android/Termux
+ - install [Termux](https://termux.com/)
+ - in Termux install via `pkg install <package-names>`
+ - `pkg update`
+ - `pkg install python automake autoconf-dev git` (TODO: check fresh installation whether there are more dependencies to install)
+
+#### Building python dependencies & running
+ - clone this repo (NOTE: on Android/Termux you should clone it into "home" folder of Termux, because virtual environment cannot live in `storage/`)
+ - `python3 -m venv venv` (make python virtual environment, the last `venv` is just a name, if you use different you should replace it in later commands)
+ - `source venv/bin/activate` (activate environment)
+ - `python3 -m pip install -r requirements.txt` (install dependencies)
+ - `python3 zeronet.py` (**run zeronet-conservancy!**)
+ - open the landing page in your browser by navigating to: http://127.0.0.1:43110/
+ - to start it again from fresh terminal, you need to navigate to repo directory and:
+ - `source venv/bin/activate`
+ - `python3 zeronet.py`
 
 ## Current limitations
 
@@ -90,7 +107,7 @@ It is recommended to use python environments instead of installing all dependenc
  * Click on **⋮** > **"Create new, empty site"** menu item on the site [ZeroHello](http://127.0.0.1:43110/1HeLLo4uzjaLetFx6NH3PMwFP3qbRbTf3D).
  * You will be **redirected** to a completely new site that is only modifiable by you!
  * You can find and modify your site's content in **data/[yoursiteaddress]** directory
- * After the modifications open your site, drag the topright "0" button to left, then press **sign** and **publish** buttons on the bottom
+ * After the modifications open your site, drag the topright "0" button to the left, then press **sign** and **publish** buttons on the bottom
 
 Next steps: [ZeroNet Developer Documentation](https://zeronet.io/docs/site_development/getting_started/)
 

plugins/Sidebar/languages/pl.json

@@ -1,9 +1,13 @@
 {
+	"Total peers": "Łącznie użytkowników równorzędnych",
+	"Connected peers": "Łącznie połączonych użytkowników równorzędnych",
 	"Peers": "Użytkownicy równorzędni",
 	"Connected": "Połączony",
-	"Connectable": "Możliwy do podłączenia",
+	"Connectable": "Do połączenia",
 	"Connectable peers": "Połączeni użytkownicy równorzędni",
 
+	"Copy to clipboard": "Kopiuj do schowka",
+
 	"Data transfer": "Transfer danych",
 	"Received": "Odebrane",
 	"Received bytes": "Odebrany bajty",
@@ -11,7 +15,7 @@
 	"Sent bytes": "Wysłane bajty",
 
 	"Files": "Pliki",
-	"Total": "Sumarycznie",
+	"Total": "Łącznie",
 	"Image": "Obraz",
 	"Other": "Inne",
 	"User data": "Dane użytkownika",
@@ -36,6 +40,10 @@
 
 	"Identity address": "Adres identyfikacyjny",
 	"Change": "Zmień",
+	"Needs to be updated": "Muszą zostać zaktualizowane",
+	"Download previous files": "Pobierz wszystkie pliki",
+	"Help distribute added optional files": "Pomóż rozpowszechniać wszystkie pliki",
+	"Auto download big file size limit": "Limit dla automatycznego pobierania dużych plików",
 
 	"Site control": "Kontrola strony",
 	"Update": "Zaktualizuj",
@@ -56,11 +64,15 @@
 	"Site title": "Tytuł strony",
 	"Site description": "Opis strony",
 	"Save site settings": "Zapisz ustawienia strony",
+	"Save as .zip": "Zapisz jako .zip",
+	"Browse files": "Przeglądaj pliki",
 
+	"Add saved private key": "Dodaj klucz prywatny",
 	"Content publishing": "Publikowanie treści",
 	"Choose": "Wybierz",
 	"Sign": "Podpisz",
 	"Publish": "Opublikuj",
+	"Sign and publish": "Zapisz i opublikuj",
 
 	"This function is disabled on this proxy": "Ta funkcja jest zablokowana w tym proxy",
 	"GeoLite2 City database download error: {}!<br>Please download manually and unpack to data dir:<br>{}": "Błąd ściągania bazy danych GeoLite2 City: {}!<br>Proszę ściągnąć ją recznie i wypakować do katalogu danych:<br>{}",

src/Ui/UiRequest.py

@@ -329,7 +329,7 @@ class UiRequest(object):
 
         def renderReplacer(m):
             if m.group(1) in kwargs:
-                return "%s" % kwargs.get(m.group(1), "")
+                return str(kwargs[m.group(1)])
             else:
                 return m.group(0)
 
@@ -545,13 +545,13 @@ class UiRequest(object):
             "src/Ui/template/wrapper.html",
             server_url=server_url,
             inner_path=inner_path,
-            file_url=re.escape(file_url),
-            file_inner_path=re.escape(file_inner_path),
+            file_url=html.escape(re.escape(file_url)),
+            file_inner_path=html.escape(re.escape(file_inner_path)),
             address=site.address,
             title=html.escape(title),
             body_style=body_style,
             meta_tags=meta_tags,
-            query_string=re.escape(inner_query_string),
+            query_string=html.escape(re.escape(inner_query_string)),
             wrapper_key=site.settings["wrapper_key"],
             ajax_key=site.settings["ajax_key"],
             wrapper_nonce=wrapper_nonce,

update.py

@@ -115,6 +115,13 @@ def update():
 
 
 if __name__ == "__main__":
+    print('please update zeronet-conservancy via git. usually it can be done via single commnad')
+    print('  git pull')
+    print('although it depends on your branches setup')
+    print('updating through 1update site is not considered safe at the moment')
+    print('if you really want to use it, edit this file')
+
+    if False:
         sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))  # Imports relative to src
 
         update()

zeronet.py

@@ -9,7 +9,7 @@ def main():
         sys.exit(0)
 
     if "--silent" not in sys.argv:
-        print("- Starting ZeroNet...")
+        print("- Starting zeronet-conservancy...")
 
     main = None
     try:
@@ -27,7 +27,7 @@ def main():
         error_log_path = config.log_dir + "/error.log"
         traceback.print_exc(file=open(error_log_path, "w"))
         print("---")
-        print("Please report it: https://github.com/HelloZeroNet/ZeroNet/issues/new?assignees=&labels=&template=bug-report.md")
+        print("Please report it: https://github.com/zeronet-conservancy/zeronet-conservancy/issues/new?template=bug-report.md")
         if sys.platform.startswith("win") and "python.exe" not in sys.executable:
             displayErrorMessage(err, error_log_path)