Merge branch 'master' into develop

composer.json

@@ -8,6 +8,7 @@
   "type": "project",
   "require": {
     "php": "^7.2",
+    "ext-curl": "*",
     "ext-json": "*",
     "ext-libxml": "*",
     "ext-pdo": "*",

config/sites/ep-events/config.yaml

@@ -123,3 +123,4 @@ routeEnhancers:
       '/': 0
       '/json': 1703
       'sitemap.xml': 1533906435
+      'yoast-snippetpreview.json': 1480321830

public/typo3conf/ext/ep_events/ext_localconf.php

@@ -3,6 +3,8 @@
 defined('TYPO3_MODE') or die();
 
 $GLOBALS['TYPO3_CONF_VARS']['LOG']['TYPO3']['CMS']['deprecations']['writerConfiguration'][\TYPO3\CMS\Core\Log\LogLevel::NOTICE] = [];
+$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['yoast_seo']['allowedDoktypes']['ep_category'] = 101;
+$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['yoast_seo']['allowedDoktypes']['ep_offer'] = 102;
 
 call_user_func(function() {
 

public/typo3conf/ext/ep_products/Classes/Service/SnowreportImportService.php

@@ -33,6 +33,7 @@ use EP\EpProducts\Domain\Repository\RegionRepository;
 use EP\EpProducts\Domain\Repository\SnowreportRepository;
 use EP\EpProducts\Domain\Repository\WebcamRepository;
 use EP\EpProducts\Utility\SettingsUtility;
+use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface;
@@ -42,6 +43,16 @@ class SnowreportImportService implements SingletonInterface
     const XML_FILE_PATH = 'fileadmin/snowreport/snowreport.xml';
     const XML_FILE_URL = 'http://www.skiresort-service.com/xml-feed/';
 
+    /**
+     * @var array
+     */
+    protected static $validSnowreportUids = [];
+
+    /**
+     * @var array
+     */
+    protected static $validWebcamUids = [];
+
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager
      */
@@ -170,11 +181,16 @@ class SnowreportImportService implements SingletonInterface
                 $this->snowreportRepository->update($snowreport);
             }
 
+            static::$validSnowreportUids[] = $vendorUid;
+
             $count++;
         }
 
         $this->persistenceManager->persistAll();
 
+        $this->cleanupData('tx_epproducts_domain_model_webcam', static::$validWebcamUids);
+        $this->cleanupData('tx_epproducts_domain_model_snowreport', static::$validSnowreportUids);
+
         $GLOBALS['BE_USER']->writelog(4, 0, 0, 0, sprintf('Snowreport XML import successful (%d records).', $count), []);
 
         return $count;
@@ -202,11 +218,43 @@ class SnowreportImportService implements SingletonInterface
                 $snowreport->addWebcam($webcam);
             } else {
                 $webcam = $result->getFirst();
+                $webcam->setUrl((string) $item->url);
+                $webcam->setName((string) $item->dt);
                 $webcam->setAvailable((string) $item->verf === 'true');
             }
+            static::$validWebcamUids[] = $vendorUid;
         }
     }
 
+    public function cleanupData($table, array $validUids)
+    {
+        /** @var ConnectionPool $connectionPool */
+        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+        $qb = $connectionPool->getQueryBuilderForTable($table);
+        $result = $qb
+            ->select('vendor_uid')
+            ->from($table)
+            ->execute()
+            ->fetchAll()
+        ;
+
+        $currentUids = array_map(function ($row) {
+            return (int)$row['vendor_uid'];
+        }, $result);
+
+        $obsoleteUids = array_diff($currentUids, $validUids);
+        if (0 === count($obsoleteUids)) {
+            return;
+        }
+
+        $qb = $connectionPool->getQueryBuilderForTable($table);
+        $qb
+            ->delete($table)
+            ->where($qb->expr()->in('vendor_uid', $obsoleteUids))
+            ->execute()
+        ;
+    }
+
     public function downloadReportsXml()
     {
         $path = GeneralUtility::getFileAbsFileName(self::XML_FILE_PATH);

public/typo3conf/ext/ep_theme/extimg.php

@@ -36,22 +36,7 @@ if ($hash !== $token) {
     die('Access denied');
 }
 
-$ch = curl_init();
-curl_setopt($ch, CURLOPT_URL, $url);
-curl_setopt($ch, CURLOPT_TIMEOUT, 5);
-curl_setopt($ch, CURLOPT_HEADER, 1);
-curl_setopt($ch, CURLOPT_NOBODY, 1);
-curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-$headers = curl_exec($ch);
-
-if ($headers === false) {
-    exit;
-}
-
-foreach (explode("\r\n", $headers) as $header) {
-    header($header);
-}
-
+$imageInfo = getimagesize($url);
+header('Content-type: '.$imageInfo['mime']);
 readfile($url);
 exit;