mirrors
/
community.applications
mirror of https://github.com/Squidly271/community.applications.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Below 

Re-add connection timeout
Ability to selectively mark a particular plugin version as being incompatible to save myself from having to watch like a hawk to see when problems are fixed.
pull/11/head
Squidly271 2021-03-07 11:23:57 -05:00
parent 80886642b5
commit 64ef860feb
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2021.03.07-x86_64-1.txz 100644
View File

Binary file not shown.

25
source/community.applications/usr/local/emhttp/plugins/community.applications/include/helpers.php
View File

@ -53,7 +53,7 @@ function download_url($url, $path = "", $bg = false, $timeout = 45) {
curl_setopt($ch,CURLOPT_URL,$url);
curl_setopt($ch,CURLOPT_FRESH_CONNECT,true);
curl_setopt($ch,CURLOPT_RETURNTRANSFER,true);
// curl_setopt($ch,CURLOPT_CONNECTTIMEOUT,15);
curl_setopt($ch,CURLOPT_CONNECTTIMEOUT,30);
curl_setopt($ch,CURLOPT_TIMEOUT,$timeout);
curl_setopt($ch,CURLOPT_ENCODING,"");
curl_setopt($ch,CURLOPT_RETURNTRANSFER,true);
@ -265,6 +265,29 @@ function fixAttributes(&$template,$attribute) {
function versionCheck($template) {
global $caSettings;
/* if ( $template['IncompatibleVersion'] ) {
if ( ! is_array($template['IcompatibleVersion']) ) {
$template['IncompatibleVersion'] = [];
$template['IncompatibleVersion'][] = $template['IncompatibleVersion'];
}
foreach ($template['IncompatibleVersion'] as $pluginVersion) {
if ( $pluginVersion == $template['pluginVersion'] ) return false;
}
}
*/
if ( $template['IncompatibleVersion'] ) {
if ( ! is_array($template['IncompatibleVersion']) ) {
$incompatible[] = $template['IncompatibleVersion'];
} else {
$incompatible = $template['IncompatibleVersion'];
}
foreach ($incompatible as $ver) {
if ( $ver == $template['pluginVersion'] ) return false;
}
}
if ( $template['MinVer'] && ( version_compare($template['MinVer'],$caSettings['unRaidVersion']) > 0 ) ) return false;
if ( $template['MaxVer'] && ( version_compare($template['MaxVer'],$caSettings['unRaidVersion']) < 0 ) ) return false;
return true;