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

Fixed: install multi not visible text on RC3+

Browse Source
This commit is contained in:
Squidly271 2022-02-06 07:21:01 -05:00
parent c3c7b25418
commit 29ab880dcc
6 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

5
source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page
View File

@ -2497,7 +2497,10 @@ function showSidebarApp(apppath,appname) {
});
postNoSpin({action:'getLastUpdate',ID:result.ID},function(lastUpdate) {
if (lastUpdate.lastUpdate) {
$("#template"+result.ID).html(lastUpdate.lastUpdate);
$("#template"+result.ID).fadeOut("slow","linear",function() {
$("#template"+result.ID).html(lastUpdate.lastUpdate);
$("#template"+result.ID).fadeIn("slow");
});
}
});
})

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

@ -1,14 +1,14 @@
39b9658d490638157e62f8616c0e587b ./Apps.page
865abbf25bbd17d8de176b1772ff3bb7 ./Apps.page
4e55f7483b661af21a25b677179baffe ./CA_notices.page
c7c6da0a4a4a7ac33f387ea178319bae ./ca_settings.page
ed2883d6c44c19304c431079596a1731 ./default.cfg
1737105eda77690afa9c927ebe51d3e1 ./include/exec.php
876078f25428140af17ea1f959da5ba4 ./include/exec.php
2c1babf5b937925bb47dce1b0566c25d ./include/helpers.php
d827ebdf8c29aa6a9818df043a37721e ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js
b398273cf7daa62ab00d2de2336ca25f ./README.md
79f3093f42415484944e6aa2863ee30a ./scripts/checkForUpdates.php
76470501fc14fa1e8c24f0526a05a0f3 ./scripts/installMulti.php
78912ecc112fd6cc6ca49b4b30197ba0 ./scripts/installMulti.php
be74e770cdc8938200fc29580be4e3a1 ./scripts/installMultiPlugin.php
524afab04ca930f59117a846f819fb2f ./scripts/installPluginUpdate.sh
f1e435bc2543dd7a9f6495fbc2533f2b ./scripts/installUpdate.php
@ -21,4 +21,4 @@ a1401a0bed89c182b69f0c7508282c1f ./scripts/pluginInstall.php
34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php
549fb44e30554bfba0a6ead71ececa65 ./skins/Narrow/css.php
7d827147dc8ede3d518b2cacae1d385b ./skins/Narrow/skin.html
70f2c72a78ffcaeb799baf7f3425c4c2 ./skins/Narrow/skin.php
44fb2dea9d449fd4cd7a89883ad7ad05 ./skins/Narrow/skin.php

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

@ -2075,14 +2075,19 @@ function getLastUpdate($ID) {
$regs = $app['Repository'];
}
$reg = explode(":",$regs);
if ( $reg[1] && $reg[1] !== "latest" )
if ( $reg[1] && strtolower($reg[1]) !== "latest" )
return tr("Unknown");
$registry = download_url("https://registry.hub.docker.com/v2/repositories/{$reg[0]}");
$registry_json = json_decode($registry,true);
if ( ! $registry_json['last_updated'] )
return;
while ( ! $registry && $count < 5 ) {
if ( $registry ) break;
sleep(1);
$count++;
$registry = download_url("https://registry.hub.docker.com/v2/repositories/{$reg[0]}");
$registry_json = json_decode($registry,true);
if ( ! $registry_json['last_updated'] )
return;
}
$lastUpdated = $registry_json['last_updated'] ? tr(date("M j, Y",strtotime($registry_json['last_updated'])),0) : "Unknown";
return $lastUpdated;

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

@ -5,10 +5,15 @@
# Licenced under GPLv2 #
# #
###############################################################
?>
<style>
.logLine{color:black !important;}
</style>
<?php
$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/community.applications/include/paths.php";
require_once "$docroot/plugins/dynamix/include/Wrappers.php";
@ -44,6 +49,7 @@ if ( $_GET['docker'] ) {
@include($exeFile); # under new GUI, this line returns a duplicated session_start() error.
echo "</div>";
?>
<script>
$("input,#output").hide();

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

@ -1288,8 +1288,11 @@ function displayPopup($template) {
if ($stars)
$card .= "<tr><td class='popupTableLeft'>".tr("DockerHub Stars:")."</td><td class='popupTableRight'>$stars <span class='dockerHubStar'></span></td></tr>";
if ( ! $Plugin && ! $Language ) {
$lastUpdateMsg = $LastUpdate ? tr(date("M j, Y",$LastUpdate),0) : tr("Unknown");
$card .= "<tr><td class='popupTableLeft'>".tr("Last Update:")."</td><td class='popupTableRight'><span id='template{$template['ID']}'>$lastUpdateMsg <span class='ca_note'><span class='ca_fa-asterisk'></span></span></span></td></tr>";
$tag = explode(":",$Repository)[1];
if ( ! $tag || strtolower($tag) === "latest" ) {
$lastUpdateMsg = $LastUpdate ? tr(date("M j, Y",$LastUpdate),0) : tr("Unknown");
$card .= "<tr><td class='popupTableLeft'>".tr("Last Update:")."</td><td class='popupTableRight'><span id='template{$template['ID']}'>$lastUpdateMsg <span class='ca_note'><span class='ca_fa-asterisk'></span></span></span></td></tr>";
}
}
if ( $Plugin ) {
$card .= "<tr><td class='popupTableLeft'>".tr("Installed Version")."</td><td class='popupTableRight'>$installedVersion</td></tr>";