From 875621fa57093897eb1e81493f27c954ec36877c Mon Sep 17 00:00:00 2001
From: whatever127 <mkuba50@outlook.com>
Date: Wed, 28 Aug 2019 16:26:16 +0200
Subject: [PATCH] Fix Windows Server updates being named Windows 10

---
 fetchupd.php    | 13 ++++++++-----
 shared/main.php |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/fetchupd.php b/fetchupd.php
index 6d5c6d9..3a48b96 100644
--- a/fetchupd.php
+++ b/fetchupd.php
@@ -192,9 +192,10 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
         return array('error' => 'EMPTY_FILELIST');
     }
 
-    preg_match('/ProductReleaseInstalled Name\=".*\.(.*?)" Version\="10\.0\.(.*?)"/', $updateInfo, $info);
-    $foundArch = strtolower($info[1]);
-    $foundBuild = $info[2];
+    preg_match('/ProductReleaseInstalled Name\="(.*?)\..*\.(.*?)" Version\="10\.0\.(.*?)"/', $updateInfo, $info);
+    $foundType = strtolower($info[1]);
+    $foundArch = strtolower($info[2]);
+    $foundBuild = $info[3];
 
     $updateTitle = preg_grep('/<Title>.*<\/Title>/', $updateMeta);
     sort($updateTitle);
@@ -217,9 +218,11 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
 
     $updateTitle = preg_replace("/ ?\d{4}-\d{2}\w* ?| ?$foundArch ?| ?x64 ?/i", '', $updateTitle);
 
-    if(!preg_match("/$foundBuild/i", $updateTitle)) {
+    if($foundType == 'server')
+        $updateTitle = str_replace('Windows 10', 'Windows Server', $updateTitle);
+
+    if(!preg_match("/$foundBuild/i", $updateTitle))
         $updateTitle = $updateTitle.' ('.$foundBuild.')';
-    }
 
     preg_match('/UpdateID=".*?"/', $updateInfo, $updateId);
     preg_match('/RevisionNumber=".*?"/', $updateInfo, $updateRev);
diff --git a/shared/main.php b/shared/main.php
index 4aeedef..358a1d5 100644
--- a/shared/main.php
+++ b/shared/main.php
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 function uupApiVersion() {
-    return '1.26.0';
+    return '1.26.1';
 }
 
 require_once dirname(__FILE__).'/auths.php';