From 02fd32b0bcf26ed77e25b7eb843bb637c00eb2af Mon Sep 17 00:00:00 2001 From: nuxsmin Date: Tue, 25 Jul 2017 12:51:10 +0200 Subject: [PATCH] * [MOD] Improved check for tmp folder --- inc/SP/Util/Util.class.php | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/inc/SP/Util/Util.class.php b/inc/SP/Util/Util.class.php index c0d7b57b..ac510bd0 100644 --- a/inc/SP/Util/Util.class.php +++ b/inc/SP/Util/Util.class.php @@ -328,21 +328,25 @@ class Util $appTmp = Init::$SERVERROOT . DIRECTORY_SEPARATOR . 'tmp'; $file = 'syspass.test'; - if (file_exists($appTmp . DIRECTORY_SEPARATOR . $file)) { + $checkDir = function ($dir) use ($file) { + if (file_exists($dir . DIRECTORY_SEPARATOR . $file)) { + return $dir; + } + + if (is_dir($dir) || @mkdir($dir)) { + if (touch($dir . DIRECTORY_SEPARATOR . $file)) { + return $dir; + } + } + + return false; + }; + + if ($checkDir($appTmp)) { return $appTmp; } - if (file_exists($sysTmp . DIRECTORY_SEPARATOR . $file)) { - return $sysTmp; - } - - if (is_dir($appTmp) || @mkdir($appTmp)) { - if (touch($appTmp . DIRECTORY_SEPARATOR . $file)) { - return $appTmp; - } - } - - return touch($sysTmp . DIRECTORY_SEPARATOR . $file) ? $sysTmp : false; + return $checkDir($sysTmp); } /** @@ -382,7 +386,7 @@ class Util */ public static function getVersion($retBuild = false, $normalized = false) { - $build = 17072502; + $build = 17072503; $version = [2, 1, 12]; if ($normalized === true) {