aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM.Gergo2020-01-12 12:53:59 +0100
committerM.Gergo2020-01-12 12:53:59 +0100
commit7891f65fb7544f3b1a126f8e0688889d6a6954f3 (patch)
tree9c5a1122a1e3aba3de81f888dafed14a1cb78282
parent502843a035833f82321ed990ada1eda23612ed92 (diff)
downloadmayor-rev4589.tar.gz
mayor-rev4589.zip
Rev: 4589rev4589
-rw-r--r--mayor-orig/mayor-base/bin/restore.sh1
-rw-r--r--mayor-orig/mayor-base/config/private-conf.php.example4
-rw-r--r--mayor-orig/mayor-base/log/mayor-base.rev2
-rw-r--r--mayor-orig/mayor-base/www/include/base/var.php4
-rw-r--r--mayor-orig/mayor-base/www/include/share/ssl/ssl.php8
-rw-r--r--mayor-orig/mayor-base/www/skin/classic/base/css/base.css25
-rw-r--r--mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml2
-rw-r--r--mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js9
-rw-r--r--mayor-orig/mayor-base/www/skin/classic/module-password/html/changeMyPassword.phtml8
-rw-r--r--mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml6
-rw-r--r--mayor-orig/mayor-base/www/skin/default/base/html/base.phtml10
-rw-r--r--mayor-orig/mayor-felveteli/log/mayor-felveteli.rev2
-rw-r--r--mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev2
-rwxr-xr-xmayor-orig/mayor-installer-orig/install.d/05checkdeb.sh6
-rw-r--r--mayor-orig/mayor-installer-orig/log/mayor-installer.rev2
-rw-r--r--mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev2
-rw-r--r--mayor-orig/mayor-jatek/log/mayor-jatek.rev2
-rw-r--r--mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev2
-rw-r--r--mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev2
-rw-r--r--mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev2
-rw-r--r--mayor-orig/mayor-naplo/log/mayor-naplo.rev2
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/base/zcheck.php2
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/share/hirnok.php16
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/share/kereso.php13
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php12
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/uzeno/uzeno.php10
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/hibabejelento/admin.php4
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/hirnok/cronFutar-pre.php8
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php1
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas-pre.php5
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas.php3
-rw-r--r--mayor-orig/mayor-naplo/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml6
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css5
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/uzeno/uzeno.css3
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml18
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml20
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml9
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/postas.phtml4
-rw-r--r--mayor-orig/mayor-portal/log/mayor-portal.rev2
-rw-r--r--mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css6
-rw-r--r--mayor-orig/mayor-wiki/log/mayor-wiki.rev2
-rw-r--r--mayor-orig/md5sum26
-rw-r--r--mayor-orig/rev.txt2
-rw-r--r--rev.txt2
44 files changed, 210 insertions, 72 deletions
diff --git a/mayor-orig/mayor-base/bin/restore.sh b/mayor-orig/mayor-base/bin/restore.sh
index 8283effa..b2173e49 100644
--- a/mayor-orig/mayor-base/bin/restore.sh
+++ b/mayor-orig/mayor-base/bin/restore.sh
@@ -189,6 +189,7 @@ EOF
) | $MYSQL -h$MYSQL_HOST -u $MYSQL_USER -p$MYSQL_PW
fi
echo -n '... '
+ # echo 'SET FOREIGN_KEY_CHECKS=0' &&
cat ${SQLFILE} | mysql -p${MYSQL_PW} --user=${MYSQL_USER} --default-character-set=utf8 ${DB}
echo ok
fi
diff --git a/mayor-orig/mayor-base/config/private-conf.php.example b/mayor-orig/mayor-base/config/private-conf.php.example
index f241e358..3b20152a 100644
--- a/mayor-orig/mayor-base/config/private-conf.php.example
+++ b/mayor-orig/mayor-base/config/private-conf.php.example
@@ -53,7 +53,9 @@
//'ldap base dn' => 'o=mayor,c=hu',
//'createAccountScript' => 'accounts.sh'
- #Active Directory Test
+ ### Active Directory Test ###
+ # self-signed cert esetén a /etc/ldap/ldap.conf-ba: TLS_REQCERT allow #
+ ### ###
#'backend' => 'ads',
#'adsHostname' => 'ldaps://your.domain:636', // Jelszóváltoztatáshoz kötelező az ldaps
#'adsBaseDn' => 'DC=your,DC=domain',
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 7b690e22..0da8daf7 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4574
+4589
diff --git a/mayor-orig/mayor-base/www/include/base/var.php b/mayor-orig/mayor-base/www/include/base/var.php
index 3068fbc6..fda47dd2 100644
--- a/mayor-orig/mayor-base/www/include/base/var.php
+++ b/mayor-orig/mayor-base/www/include/base/var.php
@@ -50,7 +50,7 @@
$return = (isset($IN)) ? preg_replace("/[^a-zA-Z0-9_\-]/i",'',$IN) : $default;
break;
case 'html':
- $return = (isset($IN)) ? preg_replace("/[^a-zA-Z0-9\ \.\,?_|:;űáéúőóüöíŰÁÉÚŐÓÜÖÍ\-]/i",'',$IN) : $default;
+ $return = (isset($IN)) ? preg_replace("/[^a-zA-Z0-9\ \.\,?_|:;űáäéúőóüöíŰÁÄÉÚŐÓÜÖÍ\-]/i",'',$IN) : $default;
break;
case 'hexa':
$return = preg_replace("/[^0-9a-fA-F]/i",'',$IN);
@@ -76,7 +76,7 @@
$return = filter_var($IN, FILTER_VALIDATE_EMAIL);
break;
case 'userAccount':
- $return = (preg_match("#([a-z]|[A-Z]|[0-9]| |\.|,|_|[űáéúőóüöíŰÁÉÚŐÓÜÖÍäÄ]|-|@)*$#", $IN) != false) ? $IN : $default;
+ $return = (preg_match("#([a-z]|[A-Z]|[0-9]| |\.|,|_|[űáäéúőóüöíŰÁÄÉÚŐÓÜÖÍäÄ]|-|@)*$#", $IN) != false) ? $IN : $default;
break;
default:
$return = $IN;
diff --git a/mayor-orig/mayor-base/www/include/share/ssl/ssl.php b/mayor-orig/mayor-base/www/include/share/ssl/ssl.php
index 61b6ca1b..c8aaba2d 100644
--- a/mayor-orig/mayor-base/www/include/share/ssl/ssl.php
+++ b/mayor-orig/mayor-base/www/include/share/ssl/ssl.php
@@ -187,7 +187,9 @@ function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzAB
if (function_exists('mcrypt_encrypt')) {
$return = mcrypt_encrypt(MCRYPT_RIJNDAEL_128,$key,$data,MCRYPT_MODE_CBC,"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
} else {
- $_SESSION['alert'][] = 'info:mcrypt függvény nem található (tipp! telepítsd a php5-mcrypt csomagot a szerverre)';
+ $return = openssl_encrypt($data, 'AES-256-CBC', $key, OPENSSL_RAW_DATA, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+ // $return = openssl_decrypt($data, 'AES-256-CBC', $key, OPENSSL_RAW_DATA, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+ //$_SESSION['alert'][] = 'info:mcrypt függvény nem található (tipp! telepítsd a php5-mcrypt csomagot a szerverre)';
}
return base64_encode($return);
}
@@ -201,7 +203,9 @@ function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzAB
if (function_exists('mcrypt_decrypt')) {
$return = mcrypt_decrypt(MCRYPT_RIJNDAEL_128,$key,$data,MCRYPT_MODE_CBC,"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
} else {
- $_SESSION['alert'][] = 'info:mcrypt függvény nem található (tipp! telepítsd a php5-mcrypt csomagot a szerverre)';
+ // $return = openssl_encrypt($data, 'AES-256-CBC', $key, OPENSSL_RAW_DATA, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+ $return = openssl_decrypt($data, 'AES-256-CBC', $key, OPENSSL_RAW_DATA, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+ // $_SESSION['alert'][] = 'info:mcrypt függvény nem található (tipp! telepítsd a php5-mcrypt csomagot a szerverre)';
}
return trim(urldecode($return));
}
diff --git a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css
index e2d5559b..54b53fb8 100644
--- a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css
+++ b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css
@@ -121,7 +121,7 @@
#nav li.active { background: #3facc7; }
#nav li a { display: block; padding: 3px 10px; color: white; }
- #nav > li > a { padding: 0px 20px; line-height: 60px; vertical-align: middle; display: table-cell; min-width: 70px;
+ #nav > li > a { padding: 0px 20px; line-height: 60px; vertical-align: middle; display: table-cell; min-width: 40px;
-webkit-transition: all 0.1s ease;
transition: all 0.1s ease;
}
@@ -365,6 +365,18 @@
#mayorGlobalLogin form input {margin:2px;}
#mayorGlobalLogin table { height:60px;}
+
+ #mayorGlobalLogin form button.dologin {
+ background-color:inherit;
+ border: solid 0px white;padding:0px;
+ height:13px;
+ font-size:13px;
+ }
+ #mayorGlobalLogin form button.dologin:hover span { color: lightgreen; }
+ #mayorGlobalLogin form button.dologin.hint span { color: orange;
+ -webkit-animation:colorchange 1s infinite alternate;
+ }
+
#mayorGlobalLogin form button.api {
background-color: inherit;
border: solid 0px #fff;
@@ -400,7 +412,8 @@
border-top: solid 4px lightblue;
padding:0px; height:20px; width:100%;
background-color:rgba(250,250,250,0.9); position:fixed;
- top:60px;left:0px; z-index:3
+ top:60px;
+ left:0px; z-index:2
}
#mayorErrorSmall.mayorErrorSmallError {
@@ -410,7 +423,8 @@
border-top: solid 4px orange;
padding:0px; height:20px; width:100%;
background-color:rgba(250,250,250,0.9); position:fixed;
- top:60px;left:0px; z-index:3
+ top:60px;
+ left:0px; z-index:2
}
@@ -768,5 +782,10 @@ border: solid 0px #eee;
100%{background-position:0% 50%}
}
+@-webkit-keyframes colorchange {
+ 0% { color: lightgreen; }
+ 50% { color: orange; }
+ 100% { color: white; }
+}
diff --git a/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml b/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml
index cb843d14..5e75c5c2 100644
--- a/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml
+++ b/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml
@@ -317,7 +317,7 @@ function html_mayor_head($sessionID,$page,$sub,$f,$lang,$MENU,$skin = _DEFAULT_S
echo '<div class="nev">';
//echo $down_svg.'<span class="onClickHideShow" style="padding-left:14px;" > '._LOGIN.'</span>';
- echo '<a id="logout" title="'._LOGIN.'" href="'.href('index.php?page=auth&f=login&toPolicy=private',array('skin','lang','sessionID')).'">';
+ echo '<a id="bejelentkezesSzoveg" title="'._LOGIN.'" href="'.href('index.php?page=auth&f=login&toPolicy=private',array('skin','lang','sessionID')).'">';
echo _LOGIN;
echo '</a>';
echo $loginout_img;
diff --git a/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js b/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js
index 54cc16da..f4b27b06 100644
--- a/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js
+++ b/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js
@@ -173,6 +173,15 @@ $(document).ready(function() {
});
$('#logo').on('dragstart', function(event) { event.preventDefault(); });
+ $('#bejelentkezesSzoveg').click(function(event) {
+ var a = $('#mayorGlobalLoginUserAccount');
+ var b = $('#mayorGlobalLoginPassword');
+ if ($(a).val()!='' || $(b).val()!='') {
+ $('#mayorGlobalLogin form.passwordAuth button').click();
+ $('button.dologin').addClass('hint');
+ event.preventDefault();
+ }
+ });
// onLoadUpdate
$('.onLoadUpdate').each( function(index, element) {
diff --git a/mayor-orig/mayor-base/www/skin/classic/module-password/html/changeMyPassword.phtml b/mayor-orig/mayor-base/www/skin/classic/module-password/html/changeMyPassword.phtml
index 20680e8e..fa8fe55d 100644
--- a/mayor-orig/mayor-base/www/skin/classic/module-password/html/changeMyPassword.phtml
+++ b/mayor-orig/mayor-base/www/skin/classic/module-password/html/changeMyPassword.phtml
@@ -32,7 +32,7 @@
echo _USERNAME;
echo '</td>'."\n";
echo '<td>'."\n";
- echo '<input id="userAccount" type="hidden" name="userAccount" value="'.$userAccount.'" maxlength="32" />'."\n";
+ echo '<input id="userAccount" type="hidden" name="userAccount" value="'.$userAccount.'" maxlength="32" autocomplete="username" />'."\n";
echo $userAccount;
echo '</td>'."\n";
echo '</tr>'."\n";
@@ -43,7 +43,7 @@
echo constant('_'.strtoupper($toPolicy).'_PASSWORD');
echo '</td>'."\n";
echo '<td>'."\n";
- echo '<input id="userPassword" type="password" accesskey="p" tabindex="2" name="userPassword" value="" maxlength="20" />'."\n";
+ echo '<input id="userPassword" type="password" accesskey="p" tabindex="2" name="userPassword" value="" maxlength="20" autocomplete="current-password" />'."\n";
echo '</td>'."\n";
echo '</tr>'."\n";
@@ -52,7 +52,7 @@
echo _NEW_PASSWORD;
echo '</td>'."\n";
echo '<td>'."\n";
- echo '<input id="newPassword" type="password" accesskey="n" tabindex="3" name="newPassword" value="" maxlength="20" />';
+ echo '<input id="newPassword" type="password" accesskey="n" tabindex="3" name="newPassword" value="" maxlength="20" autocomplete="new-password" />';
// echo '<span style="float:right;" id="complexity-bar" class="progress-bar progress-bar-danger" role="progressbar" style="width: 0%;"></span>';
echo '</td>'."\n";
echo '</tr>'."\n";
@@ -62,7 +62,7 @@
echo _VERIFICATION;
echo '</td>'."\n";
echo '<td>'."\n";
- echo '<input id="verification" type="password" accesskey="v" tabindex="4" name="verification" value="" maxlength="20" />'."\n";
+ echo '<input id="verification" type="password" accesskey="v" tabindex="4" name="verification" value="" maxlength="20" autocomplete="new-password" />'."\n";
echo '</td>'."\n";
echo '</tr>'."\n";
diff --git a/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml b/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml
index 87f34b3c..59dab0ea 100644
--- a/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml
+++ b/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml
@@ -56,7 +56,7 @@
echo '</select>'."\n";
echo '</td>'."\n";
echo '<td>'."\n";
- echo '<input id="userPassword" type="password" accesskey="p" tabindex="2" name="userPassword" value="" maxlength="20" />'."\n";
+ echo '<input id="userPassword" type="password" accesskey="p" tabindex="2" name="userPassword" value="" maxlength="20" autocomplete="current-password" />'."\n";
echo '</td>'."\n";
echo '</tr>'."\n";
}
@@ -66,7 +66,7 @@
echo _NEW_PASSWORD;
echo '</td>'."\n";
echo '<td>'."\n";
- echo '<input id="newPassword" type="password" accesskey="n" tabindex="3" name="newPassword" value="" maxlength="20" />'."\n";
+ echo '<input id="newPassword" type="password" accesskey="n" tabindex="3" name="newPassword" value="" maxlength="20" autocomplete="new-password" />'."\n";
echo '</td>'."\n";
echo '</tr>'."\n";
@@ -75,7 +75,7 @@
echo _VERIFICATION;
echo '</td>'."\n";
echo '<td>'."\n";
- echo '<input id="verification" type="password" accesskey="v" tabindex="3" name="verification" value="" maxlength="20" />'."\n";
+ echo '<input id="verification" type="password" accesskey="v" tabindex="3" name="verification" value="" maxlength="20" autocomplete="new-password" />'."\n";
echo '</td>'."\n";
echo '</tr>'."\n";
diff --git a/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml b/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml
index 7c226647..19dfa38e 100644
--- a/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml
+++ b/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml
@@ -365,9 +365,11 @@ l53 -52 55 54 55 55 42 -43 43 -42 -55 -55 -54 -55 54 -55 55 -55 -43 -42 -42
}
function mayorGlobalLogin($loggedIn=false) {
- global $AUTH;
+ global $AUTH,$page;
if (is_array($AUTH['private']['allowOnly'])) $_class='class="restricted"'; else $_class = '';
+ if ($page=="auth") return;
+
echo '<div id="mayorGlobalLogin" '.$_class.'>';
if ($loggedIn) {
if (defined('_MAYORAUTHRESULT') && defined('_AUTH_FAILURE') && intval(_MAYORAUTHRESULT)>=intval(_AUTH_FAILURE)) {
@@ -378,13 +380,13 @@ l53 -52 55 54 55 55 42 -43 43 -42 -55 -55 -54 -55 54 -55 55 -55 -43 -42 -42
echo '<table><tr><td style="padding-right:10px;">';
formBegin(array('class'=>'check passwordAuth','action'=>$secure_url));
echo '<span class="icon-adult '.$_class.'"></span>';
- echo '<input '.$_focus.' type="text" name="userAccount" autocomplete="off" />';
+ echo '<input '.$_focus.' type="text" name="userAccount" placeholder="felhasználónév" autocomplete="username" id="mayorGlobalLoginUserAccount" />';
echo '<br/>';
echo '<span class="icon-key '.$_class.'"></span>';
- echo '<input type="password" name="userPassword" />';
+ echo '<input type="password" name="userPassword" placeholder="jelszó" autocomplete="current-password" id="mayorGlobalLoginPassword" />';
echo '<input type="hidden" name="toPolicy" value="private" />';
echo '<input type="hidden" name="action" value="mayorGlobalLogin" />';
- echo '<button type="submit" style="background-color:inherit;border: solid 0px white;padding:0px;"><span class="icon-play-alt"></span></button>';
+ echo '<button type="submit" class="dologin"><span class="icon-play-alt"></span></button>';
formEnd();
echo '</td><td style="">';
if (__GOOGLEAPI_ENABLED===true) {
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 7b690e22..0da8daf7 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4574
+4589
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 7b690e22..0da8daf7 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4574
+4589
diff --git a/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh b/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh
index 56c0e55d..07a2f6f3 100755
--- a/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh
+++ b/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh
@@ -40,9 +40,13 @@ then
exit 255;
fi
-if [[ "x${RELEASE}" =~ ^x9.* ]]
+if [[ "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"
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"
fi
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 7b690e22..0da8daf7 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4574
+4589
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 7b690e22..0da8daf7 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 @@
-4574
+4589
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 7b690e22..0da8daf7 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4574
+4589
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 7b690e22..0da8daf7 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 @@
-4574
+4589
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 7b690e22..0da8daf7 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 @@
-4574
+4589
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 7b690e22..0da8daf7 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 @@
-4574
+4589
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 7b690e22..0da8daf7 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4574
+4589
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/base/zcheck.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/base/zcheck.php
index 91e3905a..12b7dea5 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/base/zcheck.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/base/zcheck.php
@@ -99,4 +99,6 @@
if (count($KERELEM_TAG) ==0) $KERELEM_TAG = array('névsor','jogviszony','órarend, haladási','hiányzás, igazolás','jegy, zárójegy');
+ if (!defined('__HABEL_GYURI_DEBUG')) define('__HABEL_GYURI_DEBUG',false);
+
?>
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/hirnok.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/hirnok.php
index 1ffdda96..94ffa865 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/hirnok.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/hirnok.php
@@ -232,6 +232,22 @@ global $SZEMESZTER;
);
}
}
+
+ // utolsó óra
+ if (__TANAR === true || (__NAPLOADMIN===true && $tanarId>0)) {
+ if (defined('__USERTANARID') && is_numeric(__USERTANARID)) { // cron esetén nincs ilyen
+ $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime, getOraIgTime(ora.oraId) AS igTime FROM (SELECT dt,max(ora) AS utolsooraateremben,teremId,terem.leiras AS teremNev FROM ora LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId) WHERE dt=curdate() AND teremId IS NOT NULL GROUP BY teremId) AS x LEFT JOIN ora ON (ora.dt = x.dt AND x.utolsooraateremben = ora.ora AND x.teremId = ora.teremId) WHERE ora.ki=%u";
+ $v = array(__USERTANARID);
+ $r = db_query($q, array('fv'=>'getHirnokFolyam/haladasi2','modul'=>'naplo','result'=>'indexed','values'=>$v));
+ for ($i=0; $i<count($r); $i++) {
+ $R[mktime()][] = array(
+ 'hirnokTipus'=>'utolsoora',
+ 'adat'=>$r[$i]
+ );
+ }
+ }
+ }
+
// Üzenő
// /* 20170418
initSzerep();
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/kereso.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/kereso.php
index b2bf2cf6..867fe15e 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/kereso.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/kereso.php
@@ -5,19 +5,19 @@
$q = "SELECT DISTINCT diak.diakId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS diakNev, oId, osztalyJel FROM `diak`
LEFT JOIN osztalyDiak ON (osztalyDiak.diakId=diak.diakId AND osztalyDiak.beDt<=NOW() AND (osztalyDiak.kiDt>=NOW() OR osztalyDiak.kiDt IS NULL))
LEFT JOIN " . __TANEVDBNEV . ".osztalyNaplo USING (osztalyId)
- HAVING (diakNev LIKE '%s' OR oId LIKE '%s') ORDER BY diakNev LIMIT 100";
+ HAVING (diakNev LIKE '%s' OR oId LIKE '%s') ORDER BY diakNev";
$r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%','%'.$pattern.'%')));
return $r;
}
function getTanarokByPattern($pattern) {
if ($pattern=='') return false;
- $q = "SELECT tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev FROM `tanar` WHERE (kiDt IS NULL OR kiDt >=NOW()) HAVING tanarNev LIKE '%s' ORDER BY tanarNev LIMIT 100";
+ $q = "SELECT tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev FROM `tanar` WHERE (kiDt IS NULL OR kiDt >=NOW()) HAVING tanarNev LIKE '%s' ORDER BY tanarNev";
$r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%')));
return $r;
}
function getTankorokByPattern($pattern) {
if ($pattern=='') return false;
- $q = "SELECT tankorId, tankorNev AS tankorNev FROM `tankor`HAVING tankorNev LIKE '%s' ORDER BY tankorNev LIMIT 100";
+ $q = "SELECT tankorId, tankorNev AS tankorNev FROM `tankor`HAVING tankorNev LIKE '%s' ORDER BY tankorNev";
$r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%')));
return $r;
}
@@ -25,7 +25,7 @@
if ($pattern=='') return false;
if ($SET['diakokkal']!==true) {
$p= "TRIM(CONCAT_WS(' ',nevElotag, csaladinev, utonev)) ";
- $q = "SELECT szuloId, $p AS szuloNev FROM `szulo` HAVING szuloNev LIKE '%s' ORDER BY szuloNev LIMIT 100";
+ $q = "SELECT szuloId, $p AS szuloNev FROM `szulo` HAVING szuloNev LIKE '%s' ORDER BY szuloNev";
$r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%')));
} else {
@@ -42,13 +42,12 @@
$subquery = 'LEFT JOIN diak ON (szuloId IN (anyaId,apaId,neveloId,gondviseloId))';
$p = "CONCAT(TRIM(CONCAT_WS(' ',nevElotag, csaladinev, utonev)), ' (',TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)),')' ) ";
- $q2 = "SELECT szuloId, $p AS szuloNev FROM `szulo` $subquery WHERE TRIM(CONCAT_WS(' ',nevElotag, csaladinev, utonev)) LIKE '%s' $W LIMIT 100";
+ $q2 = "SELECT szuloId, $p AS szuloNev FROM `szulo` $subquery WHERE TRIM(CONCAT_WS(' ',nevElotag, csaladinev, utonev)) LIKE '%s' $W ";
if (count($DIAKIDS)>0) {
- $q1 = "SELECT szuloId, $p AS szuloNev FROM `szulo`$subquery WHERE diakId IN (".implode(',',$DIAKIDS).") $W LIMIT 100";
+ $q1 = "SELECT szuloId, $p AS szuloNev FROM `szulo`$subquery WHERE diakId IN (".implode(',',$DIAKIDS).") $W ";
$q = "$q1 UNION ($q2)";
} else $q = "($q2)";
$r = db_query("$q ORDER BY szuloNev", array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%')));
-
}
return $r;
}
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php
index 0e2a5836..5dae295a 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php
@@ -424,4 +424,16 @@
return db_query($q, array('fv'=>'orarendvane','modul'=>'naplo','result'=>'value'));
}
+ function getUtolsoorak() {
+ $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime, getOraIgTime(ora.oraId) AS igTime
+FROM (SELECT dt,max(ora) AS utolsooraateremben,teremId,terem.leiras AS teremNev FROM ora LEFT JOIN ".__INTEZMENYDBNEV.".terem
+USING (teremId) WHERE teremId IS NOT NULL GROUP BY dt,teremId) AS x LEFT JOIN ora ON (ora.dt = x.dt AND x.utolsooraateremben = ora.ora AND x.teremId = ora.teremId)";
+ $r = db_query($q, array('fv'=>'getUtolsoorak','modul'=>'naplo','result'=>'indexed'));
+ $RES = array();
+ for ($i=0; $i<count($r); $i++) {
+ $RES[$r[$i]['dt']][$r[$i]['teremId']] = $r[$i];
+ }
+ return $RES;
+ }
+
?>
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/uzeno/uzeno.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/uzeno/uzeno.php
index de157fa3..561c97ff 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/uzeno/uzeno.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/uzeno/uzeno.php
@@ -180,9 +180,13 @@
$txt = ($ADAT['txt']);
$dbName = 'naplo_'.__INTEZMENY.'_'.$ADAT['tanev'];
- $q = "INSERT INTO `%s`.uzeno (dt,txt,feladoId,feladoTipus,cimzettId,cimzettTipus) VALUES (NOW(), '%s', %u, '%s', %u, '%s')";
- $v = array($dbName, $txt, $feladoId, $feladoTipus, $cimzettId, $cimzettTipus);
- return db_query($q,array('fv' => 'uzeno/postUzenet', 'modul' => 'naplo_intezmeny', 'values' => $v));
+ if ($cimzettId>0 && $feladoId>0 && $txt!='') {
+ $q = "INSERT INTO `%s`.uzeno (dt,txt,feladoId,feladoTipus,cimzettId,cimzettTipus) VALUES (NOW(), '%s', %u, '%s', %u, '%s')";
+ $v = array($dbName, $txt, $feladoId, $feladoTipus, $cimzettId, $cimzettTipus);
+ return db_query($q,array('fv' => 'uzeno/postUzenet', 'modul' => 'naplo_intezmeny', 'values' => $v));
+ } else {
+ return false;
+ }
}
// v3.1
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/hibabejelento/admin.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/hibabejelento/admin.php
index f34d5eed..8296185e 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/hibabejelento/admin.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/hibabejelento/admin.php
@@ -2,9 +2,9 @@
if (_RIGHTS_OK !== true) die();
- global $Kerelmek,$telephelyId,$TELEPHELY;
+ global $Kerelmek,$telephelyId,$TELEPHELY, $kerelemId;
- if ($skin=='classic') putHibabejelento($telephelyId);
+ if ($skin=='classic' && !($kerelemId>0)) putHibabejelento($telephelyId);
if (is_array($Kerelmek) && count($Kerelmek)>0) {
if ($_GET['view']==2){
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/hirnok/cronFutar-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/hirnok/cronFutar-pre.php
index 5691de0f..c183ba30 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/hirnok/cronFutar-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/hirnok/cronFutar-pre.php
@@ -15,9 +15,15 @@
for ($i=0; $i<count($r); $i++) {
$d = $r[$i];
+ if (defined('_DEVEL') && _DEVEL===true) $d['email'] = 'konczy+test@gmail.com'; // over
$TOLDTBYUSER[$d['naploTipus']][$d['naploId']] = ($d['utolsoEmailDt']=='') ? $_TANEV['kezdesDt'] : $d['utolsoEmailDt']; // setDt
if (!in_array($d['naploId'],$USER[$d['naploTipus']])) $USER[$d['naploTipus']][] = $d['naploId'];
- $ADAT['feliratkozas'][$d['naploTipus']][$d['naploId']][] = array('userAccount'=>$d['userAccount'], 'policy'=>$d['policy'], 'email'=>$d['email'], 'setDt'=> $refDt);
+ $ADAT['feliratkozas'][$d['naploTipus']][$d['naploId']][] = array(
+ 'userAccount'=>$d['userAccount'],
+ 'policy'=>$d['policy'],
+ 'email'=>$d['email'],
+ 'setDt'=> $refDt
+ );
}
// Megszorítás: egy naplóbeli entitás utolsoEmailDt-je együtt kell, hogy mozogjon ebben a feldolgozási rendszerben.
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php
index a7022d00..6421687a 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php
@@ -224,6 +224,7 @@
$ADAT['dt'] = $dt; // show this... ha a skin ajax
$ADAT['csengetesiRend'] = getCsengetesiRend();
+ $ADAT['utolsoorak'] = getUtolsoorak();
$ADAT['telephelyId'] = $telephelyId;
$ADAT['napiMinOra'] = getMinOra();
$ADAT['napiMaxOra'] = getMaxOra();
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas-pre.php
index 8f44cd8c..e1f28bc7 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas-pre.php
@@ -27,6 +27,7 @@
$ADAT['cimzett'] = readVariable($_POST['cimzett'],'string');
$ADAT['diakokkal'] = readVariable($_POST['diakokkal'],'bool'); // ez mindig true
$ADAT['txt'] = readVariable($_POST['txt'],'string');
+
$ADAT['tanev'] = readVariable($_POST['tanev'],'numeric',__TANEV);
list($_cimzettTipus,$_cimzettId) = explode('|',$ADAT['cimzett']);
$ADAT['cimzettTipus'] = readVariable($_cimzettTipus,'strictstring',null);
@@ -77,13 +78,15 @@
'txt'=> $ADAT['txt'] );
if (postUzenet($P) === true) {
- /* Ha sikered */
+ /* Ha sikeres */
unset($_POST);
header('Location: '.location('index.php?page=naplo&sub=uzeno&f=uzeno'));
} else {
$_SESSION['alert'][] = 'page::uzenorogziteshiba';
}
+ } else {
+ $_SESSION['alert'][] = 'page::uzenorogziteshiba';
}
?>
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas.php
index 18ccddef..6d899712 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas.php
@@ -1,5 +1,6 @@
<?php
global $ADAT;
- putUzenoPostazo($ADAT);
+ if ($skin=='ajax') putUzenoPostazo($ADAT);
+ if (__HABEL_GYURI_DEBUG===true) dump($ADAT);
?>
diff --git a/mayor-orig/mayor-naplo/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml b/mayor-orig/mayor-naplo/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml
index 69585645..cc889416 100644
--- a/mayor-orig/mayor-naplo/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml
@@ -68,8 +68,8 @@
$_color='#ff5722';
$_class="icon-question-sign";
}
- echo '<div style="width:90%; margin: 0px auto; border: solid 1px #aaa; border-radius: 2px; ">';
- echo '<div style="font-size:10px; background-color: #3c3c64; color: white; font-weight: normal; border-bottom: solid 1px #dddddd; padding:4px 10px;">Hangya - '.superdate($ADAT['kerelmek'][$i]['rogzitesDt']).'</div>';
+ echo '<div style="width:90%; margin: 0px auto; border: solid 0px #aaa; border-radius: 2px; ">';
+ echo '<div style="border-radius: 4px 4px 0px 0px; font-size:10px; background-color: #3c3c64; color: white; font-weight: normal; border-bottom: solid 1px #dddddd; padding:4px 10px;">Hangya - '.superdate($ADAT['kerelmek'][$i]['rogzitesDt']).'</div>';
echo '<div style="background-color: #eee; padding:10px;border-bottom: solid 0px #dddddd; padding:3px 3px; min-height:30px;">';
echo '<a style="color: black;" href="'.$_link.'">';
@@ -85,7 +85,7 @@
//padding:10px; border-bottom: solid 1px #3c3c64; padding:3px 10px;">'.
//htmlspecialchars($ADAT['kerelmek'][$i]['valasz']).' '.$_K['jovahagyasAccount'].'</div>';
echo '<style type="text/css">
- table.kerelemValasz {background-color:#ddd;width:100%;}
+ table.kerelemValasz {background-color: #ddd;width:100%;}
table.kerelemValasz td {font-size:10px; background-color:white; padding:2px 4px; vertical-align:top;}
table.kerelemValasz td.dt {background-color: #eee;text-align: right;}
</style>';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css
index 0cfda59b..fab07933 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css
@@ -71,6 +71,11 @@ table.orarend tbody tr td div.oraMostVan {
border-color: lightgreen; border-width: 0px 4px 0px 4px; border-radius:2px;
}
+table.orarend tbody tr td div.utolsoora {
+ border-style: solid;
+ border-color: orange; border-width: 0px 0px 2px 0px; border-radius:2px;
+}
+
table.orarend tbody tr td div.dolgozat {
background-color: orange; color:white;
border-radius:2px; padding:2px;
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/uzeno/uzeno.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/uzeno/uzeno.css
index 04d5ea37..29c35b1a 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/uzeno/uzeno.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/uzeno/uzeno.css
@@ -128,6 +128,9 @@
a span.icon-network { color: #aaa; }
a:hover span.icon-network { color: cornflowerblue; }
+ #uzenoSearchIcon { cursor:pointer; background-color: #bbb; border-radius:2px; padding:3px 3px 2px 2px; color:white; }
+ #uzenoSearchIcon:hover { background-color: cornflowerblue; }
+
@media (max-width: 764px) {
table.uzeno tbody tr td.felado { min-width:80px;}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml
index 84d59777..ffd8ed68 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml
@@ -51,6 +51,24 @@
return $RETURN_STR;
}
+ function generateFutar_utolsoora($D) {
+ $a_az[0] = 'a';
+ $a_az[1] = 'az';
+ $a_az[2] = 'a';
+ $a_az[3] = 'a';
+ $a_az[4] = 'a';
+ $a_az[5] = 'az';
+ $a_az[6] = 'a';
+ $a_az[7] = 'a';
+ $a_az[8] = 'a';
+ $a_az[9] = 'a';
+ $a_az[10] = 'a';
+ $a_az[11] = 'a';
+ $a_az[12] = 'a';
+ $RETURN_STR .='Ma a haladási napló szerint a(z) <b>'.$D['adat']['teremNev'].'</b> teremben '.$a_az[$D['adat']['utolsooraateremben']].' <b>'.$D['adat']['utolsooraateremben'].'. óra</b> után már nincs óra!';
+ return $RETURN_STR;
+ }
+
function generateFutarBadge_jegy($D) {
// return '<i class="material-icons">face</i>';
}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml
index a70662e9..61352d81 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml
@@ -55,6 +55,9 @@
function putHirnokBadge_idoszak($D) {
echo '<span class="icon-calendar-sign"></span>';
}
+ function putHirnokBadge_utolsoora($D) {
+ echo '<span class="icon-broom" style="background-color: #00bcd4"></span>';
+ }
function putHirnokBadge_haladasiBeiratlan($D) {
if ($D['db']!=0)
@@ -113,6 +116,23 @@
echo 'Aktív <b>'.$D['idoszakAdat']['tipus'].'</b> időszak: '.$D['idoszakAdat']['tolDt'].' – '.$D['idoszakAdat']['igDt'];
}
+ function putHirnok_utolsoora($D) {
+ $a_az[0] = 'a';
+ $a_az[1] = 'az';
+ $a_az[2] = 'a';
+ $a_az[3] = 'a';
+ $a_az[4] = 'a';
+ $a_az[5] = 'az';
+ $a_az[6] = 'a';
+ $a_az[7] = 'a';
+ $a_az[8] = 'a';
+ $a_az[9] = 'a';
+ $a_az[10] = 'a';
+ $a_az[11] = 'a';
+ $a_az[12] = 'a';
+ echo 'Ma a haladási napló szerint a(z) <b>'.$D['adat']['teremNev'].'</b> teremben '.$a_az[$D['adat']['utolsooraateremben']].' <b>'.$D['adat']['utolsooraateremben'].'. óra</b> után már nincs óra!';
+ }
+
function putHirnokBadge_hianyzas($D) {
$ICON = array('késés'=>'timer','felmentés'=>'accessible','felszerelés hiány'=>'accessibility',
'hiányzás'=>'location_off'); // location_off, grid_off, blur_off
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml
index b8d74048..f8b8d393 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml
@@ -24,6 +24,9 @@
function putOrarend($ADAT) {
global $aHetNapjai,$skin;
+ // $ADAT['utolsoorak'][$teremId]['oraId']
+
+
/* Képzés-Mátrix */
//dump($ADAT['kepzesOraterv']);
if (is_array($ADAT['kepzesOraterv']) && count($ADAT['kepzesOraterv'])>0) {
@@ -237,6 +240,7 @@
$_tankorTipus = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipus'];
$_tankorTipusId = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipusId'];
$_oraMostVan = (in_array($_ORA['oraId'],$ADAT['orakMost']));
+ $_utolsoora = ($_ORA['oraId']!='' && $_ORA['oraId'] == $ADAT['utolsoorak'][$dt][$_valosTeremId]['oraId']);
//
if ($kepzes_figyel
&&$ADAT['tankorTipus'][$_tankorTipusId]['oratervi'] == 'óratervi'
@@ -249,14 +253,15 @@
$_osztalyJel = $_T['osztalyJel'];
// figyelem, itt jön a kiírás, a _putOra fv helyett:
$_tipusClass = str_replace(' ','_',$_ORA['tipus']);
- $_oraMostVanClass = ($_oraMostVan) ? ' oraMostVan':'';
+ $_oraMostVanClass = ($_oraMostVan) ? ' oraMostVan ':'';
+ $_utolsooraClass = ($_utolsoora) ? ' utolsoora ':'';
if ($_T['jelleg']=='osztályfüggetlen') {
$_tipusClass .= ' osztályfüggetlen';
}
$_oraAdat = (isset($_ORA['oo']) && _POLICY!='public') ? 'oraAdat' : ''; // haladási
$_hianyzasAdat = $ADAT['hianyzas'][$_ORA['oraId']][0];
$_hianyzasClass = (is_array($_hianyzasAdat) && $_hianyzasAdat['hTipus']=='hiányzás') ? ' nemVoltBent ':'';
- echo '<div class="'.$_tipusClass.$_frissClass.$_oraMostVanClass.$_hianyzasClass.' '.$_oraAdat.'" data-oraid="'.$_ORA['oraId'].'" title="'.$_ORA['tipus'].'" >';
+ echo '<div class="'.$_tipusClass.$_frissClass.$_oraMostVanClass.$_utolsooraClass.$_hianyzasClass.' '.$_oraAdat.'" data-oraid="'.$_ORA['oraId'].'" title="'.$_ORA['tipus'].'" >';
if (is_array($_hianyzasAdat)) {
echo '<span class="hianyzasTicker '.ekezettelen($_hianyzasAdat['hTipus']).' '.ekezettelen($_hianyzasAdat['statusz']).' '.ekezettelen($_hianyzasAdat['igazolas']).'">';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/postas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/postas.phtml
index 65a45fae..0ac05060 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/postas.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/postas.phtml
@@ -24,7 +24,7 @@
echo '<input type="hidden" name="mayorToken" class="mayorToken" value="'.$_SESSION['mayorToken'].'" />'; // rendhagyó eset, mert az egész tartalmat lecseréli az onLoadUpdate, és a form-tól kezdjük...
echo '<input type="hidden" name="kuuk" value="'.$ADAT['kuuk'].'" />';
echo '<input type="hidden" name="tanev" value="'.$ADAT['tanev'].'" />';
- echo '<table class="ujUzenet" align="center">';
+ echo '<table class="ujUzenet" align="center" style="background-color: rgba(240,240,240,0.4);">';
echo '<tr><th>'._UJ_UZENET;
if (__UZENOADMIN ===true && $ADAT['user']['feladoTipus']!='admin') {
echo ' <select id="asWho" name="asWho" class="onChangeUpdate">';
@@ -38,7 +38,7 @@
echo '<tr><td>';
echo _CIMZETT.': ';
// echo '<span style="" id="uzenoSearchIcon"><img src="/skin/classic/module-naplo/img/toolSearch.png" alt="ዖ" style="height:15px; width:15px;" align="middle" class="searchIcon"/>'.'</span>';
- echo '<span style="font-size:15px; cursor:pointer" id="uzenoSearchIcon">⌕</span>';
+ echo '<span id="uzenoSearchIcon" class="icon-search"></span>';
echo '<input style="display:none" type="text" name="pattern" id="pattern" class="onChangeUpdate" placeholder="'._NEV.'" />';
echo '<button style="display:none" type="button">'._KERES.'</button>';
if (is_array($ADAT['r'])) {
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 7b690e22..0da8daf7 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4574
+4589
diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css
index 6012657c..cc128d4f 100644
--- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css
+++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css
@@ -40,12 +40,14 @@
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;
+ 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;
+ 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;
}
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 7b690e22..0da8daf7 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4574
+4589
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index e76bc873..88c0a37d 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4574
-41241dc58e3e7195301250cee3643353 mayor-fenntarto-rev4574.tgz
-08303897f4392e885330f216208bee21 mayor-installer-sulix-rev4574.tgz
-3b4d28181cc389248cb1d9fa5a9a8dc9 mayor-wiki-rev4574.tgz
-32d340be492dc2779569c5f2bf090df5 mayor-installer-rev4574.tgz
-914938cf3172fee8110af7c69a97484c mayor-portal-rev4574.tgz
-546ffeb35e70511c6c5af5ae509bdb04 mayor-felveteli-rev4574.tgz
-d8168832168dd23756fede70091440a9 mayor-jatek-rev4574.tgz
-cb5138812afb40c0469c9aa0e1bf2d80 mayor-locales-jp_JP-rev4574.tgz
-2ddec91a2d29e23faacb2b2dfaf5cb6f mayor-locales-de_DE-rev4574.tgz
-8cdf7b214a0915994ef20c63d84413be mayor-locales-en_US-rev4574.tgz
-e19850594aab19deeb367b4e04afe8fc mayor-naplo-rev4574.tgz
-ced58263b52c1748113a85fa6ad70331 mayor-base-rev4574.tgz
+Revision 4589
+97491ee59a5a0a695b3202e61d89e660 mayor-fenntarto-rev4589.tgz
+a7c7d13ce01d0d97aebca2edf6a2cd85 mayor-installer-sulix-rev4589.tgz
+928ce79eac3e2b3ece1fb76712ab179e mayor-wiki-rev4589.tgz
+3501454acee55dcf31c4e3d30d60c742 mayor-installer-rev4589.tgz
+8a062ea042d7a1e9e092a298c42bb317 mayor-portal-rev4589.tgz
+81216f010f1b222b1adef11de6562654 mayor-felveteli-rev4589.tgz
+1d770dd265ab555cb1d436cc3916911d mayor-jatek-rev4589.tgz
+571e556afbb1a8464042952dc52a394d mayor-locales-jp_JP-rev4589.tgz
+2de87e455a97faf1e74c7fdb9b7908bf mayor-locales-de_DE-rev4589.tgz
+5e9b907d18d750889e47adb42154d6fc mayor-locales-en_US-rev4589.tgz
+18d811560f4c8b6e00306c6a91ad160c mayor-naplo-rev4589.tgz
+9b6fd65c7d3d74b9a5e09dc2c3d8992a mayor-base-rev4589.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 7b690e22..0da8daf7 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4574
+4589
diff --git a/rev.txt b/rev.txt
index 7b690e22..0da8daf7 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4574
+4589