Add Features for 0.2.4.1

cheinisch · Aug 12, 2024 · 95c1fac · 95c1fac
1 parent f22cfb5
commit 95c1fac
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 35 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.2.3.1
+0.2.4.1
diff --git a/system/function/function.php b/system/function/function.php
@@ -250,7 +250,7 @@ function get_versionfromgit()
     $repoOwner = 'cheinisch';
     $repoName = 'journal';  // Ersetze 'repository' durch den Namen des Repositories
     $prerelease = isDevRelease();
-    $latestVersion = getLatestGitHubRelease($repoOwner, $repoName, $prerelease);
+    $latestVersion = getLatestGitHubRelease($repoOwner, $repoName, true);
     return htmlspecialchars($latestVersion);
   } catch (Exception $e) {
       echo "Fehler: " . htmlspecialchars($e->getMessage());

diff --git a/system/function/update.php b/system/function/update.php
@@ -1,3 +1,7 @@
+
+    // 2. Neueste Release-URL von GitHub abrufen
+
+
 <?php
 
 # Update Datei für Journal CMS
@@ -11,15 +15,14 @@
 
 function load_update()
 {
-
     require_once('system/function/dbquery.php');
 
-    $prerelease = isDevRelease();
+    $release = isDevRelease();
 
     try {
         $repoOwner = 'cheinisch'; // Ersetze 'owner' durch den Besitzer des Repositories
         $repoName = 'journal'; // Ersetze 'repository' durch den Namen des Repositories
-        updateFromGitHub($repoOwner, $repoName, $prerelease);
+        updateFromGitHub($repoOwner, $repoName);
     } catch (Exception $e) {
         echo "Fehler: " . htmlspecialchars($e->getMessage());
     }
@@ -47,38 +50,21 @@ function updateFromGitHub($repoOwner, $repoName, $prerelease = false) {
     $url = $prerelease
         ? "https://api.github.com/repos/$repoOwner/$repoName/releases"
         : "https://api.github.com/repos/$repoOwner/$repoName/releases/latest";
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $url);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0'); // GitHub API erfordert einen User-Agent Header
+    $response = curl_exec($ch);
+    curl_close($ch);
 
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0');
-        $response = curl_exec($ch);
-        curl_close($ch);
-
-        if ($response === false) {
-            throw new Exception("Fehler beim Abrufen der GitHub-Version.");
-        }
-        echo $response; // Ausgabe der API-Antwort zu Debugging-Zwecken
-
-        $data = json_decode($response, true);
-
-        if (json_last_error() !== JSON_ERROR_NONE) {
-            throw new Exception("Fehler beim Verarbeiten der GitHub-Antwort: " . json_last_error_msg());
-        }
-
-        if (!is_array($data)) {
-            throw new Exception("Unerwartete Antwort von GitHub.");
-        }
-
-        foreach ($data as $release) {
-            if ($prerelease && $release['prerelease']) {
-                return $release['zipball_url'];
-            } elseif (!$prerelease && !$release['prerelease']) {
-                return $release['zipball_url'];
-            }
-        }
-
+    if ($response === false) {
+        throw new Exception("Fehler beim Abrufen der GitHub-Version.");
+    }
+
+    $data = json_decode($response, true);
+    if (!isset($data['zipball_url'])) {
         throw new Exception("Die ZIP-URL konnte nicht abgerufen werden.");
+    }
 
     $zipUrl = $data['zipball_url'];
     echo $zipUrl;