Mirror/codiad
1
0
Fork 0
mirror of https://github.com/xevidos/codiad.git synced 2024-12-22 13:52:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into 'development'

Browse source 
Master

See merge request xevidos/codiad!4
This commit is contained in:
Isaac Brown 2018-07-18 16:12:04 -04:00
commit 957b6dc381
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
components/update/class.update.php
View file

@ -41,7 +41,7 @@ class Update {
$this->archive = "https://gitlab.telaaedifex.com/xevidos/codiad/-/archive/master/codiad-master.zip";
$this->commits = "https://gitlab.telaaedifex.com/api/v4/projects/3/repository/commits/";
$this->tags = "https://gitlab.telaaedifex.com/api/v4/projects/3/repository/tags/";
//$this->protocol = $this->CheckProtocol();
$this->protocol = $this->CheckProtocol();
}
//////////////////////////////////////////////////////////////////
@ -127,11 +127,28 @@ class Update {
//echo var_dump( $response );
//return "[".formatJSEND("success", array("currentversion"=>$local[0]['version'],"remoteversion"=>$latest,"message"=>$message,"archive"=>$archive,"nightly"=>$nightly,"name"=>$local[0]['name']))."]";
return "[".formatJSEND("success", array("currentversion"=>$current_version,"remoteversion"=>$response["name"],"message"=>$response["message"],"archive"=>$archive,"nightly"=>$nightly,"name"=>$response["author_name"]))."]";
}
function CheckProtocol() {
if( extension_loaded( 'curl' ) ) {
//Curl is loaded
return "curl";
} elseif( ini_get('allow_url_fopen') ) {
//Remote get file is enabled
return "fopen";
} else {
//None are enabled exit.
return "none";
}
}
//////////////////////////////////////////////////////////////////
// Get Local Version
//////////////////////////////////////////////////////////////////
@ -187,6 +204,6 @@ class Update {
break;
}
return json_decode(file_get_contents($remoteurl), true);
//return( json_decode( file_get_contents( $remoteurl ), true ) );
}
}
}

5
components/update/dialog.php
View file

@ -12,9 +12,10 @@
// Verify Session or Key
//////////////////////////////////////////////////////////////////
require_once('../../common.php');
checkSession();
switch($_GET['action']){
switch($_GET['action']){
//////////////////////////////////////////////////////////////////////
// Update
@ -32,7 +33,7 @@ checkSession();
} else {
require_once('class.update.php');
require_once('./class.update.php');
$update = new Update();
$vars = json_decode($update->Check(), true);