Rev: 4423

2 files changed, 10 insertions, 3 deletions

diff --git a/mayor-orig/www/policy/private/portal/hirek/hirek-pre.php b/mayor-orig/www/policy/private/portal/hirek/hirek-pre.php
index 247d10d9..db6e321f 100644
--- a/mayor-orig/www/policy/private/portal/hirek/hirek-pre.php
+++ b/mayor-orig/www/policy/private/portal/hirek/hirek-pre.php
@@ -1,7 +1,8 @@
 <?php
 
-  if (_RIGHTS_OK !== true) die();
+    if (_RIGHTS_OK !== true) die();
     require_once('include/modules/portal/share/hirek.php');
-    $ADAT['hirek'] = getHirek(array('tolDt'=>date('Y-m-d'), 'igDt'=>date('Y-m-d'),'flag'=>array(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,6));
+    $ADAT['hirek'] = getHirek($FILTER);
 
 ?>
diff --git a/mayor-orig/www/policy/private/portal/portal/portal-pre.php b/mayor-orig/www/policy/private/portal/portal/portal-pre.php
index 2f8d7772..dc4e79d5 100644
--- a/mayor-orig/www/policy/private/portal/portal/portal-pre.php
+++ b/mayor-orig/www/policy/private/portal/portal/portal-pre.php
@@ -5,9 +5,15 @@
     require_once('include/modules/portal/share/kerdoiv.php');
     require_once('include/modules/session/groupInfo.php');
 
-    $ADAT['hirek'] = getHirek(array('tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(6),'csoport'=>$AUTH['my']['categories']));
+    $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['kerdoiv'] = getKerdoiv(_POLICY);
 
+    $ev=date('Y');$honap=date('m');$nap=date('d');
+    if ($ev % 4 ==0) {if ($ev % 100 !==0) {$szokoev=true;} else {if ($ev % 400==0) {$szokoev=true;}}} else {$szokoev=false;}
+    if (!$szokoev && $honap==2 && $nap>=24) {$nap=$nap+1;}
+    $ADAT['nevnap']['ma'] = getNevnap($honap,$nap);
+    $ADAT['nevnap']['holnap'] = getNevnap($honap,$nap+1);
+
     if (in_array($AUTH[_POLICY]['backend'],array('mysql','ads')) && _POLICY=='private') {
 	$ADAT['hirekAdmin'] = getGroupInfo('hirekadmin','private',array('withNewAccounts' => false));
 	$ADAT['vezetoseg'] = getGroupInfo('vezetoseg','private',array('withNewAccounts' => false));