From ea3c71b972283d0c770ae82e0fd0eff68f0d789f Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Sun, 3 Apr 2022 14:54:24 -0400 Subject: [PATCH] cleanup --- .../plugins/community.applications/Apps.page | 8 ++++---- .../emhttp/plugins/community.applications/ca.md5 | 8 ++++---- .../community.applications/include/exec.php | 8 ++++---- .../community.applications/include/helpers.php | 2 +- .../community.applications/skins/Narrow/skin.php | 14 +++++++------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page b/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page index ba89dbdc..f13b8dbc 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page @@ -1346,7 +1346,7 @@ function pinApp(button,repository,name) { var pinnedText = ( $(button).hasClass("unpinned") ) ? "" : ""; $(button).attr('title',pinned); $(button).text(pinnedText); - + var app = $.find(".pinnedCard[data-pindata='"+repository+name+"']"); $(app).toggle("slow"); @@ -1672,7 +1672,7 @@ function updateDisplay(content) { var ID = $(this).attr("id"); context.destroy("#"+ID); }); - + $("#templates_content").html(content); setToolTip(); enableSearch(); @@ -1702,7 +1702,7 @@ function updateDisplay(content) { }); context.attach('#'+ID, opts); }); - $(".cardDesc").each(function() { + $(".cardDesc").each(function() { var description = $(this).html(); while (isOverflown(this)) { description = description.slice(0,-5); @@ -2656,7 +2656,7 @@ function dockerConvert(dockerID) { openNewWindow(templateURL); }); } - }); + }); } 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 fc08bc15..8002636d 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,9 +1,9 @@ -ba590517fb5ba5b262ff7c56f2d0293c ./Apps.page +3b5e473257765ed8a061b20c16ad1ecd ./Apps.page 4e55f7483b661af21a25b677179baffe ./CA_notices.page 42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page e718d7825dbdc96a17a915079222b098 ./default.cfg -f18b0009f23d94905d90c5355d2e83bb ./include/exec.php -14c898d4efc0cc52d416b2dec1d83e32 ./include/helpers.php +8353aa535d24bcf4f085a24375fca6d2 ./include/exec.php +a31856c2249edbc6c396b6f62540504c ./include/helpers.php d9b0dc98ee598d44633341ac199a43e0 ./include/paths.php 532fffdf939594c143e679da02bd841e ./javascript/libraries.js 71f911a818d88d3d567f8a2898094ee2 ./README.md @@ -21,4 +21,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php 34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php 0254b0a66007c3f6e32e7d259e8ee443 ./skins/Narrow/css.php 0d6d0fd063af8b0ec4664a93401d83a0 ./skins/Narrow/skin.html -280d65285b0647e0f2f2e532c8f96e88 ./skins/Narrow/skin.php +57fa9f1466c2ec2f810045d61f39af9d ./skins/Narrow/skin.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 9f0ce20f..2d5b03d6 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 @@ -1267,7 +1267,7 @@ function pinnedApps() { if ( $index === false && (strpos($search[0],"library/") !== false)) { $index = searchArray($file,"Repository",str_replace("library/","",$search[0]),$startIndex); } - + if ( $index !== false ) { if ( $file[$index]['Blacklist'] ) { #This handles things like duplicated templates $startIndex = $index + 1; @@ -2016,13 +2016,13 @@ function convert_docker() { $dockerfile['Privileged'] = "false"; $dockerfile['Networking']['Mode'] = "bridge"; $dockerfile['Icon'] = "/plugins/dynamix.docker.manager/images/question.png"; - + $existing_templates = array_diff(scandir($dockerManPaths['templates-user']),[".",".."]); 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"; } - + $dockerXML = makeXML($dockerfile); file_put_contents($caPaths['dockerSearchInstall'],$dockerXML); diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/helpers.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/helpers.php index 92f9d256..665857c7 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/helpers.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/helpers.php @@ -594,7 +594,7 @@ function languageCheck($template) { $xmlFile = readXmlFile($installedLanguage,true); if ( !$xmlFile['Version'] ) return false; - + return (strcmp($template['Version'],$xmlFile['Version']) > 0) || (strcmp($OSupdates['Version'],$xmlFile['Version']) > 0); } ###################### diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php index 61625cde..ad666f9c 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php @@ -57,9 +57,9 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false) $dockerNotEnabled = 2; // Docker failed to start if ( $unRaidVars['mdState'] !== "STARTED" ) $dockerNotEnabled = 3; // Array not started - } + } $displayHeader = ""; - + $pinnedApps = readJsonFile($caPaths['pinnedV2']); $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']); if ( strpos($template['Repository'],"/") === false ) $template['Pinned'] = $pinnedApps["library/{$template['Repository']}&{$template['SortName']}"]; - else + else $template['Pinned'] = $pinnedApps["{$template['Repository']}&{$template['SortName']}"]; $template['Twitter'] = $template['Twitter'] ?: $repositories[$template['Repo']]['Twitter']; $template['Reddit'] = $template['Reddit'] ?: $repositories[$template['Repo']]['Reddit']; @@ -312,13 +312,13 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false) } else { if ($template['InstallPath']) $template['Path'] = $template['InstallPath']; - + $displayHeader .= ""; } } // Handle MaxPerPage changing on a different tab $displayHeader .= ""; - + return "$displayHeader$ct"; } @@ -1325,11 +1325,11 @@ function displayPopup($template) { } $card .= ""; } - + if ( $Video ) { if ( ! is_array($Video) ) $Video = [$Video]; - + $vidText = (count($Video) == 1) ? "Play Video" : "Play Video %s"; $card .= "
"; $count = 1;