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

Version 4.6.0

Browse Source
This commit is contained in:
Neo committed 2025-12-19 05:55:31 -08:00
1 parent f79dcf067a
commit 517a5e1f70
2036 files changed
+110041 -26162
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/calendar/modules/admin/calendars/ical.php
+1 -1
View File
@@ -341,7 +341,7 @@ class _ical extends \IPS\Dispatcher\Controller
/* Insert the new record */
$feed->title = $values['feed_title'];
$feed->url = $values['feed_url'];
$feed->calendar_id = $values['feed_calendar_id'];
$feed->calendar_id = $values['feed_calendar_id']->_id;
if( \IPS\Settings::i()->calendar_venues_enabled )
{
applications/calendar/modules/front/calendar/event.php
+2
View File
@@ -349,6 +349,8 @@ class _event extends \IPS\Content\Controller
) );
$message = 'rsvp_selection_' . \IPS\Request::i()->action;
\IPS\Member::loggedIn()->achievementAction( 'calendar', 'Rsvp', $this->event );
}
\IPS\Output::i()->redirect( $this->event->url(), $message );
applications/calendar/modules/front/calendar/submit.php
+3 -2
View File
@@ -149,10 +149,10 @@ class _submit extends \IPS\Dispatcher\Controller
{
\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=calendar&module=calendar&controller=submit', 'front', 'calendar_submit' ) );
}
$form = new \IPS\Helpers\Form( 'form', \IPS\Member::loggedIn()->language()->checkKeyExists( \IPS\Calendar\Event::$formLangPrefix . '_save' ) ? \IPS\Calendar\Event::$formLangPrefix . '_save' : 'save' );
$form->class = 'ipsForm_vertical';
$formElements = \IPS\Calendar\Event::formElements( $existing, $existing->container() );
$formElements = \IPS\Calendar\Event::formElements( $existing, $existing->container(), TRUE );
foreach ( $formElements as $key => $object )
{
if ( \is_object( $object ) )
@@ -183,6 +183,7 @@ class _submit extends \IPS\Dispatcher\Controller
/* Set cover photo offset from original if we're using the same photo */
if( $existing->cover_photo == $obj->cover_photo )
{
$obj->cover_photo = \IPS\File::get( 'calendar_Events', $existing->cover_photo )->duplicate();
$obj->cover_offset = $existing->cover_offset;
$obj->save();
}
applications/calendar/modules/front/calendar/view.php
+12 -2
View File
@@ -345,13 +345,23 @@ class _view extends \IPS\Dispatcher\Controller
{
$dayEvents['count']++;
if( $_event->all_day )
if( $_event->all_day AND (
$_event->nextOccurrence( $date, 'startDate' )->strFormat('%d') == \IPS\Request::i()->d OR
$_event->nextOccurrence( $date, 'endDate' ) AND $_event->nextOccurrence( $date, 'endDate' )->strFormat('%d') == \IPS\Request::i()->d
) )
{
$dayEvents['allDay'][ $_event->id ] = $_event;
}
else
{
$dayEvents[ $_event->_start_date->hours ][ $_event->id ] = $_event;
if( $_event->nextOccurrence( $date, 'startDate' )->strFormat('%d') == \IPS\Request::i()->d )
{
$dayEvents[ $_event->_start_date->hours ][ $_event->id ] = $_event;
}
elseif( $_event->nextOccurrence( $date, 'endDate' ) AND $_event->nextOccurrence( $date, 'endDate' )->strFormat('%d') == \IPS\Request::i()->d )
{
$dayEvents[ 0 ][ $_event->id ] = $_event;
}
}
}
}