diff --git a/app/sql_query/v_sql_query.php b/app/sql_query/v_sql_query.php
index 1d0af0ec2a..1f4da32340 100644
--- a/app/sql_query/v_sql_query.php
+++ b/app/sql_query/v_sql_query.php
@@ -62,7 +62,6 @@ else {
echo "
";
echo "
\n";
-
echo "\n";
echo " \n";
echo " ";
diff --git a/app/sql_query/v_sql_query_db.php b/app/sql_query/v_sql_query_db.php
index 913c800195..228b8e91f8 100644
--- a/app/sql_query/v_sql_query_db.php
+++ b/app/sql_query/v_sql_query_db.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_databases ";
+ $sql = "select count(*) as num_rows from v_databases ";
if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
$prep_statement = $db->prepare($sql);
if ($prep_statement) {
@@ -84,10 +83,9 @@ require_once "includes/paging.php";
$offset = $rows_per_page * $page;
//get the list
- $sql = "";
- $sql .= " select * from v_databases ";
+ $sql = "select * from v_databases ";
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);
@@ -110,7 +108,7 @@ require_once "includes/paging.php";
//echo th_order_by('database_path', 'Path', $order_by, $order);
echo th_order_by('database_description', 'Description', $order_by, $order);
echo "
\n";
- //echo " $v_link_label_add\n";
+ //echo " $v_link_label_add\n";
echo " | \n";
echo "
\n";
@@ -125,7 +123,7 @@ require_once "includes/paging.php";
//echo " | ".$row['database_path']." | \n";
echo " ".$row['database_description']." | \n";
echo " \n";
- echo " $v_link_label_edit\n";
+ echo " $v_link_label_edit\n";
echo " | \n";
echo "
\n";
if ($c==0) { $c=1; } else { $c=0; }
diff --git a/app/sql_query/v_sql_query_pdo.php b/app/sql_query/v_sql_query_pdo.php
index 4a004640d1..6e78d7524c 100644
--- a/app/sql_query/v_sql_query_pdo.php
+++ b/app/sql_query/v_sql_query_pdo.php
@@ -23,7 +23,17 @@
Contributor(s):
Mark J Crane
*/
-
+require_once "root.php";
+require_once "includes/require.php";
+require_once "includes/checkauth.php";
+if (if_group("admin") || if_group("superadmin")) {
+ //access granted
+}
+else {
+ echo "access denied";
+ exit;
+}
+
//set the default values
if (isset($db_file_path) > 0) {
$db_path = $db_file_path;
@@ -31,27 +41,23 @@
}
//get the db connection information
-/*
- if ($db) {
- $sql = "";
- $sql .= "select * from v_db ";
- $sql .= "where domain_uuid = '$domain_uuid' ";
- $sql .= "and db_uuid = '".$_REQUEST['id']."' ";
+ if (strlen($_REQUEST['id']) > 0) {
+ $sql = "select * from v_databases ";
+ $sql .= "where database_uuid = '".$_REQUEST['id']."' ";
$prep_statement = $db->prepare($sql);
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
foreach ($result as &$row) {
- $db_type = $row["db_type"];
- $db_host = $row["db_host"];
- $db_port = $row["db_port"];
- $db_name = $row["db_name"];
- $db_username = $row["db_username"];
- $db_password = $row["db_password"];
- $db_path = $row["db_path"];
+ $db_type = $row["database_type"];
+ $db_host = $row["database_host"];
+ $db_port = $row["database_port"];
+ $db_name = $row["database_name"];
+ $db_username = $row["database_username"];
+ $db_password = $row["database_password"];
+ $db_path = $row["database_path"];
break;
}
}
-*/
//unset the database connection
unset($db);
@@ -222,4 +228,15 @@ if ($db_type == "pgsql") {
}
} //end if db_type pgsql
+if ($db_type == "odbc") {
+ //database connection
+ try {
+ unset($db);
+ $db = new PDO("odbc:$db_name", "$db_username", "$db_password");
+ }
+ catch (PDOException $e) {
+ echo 'Connection failed: ' . $e->getMessage();
+ }
+} //end if db_type odbc
+
?>
\ No newline at end of file