From f17018962bfc6cc38a0b2ccc5f40a939f5fe49fa Mon Sep 17 00:00:00 2001
From: Damien Zammit <damien@zamaudio.com>
Date: Tue, 10 Aug 2021 19:16:48 +1000
Subject: Use relative URLs instead of hardcoding domain

---
 h-source/Application/Controllers/WikiController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'h-source/Application')

diff --git a/h-source/Application/Controllers/WikiController.php b/h-source/Application/Controllers/WikiController.php
index 5dc05b8..f3da19f 100644
--- a/h-source/Application/Controllers/WikiController.php
+++ b/h-source/Application/Controllers/WikiController.php
@@ -496,7 +496,7 @@ class WikiController extends BaseController
 
 // 				if ($this->m['WikitalkModel']->queryResult)
 // 				{
-// 					header('Refresh: 0;url=http://'.DOMAIN_NAME.$_SERVER['REQUEST_URI']);
+// 					header('Refresh: 0;url='.$_SERVER['REQUEST_URI']);
 // 					die();
 // 				}
 			}
-- 
cgit v1.2.3


From a57a3fa7241f33a94d41a1fd22a0d07c8fb6286d Mon Sep 17 00:00:00 2001
From: Yuchen Pei <me@ypei.me>
Date: Wed, 18 Aug 2021 09:42:08 +1000
Subject: Removing mentions of gnewsense and blag.

These changes were already made on the prod server.
---
 h-source/Application/Views/Desktop/Help/index.php  |  2 --
 .../Application/Views/Desktop/Help/index_de.php    |  4 +---
 .../Application/Views/Desktop/Help/index_es.php    |  2 --
 .../Application/Views/Desktop/Help/index_fr.php    |  4 +---
 .../Application/Views/Desktop/Help/index_it.php    |  4 +---
 h-source/Application/Views/Desktop/Home/left.php   |  1 -
 .../Application/Views/Desktop/Home/left_de.php     |  1 -
 .../Application/Views/Desktop/Home/left_es.php     |  1 -
 .../Application/Views/Desktop/Home/left_fr.php     |  1 -
 .../Application/Views/Desktop/Home/left_gr.php     |  1 -
 .../Application/Views/Desktop/Home/left_it.php     |  1 -
 h-source/Application/Views/Mobile/Home/left.php    |  1 -
 h-source/Application/Views/Mobile/Home/left_de.php |  1 -
 h-source/Application/Views/Mobile/Home/left_es.php |  1 -
 h-source/Application/Views/Mobile/Home/left_fr.php |  1 -
 h-source/Application/Views/Mobile/Home/left_gr.php |  1 -
 h-source/Application/Views/Mobile/Home/left_it.php |  1 -
 h-source/config.xml                                | 24 ----------------------
 18 files changed, 3 insertions(+), 49 deletions(-)

(limited to 'h-source/Application')

diff --git a/h-source/Application/Views/Desktop/Help/index.php b/h-source/Application/Views/Desktop/Help/index.php
index bec0d54..c4fcee7 100644
--- a/h-source/Application/Views/Desktop/Help/index.php
+++ b/h-source/Application/Views/Desktop/Help/index.php
@@ -434,10 +434,8 @@ Bus 002 Device 003: ID <b>08ff:2580</b> AuthenTec, Inc. AES2501 Fingerprint Sens
 	
 	<!-- p>They are listed in alphabetical order</p -->
 		<ul>
-			<li><a href="http://www.blagblagblag.org/">BLAG GNU/Linux</a></li>
 			<li><a href="http://www.dragora.org">Dragora GNU/Linux</a></li>
 			<li><a href="http://dynebolic.org/">Dynebolic GNU/Linux</a></li>
-			<li><a href="http://www.gnewsense.org/">gNewSense GNU/Linux</a></li>
 			<li><a href="http://www.musix.org.ar/">Musix GNU+Linux</a></li>
 			<li><a href="https://parabolagnulinux.org/">Parabola GNU/Linux</a></li>
 			<li><a href="http://trisquel.info/">Trisquel GNU/Linux</a></li>
diff --git a/h-source/Application/Views/Desktop/Help/index_de.php b/h-source/Application/Views/Desktop/Help/index_de.php
index 8301eda..e53693e 100644
--- a/h-source/Application/Views/Desktop/Help/index_de.php
+++ b/h-source/Application/Views/Desktop/Help/index_de.php
@@ -431,10 +431,8 @@ Device Descriptor:
 	<p>(In alphabetischer Reihenfolge)</p>
 	
 	<ul>
