From 69adee8ca770a60592618eedda525e25c6b2f08f Mon Sep 17 00:00:00 2001
From: Thom <thom@amsterdamtech.nl>
Date: Mon, 6 Feb 2023 19:23:47 +0100
Subject: [PATCH 1/2] Don't request ECC (new acme.sh default) certificate
 (#6458)

---
 install/lib/installer_base.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 3d49c23871..20c847b2b6 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))) {
-- 
GitLab


From 6238bd171b0e62e191a71cf149daf90d2fff68b2 Mon Sep 17 00:00:00 2001
From: Johannes <hannes@cheat.at>
Date: Sun, 23 Apr 2023 14:08:33 +0000
Subject: [PATCH 2/2] Add Sort for additional PHP Versions so that clients
 don't use outdatet Version because it is the default.

---
 install/sql/incremental/upd_0098.sql          |  1 +
 interface/web/admin/form/server_php.tform.php |  9 ++++++
 .../web/admin/lib/lang/ar_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/bg_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/ca_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/de_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/dk_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/el_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/en_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/es_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/fi_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/fr_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/hr_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/hu_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/id_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/it_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/ja_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/nl_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/pl_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/pt_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/ro_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/ru_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/se_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/sk_server_php_list.lng |  2 ++
 .../web/admin/lib/lang/tr_server_php_list.lng |  2 ++
 interface/web/admin/server_php_sort.php       | 28 +++++++++++++++++++
 .../web/admin/templates/server_php_list.htm   | 12 +++++---
 interface/web/sites/ajax_get_json.php         | 26 +++++++++--------
 .../sites/templates/web_vhost_domain_edit.htm |  4 ++-
 29 files changed, 109 insertions(+), 17 deletions(-)
 create mode 100644 install/sql/incremental/upd_0098.sql
 create mode 100644 interface/web/admin/server_php_sort.php

diff --git a/install/sql/incremental/upd_0098.sql b/install/sql/incremental/upd_0098.sql
new file mode 100644
index 0000000000..36c9b788a5
--- /dev/null
+++ b/install/sql/incremental/upd_0098.sql
@@ -0,0 +1 @@
+ALTER TABLE `server_php` ADD `sortprio` INT(20) NOT NULL DEFAULT '100' AFTER `active`;
diff --git a/interface/web/admin/form/server_php.tform.php b/interface/web/admin/form/server_php.tform.php
index 2a37a1e6d1..ac3061406b 100644
--- a/interface/web/admin/form/server_php.tform.php
+++ b/interface/web/admin/form/server_php.tform.php
@@ -130,6 +130,15 @@ $form["tabs"]['php_name'] = array (
 			'default' => 'y',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
+            	'sortprio' => array (
+			'datatype' => 'INTEGER',
+			'formtype' => 'TEXT',
+			'default' => '100',
+			'value'  => '',
+			'separator' => '',
+			'width'  => '10',
+			'maxlength' => '20'
+		),
 
 		//#################################
 		// ENDE Datenbankfelder
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 f9da54d84c..b044d18d92 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,6 @@ $wb['client_id_txt'] = 'Kunde';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Aktiv';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 65869ce2ed..2816009480 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,6 @@ $wb['client_id_txt'] = 'Kunde';
 $wb['name_txt'] = 'PHP Navn';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 8d62ee8919..423856e3ca 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,6 @@ $wb['name_txt'] = 'Versión de PHP';
 $wb['server_id_txt'] = 'Servidor';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 1851ac8395..ff8f035f87 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,6 @@ $wb['client_id_txt'] = 'Klijent';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 5ff1ebe314..2a61852644 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,6 @@ $wb['client_id_txt'] = 'Cliente';
 $wb['name_txt'] = 'Nome PHP';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 5be582f23d..b6b230e915 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,6 @@ $wb['client_id_txt'] = 'ID Клиента';
 $wb['name_txt'] = 'Имя PHP';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 b2f8b55112..ad1ed98efe 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,6 @@ $wb['client_id_txt'] = 'Kund';
 $wb['name_txt'] = 'PHP-namn';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 291302cbb7..508d5b36ab 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,6 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
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 4468e7ead9..6333f9eca4 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,6 @@ $wb['client_id_txt'] = 'Müşteri';
 $wb['name_txt'] = 'PHP Adı';
 $wb['active_txt'] = 'Etkin';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Prio';
+$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';
 ?>
diff --git a/interface/web/admin/server_php_sort.php b/interface/web/admin/server_php_sort.php
new file mode 100644
index 0000000000..d1b911cc0d
--- /dev/null
+++ b/interface/web/admin/server_php_sort.php
@@ -0,0 +1,28 @@
+<?php
+
+
+
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
+
+
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
+
+if($_GET['do'] == 'sort')
+{
+    if($_SESSION['s']['user']['typ'] != 'admin')
+    {
+        die('For admin use only.');
+    }
+
+    if (is_int($_GET['id'] == true && is_int($_GET['sortval'] == true)))
+    {
+        die('Not Numeric.');
+    }
+    
+    $app->db->query("UPDATE server_php SET sortprio = ? WHERE server_php_id = ?", $_GET['sortval'], $_GET['id']);
+    @header('Location:server_php_list.php');
+} else {
+    die('No Action');
+}
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm
index a2595a8474..0651058b5f 100644
--- a/interface/web/admin/templates/server_php_list.htm
+++ b/interface/web/admin/templates/server_php_list.htm
@@ -15,11 +15,12 @@
 <table class="table">
                 <thead class="dark form-group-sm">
                     <tr>
-						<th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
+			<th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
                         <th data-column="server_id"><tmpl_var name="server_id_txt"></th>
                         <th class="small-col" data-column="client_id"><tmpl_var name="client_id_txt"></th>
                         <th data-column="name"><tmpl_var name="name_txt"></th>
-                        <th data-column="usage"><tmpl_var name="usage_txt"></th>
+                        <th class="tiny-col" data-column="sortprio"><tmpl_var name="sortprio_txt"></th>
+                        <th class="text-center" data-column="usage"><tmpl_var name="usage_txt"></th>
                         <th class="text-right">{tmpl_var name='search_limit'}</th>
                     </tr>
                     <tr>
@@ -27,7 +28,7 @@
                         <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td><select class="form-control" name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
                         <td><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
-                        <td></td>
+                        <td></td><td></td>
                         <td class="text-right">
                             <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="admin/server_php_list.php"><span class="icon icon-filter"></span></button>
                         </td>
@@ -40,7 +41,10 @@
                             <td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
                             <td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="client_id"}</a></td>
                             <td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
-                            <td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="usage"}</a></td>
+                            <td><input type="number" id="typeNumber" class="form-control input-sm" data-html="true" data-toggle="tooltip" data-placement="top"  title="{tmpl_var name='sortprio_long_txt'}" value="{tmpl_var name="sortprio"}" 
+                                            onchange="ISPConfig.loadContent('/admin/server_php_sort.php?do=sort&sortval='+this.value+'&id={tmpl_var name='id'}')"/></td>
+                            <td class="text-center"><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="usage"}</a></td>
+
                             <td class="text-right">
                                 <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('admin/server_php_del.php?id={tmpl_var name='id'}&_csrf_id={tmpl_var name='csrf_id'}&_csrf_key={tmpl_var name='csrf_key'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
                             </td>
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index 936a584f20..f1d8433c8a 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -64,7 +64,7 @@ if($type == 'getserverid'){
 }
 
 if($type == 'getserverphp'){
-	$json = '{';
+	$json = '{"phpversion":['; //Wrap Objects into Array because chrome reorder objects itself
 
 	$server_type = 'apache';
 	$web_config = $app->getconf->get_server_config($server_id, 'web');
@@ -74,10 +74,10 @@ if($type == 'getserverphp'){
 
 	//* Client: If the logged in user is not admin and has no sub clients (no reseller)
 	if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
-		$sql_where = " AND (client_id = 0 OR client_id = ".$app->functions->intval($_SESSION["s"]["user"]["client_id"]) . ")";
+		$sql_where = " AND (client_id = 0 OR client_id = ".$app->functions->intval($_SESSION["s"]["user"]["client_id"]) . ") ORDER BY sortprio";
 		//* Reseller: If the logged in user is not admin and has sub clients (is a reseller)
 	} elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
-		$client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ?", $client_group_id);
+		$client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ? ORDER BY sortprio", $client_group_id);
 		//$sql_where = " AND (client_id = 0 OR client_id = ".$_SESSION["s"]["user"]["client_id"];
 		$sql_where = " AND (client_id = 0";
 		if($app->functions->intval($client['client_id']) > 0) $sql_where .= " OR client_id = ".$app->functions->intval($client['client_id']);
@@ -89,7 +89,7 @@ if($type == 'getserverphp'){
 		//$sql_where = " AND (client_id = 0 OR client_id = ".$_SESSION["s"]["user"]["client_id"];
 		$sql_where = " AND (client_id = 0";
 		if($app->functions->intval($client['client_id']) > 0) $sql_where .= " OR client_id = ".$app->functions->intval($client['client_id']);
-		$sql_where .= ")";
+		$sql_where .= ") ORDER BY sortprio";
 	}
 
 	$php_records = array();
@@ -98,10 +98,11 @@ if($type == 'getserverphp'){
 	} elseif($php_type == 'fast-cgi'){
 		$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND active = 'y'".$sql_where, $server_id);
 	}
+        $usePHPDefault=false;
+        $usePHPDefaultDone=false;
 	if (empty($web_config['php_default_hide']) || 'n' === $web_config['php_default_hide']) {
-		$php_records[]=array('name' => $app->functions->htmlentities($web_config['php_default_name']));
+                $usePHPDefault=true;
 	}
-	uasort($php_records, 'sort_php');
 	$php_select = "";
 	if(is_array($php_records) && !empty($php_records)) {
 		foreach( $php_records as $php_record) {
@@ -110,16 +111,17 @@ if($type == 'getserverphp'){
 			} else {
 				$php_version = $php_record['server_php_id'];
 			}
-			if($php_record['name'] != $web_config['php_default_name']) {
-				$json .= '"'.$php_version.'": "'.$php_record['name'].'",';
-			} else {
-				$json .= '"0": "'.$php_record['name'].'",';
-			}
+                        if ($php_record['sortprio'] > 0 && $usePHPDefault && $usePHPDefaultDone == false)  //if DefaultPHP is enable insert it on virtual position 0
+                        {
+                            $json .= '{"0": "'.$web_config['php_default_name'].'"},';
+                            $usePHPDefaultDone = true;
+                        }
+			$json .= '{"'.$php_version.'": "'.$php_record['name'].'"},';
 		}
 	}
 	unset($php_records);
 	if(substr($json, -1) == ',') $json = substr($json, 0, -1);
-	$json .= '}';
+	$json .= ']}';
 }
 
 if($type == 'getphptype'){
diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
index c4421aac74..356e03e2dc 100644
--- a/interface/web/sites/templates/web_vhost_domain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -456,7 +456,9 @@
             //var options = '<option value="">Default</option>';
 			var options = '';
             var serverphpidselected = '';
-            $.each(data, function(key, val) {
+            $.each(data.phpversion, function(akey,aval) {
+                key=Object.getOwnPropertyNames(aval)[0];
+                val=aval[key];
 				<tmpl_if name="id">
                 if($('#server_php_id').val() == key){
                     serverphpidselected = ' selected="selected"';
-- 
GitLab