Rev: 4589rev4589

11 files changed, 58 insertions, 21 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) {