nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Included the sql.js file, added teh container division sqlqueryresults

Browse Source 
when generating the results table.  All cases have not been handled yet.
This commit is contained in:
ninadsp
2010-07-01 02:33:31 +05:30
parent b1dcb9493d
commit 5c1052ad96
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql.php
View File

@@ -312,6 +312,11 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
} }
$active_page = $goto; $active_page = $goto;
$message = htmlspecialchars(PMA_Message::rawError($error)); $message = htmlspecialchars(PMA_Message::rawError($error));
if( $GLOBALS['is_ajax_request'] == true) {
PMA_ajaxResponse($message, false);
}
/** /**
* Go to target path. * Go to target path.
*/ */
@@ -580,6 +585,7 @@ else {
require_once './libraries/header_printview.inc.php'; require_once './libraries/header_printview.inc.php';
} else { } else {
$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'sql.js';
unset($message); unset($message);
if( $GLOBALS['is_ajax_request'] != true) { if( $GLOBALS['is_ajax_request'] != true) {
if (strlen($table)) { if (strlen($table)) {
@@ -607,12 +613,17 @@ else {
$fields_meta = PMA_DBI_get_fields_meta($result); $fields_meta = PMA_DBI_get_fields_meta($result);
$fields_cnt = count($fields_meta); $fields_cnt = count($fields_meta);
} }
if( $GLOBALS['is_ajax_request'] != true ) {
//begin the sqlqueryresults div here. container div
echo '<div id="sqlqueryresults">';
}
// Display previous update query (from tbl_replace) // Display previous update query (from tbl_replace)
if (isset($disp_query) && $cfg['ShowSQL'] == true) { if (isset($disp_query) && $cfg['ShowSQL'] == true) {
PMA_showMessage($disp_message, $disp_query, 'success'); PMA_showMessage($disp_message, $disp_query, 'success');
} }
if (isset($profiling_results)) { if (isset($profiling_results)) {
PMA_profilingResults($profiling_results); PMA_profilingResults($profiling_results);
} }
@@ -709,6 +720,10 @@ window.onload = function()
</script> </script>
<?php <?php
} // end print case } // end print case
if( $GLOBALS['is_ajax_request'] != true) {
echo '</div>'; // end sqlqueryresults div
}
} // end rows returned } // end rows returned
/** /**