Az eredeti forráskódok frissítve a http://mayor.hu -ról

6 files changed, 55 insertions, 5 deletions

diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php
index 0d5cbf71..ef18e58c 100644
--- a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php
@@ -26,6 +26,7 @@ if (_RIGHTS_OK !== true) die();
         $DATA['flag']= readVariable($_POST['flag'],'numeric',null);
         $DATA['class']= readVariable($_POST['class'],'numeric',null);
         $DATA['cid']= readVariable($_POST['cid'],'numeric',null);
+        $DATA['kategoriaId']= readVariable($_POST['kategoriaId'],'id',null);
         $DATA['lang'] = readVariable($_POST['lang'],'strictstring',$LANGUAGES);
 	$DATA['owner'] = _USERACCOUNT;
 	if (is_array($_POST['csoport'])) {
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php
index 630c9cbd..1e51b811 100644
--- a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php
@@ -6,6 +6,39 @@
     }
 
     require_once('include/modules/portal/share/hirek.php');
-    $HIREK = getHirek(array('all'=>true)); // minden nyelvű hír
 
+    if ($action=='kategoriaSzerkeszt') {
+	$_id = readVariable($_POST['id'],'id');
+	if (is_numeric($_id)) {
+	    $_leiras = readVariable($_POST['leiras'],'string');
+	    $_precode = readVariable($_POST['precode'],'html');
+	    $_postcode = readVariable($_POST['postcode'],'html');
+	    $q = "INSERT INTO kategoriak (id,leiras,precode,postcode) VALUES (%u,'%s','%s','%s')";
+	    $v = array($_id,$_leiras,$_precode,$_postcode);
+	    db_query($q,array('modul'=>'portal','values'=>$v));
+	}
+	$KATEGORIAIDK = readVariable($_POST['kategoriaId'],'id');
+	for ($i=0; $i<count($KATEGORIAIDK); $i++) {
+	    $_id = $KATEGORIAIDK[$i];
+	    $_leiras = readVariable($_POST['leiras_'.$_id],'string');
+	    $_precode = readVariable($_POST['precode_'.$_id],'string');
+	    $_postcode = readVariable($_POST['postcode_'.$_id],'string');
+	    $q = "UPDATE kategoriak SET leiras='%s',precode='%s',postcode='%s' WHERE id=%u";
+	    $v = array($_leiras,$_precode,$_postcode,$_id);
+	    db_query($q,array('modul'=>'portal','values'=>$v));
+	}
+	$KATEGORIAIDK = readVariable($_POST['kategoriaTorlendo'],'id');
+	for ($i=0; $i<count($KATEGORIAIDK); $i++) {
+	    $_id = $KATEGORIAIDK[$i];
+	    $q = "DELETE FROM kategoriak WHERE id=%u";
+	    $v = array($_id);
+	    db_query($q,array('modul'=>'portal','values'=>$v));
+	}
+    } 
+
+
+    $ADAT = getHirek(array('all'=>true)); // minden nyelvű hír
+    $ADAT['kategoriak'] = getKategoriak();
+    $ADAT['kategoriaId2txt'] = reindex($ADAT['kategoriak'],array('id'));
+dump($ADAT['kategoriaId2txt']);
 ?>
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php
index 2474b23e..909018dc 100644
--- a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php
@@ -1,5 +1,7 @@
 <?php
 
-    global $HIREK;
-    putHirek($HIREK['szovegek']);
+    global $ADAT;
+
+    putKategoriaSzerkeszto($ADAT['kategoriak']);
+    putHirek($ADAT);
 ?>
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php
index dc4e79d5..d8026e35 100644
--- a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php
@@ -5,7 +5,13 @@
     require_once('include/modules/portal/share/kerdoiv.php');
     require_once('include/modules/session/groupInfo.php');
 
-    $ADAT['hirek'] = getHirek(array('cid'=>array(0),'tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1,6),'csoport'=>$AUTH['my']['categories']));
+    $ADAT['kategoriak'] = getKategoriak();
+    for ($i=0; $i<count($ADAT['kategoriak']); $i++) {
+        $RESTRICTKATEGORIA[] = intval($ADAT['kategoriak'][$i]['id']);
+    }
+    $kategoriaId = readVariable($_GET['kategoriaId'],'id',null,$RESTRICTKATEGORIA);
+    $ADAT['kategoriaId'] = $kategoriaId;
+    $ADAT['hirek'] = getHirek(array('kategoria'=>array($kategoriaId),'cid'=>array(0),'tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1,6),'csoport'=>$AUTH['my']['categories']));
     $ADAT['kerdoiv'] = getKerdoiv(_POLICY);
 
     $ev=date('Y');$honap=date('m');$nap=date('d');
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal.php b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal.php
index 1640b057..6e9d1cc3 100644
--- a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal.php
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal.php
@@ -3,6 +3,7 @@
     global $skin;
 
     /* $skinnek lennie kell */                                                                                                                                                                             
+
     if (defined('_POLICY') && defined('__PORTAL_CODE') && file_exists('policy/'._POLICY.'/portal/portal/portal_'.__PORTAL_CODE.'.'.$skin.'.php') ) {                                                       
         require('policy/'._POLICY.'/portal/portal/portal_'.__PORTAL_CODE.'.'.$skin.'.php');                                                                                                                
     } elseif (file_exists('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'.$skin.'.php')) {                                                                                                             
diff --git a/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php
index d02f5484..44906949 100644
--- a/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php
+++ b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php
@@ -14,7 +14,14 @@
 //    $ADAT['nevnap']['ma'] = getNevnap(date('m'),date('d'));
 //    $ADAT['nevnap']['holnap'] = getNevnap(date('m'),date('d')+1);
 
-    $FILTER=array('tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1));
+    $ADAT['kategoriak'] = getKategoriak();
+    for ($i=0; $i<count($ADAT['kategoriak']); $i++) {
+        $RESTRICTKATEGORIA[] = intval($ADAT['kategoriak'][$i]['id']);
+    }
+    $kategoriaId = readVariable($_GET['kategoriaId'],'id',null,$RESTRICTKATEGORIA);
+    $ADAT['kategoriaId'] = $kategoriaId;
+
+    $FILTER=array('tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1),'kategoria'=>array($kategoriaId));
     if (defined('__PORTAL_RESTRICT_CID')) 
 	$FILTER['cid'] = explode(',',__PORTAL_RESTRICT_CID);