-		<li><a href="http://www.blagblagblag.org/">BLAG GNU/Linux</a></li>
 		<li><a href="http://www.dragora.org">Dragora GNU/Linux</a></li>
 		<li><a href="http://dynebolic.org/">Dynebolic GNU/Linux</a></li>
-		<li><a href="http://www.gnewsense.org/">gNewSense GNU/Linux</a></li>
 		<li><a href="http://www.musix.org.ar/">Musix GNU+Linux</a></li>
 		<li><a href="https://parabolagnulinux.org/">Parabola GNU/Linux</a></li>
 		<li><a href="http://trisquel.info/">Trisquel GNU/Linux</a></li>
@@ -442,4 +440,4 @@ Device Descriptor:
 		<li><a href="http://venenux.org/">Venenux GNU/Linux</a></li>
 	</ul>	
 	</div>
-	
\ No newline at end of file
+	
diff --git a/h-source/Application/Views/Desktop/Help/index_es.php b/h-source/Application/Views/Desktop/Help/index_es.php
index c3ceb02..acbdf6b 100644
--- a/h-source/Application/Views/Desktop/Help/index_es.php
+++ b/h-source/Application/Views/Desktop/Help/index_es.php
@@ -428,10 +428,8 @@ Bus 002 Device 003: ID <b>08ff:2580</b> AuthenTec, Inc. AES2501 Fingerprint Sens
 	<p>(En orden alfabético)</p>
 	
 	<ul>
-		<li><a href="http://www.blagblagblag.org/">BLAG GNU/Linux</a></li>
 		<li><a href="http://www.dragora.org">Dragora GNU/Linux</a></li>
 		<li><a href="http://dynebolic.org/">Dynebolic GNU/Linux</a></li>
-		<li><a href="http://www.gnewsense.org/">gNewSense GNU/Linux</a></li>
 		<li><a href="http://www.musix.org.ar/">Musix GNU+Linux</a></li>
 		<li><a href="https://parabolagnulinux.org/">Parabola GNU/Linux</a></li>
 		<li><a href="http://trisquel.info/">Trisquel GNU/Linux</a></li>
