[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16640] API: login from lightbox
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [16640] API: login from lightbox |
Date: |
Thu, 27 Apr 2017 10:08:05 -0400 (EDT) |
Revision: 16640
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16640
Author: sigurdne
Date: 2017-04-27 10:08:05 -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 13:58:06 UTC (rev
16639)
+++ trunk/phpgwapi/inc/class.login.inc.php 2017-04-27 14:08:05 UTC (rev
16640)
@@ -276,12 +276,12 @@
$extra_vars['cd'] = 'yes';
-// if ($lightbox)
-// {
-//
$GLOBALS['phpgw']->redirect_link("{$frontend}/login.php", array('hide_lightbox'
=> true));
-// }
-// else
+ if ($lightbox)
{
+
$GLOBALS['phpgw']->redirect_link("{$frontend}/login.php", array('hide_lightbox'
=> true));
+ }
+ else
+ {
$GLOBALS['phpgw']->hooks->process('login');
if ($after)
{
Modified: trunk/phpgwapi/js/jquery/common.js
===================================================================
--- trunk/phpgwapi/js/jquery/common.js 2017-04-27 13:58:06 UTC (rev 16639)
+++ trunk/phpgwapi/js/jquery/common.js 2017-04-27 14:08:05 UTC (rev 16640)
@@ -769,10 +769,10 @@
mask: true,
animate: false,
close: false,
- openjs : function ()
- {
- lightboxlogin_check_session();
- },
+// openjs : function ()
+// {
+// lightboxlogin_check_session();
+// },
closejs: false
});
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16640] API: login from lightbox,
sigurdne <=