PHP Fixes

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

@@ -89,6 +89,10 @@ 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 @@
-32e3eec1a1d17de3e361199390a4ef2d  ./Apps.page
+a8912282397fd6ae3351f631ddc2b678  ./Apps.page
 2defe45163697e40c813a57ae9a50231  ./CA_notices.page
-a3cb6f32cb9453c058563b6860f70a31  ./ca_settings.page
+bce84c6e359376b627561214a730a504  ./ca_settings.page
 01ed7990078dee7cecfeda9a4e49377e  ./default.cfg
-452a4db77a1e47a2bdf51e65ebe3e01d  ./include/exec.php
+e95788d5122a6ba8e2306d0f640a57ec  ./include/exec.php
 1d21e20284741127836e4acdafff3cb1  ./include/helpers.php
 590fb8b29aba360a56dd8338b022f9e0  ./include/paths.php
 7234caf6800479df03abb222aaedaca5  ./javascript/libraries.js
@@ -20,7 +20,7 @@ b5e2ca7fef2c4aa0b0d6910187b863f9  ./scripts/notices.php
 bfe94da567d20dbb63fbd162c3025ff3  ./scripts/showStatistics.php
 4425f8fd4ef662a7dc65cee01de3e419  ./scripts/updatePLG.sh
 7592f203dca78dce476051b85f7ca133  ./scripts/updatePluginSupport.php
-35f936729fc2e906254b09de74f4ed2c  ./skins/Narrow/css.php
+1c2654912b281192aab131be1e782ff5  ./skins/Narrow/css.php
 f7d48fdb63e116ecc3ec49cbbf6b2dc2  ./skins/Narrow/skin.html
-299ff544ce43fba2fb974ca2c31b58e1  ./skins/Narrow/skin.php
+dcd39b95f1b624d116ca9fc352c4d2b3  ./skins/Narrow/skin.php
 c26b187a50c966adff7bfb9cab6fca16  ./event/disks_mounted

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

@@ -27,8 +27,20 @@ function tr($string,$ret=false) {
   else
     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,6 +313,12 @@ 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']);
@@ -334,7 +340,7 @@ function DownloadApplicationFeed() {
 
     $o['Category'] = str_replace("Status:Beta","",$o['Category']);    # undo changes LT made to my xml schema for no good reason
     $o['Category'] = str_replace("Status:Stable","",$o['Category']);
-    $myTemplates[$i] = $o;
+    //$myTemplates[$i] = $o;
 
     if ( ! ($o['Official']??null) ) {
       if ( ! ($o['DonateText']??null) && ($ApplicationFeed['repositories'][$o['RepoName']]['DonateText'] ?? false) )
@@ -387,8 +393,6 @@ function DownloadApplicationFeed() {
       }
     }
     unset($o['Branch']);
-    $myTemplates[$o['ID']] = $o;
-    $i = ++$i;
     if ( $o['OriginalOverview']??null ) {
       $o['Overview'] = $o['OriginalOverview'];
       unset($o['OriginalOverview']);
@@ -398,6 +402,9 @@ function DownloadApplicationFeed() {
       $o['Description'] = $o['OriginalDescription'];
       unset($o['OriginalDescription']);
     }
+    $myTemplates[$o['ID']] = $o;
+    $i = ++$i;
+
   }
 
   if ( $invalidXML )
@@ -1095,7 +1102,15 @@ function force_update() {
     $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") {
-    $script .= "addBannerWarning('Faces of Limetech Edition',false);addBannerWarning('On installations, icons will be what the author specified',false);";
+    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);addBannerWarning('On installations, icons will be what the author specified',false);addBannerWarning('Navigate to Settings - Community Applications to disable',false);";
+      } else {
+        touch("/boot/config/plugins/community.applications/larry");
+      }
+    }
   }
   postReturn(['status'=>"ok",'script'=> $script]);
 }
@@ -1904,7 +1919,9 @@ function createXML() {
       $template['Overview'] = $template['OriginalOverview'];
     if ( $template['OriginalDescription'] ?? false )
       $template['Description'] = $template['OriginalDescription'];
-    $template['Icon'] = $template["Icon-{$caSettings['dynamixTheme']}"] ?? $template['Icon'];
+   
+    // UNCOMMENT after larry is finished
+    // $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/css.php

@@ -64,7 +64,7 @@ switch ($theme) {
     $templateHoverBackground = "#edeaef";
     $templateFavourite = "#e0e0e0";
     $hrColor = "#606e7f";
-    $border = "#9794a7";
+    $borderColor = "#9794a7";
     $watermarkColor = "rgba(96, 110, 127, 0.1)";
     $aColor = "#486dba";
     $sidebarBackground = "#edeaef";
@@ -82,7 +82,7 @@ switch ($theme) {
     $templateHoverBackground = "#0c0f0b";
     $templateFavourite = "#2b2b2b";
     $hrColor = "#606e7f";
-    $border = "#606e7f";
+    $borderColor = "#606e7f";
     $watermarkColor = "rgba(96, 110, 127, 0.1)";
     $aColor = "#00b8d6";
     $sidebarBackground = "#121510";

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

@@ -97,8 +97,9 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
         $template['ModeratorComment'] = $extraDeprecated[$template['Repository']];
       }
     }
-    $template['Icon'] = $template["Icon-{$caSettings['dynamixTheme']}"] ?? $template['Icon'];
-
+    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";
 
@@ -513,7 +514,7 @@ function getPopupDescriptionSkin($appNumber) {
   else
     $displayed = readJsonFile($caPaths['community-templates-displayed']);
 
-  $index = searchArray($displayed['community'],"InstallPath",$appNumber);
+  $index = searchArray($displayed['community']??[],"InstallPath",$appNumber);
   if ( $index === false ) {
     $ind = $index;
     while ( true ) {
@@ -526,7 +527,7 @@ function getPopupDescriptionSkin($appNumber) {
           }
         }
       }
-      $ind = searchArray($displayed['community'],"Path",$appNumber,$ind+1);
+      $ind = searchArray($displayed['community']??[],"Path",$appNumber,$ind+1);
       if ( $ind === false ) {
         unset($template);
         break;
@@ -642,7 +643,9 @@ function getPopupDescriptionSkin($appNumber) {
     $templateIcon = startsWith($template['IconFA'],"icon-") ? "{$template['IconFA']} unraidIcon" : "fa fa-{$template['IconFA']}";
     $template['display_icon'] = "<i class='$templateIcon popupIcon'></i>";
   } else {
-    $template['Icon'] = $template["Icon-{$caSettings['dynamixTheme']}"] ?? $template['Icon'];
+    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'>";
   }
   
@@ -1615,7 +1618,7 @@ function displayPopup($template) {
     $card .= "<tr><td calss='popupTableLeft'>".tr("Current Version")."</td><td class='popupTableRight'>$pluginVersion</td></tr>";
   }
 
-  if ( $Plugin || ! $Compatible) {
+  if ( $Plugin || ! ($Compatible??null)) {
     if ( $MinVer )
       $card .= "<tr><td class='popupTableLeft'>".tr("Min OS")."</td><td class='popupTableRight'>$MinVer</td></tr>";
     if ( $MaxVer )