mirrors/community.applications
1
0
Fork 0
mirror of https://github.com/Squidly271/community.applications.git synced 2025-06-03 14:52:13 +08:00
Code Issues Projects Releases Wiki Activity

Drop compatibility with 6.4-> 6.6.1

Browse Source
This commit is contained in:
Squidly271 2021-06-26 17:04:49 -04:00
parent 93c8bb8139
commit fd0aa391da
9 changed files with 18 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

2
plugins/community.applications.plg
View File

@ -10,7 +10,7 @@
<!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/master/plugins/&name;.plg"> <!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/master/plugins/&name;.plg">
]> ]>
<PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;" min="6.4.0" support="https://lime-technology.com/forums/topic/38582-plug-in-community-applications/" icon="users"> <PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;" min="6.6.2" support="https://lime-technology.com/forums/topic/38582-plug-in-community-applications/" icon="users">
<CHANGES> <CHANGES>
###2021.06.21 ###2021.06.21

2
source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page
View File

@ -670,7 +670,6 @@ function setToolTip() {
origin.tooltipster("hide"); origin.tooltipster("hide");
} }
}); });
} }
function showSpecialCategory(button) { function showSpecialCategory(button) {
@ -741,7 +740,6 @@ function mySpinner() {
html: true html: true
}); });
swalBackground("transparent"); // Occasional race condition where swal is not initialized at time the initial background change happens swalBackground("transparent"); // Occasional race condition where swal is not initialized at time the initial background change happens
} }
function myCloseSpinner() { function myCloseSpinner() {

12
source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5
View File

@ -1,6 +1,6 @@
767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page 767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page 83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
9aefada3622f8535299a79d968aa9430 ./CommunityApps.page 9647c7c276803529ac6ec8ba5ff2ef94 ./CommunityApps.page
6db73582f22dab13d329e862067ee84e ./PluginAPI.page 6db73582f22dab13d329e862067ee84e ./PluginAPI.page
b398273cf7daa62ab00d2de2336ca25f ./README.md b398273cf7daa62ab00d2de2336ca25f ./README.md
a9d4cd0e4e1f37cbe3806b952a96ddb1 ./ca_settings.page a9d4cd0e4e1f37cbe3806b952a96ddb1 ./ca_settings.page
@ -11,15 +11,15 @@ a9d4cd0e4e1f37cbe3806b952a96ddb1 ./ca_settings.page
6e48a62b91bdd066f023f46c6b491afd ./images/discord-gray.svg 6e48a62b91bdd066f023f46c6b491afd ./images/discord-gray.svg
8e7dc33512b8a78f28d7179a972c7c34 ./images/discord-hover.svg 8e7dc33512b8a78f28d7179a972c7c34 ./images/discord-hover.svg
54e46db492ddb033dfeb2827c5efd4a8 ./images/discord-white.svg 54e46db492ddb033dfeb2827c5efd4a8 ./images/discord-white.svg
4d3820a53990726e15e02929d86899ae ./include/exec.php 738e551de3beefddfb99623eed309cab ./include/exec.php
d7f50413cbaac1c6cb9ceaaef48f270a ./include/helpers.php 06b55b88a6ed1834a15c7fd72b2c819d ./include/helpers.php
8f1129e0cdb994c6d1900192252433d8 ./include/paths.php 8f1129e0cdb994c6d1900192252433d8 ./include/paths.php
eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js
3d5ecb488a4b90fdd5005dea1abe1ad3 ./skins/Narrow/css.php e29c13353bc1277fc2c3597782d7c954 ./skins/Narrow/css.php
adc2d62d429accb264cedad58e6ef7a5 ./skins/Narrow/skin.html adc2d62d429accb264cedad58e6ef7a5 ./skins/Narrow/skin.html
715c92f632837f3c3dc099d014f3deee ./skins/Narrow/skin.php 715c92f632837f3c3dc099d014f3deee ./skins/Narrow/skin.php
38d1f40cbc64eed32cdb3292e1ec1f6e ./scripts/PluginAPI.php 430966e5646376b62905b63a30de7102 ./scripts/PluginAPI.php
bbd9dec6c5df486d75c46388c14f09ce ./scripts/installMulti.php e474ec681bf833969bffcf19baed2b0c ./scripts/installMulti.php
ce2c904b6a40c4677a3ff3484776959e ./scripts/installMultiPlugin.sh ce2c904b6a40c4677a3ff3484776959e ./scripts/installMultiPlugin.sh
524afab04ca930f59117a846f819fb2f ./scripts/installPluginUpdate.sh 524afab04ca930f59117a846f819fb2f ./scripts/installPluginUpdate.sh
5846421e95b475e1156c3f68164ccc4f ./scripts/languageInstall.sh 5846421e95b475e1156c3f68164ccc4f ./scripts/languageInstall.sh

14
source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php
View File

@ -512,9 +512,8 @@ function checkRandomApp($test,$info=array(),$random=false) {
if ( ! $test['Compatible'] && $caSettings['hideIncompatible'] == "true" ) return false; if ( ! $test['Compatible'] && $caSettings['hideIncompatible'] == "true" ) return false;
if ( $test['Blacklist'] ) return false; if ( $test['Blacklist'] ) return false;
if ( $test['Deprecated'] && ( $caSettings['hideDeprecated'] == "true" ) ) return false; if ( $test['Deprecated'] && ( $caSettings['hideDeprecated'] == "true" ) ) return false;
if ( $random ) { if ( $random ) return ! appInstalled($test,$info);
return ! appInstalled($test,$info);
}
return true; return true;
} }
############################################################## ##############################################################
@ -658,7 +657,6 @@ function get_content() {
$startupType = "Trending"; break; $startupType = "Trending"; break;
} }
$o['display'] = "<br><div class='ca_center'><font size='4' color='purple'><span class='ca_bold'>".sprintf(tr("An error occurred. Could not find any %s Apps"),$startupType)."</span></font><br><br>"; $o['display'] = "<br><div class='ca_center'><font size='4' color='purple'><span class='ca_bold'>".sprintf(tr("An error occurred. Could not find any %s Apps"),$startupType)."</span></font><br><br>";
$o['script'] = "$('#templateSortButtons,#sortButtons').hide();enableIcon('#sortIcon',false);"; $o['script'] = "$('#templateSortButtons,#sortButtons').hide();enableIcon('#sortIcon',false);";
postReturn($o); postReturn($o);
@ -766,9 +764,9 @@ function get_content() {
} }
else else
$searchResults['anyHit'] = array(); $searchResults['anyHit'] = array();
if ( is_array($searchResults['favNameHit']) ) { if ( is_array($searchResults['favNameHit']) )
usort($searchResults['favNameHit'],"mySort"); usort($searchResults['favNameHit'],"mySort");
} else else
$searchResults['favNameHit'] = array(); $searchResults['favNameHit'] = array();
if ( is_array($searchResults['extraHit']) ) if ( is_array($searchResults['extraHit']) )
@ -873,14 +871,11 @@ function display_content() {
} }
$displayedApps = readJsonFile($caPaths['community-templates-displayed']); $displayedApps = readJsonFile($caPaths['community-templates-displayed']);
/* if ( ! is_array($displayedApps['community']) || count($displayedApps['community']) < 1)
$o['script'] = "disableSort();"; */
$currentServer = @file_get_contents($caPaths['currentServer']); $currentServer = @file_get_contents($caPaths['currentServer']);
$o['script'] .= "feedWarning('$currentServer');"; $o['script'] .= "feedWarning('$currentServer');";
postReturn($o); postReturn($o);
} }
####################################################################### #######################################################################
# convert_docker - called when system adds a container from dockerHub # # convert_docker - called when system adds a container from dockerHub #
####################################################################### #######################################################################
@ -1628,7 +1623,6 @@ function createXML() {
$valueReferenced = array_values(array_filter(explode("/",$config['value']))); $valueReferenced = array_values(array_filter(explode("/",$config['value'])));
if ( $valueReferenced[0] == "mnt" && $valueReferenced[1] && ! in_array($valueReferenced[1],$disksPresent) ) if ( $valueReferenced[0] == "mnt" && $valueReferenced[1] && ! in_array($valueReferenced[1],$disksPresent) )
$config['value'] = str_replace("/mnt/{$valueReferenced[1]}/","/mnt/{$disksPresent[0]}/",$config['value']); $config['value'] = str_replace("/mnt/{$valueReferenced[1]}/","/mnt/{$disksPresent[0]}/",$config['value']);
} }
} }
} }

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

