Version 4.1.19
This commit is contained in:
1 parent
28bd025b35
commit
2bd5025018
2674 files changed
+233518
-77766
No files matched your search
@@ -2,10 +2,10 @@
|
||||
/**
|
||||
* @brief upcomingEvents Widget
|
||||
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) 2001 - SVN_YYYY Invision Power Services, Inc.
|
||||
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/legal/standards/
|
||||
* @package IPS Social Suite
|
||||
* @subpackage calendar
|
||||
* @package IPS Community Suite
|
||||
* @subpackage Calendar
|
||||
* @since 18 Dec 2013
|
||||
* @version SVN_VERSION_NUMBER
|
||||
*/
|
||||
@@ -98,7 +98,7 @@ class _upcomingEvents extends \IPS\Widget\PermissionCache
|
||||
) ) );
|
||||
|
||||
$form->add( new \IPS\Helpers\Form\YesNo( 'auto_hide', isset( $this->configuration['auto_hide'] ) ? $this->configuration['auto_hide'] : FALSE, FALSE ) );
|
||||
$form->add( new \IPS\Helpers\Form\Number( 'days_ahead', isset( $this->configuration['days_ahead'] ) ? $this->configuration['days_ahead'] : NULL, TRUE, array( 'unlimited' => -1 ) ) );
|
||||
$form->add( new \IPS\Helpers\Form\Number( 'days_ahead', isset( $this->configuration['days_ahead'] ) ? $this->configuration['days_ahead'] : 7, TRUE, array( 'unlimited' => -1 ) ) );
|
||||
$form->add( new \IPS\Helpers\Form\Number( 'maximum_count', isset( $this->configuration['maximum_count'] ) ? $this->configuration['maximum_count'] : 5, TRUE, array( 'unlimited' => -1 ) ) );
|
||||
return $form;
|
||||
}
|
||||
@@ -131,7 +131,7 @@ class _upcomingEvents extends \IPS\Widget\PermissionCache
|
||||
return '';
|
||||
}
|
||||
|
||||
$_today = \IPS\calendar\Date::getDate();
|
||||
$_today = new \IPS\calendar\Date( "now", \IPS\Member::loggedIn()->timezone ? new \DateTimeZone( \IPS\Member::loggedIn()->timezone ) : NULL );
|
||||
|
||||
/* Do we have a days ahead cutoff? */
|
||||
$endDate = NULL;
|
||||
@@ -147,9 +147,23 @@ class _upcomingEvents extends \IPS\Widget\PermissionCache
|
||||
{
|
||||
$calendars = $this->configuration['widget_calendar'];
|
||||
}
|
||||
|
||||
$events = \IPS\calendar\Event::retrieveEvents( $_today, $endDate, $calendars, ( isset( $this->configuration['maximum_count'] ) AND $this->configuration['maximum_count'] > 0 ) ? $this->configuration['maximum_count'] : 5, FALSE );
|
||||
|
||||
/* How many are we displaying? */
|
||||
$count = 5;
|
||||
if( isset( $this->configuration['maximum_count'] ) )
|
||||
{
|
||||
if( $this->configuration['maximum_count'] > 0 )
|
||||
{
|
||||
$count = $this->configuration['maximum_count'];
|
||||
}
|
||||
else if ( $this->configuration['maximum_count'] == -1 )
|
||||
{
|
||||
$count = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
$events = \IPS\calendar\Event::retrieveEvents( $_today, $endDate, ( $calendars === NULL ? NULL : !is_array( $calendars ) ? array( $calendars ) : $calendars ), $count, FALSE );
|
||||
|
||||
/* Auto hiding? */
|
||||
if( !count($events) AND isset( $this->configuration['auto_hide'] ) AND $this->configuration['auto_hide'] )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user