további rendrakás

39 files changed, 1063 insertions, 0 deletions

diff --git a/mayor-orig/mayor-base/update/linkme.sh b/mayor-orig/mayor-base/update/linkme.sh
new file mode 100644
index 00000000..60a70424
--- /dev/null
+++ b/mayor-orig/mayor-base/update/linkme.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+parentLink="naplo/hibabejelento/hibabejelento naplo//szulinap naplo/haladasi/haladasi naplo/haladasi/stat naplo/osztalyozo/diak
+naplo/osztalyozo/jegy naplo/osztalyozo/dolgozat naplo/osztalyozo/bizonyitvany naplo/osztalyozo/stat
+naplo/bejegyzesek/bejegyzesek naplo/bejegyzesek/info naplo/tanev/fogadoOra naplo/orarend/helyettesites naplo/tanev/munkaterv naplo/orarend/orarend
+naplo/intezmeny/valtas naplo/intezmeny/diak naplo/intezmeny/diakSzulo naplo/hianyzas/diak naplo/hianyzas/diakLista naplo/hianyzas/nap naplo/uzeno/uzeno naplo/ertekeles/ertekeles
+naplo/uzeno/postas naplo//error
+portal/hirek/egyhir
+session/download"
+publicLink="naplo/orarend/orarend naplo/orarend/szabadTerem naplo/orarend/helyettesites naplo//error"
diff --git a/mayor-orig/mayor-base/update/post002038-1.sh b/mayor-orig/mayor-base/update/post002038-1.sh
new file mode 100644
index 00000000..cc91d170
--- /dev/null
+++ b/mayor-orig/mayor-base/update/post002038-1.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo 'A post update szkriptek tesztelése'
+echo 'A post fut!!' >> /tmp/mayor-update-test.log
+
diff --git a/mayor-orig/mayor-base/update/pre002038-1.sh b/mayor-orig/mayor-base/update/pre002038-1.sh
new file mode 100644
index 00000000..c798ce9e
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre002038-1.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo 'A pre update szkriptek tesztelése'
+echo 'A pre fut!!' >> /tmp/mayor-update-test.log
+
diff --git a/mayor-orig/mayor-base/update/pre002989-0.sh b/mayor-orig/mayor-base/update/pre002989-0.sh
new file mode 100644
index 00000000..7ecb21ee
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre002989-0.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+FILE="update/pre002989-1-intemzeny.sql"
+
+echo " Felesleges állományok törlése:"
+    echo -n "          $BASEDIR/$FILE ... "
+    if [ -e "$BASEDIR/$FILE" ]; then
+        rm -f "$BASEDIR/$FILE"
+        echo "törölve."
+    else
+        echo "nincs."
+    fi
+echo " Kész."
\ No newline at end of file
diff --git a/mayor-orig/mayor-base/update/pre003042-1-mayor_login.sql b/mayor-orig/mayor-base/update/pre003042-1-mayor_login.sql
new file mode 100644
index 00000000..471b654f
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre003042-1-mayor_login.sql
@@ -0,0 +1,12 @@
+CREATE TABLE `loginLog_a` (
+  `logId` int(10) unsigned NOT NULL,
+  `policy` varchar(10) NOT NULL DEFAULT 'private',
+  `userAccount` varchar(50) DEFAULT NULL,
+  `ip` varchar(15) DEFAULT NULL,
+  `dt` datetime DEFAULT NULL,
+  `flag` tinyint(3) unsigned DEFAULT NULL
+) ENGINE=ARCHIVE DEFAULT CHARSET=utf8;
+INSERT INTO loginLog_a SELECT * FROM loginLog WHERE dt<CURDATE() - INTERVAL 1 DAY;
+DELETE FROM loginLog WHERE dt<CURDATE() - INTERVAL 1 DAY;
+alter table loginLog ADD INDEX IDX_puf (policy,userAccount,flag);
+alter table loginLog ADD INDEX IDX_pudf (policy,userAccount,dt,flag);
diff --git a/mayor-orig/mayor-base/update/pre003079-0.sh b/mayor-orig/mayor-base/update/pre003079-0.sh
new file mode 100644
index 00000000..f2a48bde
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre003079-0.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+FILE="$BASEDIR/www/skin/classic/base/css/head.css"
+
+echo " Felesleges állományok törlése:"
+    echo -n "          $BASEDIR/$FILE ... "
+    if [ -e "$BASEDIR/$FILE" ]; then
+        rm -f "$BASEDIR/$FILE"
+        echo "törölve."
+    else
+        echo "nincs."
+    fi
+echo " Kész."
\ No newline at end of file
diff --git a/mayor-orig/mayor-base/update/pre003396-1-mayor_login.sql b/mayor-orig/mayor-base/update/pre003396-1-mayor_login.sql
new file mode 100644
index 00000000..3d1899f2
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre003396-1-mayor_login.sql
@@ -0,0 +1,41 @@
+
+DELIMITER $$
+ DROP PROCEDURE IF EXISTS upgrade_database_3396c $$
+ CREATE PROCEDURE upgrade_database_3396c()
+ -- READS SQL DATA
+ BEGIN
+    DECLARE done INT DEFAULT FALSE;
+    DECLARE DB VARCHAR(255);
+    DECLARE statement TEXT;
+    DECLARE cur1
+        CURSOR FOR
+	SELECT DISTINCT TABLE_SCHEMA FROM information_schema.TABLES WHERE TABLE_SCHEMA LIKE 'mayor\_%';
+    DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+    OPEN cur1;
+    lo: LOOP
+	IF done = TRUE THEN
+	    LEAVE lo;
+	END IF;
+
+        FETCH cur1 INTO DB;
+
+	IF NOT EXISTS (
+	    SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DB COLLATE utf8_general_ci AND TABLE_NAME='mayorUpdateLog'
+	) THEN
+	    SET @statement = CONCAT('CREATE TABLE ',DB,'.`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;');
+	    PREPARE command FROM @statement;
+	    EXECUTE command;
+	    DEALLOCATE PREPARE  command;
+	END IF;
+
+    END LOOP;
+    CLOSE cur1;
+ END; $$
+DELIMITER ; $$
+
+CALL upgrade_database_3396c();
diff --git a/mayor-orig/mayor-base/update/pre003738-1-mayor_login.sql b/mayor-orig/mayor-base/update/pre003738-1-mayor_login.sql
new file mode 100644
index 00000000..7b44f6e2
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre003738-1-mayor_login.sql
@@ -0,0 +1,25 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_3738 $$
+CREATE PROCEDURE upgrade_database_3738()
+BEGIN
+
+SET NAMES utf8 COLLATE utf8_hungarian_ci;
+
+CREATE TABLE IF NOT EXISTS accountRecovery (
+    `recoveryId` INTEGER(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+    `policy` enum('private','parent','public') COLLATE utf8_hungarian_ci NOT NULL,
+    `userAccount` varchar(32) COLLATE utf8_hungarian_ci NOT NULL,
+    `selector` CHAR(16),
+    `token` CHAR(64),
+    `expires` DATETIME,
+    PRIMARY KEY(`recoveryId`),
+    KEY(`selector`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
+END $$
+DELIMITER ;
+CALL upgrade_database_3738();
+
+
+
+
diff --git a/mayor-orig/mayor-base/update/pre003760-1-mayor_login.sql b/mayor-orig/mayor-base/update/pre003760-1-mayor_login.sql
new file mode 100644
index 00000000..e2fa02fc
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre003760-1-mayor_login.sql
@@ -0,0 +1,34 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_3760 $$
+CREATE PROCEDURE upgrade_database_3760()
+BEGIN
+IF NOT EXISTS (
+    SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='mayorKeychain'
+) THEN
+  CREATE TABLE `mayorKeychain` (
+  `dt` date DEFAULT NULL,
+  `OMKod` mediumint(8) unsigned zerofill NOT NULL DEFAULT '00000000',
+  `publicKey` text COLLATE utf8_hungarian_ci NOT NULL,
+  `valid` tinyint(1) unsigned NOT NULL DEFAULT '1',
+  `naploUrl` varchar(255) COLLATE utf8_hungarian_ci NOT NULL,
+  PRIMARY KEY (`OMKod`,`valid`)
+  ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+ELSE
+    IF NOT EXISTS (
+	SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND COLUMN_NAME='naploUrl'
+    ) THEN
+	ALTER TABLE mayorKeychain ADD `naploUrl` varchar(255) NOT NULL;
+    END IF;
+END IF;
+
+END $$
+DELIMITER ; $$
+CALL upgrade_database_3760();
+
+INSERT IGNORE INTO mayorKeychain (dt,OMKod,publicKey,valid,naploUrl)
+VALUES (CURDATE(), '09862967','-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbMFUWy0Juy/7uHROaLOMPSHMI
+Vw/jSmEAKW6lCeIOH2oUVsAQkgsZCFiKqQhH3WbtLrAzSmOA7+rEU3RtgXtPZpHN
+2UUPQqoHWoMOkumfIS5oM0sQgSQ738TC0X9yxZlNqZtdpdCa0zjVnGLxqVVhS3KD
++O8uuA7jQwczlSqWJwIDAQAB
+-----END PUBLIC KEY-----',1,'https://www.mayor.hu');
diff --git a/mayor-orig/mayor-base/update/pre003763-1-mayor_login.sql b/mayor-orig/mayor-base/update/pre003763-1-mayor_login.sql
new file mode 100644
index 00000000..7c363519
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre003763-1-mayor_login.sql
@@ -0,0 +1,36 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_3763 $$
+CREATE PROCEDURE upgrade_database_3763()
+BEGIN
+    IF NOT EXISTS (
+	SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND COLUMN_NAME='nev'
+    ) THEN
+	ALTER TABLE mayorKeychain 
+	ADD `nev` varchar(128) default NULL,
+	ADD `rovidNev` varchar(16) default NULL,
+	ADD `cimHelyseg` varchar(32) default NULL,
+	ADD `cimIrsz` varchar(8) default NULL,
+	ADD `cimKozteruletNev` varchar(32) default NULL,
+	ADD `cimKozteruletJelleg` varchar(32) default NULL,
+	ADD `cimHazszam` varchar(20) default NULL,
+	ADD `telefon` varchar(64) default NULL,
+	ADD `fax` varchar(64) default NULL,
+	ADD `email` varchar(96) default NULL,
+	ADD `honlap` varchar(96) default NULL,
+	ADD `kapcsolatNev` varchar(128) default NULL,
+	ADD `kapcsolatEmail` varchar(96) default NULL,
+	ADD `kapcsolatTelefon` varchar(64) default NULL,
+	ADD `mayorTipus` ENUM('intézmény','fenntartó','backup','fejlesztői','boss') DEFAULT 'intézmény';
+    END IF;
+END $$
+DELIMITER ; $$
+CALL upgrade_database_3763();
+
+DELETE FROM mayorKeychain WHERE OMKod=9862967;
+INSERT IGNORE INTO mayorKeychain (dt,OMKod,publicKey,valid,naploUrl,mayorTipus)
+VALUES (CURDATE(), '09862967','-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbMFUWy0Juy/7uHROaLOMPSHMI
+Vw/jSmEAKW6lCeIOH2oUVsAQkgsZCFiKqQhH3WbtLrAzSmOA7+rEU3RtgXtPZpHN
+2UUPQqoHWoMOkumfIS5oM0sQgSQ738TC0X9yxZlNqZtdpdCa0zjVnGLxqVVhS3KD
++O8uuA7jQwczlSqWJwIDAQAB
+-----END PUBLIC KEY-----',1,'https://www.mayor.hu','boss');
diff --git a/mayor-orig/mayor-base/update/pre003856-1-mayor_login.sql b/mayor-orig/mayor-base/update/pre003856-1-mayor_login.sql
new file mode 100644
index 00000000..3c7a8c25
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre003856-1-mayor_login.sql
@@ -0,0 +1,16 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_3856 $$
+CREATE PROCEDURE upgrade_database_3856()
+BEGIN
+    IF NOT EXISTS (
+	SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='facebookConnect'
+    ) THEN
+    CREATE TABLE `facebookConnect` (
+  `fbUserId` bigint(20) NOT NULL,
+  `userAccount` varchar(64) COLLATE utf8_hungarian_ci NOT NULL,
+  `policy` enum('public','parent','private') COLLATE utf8_hungarian_ci DEFAULT NULL
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+END IF;
+END $$
+DELIMITER ; $$
+CALL upgrade_database_3856();
diff --git a/mayor-orig/mayor-base/update/pre003858-1-mayor_login.sql b/mayor-orig/mayor-base/update/pre003858-1-mayor_login.sql
new file mode 100644
index 00000000..804ceb46
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre003858-1-mayor_login.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_3858 $$
+CREATE PROCEDURE upgrade_database_3858()
+BEGIN
+    IF EXISTS (
+	SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='facebookConnect'
+    ) THEN
+    ALTER TABLE facebookConnect ADD UNIQUE INDEX (fbUserId);
+END IF;
+END $$
+DELIMITER ; $$
+CALL upgrade_database_3858();
diff --git a/mayor-orig/mayor-base/update/pre003860-1-mayor_login.sql b/mayor-orig/mayor-base/update/pre003860-1-mayor_login.sql
new file mode 100644
index 00000000..239c81ff
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre003860-1-mayor_login.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_3860 $$
+CREATE PROCEDURE upgrade_database_3860()
+BEGIN
+    IF NOT EXISTS (
+	SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='facebookConnect' AND COLUMN_NAME='fbUserCn'
+    ) THEN
+    ALTER TABLE facebookConnect ADD fbUserCn varchar(64), ADD fbUserEmail varchar(64), ADD studyId varchar(12);
+END IF;
+END $$
+DELIMITER ; $$
+CALL upgrade_database_3860();
diff --git a/mayor-orig/mayor-base/update/pre003950-1-mayor_login.sql b/mayor-orig/mayor-base/update/pre003950-1-mayor_login.sql
new file mode 100644
index 00000000..66918fb2
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre003950-1-mayor_login.sql
@@ -0,0 +1,33 @@
+
+alter table mayorKeychain change `naploUrl` `url` varchar(255) COLLATE utf8_hungarian_ci NOT NULL;
+alter table mayorKeychain add column `nodeId` mediumint(8) unsigned zerofill NOT NULL DEFAULT '00000000' first;
+alter table mayorKeychain change column `mayorTipus` `nodeTipus` enum('intézmény','fenntartó','backup','fejlesztői','controller','boss') COLLATE utf8_hungarian_ci DEFAULT 'intézmény' after `nodeId`;
+update mayorKeychain set nodeTipus='controller',url='https://www.mayor.hu' where OMKod='09862967';
+alter table mayorKeychain modify column `nodeTipus` enum('intézmény','fenntartó','backup','fejlesztői','controller') COLLATE utf8_hungarian_ci DEFAULT 'intézmény' after `nodeId`;
+
+update mayorKeychain set `nodeId`=`OMKod` where `OMKod`<>'00000000' and `nodeId`='00000000';
+-- duplikátumok kiszűrése, módosítása... hogyan?
+alter table mayorKeychain drop primary key;
+alter table mayorKeychain add primary key (`nodeId`);
+
+alter table mayorSsl add column `nodeId` mediumint(8) unsigned zerofill NOT NULL DEFAULT '00000000' after `sslId`;
+-- valahogy be kell állítani a saját nodeId-t... Esetleg publicKey segítségével a reg. szervertől...
+
+
+
+-- -- portal-mayor.regisztracio --
+
+-- alter table regisztracio add column `nodeId` mediumint(8) unsigned zerofill NOT NULL DEFAULT '00000000' after `regId`;
+-- alter table regisztracio add column `nodeTipus` enum('intézmény','fenntartó','backup','fejlesztői','controller') COLLATE utf8_hungarian_ci DEFAULT 'intézmény' after `nodeId`;
+-- alter table regisztracio change `naploUrl` `url` varchar(255) COLLATE utf8_hungarian_ci NOT NULL;
+
+-- update regisztracio set nodeTipus='controller',url='https://www.mayor.hu' where OMKod='09862967';
+-- -- a valid mező nem tudom mire kell...
+-- update regisztracio set `nodeId`=`OMKod` where `OMKod`<>'00000000' and `nodeId`='00000000';
+-- alter table regisztracio add unique key (`nodeId`);
+-- -- publicKey tördelése --
+-- update regisztracio set publicKey = concat_ws('\n','-----BEGIN PUBLIC KEY-----',mid(publicKey,27,64),mid(publicKey,91,64),mid(publicKey,155,64),
+-- mid(replace(publicKey,'-----END PUBLIC KEY-----',''),219,64),nullif(mid(replace(publicKey,'-----END PUBLIC KEY-----',''),283,64),''),
+-- nullif(mid(replace(publicKey,'-----END PUBLIC KEY-----',''),347,64),''),nullif(mid(replace(publicKey,'-----END PUBLIC KEY-----',''),411,64),''),
+-- '-----END PUBLIC KEY-----') where publicKey not like '%\n%';
+
diff --git a/mayor-orig/mayor-base/update/pre003950-2.sh b/mayor-orig/mayor-base/update/pre003950-2.sh
new file mode 100644
index 00000000..e913c1d4
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre003950-2.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+FILES="mayor-base/www/policy/public/portal/rpc/rpc.php
+mayor-portal-mayor/www/policy/public/portal/regisztracio/regisztracio.php
+mayor-portal-mayor/www/skin/mayor/module-portal/css/regisztracio
+mayor-portal-mayor/www/skin/mayor/module-portal/css/regisztracio/regisztracio.css
+mayor-portal-mayor/www/skin/mayor/module-portal/html/regisztracio
+mayor-portal-mayor/www/skin/mayor/module-portal/html/regisztracio/regisztracio.phtml"
+
+echo " 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
+echo " Kész."
\ No newline at end of file
diff --git a/mayor-orig/mayor-base/update/pre003958-1-mayor_login.sql b/mayor-orig/mayor-base/update/pre003958-1-mayor_login.sql
new file mode 100644
index 00000000..9a1c17b5
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre003958-1-mayor_login.sql
@@ -0,0 +1,3 @@
+
+update mayorKeychain set nev='MaYoR HU',cimHelyseg='Budapest' where OMKod='09862967';
+
diff --git a/mayor-orig/mayor-base/update/pre004179-1-mayor_login.sql b/mayor-orig/mayor-base/update/pre004179-1-mayor_login.sql
new file mode 100644
index 00000000..66d18869
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre004179-1-mayor_login.sql
@@ -0,0 +1,22 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4179 $$
+CREATE PROCEDURE upgrade_database_4179()
+BEGIN
+    IF NOT EXISTS (
+        SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='googleConnect'
+    ) THEN
+
+CREATE TABLE `googleConnect` (
+  `googleSub` varchar(32) COLLATE utf8_hungarian_ci DEFAULT NULL,
+  `userAccount` varchar(64) COLLATE utf8_hungarian_ci NOT NULL,
+  `policy` enum('public','parent','private') COLLATE utf8_hungarian_ci DEFAULT NULL,
+  `googleUserCn` varchar(64) COLLATE utf8_hungarian_ci DEFAULT NULL,
+  `googleUserEmail` varchar(64) COLLATE utf8_hungarian_ci DEFAULT NULL,
+  `studyId` varchar(12) COLLATE utf8_hungarian_ci DEFAULT NULL,
+  UNIQUE KEY `googleSub` (`googleSub`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
+END IF;
+END $$
+DELIMITER ; $$
+CALL upgrade_database_4179();
diff --git a/mayor-orig/mayor-base/update/pre004356-1-mayor_login.sql b/mayor-orig/mayor-base/update/pre004356-1-mayor_login.sql
new file mode 100644
index 00000000..8a8a5440
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre004356-1-mayor_login.sql
@@ -0,0 +1,21 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4356 $$
+CREATE PROCEDURE upgrade_database_4356()
+BEGIN
+    IF NOT EXISTS (
+        SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='eduroam'
+    ) THEN
+
+CREATE TABLE `eduroam` (
+    `userAccount` varchar(64) COLLATE utf8_hungarian_ci NOT NULL,
+    `policy` enum('public','parent','private') COLLATE utf8_hungarian_ci DEFAULT NULL,
+    `eduroamUID` varchar(32)  COLLATE utf8_hungarian_ci NOT NULL,
+    `eduroamPASSWORD` varchar(128) COLLATE utf8_hungarian_ci NOT NULL,
+    `eduroamAFFILIATION` ENUM ('staff','faculty','student','') DEFAULT '',
+    `modositasDt` datetime DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
+END IF;
+END $$
+DELIMITER ; $$
+CALL upgrade_database_4356();
diff --git a/mayor-orig/mayor-base/update/pre004388-1-mayor_login.sql b/mayor-orig/mayor-base/update/pre004388-1-mayor_login.sql
new file mode 100644
index 00000000..f0d7b148
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre004388-1-mayor_login.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4388 $$
+CREATE PROCEDURE upgrade_database_4388()
+BEGIN
+    IF NOT EXISTS (
+        SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='eduroam' AND COLUMN_NAME='eduroamDOMAIN'
+    ) THEN
+ALTER TABLE `eduroam` ADD `eduroamDOMAIN` varchar(128) COLLATE utf8_hungarian_ci NOT NULL;
+END IF;
+END $$
+DELIMITER ; $$
+CALL upgrade_database_4388();
diff --git a/mayor-orig/mayor-base/update/pre004412-1-mayor_login.sql b/mayor-orig/mayor-base/update/pre004412-1-mayor_login.sql
new file mode 100644
index 00000000..b1b414ae
--- /dev/null
+++ b/mayor-orig/mayor-base/update/pre004412-1-mayor_login.sql
@@ -0,0 +1,27 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4412 $$
+CREATE PROCEDURE upgrade_database_4412()
+BEGIN
+    IF NOT EXISTS (
+        SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='authToken' 
+    ) THEN
+
+CREATE TABLE `authToken` (
+  `tokenId` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `policy` enum('private','parent','public') COLLATE utf8_hungarian_ci NOT NULL,
+  `userAccount` varchar(32) COLLATE utf8_hungarian_ci NOT NULL,
+  `userCn` varchar(64) COLLATE utf8_hungarian_ci NOT NULL,
+  `studyId` bigint(20) unsigned DEFAULT NULL,
+  `selector` char(16) COLLATE utf8_hungarian_ci DEFAULT NULL,
+  `token` char(64) COLLATE utf8_hungarian_ci DEFAULT NULL,
+  `expires` datetime DEFAULT NULL,
+  `ipAddress` varchar(64) COLLATE utf8_hungarian_ci DEFAULT NULL,
+  `activity` datetime DEFAULT NULL,
+  PRIMARY KEY (`tokenId`),
+  UNIQUE KEY `selector` (`selector`)
+) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
+END IF;
+END $$
+DELIMITER ; $$
+CALL upgrade_database_4412();
diff --git a/mayor-orig/mayor-base/update/processUpdateScripts.sh b/mayor-orig/mayor-base/update/processUpdateScripts.sh
new file mode 100644
index 00000000..1a29835f
--- /dev/null
+++ b/mayor-orig/mayor-base/update/processUpdateScripts.sh
@@ -0,0 +1,269 @@
+#!/bin/bash
+
+source $BASEDIR/update/linkme.sh
+
+# Setting Mysql Connection Parameters
+echo -e "[mysqld]
+character-set-server = utf8
+collation-server = utf8_hungarian_ci
+skip-character-set-client-handshake
+[client]
+host=$MYSQL_HOST
+user=$MYSQL_USER
+password=$MYSQL_PW
+" > $BASEDIR/config/my.cnf
+
+PRECHARSET="SET NAMES 'utf8' COLLATE 'utf8_hungarian_ci'; "
+#PRECHARSET="$PRECHARSET SET collation_connection = utf8_hungarian_ci; "
+
+MYSQL_CONFIG="--defaults-extra-file=$BASEDIR/config/my.cnf"
+MYSQL_PARAMETERS=""
+TEST=`$MYSQL -h$MYSQL_HOST -u$MYSQL_USER -p$MYSQL_PW -e exit 2>&1 >/dev/null`
+if [ $? == "0" ]; then
+    echo "SQL-connect test #2 OK"
+    MYSQL_PARAMETERS="-h$MYSQL_HOST -u$MYSQL_USER -p$MYSQL_PW"
+else
+    echo "Hibás SQL csatlakozás(2)"
+fi
+TEST=`$MYSQL $MYSQL_CONFIG -e exit 2>&1 >/dev/null`
+if [ $? == "0" ]; then 
+    echo "SQL-connect test #1 OK"
+    MYSQL_PARAMETERS=$MYSQL_CONFIG
+else
+    echo "Hibás SQL csatlakozás(1)"
+fi
+echo "Karakterkódolás ellenőrzése"
+echo "SHOW VARIABLES LIKE 'character%';" | $MYSQL $MYSQL_PARAMETERS
+# patch by Acsai Gabor <acsi@c3.hu> - FreeBSD
+TEST=`echo "SHOW VARIABLES LIKE 'character_set_client'" | $MYSQL $MYSQL_PARAMETERS | grep utf8 | wc -l | tr -d " "`
+if [ "x${TEST}" == "x1" ]; then
+    echo "SQL-UTF8 test OK"
+else
+    echo -e "\n\nERROR: Hibás - nem utf8 - MySQL kliens karakterkódolás!\n"
+    echo -e "Ellenőrizd a beállításokat és kérj segítséget a support@mayor.hu -n!\n"
+    exit 12
+fi
+# --
+
+run_script() {
+    # FILEELEJE=`echo $FILE | cut -f 1 -d '-'`
+    # patch by Acsai Gabor <acsi@c3.hu> - FreeBSD
+    FILEELEJE=$(basename $FILE | cut -f 1 -d '-')
+    FILEREV=${FILEELEJE: -6}
+    LOGSQL=""
+    if [ "$FILEREV" != "" ]; then
+	if [ "$FILEREV" -gt 3399 ]; then
+	    LOGSQL="INSERT IGNORE mayorUpdateLog (scriptFile) VALUES ('${FILE}')"
+	fi
+    fi
+    if [ ! "${FILEREV}" \< "${REVSTR}" ]; then
+	# FILEEXT=`echo $FILE | cut -f 2 -d '.'`
+	# patch by Acsai Gabor <acsi@c3.hu> - FreeBSD
+	FILEEXT=$(basename $FILE | cut -f 2 -d '.')
+	if [ "$FILEEXT" == "sh" ]; then
+	    echo "    - Szkript futtatása ($FILE)..."
+	    . $FILE
+	    if [ $? != 0 ]; then exit 13; fi
+	elif [ "$FILEEXT" == "sql" ]; then
+	    echo "    - SQL utasítások végrehajtása ($FILE)..."
+	    # FILEDB=`echo $FILE | cut -f 1 -d '.' | cut -f 3 -d '-'`
+	    # patch by Acsai Gabor <acsi@c3.hu> - FreeBSD
+	    FILEDB=$(basename $FILE | cut -f 1 -d '.' | cut -f 3 -d '-')
+	    case "$FILEDB" in
+	        naplo)
+		    DBS=$DB_NAPLO
+	        ;;
+	        intezmeny)
+		    DBS=$DB_INTEZMENY
+	        ;;
+	        auth)
+		    DBS=$DB_AUTH
+	        ;;
+	        *)
+		    DBS=$FILEDB
+	        ;;
+	    esac
+	    for DB in $DBS; do
+		echo -e "\n        $DB..."
+
+		if [ "$FILEREV" != "" ]; then
+		    if [ "$FILEREV" -gt 3399 ]; then
+			TEST=`echo "SELECT count(*) as db FROM information_schema.TABLES WHERE TABLE_SCHEMA='${DB}' and TABLE_NAME='mayorUpdateLog'" | $MYSQL $MYSQL_PARAMETERS $DB | grep -v "db"`
+			if [ "$TEST" == "0" ]; then 
+			    echo "      Hiányzik a mayorUpdateLog tábla... tovább..."
+			    continue
+			fi
+		    fi
+		fi
+
+		case "$FILEDB" in
+		    naplo)
+			INTEZMENYDB=`echo $DB | sed -e 's/\(naplo_\)\(.*\)\(_.*\)/intezmeny_\2/'`
+			INTEZMENYROVIDNEV=`echo $DB | cut -f 2 -d '_'`
+			TANEV=`echo $DB | cut -f 3 -d '_'`
+			(cat $FILE && echo "${LOGSQL}") | sed -e "s/%INTEZMENYDB%/$INTEZMENYDB/g" | sed -e "s/%INTEZMENY%/$INTEZMENYROVIDNEV/g" | \
+				    sed -e "s/%TANEV%/$TANEV/g" | $MYSQL $MYSQL_PARAMETERS $DB
+		    ;;
+		    auth)
+			(cat $FILE && echo "${LOGSQL}") | sed -e "s/%MYSQL_ENCODE_STR%/$MYSQL_ENCODE_STR/g" | $MYSQL $MYSQL_PARAMETERS $DB
+		    ;;
+		    intezmeny)
+			INTEZMENYROVIDNEV=`echo $DB | cut -f 2 -d '_'`
+			(cat $FILE && echo "${LOGSQL}") | sed -e "s/%INTEZMENY%/$INTEZMENYROVIDNEV/g" | $MYSQL $MYSQL_PARAMETERS $DB
+		    ;;
+		    *)
+			(cat $FILE && echo "${LOGSQL}") | $MYSQL $MYSQL_PARAMETERS $DB
+		    ;;
+		esac
+		if [ $? != 0 ]; then 
+		    exit 13; 
+		fi
+	    done
+	    [ ! -z $SQLLOG ] && echo $FILE >> $SQLLOG; 
+	fi
+    fi
+}
+
+echo "   Az új változat verziószáma: $UJ_REV"
+
+REVSTR=`printf "%06d" $REV`
+MYSQL_ENCODE_STR=`grep _MYSQL_ENCODE_STR $BASEDIR/config/main-config.php | sed -e "s/define('_MYSQL_ENCODE_STR','\(.*\)');/\\1/"`
+
+# mysql host beállítása
+if [ "$MYSQL_HOST" == "" ]; then
+    MYSQL_HOST="localhost"
+fi
+echo "   A MySQL backend a következő lesz: $MYSQL_HOST"
+echo "   Figyelem! MySQL Master-Slave architekturát az upgrade script jelenleg nem támogat!!!"
+
+echo -e "\n * Adatbázisok lekérdezése..."
+if [ -f $MYSQL ]
+then
+    DB_MAYOR=`$MYSQL $MYSQL_PARAMETERS -e"SHOW DATABASES LIKE 'mayor\_%'" | grep -e '^mayor\_[^_]*$'`
+    DB_NAPLO=`$MYSQL $MYSQL_PARAMETERS -e"SHOW DATABASES LIKE 'naplo\_%\_%'" | grep -e '^naplo\_[^\_]*\_20[0-9][0-9]$'`
+    DB_INTEZMENY=`$MYSQL $MYSQL_PARAMETERS -e"SELECT CONCAT('intezmeny_',rovidNev) FROM mayor_naplo.intezmeny" | grep -e '^intezmeny\_[^\_]*$'`
+#    DB_INTEZMENY=`$MYSQL $MYSQL_PARAMETERS -e"SHOW DATABASES LIKE 'intezmeny\_%'" | grep -e '^intezmeny\_[^\_]*$'`
+    if [ $? != 0 ]; then exit 12; fi
+    DB_AUTH=""
+    for DB in $DB_MAYOR; do
+	if [ "$DB" == "mayor_parent" -o "$DB" == "mayor_private" -o "$DB" == "mayor_public" ]; then
+	    DB_AUTH="$DB_AUTH $DB"
+	fi
+    done
+else
+    echo -e "\n\nERROR: A mysql kliens nem található: $MYSQL\n"
+    exit 12
+fi
+
+if [ "$SKIPLOCK" != "1" ]; then
+    if [ ! -z $LOCKFILE ]; then
+	echo -e "\n * A web-es elérés letiltása:"
+	echo -n "    - Lock-file létrehozása... "
+	echo "$DATE: Update process runing... " > $LOCKFILE
+	echo "kész."
+
+	echo -n "    - Aktív munkamenetek törlése... "
+	$MYSQL $MYSQL_PARAMETERS -e"DELETE FROM mayor_login.session"
+	echo "kész."
+    fi
+else
+	echo -e "\n * A lock-olást a kérésedre kihagyjuk..."
+fi
+
+echo -e "\n * Az előzetes frissítő állományok feldolgozása (pre*, rev*):\n"
+for FILE in `ls $UPDATEDIR/rev* $UPDATEDIR/pre* | sort`; do
+    run_script
+done
+
+if [ "$EXECONLY" != "1" ]; then
+    echo -e "\n * A modulok állományainak frissítése:\n"
+    for MODULE in $MODULES; do
+	echo -e "\n     $MODULE... \n"
+	if [ "$HTTP_SERVER" == '' ]; then
+	    $SVN --force --quiet export svn+ssh://svn.mayor.hu/var/svn/trunk/$MODULE "$BASEDIR"
+	    if [ $? != 0 ]; then exit 13; fi
+	else
+	    # Ha rpm csomag futtatja, akkor már ki van csomagolva minden és nincs md5sum
+	    if [ -f $TMPDIR/md5sum ]; then 
+		MOD=`echo $MODULE | sed "s#/#-#"`
+		FILE=`grep "$MOD-rev" $TMPDIR/md5sum | cut -d ' ' -f 3`
+		if [ -f $TMPDIR/$FILE ]; then
+    		    tar xfz $TMPDIR/$FILE -C $BASEDIR
+		    if [ $? != 0 ]; then exit 13; fi
+		fi
+	    fi
+	fi
+    done
+    if [ -d $TMPDIR ]; then rm -rf $TMPDIR; fi
+    echo -e "\nkész.\n"
+fi
+
+echo -e "\n * Az utólagos frissítő állományok feldolgozása (post*):\n"
+for FILE in `ls $UPDATEDIR/post* | sort`; do
+    run_script
+done
+
+
+if [ -e $LOCKFILE ]; then
+    if [ ! -z $LOCKFILE ]; then
+    echo -e "\n * A web-es hozzáférés engedélyezése:"
+    rm $LOCKFILE
+    fi
+fi
+
+if [ "$EXECONLY" != "1" ]; then
+    echo -e "\n * A szükséges jogosultságok beállítása:"
+    chmod +x $BASEDIR/bin/mayor
+    echo -n "  ... "
+    chown -R $WEB_SERVER_USER $BASEDIR/download
+    chown -R $WEB_SERVER_USER $BASEDIR/cache
+    if [ -d $BASEDIR/www/wiki/conf ]; then
+        chown -R $WEB_SERVER_USER $BASEDIR/www/wiki/conf $BASEDIR/www/wiki/data
+    fi
+    chown $WEB_SERVER_USER $BASEDIR/config
+    chmod 700 $BASEDIR/config
+    echo -e "... kész.\n"
+
+    echo -e "\n * Szimbolikus linkek ellenőrzése/létrehozása"
+    POLICIES="parent public"
+    for POLICY in $POLICIES; do
+        eval "LIST=\$${POLICY}Link"
+        for f in $LIST; do
+            DIR=`echo $f | cut -d / -f 1-2`
+            if [ ! -d $BASEDIR/www/policy/$POLICY/$DIR ]; then
+                echo "    Könyvtár: $BASEDIR/www/policy/$POLICY/$DIR"
+                mkdir -p $BASEDIR/www/policy/$POLICY/$DIR
+            fi
+            FILES="$f-pre.php $f.php"
+            for file in $FILES; do
+                if [ ! -e $BASEDIR/www/policy/$POLICY/$file ]; then
+                    if [ -f $BASEDIR/www/policy/private/$file ]; then
+                        echo "      $BASEDIR/www/policy/private/$file --> $BASEDIR/www/policy/$POLICY/$file"
+                        ln -s $BASEDIR/www/policy/private/$file $BASEDIR/www/policy/$POLICY/$file
+                    else
+                        echo "      Hiányzó file: $BASEDIR/www/policy/private/$file"
+                    fi
+                fi
+            done
+        done
+        eval "DLIST=\$${POLICY}Deny"
+        for f in $DLIST; do
+            FILES="$f-pre.php $f.php"
+            for file in $FILES; do
+                if [ -e $BASEDIR/www/policy/$POLICY/$file ]; then
+                    echo "      $BASEDIR/www/policy/$POLICY/$file link(file) törlése"
+                    rm "$BASEDIR/www/policy/$POLICY/$file"
+                fi
+            done
+        done
+    done
+fi # execonly
+
+echo -e "\n * Az frissített verziószám rögzítése ($UJ_REV)"
+if [ "$UJ_REV" -gt 0 ]; then 
+    echo $UJ_REV > $REVISION_FILE
+else
+    echo "      Hibás (nulla) verziószám! Nem rögzítjük."
+fi
+
+[ -x "$LOCAL_UPDATE_SCRIPT" ] && echo -e "\n * Helyi szkript futtatása: $LOCAL_UPDATE_SCRIPT...\n " && . "$LOCAL_UPDATE_SCRIPT"
diff --git a/mayor-orig/mayor-base/update/rev001167-1.sh b/mayor-orig/mayor-base/update/rev001167-1.sh
new file mode 100644
index 00000000..0057aadf
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev001167-1.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo -ne "\n          Az update.conf file jogosultságainak beállítása ... "
+# nem kell ellenőrizni, mert ilyen állomány biztosan van - ha eljutottunk idáig
+chmod 0600 $BASEDIR/config/update.conf
+chown root.root $BASEDIR/config/update.conf
+echo "kész."
+
diff --git a/mayor-orig/mayor-base/update/rev001174-1.sh b/mayor-orig/mayor-base/update/rev001174-1.sh
new file mode 100644
index 00000000..6cab9e63
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev001174-1.sh
@@ -0,0 +1,167 @@
+#!/bin/bash
+
+echo "          - A main-config.php áthelyezése"
+if [ -f $BASEDIR/www/include/config/main-config.php ]; then
+    echo -n "             $BASEDIR/www/include/config/main-config.php --> "
+    mv $BASEDIR/www/include/config/main-config.php $BASEDIR/config/main-config.php
+    echo "$BASEDIR/config/main-config.php"
+else
+    echo "             $BASEDIR/www/include/config/main-config.php -- nincs!!"
+fi
+
+echo "          - Az esetleg létező main-config.php.example törlése"
+if [ -f $BASEDIR/www/include/config/main-config.php.example ]; then
+    echo -n "             $BASEDIR/www/include/config/main-config.php.example -- "
+    rm $BASEDIR/www/include/config/main-config.php.example
+    echo "törölve"
+else
+    echo "             $BASEDIR/www/include/config/main-config.php.example -- nincs"
+fi
+
+echo "          - A config/base könyvtár létrehozása"
+if [ ! -d $BASEDIR/config/base ]; then
+    echo -n "             A könyvtár létrehozása: "
+    mkdir $BASEDIR/config/base
+    echo "$BASEDIR/config/base"
+fi
+
+echo "          - A modulok konfig álloményainak áthelyezése - ha volnának"
+if [ `ls -l $BASEDIR/www/include/config/module* 2>/dev/null | wc -l` \> 0 ]; then
+    echo -n "             A modulok konfigurációs állományainak áthelyezése ... "
+    cp $BASEDIR/www/include/config/module* $BASEDIR/config/base/
+    rm $BASEDIR/www/include/config/module*
+    echo "kész."
+fi
+
+echo "          - A _MAYOR_DIR és _CONFIGDIR konstansok bevezetése a main-config.php-ben"
+if [ -f $BASEDIR/config/main-config.php ]; then
+    sed -r -i.rev1174  \
+	-e "s#_BASEDIR','(.*)/www.*#_MAYOR_DIR','\1');\ndefine('_BASEDIR',_MAYOR_DIR.'/www');\ndefine('_CONFIGDIR',_MAYOR_DIR.'/config');#" \
+	-e "s#_DATADIR','.*'#_DATADIR',_MAYOR_DIR.'/data'#" \
+	-e "s#_DOWNLOAD_DIR','.*'#_DOWNLOADDIR',_MAYOR_DIR.'/download'#" \
+	-e "s#'include/config/'#_CONFIGDIR.'/base/'#" $BASEDIR/config/main-config.php
+    echo "             kész."
+else
+    echo -e "\n\nERROR: Hiányzó konfigurációs file: $BASEDIR/config/main-config.php\n"
+    exit 1
+fi
+
+echo "          - A policy-k konfigurációs állományainak áthelyezése"
+for policy in private parent public; do
+    if [ -f $BASEDIR/www/include/config/$policy-conf.php ]; then
+	echo -n "             $BASEDIR/www/include/config/$policy-conf.php --> "
+	mv $BASEDIR/www/include/config/$policy-conf.php $BASEDIR/config/$policy-conf.php
+	echo "$BASEDIR/config/$policy-conf.php"
+    else
+	echo "             $BASEDIR/www/include/config/$policy-conf.php -- nincs"
+    fi
+done
+
+echo "          - A policy-k konfigurációs állományainak minta állományait töröljük (.example)"
+for policy in private parent public; do
+    if [ -f $BASEDIR/www/include/config/$policy-conf.php.example ]; then
+	echo -n "             $BASEDIR/www/include/config/$policy-conf.php.example -- "
+	rm $BASEDIR/www/include/config/$policy-conf.php.example
+	echo "törölve"
+    else
+	echo "             $BASEDIR/www/include/config/$policy-conf.php.example -- nincs"
+    fi
+done
+
+echo "          - A modulok base/config.php-inek áthelyezése"
+for module in naplo portal forum felveteli honosito; do
+    if [ -f $BASEDIR/www/include/modules/$module/base/config.php ]; then
+	if [ ! -d $BASEDIR/config/module-$module ]; then
+	    echo -n "             A könyvtár létrehozása: "
+	    mkdir $BASEDIR/config/module-$module
+	    echo "$BASEDIR/config/module-$module"
+	fi
+	echo -n "             $BASEDIR/www/include/modules/$module/base/config.php --> "
+	mv $BASEDIR/www/include/modules/$module/base/config.php $BASEDIR/config/module-$module/config.php
+	echo "$BASEDIR/config/module-$module/config.php"
+    else
+	echo "             $BASEDIR/www/include/modules/$module/base/config.php -- nincs"
+    fi
+done
+
+echo "          - A modulok base/config.php.example-inek törlése"
+for module in naplo portal forum felveteli honosito; do
+    if [ -f $BASEDIR/www/include/modules/$module/base/config.php.example ]; then
+	echo -n "             $BASEDIR/www/include/modules/$module/base/config.php.example -- "
+	rm $BASEDIR/www/include/modules/$module/base/config.php.example
+	echo "törölve"
+    else
+	echo "             $BASEDIR/www/include/modules/$module/base/config.php.example -- nincs"
+    fi
+done
+
+echo "          - A napló intézményi config file-jainak (és mintáinak) áthelyezése"
+if [ `ls -l $BASEDIR/www/include/modules/naplo/config-* 2>/dev/null | wc -l` \> 0 ]; then
+    echo -n "             Az intézményi konfigurációs állományok áthelyezése ... "
+    cp $BASEDIR/www/include/modules/naplo/config-* $BASEDIR/config/module-naplo
+    rm $BASEDIR/www/include/modules/naplo/config-*
+    echo "kész."
+fi
+
+echo "          - A classic skin configurációs könyvtárának létrehozása"
+if [ ! -d $BASEDIR/config/skin-classic ]; then
+    echo -n "             A könyvtár létrehozása: "
+    mkdir $BASEDIR/config/skin-classic
+    echo "$BASEDIR/config/skin-classic"
+fi
+
+echo "A pda skin configurációs könyvtárának létrehozása"
+if [ ! -d $BASEDIR/config/skin-pda ]; then
+    echo -n "             A könyvtár létrehozása: "
+    mkdir $BASEDIR/config/skin-pda
+    echo "$BASEDIR/config/skin-pda"
+fi
+
+echo "          - A skin config áthelyezése. Csak a classic skinhez!"
+if [ -f $BASEDIR/www/skin/classic/config.php ]; then 
+    echo -n "             $BASEDIR/www/skin/classic/config.php --> "
+    mv $BASEDIR/www/skin/classic/config.php $BASEDIR/config/skin-classic/config.php
+    echo "$BASEDIR/config/skin-classic/config.php"
+else
+    echo "             $BASEDIR/www/skin/classic/config.php -- nincs"
+fi
+
+echo "          - A skin config mintafile törlése"
+if [ -f $BASEDIR/www/skin/classic/config.php.example ]; then 
+    echo -n "             $BASEDIR/www/skin/classic/config.php.example -- "
+    rm $BASEDIR/www/skin/classic/config.php.example
+    echo "törölve"
+else
+    echo "             $BASEDIR/www/skin/classic/config.php.example -- nincs"
+fi
+
+echo "          - A modulok skin beállításai - csak classic skin-re!!"
+for module in naplo portal forum; do
+    if [ -f $BASEDIR/www/skin/classic/module-$module/config.php ]; then
+	echo -n "             $BASEDIR/www/skin/classic/module-$module/config.php --> "
+	mv $BASEDIR/www/skin/classic/module-$module/config.php $BASEDIR/config/skin-classic/$module-config.php
+	echo "$BASEDIR/config/skin-classic/$module-config.php"
+    else
+	echo "          $BASEDIR/www/skin/classic/module-$module/config.php -- nincs"
+    fi
+done
+
+echo "          - A modul skin beállítás minta állományok törlése"
+for module in naplo portal forum; do
+    if [ -f $BASEDIR/www/skin/classic/module-$module/config.php.example ]; then
+	echo -n "             $BASEDIR/www/skin/classic/module-$module/config.php.example -- "
+	rm $BASEDIR/www/skin/classic/module-$module/config.php.example
+	echo "törölve"
+    else
+	echo "             $BASEDIR/www/skin/classic/module-$module/config.php.example -- nincs"
+    fi
+done
+
+echo "          - /var/mayor/data/base/huhyphn.tex törlése"
+if [ -f $BASEDIR/data/base/huhyphn.tex ]; then
+    echo -n "             $BASEDIR/data/base/huhyphn.tex -- "
+    rm $BASEDIR/data/base/huhyphn.tex
+    echo "törölve"
+else
+    echo "             $BASEDIR/data/base/huhyphn.tex -- nincs"
+fi
diff --git a/mayor-orig/mayor-base/update/rev001177-1.sh b/mayor-orig/mayor-base/update/rev001177-1.sh
new file mode 100644
index 00000000..f99fab0e
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev001177-1.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+if [ -f $BASEDIR/config/backup.conf ]; then
+    . $BASEDIR/config/backup.conf
+else
+    echo -e "\n\nERROR: hiányzó konfigurációs file: $BASEDIR/config/backup.conf\n"
+    exit 1
+fi
+
+if [ ! -d $BACKUPDIR ]; then
+    echo -e "\n\nERROR: hibás mentési könyvtár: $BACKUPDIR\n"
+    exit 1
+fi
+
+if [ ! -d $BACKUPDIR/rev-$REV ]; then
+    echo -n "          - $REV. változat mentési könyvtára: "
+    mkdir $BACKUPDIR/rev-$REV
+    echo $BACKUPDIR/rev-$REV
+fi
+
+FILES='eNaploBackup.sh eNaploRestore.sh update.sh'
+echo '          - Az elavult /usr/local/sbin elavult scriptjeinek törlése...'
+for FILE in $FILES; do
+    echo -n "            /usr/local/sbin/$FILE "
+    if [ -f /usr/local/sbin/$FILE ]; then
+	mv /usr/local/sbin/$FILE $BACKUPDIR/rev-$REV/$FILE
+	echo "--> $BACKUPDIR/rev-$REV/$FILE"
+    else
+	echo "-- nincs"
+    fi
+done
+
+echo -n "          - Az új mayor szkript telepítése... "
+if [ ! -f $BASEDIR/bin/mayor ]; then
+    echo -e "\n          !! WARNING !!: Az új script még nincs letöltve\n"
+    echo -n "            Letöltés ... "
+    $SVN --force export https://svn.mayor.hu/svn/trunk/mayor-base/bin "$BASEDIR/bin" > /dev/null
+    echo -n "mayor-base/bin ... "
+    $SVN --force export https://svn.mayor.hu/svn/trunk/mayor-naplo/bin "$BASEDIR/bin" > /dev/null
+    echo -e "mayor-naplo/bin\n"
+fi
+chmod +x $BASEDIR/bin/mayor
+ln -s $BASEDIR/bin/mayor /usr/local/sbin
+echo "kész."
+
+if [ -f /etc/cron.daily/eNaplo ]; then
+    echo "          - Az elavult cron script törlése"
+    echo -n "            /etc/cron.daily/eNaplo --"
+    mv /etc/cron.daily/eNaplo $BACKUPDIR/rev-$REV/eNaplo
+    echo "> $BACKUP/rev-$REV/eNaplo"
+fi
+
+if [ -f $BASEDIR/bin/etc/cron.daily/mayor ]; then 
+    echo -n "          - Az új cron script telepítése ... "
+    cp $BASEDIR/bin/etc/cron.daily/mayor /etc/cron.daily/mayor
+    echo "kész."
+fi
+
diff --git a/mayor-orig/mayor-base/update/rev001181-1.sh b/mayor-orig/mayor-base/update/rev001181-1.sh
new file mode 100644
index 00000000..791ed988
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev001181-1.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo -ne "          - A WEB_SERVER_USER környezeti változó felvétele az update.conf állományba ... "
+echo -e "WEB_SERVER_USER=www-data\n" >> $BASEDIR/config/update.conf
+echo -e "kész.\n"
diff --git a/mayor-orig/mayor-base/update/rev001341-1-auth.sql b/mayor-orig/mayor-base/update/rev001341-1-auth.sql
new file mode 100644
index 00000000..0affd9ce
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev001341-1-auth.sql
@@ -0,0 +1,4 @@
+-- Auth adatbázis módosítása --
+
+alter table accounts modify userPassword varbinary(40);
+update accounts set userPassword=sha(decode(userPassword,'%MYSQL_ENCODE_STR%'));
diff --git a/mayor-orig/mayor-base/update/rev001351-1-auth.sql b/mayor-orig/mayor-base/update/rev001351-1-auth.sql
new file mode 100644
index 00000000..42665a1f
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev001351-1-auth.sql
@@ -0,0 +1,3 @@
+
+alter table accounts modify policy ENUM('private','parent','public') NOT NULL;
+alter table accounts modify userAccount VARCHAR(32) NOT NULL;
diff --git a/mayor-orig/mayor-base/update/rev001368-1.sh b/mayor-orig/mayor-base/update/rev001368-1.sh
new file mode 100644
index 00000000..9965624a
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev001368-1.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo "          - Az esetleg létező skin/classic/config* átmozgatása"
+if [ `ls $BASEDIR/www/skin/classic/config* | wc -l` -gt 2 ]; then
+    echo -n "             $BASEDIR/www/skin/classic/config* --> "
+    mv "$BASEDIR/www/skin/classic/config*" "$BASEDIR/config/skin-classic/"
+    echo "$BASEDIR/config/skin-classic/"
+else
+    echo "              nincs ilyen file"
+fi
diff --git a/mayor-orig/mayor-base/update/rev001387-1-mayor_login.sql b/mayor-orig/mayor-base/update/rev001387-1-mayor_login.sql
new file mode 100644
index 00000000..4262c83f
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev001387-1-mayor_login.sql
@@ -0,0 +1 @@
+alter table session modify sessionID char(40) NOT NULL;
diff --git a/mayor-orig/mayor-base/update/rev001391-1-mayor_login.sql b/mayor-orig/mayor-base/update/rev001391-1-mayor_login.sql
new file mode 100644
index 00000000..9a25fe8f
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev001391-1-mayor_login.sql
@@ -0,0 +1 @@
+--rev1393--alter table session add sessionCookie char(40) not null;
\ No newline at end of file
diff --git a/mayor-orig/mayor-base/update/rev001393-1-mayor_login.sql b/mayor-orig/mayor-base/update/rev001393-1-mayor_login.sql
new file mode 100644
index 00000000..fa38c4e8
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev001393-1-mayor_login.sql
@@ -0,0 +1 @@
+alter table session add sessionCookie char(40) not null;
\ No newline at end of file
diff --git a/mayor-orig/mayor-base/update/rev001582-1.sh b/mayor-orig/mayor-base/update/rev001582-1.sh
new file mode 100644
index 00000000..a9d79404
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev001582-1.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+if [ -e "/etc/mayor/main.conf" ]; then
+    echo 'OK'
+else
+    echo "          - Konfigurációs állományok és naplózási beállítások átszervezése..."
+
+    echo "            * Új konfigurációs állomány létrehozása"
+    echo -e "\n#====================#\n#  Main paraméterek  #\n#====================#\n\n" > $BASEDIR/config/main.conf
+    grep -e '^BASEDIR' -e 'WEB_SERVER_USER' -e '^MYSQL=' -e 'MYSQL_USER' -e 'MYSQL_PW' -e 'SVN' -e 'SHELL' $BASEDIR/config/update.conf >> $BASEDIR/config/main.conf
+    echo -e "\n\n#====================#\n# Update paraméterek #\n#====================#\n\n" >> $BASEDIR/config/main.conf
+    echo -e "UPDATELOG=\"\$BASEDIR/log/update.log\"\nSQLLOG=\"\$BASEDIR/log/sql-update.log\"\nREVISION_FILE=\"\$BASEDIR/log/revision\"\nLOCKFILE=\"/var/run/mayor.lock\"\nVERSION=\"radyx\"" >> $BASEDIR/config/main.conf
+    grep -v -e '^BASEDIR' -e 'WEB_SERVER_USER' -e '^MYSQL=' -e 'MYSQL_USER' -e 'MYSQL_PW' -e 'SVN' -e 'SHELL' -e 'REVISION_FILE' $BASEDIR/config/update.conf >> $BASEDIR/config/main.conf
+    echo -e "\n\n#====================#\n# Backup paraméterek #\n#====================#\n\n" >> $BASEDIR/config/main.conf
+    grep -v -e '^BASEDIR' -e 'WEB_SERVER_USER' -e '^MYSQL=' -e 'MYSQL_USER' -e 'MYSQL_PW' -e 'WWWDIR' -e 'DATE' $BASEDIR/config/backup.conf >> $BASEDIR/config/main.conf
+
+    echo "            * Korábbi konfigurációs állományok mentése: "
+    mv $BASEDIR/config/update.conf $BASEDIR/config/update.conf.old
+    echo "                update.conf --> update.conf.old"
+    mv $BASEDIR/config/backup.conf $BASEDIR/config/backup.conf.old
+    echo "                backup.conf --> backup.conf.old"
+
+    echo "            * Naplózás előkészítése"
+    if [ ! -e $BASEDIR/log ]; then mkdir $BASEDIR/log; fi
+    if [ ! -e /var/log/mayor ]; then ln -s $BASEDIR/log /var/log/mayor; fi
+
+    echo "            * update.rev áthelyezése"
+    mv $BASEDIR/config/update.rev $BASEDIR/log/revision
+    mv $BASEDIR/config/main-config.php $BASEDIR/config/main-config.php.old
+    cat $BASEDIR/config/main-config.php.old | \
+	sed -e "s/define('_CONFIGDIR',\(.*\));/define('_CONFIGDIR',\\1);\\ndefine('_LOGDIR',_MAYOR_DIR\.'\/log');\\ndefine('_LOCKFILE','\/var\/run\/mayor.lock');/g" \
+	> $BASEDIR/config/main-config.php
+
+    if [ "$HTTP_SERVER" != '' ]; then
+	cd $TMPDIR
+	FILE=`grep mayor-base md5sum | cut -d ' ' -f 3`
+	tar xfz $FILE -C $BASEDIR ./bin
+	cd $BASEDIR/bin
+    fi
+
+    echo "            * Konfigurációs könyvtár linkelése a /etc-be"
+    ln -s $BASEDIR/config /etc/mayor
+
+    echo "            * Jogosultságok állítása"
+    chmod +x $BASEDIR/bin/mayor
+
+    echo "
+#*****************************************************************#
+#                                                                 #
+#  A konfigurációs beállítások átalakítása befejeződött.          #
+#                                                                 #
+#  Ellenőrizze a /etc/mayor/main.conf állomány tartalmát, vala-   #
+#  mint a /var/log/mayor/revision állományban található számot,   #
+#  aminek 1582-nél kisebbnek kell még lennie.                     #
+#                                                                 #
+#  Ha mindent rendben talál futtassa újra a mayor update paran-   #
+#  csot! Kövesse nyomon az üzeneteket, melyek mostantól a képer-  #
+#  nyő mellett a /var/log/mayor/update.log állományban is megje-  #
+#  lennek.                                                        #
+#                                                                 #
+#*****************************************************************#
+"
+
+exit 1
+
+fi
\ No newline at end of file
diff --git a/mayor-orig/mayor-base/update/rev001745-1.sh b/mayor-orig/mayor-base/update/rev001745-1.sh
new file mode 100644
index 00000000..18eaf7e9
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev001745-1.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+FILE="install/base/sh/*"
+
+echo " Felesleges állományok törlése:"
+    echo -n "          $BASEDIR/$FILE ... "
+    if [ -e "$BASEDIR/$FILE" ]; then
+        rm -f "$BASEDIR/$FILE"
+        echo "törölve."
+    else
+        echo "nincs."
+    fi
+echo " Kész."
\ No newline at end of file
diff --git a/mayor-orig/mayor-base/update/rev001751-1.sh b/mayor-orig/mayor-base/update/rev001751-1.sh
new file mode 100644
index 00000000..18eaf7e9
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev001751-1.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+FILE="install/base/sh/*"
+
+echo " Felesleges állományok törlése:"
+    echo -n "          $BASEDIR/$FILE ... "
+    if [ -e "$BASEDIR/$FILE" ]; then
+        rm -f "$BASEDIR/$FILE"
+        echo "törölve."
+    else
+        echo "nincs."
+    fi
+echo " Kész."
\ No newline at end of file
diff --git a/mayor-orig/mayor-base/update/rev001986-1-mayor_login.sql b/mayor-orig/mayor-base/update/rev001986-1-mayor_login.sql
new file mode 100644
index 00000000..75268f72
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev001986-1-mayor_login.sql
@@ -0,0 +1,4 @@
+DROP TABLE IF EXISTS `cache`;
+CREATE TABLE `cache` (`sessionID` char(40), `policy` varchar(10), `kulcs` varchar(32) NOT NULL, `ertek` varchar(100), dt DATETIME)
+ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_hungarian_ci;
+ALTER TABLE `cache` add primary key PK (sessionID,policy,kulcs);
diff --git a/mayor-orig/mayor-base/update/rev002008-1-auth.sql b/mayor-orig/mayor-base/update/rev002008-1-auth.sql
new file mode 100644
index 00000000..2dd51671
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev002008-1-auth.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `groups` CHANGE groupId groupCn varchar(32);
+ALTER TABLE `groups` CHANGE groupName groupDesc varchar(32);
+ALTER TABLE `members` DROP `type`;
diff --git a/mayor-orig/mayor-base/update/rev002038-1.sh b/mayor-orig/mayor-base/update/rev002038-1.sh
new file mode 100644
index 00000000..aa8c2ba4
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev002038-1.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo 'A standard update szkriptek tesztelése'
+echo 'A rev fut!!' >> /tmp/mayor-update-test.log
+
diff --git a/mayor-orig/mayor-base/update/rev002400-1-mayor_login.sql b/mayor-orig/mayor-base/update/rev002400-1-mayor_login.sql
new file mode 100644
index 00000000..bcc04e0c
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev002400-1-mayor_login.sql
@@ -0,0 +1,19 @@
+CREATE TABLE IF NOT EXISTS `mayorSsl` (
+  `sslId` tinyint(1) unsigned NOT NULL auto_increment,
+  `privateKey` text COLLATE utf8_hungarian_ci NOT NULL,
+  `publicKey` text COLLATE utf8_hungarian_ci NOT NULL,
+  `secret` varchar(40) COLLATE utf8_hungarian_ci DEFAULT NULL,
+  PRIMARY KEY (`sslId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
+CREATE TABLE IF NOT EXISTS `mayorKeychain` (
+  `dt` date null,
+  `OMKod` mediumint(8) unsigned zerofill,
+  `publicKey` text COLLATE utf8_hungarian_ci NOT NULL,
+  `valid` tinyint(1) unsigned NULL DEFAULT '1',
+  PRIMARY KEY (`OMKod`,`valid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
+ALTER TABLE `mayorSsl` modify  `sslId` tinyint(1) unsigned NOT NULL auto_increment;
+
+INSERT IGNORE INTO `mayorKeychain` (dt,OMKod,publicKey,valid) VALUES ('2011-04-07',0,'-----BEGIN PUBLIC KEY-----MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbMFUWy0Juy/7uHROaLOMPSHMIVw/jSmEAKW6lCeIOH2oUVsAQkgsZCFiKqQhH3WbtLrAzSmOA7+rEU3RtgXtPZpHN2UUPQqoHWoMOkumfIS5oM0sQgSQ738TC0X9yxZlNqZtdpdCa0zjVnGLxqVVhS3KD+O8uuA7jQwczlSqWJwIDAQAB-----END PUBLIC KEY-----',1);
diff --git a/mayor-orig/mayor-base/update/rev002422-1-mayor_login.sql b/mayor-orig/mayor-base/update/rev002422-1-mayor_login.sql
new file mode 100644
index 00000000..94af5e78
--- /dev/null
+++ b/mayor-orig/mayor-base/update/rev002422-1-mayor_login.sql
@@ -0,0 +1,41 @@
+TRUNCATE TABLE `mayorKeychain`;
+INSERT INTO `mayorKeychain` VALUES 
+('2011-04-13',00029299,'-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXSTkz71IEVd3rGg497nBZJNVs
+xTbMUxsXMGupq9jGRmlqUhjIddayOMw2CFW/OR5BB0WD0pxKjEm7IZz6MzfnL27P
+mbPYuSwn3/Oq/gCGLTKiq48I+u0SZCGdLEzOU5rGjXoEqlzXPNvNc8q/sb4KsQZm
+tFr9+VLr+nUkk/v4JQIDAQAB
+-----END PUBLIC KEY-----',1),
+('2011-04-13',00035242,'-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDP6P945Egfn30JQrdSXzFaCiON
+m74vDqpn+7sdnrQwmyxn/RJwGb7kp6ICx6EIu494IichesZ8S4jx3acd+JLfEzP7
+UvHYz4CTvFRxSp0NXAK88ss0L6d7EXS5yCwyAhIHogM1JBBO+S4xLjIB9Iv0qQEb
+xrYta2qgqZxyMfCdZQIDAQAB
+-----END PUBLIC KEY-----',1),
+('2011-04-13',00035432,'-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwNglEZC06khfqipxCzz14gvfS
+QB5FBJfuiYOpU1HDLJ1tYfXrIIokv+6EhrSNx5It/TUpZ6Sz7sjW39ZJnYRWhYlS
+dcLqRRSNZRaZV/m0LCQAv1HjM8XAZZaiIMpkgGu8DaTE4mbn6cynj9z433hr7h03
+N3kIPMV4scnOHOQ8AQIDAQAB
+-----END PUBLIC KEY-----',1),
+('2011-04-13',00037181,'-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6jcvWxmH7y2p9FukRsZx0mcYz
+127e/Pckvwd/gXdbH3eaH6fMaNrPoku6wrK9TWy2nkH+UB/RFOvIzNGExXJK8QBC
+ygW9uc3G32N0IweSKw7mEwCzbhSLJPepo5lG57NobgOLgiFRIV8k6tSE+AL0csTT
+v+cUpcsDU6x2pKHJDQIDAQAB
+-----END PUBLIC KEY-----',1),
+('2011-04-07',09000000,'-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbMFUWy0Juy/7uHROaLOMPSHMI
+Vw/jSmEAKW6lCeIOH2oUVsAQkgsZCFiKqQhH3WbtLrAzSmOA7+rEU3RtgXtPZpHN
+2UUPQqoHWoMOkumfIS5oM0sQgSQ738TC0X9yxZlNqZtdpdCa0zjVnGLxqVVhS3KD
++O8uuA7jQwczlSqWJwIDAQAB
+-----END PUBLIC KEY-----',1),
+('2011-04-13',09000001,'
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxxGQdt76++8nZ88RHbSTFt2jQ
+rU3d3wArUwQrVqQEkpkSQmXMgzB4ltFRGfA4gdteVHlj7GOAJX9nYgSg5iBpeUUX
+UTrq1MprV77er35ZIGmDA7OLUCdLX23UhM8JGxW8+v/0DT0xHYQHAtgnBc9Qdgcn
+8sWu7LXvX1j3wIHKHQIDAQAB
+-----END PUBLIC KEY-----',1);
+
+