N°1248 - Fix API access (back to the same behavior as 2.4.1)

SVN:trunk[5705]
This commit is contained in:
Eric Espié
2018-04-20 12:30:20 +00:00
parent 1c86eba9d9
commit f7879256c1

View File

@@ -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;
}
}