további rendrakás

23 files changed, 484 insertions, 0 deletions

diff --git a/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal-pre.php b/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal-pre.php
new file mode 100644
index 00000000..f30cdaab
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal-pre.php
@@ -0,0 +1,16 @@
+<?php
+
+    if ($_SESSION['szuloDiakIdOk'] != true) {
+        header('Location: '.location('index.php?page=naplo&f=diakValaszto'));
+    }
+
+    require_once('include/modules/portal/share/hirek.php');
+    require_once('include/modules/portal/share/nevnap.php');
+    require_once('include/modules/portal/share/kerdoiv.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)));
+
+    require('skin/classic/module-portal/html/share/doboz.phtml');
+    require('skin/classic/module-portal/html/share/hirek.phtml');
+
+?>
diff --git a/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal.php b/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal.php
new file mode 100644
index 00000000..ef2fcd3f
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal.php
@@ -0,0 +1,16 @@
+<?php
+
+    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')) {                                                                                                             
+        require('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'.$skin.'.php');                                                                                                                         
+    } elseif (file_exists('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'._DEFAULT_SKIN.'.php')) {                                                                                                     
+        require('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'._DEFAULT_SKIN.'.php');                                                                                                                 
+    }                                                                                                                                                                                                      
+         
+
+
+?>
diff --git a/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal_demo.classic.php b/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal_demo.classic.php
new file mode 100644
index 00000000..c48052fd
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal_demo.classic.php
@@ -0,0 +1,47 @@
+<?php
+
+    global $ADAT,$vmPost,$AUTH;
+
+	$LINKEK['inside'] = array(
+	    array('href'=>href('index.php?page=naplo&sub=osztalyozo&f=diak'),'szoveg' => 'Osztályozó napló'),
+	    array('href'=>href('index.php?page=naplo&sub=hianyzas&f=diak'),'szoveg' => 'Hiányzások'),
+	    array('href'=>href('index.php?page=naplo&sub=uzeno&f=uzeno'),'szoveg' => 'Üzenő'),
+	    array('href'=>href('index.php?page=naplo&sub=hirnok&f=hirnok'),'szoveg' => 'Hírnök'),
+	);	
+
+    echo '<table class="portalMain">';
+    echo '<tr><td class="bal">';
+
+	putDoboz('Napló',genLinkek($LINKEK['inside']),array('header-color'=>'cornflowerblue'));
+        putDoboz('Bejegyzések',ajaxUpdaterForm('bejegyzesek','index.php?page=naplo&sub=bejegyzesek&f=info',array(),'post',true),
+            array('header-color'=>'rgb(150,100,150)'));
+
+    echo '</td>';
+    echo '<td class="kozep">';
+
+        echo ajaxUpdaterForm('intezmenyNev','index.php?page=naplo&sub=tools&f=intezmenyNev',array(),'post',true);
+        echo '<script type="text/javascript">includeCSS(\'/skin/classic/module-naplo/css/naplo.css\')</script>';
+        echo '<script type="text/javascript">includeCSS(\'/skin/classic/module-naplo/css/hirnok/hirnok.css\')</script>';
+        echo ajaxUpdaterForm('hirnok','index.php?page=naplo&sub=hirnok&f=hirnok',array(),'post',true);
+	putHirek($ADAT);
+
+	echo '<script type="text/javascript">includeCSS(\'/skin/classic/module-naplo/css/uzeno/uzeno.css\')</script>';
+	echo ajaxUpdaterForm('uzenoKozep','index.php?page=naplo&sub=uzeno&f=uzeno',array(),'post',true);
+
+    echo '</td>';
+    echo '<td class="jobb">';
+
+	echo '<script type="text/javascript">includeCSS(\'/skin/ajax/module-naplo/css/tanev/orarend.css\')</script>';
+	$_refStamp = mktime(date('H')+8,0,0,date('m'), date('d'), date('Y'));
+        $dt = date('Y-m-d', $_refStamp);
+	putDoboz('Órarend '.str_replace('-','.',$dt).'.',ajaxUpdaterForm('orarend','index.php?page=naplo&sub=tanev&f=orarend',array('dt' => $dt),'post',true)
+	,array('header-color'=>'#f06'));
+
+//	putDoboz('Hangya',ajaxUpdaterForm('hangya','index.php?page=naplo&sub=hibabejelento&f=admin',array(),'post',true),
+//	    array('header-color'=>'rgb(150,100,150)'));
+
+    echo '</td>';
+    echo '</tr>';
+    echo '</table>';
+
+?>
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
new file mode 100644
index 00000000..f5931b9d
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php
@@ -0,0 +1,42 @@
+<?php
+
+if (_RIGHTS_OK !== true) die();
+
+    require_once('include/modules/portal/share/hirek.php');
+    $hirId = readVariable($_POST['hirId'],'id',null);
+    if ($hirId=='') $hirId = readVariable($_GET['hirId'],'id',null);
+    $action = readVariable($_POST['action'],'strictstring',array(null,'save',''));
+    if ($action=='save' && (__HIREKADMIN || $hirId=='' || isOwner($hirId))) {
+       global $LANGUAGES;
+	if (__HIREKADMIN === true) {
+    	    $DATA['cim'] = readVariable($_POST['cim'],'string');
+    	    $DATA['txt'] = readVariable($_POST['txt'],'string');
+	} else {
+    	    $DATA['cim'] = readVariable($_POST['cim'],'string');
+    	    $DATA['txt'] = readVariable($_POST['txt'],'string');
+	}
+        $DATA['hirId'] = $hirId;
+    	$DATA['pic'] = readVariable($_POST['pic'],'string');
+        $DATA['kdt'] = readVariable($_POST['kdt'],'datetime',date('Y-m-d H:i:s'));
+        $DATA['vdt'] = readVariable($_POST['vdt'],'datetime');
+        $DATA['flag']= readVariable($_POST['flag'],'numeric',null);
+        $DATA['class']= readVariable($_POST['class'],'numeric',null);
+        $DATA['cid']= readVariable($_POST['cid'],'numeric',null);
+        $DATA['lang'] = readVariable($_POST['lang'],'strictstring',$LANGUAGES);
+	$DATA['owner'] = _USERACCOUNT;
+	if (is_array($_POST['csoport'])) {
+	    $DATA['csoport'] = implode(',',readVariable($_POST['csoport'],'sql'));
+	}
+	$r = saveHir($DATA);
+	if ($hirId=='') $hirId=$r;
+    }
+    if ($hirId!='' && is_numeric($hirId) && __HIREKADMIN || isOwner($hirId))
+	$HIREK = getHirek(array('id'=>$hirId));
+    elseif ($hirId!='')
+	$_SESSION['alert'][] = 'page:not_owner';
+
+    $ADAT['kategoriak'] = getKategoriak();
+
+
+
+?>
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir.php
new file mode 100644
index 00000000..3ad1f486
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir.php
@@ -0,0 +1,5 @@
+<?php
+  if (_RIGHTS_OK !== true) die();
+    global $HIREK,$ADAT;
+    putHirForm($HIREK['szovegek'][0], $ADAT);
+?>
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirek-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirek-pre.php
new file mode 100644
index 00000000..db6e321f
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirek-pre.php
@@ -0,0 +1,8 @@
+<?php
+
+    if (_RIGHTS_OK !== true) die();
+    require_once('include/modules/portal/share/hirek.php');
+    $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/mayor-portal/www/policy/private/portal/hirek/hirek.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirek.php
new file mode 100644
index 00000000..8f17a358
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirek.php
@@ -0,0 +1,7 @@
+<?php
+
+    global $ADAT;
+
+    putHirek($ADAT);
+    
+?>
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
new file mode 100644
index 00000000..630c9cbd
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php
@@ -0,0 +1,11 @@
+<?php
+  if (_RIGHTS_OK !== true) die();
+
+    if (!__HIREKADMIN) {
+	$_SESSION['alert'][] = 'page:insufficient_access';
+    }
+
+    require_once('include/modules/portal/share/hirek.php');
+    $HIREK = getHirek(array('all'=>true)); // minden nyelvű hír
+
+?>
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
new file mode 100644
index 00000000..2474b23e
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php
@@ -0,0 +1,5 @@
+<?php
+
+    global $HIREK;
+    putHirek($HIREK['szovegek']);
+?>
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/kerdoiv/kerdoivAdmin-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/kerdoiv/kerdoivAdmin-pre.php
new file mode 100644
index 00000000..8825861c
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/kerdoiv/kerdoivAdmin-pre.php
@@ -0,0 +1,17 @@
+<?php
+
+    if (__HIREKADMIN) {
+
+	require_once('include/modules/portal/share/kerdoiv.php');
+
+	if ($action == 'ujKerdes') {
+	    addKerdoiv($_POST['kerdes'],$_POST['valaszok']);
+	} elseif ($action == 'delKerdes') {
+	    $sorszamok = (readVariable($_POST['sorszam'],'id'));
+	    if (is_array($sorszamok)) delKerdoivKerdes($sorszamok);
+	}
+	$ADAT = getRegiKerdesek();
+
+    }
+
+?>
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/kerdoiv/kerdoivAdmin.php b/mayor-orig/mayor-portal/www/policy/private/portal/kerdoiv/kerdoivAdmin.php
new file mode 100644
index 00000000..2ccaf34e
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/kerdoiv/kerdoivAdmin.php
@@ -0,0 +1,7 @@
+<?php
+
+    global $ADAT;
+    putUjKerdoiv();
+    putRegiKerdesek($ADAT);
+
+?>
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/portal-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/portal-pre.php
new file mode 100644
index 00000000..3d9a95da
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/portal-pre.php
@@ -0,0 +1,5 @@
+<?php
+
+    header('Location: '.location('index.php?page=portal&sub=portal&f=portal'));
+
+?>
\ No newline at end of file
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/portal.php b/mayor-orig/mayor-portal/www/policy/private/portal/portal.php
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/portal.php
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
new file mode 100644
index 00000000..dc4e79d5
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php
@@ -0,0 +1,41 @@
+<?php
+
+    require_once('include/modules/portal/share/hirek.php');
+    require_once('include/modules/portal/share/nevnap.php');
+    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['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));
+	$ADAT['titkarsag'] = getGroupInfo('titkarsag','private',array('withNewAccounts' => false));
+	$ADAT['useradmin'] = getGroupInfo('useradmin','private',array('withNewAccounts' => false));
+	$ADAT['diakadmin'] = getGroupInfo('diakadmin','private',array('withNewAccounts' => false));
+    }
+    $kerdoivId = $ADAT['kerdoiv']['kerdes']['sorszam'];
+    $vId = readVariable($_POST['vId'],'numeric');
+    $szavazotte = szavazotte($kerdoivId);
+    // Kérdőív - <<<<
+    if ($action == 'szavaz' && !$szavazotte) {
+        szavaz($vId,1,$kerdoivId);
+	$szavazotte=true;
+	$_SESSION['kerdoivSzavazott'] = true;
+    }
+    $ADAT['kerdoiv'] = getKerdoiv(_POLICY);
+    $ADAT['kerdoiv']['szavazott'] = $szavazotte;
+    // Kérdőív - >>>>
+
+    require('skin/classic/module-portal/html/share/doboz.phtml');
+    require('skin/classic/module-portal/html/share/hirek.phtml');
+    require('skin/classic/module-portal/html/share/kerdoiv.phtml');
+
+?>
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
new file mode 100644
index 00000000..1640b057
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal.php
@@ -0,0 +1,14 @@
+<?php
+
+    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')) {                                                                                                             
+        require('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'.$skin.'.php');                                                                                                                         
+    } elseif (file_exists('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'._DEFAULT_SKIN.'.php')) {                                                                                                             
+        require('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'._DEFAULT_SKIN.'.php');                                                                                                                         
+    }                                                    
+
+?>
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal_demo.classic.php b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal_demo.classic.php
new file mode 100644
index 00000000..d71d745b
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal_demo.classic.php
@@ -0,0 +1,59 @@
+<?php
+
+    global $ADAT,$vmPost,$AUTH;
+
+	$LINKEK['inside'] = array(
+	    array('href'=>href('index.php?page=naplo'),
+		    'szoveg' => 'Napló'),
+	    array('href'=>href('index.php?page=portal&sub=hirek&f=egyhir'),
+		    'szoveg' => 'Hír beküldés'),
+	);	
+
+    echo '<table class="portalMain">';
+    echo '<tr><td class="bal">';
+
+	// putDoboz('Napló',genLinkek($LINKEK['inside']),array('header-color'=>'#778877'));
+	putDoboz('Születésnaposok :)',ajaxUpdaterForm('szulinap','index.php?page=naplo&sub=&f=szulinap',array(),'post',true),
+	    array('header-color'=>'rgb(100,100,150)'));
+//        putDoboz('Hiányzók',ajaxUpdaterForm('hianyzok','index.php?page=naplo&sub=hianyzas&f=info',array(),'post',true),
+//            array('header-color'=>'rgb(100,150,150)'));
+	if (in_array('diák',$AUTH['my']['categories']))
+    	    putDoboz('Bejegyzések',ajaxUpdaterForm('bejegyzesek','index.php?page=naplo&sub=bejegyzesek&f=info',array(),'post',true),
+        	array('header-color'=>'rgb(150,100,150)'));
+
+    echo '</td>';
+    echo '<td class="kozep">';
+
+	echo ajaxUpdaterForm('intezmenyNev','index.php?page=naplo&sub=tools&f=intezmenyNev',array(),'post',true);
+        echo '<script type="text/javascript">includeCSS(\'/skin/classic/module-naplo/css/naplo.css\')</script>';
+        echo '<script type="text/javascript">includeCSS(\'/skin/classic/module-naplo/css/hirnok/hirnok.css\')</script>';
+        echo ajaxUpdaterForm('hangya2','index.php?page=naplo&sub=hibabejelento&f=admin&view=2',array(),'post',true);
+        echo ajaxUpdaterForm('hirnok','index.php?page=naplo&sub=hirnok&f=hirnok',array(),'post',true);
+	//echo ajaxUpdaterForm('naploHaladasi','index.php?page=naplo',array(),'post',true);
+        //echo ajaxUpdaterForm('hangya2','index.php?page=naplo&sub=hibabejelento&f=admin&view=2',array(),'post',true);
+
+//	echo '<script type="text/javascript">includeCSS(\'/skin/classic/module-naplo/css/uzeno/uzeno.css\')</script>';
+//	echo ajaxUpdaterForm('uzenoKozep','index.php?page=naplo&sub=uzeno&f=uzeno',array(),'post',true);
+
+	putHirek($ADAT);
+
+    echo '</td>';
+    echo '<td class="jobb">';
+
+	if (is_array($ADAT['kerdoiv']['kerdes']) && count($ADAT['kerdoiv']['kerdes']) > 0)
+            putDoboz('Kérdőív', genKerdoiv($ADAT['kerdoiv']), array('header-color'=>'rgb(140,160,120)'));
+
+	echo '<script type="text/javascript">includeCSS(\'/skin/ajax/module-naplo/css/orarend/orarend.css\')</script>';
+	$_refStamp = mktime(date('H')+8,0,0,date('m'), date('d'), date('Y'));
+        $dt = date('Y-m-d', $_refStamp);
+	putDoboz('Órarend '.$dt,ajaxUpdaterForm('orarend','index.php?page=naplo&sub=orarend&f=orarend',array('dt' => $dt),'post',true)
+	,array('header-link'=>href('index.php?page=naplo&sub=orarend&f=orarend'),'header-color'=>'#f06'));
+
+	// putDoboz('Hangya',ajaxUpdaterForm('hangya','index.php?page=naplo&sub=hibabejelento&f=admin',array(),'post',true),
+	//    array('header-color'=>'rgb(150,100,150)'));
+
+    echo '</td>';
+    echo '</tr>';
+    echo '</table>';
+
+?>
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal_demo.pda.php b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal_demo.pda.php
new file mode 100644
index 00000000..62a2de0c
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal_demo.pda.php
@@ -0,0 +1,3 @@
+<?php
+
+?>
diff --git a/mayor-orig/mayor-portal/www/policy/public/portal/portal/hir-pre.php b/mayor-orig/mayor-portal/www/policy/public/portal/portal/hir-pre.php
new file mode 100644
index 00000000..7e88f0f3
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/public/portal/portal/hir-pre.php
@@ -0,0 +1,24 @@
+<?php
+    global $OG;
+
+    require_once('include/modules/portal/share/hirek.php');
+    $hirId = readVariable($_GET['hirId'],id);
+    if ($hirId>=1) {
+	if (_POLICY=='private')
+	    $FILTER=array('id'=>$hirId);
+	else
+	    $FILTER=array('id'=>$hirId,'flag'=>array(1),'class'=>array(1));
+
+	if (defined('__PORTAL_RESTRICT_CID')) 
+	    $FILTER['cid'] = explode(',',__PORTAL_RESTRICT_CID);
+
+	$ADAT['hirek'] = getHirek($FILTER);
+	/* opengraph attributumok */
+	$OG = array('title'=>$ADAT['hirek']['szovegek'][0]['cim'],'getparameter'=>'hirId='.$hirId);
+	if ($ADAT['hirek']['szovegek'][0]['pic']!='') {
+	    $OG['image'] = $ADAT['hirek']['szovegek'][0]['pic'];
+	}
+    }
+
+
+?>
diff --git a/mayor-orig/mayor-portal/www/policy/public/portal/portal/hir.php b/mayor-orig/mayor-portal/www/policy/public/portal/portal/hir.php
new file mode 100644
index 00000000..6a7ee860
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/public/portal/portal/hir.php
@@ -0,0 +1,11 @@
+<?php
+
+    /* including global phtml libs */
+
+    require_once('skin/classic/module-portal/html/share/doboz.phtml');                                                                                                                                         
+    require_once('skin/classic/module-portal/html/share/hirek.phtml');                                                                                                                                         
+        
+    global $skin,$SKINSSHOW,$ADAT;
+                            
+    putHir($ADAT);
+?>
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
new file mode 100644
index 00000000..d02f5484
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php
@@ -0,0 +1,37 @@
+<?php
+
+    require_once('include/modules/portal/share/hirek.php');
+    require_once('include/modules/portal/share/nevnap.php');
+    require_once('include/modules/portal/share/kerdoiv.php');
+
+    $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);
+
+//    $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));
+    if (defined('__PORTAL_RESTRICT_CID')) 
+	$FILTER['cid'] = explode(',',__PORTAL_RESTRICT_CID);
+
+    $ADAT['hirek'] = getHirek($FILTER);
+    $ADAT['kerdoiv'] = getKerdoiv(_POLICY);
+
+    $kerdoivId = readVariable($_POST['kerdoivId'],'numeric',$ADAT['kerdoiv']['kerdes']['sorszam']);
+    $vId = readVariable($_POST['vId'],'numeric');
+    $szavazotte = szavazotte($kerdoivId);
+    // Kérdőív - <<<<
+    if ($action == 'szavaz' && $szavazotte==false) {
+        szavaz($vId,1,$kerdoivId);
+        $szavazotte = true;
+	$_SESSION['kerdoivSzavazott'] = true;
+    }
+    $ADAT['kerdoiv'] = getKerdoiv();
+    $ADAT['kerdoiv']['szavazott'] = $szavazotte;
+    // Kérdőív - >>>>
+
+?>
diff --git a/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal.php b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal.php
new file mode 100644
index 00000000..96275bf4
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal.php
@@ -0,0 +1,37 @@
+<?php
+
+    /* including global phtml libs */
+
+    require_once('skin/classic/module-portal/html/share/doboz.phtml');                                                                                                                                         
+    require_once('skin/classic/module-portal/html/share/hirek.phtml');                                                                                                                                         
+    require_once('skin/classic/module-portal/html/share/kerdoiv.phtml');
+        
+    global $skin,$SKINSSHOW;
+
+/*
+    if (in_array($skin,$SKINSSHOW)) {
+	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');
+	} else {
+	    if (file_exists('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'._DEFAULT_SKIN.'.php')) 
+		require('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'._DEFAULT_SKIN.'.php');
+	}
+    }
+*/
+                                                                                                                                                                                                   
+    /* $skinnek lennie kell */                                                                                                                                                                             
+    if (defined('_POLICY') && defined('__PORTAL_CODE')) {
+	if (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_'.__PORTAL_CODE.'.classic.php') )                                                      
+	    require('policy/'._POLICY.'/portal/portal/portal_'.__PORTAL_CODE.'.'.'classic'.'.php');
+	elseif (file_exists('policy/'._POLICY.'/portal/portal/portal_demo.classic.php') )                                                      
+	    require('policy/'._POLICY.'/portal/portal/portal_demo.classic'.'.php');
+	else
+	    echo 'portal ERROR.:(';
+    } elseif (file_exists('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'.$skin.'.php')) {                                                                                                             
+        require('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'.$skin.'.php');                                                                                                                         
+    } elseif (file_exists('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'._DEFAULT_SKIN.'.php')) {                                                                                                     
+        require('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'._DEFAULT_SKIN.'.php');                                                                                                                 
+    }                                                                                                                                                                                                      
+?>
diff --git a/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal_demo.classic.php b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal_demo.classic.php
new file mode 100644
index 00000000..31aebc95
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal_demo.classic.php
@@ -0,0 +1,43 @@
+<?php
+
+    global $ADAT,$vmPost;
+
+    $TXT['japszotar'] ='
+<!-- MaYoR-じしょ search form -->
+<form name="jisho" style="font-size:10px" method="post" action=" http://szotar.vmg.sulinet.hu/index.php?p=dict" target="_blank">
+<select name="lang" style="font-size:10px; width:110px; background-color: #eeeeee;">
+<option value="hu">magyar</option>
+<option value="jp">japán</option>
+<option value="en">angol</option>
+</select>
+<br/>
+<input name="word" value="" style="width: 90px; font-size:10px;" type="text" />
+<input src="skin/classic/module-portal/img/ok_button.gif" name="sent" value="Mehet" type="image" />
+</form>
+<!-- end of MaYoR-じしょ -->';
+
+
+    echo '<table class="portalMain">';
+    echo '<tr><td class="bal">';
+
+	putDoboz('MaYoR-じしょ',$TXT['japszotar'],array('header-color'=>'#bb0088'));
+
+    echo '</td>';
+    echo '<td class="kozep">';
+
+	putHirek($ADAT);
+
+    echo '</td>';
+    echo '<td class="jobb">';
+
+	putDoboz('Névnapok','Ma: '.$ADAT['nevnap']['ma'].'<br/>Holnap: '.$ADAT['nevnap']['holnap'],array('header-color'=>'rgb(138,128,238)'));
+
+
+	if (is_array($ADAT['kerdoiv']['kerdes']) && count($ADAT['kerdoiv']['kerdes']) > 0)
+	    putDoboz('Kérdőív', genKerdoiv($ADAT['kerdoiv']), array('header-color'=>'rgb(238,82,38)'));
+
+    echo '</td>';
+    echo '</tr>';
+    echo '</table>';
+
+?>
diff --git a/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal_demo.pda.php b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal_demo.pda.php
new file mode 100644
index 00000000..3123adcd
--- /dev/null
+++ b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal_demo.pda.php
@@ -0,0 +1,29 @@
+<?php
+
+    global $ADAT,$vmPost;
+
+    if ($_GET['show'] == 'hirek') {
+
+	putHirek($ADAT);
+
+    } else {
+	echo '
+	<h1>Belépés</h1>
+	<div class="set">
+	<a class="diak" href="'.href('index.php?page=auth&f=login&toPolicy=private&skin=pda&policy=public&toPolicy=private&toSkin=pda&toPSF=naplo:osztalyozo:diak').'">diák</a>
+	<a class="szulo" href="'.href('index.php?page=auth&f=login&toPolicy=private&skin=pda&policy=public&toPolicy=parent&toSkin=pda&toPSF=naplo:osztalyozo:diak').'">szülő</a>
+	<a class="tanar" href="'.href('index.php?page=auth&f=login&toPolicy=private&skin=pda&policy=public&toPolicy=private&toSkin=pda&toPSF=naplo::naplo').'">tanár</a>';
+
+	if (defined('__FORUM_INSTALLED') && __FORUM_INSTALLED===true)
+	    echo '<a class="forum" href="'.href('index.php?page=auth&f=login&toPolicy=private&skin=pda&policy=public&toPolicy=public&toSkin=pda&toPSF=forum::').'">fórum</a>';
+	echo '</div>';
+
+	echo '<h1>Szolgáltatások</h1>
+	<div class="set">
+	<a class="orarend" href="'.href('index.php?page=naplo&sub=orarend&f=orarend').'">órarend</a>
+	<a class="helyettesites" href="'.href('index.php?page=naplo&sub=orarend&f=helyettesites').'">helyettesítés</a>
+	<a class="hirek" href="'.href('index.php?page=portal&f=portal&show=hirek').'">hírek</a>';
+	echo '</div>';
+    }
+
+?>