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/cms/modules/front/database/category.php
+50 -19
View File
@@ -92,7 +92,7 @@ class _category extends \IPS\cms\Databases\Controller
{
$breadcrumbs = \IPS\Output::i()->breadcrumb;
}
$RecordsClass = $category::$contentItemClass;
/* AdvancedSearch can wipe out the checked box as it is looking for _checkbox. Note to self in 4.5, rewrite the filter widget to avoid using advancedSearch :/ */
@@ -683,19 +683,12 @@ class _category extends \IPS\cms\Databases\Controller
\IPS\Output::i()->linkTags['canonical'] = (string) $category->url();
/* Set breadcrumb */
if ( \IPS\IPS::classUsesTrait( $category, 'IPS\Content\ClubContainer' ) and $club = $category->club() )
foreach ( $category->parents() as $parent )
{
$club->setBreadcrumbs( $category );
\IPS\Output::i()->breadcrumb[] = array( $parent->url(), $parent->_title );
}
else
{
foreach ( $category->parents() as $parent )
{
\IPS\Output::i()->breadcrumb[] = array( $parent->url(), $parent->_title );
}
\IPS\Output::i()->breadcrumb[] = array( NULL, $category->_title );
}
\IPS\Output::i()->breadcrumb[] = array( NULL, $category->_title );
}
/* Node handler does not support keywords, so we need to do it manually */
@@ -704,6 +697,9 @@ class _category extends \IPS\cms\Databases\Controller
\IPS\Output::i()->metaTags['keywords'] = $category->meta_keywords;
}
/* Show club header, if applicable */
$this->showClubHeader( $category );
/* Update location */
$permissions = $category->permissions();
\IPS\Session::i()->setLocation( $category->url(), explode( ",", $permissions['perm_view'] ), 'loc_cms_viewing_db_cat', array( 'content_db_' . $database->id => TRUE, 'content_cat_name_' . $category->id => TRUE ) );
@@ -740,6 +736,39 @@ class _category extends \IPS\cms\Databases\Controller
\IPS\Output::i()->title = $titleSuffix;
}
}
/**
* Show Club Header
*
* @param \IPS\cms\Categories $category
* @return void
*/
protected function showClubHeader( \IPS\cms\Categories $category )
{
if ( $club = $category->_club )
{
\IPS\Output::i()->sidebar['contextual'] = '';
/* Club info in sidebar */
if ( \IPS\Settings::i()->clubs_header == 'sidebar' )
{
\IPS\Output::i()->sidebar['enabled'] = true;
\IPS\Output::i()->sidebar['contextual'] .= \IPS\Theme::i()->getTemplate( 'clubs', 'core', 'front' )->header( $club, $category, 'sidebar' );
}
else
{
\IPS\cms\Databases\Dispatcher::i()->output .= \IPS\Theme::i()->getTemplate( 'clubs', 'core', 'front' )->header( $club, $category, 'full' );
}
if( ( \IPS\GeoLocation::enabled() and \IPS\Settings::i()->clubs_locations AND $location = $club->location() ) )
{
\IPS\Output::i()->sidebar['enabled'] = true;
\IPS\Output::i()->sidebar['contextual'] .= \IPS\Theme::i()->getTemplate( 'clubs', 'core', 'front' )->clubLocationBox( $club, $location );
}
$club->setBreadcrumbs( $category );
}
}
/**
* Form
@@ -774,13 +803,6 @@ class _category extends \IPS\cms\Databases\Controller
{
$hasModOptions = TRUE;
}
\IPS\Output::i()->allowDefaultWidgets = FALSE;
\IPS\Output::i()->sidebar['enabled'] = FALSE;
\IPS\cms\Pages\Page::$currentPage->getWidgets();
\IPS\cms\Databases\Dispatcher::i()->output = \IPS\Output::i()->output = $form->customTemplate( array( \IPS\cms\Theme::i()->getTemplate( $database->template_form, 'cms', 'database' ), 'recordForm' ), NULL, $category, $database, \IPS\cms\Pages\Page::$currentPage, $title, $hasModOptions );
\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack( $title );
\IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'records/form.css', 'cms', 'front' ) );
try
{
@@ -794,8 +816,17 @@ class _category extends \IPS\cms\Databases\Controller
}
}
catch( \Exception $e ) {}
\IPS\Output::i()->breadcrumb[] = array( NULL, $title );
$this->showClubHeader( $category );
\IPS\Output::i()->allowDefaultWidgets = FALSE;
\IPS\Output::i()->sidebar['enabled'] = FALSE;
\IPS\cms\Pages\Page::$currentPage->getWidgets();
\IPS\Output::i()->output = $form->customTemplate( array( \IPS\cms\Theme::i()->getTemplate( $database->template_form, 'cms', 'database' ), 'recordForm' ), NULL, $category, $database, \IPS\cms\Pages\Page::$currentPage, $title, $hasModOptions );
\IPS\cms\Databases\Dispatcher::i()->output .= \IPS\Output::i()->output;
\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack( $title );
\IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'records/form.css', 'cms', 'front' ) );
}
/**
applications/cms/modules/front/database/index.php
+10 -1
View File
@@ -148,7 +148,16 @@ class _index extends \IPS\cms\Databases\Controller
/* Load into memory */
$class::loadIntoMemory();
$categories = $class::roots();
/* Get only the categories we can view. Otherwise, there is a risk the output will show a list of categories with no actual content or error message (the template that checks view permission is separate from the one that verifies the count in our oob templates) */
$categories = [];
foreach ( $class::roots() as $category )
{
if ( $category->can('view') )
{
$categories[] = $category;
}
}
\IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'records/index.css', 'cms', 'front' ) );
\IPS\Output::i()->title = $database->pageTitle();
applications/cms/modules/front/database/record.php
+47 -1
View File
@@ -124,6 +124,16 @@ class _record extends \IPS\Content\Controller
if ( \count( $customValues ) )
{
/* Store a revision before we change any values */
if ( $record::database()->revisions )
{
$revision = new \IPS\cms\Records\Revisions;
$revision->database_id = $record::$customDatabaseId;
$revision->record_id = $record->_id;
$revision->data = $record->fieldValues( TRUE );
$revision->save();
}
if ( isset( $values['record_display_field_change'] ) AND $values['record_display_field_change'] )
{
$record->addCommentWhenFiltersChanged( $values );
@@ -326,6 +336,7 @@ class _record extends \IPS\Content\Controller
);
}
$this->showClubHeader();
/* Set default search to this record */
if ( ! $record::database()->search )
{
@@ -729,7 +740,6 @@ class _record extends \IPS\Content\Controller
\IPS\Output::i()->allowDefaultWidgets = FALSE;
\IPS\Output::i()->sidebar['enabled'] = FALSE;
\IPS\cms\Pages\Page::$currentPage->getWidgets();
\IPS\cms\Databases\Dispatcher::i()->output = $form->customTemplate( array( \IPS\cms\Theme::i()->getTemplate( $database->template_form, 'cms', 'database' ), 'recordForm' ), NULL, $category, $database, \IPS\cms\Pages\Page::$currentPage, $title, $hasModOptions );
\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack( $title );
\IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'records/form.css', 'cms', 'front' ) );
@@ -747,6 +757,9 @@ class _record extends \IPS\Content\Controller
catch( \Exception $e ) {}
\IPS\Output::i()->breadcrumb[] = array( $record->url(), $record->mapped('title') );
$this->showClubHeader();
\IPS\cms\Databases\Dispatcher::i()->output .= $form->customTemplate( array( \IPS\cms\Theme::i()->getTemplate( $database->template_form, 'cms', 'database' ), 'recordForm' ), NULL, $category, $database, \IPS\cms\Pages\Page::$currentPage, $title, $hasModOptions );
}
/**
@@ -949,4 +962,37 @@ class _record extends \IPS\Content\Controller
\IPS\Output::i()->error( 'node_error', '2T252/F', 403, '' );
}
}
/**
* Add the club header to \IPS\Output
*
* @return void
*/
protected function showClubHeader()
{
$record = $this->_getRecord();
if ( $record and $club = $record->club )
{
$category = $record->container();
\IPS\Output::i()->sidebar['contextual'] = '';
/* Club info in sidebar */
if ( \IPS\Settings::i()->clubs_header == 'sidebar' )
{
\IPS\Output::i()->sidebar['enabled'] = true;
\IPS\Output::i()->sidebar['contextual'] .= \IPS\Theme::i()->getTemplate( 'clubs', 'core', 'front' )->header( $club, $category, 'sidebar' );
}
else
{
\IPS\cms\Databases\Dispatcher::i()->output .= \IPS\Theme::i()->getTemplate( 'clubs', 'core', 'front' )->header( $club, $record->container(), 'full' );
}
if( ( \IPS\GeoLocation::enabled() and \IPS\Settings::i()->clubs_locations AND $location = $club->location() ) )
{
\IPS\Output::i()->sidebar['enabled'] = true;
\IPS\Output::i()->sidebar['contextual'] .= \IPS\Theme::i()->getTemplate( 'clubs', 'core', 'front' )->clubLocationBox( $club, $location );
}
}
}
}