From f7879256c1fc81e0b770e54d784ea7f678728691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20Espi=C3=A9?= Date: Fri, 20 Apr 2018 12:30:20 +0000 Subject: [PATCH] =?UTF-8?q?N=C2=B01248=20-=20Fix=20API=20access=20(back=20?= =?UTF-8?q?to=20the=20same=20behavior=20as=202.4.1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SVN:trunk[5705] --- core/userrights.class.inc.php | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/core/userrights.class.inc.php b/core/userrights.class.inc.php index 08dee76591..d1b58655a2 100644 --- a/core/userrights.class.inc.php +++ b/core/userrights.class.inc.php @@ -559,6 +559,7 @@ interface iSelfRegister */ class UserRights { + /** @var UserRightsAddOnAPI $m_oAddOn */ protected static $m_oAddOn; protected static $m_oUser; protected static $m_oRealUser; @@ -959,20 +960,32 @@ class UserRights return true; } + /** + * @param $sClass + * @param array $aSettings + * + * @return bool + */ public static function GetSelectFilter($sClass, $aSettings = array()) { // When initializing, we need to let everything pass trough - if (!self::CheckLogin()) return true; + if (!self::CheckLogin()) {return true;} - if (self::IsAdministrator()) return true; + if (self::IsAdministrator()) {return true;} - if (MetaModel::HasCategory($sClass, 'bizmodel') || MetaModel::HasCategory($sClass, 'grant_by_profile')) + try { - return self::$m_oAddOn->GetSelectFilter(self::$m_oUser, $sClass, $aSettings); - } - else + if (MetaModel::HasCategory($sClass, 'bizmodel')) + { + return self::$m_oAddOn->GetSelectFilter(self::$m_oUser, $sClass, $aSettings); + } + else + { + return true; + } + } catch (Exception $e) { - return true; + return false; } }