Skip to content

Commit d2e901a

Browse files
committed
6497 sorting for php versions
1 parent 16b9620 commit d2e901a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+155
-16
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11

22
ALTER TABLE `mail_user` CHANGE `quota` `quota` BIGINT(20) NOT NULL DEFAULT '0';
3+
ALTER TABLE `server_php` ADD `sortprio` INT(20) NOT NULL DEFAULT '100' AFTER `active`;

install/sql/ispconfig3.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,6 +1460,7 @@ CREATE TABLE `server_php` (
14601460
`php_fpm_pool_dir` varchar(255) DEFAULT NULL,
14611461
`php_fpm_socket_dir` varchar(255) DEFAULT NULL,
14621462
`active` enum('n','y') NOT NULL DEFAULT 'y',
1463+
`sortprio` int(20) NOT NULL DEFAULT 100,
14631464
PRIMARY KEY (`server_php_id`)
14641465
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
14651466

interface/web/admin/form/server_php.tform.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,4 +248,20 @@
248248
//#################################
249249
)
250250
);
251+
$form["tabs"]['php_sort'] = array (
252+
'title' => "PHP Sort Priority",
253+
'width' => 80,
254+
'template' => "templates/server_php_sort_edit.htm",
255+
'fields' => array(
256+
'sortprio' => array (
257+
'datatype' => 'INTEGER',
258+
'formtype' => 'TEXT',
259+
'default' => '100',
260+
'value' => '',
261+
'separator' => '',
262+
'width' => '10',
263+
'maxlength' => '20'
264+
),
265+
)
266+
);
251267
?>

interface/web/admin/lib/lang/ar_server_php.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
1717
$wb['active_txt'] = 'Active';
1818
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
1919
$wb['php_name_in_use_error'] = 'The name can not be changed.';
20+
$wb['PHP Sort Priority'] = 'Priority';
21+
$wb['sortprio_txt'] = 'Priority';
22+
$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
2023
?>

interface/web/admin/lib/lang/ar_server_php_list.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
66
$wb['name_txt'] = 'PHP Name';
77
$wb['active_txt'] = 'Active';
88
$wb['usage_txt'] = 'Usage count';
9+
$wb['sortprio_txt'] = 'Priority';
910
?>

interface/web/admin/lib/lang/bg_server_php.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
1717
$wb['active_txt'] = 'Active';
1818
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
1919
$wb['php_name_in_use_error'] = 'The name can not be changed.';
20+
$wb['PHP Sort Priority'] = 'Priority';
21+
$wb['sortprio_txt'] = 'Priority';
22+
$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
2023
?>

interface/web/admin/lib/lang/bg_server_php_list.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
66
$wb['name_txt'] = 'PHP Name';
77
$wb['active_txt'] = 'Active';
88
$wb['usage_txt'] = 'Usage count';
9+
$wb['sortprio_txt'] = 'Priority';
910
?>

interface/web/admin/lib/lang/br_server_php.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
1717
$wb['active_txt'] = 'Ativo';
1818
$wb['php_in_use_error'] = 'Esta versão PHP está em uso.';
1919
$wb['php_name_in_use_error'] = 'O nome não pode ser modificado.';
20+
$wb['PHP Sort Priority'] = 'Priority';
21+
$wb['sortprio_txt'] = 'Priority';
22+
$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
2023
?>

interface/web/admin/lib/lang/ca_server_php.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
1717
$wb['active_txt'] = 'Active';
1818
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
1919
$wb['php_name_in_use_error'] = 'The name can not be changed.';
20+
$wb['PHP Sort Priority'] = 'Priority';
21+
$wb['sortprio_txt'] = 'Priority';
22+
$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
2023
?>

interface/web/admin/lib/lang/ca_server_php_list.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
66
$wb['name_txt'] = 'PHP Name';
77
$wb['active_txt'] = 'Active';
88
$wb['usage_txt'] = 'Usage count';
9+
$wb['sortprio_txt'] = 'Priority';
910
?>

0 commit comments

Comments
 (0)