diff --git a/h-source/Application/Views/Desktop/Help/index_fr.php b/h-source/Application/Views/Desktop/Help/index_fr.php
index c3a507b..3e46137 100644
--- a/h-source/Application/Views/Desktop/Help/index_fr.php
+++ b/h-source/Application/Views/Desktop/Help/index_fr.php
@@ -419,10 +419,8 @@ Bus 002 Device 003: ID <b>08ff:2580</b> AuthenTec, Inc. AES2501 Fingerprint Sens
 	<p>(Dans l'ordre alphabétique)</p>
 	
 	<ul>
-		<li><a href="http://www.blagblagblag.org/">BLAG GNU/Linux</a></li>
 		<li><a href="http://www.dragora.org">Dragora GNU/Linux</a></li>
 		<li><a href="http://dynebolic.org/">Dynebolic GNU/Linux</a></li>
-		<li><a href="http://www.gnewsense.org/">gNewSense GNU/Linux</a></li>
 		<li><a href="http://www.musix.org.ar/">Musix GNU+Linux</a></li>
 		<li><a href="https://parabolagnulinux.org/">Parabola GNU/Linux</a></li>
 		<li><a href="http://trisquel.info/">Trisquel GNU/Linux</a></li>
@@ -431,4 +429,4 @@ Bus 002 Device 003: ID <b>08ff:2580</b> AuthenTec, Inc. AES2501 Fingerprint Sens
 	</ul>
 	
 	</div>
-	
\ No newline at end of file
+	
diff --git a/h-source/Application/Views/Desktop/Help/index_it.php b/h-source/Application/Views/Desktop/Help/index_it.php
index 6183d18..c3c968e 100644
--- a/h-source/Application/Views/Desktop/Help/index_it.php
+++ b/h-source/Application/Views/Desktop/Help/index_it.php
@@ -424,10 +424,8 @@ Bus 002 Device 003: ID <b>08ff:2580</b> AuthenTec, Inc. AES2501 Fingerprint Sens
 	<p>In ordine alfabetico</p>
 	
 	<ul>
-		<li><a href="http://www.blagblagblag.org/">BLAG GNU/Linux</a></li>
 		<li><a href="http://www.dragora.org">Dragora GNU/Linux</a></li>
 		<li><a href="http://dynebolic.org/">Dynebolic GNU/Linux</a></li>
-		<li><a href="http://www.gnewsense.org/">gNewSense GNU/Linux</a></li>
 		<li><a href="http://www.musix.org.ar/">Musix GNU+Linux</a></li>
 		<li><a href="https://parabolagnulinux.org/">Parabola GNU/Linux</a></li>
 		<li><a href="http://trisquel.info/">Trisquel GNU/Linux</a></li>
@@ -435,4 +433,4 @@ Bus 002 Device 003: ID <b>08ff:2580</b> AuthenTec, Inc. AES2501 Fingerprint Sens
 		<li><a href="http://venenux.org/">Venenux GNU/Linux</a></li>
 	</ul>
 	</div>
-	
\ No newline at end of file
+	
diff --git a/h-source/Application/Views/Desktop/Home/left.php b/h-source/Application/Views/Desktop/Home/left.php
index 8635564..0f6ce30 100644
--- a/h-source/Application/Views/Desktop/Home/left.php
+++ b/h-source/Application/Views/Desktop/Home/left.php
@@ -71,7 +71,6 @@
 				<ul>
 					<!--<li><a href="http://www.fsf.org/resources/hw">Free Software Foundation archive</a></li>-->
 					<li><a href="http://libreplanet.org/wiki/Hardware/Freest">LibrePlanet Freest Hardware Page</a></li>
-					<li><a href="http://www.gnewsense.org/Main/LaptopGuide">gNewSense Laptop Guide</a></li>
 					<li><a href="http://libreplanet.org/wiki/Group:LibrePlanet_Italia/Progetti/hardware_libero">LibrePlanet Italia - progetti hardware database</a></li>
 				</ul>
 			</div>
diff --git a/h-source/Application/Views/Desktop/Home/left_de.php b/h-source/Application/Views/Desktop/Home/left_de.php
index 42bfff7..7317124 100644
--- a/h-source/Application/Views/Desktop/Home/left_de.php
+++ b/h-source/Application/Views/Desktop/Home/left_de.php
@@ -72,7 +72,6 @@
 				<ul>
 <!-- 					<li><a href="http://www.fsf.org/resources/hw">Free Software Foundation archive</a></li> -->
 					<li><a href="http://libreplanet.org/wiki/Hardware/Freest">LibrePlanet Freest Hardware Page</a></li>
-					<li><a href="http://www.gnewsense.org/Main/LaptopGuide">gNewSense Laptop Guide</a></li>
 					<li><a href="http://libreplanet.org/wiki/Group:LibrePlanet_Italia/Progetti/hardware_libero">LibrePlanet Italia - progetti hardware database</a></li>
 				</ul>
 			</div>
diff --git a/h-source/Application/Views/Desktop/Home/left_es.php b/h-source/Application/Views/Desktop/Home/left_es.php
index 0ac26d0..882a7b1 100644
--- a/h-source/Application/Views/Desktop/Home/left_es.php
+++ b/h-source/Application/Views/Desktop/Home/left_es.php
@@ -71,7 +71,6 @@
 				<ul>
 <!-- 					<li><a href="http://www.fsf.org/resources/hw">Free Software Foundation archive</a></li> -->
 					<li><a href="http://libreplanet.org/wiki/Hardware/Freest">LibrePlanet Freest Hardware Page</a></li>
-					<li><a href="http://www.gnewsense.org/Main/LaptopGuide">gNewSense Laptop Guide</a></li>
 					<li><a href="http://libreplanet.org/wiki/Group:LibrePlanet_Italia/Progetti/hardware_libero">LibrePlanet Italia - progetti hardware database</a></li>
 				</ul>
 			</div>
diff --git a/h-source/Application/Views/Desktop/Home/left_fr.php b/h-source/Application/Views/Desktop/Home/left_fr.php
index 2e17468..2056c75 100644
--- a/h-source/Application/Views/Desktop/Home/left_fr.php
+++ b/h-source/Application/Views/Desktop/Home/left_fr.php
@@ -74,7 +74,6 @@
 				<ul>
 <!-- 					<li><a href="http://www.fsf.org/resources/hw">Free Software Foundation archive</a></li> -->
 					<li><a href="http://libreplanet.org/wiki/Hardware/Freest">LibrePlanet Freest Hardware Page</a></li>
-					<li><a href="http://www.gnewsense.org/Main/LaptopGuide">gNewSense Laptop Guide</a></li>
 					<li><a href="http://libreplanet.org/wiki/Group:LibrePlanet_Italia/Progetti/hardware_libero">LibrePlanet Italia - progetti hardware database</a></li>
 				</ul>
 			</div>
diff --git a/h-source/Application/Views/Desktop/Home/left_gr.php b/h-source/Application/Views/Desktop/Home/left_gr.php
index 26fc83a..a0a4279 100644
--- a/h-source/Application/Views/Desktop/Home/left_gr.php
+++ b/h-source/Application/Views/Desktop/Home/left_gr.php
@@ -73,7 +73,6 @@
 				<ul>
 <!-- 					<li><a href="http://www.fsf.org/resources/hw">Free Software Foundation archive</a></li> -->
 					<li><a href="http://libreplanet.org/wiki/Hardware/Freest">LibrePlanet Freest Hardware Page</a></li>
-					<li><a href="http://www.gnewsense.org/Main/LaptopGuide">gNewSense Laptop Guide</a></li>
 					<li><a href="http://libreplanet.org/wiki/Group:LibrePlanet_Italia/Progetti/hardware_libero">LibrePlanet Italia - progetti hardware database</a></li>
 				</ul>
 			</div>
diff --git a/h-source/Application/Views/Desktop/Home/left_it.php b/h-source/Application/Views/Desktop/Home/left_it.php
index fe74850..561c3a1 100644
--- a/h-source/Application/Views/Desktop/Home/left_it.php
+++ b/h-source/Application/Views/Desktop/Home/left_it.php
@@ -74,7 +74,6 @@
 				<ul>
 <!-- 					<li><a href="http://www.fsf.org/resources/hw">Free Software Foundation archive</a></li> -->
 					<li><a href="http://libreplanet.org/wiki/Hardware/Freest">LibrePlanet Freest Hardware Page</a></li>
-					<li><a href="http://www.gnewsense.org/Main/LaptopGuide">gNewSense Laptop Guide</a></li>
 					<li><a href="http://libreplanet.org/wiki/Group:LibrePlanet_Italia/Progetti/hardware_libero">LibrePlanet Italia - progetti hardware database</a></li>
 				</ul>
 			</div>
diff --git a/h-source/Application/Views/Mobile/Home/left.php b/h-source/Application/Views/Mobile/Home/left.php
index 21a62f9..b4ec21e 100644
--- a/h-source/Application/Views/Mobile/Home/left.php
+++ b/h-source/Application/Views/Mobile/Home/left.php
@@ -73,7 +73,6 @@
 				<ul>
 <!-- 					<li><a href="http://www.fsf.org/resources/hw">Free Software Foundation archive</a></li> -->
 					<li><a href="http://libreplanet.org/wiki/Hardware/Freest">LibrePlanet Freest Hardware Page</a></li>
-					<li><a href="http://www.gnewsense.org/Main/LaptopGuide">gNewSense Laptop Guide</a></li>
 					<li><a href="http://libreplanet.org/wiki/Group:LibrePlanet_Italia/Progetti/hardware_libero">LibrePlanet Italia - progetti hardware database</a></li>
 				</ul>
 			</div>
diff --git a/h-source/Application/Views/Mobile/Home/left_de.php b/h-source/Application/Views/Mobile/Home/left_de.php
index 5f99701..75467ea 100644
--- a/h-source/Application/Views/Mobile/Home/left_de.php
+++ b/h-source/Application/Views/Mobile/Home/left_de.php
@@ -72,7 +72,6 @@
 				<ul>
 <!-- 					<li><a href="http://www.fsf.org/resources/hw">Free Software Foundation archive</a></li> -->
 					<li><a href="http://libreplanet.org/wiki/Hardware/Freest">LibrePlanet Freest Hardware Page</a></li>
-					<li><a href="http://www.gnewsense.org/Main/LaptopGuide">gNewSense Laptop Guide</a></li>
 					<li><a href="http://libreplanet.org/wiki/Group:LibrePlanet_Italia/Progetti/hardware_libero">LibrePlanet Italia - progetti hardware database</a></li>
 				</ul>
 			</div>
diff --git a/h-source/Application/Views/Mobile/Home/left_es.php b/h-source/Application/Views/Mobile/Home/left_es.php
index e17a448..4b310c7 100644
--- a/h-source/Application/Views/Mobile/Home/left_es.php
+++ b/h-source/Application/Views/Mobile/Home/left_es.php
@@ -71,7 +71,6 @@
 				<ul>
 <!-- 					<li><a href="http://www.fsf.org/resources/hw">Free Software Foundation archive</a></li> -->
 					<li><a href="http://libreplanet.org/wiki/Hardware/Freest">LibrePlanet Freest Hardware Page</a></li>
-					<li><a href="http://www.gnewsense.org/Main/LaptopGuide">gNewSense Laptop Guide</a></li>
 					<li><a href="http://libreplanet.org/wiki/Group:LibrePlanet_Italia/Progetti/hardware_libero">LibrePlanet Italia - progetti hardware database</a></li>
 				</ul>
 			</div>
diff --git a/h-source/Application/Views/Mobile/Home/left_fr.php b/h-source/Application/Views/Mobile/Home/left_fr.php
index db51f4a..f68a53f 100644
--- a/h-source/Application/Views/Mobile/Home/left_fr.php
+++ b/h-source/Application/Views/Mobile/Home/left_fr.php
@@ -73,7 +73,6 @@
 				<ul>
 <!-- 					<li><a href="http://www.fsf.org/resources/hw">Free Software Foundation archive</a></li> -->
 					<li><a href="http://libreplanet.org/wiki/Hardware/Freest">LibrePlanet Freest Hardware Page</a></li>
-					<li><a href="http://www.gnewsense.org/Main/LaptopGuide">gNewSense Laptop Guide</a></li>
 					<li><a href="http://libreplanet.org/wiki/Group:LibrePlanet_Italia/Progetti/hardware_libero">LibrePlanet Italia - progetti hardware database</a></li>
 				</ul>
 			</div>
diff --git a/h-source/Application/Views/Mobile/Home/left_gr.php b/h-source/Application/Views/Mobile/Home/left_gr.php
index 38cb594..5e15b4c 100644
--- a/h-source/Application/Views/Mobile/Home/left_gr.php
+++ b/h-source/Application/Views/Mobile/Home/left_gr.php
@@ -73,7 +73,6 @@
 				<ul>
 <!-- 					<li><a href="http://www.fsf.org/resources/hw">Free Software Foundation archive</a></li> -->
 					<li><a href="http://libreplanet.org/wiki/Hardware/Freest">LibrePlanet Freest Hardware Page</a></li>
-					<li><a href="http://www.gnewsense.org/Main/LaptopGuide">gNewSense Laptop Guide</a></li>
 					<li><a href="http://libreplanet.org/wiki/Group:LibrePlanet_Italia/Progetti/hardware_libero">LibrePlanet Italia - progetti hardware database</a></li>
 				</ul>
 			</div>
diff --git a/h-source/Application/Views/Mobile/Home/left_it.php b/h-source/Application/Views/Mobile/Home/left_it.php
index 1be8bf0..dc9a6bb 100644
--- a/h-source/Application/Views/Mobile/Home/left_it.php
+++ b/h-source/Application/Views/Mobile/Home/left_it.php
@@ -73,7 +73,6 @@
 				<ul>
 <!-- 					<li><a href="http://www.fsf.org/resources/hw">Free Software Foundation archive</a></li> -->
 					<li><a href="http://libreplanet.org/wiki/Hardware/Freest">LibrePlanet Freest Hardware Page</a></li>
-					<li><a href="http://www.gnewsense.org/Main/LaptopGuide">gNewSense Laptop Guide</a></li>
 					<li><a href="http://libreplanet.org/wiki/Group:LibrePlanet_Italia/Progetti/hardware_libero">LibrePlanet Italia - progetti hardware database</a></li>
 				</ul>
 			</div>
diff --git a/h-source/config.xml b/h-source/config.xml
index 0ac72f1..8f87304 100644
--- a/h-source/config.xml
+++ b/h-source/config.xml
@@ -222,10 +222,6 @@
 				<a href="http://www.fsfe.org/">FSF Europe</a>
 				</div>
 
-				<div>
-				<a href="http://www.blagblagblag.org/">BLAG</a>
-				</div>
-
 				<div>
 				<a href="http://www.dragora.org">Dragora</a>
 				</div>
@@ -234,10 +230,6 @@
 				<a href="http://dynebolic.org/">Dynebolic</a>
 				</div>
 
-				<div>
-				<a href="http://www.gnewsense.org/">gNewSense</a>
-				</div>
-
 				<div>
 				<a href="https://parabolagnulinux.org/">Parabola GNU/Linux</a>
 				</div>
@@ -347,10 +339,6 @@
 				<a href="http://www.fsfe.org/">FSF Europe</a>
 				</div>
 
-				<div>
-				<a href="http://www.blagblagblag.org/">BLAG</a>
-				</div>
-
 				<div>
 				<a href="http://www.dragora.org">Dragora</a>
 				</div>
@@ -359,10 +347,6 @@
 				<a href="http://dynebolic.org/">Dynebolic</a>
 				</div>
 
-				<div>
-				<a href="http://www.gnewsense.org/">gNewSense</a>
-				</div>
-
 				<div>
 				<a href="https://parabolagnulinux.org/">Parabola GNU/Linux</a>
 				</div>
@@ -472,10 +456,6 @@
 				<a href="http://www.fsfe.org/">FSF Europe</a>
 				</div>
 
-				<div>
-				<a href="http://www.blagblagblag.org/">BLAG</a>
-				</div>
-
 				<div>
 				<a href="http://www.dragora.org">Dragora</a>
 				</div>
@@ -484,10 +464,6 @@
 				<a href="http://dynebolic.org/">Dynebolic</a>
 				</div>
 
-				<div>
-				<a href="http://www.gnewsense.org/">gNewSense</a>
-				</div>
-
 				<div>
 				<a href="https://parabolagnulinux.org/">Parabola GNU/Linux</a>
 				</div>
-- 
cgit v1.2.3


From 7b2c76f23be47a8753cfe6d197843a82c6ebf26d Mon Sep 17 00:00:00 2001
From: Yuchen Pei <hi@ypei.me>
Date: Thu, 26 Aug 2021 11:24:58 +1000
Subject: Moving docker files to its own directory.

Also applied the docker patch and removed some commented code.
---
 config-docker.patch                         | 81 -----------------------------
 docker-compose.yml                          | 14 -----
 docker/docker-compose.yml                   | 14 +++++
 docker/readme-php5.sh                       | 18 +++++++
 h-source/.htaccess                          | 15 ++----
 h-source/Application/Hooks/BeforeChecks.php |  2 +-
 h-source/Config/Config.php                  |  8 +--
 h-source/admin/Config/Config.php            |  8 +--
 readme-php5.sh                              | 20 -------
 9 files changed, 44 insertions(+), 136 deletions(-)
 delete mode 100644 config-docker.patch
 delete mode 100644 docker-compose.yml
 create mode 100644 docker/docker-compose.yml
 create mode 100755 docker/readme-php5.sh
 delete mode 100755 readme-php5.sh

(limited to 'h-source/Application')

diff --git a/config-docker.patch b/config-docker.patch
deleted file mode 100644
index 34f8f8b..0000000
--- a/config-docker.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/h-source/.htaccess b/h-source/.htaccess
-index 56ccf22..61012e2 100755
---- a/h-source/.htaccess
-+++ b/h-source/.htaccess
-@@ -1,7 +1,7 @@
- RewriteEngine On
- 
--RewriteCond %{HTTPS} !^on$
--RewriteRule (.*) https://www.h-node.org/$1 [R,L]
-+#RewriteCond %{HTTPS} !^on$
-+#RewriteRule (.*) https://www.h-node.org/$1 [R,L]
- 
- # <IfModule mod_rewrite.c>
- # 	Options +FollowSymlinks
-diff --git a/h-source/Application/Hooks/BeforeChecks.php b/h-source/Application/Hooks/BeforeChecks.php
-index 6f200e6..47e7936 100755
---- a/h-source/Application/Hooks/BeforeChecks.php
-+++ b/h-source/Application/Hooks/BeforeChecks.php
-@@ -13,7 +13,7 @@ if (!defined('EG')) die('Direct access not allowed!');
- 
- Params::$htmlentititiesCharset = "UTF-8";
- 
--Params::$useHttps = true;
-+Params::$useHttps = false;
- 
- Params::$allowedSanitizeFunc .= ",sanitizeString,sanitizeAlphanum";
- 
-diff --git a/h-source/Config/Config.php b/h-source/Config/Config.php
-index bea5562..1290751 100755
---- a/h-source/Config/Config.php
-+++ b/h-source/Config/Config.php
-@@ -23,10 +23,10 @@
- if (!defined('EG')) die('Direct access not allowed!');
- 
- 
--define('DB', '');
--define('USER', '');
-+define('DB', 'hnode');
-+define('USER', 'root');
- define('PWD', '');
--define('HOST', '');
-+define('HOST', 'localhost');
- 
- /*default controller name*/
- define('DEFAULT_CONTROLLER','home');
-@@ -35,7 +35,7 @@ define('DEFAULT_CONTROLLER','home');
- define('DEFAULT_ACTION','index');
- 
- /*website parameters*/
--define('DOMAIN_NAME','h-source');
-+define('DOMAIN_NAME','localhost');
- 
- /*type of database.*/
- //it can be: Mysql, Mysqli or None (first letter in uppercase)
-diff --git a/h-source/admin/Config/Config.php b/h-source/admin/Config/Config.php
-index 24d2e57..3f7866d 100755
---- a/h-source/admin/Config/Config.php
-+++ b/h-source/admin/Config/Config.php
-@@ -6,10 +6,10 @@
- if (!defined('EG')) die('Direct access not allowed!');
- 
- 
--define('DB', '');
--define('USER', '');
-+define('DB', 'hnode');
-+define('USER', 'root');
- define('PWD', '');
--define('HOST', '');
-+define('HOST', 'localhost');
- 
- /*default controller name*/
- define('DEFAULT_CONTROLLER','adminusers');
-@@ -18,7 +18,7 @@ define('DEFAULT_CONTROLLER','adminusers');
- define('DEFAULT_ACTION','login');
- 
- /*website parameters*/
--define('DOMAIN_NAME','h-source/admin');
-+define('DOMAIN_NAME','localhost/admin');
- 
- /*type of database.*/
- //it can be: Mysql, Mysqli or None (first letter in uppercase)
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 3b70319..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Image for LAMP based on Dockerfile in https://github.com/jakejarvis/docker-lamp-php5
-# WARNING: Not suitable for production environments, only for testing legacy php5 application.
-# (Docker image supplementary files licenced under Apache 2.0)
-
-version: "3"
-services:
-  lamp-php5:
-    image: docker.io/jakejarvis/lamp-php5:latest
-    ports:
-      - 80:80
-      - 3306:3306
-    volumes:
-      - "./h-source:/app"
-      - "./mysql:/var/lib/mysql"
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 0000000..c3f2349
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,14 @@
+# Image for LAMP based on Dockerfile in https://github.com/jakejarvis/docker-lamp-php5
+# WARNING: Not suitable for production environments, only for testing legacy php5 application.
+# (Docker image supplementary files licenced under Apache 2.0)
+
+version: "3"
+services:
+  lamp-php5:
+    image: docker.io/jakejarvis/lamp-php5:latest
+    ports:
+      - 80:80
+      - 3306:3306
+    volumes:
+      - "../h-source:/app"
+      - "./mysql:/var/lib/mysql"
diff --git a/docker/readme-php5.sh b/docker/readme-php5.sh
new file mode 100755
index 0000000..fb62a4d
--- /dev/null
+++ b/docker/readme-php5.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+# INSTRUCTIONS for testing with docker-lamp-php5:
+#
+# After the docker container spins up,
+# the mysql password will be displayed.
+# - MySQL on port 3306
+# - Apache on port 80
+#
+# Don't forget to create the database:
+#	mysql -uadmin -pXXX -h127.0.0.1
+#	> create database hnode;
+#	> ^D
+# and populate the schema/initial data with:
+#	mysql -uadmin -pXXX -h127.0.0.1 hnode < ../h-source/tables.sql
+
+docker-compose up --build lamp-php5
+
diff --git a/h-source/.htaccess b/h-source/.htaccess
index 56ccf22..95ab62f 100755
--- a/h-source/.htaccess
+++ b/h-source/.htaccess
@@ -1,14 +1,5 @@
 RewriteEngine On
 
-RewriteCond %{HTTPS} !^on$
-RewriteRule (.*) https://www.h-node.org/$1 [R,L]
-
-# <IfModule mod_rewrite.c>
-# 	Options +FollowSymlinks
-#    RewriteEngine on
-	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteCond %{REQUEST_FILENAME} !-d
-	RewriteRule ^(.*)$ index.php?url=$1 [QSA,L]
-# </IfModule>
-
- 
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^(.*)$ index.php?url=$1 [QSA,L]
diff --git a/h-source/Application/Hooks/BeforeChecks.php b/h-source/Application/Hooks/BeforeChecks.php
index 6f200e6..47e7936 100755
--- a/h-source/Application/Hooks/BeforeChecks.php
+++ b/h-source/Application/Hooks/BeforeChecks.php
@@ -13,7 +13,7 @@ if (!defined('EG')) die('Direct access not allowed!');
 
 Params::$htmlentititiesCharset = "UTF-8";
 
-Params::$useHttps = true;
+Params::$useHttps = false;
 
 Params::$allowedSanitizeFunc .= ",sanitizeString,sanitizeAlphanum";
 
diff --git a/h-source/Config/Config.php b/h-source/Config/Config.php
index bea5562..1290751 100755
--- a/h-source/Config/Config.php
+++ b/h-source/Config/Config.php
@@ -23,10 +23,10 @@
 if (!defined('EG')) die('Direct access not allowed!');
 
 
-define('DB', '');
-define('USER', '');
+define('DB', 'hnode');
+define('USER', 'root');
 define('PWD', '');
-define('HOST', '');
+define('HOST', 'localhost');
 
 /*default controller name*/
 define('DEFAULT_CONTROLLER','home');
@@ -35,7 +35,7 @@ define('DEFAULT_CONTROLLER','home');
 define('DEFAULT_ACTION','index');
 
 /*website parameters*/
-define('DOMAIN_NAME','h-source');
+define('DOMAIN_NAME','localhost');
 
 /*type of database.*/
 //it can be: Mysql, Mysqli or None (first letter in uppercase)
diff --git a/h-source/admin/Config/Config.php b/h-source/admin/Config/Config.php
index 24d2e57..3f7866d 100755
--- a/h-source/admin/Config/Config.php
+++ b/h-source/admin/Config/Config.php
@@ -6,10 +6,10 @@
 if (!defined('EG')) die('Direct access not allowed!');
 
 
-define('DB', '');
-define('USER', '');
+define('DB', 'hnode');
+define('USER', 'root');
 define('PWD', '');
-define('HOST', '');
+define('HOST', 'localhost');
 
 /*default controller name*/
 define('DEFAULT_CONTROLLER','adminusers');
@@ -18,7 +18,7 @@ define('DEFAULT_CONTROLLER','adminusers');
 define('DEFAULT_ACTION','login');
 
 /*website parameters*/
-define('DOMAIN_NAME','h-source/admin');
+define('DOMAIN_NAME','localhost/admin');
 
 /*type of database.*/
 //it can be: Mysql, Mysqli or None (first letter in uppercase)
diff --git a/readme-php5.sh b/readme-php5.sh
deleted file mode 100755
index 4bad3aa..0000000
--- a/readme-php5.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-#
-# INSTRUCTIONS for testing with docker-lamp-php5:
-#
-# After the docker container spins up,
-# the mysql password will be displayed.
-# - MySQL on port 3306
-# - Apache on port 80
-#
-# Don't forget to create the database:
-#	mysql -uadmin -pXXX -h127.0.0.1
-#	> create database hnode;
-#	> ^D
-# and populate the schema/initial data with:
-#	mysql -uadmin -pXXX -h127.0.0.1 hnode < h-source/tables.sql
-
-patch -p1 < config-docker.patch
-
-docker-compose up --build lamp-php5
-
-- 
cgit v1.2.3


From a433241c0aff14110d1355f904d3dace8b6bae6b Mon Sep 17 00:00:00 2001
From: Yuchen Pei <hi@ypei.me>
Date: Thu, 26 Aug 2021 09:53:44 +1000
Subject: Updating contact section.

Removing info@h-node.com
adding irc and mailing list.

couldn't do nonenglish version because I don't know the languages.
---
 h-source/Application/Views/Desktop/Contact/index.php | 2 +-
 h-source/Application/Views/Mobile/Contact/index.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'h-source/Application')

