diff --git a/core/servers/app_config.php b/core/servers/app_config.php index bf7a2bd6cb..7f7ebbbd8a 100644 --- a/core/servers/app_config.php +++ b/core/servers/app_config.php @@ -15,7 +15,7 @@ $apps[$x]['menu'][0]['uuid'] = 'f35ee905-1f30-7529-7420-35fc77e47882'; $apps[$x]['menu'][0]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f'; $apps[$x]['menu'][0]['category'] = 'internal'; - $apps[$x]['menu'][0]['path'] = '/core/servers/v_servers.php'; + $apps[$x]['menu'][0]['path'] = '/core/servers/servers.php'; $apps[$x]['menu'][0]['groups'][] = 'superadmin'; //permission details diff --git a/core/servers/server_settings.php b/core/servers/server_settings.php index d78f4db2f8..ab6402f99f 100644 --- a/core/servers/server_settings.php +++ b/core/servers/server_settings.php @@ -60,10 +60,9 @@ require_once "includes/paging.php"; echo "\n"; //prepare to page the results - $sql = ""; - $sql .= " select count(*) as num_rows from v_server_settings "; - $sql .= " where domain_uuid = '$domain_uuid' "; - $sql .= " and server_uuid = '$server_uuid' "; + $sql = "select count(*) as num_rows from v_server_settings "; + $sql .= "where domain_uuid = '$domain_uuid' "; + $sql .= "and server_uuid = '$server_uuid' "; if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } $prep_statement = $db->prepare($sql); if ($prep_statement) { @@ -86,10 +85,9 @@ require_once "includes/paging.php"; $offset = $rows_per_page * $page; //get the server list - $sql = ""; - $sql .= " select * from v_server_settings "; - $sql .= " where domain_uuid = '$domain_uuid' "; - $sql .= " and server_uuid = '$server_uuid' "; + $sql = "select * from v_server_settings "; + $sql .= "where domain_uuid = '$domain_uuid' "; + $sql .= "and server_uuid = '$server_uuid' "; if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } $sql .= " limit $rows_per_page offset $offset "; $prep_statement = $db->prepare(check_sql($sql)); @@ -110,7 +108,7 @@ require_once "includes/paging.php"; echo th_order_by('server_setting_name', 'Name', $order_by, $order); echo th_order_by('server_setting_value', 'Value', $order_by, $order); echo "\n"; - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; echo "\n"; echo "\n"; @@ -121,8 +119,8 @@ require_once "includes/paging.php"; echo " ".$row['server_setting_name']." \n"; echo " ".$row['server_setting_value']." \n"; echo " \n"; - echo " $v_link_label_edit\n"; - echo " $v_link_label_delete\n"; + echo " $v_link_label_edit\n"; + echo " $v_link_label_delete\n"; echo " \n"; echo "\n"; if ($c==0) { $c=1; } else { $c=0; } @@ -138,7 +136,7 @@ require_once "includes/paging.php"; echo "  \n"; echo " $paging_controls\n"; echo " \n"; - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; echo " \n"; echo " \n"; echo " \n"; diff --git a/core/servers/server_settings_delete.php b/core/servers/server_settings_delete.php index 7396ff13b0..bdbd24184a 100644 --- a/core/servers/server_settings_delete.php +++ b/core/servers/server_settings_delete.php @@ -50,7 +50,7 @@ if (strlen($id)>0) { } require_once "includes/header.php"; -echo "\n"; +echo "\n"; echo "
\n"; echo "Delete Complete\n"; echo "
\n"; diff --git a/core/servers/server_settings_edit.php b/core/servers/server_settings_edit.php index c89903b331..82974ce8ab 100644 --- a/core/servers/server_settings_edit.php +++ b/core/servers/server_settings_edit.php @@ -108,7 +108,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo "Add Complete\n"; echo "
\n"; @@ -130,7 +130,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo "Update Complete\n"; echo "
\n"; @@ -181,7 +181,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { echo "Server Setting Edit\n"; } - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/core/servers/servers.php b/core/servers/servers.php index d968c18fdc..32d09efa51 100644 --- a/core/servers/servers.php +++ b/core/servers/servers.php @@ -60,8 +60,7 @@ require_once "includes/paging.php"; echo "\n"; //prepare to page the results - $sql = ""; - $sql .= " select count(*) as num_rows from v_servers "; + $sql = " select count(*) as num_rows from v_servers "; $sql .= " where domain_uuid = '$domain_uuid' "; if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } $prep_statement = $db->prepare($sql); @@ -85,11 +84,10 @@ require_once "includes/paging.php"; $offset = $rows_per_page * $page; //get the list - $sql = ""; - $sql .= " select * from v_servers "; - $sql .= " where domain_uuid = '$domain_uuid' "; + $sql = "select * from v_servers "; + $sql .= "where domain_uuid = '$domain_uuid' "; if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } - $sql .= " limit $rows_per_page offset $offset "; + $sql .= "limit $rows_per_page offset $offset "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); @@ -107,7 +105,7 @@ require_once "includes/paging.php"; echo th_order_by('server_name', 'Server Name', $order_by, $order); echo th_order_by('server_description', 'Description', $order_by, $order); echo "\n"; - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; echo "\n"; echo "\n"; @@ -118,8 +116,8 @@ require_once "includes/paging.php"; echo " ".$row['server_name']." \n"; echo " ".$row['server_description']." \n"; echo " \n"; - echo " $v_link_label_edit\n"; - echo " $v_link_label_delete\n"; + echo " $v_link_label_edit\n"; + echo " $v_link_label_delete\n"; echo " \n"; echo "\n"; if ($c==0) { $c=1; } else { $c=0; } @@ -135,7 +133,7 @@ require_once "includes/paging.php"; echo "  \n"; echo " $paging_controls\n"; echo " \n"; - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; echo " \n"; echo " \n"; echo " \n"; diff --git a/core/servers/servers_delete.php b/core/servers/servers_delete.php index 8a6b69ee1f..45d97fbe03 100644 --- a/core/servers/servers_delete.php +++ b/core/servers/servers_delete.php @@ -39,8 +39,7 @@ if (count($_GET)>0) { } if (strlen($id)>0) { - $sql = ""; - $sql .= "delete from v_servers "; + $sql = "delete from v_servers "; $sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "and server_uuid = '$id' "; $prep_statement = $db->prepare(check_sql($sql)); @@ -49,7 +48,7 @@ if (strlen($id)>0) { } require_once "includes/header.php"; -echo "\n"; +echo "\n"; echo "
\n"; echo "Delete Complete\n"; echo "
\n"; diff --git a/core/servers/servers_edit.php b/core/servers/servers_edit.php index 85fd3db499..3736b6ebef 100644 --- a/core/servers/servers_edit.php +++ b/core/servers/servers_edit.php @@ -91,7 +91,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo "Add Complete\n"; echo "
\n"; @@ -109,7 +109,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo "Update Complete\n"; echo "
\n"; @@ -122,8 +122,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //pre-populate the form if (count($_GET)>0 && $_POST["persistformvar"] != "true") { $server_uuid = $_GET["id"]; - $sql = ""; - $sql .= "select * from v_servers "; + $sql = "select * from v_servers "; $sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "and server_uuid = '$server_uuid' "; $prep_statement = $db->prepare(check_sql($sql)); @@ -158,7 +157,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { echo "Server Edit\n"; } - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -199,7 +198,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo ""; if ($action == "update") { - require "v_server_settings.php"; + require "server_settings.php"; } echo " ";