more cleaning

This commit is contained in:
Squidly271 2022-11-18 17:15:50 -05:00
parent 79941dccc4
commit bc7b5c1746
5 changed files with 72 additions and 72 deletions

View File

@ -2,8 +2,8 @@ ae9874967a4715939f3e97c53676cc33 ./Apps.page
4e55f7483b661af21a25b677179baffe ./CA_notices.page 4e55f7483b661af21a25b677179baffe ./CA_notices.page
4c5d4598e1bafa46bd90c27cbe302122 ./ca_settings.page 4c5d4598e1bafa46bd90c27cbe302122 ./ca_settings.page
e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg
674959fdd7e96eca322ec80ce4caf89e ./include/exec.php 69ab8fcb35d59d712aed59b50932efeb ./include/exec.php
9051e76ffa5f7f8b07b7f0ac13697b30 ./include/helpers.php 46e4705b2a7e379a7930496228cbaac6 ./include/helpers.php
116042a918060278e77379b0dd73482c ./include/paths.php 116042a918060278e77379b0dd73482c ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js 532fffdf939594c143e679da02bd841e ./javascript/libraries.js
71f911a818d88d3d567f8a2898094ee2 ./README.md 71f911a818d88d3d567f8a2898094ee2 ./README.md
@ -22,4 +22,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php
34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php 34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php
25bdaed6f62ac73f9ef7c3ce0c125ef7 ./skins/Narrow/css.php 25bdaed6f62ac73f9ef7c3ce0c125ef7 ./skins/Narrow/css.php
7eb021a105e2f7a15675ec8a14e6f05e ./skins/Narrow/skin.html 7eb021a105e2f7a15675ec8a14e6f05e ./skins/Narrow/skin.html
b54dae1d2e95c018a8896b3fe3baf75e ./skins/Narrow/skin.php 8899126b72149ff7064cab07f790290b ./skins/Narrow/skin.php

View File

@ -10,7 +10,7 @@
# Convert Array("one","two","three") to be Array("one"=>$defaultFlag, "two"=>$defaultFlag, "three"=>$defaultFlag # # Convert Array("one","two","three") to be Array("one"=>$defaultFlag, "two"=>$defaultFlag, "three"=>$defaultFlag #
################################################################################################################## ##################################################################################################################
function arrayEntriesToObject($sourceArray,$defaultFlag=true) { function arrayEntriesToObject($sourceArray,$defaultFlag=true) {
return is_array($sourceArray) ? array_fill_keys($sourceArray,$defaultFlag) : array(); return is_array($sourceArray) ? array_fill_keys($sourceArray,$defaultFlag) : []);
} }
########################################################################### ###########################################################################
# Helper function to determine if a plugin has an update available or not # # Helper function to determine if a plugin has an update available or not #
@ -252,7 +252,7 @@ function fixTemplates($template) {
function makeXML($template) { function makeXML($template) {
# ensure its a v2 template if the Config entries exist # ensure its a v2 template if the Config entries exist
if ( $template['Config'] && ! $template['@attributes'] ) if ( $template['Config'] && ! $template['@attributes'] )
$template['@attributes'] = array("version"=>2); $template['@attributes'] = ["version"=>2];
if ($template['Overview']) $template['Description'] = $template['Overview']; if ($template['Overview']) $template['Description'] = $template['Overview'];
@ -286,7 +286,7 @@ function fixAttributes(&$template,$attribute) {
if ( $template[$attribute] ) { if ( $template[$attribute] ) {
foreach ($template[$attribute] as $tempArray) foreach ($template[$attribute] as $tempArray)
$tempArray2[] = isset($tempArray['value']) ? array('@attributes'=>$tempArray['@attributes'],'@value'=>$tempArray['value']) : array('@attributes'=>$tempArray['@attributes']); $tempArray2[] = isset($tempArray['value']) ? ['@attributes'=>$tempArray['@attributes'],'@value'=>$tempArray['value']] : ['@attributes'=>$tempArray['@attributes']];
$template[$attribute] = $tempArray2; $template[$attribute] = $tempArray2;
} }
} }
@ -337,7 +337,7 @@ function readXmlFile($xmlfile,$generic=false,$stats=true) {
# handle the case where there is only a single <Config> entry # handle the case where there is only a single <Config> entry
if ( $o['Config']['@attributes'] ) if ( $o['Config']['@attributes'] )
$o['Config'] = array('@attributes'=>$o['Config']['@attributes'],'value'=>$o['Config']['value']); $o['Config'] = ['@attributes'=>$o['Config']['@attributes'],'value'=>$o['Config']['value']];
if ( $stats) { if ( $stats) {
if ( $o['Plugin'] ) { if ( $o['Plugin'] ) {
@ -461,7 +461,7 @@ function getAuthor($template) {
# Trims the category lists # # Trims the category lists #
############################ ############################
function categoryList($cat,$popUp = false) { function categoryList($cat,$popUp = false) {
$cat = str_replace(array(":,",": "," "),",",$cat); $cat = str_replace([":,",": "," "],",",$cat);
$cat = rtrim($cat,": "); $cat = rtrim($cat,": ");
$all_cat = explode(",",$cat); $all_cat = explode(",",$cat);
foreach ($all_cat as $trcat) foreach ($all_cat as $trcat)
@ -494,7 +494,7 @@ function languageAuthorList($authors) {
# Gets a rounded off download count # # Gets a rounded off download count #
##################################### #####################################
function getDownloads($downloads,$lowFlag=false) { function getDownloads($downloads,$lowFlag=false) {
$downloadCount = array("10000000000","5000000000","1000000000","500000000","100000000","50000000","25000000","10000000","5000000","2500000","1000000","500000","250000","100000","50000","25000","10000","5000","1000","500","100"); $downloadCount = ["10000000000","5000000000","1000000000","500000000","100000000","50000000","25000000","10000000","5000000","2500000","1000000","500000","250000","100000","50000","25000","10000","5000","1000","500","100"];
foreach ($downloadCount as $downloadtmp) { foreach ($downloadCount as $downloadtmp) {
if ($downloads > $downloadtmp) { if ($downloads > $downloadtmp) {
return sprintf(tr("More than %s"),number_format($downloadtmp)); return sprintf(tr("More than %s"),number_format($downloadtmp));
@ -580,7 +580,7 @@ if ( ! function_exists("tr") ) {
if ( startsWith($translated,"&#34;") && endsWith($translated,"&#34;") ) if ( startsWith($translated,"&#34;") && endsWith($translated,"&#34;") )
$translated = first_str_replace(last_str_replace($translated,"&#34;",""),"&#34;",""); $translated = first_str_replace(last_str_replace($translated,"&#34;",""),"&#34;","");
$translated = str_replace('"',"&#34;",str_replace("'","&#39;",$translated)); $translated = str_replace(['"',"'"],["&#34;","&#39;"],$translated));
return $translated; return $translated;
} }
@ -612,7 +612,7 @@ function languageCheck($template) {
# Writes an ini file # # Writes an ini file #
###################### ######################
function write_ini_file($file,$array) { function write_ini_file($file,$array) {
$res = array(); $res = [];
foreach($array as $key => $val) { foreach($array as $key => $val) {
if(is_array($val)) { if(is_array($val)) {
$res[] = "[$key]"; $res[] = "[$key]";