sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 4.7.23

Browse Source
This commit is contained in:
Neo committed 2025-12-19 16:21:27 -08:00
1 parent 7124a02564
commit 25ddeb65d6
1791 files changed
+76990 -44452
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/core/Application.php
+29 -49
View File
@@ -85,41 +85,6 @@ class _Application extends \IPS\Application
unset( $menu['support'] );
}
$categories = ( new \IPS\core\modules\admin\marketplace\marketplace )->hierarchicalCategoryTree();
foreach( $categories as $c )
{
$menu[ 'mp_' . $c['id'] ][ 'all' ] = array(
'tab' => 'marketplace',
'module_url' => 'marketplace',
'controller' => 'marketplace',
'do' => 'viewCategory&id=' . $c['id'],
'restriction' => 'marketplace_manage',
'restriction_module' => 'marketplace',
'menu_checks' => array( 'do' => 'viewCategory', 'id' => $c['id'] ),
'menu_controller' => 'all'
);
foreach( $c['children'] as $ch )
{
$menu[ 'mp_' . $c['id'] ][ $ch['id'] ] = array(
'tab' => 'marketplace',
'module_url' => 'marketplace',
'controller' => 'marketplace',
'do' => 'viewCategory&id=' . $ch['id'],
'restriction' => 'marketplace_manage',
'restriction_module' => 'marketplace',
'menu_checks' => array( 'do' => 'viewCategory', 'id' => $ch['id'] ),
'menu_controller' => $ch['id']
);
\IPS\Member::loggedIn()->language()->words[ 'menu__core_mp_' . $c['id'] . '_' . $ch['id'] ] = $ch['name'];
}
\IPS\Member::loggedIn()->language()->words[ 'menu__core_mp_' . $c['id'] ] = $c['name'];
\IPS\Member::loggedIn()->language()->words[ 'menu__core_mp_' . $c['id'] . '_all' ] = 'All ' . $c['name'];
}
if ( \IPS\Application::appIsEnabled( 'cloud' ) )
{
$menu['smartcommunity']['features'] = array(
@@ -129,16 +94,6 @@ class _Application extends \IPS\Application
'restriction' => 'licensekey_manage'
);
}
/* Add Community Hive */
$menu['communityhive']['settings'] = array(
'tab' => 'community',
'module_url' => 'applications',
'controller' => 'enhancements',
'do' => 'edit&id=core_Hive',
'restriction' => 'enhancements_manage',
'menu_checks' => [ 'app' => 'ipshive' ] //intentionally bogus app
);
return $menu;
}
@@ -214,7 +169,7 @@ class _Application extends \IPS\Application
$module->key == 'system'
and
\in_array( $controller, array( 'login', 'register', 'lostpass', 'terms', 'ajax', 'privacy', 'editor',
'language', 'theme', 'redirect', 'guidelines', 'announcement', 'metatags', 'marketplace', 'serviceworker', 'offline', 'cookie' ) )
'language', 'theme', 'redirect', 'guidelines', 'announcement', 'metatags', 'serviceworker', 'offline', 'cookie' ) )
)
or
(
@@ -223,7 +178,12 @@ class _Application extends \IPS\Application
or
(
$module->key == 'discover' and \in_array( $controller, array( 'rss', 'streams' ) )
);
)
or
(
$module->key == 'system' and $controller == 'metatags' and $do == 'manifest'
)
;
}
/**
@@ -247,7 +207,6 @@ class _Application extends \IPS\Application
'register',
'announcement', // Announcements can be useful when the site is offline
'redirect', // When email tracking is enabled we pass through here
'marketplace', // Remote services needs to send data back
'metatags', // Manifest
'serviceworker', // Service Worker
'offline', // Service Worker offline page
@@ -450,6 +409,17 @@ class _Application extends \IPS\Application
'privacyUrl' => 'https://sendgrid.com/policies/privacy/'
);
}
/* Postmark */
$postmark = new \IPS\core\extensions\core\CommunityEnhancements\Postmark();
if ( $postmark->enabled )
{
$subprocessors[] = array(
'title' => \IPS\Member::loggedIn()->language()->addToStack('enhancements__core_Postmark'),
'description' => \IPS\Member::loggedIn()->language()->addToStack('pp_desc_Postmark'),
'privacyUrl' => 'https://postmarkapp.com/privacy-policy'
);
}
/* Captcha */
if ( \IPS\Settings::i()->bot_antispam_type !== 'none' )
@@ -614,8 +584,9 @@ class _Application extends \IPS\Application
'member_registration_complete' => \IPS\Member::class,
'member_edited' => [ 'member' => \IPS\Member::class, 'changes' => "array" ],
'member_delete' => \IPS\Member::class,
'member_warned' => \IPS\core\Warnings::class,
'member_warned' => \IPS\core\Warnings\Warning::class,
'member_merged' => [ 'kept' => \IPS\Member::class, 'removed' => \IPS\Member::class],
'member_badge_awarded' => [ 'member' => \IPS\Member::class, 'badge' => \IPS\core\Achievements\Badge::class ],
'content_promoted' => \IPS\Content::class,
'content_marked_solved' => [ 'item' => \IPS\Content\Item::class, 'comment' => \IPS\Content\Comment::class , 'markedBy' => \IPS\Member::class ]
], parent::getWebhooks() );
@@ -755,6 +726,15 @@ class _Application extends \IPS\Application
$cookies[] = 'referred_by';
}
foreach ( \IPS\Login::methods() as $method )
{
if( isset( $method->pkceSupported ) AND $method->pkceSupported === TRUE )
{
$cookies[] = 'codeVerifier';
break;
}
}
return $cookies;
}
}