Rev: 4828

22 files changed, 71 insertions, 40 deletions

diff --git a/mayor-orig/mayor-base/install/base/mysql/utf8.cnf b/mayor-orig/mayor-base/install/base/mysql/utf8.cnf
index e5927257..824fdcbe 100644
--- a/mayor-orig/mayor-base/install/base/mysql/utf8.cnf
+++ b/mayor-orig/mayor-base/install/base/mysql/utf8.cnf
@@ -1,5 +1,6 @@
-
 [mysqld]
-  character-set-server = utf8
-  collation-server = utf8_hungarian_ci
-  skip-character-set-client-handshake
+character-set-server = utf8
+collation-server = utf8_hungarian_ci
+skip-character-set-client-handshake
+sql-mode=""
+  
\ No newline at end of file
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 84bef267..61dcbb9b 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4825
+4828
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 84bef267..61dcbb9b 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4825
+4828
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 84bef267..61dcbb9b 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4825
+4828
diff --git a/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh b/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh
index dbdb49b3..dc3aac2f 100755
--- a/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh
+++ b/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh
@@ -26,7 +26,8 @@ echo "Ubuntu:" ${UBUNTU}
 echo "Version:" ${RELEASE}
 
 TEST=`grep contrib /etc/apt/sources.list`
-if [ "$TEST" == "" ]
+TEST2=`grep contrib /etc/apt/sources.list.d/*`
+if [ "$TEST" == "" ] && [ "$TEST2" == "" ]
 then
     echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
     echo "Az apt sources.list módosítása szükséges!"
@@ -35,20 +36,31 @@ then
     deb http://ftp.hu.debian.org/debian/ jessie main contrib non-free
     deb http://security.debian.org/ jessie/updates main contrib non-free
     deb http://ftp.hu.debian.org/debian/ jessie-updates main contrib non-free
+  "
+  echo "Debian Bullseye (11) esetén például:
+    deb http://ftp.debian.org/debian/ bullseye main contrib non-free
+    deb http://ftp.debian.org/debian/ bullseye-updates main contrib non-free
 	"
     fi
     exit 255;
 fi
 
-if [[ "x${RELEASE}" =~ ^x9.* ]] 
+if [[ "x${RELEASE}" =~ ^x8.* ]] 
+then
+    PKGS="apache2 php5 php5-json php5-mysqlnd php5-ldap php5-mcrypt php5-curl mysql-server recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex ttf-mscorefonts-installer ntp wget ssl-cert ssh pwgen texlive-lang-european texlive-lang-hungarian"
+elif [[ "x${RELEASE}" =~ ^x9.* ]] 
 then
     PKGS="apache2 php php-json php-mysql php-ldap php-mbstring php-mcrypt php-curl mariadb-server-10.1 recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex ntp wget ssl-cert ssh pwgen texlive-lang-european"
 elif [[ "x${RELEASE}" =~ ^x10.* ]]
 then
     ## PHP 7.2-től php-mcrypt deprecated --> kivettük, de a kódban még van...
     PKGS="apache2 php php-json php-mysql php-ldap php-mbstring php-curl php-bcmath mariadb-server-10.3 recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex ntp wget ssl-cert ssh pwgen texlive-lang-european ghostscript"
+elif [[ "x${RELEASE}" =~ ^x11.* ]]
+then
+    PKGS="apache2 php php-json php-mysql php-ldap php-mbstring php-curl php-bcmath mariadb-server recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex wget ssl-cert ssh pwgen texlive-lang-european ghostscript"
 else
-    PKGS="apache2 php5 php5-json php5-mysqlnd php5-ldap php5-mcrypt php5-curl mysql-server recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex ttf-mscorefonts-installer ntp wget ssl-cert ssh pwgen texlive-lang-european texlive-lang-hungarian"
+    echo "Nem tudom meghatározni, milyen csomagokat telepítsünk. Kilépek. :("
+    exit 1
 fi
 
 if [ "$1" == "--no-deb" ]; then
diff --git a/mayor-orig/mayor-installer-orig/install.d/20mysql.sh b/mayor-orig/mayor-installer-orig/install.d/20mysql.sh
index 3d0175c8..fd8efec8 100755
--- a/mayor-orig/mayor-installer-orig/install.d/20mysql.sh
+++ b/mayor-orig/mayor-installer-orig/install.d/20mysql.sh
@@ -18,7 +18,13 @@ echo -e "\nMySQL beállítások"
 echo -n "  utf8.cnf ... "
 cp -f $MAYORDIR/install/base/mysql/utf8.cnf /etc/mysql/conf.d
 echo ok
-/etc/init.d/mysql restart
+
+if [ -f "/etc/init.d/mysql" ]; then
+  /etc/init.d/mysql restart
+fi
+if [ -f "/etc/init.d/mariadb" ]; then
+  /etc/init.d/mariadb restart
+fi
 
 if [ "x${RELEASE}" == "x9" ]
 then
@@ -32,3 +38,9 @@ then
     echo -n "  futtatom a mysql_Secure_installation scriptet: "
     mysql_secure_installation
 fi
+if [ "x${RELEASE}" == "x11" ]
+then
+    echo -e "\nMariaDB/MySQL beállítások"
+    echo -n "  futtatom a mysql_secure_installation scriptet: "
+    mysql_secure_installation
+fi
diff --git a/mayor-orig/mayor-installer-orig/install.d/45intezmeny.sh b/mayor-orig/mayor-installer-orig/install.d/45intezmeny.sh
index fc8eafeb..d1a15ac5 100755
--- a/mayor-orig/mayor-installer-orig/install.d/45intezmeny.sh
+++ b/mayor-orig/mayor-installer-orig/install.d/45intezmeny.sh
@@ -17,6 +17,8 @@ Ehhez meg kell adnia az intézmény OM kódját, nevét és rövid nevét
 
 EOF
 
