TYPO3-extensions · mhirdes · Aug 24, 2017 · Sep 28, 2017 · Sep 28, 2017 · Sep 28, 2017
diff --git a/Classes/Ajax/Ajax.php b/Classes/Ajax/Ajax.php
diff --git a/Classes/Backend/CalWizIcon.php b/Classes/Backend/CalWizIcon.php
diff --git a/Classes/Backend/Modul/clear.gif b/Classes/Backend/Modul/clear.gif
diff --git a/Classes/Backend/Modul/icon_tx_cal_indexer.gif b/Classes/Backend/Modul/icon_tx_cal_indexer.gif
diff --git a/Classes/Backend/TCA/CustomTca.php b/Classes/Backend/TCA/CustomTca.php
diff --git a/Classes/Backend/TCA/ItemsProcFunc.php b/Classes/Backend/TCA/ItemsProcFunc.php
diff --git a/Classes/Backend/TCA/Labels.php b/Classes/Backend/TCA/Labels.php
diff --git a/Classes/Controller/Api.php b/Classes/Controller/Api.php
diff --git a/Classes/Controller/BaseController.php b/Classes/Controller/BaseController.php
diff --git a/Classes/Controller/Calendar.php b/Classes/Controller/Calendar.php
diff --git a/Classes/Controller/DateParser.php b/Classes/Controller/DateParser.php
diff --git a/Classes/Controller/ModelController.php b/Classes/Controller/ModelController.php
diff --git a/Classes/Controller/ViewController.php b/Classes/Controller/ViewController.php
diff --git a/Classes/Cron/CalendarScheduler.php b/Classes/Cron/CalendarScheduler.php
diff --git a/Classes/Cron/ReminderScheduler.php b/Classes/Cron/ReminderScheduler.php
diff --git a/Classes/Frontend/HtmlCrop.php b/Classes/Frontend/HtmlCrop.php
diff --git a/Classes/Frontend/IsCalNotAllowedToBeCached.php b/Classes/Frontend/IsCalNotAllowedToBeCached.php
diff --git a/Classes/Hooks/Befunc.php b/Classes/Hooks/Befunc.php
diff --git a/Classes/Hooks/DateEval.php b/Classes/Hooks/DateEval.php
diff --git a/Classes/Hooks/EventLinkHandler.php b/Classes/Hooks/EventLinkHandler.php
diff --git a/Classes/Hooks/LogoffPostProcessing.php b/Classes/Hooks/LogoffPostProcessing.php
diff --git a/Classes/Hooks/RealUrl.php b/Classes/Hooks/RealUrl.php
diff --git a/Classes/Hooks/TceFormsGetmainfields.php b/Classes/Hooks/TceFormsGetmainfields.php
diff --git a/Classes/Hooks/TceMainProcesscmdmap.php b/Classes/Hooks/TceMainProcesscmdmap.php
diff --git a/Classes/Hooks/TceMainProcessdatamap.php b/Classes/Hooks/TceMainProcessdatamap.php
diff --git a/Classes/Hooks/WecMap.php b/Classes/Hooks/WecMap.php
diff --git a/Classes/Model/AbstractModel.php b/Classes/Model/AbstractModel.php
diff --git a/Classes/Model/AttendeeModel.php b/Classes/Model/AttendeeModel.php
diff --git a/Classes/Model/BaseModel.php b/Classes/Model/BaseModel.php
@@ -41,6 +41,7 @@ abstract class BaseModel extends \TYPO3\CMS\Cal\Model\AbstractModel {
 	var $cachedValueArray = Array ();
 	var $initializingCacheValues = false;
 	var $templatePath;
+	var $classMethodVars = [];
 
 	/**
 	 * Constructor.
@@ -93,14 +94,14 @@ public function getValuesAsArray() {
 					GeneralUtility::devLog ('CACHE HIT (' . __CLASS__ . '::' . __FUNCTION__ . ')', 'cal', - 1, array ());
 				}
 				$cachedValues = unserialize ($cachedValues);
-				$this->classMethodVars = $cachedValues [0];
+				$this->classMethodVars = $cachedValues [0]?:[];
 				$autoFetchTextFields = $cachedValues [1];
 				$autoFetchTextSplitValue = $cachedValues [2];
 			} else {
 				$noAutoFetchMethods = $this->noAutoFetchMethods;
-				if (is_object (parent) && count (parent::getNoAutoFetchMethods ())) {
-					$noAutoFetchMethods = array_merge (parent::getNoAutoFetchMethods (), $this->getNoAutoFetchMethods ());
-				}
+//				if (is_object (parent) && count (parent::getNoAutoFetchMethods ())) {
+//					$noAutoFetchMethods = array_merge (parent::getNoAutoFetchMethods (), $this->getNoAutoFetchMethods ());
+//				}
 				$cObj = &\TYPO3\CMS\Cal\Utility\Registry::Registry ('basic', 'cobj');
 				$autoFetchTextFields = explode (',', strtolower ($this->conf ['autoFetchTextFields']));
 				$autoFetchTextSplitValue = $cObj->stdWrap ($this->conf ['autoFetchTextSplitValue'], $this->conf ['autoFetchTextSplitValue.']);

diff --git a/Classes/Model/CalDate.php b/Classes/Model/CalDate.php
diff --git a/Classes/Model/CalendarModel.php b/Classes/Model/CalendarModel.php
diff --git a/Classes/Model/CategoryModel.php b/Classes/Model/CategoryModel.php
diff --git a/Classes/Model/EventRecDeviationModel.php b/Classes/Model/EventRecDeviationModel.php
diff --git a/Classes/Model/EventRecModel.php b/Classes/Model/EventRecModel.php
diff --git a/Classes/Model/ICalendar.php b/Classes/Model/ICalendar.php
diff --git a/Classes/Model/ICalendar/daylight.php b/Classes/Model/ICalendar/daylight.php
diff --git a/Classes/Model/ICalendar/standard.php b/Classes/Model/ICalendar/standard.php
diff --git a/Classes/Model/ICalendar/valarm.php b/Classes/Model/ICalendar/valarm.php
diff --git a/Classes/Model/ICalendar/vcard.php b/Classes/Model/ICalendar/vcard.php
diff --git a/Classes/Model/ICalendar/vevent.php b/Classes/Model/ICalendar/vevent.php
diff --git a/Classes/Model/ICalendar/vfreebusy.php b/Classes/Model/ICalendar/vfreebusy.php
diff --git a/Classes/Model/ICalendar/vjournal.php b/Classes/Model/ICalendar/vjournal.php
diff --git a/Classes/Model/ICalendar/vnote.php b/Classes/Model/ICalendar/vnote.php
diff --git a/Classes/Model/ICalendar/vtimezone.php b/Classes/Model/ICalendar/vtimezone.php
diff --git a/Classes/Model/ICalendar/vtodo.php b/Classes/Model/ICalendar/vtodo.php
diff --git a/Classes/Model/Location.php b/Classes/Model/Location.php
diff --git a/Classes/Model/LocationModel.php b/Classes/Model/LocationModel.php
diff --git a/Classes/Model/LocationPartner.php b/Classes/Model/LocationPartner.php
diff --git a/Classes/Model/Model.php b/Classes/Model/Model.php
diff --git a/Classes/Model/Organizer.php b/Classes/Model/Organizer.php
diff --git a/Classes/Model/OrganizerFeUser.php b/Classes/Model/OrganizerFeUser.php
diff --git a/Classes/Model/OrganizerPartner.php b/Classes/Model/OrganizerPartner.php
diff --git a/Classes/Model/Pear/Date.php b/Classes/Model/Pear/Date.php
diff --git a/Classes/Model/Pear/Date/Calc.php b/Classes/Model/Pear/Date/Calc.php
diff --git a/Classes/Model/Pear/Date/Human.php b/Classes/Model/Pear/Date/Human.php
diff --git a/Classes/Model/Pear/Date/Span.php b/Classes/Model/Pear/Date/Span.php
diff --git a/Classes/Model/Pear/Date/TimeZone.php b/Classes/Model/Pear/Date/TimeZone.php
diff --git a/Classes/Model/TodoModel.php b/Classes/Model/TodoModel.php
diff --git a/Classes/Model/TodoRecModel.php b/Classes/Model/TodoRecModel.php
diff --git a/Classes/Service/AbstractModul.php b/Classes/Service/AbstractModul.php
diff --git a/Classes/Service/AttendeeService.php b/Classes/Service/AttendeeService.php
diff --git a/Classes/Service/BaseService.php b/Classes/Service/BaseService.php
diff --git a/Classes/Service/CalendarService.php b/Classes/Service/CalendarService.php
diff --git a/Classes/Service/CategoryService.php b/Classes/Service/CategoryService.php
diff --git a/Classes/Service/FnbEventService.php b/Classes/Service/FnbEventService.php
diff --git a/Classes/Service/ICalendarService.php b/Classes/Service/ICalendarService.php
diff --git a/Classes/Service/LocationAddressService.php b/Classes/Service/LocationAddressService.php
diff --git a/Classes/Service/LocationPartnerService.php b/Classes/Service/LocationPartnerService.php
diff --git a/Classes/Service/LocationService.php b/Classes/Service/LocationService.php
diff --git a/Classes/Service/NearbyEventService.php b/Classes/Service/NearbyEventService.php
diff --git a/Classes/Service/OrganizerAddressService.php b/Classes/Service/OrganizerAddressService.php
diff --git a/Classes/Service/OrganizerFeUserService.php b/Classes/Service/OrganizerFeUserService.php
diff --git a/Classes/Service/OrganizerPartnerService.php b/Classes/Service/OrganizerPartnerService.php
diff --git a/Classes/Service/OrganizerService.php b/Classes/Service/OrganizerService.php
diff --git a/Classes/Service/RightsService.php b/Classes/Service/RightsService.php
diff --git a/Classes/TreeProvider/TreeView.php b/Classes/TreeProvider/TreeView.php
diff --git a/Classes/Utility/Cache.php b/Classes/Utility/Cache.php
diff --git a/Classes/Utility/Functions.php b/Classes/Utility/Functions.php
@@ -158,13 +158,13 @@ public static function substituteMarkerArrayNotCached($content, $markContentArra
 
 		// Finding subparts and substituting them with the subpart as a marker
 		reset ($sPkeys);
-		while (list (, $sPK) = each ($sPkeys)) {
+        foreach ($sPkeys as $key => $sPK) {
 			$content = $cObj->substituteSubpart ($content, $sPK, $subpartContentArray [$sPK]);
 		}
 
 		// Finding subparts and wrapping them with markers
 		reset ($wPkeys);
-		while (list (, $wPK) = each ($wPkeys)) {
+        foreach ($wPkeys as $key => $wPK) {
 			if (is_array ($wrappedSubpartContentArray [$wPK])) {
 				$parts = &$wrappedSubpartContentArray [$wPK];
 			} else {

diff --git a/Classes/Utility/PearLoader.php b/Classes/Utility/PearLoader.php
diff --git a/Classes/Utility/RecurrenceGenerator.php b/Classes/Utility/RecurrenceGenerator.php
diff --git a/Classes/Utility/Registry.php b/Classes/Utility/Registry.php
diff --git a/Classes/View/AdminView.php b/Classes/View/AdminView.php
diff --git a/Classes/View/BaseView.php b/Classes/View/BaseView.php
diff --git a/Classes/View/ConfirmCalendarView.php b/Classes/View/ConfirmCalendarView.php
diff --git a/Classes/View/ConfirmCategoryView.php b/Classes/View/ConfirmCategoryView.php
diff --git a/Classes/View/ConfirmEventView.php b/Classes/View/ConfirmEventView.php
diff --git a/Classes/View/ConfirmLocationOrganizerView.php b/Classes/View/ConfirmLocationOrganizerView.php
diff --git a/Classes/View/CreateCalendarView.php b/Classes/View/CreateCalendarView.php
diff --git a/Classes/View/CreateCategoryView.php b/Classes/View/CreateCategoryView.php
diff --git a/Classes/View/CreateEventView.php b/Classes/View/CreateEventView.php
diff --git a/Classes/View/CreateLocationOrganizerView.php b/Classes/View/CreateLocationOrganizerView.php
diff --git a/Classes/View/DeleteCalendarView.php b/Classes/View/DeleteCalendarView.php
diff --git a/Classes/View/DeleteCategoryView.php b/Classes/View/DeleteCategoryView.php
diff --git a/Classes/View/DeleteEventView.php b/Classes/View/DeleteEventView.php
diff --git a/Classes/View/DeleteLocationOrganizerView.php b/Classes/View/DeleteLocationOrganizerView.php
diff --git a/Classes/View/EventView.php b/Classes/View/EventView.php
diff --git a/Classes/View/FeEditingBaseView.php b/Classes/View/FeEditingBaseView.php
diff --git a/Classes/View/IcsView.php b/Classes/View/IcsView.php
diff --git a/Classes/View/ListView.php b/Classes/View/ListView.php
diff --git a/Classes/View/LocationView.php b/Classes/View/LocationView.php
diff --git a/Classes/View/MeetingManagerView.php b/Classes/View/MeetingManagerView.php
diff --git a/Classes/View/Module/Example.php b/Classes/View/Module/Example.php
diff --git a/Classes/View/Module/LocationLoader.php b/Classes/View/Module/LocationLoader.php
diff --git a/Classes/View/Module/OrganizerLoader.php b/Classes/View/Module/OrganizerLoader.php
diff --git a/Classes/View/MonthView.php b/Classes/View/MonthView.php
diff --git a/Classes/View/NewDayView.php b/Classes/View/NewDayView.php
diff --git a/Classes/View/NewMonthView.php b/Classes/View/NewMonthView.php
diff --git a/Classes/View/NewTimeView.php b/Classes/View/NewTimeView.php
diff --git a/Classes/View/NewWeekView.php b/Classes/View/NewWeekView.php
@@ -504,7 +504,7 @@ private function getDayClasses($weekdayIndex) {
 			$localDayIndex = 6;
 		}
 		$daysKeys = array_keys ($this->days);
-		if (intval ($this->getParentMonth ()) != intval ($this->days [$daysKeys [$localDayIndex]]->month)) {
+		if (intval ($this->getParentMonth ()) != intval ($this->days [$daysKeys [$localDayIndex]]->getMonth())) {
 			$classes .= ' ' . $conf['view.']['month.']['monthOffStyle'];
 		}
 

diff --git a/Classes/View/NotificationView.php b/Classes/View/NotificationView.php
diff --git a/Classes/View/OrganizerView.php b/Classes/View/OrganizerView.php
diff --git a/Classes/View/ReminderView.php b/Classes/View/ReminderView.php
diff --git a/Classes/View/RssView.php b/Classes/View/RssView.php
diff --git a/Classes/View/SearchViews.php b/Classes/View/SearchViews.php
diff --git a/Classes/View/WeekView.php b/Classes/View/WeekView.php
diff --git a/Classes/View/YearView.php b/Classes/View/YearView.php
diff --git a/Configuration/FlexForms/flexform_cal.xml b/Configuration/FlexForms/flexform_cal.xml
diff --git a/Configuration/FlexForms/flexform_cal_sys_category.xml b/Configuration/FlexForms/flexform_cal_sys_category.xml
diff --git a/Resources/Private/Help/locallang_csh_flexform.xml b/Resources/Private/Help/locallang_csh_flexform.xml
diff --git a/Resources/Private/Help/locallang_csh_txcalcal.xml b/Resources/Private/Help/locallang_csh_txcalcal.xml
diff --git a/Resources/Private/Help/locallang_csh_txcalcat.xml b/Resources/Private/Help/locallang_csh_txcalcat.xml
diff --git a/Resources/Private/Help/locallang_csh_txcalevent.xml b/Resources/Private/Help/locallang_csh_txcalevent.xml
diff --git a/Resources/Private/Help/locallang_csh_txcalexceptionevent.xml b/Resources/Private/Help/locallang_csh_txcalexceptionevent.xml
diff --git a/Resources/Private/Help/locallang_csh_txcalexceptioneventgroup.xml b/Resources/Private/Help/locallang_csh_txcalexceptioneventgroup.xml
diff --git a/Resources/Private/Help/locallang_csh_txcallocation.xml b/Resources/Private/Help/locallang_csh_txcallocation.xml
diff --git a/Resources/Private/Help/locallang_csh_txcalorganizer.xml b/Resources/Private/Help/locallang_csh_txcalorganizer.xml
diff --git a/Resources/Private/Language/locallang.xml b/Resources/Private/Language/locallang.xml
diff --git a/Resources/Private/Language/locallang_db.xml b/Resources/Private/Language/locallang_db.xml
diff --git a/Resources/Private/Language/locallang_plugin.xml b/Resources/Private/Language/locallang_plugin.xml
diff --git a/Resources/Private/Language/locallang_tca.xml b/Resources/Private/Language/locallang_tca.xml
diff --git a/Resources/Public/icons/ce_wiz.gif b/Resources/Public/icons/ce_wiz.gif
diff --git a/Resources/Public/icons/icon_tx_cal_attendee.gif b/Resources/Public/icons/icon_tx_cal_attendee.gif
diff --git a/Resources/Public/icons/icon_tx_cal_calendar.gif b/Resources/Public/icons/icon_tx_cal_calendar.gif
diff --git a/Resources/Public/icons/icon_tx_cal_calendar__h.gif b/Resources/Public/icons/icon_tx_cal_calendar__h.gif
diff --git a/Resources/Public/icons/icon_tx_cal_calendar_exturl.gif b/Resources/Public/icons/icon_tx_cal_calendar_exturl.gif
diff --git a/Resources/Public/icons/icon_tx_cal_calendar_exturl__h.gif b/Resources/Public/icons/icon_tx_cal_calendar_exturl__h.gif
diff --git a/Resources/Public/icons/icon_tx_cal_calendar_feed.gif b/Resources/Public/icons/icon_tx_cal_calendar_feed.gif
diff --git a/Resources/Public/icons/icon_tx_cal_calendar_ics.gif b/Resources/Public/icons/icon_tx_cal_calendar_ics.gif
diff --git a/Resources/Public/icons/icon_tx_cal_calendar_ics__h.gif b/Resources/Public/icons/icon_tx_cal_calendar_ics__h.gif
diff --git a/Resources/Public/icons/icon_tx_cal_category.gif b/Resources/Public/icons/icon_tx_cal_category.gif
diff --git a/Resources/Public/icons/icon_tx_cal_category__h.gif b/Resources/Public/icons/icon_tx_cal_category__h.gif
diff --git a/Resources/Public/icons/icon_tx_cal_deviation.gif b/Resources/Public/icons/icon_tx_cal_deviation.gif
diff --git a/Resources/Public/icons/icon_tx_cal_events.gif b/Resources/Public/icons/icon_tx_cal_events.gif
diff --git a/Resources/Public/icons/icon_tx_cal_events__h.gif b/Resources/Public/icons/icon_tx_cal_events__h.gif
diff --git a/Resources/Public/icons/icon_tx_cal_events_exturl.gif b/Resources/Public/icons/icon_tx_cal_events_exturl.gif
diff --git a/Resources/Public/icons/icon_tx_cal_events_exturl__h.gif b/Resources/Public/icons/icon_tx_cal_events_exturl__h.gif
diff --git a/Resources/Public/icons/icon_tx_cal_events_intlnk.gif b/Resources/Public/icons/icon_tx_cal_events_intlnk.gif
diff --git a/Resources/Public/icons/icon_tx_cal_events_intlnk__h.gif b/Resources/Public/icons/icon_tx_cal_events_intlnk__h.gif
diff --git a/Resources/Public/icons/icon_tx_cal_events_meeting.gif b/Resources/Public/icons/icon_tx_cal_events_meeting.gif
diff --git a/Resources/Public/icons/icon_tx_cal_events_meeting__h.gif b/Resources/Public/icons/icon_tx_cal_events_meeting__h.gif
diff --git a/Resources/Public/icons/icon_tx_cal_events_todo.gif b/Resources/Public/icons/icon_tx_cal_events_todo.gif
diff --git a/Resources/Public/icons/icon_tx_cal_events_todo__h.gif b/Resources/Public/icons/icon_tx_cal_events_todo__h.gif
diff --git a/Resources/Public/icons/icon_tx_cal_exception_event.gif b/Resources/Public/icons/icon_tx_cal_exception_event.gif
diff --git a/Resources/Public/icons/icon_tx_cal_exception_event__h.gif b/Resources/Public/icons/icon_tx_cal_exception_event__h.gif
diff --git a/Resources/Public/icons/icon_tx_cal_exception_event_group.gif b/Resources/Public/icons/icon_tx_cal_exception_event_group.gif
diff --git a/Resources/Public/icons/icon_tx_cal_exception_event_group__h.gif b/Resources/Public/icons/icon_tx_cal_exception_event_group__h.gif
diff --git a/Resources/Public/icons/icon_tx_cal_fe_user_event_monitor_mm.gif b/Resources/Public/icons/icon_tx_cal_fe_user_event_monitor_mm.gif
diff --git a/Resources/Public/icons/icon_tx_cal_location.gif b/Resources/Public/icons/icon_tx_cal_location.gif
diff --git a/Resources/Public/icons/icon_tx_cal_location__h.gif b/Resources/Public/icons/icon_tx_cal_location__h.gif
diff --git a/Resources/Public/icons/icon_tx_cal_organizer.gif b/Resources/Public/icons/icon_tx_cal_organizer.gif
diff --git a/Resources/Public/icons/icon_tx_cal_organizer__h.gif b/Resources/Public/icons/icon_tx_cal_organizer__h.gif
diff --git a/Resources/Public/icons/icon_tx_cal_unknown_users.gif b/Resources/Public/icons/icon_tx_cal_unknown_users.gif
diff --git a/Resources/Public/js/recurui.js b/Resources/Public/js/recurui.js
diff --git a/Resources/Public/js/recurui2.js b/Resources/Public/js/recurui2.js
diff --git a/Resources/Public/js/recurui3.js b/Resources/Public/js/recurui3.js
diff --git a/Resources/Public/js/url.js b/Resources/Public/js/url.js
diff --git a/Resources/Public/js/url2.js b/Resources/Public/js/url2.js
diff --git a/composer.json b/composer.json
@@ -0,0 +1,20 @@
+{
+  "name": "typo3/cal",
+  "type": "typo3-cms-extension",
+  "description": "Calendar Base (cal)",
+  "license": [
+	"GPL-2.0+"
+  ],
+  "version": "1.11.2-dev",
+  "replace": {
+	"cal": "*"
+  },
+  "require": {
+	"typo3/cms-core": ">=8.7.0"
+  },
+  "autoload": {
+	"psr-4": {
+	  "TYPO3\\CMS\\Cal\\": "Classes/"
+	}
+  }
+}
diff --git a/ext_conf_template.txt b/ext_conf_template.txt
diff --git a/ext_emconf.php b/ext_emconf.php
diff --git a/ext_icon.gif b/ext_icon.gif
diff --git a/ext_localconf.php b/ext_localconf.php
diff --git a/ext_tables.php b/ext_tables.php
diff --git a/ext_tables.sql b/ext_tables.sql
@@ -484,8 +484,8 @@ CREATE TABLE be_groups (
 );
 
 CREATE TABLE fe_users (
-	tx_cal_calendar tinytext NOT NULL,
-	tx_cal_calendar_subscription tinyblob NOT NULL,
+	tx_cal_calendar tinytext,
+	tx_cal_calendar_subscription tinyblob,
 );
 
 CREATE TABLE tx_cal_attendee (
@@ -603,7 +603,7 @@ CREATE TABLE tx_cal_cache (
     identifier varchar(128) DEFAULT '' NOT NULL,
     content text NOT NULL,
 	crdate int(11) DEFAULT '0' NOT NULL,
-	lifetime int(11) DEFAULT '0' NOT NULL,    
+	lifetime BIGINT DEFAULT '0' NOT NULL,
   	PRIMARY KEY (id),
   	KEY cache_id (identifier)
 ) ENGINE=InnoDB;

diff --git a/misc/locales.php b/misc/locales.php
diff --git a/misc/realurl_example.txt b/misc/realurl_example.txt