From c7294bd069806bded2b46495089747332dfca0fa Mon Sep 17 00:00:00 2001
From: Yalh <yalh@yalh.net>
Date: Sun, 27 Jan 2019 21:12:58 +0100
Subject: [PATCH] Fix install

---
 conf/nginx.conf     |  8 +++++++-
 sources/sso/sso.php | 19 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index dc8b7c7..848d727 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -9,10 +9,16 @@ location __PATH__/ {
     rewrite ^ https://$server_name$request_uri? permanent;
   }
 
-	location ^~ __PATH__/app/data {
+	location ^~ __PATH__/data {
 	  deny all;
 	}
+    location ^~ /data {
+        deny all;
+    }
 
+	location ^~ /pgpback/keys {
+	  deny all;
+	}
 	location ^~ __PATH__/pgpback/keys {
 	  deny all;
 	}
diff --git a/sources/sso/sso.php b/sources/sso/sso.php
index b20beff..54fb4a3 100644
--- a/sources/sso/sso.php
+++ b/sources/sso/sso.php
@@ -1,9 +1,22 @@
 <?php
 
-// Enable RainLoop Api and include index file 
-$_ENV['RAINLOOP_INCLUDE_AS_API'] = true;
-include '__FINAL_PATH__/app/index.php';
+if (!defined('APP_VERSION'))
+{
+	define('APP_VERSION', '1.12.1');
+	define('APP_VERSION_TYPE', 'community');
+	define('APP_INDEX_ROOT_FILE', __FILE__);
+	define('APP_INDEX_ROOT_PATH', str_replace('\\', '/', rtrim(dirname(__FILE__), '\\/').'/'));
+}
 
+if (file_exists(APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/include.php'))
+{
+	include APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/include.php';
+}
+else
+{
+	echo '[105] Missing version directory';
+	exit(105);
+}
 // Retrieve email and password
 if (isset($_SERVER['HTTP_EMAIL']) && isset($_SERVER['PHP_AUTH_PW'])) {
 	$email = $_SERVER['HTTP_EMAIL'];