diff --git a/.gitignore b/.gitignore
index 47afc8e..00173a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,5 @@ data/DoctrineORMModule/cache/
demos/
extras/documentation
+*.zip
+
diff --git a/install/public_html/templates/install_requirement.tpl.php b/install/public_html/templates/install_requirement.tpl.php
index 5c8aeb3..7555282 100644
--- a/install/public_html/templates/install_requirement.tpl.php
+++ b/install/public_html/templates/install_requirement.tpl.php
@@ -48,10 +48,10 @@
|
'._t('Anleitung zur Installation').''; ?> |
-
+
|
'._t('Anleitung zur Installation').''; ?> |
diff --git a/install/resources/content/install_requirement.php b/install/resources/content/install_requirement.php
index 99a87cf..4b3e46b 100644
--- a/install/resources/content/install_requirement.php
+++ b/install/resources/content/install_requirement.php
@@ -25,8 +25,8 @@ if (version_compare(PHP_VERSION, '7.0.0') >= 0)
if (extension_loaded('ssh2'))
$phpSSH['status'] = true;
-//if (function_exists('mcrypt_encrypt') !== false)
- $phpMcrypt['status'] = true;
+#if (function_exists('mcrypt_encrypt') !== false)
+# $phpMcrypt['status'] = true;
if (trim(exec('dpkg -s php7.3-cli | grep Status: ')) != '' || trim(exec('dpkg -s php7.4-cli | grep Status: ')) != '')
$phpCLI['status'] = true;
@@ -71,7 +71,8 @@ else
setCookie('_pi-control_install_language', $globalLanguage);
// Button
-if ($phpVersion['status'] === false || $phpSSH['status'] === false || $phpMcrypt['status'] === false || $phpCLI['status'] === false || $phpCURL['status'] === false || $phpZipArchive['status'] === false || $phpAllowUrlFopen['status'] === false || $filesFoldersExist['status'] === false || $filesFoldersPermission['status'] === false || $otherDistribution['status'] === false || $otherCookie['status'] === false)
+//if ($phpVersion['status'] === false || $phpSSH['status'] === false || $phpMcrypt['status'] === false || $phpCLI['status'] === false || $phpCURL['status'] === false || $phpZipArchive['status'] === false || $phpAllowUrlFopen['status'] === false || $filesFoldersExist['status'] === false || $filesFoldersPermission['status'] === false || $otherDistribution['status'] === false || $otherCookie['status'] === false)
+if ($phpVersion['status'] === false || $phpSSH['status'] === false || $phpCLI['status'] === false || $phpCURL['status'] === false || $phpZipArchive['status'] === false || $phpAllowUrlFopen['status'] === false || $filesFoldersExist['status'] === false || $filesFoldersPermission['status'] === false || $otherDistribution['status'] === false || $otherCookie['status'] === false)
$error = true;
$tpl->assign('phpVersion', $phpVersion);
diff --git a/resources/cron/init.php b/resources/cron/init.php
index 2c3fdeb..20c82a7 100644
--- a/resources/cron/init.php
+++ b/resources/cron/init.php
@@ -31,5 +31,5 @@ foreach ($fileArray as $file)
}
}
-if (trim(exec('dpkg -s php7.0-cli | grep Status: ')) != '' || trim(exec('dpkg -s php7.3-cli | grep Status: ')) != '')
+if (trim(exec('dpkg -s php7.4-cli | grep Status: ')) != '' || trim(exec('dpkg -s php7.3-cli | grep Status: ')) != '')
setConfig('cron:execution.cron', time());
diff --git a/resources/init.php b/resources/init.php
index 7ddd3d5..7821a41 100644
--- a/resources/init.php
+++ b/resources/init.php
@@ -10,8 +10,8 @@ if (!isset($config))
'ssh_ip' => '127.0.0.1'
),
'version' => array(
- 'version' => '2.2.0',
- 'versioncode' => 30,
+ 'version' => '2.3.0',
+ 'versioncode' => 31,
'android_comp_level' => 25
),
'url' => array(
diff --git a/resources/library/update/update.class.php b/resources/library/update/update.class.php
index 54d3b70..07c5b67 100644
--- a/resources/library/update/update.class.php
+++ b/resources/library/update/update.class.php
@@ -253,7 +253,7 @@ class UpdateController
if (!class_exists('cURL'))
(include LIBRARY_PATH.'curl/curl.class.php');
- $curl = new cURL($this->updateDownloadURL.'&'.http_build_query(array('file' => $version->getFilename())));
+ $curl = new cURL($this->updateDownloadURL . $version->getFilename());
$curlStatus = $curl->downloadFile(UPDATE_PATH.'update.zip');
if (!is_bool($curlStatus))
@@ -267,7 +267,7 @@ class UpdateController
unlink(UPDATE_PATH.'update.zip');
return $curl->getStatusCode();
}
-
+
if (md5_file(UPDATE_PATH.'update.zip') !== $version->getChecksum())
{
unlink(UPDATE_PATH.'update.zip');