mirrors
/
community.applications
mirror of https://github.com/Squidly271/community.applications.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

apps in installed / previous wouldn't show the original description and not the one if the user changed it.

pull/11/head
Squidly271 2021-08-14 13:25:27 -04:00
parent 8103faa894
commit 4bfbf8b010
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2021.08.14-x86_64-1.txz
View File

Binary file not shown.

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

@ -9,7 +9,7 @@ c2c927b524c58a1be457ab0a7e2a1a35 ./CommunityApps.page
6e48a62b91bdd066f023f46c6b491afd ./images/discord-gray.svg 6e48a62b91bdd066f023f46c6b491afd ./images/discord-gray.svg
8e7dc33512b8a78f28d7179a972c7c34 ./images/discord-hover.svg 8e7dc33512b8a78f28d7179a972c7c34 ./images/discord-hover.svg
54e46db492ddb033dfeb2827c5efd4a8 ./images/discord-white.svg 54e46db492ddb033dfeb2827c5efd4a8 ./images/discord-white.svg
a67f60711fc505e4d65b2b2e2351bb65 ./include/exec.php ef41cf5cd1f798e1b94dd0b629ec0e5a ./include/exec.php
00068044737bb1c08f2c0bad98b97646 ./include/helpers.php 00068044737bb1c08f2c0bad98b97646 ./include/helpers.php
3893704ad833c765384c5fcf3147a7f7 ./include/paths.php 3893704ad833c765384c5fcf3147a7f7 ./include/paths.php
eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js

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

@ -1013,6 +1013,7 @@ function previous_apps() {
foreach ($all_files as $xmlfile) { foreach ($all_files as $xmlfile) {
$o = readXmlFile($xmlfile); $o = readXmlFile($xmlfile);
$o['Overview'] = fixDescription($o['Overview']); $o['Overview'] = fixDescription($o['Overview']);
$o['Description'] = $o['Overview'];
$o['CardDescription'] = $o['Overview']; $o['CardDescription'] = $o['Overview'];
$o['InstallPath'] = $xmlfile; $o['InstallPath'] = $xmlfile;
$o['UnknownCompatible'] = true; $o['UnknownCompatible'] = true;
@ -1044,8 +1045,11 @@ function previous_apps() {
if ( $searchResult !== false ) { if ( $searchResult !== false ) {
$tempPath = $o['InstallPath']; $tempPath = $o['InstallPath'];
$containerID = $file[$searchResult]['ID']; $containerID = $file[$searchResult]['ID'];
$tmpOvr = $o['Overview'];
$o = $file[$searchResult]; $o = $file[$searchResult];
$o['Name'] = $installedName; $o['Name'] = $installedName;
$o['Overview'] = $tmpOvr;
$o['CardDescription'] = $tmpOvr;
$o['InstallPath'] = $tempPath; $o['InstallPath'] = $tempPath;
$o['SortName'] = str_replace("-"," ",$installedName); $o['SortName'] = str_replace("-"," ",$installedName);
/* if ( $dockerUpdateStatus[$installedImage]['status'] == "false" || $dockerUpdateStatus[$template['Name']] == "false" ) { /* if ( $dockerUpdateStatus[$installedImage]['status'] == "false" || $dockerUpdateStatus[$template['Name']] == "false" ) {
@ -1066,11 +1070,11 @@ function previous_apps() {
$fat32Fix[$searchResult]++; $fat32Fix[$searchResult]++;
if ($fat32Fix[$searchResult] > 1) continue; if ($fat32Fix[$searchResult] > 1) continue;
if ($o['testrepo']) continue; if ($o['testrepo']) continue;
}
}
$displayed[] = $o; $displayed[] = $o;
} }
} }
}
}
} else { } else {
if ( ! $filter || $filter == "docker" ) { if ( ! $filter || $filter == "docker" ) {
# now get the old not installed docker apps # now get the old not installed docker apps
@ -1078,6 +1082,7 @@ function previous_apps() {
$o = readXmlFile($xmlfile); $o = readXmlFile($xmlfile);
if ( ! $o ) continue; if ( ! $o ) continue;
$o['Overview'] = fixDescription($o['Overview']); $o['Overview'] = fixDescription($o['Overview']);
$o['Description'] = $o['Overview'];
$o['CardDescription'] = $o['Overview']; $o['CardDescription'] = $o['Overview'];
$o['InstallPath'] = $xmlfile; $o['InstallPath'] = $xmlfile;
$o['UnknownCompatible'] = true; $o['UnknownCompatible'] = true;
@ -1103,7 +1108,11 @@ function previous_apps() {
if (startsWith($appTemplate['Repository'],$testRepo)) { if (startsWith($appTemplate['Repository'],$testRepo)) {
$tempPath = $o['InstallPath']; $tempPath = $o['InstallPath'];
$tempName = $o['Name']; $tempName = $o['Name'];
$tempOvr = $o['Overview'];
$o = $appTemplate; $o = $appTemplate;
$o['Overview'] = $tempOvr;
$o['Description'] = $tempOvr;
$o['CardDescription'] = $tempOvr;
$o['Removable'] = true; $o['Removable'] = true;
$o['InstallPath'] = $tempPath; $o['InstallPath'] = $tempPath;
$o['Name'] = $tempName; $o['Name'] = $tempName;
@ -1111,14 +1120,13 @@ function previous_apps() {
break; break;
} }
} }
}
if ( ! $o['Blacklist'] ) if ( ! $o['Blacklist'] )
$displayed[] = $o; $displayed[] = $o;
} }
} }
} }
} }
}
# Now work on plugins # Now work on plugins
if ( $installed == "true" ) { if ( $installed == "true" ) {
if ( ! $filter || $filter == "plugins" ) { if ( ! $filter || $filter == "plugins" ) {