Version 4.3.6
This commit is contained in:
1 parent
fe1acf984a
commit
1a0c7fd3c2
609 files changed
+14707
-5726
No files matched your search
@@ -36,6 +36,11 @@ abstract class _Standard extends \IPS\Dispatcher
|
||||
* Controller
|
||||
*/
|
||||
public $controller;
|
||||
|
||||
/**
|
||||
* @brief Check access permissions
|
||||
*/
|
||||
public $checkGenericPermissions = TRUE;
|
||||
|
||||
/**
|
||||
* Base CSS
|
||||
@@ -81,10 +86,16 @@ abstract class _Standard extends \IPS\Dispatcher
|
||||
\IPS\Output::i()->jsVars['ipb_url_filter_option'] = \IPS\Settings::i()->ipb_url_filter_option;
|
||||
\IPS\Output::i()->jsVars['url_filter_any_action'] = \IPS\Settings::i()->url_filter_any_action;
|
||||
\IPS\Output::i()->jsVars['bypass_profanity'] = intval( \IPS\Member::loggedIn()->group['g_bypass_badwords'] );
|
||||
\IPS\Output::i()->jsVars['emoji_style'] = \IPS\Settings::i()->getFromConfGlobal('sql_utf8mb4') ? \IPS\Settings::i()->emoji_style : 'disabled';
|
||||
\IPS\Output::i()->jsVars['emoji_style'] = ( \IPS\Settings::i()->getFromConfGlobal('sql_utf8mb4') === TRUE ) ? \IPS\Settings::i()->emoji_style : 'disabled';
|
||||
\IPS\Output::i()->jsVars['emoji_shortcodes'] = \IPS\Settings::i()->emoji_shortcodes;
|
||||
\IPS\Output::i()->jsVars['emoji_ascii'] = \IPS\Settings::i()->emoji_ascii;
|
||||
\IPS\Output::i()->jsVars['emoji_cache'] = \IPS\Settings::i()->emoji_cache;
|
||||
|
||||
/* Load the howler JS package if notifications are enabled */
|
||||
if( !\IPS\Member::loggedIn()->members_bitoptions['disable_notification_sounds'] )
|
||||
{
|
||||
array_unshift( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'howler/howler.core.min.js', 'core', 'interface' )[0] );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -186,7 +197,7 @@ abstract class _Standard extends \IPS\Dispatcher
|
||||
}
|
||||
|
||||
/* Init Application */
|
||||
if( !$this->application->canAccess( \IPS\Member::loggedIn() ) AND $this->controllerLocation != 'admin' )
|
||||
if( $this->checkGenericPermissions === TRUE AND !$this->application->canAccess( \IPS\Member::loggedIn() ) AND $this->controllerLocation != 'admin' )
|
||||
{
|
||||
\IPS\Output::i()->jsFiles = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'app.js' ) );
|
||||
$message = $this->application->disabled_message ?: 'generic_offline_message';
|
||||
|
||||
Reference in new issue
Block a user