SchultesDev/pi-control
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge durchgeführt in bullseye (Pull-Request #1)

Browse Source 
Bullseye
This commit is contained in:
Gregor Schulte
2021-12-14 11:22:25 +00:00
parent 22fa53e3a3 3ebc78f14d
commit db683a5b19
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -99,3 +99,5 @@ data/DoctrineORMModule/cache/
demos/
extras/documentation
*.zip

4
install/public_html/templates/install_requirement.tpl.php
View File

@@ -48,10 +48,10 @@
<td><?php _e('SSH2-Erweiterung installiert'); ?></td>
<td class="<?php echo ($data['phpSSH']['status'] == true) ? 'green' : 'red'; ?>"><?php echo ($data['phpSSH']['status'] == true) ? '&#10004;' : '&#10006; <a style="color: inherit; text-decoration: underline" href="'.$data['configHelp'].'#phpssh'.getURLLangParam().'" target="_blank">'._t('Anleitung zur Installation').'</a>'; ?></td>
</tr>
<tr>
<!--<tr>
<td><?php _e('Mcrypt-Erweiterung installiert'); ?></td>
<td class="<?php echo ($data['phpMcrypt']['status'] == true) ? 'green' : 'red'; ?>"><?php echo ($data['phpMcrypt']['status'] == true) ? '&#10004;' : '&#10006; <a style="color: inherit; text-decoration: underline" href="'.$data['configHelp'].'?s=view&amp;i=12'.getURLLangParam().'" target="_blank">'._t('Anleitung zur Installation').'</a>'; ?></td>
</tr>
</tr>-->
<tr>
<td><?php _e('CLI-Erweiterung installiert'); ?></td>
<td class="<?php echo ($data['phpCLI']['status'] == true) ? 'green' : 'red'; ?>"><?php echo ($data['phpCLI']['status'] == true) ? '&#10004;' : '&#10006; <a style="color: inherit; text-decoration: underline" href="'.$data['configHelp'].'?s=view&amp;i=13'.getURLLangParam().'" target="_blank">'._t('Anleitung zur Installation').'</a>'; ?></td>

7
install/resources/content/install_requirement.php
View File

@@ -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);

2
resources/cron/init.php
View File

@@ -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());

4
resources/init.php
View File

@@ -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(

2
resources/library/update/update.class.php
View File

@@ -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))