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

Fixed below

Browse Source 
A repo with a duplicated template wouldn't appear in the correct order when sorting repository listings by date added
This commit is contained in:
Squidly271 2021-06-13 10:07:49 -04:00
parent b3e328ba78
commit dc17cf950e
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -11,13 +11,13 @@ a9d4cd0e4e1f37cbe3806b952a96ddb1 ./ca_settings.page
6e48a62b91bdd066f023f46c6b491afd ./images/discord-gray.svg
8e7dc33512b8a78f28d7179a972c7c34 ./images/discord-hover.svg
54e46db492ddb033dfeb2827c5efd4a8 ./images/discord-white.svg
ba7e6456556f29f6e8fa0ade0dcadd30 ./include/exec.php
13dfe950ed61efb6a567bfecb5506cbb ./include/exec.php
d7f50413cbaac1c6cb9ceaaef48f270a ./include/helpers.php
8f1129e0cdb994c6d1900192252433d8 ./include/paths.php
eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js
3d5ecb488a4b90fdd5005dea1abe1ad3 ./skins/Narrow/css.php
944beab17894885ed9ae22db3920a054 ./skins/Narrow/skin.html
803c7bb7182371831f27dea9ebcfeddb ./skins/Narrow/skin.php
715c92f632837f3c3dc099d014f3deee ./skins/Narrow/skin.php
38d1f40cbc64eed32cdb3292e1ec1f6e ./scripts/PluginAPI.php
bbd9dec6c5df486d75c46388c14f09ce ./scripts/installMulti.php
ce2c904b6a40c4677a3ff3484776959e ./scripts/installMultiPlugin.sh

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

@ -297,11 +297,13 @@ function DownloadApplicationFeed() {
$ApplicationFeed['repositories'][$o['RepoName']]['downloads']++;
$ApplicationFeed['repositories'][$o['RepoName']]['trending'] += $o['trending'];
if ( $ApplicationFeed['repositories'][$o['RepoName']]['FirstSeen'] ) {
if ($o['FirstSeen'] < $ApplicationFeed['repositories'][$o['RepoName']]['FirstSeen'])
$ApplicationFeed['repositories'][$o['RepoName']]['FirstSeen'] = $o['firstSeen'];
} else {
$ApplicationFeed['repositories'][$o['RepoName']]['FirstSeen'] = $o['FirstSeen'];
if ( ! $o['ModeratorComment'] == "Duplicated Template" ) {
if ( $ApplicationFeed['repositories'][$o['RepoName']]['FirstSeen'] ) {
if ( $o['FirstSeen'] < $ApplicationFeed['repositories'][$o['RepoName']]['FirstSeen'])
$ApplicationFeed['repositories'][$o['RepoName']]['FirstSeen'] = $o['firstSeen'];
} else {
$ApplicationFeed['repositories'][$o['RepoName']]['FirstSeen'] = $o['FirstSeen'];
}
}
if ( is_array($o['Branch']) ) {
if ( ! $o['Branch'][0] ) {
@ -1405,7 +1407,7 @@ function statistics() {
$o .= "<tr><td class='ca_table'><a class='popUpLink' onclick='showModeration(&quot;Moderation&quot;,&quot;".tr("All Moderation Entries")."&quot;);' style='cursor:pointer'>".tr("Number Of Moderation Entries")."</a></td><td class='ca_stat'>{$statistics['totalModeration']}+</td></tr>";
$o .= "<tr><td class='ca_table'><a class='popUpLink' href='{$caPaths['application-feed']}' target='_blank'>".tr("Primary Server")."</a> / <a class='popUpLink' href='{$caPaths['application-feedBackup']}' target='_blank'> ".tr("Backup Server")."</a></td></tr>";
$o .= "</table>";
$o .= "<div class='ca_center'><a href='https://forums.unraid.net/topic/87144-ca-application-policies/' target='_blank'>".tr("Application Policy")."</a></div>";
$o .= "<div class='ca_center'><a class='popUpLink' href='https://forums.unraid.net/topic/87144-ca-application-policies/' target='_blank'>".tr("Application Policy")."</a></div>";
postReturn(['statistics'=>$o]);
}

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

@ -950,7 +950,7 @@ function getRepoDescriptionSkin($repository) {
if ( $totalLanguage )
$t .= "<tr><td style='width:50%;'>".tr("Total Languages")."</td><td style='width:30%;text-align:right;'>$totalLanguage</td></tr>";
if ($dockerVars['DOCKER_AUTHORING_MODE'] == "yes")
$t .= "<tr><td style='width:50%;'><a href='{$repo['url']}' target='_blank'>".tr("Repository URL")."</a></td></tr>";
$t .= "<tr><td style='width:50%;'><a class='popUpLink' href='{$repo['url']}' target='_blank'>".tr("Repository URL")."</a></td></tr>";
$t .= "<tr><td style='width:50%;'>".tr("Total Applications")."</td><td style='width:30%;text-align:right;'>$totalApps</td></tr>";