From 108cd360416fab309c0d91e26187c5d51dc1f8d7 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Thu, 26 Mar 2020 17:25:03 +0100 Subject: Rev: 4639 --- mayor-orig/mayor-base/www/include/share/net/upload.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'mayor-orig/mayor-base/www/include/share') diff --git a/mayor-orig/mayor-base/www/include/share/net/upload.php b/mayor-orig/mayor-base/www/include/share/net/upload.php index d58708ed..4aea8b8a 100644 --- a/mayor-orig/mayor-base/www/include/share/net/upload.php +++ b/mayor-orig/mayor-base/www/include/share/net/upload.php @@ -49,12 +49,27 @@ try { // You should name it uniquely. // DO NOT USE $_FILES['upfile']['name'] WITHOUT ANY VALIDATION !! // On this example, obtain safe unique name from its binary data. + + // define('CLAMAV_ENABLED',true); + if (CLAMAV_ENABLED === true) { + $safePath = escapeshellarg($_FILES['upfile']['tmp_name']); + $command = "clamdscan --quiet --stdout --fdpass ".$safePath." --remove --log='/var/mayor/log/clamdscan.log'"; // --remove + $out = ''; + $int = -1; + exec($command, $out, $int); + if ($int!==0) { + if (file_exists($safePath)) unlink($safePath); + throw new RuntimeException('Szerintünk ez vírusos!!!'); + } + } + if (!move_uploaded_file($_FILES['upfile']['tmp_name'],$ADAT['subdir'].'/'.$ADAT['filename'])) { throw new RuntimeException('Nem tudtuk átmozgatni. Van jogunk írni a célkönyvtárba?'); } } catch (RuntimeException $e) { $_SESSION['alert'][] = 'info::'.$e->getMessage(); + return false; } return true; -- cgit v1.2.3 From d2c82a8367b63d0a51fb4d3a322e5e83c06874c9 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Thu, 26 Mar 2020 17:50:04 +0100 Subject: Rev: 4640 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- .../mayor-base/www/include/share/net/upload.php | 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 +- 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, 28 insertions(+), 28 deletions(-) (limited to 'mayor-orig/mayor-base/www/include/share') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4639 +4640 diff --git a/mayor-orig/mayor-base/www/include/share/net/upload.php b/mayor-orig/mayor-base/www/include/share/net/upload.php index 4aea8b8a..0d50d34e 100644 --- a/mayor-orig/mayor-base/www/include/share/net/upload.php +++ b/mayor-orig/mayor-base/www/include/share/net/upload.php @@ -53,7 +53,7 @@ try { // define('CLAMAV_ENABLED',true); if (CLAMAV_ENABLED === true) { $safePath = escapeshellarg($_FILES['upfile']['tmp_name']); - $command = "clamdscan --quiet --stdout --fdpass ".$safePath." --remove --log='/var/mayor/log/clamdscan.log'"; // --remove + $command = "clamdscan --quiet --stdout --fdpass ".$safePath." --remove"; // --remove $out = ''; $int = -1; exec($command, $out, $int); diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4639 +4640 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4639 +4640 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4639 +4640 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 d464190f..f201ebe0 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 @@ -4639 +4640 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4639 +4640 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 d464190f..f201ebe0 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 @@ -4639 +4640 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 d464190f..f201ebe0 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 @@ -4639 +4640 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 d464190f..f201ebe0 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 @@ -4639 +4640 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4639 +4640 diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4639 +4640 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4639 +4640 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 3406c508..a29c6989 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4639 -2d41c52f4016d1be10f4dce40ed0b93f mayor-fenntarto-rev4639.tgz -c9478de2ea95c1be83ff1e0b62e2f551 mayor-installer-sulix-rev4639.tgz -942b1ae2d0c7b63e733f7a1adbbaa0fa mayor-wiki-rev4639.tgz -cc9376be722d81207bbfa23c89fabe89 mayor-installer-rev4639.tgz -26fd8ce3ecef39bf4ee8551cd7876fbb mayor-portal-rev4639.tgz -a1908da04c7df9f409d1b744a59bdf95 mayor-felveteli-rev4639.tgz -e5bc861e6b379dcbcfb091e92b7b47f8 mayor-jatek-rev4639.tgz -a880b62b6fce28e75dc04926cec94cb7 mayor-locales-jp_JP-rev4639.tgz -f0c9d72a8997e39688dafcde61a3bc64 mayor-locales-de_DE-rev4639.tgz -518c80ceee91124cdc30dcce46734cd9 mayor-locales-en_US-rev4639.tgz -3e36f7e5a3f044eaf359b5c93e7e4c53 mayor-naplo-rev4639.tgz -39a23ad8b33e5c5f9b9c036831f8171c mayor-base-rev4639.tgz +Revision 4640 +b51060c311067404ac189cad6cace9b7 mayor-fenntarto-rev4640.tgz +cddc7e2f50f0488aafbecfde00f85221 mayor-installer-sulix-rev4640.tgz +a497bc01ef299e59fd3ee697a5587d9b mayor-wiki-rev4640.tgz +83a6acdac73692b2f682b454e08b3c17 mayor-installer-rev4640.tgz +5ebfe1aab6a41b565c217d9286522560 mayor-portal-rev4640.tgz +d70c7ff14d8a857d4f214289fe9864cd mayor-felveteli-rev4640.tgz +634acc85bd9fbfeae1af698539e67124 mayor-jatek-rev4640.tgz +e73a9088ced43dcb8710190f487eb7e3 mayor-locales-jp_JP-rev4640.tgz +c294db378132eb75cea51997581ebd07 mayor-locales-de_DE-rev4640.tgz +6f14ab873b407d1d97348895c5ef8a2e mayor-locales-en_US-rev4640.tgz +c217cd9212716e3d3de34ffb930db72e mayor-naplo-rev4640.tgz +a1459d17b6ac376e21051b4009263c9b mayor-base-rev4640.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index d464190f..f201ebe0 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4639 +4640 diff --git a/rev.txt b/rev.txt index d464190f..f201ebe0 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4639 +4640 -- cgit v1.2.3