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

cleanup

Browse Source
This commit is contained in:
Squidly271 2022-04-03 14:54:24 -04:00
parent c0783758bc
commit ea3c71b972
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1346,7 +1346,7 @@ function pinApp(button,repository,name) {
var pinnedText = ( $(button).hasClass("unpinned") ) ? "<?tr("Pin app")?>" : "<?tr("Unpin App")?>"; var pinnedText = ( $(button).hasClass("unpinned") ) ? "<?tr("Pin app")?>" : "<?tr("Unpin App")?>";
$(button).attr('title',pinned); $(button).attr('title',pinned);
$(button).text(pinnedText); $(button).text(pinnedText);
var app = $.find(".pinnedCard[data-pindata='"+repository+name+"']"); var app = $.find(".pinnedCard[data-pindata='"+repository+name+"']");
$(app).toggle("slow"); $(app).toggle("slow");
@ -1672,7 +1672,7 @@ function updateDisplay(content) {
var ID = $(this).attr("id"); var ID = $(this).attr("id");
context.destroy("#"+ID); context.destroy("#"+ID);
}); });
$("#templates_content").html(content); $("#templates_content").html(content);
setToolTip(); setToolTip();
enableSearch(); enableSearch();
@ -1702,7 +1702,7 @@ function updateDisplay(content) {
}); });
context.attach('#'+ID, opts); context.attach('#'+ID, opts);
}); });
$(".cardDesc").each(function() { $(".cardDesc").each(function() {
var description = $(this).html(); var description = $(this).html();
while (isOverflown(this)) { while (isOverflown(this)) {
description = description.slice(0,-5); description = description.slice(0,-5);
@ -2656,7 +2656,7 @@ function dockerConvert(dockerID) {
openNewWindow(templateURL); openNewWindow(templateURL);
}); });
} }
}); });
} }

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

@ -1,9 +1,9 @@
ba590517fb5ba5b262ff7c56f2d0293c ./Apps.page 3b5e473257765ed8a061b20c16ad1ecd ./Apps.page
4e55f7483b661af21a25b677179baffe ./CA_notices.page 4e55f7483b661af21a25b677179baffe ./CA_notices.page
42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page 42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page
e718d7825dbdc96a17a915079222b098 ./default.cfg e718d7825dbdc96a17a915079222b098 ./default.cfg
f18b0009f23d94905d90c5355d2e83bb ./include/exec.php 8353aa535d24bcf4f085a24375fca6d2 ./include/exec.php
14c898d4efc0cc52d416b2dec1d83e32 ./include/helpers.php a31856c2249edbc6c396b6f62540504c ./include/helpers.php
d9b0dc98ee598d44633341ac199a43e0 ./include/paths.php d9b0dc98ee598d44633341ac199a43e0 ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js 532fffdf939594c143e679da02bd841e ./javascript/libraries.js
71f911a818d88d3d567f8a2898094ee2 ./README.md 71f911a818d88d3d567f8a2898094ee2 ./README.md
@ -21,4 +21,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php
34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php 34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php
0254b0a66007c3f6e32e7d259e8ee443 ./skins/Narrow/css.php 0254b0a66007c3f6e32e7d259e8ee443 ./skins/Narrow/css.php
0d6d0fd063af8b0ec4664a93401d83a0 ./skins/Narrow/skin.html 0d6d0fd063af8b0ec4664a93401d83a0 ./skins/Narrow/skin.html
280d65285b0647e0f2f2e532c8f96e88 ./skins/Narrow/skin.php 57fa9f1466c2ec2f810045d61f39af9d ./skins/Narrow/skin.php

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

