kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-14 17:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Squashed commit

Browse Source 
Always execute migration 9999 (can be used to fix things manually)
Optimized meal plan navigation / date range filtering
Prepared next release
Pulled translations from Transifex
Various code optimizations
This commit is contained in:
Bernd Bestel
2021-07-16 17:32:08 +02:00
parent 2d1d5d46f6
commit edfa404ed6
58 changed files with 312 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
helpers/extensions.php
View File

@@ -4,8 +4,7 @@ function FindObjectInArrayByPropertyValue($array, $propertyName, $propertyValue)
{
foreach ($array as $object)
{
if ($object->{$propertyName}
== $propertyValue)
if ($object->{$propertyName} == $propertyValue)
{
return $object;
}
@@ -17,37 +16,28 @@ function FindObjectInArrayByPropertyValue($array, $propertyName, $propertyValue)
function FindAllObjectsInArrayByPropertyValue($array, $propertyName, $propertyValue, $operator = '==')
{
$returnArray = [];
foreach ($array as $object)
{
switch ($operator)
{
case '==':
if ($object->{$propertyName}
== $propertyValue)
if ($object->{$propertyName} == $propertyValue)
{
$returnArray[] = $object;
}
break;
case '>':
if ($object->{$propertyName}
> $propertyValue)
if ($object->{$propertyName} > $propertyValue)
{
$returnArray[] = $object;
}
break;
case '<':
if ($object->{$propertyName}
< $propertyValue)
if ($object->{$propertyName} < $propertyValue)
{
$returnArray[] = $object;
}
break;
}
}
@@ -58,7 +48,6 @@ function FindAllObjectsInArrayByPropertyValue($array, $propertyName, $propertyVa
function FindAllItemsInArrayByValue($array, $value, $operator = '==')
{
$returnArray = [];
foreach ($array as $item)
{
switch ($operator)
@@ -69,7 +58,6 @@ function FindAllItemsInArrayByValue($array, $value, $operator = '==')
{
$returnArray[] = $item;
}
break;
case '>':
@@ -77,7 +65,6 @@ function FindAllItemsInArrayByValue($array, $value, $operator = '==')
{
$returnArray[] = $item;
}
break;
case '<':
@@ -85,7 +72,6 @@ function FindAllItemsInArrayByValue($array, $value, $operator = '==')
{
$returnArray[] = $item;
}
break;
}
}
@@ -96,7 +82,6 @@ function FindAllItemsInArrayByValue($array, $value, $operator = '==')
function SumArrayValue($array, $propertyName)
{
$sum = 0;
foreach ($array as $object)
{
$sum += floatval($object->{$propertyName});
@@ -124,7 +109,6 @@ function GetClassConstants($className, $prefix = null)
function RandomString($length, $allowedChars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
{
$randomString = '';
for ($i = 0; $i < $length; $i++)
{
$randomString .= $allowedChars[rand(0, strlen($allowedChars) - 1)];
@@ -190,7 +174,8 @@ function Setting(string $name, $value)
define('GROCY_' . $name, ExternalSettingValue(file_get_contents($settingOverrideFile)));
}
elseif (getenv('GROCY_' . $name) !== false)
{ // An environment variable with the same name and prefix GROCY_ overwrites the given setting
{
// An environment variable with the same name and prefix GROCY_ overwrites the given setting
define('GROCY_' . $name, ExternalSettingValue(getenv('GROCY_' . $name)));
}
else