+echo "Használt nyelvi beállítás: " $LANG
+
 read -n 1 -p "Létrehozzam az intézményt? (i/N)" -s DO
 if [ "$DO" != "i" ]; then echo -e "\nNem hoztam létre az intézményt.\n"; exit; fi
 
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 84bef267..61dcbb9b 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4825
+4828
diff --git a/mayor-orig/mayor-installer-orig/setup b/mayor-orig/mayor-installer-orig/setup
index 3c13a155..74fe9215 100755
--- a/mayor-orig/mayor-installer-orig/setup
+++ b/mayor-orig/mayor-installer-orig/setup
@@ -1,5 +1,6 @@
 #!/bin/bash
-clear
+
+#clear
 echo "-------------------------------------------"
 echo "             MaYoR Setup               "
 echo "-------------------------------------------"
diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
index 84bef267..61dcbb9b 100644
--- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
+++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
@@ -1 +1 @@
-4825
+4828
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 84bef267..61dcbb9b 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4825
+4828
diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
index 84bef267..61dcbb9b 100644
--- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
+++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
@@ -1 +1 @@
-4825
+4828
diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
index 84bef267..61dcbb9b 100644
--- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
+++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
@@ -1 +1 @@
-4825
+4828
diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
index 84bef267..61dcbb9b 100644
--- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
+++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
@@ -1 +1 @@
-4825
+4828
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 84bef267..61dcbb9b 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4825
+4828
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php
index 761156cd..c883a0e7 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php
@@ -2,9 +2,11 @@
 
     global $ADAT;
 
-    if ($ADAT['orarendvane']==0)
-	putNincsOrarend();
-    if (is_array($ADAT))
-	putOrarend($ADAT);
+    if ($skin!='ajax' && $ADAT['orarendvane']==0) {
+        putNincsOrarend();
+    }
+    if (is_array($ADAT)) {
+        putOrarend($ADAT);
+    }
 
 ?>
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/dolgozat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/dolgozat.phtml
index 5b26a9b9..744dce31 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/dolgozat.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/dolgozat.phtml
@@ -87,7 +87,7 @@
 	echo '</table>';
 
 	echo '<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>'; 
-	echo '<table align="center" style="width:90%; border: solid 1px #888;">';
+	echo '<table align="center" style="width:90%; border: solid 1px white;">';
 	echo '<tr><th>';
 	    echo '<div id="chart_div""></div>';
 	echo '</th></tr></table>';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js
index 5ec0ede5..9d72dee6 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js
@@ -21,6 +21,7 @@ $(function() {
 	});
        var chart = new google.visualization.Calendar(document.getElementById('chart_div'));
        var options = {
+      height:400,
 	    title: "Dolgozatok (terhelés)",
 	    colorAxis: {colors:['cornflowerblue','#ff0000']},
 	    calendar: {
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 84bef267..61dcbb9b 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4825
+4828
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 84bef267..61dcbb9b 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4825
+4828
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index e3ad4b6e..075b2211 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4825
-decddbe8bf28ec5f18650c4428efece4  mayor-fenntarto-rev4825.tgz
-e8a0a997617f882e23e0a11db55c0c82  mayor-installer-sulix-rev4825.tgz
-8f827bea5c3c404628cfd3810e62c3b2  mayor-wiki-rev4825.tgz
-38b4873d795802c38d6321fa35a9affc  mayor-installer-rev4825.tgz
-ec845bf8cac2b5b41cc34d58f1e8568a  mayor-portal-rev4825.tgz
-05544b28140fe447bc89c8ff671db89c  mayor-felveteli-rev4825.tgz
-9b4703922a3ae0043cfe8d5661a873d9  mayor-jatek-rev4825.tgz
-994bfe185faff73a3bd2ee486e2b6586  mayor-locales-jp_JP-rev4825.tgz
-f7caf8fae641852ee2740b61027edd76  mayor-locales-de_DE-rev4825.tgz
-3bc14f7527b34cebd6a940b7cdfed8be  mayor-locales-en_US-rev4825.tgz
-e1dea5951c4961d44abf69fb026e66cc  mayor-naplo-rev4825.tgz
-ba54c940bafee3e8659af349765f6694  mayor-base-rev4825.tgz
+Revision 4828
+1455413e6c28f53123ca416f8e07b353  mayor-fenntarto-rev4828.tgz
+2e0991fbdffe8e5170afc220cd990969  mayor-installer-sulix-rev4828.tgz
+ced75dd520835d674dcbd2830ca4c1a7  mayor-wiki-rev4828.tgz
+bd41c634b179b4691628f144f87c5227  mayor-installer-rev4828.tgz
+abc5a23a8dc0658d86b6a9a035eeae7f  mayor-portal-rev4828.tgz
+d1dd737b1645b5703cccab1584ed276b  mayor-felveteli-rev4828.tgz
+7e696c6025f647c484d8c2a8bf37b4e6  mayor-jatek-rev4828.tgz
+4568295e62f156e90be3274436d56339  mayor-locales-jp_JP-rev4828.tgz
+76205c315a6f8e8b56ed97bb5cd31e5b  mayor-locales-de_DE-rev4828.tgz
+e103be04517fc08e75bd571e42b89155  mayor-locales-en_US-rev4828.tgz
+eab2cea763712d30b8ed4fda4149590d  mayor-naplo-rev4828.tgz
+ec6ed4e8a1efc5cada53a20581df875d  mayor-base-rev4828.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 84bef267..61dcbb9b 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4825
+4828