diff --git a/.devilbox/www/include/lib/Helper.php b/.devilbox/www/include/lib/Helper.php index 4c3526be..d1750554 100644 --- a/.devilbox/www/include/lib/Helper.php +++ b/.devilbox/www/include/lib/Helper.php @@ -92,7 +92,7 @@ class Helper $output = array(); // Translate PHP Docker environmental variables to $ENV - exec('env', $output); + exec('/usr/bin/env', $output); foreach ($output as $var) { $tmp = explode('=', $var); diff --git a/.devilbox/www/include/lib/Mail.php b/.devilbox/www/include/lib/Mail.php index bab4634c..8a1353b7 100644 --- a/.devilbox/www/include/lib/Mail.php +++ b/.devilbox/www/include/lib/Mail.php @@ -85,27 +85,33 @@ class Mail } // Optionally sort messages - if (is_array($sort) && (array_values($sort)[0] == 'ASC' || array_values($sort)[0] == 'DESC')) { - $key = array_keys($sort)[0]; - $order = array_values($sort)[0]; + if (is_array($sort)) { + $array_values = array_values($sort); + $array_value = $array_values[0]; + if ($array_value == 'ASC' || $array_value == 'DESC') { + $key = array_keys($sort); + $key = $key[0]; + $order = array_values($sort); + $order = $order[0]; - $sorter = function ($a, $b) use ($key, $order) { - $val1 = $a['decoded']->headers[$key]; - $val2 = $b['decoded']->headers[$key]; + $sorter = function ($a, $b) use ($key, $order) { + $val1 = $a['decoded']->headers[$key]; + $val2 = $b['decoded']->headers[$key]; - // Convert date strings to timestamps for comparison - if (strtotime($val1) !== false && strtotime($val2) !== false) { - $val1 = strtotime($val1); - $val2 = strtotime($val2); - } + // Convert date strings to timestamps for comparison + if (strtotime($val1) !== false && strtotime($val2) !== false) { + $val1 = strtotime($val1); + $val2 = strtotime($val2); + } - if ($order === 'ASC') { - return (strcmp($val1, $val2) > 0); - } else { - return (strcmp($val1, $val2) <= 0); - } - }; - usort($messages, $sorter); + if ($order === 'ASC') { + return (strcmp($val1, $val2) > 0); + } else { + return (strcmp($val1, $val2) <= 0); + } + }; + usort($messages, $sorter); + } } return $messages; diff --git a/.devilbox/www/include/lib/container/Mongo.php b/.devilbox/www/include/lib/container/Mongo.php index d7d9ca92..a78b241d 100644 --- a/.devilbox/www/include/lib/container/Mongo.php +++ b/.devilbox/www/include/lib/container/Mongo.php @@ -115,12 +115,22 @@ class Mongo extends BaseClass implements BaseInterface $databases = array(); $tmp = $this->command(array('listDatabases' => true)); if (isset($tmp[0])) { - foreach ($tmp[0]->databases as $db) { - $databases[] = array( - 'name' => $db->name, - 'size' => $db->sizeOnDisk, - 'empty' => $db->empty - ); + if (is_array($tmp[0])) { + foreach ($tmp[0]['databases'] as $db) { + $databases[] = array( + 'name' => $db->name, + 'size' => $db->sizeOnDisk, + 'empty' => $db->empty + ); + } + } else { + foreach ($tmp[0]->databases as $db) { + $databases[] = array( + 'name' => $db->name, + 'size' => $db->sizeOnDisk, + 'empty' => $db->empty + ); + } } } diff --git a/.devilbox/www/include/lib/container/Mysql.php b/.devilbox/www/include/lib/container/Mysql.php index 677485df..031c8050 100644 --- a/.devilbox/www/include/lib/container/Mysql.php +++ b/.devilbox/www/include/lib/container/Mysql.php @@ -207,7 +207,8 @@ class Mysql extends BaseClass implements BaseInterface $val = $this->select($sql, $callback); if (is_array($val) && $val) { - return array_values($val)[0]; + $array_values = array_values($val); + return $array_values[0]; } else { return $val; }