Squidly271/community.applications
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed: couldn't install plugins from sidebar

Browse Source
This commit is contained in:
Squidly271 2022-04-01 20:02:17 -04:00
parent 7025307e39
commit 0c7b0c5425
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2022.04.01-x86_64-1.txz Normal file
View File

Binary file not shown.

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

@ -2,8 +2,8 @@ fba5da7b32a25b10f66b98923ea2fe5b ./Apps.page
4e55f7483b661af21a25b677179baffe ./CA_notices.page
42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page
e718d7825dbdc96a17a915079222b098 ./default.cfg
a9e2a5a3b9e0dfa39cbec0021850469c ./include/exec.php
f32bb71914346adbbc8a3a6b59e9521d ./include/helpers.php
f18b0009f23d94905d90c5355d2e83bb ./include/exec.php
a31856c2249edbc6c396b6f62540504c ./include/helpers.php
d9b0dc98ee598d44633341ac199a43e0 ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js
71f911a818d88d3d567f8a2898094ee2 ./README.md
@ -20,5 +20,5 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php
4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh
34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php
62494acd8ae889cf55688a22852eadb0 ./skins/Narrow/css.php
639c5146c5880a617fe15f603b1cffa3 ./skins/Narrow/skin.html
ca8b5d1bd3964cd69f8480063a5053f0 ./skins/Narrow/skin.php
1ebe048c608674e40af3846b2233b274 ./skins/Narrow/skin.html
e7773ea7c686cc64d7cc1d432e1c5a67 ./skins/Narrow/skin.php

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

@ -13,7 +13,7 @@ $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: "/usr/local/emhttp";
$_SERVER['REQUEST_URI'] = "docker/apps";
require_once("$docroot/plugins/dynamix/include/Translations.php");
require_once "$docroot/plugins/dynamix/include/Translations.php";
require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php"; # must be first include due to paths defined
require_once "$docroot/plugins/community.applications/include/paths.php";
require_once "$docroot/plugins/community.applications/include/helpers.php";
@ -832,7 +832,6 @@ function get_content() {
} else continue;
}
}
$display[] = $template;
}
if ( $filter ) {

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

@ -593,6 +593,8 @@ function languageCheck($template) {
$xmlFile = readXmlFile($installedLanguage,true);
if ( !$xmlFile['Version'] ) return false;
return (strcmp($template['Version'],$xmlFile['Version']) > 0) || (strcmp($OSupdates['Version'],$xmlFile['Version']) > 0);
}
######################

1
source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.html
View File

@ -3,6 +3,7 @@
<ul class='caMenu '>
<li class='startupButton caMenuItem onlyShowWithFeed' data-category='new'><?tr("Home");?></li>
<hr class='onlyShowWithFeed'>
<li class='caMenuItem sectionMenu onlyShowWithFeed' data-category='action_center'><?tr("Action Centre");?></li>
<li class='caMenuItem sectionMenu onlyShowWithFeed' data-category='installed_apps'><?tr("Installed Apps");?></li>
<ul class='subCategory onlyShowWithFeed'>
<li class='caMenuItem sectionMenu onlyShowWithFeed dockerSpecific' data-category='inst_docker'><?tr("Docker");?></li>

2
source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php
View File

@ -601,7 +601,7 @@ function getPopupDescriptionSkin($appNumber) {
} elseif ( ! $template['Blacklist'] ) {
if ( $template['Compatible'] || $caSettings['hideIncompatible'] !== "true") {
if ( !$template['Deprecated'] || $caSettings['hideDeprecated'] !== "true" ) {
if ( $template['RequiresFile'] && is_file($template['RequiresFile']) ) {
if ( ($template['RequiresFile'] && is_file($template['RequiresFile']) ) || ! $template['RequiresFile'] ) {
$buttonTitle = $template['InstallPath'] ? tr("Reinstall") : tr("Install");
$actionsContext[] = array("icon"=>"ca_fa-install","text"=>$buttonTitle,"action"=>"installPlugin('{$template['PluginURL']}');");
}