bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-25 07:10:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

improved session timeout handling

Browse Source
This commit is contained in:
SJ 2013-04-22 16:52:02 +02:00
parent b44ae2e9ea
commit 1be0ed1061
5 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webui/config.php
View File

@ -58,6 +58,8 @@ $config['LDAP_DISTRIBUTIONLIST_ATTR'] = 'zimbraMailForwardingAddress';
//$config['LDAP_DISTRIBUTIONLIST_ATTR'] = 'mail'; //$config['LDAP_DISTRIBUTIONLIST_ATTR'] = 'mail';
// enable SSO against an Active Directory
$config['ENABLE_SSO_LOGIN'] = 0;
// enable authentication against an imap server (disabled by default) // enable authentication against an imap server (disabled by default)
@ -147,6 +149,9 @@ $config['USE_EMAIL_AS_USERNAME'] = 1;
$config['LDAP_IMPORT_MINIMUM_NUMBER_OF_USERS_TO_HEALTH_OK'] = 100; $config['LDAP_IMPORT_MINIMUM_NUMBER_OF_USERS_TO_HEALTH_OK'] = 100;
define('PILER_LOGIN_HELPER_PLACEHOLDER', 'PILER_COMMENT_FOR_PROPER_LOGIN_SO_THIS_CAN_BE_ANYTHING_JUST_BE_IT_SOMETHING_LIKE_A_UNIQUE_VALUE');
$config['SIZE_X'] = 430; $config['SIZE_X'] = 430;
$config['SIZE_Y'] = 250; $config['SIZE_Y'] = 250;

9
webui/index.php
View File

@ -84,9 +84,14 @@ if(Registry::get('username')) {
} }
} }
else { else {
if(ENABLE_GOOGLE_LOGIN == 1 && isset($request->get['route']) && $request->get['route'] == 'login/google') { if(ENABLE_SSO_LOGIN == 1) {
header("Location: " . SITE_URL . 'sso.php');
exit;
}
else if(ENABLE_GOOGLE_LOGIN == 1 && isset($request->get['route']) && $request->get['route'] == 'login/google') {
$action = new Router('login/google'); $action = new Router('login/google');
} else { }
else {
$action = new Router('login/login'); $action = new Router('login/login');
} }
} }

16
webui/view/javascript/piler-in.js
View File

@ -30,7 +30,7 @@ var Piler =
/* /*
* search data * search data
*/ */
Searches:{}, Searches: {},
/* /*
* message meta ids * message meta ids
@ -138,7 +138,13 @@ var Piler =
}) })
.done( function( a )// data, textStatus, jqXHR .done( function( a )// data, textStatus, jqXHR
{ {
$('#mailcontframe').html( a );
if(a.indexOf('<?php print PILER_LOGIN_HELPER_PLACEHOLDER; ?>') > 0) {
document.location.href = '<?php print SITE_URL; ?>';
return true;
}
$('#mailcontframe').html(a);
Piler.fill_current_messages_array(); Piler.fill_current_messages_array();
Piler.spinner('stop'); Piler.spinner('stop');
$('#resultsheader').show(); $('#resultsheader').show();
@ -244,6 +250,12 @@ var Piler =
jQuery.ajax('/message.php/' + id, { cache: true }) jQuery.ajax('/message.php/' + id, { cache: true })
.done( function(a) { .done( function(a) {
if(a.indexOf('<?php print PILER_LOGIN_HELPER_PLACEHOLDER; ?>') > 0) {
document.location.href = '<?php print SITE_URL; ?>';
return true;
}
$('#mailpreviewframe').html(a); $('#mailpreviewframe').html(a);
}) })
.fail(function(a, b) { alert("Problem retrieving XML data:" + b) }); .fail(function(a, b) { alert("Problem retrieving XML data:" + b) });

2
webui/view/theme/default/templates/login/login.tpl
View File

@ -51,5 +51,7 @@
<?php } ?> <?php } ?>
<!-- <?php print PILER_LOGIN_HELPER_PLACEHOLDER; ?> -->
</body> </body>
</html> </html>

2
webui/view/theme/orig/templates/login/login.tpl
View File

@ -59,5 +59,7 @@
</div> </div>
<!-- <?php print PILER_LOGIN_HELPER_PLACEHOLDER; ?> -->
</body> </body>
</html> </html>