Merge remote-tracking branch 'origin/main' into main

Author: ah-papoo

lib/classes/content_class.php

@@ -32,14 +32,17 @@ function __construct()
 
 	/**
 	 * Template-Variablen der Template-Engine Smarty zuweisen
+	 * @param bool $decode
 	 */
-	function assign()
+	public function assign(bool $decode=true): void
 	{
 		global $smarty;
 		global $template;
 
 		// 1. Inhalte Codieren
-		$this->template = self::decode($this->template);
+		if ($decode) {
+			$this->template = self::decode($this->template);
+		}
 
 		// 2. Template (HTML-Datei) Übergeben
 		$this->template['_template_'] = $template;

plugins/content_manipulator/scripts/single_artikel/include.php

@@ -75,6 +75,8 @@ function create_single_artikelintegration($inhalt = "")
 			$i++;
 		}
 
+		$this->content->assign(false);
+
 		IfNotSetNull($this->fourcss);
 		$inhalt = str_ireplace('</head>', $this->fourcss.'</head>', $inhalt);
 
@@ -194,14 +196,13 @@ function get_single_artikel($reporeid=0,$template_var=0)
 		if ($templatePathname = $this->findTemplate((int)$template_var)) {
 			$smartyIdentifier = '{*##SMARTY##*}';
 			if (strpos(file_get_contents($templatePathname, false, null, 0, strlen($smartyIdentifier)), $smartyIdentifier) === 0) {
-				$content->assign();
+				$content->assign(false);
 				$smarty->assign([
 					'article' => is_array($artikel_daten) ? reset($artikel_daten) ?: [] : [],
 					'modFree' => $cms->mod_free,
 				]);
 
 				$result = $smarty->fetch($templatePathname);
-				$content->assign();
 				return $result;
 			}
 		}

plugins/mv/lib/mv.php

@@ -4475,14 +4475,19 @@ function get_get_vars()
 		*/
 
 
-			$parameters = [
+			$parameters = array_filter([
 				"menuid" => (int)$this->checked->menuid,
 				"template" => (string)$this->checked->template,
 				"mv_id" => (int)$this->checked->mv_id,
+				'mv_submit' => (string)$this->checked->mv_submit,
 				"onemv" => (string)$this->checked->onemv,
 				"search_mv" => (string)$this->checked->search_mv,
 				"sort_feld" => (string)$this->checked->sort_feld
-			];
+			], function ($value, $name) {
+				return strlen($value) > 0 || !in_array($name, [
+					'mv_submit',
+				]);
+			}, ARRAY_FILTER_USE_BOTH);
 
 			// $this->cms->template_lang wird nach einem Seitenwechsel ueber die Pagination ploetzlich nicht mehr definiert...
 			$menuId = (int)$this->checked->menuid;
@@ -4498,6 +4503,27 @@ function get_get_vars()
 				}, $parameters);
 			}
 
+			$flexId = $parameters['mv_id'] = (int)$parameters['mv_id'];
+
+			// Append the user input of a flex search to the parameters
+			if ($flexId) {
+				$searchColumn = defined('admin') ? 'mvcform_search_back' : 'mvcform_search';
+				$searchableFlexFields = array_map(function (array $row) {
+					return "{$row['mvcform_name']}_{$row['mvcform_id']}";
+				}, $this->db->get_results(
+					"SELECT mvcform_id, mvcform_name ".
+					"FROM {$this->cms->tbname['papoo_mvcform']} ".
+					"WHERE mvcform_form_id = {$flexId} AND mvcform_aktiv = 1 ".
+					"AND {$searchColumn} = 1", ARRAY_A)
+				);
+
+				foreach ($searchableFlexFields as $fieldName) {
+					if (strlen($value = $this->checked->$fieldName ?? '') > 0) {
+						$parameters[$fieldName] = $value;
+					}
+				}
+			}
+
 			return urldecode(http_build_query($parameters, null, "&"));
 		}