diff --git a/archive/community.applications-2021.04.28-x86_64-1.txz b/archive/community.applications-2021.04.28-x86_64-1.txz new file mode 100644 index 00000000..f083152f Binary files /dev/null and b/archive/community.applications-2021.04.28-x86_64-1.txz differ diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page b/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page index c6cb37e7..43431be5 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page @@ -339,9 +339,21 @@ $(function(){ case "installed_apps": previousApps(true); break; + case "inst_docker": + previousApps(true,false,"docker"); + break; + case "inst_plugins": + previousApps(true,false,"plugins"); + break; case "previous_apps": previousApps(false); break; + case "prev_docker": + previousApps(false,false,"docker"); + break; + case "prev_plugins": + previousApps(false,false,"plugins"); + break; case "pinned_apps": pinnedApps(); break; @@ -950,7 +962,7 @@ function showModeration(script,title) { showDesc_openBox("/plugins//scripts/showStatistics.php?arg1="+script,title,550,900,true,false); } -function previousApps(installed,dontClear=false) { +function previousApps(installed,dontClear=false,filter="") { hideSortIcons(); clearCategory(); setPageOne(); @@ -960,7 +972,7 @@ function previousApps(installed,dontClear=false) { $(".dockerSearch").hide(); enableIcon("#sortIcon",true); - post({action:'previous_apps',installed:installed},function(result) { + post({action:'previous_apps',installed:installed,filter:filter},function(result) { if ( installed ) { $(".multi_installDiv").hide(); } else { diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 index d01a19d1..9da0c82a 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 @@ -1,6 +1,6 @@ 767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page 83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page -5cdbd6e3fd10ca4e156cacb7b26dae1e ./CommunityApps.page +6b47f59ebd426b33c9c9b4e739d1f47a ./CommunityApps.page 6db73582f22dab13d329e862067ee84e ./PluginAPI.page b398273cf7daa62ab00d2de2336ca25f ./README.md 1a908064914041c48be7bf0dab77515a ./ca_settings.page @@ -11,12 +11,12 @@ b398273cf7daa62ab00d2de2336ca25f ./README.md 6e48a62b91bdd066f023f46c6b491afd ./images/discord-gray.svg 8e7dc33512b8a78f28d7179a972c7c34 ./images/discord-hover.svg 54e46db492ddb033dfeb2827c5efd4a8 ./images/discord-white.svg -9c186878dde3a06d4a3e9f8f5769b553 ./include/exec.php +1743a5f99c606008ec90b6302cb2d280 ./include/exec.php 46a523633a4737378b64192db97fca27 ./include/helpers.php 8f1129e0cdb994c6d1900192252433d8 ./include/paths.php 9ba7ea3ef8bad60cb8335da9c0daea4f ./javascript/libraries.js 3a632db992fd18e3f5cfeca203bcff2c ./skins/Narrow/css.php -81e36a845dd30426806a0d0c04a8b786 ./skins/Narrow/skin.html +58a140a38ceb6836a5b7c5b9bca85b6c ./skins/Narrow/skin.html 7bebedcb67df7ed7c3933a79a3757d9b ./skins/Narrow/skin.php 38d1f40cbc64eed32cdb3292e1ec1f6e ./scripts/PluginAPI.php bbd9dec6c5df486d75c46388c14f09ce ./scripts/installMulti.php diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php index dae0b2fd..d900d324 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php @@ -979,6 +979,7 @@ function previous_apps() { global $caPaths, $caSettings, $DockerClient; $installed = getPost("installed",""); + $filter = getPost("filter",""); $dockerUpdateStatus = readJsonFile($caPaths['dockerUpdateStatus']); $info = $caSettings['dockerRunning'] ? $DockerClient->getDockerContainers() : array(); @@ -996,166 +997,174 @@ if ( $caSettings['dockerRunning'] ) { $all_files = glob("{$caPaths['dockerManTemplates']}/*.xml"); $all_files = $all_files ?: array(); if ( $installed == "true" ) { - foreach ($info as $installedDocker) { - $installedName = $installedDocker['Name']; - if ( startsWith($installedImage,"library/") ) # official images are in DockerClient as library/mysql eg but template just shows mysql - $installedImage = str_replace("library/","",$installedImage); + if ( !$filter || $filter == "docker" ) { + foreach ($info as $installedDocker) { + $installedName = $installedDocker['Name']; + if ( startsWith($installedImage,"library/") ) # official images are in DockerClient as library/mysql eg but template just shows mysql + $installedImage = str_replace("library/","",$installedImage); - foreach ($file as $template) { - if ( $installedName == $template['Name'] ) { - $template['testrepo'] = $installedImage; - if ( startsWith($installedImage,$template['Repository']) ) { - $template['Uninstall'] = true; - $template['InstallPath'] = $template['Path']; - if ( $dockerUpdateStatus[$installedImage]['status'] == "false" || $dockerUpdateStatus[$template['Name']] == "false" ) { - $template['UpdateAvailable'] = true; + foreach ($file as $template) { + if ( $installedName == $template['Name'] ) { + $template['testrepo'] = $installedImage; + if ( startsWith($installedImage,$template['Repository']) ) { + $template['Uninstall'] = true; + $template['InstallPath'] = $template['Path']; + if ( $dockerUpdateStatus[$installedImage]['status'] == "false" || $dockerUpdateStatus[$template['Name']] == "false" ) { + $template['UpdateAvailable'] = true; + } + if ($template['Blacklist'] ) continue; + + $displayed[] = $template; + break; } - if ($template['Blacklist'] ) continue; + } + } + } + # handle renamed containers + foreach ($all_files as $xmlfile) { + $o = readXmlFile($xmlfile); + $o['Description'] = fixDescription($o['Description']); + $o['Overview'] = fixDescription($o['Overview']); + $o['InstallPath'] = $xmlfile; + $o['UnknownCompatible'] = true; - $displayed[] = $template; - break; + $flag = false; + $containerID = false; + foreach ($file as $templateDocker) { + # use startsWith to eliminate any version tags (:latest) + if ( startsWith($templateDocker['Repository'], $testRepo) ) { + if ( $templateDocker['Name'] == $o['Name'] ) { + $flag = true; + $containerID = $template['ID']; + break; + } + } + } + if ( ! $flag ) { + $runningflag = false; + foreach ($info as $installedDocker) { + $installedImage = $installedDocker['Image']; + $installedName = $installedDocker['Name']; + if ( startsWith($installedImage, $o['Repository']) ) { + if ( $installedName == $o['Name'] ) { + $runningflag = true; + $searchResult = searchArray($file,'Repository',$o['Repository']); + if ( ! $searchResult ) { + $searchResult = searchArray($file,'Repository',explode(":",$o['Repository'])[0]); + } + if ( $searchResult !== false ) { + $tempPath = $o['InstallPath']; + $containerID = $file[$searchResult]['ID']; + $o = $file[$searchResult]; + $o['Name'] = $installedName; + $o['InstallPath'] = $tempPath; + $o['SortName'] = str_replace("-"," ",$installedName); + if ( $dockerUpdateStatus[$installedImage]['status'] == "false" || $dockerUpdateStatus[$template['Name']] == "false" ) { + $o['UpdateAvailable'] = true; + } + } + break; + } + } + } + if ( $runningflag ) { + $o['Uninstall'] = true; + $o['ID'] = $containerID; + if ( $o['Blacklist'] ) continue; + + # handle a PR from LT where it is possible for an identical template (xml) to be present twice, with different filenames. + # Without this, an app could appear to be shown in installed apps twice + $fat32Fix[$searchResult]++; + if ($fat32Fix[$searchResult] > 1) continue; + $displayed[] = $o; } } } } -# handle renamed containers - foreach ($all_files as $xmlfile) { - $o = readXmlFile($xmlfile); - $o['Description'] = fixDescription($o['Description']); - $o['Overview'] = fixDescription($o['Overview']); - $o['InstallPath'] = $xmlfile; - $o['UnknownCompatible'] = true; + } else { + if ( ! $filter || $filter == "docker" ) { + # now get the old not installed docker apps + foreach ($all_files as $xmlfile) { + $o = readXmlFile($xmlfile); + if ( ! $o ) continue; + $o['Description'] = fixDescription($o['Description']); + $o['Overview'] = fixDescription($o['Overview']); + $o['InstallPath'] = $xmlfile; + $o['UnknownCompatible'] = true; + $o['Removable'] = true; + # is the container running? - $flag = false; - $containerID = false; - foreach ($file as $templateDocker) { -# use startsWith to eliminate any version tags (:latest) - if ( startsWith($templateDocker['Repository'], $testRepo) ) { - if ( $templateDocker['Name'] == $o['Name'] ) { - $flag = true; - $containerID = $template['ID']; - break; - } - } - } - if ( ! $flag ) { - $runningflag = false; + $flag = false; foreach ($info as $installedDocker) { $installedImage = $installedDocker['Image']; $installedName = $installedDocker['Name']; if ( startsWith($installedImage, $o['Repository']) ) { if ( $installedName == $o['Name'] ) { - $runningflag = true; - $searchResult = searchArray($file,'Repository',$o['Repository']); - if ( ! $searchResult ) { - $searchResult = searchArray($file,'Repository',explode(":",$o['Repository'])[0]); - } - if ( $searchResult !== false ) { - $tempPath = $o['InstallPath']; - $containerID = $file[$searchResult]['ID']; - $o = $file[$searchResult]; - $o['Name'] = $installedName; - $o['InstallPath'] = $tempPath; - $o['SortName'] = str_replace("-"," ",$installedName); - if ( $dockerUpdateStatus[$installedImage]['status'] == "false" || $dockerUpdateStatus[$template['Name']] == "false" ) { - $o['UpdateAvailable'] = true; - } - } - break; + $flag = true; + continue; } } } - if ( $runningflag ) { - $o['Uninstall'] = true; - $o['ID'] = $containerID; - if ( $o['Blacklist'] ) continue; - - # handle a PR from LT where it is possible for an identical template (xml) to be present twice, with different filenames. - # Without this, an app could appear to be shown in installed apps twice - $fat32Fix[$searchResult]++; - if ($fat32Fix[$searchResult] > 1) continue; - $displayed[] = $o; - } - } - } - } else { -# now get the old not installed docker apps - foreach ($all_files as $xmlfile) { - $o = readXmlFile($xmlfile); - if ( ! $o ) continue; - $o['Description'] = fixDescription($o['Description']); - $o['Overview'] = fixDescription($o['Overview']); - $o['InstallPath'] = $xmlfile; - $o['UnknownCompatible'] = true; - $o['Removable'] = true; -# is the container running? - - $flag = false; - foreach ($info as $installedDocker) { - $installedImage = $installedDocker['Image']; - $installedName = $installedDocker['Name']; - if ( startsWith($installedImage, $o['Repository']) ) { - if ( $installedName == $o['Name'] ) { - $flag = true; - continue; + if ( ! $flag ) { + $testRepo = explode(":",$o['Repository'])[0]; + # now associate the template back to a template in the appfeed + foreach ($file as $appTemplate) { + if (startsWith($appTemplate['Repository'],$testRepo)) { + $tempPath = $o['InstallPath']; + $tempName = $o['Name']; + $o = $appTemplate; + $o['Removable'] = true; + $o['InstallPath'] = $tempPath; + $o['Name'] = $tempName; + $o['SortName'] = str_replace("-"," ",$o['Name']); + break; + } } - } - } - if ( ! $flag ) { - $testRepo = explode(":",$o['Repository'])[0]; -# now associate the template back to a template in the appfeed - foreach ($file as $appTemplate) { - if (startsWith($appTemplate['Repository'],$testRepo)) { - $tempPath = $o['InstallPath']; - $tempName = $o['Name']; - $o = $appTemplate; - $o['Removable'] = true; - $o['InstallPath'] = $tempPath; - $o['Name'] = $tempName; - $o['SortName'] = str_replace("-"," ",$o['Name']); - break; - } - } - if ( ! $o['Blacklist'] ) - $displayed[] = $o; + if ( ! $o['Blacklist'] ) + $displayed[] = $o; + } } } } } # Now work on plugins if ( $installed == "true" ) { - foreach ($file as $template) { - if ( ! $template['Plugin'] ) continue; + if ( ! $filter || $filter == "plugins" ) { + foreach ($file as $template) { + if ( ! $template['Plugin'] ) continue; - $filename = pathinfo($template['Repository'],PATHINFO_BASENAME); + $filename = pathinfo($template['Repository'],PATHINFO_BASENAME); - if ( checkInstalledPlugin($template) ) { - if ( $template['Blacklist'] ) continue; + if ( checkInstalledPlugin($template) ) { + if ( $template['Blacklist'] ) continue; - $template['InstallPath'] = "/var/log/plugins/$filename"; - $template['Uninstall'] = true; - $displayed[] = $template; + $template['InstallPath'] = "/var/log/plugins/$filename"; + $template['Uninstall'] = true; + $displayed[] = $template; + } } } } else { - $all_plugs = array_merge(glob("/boot/config/plugins-error/*.plg"),glob("/boot/config/plugins-removed/*.plg")); - foreach ($all_plugs as $oldplug) { - foreach ($file as $template) { - if ( basename($oldplug) == basename($template['Repository']) ) { - if ( ! file_exists("/boot/config/plugins/".basename($oldplug)) ) { - if ( $template['Blacklist'] || ( ($caSettings['hideIncompatible'] == "true") && (! $template['Compatible']) ) ) continue; - $oldPlugURL = trim(plugin("pluginURL",$oldplug)); - if ( strtolower(trim($template['PluginURL'])) != strtolower(trim($oldPlugURL)) ) { - continue; + if ( ! $filter || $filter == "plugins" ) { + $all_plugs = array_merge(glob("/boot/config/plugins-error/*.plg"),glob("/boot/config/plugins-removed/*.plg")); + foreach ($all_plugs as $oldplug) { + foreach ($file as $template) { + if ( basename($oldplug) == basename($template['Repository']) ) { + if ( ! file_exists("/boot/config/plugins/".basename($oldplug)) ) { + if ( $template['Blacklist'] || ( ($caSettings['hideIncompatible'] == "true") && (! $template['Compatible']) ) ) continue; + $oldPlugURL = trim(plugin("pluginURL",$oldplug)); + if ( strtolower(trim($template['PluginURL'])) != strtolower(trim($oldPlugURL)) ) { + continue; + } + $template['Removable'] = true; + $template['InstallPath'] = $oldplug; + if ( $alreadySeen[$oldPlugURL] ) + continue; + $alreadySeen[$oldPlugURL] = true; + $displayed[] = $template; + break; } - $template['Removable'] = true; - $template['InstallPath'] = $oldplug; - if ( $alreadySeen[$oldPlugURL] ) - continue; - $alreadySeen[$oldPlugURL] = true; - $displayed[] = $template; - break; } } } diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.html b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.html index c4782585..fa37e951 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.html +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.html @@ -2,7 +2,15 @@