Remove Larry

source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page

@@ -89,10 +89,6 @@ else
 
 $date = (date("n/d"));
 
-if ( $firstRun == "true" && ($date == "4/01" || $date == "4/02" || $date == "3/31") )  {
-  touch("/boot/config/plugins/community.applications/larry");
-}
-
 $startupDisplayed = is_file($caPaths['startupDisplayed']) ? "true" : "false";
 if ( $startupDisplayed == "true" && ($_COOKIE['ca_languageSwitch'] ?? false) )
   $killCookie = "true";

source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5

@@ -1,8 +1,8 @@
-a8912282397fd6ae3351f631ddc2b678  ./Apps.page
+32e3eec1a1d17de3e361199390a4ef2d  ./Apps.page
 2defe45163697e40c813a57ae9a50231  ./CA_notices.page
-ae3dbecc854f59d9b59509559c847e8f  ./ca_settings.page
+c12622d8281346d37398e96cbb6b8b69  ./ca_settings.page
 01ed7990078dee7cecfeda9a4e49377e  ./default.cfg
-13702d5c79c0beb39e126356430d9ed6  ./include/exec.php
+bc00985b12acbc84b03d3be217b969bd  ./include/exec.php
 66cebca33e8cf88b513c93939279de91  ./include/helpers.php
 590fb8b29aba360a56dd8338b022f9e0  ./include/paths.php
 7234caf6800479df03abb222aaedaca5  ./javascript/libraries.js
@@ -22,5 +22,5 @@ c11415ac49ba9cd6af2b5dc022aa3367  ./scripts/notices.php
 7592f203dca78dce476051b85f7ca133  ./scripts/updatePluginSupport.php
 a84d40579c8f42498e34b15ff4e2d3b4  ./skins/Narrow/css.php
 f7d48fdb63e116ecc3ec49cbbf6b2dc2  ./skins/Narrow/skin.html
-aca0b8dcd84748efe95d2143ee774259  ./skins/Narrow/skin.php
+06cd05fd7478a8836ad519119cd0fbf1  ./skins/Narrow/skin.php
 c26b187a50c966adff7bfb9cab6fca16  ./event/disks_mounted

source/community.applications/usr/local/emhttp/plugins/community.applications/ca_settings.page

@@ -28,19 +28,8 @@ function tr($string,$ret=false) {
     echo $string;
 }
 
-if ( date("n j") == "4 1" || date("n j") == "3 31" || date("n j") == "4 2" ) {
-  touch("/boot/config/plugins/community.applications/larry");
-  exec("rm -rf /tmp/community.applications");
-  $larry = true;
-}
-
-
 ?>
 <script>
-<? if ($larry ?? false):?>
-  addBannerWarning("Faces of Limetech Edition Disabled",false);
-<? endif;?>
-
 $(function() {
   <?if ( is_file($caPaths['logging']) ):?>
     $("#debugging").show();

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

@@ -313,12 +313,6 @@ function DownloadApplicationFeed() {
       $o['Repository']    = $o['PluginURL'];
     }
 
-    // FOR LARRY
-    if ( $o['ForLarry'] ?? false ) {
-      unset($o['Icon-FA']);
-      $o['Icon-black'] = $o['Icon-white'] = $o['Icon-gray'] = $o['Icon-azure'] = $o['ForLarry'];
-    }
-
     $o['Blacklist'] = ($o['CABlacklist']??null) ? true : ($o['Blacklist']??false);
     $o['MinVer'] = max([($o['MinVer']??null),($o['UpdateMinVer']??null)]);
     $tag = explode(":",$o['Repository']);
@@ -1100,17 +1094,6 @@ function force_update() {
   if ( version_compare($caSettings['unRaidVersion'],$GLOBALS['templates'][$appfeedCA]['MinVer'],"<") )
     $script .= "addBannerWarning('".tr("Deprecated OS version.  No further updates to Community Applications will be issued for this OS version")."');";
   
-  if ( date("n j",$appFeedTime['last_updated_timestamp']) == "4 1") {
-    if ( ! is_file("/boot/config/plugins/community.applications/larry") ) {
-      $dynamixSettings = @parse_ini_file($caPaths['dynamixSettings'],true);
-      $currentLanguage = $dynamixSettings['display']['locale'] ?? "en_US";
-      if ( $currentLanguage == "en_US" || $currentLanguage == "" ) {
-        $script .= "addBannerWarning('Faces of Limetech Edition',false,true);addBannerWarning('On installations icons will be what the author specified',false,true);addBannerWarning('Navigate to Settings - Community Applications to disable',false,true);";
-      } else {
-        touch("/boot/config/plugins/community.applications/larry");
-      }
-    }
-  }
   postReturn(['status'=>"ok",'script'=> $script]);
 }
 
@@ -1919,8 +1902,7 @@ function createXML() {
     if ( $template['OriginalDescription'] ?? false )
       $template['Description'] = $template['OriginalDescription'];
    
-    // UNCOMMENT after larry is finished
+    $template['Icon'] = $template["Icon-{$caSettings['dynamixTheme']}"] ?? $template['Icon'];
-    // $template['Icon'] = $template["Icon-{$caSettings['dynamixTheme']}"] ?? $template['Icon'];
     
 // switch from br0 to eth0 if necessary
     if ( isset($template['Networking']['Mode']) || isset($template['Network']) ) {

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

@@ -97,9 +97,7 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
         $template['ModeratorComment'] = $extraDeprecated[$template['Repository']];
       }
     }
-    if ( ! is_file("/boot/config/plugins/community.applications/larry") ) {
+
-      $template['Icon'] = $template["Icon-{$caSettings['dynamixTheme']}"] ?? $template['Icon']; // remove if clause post 4/1
-    }
     if ( $template['RepositoryTemplate'] ) {
       $template['Icon'] = $template['icon'] ?? "/plugins/dynamix.docker.manager/images/question.png";
 
@@ -643,9 +641,7 @@ function getPopupDescriptionSkin($appNumber) {
     $templateIcon = startsWith($template['IconFA'],"icon-") ? "{$template['IconFA']} unraidIcon" : "fa fa-{$template['IconFA']}";
     $template['display_icon'] = "<i class='$templateIcon popupIcon'></i>";
   } else {
-    if ( ! is_file("/boot/config/plugins/community.applications/larry") ) {
     $template['Icon'] = $template["Icon-{$caSettings['dynamixTheme']}"] ?? $template['Icon'];  // remove if clause post 4/1
-    }
     $template['display_icon'] = "<img class='popupIcon screenshot' href='{$template['Icon']}' src='{$template['Icon']}' alt='Application Icon'>";
   }