From 095e5987eadbe3786be5e12ef385bda9640155b0 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Fri, 6 Jul 2018 11:34:04 +0200
Subject: checkupdate.sh + portal 2018/Feb kiinduló

---
 mayor-orig/config/module-portal/config.php.example |  14 ++
 .../install/mayor-portal/mysql/mayor-portal.sql    | 150 ++++++++++++++++++++
 .../install/mayor-portal/mysql/portal-init.sql     |  17 +++
 mayor-orig/log/mayor-portal.rev                    |   1 +
 mayor-orig/update/pre002213-1.sh                   |  15 ++
 mayor-orig/update/pre004232-1-mayor_portal.sql     |  16 +++
 mayor-orig/update/rev001935-1.sh                   |  15 ++
 mayor-orig/update/rev002019-1-mayor_portal.sql     |   3 +
 mayor-orig/update/rev003307-1-mayor_portal.sql     |   1 +
 .../include/menu/parent/hu_HU/module-portal.php    |  11 ++
 .../include/menu/private/hu_HU/module-portal.php   |  43 ++++++
 .../include/menu/public/hu_HU/module-portal.php    |   8 ++
 .../www/include/modules/portal/base/rights.php     |  10 ++
 .../www/include/modules/portal/hirek/egyhir.php    |  47 +++++++
 .../modules/portal/kerdoiv/kerdoivAdmin.php        |  32 +++++
 .../www/include/modules/portal/share/hirek.php     |  50 +++++++
 .../www/include/modules/portal/share/kerdoiv.php   |  45 ++++++
 .../www/include/modules/portal/share/nevnap.php    |   8 ++
 .../www/lang/hu_HU/module-portal/hirek/egyhir.php  |  18 +++
 .../hu_HU/module-portal/kerdoiv/kerdoivAdmin.php   |   5 +
 .../www/policy/parent/portal/portal/portal-pre.php |  16 +++
 .../www/policy/parent/portal/portal/portal.php     |  16 +++
 .../parent/portal/portal/portal_demo.classic.php   |  47 +++++++
 .../www/policy/private/portal/hirek/egyhir-pre.php |  42 ++++++
 .../www/policy/private/portal/hirek/egyhir.php     |   5 +
 .../www/policy/private/portal/hirek/hirek-pre.php  |   7 +
 .../www/policy/private/portal/hirek/hirek.php      |   7 +
 .../policy/private/portal/hirek/hirekAdmin-pre.php |  11 ++
 .../www/policy/private/portal/hirek/hirekAdmin.php |   5 +
 .../private/portal/kerdoiv/kerdoivAdmin-pre.php    |  17 +++
 .../policy/private/portal/kerdoiv/kerdoivAdmin.php |   7 +
 .../www/policy/private/portal/portal-pre.php       |   5 +
 mayor-orig/www/policy/private/portal/portal.php    |   0
 .../policy/private/portal/portal/portal-pre.php    |  35 +++++
 .../www/policy/private/portal/portal/portal.php    |  14 ++
 .../private/portal/portal/portal_demo.classic.php  |  59 ++++++++
 .../private/portal/portal/portal_demo.pda.php      |   3 +
 .../www/policy/public/portal/portal/hir-pre.php    |  24 ++++
 mayor-orig/www/policy/public/portal/portal/hir.php |  11 ++
 .../www/policy/public/portal/portal/portal-pre.php |  53 +++++++
 .../www/policy/public/portal/portal/portal.php     |  37 +++++
 .../public/portal/portal/portal_demo.classic.php   |  43 ++++++
 .../public/portal/portal/portal_demo.pda.php       |  29 ++++
 .../skin/classic/module-portal/config.php.example  |  10 ++
 .../classic/module-portal/css/hirek/egyhir.css     |  42 ++++++
 .../skin/classic/module-portal/css/hirek/hirek.css |   9 ++
 .../classic/module-portal/css/hirek/hirekAdmin.css |  29 ++++
 .../module-portal/css/kerdoiv/kerdoivAdmin.css     |   8 ++
 .../www/skin/classic/module-portal/css/portal.css  |  99 +++++++++++++
 .../skin/classic/module-portal/css/portal/hir.css  |   5 +
 .../classic/module-portal/html/hirek/egyhir.phtml  | 153 +++++++++++++++++++++
 .../module-portal/html/hirek/hirekAdmin.phtml      |  51 +++++++
 .../module-portal/html/kerdoiv/kerdoivAdmin.phtml  |  38 +++++
 .../classic/module-portal/html/portal/hir.phtml    |  16 +++
 .../classic/module-portal/html/share/doboz.phtml   |  32 +++++
 .../classic/module-portal/html/share/hirek.phtml   |  34 +++++
 .../classic/module-portal/html/share/kerdoiv.phtml |  41 ++++++
 .../www/skin/classic/module-portal/img/cl.gif      | Bin 0 -> 99 bytes
 .../www/skin/classic/module-portal/img/cr.gif      | Bin 0 -> 100 bytes
 .../skin/classic/module-portal/img/ok_button.gif   | Bin 0 -> 103 bytes
 .../module-portal/javascript/hirek/egyhir.php      |  23 ++++
 .../www/skin/pda/module-portal/css/portal.css      |  25 ++++
 62 files changed, 1617 insertions(+)
 create mode 100644 mayor-orig/config/module-portal/config.php.example
 create mode 100644 mayor-orig/install/mayor-portal/mysql/mayor-portal.sql
 create mode 100644 mayor-orig/install/mayor-portal/mysql/portal-init.sql
 create mode 100644 mayor-orig/log/mayor-portal.rev
 create mode 100644 mayor-orig/update/pre002213-1.sh
 create mode 100644 mayor-orig/update/pre004232-1-mayor_portal.sql
 create mode 100644 mayor-orig/update/rev001935-1.sh
 create mode 100644 mayor-orig/update/rev002019-1-mayor_portal.sql
 create mode 100644 mayor-orig/update/rev003307-1-mayor_portal.sql
 create mode 100644 mayor-orig/www/include/menu/parent/hu_HU/module-portal.php
 create mode 100644 mayor-orig/www/include/menu/private/hu_HU/module-portal.php
 create mode 100644 mayor-orig/www/include/menu/public/hu_HU/module-portal.php
 create mode 100644 mayor-orig/www/include/modules/portal/base/rights.php
 create mode 100644 mayor-orig/www/include/modules/portal/hirek/egyhir.php
 create mode 100644 mayor-orig/www/include/modules/portal/kerdoiv/kerdoivAdmin.php
 create mode 100644 mayor-orig/www/include/modules/portal/share/hirek.php
 create mode 100644 mayor-orig/www/include/modules/portal/share/kerdoiv.php
 create mode 100644 mayor-orig/www/include/modules/portal/share/nevnap.php
 create mode 100644 mayor-orig/www/lang/hu_HU/module-portal/hirek/egyhir.php
 create mode 100644 mayor-orig/www/lang/hu_HU/module-portal/kerdoiv/kerdoivAdmin.php
 create mode 100644 mayor-orig/www/policy/parent/portal/portal/portal-pre.php
 create mode 100644 mayor-orig/www/policy/parent/portal/portal/portal.php
 create mode 100644 mayor-orig/www/policy/parent/portal/portal/portal_demo.classic.php
 create mode 100644 mayor-orig/www/policy/private/portal/hirek/egyhir-pre.php
 create mode 100644 mayor-orig/www/policy/private/portal/hirek/egyhir.php
 create mode 100644 mayor-orig/www/policy/private/portal/hirek/hirek-pre.php
 create mode 100644 mayor-orig/www/policy/private/portal/hirek/hirek.php
 create mode 100644 mayor-orig/www/policy/private/portal/hirek/hirekAdmin-pre.php
 create mode 100644 mayor-orig/www/policy/private/portal/hirek/hirekAdmin.php
 create mode 100644 mayor-orig/www/policy/private/portal/kerdoiv/kerdoivAdmin-pre.php
 create mode 100644 mayor-orig/www/policy/private/portal/kerdoiv/kerdoivAdmin.php
 create mode 100644 mayor-orig/www/policy/private/portal/portal-pre.php
 create mode 100644 mayor-orig/www/policy/private/portal/portal.php
 create mode 100644 mayor-orig/www/policy/private/portal/portal/portal-pre.php
 create mode 100644 mayor-orig/www/policy/private/portal/portal/portal.php
 create mode 100644 mayor-orig/www/policy/private/portal/portal/portal_demo.classic.php
 create mode 100644 mayor-orig/www/policy/private/portal/portal/portal_demo.pda.php
 create mode 100644 mayor-orig/www/policy/public/portal/portal/hir-pre.php
 create mode 100644 mayor-orig/www/policy/public/portal/portal/hir.php
 create mode 100644 mayor-orig/www/policy/public/portal/portal/portal-pre.php
 create mode 100644 mayor-orig/www/policy/public/portal/portal/portal.php
 create mode 100644 mayor-orig/www/policy/public/portal/portal/portal_demo.classic.php
 create mode 100644 mayor-orig/www/policy/public/portal/portal/portal_demo.pda.php
 create mode 100644 mayor-orig/www/skin/classic/module-portal/config.php.example
 create mode 100644 mayor-orig/www/skin/classic/module-portal/css/hirek/egyhir.css
 create mode 100644 mayor-orig/www/skin/classic/module-portal/css/hirek/hirek.css
 create mode 100644 mayor-orig/www/skin/classic/module-portal/css/hirek/hirekAdmin.css
 create mode 100644 mayor-orig/www/skin/classic/module-portal/css/kerdoiv/kerdoivAdmin.css
 create mode 100644 mayor-orig/www/skin/classic/module-portal/css/portal.css
 create mode 100644 mayor-orig/www/skin/classic/module-portal/css/portal/hir.css
 create mode 100644 mayor-orig/www/skin/classic/module-portal/html/hirek/egyhir.phtml
 create mode 100644 mayor-orig/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml
 create mode 100644 mayor-orig/www/skin/classic/module-portal/html/kerdoiv/kerdoivAdmin.phtml
 create mode 100644 mayor-orig/www/skin/classic/module-portal/html/portal/hir.phtml
 create mode 100644 mayor-orig/www/skin/classic/module-portal/html/share/doboz.phtml
 create mode 100644 mayor-orig/www/skin/classic/module-portal/html/share/hirek.phtml
 create mode 100644 mayor-orig/www/skin/classic/module-portal/html/share/kerdoiv.phtml
 create mode 100644 mayor-orig/www/skin/classic/module-portal/img/cl.gif
 create mode 100644 mayor-orig/www/skin/classic/module-portal/img/cr.gif
 create mode 100644 mayor-orig/www/skin/classic/module-portal/img/ok_button.gif
 create mode 100644 mayor-orig/www/skin/classic/module-portal/javascript/hirek/egyhir.php
 create mode 100644 mayor-orig/www/skin/pda/module-portal/css/portal.css

(limited to 'mayor-orig')

