diff --git a/core/domain_settings/domains.php b/core/domain_settings/domains.php index 7ddf64c420..d3bb0121ae 100644 --- a/core/domain_settings/domains.php +++ b/core/domain_settings/domains.php @@ -75,7 +75,7 @@ else { $domain->db = $db; $domain->set(); - // on domain change, redirect user + //redirect the user if ($_SESSION["login"]["destination"] != '') { // to default, or domain specific, login destination header("Location: ".PROJECT_PATH.$_SESSION["login"]["destination"]["url"]); @@ -90,7 +90,6 @@ else { //includes require_once "resources/header.php"; $document['title'] = $text['title-domains']; - require_once "resources/paging.php"; //get the http values and set them as variables @@ -100,24 +99,6 @@ else { $order = check_str($_GET["order"]); } -//show the header and the search - echo "\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
".$text['header-domains']."\n"; - echo "
\n"; - echo " "; - echo " "; - echo "
\n"; - echo "
\n"; - echo " ".$text['description-domains']."

\n"; - echo "
\n"; - //prepare to page the results $sql = "select count(*) as num_rows from v_domains "; if (strlen($search) > 0) { @@ -146,7 +127,7 @@ else { list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); $offset = $rows_per_page * $page; -//get the list +//get the domains $sql = "select * from v_domains "; if (strlen($search) > 0) { $sql .= "where ("; @@ -177,6 +158,24 @@ else { $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; +//show the header and the search + echo "\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
".$text['header-domains']."\n"; + echo "
\n"; + echo " "; + echo " "; + echo "
\n"; + echo "
\n"; + echo " ".$text['description-domains']."

\n"; + echo "
\n"; + echo "\n"; echo "\n"; echo th_order_by('domain_name', $text['label-domain'], $order_by, $order); @@ -190,7 +189,6 @@ else { echo "\n"; if (count($domains) > 0) { - global $c, $row_style, $text, $v_link_label_edit, $v_link_label_delete; foreach ($domains as $domain_uuid => $domain) { $tr_link = (permission_exists('domain_edit')) ? "href='domain_edit.php?id=".$domain_uuid."'" : null; echo "\n"; @@ -245,4 +243,5 @@ else { //include the footer require_once "resources/footer.php"; + ?> \ No newline at end of file