wip #2428 @4

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 45b393ac9f7824d5c5634570310578c391e57d2d..7699a87a7d60e243ed1c67e9d0ed4c9cfcb6bcbc 100644 (file)
--- 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 2263a0d6c4f5f4e37bd05616bbd906e08cad68bf..7cdab649e8f958afa9c29cd17e50e44149a42481 100644 (file)
--- 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;