From 0d9ea1c1942ca78d40e1a89a21912e70eb846f15 Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Fri, 7 Jun 2013 00:11:52 +0000 Subject: [PATCH] Multilinguified SQL Query. Added Manage button on Select Database page to link to Databases app. Fixed bug in CSV download file extension. --- app/sql_query/app_languages.php | 33 ++++++++++++++++++++++ app/sql_query/sql_backup.php | 10 +++++-- app/sql_query/sql_db_conversion.php | 43 +++++++++++++++++------------ app/sql_query/sql_query.php | 38 +++++++++++++++---------- app/sql_query/sql_query_db.php | 42 ++++++++++++++++------------ app/sql_query/sql_query_result.php | 24 ++++++++++------ 6 files changed, 128 insertions(+), 62 deletions(-) create mode 100644 app/sql_query/app_languages.php diff --git a/app/sql_query/app_languages.php b/app/sql_query/app_languages.php new file mode 100644 index 0000000000..694d9e0081 --- /dev/null +++ b/app/sql_query/app_languages.php @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/app/sql_query/sql_backup.php b/app/sql_query/sql_backup.php index 5040f163a4..b0f285e515 100644 --- a/app/sql_query/sql_backup.php +++ b/app/sql_query/sql_backup.php @@ -34,6 +34,12 @@ else { exit; } +//add multi-lingual support + require_once "app_languages.php"; + foreach($text as $key => $value) { + $text[$key] = $value[$_SESSION['domain']['language']['code']]; + } + //pdo database connection if (strlen($_REQUEST['id']) > 0) { require_once "sql_query_pdo.php"; @@ -69,12 +75,12 @@ else { $sql = "select * from $table_name"; if (strlen($sql) > 0) { $prep_statement_2 = $db->prepare(check_sql($sql)); - if ($prep_statement_2) { + if ($prep_statement_2) { $prep_statement_2->execute(); $result2 = $prep_statement_2->fetchAll(PDO::FETCH_ASSOC); } else { - echo "Error:\n"; + echo "".$text['label-error'].":\n"; echo "
\n";
 					print_r($db->errorInfo());
 					echo "
\n"; diff --git a/app/sql_query/sql_db_conversion.php b/app/sql_query/sql_db_conversion.php index 0a9830cbc0..f356612c3f 100644 --- a/app/sql_query/sql_db_conversion.php +++ b/app/sql_query/sql_db_conversion.php @@ -34,6 +34,13 @@ if (if_group("superadmin")) { else { echo "access denied"; exit; +} + +//add multi-lingual support + require_once "app_languages.php"; + foreach($text as $key => $value) { + $text[$key] = $value[$_SESSION['domain']['language']['code']]; + } //show errors ini_set('display_errors', '1'); @@ -45,7 +52,7 @@ else { $result = false; foreach ($tmp_array as &$row) { if ($row[0] == $column) { - $result = true; + $result = true; } return $result; } @@ -95,7 +102,7 @@ else { $db_dest->beginTransaction(); } catch (PDOException $error) { - print "error: " . $error->getMessage() . "
"; + print $text['label-error'].": " . $error->getMessage() . "
"; die(); } @@ -116,7 +123,7 @@ else { } } catch (PDOException $error) { - echo "error: " . $error->getMessage() . " sql: $sql
"; + echo $text['label-error'].": " . $error->getMessage() . " sql: $sql
"; } $x++; } @@ -140,7 +147,7 @@ else { $db_dest = new PDO("pgsql:host=localhost port={$db_port} user={$db_create_username} password={$db_create_password} dbname=template1"); } } catch (PDOException $error) { - print "error: " . $error->getMessage() . "
"; + print $text['label-error'].": " . $error->getMessage() . "
"; die(); } //create the database, user, grant perms @@ -161,7 +168,7 @@ else { } } catch (PDOException $error) { - print "error: " . $error->getMessage() . "
"; + print $text['label-error'].": " . $error->getMessage() . "
"; die(); } @@ -183,7 +190,7 @@ else { } } catch (PDOException $error) { - echo "error: " . $error->getMessage() . " sql: $sql
"; + echo $text['label-error'].": " . $error->getMessage() . " sql: $sql
"; die(); } } @@ -232,7 +239,7 @@ else { } catch (PDOException $error) { if ($v_debug) { - print "error: " . $error->getMessage() . "
"; + print $text['label-error'].": " . $error->getMessage() . "
"; } } @@ -244,7 +251,7 @@ else { } catch (PDOException $error) { if ($v_debug) { - print "error: " . $error->getMessage() . "
"; + print $text['label-error'].": " . $error->getMessage() . "
"; } } //create user and set the permissions @@ -254,7 +261,7 @@ else { } catch (PDOException $error) { if ($v_debug) { - print "error: " . $error->getMessage() . "
"; + print $text['label-error'].": " . $error->getMessage() . "
"; } } //set account to unlimitted use @@ -266,7 +273,7 @@ else { } catch (PDOException $error) { if ($v_debug) { - print "error: " . $error->getMessage() . "
"; + print $text['label-error'].": " . $error->getMessage() . "
"; } } //create the database and set the create user with permissions @@ -276,7 +283,7 @@ else { } catch (PDOException $error) { if ($v_debug) { - print "error: " . $error->getMessage() . "
"; + print $text['label-error'].": " . $error->getMessage() . "
"; } } //set user permissions @@ -285,7 +292,7 @@ else { } catch (PDOException $error) { if ($v_debug) { - print "error: " . $error->getMessage() . "
"; + print $text['label-error'].": " . $error->getMessage() . "
"; } } //make the changes active @@ -295,7 +302,7 @@ else { } catch (PDOException $error) { if ($v_debug) { - print "error: " . $error->getMessage() . "
"; + print $text['label-error'].": " . $error->getMessage() . "
"; } } } //if (strlen($db_create_username) > 0) @@ -305,7 +312,7 @@ else { } catch (PDOException $error) { if ($v_debug) { - print "error: " . $error->getMessage() . "
"; + print $text['label-error'].": " . $error->getMessage() . "
"; } } @@ -379,7 +386,7 @@ else { $tmp_sql = "PRAGMA table_info($table_name);"; } if ($db_dest_type == "pgsql") { - + } if ($db_dest_type == "mysql") { $tmp_sql = "show columns from $table_name;"; @@ -392,7 +399,7 @@ else { $result2 = $prep_statement_2->fetchAll(PDO::FETCH_ASSOC); } else { - echo "Error:\n"; + echo "".$text['label-error'].":\n"; echo "
\n";
 						print_r($db_dest->errorInfo());
 						echo "
