1 Commits
2.3.3 ... v3

Author SHA1 Message Date
f7e0f37528 Init 2023-03-28 10:34:44 +02:00
429 changed files with 10218 additions and 299 deletions

View File

Before

Width:  |  Height:  |  Size: 162 B

After

Width:  |  Height:  |  Size: 162 B

View File

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 194 B

View File

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

Before

Width:  |  Height:  |  Size: 883 B

After

Width:  |  Height:  |  Size: 883 B

View File

Before

Width:  |  Height:  |  Size: 993 B

After

Width:  |  Height:  |  Size: 993 B

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

Before

Width:  |  Height:  |  Size: 911 B

After

Width:  |  Height:  |  Size: 911 B

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 446 B

After

Width:  |  Height:  |  Size: 446 B

View File

Before

Width:  |  Height:  |  Size: 259 B

After

Width:  |  Height:  |  Size: 259 B

View File

Before

Width:  |  Height:  |  Size: 897 B

After

Width:  |  Height:  |  Size: 897 B

View File

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -1,8 +1,8 @@
<?php
if (!defined('PICONTROL')) exit();
(include_once LIBRARY_PATH . 'main/rpi.function.php') or die('Error: 0x0010');
(include_once LIBRARY_PATH . 'install/install.function.php') or die('Error: 0x0011');
(include_once LIBRARY_PATH.'main/rpi.function.php') or die('Error: 0x0010');
(include_once LIBRARY_PATH.'install/install.function.php') or die('Error: 0x0011');
$tpl->setHeaderTitle(_t('Anforderungen'));
// PHP
@@ -15,7 +15,7 @@ $phpZipArchive = array('status' => false);
$phpAllowUrlFopen = array('status' => false);
$filesFoldersExist = array('count' => 0, 'status' => true);
$filesFoldersPermission = array('count' => 0, 'status' => true);
$otherDistribution = array('version' => rpi_getDistribution(), 'status' => true);
$otherDistribution = array('version' => rpi_getDistribution(), 'status' => false);
$otherCookie = array('status' => false);
$error = false;
@@ -28,7 +28,7 @@ if (extension_loaded('ssh2'))
#if (function_exists('mcrypt_encrypt') !== false)
# $phpMcrypt['status'] = true;
if (trim(exec('dpkg -s php-cli | grep Status: ')) != '' || trim(exec('dpkg -s php7.4-cli | grep Status: ')) != '' || trim(exec('dpkg -s php8.0-cli | grep Status: ')) != '' || trim(exec('dpkg -s php8.1-cli | grep Status: ')) != '' || trim(exec('dpkg -s php8.2-cli | grep Status: ')) != '')
if (trim(exec('dpkg -s php7.3-cli | grep Status: ')) != '' || trim(exec('dpkg -s php7.4-cli | grep Status: ')) != '' || trim(exec('dpkg -s php8.0-cli | grep Status: ')) != '' || trim(exec('dpkg -s php8.1-cli | grep Status: ')) != '' || trim(exec('dpkg -s php8.2-cli | grep Status: ')) != '')
$phpCLI['status'] = true;
if (function_exists('curl_init') !== false)
@@ -43,14 +43,18 @@ if (ini_get('allow_url_fopen') !== false)
// Dateien und Ordner
$filesFolders = fileFolderPermission();
foreach ($filesFolders as $file => $info) {
if ($info['error'] === true) {
if ($info['existsBool'] === false || $info['filesizeBool'] === false) {
foreach ($filesFolders as $file => $info)
{
if ($info['error'] === true)
{
if ($info['existsBool'] === false || $info['filesizeBool'] === false)
{
$filesFoldersExist['count'] += 1;
$filesFoldersExist['status'] = false;
}
if ($info['permissionBool'] === false || $info['userGroupBool'] === false) {
if ($info['permissionBool'] === false || $info['userGroupBool'] === false)
{
$filesFoldersPermission['count'] += 1;
$filesFoldersPermission['status'] = false;
}
@@ -58,8 +62,8 @@ foreach ($filesFolders as $file => $info) {
}
// Sonstiges
//if ($otherDistribution['version'] == 'Raspbian GNU/Linux 10' || $otherDistribution['version'] == 'Raspbian GNU/Linux 11' || $otherDistribution['version'] == 'Debian GNU/Linux 11')
// $otherDistribution['status'] = true;
if ($otherDistribution['version'] == 'Raspbian GNU/Linux 10' || $otherDistribution['version'] == 'Raspbian GNU/Linux 11' || $otherDistribution['version'] == 'Debian GNU/Linux 11')
$otherDistribution['status'] = true;
if (isset($_COOKIE['_pi-control_install_language']) && $_COOKIE['_pi-control_install_language'] != '')
$otherCookie['status'] = true;
@@ -83,7 +87,8 @@ $tpl->assign('filesFoldersPermission', $filesFoldersPermission);
$tpl->assign('otherDistribution', $otherDistribution);
$tpl->assign('otherCookie', $otherCookie);
$tpl->assign('error', $error);
$tpl->assign('langUrl', (isset($_GET['lang']) && $_GET['lang'] != '') ? '&amp;lang=' . $_GET['lang'] : '');
$tpl->assign('langUrl', (isset($_GET['lang']) && $_GET['lang'] != '') ? '&amp;lang='.$_GET['lang'] : '');
$tpl->assign('configHelp', $config['url']['help']);
$tpl->draw('install_requirement');
?>

View File

@@ -650,7 +650,7 @@ class PiTpl
* @return bool
*/
public function msg($type, $msg, $title = NULL, $cancelable = true, $id = 0)
public function msg($type, $title = NULL, $msg, $cancelable = true, $id = 0)
{
if (!strlen($type) > 0 || !is_string($type) ||
!strlen($msg) > 0 || !is_string($msg)
@@ -943,3 +943,4 @@ class PiTpl
return true;
}
}
?>

Some files were not shown because too many files have changed in this diff Show More