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

Finaler Stand 2.2.0

Browse Source
This commit is contained in:
Gregor Schulte
2021-12-07 12:15:13 +01:00
parent 80af04e1e4
commit a61783045a
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
PiControl-2.2.0-full.zip Normal file
View File

Binary file not shown.

BIN
PiControl-2.2.0.zip Normal file
View File

Binary file not shown.

8
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.2.0beta', 'version' => '2.2.0',
'versioncode' => 29, 'versioncode' => 30,
'android_comp_level' => 25 'android_comp_level' => 25
), ),
'url' => array( 'url' => array(
'update' => 'https://pi-control.de/service/v1/update/', 'update' => 'https://pic.die-schultes.eu/service/v1/update/',
'updateDownload' => 'https://pi-control.de/?service=update', 'updateDownload' => 'https://www.die-schultes.eu/wp-content/uploads/',
'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',

8
resources/library/main/tpl.class.php
View File

@@ -803,7 +803,8 @@ class PiTpl
if ($this->tplSSH === NULL) if ($this->tplSSH === NULL)
if (self::loadSSH() !== true) if (self::loadSSH() !== true)
if ($cancelIfError !== 0) if ($cancelIfError !== 0)
return self::error(_t('SSH-Zugriffsfehler'), _t('Kein SSH-Zugriff, bitte anmelden! <a href="%s">Jetzt anmelden.</a>', '?s=ssh_login'), ($cancelIfError === 1) ? true : false); return self::error(_t('SSH-Zugriffsfehler'), _t('Kein SSH-Zugriff, diese Funktion steht aktuell nicht zur Verfügung!'), ($cancelIfError === 1) ? true : false);
#return self::error(_t('SSH-Zugriffsfehler'), _t('Kein SSH-Zugriff, bitte anmelden! <a href="%s">Jetzt anmelden.</a>', '?s=ssh_login'), ($cancelIfError === 1) ? true : false);
if ($timeout != NULL) if ($timeout != NULL)
$this->tplSSH->setTimeout($timeout); $this->tplSSH->setTimeout($timeout);
@@ -834,8 +835,9 @@ class PiTpl
if ($this->tplSSH === NULL) if ($this->tplSSH === NULL)
if (self::loadSSH() !== true) if (self::loadSSH() !== true)
{ {
if ($cancelIfError !== 0) if ($cancelIfError !== 0)
self::error(_t('SSH-Zugriffsfehler'), _t('Kein SSH-Zugriff, bitte anmelden! <a href="%s">Jetzt anmelden.</a>', '?s=ssh_login'), ($cancelIfError === 1) ? true : false); self::error(_t('SSH-Zugriffsfehler'), _t('Kein SSH-Zugriff, diese Funktion steht aktuell nicht zur Verfügung!'), ($cancelIfError === 1) ? true : false);
#self::error(_t('SSH-Zugriffsfehler'), _t('Kein SSH-Zugriff, bitte anmelden! <a href="%s">Jetzt anmelden.</a>', '?s=ssh_login'), ($cancelIfError === 1) ? true : false);
return false; return false;
} }

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

@@ -49,7 +49,7 @@ class UpdateController
if ($curl->getResult($data) != JSON_ERROR_NONE) if ($curl->getResult($data) != JSON_ERROR_NONE)
return 1; return 1;
if (!isset($data['versions'], $data['latest'])) if (!isset($data['versions'], $data['latest']))
return 2; return 2;
@@ -253,7 +253,6 @@ class UpdateController
if (!class_exists('cURL')) if (!class_exists('cURL'))
(include LIBRARY_PATH.'curl/curl.class.php'); (include LIBRARY_PATH.'curl/curl.class.php');
$curl = new cURL($this->updateDownloadURL.'&'.http_build_query(array('file' => $version->getFilename()))); $curl = new cURL($this->updateDownloadURL.'&'.http_build_query(array('file' => $version->getFilename())));
$curlStatus = $curl->downloadFile(UPDATE_PATH.'update.zip'); $curlStatus = $curl->downloadFile(UPDATE_PATH.'update.zip');