0ct0pu5/yellow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Better software update

Browse source
This commit is contained in:
markseu 2018-07-24 22:46:16 +02:00
parent 74c748d48a
commit fea41b25c7
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
system/plugins/update.php
View file

@ -5,7 +5,7 @@
class YellowUpdate
{
const VERSION = "0.7.14";
const VERSION = "0.7.15";
var $yellow; //access to API
var $updates; //number of updates
@ -63,16 +63,6 @@ class YellowUpdate
$_GET["clean-url"] = "theme-has-been-updated";
}
}
if($update) //TODO: remove later, converts old script
{
$fileName = "yellow.php";
if(is_file($fileName))
{
$fileData = $this->yellow->toolbox->readFile($fileName);
$fileDataNew = preg_replace("#yellow->plugins->load\(\)#", "yellow->load()", $fileData);
if($fileData!=$fileDataNew) $this->yellow->toolbox->createFile($fileName, $fileDataNew);
}
}
if($update) //TODO: remove later, converts old error page
{
$fileName = $this->yellow->config->get("configDir")."page-error-500.txt";
@ -267,7 +257,7 @@ class YellowUpdate
$fileExtension = $this->yellow->config->get("downloadExtension");
foreach($data as $key=>$value)
{
$fileName = strtoloweru("$path$key.zip");
$fileName = $path.$this->yellow->lookup->normaliseName($key, true, false, true).".zip";
list($version, $url) = explode(',', $value);
list($statusCode, $fileData) = $this->getSoftwareFile($url);
if(empty($fileData) || !$this->yellow->toolbox->createFile($fileName.$fileExtension, $fileData))
@ -281,7 +271,7 @@ class YellowUpdate
{
foreach($data as $key=>$value)
{
$fileName = strtoloweru("$path$key.zip");
$fileName = $path.$this->yellow->lookup->normaliseName($key, true, false, true).".zip";
if(!$this->yellow->toolbox->renameFile($fileName.$fileExtension, $fileName))
{
$statusCode = 500;
@ -802,10 +792,6 @@ class YellowUpdate
{
$urlRequest = "https://raw.githubusercontent.com/".$matches[1]."/".$matches[2];
}
if(preg_match("#^https://github.com/(.+)/archive/master.zip$#", $url, $matches))
{
$urlRequest = "https://codeload.github.com/".$matches[1]."/zip/master";
}
$curlHandle = curl_init();
curl_setopt($curlHandle, CURLOPT_URL, $urlRequest);
curl_setopt($curlHandle, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; DatenstromYellow/".YellowCore::VERSION."; SoftwareUpdater)");