diff options
author | M.Gergo | 2020-04-01 15:50:03 +0200 |
---|---|---|
committer | M.Gergo | 2020-04-01 15:50:03 +0200 |
commit | ad6a38cc882f9da97aae74bb8c48ad9f70bc39e8 (patch) | |
tree | 8fb5320968ab686e737f927658373bef18d0e5d5 | |
parent | 973ae816e66352e9d97facf92f8ffc3bcc0d89bd (diff) | |
download | mayor-ad6a38cc882f9da97aae74bb8c48ad9f70bc39e8.tar.gz mayor-ad6a38cc882f9da97aae74bb8c48ad9f70bc39e8.zip |
Rev: 4646rev4646
17 files changed, 35 insertions, 30 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index df260d9e..432cde09 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4645 +4646 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index df260d9e..432cde09 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4645 +4646 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index df260d9e..432cde09 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4645 +4646 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index df260d9e..432cde09 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4645 +4646 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 df260d9e..432cde09 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 @@ -4645 +4646 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index df260d9e..432cde09 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4645 +4646 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 df260d9e..432cde09 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 @@ -4645 +4646 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 df260d9e..432cde09 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 @@ -4645 +4646 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 df260d9e..432cde09 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 @@ -4645 +4646 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index df260d9e..432cde09 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4645 +4646 diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php index 3fd87f21..86ca57a0 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php @@ -61,7 +61,7 @@ $hazifeladatFeltoltesEngedely = readVariable($_POST['hazifeladatFeltoltesEngedely'],'id',0); if ($hazifeladatId>0) { // update if (is_null($hazifeladatHataridoDt)) { - $q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u WHERE hazifeladatId=%u"; + $q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u,hazifeladatHataridoDt=NULL WHERE hazifeladatId=%u"; $values = array($ADAT['hazifeladatLeiras'],$hazifeladatFeltoltesEngedely,$ADAT['hazifeladatId']); } else { $q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u,hazifeladatHataridoDt='%s' WHERE hazifeladatId=%u"; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml index e6e2d4e6..98337d4e 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml @@ -79,7 +79,10 @@ echo '<style type="text/css"> if ($ADAT['hazifeladatDiak']['tanarLattamDt']!='') { echo ' <span class="icon-ok-sign" style="color: lightgreen"></span> '.$ADAT['hazifeladatDiak']['tanarLattamDt']; } - if (strtotime($ADAT['hazifeladatDiak']['hazifeladatDiakFileDt']) > strtotime($ADAT['hazifeladatAdat']['hazifeladatHataridoDt'])) { + + if ($ADAT['hazifeladatAdat']['hazifeladatHataridoDt']!='' + && $D['hazifeladatDiakFileDt']!='' + && strtotime($D['hazifeladatDiakFileDt']) > strtotime($ADAT['hazifeladatAdat']['hazifeladatHataridoDt'])) { echo '<span class="hataridoUtaniFeltoltes">határidő utáni feltöltés</span>'; } echo '</li></ul>'; @@ -222,7 +225,9 @@ echo '<style type="text/css"> echo '<td colspan="1" class="'.ekezettelen($D['hazifeladatDiakStatus']).'">'.$D['hazifeladatDiakStatus'].'</td>'; //echo '<td>'.$D['hazifeladatDiakMegjegyzes'].'</td>'; echo '<td>'; - if (strtotime($D['hazifeladatDiakFileDt']) > strtotime($ADAT['hazifeladatAdat']['hazifeladatHataridoDt'])) { + if ($ADAT['hazifeladatAdat']['hazifeladatHataridoDt']!='' + && $D['hazifeladatDiakFileDt']!='' + && strtotime($D['hazifeladatDiakFileDt']) > strtotime($ADAT['hazifeladatAdat']['hazifeladatHataridoDt'])) { echo '<span class="hataridoUtaniFeltoltes">határidő utáni feltöltés</span>'; } echo '</td>'; diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index df260d9e..432cde09 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4645 +4646 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index df260d9e..432cde09 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4645 +4646 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 5b6a7746..fe92affd 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4645 -32c59157c46a9f7cc850c8d8c750b371 mayor-fenntarto-rev4645.tgz -651b082a2c563e7c04c1cc28720f3b1b mayor-installer-sulix-rev4645.tgz -6cc5495b1320ce5d0315fed2edbc079a mayor-wiki-rev4645.tgz -b660418d027155d4d82d131c8d811930 mayor-installer-rev4645.tgz -9b3be1d5ee811e33aef786bd4667332c mayor-portal-rev4645.tgz -0be48fd4cb4930f3d59cff0e043bb214 mayor-felveteli-rev4645.tgz -85ce809f84e94d88f33b94e69d990ac0 mayor-jatek-rev4645.tgz -574c46fd12cb0d6a1a8dbfc3bce1b778 mayor-locales-jp_JP-rev4645.tgz -2f70947d29180b179a4af3d3677bd598 mayor-locales-de_DE-rev4645.tgz -4897ac638fb9bee6468adfd2c07de96d mayor-locales-en_US-rev4645.tgz -b101ac6d1ccdf125ee09da69396b8406 mayor-naplo-rev4645.tgz -c8ef0da17aa2e3dff7ca4d89082a4a29 mayor-base-rev4645.tgz +Revision 4646 +ebb35417a13f1d3ca611030256dc53dc mayor-fenntarto-rev4646.tgz +f928b55f1f2812aad961e91bd15b83f3 mayor-installer-sulix-rev4646.tgz +ac834d79ee8faaf09af15e9753e39967 mayor-wiki-rev4646.tgz +48c0acd54dbc6c49219c1e6219d63d31 mayor-installer-rev4646.tgz +6e1b6103616ac8595c6f529845cd51ea mayor-portal-rev4646.tgz +cdb74cd9e35df127608830e829cb3a53 mayor-felveteli-rev4646.tgz +3d18adcd4647b8f82adbda6bf9e671c7 mayor-jatek-rev4646.tgz +00f525d935bf0317bc39ae0c47ed4d0d mayor-locales-jp_JP-rev4646.tgz +d47203fe463e09468d3a891191b306db mayor-locales-de_DE-rev4646.tgz +63f29492349230b00a9aa1e5a44e9934 mayor-locales-en_US-rev4646.tgz +ab798136849abe56af0f79334800e949 mayor-naplo-rev4646.tgz +db099677c69ea7fecd9ee00326a6abdd mayor-base-rev4646.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index df260d9e..432cde09 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4645 +4646 @@ -1 +1 @@ -4645 +4646 |