gfd

plugins/community.applications.plg

@@ -2,8 +2,8 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "community.applications">
 <!ENTITY author    "Andrew Zawadzki">
-<!ENTITY version   "2024.04.28">
-<!ENTITY md5       "497bf4ed5b9b265931cba151a053f638">
+<!ENTITY version   "2024.05.03">
+<!ENTITY md5       "16ba195670cadafdad7f195f42c87a9d">
 <!ENTITY launch    "Apps">
 <!ENTITY plugdir   "/usr/local/emhttp/plugins/&name;">
 <!ENTITY github    "Squidly271/community.applications">
@@ -13,6 +13,9 @@
 <PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;" min="6.12.0" support="https://forums.unraid.net/topic/38582-plug-in-community-applications" icon="users">
 
 <CHANGES>
+###2024.05.03
+- Fixed: curl encoding option of "" no longer works on backup application feed.  Switch to "deflate" as a fallback in case of failure on all downloads
+
 ###2024.04.28
 - Fixed: Any corrupted xml files in /boot/config/plugins/dockerMan/templates-user would crash action centre or Installed / Previous Apps
 - Fixed: If template maintainer listed a "branch" tag twice, fatal errors would happen with PHP error settings set to display

source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5

@@ -3,7 +3,7 @@
 c12622d8281346d37398e96cbb6b8b69  ./ca_settings.page
 01ed7990078dee7cecfeda9a4e49377e  ./default.cfg
 e3301a1191f42a799769ef8266a78cf5  ./include/exec.php
-66cebca33e8cf88b513c93939279de91  ./include/helpers.php
+cc2d19a7028adfcca362ca7fc2fefe3f  ./include/helpers.php
 590fb8b29aba360a56dd8338b022f9e0  ./include/paths.php
 7234caf6800479df03abb222aaedaca5  ./javascript/libraries.js
 71f911a818d88d3d567f8a2898094ee2  ./README.md

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

@@ -94,13 +94,17 @@ function download_url($url, $path = "", $bg = false, $timeout = 45) {
   curl_setopt($ch,CURLOPT_FOLLOWLOCATION, true);
   curl_setopt($ch,CURLOPT_FAILONERROR,true);
 
-  if ( is_file("/boot/config/plugins/community.applications/proxy.cfg") ) {
+  if ( !getenv("http_proxy") && is_file("/boot/config/plugins/community.applications/proxy.cfg") ) {
     $proxyCFG = parse_ini_file("/boot/config/plugins/community.applications/proxy.cfg");
     curl_setopt($ch, CURLOPT_PROXYPORT,intval($proxyCFG['port']));
     curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL,intval($proxyCFG['tunnel']));
     curl_setopt($ch, CURLOPT_PROXY,$proxyCFG['proxy']);
   }
   $out = curl_exec($ch);
+  if ( curl_errno($ch) == 23 ) {
+    curl_setopt($ch,CURLOPT_ENCODING,"deflate");
+    $out = curl_exec($ch);
+  }
   curl_close($ch);
   if ( $path )
     ca_file_put_contents($path,$out);