maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Optimised phpdoc and array value use in foreach (#1026)

Browse Source 
* use array values by already destructed values in foreach
corrected php docs to use string|array

* use values by already desctructered array values in foreach
This commit is contained in:
Dennis Dudek
2022-04-13 10:37:25 +02:00
committed by GitHub
parent 7a13e4a421
commit d90676a793
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Froxlor/Cron/Traffic/TrafficCron.php
View File

@@ -15,7 +15,7 @@ namespace Froxlor\Cron\Traffic;
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Cron
*
*
*/
use Froxlor\Database\Database;
use Froxlor\Settings;
@@ -898,8 +898,8 @@ class TrafficCron extends \Froxlor\Cron\FroxlorCron
foreach ($months as $month => $traffic) {
if (! isset($httptrafficlast[$year][$month])) {
$returnval += $traffic;
} elseif ($httptrafficlast[$year][$month] < $httptraffic[$year][$month]) {
$returnval += ($httptraffic[$year][$month] - $httptrafficlast[$year][$month]);
} elseif ($httptrafficlast[$year][$month] < $traffic) {
$returnval += ($traffic - $httptrafficlast[$year][$month]);
}
}
}

22
lib/Froxlor/PhpHelper.php
View File

@@ -39,7 +39,7 @@ class PhpHelper
* Wrapper around htmlentities to handle arrays, with the advantage that you
* can select which fields should be handled by htmlentities
*
* @param array $subject
* @param array|string $subject
* The subject array
* @param string $fields
* The fields which should be checked for, separated by spaces
@@ -61,7 +61,7 @@ class PhpHelper
foreach ($subject as $field => $value) {
if ((!is_array($fields) || empty($fields)) || (is_array($fields) && !empty($fields) && in_array($field, $fields))) {
// Just call ourselve to manage multi-dimensional arrays
$subject[$field] = self::htmlentitiesArray($subject[$field], $fields, $quote_style, $charset);
$subject[$field] = self::htmlentitiesArray($value, $fields, $quote_style, $charset);
}
}
} else {
@@ -75,15 +75,15 @@ class PhpHelper
* Replaces Strings in an array, with the advantage that you
* can select which fields should be str_replace'd
*
* @param
* mixed String or array of strings to search for
* @param
* mixed String or array to replace with
* @param
* array The subject array
* @param
* @param string|array $search
* String or array of strings to search for
* @param string|array $reaplce
* String or array to replace with
* @param string|array $subject
* String or array The subject array
* @param string $fields
* string The fields which should be checked for, separated by spaces
* @return array The str_replace'd array
* @return string|array The str_replace'd array
* @author Florian Lippert <flo@syscp.org>
*/
public static function strReplaceArray($search, $replace, $subject, $fields = '')
@@ -92,7 +92,7 @@ class PhpHelper
$fields = self::arrayTrim(explode(' ', $fields));
foreach ($subject as $field => $value) {
if ((!is_array($fields) || empty($fields)) || (is_array($fields) && !empty($fields) && in_array($field, $fields))) {
$subject[$field] = str_replace($search, $replace, $subject[$field]);
$subject[$field] = str_replace($search, $replace, $value);
}
}
} else {