diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php index f51031e0..14dca8e0 100644 --- a/lib/Froxlor/Froxlor.php +++ b/lib/Froxlor/Froxlor.php @@ -297,26 +297,24 @@ final class Froxlor private static function parseVersionArray(&$arr = null) { - // -svn or -dev or -rc ? + // -dev or -beta or -rc ? if (stripos($arr[count($arr) - 1], '-') !== false) { $x = explode("-", $arr[count($arr) - 1]); $arr[count($arr) - 1] = $x[0]; if (stripos($x[1], 'rc') !== false) { $arr[] = '-1'; - $arr[] = '2'; // rc > dev > svn + $arr[] = '2'; // dev < beta < rc // number of rc $arr[] = substr($x[1], 2); - } elseif (stripos($x[1], 'dev') !== false) { + } else if (stripos($x[1], 'beta') !== false) { $arr[] = '-1'; - $arr[] = '1'; // svn < dev < rc - // number of dev + $arr[] = '1'; // dev < beta < rc + // number of beta $arr[] = substr($x[1], 3); - } elseif (stripos($x[1], 'svn') !== false) { - // -svn version are deprecated + } else if (stripos($x[1], 'dev') !== false) { $arr[] = '-1'; - // svn < dev < rc - $arr[] = '0'; - // number of svn + $arr[] = '0'; // dev < beta < rc + // number of dev $arr[] = substr($x[1], 3); } } diff --git a/lib/formfields/admin/customer/formfield.customer_edit.php b/lib/formfields/admin/customer/formfield.customer_edit.php index 172099c3..ce51f7f6 100644 --- a/lib/formfields/admin/customer/formfield.customer_edit.php +++ b/lib/formfields/admin/customer/formfield.customer_edit.php @@ -51,7 +51,7 @@ return [ 'label' => lng('admin.stdsubdomain_add') . '?', 'type' => 'checkbox', 'value' => '1', - 'checked' => ($result['standardsubdomain'] != '0') ? '1' : '0' + 'checked' => $result['standardsubdomain'] ], 'deactivated' => [ 'label' => lng('admin.deactivated_user'), @@ -266,7 +266,7 @@ return [ 'mysqls' => [ 'label' => lng('customer.mysqls'), 'type' => 'textul', - 'value' => empty($result['mysql']) ? '0' : $result['mysqls'], + 'value' => empty($result['mysqls']) ? '0' : $result['mysqls'], 'maxlength' => 9, 'mandatory' => true ],