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

Version 4.5.0

Browse Source
This commit is contained in:
Neo committed 2025-12-19 05:51:58 -08:00
1 parent 1a0c7fd3c2
commit f79dcf067a
3791 files changed
+248032 -76372
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/cms/modules/front/pages/page.php
+49 -3
View File
@@ -12,7 +12,7 @@
namespace IPS\cms\modules\front\pages;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
@@ -63,6 +63,45 @@ class _page extends \IPS\Dispatcher\Controller
if ( \IPS\Request::i()->path == $page->full_path )
{
/* Did we have a trailing slash? */
if ( \IPS\Settings::i()->htaccess_mod_rewrite and mb_substr( \IPS\Request::i()->url()->data[ \IPS\Http\Url::COMPONENT_PATH ], -1 ) != '/' )
{
$url = $page->url();
foreach( \IPS\Request::i()->url()->queryString as $k => $v )
{
$url = $url->setQueryString( $k, $v );
}
if ( ! empty( \IPS\Request::i()->url()->fragment ) )
{
$url = $url->setFragment( \IPS\Request::i()->url()->fragment );
}
\IPS\Output::i()->redirect( $url, NULL, 301 );
}
else if ( ! \IPS\Settings::i()->htaccess_mod_rewrite and ! mb_strstr( \IPS\Request::i()->url()->data[ \IPS\Http\Url::COMPONENT_QUERY ], $page->url()->data[ \IPS\Http\Url::COMPONENT_QUERY ] ) )
{
$url = $page->url();
foreach( \IPS\Request::i()->url()->queryString as $k => $v )
{
if ( mb_substr( $k, 0, 1 ) == '/' and mb_substr( $k, -1 ) != '/' )
{
$k .= '/';
}
}
$url = $url->setQueryString( $k, $v );
if ( ! empty( \IPS\Request::i()->url()->fragment ) )
{
$url = $url->setFragment( \IPS\Request::i()->url()->fragment );
}
\IPS\Output::i()->redirect( $url, NULL, 301 );
}
/* Just viewing this page, no database categories or records */
$permissions = $page->permissions();
\IPS\Session::i()->setLocation( $page->url(), explode( ",", $permissions['perm_view'] ), 'loc_cms_viewing_page', array( 'cms_page_' . $page->_id => TRUE ) );
@@ -100,9 +139,16 @@ class _page extends \IPS\Dispatcher\Controller
}
else if ( isset( \IPS\Request::i()->path ) AND \IPS\Request::i()->path != '/' )
{
/* Sort out pagination for pages */
list( $path, $pageNumber ) = \IPS\cms\Pages\Page::getStrippedPagePath( \IPS\Request::i()->path );
if( $pageNumber AND !\IPS\Request::i()->page )
{
\IPS\Request::i()->page = $pageNumber;
}
try
{
$page = \IPS\cms\Pages\Page::loadFromPath( \IPS\Request::i()->path );
$page = \IPS\cms\Pages\Page::loadFromPath( $path );
}
catch ( \OutOfRangeException $e )
{
@@ -191,6 +237,6 @@ class _page extends \IPS\Dispatcher\Controller
*/
protected function embed()
{
return $this->__call( 'embed', func_get_args() );
return $this->__call( 'embed', \func_get_args() );
}
}