@ -1267,7 +1267,7 @@ function pinnedApps() {
if ( $index === false && (strpos($search[0],"library/") !== false)) { if ( $index === false && (strpos($search[0],"library/") !== false)) {
$index = searchArray($file,"Repository",str_replace("library/","",$search[0]),$startIndex); $index = searchArray($file,"Repository",str_replace("library/","",$search[0]),$startIndex);
} }
if ( $index !== false ) { if ( $index !== false ) {
if ( $file[$index]['Blacklist'] ) { #This handles things like duplicated templates if ( $file[$index]['Blacklist'] ) { #This handles things like duplicated templates
$startIndex = $index + 1; $startIndex = $index + 1;
@ -2016,13 +2016,13 @@ function convert_docker() {
$dockerfile['Privileged'] = "false"; $dockerfile['Privileged'] = "false";
$dockerfile['Networking']['Mode'] = "bridge"; $dockerfile['Networking']['Mode'] = "bridge";
$dockerfile['Icon'] = "/plugins/dynamix.docker.manager/images/question.png"; $dockerfile['Icon'] = "/plugins/dynamix.docker.manager/images/question.png";
$existing_templates = array_diff(scandir($dockerManPaths['templates-user']),[".",".."]); $existing_templates = array_diff(scandir($dockerManPaths['templates-user']),[".",".."]);
foreach ( $existing_templates as $template ) { foreach ( $existing_templates as $template ) {
if ( strtolower($dockerfile['Name']) == strtolower(str_replace(["my-",".xml"],["",""],$template)) ) if ( strtolower($dockerfile['Name']) == strtolower(str_replace(["my-",".xml"],["",""],$template)) )
$dockerfile['Name'] .= "-1"; $dockerfile['Name'] .= "-1";
} }
$dockerXML = makeXML($dockerfile); $dockerXML = makeXML($dockerfile);
file_put_contents($caPaths['dockerSearchInstall'],$dockerXML); file_put_contents($caPaths['dockerSearchInstall'],$dockerXML);

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

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

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

@ -57,9 +57,9 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
$dockerNotEnabled = 2; // Docker failed to start $dockerNotEnabled = 2; // Docker failed to start
if ( $unRaidVars['mdState'] !== "STARTED" ) if ( $unRaidVars['mdState'] !== "STARTED" )
$dockerNotEnabled = 3; // Array not started $dockerNotEnabled = 3; // Array not started
} }
$displayHeader = "<script>addDockerWarning($dockerNotEnabled);var dockerNotEnabled = $dockerWarningFlag;</script>"; $displayHeader = "<script>addDockerWarning($dockerNotEnabled);var dockerNotEnabled = $dockerWarningFlag;</script>";
$pinnedApps = readJsonFile($caPaths['pinnedV2']); $pinnedApps = readJsonFile($caPaths['pinnedV2']);
$checkedOffApps = arrayEntriesToObject(@array_merge(@array_values($selectedApps['docker']),@array_values($selectedApps['plugin']))); $checkedOffApps = arrayEntriesToObject(@array_merge(@array_values($selectedApps['docker']),@array_values($selectedApps['plugin'])));
@ -260,7 +260,7 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
$template['ca_fav'] = $caSettings['favourite'] && ($caSettings['favourite'] == $template['RepoName']); $template['ca_fav'] = $caSettings['favourite'] && ($caSettings['favourite'] == $template['RepoName']);
if ( strpos($template['Repository'],"/") === false ) if ( strpos($template['Repository'],"/") === false )
$template['Pinned'] = $pinnedApps["library/{$template['Repository']}&{$template['SortName']}"]; $template['Pinned'] = $pinnedApps["library/{$template['Repository']}&{$template['SortName']}"];
else else
$template['Pinned'] = $pinnedApps["{$template['Repository']}&{$template['SortName']}"]; $template['Pinned'] = $pinnedApps["{$template['Repository']}&{$template['SortName']}"];
$template['Twitter'] = $template['Twitter'] ?: $repositories[$template['Repo']]['Twitter']; $template['Twitter'] = $template['Twitter'] ?: $repositories[$template['Repo']]['Twitter'];
$template['Reddit'] = $template['Reddit'] ?: $repositories[$template['Repo']]['Reddit']; $template['Reddit'] = $template['Reddit'] ?: $repositories[$template['Repo']]['Reddit'];
@ -312,13 +312,13 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
} else { } else {
if ($template['InstallPath']) if ($template['InstallPath'])
$template['Path'] = $template['InstallPath']; $template['Path'] = $template['InstallPath'];
$displayHeader .= "<script>showSidebarApp('{$template['Path']}','{$template['Name']}');</script>"; $displayHeader .= "<script>showSidebarApp('{$template['Path']}','{$template['Name']}');</script>";
} }
} }
// Handle MaxPerPage changing on a different tab // Handle MaxPerPage changing on a different tab
$displayHeader .= "<script>changeMax({$caSettings['maxPerPage']});</script>"; $displayHeader .= "<script>changeMax({$caSettings['maxPerPage']});</script>";
return "$displayHeader$ct"; return "$displayHeader$ct";
} }
@ -1325,11 +1325,11 @@ function displayPopup($template) {
} }
$card .= "</div>"; $card .= "</div>";
} }
if ( $Video ) { if ( $Video ) {
if ( ! is_array($Video) ) if ( ! is_array($Video) )
$Video = [$Video]; $Video = [$Video];
$vidText = (count($Video) == 1) ? "Play Video" : "Play Video %s"; $vidText = (count($Video) == 1) ? "Play Video" : "Play Video %s";
$card .= "<div>"; $card .= "<div>";
$count = 1; $count = 1;