From 3746111ee878e90e0ab8a79d56ecb52c2573d287 Mon Sep 17 00:00:00 2001
From: Krateng <git.noreply@krateng.ch>
Date: Thu, 24 Oct 2019 20:51:49 +0200
Subject: [PATCH] Updated to new pyhp

---
 .doreah              | 2 ++
 requirements.txt     | 2 +-
 server.py            | 9 +--------
 settings/default.ini | 1 +
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.doreah b/.doreah
index 5d9d026..29356ba 100644
--- a/.doreah
+++ b/.doreah
@@ -8,3 +8,5 @@ caching:
    folder: "cache/"
 regular:
    autostart: false
+pyhp:
+   version: 2
diff --git a/requirements.txt b/requirements.txt
index b5aa9c9..9dd1d56 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 bottle>=0.12.16
 waitress>=1.3
-doreah>=1.1.7
+doreah>=1.2
 nimrodel>=0.4.9
 setproctitle>=1.1.10
 wand>=0.5.4
diff --git a/server.py b/server.py
index 114a706..50c9631 100755
--- a/server.py
+++ b/server.py
@@ -149,15 +149,8 @@ def static_html(name):
 	keys = remove_identical(FormsDict.decode(request.query))
 
 	# if a pyhp file exists, use this
-	if os.path.exists("website/" + name + ".pyhp"):
+	if os.path.exists("website/" + name + ".pyhp") and settings.get_settings("USE_PYHP"):
 		from doreah.pyhp import file
-		#try:
-		#	d = SourceFileLoader(name,"website/" + name + ".py").load_module().pyhp(keys)
-		#	print("loaded dict")
-		#except:
-		#	d = {}
-		#	print("error")
-		#	raise
 		environ = {} #things we expose to the pyhp pages
 
 		# maloja
diff --git a/settings/default.ini b/settings/default.ini
index d96ec0b..ec7e552 100644
--- a/settings/default.ini
+++ b/settings/default.ini
@@ -56,3 +56,4 @@ NAME = "Generic Maloja User"
 [Misc]
 
 EXPERIMENTAL_FEATURES = no
+USE_PYHP = no