Fixed output of calender data via the content-manipulator plugin

Author: ah-papoo

plugins/content_manipulator/scripts/kalender/include.php

@@ -106,13 +106,14 @@ function get_kalender($id = 0, $count = -1)
 		$kal_rahmen=file_get_contents(PAPOO_ABS_PFAD."/plugins/content_manipulator/scripts/kalender/templates/kalender.html");
 		$kal_daten=file_get_contents(PAPOO_ABS_PFAD."/plugins/content_manipulator/scripts/kalender/templates/kalender_content.html");
 
+		$kalenderData = $class_cal_front_cm->get_alle_termine_ab_jetzt(['kalender_id' => $id]);
+
 		//Termine
-		if (!isset($class_cal_front_cm->alle_termin_ab_jetzt[$id]) ||
-			isset($class_cal_front_cm->alle_termin_ab_jetzt[$id]) && !is_array($class_cal_front_cm->alle_termin_ab_jetzt[$id])) {
+		if (!isset($kalenderData) || !is_array($kalenderData)) {
 			return "<strong>Es sind keine Termine im Kalender eingetragen oder der Kalender existiert nicht. - bitte ID korrigieren</strong>";
 		}
 		else {
-			$termine = array_slice($class_cal_front_cm->alle_termin_ab_jetzt[$id], 0, ($count >= 0 ? $count : null), true);
+			$termine = array_slice($kalenderData, 0, ($count >= 0 ? $count : null), true);
 			$kal_items="";
 			foreach ($termine as $k=>$v) {
 				$kal_item=$kal_daten;

plugins/pkalender/lib/class_cal_front.php

@@ -1163,16 +1163,18 @@ function get_alle_termine_ab_jetzt($cal = array(), $count = 15, $days_limit = 36
 		$sql = sprintf("SELECT DISTINCT * FROM %s
 									LEFT JOIN %s ON pkal_date_id=date_id_id
 									LEFT JOIN %s ON date_gruppe_lese_id=gruppenid
-									WHERE pkal_date_start_datum>='%d'
+                                    WHERE pkal_date_lang_id='%d'
+									AND pkal_date_start_datum>='%d'
 									AND pkal_date_end_datum<='%d'
 									AND userid='%d'
 									AND pkal_date_eintrag_im_frontend_freischalten='1'
 									ORDER BY pkal_date_start_datum ASC
-									LIMIT %d									
+									LIMIT %d
 									",
 			$this->cms->tbname['plugin_kalender_date'],
 			$this->cms->tbname['plugin_kalender_lookup_read_date'],
 			$this->cms->tbname['papoo_lookup_ug'],
+			$this->cms->lang_id,
 			$start,
 			$end,
 			$this->user->userid,