Merge pull request #152 from FriendsOfREDAXO/copilot/fix-121

Add optional media prefix setting to sync cronjob

Author: alxndr-w

lang/de_de.lang

@@ -119,4 +119,5 @@ neues_entry_sync_cronjob_neues_category_id = Standard-Kategorie
 neues_entry_sync_cronjob_neues_author_id = Standard-Autor
 neues_entry_sync_cronjob_media_category_id = Import in Medienpool-Kategorie
 neues_entry_sync_cronjob_x_per_page = Anzahl der letzten Beiträge
+neues_entry_sync_cronjob_media_prefix = Medien mit Präfix
 neues_entry_sync_cronjob_success = %s Beiträge wurden erfolgreich synchronisiert (Erstellt: %s, aktualisiert %s).

lang/en_gb.lang

@@ -98,3 +98,15 @@ neues_docs_restful_api = YForm RESTful API
 neues_entry_publish_success = %d posts have been successfully published.
 neues_entry_publish_error = %d posts could not be published.
 neues_entry_publish_cronjob = Publish planned posts. (Current)
+
+neues_entry_sync_error = Error synchronizing posts.
+neues_entry_sync_cronjob = [📰 News] Retrieve posts, categories and authors from another REDAXO installation
+neues_entry_sync_cronjob_url = URL of the REDAXO installation
+neues_entry_sync_cronjob_token = RESTful API token
+neues_entry_sync_cronjob_status = Status value
+neues_entry_sync_cronjob_neues_category_id = Default category
+neues_entry_sync_cronjob_neues_author_id = Default author
+neues_entry_sync_cronjob_media_category_id = Import to media pool category
+neues_entry_sync_cronjob_x_per_page = Number of recent posts
+neues_entry_sync_cronjob_media_prefix = Media with prefix
+neues_entry_sync_cronjob_success = %s posts were successfully synchronized (Created: %s, updated %s).

lib/Cronjob/Sync.php

@@ -108,8 +108,9 @@ public function createEntry(array $current): void
 
         /* Titelbild abrufen und speichern */
         $updated_image = '';
-        $targetname = $entry_data['uuid'] . '_' . $entry_data['image'];
-        if ($this->createMedia($entry_data['image'])) {
+        $prefix = $this->getParam('media_prefix') ? $entry_data['uuid'] . '_' : '';
+        $targetname = $prefix . $entry_data['image'];
+        if ($this->createMedia($entry_data['image'], $prefix)) {
             $updated_image = $targetname;
         }
         $entry->setValue('image', $updated_image);
@@ -119,8 +120,8 @@ public function createEntry(array $current): void
         $images = array_filter(explode(',', $entry_data['images']));
         $updated_images = [];
         foreach ($images as $image) {
-            $targetname = $entry_data['uuid'] . '_' . $image;
-            if ($this->createMedia($image, $targetname)) {
+            $targetname = $prefix . $image;
+            if ($this->createMedia($image, $prefix)) {
                 $updated_images[] = $targetname;
             }
         }
@@ -187,9 +188,9 @@ public function createAuthor(array $current): Author
         return $author;
     }
 
-    public function createMedia(string $filename, ?string $prefix = null): bool
+    public function createMedia(string $filename, string $prefix = ''): bool
     {
-        $targetname = rex_string::normalize($prefix) . $filename;
+        $targetname = rex_string::normalize($prefix . $filename);
         if ('' === $filename) {
             return false;
         }
@@ -281,6 +282,15 @@ public function getParamFields()
                 'type' => 'text',
                 'attributes' => ['type' => 'number', 'min' => 1],
             ],
+            [
+                'name' => 'media_prefix',
+                'label' => rex_i18n::msg('neues_entry_sync_cronjob_media_prefix'),
+                'type' => 'select',
+                'options' => [
+                    '1' => rex_i18n::msg('neues_entry_sync_cronjob_media_prefix_yes'),
+                    '0' => rex_i18n::msg('neues_entry_sync_cronjob_media_prefix_no'),
+                ],
+            ],
         ];
 
         return $fields;