aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM.Gergo2020-06-09 23:40:04 +0200
committerM.Gergo2020-06-09 23:40:04 +0200
commit6359761e029be169a9f0ea2b1e3410408c373ec4 (patch)
tree3cd7bc3f9f4c75e7e47e6608dddea892358ea681
parent99481ab82a386c30d970592c5b8804e5c8e6df6e (diff)
downloadmayor-6359761e029be169a9f0ea2b1e3410408c373ec4.tar.gz
mayor-6359761e029be169a9f0ea2b1e3410408c373ec4.zip
Rev: 4656rev4656
Diffstat
-rw-r--r--mayor-orig/mayor-base/log/mayor-base.rev2
-rw-r--r--mayor-orig/mayor-base/www/lang/hu_HU/module-password/changePassword.php1
-rw-r--r--mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml9
-rw-r--r--mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js32
-rw-r--r--mayor-orig/mayor-felveteli/log/mayor-felveteli.rev2
-rw-r--r--mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev2
-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/policy/private/naplo/osztalyozo/stat-pre.php2
-rw-r--r--mayor-orig/mayor-portal/log/mayor-portal.rev2
-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
19 files changed, 70 insertions, 28 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index b5859656..4a14f368 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4653
+4656
diff --git a/mayor-orig/mayor-base/www/lang/hu_HU/module-password/changePassword.php b/mayor-orig/mayor-base/www/lang/hu_HU/module-password/changePassword.php
index 9c56a329..94007ff8 100644
--- a/mayor-orig/mayor-base/www/lang/hu_HU/module-password/changePassword.php
+++ b/mayor-orig/mayor-base/www/lang/hu_HU/module-password/changePassword.php
@@ -12,5 +12,6 @@ define('_USERNAME','Felhasználói név');
define('_NEW_PASSWORD','Új jelszó');
define('_VERIFICATION','Megerősítés');
define('_OK','OK');
+define('_PWGEN','Ajánlott jelszó');
?>
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 59dab0ea..295f6eeb 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
@@ -33,6 +33,15 @@
echo '<tbody>'."\n";
echo '<tr>'."\n";
echo '<td>'."\n";
+ echo _PWGEN;
+ echo '</td>'."\n";
+ echo '<td>'."\n";
+ echo '<input id="txtPwgen" type="text" value="" maxlength="32" />'."\n";
+ echo '<div id="btnPwgen" class="icon-fork" style="cursor: pointer"></div>';
+ echo '</td>'."\n";
+ echo '</tr>'."\n";
+ echo '<tr>'."\n";
+ echo '<td>'."\n";
echo _USERNAME;
echo '</td>'."\n";
echo '<td>'."\n";
diff --git a/mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js b/mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js
new file mode 100644
index 00000000..221c2f98
--- /dev/null
+++ b/mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js
@@ -0,0 +1,32 @@
+$(function() {
+
+ var str = randString($('#newpassword'));
+ $("#btnPwgen").click(function() {
+ $('#newPassword').val(str);
+ $('#verification').val(str);
+ });
+ $('#txtPwgen').val(str);
+
+});
+
+function randString(id){
+ var dataSet = 'a-z,A-Z,0-9'.split(',');
+ var possible = '';
+ if($.inArray('a-z', dataSet) >= 0){
+ possible += 'abcdefghijklmnopqrstuvwxyz';
+ }
+ if($.inArray('A-Z', dataSet) >= 0){
+ possible += 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+ }
+ if($.inArray('0-9', dataSet) >= 0){
+ possible += '0123456789';
+ }
+ if($.inArray('#', dataSet) >= 0){
+ possible += '![]{}()%&*$#^<>~@|';
+ }
+ var text = '';
+ for(var i=0; i < 10; i++) {
+ text += possible.charAt(Math.floor(Math.random() * possible.length));
+ }
+ return text;
+}
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index b5859656..4a14f368 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4653
+4656
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index b5859656..4a14f368 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4653
+4656
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index b5859656..4a14f368 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4653
+4656
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 b5859656..4a14f368 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 @@
-4653
+4656
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index b5859656..4a14f368 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4653
+4656
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 b5859656..4a14f368 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 @@
-4653
+4656
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 b5859656..4a14f368 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 @@
-4653
+4656
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 b5859656..4a14f368 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 @@
-4653
+4656
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index b5859656..4a14f368 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4653
+4656
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php
index 7fc0a8de..1ede4ff2 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php
@@ -126,7 +126,7 @@
list($_diakId, $_zaradekIndex, $zaradekId, $csereStr) = explode('/', $zAdat); // --TODO per jel hibás lehet!
if ($zaradekId == '') $zaradekId = null;
if (in_array($_zaradekIndex, array_values($ZaradekIndex['konferencia bukás']))) $csere = array('%évfolyam%' => $ADAT['evfolyamJel'].".");
- else $csere = array('%évfolyam%' => ($ADAT['kovetkezoEvfolyamJel']).".", '%évfolyam betűvel%' => ($_EVFOLYAMJEL_BETUVEL[ $ADAT['kovetkezoEvfolyamJel'] ]).".");
+ else $csere = array('%évfolyam%' => ($ADAT['kovetkezoEvfolyamJel']).".", '%évfolyam betűvel%' => $_EVFOLYAMJEL_BETUVEL[ $ADAT['kovetkezoEvfolyamJel'] ]);
$csere['%tantárgy%'] = str_replace('=',', ',$csereStr); // TODO, és-re cserélhetjük vessző helyett
zaradekRogzites(array('diakId'=>$_diakId, 'zaradekId' => $zaradekId, 'zaradekIndex'=>$_zaradekIndex, 'dt'=>$ADAT['utolsoTanitasiNap'], 'csere' => $csere));
}
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index b5859656..4a14f368 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4653
+4656
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index b5859656..4a14f368 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4653
+4656
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 51d75cf9..9701a43c 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4653
-e1da81dde355c3b2a27222f55485f4d7 mayor-fenntarto-rev4653.tgz
-7db82c9dea4c9474dc0ea43570549b82 mayor-installer-sulix-rev4653.tgz
-b6b523a7a97959c3043191e971546d5f mayor-wiki-rev4653.tgz
-2177a02b73ee7fa9e04bfadecb0d9bb4 mayor-installer-rev4653.tgz
-48775a1f9977e4bd131d42b20a682975 mayor-portal-rev4653.tgz
-5d31067b8865d927aa735830910b1fd4 mayor-felveteli-rev4653.tgz
-b422baa7722e322c8242f10231b24014 mayor-jatek-rev4653.tgz
-c1c3eeb0593c686c9eb72fe3a2eba342 mayor-locales-jp_JP-rev4653.tgz
-b9915bed4c51e5c0f7eea228477c8325 mayor-locales-de_DE-rev4653.tgz
-5bc43b6037d8e63b2c4743d6a7233dd3 mayor-locales-en_US-rev4653.tgz
-0d9fd05779684646dee6cbd04f203136 mayor-naplo-rev4653.tgz
-2911fe7c85c52c67b64341248eba9d7d mayor-base-rev4653.tgz
+Revision 4656
+0426dbe90ba92e5cdd8757572cf3b78f mayor-fenntarto-rev4656.tgz
+62b428ce652aaee4f7634fe06f4cb255 mayor-installer-sulix-rev4656.tgz
+8b7c6fbf3a10477a6626aba3766fcba1 mayor-wiki-rev4656.tgz
+e0a6ad5568813b1b1f36a2641e51fd58 mayor-installer-rev4656.tgz
+5fa3a5aa03af5d74807110d68682dd6f mayor-portal-rev4656.tgz
+ec76de46b35d2aeec1c85047b1406522 mayor-felveteli-rev4656.tgz
+8ea55339b8fa77e2667a53342ac73f91 mayor-jatek-rev4656.tgz
+8b83fef861919c37d53e39db923272a6 mayor-locales-jp_JP-rev4656.tgz
+1f4ad456e2ba9d6983af5bc65705873b mayor-locales-de_DE-rev4656.tgz
+93183a616d018cd65304e68eebefa773 mayor-locales-en_US-rev4656.tgz
+200a00e5e4f9313b117b19868bce830c mayor-naplo-rev4656.tgz
+ddf4cff2eccd8ac99bbeec9ba440988a mayor-base-rev4656.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index b5859656..4a14f368 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4653
+4656
diff --git a/rev.txt b/rev.txt
index b5859656..4a14f368 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4653
+4656
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-16 15:23:43 +0000