From 04f8158cfa7827de0b0e3c70d98d02c14f05354f Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 12 Aug 2015 10:04:22 -0300
Subject: Fix opensearch URL when root config is defined

---
 www/api/opensearch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'www')

diff --git a/www/api/opensearch.php b/www/api/opensearch.php
index 3e7dbf7..9d3eae7 100644
--- a/www/api/opensearch.php
+++ b/www/api/opensearch.php
@@ -12,5 +12,5 @@ echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n";
   <Developer>Jan Seifert "jan.seifert@uid.com"</Developer>
   <Tags>semanticscuttle bookmark web</Tags>
   <Image width="16" height="16">data:image/gif;base64,R0lGODlhEAAQAMZ9ANaPE9mREteTHtSXLdmXIdiXJtaYKdiYJ9iYKNeaLtKdP9CdRd2dLNWfQuWiFMqjX9+hNMykXt6jPOCkPM2oaM+paeCpQuGoR+OqOeKpR+GqS9+uWeSwU+ayS+uzOeWxVeWxWOSyWOu0POazXOS0YOm8Zee8cOy+WOm9a/jBLum+bPbCNurAbe7BYuvBc/LDV/LEV+zEdv/KKf/KLP/KLf/LLuzHe//MNP/NN/nMTv/OOf/OPP/OP/jNW//PPvnOVv/QQv7QRv/QRP/RR/HOhP/SSf/STPnRav/TT//TUPfScf/UUvzUXP/UVP/VV/bTfv/WWf/WW//WXP7XYf/XX//XYP/YZPPVmf/ZZv/ZZ/vYeP/aaf/aa//abP/abf/abvvaef/bb//bcfzbfP/ccv/cc//cdP/cdf/dd//deP/def3egP/ee//efP/efv/ffv/ggf/gg//ghP/ghfrfmv/hif/ii//ijP/jkfzjm//kkv7klv/lmP///////////yH5BAEKAH8ALAAAAAAQABAAAAergH+Cg38hhIeHIFcmiIgDLnt0Go2EE1pyd0QbjQMQDC9bZGprKBcjA4IfAQMrQUhOVFlhaGNPMRl/Aw4yMzc7QkZNUlZdZmASqAJKcW1WPDpARUtQUx0RgyR5fHpzUTU4PkMiqIMVNnh2c25lSTQpAIgqdXJvaWReXz0JiCxwbWhiuGCp8uMAohJszhw5AYMJlBwFEHFoYQHBAwUEMHgwgKjBA0QLKFAaKSgQADs=</Image>
-  <Url type="text/html" template="http://<?php echo $_SERVER['HTTP_HOST'] . '/' . $GLOBALS['root']?>search.php/all/{searchTerms}"/>
+  <Url type="text/html" template="<?php if ($GLOBALS['root'] != null) { echo $GLOBALS['root']; } else { echo $_SERVER['SERVER_PROTOCOL'] .'://'. $_SERVER['HTTP_HOST'] . '/'; } ?>search.php/all/{searchTerms}"/>
 </OpenSearchDescription>
-- 
cgit v1.2.3


From 1b056fa2334b5743ce0ed69b4ec550d974b711fd Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 12 Aug 2015 10:33:35 -0300
Subject: Fix mod_rewrite issue

---
 www/.htaccess | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'www')

diff --git a/www/.htaccess b/www/.htaccess
index 563fe53..5799444 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -3,6 +3,10 @@
 # (see $cleanurls in config.inc.php)
 #####################################
 
+# See https://stackoverflow.com/questions/4558629/mod-rewrite-not-behaving-nicely
+#     http://www.bennadel.com/blog/2218-Negotiation-Discovered-File-s-Matching-Request-None-Could-Be-Negotiated.htm
+#     https://httpd.apache.org/docs/current/content-negotiation.html
+Options -MultiViews +FollowSymLinks
 
 # Rewrite clean URLs onto real files
 <IfModule mod_rewrite.c>
-- 
cgit v1.2.3