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/sources/Stream/Stream.php
+10 -3
View File
@@ -196,6 +196,7 @@ class _Stream extends \IPS\Node\Model
$stream->date_type = 'relative';
$stream->default_view = 'expanded';
$stream->baseUrl = \IPS\Http\Url::internal( "app=core&module=discover&controller=streams", 'front', 'discover_all' );
$stream->read = "all";
return $stream;
}
@@ -394,7 +395,7 @@ class _Stream extends \IPS\Node\Model
$nodeClass = $class::$containerNodeClass;
$value = isset( $containers->$class ) ? $containers->$class : 0;
$field = new \IPS\Helpers\Form\Node( 'stream_containers_' . $class::$title, $value, FALSE, array( 'class' => $nodeClass, 'clubs' => TRUE, 'multiple' => TRUE, 'zeroVal' => 'all', 'permissionCheck' => $nodeClass::searchableNodesPermission(), 'forceOwner' => FALSE, 'subnodes' => FALSE ), NULL, NULL, NULL, 'stream_containers_' . $class::$title );
$field = new \IPS\Helpers\Form\Node( 'stream_containers_' . $class::$title, $value, FALSE, array( 'class' => $nodeClass, 'clubs' => TRUE, 'multiple' => TRUE, 'zeroVal' => 'all', 'forceOwner' => FALSE, 'subnodes' => FALSE ), NULL, NULL, NULL, 'stream_containers_' . $class::$title );
$field->label = \IPS\Member::loggedIn()->language()->addToStack( $nodeClass::$nodeTitle );
$form->add( $field );
}
@@ -560,6 +561,12 @@ class _Stream extends \IPS\Node\Model
*/
protected function _getOurClubs()
{
/* If we're in the ACP, just return all clubs */
if( \IPS\Dispatcher::hasInstance() and \IPS\Dispatcher::i()->controllerLocation === 'admin' )
{
return iterator_to_array( \IPS\Member\Club::clubs( NULL, NULL, 'name' ) );
}
if( static::$ourClubs === NULL )
{
static::$ourClubs = \IPS\Member\Club::clubs( \IPS\Member::loggedIn(), NULL, 'name', TRUE, array(), \IPS\Settings::i()->clubs_require_approval ? array( 'approved=1' ) : NULL );
@@ -871,7 +878,7 @@ class _Stream extends \IPS\Node\Model
}
}
if ( $this->tags )
if ( $this->tags and \IPS\Settings::i()->tags_enabled )
{
$terms[] = \IPS\Member::loggedIn()->language()->addToStack( 'stream_includes_tags', FALSE, array( 'sprintf' => array( \IPS\Member::loggedIn()->language()->formatList( array_map( function( $val ){
return '\'' . $val . '\'';
@@ -1098,7 +1105,7 @@ class _Stream extends \IPS\Node\Model
}
/* Tags */
if( $this->tags )
if( $this->tags and \IPS\Settings::i()->tags_enabled )
{
$config['stream_tags'] = $this->tags;
}