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

fix preselected values in customer-edit form; adjust version checking to include '-beta' and drop long unused '-svn'

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-08-25 21:42:53 +02:00
parent 5525b927c1
commit e5620b22e0
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Froxlor/Froxlor.php
View File

@@ -297,26 +297,24 @@ final class Froxlor
private static function parseVersionArray(&$arr = null) private static function parseVersionArray(&$arr = null)
{ {
// -svn or -dev or -rc ? // -dev or -beta or -rc ?
if (stripos($arr[count($arr) - 1], '-') !== false) { if (stripos($arr[count($arr) - 1], '-') !== false) {
$x = explode("-", $arr[count($arr) - 1]); $x = explode("-", $arr[count($arr) - 1]);
$arr[count($arr) - 1] = $x[0]; $arr[count($arr) - 1] = $x[0];
if (stripos($x[1], 'rc') !== false) { if (stripos($x[1], 'rc') !== false) {
$arr[] = '-1'; $arr[] = '-1';
$arr[] = '2'; // rc > dev > svn $arr[] = '2'; // dev < beta < rc
// number of rc // number of rc
$arr[] = substr($x[1], 2); $arr[] = substr($x[1], 2);
} elseif (stripos($x[1], 'dev') !== false) { } else if (stripos($x[1], 'beta') !== false) {
$arr[] = '-1'; $arr[] = '-1';
$arr[] = '1'; // svn < dev < rc $arr[] = '1'; // dev < beta < rc
// number of dev // number of beta
$arr[] = substr($x[1], 3); $arr[] = substr($x[1], 3);
} elseif (stripos($x[1], 'svn') !== false) { } else if (stripos($x[1], 'dev') !== false) {
// -svn version are deprecated
$arr[] = '-1'; $arr[] = '-1';
// svn < dev < rc $arr[] = '0'; // dev < beta < rc
$arr[] = '0'; // number of dev
// number of svn
$arr[] = substr($x[1], 3); $arr[] = substr($x[1], 3);
} }
} }

4
lib/formfields/admin/customer/formfield.customer_edit.php
View File

@@ -51,7 +51,7 @@ return [
'label' => lng('admin.stdsubdomain_add') . '?', 'label' => lng('admin.stdsubdomain_add') . '?',
'type' => 'checkbox', 'type' => 'checkbox',
'value' => '1', 'value' => '1',
'checked' => ($result['standardsubdomain'] != '0') ? '1' : '0' 'checked' => $result['standardsubdomain']
], ],
'deactivated' => [ 'deactivated' => [
'label' => lng('admin.deactivated_user'), 'label' => lng('admin.deactivated_user'),
@@ -266,7 +266,7 @@ return [
'mysqls' => [ 'mysqls' => [
'label' => lng('customer.mysqls'), 'label' => lng('customer.mysqls'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['mysql']) ? '0' : $result['mysqls'], 'value' => empty($result['mysqls']) ? '0' : $result['mysqls'],
'maxlength' => 9, 'maxlength' => 9,
'mandatory' => true 'mandatory' => true
], ],