From 35b8c1f26d3769dadf1541438a178fc432e1e7db Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Tue, 27 Feb 2018 14:17:36 +0100
Subject: [PATCH] =?UTF-8?q?CIS-Suche=20verlinkt=20Rauminformationen=20bei?=
 =?UTF-8?q?=20R=C3=A4umen=20mit=20Content=5FID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/tools/suche.php | 22 ++++++++++++++++++----
 include/ort.class.php       |  2 +-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/cis/private/tools/suche.php b/cis/private/tools/suche.php
index b262ea01c..29d10b38b 100644
--- a/cis/private/tools/suche.php
+++ b/cis/private/tools/suche.php
@@ -330,10 +330,11 @@ function searchOrt($search)
 		<table class="tablesorter" id="orttable">
 			<thead>
 				<tr>
-					<th>',$p->t('global/ort'),'</th>
+					<th>',$p->t('lvplan/raum'),'</th>
 					<th>',$p->t('global/bezeichnung'),'</th>
-					<th>',$p->t('tools/maxPersonen'),'</th>
-					<th>',$p->t('tools/telefonklappe'),'</th>';
+					<th>',$p->t('lvplan/anzahlPersonen'),'</th>
+					<th>',$p->t('tools/telefonklappe'),'</th>
+					<th>',$p->t('lvplan/rauminformationenAnzeigen'),'</th>';
 					if ($raumres)
 						echo '<th>',$p->t('tools/reservieren'),'</th>';
 					else
@@ -348,6 +349,7 @@ function searchOrt($search)
 			echo '<td>',$row->bezeichnung,'</td>';
 			echo '<td>',$row->max_person,'</td>';
 			echo '<td>',$row->telefonklappe,'</td>';
+			echo '<td>'.($row->content_id != '' ?'<a href="../../../cms/content.php?content_id='.$row->content_id.'" target="_self">'.$p->t('lvplan/rauminformationenAnzeigen').'</a>':'-').'</td>';
 			if ($raumres)
 				echo '<td><a href="../../../cis/private/lvplan/stpl_week.php?type=ort&ort_kurzbz='.$row->ort_kurzbz.'">'.$p->t('tools/reservieren').'</a></td>';
 			else
@@ -455,6 +457,7 @@ function searchContent($searchItems)
 	global $db,$p,$sprache,$uid;
 	$cms = new content();
 	$cms->search($searchItems, 21);
+	$content_id_arr = array();
 
 	if(count($cms->result) > 0)
 	{
@@ -480,18 +483,24 @@ function searchContent($searchItems)
 				$berechtigt = $berechtigt->berechtigt($row->content_id, $uid);
 				if ($berechtigt)
 				{
+					// Jede Content_ID nur einmal ausgeben
+					if (in_array($row->content_id, $content_id_arr))
+						continue;
+					
 					echo '<li><div class="suchergebnis">';
 					echo '<a href="../../../cms/content.php?content_id=',$db->convert_html_chars($row->content_id),'&sprache=',$db->convert_html_chars($row->sprache),'">',$db->convert_html_chars($row->titel),'</a><br>';
 					$preview = findAndMark($row->content, $searchItems);
 
 					echo $preview;
 					echo '<br /><br /></div></li>';
+					$content_id_arr[] .= $row->content_id;
 				}
 			}
 		}
 		echo '</ul>';
 		$anzeigesprache='';
-		foreach($cms->result as $row)
+		$content_id_arr = array();
+		foreach ($cms->result as $row)
 		{
 			if ($sprache != $row->sprache)
 			{
@@ -506,12 +515,17 @@ function searchContent($searchItems)
 				$berechtigt = $berechtigt->berechtigt($row->content_id, $uid);
 				if ($berechtigt)
 				{
+					// Jede Content_ID nur einmal ausgeben
+					if (in_array($row->content_id, $content_id_arr))
+						continue;
+					
 					echo '<li><div class="suchergebnis">';
 					echo '<a href="../../../cms/content.php?content_id=',$db->convert_html_chars($row->content_id),'&sprache=',$db->convert_html_chars($row->sprache),'">',$db->convert_html_chars($row->titel),'</a><br>';
 					$preview = findAndMark($row->content, $searchItems);
 
 					echo $preview;
 					echo '<br /><br /></div></li>';
+					$content_id_arr[] .= $row->content_id;
 				}
 			}
 		}
diff --git a/include/ort.class.php b/include/ort.class.php
index 18dd7d847..648d34a93 100644
--- a/include/ort.class.php
+++ b/include/ort.class.php
@@ -518,7 +518,7 @@ class ort extends basis_db
 			$ort_obj->stockwerk			= $row->stockwerk;
 			$ort_obj->standort_id		= $row->standort_id;
 			$ort_obj->telefonklappe		= $row->telefonklappe;
-			//$ort_obj->content_id		= $row->content_id;
+			$ort_obj->content_id		= $row->content_id;
 			$ort_obj->m2 				= $row->m2;
 			$ort_obj->gebteil 			= $row->gebteil;
 			$ort_obj->oe_kurzbz 		= $row->oe_kurzbz;