From a8e8d1b9a5fd55fdb0c8e6e24a4c67e8c1747214 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 14 Dec 2018 17:58:42 +0000
Subject: [PATCH] wip #2428 @4

---
 inc/ws/Controlleur/class.ws.maintenance.php |  9 +++++++
 inc/ws/Controlleur/class.ws.services.php    | 30 ++++++++++++---------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 45b393ac9..7699a87a7 100644
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -1719,6 +1719,15 @@ class wsMaintenance
 	{
 		wsPackager::package(16200, 'win-exe-html');
 	}
+
+	public static function gpu()
+	{
+		global $core;
+		$r = $core->con->select('SELECT DISTINCT rgpu FROM gpu_log');
+		while ($r->fetch()) {
+			echo $r->rgpu . ' : <b>' . file_get_contents('https://workshop.fluidbook.com/services/gup?gup=' . base64_encode($r->rgpu)) . '</b><br>';
+		}
+	}
 }
 
 
diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 2263a0d6c..7cdab649e 100644
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -1343,26 +1343,30 @@ class wsServices extends cubeFlashGateway
 
 		$this->outputXML = false;
 
-		$gpu = base64_decode($_GET['gup']);
-		if (preg_match('/\(([^\)]*)\)/', $gpu, $matches)) {
-			if (strlen($matches[1]) > 8) {
-				$gpu = $matches[1];
+		$rgpu = $gpu = trim(base64_decode($_GET['gup']));
+
+		if (strstr($gpu, 'ANGLE (')) {
+			if (preg_match('/\((.*)\)/', $gpu, $matches)) {
+				if (strlen($matches[1]) > 8) {
+					$gpu = $matches[1];
+				}
 			}
-		}
-		$version = 40;
 
-		$split = self::gpuSeparators();
+			$split = self::gpuSeparators();
 
-		foreach ($split as $item) {
-			$e = explode($item, $gpu);
-			if (count($e) > 1) {
-				$gpu = $e[0];
-				break;
+			foreach ($split as $item) {
+				$e = explode($item, $gpu);
+				if (count($e) > 1) {
+					$gpu = $e[0];
+					break;
+				}
 			}
 		}
+		$version = 40;
+
+
 
 		$gpu = trim($gpu);
-		$rgpu = trim(base64_decode($_GET['rgup']));
 
 		$c = $core->con->openCursor('gpu_log');
 		$c->gpu = $gpu;
-- 
2.39.5