@ -227,7 +227,6 @@ function fixTemplates($template) {
} }
} }
} }
return $template; return $template;
} }
############################################### ###############################################
@ -276,17 +275,6 @@ function fixAttributes(&$template,$attribute) {
function versionCheck($template) { function versionCheck($template) {
global $caSettings; 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 ( $template['IncompatibleVersion'] ) {
if ( ! is_array($template['IncompatibleVersion']) ) { if ( ! is_array($template['IncompatibleVersion']) ) {
$incompatible[] = $template['IncompatibleVersion']; $incompatible[] = $template['IncompatibleVersion'];
@ -298,7 +286,6 @@ function versionCheck($template) {
} }
} }
if ( $template['MinVer'] && ( version_compare($template['MinVer'],$caSettings['unRaidVersion']) > 0 ) ) 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; if ( $template['MaxVer'] && ( version_compare($template['MaxVer'],$caSettings['unRaidVersion']) < 0 ) ) return false;
return true; return true;

1
source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/PluginAPI.php
View File

@ -55,5 +55,4 @@ switch ($_POST['action']) {
file_put_contents("/tmp/reboot_notifications",implode("\n",array_unique($existing))); file_put_contents("/tmp/reboot_notifications",implode("\n",array_unique($existing)));
break; break;
} }
?> ?>

30
source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/installMulti.php
View File

@ -14,40 +14,12 @@ if ( $translations ) {
require_once "$docroot/plugins/community.applications/include/paths.php"; require_once "$docroot/plugins/community.applications/include/paths.php";
require_once "$docroot/plugins/dynamix/include/Wrappers.php"; require_once "$docroot/plugins/dynamix/include/Wrappers.php";
require_once "$docroot/plugins/community.applications/include/helpers.php";
$unRaidVersion = parse_ini_file($caPaths['unRaidVersion']); $unRaidVersion = parse_ini_file($caPaths['unRaidVersion']);
$translations = is_file("$docroot/plugins/dynamix/include/Translations.php"); $translations = is_file("$docroot/plugins/dynamix/include/Translations.php");
function tr($string,$ret=true) {
if ( function_exists("_") )
$string = str_replace('"',"&#34;",str_replace("'","&#39;",_($string)));
if ( $ret )
return $string;
else
echo $string;
}
function startsWith($haystack, $needle) {
return $needle === "" || strripos($haystack, $needle, -strlen($haystack)) !== FALSE;
}
# Modify the system file to avoid a harmless error from being displayed under normal circumstances
# Not needed under unRaid 6.6.2+
if ( version_compare($unRaidVersion['version'],"6.6.2",">=") ) {
$exeFile = "/usr/local/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php"; $exeFile = "/usr/local/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php";
} else {
$exeFile = "/tmp/community.applications/tempFiles/newCreateDocker.php";
$dockerInstall = file("/usr/local/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php",FILE_IGNORE_NEW_LINES);
foreach ($dockerInstall as $line) {
if ( startsWith(trim($line),"removeContainer(") ) {
$line = "#$line";
}
$newInstall[] = $line;
}
file_put_contents($exeFile,implode("\n",$newInstall));
chmod($exeFile,0777);
}
$javascript = file_get_contents("/usr/local/emhttp/plugins/dynamix/javascript/dynamix.js"); $javascript = file_get_contents("/usr/local/emhttp/plugins/dynamix/javascript/dynamix.js");
echo "<script>$javascript</script>"; echo "<script>$javascript</script>";

13
source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php
View File

@ -18,7 +18,6 @@ $theme = $dynamix['theme'];
$unRaidSettings = parse_ini_file("/etc/unraid-version"); $unRaidSettings = parse_ini_file("/etc/unraid-version");
$unRaid66 = version_compare($unRaidSettings['version'],"6.5.3",">");
$unRaid67 = version_compare($unRaidSettings['version'],"6.7.0-rc4",">"); $unRaid67 = version_compare($unRaidSettings['version'],"6.7.0-rc4",">");
$unRaid69 = version_compare($unRaidSettings['version'],"6.9.0-beta1",">"); $unRaid69 = version_compare($unRaidSettings['version'],"6.9.0-beta1",">");
$unRaid66color = "#FF8C2F"; $unRaid66color = "#FF8C2F";
@ -280,20 +279,16 @@ a.popup-donate:hover {color:<?=$donateText?>;background-color:<?=$unRaid66color?
#searchBox{margin-left:1rem;margin-right:0;position:relative;top:-.6rem;border:none;} #searchBox{margin-left:1rem;margin-right:0;position:relative;top:-.6rem;border:none;}
<?endif;?> <?endif;?>
<?if ( $theme == "black" ):?> <?if ( $theme == "black" ):?>
.searchSubmit{font-family:'FontAwesome';width:2.9rem;height:2rem;border:1px solid #dadada;border-radius:4px 4px 4px 4px;font-size:1.1rem;position:relative; top:-6px;padding:0px 2px;background:transparent;border:none;cursor:pointer;} .searchSubmit{font-family:'FontAwesome';width:2.9rem;height:3.4rem;border:1px solid #dadada;border-radius:4px 4px 4px 4px;font-size:1.1rem;position:relative; top:-6px;padding:0px 2px;background:transparent;border:none;cursor:pointer;}
#searchBox{margin-left:1rem;margin-right:0;position:relative;top:-.5rem;border:none;} #searchBox{margin-left:1rem;margin-right:0;position:relative;top:-.6rem;border:none;padding:0.6rem;}
<?endif;?> <?endif;?>
<?if ( $theme == "gray" ):?> <?if ( $theme == "gray" ):?>
.searchSubmit{font-family:'FontAwesome';width:2.9rem;height:2.9rem;border:.1rem solid #dadada;border-radius:4px 4px 4px 4px;font-size:1.1rem;position:relative; top:-.7rem;padding:0px .2rem;background:transparent;border:none;cursor:pointer;} .searchSubmit{font-family:'FontAwesome';width:2.9rem;height:2.9rem;border:.1rem solid #dadada;border-radius:4px 4px 4px 4px;font-size:1.1rem;position:relative; top:-.7rem;padding:0px .2rem;background:transparent;border:none;cursor:pointer;}
#searchBox{margin-left:1rem;margin-right:0;position:relative;top:-.6rem;border:none;} #searchBox{margin-left:1rem;margin-right:0;position:relative;top:-.6rem;border:none;}
<?endif;?> <?endif;?>
<?if ( $theme == "white" ):?> <?if ( $theme == "white" ):?>
.searchSubmit{font-family:'FontAwesome';width:2.9rem;height:2.6rem;border:1px; solid #dadada;border-radius:4px 4px 4px 4px;font-size:1.1rem;position:relative; top:-6px;padding:0px 2px;background:transparent;border:none;cursor:pointer;} .searchSubmit{font-family:'FontAwesome';width:2.9rem;height:3.4rem;border:1px; solid #dadada;border-radius:4px 4px 4px 4px;font-size:1.1rem;position:relative; top:-6px;padding:0px 2px;background:transparent;border:none;cursor:pointer;}
#searchBox{margin-left:1rem;margin-right:0;position:relative;top:-.5rem;border:none;} #searchBox{margin-left:1rem;margin-right:0;position:relative;top:-.6rem;border:none;padding:0.6rem;}
<?endif;?>
<?if ($unRaid66 && ( $theme == "black" || $theme == "white") ):?>
#searchBox{top:-0.6rem;padding:0.6rem;}
.searchSubmit{height:3.4rem;}
<?endif;?> <?endif;?>
.popUpLink {cursor:pointer;color:<?$aColor?>;} .popUpLink {cursor:pointer;color:<?$aColor?>;}
a.popUpLink {text-decoration:none;} a.popUpLink {text-decoration:none;}