diff --git a/mayor-orig/config/module-portal/config.php.example b/mayor-orig/config/module-portal/config.php.example
new file mode 100644
index 00000000..0be5dcca
--- /dev/null
+++ b/mayor-orig/config/module-portal/config.php.example
@@ -0,0 +1,14 @@
+<?php
+
+    //define('__PORTAL_INSTALLED',true);
+
+    $MYSQL_DATA['portal']['user']= 'mayor_portal';
+    $MYSQL_DATA['portal']['pw']= '%SQLPW%';
+    $MYSQL_DATA['portal']['db']= 'mayor_portal';
+
+    define('__PORTAL_CODE','demo');
+
+    // A hír kiíráskor legyen-e RTE
+    define('__RICH_TEXT_EDITOR',true);
+
+?>
\ No newline at end of file
diff --git a/mayor-orig/install/mayor-portal/mysql/mayor-portal.sql b/mayor-orig/install/mayor-portal/mysql/mayor-portal.sql
new file mode 100644
index 00000000..842760b7
--- /dev/null
+++ b/mayor-orig/install/mayor-portal/mysql/mayor-portal.sql
@@ -0,0 +1,150 @@
+-- MySQL dump 10.11
+--
+-- Host: localhost    Database: hirek
+-- ------------------------------------------------------
+-- Server version	5.0.32-Debian_7etch1-log
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+CREATE DATABASE IF NOT EXISTS %MYSQL_PORTAL_DB% CHARACTER SET utf8 COLLATE utf8_hungarian_ci;
+GRANT ALL ON `%MYSQL_PORTAL_DB%`.* TO '%MYSQL_PORTAL_USER%'@'localhost' IDENTIFIED BY '%MYSQL_PORTAL_PW%';
+
+USE %MYSQL_PORTAL_DB%;
+
+CREATE TABLE `mayorUpdateLog` (
+  `scriptFile` varchar(255) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
+  `dt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`scriptFile`,`dt`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
+--
+-- Table structure for table `hirek`
+--
+
+DROP TABLE IF EXISTS `hirek`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `hirek` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `kdt` datetime default NULL,
+  `vdt` datetime default NULL,
+  `class` tinyint(3) unsigned NOT NULL default '0',
+  `lang` varchar(5) default 'hu_HU',
+  `cim` text,
+  `txt` text,
+  `owner` varchar(10) default NULL,
+  `flag` tinyint(3) unsigned NOT NULL default '0',
+  `cid` tinyint(3) unsigned NOT NULL default '0',
+  `pic` varchar(20) default NULL,
+  `friss` enum('','on') default '',
+  `fontos` enum('','on') default '',
+  `split` tinyint(3) unsigned NOT NULL default '0',
+  `csoport` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`id`),
+  KEY `dtindex` (`kdt`,`vdt`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 PACK_KEYS=1;
+SET character_set_client = @saved_cs_client;
+
+--
+--
+-- Table structure for table `kategoriak`
+--
+
+DROP TABLE IF EXISTS `kategoriak`;
+CREATE TABLE `kategoriak` (
+  `id` mediumint(8) unsigned NOT NULL default '0',
+  `leiras` varchar(70) NOT NULL default '',
+  `precode` text,
+  `postcode` text
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 PACK_KEYS=1;
+
+
+--
+-- Table structure for table `linkek`
+--
+
+DROP TABLE IF EXISTS `linkek`;
+CREATE TABLE `linkek` (
+  `kulcs` int(10) unsigned NOT NULL auto_increment,
+  `hid` int(10) unsigned NOT NULL default '0',
+  `uri` varchar(255) default NULL,
+  `linktipus` enum('belso','kulso') default NULL,
+  `szoveg` text,
+  PRIMARY KEY  (`kulcs`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 PACK_KEYS=1;
+
+
+--
+-- Table structure for table `kerdesek`
+--
+
+DROP TABLE IF EXISTS `kerdesek`;
+CREATE TABLE `kerdesek` (
+  `sorszam` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `vszam` tinyint(3) unsigned DEFAULT NULL,
+  `kerdes` varchar(255) DEFAULT NULL,
+  `policy` set('private','parent','public') DEFAULT 'public',
+  PRIMARY KEY (`sorszam`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 PACK_KEYS=1;
+
+
+--
+-- Table structure for table `nevnap`
+--
+
+DROP TABLE IF EXISTS `nevnap`;
+CREATE TABLE `nevnap` (
+  `honap` tinyint(4) default NULL,
+  `nap` tinyint(4) default NULL,
+  `nevnap` tinytext
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 PACK_KEYS=1;
+
+--
+-- Dumping data for table `nevnap`
+--
+
+/*!40000 ALTER TABLE `nevnap` DISABLE KEYS */;
+INSERT INTO `nevnap` VALUES (1,1,'Fruzsina'),(1,2,'Ábel'),(1,3,'Genovéva, Benjámin'),(1,4,'Titusz, Leona'),(1,5,'Simon'),(1,6,'Boldizsár'),(1,7,'Attila, Ramóna'),(1,8,'Gyöngyvér'),(1,9,'Marcell'),(1,10,'Melánia'),(1,11,'Ágota'),(1,12,'Ernő'),(1,13,'Veronika'),(1,14,'Bódog'),(1,15,'Lóránt, Loránd'),(1,16,'Gusztáv'),(1,17,'Antal, Antónia'),(1,18,'Piroska'),(1,19,'Sára, Márió'),(1,20,'Fábián, Sebestyén'),(1,21,'Ágnes'),(1,22,'Vince, Artúr'),(1,23,'Zelma, Rajmund'),(1,24,'Timót'),(1,25,'Pál'),(1,26,'Vanda, Paula'),(1,27,'Angelika'),(1,28,'Károly, Karola'),(1,29,'Adél'),(1,30,'Martina, Gerda'),(1,31,'Marcella'),(2,1,'Ignác'),(2,2,'Karolina, Aida'),(2,3,'Balázs'),(2,4,'Ráhel, Csenge'),(2,5,'Ágota, Ingrid'),(2,6,'Dorottya, Dóra'),(2,7,'Tódor, Rómeó'),(2,8,'Aranka'),(2,9,'Abigél, Alex'),(2,10,'Elvira'),(2,11,'Bertold, Marietta'),(2,12,'Lívia, Lídia'),(2,13,'Ella, Linda'),(2,14,'Bálint, Valentin'),(2,15,'Kolos, Georgina'),(2,16,'Julianna, Lilla'),(2,17,'Donát'),(2,18,'Bernadett'),(2,19,'Zsuzsanna'),(2,20,'Aladár, Álmos'),(2,21,'Eleonóra'),(2,22,'Gerzson'),(2,23,'Alfréd'),(2,24,'Szőkőnap'),(2,25,'Mátyás'),(2,26,'Géza'),(2,27,'Edina'),(2,28,'Ákos, Bátor'),(2,29,'Elemér'),(3,1,'Albin'),(3,2,'Lujza'),(3,3,'Kornélia'),(3,4,'Kázmér'),(3,5,'Adorján, Adrián'),(3,6,'Leonóra, Inez'),(3,7,'Tamás'),(3,8,'Zoltán'),(3,9,'Franciska, Fanni'),(3,10,'Ildikó'),(3,11,'Szilárd'),(3,12,'Gergely'),(3,13,'Krisztián, Ajtony'),(3,14,'Matild'),(3,15,'Kristóf'),(3,16,'Henrietta'),(3,17,'Gertrúd, Patrik'),(3,18,'Sándor, Ede'),(3,19,'József, Bánk'),(3,20,'Klaudia'),(3,21,'Benedek'),(3,22,'Beáta, Izolda'),(3,23,'Emőke'),(3,24,'Gábor, Karina'),(3,25,'Irén, Irisz'),(3,26,'Emánuel'),(3,27,'Hajnalka'),(3,28,'Gedeon, Johanna'),(3,29,'Auguszta'),(3,30,'Zalán'),(3,31,'Árpád'),(4,1,'Hugó'),(4,2,'Áron'),(4,3,'Buda, Richárd'),(4,4,'Izidor'),(4,5,'Vince'),(4,6,'Vilmos, Bíborka'),(4,7,'Herman'),(4,8,'Dénes'),(4,9,'Erhard'),(4,10,'Zsolt'),(4,11,'Leó, Szaniszló'),(4,12,'Gyula'),(4,13,'Ida'),(4,14,'Tibor, Nyúl:)'),(4,15,'Anasztázia, Tas'),(4,16,'Csongor'),(4,17,'Rudolf'),(4,18,'Andrea, Ilma'),(4,19,'Emma, :)'),(4,20,'Tivadar'),(4,21,'Konrád'),(4,22,'Csilla, Noémi'),(4,23,'Béla'),(4,24,'György'),(4,25,'Márk'),(4,26,'Ervin'),(4,27,'Zita'),(4,28,'Valéria'),(4,29,'Péter'),(4,30,'Katalin, Kitti'),(5,1,'Fülöp, Jakab'),(5,2,'Zsigmond'),(5,3,'Tímea, Irma'),(5,4,'Mónika, Flórián'),(5,5,'Györgyi'),(5,6,'Ivett, Frida'),(5,7,'Gizella'),(5,8,'Mihály'),(5,9,'Gergely'),(5,10,'Ármin, Pálma'),(5,11,'Ferenc'),(5,12,'Pongrác'),(5,13,'Szervác, Imola'),(5,14,'Bonifác'),(5,15,'Zsófia, Szonja'),(5,16,'Mózes, Botond'),(5,17,'Paszkál'),(5,18,'Erik, Alexandra'),(5,19,'Ivó, Milán'),(5,20,'Bernát, Felícia'),(5,21,'Konstantin'),(5,22,'Júlia, Rita'),(5,23,'Dezső'),(5,24,'Eszter, Eliza'),(5,25,'Orbán'),(5,26,'Fülöp, Evelin'),(5,27,'Hella'),(5,28,'Emil, Csanád'),(5,29,'Magdolna'),(5,30,'Janka, Zsanett'),(5,31,'Angéla, Petronella'),(6,1,'Tünde'),(6,2,'Kármen, Anita'),(6,3,'Klotild'),(6,4,'Bulcsú'),(6,5,'Fatime'),(6,6,'Norbert, Cintia'),(6,7,'Róbert'),(6,8,'Medárd'),(6,9,'Félix'),(6,10,'Margit, Gréta'),(6,11,'Barnabás'),(6,12,'Villő'),(6,13,'Antal, Anett'),(6,14,'Vazul'),(6,15,'Jolán, Vid'),(6,16,'Jusztin'),(6,17,'Laura, Alida'),(6,18,'Arnold, Levente'),(6,19,'Gyárfás'),(6,20,'Rafael'),(6,21,'Alajos, Leila'),(6,22,'Paulina'),(6,23,'Zoltán'),(6,24,'Iván'),(6,25,'Vilmos'),(6,26,'János, Pál'),(6,27,'László'),(6,28,'Levente, Irén'),(6,29,'Péter, Pál'),(6,30,'Pál'),(7,1,'Tihamér, Annamária'),(7,2,'Ottó'),(7,3,'Kornél, Soma'),(7,4,'Ulrik'),(7,5,'Emese, Sarolta'),(7,6,'Csaba'),(7,7,'Appolónia'),(7,8,'Ellák'),(7,9,'Lukrécia'),(7,10,'Amália'),(7,11,'Nóra, Lili'),(7,12,'Izabella, Dalma'),(7,13,'Jenő'),(7,14,'őrs, Stella'),(7,15,'Henrik, Roland'),(7,16,'Valter'),(7,17,'Endre, Elek'),(7,18,'Frigyes'),(7,19,'Emília'),(7,20,'Illés'),(7,21,'Dániel, Daniella'),(7,22,'Magdolna'),(7,23,'Lenke'),(7,24,'Kinga, Kincső'),(7,25,'Kristóf, Jakab'),(7,26,'Anna, Anikó'),(7,27,'Olga, Liliána'),(7,28,'Szabolcs'),(7,29,'Márta, Flóra'),(7,30,'Judit, Xénia'),(7,31,'Oszkár'),(8,1,'Boglárka'),(8,2,'Lehel'),(8,3,'Hermina'),(8,4,'Domonkos, Dominika'),(8,5,'Krisztina'),(8,6,'Berta, Bettina'),(8,7,'Ibolya'),(8,8,'László'),(8,9,'Emőd'),(8,10,'Lörinc'),(8,11,'Zsuzsanna, Tiborc'),(8,12,'Klára'),(8,13,'Ipoly'),(8,14,'Marcell'),(8,15,'Mária'),(8,16,'Ábrahám'),(8,17,'Jácint'),(8,18,'Ilona'),(8,19,'Huba'),(8,20,'István'),(8,21,'Sámuel, Hajna'),(8,22,'Menyhért, Mirjam'),(8,23,'Bence'),(8,24,'Bertalan'),(8,25,'Lajos, Patrícia'),(8,26,'Izsó'),(8,27,'Gáspár'),(8,28,'Ágoston'),(8,29,'Beatrix, Erna'),(8,30,'Rózsa'),(8,31,'Erika, Bella'),(9,1,'Egyed, Egon'),(9,2,'Rebeka, Dorina'),(9,3,'Hilda'),(9,4,'Rozália'),(9,5,'Viktor, Lőrinc'),(9,6,'Zakariás'),(9,7,'Regina'),(9,8,'Mária, Adrienn'),(9,9,'Ádám'),(9,10,'Nikolett, Hunor'),(9,11,'Teodóra'),(9,12,'Mária'),(9,13,'Kornél'),(9,14,'Szeréna, Roxána'),(9,15,'Enikő, Melitta'),(9,16,'Edit'),(9,17,'Zsófia'),(9,18,'Diána'),(9,19,'Vilhelmina'),(9,20,'Friderika'),(9,21,'Máté, Mirella'),(9,22,'Móric'),(9,23,'Tekla'),(9,24,'Gellért, Mercédesz'),(9,25,'Eufrozina, Kende'),(9,26,'Jusztina'),(9,27,'Adalbert'),(9,28,'Vencel'),(9,29,'Mihály'),(9,30,'Jeromos'),(10,1,'Malvin'),(10,2,'Petra'),(10,3,'Helga'),(10,4,'Ferenc'),(10,5,'Aurél'),(10,6,'Brúnó, Renáta'),(10,7,'Amália'),(10,8,'Koppány'),(10,9,'Dénes'),(10,10,'Gedeon'),(10,11,'Brigitta'),(10,12,'Miksa'),(10,13,'Kálmán, Ede'),(10,14,'Helén'),(10,15,'Teréz'),(10,16,'Gál'),(10,17,'Hedvig'),(10,18,'Lukács'),(10,19,'Nándor'),(10,20,'Vendel, :)'),(10,21,'Orsolya'),(10,22,'Előd'),(10,23,'Gyöngyi'),(10,24,'Salamon'),(10,25,'Blanka, Bianka'),(10,26,'Dömötör'),(10,27,'Szabina'),(10,28,'Simon, Szimonetta'),(10,29,'Nárcisz'),(10,30,'Alfonz'),(10,31,'Farkas'),(11,1,'Marianna'),(11,2,'Achilles'),(11,3,'Győző'),(11,4,'Károly'),(11,5,'Imre'),(11,6,'Lénárd'),(11,7,'Rezső'),(11,8,'Zsombor'),(11,9,'Tivadar'),(11,10,'Réka'),(11,11,'Márton'),(11,12,'Jónás, Renátó'),(11,13,'Szilvia'),(11,14,'Aliz'),(11,15,'Albert, Lipót'),(11,16,'Ödön'),(11,17,'Hortenzia, Gergő'),(11,18,'Jenő'),(11,19,'Erzsébet'),(11,20,'Jolán'),(11,21,'Olivér'),(11,22,'Cecília'),(11,23,'Kelemen, Klementina'),(11,24,'Emma'),(11,25,'Katalin'),(11,26,'Virág'),(11,27,'Virgil'),(11,28,'Stefánia'),(11,29,'Taksony'),(11,30,'András, Andor'),(12,1,'Elza'),(12,2,'Melinda, Vivien'),(12,3,'Ferenc, Olívia'),(12,4,'Borbála, Barbara'),(12,5,'Vilma'),(12,6,'Mikulás, Miklós'),(12,7,'Ambrus'),(12,8,'Mária'),(12,9,'Natália'),(12,10,'Judit'),(12,11,'Árpád'),(12,12,'Gabriella'),(12,13,'Luca, Otília'),(12,14,'Szilárda'),(12,15,'Valér'),(12,16,'Etelka, Aletta'),(12,17,'Lázár, Olimpia'),(12,18,'Auguszta'),(12,19,'Viola'),(12,20,'Teofil'),(12,21,'Tamás'),(12,22,'Zéno'),(12,23,'Viktória'),(12,24,'Ádám, Éva'),(12,25,'KARÁCSONY, Eugénia'),(12,26,'KARÁCSONY, István'),(12,27,'János'),(12,28,'Kamilla'),(12,29,'Tamás, Tamara'),(12,30,'Dávid'),(12,31,'Szilveszter');
+/*!40000 ALTER TABLE `nevnap` ENABLE KEYS */;
+
+-- Table structure for table `valaszok`
+--
+
+DROP TABLE IF EXISTS `valaszok`;
+CREATE TABLE `valaszok` (
+  `sorszam` int(10) unsigned NOT NULL auto_increment,
+  `kszam` int(10) unsigned default NULL,
+  `pontszam` int(10) unsigned default '0',
+  `valasz` varchar(255) default NULL,
+  PRIMARY KEY  (`sorszam`)
+) ENGINE=InnoDb DEFAULT CHARSET=utf8;
+
+-- Table structure for table `kerdoivSzavazott`
+--
+
+DROP TABLE IF EXISTS `kerdoivSzavazott`;
+CREATE TABLE `kerdoivSzavazott` (
+  `kerdoivId` int(10) unsigned NOT NULL,
+  `policy` enum('private','parent') COLLATE utf8_hungarian_ci DEFAULT NULL,
+  `userAccount` varchar(60) COLLATE utf8_hungarian_ci DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
diff --git a/mayor-orig/install/mayor-portal/mysql/portal-init.sql b/mayor-orig/install/mayor-portal/mysql/portal-init.sql
new file mode 100644
index 00000000..969730ba
--- /dev/null
+++ b/mayor-orig/install/mayor-portal/mysql/portal-init.sql
@@ -0,0 +1,17 @@
+
+USE %MYSQL_PRIVATE_DB%;
+
+SET @uid = (SELECT uid FROM accounts WHERE userAccount='mayoradmin');
+DELETE FROM groups WHERE groupCn='hirekadmin';
+INSERT INTO groups (groupCn,groupDesc,policy) VALUES ('hirekadmin','Hír adminisztrátor','private');
+SET @gid = (SELECT gid FROM groups WHERE groupCn='hirekadmin');
+DELETE FROM members WHERE uid=@uid AND gid=@gid;
+INSERT INTO members (uid,gid) VALUES (@uid,@gid);
+
+INSERT INTO %MYSQL_PORTAL_DB%.hirek (kdt,vdt,class,lang,cim,txt,owner,flag,csoport) VALUES (
+	CURDATE(), CURDATE() + INTERVAL 7 DAY, 6, 'hu_HU', 
+	'Köszöntünk a MaYoR-ban!','A MaYoR keretrendszer és elektronikus napló telepítése sikeresen lezajlott, 
+	következhet az adatok betöltése és a rendszer konfigurálása. Ehhez segítséget a 
+	<a href="http://wiki.mayor.hu/doku.php?id=hogyan:telepites#adatok_felvitele">MaYoR Wiki</a>-ben találsz.', 
+	'mayoradmin', 1, 'egyéb'
+);
diff --git a/mayor-orig/log/mayor-portal.rev b/mayor-orig/log/mayor-portal.rev
new file mode 100644
index 00000000..87ca4f07
--- /dev/null
+++ b/mayor-orig/log/mayor-portal.rev
@@ -0,0 +1 @@
+4284
diff --git a/mayor-orig/update/pre002213-1.sh b/mayor-orig/update/pre002213-1.sh
new file mode 100644
index 00000000..ea163249
--- /dev/null
+++ b/mayor-orig/update/pre002213-1.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+FILES="install/module-portal/mysql/hirek.sql"
+
+echo -e "\n          * Felesleges állományok törlése:"
+  for FILE in $FILES
+  do
+    echo -n "            $BASEDIR/$FILE ... "
+    if [ -e "$BASEDIR/$FILE" ]; then
+        rm -f "$BASEDIR/$FILE"
+        echo "törölve."
+    else
+        echo "nincs."
+    fi
+  done
diff --git a/mayor-orig/update/pre004232-1-mayor_portal.sql b/mayor-orig/update/pre004232-1-mayor_portal.sql
new file mode 100644
index 00000000..60a37f94
--- /dev/null
+++ b/mayor-orig/update/pre004232-1-mayor_portal.sql
@@ -0,0 +1,16 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4232 $$
+CREATE PROCEDURE upgrade_database_4232()
+BEGIN
+
+SET NAMES utf8 COLLATE utf8_hungarian_ci;
+
+IF EXISTS (
+    SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='nevnap'
+) THEN
+    update nevnap set nevnap='Gyöngyi' where honap=10 and nap=23;
+END IF;
+
+END $$
+DELIMITER ;
+CALL upgrade_database_4232();
diff --git a/mayor-orig/update/rev001935-1.sh b/mayor-orig/update/rev001935-1.sh
new file mode 100644
index 00000000..ac899c9d
--- /dev/null
+++ b/mayor-orig/update/rev001935-1.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+FILES="www/include/modules/portal/share/sql.php"
+
+echo -e "\n          Elavult állományok törlése:\n"
+for FILE in $FILES; do
+    echo -n "          $BASEDIR/$FILE ... "
+    if [ -e $BASEDIR/$FILE ]; then
+        rm -f $BASEDIR/$FILE
+        echo "törölve."
+    else
+        echo "nincs."
+    fi
+done
+
diff --git a/mayor-orig/update/rev002019-1-mayor_portal.sql b/mayor-orig/update/rev002019-1-mayor_portal.sql
new file mode 100644
index 00000000..cc90243f
--- /dev/null
+++ b/mayor-orig/update/rev002019-1-mayor_portal.sql
@@ -0,0 +1,3 @@
+create table `kerdoivSzavazott` (`kerdoivId` int unsigned not null, `policy` ENUM('private','parent'), `userAccount` varchar(60))
+ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_hungarian_ci;
+alter table `kerdesek` add `policy` set('private','parent','public') DEFAULT 'public';
diff --git a/mayor-orig/update/rev003307-1-mayor_portal.sql b/mayor-orig/update/rev003307-1-mayor_portal.sql
new file mode 100644
index 00000000..a9c899b1
--- /dev/null
+++ b/mayor-orig/update/rev003307-1-mayor_portal.sql
@@ -0,0 +1 @@
+ALTER TABLE hirek MODIFY pic varchar(256) NULL;
diff --git a/mayor-orig/www/include/menu/parent/hu_HU/module-portal.php b/mayor-orig/www/include/menu/parent/hu_HU/module-portal.php
new file mode 100644
index 00000000..802a2d6e
--- /dev/null
+++ b/mayor-orig/www/include/menu/parent/hu_HU/module-portal.php
@@ -0,0 +1,11 @@
+<?php
+
+    if ($page != 'naplo') array_unshift($NAV[1], array('page' => 'naplo'));
+
+    if (is_array($MENU['modules']['portal']['sub'][$sub])) foreach ($MENU['modules']['portal']['sub'][$sub] as $_f => $M) {
+        $NAV[2][] = array('page' => 'portal', 'sub' => $sub, 'f' => $_f);
+    } elseif (is_array($MENU['modules']['portal']))  foreach ($MENU['modules']['portal'] as $_sub => $M)    {
+        if ($_sub != 'sub') $NAV[2][] = array('page' => 'portal', 'sub' => $_sub);
+    }
+
+?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/menu/private/hu_HU/module-portal.php b/mayor-orig/www/include/menu/private/hu_HU/module-portal.php
new file mode 100644
index 00000000..eeb70da8
--- /dev/null
+++ b/mayor-orig/www/include/menu/private/hu_HU/module-portal.php
@@ -0,0 +1,43 @@
+<?php
+
+    if (defined('__HIREKADMIN') && __HIREKADMIN === true) {
+//	$MENU['portal'] = array(array('txt' => 'Portál', 'url' => 'index.php?page=portal&sub=hirek&f=egyhir'));
+	$MENU['portal'] = array(array('txt' => 'Kezdőlap', 'url' => 'index.php'));
+	$MENU['modules']['portal']['hirek'] = array(array('txt'=>'Hírek szerkesztése','url'=>'index.php?page=portal&sub=hirek&f=hirekAdmin'));
+	$MENU['modules']['portal']['sub']['hirek'] = array(
+	    'hirekAdmin'=>array(array('txt' => 'Hírek')),
+	    'egyhir'=>array(array('txt' => 'Új hír')),
+//	    array('txt' => 'Új kérdés', 'url' => 'index.php?page=portal&sub=kerdoiv&f=kerdoivAdmin')
+	);
+	$MENU['modules']['portal']['kerdoiv'] = array(
+	    array('txt' => 'Új kérdés', 'url' => 'index.php?page=portal&sub=kerdoiv&f=kerdoivAdmin')
+	);
+
+	//if ($page != 'portal') 
+	//    $NAV[1][] = array('page'=>'portal', 'sub' => 'hirek');
+    } else { 
+	/* Mégse rakjuk ki a többieknek */
+	// $MENU['portal'] = array(array('txt' => 'Hír beküldése', 'url' => 'index.php?page=portal&sub=hirek&f=egyhir'));
+    }
+
+//    if (memberOf(_USERACCOUNT, $AUTH[_POLICY]['adminGroup'])) {
+//	$NAV[1][] = array('page'=>'session');
+//    } else {
+//	$NAV[1][] = array('page'=>'session','f'=>'changeMyPassword');
+//    }
+
+    //if ($page != 'naplo') $NAV[1][] = array('page' => 'naplo');
+
+
+
+if ($page=='portal') {
+    if (is_array($MENU['modules']['portal']['sub'][$sub])) foreach ($MENU['modules']['portal']['sub'][$sub] as $_f => $M) {
+        $NAV[2][] = array('page' => 'portal', 'sub' => $sub, 'f' => $_f);
+    } elseif (is_array($MENU['modules']['portal']))  foreach ($MENU['modules']['portal'] as $_sub => $M)    {
+        if ($_sub != 'sub') $NAV[2][] = array('page' => 'portal', 'sub' => $_sub);
+    }
+}
+
+
+
+?>
diff --git a/mayor-orig/www/include/menu/public/hu_HU/module-portal.php b/mayor-orig/www/include/menu/public/hu_HU/module-portal.php
new file mode 100644
index 00000000..53b4315c
--- /dev/null
+++ b/mayor-orig/www/include/menu/public/hu_HU/module-portal.php
@@ -0,0 +1,8 @@
+<?php
+/*
+    module: naplo
+*/
+
+//    $MENU['portal'] = array(array('txt' => 'Portál', 'url' => 'index.php?page=portal'));
+
+?>
diff --git a/mayor-orig/www/include/modules/portal/base/rights.php b/mayor-orig/www/include/modules/portal/base/rights.php
new file mode 100644
index 00000000..c1a5c039
--- /dev/null
+++ b/mayor-orig/www/include/modules/portal/base/rights.php
@@ -0,0 +1,10 @@
+<?php
+
+    if (_POLICY=='private' && @memberOf(_USERACCOUNT, 'hirekadmin')) {
+        $AUTH['my']['categories'][] = 'hirekadmin';
+        define('__HIREKADMIN',true);
+    } else {
+        define('__HIREKADMIN',false);
+    }
+
+?>
diff --git a/mayor-orig/www/include/modules/portal/hirek/egyhir.php b/mayor-orig/www/include/modules/portal/hirek/egyhir.php
new file mode 100644
index 00000000..c93a81bd
--- /dev/null
+++ b/mayor-orig/www/include/modules/portal/hirek/egyhir.php
@@ -0,0 +1,47 @@
+<?php
+
+    function saveHir($DATA) {
+	global $LANGUAGES;
+
+	$cim = $DATA['cim'];
+	$txt = $DATA['txt'];
+	$pic = $DATA['pic'];
+	$owner = $DATA['owner'];
+	$hirId = $DATA['hirId'];
+	$kdt = $DATA['kdt'];
+	$vdt = $DATA['vdt'];
+	$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'];
+	$csoport = $DATA['csoport'];
+	if ($hirId!='' && __HIREKADMIN == false ) {
+	    $q = "SELECT owner FROM hirek WHERE owner='%s'";
+	    $v = array($owner);
+	    $_owner = db_query($q,array('modul'=>'portal','result'=>'value','values'=>$v));
+	    $isOwner = ($_owner===$owner);
+	} else $isOwner = false;
+	if ($hirId=='') {
+	    $keys = array('`pic`','`owner`','`cim`','`txt`','`kdt`','`vdt`','`flag`','`class`','`lang`','`csoport`');
+	    $pattern = array("'%s'","'%s'","'%s'","'%s'","'%s'","'%s'","%u","%u","'%s'","'%s'");
+	    $v = array($pic,$owner,$cim,$txt,$kdt,$vdt,$flag,$class,$lang,$csoport);
+	    if (isset($cid)) {
+		$keys[] = 'cid';
+		$pattern[] = '%u';
+		$v[] = $cid;
+	    }
+	    $q = "insert INTO `hirek` (".implode(',',$keys).") VALUES (".implode(',',$pattern).")";
+	} elseif (isset($hirId) && (__HIREKADMIN || $isOwner)) {
+	    if (isset($cid)) {
+		$q = "update `hirek` SET pic='%s', cim='%s', txt='%s',kdt='%s',vdt='%s',flag=%u,class=%u,lang='%s',csoport='%s',cid=%u WHERE id=%u";
+		$v = array($pic,$cim,$txt,$kdt,$vdt,$flag,$class,$lang,$csoport, $cid, $hirId);
+	    } else {
+		$q = "update `hirek` SET pic='%s', cim='%s', txt='%s',kdt='%s',vdt='%s',flag=%u,class=%u,lang='%s',csoport='%s' WHERE id=%u";
+		$v = array($pic,$cim,$txt,$kdt,$vdt,$flag,$class,$lang,$csoport, $hirId);
+	    }
+	} else $q = '';
+	if ($q!='') $r = db_query($q,array('modul'=>'portal','result'=>'insert','values'=>$v));
+	return $r;
+    }
+
+?>
diff --git a/mayor-orig/www/include/modules/portal/kerdoiv/kerdoivAdmin.php b/mayor-orig/www/include/modules/portal/kerdoiv/kerdoivAdmin.php
new file mode 100644
index 00000000..237b6dc6
--- /dev/null
+++ b/mayor-orig/www/include/modules/portal/kerdoiv/kerdoivAdmin.php
@@ -0,0 +1,32 @@
+<?php
+
+    function addKerdoiv($kerdes, $valaszok) {
+
+	$v = $Pattern = array();
+	// ellenőrizük, hogy van-e válasz...
+	for ($i = 0; $i < count($valaszok); $i++) if ($valaszok[$i] != '') {
+	    $Pattern[] = "(%u, '%s')";
+	}
+
+	if (count($Pattern) > 0) {
+	    // A kérdés felvétele
+	    $q = "INSERT INTO kerdesek (vszam,kerdes) VALUES (%u,'%s')";
+	    $kszam = db_query($q, array('fv' => 'addKerdoiv', 'modul' => 'portal', 'result' => 'insert', 'values' => array(count($valaszok), $kerdes)));
+	    // A válaszok rögzítése
+	    for ($i = 0; $i < count($valaszok); $i++) if ($valaszok[$i] != '') { $v[] = $kszam; $v[] = $valaszok[$i]; }
+	    $q = "INSERT INTO valaszok (kszam,valasz) VALUES ".implode(',', $Pattern);
+	    return db_query($q, array('fv' => 'addKerdoiv', 'modul' => 'portal', 'values' => $v));
+	} else {
+	    return false;
+	}
+    }
+
+    function delKerdoivKerdes($kerdesek) {
+	$q = "DELETE FROM kerdesek WHERE sorszam IN (".implode(',',array_fill(0, count($kerdesek), '%u')).")";
+	$v = $kerdesek;
+	db_query($q, array('fv' => 'delKeroivKerdes', 'modul' => 'portal', 'values'=>$v));
+	$q = "DELETE FROM valaszok WHERE kszam IN (".implode(',',array_fill(0, count($kerdesek), '%u')).")";
+	db_query($q, array('fv' => 'delKeroivKerdes', 'modul' => 'portal', 'values'=>$v));
+    }
+
+?>
diff --git a/mayor-orig/www/include/modules/portal/share/hirek.php b/mayor-orig/www/include/modules/portal/share/hirek.php
new file mode 100644
index 00000000..f9a64f62
--- /dev/null
+++ b/mayor-orig/www/include/modules/portal/share/hirek.php
@@ -0,0 +1,50 @@
+<?php
+
+    function isOwner($hirId) {
+	if ($hirId=='') return false;
+	$q = "SELECT owner FROM hirek WHERE id=%u";
+	$r = db_query($q,array('modul'=>'portal','result'=>'value','values'=>array($hirId)));
+	return ($r === _USERACCOUNT);
+    }
+
+    function getKategoriak() {
+	$q = "SELECT * FROM kategoriak ORDER BY leiras";
+	$r = db_query($q,array('modul'=>'portal','result'=>'indexed'));
+	return $r;
+    }
+
+    function getHirek($SET = array('all'=>true,'tolDt'=>'', 'igDt'=>'', 'id' => '', 'flag'=>array(), 'class'=>array(), 'cid'=>array(), 'limit'=>'', 'lang'=>'hu_HU') ) {
+	$tolDt = $SET['tolDt']; $igDt = $SET['igDt'];
+	if ($tolDt!='') $W[] = "kdt<='$tolDt'";
+	if ($igDt!='')  $W[] = "vdt>='$igDt'";
+	if (count($SET['flag'])>0) $W[] = "flag IN (".implode(',',$SET['flag']).")";
+	if (count($SET['class'])>0) $W[] = "class IN (".implode(',',$SET['class']).")";
+	if (count($SET['cid'])>0) $W[] = "cid IN (".implode(',',$SET['cid']).")";
+	if ($SET['lang']!='')  $W[] = "lang='".$SET['lang']."'";
+
+	if ($SET['limit']!='') $L = ' LIMIT '.$SET['limit'];
+	if ($SET['id']!='') $W[] = 'id='.$SET['id'];
+
+	if ($SET['id']=='') {
+	    if (is_array($SET['csoport'])) {
+		for ($i=0; $i<count($SET['csoport']); $i++) {
+		    $GW[] = "csoport like '%".$SET['csoport'][$i]."%'";
+		}
+		if (count($GW)>0) $WOR = ' OR '.implode(' OR ',$GW);
+	    } else {
+		$WOR = '';
+	    }
+	    $W[] = '(csoport="" '.$WOR.')';
+	}
+	if (is_array($W) && count($W)>0) {
+	    $WHERE = "WHERE ".implode(' AND ',$W);
+	} else $WHERE = '';
+
+	//hack
+	if ($SET['all']===true) $WHERE='';
+	$q = "SELECT * FROM hirek $WHERE ORDER BY kdt DESC,vdt DESC".$L;
+	$HIREK['szovegek'] = db_query($q, array('modul'=>'portal','result'=>'indexed'));
+	return $HIREK;
+    }
+
+?>
diff --git a/mayor-orig/www/include/modules/portal/share/kerdoiv.php b/mayor-orig/www/include/modules/portal/share/kerdoiv.php
new file mode 100644
index 00000000..36a7e8b1
--- /dev/null
+++ b/mayor-orig/www/include/modules/portal/share/kerdoiv.php
@@ -0,0 +1,45 @@
+<?php
+
+    function getKerdoiv($policy='public') {
+
+	$v = array($policy);
+	$q = "select * from kerdesek where sorszam=(select max(sorszam) from kerdesek WHERE policy='%s')";
+	$R['kerdes'] = db_query($q, array('fv' => 'getKerdoiv', 'modul' => 'portal', 'values'=>$v,'result' => 'record'));
+
+	$q = "select * from valaszok where kszam=(select max(sorszam) from kerdesek WHERE policy='%s')";
+	$R['valaszok'] = db_query($q, array('fv' => 'getKerdoiv', 'modul' => 'portal', 'result' => 'indexed', 'values'=>$v, 'keyfiled' => 'kszam'));
+	return $R;
+
+    }
+
+    function szavazotte($kerdoivId) {
+	if (defined('_USERACCOUNT') && defined('_POLICY') && _USERACCOUNT!='' && _POLICY != '') {
+	    $q = "SELECT count(*) AS db FROM kerdoivSzavazott WHERE kerdoivId=%u AND policy='%s' AND userAccount='%s'";
+	    $v = array($kerdoivId, _POLICY, _USERACCOUNT);
+	    return (db_query($q, array('fv' => 'szavaz', 'modul' => 'portal', 'result'=>'value','values' => $v))>0);
+	} else {
+	    if (isset($_SESSION['kerdoivSzavazott']))
+		return true;
+	    else
+		return false;
+	} 
+    }
+
+    function szavaz($id, $db = 1, $kerdoivId) {
+	if (defined('_USERACCOUNT') && defined('_POLICY')) {
+	    $q = "INSERT INTO kerdoivSzavazott (kerdoivId,policy,userAccount) VALUES (%u,'%s','%s')";
+	    $v = array($kerdoivId, _POLICY, _USERACCOUNT);
+	    db_query($q, array('fv' => 'szavaz', 'modul' => 'portal', 'values' => $v));
+	}
+	$q = "UPDATE valaszok SET pontszam=pontszam + (%u) WHERE sorszam=%u";
+	$v = array($db, $id);
+	return db_query($q, array('fv' => 'szavaz', 'modul' => 'portal', 'values' => $v));
+    }
+
+    function getRegiKerdesek() {
+	$q = "SELECT * FROM kerdesek ORDER BY sorszam DESC LIMIT 10";
+	return db_query($q, array('modul'=>'portal','result'=>'indexed'));
+    }
+
+
+?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/portal/share/nevnap.php b/mayor-orig/www/include/modules/portal/share/nevnap.php
new file mode 100644
index 00000000..7a9ae971
--- /dev/null
+++ b/mayor-orig/www/include/modules/portal/share/nevnap.php
@@ -0,0 +1,8 @@
+<?php
+
+    function getNevnap($ho,$nap) {
+	$v = array($ho,$nap);
+	return db_query("SELECT `nevnap` FROM `nevnap` WHERE `honap`=%u AND `nap`=%u", array('modul'=>'portal','values'=>$v,'result'=>'value'));
+    }
+
+?>
diff --git a/mayor-orig/www/lang/hu_HU/module-portal/hirek/egyhir.php b/mayor-orig/www/lang/hu_HU/module-portal/hirek/egyhir.php
new file mode 100644
index 00000000..c4f6de65
--- /dev/null
+++ b/mayor-orig/www/lang/hu_HU/module-portal/hirek/egyhir.php
@@ -0,0 +1,18 @@
+<?php
+
+    define('__TITLE','Hír beküldése a szerkesztőnek');
+    define('_CIM','Cím');
+    define('_SZOVEG','Szöveg');
+    define('_ROGZIT','Rögzít');
+    define('_KULSO_HIR','külső hír');
+    define('_KIS_HIR','kis hír');
+    define('_CSAK_BELSO','csak belső');
+    define('_NEM_LATSZIK','nem látszik');
+    define('_LATSZIK','látszik');
+
+    define('_TOLDT','Ettől');
+    define('_IGDT','Eddig');
+
+    define('_BEALLITASOK','Beállítások');
+
+?>
diff --git a/mayor-orig/www/lang/hu_HU/module-portal/kerdoiv/kerdoivAdmin.php b/mayor-orig/www/lang/hu_HU/module-portal/kerdoiv/kerdoivAdmin.php
new file mode 100644
index 00000000..7cf33d5f
--- /dev/null
+++ b/mayor-orig/www/lang/hu_HU/module-portal/kerdoiv/kerdoivAdmin.php
@@ -0,0 +1,5 @@
+<?php
+
+    define('_KERDES','Kérdés');
+
+?>
diff --git a/mayor-orig/www/policy/parent/portal/portal/portal-pre.php b/mayor-orig/www/policy/parent/portal/portal/portal-pre.php
new file mode 100644
index 00000000..f30cdaab
--- /dev/null
+++ b/mayor-orig/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/www/policy/parent/portal/portal/portal.php b/mayor-orig/www/policy/parent/portal/portal/portal.php
new file mode 100644
index 00000000..ef2fcd3f
--- /dev/null
+++ b/mayor-orig/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/www/policy/parent/portal/portal/portal_demo.classic.php b/mayor-orig/www/policy/parent/portal/portal/portal_demo.classic.php
new file mode 100644
index 00000000..c48052fd
--- /dev/null
+++ b/mayor-orig/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/www/policy/private/portal/hirek/egyhir-pre.php b/mayor-orig/www/policy/private/portal/hirek/egyhir-pre.php
new file mode 100644
index 00000000..f5931b9d
--- /dev/null
+++ b/mayor-orig/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/www/policy/private/portal/hirek/egyhir.php b/mayor-orig/www/policy/private/portal/hirek/egyhir.php
new file mode 100644
index 00000000..3ad1f486
--- /dev/null
+++ b/mayor-orig/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/www/policy/private/portal/hirek/hirek-pre.php b/mayor-orig/www/policy/private/portal/hirek/hirek-pre.php
new file mode 100644
index 00000000..247d10d9
--- /dev/null
+++ b/mayor-orig/www/policy/private/portal/hirek/hirek-pre.php
@@ -0,0 +1,7 @@
+<?php
+
+  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)));
+
+?>
diff --git a/mayor-orig/www/policy/private/portal/hirek/hirek.php b/mayor-orig/www/policy/private/portal/hirek/hirek.php
new file mode 100644
index 00000000..8f17a358
--- /dev/null
+++ b/mayor-orig/www/policy/private/portal/hirek/hirek.php
@@ -0,0 +1,7 @@
+<?php
+
+    global $ADAT;
+
+    putHirek($ADAT);
+    
+?>
diff --git a/mayor-orig/www/policy/private/portal/hirek/hirekAdmin-pre.php b/mayor-orig/www/policy/private/portal/hirek/hirekAdmin-pre.php
new file mode 100644
index 00000000..630c9cbd
--- /dev/null
+++ b/mayor-orig/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/www/policy/private/portal/hirek/hirekAdmin.php b/mayor-orig/www/policy/private/portal/hirek/hirekAdmin.php
new file mode 100644
index 00000000..2474b23e
--- /dev/null
+++ b/mayor-orig/www/policy/private/portal/hirek/hirekAdmin.php
@@ -0,0 +1,5 @@
+<?php
+
+    global $HIREK;
+    putHirek($HIREK['szovegek']);
+?>
diff --git a/mayor-orig/www/policy/private/portal/kerdoiv/kerdoivAdmin-pre.php b/mayor-orig/www/policy/private/portal/kerdoiv/kerdoivAdmin-pre.php
new file mode 100644
index 00000000..8825861c
--- /dev/null
+++ b/mayor-orig/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/www/policy/private/portal/kerdoiv/kerdoivAdmin.php b/mayor-orig/www/policy/private/portal/kerdoiv/kerdoivAdmin.php
new file mode 100644
index 00000000..2ccaf34e
--- /dev/null
+++ b/mayor-orig/www/policy/private/portal/kerdoiv/kerdoivAdmin.php
@@ -0,0 +1,7 @@
+<?php
+
+    global $ADAT;
+    putUjKerdoiv();
+    putRegiKerdesek($ADAT);
+
+?>
diff --git a/mayor-orig/www/policy/private/portal/portal-pre.php b/mayor-orig/www/policy/private/portal/portal-pre.php
new file mode 100644
index 00000000..3d9a95da
--- /dev/null
+++ b/mayor-orig/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/www/policy/private/portal/portal.php b/mayor-orig/www/policy/private/portal/portal.php
new file mode 100644
index 00000000..e69de29b
diff --git a/mayor-orig/www/policy/private/portal/portal/portal-pre.php b/mayor-orig/www/policy/private/portal/portal/portal-pre.php
new file mode 100644
index 00000000..2f8d7772
--- /dev/null
+++ b/mayor-orig/www/policy/private/portal/portal/portal-pre.php
@@ -0,0 +1,35 @@
+<?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('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['kerdoiv'] = getKerdoiv(_POLICY);
+
+    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/www/policy/private/portal/portal/portal.php b/mayor-orig/www/policy/private/portal/portal/portal.php
new file mode 100644
index 00000000..1640b057
--- /dev/null
+++ b/mayor-orig/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/www/policy/private/portal/portal/portal_demo.classic.php b/mayor-orig/www/policy/private/portal/portal/portal_demo.classic.php
new file mode 100644
index 00000000..dc88056a
--- /dev/null
+++ b/mayor-orig/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'=>'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/www/policy/private/portal/portal/portal_demo.pda.php b/mayor-orig/www/policy/private/portal/portal/portal_demo.pda.php
new file mode 100644
index 00000000..62a2de0c
--- /dev/null
+++ b/mayor-orig/www/policy/private/portal/portal/portal_demo.pda.php
@@ -0,0 +1,3 @@
+<?php
+
+?>
diff --git a/mayor-orig/www/policy/public/portal/portal/hir-pre.php b/mayor-orig/www/policy/public/portal/portal/hir-pre.php
new file mode 100644
index 00000000..7e88f0f3
--- /dev/null
+++ b/mayor-orig/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/www/policy/public/portal/portal/hir.php b/mayor-orig/www/policy/public/portal/portal/hir.php
new file mode 100644
index 00000000..6a7ee860
--- /dev/null
+++ b/mayor-orig/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/www/policy/public/portal/portal/portal-pre.php b/mayor-orig/www/policy/public/portal/portal/portal-pre.php
new file mode 100644
index 00000000..7ef3ebca
--- /dev/null
+++ b/mayor-orig/www/policy/public/portal/portal/portal-pre.php
@@ -0,0 +1,53 @@
+<?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/www/policy/public/portal/portal/portal.php b/mayor-orig/www/policy/public/portal/portal/portal.php
new file mode 100644
index 00000000..96275bf4
--- /dev/null
+++ b/mayor-orig/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/www/policy/public/portal/portal/portal_demo.classic.php b/mayor-orig/www/policy/public/portal/portal/portal_demo.classic.php
new file mode 100644
index 00000000..31aebc95
--- /dev/null
+++ b/mayor-orig/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/www/policy/public/portal/portal/portal_demo.pda.php b/mayor-orig/www/policy/public/portal/portal/portal_demo.pda.php
new file mode 100644
index 00000000..3123adcd
--- /dev/null
+++ b/mayor-orig/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>';
+    }
+
+?>
diff --git a/mayor-orig/www/skin/classic/module-portal/config.php.example b/mayor-orig/www/skin/classic/module-portal/config.php.example
new file mode 100644
index 00000000..fe68ca47
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/config.php.example
@@ -0,0 +1,10 @@
+<?php
+
+if ( ($policy=='private' || $policy=='parent') && $page=='portal' && $sub=='hirek' && $f=='egyhir') {
+    $SSSHH .= '
+    <script src="skin/classic/share/javascript/tiny_mce/tiny_mce.js" type="text/javascript"></script>
+    <script src="skin/classic/module-portal/javascript/hirek/egyhir.php?lang='.$lang.'" type="text/javascript"></script>
+    '; 
+}
+
+?>
\ No newline at end of file
diff --git a/mayor-orig/www/skin/classic/module-portal/css/hirek/egyhir.css b/mayor-orig/www/skin/classic/module-portal/css/hirek/egyhir.css
new file mode 100644
index 00000000..8be4a7c3
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/css/hirek/egyhir.css
@@ -0,0 +1,42 @@
+
+
+
+    div.egyhir {
+	margin-left: 50px;
+    }
+
+    div.egyhir form {
+	font-weight: bold;
+    }
+
+    div.egyhir label {
+
+    }
+
+    div.egyhir input {
+	background-color: white;
+	border: solid 1px #667766;
+    }
+
+    div.egyhir textarea {
+	width: 80%;
+	height: 300px;
+	border: solid 1px #667766;	
+	background-color: white;
+    }
+
+    table.egyhirdetail {
+	background-color: #eeeeee;
+	border-bottom: solid 2px #667766;
+    }
+    table.egyhirdetail td {
+	border: solid 1px #667766;
+    }
+    table.egyhirdetail th {
+	background-color: #667766;
+	color: white;
+	height:30px;
+	border-bottom: solid 2px #001100;
+    }
+
+    .mceEditor iframe { border: blue 1px solid; }
diff --git a/mayor-orig/www/skin/classic/module-portal/css/hirek/hirek.css b/mayor-orig/www/skin/classic/module-portal/css/hirek/hirek.css
new file mode 100644
index 00000000..8887a347
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/css/hirek/hirek.css
@@ -0,0 +1,9 @@
+
+    div.hirCim {
+	font-style: italic;
+	font-size: 14px;
+	color: #000088;
+	font-weight: bold;
+	margin-top:1em;
+	padding-bottom: 0.5em;
+    }
diff --git a/mayor-orig/www/skin/classic/module-portal/css/hirek/hirekAdmin.css b/mayor-orig/www/skin/classic/module-portal/css/hirek/hirekAdmin.css
new file mode 100644
index 00000000..9e05068d
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/css/hirek/hirekAdmin.css
@@ -0,0 +1,29 @@
+
+    div.hirCim {
+	font-style: italic;
+	font-size: 14px;
+	color: #000088;
+	font-weight: bold;
+	margin-top:1em;
+	padding-bottom: 0.5em;
+    }
+
+    table.hAdmin {
+	background-color: #445560;
+	
+    }
+    table.hAdmin tr td {
+	background-color: #eeeeee;
+    }
+
+
+    table.hAdmin tr.unk td {
+	background-color: #993456;
+    }
+    table.hAdmin tr.old td {
+	background-color: #999999;
+    }
+
+    table.hAdmin a { display: block;  color: black; }
+
+    label { margin:0px; padding:0px; }
diff --git a/mayor-orig/www/skin/classic/module-portal/css/kerdoiv/kerdoivAdmin.css b/mayor-orig/www/skin/classic/module-portal/css/kerdoiv/kerdoivAdmin.css
new file mode 100644
index 00000000..41dd7dd2
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/css/kerdoiv/kerdoivAdmin.css
@@ -0,0 +1,8 @@
+
+    form.kerdoiv { padding: 30px; width:300px; float:left; }
+    form.kerdoiv p { background-color: #556677; padding:2px; color:white; margin-bottom:0px; border-bottom: solid 1px white;}
+    form.kerdoiv input { border: solid 1px #556677; }
+    form.kerdoiv ol { background-color: #aabbcc; margin-top:0px;}
+    form.kerdoiv ol li { padding:2px; }
+    form.kerdoiv ul { background-color: #ccbbcc; margin-top:0px;}
+    form.kerdoiv ul li { padding:2px; }
diff --git a/mayor-orig/www/skin/classic/module-portal/css/portal.css b/mayor-orig/www/skin/classic/module-portal/css/portal.css
new file mode 100644
index 00000000..60c89501
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/css/portal.css
@@ -0,0 +1,99 @@
+
+   div.hirCim {
+        font-style: italic;
+        font-size: 14px;
+        color: #000088;
+        font-weight: bold;
+        margin-top:1em;
+        padding-bottom: 0.5em;
+    }
+
+    div.hirCim a {
+        color: #000088;
+	text-decoration: none;
+    }
+    div.hirCim a:hover { color: #1E90FF }
+
+    table.portalMain { width: 100%; }
+
+    table.portalMain td.bal {
+	width:140px;
+	vertical-align: top;
+	font-size: 10px;
+    }
+    table.portalMain td.kozep {
+	vertical-align: top;
+	padding:4px;
+    }
+
+    table.portalMain td.jobb {
+	width:160px;
+	vertical-align: top;
+	font-size: 10px;
+    }
+
+    table.portalMain div.doboz { width:100%; padding:0em; margin-bottom: 4px; margin-right: 2px; margin-left: 2px; }
+    table.portalMain div.doboz ul { padding-left:20px; margin: 0px 0px 0px 0px; }
+    table.portalMain div.doboz ul li { padding:0px 0px 0px 0px; margin: 0px 0px 0px 0px; }
+    table.portalMain div.doboz ul li a { color: black; text-decoration: none; }
+    table.portalMain div.doboz ul li a:hover { color: black; text-decoration: underline; }
+
+
+    table.portalMain td.bal div.doboz div.dobozCim { 
+	width:100%; font-size:11px;font-weight: bold; padding: 0.1em 0em;  color: white; border-bottom: solid 1px #676767;
+	border-top-right-radius: 5px;
+	border-top-left-radius: 5px;
+    }
+    table.portalMain td.jobb div.doboz div.dobozCim { 
+	width:100%; font-size:11px;font-weight: bold; padding: 0.1em 0em;  color: white; border-bottom: solid 1px #676767;
+	border-top-right-radius: 5px;
+	border-top-left-radius: 5px;
+    }
+    div.doboz div.dobozCim span { padding-left: 0.8em; }
+    div.doboz div.dobozCim a { color:white; text-decoration: none;}
+    div.doboz div.dobozCim a:hover { text-decoration: underline; }
+
+    div.doboz:hover div.dobozCim { opacity: 0.8;  }
+
+/*
+    div.doboz div.dobozCim , div.doboz div.dobozCim { border-bottom: solid 1px black; }
+    div.doboz div.dobozCim tr th {color:white; font-weight:bold; text-align: left; font-size:10px;}
+*/
+
+    table.kerdoiv { font-size:10px; }
+    div.kerdes    { text-align: center; font-weight:bold; }
+    table.kerdoiv tr td.j { text-align: right }
+
+    div.egyHir {position:relative;}
+    div.egyHir div.hir a { color:#325C99; }
+    div.egyHir div.hir a:hover { color:#1E90FF; }
+/*
+div.egyHir div.hirCim:after {position:absolute; display:block; content:""; background-color:#eeeeee; height:1px; width:100%;
+bottom:0px; right:0px; }
+*/
+
+/*Az a hr mindig a halálom volt :) */
+div.egyHir:after {
+  clear: both;
+  height: 0px;
+  margin-top: 2em;
+  margin-bottom: 2em;
+  width: 100%;
+  background-color: #777777;
+  border-style: solid;
+  border-color: #eeeeee;
+  border-width: 0px 0px 1px 0px;
+  content: " ";
+  display: block;
+}
+hr {display: none;}
+
+    table.portalMain div.dobozTart a { color: black }
+
+
+
+@media (max-width: 850px) {
+  .bal, .jobb {
+    display: none;
+  }
+}
\ No newline at end of file
diff --git a/mayor-orig/www/skin/classic/module-portal/css/portal/hir.css b/mayor-orig/www/skin/classic/module-portal/css/portal/hir.css
new file mode 100644
index 00000000..84d9cbcd
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/css/portal/hir.css
@@ -0,0 +1,5 @@
+
+ div.hir { margin:20px; }
+ div.hir h1 { color: #008; }
+ div.hir h1 a { text-decoration: underline}
+ div.hir p { line-height:1.5em;  }
diff --git a/mayor-orig/www/skin/classic/module-portal/html/hirek/egyhir.phtml b/mayor-orig/www/skin/classic/module-portal/html/hirek/egyhir.phtml
new file mode 100644
index 00000000..c75b2756
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/html/hirek/egyhir.phtml
@@ -0,0 +1,153 @@
+<?php
+
+    function _putKategoriak($ADAT,$cid) {
+
+	echo '<select name="cid">';
+	    echo '<option value=""></option>';
+	    for ($i=0; $i<count($ADAT['kategoriak']); $i++) {
+		$_SEL = ($ADAT['kategoriak'][$i]['id'] == $cid) ? ' selected="selected" ':'';
+		echo '<option value="'.$ADAT['kategoriak'][$i]['id'].'" '.$_SEL.'>'.$ADAT['kategoriak'][$i]['leiras'].'</option>';
+	    }
+	echo '</select>';
+
+    }
+
+    function putHirForm($HIR,$ADAT) {
+	global $LANGUAGES, $AUTH;
+
+        $CLASSS = array(1 => _KULSO_HIR, 2 => _KIS_HIR, 6 => _CSAK_BELSO, 0 => _ISMERETLEN);
+        $FLAGSS = array(0 => _NEM_LATSZIK, 1 => _LATSZIK, 2 => 2, 3 => 3);
+	
+    $FLAGS                = Array(0,1);
+
+	echo '<div class="egyhir">';
+
+	echo '<h2>'.__TITLE.'</h2>';
+
+	formBegin();
+
+	    if (__HIREKADMIN===true) {
+
+		    echo '<table class="egyhirdetail" cellspacing="1">';
+		    echo '<tr><th colspan="3">'._BEALLITASOK.'</th></tr>';
+		    echo '<tr><td style="text-align:right">';
+
+		    echo _TOLDT.': <input type="text" name="kdt" id="kdt" value="'.$HIR['kdt'].'" class="datetime" /><br/>';	
+		    echo _IGDT.': <input type="text" name="vdt" id="vdt" value="'.$HIR['vdt'].'" class="datetime" />';	
+
+		echo '</td>';
+		echo '<td>';
+
+		    reset($LANGUAGES);
+		    echo '<select name="lang">';
+		    for($i=0; $i<count($LANGUAGES); $i++) {
+			//echo '<input type="checkbox" name="policies" value="'.$LANGUAGES[$i].'" />';
+			$_CHK = ($LANGUAGES[$i]==$HIR['lang']) ? ' selected="selected" ':'';
+			echo '<option value="'.$LANGUAGES[$i].'" '.$_CHK.'/>';
+			echo $LANGUAGES[$i];
+			echo '</option>';
+		    }
+		    echo '</select>';
+	
+		    _putKategoriak($ADAT,$HIR['cid']);
+
+	    	echo '</td>';
+		echo '<td>';
+		    echo $HIR['owner'];
+		echo '</td>';
+		echo '</tr>';
+
+		echo '<tr>';
+		echo '<td>'; 
+
+
+		reset($FLAGS);
+		for($i=0; $i<count($FLAGS); $i++) {
+		    $_CHK = ($FLAGS[$i]==$HIR['flag']) ? ' checked="checked" ':'';
+		    echo '<input type="radio" id="F'.$i.'" name="flag" value="'.$FLAGS[$i].'" '.$_CHK.'/>';
+		    echo '<label for="F'.$i.'">';
+		    echo '&nbsp;&nbsp;&nbsp;&nbsp;';
+		    echo $FLAGSS[$i];
+		    echo '('.$FLAGS[$i].')';
+		    echo '</label>';
+		    echo '<br/>';
+		}
+
+
+
+		echo '</td><td>';
+
+		//$POLICIES                = Array('private','parent','public');
+		$POLICIES                = Array(1,6);
+		reset($POLICIES);
+		for($i=0; $i<count($POLICIES); $i++) {
+		    //echo '<input type="checkbox" name="policies" value="'.$POLICIES[$i].'" />';
+		    $_CHK = ($POLICIES[$i]==$HIR['class']) ? ' checked="checked" ':'';
+		    echo '<input id="P'.$i.'" type="radio" name="class" value="'.$POLICIES[$i].'" '.$_CHK.'/>';
+		    echo '<label for="P'.$i.'"> ';
+		    echo $CLASSS[$POLICIES[$i]];
+		    echo ' ('.$POLICIES[$i].')';
+		    echo '</label>';
+		    echo '<br/>';
+		}
+
+		echo '</td>';
+		echo '<td>';
+		    for($i=0; $i<count($C = $AUTH['private']['categories']); $i++) {
+			$_CHK = (strstr($HIR['csoport'],$C[$i])) ? ' checked="checked"':'';
+			echo '<input type="checkbox" id="C1'.$i.'" name="csoport[]" value="'.$C[$i].'" '.$_CHK.'/>';
+			echo '<label for="C1'.$i.'">'.$C[$i].'</label>';
+		    }
+		    for($i=0; $i<count($C = $AUTH['parent']['categories']); $i++) {
+			$_CHK = (strstr($HIR['csoport'],$C[$i])) ? ' checked="checked"':'';
+			echo '<input type="checkbox" id="C2'.$i.'" name="csoport[]" value="'.$C[$i].'" '.$_CHK.'/>';
+			echo '<label for="C2'.$i.'">'.$C[$i].'</label>';
+		    }
+		echo '</td>';
+		echo '</tr>';
+
+		echo '</table>';
+
+
+	    } else {
+		echo '<input type="hidden" name="flag" value="0" />';	
+	    }
+
+	    echo '<p>';
+
+
+	    echo '<label for="cim">'._CIM.': </label>';
+	    echo '<input type="text" name="cim" id="cim" size="80" value="'.htmlspecialchars($HIR['cim']).'" />';
+
+	    echo '<br/>';	    
+	    echo "\n".'<textarea name="txt" id="txt" class="wysiwyg" rows="10" cols="80">'.htmlspecialchars($HIR['txt']).'</textarea>'."\n";
+
+	    echo '<br/>';
+	    echo _KEP;
+	    echo '<input type="text" name="pic" id="pic" size="128" value="'.$HIR['pic'].'" /><br/>';
+	    echo '<input type="submit" value="'._ROGZIT.'" />';
+	    echo '<input type="hidden" name="action" value="save" />';
+	    echo '<input type="hidden" name="hirId" value="'.($HIR['id']).'" />';
+	    echo '</p>';
+
+
+	formEnd();
+	
+	echo '</div>';
+
+
+	if (__HIREKADMIN===true) {
+	echo '<hr/>';
+            echo '<div class="hirCim">'.($HIR['cim']).'</div>';
+            echo '<div class="hir">'.($HIR['txt']).'</div>';
+            for ($j=0; $j<count($ADAT['hirek']['linkek'][$HIR['id']]); $j++) {
+                echo '<a href="'.$ADAT['hirek']['linkek'][$HIR['id']][$j]['uri'].'">';
+                //echo $ADAT['hirek']['linkek'][$HIR['id']][$j]['szoveg'];
+                echo '</a>';
+            }
+	echo '<hr/>';
+	}
+
+    }
+
+?>
diff --git a/mayor-orig/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml b/mayor-orig/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml
new file mode 100644
index 00000000..6dc5900d
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml
@@ -0,0 +1,51 @@
+<?php
+
+    function putHirek($ADAT) {
+
+/*
+    hideShowContainer
+    onClickHideShow
+    openable
+*/
+
+	$CLASS = array(1=>'külső hír',2=>'kis hír',6=>'csak belső',0=>'ISMERETLEN');
+	$FLAGS = array(0=>'nem látszik', 1=>'látszik', 2=>2, 3=>3);
+	$now = time();
+	echo '<table class="hAdmin hideShowContainer" align="center">';
+	echo '<tr><th colspan="5"><button type="button" class="onClickHideShow">+++</button></th></tr>'."\n";
+	for ($i=0; $i<count($ADAT); $i++) {
+	    $D = $ADAT[$i];
+	    if ($D['class']==0) $_class='class="unk"'; else 
+	    if (strtotime($D['vdt'])<$now || $D['flag']==0) $_class='class="old openable" style="display: none"'; else $_class="";
+
+	    echo '<tr '.$_class.'>';
+	    echo '<td>';
+		echo $D['lang'];
+	    echo '</td>';
+
+	    echo '<td>';
+		echo '<a href="'.href('index.php?page=portal&sub=hirek&f=egyhir&hirId='.$D['id']).'">';
+		echo ($D['cim']=='')?'nincs cím':htmlspecialchars($D['cim']);
+		echo '</a>';
+	    echo '</td>';
+	    echo '<td>';
+		echo $CLASS[$D['class']];
+	    echo '</td>';
+	    echo '<td>';
+		echo $FLAGS[$D['flag']];
+		echo ' '.$D['csoport'];
+	    echo '</td>';
+	    echo '<td>';
+		echo $D['owner'];
+	    echo '</td>';
+	    echo '<td>';
+		echo $D['kdt'];
+		echo $D['vdt'];
+	    echo '</td></tr>';
+	    echo "\n\n";
+	}
+        echo '</table>';
+
+    }
+
+?>
diff --git a/mayor-orig/www/skin/classic/module-portal/html/kerdoiv/kerdoivAdmin.phtml b/mayor-orig/www/skin/classic/module-portal/html/kerdoiv/kerdoivAdmin.phtml
new file mode 100644
index 00000000..2d657a27
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/html/kerdoiv/kerdoivAdmin.phtml
@@ -0,0 +1,38 @@
+<?php
+
+    function putUjKerdoiv() {
+
+	formBegin(array('class'=>'kerdoiv'));
+	    echo '<input type="hidden" name="action" value="ujKerdes" />';
+	    echo '<p>';
+	    echo '<label for="kerdes">'._KERDES.'</label>'."\n";
+	    echo '<input type="text" name="kerdes" text="" />';
+	    echo '</p>';
+	    echo '<ol>';
+	    for ($i = 0; $i < 15; $i++) {
+		echo '<li><input type="text" name="valaszok[]" text="" /></li>';
+	    }
+	    echo '</ol>';
+	    echo '<input type="submit"  />';
+	formEnd();
+
+    }
+
+    function putRegiKerdesek($ADAT) {
+	formBegin(array('class'=>'kerdoiv'));
+	echo '<input type="hidden" name="action" value="delKerdes" />';
+	echo '<p>Törlendők</p>';
+	echo '<ul>';
+	for ($i=0; $i<count($ADAT); $i++) {
+	    echo '<li>';
+		echo '<input type="checkbox" name="sorszam[]" value="'.$ADAT[$i]['sorszam'].'" />';
+		echo $ADAT[$i]['kerdes'];
+	    echo '</li>';
+	}
+	echo '</ul>';
+	echo '<input type="submit"  />';
+	formEnd();
+
+    }
+
+?>
diff --git a/mayor-orig/www/skin/classic/module-portal/html/portal/hir.phtml b/mayor-orig/www/skin/classic/module-portal/html/portal/hir.phtml
new file mode 100644
index 00000000..30be4289
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/html/portal/hir.phtml
@@ -0,0 +1,16 @@
+<?php
+
+    function putHir($ADAT) {
+	$H = $ADAT['hirek']['szovegek'][0];
+	echo '<div class="hir">';
+	echo '<h1>'.$H['cim'].'</h1>';
+	echo '<p>'.$H['txt'].'</p>';
+	//echo '<div>'.$H['kdt'].'</div>';
+	echo '</div>';
+	if (_OG_ENABLED===true) {
+	    echo '<div class="fb-comments" style="z-index:0" data-href="'._BASE_URL.'/index.php?page=portal&amp;sub=portal&amp;f=hir&amp;hirId='.$H['id'].'"
+		   data-width="100%" data-numposts="10" data-colorscheme="light"></div>';
+	}
+    }
+
+?>
\ No newline at end of file
diff --git a/mayor-orig/www/skin/classic/module-portal/html/share/doboz.phtml b/mayor-orig/www/skin/classic/module-portal/html/share/doboz.phtml
new file mode 100644
index 00000000..7c903e27
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/html/share/doboz.phtml
@@ -0,0 +1,32 @@
+<?php
+
+    function genLinkek($ADAT) {
+	
+	if (is_array($ADAT) && count($ADAT)>0) {
+	    $str = '<ul>';
+	    for ($i=0; $i<count($ADAT); $i++) {
+		$L = $ADAT[$i];
+		$str .= '<li>';
+		    $str .=  '<a href="'.$L['href'].'">';
+			$str .=  $L['szoveg'];
+		    $str .=  '</a>';
+		$str .=  '</li>'."\n";
+	    }
+	    $str .=  '</ul>';
+	}
+	return $str;
+    }
+
+    function putDoboz($cime, $bele, $SET = array('width'=>'100%','background-color'=> '#eeeeee', 'header-color'=>'#444444', 'header-link'=>'')) {
+
+	    $bgcolor =  ($SET['background-color']=='') ? '#eeeeee' : $SET['background-color'] ;
+	    $width = ($SET['width']=='') ? '100%':$SET['width'];
+	    if ($SET['header-link']!='') $cime = '<a href="'.$SET['header-link'].'">'.$cime.'</a>';
+	    echo '<div class="doboz">';
+		echo '<div class="dobozCim" style="width: '.$width.'; background-color: '.$SET['header-color'].'"><span>'.$cime.'</span></div>';
+		echo '<div class="dobozTart" style="background-color: '.$bgcolor.'">'.$bele.'</div>';
+	    echo '</div>';
+
+    }
+
+?>
diff --git a/mayor-orig/www/skin/classic/module-portal/html/share/hirek.phtml b/mayor-orig/www/skin/classic/module-portal/html/share/hirek.phtml
new file mode 100644
index 00000000..9b586cd7
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/html/share/hirek.phtml
@@ -0,0 +1,34 @@
+<?php
+
+    function putHirek($ADAT) {
+
+	if (count($ADAT['hirek']['szovegek'])==0) {
+/*	    echo '<div class="egyHir"><div class="hirCim">';
+		echo 'MaYoR elektronikus napló';
+	    echo '</div><div class="hir">';
+		echo 'Szabadszoftver a közoktatási intézmények napi adminisztrációjához.';
+		echo '<ul><li><a href="http://www.mayor.hu">www.mayor.hu</a> - a mindennapokra</li></ul>';
+	    echo '</div></div>';
+*/
+	} else {
+	for ($i=0; $i<count($ADAT['hirek']['szovegek']); $i++) {
+	    echo '<div class="egyHir">';
+	    $D = $ADAT['hirek']['szovegek'][$i];
+	    list ($a,$b) = explode('<!-- more -->',$D['txt']);
+	    echo '<div class="hirCim"><a href="'.href('index.php?page=portal&sub=portal&f=hir&hirId='.$D['id']).'">'.$D['cim'].'</a></div>';
+	    echo '<div class="hir">';
+		echo $a;
+		if ($b!="") echo ' <a href="'.href('index.php?page=portal&sub=portal&f=hir&hirId='.$D['id']).'">Tovább...</a>';
+	    echo '</div>';
+	    for ($j=0; $j<count($ADAT['hirek']['linkek'][$D['id']]); $j++) {
+		echo '<a href="'.$ADAT['hirek']['linkek'][$D['id']][$j]['uri'].'">';
+		echo $ADAT['hirek']['linkek'][$D['id']][$j]['szoveg'];
+		echo '</a>';
+	    }
+	    echo '<hr style="clear:both; height:0px; margin-top:2em; margin-bottom:2em; width:80%; background-color: #777777; border-style: solid; border-color: #eeeeee; border-width: 0px 0px 1px 0px;" />';
+	    echo '</div>';
+	}
+	}
+    }
+
+?>
diff --git a/mayor-orig/www/skin/classic/module-portal/html/share/kerdoiv.phtml b/mayor-orig/www/skin/classic/module-portal/html/share/kerdoiv.phtml
new file mode 100644
index 00000000..4e8ab0e6
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/html/share/kerdoiv.phtml
@@ -0,0 +1,41 @@
+<?php
+
+    function genKerdoiv($ADAT) {
+
+	$VALASZOK = $ADAT['valaszok'];
+
+	$r = formBegin(array(),array("print"=>false));
+	$r .= '<input type="hidden" name="action" value="szavaz" />';
+	$r .= '<input type="hidden" name="kerdoivId" value="'.$ADAT['kerdes']['sorszam'].'" />';
+	$r .= '<div class="kerdes">'.$ADAT['kerdes']['kerdes'].'</div>';
+
+	$r.='<table class="kerdoiv" cellpadding="1" cellspacing="0">';
+
+	if (count($VALASZOK)>15 && $ADAT['szavazott']!==true) {
+	    $r .= '<tr><td>';
+	    $r .= '<select name="vId">';
+	    for ($i = 0; $i < count($VALASZOK); $i++) {
+		$r .= '<option value="'.$VALASZOK[$i]['sorszam'].'">'.$VALASZOK[$i]['valasz'].'</option>';
+	    }
+	    $r .= '</select>';
+	    $r .= '</td></tr>'."\n";
+	} else {
+	    for ($i = 0; $i < count($VALASZOK); $i++) {
+		$r .= '<tr><td>';
+		if ($ADAT['szavazott'] != true) $r .= '<input type="radio" name="vId" id="vId'.$i.'" value="'.$VALASZOK[$i]['sorszam'].'" />';
+		$r .= '</td><td>';
+		$r .= '<label for="vId'.$i.'">'.$VALASZOK[$i]['valasz'].'</label>';
+		$r .= '</td><td class="j">';
+		$r .= $VALASZOK[$i]['pontszam'];
+		$r .= '</td></tr>';
+	    }
+	}
+	$r .= '</table>'."\n";
+	if ($ADAT['szavazott'] != true) $r .= '<input type="submit" />';
+	$r .= formEnd(array("print"=>false));
+
+	return $r;
+
+    }
+
+?>
diff --git a/mayor-orig/www/skin/classic/module-portal/img/cl.gif b/mayor-orig/www/skin/classic/module-portal/img/cl.gif
new file mode 100644
index 00000000..9f2f2c22
Binary files /dev/null and b/mayor-orig/www/skin/classic/module-portal/img/cl.gif differ
diff --git a/mayor-orig/www/skin/classic/module-portal/img/cr.gif b/mayor-orig/www/skin/classic/module-portal/img/cr.gif
new file mode 100644
index 00000000..9fe3cad0
Binary files /dev/null and b/mayor-orig/www/skin/classic/module-portal/img/cr.gif differ
diff --git a/mayor-orig/www/skin/classic/module-portal/img/ok_button.gif b/mayor-orig/www/skin/classic/module-portal/img/ok_button.gif
new file mode 100644
index 00000000..f703e173
Binary files /dev/null and b/mayor-orig/www/skin/classic/module-portal/img/ok_button.gif differ
diff --git a/mayor-orig/www/skin/classic/module-portal/javascript/hirek/egyhir.php b/mayor-orig/www/skin/classic/module-portal/javascript/hirek/egyhir.php
new file mode 100644
index 00000000..bbaa9f91
--- /dev/null
+++ b/mayor-orig/www/skin/classic/module-portal/javascript/hirek/egyhir.php
@@ -0,0 +1,23 @@
+<?php
+
+    if ($_GET['lang'] != '') $lang = substr($_GET['lang'],0,2);
+    else $lang = 'hu';
+
+    if ($lang == 'jp') $lang = 'ja';
+
+    echo '
+	tinyMCE.init({
+    	    mode : "specific_textareas",
+	    editor_selector : "wysiwyg",
+	    theme : "advanced",
+	    language : "'.$lang.'",
+	    plugins : "table,advimage,style,visualchars",
+	    entity_encoding : "raw",
+	    inline_styles : true,
+	    theme_advanced_buttons1_add : "fontsizeselect,fontselect",
+	    theme_advanced_buttons2_add : "separator,forecolor,backcolor,visualchars",
+	    theme_advanced_buttons3_add_before : "tablecontrols,separator,styleprops"
+	});
+    ';
+
+?>
\ No newline at end of file
diff --git a/mayor-orig/www/skin/pda/module-portal/css/portal.css b/mayor-orig/www/skin/pda/module-portal/css/portal.css
new file mode 100644
index 00000000..04b6b0ad
--- /dev/null
+++ b/mayor-orig/www/skin/pda/module-portal/css/portal.css
@@ -0,0 +1,25 @@
+/* ------ PDA ----------- */
+
+    h1 { font-size: large; font-weight: bold; text-align: center; }
+    div.set { text-align: center; margin: 10px 2px; }
+
+    a { border-radius: 4px;}
+
+    a.diak { text-decoration: none; background-color: rgb(60,60,150); color: white; padding: 4px; margin: 2px; }
+    a.szulo { text-decoration: none; background-color: rgb(60,150,60); color: white; padding: 4px; margin: 2px; }
+    a.tanar { text-decoration: none; background-color: rgb(150,60,60); color: white; padding: 4px; margin: 2px; }
+    a.forum { text-decoration: none; background-color: rgb(60,60,60); color: white; padding: 4px; margin: 2px; }
+    a.diak:hover { background-color: rgb(90,90,200); }
+    a.szulo:hover { background-color: rgb(90,200,90); }
+    a.tanar:hover { background-color: rgb(200,90,90); }
+    a.forum:hover { background-color: rgb(90,90,90); }
+
+    a.orarend { text-decoration: none; background-color: rgb(60,100,100); color: white; padding: 4px; margin: 2px; }
+    a.helyettesites { text-decoration: none; background-color: rgb(100,100,60); color: white; padding: 4px; margin: 2px; }
+    a.hirek { text-decoration: none; background-color: rgb(100,60,100); color: white; padding: 4px; margin: 2px; }
+    a.osztalyozo { text-decoration: none; background-color: #77aa99; color: white; padding: 4px; margin: 2px; }
+    a.hianyzas { text-decoration: none; background-color: #778899; color: white; padding: 4px; margin: 2px; }
+    a.kilepes { text-decoration: none; background-color: magenta; color: white; padding: 4px; margin: 2px; }
+    a.orarend:hover { background-color: rgb(90,200,200); }
+    a.helyettesites:hover { background-color: rgb(200,200,90); }
+    a.hirek:hover { background-color: rgb(200,90,200); }
-- 
cgit v1.2.3