From 5be44d0161010af454947535ebea67a60c3b250d Mon Sep 17 00:00:00 2001
From: Pierre Ozoux <pierre@ozoux.net>
Date: Mon, 28 Nov 2022 12:20:11 +0000
Subject: [PATCH 1/5] Fixes bug visio url link

---
 base/apps/indie_external/lib/SitesManager.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/base/apps/indie_external/lib/SitesManager.php b/base/apps/indie_external/lib/SitesManager.php
index 00e8aaf..773eec5 100644
--- a/base/apps/indie_external/lib/SitesManager.php
+++ b/base/apps/indie_external/lib/SitesManager.php
@@ -115,8 +115,12 @@ class SitesManager {
 
 			if ($site['name'] === 'Visio') {
 				$visio_url = getenv('VISIO_URL', true) ?: getenv('VISIO_URL');
-				if ($visio_url) {
-					$site['url'] = $visio_url;
+				if ($visio_url !== '') { // if VISIO_URL is empty, we use the default provided in the json 
+					if ($visio_url == 'false') { // if VISIO_URL is 'false', continue the loop and skip this item
+						continue;
+					} else {
+						$site['url'] = $visio_url;
+					}
 				}
 			}
 
-- 
GitLab


From 1070c3d1816a44aa1aee5a689145d0de68bd3fa8 Mon Sep 17 00:00:00 2001
From: Pierre Ozoux <pierre@ozoux.net>
Date: Mon, 28 Nov 2022 13:37:50 +0000
Subject: [PATCH 2/5] Fix DESTINATION bash variable

pipeline broken.
---
 ci/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/functions b/ci/functions
index 3b184eb..2486bef 100644
--- a/ci/functions
+++ b/ci/functions
@@ -38,7 +38,7 @@ function build_web() {
 
 function test_build() {
   print_versions
-  export DESTINATION: "--no-push"
+  export DESTINATION="--no-push"
   build_base
 }
 
-- 
GitLab


From ed1b189974c21ce6881d9fc42357fa99a9891174 Mon Sep 17 00:00:00 2001
From: Hugo Renard <hugo.renard@protonmail.com>
Date: Tue, 29 Nov 2022 01:12:32 +0100
Subject: [PATCH 3/5] fix: bad code

---
 base/apps/indie_external/lib/SitesManager.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/base/apps/indie_external/lib/SitesManager.php b/base/apps/indie_external/lib/SitesManager.php
index 773eec5..1909e79 100644
--- a/base/apps/indie_external/lib/SitesManager.php
+++ b/base/apps/indie_external/lib/SitesManager.php
@@ -115,12 +115,8 @@ class SitesManager {
 
 			if ($site['name'] === 'Visio') {
 				$visio_url = getenv('VISIO_URL', true) ?: getenv('VISIO_URL');
-				if ($visio_url !== '') { // if VISIO_URL is empty, we use the default provided in the json 
-					if ($visio_url == 'false') { // if VISIO_URL is 'false', continue the loop and skip this item
-						continue;
-					} else {
-						$site['url'] = $visio_url;
-					}
+				if ($visio_url !== '' && $visio_url !== 'false') { // if VISIO_URL is empty, we use the default provided in the json 
+					$site['url'] = $visio_url;
 				}
 			}
 
-- 
GitLab


From 4f2bf184763271f6888038789fdf715143a35bef Mon Sep 17 00:00:00 2001
From: Hugo Renard <hugo.renard@protonmail.com>
Date: Wed, 30 Nov 2022 16:55:40 +0100
Subject: [PATCH 4/5] fix: visio link

---
 base/apps/indie_external/lib/SitesManager.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/base/apps/indie_external/lib/SitesManager.php b/base/apps/indie_external/lib/SitesManager.php
index 1909e79..d20f434 100644
--- a/base/apps/indie_external/lib/SitesManager.php
+++ b/base/apps/indie_external/lib/SitesManager.php
@@ -114,8 +114,8 @@ class SitesManager {
 			$site['url'] = str_replace(['{email}', '{uid}', '{displayname}', '{chat_url}', '{saml_idp_url}', '{saml_realm}', '{quota_url}'], [$email, $uid, $displayName, $chat_url, $saml_idp_url, $saml_realm, $quota_url], $site['url']);
 
 			if ($site['name'] === 'Visio') {
-				$visio_url = getenv('VISIO_URL', true) ?: getenv('VISIO_URL');
-				if ($visio_url !== '' && $visio_url !== 'false') { // if VISIO_URL is empty, we use the default provided in the json 
+				$visio_url = getenv('VISIO_URL', true);
+				if ($visio_url) { // if VISIO_URL is empty, we use the default provided in the json 
 					$site['url'] = $visio_url;
 				}
 			}
@@ -187,13 +187,11 @@ class SitesManager {
 			}
 			
 			if ($site['name'] === 'Visio') {
-				$visio_url = getenv('VISIO_URL', true) ?: getenv('VISIO_URL');
-				if ($visio_url !== '') { // if VISIO_URL is empty, we use the default provided in the json 
-					if ($visio_url == 'false') { // if VISIO_URL is 'false', continue the loop and skip this item
-						continue;
-					} else {
-						$site['url'] = $visio_url;
-					}
+				$visio_url = getenv('VISIO_URL', true);
+				if (!$visio_url) { // if VISIO_URL is empty, we use the default provided in the json 
+					continue;
+				} else {
+					$site['url'] = $visio_url;
 				}
 			}
 
-- 
GitLab


From ae2553cd7824fb821dcdad2f47b2c43e35c493b7 Mon Sep 17 00:00:00 2001
From: Pierre Ozoux <pierre@ozoux.net>
Date: Thu, 1 Dec 2022 09:20:08 +0000
Subject: [PATCH 5/5] Adds env VISIO_URL

---
 base/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/base/Dockerfile b/base/Dockerfile
index 78beebf..960595a 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -12,6 +12,7 @@ RUN rm ./install.sh ./install-list ./mail-enumeration-leak.patch ./files_version
 
 FROM nextcloud:${MARKETTING_VERSION}-fpm-alpine
 ENV VERSION $PATCH_VERSION
+ENV VISIO_URL=https://meet.liiib.re
 RUN apk add --no-cache patch jq
 COPY redis.ini /usr/local/etc/php/conf.d/
 COPY opcache-recommended.ini /usr/local/etc/php/conf.d/opcache.ini
-- 
GitLab