security updates

This commit is contained in:
Squidly271 2021-08-28 11:57:11 -04:00
parent d78a4f3a44
commit 1c758e5c4f
7 changed files with 56 additions and 20 deletions

Binary file not shown.

View File

@ -626,7 +626,7 @@ function updateContent(button) {
var plugins = $.cookie("ca_plugininstallpending");
$.removeCookie("ca_plugininstallpending");
myCloseAlert();
openBox('/plugins/<?=$plugin?>/scripts/installMultiPlugin.sh&arg1='+plugins,"<?tr('Install Plugin Applications')?>",600,900,true);
openBox('/plugins/<?=$plugin?>/scripts/installMultiPlugin.php&arg1='+plugins,"<?tr('Install Plugin Applications')?>",600,900,true);
} else {
if ( result.data ) {
updateDisplay(result.data);
@ -1030,9 +1030,9 @@ function installPlugin(pluginURL,update=false) {
$(".tooltipstered").tooltipster("hide");
disableSearch();
<? if ( $translations ): ?>
openBox('/plugins/community.applications/scripts/pluginInstall.sh&arg1='+type+'&arg2='+pluginURL,title,600,900,true,"refreshDisplay");
openBox('/plugins/community.applications/scripts/pluginInstall.php&arg1='+type+'&arg2='+pluginURL,title,600,900,true,"refreshDisplay");
<? else: ?>
my_openBox('/plugins/community.applications/scripts/pluginInstall.sh&arg1='+type+'&arg2='+pluginURL,title,600,900,true,"refreshDisplay");
my_openBox('/plugins/community.applications/scripts/pluginInstall.php&arg1='+type+'&arg2='+pluginURL,title,600,900,true,"refreshDisplay");
<? endif; ?>
}
@ -1123,9 +1123,9 @@ function uninstallApp(application,humanName) {
if (isConfirm) {
application = application.basename();
<? if ( $translations ): ?>
openBox('/plugins/community.applications/scripts/pluginInstall.sh&arg1=remove&arg2='+application,"<?tr('Uninstall Plugin')?>",600,900,true,"postUninstallPlugin");
openBox('/plugins/community.applications/scripts/pluginInstall.php&arg1=remove&arg2='+application,"<?tr('Uninstall Plugin')?>",600,900,true,"postUninstallPlugin");
<? else: ?>
my_openBox('/plugins/community.applications/scripts/pluginInstall.sh&arg1=remove&arg2='+application,"<?tr('Uninstall Plugin')?>",600,900,true,"postUninstallPlugin()");
my_openBox('/plugins/community.applications/scripts/pluginInstall.php&arg1=remove&arg2='+application,"<?tr('Uninstall Plugin')?>",600,900,true,"postUninstallPlugin()");
<? endif; ?>
} else {
enableSearch();
@ -1462,7 +1462,7 @@ function installMulti() {
$("#sb-nav-close").css("visibility","hidden"); // Because docker install cannot be aborted so why allow window to close
openBox('/plugins/<?=$plugin?>/scripts/installMulti.php?plugin='+plugin+'&docker='+docker,tr('Install '+makePlural("Application",dockerCount)),600,1100,true);
} else {
openBox('/plugins/<?=$plugin?>/scripts/installMultiPlugin.sh&arg1='+plugin,tr('Install '+makePlural("Application",pluginCount)),600,900,true);
openBox('/plugins/<?=$plugin?>/scripts/installMultiPlugin.php&arg1='+plugin,tr('Install '+makePlural("Application",pluginCount)),600,900,true);
enableSearch();
}
} else {

View File

@ -1,7 +1,7 @@
767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
2cdb7da0d67a11278ada7fd029707738 ./ca_settings.page
ba02e0b349a7974c1c9e38eeaf7e4f4d ./CommunityApps.page
6da0e468ad8553d9e4882c5ff4ffd814 ./CommunityApps.page
7c88ace586933a4a60b0ef2f8a97a662 ./default.cfg
4344942541019c3b5464d508c7f0dd30 ./images/community.applications.png
6e48a62b91bdd066f023f46c6b491afd ./images/discord-azure.svg
@ -17,13 +17,13 @@ eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js
b398273cf7daa62ab00d2de2336ca25f ./README.md
717f49d6faabd7e1d7cf0940beb5cd5e ./scripts/checkForUpdates.php
c83dee5045392761136e6330e896d959 ./scripts/installMulti.php
ce2c904b6a40c4677a3ff3484776959e ./scripts/installMultiPlugin.sh
2242d19776185c3f99e4dbc8bdc3a8d9 ./scripts/installMultiPlugin.php
524afab04ca930f59117a846f819fb2f ./scripts/installPluginUpdate.sh
92028dcc61f62158cbc7064e6143d287 ./scripts/installUpdate.php
5846421e95b475e1156c3f68164ccc4f ./scripts/languageInstall.sh
729c178196af99c94116246f0c8be7a5 ./scripts/notices.php
430966e5646376b62905b63a30de7102 ./scripts/PluginAPI.php
1efbd780e8ead27a768d1631fb51150c ./scripts/pluginInstall.sh
9c7608a4a2cf279c8a2af88960e1642d ./scripts/pluginInstall.php
f9c3f431935fb20801f3fef152dc7b58 ./scripts/showStatistics.php
4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh
02759ea835ee4ce5a051fead96ab9b9b ./scripts/updatePluginSupport.php

View File

@ -0,0 +1,22 @@
#!/usr/bin/php
<?
###############################################################
# #
# Community Applications copyright 2015-2021, Andrew Zawadzki #
# Licenced under GPLv2 #
# #
###############################################################
require_once "/usr/local/emhttp/plugins/community.applications/include/paths.php";
require_once "/usr/local/emhttp/plugins/community.applications/include/helpers.php";
$apps = readJsonFile($caPaths['community-templates-info']);
$plugins = explode("*",$argv[1]);
foreach ($plugins as $plugin) {
if (! $plugin ) continue;
if ( searchArray($apps,"PluginURL",$plugin) !== false )
passthru("/usr/local/emhttp/plugins/dynamix.plugin.manager/scripts/plugin install ".escapeshellarg($plugin));
else
echo "$plugin not found in application feed\n";
}
passthru("/usr/local/emhttp/plugins/community.applications/scripts/updatePluginSupport.php");
?>

View File

@ -1,8 +0,0 @@
#!/bin/bash
IFS="*" read -r -a array <<< "$1"
for element in "${array[@]}"
do
/usr/local/sbin/plugin install "$element"
done
/usr/local/emhttp/plugins/community.applications/scripts/updatePluginSupport.php

View File

@ -0,0 +1,25 @@
#!/usr/bin/php
<?
###############################################################
# #
# Community Applications copyright 2015-2021, Andrew Zawadzki #
# Licenced under GPLv2 #
# #
###############################################################
require_once "/usr/local/emhttp/plugins/community.applications/include/paths.php";
require_once "/usr/local/emhttp/plugins/community.applications/include/helpers.php";
$pluginURL = $argv[2];
if ( ! $pluginURL ) {
echo "No URL passed";
exit(1);
}
$apps = readJsonFile($caPaths['community-templates-info']);
if ( searchArray($apps,"PluginURL",$pluginURL) !== false || $argv[1] == "update" || $argv[1] == "remove") {
passthru("/usr/local/emhttp/plugins/dynamix.plugin.manager/scripts/plugin ".escapeshellarg($argv[1])." ".escapeshellarg($argv[2]));
passthru("/usr/local/emhttp/plugins/community.applications/scripts/updatePluginSupport.php");
}
else
echo "URL passed for installation does not exist in application feed\n";
?>

View File

@ -1,3 +0,0 @@
#!/bin/bash
/usr/local/emhttp/plugins/dynamix.plugin.manager/scripts/plugin $1 $2
/usr/local/emhttp/plugins/community.applications/scripts/updatePluginSupport.php