diff --git a/h-source/Application/Views/Desktop/Contact/index.php b/h-source/Application/Views/Desktop/Contact/index.php
index 62822d8..ac6e7d5 100644
--- a/h-source/Application/Views/Desktop/Contact/index.php
+++ b/h-source/Application/Views/Desktop/Contact/index.php
@@ -31,7 +31,7 @@
 			</div>
 
 			<div class="contact_div">
-				If you want to directly contact the <b><?php echo Website::$generalName;?></b> team use this e-mail address: <b>info@h-node.com</b>
+				Discussions about <b><?php echo Website::$generalName;?></b> also take place on the <a href="https://lists.nongnu.org/mailman/listinfo/h-source-users">h-source-users mailing list</a> and <a href="irc://libera.chat/h-node">#h-node libera.chat IRC channel</a>.
 			</div>
 			
 		</div>
diff --git a/h-source/Application/Views/Mobile/Contact/index.php b/h-source/Application/Views/Mobile/Contact/index.php
index 51e0466..20faef1 100644
--- a/h-source/Application/Views/Mobile/Contact/index.php
+++ b/h-source/Application/Views/Mobile/Contact/index.php
@@ -33,7 +33,7 @@
 			</div>
 
 			<div class="contact_div">
-				If you want to directly contact the <b><?php echo Website::$generalName;?></b> team use this e-mail address: <b>info@h-node.com</b>
+				Discussions about <b><?php echo Website::$generalName;?></b> also take place on the <a href="https://lists.nongnu.org/mailman/listinfo/h-source-users">h-source-users mailing list</a> and <a href="irc://libera.chat/h-node">#h-node libera.chat IRC channel</a>.
 			</div>
 
 		</div>
-- 
cgit v1.2.3