\n"; @@ -406,7 +413,7 @@ else { $destination_column_array[$x] = $row2['Field']; } if ($db_dest_type == "pgsql") { - + } $x++; } @@ -435,7 +442,7 @@ else { $result2 = $prep_statement_2->fetchAll(PDO::FETCH_ASSOC); } else { - echo "Error:\n"; + echo "".$text['label-error'].":\n"; echo "
\n";
 						print_r($db->errorInfo());
 						echo "
\n"; diff --git a/app/sql_query/sql_query.php b/app/sql_query/sql_query.php index bf8f48f11b..933635bc9d 100644 --- a/app/sql_query/sql_query.php +++ b/app/sql_query/sql_query.php @@ -34,8 +34,15 @@ else { exit; } +//add multi-lingual support + require_once "app_languages.php"; + foreach($text as $key => $value) { + $text[$key] = $value[$_SESSION['domain']['language']['code']]; + } + //show the header require_once "includes/header.php"; + $page["title"] = $text['title-sql_query']; //pdo voicemail database connection require_once "sql_query_pdo.php"; @@ -70,16 +77,16 @@ else { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; @@ -92,7 +99,7 @@ else { echo " \n"; echo " \n"; echo " "; diff --git a/app/sql_query/sql_query_db.php b/app/sql_query/sql_query_db.php index 2b83bc3a0c..59e6bc4ab7 100644 --- a/app/sql_query/sql_query_db.php +++ b/app/sql_query/sql_query_db.php @@ -33,7 +33,16 @@ else { echo "access denied"; exit; } + +//add multi-lingual support + require_once "app_languages.php"; + foreach($text as $key => $value) { + $text[$key] = $value[$_SESSION['domain']['language']['code']]; + } + require_once "includes/header.php"; +$page["title"] = $text['title-databases']; + require_once "includes/paging.php"; //get variables used to control the order @@ -49,12 +58,16 @@ require_once "includes/paging.php"; echo "
SQL Query".$text['header-sql_query']."\n"; if (strlen($_REQUEST['id']) > 0) { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; echo "
\n"; - + /* echo " DB: \n"; */ - echo " Type: \n"; - echo "  \n"; - echo "  \n"; - echo " Table: \n"; + + echo " ".$text['label-table'].": \n"; echo " \n"; + echo "  \n"; + echo "  \n"; + echo " ".$text['label-result_type'].": \n"; echo " \n"; - echo " \n"; + echo " \n"; echo "
\n"; echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo "
Databases ".$text['header-databases'].""; + if (if_group("superadmin")) { + echo " \n"; + } + echo "
\n"; - echo " Select the database to use.

\n"; + echo " ".$text['description-databases'].".

