Use postMessage to alert window.topon framed login (#1206)

Use `postMessage` to alert `window.top`on framed login
ubccr · Jan 16, 2020 · b28197e · b28197e
2 parents 0710b9b + 065f423
commit b28197e
Showing 1 changed file with 24 additions and 3 deletions.
diff --git a/html/gui/general/login.php b/html/gui/general/login.php
@@ -51,9 +51,18 @@
   </style>
   <script type="text/javascript">
     function loadPortal() {
-      setTimeout(function(){
-        parent.location.href = '/index.php' + document.location.hash;
-      }, 1500);
+        try{
+            var href = window.top.location.href;
+            setTimeout(function(){
+                parent.location.href = '/index.php' + document.location.hash;
+            }, 1500);
+        }
+        catch(exception){
+            window.top.postMessage({
+                application:'xdmod',
+                action: 'loginComplete'
+            },'*');
+        }
     }
 
     function contactAdmin() {
@@ -73,6 +82,18 @@ function contactAdmin() {
             <br>
             <a href="javascript:contactAdmin()">Contact a system administrator.</a>
         </p>
+        <script>
+           try {
+               var href = window.top.location.href;
+           }
+           catch(exception){
+               window.top.postMessage({
+                   application:'xdmod',
+                   action: 'error',
+                   info: <?php echo json_encode($message); ?>
+               },'*');
+           }
+        </script>
       </body>
       </html>
     <?php