Merge pull request #147 from pdir/fix-newslist-module

2.12.5
pdir · Aug 20, 2024 · 31c3e82 · 31c3e82
2 parents ecd6484 + b58b577
commit 31c3e82
Show file tree

Hide file tree

Showing 41 changed files with 116 additions and 107 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,15 @@ Types of changes
     Security in case of vulnerabilities.
 )
 
+## [2.13.4](https://github.com/pdir/social-feed-bundle/tree/2.13.4) - 2024-08-20
+
+This version is currently only available via the “early adopter” program (EAP). You can find out more at [Social Feed EAP](https://pdir.de/crowdfunding/social-feed-bundle.html).
+
+Diese Version ist aktuell nur über das "early adopter"-Programm (EAP) verfügbar. Mehr erfährst du unter [Social Feed EAP](https://pdir.de/crowdfunding/social-feed-bundle.html).
+
+- [Fixed] Fix newslist module (remove void)
+- [Fixed] Missing images in moderated instagram import
+
 ## [2.13.3](https://github.com/pdir/social-feed-bundle/tree/2.13.3) - 2024-08-07
 
 This version is currently only available via the “early adopter” program (EAP). You can find out more at [Social Feed EAP](https://pdir.de/crowdfunding/social-feed-bundle.html).
@@ -55,6 +64,7 @@ Diese Version ist aktuell nur über das "early adopter"-Programm (EAP) verfügba
 - [Changed] guzzlehttp/guzzle from 6.3 to ^7.3
 - [Changed] Change translations and texts
 - [Fixed] temporarily supplemented samoritano/linkedin-api-php-client-v2 to support guzzle 7.3
+- [Fixed] Fix newslist module (remove void)
 
 ## [2.12.4](https://github.com/pdir/social-feed-bundle/tree/2.12.4) - 2023-07-31
 

diff --git a/src/ContaoManager/Plugin.php b/src/ContaoManager/Plugin.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Controller/FacebookController.php b/src/Controller/FacebookController.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Controller/InstagramController.php b/src/Controller/InstagramController.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Controller/LinkedinController.php b/src/Controller/LinkedinController.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Controller/ModerateController.php b/src/Controller/ModerateController.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Dca/tl_social_feed.php b/src/Dca/tl_social_feed.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/DependencyInjection/PdirSocialFeedExtension.php b/src/DependencyInjection/PdirSocialFeedExtension.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/EventListener/CronListener.php b/src/EventListener/CronListener.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/EventListener/SocialFeedListener.php b/src/EventListener/SocialFeedListener.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Importer/Importer.php b/src/Importer/Importer.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Importer/InstagramClient.php b/src/Importer/InstagramClient.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Importer/InstagramRequestCache.php b/src/Importer/InstagramRequestCache.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Importer/NewsImporter.php b/src/Importer/NewsImporter.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Model/SocialFeedModel.php b/src/Model/SocialFeedModel.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Module/ModuleCustomNewslist.php b/src/Module/ModuleCustomNewslist.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle
@@ -31,8 +31,8 @@ class ModuleCustomNewslist extends ModuleNewsList
      * @var string
      */
     protected $strTemplate = 'mod_newslist';
-
-    protected function compile(): void
+    
+    protected function compile()
     {
         parent::compile();
 

diff --git a/src/Module/NewsCategoriesModule.php b/src/Module/NewsCategoriesModule.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle
@@ -32,7 +32,7 @@ class NewsCategoriesModule extends NewsListModule
      */
     protected $strTemplate = 'mod_newslist';
 
-    protected function compile(): void
+    protected function compile()
     {
         parent::compile();
 

diff --git a/src/PdirSocialFeedBundle.php b/src/PdirSocialFeedBundle.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Resources/contao/dca/tl_module.php b/src/Resources/contao/dca/tl_module.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Resources/contao/dca/tl_news.php b/src/Resources/contao/dca/tl_news.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Resources/contao/dca/tl_news_archive.php b/src/Resources/contao/dca/tl_news_archive.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Resources/contao/dca/tl_social_feed.php b/src/Resources/contao/dca/tl_social_feed.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Resources/contao/languages/de/default.php b/src/Resources/contao/languages/de/default.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Resources/contao/languages/de/modules.php b/src/Resources/contao/languages/de/modules.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Resources/contao/languages/de/tl_module.php b/src/Resources/contao/languages/de/tl_module.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Resources/contao/languages/de/tl_news.php b/src/Resources/contao/languages/de/tl_news.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Resources/contao/languages/de/tl_social_feed.php b/src/Resources/contao/languages/de/tl_social_feed.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle
@@ -74,28 +74,28 @@
 $GLOBALS['TL_LANG']['tl_social_feed']['user'] = ['Benutzer', 'Geben Sie hier bitte an, welcher Benutzer für neu importierte Nachrichten gesetzt werden soll.'];
 
 $GLOBALS['TL_LANG']['tl_social_feed']['setupWelcome'] = 'Social Feed Bundle';
-$GLOBALS['TL_LANG']['tl_social_feed']['setupLinks'] = <<<HTML
-<p>Das SocialFeedBundle ist gesponsert von der <a href="http://www.pdir.de/" target="_blank">pdir / digital agentur</a></p>
-<h2>Interessante Links</h2>
-<ul class="link-list">
-  <li><a href="https://pdir.de/docs/de/contao/extensions/socialfeed/" target="_blank" style="text-decoration: underline;">Dokumentation</a></li>
-  <li><a href="https://github.com/pdir/social-feed-bundle/issues" target="_blank" style="text-decoration: underline;">Probleme melden</a></li>
-  <li><a href="https://github.com/pdir/social-feed-bundle/" target="_blank" style="text-decoration: underline;">Github</a></li>
-  <li><a href="https://contao-themes.net/sponsoring.html?isorc=3" target="_blank" style="text-decoration: underline;">Sponsoring / Unterstützen</a></li>
-</ul>
-HTML;
+$GLOBALS['TL_LANG']['tl_social_feed']['setupLinks'] = <<<'HTML'
+    <p>Das SocialFeedBundle ist gesponsert von der <a href="http://www.pdir.de/" target="_blank">pdir / digital agentur</a></p>
+    <h2>Interessante Links</h2>
+    <ul class="link-list">
+      <li><a href="https://pdir.de/docs/de/contao/extensions/socialfeed/" target="_blank" style="text-decoration: underline;">Dokumentation</a></li>
+      <li><a href="https://github.com/pdir/social-feed-bundle/issues" target="_blank" style="text-decoration: underline;">Probleme melden</a></li>
+      <li><a href="https://github.com/pdir/social-feed-bundle/" target="_blank" style="text-decoration: underline;">Github</a></li>
+      <li><a href="https://contao-themes.net/sponsoring.html?isorc=3" target="_blank" style="text-decoration: underline;">Sponsoring / Unterstützen</a></li>
+    </ul>
+    HTML;
 
 $GLOBALS['TL_LANG']['tl_social_feed']['setupHeadline'] = 'Willkommen beim Social Feed Bundle für Contao';
 $GLOBALS['TL_LANG']['tl_social_feed']['setupDesc'] = 'Die Social Feed Erweiterung zeigt einen Feed aus den beliebtesten sozialen Netzwerken an. Zur Zeit werden Facebook, Instagram, Twitter und LinkedIn unterstützt. Die Erweiterung kann kostenfrei genutzt werden. Es gibt eine kostenpflichtige Plus Version um Beiträge in allen sozialen Medien auf einmal zu veröffentlichen oder dies manuell durchzuführen.';
-$GLOBALS['TL_LANG']['tl_social_feed']['setupPlus'] = <<<HTML
-  <h3>Social Feed<span class="high-plus"></span> Version</h3>
-    <ul class="benefit">
-      <li>Auf mehreren Social Media Kanälen gleichzeitig veröffentlichen</li>
-      <li>Automatisches veröffentlichen von geplanten und normalen Beiträgen</li>
-      <li>Anpassen der Texte in der Vorschau bevor die Veröffentlichung erfolgt</li>
-      <li>Unterstützung von Tags die automatisch am Ende eingefügt werden</li>
-      <li>Schnelle Hilfe bei Problemen über unser Ticketsystem</li>
-    </ul>
-    <p><br><span class="price">99,- €</span> <a href="https://pdir.de/socialfeed+" target="_blank" class="tl_submit">Jetzt kaufen</a></p>
-HTML;
+$GLOBALS['TL_LANG']['tl_social_feed']['setupPlus'] = <<<'HTML'
+      <h3>Social Feed<span class="high-plus"></span> Version</h3>
+        <ul class="benefit">
+          <li>Auf mehreren Social Media Kanälen gleichzeitig veröffentlichen</li>
+          <li>Automatisches veröffentlichen von geplanten und normalen Beiträgen</li>
+          <li>Anpassen der Texte in der Vorschau bevor die Veröffentlichung erfolgt</li>
+          <li>Unterstützung von Tags die automatisch am Ende eingefügt werden</li>
+          <li>Schnelle Hilfe bei Problemen über unser Ticketsystem</li>
+        </ul>
+        <p><br><span class="price">99,- €</span> <a href="https://pdir.de/socialfeed+" target="_blank" class="tl_submit">Jetzt kaufen</a></p>
+    HTML;
 $GLOBALS['TL_LANG']['tl_social_feed']['setupFooter'] = 'Ihr Team der <img src="/bundles/pdirsocialfeed/img/pdir_logo.svg" width="50" alt="pdir logo" style="vertical-align: sub;"> / digital agentur';
diff --git a/src/Resources/contao/languages/en/default.php b/src/Resources/contao/languages/en/default.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Resources/contao/languages/en/modules.php b/src/Resources/contao/languages/en/modules.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Resources/contao/languages/en/tl_module.php b/src/Resources/contao/languages/en/tl_module.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle

diff --git a/src/Resources/contao/languages/en/tl_news.php b/src/Resources/contao/languages/en/tl_news.php
@@ -5,7 +5,7 @@
 /*
  * social feed bundle for Contao Open Source CMS
  *
- * Copyright (c) 2023 pdir / digital agentur // pdir GmbH
+ * Copyright (c) 2024 pdir / digital agentur // pdir GmbH
  *
  * @package    social-feed-bundle
  * @link       https://github.com/pdir/social-feed-bundle