[mapguide-commits] r10060 - in trunk/MgDev: . Web/src/mapadmin Web/src/mapviewerphp

[svn_mapguide at osgeo.org]

Author: jng
Date: 2023-11-10 07:08:48 -0800 (Fri, 10 Nov 2023)
New Revision: 10060

Modified:
   trunk/MgDev/
   trunk/MgDev/Web/src/mapadmin/resizablepagecomponents.php
   trunk/MgDev/Web/src/mapviewerphp/mapagentcapture.php
Log:
Merged revision(s) 10059 from branches/4.0/MgDev:
Update final cases of instanceof exception checks in PHP code

Fixes #2876
........


Index: trunk/MgDev
===================================================================
--- trunk/MgDev	2023-11-10 15:06:39 UTC (rev 10059)
+++ trunk/MgDev	2023-11-10 15:08:48 UTC (rev 10060)

Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -2,6 +2,7 ##
 /branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
 /branches/3.0/MgDev:8658,8705,8710
 /branches/3.1/MgDev:9026,9058-9059,9067-9068,9322-9323,9329,9377-9378,9382,9387,9389,9393-9395,9425-9426,9428,9452-9453,9455-9456,9481,9483-9484
+/branches/4.0/MgDev:10059
 /sandbox/VC140:8684-8759
 /sandbox/adsk/2.6l:8727
 /sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
Modified: trunk/MgDev/Web/src/mapadmin/resizablepagecomponents.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/resizablepagecomponents.php	2023-11-10 15:06:39 UTC (rev 10059)
+++ trunk/MgDev/Web/src/mapadmin/resizablepagecomponents.php	2023-11-10 15:08:48 UTC (rev 10060)
@@ -2093,13 +2093,14 @@
     }
     function CheckForFatalMgException( $exception )
     {
-        if ( $exception instanceof MgAuthenticationFailedException ||
-             $exception instanceof MgConnectionFailedException ||
-             $exception instanceof MgConnectionNotOpenException ||
-             $exception instanceof MgDuplicateSessionException ||
-             $exception instanceof MgLicenseException ||
-             $exception instanceof MgLicenseExpiredException ||
-             $exception instanceof MgSessionExpiredException )
+        $exCode = $exception->GetExceptionCode();
+        if ( $exCode == MgExceptionCodes::MgAuthenticationFailedException ||
+             $exCode == MgExceptionCodes::MgConnectionFailedException ||
+             $exCode == MgExceptionCodes::MgConnectionNotOpenException ||
+             $exCode == MgExceptionCodes::MgDuplicateSessionException ||
+             $exCode == MgExceptionCodes::MgLicenseException ||
+             $exCode == MgExceptionCodes::MgLicenseExpiredException ||
+             $exCode == MgExceptionCodes::MgSessionExpiredException )
         {
             LogoutWithFatalException();
         }

Modified: trunk/MgDev/Web/src/mapviewerphp/mapagentcapture.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/mapagentcapture.php	2023-11-10 15:06:39 UTC (rev 10059)
+++ trunk/MgDev/Web/src/mapviewerphp/mapagentcapture.php	2023-11-10 15:08:48 UTC (rev 10060)
@@ -167,7 +167,7 @@
             {
                 echo $val;
                 ob_flush();
-                flush();s
+                flush();
                 $len = $byteReader->Read($val, 4096);
             }
         }