Merge pull request #3 from php-schubser/master

feat: add cronjob

Author: php-schubser

moduleinfo.json

@@ -16,6 +16,6 @@
         "robinthehood/modified-std-module": "^0.1.0"
     },
     "modifiedCompatibility": [
-        "2.0.5.1"
+        "2.0.4.2", "2.0.5.1"
     ]
 }

new_files/admin/includes/modules/system/fs_cleverreach_interface.php

@@ -21,7 +21,7 @@ public function display()
     {
         return [
             'text' => '<br /><div align="center">' .    xtc_button(BUTTON_SAVE). 
-                                                        xtc_button_link(BUTTON_EXPORT, xtc_href_link("../interface/fs_cleverreach_interface.php")) .
+                                                        xtc_button_link(BUTTON_EXPORT, xtc_href_link("../interface/fs_cleverreach_interface.php?redirect_back=true")) .
                                                         xtc_button_link(BUTTON_CANCEL, xtc_href_link(FILENAME_MODULE_EXPORT, 'set=' . $_GET['set'] . '&module=fs_cleverreach_interface')) . "</div>"
         ];
     }

new_files/interface/fs_cleverreach_interface.php

@@ -11,6 +11,10 @@
 	$_SESSION['cleacerreach_interface_counter'] = 1;
 }
 
+if (!isset($_SESSION['cleacerreach_interface_error'])) {
+	$_SESSION['cleacerreach_interface_error'] = false;
+}
+
 if(!defined('MODULE_FS_CLEVERREACH_INTERFACE_STATUS') || MODULE_FS_CLEVERREACH_INTERFACE_STATUS != 'true')
 {
 	header('Location: ' . preg_replace("/[\r\n]+(.*)$/i", "", html_entity_decode($_SERVER['HTTP_REFERER'])));
@@ -158,11 +162,15 @@
 
 if (count($receivers) > 0) {
 	foreach ($receivers as $receiver) {
-		$response = $rest->get("/groups.json/".$group_id."/receivers/", $receiver["email"]);
-		if(!$response) {
-			$rest->post("/groups.json/".$group_id."/receivers", $receiver);
-		} else {
-			$rest->put("/groups.json/".$group_id."/receivers/".$receiver["email"], json_encode($receiver));
+		try {
+			$response = $rest->get("/groups.json/".$group_id."/receivers/", $receiver["email"]);
+			if(!$response) {
+				$rest->post("/groups.json/".$group_id."/receivers", $receiver);
+			} else {
+				$rest->put("/groups.json/".$group_id."/receivers/".$receiver["email"], json_encode($receiver));
+			}
+		} catch (Exception $e) {
+			$_SESSION['cleacerreach_interface_error'] = true;
 		}
 	}
 } else {
@@ -178,5 +186,17 @@
 $receivers = array();
 
 unset($_SESSION['cleacerreach_interface_counter']);
-header('Location: ' . xtc_href_link_admin((defined('DIR_ADMIN') ? DIR_ADMIN : 'admin/').'module_export.php', 'set=system&module=fs_cleverreach_interface&action=edit', 'NONSSL'));
+
+if (isset($_GET['redirect_back']) && $_GET['redirect_back'] == true) {
+	header('Location: ' . xtc_href_link_admin((defined('DIR_ADMIN') ? DIR_ADMIN : 'admin/').'module_export.php', 'set=system&module=fs_cleverreach_interface&action=edit', 'NONSSL'));
+	exit();
+}
+
+if (isset($_SESSION['cleacerreach_interface_error']) && $_SESSION['cleacerreach_interface_error'] == true) {
+	echo 'Fehler: Import nicht erfolgreich. Bitte prüfen Sie die eingegebenen Daten';
+} else {
+	echo 'Import erfolgreich';
+}
+
+unset($_SESSION['cleacerreach_interface_error']);
 exit();