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

64bit Anpassungen

Browse Source 
Name der Distro angepasst
Max Value in Statistiken angepasst
Hash Verfahren auf SHA256 umgestellt
This commit is contained in:
Gregor Schulte
2022-02-09 09:40:58 +01:00
parent 79fc07e010
commit 1e60371abe
6 changed files with 475 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ foreach ($filesFolders as $file => $info)
} }
// Sonstiges // Sonstiges
if ($otherDistribution['version'] == 'Raspbian GNU/Linux 10' || $otherDistribution['version'] == 'Raspbian GNU/Linux 11') if ($otherDistribution['version'] == 'Raspbian GNU/Linux 10' || $otherDistribution['version'] == 'Raspbian GNU/Linux 11' || $otherDistribution['version'] == 'Debian GNU/Linux 11')
$otherDistribution['status'] = true; $otherDistribution['status'] = true;
if (isset($_COOKIE['_pi-control_install_language']) && $_COOKIE['_pi-control_install_language'] != '') if (isset($_COOKIE['_pi-control_install_language']) && $_COOKIE['_pi-control_install_language'] != '')

12
install/resources/library/main/main.function.php
View File

@@ -368,8 +368,15 @@ function urlIsPublic($url)
$ip = gethostbyname($url); $ip = gethostbyname($url);
$long = ip2long($ip); $long = ip2long($ip);
if (($long >= 167772160 && $long <= 184549375) || ($long >= -1408237568 && $long <= -1407188993) || ($long >= -1062731776 && $long <= -1062666241) || ($long >= 2130706432 && $long <= 2147483647) || $long == -1) if (PHP_INT_SIZE == 4) {
return false; if (($long >= 167772160 && $long <= 184549375) || ($long >= -1408237568 && $long <= -1407188993) || ($long >= -1062731776 && $long <= -1062666241) || ($long >= 2130706432 && $long <= 2147483647) || $long == -1) {
return false;
}
} else {
if (($long >= 3232235520 && $long <= 3232301055) || ($long >= 2886729728 && $long <= 2887778303) || ($long >= 167772160 && $long <= 184549375) || $long == -1) {
return false;
}
}
return true; return true;
} }
@@ -614,4 +621,3 @@ function getURLLangParam($echo = false, $html = true, $first = false)
return $param; return $param;
} }
?>

6
resources/init.php
View File

@@ -10,13 +10,13 @@ if (!isset($config))
'ssh_ip' => '127.0.0.1' 'ssh_ip' => '127.0.0.1'
), ),
'version' => array( 'version' => array(
'version' => '2.3.0', 'version' => '2.3.1beta1',
'versioncode' => 31, 'versioncode' => 32,
'android_comp_level' => 25 'android_comp_level' => 25
), ),
'url' => array( 'url' => array(
'update' => 'https://pic.die-schultes.eu/service/v1/update/', 'update' => 'https://pic.die-schultes.eu/service/v1/update/',
'updateDownload' => 'https://www.die-schultes.eu/wp-content/uploads/', 'updateDownload' => 'https://bugs.die-schultes.eu/attachments/',
'updateNotification' => 'https://pi-control.de/?service=update_notification', 'updateNotification' => 'https://pi-control.de/?service=update_notification',
'plugin' => 'https://pi-control.de/service/v1/plugin/', 'plugin' => 'https://pi-control.de/service/v1/plugin/',
'pluginDownload' => 'https://pi-control.de/?service=plugin', 'pluginDownload' => 'https://pi-control.de/?service=plugin',

1007
resources/library/main/main.function.php
View File

File diff suppressed because it is too large Load Diff

2
resources/library/statistic/statistic.config.php
View File

@@ -84,7 +84,7 @@ $statisticConfig = array(
'fix' => true 'fix' => true
), ),
'max' => array( 'max' => array(
'value' => 1200, 'value' => 2100,
'use' => 'fix', 'use' => 'fix',
'fix' => true 'fix' => true
) )

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

@@ -268,7 +268,7 @@ class UpdateController
return $curl->getStatusCode(); return $curl->getStatusCode();
} }
if (md5_file(UPDATE_PATH.'update.zip') !== $version->getChecksum()) if (hash_file('sha256', UPDATE_PATH.'update.zip') !== $version->getChecksum())
{ {
unlink(UPDATE_PATH.'update.zip'); unlink(UPDATE_PATH.'update.zip');
return 1; return 1;