bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-07-01 07:53:43 +02:00
Code Issues Projects Releases Wiki Activity

LSurl handlers : fix always display template after adding error

Browse source
This commit is contained in:
Benjamin Renard 2020-05-04 12:28:11 +02:00
parent feb346acef
commit 119ce68a35
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
public_html/includes/routes.php
View file

@ -103,11 +103,13 @@ function get_LSobject_from_request($request, $instanciate=true, $check_access=nu
if ($dn) { if ($dn) {
if (!call_user_func($check_access, $LSobject, $dn)) { if (!call_user_func($check_access, $LSobject, $dn)) {
LSerror :: addErrorCode('LSsession_11'); LSerror :: addErrorCode('LSsession_11');
LSsession :: displayTemplate();
return false; return false;
} }
} }
else if (!LSsession :: in_menu($LSobject) && !call_user_func($check_access, $LSobject)) { else if (!LSsession :: in_menu($LSobject) && !call_user_func($check_access, $LSobject)) {
LSerror :: addErrorCode('LSsession_11'); LSerror :: addErrorCode('LSsession_11');
LSsession :: displayTemplate();
return false; return false;
} }
@ -146,7 +148,8 @@ function handle_LSobject_search($request) {
$LSobject = $object -> getType(); $LSobject = $object -> getType();
if (!LSsession :: loadLSclass('LSsearch')) { if (!LSsession :: loadLSclass('LSsearch')) {
LSsession :: addErrorCode('LSsession_05','LSsearch'); LSsession :: addErrorCode('LSsession_05', 'LSsearch');
LSsession :: displayTemplate();
return false; return false;
} }
@ -814,13 +817,13 @@ function handle_addon_view($request) {
if (LSsession ::loadLSaddon($request -> LSaddon)) { if (LSsession ::loadLSaddon($request -> LSaddon)) {
if ( LSsession :: canAccessLSaddonView($request -> LSaddon, $request -> view) ) { if ( LSsession :: canAccessLSaddonView($request -> LSaddon, $request -> view) ) {
LSsession :: showLSaddonView($request -> LSaddon, $request -> view); LSsession :: showLSaddonView($request -> LSaddon, $request -> view);
// Print template
LSsession :: displayTemplate();
} }
else { else {
LSerror :: addErrorCode('LSsession_11'); LSerror :: addErrorCode('LSsession_11');
} }
} }
// Print template
LSsession :: displayTemplate();
} }
LSurl :: add_handler('#^addon/(?P<LSaddon>[^/]+)/(?P<view>[^/]+)$#', 'handle_addon_view'); LSurl :: add_handler('#^addon/(?P<LSaddon>[^/]+)/(?P<view>[^/]+)$#', 'handle_addon_view');