Rev: 4695rev4695

2 files changed, 9 insertions, 2 deletions

diff --git a/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php b/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php
index c93a81bd..1c5c8bc9 100644
--- a/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php
+++ b/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php
@@ -13,7 +13,7 @@
 	$flag = intval($DATA['flag']);
 	$class = intval($DATA['class']);
 	$lang = (in_array($DATA['lang'],$LANGUAGES)) ? $DATA['lang'] : _DEFAULT_LANG;
-	if ($DATA['cid']>0) $cid = $DATA['cid'];
+	if ($DATA['cid']>0) $cid = $DATA['cid']; // -- TODO!!!!
 	$csoport = $DATA['csoport'];
 	if ($hirId!='' && __HIREKADMIN == false ) {
 	    $q = "SELECT owner FROM hirek WHERE owner='%s'";
@@ -41,6 +41,13 @@
 	    }
 	} else $q = '';
 	if ($q!='') $r = db_query($q,array('modul'=>'portal','result'=>'insert','values'=>$v));
+	if (is_array($DATA['kategoriaId'])) {
+	    for ($i=0; $i<count($DATA['kategoriaId']); $i++) {
+		$q = "INSERT IGNORE INTO `hirKategoria` (hirId,kategoriaId) VALUES (%u,%u)";
+		$v = array($hirId,$DATA['kategoriaId'][$i]);
+		db_query($q,array('modul'=>'portal','result'=>'insert','values'=>$v));
+	    }
+	}
 	return $r;
     }
 
diff --git a/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php b/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php
index d7db431e..0de316b6 100644
--- a/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php
+++ b/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php
@@ -42,7 +42,7 @@
 	} else $WHERE = '';
 
 	if ($SET['all']===true) $WHERE = ''; 
-	$q = "SELECT * FROM hirek $WHERE ORDER BY kdt DESC,vdt DESC".$L;
+	$q = "SELECT hirek.*, hirek.id AS hirId, GROUP_CONCAT(kategoriaId) AS hirkategoriak FROM hirek LEFT JOIN hirKategoria ON (hirek.id=hirId) $WHERE GROUP BY hirek.id ORDER BY kdt DESC,vdt DESC".$L;
 	$HIREK['szovegek'] = db_query($q, array('modul'=>'portal','result'=>'indexed'));
 	return $HIREK;
     }