From c5e0aa198eaf5a01e89700cd484ca6ea86228811 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Wed, 2 Jun 2021 14:55:05 +0200 Subject: Rev: 4788 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- mayor-orig/mayor-felveteli/log/mayor-felveteli.rev | 2 +- mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev | 2 +- .../mayor-installer-orig/log/mayor-installer.rev | 2 +- .../log/mayor-installer-sulix.rev | 2 +- mayor-orig/mayor-jatek/log/mayor-jatek.rev | 2 +- .../log/mayor-locales-de_DE.rev | 2 +- .../log/mayor-locales-en_US.rev | 2 +- .../log/mayor-locales-jp_JP.rev | 2 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../policy/private/naplo/hirnok/cronFutar-pre.php | 17 +++++++------- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 +++++++++++----------- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 16 files changed, 35 insertions(+), 36 deletions(-) diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 1a48a10f..7b39ff55 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4787 +4788 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 1a48a10f..7b39ff55 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4787 +4788 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 1a48a10f..7b39ff55 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4787 +4788 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 1a48a10f..7b39ff55 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4787 +4788 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 1a48a10f..7b39ff55 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 @@ -4787 +4788 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 1a48a10f..7b39ff55 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4787 +4788 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 1a48a10f..7b39ff55 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 @@ -4787 +4788 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 1a48a10f..7b39ff55 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 @@ -4787 +4788 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 1a48a10f..7b39ff55 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 @@ -4787 +4788 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 1a48a10f..7b39ff55 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4787 +4788 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 227d1216..34ec7024 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 @@ -17,15 +17,14 @@ $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 (is_array($USER[$d['naploTipus']])) { - 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 - ); - } + + 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 + ); } // 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-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 1a48a10f..7b39ff55 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4787 +4788 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 1a48a10f..7b39ff55 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4787 +4788 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 6f9acda4..e0b2c773 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4787 -fd46a8aa9a62e3fdb99c464203118281 mayor-fenntarto-rev4787.tgz -c0d539456baa6e941dfdd38de9cf5f6f mayor-installer-sulix-rev4787.tgz -e867e27b129bda359a7ef127965e6547 mayor-wiki-rev4787.tgz -625fbfb0b5c1a31c6a775d5764015419 mayor-installer-rev4787.tgz -ad42fc852ca86ad70d322ed5d8408eb5 mayor-portal-rev4787.tgz -ba1a310063191581b954df847ccf1b23 mayor-felveteli-rev4787.tgz -ae074969e02e059f0a06b15d7df4dcfc mayor-jatek-rev4787.tgz -70162fa6b57995e3d23c5fefc63e8005 mayor-locales-jp_JP-rev4787.tgz -fb4af83cd5475e67c37759b464ff3da5 mayor-locales-de_DE-rev4787.tgz -ce051d4350dcac5a0c4c4c173bf7b32e mayor-locales-en_US-rev4787.tgz -97f1d1ccc929f5a9fde0d0a404e158cf mayor-naplo-rev4787.tgz -0d5c3876e3cc372a747eb85aabaa8fe7 mayor-base-rev4787.tgz +Revision 4788 +be460bb524ee25f3092dd30b185a5193 mayor-fenntarto-rev4788.tgz +1ee9277ea5a629ff84d161b1960d19d3 mayor-installer-sulix-rev4788.tgz +1c2a608f01d00bfccfcb24cad22f6d9e mayor-wiki-rev4788.tgz +4ed8ea813d8d83643d603834d3e293ce mayor-installer-rev4788.tgz +6341f21a5ca79648d7649a374f5d809b mayor-portal-rev4788.tgz +095918a539b56fb9e8a80570e71a0350 mayor-felveteli-rev4788.tgz +ea930df49d9078f15e7d92c10c4f462d mayor-jatek-rev4788.tgz +e1f151cec3341cab8160bd2d9bfa81b5 mayor-locales-jp_JP-rev4788.tgz +fe4c8d3626b29208f13c8f6677c75b23 mayor-locales-de_DE-rev4788.tgz +c9c6f852be477c962d2f3a8f1f139d9e mayor-locales-en_US-rev4788.tgz +d272925797308ebdf51a00b782fe2910 mayor-naplo-rev4788.tgz +bc3a58c422c6bce8c2109139f7c18192 mayor-base-rev4788.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 1a48a10f..7b39ff55 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4787 +4788 diff --git a/rev.txt b/rev.txt index 1a48a10f..7b39ff55 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4787 +4788 -- cgit v1.2.3