[Fmsystem-commits] [16642] API: login from lightbox

[sigurdne]

Revision: 16642
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16642
Author:   sigurdne
Date:     2017-04-27 10:30:24 -0400 (Thu, 27 Apr 2017)
Log Message:
-----------
API: login from lightbox

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.login.inc.php
    trunk/phpgwapi/js/jquery/common.js

Modified: trunk/phpgwapi/inc/class.login.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.login.inc.php      2017-04-27 14:08:52 UTC (rev 
16641)
+++ trunk/phpgwapi/inc/class.login.inc.php      2017-04-27 14:30:24 UTC (rev 
16642)
@@ -93,6 +93,7 @@
                        if(phpgw::get_var('hide_lightbox', 'bool'))
                        {
                                $uilogin->phpgw_display_login(array());
+                               exit;
                        }
 
                        if ($GLOBALS['phpgw_info']['server']['auth_type'] == 
'remoteuser' && isset($GLOBALS['phpgw_info']['server']['mapping']) && 
!empty($GLOBALS['phpgw_info']['server']['mapping']) && 
isset($_SERVER['REMOTE_USER']))
@@ -186,15 +187,21 @@
                                $extra_vars['cd'] = 'yes';
 
                                $GLOBALS['phpgw']->hooks->process('login');
-                               if ($after)
+                               if ($lightbox)
                                {
-                                       $this->redirect_after($frontend);
+                                       
$GLOBALS['phpgw']->redirect_link("{$frontend}/login.php", array('hide_lightbox' 
=> true));
                                }
                                else
                                {
-                                       
$GLOBALS['phpgw']->redirect_link("{$frontend}/home.php", $extra_vars);
+                                       if ($after)
+                                       {
+                                               
$this->redirect_after($frontend);
+                                       }
+                                       else
+                                       {
+                                               
$GLOBALS['phpgw']->redirect_link("{$frontend}/home.php", $extra_vars);
+                                       }
                                }
-
                        //----------------- End login ntlm
                        }
 

Modified: trunk/phpgwapi/js/jquery/common.js
===================================================================
--- trunk/phpgwapi/js/jquery/common.js  2017-04-27 14:08:52 UTC (rev 16641)
+++ trunk/phpgwapi/js/jquery/common.js  2017-04-27 14:30:24 UTC (rev 16642)
@@ -769,47 +769,12 @@
                mask: true,
                animate: false,
                close: false,
-//             openjs : function ()
-//             {
-//                     lightboxlogin_check_session();
-//             },
                closejs: false
        });
 };
 
-/**
- * In case of SSO
- * 
- */
-lightboxlogin_check_session = function()
-{
-       var oArgs = {menuaction: 'property.bocommon.confirm_session'};
-       var strURL = phpGWLink('index.php', oArgs, true);
-       $.ajax({
-               type: 'POST',
-               dataType: 'json',
-               url: strURL,
-               success: function (data)
-               {
-                       if (data != null)
-                       {
-                               if (data['sessionExpired'] == true)
-                               {
-                                       //ntothing
-                               }
-                               else
-                               {
-                                       TINY.box.hide();
-                               }
-                       }
-               },
-               failure: function (o)
-               {
-               },
-               timeout: 1000
-       });
-};
 
+
 JqueryPortico.showlightbox_history = function (sUrl)
 {
        TINY.box.show({iframe: sUrl, boxid: 'frameless', width: 650, height: 
400, fixed: false, maskid: 'darkmask', maskopacity: 40, mask: true, animate: 
true, close: true});