diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 3d49c23871ef998815603259fb55932ef16351e6..20c847b2b67d18b522d6a065ad3a8025de1d6e3c 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -3145,11 +3145,11 @@ class installer_base {
$out = null;
$ret = null;
if($conf['nginx']['installed'] == true || $conf['apache']['installed'] == true) {
- exec("$acme --issue --log $acme_log -w /usr/local/ispconfig/interface/acme -d " . escapeshellarg($hostname) . " $renew_hook", $out, $ret);
+ exec("$acme --issue --keylength 4096 --log $acme_log -w /usr/local/ispconfig/interface/acme -d " . escapeshellarg($hostname) . " $renew_hook", $out, $ret);
}
// Else, it is not webserver, so we use standalone
else {
- exec("$acme --issue --log $acme_log --standalone -d " . escapeshellarg($hostname) . " $hook", $out, $ret);
+ exec("$acme --issue --keylength 4096 --log $acme_log --standalone -d " . escapeshellarg($hostname) . " $hook", $out, $ret);
}
if($ret == 0 || ($ret == 2 && file_exists($check_acme_file))) {
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..36c9b788a561f06baf35b43a7fe5ba64c64c601b 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -0,0 +1 @@
+ALTER TABLE `server_php` ADD `sortprio` INT(20) NOT NULL DEFAULT '100' AFTER `active`;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index cf340bda0170cb77039941455303d76ee28066ca..c918f5688d32466bf83a2c2b21673028457c1afa 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1460,6 +1460,7 @@ CREATE TABLE `server_php` (
`php_fpm_pool_dir` varchar(255) DEFAULT NULL,
`php_fpm_socket_dir` varchar(255) DEFAULT NULL,
`active` enum('n','y') NOT NULL DEFAULT 'y',
+ `sortprio` int(20) NOT NULL DEFAULT 100,
PRIMARY KEY (`server_php_id`)
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
diff --git a/interface/web/admin/form/server_php.tform.php b/interface/web/admin/form/server_php.tform.php
index 2a37a1e6d1e66ecaebe10c8eeef22e77f1c27902..67f22cbeb43277931f7451d89a135319b13de5c7 100644
--- a/interface/web/admin/form/server_php.tform.php
+++ b/interface/web/admin/form/server_php.tform.php
@@ -248,4 +248,20 @@ $form["tabs"]['php_fpm'] = array(
//#################################
)
);
+$form["tabs"]['php_sort'] = array (
+ 'title' => "PHP Sort Priority",
+ 'width' => 80,
+ 'template' => "templates/server_php_sort_edit.htm",
+ 'fields' => array(
+ 'sortprio' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'default' => '100',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '20'
+ ),
+ )
+);
?>
diff --git a/interface/web/admin/lib/lang/ar_server_php.lng b/interface/web/admin/lib/lang/ar_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/ar_server_php.lng
+++ b/interface/web/admin/lib/lang/ar_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/ar_server_php_list.lng b/interface/web/admin/lib/lang/ar_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/ar_server_php_list.lng
+++ b/interface/web/admin/lib/lang/ar_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/bg_server_php.lng b/interface/web/admin/lib/lang/bg_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/bg_server_php.lng
+++ b/interface/web/admin/lib/lang/bg_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/bg_server_php_list.lng b/interface/web/admin/lib/lang/bg_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/bg_server_php_list.lng
+++ b/interface/web/admin/lib/lang/bg_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/br_server_php.lng b/interface/web/admin/lib/lang/br_server_php.lng
index d0a1015833f82dfd9c183a1928e02dacfd690e8c..791db7e3ec70cde55a0ac003fb7738f64942020e 100644
--- a/interface/web/admin/lib/lang/br_server_php.lng
+++ b/interface/web/admin/lib/lang/br_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Ativo';
$wb['php_in_use_error'] = 'Esta versão PHP está em uso.';
$wb['php_name_in_use_error'] = 'O nome não pode ser modificado.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/ca_server_php.lng b/interface/web/admin/lib/lang/ca_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/ca_server_php.lng
+++ b/interface/web/admin/lib/lang/ca_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/ca_server_php_list.lng b/interface/web/admin/lib/lang/ca_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/ca_server_php_list.lng
+++ b/interface/web/admin/lib/lang/ca_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng
index c1c67f05ef6673858a11f164aa5a2e0f6d483c0c..64909284298ba7f655b2c7a33e68e299a7620b6c 100644
--- a/interface/web/admin/lib/lang/cz_server_php.lng
+++ b/interface/web/admin/lib/lang/cz_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Aktivní';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/de_server_php.lng b/interface/web/admin/lib/lang/de_server_php.lng
index b3ad5d991331f2ed1f932f7e271544e3e00f1ce6..4100957b9d336884d26b935487bc1f8a79c48344 100644
--- a/interface/web/admin/lib/lang/de_server_php.lng
+++ b/interface/web/admin/lib/lang/de_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Aktiv';
$wb['php_in_use_error'] = 'Diese PHP-Version wird noch benutzt.';
$wb['php_name_in_use_error'] = 'Der Name kann nicht geändert werden.';
+$wb['PHP Sort Priority'] = 'Priorität';
+$wb['sortprio_txt'] = 'Sorting Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP Version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/de_server_php_list.lng b/interface/web/admin/lib/lang/de_server_php_list.lng
index f9da54d84c90b58a7b97bb8f9bd6439be9b8f933..6b0a08474664bbfdcb04d95b9189d459c835679a 100644
--- a/interface/web/admin/lib/lang/de_server_php_list.lng
+++ b/interface/web/admin/lib/lang/de_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Kunde';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Aktiv';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/dk_server_php.lng b/interface/web/admin/lib/lang/dk_server_php.lng
index db6ef1f98a2f0f2e7955afb872f06583c2a53922..e9b42a51334a4f9868e6d9eee0099ea398194d9c 100644
--- a/interface/web/admin/lib/lang/dk_server_php.lng
+++ b/interface/web/admin/lib/lang/dk_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/dk_server_php_list.lng b/interface/web/admin/lib/lang/dk_server_php_list.lng
index 65869ce2ed3dd1f042a4d9e5e27427fbdeed1c4a..4be3b3446b8749e98a33582ff244a3eca0daaf69 100644
--- a/interface/web/admin/lib/lang/dk_server_php_list.lng
+++ b/interface/web/admin/lib/lang/dk_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Kunde';
$wb['name_txt'] = 'PHP Navn';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/el_server_php.lng b/interface/web/admin/lib/lang/el_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/el_server_php.lng
+++ b/interface/web/admin/lib/lang/el_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/el_server_php_list.lng b/interface/web/admin/lib/lang/el_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/el_server_php_list.lng
+++ b/interface/web/admin/lib/lang/el_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/en_server_php.lng b/interface/web/admin/lib/lang/en_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/en_server_php.lng
+++ b/interface/web/admin/lib/lang/en_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/en_server_php_list.lng b/interface/web/admin/lib/lang/en_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/en_server_php_list.lng
+++ b/interface/web/admin/lib/lang/en_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/es_server_php.lng b/interface/web/admin/lib/lang/es_server_php.lng
index df2f0778f486de1bbd1b494a37270dc4e7518c2b..e75aa0e4e472095332f3994c901787fd4ae6f120 100644
--- a/interface/web/admin/lib/lang/es_server_php.lng
+++ b/interface/web/admin/lib/lang/es_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/es_server_php_list.lng b/interface/web/admin/lib/lang/es_server_php_list.lng
index 8d62ee891926fd8ee2b32de02b10ae8bc3b6c093..1efd239d31467472a2039cb7a7d01cda059333ed 100644
--- a/interface/web/admin/lib/lang/es_server_php_list.lng
+++ b/interface/web/admin/lib/lang/es_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['name_txt'] = 'Versión de PHP';
$wb['server_id_txt'] = 'Servidor';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/fi_server_php.lng b/interface/web/admin/lib/lang/fi_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/fi_server_php.lng
+++ b/interface/web/admin/lib/lang/fi_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/fi_server_php_list.lng b/interface/web/admin/lib/lang/fi_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/fi_server_php_list.lng
+++ b/interface/web/admin/lib/lang/fi_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/fr_server_php.lng b/interface/web/admin/lib/lang/fr_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/fr_server_php.lng
+++ b/interface/web/admin/lib/lang/fr_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/fr_server_php_list.lng b/interface/web/admin/lib/lang/fr_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/fr_server_php_list.lng
+++ b/interface/web/admin/lib/lang/fr_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/hr_server_php.lng b/interface/web/admin/lib/lang/hr_server_php.lng
index 15ec1b30f533c17414ed1908236ba4ee12561a16..9db79d4f9b727891c49319105f3ba293d3b452d3 100644
--- a/interface/web/admin/lib/lang/hr_server_php.lng
+++ b/interface/web/admin/lib/lang/hr_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/hr_server_php_list.lng b/interface/web/admin/lib/lang/hr_server_php_list.lng
index 1851ac8395305bf7c9aac965656ac56cbe766b12..4e5381c1f36c8504ff2c83544f88a18fb702f5b7 100644
--- a/interface/web/admin/lib/lang/hr_server_php_list.lng
+++ b/interface/web/admin/lib/lang/hr_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Klijent';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/hu_server_php.lng b/interface/web/admin/lib/lang/hu_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/hu_server_php.lng
+++ b/interface/web/admin/lib/lang/hu_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/hu_server_php_list.lng b/interface/web/admin/lib/lang/hu_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/hu_server_php_list.lng
+++ b/interface/web/admin/lib/lang/hu_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/id_server_php.lng b/interface/web/admin/lib/lang/id_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/id_server_php.lng
+++ b/interface/web/admin/lib/lang/id_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/id_server_php_list.lng b/interface/web/admin/lib/lang/id_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/id_server_php_list.lng
+++ b/interface/web/admin/lib/lang/id_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/it_server_php.lng b/interface/web/admin/lib/lang/it_server_php.lng
index 7569ba9b5215c7bbdb3ecfd5eab10c5a2b8e544f..d4feb7cb0c3232c8aec6c8048c5a437dd5abd3e5 100644
--- a/interface/web/admin/lib/lang/it_server_php.lng
+++ b/interface/web/admin/lib/lang/it_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Attivo';
$wb['php_in_use_error'] = 'Questa versione PHP è in uso.';
$wb['php_name_in_use_error'] = 'Il nome non può essere cambiato.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/it_server_php_list.lng b/interface/web/admin/lib/lang/it_server_php_list.lng
index 5ff1ebe31460dad547308f710edbd3e25769195b..ca117bf38ab8c2af483a6df59d02a615331f7645 100644
--- a/interface/web/admin/lib/lang/it_server_php_list.lng
+++ b/interface/web/admin/lib/lang/it_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Cliente';
$wb['name_txt'] = 'Nome PHP';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/ja_server_php.lng b/interface/web/admin/lib/lang/ja_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/ja_server_php.lng
+++ b/interface/web/admin/lib/lang/ja_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/ja_server_php_list.lng b/interface/web/admin/lib/lang/ja_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/ja_server_php_list.lng
+++ b/interface/web/admin/lib/lang/ja_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/nl_server_php.lng b/interface/web/admin/lib/lang/nl_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/nl_server_php.lng
+++ b/interface/web/admin/lib/lang/nl_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/nl_server_php_list.lng b/interface/web/admin/lib/lang/nl_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/nl_server_php_list.lng
+++ b/interface/web/admin/lib/lang/nl_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/pl_server_php.lng b/interface/web/admin/lib/lang/pl_server_php.lng
index de4ce60ac1af074b470fa993c661b8890cd3d4db..d86e2cf01ff0d53b779b690c8f072c6adf927ed4 100644
--- a/interface/web/admin/lib/lang/pl_server_php.lng
+++ b/interface/web/admin/lib/lang/pl_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/pl_server_php_list.lng b/interface/web/admin/lib/lang/pl_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/pl_server_php_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/pt_server_php.lng b/interface/web/admin/lib/lang/pt_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/pt_server_php.lng
+++ b/interface/web/admin/lib/lang/pt_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/pt_server_php_list.lng b/interface/web/admin/lib/lang/pt_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/pt_server_php_list.lng
+++ b/interface/web/admin/lib/lang/pt_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/ro_server_php.lng b/interface/web/admin/lib/lang/ro_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/ro_server_php.lng
+++ b/interface/web/admin/lib/lang/ro_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/ro_server_php_list.lng b/interface/web/admin/lib/lang/ro_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/ro_server_php_list.lng
+++ b/interface/web/admin/lib/lang/ro_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/ru_server_php.lng b/interface/web/admin/lib/lang/ru_server_php.lng
index c5c4942b8e08ebf2cbfdba21300d413857356c1d..ca1a8147a3e1739267f95d5db2577fa8e64a50b4 100644
--- a/interface/web/admin/lib/lang/ru_server_php.lng
+++ b/interface/web/admin/lib/lang/ru_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/ru_server_php_list.lng b/interface/web/admin/lib/lang/ru_server_php_list.lng
index 5be582f23daf324d4ba7e90203d074a73a081641..1a2068057fa35c4e7e49fbe199b0142dde62dbba 100644
--- a/interface/web/admin/lib/lang/ru_server_php_list.lng
+++ b/interface/web/admin/lib/lang/ru_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'ID Клиента';
$wb['name_txt'] = 'Имя PHP';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/se_server_php.lng b/interface/web/admin/lib/lang/se_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/se_server_php.lng
+++ b/interface/web/admin/lib/lang/se_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/se_server_php_list.lng b/interface/web/admin/lib/lang/se_server_php_list.lng
index b2f8b5511219e8538d8e1ad32d24d01c0d656245..86adb0f2a62620545ff9f55a238998ade7abd146 100644
--- a/interface/web/admin/lib/lang/se_server_php_list.lng
+++ b/interface/web/admin/lib/lang/se_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Kund';
$wb['name_txt'] = 'PHP-namn';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/sk_server_php.lng b/interface/web/admin/lib/lang/sk_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/sk_server_php.lng
+++ b/interface/web/admin/lib/lang/sk_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Active';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/sk_server_php_list.lng b/interface/web/admin/lib/lang/sk_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/sk_server_php_list.lng
+++ b/interface/web/admin/lib/lang/sk_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/lib/lang/tr_server_php.lng b/interface/web/admin/lib/lang/tr_server_php.lng
index 71b130e3d25bcf8ef9d8a553932416ed13b197b6..914d28f167314f3fc6b10ec070f44cd4fa4f1a03 100644
--- a/interface/web/admin/lib/lang/tr_server_php.lng
+++ b/interface/web/admin/lib/lang/tr_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
$wb['active_txt'] = 'Etkin';
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
$wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box
Default PHP has prio 0 if enabled
Lower value is higher priority';
?>
diff --git a/interface/web/admin/lib/lang/tr_server_php_list.lng b/interface/web/admin/lib/lang/tr_server_php_list.lng
index 4468e7ead9ba1e7695c6c5125884a91c12624e51..82fb3cc32e69c0931fb572b496b43bb538141d32 100644
--- a/interface/web/admin/lib/lang/tr_server_php_list.lng
+++ b/interface/web/admin/lib/lang/tr_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Müşteri';
$wb['name_txt'] = 'PHP Adı';
$wb['active_txt'] = 'Etkin';
$wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
?>
diff --git a/interface/web/admin/server_php_edit.php b/interface/web/admin/server_php_edit.php
index a9e7b38bbb5b0d10335bffea920a847dd5347b9f..8ad055624dfb6b5c63b8691cbd0e2111679f2669 100644
--- a/interface/web/admin/server_php_edit.php
+++ b/interface/web/admin/server_php_edit.php
@@ -54,7 +54,13 @@ class page_action extends tform_actions {
parent::onSubmit();
}
function onBeforeUpdate() {
- global $app;
+
+ global $app;
+
+ //check if Prio tab got update/save if yes disable datalog update - not needed
+ if(isset($this->dataRecord["sortprio"])) {
+ $app->tform->formDef['db_history'] = 'no';
+ }
//* Check if the server has been changed
// We do this only for the admin or reseller users, as normal clients can not change the server ID anyway
diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm
index a2595a84741a2b729a1f55e12af7e5b1f09ce3f1..5f6fae91dbba86f7ae32581f55b55a6afc98a0be 100644
--- a/interface/web/admin/templates/server_php_list.htm
+++ b/interface/web/admin/templates/server_php_list.htm
@@ -19,6 +19,7 @@