This commit is contained in:
Squidly271 2022-07-16 08:42:27 -04:00
parent 2ebb2ea6e2
commit cb6d32f461
11 changed files with 32 additions and 10 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -2010,6 +2010,7 @@ echo ""
echo "Adjusting icon for unRaid version"
if [[ -e /usr/local/emhttp/plugins/dynamix/styles/font-cases.ttf ]]; then sed -i 's/f0db/e942/g' /usr/local/emhttp/plugins/community.applications/Apps.page; fi
if [[ ! -e /usr/local/emhttp/plugins/dynamix/styles/font-cases.ttf ]]; then sed -i 's/e942/f0db/g' /usr/local/emhttp/plugins/community.applications/Apps.page; fi
echo ""
echo "----------------------------------------------------"
echo " &name; has been installed."

View File

@ -784,7 +784,7 @@ function showSortIcons() {
}
<?if ($nchanCom):?>
function ca_openPlugin(cmd,title,plg,func) {
setTimeout(function(){openPlugin(cmd,title,plg,func);},250);
setTimeout(function(){openPlugin(cmd,title,plg,func,"");},250);
}
<?endif;?>
@ -822,7 +822,9 @@ function updateContent(button) {
$.removeCookie("ca_plugininstallpending");
myCloseAlert();
<?if ($nchanCom):?>
ca_openPlugin('multiplugin install '+plugins,"<?tr('Install Plugin Applications')?>",'','refresh');
post({action:'saveMultiPluginPending',plugin:plugins},function(data) {
ca_openPlugin('multiplugin install '+plugins,"<?tr('Install Plugin Applications')?>",'','refresh');
});
<?else:?>
openBox('/plugins/<?=$plugin?>/scripts/installMultiPlugin.php&arg1='+plugins,"<?tr('Install Plugin Applications')?>",600,900,true);
<?endif;?>
@ -1197,7 +1199,9 @@ function actuallyInstallPlugin(pluginURL,update=false,comment="") {
pluginURL.replace("&deprecated","");
}
<?if ($nchanCom):?>
ca_openPlugin('plugin '+type+' '+pluginURL,title,'',postFunction);
post({action:'saveMultiPluginPending',plugin:pluginURL},function(data) {
ca_openPlugin('plugin '+type+' '+pluginURL,title,'',postFunction);
});
<?else:?>
openBox('/plugins/community.applications/scripts/pluginInstall.php&arg1='+type+'&arg2='+pluginURL,title,600,900,true,postFunction);
<?endif;?>
@ -1220,6 +1224,7 @@ function actuallyInstallPlugin(pluginURL,update=false,comment="") {
}
<?if ($nchanCom):?>
ca_openPlugin('plugin '+type+' '+pluginURL,title,'',postFunction);
<?else:?>
openBox('/plugins/community.applications/scripts/pluginInstall.php&arg1='+type+'&arg2='+pluginURL,title,600,900,true,postFunction);
<?endif;?>
@ -1928,7 +1933,6 @@ function installMulti() {
});
<?if ($nchanCom):?>
post({action:'saveMultiPluginPending',plugin:plugin},function(data) {
alert(plugin);
ca_openPlugin('multiplugin install '+plugin,tr('Install '+makePlural("Application",pluginCount)),'','refresh');
});
<?else:?>

View File

@ -1,14 +1,14 @@
dbc557b8f37a8fda04fd617c0fd5c503 ./Apps.page
85b981e211b30b027549c3d9494e1618 ./Apps.page
4e55f7483b661af21a25b677179baffe ./CA_notices.page
42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page
e718d7825dbdc96a17a915079222b098 ./default.cfg
07a72859c0c26030943adf8d379d4074 ./include/exec.php
e564b860fa0d5022df83c103922665d7 ./include/helpers.php
d9bce32c48b39966cf5e5b6fdf6946ee ./include/paths.php
116042a918060278e77379b0dd73482c ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js
71f911a818d88d3d567f8a2898094ee2 ./README.md
aa1520f5576149b5f7734d4f280ba4ee ./scripts/caPostHook.php
b45c0067b64f05c3dafc202e423a3151 ./scripts/caPreHook.php
ff1fa32f5bc288631673066da4a36ebe ./scripts/caPostHook.php
981bc776ea83d2f15387e29870554e3f ./scripts/caPreHook.php
d3d8286046cc7d6edf8f596067c163a2 ./scripts/checkForUpdates.php
99a9d58a49a7f6812f18bd4be2b563b9 ./scripts/checkForUpdates.sh
677ac9a29993ec57e09ec6a1856f1a11 ./scripts/dockerConvert.php

View File

@ -72,5 +72,5 @@ $caPaths['dockerSearchInstall'] = $caPaths['tempFiles']."/docker
$caPaths['dockerSearchActive'] = $caPaths['tempFiles']."/dockerSearchActive";
$caPaths['SpotlightIcon'] = "https://raw.githubusercontent.com/Squidly271/community.applications/master/webImages/Unraid.svg";
$caPaths['dockerConvertFlash'] = $dockerManPaths['templates-user']."/my-CA_TEST_CONTAINER_DOCKERHUB.xml";
$caPaths['pluginPending'] = "/tmp/community.applications/pluginPending/";
$caPaths['pluginPending'] = "/tmp/plugins/pluginPending/";
?>

View File

@ -1,8 +1,13 @@
#!/usr/bin/php
<?
###############################################################
# #
# Community Applications copyright 2015-2022, Andrew Zawadzki #
# Licenced under GPLv2 #
# #
###############################################################
if ( $argv[1] == "check" || $argv[1] == "checkall" )
return;
echo "Executing Community Applications Post-Plugin Settings\n";
@unlink("/tmp/community.applications/pluginPending/{$argv[2]}");
echo "Finished";

View File

@ -1,9 +1,21 @@
#!/usr/bin/php
<?
###############################################################
# #
# Community Applications copyright 2015-2022, Andrew Zawadzki #
# Licenced under GPLv2 #
# #
###############################################################
if ( $argv[1] == "check" || $argv[1] == "checkall" )
return;
echo "Executing Community Applications Pre-Plugin Settings\n";
@mkdir("/tmp/community.applications/pluginPending",0777,true);
touch("/tmp/community.applications/pluginPending/{$argv[2]}");
if ( $argv[1] == "update" ) {
if ( is_file("/var/log/plugins/{$argv[2]}") )
passthru("/usr/local/emhttp/plugins/dynamix.plugin.manager/scripts/plugin check ".escapeshellarg($argv[2]));
return;
}
?>