From 8e73926725845e3afd97dc06eca430ad73d4b411 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Thu, 24 Sep 2020 21:38:55 +0200
Subject: [PATCH] Enable the packages/plugins

---
 .../app/libraries/RainLoop/Actions/Admin.php    | 17 +++++------------
 rainloop/v/0.0.0/include.php                    |  2 --
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
index 5fbbbecf4..77ec55ffb 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
@@ -503,15 +503,9 @@ trait Admin
 		));
 	}
 
-	private function rainLoopRepo() : string
+	private function snappyMailRepo() : string
 	{
-		$sUrl = APP_REPOSITORY_PATH;
-		if ('' !== $sUrl)
-		{
-			$sUrl = rtrim($sUrl, '\\/').'/';
-		}
-
-		return $sUrl;
+		return 'https://snappymail.eu/repository/';
 	}
 
 	private function rainLoopUpdatable() : bool
@@ -529,7 +523,7 @@ trait Admin
 		$aRep = null;
 
 		$sRep = '';
-		$sRepoFile = 'repository.json';
+		$sRepoFile = 'packages.json';
 		$iRepTime = 0;
 
 		$oHttp = \MailSo\Base\Http::SingletonInstance();
@@ -614,7 +608,7 @@ trait Admin
 	{
 		$bRainLoopUpdatable = $this->rainLoopUpdatable();
 
-		$aResult = $this->getRepositoryDataByUrl($this->rainLoopRepo(), $bReal);
+		$aResult = $this->getRepositoryDataByUrl($this->snappyMailRepo(), $bReal);
 
 		$aSub = array();
 		foreach ($aResult as $aItem)
@@ -783,8 +777,7 @@ trait Admin
 		$bResult = false;
 		if ('' !== $sRealFile)
 		{
-			$sUrl = $this->rainLoopRepo().$sRealFile;
-			$sTmp = $this->downloadRemotePackageByUrl($sUrl);
+			$sTmp = $this->downloadRemotePackageByUrl($this->snappyMailRepo().$sRealFile);
 		}
 
 		if ('' !== $sTmp)
diff --git a/rainloop/v/0.0.0/include.php b/rainloop/v/0.0.0/include.php
index aa3b9e583..9c45aafcf 100644
--- a/rainloop/v/0.0.0/include.php
+++ b/rainloop/v/0.0.0/include.php
@@ -44,8 +44,6 @@
 
 			define('APP_DUMMY', '********');
 			define('APP_DEV_VERSION', '0.0.0');
-			define('APP_REPOSITORY_PATH', 'http://repository.rainloop.net/v1/');
-			define('APP_REPO_CORE_FILE', 'http://repository.rainloop.net/v2/core.{{channel}}.json');
 
 			$sCustomDataPath = '';
 			$sCustomConfiguration = '';