\n"; echo "
\n"; @@ -78,9 +91,9 @@ require_once "includes/paging.php"; $rows_per_page = 100; $param = ""; $page = $_GET['page']; - if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } - list($paging_controls, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page); - $offset = $rows_per_page * $page; + if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } + list($paging_controls, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page); + $offset = $rows_per_page * $page; //get the list $sql = "select * from v_databases "; @@ -100,15 +113,11 @@ require_once "includes/paging.php"; echo "\n"; echo "\n"; - echo th_order_by('database_type', 'Type', $order_by, $order); - echo th_order_by('database_host', 'Host', $order_by, $order); - //echo th_order_by('database_port', 'Port', $order_by, $order); - echo th_order_by('database_name', 'Name', $order_by, $order); - //echo th_order_by('database_username', 'Username', $order_by, $order); - //echo th_order_by('database_path', 'Path', $order_by, $order); - echo th_order_by('database_description', 'Description', $order_by, $order); + echo th_order_by('database_type', $text['label-type'], $order_by, $order); + echo th_order_by('database_host', $text['label-host'], $order_by, $order); + echo th_order_by('database_name', $text['label-name'], $order_by, $order); + echo th_order_by('database_description', $text['label-description'], $order_by, $order); echo "\n"; echo "\n"; @@ -117,13 +126,10 @@ require_once "includes/paging.php"; echo "\n"; echo " \n"; echo " \n"; - //echo " \n"; echo " \n"; - //echo " \n"; - //echo " \n"; echo " \n"; echo " \n"; echo "\n"; if ($c==0) { $c=1; } else { $c=0; } diff --git a/app/sql_query/sql_query_result.php b/app/sql_query/sql_query_result.php index 15fb1fc97c..09f7a66f55 100644 --- a/app/sql_query/sql_query_result.php +++ b/app/sql_query/sql_query_result.php @@ -34,6 +34,12 @@ else { exit; } +//add multi-lingual support + require_once "app_languages.php"; + foreach($text as $key => $value) { + $text[$key] = $value[$_SESSION['domain']['language']['code']]; + } + //pdo database connection if (strlen($_REQUEST['id']) > 0) { require_once "sql_query_pdo.php"; @@ -118,7 +124,7 @@ if (count($_POST)>0) { reset($sql_array); foreach($sql_array as $sql) { $sql = trim($sql); - echo "SQL Query:
\n"; + echo "".$text['label-sql_query'].":
\n"; echo "".$sql."

"; if (strlen($sql) > 0) { @@ -127,10 +133,10 @@ if (count($_POST)>0) { $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); $result = $prep_statement->fetchAll(PDO::FETCH_ASSOC); - echo "Results: ".count($result)."
"; + echo "".$text['label-results'].": ".count($result)."
"; } catch(PDOException $e) { - echo "Error:
\n"; + echo "".$text['label-error'].":
\n"; echo "
\n"; - //echo " $v_link_label_add\n"; echo "
".$row['database_type']." ".$row['database_host']." ".$row['database_port']." ".$row['database_name']." ".$row['database_username']." ".$row['database_path']." ".$row['database_description']." \n"; - echo " $v_link_label_edit\n"; + echo " $v_link_label_edit\n"; echo "
\n"; echo "\n"; echo "
\n"; @@ -170,19 +176,19 @@ if (count($_POST)>0) { echo $tmp_header; $sql = trim($sql); - echo "SQL Query:
\n"; + echo "".$text['label-sql_query'].":
\n"; echo "".$sql."

"; //get the table data $sql = "select * from $table_name"; if (strlen($sql) > 0) { $prep_statement = $db->prepare(check_sql($sql)); - if ($prep_statement) { + if ($prep_statement) { $prep_statement->execute(); $result = $prep_statement->fetchAll(PDO::FETCH_ASSOC); } else { - echo "Error:\n"; + echo "".$text['label-error'].":\n"; echo "
\n";
 					print_r($db->errorInfo());
 					echo "
\n"; @@ -240,19 +246,19 @@ if (count($_POST)>0) { //set the headers header('Content-type: application/octet-binary'); - header('Content-Disposition: attachment; filename='.$table_name.'.sql'); + header('Content-Disposition: attachment; filename='.$table_name.'.csv'); //get the table data $sql = trim($sql); $sql = "select * from $table_name"; if (strlen($sql) > 0) { $prep_statement = $db->prepare(check_sql($sql)); - if ($prep_statement) { + if ($prep_statement) { $prep_statement->execute(); $result = $prep_statement->fetchAll(PDO::FETCH_ASSOC); } else { - echo "Error:\n"; + echo "".$text['label-error'].":\n"; echo "
\n";
 					print_r($db->errorInfo());
 					echo "
\n";