diff --git a/app/vars/app_config.php b/app/vars/app_config.php index f3748ef7c1..bbec35c65e 100644 --- a/app/vars/app_config.php +++ b/app/vars/app_config.php @@ -32,7 +32,7 @@ $apps[$x]['menu'][0]['uuid'] = '7a4e9ec5-24b9-7200-89b8-d70bf8afdd8f'; $apps[$x]['menu'][0]['parent_uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788'; $apps[$x]['menu'][0]['category'] = 'internal'; - $apps[$x]['menu'][0]['path'] = '/app/vars/v_vars.php'; + $apps[$x]['menu'][0]['path'] = '/app/vars/vars.php'; $apps[$x]['menu'][0]['groups'][] = 'superadmin'; //permission details diff --git a/app/vars/var_delete.php b/app/vars/var_delete.php index 126d03ac14..377032fc77 100644 --- a/app/vars/var_delete.php +++ b/app/vars/var_delete.php @@ -40,8 +40,7 @@ if (count($_GET)>0) { //delete the data if (strlen($id)>0) { - $sql = ""; - $sql .= "delete from v_vars "; + $sql = "delete from v_vars "; $sql .= "where var_uuid = '$id' "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); @@ -52,7 +51,7 @@ if (count($_GET)>0) { //redirect the user require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo "Delete Complete\n"; echo "
\n"; diff --git a/app/vars/var_edit.php b/app/vars/var_edit.php index d8138aa1df..ab96e3a34a 100644 --- a/app/vars/var_edit.php +++ b/app/vars/var_edit.php @@ -119,7 +119,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //redirect the user require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo "Add Complete\n"; echo "
\n"; @@ -147,7 +147,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //redirect the user require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo "Update Complete\n"; echo "
\n"; @@ -160,8 +160,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //pre-populate the form if (count($_GET)>0 && $_POST["persistformvar"] != "true") { $var_uuid = $_GET["id"]; - $sql = ""; - $sql .= "select * from v_vars "; + $sql = "select * from v_vars "; $sql .= "where var_uuid = '$var_uuid' "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); @@ -199,7 +198,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { echo "Variable Edit\n"; } - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; diff --git a/app/vars/vars.php b/app/vars/vars.php index e5fd96344d..f09dc6ea89 100644 --- a/app/vars/vars.php +++ b/app/vars/vars.php @@ -86,15 +86,12 @@ else { $tmp_var_header .= "Description\n"; $tmp_var_header .= "\n"; if (permission_exists('variables_add')) { - $tmp_var_header .= " $v_link_label_add\n"; + $tmp_var_header .= " $v_link_label_add\n"; } $tmp_var_header .= "\n"; $tmp_var_header .= "\n"; - if ($result_count == 0) { - //no results - } - else { + if ($result_count > 0) { $prev_var_cat = ''; foreach($result as $row) { $var_value = $row[var_value]; @@ -110,7 +107,7 @@ else { echo "  \n"; echo " \n"; if (permission_exists('variables_add')) { - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; } echo " \n"; echo " \n"; @@ -136,10 +133,10 @@ else { echo " ".$var_description." \n"; echo " \n"; if (permission_exists('variables_edit')) { - echo " $v_link_label_edit\n"; + echo " $v_link_label_edit\n"; } if (permission_exists('variables_delete')) { - echo " $v_link_label_delete\n"; + echo " $v_link_label_delete\n"; } echo " \n"; echo "\n"; @@ -158,7 +155,7 @@ else { echo " $paging_controls\n"; echo " \n"; if (permission_exists('variables_add')) { - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; } echo " \n"; echo " \n"; diff --git a/app/vars/vars_textarea.php b/app/vars/vars_textarea.php index ccc92d544e..a90c485a9b 100644 --- a/app/vars/vars_textarea.php +++ b/app/vars/vars_textarea.php @@ -91,7 +91,7 @@ if ($_GET['a'] == "default" && permission_exists('variables_edit')) {
-
+
Variables
@@ -128,7 +128,7 @@ if ($_GET['a'] == "default" && permission_exists('variables_edit')) { "; + echo ""; } ?>