From ec16d3583780b0cdef0c7209c35a0a9b35219654 Mon Sep 17 00:00:00 2001 From: Nivesh Krishna Date: Fri, 17 Mar 2023 16:12:04 +0530 Subject: [PATCH 1/3] use https protocol --- index.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index 0a159e1..aa1f4a1 100644 --- a/index.php +++ b/index.php @@ -51,10 +51,11 @@ } } - if( isset($_SERVER['HTTPS']) ) - $protocol = 'https://'; - else - $protocol = 'http://'; + // if( isset($_SERVER['HTTPS']) ) + // $protocol = 'https://'; + // else + // $protocol = 'http://'; + $protocol = 'https://'; $logger = new Logger('main'); $logger->pushHandler(new StreamHandler('LineageOTA.log', Logger::INFO)); -- GitLab From a79fb548d2eab04f0f15f922510b46ec435d98bc Mon Sep 17 00:00:00 2001 From: Fazle Rabbi Date: Tue, 21 Mar 2023 17:30:01 +0600 Subject: [PATCH 2/3] Revert "use https protocol" This reverts commit ec16d3583780b0cdef0c7209c35a0a9b35219654. --- index.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/index.php b/index.php index aa1f4a1..0a159e1 100644 --- a/index.php +++ b/index.php @@ -51,11 +51,10 @@ } } - // if( isset($_SERVER['HTTPS']) ) - // $protocol = 'https://'; - // else - // $protocol = 'http://'; - $protocol = 'https://'; + if( isset($_SERVER['HTTPS']) ) + $protocol = 'https://'; + else + $protocol = 'http://'; $logger = new Logger('main'); $logger->pushHandler(new StreamHandler('LineageOTA.log', Logger::INFO)); -- GitLab From c88fc2d0bb36ffea116d9e30fdfa0923cb3cc7ef Mon Sep 17 00:00:00 2001 From: Alexandre Roux D'Anzi Date: Fri, 12 May 2023 16:50:00 +0200 Subject: [PATCH 3/3] quick fix to allow 2e upgrade to zirconia --- src/Helpers/Build.php | 2 +- src/Helpers/Builds.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Helpers/Build.php b/src/Helpers/Build.php index 87bcf4d..17507e5 100644 --- a/src/Helpers/Build.php +++ b/src/Helpers/Build.php @@ -138,7 +138,7 @@ $ret = false; - if ($params['device'] == $this->model) { + if ($params['device'] == $this->model || $params['device'] === "2e" && $this->model === "zirconia") { if (count($params['channels']) > 0) { foreach ($params['channels'] as $channel) { if (strtolower($channel) == $this->channel) { diff --git a/src/Helpers/Builds.php b/src/Helpers/Builds.php index 75cc37e..7749c45 100644 --- a/src/Helpers/Builds.php +++ b/src/Helpers/Builds.php @@ -186,7 +186,7 @@ foreach ($files as $file) { // Skip all files except for the ones that match the pattern // filename starting with e- and ending with .zip are considered as valid files - if (!preg_match("/^e-[0-9\.]+-(.*)-$device\.zip$/i", $file)) { + if (!preg_match("/^e-[0-9\.]+-(.*)-$device\.zip$/i", $file) && !($device === "2e" && preg_match("/^e-[0-9\.]+-(.*)-zirconia\.zip$/i", $file))) { continue; } $build = null; -- GitLab