' . "\n";
@@ -720,7 +716,6 @@ do {
// End of fake loop
if ($save_on_server && isset($message)) {
- include_once 'libraries/header.inc.php';
if ($export_type == 'server') {
$active_page = 'server_export.php';
include 'server_export.php';
@@ -768,7 +763,7 @@ if (! empty($asfile)) {
}
}
- /* If ve saved on server, we have to close file now */
+ /* If we saved on server, we have to close file now */
if ($save_on_server) {
$write_result = @fwrite($file_handle, $dump_buffer);
fclose($file_handle);
@@ -788,7 +783,6 @@ if (! empty($asfile)) {
);
}
- include_once 'libraries/header.inc.php';
if ($export_type == 'server') {
$active_page = 'server_export.php';
include_once 'server_export.php';
@@ -801,6 +795,7 @@ if (! empty($asfile)) {
}
exit();
} else {
+ PMA_Response::getInstance()->disable();
echo $dump_buffer;
}
} else {
@@ -838,6 +833,5 @@ if (! empty($asfile)) {
//]]>
diff --git a/gis_data_editor.php b/gis_data_editor.php
index 70c96718b3..9eb0e99744 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -1,10 +1,6 @@
$visualization,
'openLayers' => $open_layers,
);
- PMA_ajaxResponse(null, true, $extra_data);
+ $response = PMA_Response::getInstance();
+ $response->addJSON($extra_data);
+ exit;
}
-// If the call is to get the whole content, start buffering, skipping and tags
-if (isset($_REQUEST['get_gis_editor']) && $_REQUEST['get_gis_editor'] == true) {
- ob_start();
-} else {
-?>
-
-
-
-
-
-addJSON('gis_editor', ob_get_contents());
+ob_end_clean();
?>
diff --git a/import.php b/import.php
index 1c93cc119f..85dfaea5e1 100644
--- a/import.php
+++ b/import.php
@@ -83,7 +83,6 @@ if (! empty($sql_query)) {
// upload limit has been reached, let's assume the second possibility.
;
if ($_POST == array() && $_GET == array()) {
- include_once 'libraries/header.inc.php';
$message = PMA_Message::error(__('You probably tried to upload too large file. Please refer to %sdocumentation%s for ways to workaround this limit.'));
$message->addParam('[a@./Documentation.html#faq1_16@_blank]');
$message->addParam('[/a]');
@@ -93,7 +92,7 @@ if ($_POST == array() && $_GET == array()) {
$_SESSION['Import_message']['go_back_url'] = $goto;
$message->display();
- include 'libraries/footer.inc.php';
+ exit; // the footer is displayed automatically
}
/**
@@ -222,10 +221,13 @@ if (! empty($id_bookmark)) {
case 1: // bookmarked query that have to be displayed
$import_text = PMA_Bookmark_get($db, $id_bookmark);
if ($GLOBALS['is_ajax_request'] == true) {
- $extra_data['sql_query'] = $import_text;
- $extra_data['action_bookmark'] = $action_bookmark;
$message = PMA_Message::success(__('Showing bookmark'));
- PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
+ $response = PMA_Response::getInstance();
+ $response->isSuccess($message->isSuccess());
+ $response->addJSON('message', $message);
+ $response->addJSON('sql_query', $import_text);
+ $response->addJSON('action_bookmark', $action_bookmark);
+ exit;
} else {
$run_query = false;
}
@@ -235,9 +237,12 @@ if (! empty($id_bookmark)) {
PMA_Bookmark_delete($db, $id_bookmark);
if ($GLOBALS['is_ajax_request'] == true) {
$message = PMA_Message::success(__('The bookmark has been deleted.'));
- $extra_data['action_bookmark'] = $action_bookmark;
- $extra_data['id_bookmark'] = $id_bookmark;
- PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
+ $response = PMA_Response::getInstance();
+ $response->isSuccess($message->isSuccess());
+ $response->addJSON('message', $message);
+ $response->addJSON('action_bookmark', $action_bookmark);
+ $response->addJSON('id_bookmark', $id_bookmark);
+ exit;
} else {
$run_query = false;
$error = true; // this is kind of hack to skip processing the query
@@ -523,5 +528,4 @@ if ($go_sql) {
$active_page = $goto;
include '' . $goto;
}
-exit();
?>
diff --git a/index.php b/index.php
index 189819f177..99ac95d499 100644
--- a/index.php
+++ b/index.php
@@ -72,7 +72,11 @@ $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1];
// start output
-require 'libraries/header_http.inc.php';
+$response = PMA_Response::getInstance();
+$header = $response->getHeader();
+$header->sendHttpHeaders();
+$response->disable();
+
?>
@@ -135,9 +139,11 @@ require 'libraries/header_http.inc.php';
// ]]>
addFile('jquery/jquery-1.6.2.js');
+$scripts->addFile('update-location.js');
+$scripts->addFile('common.js');
+echo $scripts->getDisplay();
?>
" + PMA_messages['strReloadDatabase'] + "?").dialog({
buttons: button_options
}) //end dialog options
- }
- else {
+ } else {
PMA_ajaxShowMessage(data.error, false);
}
}) // end $.get()
@@ -106,8 +105,7 @@ $(function() {
// not refresh it
window.parent.refreshNavigation(true);
}
- }
- else {
+ } else {
$('#floating_menubar').after(data.error);
}
@@ -131,8 +129,7 @@ $(function() {
$.get($form.attr('action'), $form.serialize() + "&submitcollation=" + $form.find("input[name=submitcollation]").val(), function(data) {
if(data.success == true) {
PMA_ajaxShowMessage(data.message);
- }
- else {
+ } else {
PMA_ajaxShowMessage(data.error, false);
}
}) // end $.get()
diff --git a/js/db_search.js b/js/db_search.js
index 5c80bb2f90..f1a18d48b4 100644
--- a/js/db_search.js
+++ b/js/db_search.js
@@ -193,10 +193,10 @@ $(function() {
PMA_prepareForAjaxRequest($form);
var url = $form.serialize() + "&submit_search=" + $("#buttonGo").val();
- $.post($form.attr('action'), url, function(response) {
- if (typeof response == 'string') {
+ $.post($form.attr('action'), url, function(data) {
+ if (data.success == true) {
// found results
- $("#searchresults").html(response);
+ $("#searchresults").html(data.message);
$('#togglesearchresultlink')
// always start with the Show message
@@ -219,7 +219,7 @@ $(function() {
.show();
} else {
// error message (zero rows)
- $("#sqlqueryresults").html(response['message']);
+ $("#sqlqueryresults").html(data.error);
}
PMA_ajaxRemoveMessage($msgbox);
diff --git a/js/db_structure.js b/js/db_structure.js
index f5d4db94bb..8b0629713e 100644
--- a/js/db_structure.js
+++ b/js/db_structure.js
@@ -173,7 +173,7 @@ $(function() {
}); // end dialog options
} else {
var $dialog = $div
- .append(data)
+ .append(data.message)
.dialog({
title: PMA_messages['strInsertTable'],
height: 600,
@@ -194,7 +194,7 @@ $(function() {
$("table.insertRowTable").addClass("ajax");
$("#buttonYes").addClass("ajax");
$div = $("#insert_table_dialog");
- PMA_convertFootnotesToTooltips($div);
+ PMA_showHints($div);
}
PMA_ajaxRemoveMessage($msgbox);
}); // end $.get()
diff --git a/js/functions.js b/js/functions.js
index 1cf4adc9f3..c907328c1e 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -157,10 +157,9 @@ function PMA_display_git_revision()
$.get("main.php?token="
+ $("input[type=hidden][name=token]").val()
+ "&git_revision=1&ajax_request=true", function (data) {
- if (data.error != "undefined" && data.error) {
- return;
+ if (data.success == true) {
+ $(data.message).insertAfter('#li_pma_version');
}
- $(data.message).insertAfter('#li_pma_version');
});
}
@@ -1612,12 +1611,11 @@ function PMA_createTableDialog( $div, url , target)
})// end dialog options
//remove the redundant [Back] link in the error message.
.find('fieldset').remove();
- }
- else {
+ } else {
var size = getWindowSize();
var timeout;
$div
- .append(data)
+ .append(data.message)
.dialog({
dialogClass: 'create-table',
resizable: false,
@@ -1673,7 +1671,7 @@ function PMA_createTableDialog( $div, url , target)
buttons: button_options
}); // end dialog options
}
- PMA_convertFootnotesToTooltips($div);
+ PMA_showHints($div);
PMA_ajaxRemoveMessage($msgbox);
}); // end $.get()
@@ -1730,7 +1728,7 @@ function PMA_createChart(passedSettings)
thisChart.options.realtime.postData,
function(data) {
try {
- curValue = jQuery.parseJSON(data);
+ curValue = jQuery.parseJSON(data.message);
} catch (err) {
if (thisChart.options.realtime.error) {
thisChart.options.realtime.error(err);
@@ -2335,11 +2333,11 @@ $(function() {
$.post($form.attr('action'), $form.serialize() + "&submit_num_fields=" + $(this).val(), function(data) {
// if 'create_table_dialog' exists
if ($("#create_table_dialog").length > 0) {
- $("#create_table_dialog").html(data);
+ $("#create_table_dialog").html(data.message);
}
// if 'create_table_div' exists
if ($("#create_table_div").length > 0) {
- $("#create_table_div").html(data);
+ $("#create_table_div").html(data.message);
}
PMA_verifyColumnsProperties();
PMA_ajaxRemoveMessage($msgbox);
@@ -2375,7 +2373,7 @@ $(function() {
$("
").insertAfter("#floating_menubar");
$("#sqlqueryresults").html(data.sql_query);
$("#result_query .notice").remove();
- $("#result_query").prepend((data.message));
+ $("#result_query").prepend(data.message);
} else {
var $temp_div = $("
");
$temp_div.html(data.error);
@@ -2411,7 +2409,7 @@ $(function() {
$("
").insertAfter("#floating_menubar");
$("#sqlqueryresults").html(data.sql_query);
$("#result_query .notice").remove();
- $("#result_query").prepend((data.message));
+ $("#result_query").prepend(data.message);
$("#copyTable").find("select[name='target_db'] option").filterByValue(data.db).prop('selected', true);
//Refresh navigation frame when the table is coppied
@@ -2419,10 +2417,7 @@ $(function() {
window.parent.frame_navigation.location.reload();
}
} else {
- var $temp_div = $("
");
- $temp_div.html(data.error);
- var $error = $temp_div.find("code").addClass("error");
- PMA_ajaxShowMessage($error, false);
+ PMA_ajaxShowMessage(data.error, false);
}
}); // end $.post()
}
@@ -2444,19 +2439,19 @@ $(function() {
}
//variables which stores the common attributes
$.post(href[0], href[1]+"&ajax_request=true", function(data) {
- if (data.success == undefined) {
- var $temp_div = $("
");
- $temp_div.html(data);
- var $success = $temp_div.find("#result_query .success");
- PMA_ajaxShowMessage($success);
- $("
").insertAfter("#floating_menubar");
- $("#sqlqueryresults").html(data);
- PMA_init_slider();
- $("#sqlqueryresults").children("fieldset").remove();
- } else if (data.success == true ) {
+ if (data.success == true && data.sql_query != undefined) {
PMA_ajaxShowMessage(data.message);
$("
").insertAfter("#floating_menubar");
$("#sqlqueryresults").html(data.sql_query);
+ } else if (data.success == true) {
+ var $temp_div = $("
");
+ $temp_div.html(data.message);
+ var $success = $temp_div.find("#result_query .success");
+ PMA_ajaxShowMessage($success);
+ $("
").insertAfter("#floating_menubar");
+ $("#sqlqueryresults").html(data.message);
+ PMA_init_slider();
+ $("#sqlqueryresults").children("fieldset").remove();
} else {
var $temp_div = $("
");
$temp_div.html(data.error);
@@ -2535,8 +2530,7 @@ $(function() {
if (window.parent && window.parent.frame_navigation) {
window.parent.frame_navigation.location.reload();
}
- }
- else {
+ } else {
PMA_ajaxShowMessage(data.error, false);
}
}); // end $.post()
@@ -2592,16 +2586,11 @@ $(function() {
* Attach Ajax event handler on the change password anchor
* @see $cfg['AjaxEnable']
*/
- $('#change_password_anchor.dialog_active').live('click', function(event) {
- event.preventDefault();
- return false;
- });
$('#change_password_anchor.ajax').live('click', function(event) {
event.preventDefault();
var $msgbox = PMA_ajaxShowMessage();
- $(this).removeClass('ajax').addClass('dialog_active');
/**
* @var button_options Object containing options to be passed to jQueryUI's dialog
*/
@@ -2631,10 +2620,9 @@ $(function() {
$.post($the_form.attr('action'), $the_form.serialize() + '&change_pw='+ this_value, function(data) {
if (data.success == true) {
- $("#floating_menubar").after(data.sql_query);
+ $("#floating_menubar").after(data.message);
$("#change_password_dialog").hide().remove();
$("#edit_user_dialog").dialog("close").remove();
- $('#change_password_anchor.dialog_active').removeClass('dialog_active').addClass('ajax');
PMA_ajaxRemoveMessage($msgbox);
}
else {
@@ -2655,11 +2643,9 @@ $(function() {
$(this).remove();
},
buttons : button_options,
- beforeClose: function(ev, ui) {
- $('#change_password_anchor.dialog_active').removeClass('dialog_active').addClass('ajax');
- }
+ modal: true
})
- .append(data);
+ .append(data.message);
// for this dialog, we remove the fieldset wrapping due to double headings
$("fieldset#fieldset_change_password")
.find("legend").remove().end()
@@ -2922,10 +2908,6 @@ $(function() {
});
});
-$(function() {
- PMA_convertFootnotesToTooltips();
-});
-
/**
* Ensures indexes names are valid according to their type and, for a primary
* key, lock index name to 'PRIMARY'
@@ -2961,55 +2943,22 @@ function checkIndexName(form_id)
} // end of the 'checkIndexName()' function
/**
- * function to convert the footnotes to tooltips
+ * Function to display tooltips that were
+ * generated on the PHP side by PMA_showHint()
*
- * @param jquery-Object $div a div jquery object which specifies the
- * domain for searching footnootes. If we
- * ommit this parameter the function searches
- * the footnotes in the whole body
+ * @param object $div a div jquery object which specifies the
+ * domain for searching for tooltips. If we
+ * omit this parameter the function searches
+ * in the whole body
**/
-function PMA_convertFootnotesToTooltips($div)
+function PMA_showHints($div)
{
- // Hide the footnotes from the footer (which are displayed for
- // JavaScript-disabled browsers) since the tooltip is sufficient
-
if ($div == undefined || ! $div instanceof jQuery || $div.length == 0) {
$div = $("body");
}
-
- $footnotes = $div.find(".footnotes");
-
- $footnotes.hide();
- $footnotes.find('span').each(function() {
- $(this).children("sup").remove();
- });
- // The border and padding must be removed otherwise a thin yellow box remains visible
- $footnotes.css("border", "none");
- $footnotes.css("padding", "0px");
-
- // Replace the superscripts with the help icon
- $div.find("sup.footnotemarker").hide();
- $div.find("img.footnotemarker").show();
-
- $div.find("img.footnotemarker").each(function() {
- var img_class = $(this).attr("class");
- /** img contains two classes, as example "footnotemarker footnote_1".
- * We split it by second class and take it for the id of span
- */
- img_class = img_class.split(" ");
- for (i = 0; i < img_class.length; i++) {
- if (img_class[i].split("_")[0] == "footnote") {
- var span_id = img_class[i].split("_")[1];
- }
- }
- /**
- * Now we get the #id of the span with span_id variable. As an example if we
- * initially get the img class as "footnotemarker footnote_2", now we get
- * #2 as the span_id. Using that we can find footnote_2 in footnotes.
- * */
- var tooltip_text = $footnotes.find("span#footnote_" + span_id).html();
- $(this).qtip({
- content: tooltip_text,
+ $div.find('.pma_hint').each(function () {
+ $(this).children('img').qtip({
+ content: $(this).children('span').html(),
show: { delay: 0 },
hide: { delay: 1000 },
style: { background: '#ffffcc' }
@@ -3017,6 +2966,10 @@ function PMA_convertFootnotesToTooltips($div)
});
}
+$(function() {
+ PMA_showHints();
+});
+
/**
* This function handles the resizing of the content frame
* and adjusts the top menu according to the new size of the frame
@@ -3839,13 +3792,13 @@ $(document).ready(function () {
buttonOptions[PMA_messages['strClose']] = function () {
$(this).dialog("close");
};
- var $dialog = $('
').attr('id', 'createViewDialog').append(data).dialog({
+ var $dialog = $('
').attr('id', 'createViewDialog').append(data.message).dialog({
width: 500,
minWidth: 300,
maxWidth: 620,
modal: true,
buttons: buttonOptions,
- title: $('legend', $(data)).html(),
+ title: $('legend', $(data.message)).html(),
close: function () {
$(this).remove();
}
diff --git a/js/gis_data_editor.js b/js/gis_data_editor.js
index 477b3988a9..9cba83659d 100644
--- a/js/gis_data_editor.js
+++ b/js/gis_data_editor.js
@@ -142,7 +142,8 @@ function loadGISEditor(value, field, type, input_name, token) {
'type' : type,
'input_name' : input_name,
'get_gis_editor' : true,
- 'token' : token
+ 'token' : token,
+ 'ajax_request': true
}, function(data) {
if (data.success == true) {
$gis_editor.html(data.gis_editor);
@@ -190,7 +191,7 @@ function insertDataAndClose() {
var $form = $('form#gis_data_editor_form');
var input_name = $form.find("input[name='input_name']").val();
- $.post('gis_data_editor.php', $form.serialize() + "&generate=true", function(data) {
+ $.post('gis_data_editor.php', $form.serialize() + "&generate=true&ajax_request=true", function(data) {
if(data.success == true) {
$("input[name='" + input_name + "']").val(data.result);
} else {
@@ -226,7 +227,7 @@ $(function() {
*/
$('#gis_editor').find("input[type='text']").live('change', function() {
var $form = $('form#gis_data_editor_form');
- $.post('gis_data_editor.php', $form.serialize() + "&generate=true", function(data) {
+ $.post('gis_data_editor.php', $form.serialize() + "&generate=true&ajax_request=true", function(data) {
if(data.success == true) {
$('#gis_data_textarea').val(data.result);
$('#placeholder').empty().removeClass('hasSVG').html(data.visualization);
@@ -246,7 +247,7 @@ $(function() {
var $gis_editor = $("#gis_editor");
var $form = $('form#gis_data_editor_form');
- $.post('gis_data_editor.php', $form.serialize() + "&get_gis_editor=true", function(data) {
+ $.post('gis_data_editor.php', $form.serialize() + "&get_gis_editor=true&ajax_request=true", function(data) {
if(data.success == true) {
$gis_editor.html(data.gis_editor);
initGISEditorVisualization();
diff --git a/js/makegrid.js b/js/makegrid.js
index 00f49ea8a9..3edcb7f699 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -950,8 +950,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
$editArea.find('textarea').val($(this).val());
});
$editArea.append('' + g.cellEditHint + '
');
- }
- else {
+ } else {
PMA_ajaxShowMessage(data.error, false);
}
}); // end $.post()
diff --git a/js/navigation.js b/js/navigation.js
index cd65e595d8..f8e335cf16 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -180,12 +180,14 @@ function fast_filter(value)
}
fast_filter.ajax_semaphore = true;
$.get('db_tables_search.php?db=' + db +'&table=' + lowercase_value, function(data) {
+ if (data.tables) {
var tables = data.tables;
var l = tables.length;
for(var i = 0; i < l; i++) {
$('#subel0').append(tables[i].line);
}
fast_filter.ajax_semaphore = false;
+ }
});
}
}
diff --git a/js/server_databases.js b/js/server_databases.js
index 5fdff9344b..14684279f0 100644
--- a/js/server_databases.js
+++ b/js/server_databases.js
@@ -59,8 +59,7 @@ $(function() {
window.parent.frame_navigation.location.reload();
}
$('#tableslistcontainer').load('server_databases.php form#dbStatsForm');
- }
- else {
+ } else {
PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + ": " + data.error, false);
}
}); // end $.post()
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 5394f594dd..5303ac276f 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -169,22 +169,12 @@ $(function() {
} else {
$("#usersForm").remove();
}
- var $user_div = $('
');
- /*If the JSON string parsed correctly*/
- if (typeof priv_data.success != 'undefined') {
- if (priv_data.success == true) {
- $user_div
- .html(priv_data.user_form)
- .insertAfter('#result_query');
- } else {
- PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + priv_data.error, false);
- }
+ if (priv_data.success == true) {
+ $('
')
+ .html(priv_data.user_form)
+ .insertAfter('#result_query');
} else {
- /*parse the JSON string*/
- var obj = $.parseJSON(priv_data);
- $user_div
- .html(obj.user_form)
- .insertAfter('#result_query');
+ PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + priv_data.error, false);
}
});
} else {
@@ -199,7 +189,7 @@ $(function() {
$.get($(this).attr("href"), {'ajax_request':true}, function(data) {
var $div = $('
')
- .prepend(data)
+ .prepend(data.message)
.find("#fieldset_add_user_footer").hide() //showing the "Go" and "Create User" buttons together will confuse the user
.end()
.find("form[name=usersForm]").append('
')
- .append(data)
+ .append(data.message)
.dialog({
width: 900,
height: 600,
@@ -354,7 +342,7 @@ $(function() {
}); //dialog options end
displayPasswordGenerateButton();
PMA_ajaxRemoveMessage($msgbox);
- PMA_convertFootnotesToTooltips($div);
+ PMA_showHints($div);
}); // end $.get()
});
@@ -436,8 +424,7 @@ $(function() {
$("#usersForm")
.find('.current_row')
.removeClass('current_row');
- }
- else {
+ } else {
PMA_ajaxShowMessage(data.error, false);
}
});
@@ -562,7 +549,7 @@ $(function() {
$("#usersForm").hide("medium").remove();
$("#fieldset_add_user").hide("medium").remove();
$("#initials_table")
- .after(data).show("medium")
+ .after(data.message).show("medium")
.siblings("h2").not(":first").remove();
PMA_ajaxRemoveMessage($msgbox);
diff --git a/js/server_status.js b/js/server_status.js
index edd0c54658..eb0dfc1c3e 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -220,7 +220,7 @@ $(function() {
$.get($(this).attr('href'), { ajax_request: 1 }, function(data) {
$(that).find('img').hide();
- initTab(tab, data);
+ initTab(tab, data.message);
});
tabStatus[tab.attr('id')] = 'data';
@@ -437,7 +437,7 @@ $(function() {
if (data != null) {
tab.find('.tabInnerContent').html(data);
}
- PMA_convertFootnotesToTooltips();
+ PMA_showHints();
break;
case 'statustabs_queries':
if (data != null) {
@@ -646,7 +646,7 @@ $(function() {
$.get('server_status.php?' + url_query, { ajax_request: true, advisor: true }, function(data) {
var $tbody, $tr, str, even = true;
- data = $.parseJSON(data);
+ data = $.parseJSON(data.message);
$cnt.html('');
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index 6904beb21b..c24c91ab09 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -621,7 +621,7 @@ $(function() {
$.get('server_status.php?' + url_query, vars,
function(data) {
- var logVars = $.parseJSON(data),
+ var logVars = $.parseJSON(data.message),
icon = PMA_getImage('s_success.png'), msg='', str='';
if (logVars['general_log'] == 'ON') {
@@ -1202,7 +1202,7 @@ $(function() {
}, function(data) {
var chartData;
try {
- chartData = $.parseJSON(data);
+ chartData = $.parseJSON(data.message);
} catch(err) {
return serverResponseError();
}
@@ -1388,7 +1388,7 @@ $(function() {
function(data) {
var logData;
try {
- logData = $.parseJSON(data);
+ logData = $.parseJSON(data.message);
} catch(err) {
return serverResponseError();
}
@@ -1773,7 +1773,7 @@ $(function() {
query: codemirror_editor ? codemirror_editor.getValue() : $('#sqlquery').val(),
database: db
}, function(data) {
- data = $.parseJSON(data);
+ data = $.parseJSON(data.message);
var totalTime = 0;
if (data.error) {
diff --git a/js/server_variables.js b/js/server_variables.js
index 94ca6110da..1e952f4784 100644
--- a/js/server_variables.js
+++ b/js/server_variables.js
@@ -174,7 +174,7 @@ function editVariable(link)
$cell.html('' + $cell.html() + ' ');
// put edit field and save/cancel link
$cell.prepend('');
+ '
')
.html(data.sql_query)
@@ -217,9 +220,22 @@ $(function() {
// unnecessary div that came from data.sql_query
$('div.notice').remove();
} else {
- $('#sqlqueryform').before(data.message);
+ $sqlqueryresults
+ .show()
+ .html(data.message);
}
- $sqlqueryresults.show();
+ $sqlqueryresults.show().trigger('makegrid');
+ $('#togglequerybox').show();
+ PMA_init_slider();
+
+ if (typeof data.action_bookmark == 'undefined') {
+ if( $('#sqlqueryform input[name="retain_query_box"]').is(':checked') != true ) {
+ if ($("#togglequerybox").siblings(":visible").length > 0) {
+ $("#togglequerybox").trigger('click');
+ }
+ }
+ }
+
// this happens if a USE command was typed
if (typeof data.reload != 'undefined') {
// Unbind the submit event before reloading. See bug #3295529
@@ -236,29 +252,6 @@ $(function() {
// show an error message that stays on screen
$('#sqlqueryform').before(data.error);
$sqlqueryresults.hide();
- } else {
- // real results are returned
- // fade out previous messages, if any
- $('div.success, div.sqlquery_message').fadeOut();
- var $received_data = $(data);
- var $zero_row_results = $received_data.find('textarea[name="sql_query"]');
- // if zero rows are returned from the query execution
- if ($zero_row_results.length > 0) {
- $('#sqlquery').val($zero_row_results.val());
- setQuery($('#sqlquery').val());
- } else {
- $sqlqueryresults
- .show()
- .html(data)
- .trigger('makegrid');
- $('#togglequerybox').show();
- if( $('#sqlqueryform input[name="retain_query_box"]').is(':checked') != true ) {
- if ($("#togglequerybox").siblings(":visible").length > 0) {
- $("#togglequerybox").trigger('click');
- }
- }
- PMA_init_slider();
- }
}
PMA_ajaxRemoveMessage($msgbox);
}); // end $.post()
@@ -302,10 +295,9 @@ $(function() {
$.post($form.attr('action'), $form.serialize(), function(data) {
$("#sqlqueryresults")
- .html(data)
+ .html(data.message)
.trigger('makegrid');
PMA_init_slider();
-
PMA_ajaxRemoveMessage($msgbox);
}); // end $.post()
}
@@ -327,7 +319,7 @@ $(function() {
$.post($form.attr('action'), $form.serialize() + '&ajax_request=true', function(data) {
$("#sqlqueryresults")
- .html(data)
+ .html(data.message)
.trigger('makegrid');
PMA_init_slider();
PMA_ajaxRemoveMessage($msgbox);
@@ -353,7 +345,7 @@ $(function() {
$.get($anchor.attr('href'), $anchor.serialize() + '&ajax_request=true', function(data) {
$("#sqlqueryresults")
- .html(data)
+ .html(data.message)
.trigger('makegrid');
PMA_ajaxRemoveMessage($msgbox);
}); // end $.get()
@@ -372,7 +364,7 @@ $(function() {
$.post($form.attr('action'), $form.serialize() + '&ajax_request=true' , function(data) {
$("#sqlqueryresults")
- .html(data)
+ .html(data.message)
.trigger('makegrid');
PMA_init_slider();
}); // end $.post()
@@ -422,7 +414,7 @@ $(function() {
}); // end dialog options
} else {
$div
- .append(data)
+ .append(data.message)
.dialog({
title: PMA_messages['strChangeTbl'],
height: 600,
diff --git a/js/tbl_change.js b/js/tbl_change.js
index 04c5247fac..22fb5f8f70 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -322,6 +322,9 @@ $(function() {
* to previous page" and "insert another new row" actions, using AJAX
* has no obvious advantage. If inserting, the "go back to previous"
* action needs a page refresh anyway.
+ *
+ * 3. The handling of the response is also broken because PMA
+ * no longher returns plain HTML for an ajax request
*/
$("#insertFormDEACTIVATED").live('submit', function(event) {
diff --git a/js/tbl_select.js b/js/tbl_select.js
index bd50a10733..b8c9f386d5 100644
--- a/js/tbl_select.js
+++ b/js/tbl_select.js
@@ -52,11 +52,11 @@ $(function() {
PMA_prepareForAjaxRequest($search_form);
- $.post($search_form.attr('action'), $search_form.serialize(), function(response) {
+ $.post($search_form.attr('action'), $search_form.serialize(), function(data) {
PMA_ajaxRemoveMessage($msgbox);
- if (typeof response == 'string') {
+ if (data.success == true) {
// found results
- $("#sqlqueryresults").html(response);
+ $("#sqlqueryresults").html(data.message);
$("#sqlqueryresults").trigger('makegrid');
$('#tbl_search_form')
// workaround for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome.
@@ -71,14 +71,7 @@ $(function() {
// needed for the display options slider in the results
PMA_init_slider();
} else {
- // error message (zero rows)
- if (response.message != undefined) {
- $("#sqlqueryresults").html(response['message']);
- }
- // other error (syntax error?)
- if (response.error != undefined) {
- $("#sqlqueryresults").html(response['error']);
- }
+ $("#sqlqueryresults").html(data.error);
}
}); // end $.post()
});
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 2a931d206a..64800daf5b 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -64,8 +64,7 @@ $(function() {
$curr_row.hide("medium").remove();
// refresh the list of indexes (comes from sql.php)
$('#indexes').html(data.indexes_list);
- }
- else {
+ } else {
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
}
}); // end $.get()
@@ -104,8 +103,7 @@ $(function() {
if (typeof data.reload != 'undefined') {
window.parent.frame_content.location.reload();
}
- }
- else {
+ } else {
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
}
}); // end $.get()
@@ -158,8 +156,7 @@ $(function() {
$(this).remove();
});
}
- }
- else {
+ } else {
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
}
}); // end $.get()
@@ -265,7 +262,7 @@ $(function() {
$("#edit_index_dialog").dialog("close");
}
$('div.no_indexes_defined').hide();
- } else if (data.error != undefined) {
+ } else {
var $temp_div = $("").append(data.error);
if ($temp_div.find(".error code").length != 0) {
var $error = $temp_div.find(".error code").addClass("error");
@@ -281,14 +278,14 @@ $(function() {
};
var $msgbox = PMA_ajaxShowMessage();
$.get("tbl_indexes.php", url, function(data) {
- if (data.error) {
+ if (data.success == false) {
//in the case of an error, show the error message returned.
PMA_ajaxShowMessage(data.error, false);
} else {
PMA_ajaxRemoveMessage($msgbox);
// Show dialog if the request was successful
$div
- .append(data)
+ .append(data.message)
.dialog({
title: title,
width: 450,
@@ -301,7 +298,7 @@ $(function() {
});
checkIndexType();
checkIndexName("index_frm");
- PMA_convertFootnotesToTooltips($div);
+ PMA_showHints($div);
// Add a slider for selecting how many columns to add to the index
$div.find('.slider').slider({
animate: true,
@@ -390,7 +387,7 @@ $(function() {
}
$.post($form.prop("action"), serialized + "&ajax_request=true", function (data) {
- if (data.success != undefined && data.success == false) {
+ if (data.success == false) {
PMA_ajaxRemoveMessage($msgbox);
$this
.clone()
@@ -410,8 +407,7 @@ $(function() {
// loop through the correct order
for (var i in data.columns) {
var the_column = data.columns[i];
- var $the_row
- = $rows
+ var $the_row = $rows
.find("input:checkbox[value=" + the_column + "]")
.closest("tr");
// append the row for this column to the table
@@ -526,7 +522,7 @@ $(function() {
}); // end dialog options
} else {
$div
- .append(data)
+ .append(data.message)
.dialog({
title: PMA_messages['strAddColumns'],
height: 600,
@@ -542,7 +538,7 @@ $(function() {
$div = $("#add_columns");
/*changed the z-index of the enum editor to allow the edit*/
$("#enum_editor").css("z-index", "1100");
- PMA_convertFootnotesToTooltips($div);
+ PMA_showHints($div);
// set focus on first column name input
$div.find("input.textfield").eq(0).focus();
}
@@ -604,7 +600,7 @@ function changeColumns(action,url)
}); // end dialog options
} else {
$div
- .append(data)
+ .append(data.message)
.dialog({
title: PMA_messages['strChangeTbl'],
height: 600,
@@ -620,7 +616,7 @@ function changeColumns(action,url)
/*changed the z-index of the enum editor to allow the edit*/
$("#enum_editor").css("z-index", "1100");
$div = $("#change_column_dialog");
- PMA_convertFootnotesToTooltips($div);
+ PMA_showHints($div);
}
PMA_ajaxRemoveMessage($msgbox);
}); // end $.get()
@@ -673,7 +669,7 @@ $(function() {
/*Reload the field form*/
reloadFieldForm(data.message);
} else {
- var $temp_div = $("
").append(data);
+ var $temp_div = $("
").append(data.error);
var $error = $temp_div.find(".error code").addClass("error");
PMA_ajaxShowMessage($error, false);
}
@@ -693,7 +689,7 @@ $(function() {
*/
function reloadFieldForm(message) {
$.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize()+"&ajax_request=true", function(form_data) {
- var $temp_div = $("
").append(form_data);
+ var $temp_div = $("
").append(form_data.message);
$("#fieldsForm").replaceWith($temp_div.find("#fieldsForm"));
$("#addColumns").replaceWith($temp_div.find("#addColumns"));
$('#move_columns_dialog ul').replaceWith($temp_div.find("#move_columns_dialog ul"));
diff --git a/js/tbl_zoom_plot_jqplot.js b/js/tbl_zoom_plot_jqplot.js
index 7476db0e2f..4c3b0706fa 100644
--- a/js/tbl_zoom_plot_jqplot.js
+++ b/js/tbl_zoom_plot_jqplot.js
@@ -12,10 +12,7 @@
** Display Help/Info
**/
function displayHelp() {
- var msgbox = PMA_ajaxShowMessage(PMA_messages['strDisplayHelp'], 10000);
- msgbox.click(function() {
- PMA_ajaxRemoveMessage(msgbox);
- });
+ PMA_ajaxShowMessage(PMA_messages['strDisplayHelp'], 10000);
}
/**
@@ -264,14 +261,14 @@ $(document).ready(function() {
//Find changed values by comparing form values with selectedRow Object
var newValues = new Object();//Stores the values changed from original
var sqlTypes = new Object();
- var it = 4;
+ var it = 0;
var xChange = false;
var yChange = false;
for (key in selectedRow) {
var oldVal = selectedRow[key];
- var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val();
+ var newVal = ($('#edit_fields_null_id_' + it).attr('checked')) ? null : $('#edit_fieldID_' + it).val();
if (newVal instanceof Array) { // when the column is of type SET
- newVal = $('#fieldID_' + it).map(function(){
+ newVal = $('#edit_fieldID_' + it).map(function(){
return $(this).val();
}).get().join(",");
}
@@ -286,7 +283,7 @@ $(document).ready(function() {
searchedData[searchedDataKey][yLabel] = newVal;
}
}
- var $input = $('#fieldID_' + it);
+ var $input = $('#edit_fieldID_' + it);
if ($input.hasClass('bit')) {
sqlTypes[key] = 'bit';
}
@@ -534,6 +531,7 @@ $(document).ready(function() {
// resizing, it's ok
// under IE 9, everything is fine
currentChart = $.jqplot('querychart', series, options);
+ currentChart.resetZoom();
$('button.button-reset').click(function(event) {
event.preventDefault();
@@ -551,7 +549,7 @@ $(document).ready(function() {
$('div#querychart').bind('jqplotDataClick',
function(event, seriesIndex, pointIndex, data) {
searchedDataKey = data[4]; // key from searchedData (global)
- var field_id = 4;
+ var field_id = 0;
var post_params = {
'ajax_request' : true,
'get_data_row' : true,
@@ -565,8 +563,8 @@ $(document).ready(function() {
// Row is contained in data.row_info,
// now fill the displayResultForm with row values
for (key in data.row_info) {
- $field = $('#fieldID_' + field_id);
- $field_null = $('#fields_null_id_' + field_id);
+ $field = $('#edit_fieldID_' + field_id);
+ $field_null = $('#edit_fields_null_id_' + field_id);
if (data.row_info[key] == null) {
$field_null.attr('checked', true);
$field.val('');
diff --git a/libraries/Error.class.php b/libraries/Error.class.php
index 06498917a3..306d2c19b5 100644
--- a/libraries/Error.class.php
+++ b/libraries/Error.class.php
@@ -255,7 +255,9 @@ class PMA_Error extends PMA_Message
$retval = '';
foreach ($this->getBacktrace() as $step) {
- $retval .= PMA_Error::relPath($step['file']) . '#' . $step['line'] . ': ';
+ if (isset($step['file']) && isset($step['line'])) {
+ $retval .= PMA_Error::relPath($step['file']) . '#' . $step['line'] . ': ';
+ }
if (isset($step['class'])) {
$retval .= $step['class'] . $step['type'];
}
@@ -317,6 +319,7 @@ class PMA_Error extends PMA_Message
*/
public function getDisplay()
{
+ $this->isDisplayed(true);
$retval = '
';
if (! $this->isUserError()) {
$retval .= '
' . $this->getType() . ' ';
diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php
index ef3ed50fba..d623c321ca 100644
--- a/libraries/Error_Handler.class.php
+++ b/libraries/Error_Handler.class.php
@@ -64,8 +64,8 @@ class PMA_Error_Handler
if (count($_SESSION['errors']) >= 20) {
$error = new PMA_Error(0, __('Too many error messages, some are not displayed.'), __FILE__, __LINE__);
$_SESSION['errors'][$error->getHash()] = $error;
- }
- if (($error instanceof PMA_Error) && ! $error->isDisplayed()) {
+ break;
+ } else if (($error instanceof PMA_Error) && ! $error->isDisplayed()) {
$_SESSION['errors'][$key] = $error;
}
}
@@ -205,17 +205,29 @@ class PMA_Error_Handler
}
/**
- * display user errors not displayed
+ * Displays user errors not displayed
*
* @return void
*/
public function dispUserErrors()
{
+ echo $this->getDispUserErrors();
+ }
+
+ /**
+ * Renders user errors not displayed
+ *
+ * @return string
+ */
+ public function getDispUserErrors()
+ {
+ $retval = '';
foreach ($this->getErrors() as $error) {
if ($error->isUserError() && ! $error->isDisplayed()) {
- $error->display();
+ $retval .= $error->getDisplay();
}
}
+ return $retval;
}
/**
@@ -227,6 +239,7 @@ class PMA_Error_Handler
*/
protected function dispPageStart($error = null)
{
+ PMA_Response::getInstance()->disable();
echo '
';
if ($error) {
echo $error->getTitle();
@@ -259,25 +272,39 @@ class PMA_Error_Handler
}
/**
- * display errors not displayed
+ * renders errors not displayed
+ *
+ * @return void
+ */
+ public function getDispErrors()
+ {
+ $retval = '';
+ if ($GLOBALS['cfg']['Error_Handler']['display']) {
+ foreach ($this->getErrors() as $error) {
+ if ($error instanceof PMA_Error) {
+ if (! $error->isDisplayed()) {
+ $retval .= $error->getDisplay();
+ }
+ } else {
+ ob_start();
+ var_dump($error);
+ $retval .= ob_end_clean();
+ }
+ }
+ } else {
+ $retval .= $this->getDispUserErrors();
+ }
+ return $retval;
+ }
+
+ /**
+ * displays errors not displayed
*
* @return void
*/
public function dispErrors()
{
- if ($GLOBALS['cfg']['Error_Handler']['display']) {
- foreach ($this->getErrors() as $error) {
- if ($error instanceof PMA_Error) {
- if (! $error->isDisplayed()) {
- $error->display();
- }
- } else {
- var_dump($error);
- }
- }
- } else {
- $this->dispUserErrors();
- }
+ echo $this->getDispErrors();
}
/**
@@ -297,7 +324,7 @@ class PMA_Error_Handler
}
//$this->errors = array_merge($_SESSION['errors'], $this->errors);
- // delet stored errors
+ // delete stored errors
$_SESSION['errors'] = array();
unset($_SESSION['errors']);
}
diff --git a/libraries/Footer.class.php b/libraries/Footer.class.php
new file mode 100644
index 0000000000..d231e134cc
--- /dev/null
+++ b/libraries/Footer.class.php
@@ -0,0 +1,334 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Used to render the footer of PMA's pages
+ *
+ * @package PhpMyAdmin
+ */
+if (! defined('PHPMYADMIN')) {
+ exit;
+}
+
+require_once 'libraries/Scripts.class.php';
+
+/**
+ * Class used to output the footer
+ *
+ * @package PhpMyAdmin
+ */
+class PMA_Footer
+{
+ /**
+ * PMA_Scripts instance
+ *
+ * @access private
+ * @var object
+ */
+ private $_scripts;
+ /**
+ * Whether we are servicing an ajax request.
+ * We can't simply use $GLOBALS['is_ajax_request']
+ * here since it may have not been initialised yet.
+ *
+ * @access private
+ * @var bool
+ */
+ private $_isAjax;
+ /**
+ * Whether to only close the BODY and HTML tags
+ * or also include scripts, errors and links
+ *
+ * @access private
+ * @var bool
+ */
+ private $_isMinimal;
+ /**
+ * Whether to display anything
+ *
+ * @access private
+ * @var bool
+ */
+ private $_isEnabled;
+
+ /**
+ * Creates a new class instance
+ *
+ * @return new PMA_Footer object
+ */
+ public function __construct()
+ {
+ $this->_isEnabled = true;
+ $this->_scripts = new PMA_Scripts();
+ $this->_isMinimal = false;
+ $this->_addDefaultScripts();
+ }
+
+ /**
+ * Loads common scripts
+ *
+ * @return void
+ */
+ private function _addDefaultScripts()
+ {
+ if (empty($GLOBALS['error_message'])) {
+ $this->_scripts->addCode("
+ $(function() {
+ // updates current settings
+ if (window.parent.setAll) {
+ window.parent.setAll(
+ '" . PMA_escapeJsString($GLOBALS['lang']) . "',
+ '" . PMA_escapeJsString($GLOBALS['collation_connection']) . "',
+ '" . PMA_escapeJsString($GLOBALS['server']) . "',
+ '" . PMA_escapeJsString(PMA_ifSetOr($GLOBALS['db'], '')) . "',
+ '" . PMA_escapeJsString(PMA_ifSetOr($GLOBALS['table'], '')) . "',
+ '" . PMA_escapeJsString($_SESSION[' PMA_token ']) . "'
+ );
+ }
+ });
+ ");
+ if (! empty($GLOBALS['reload'])) {
+ $this->_scripts->addCode("
+ // refresh navigation frame content
+ if (window.parent.refreshNavigation) {
+ window.parent.refreshNavigation();
+ }
+ ");
+ } else if (isset($_GET['reload_left_frame'])
+ && $_GET['reload_left_frame'] == '1'
+ ) {
+ // reload left frame (used by user preferences)
+ $this->_scripts->addCode("
+ if (window.parent && window.parent.frame_navigation) {
+ window.parent.frame_navigation.location.reload();
+ }
+ ");
+ }
+
+ // set current db, table and sql query in the querywindow
+ $query = '';
+ if (strlen($GLOBALS['sql_query']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
+ $query = PMA_escapeJsString($GLOBALS['sql_query']);
+ }
+ $this->_scripts->addCode("
+ if (window.parent.reload_querywindow) {
+ window.parent.reload_querywindow(
+ '" . PMA_escapeJsString(PMA_ifSetOr($GLOBALS['db'], '')) . "',
+ '" . PMA_escapeJsString(PMA_ifSetOr($GLOBALS['table'], '')) . "',
+ '" . $query . "'
+ );
+ }
+ ");
+
+ if (! empty($GLOBALS['focus_querywindow'])) {
+ // set focus to the querywindow
+ $this->_scripts->addCode("
+ if (parent.querywindow && !parent.querywindow.closed
+ && parent.querywindow.location
+ ) {
+ self.focus();
+ }
+ ");
+ }
+ $this->_scripts->addCode("
+ if (window.parent.frame_content) {
+ // reset content frame name, as querywindow needs
+ // to set a unique name before submitting form data,
+ // and navigation frame needs the original name
+ if (typeof(window.parent.frame_content.name) != 'undefined'
+ && window.parent.frame_content.name != 'frame_content') {
+ window.parent.frame_content.name = 'frame_content';
+ }
+ if (typeof(window.parent.frame_content.id) != 'undefined'
+ && window.parent.frame_content.id != 'frame_content') {
+ window.parent.frame_content.id = 'frame_content';
+ }
+ //window.parent.frame_content.setAttribute('name', 'frame_content');
+ //window.parent.frame_content.setAttribute('id', 'frame_content');
+ }
+ ");
+ }
+ }
+
+ /**
+ * Renders the debug messages
+ *
+ * @return string
+ */
+ private function _getDebugMessage()
+ {
+ $retval = '';
+ if (! empty($_SESSION['debug'])) {
+ $sum_time = 0;
+ $sum_exec = 0;
+ foreach ($_SESSION['debug']['queries'] as $query) {
+ $sum_time += $query['count'] * $query['time'];
+ $sum_exec += $query['count'];
+ }
+
+ $retval .= '<div>';
+ $retval .= count($_SESSION['debug']['queries']) . ' queries executed ';
+ $retval .= $sum_exec . ' times in ' . $sum_time . ' seconds';
+ $retval .= '<pre>';
+
+ ob_start();
+ print_r($_SESSION['debug']);
+ $retval .= ob_end_clean();
+
+ $retval .= '</pre>';
+ $retval .= '</div>';
+ $_SESSION['debug'] = array();
+ }
+ return $retval;
+ }
+
+ /**
+ * Renders the link to open a new page
+ *
+ * @param string $url_params URL paramater string
+ *
+ * @return string
+ */
+ private function _getSelfLink($url_params)
+ {
+ $retval = '';
+ $retval .= '<div id="selflink" class="print_ignore">';
+ $retval .= '<a href="index.php' . PMA_generate_common_url($url_params) . '"'
+ . ' title="' . __('Open new phpMyAdmin window') . '" target="_blank">';
+ if ($GLOBALS['cfg']['NavigationBarIconic']) {
+ $retval .= PMA_getImage(
+ 'window-new.png',
+ __('Open new phpMyAdmin window')
+ );
+ } else {
+ $retval .= __('Open new phpMyAdmin window');
+ }
+ $retval .= '</a>';
+ $retval .= '</div>';
+ return $retval;
+ }
+
+ /**
+ * Renders the link to open a new page
+ *
+ * @return string
+ */
+ private function _getErrorMessages()
+ {
+ $retval = '';
+ if ($GLOBALS['error_handler']->hasDisplayErrors()) {
+ $retval .= '<div class="clearfloat">';
+ $retval .= $GLOBALS['error_handler']->getDispErrors();
+ $retval .= '</div>';
+ }
+ return $retval;
+ }
+
+ /**
+ * Saves query in history
+ *
+ * @return void
+ */
+ private function _setHistory()
+ {
+ if (! PMA_isValid($_REQUEST['no_history'])
+ && empty($GLOBALS['error_message'])
+ && ! empty($GLOBALS['sql_query'])
+ ) {
+ PMA_setHistory(
+ PMA_ifSetOr($GLOBALS['db'], ''),
+ PMA_ifSetOr($GLOBALS['table'], ''),
+ $GLOBALS['cfg']['Server']['user'],
+ $GLOBALS['sql_query']
+ );
+ }
+ }
+
+ /**
+ * Disables the rendering of the footer
+ *
+ * @return void
+ */
+ public function disable()
+ {
+ $this->_isEnabled = false;
+ }
+
+ /**
+ * Set the ajax flag to indicate whether
+ * we are sevicing an ajax request
+ *
+ * @param bool $isAjax Whether we are sevicing an ajax request
+ *
+ * @return void
+ */
+ public function setAjax($isAjax)
+ {
+ $this->_isAjax = ($isAjax == true);
+ }
+
+ /**
+ * Turn on minimal display mode
+ *
+ * @return void
+ */
+ public function setMinimal()
+ {
+ $this->_isMinimal = true;
+ }
+
+ /**
+ * Returns the PMA_Scripts object
+ *
+ * @return PMA_Scripts object
+ */
+ public function getScripts()
+ {
+ return $this->_scripts;
+ }
+
+ /**
+ * Renders the footer
+ *
+ * @return string
+ */
+ public function getDisplay()
+ {
+ $retval = '';
+ $this->_setHistory();
+ if ($this->_isEnabled) {
+ if (! $this->_isAjax && ! $this->_isMinimal) {
+ // Link to itself to replicate windows including frameset
+ if (! isset($GLOBALS['checked_special'])) {
+ $GLOBALS['checked_special'] = false;
+ }
+ if (PMA_getenv('SCRIPT_NAME')
+ && empty($_POST)
+ && ! $GLOBALS['checked_special']
+ && ! $this->_isAjax
+ ) {
+ $url_params['target'] = basename(PMA_getenv('SCRIPT_NAME'));
+ $url = PMA_generate_common_url($url_params, 'text', '');
+ $this->_scripts->addCode("
+ // Store current location in hash part
+ // of URL to allow direct bookmarking
+ setURLHash('$url');
+ ");
+ $retval .= $this->_getSelfLink($url_params);
+ }
+ $retval .= $this->_getDebugMessage();
+ $retval .= $this->_getErrorMessages();
+ $retval .= $this->_scripts->getDisplay();
+ // Include possible custom footers
+ if (file_exists(CUSTOM_FOOTER_FILE)) {
+ ob_start();
+ include CUSTOM_FOOTER_FILE;
+ $retval .= ob_end_clean();
+ }
+ } else if (! $this->_isAjax) {
+ $retval .= "</body></html>";
+ }
+ }
+
+ return $retval;
+ }
+}
diff --git a/libraries/Header.class.php b/libraries/Header.class.php
new file mode 100644
index 0000000000..eaabde56c8
--- /dev/null
+++ b/libraries/Header.class.php
@@ -0,0 +1,528 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Used to render the header of PMA's pages
+ *
+ * @package PhpMyAdmin
+ */
+if (! defined('PHPMYADMIN')) {
+ exit;
+}
+
+require_once 'libraries/Scripts.class.php';
+require_once 'libraries/RecentTable.class.php';
+require_once 'libraries/Menu.class.php';
+
+/**
+ * Class used to output the HTTP and HTML headers
+ *
+ * @package PhpMyAdmin
+ */
+class PMA_Header
+{
+ /**
+ * PMA_Scripts instance
+ *
+ * @access private
+ * @var object
+ */
+ private $_scripts;
+ /**
+ * PMA_Menu instance
+ *
+ * @access private
+ * @var object
+ */
+ private $_menu;
+ /**
+ * Whether to offer the option of importing user settings
+ *
+ * @access private
+ * @var bool
+ */
+ private $_userprefsOfferImport;
+ /**
+ * The page title
+ *
+ * @access private
+ * @var string
+ */
+ private $_title;
+ /**
+ * The value for the id attribute for the body tag
+ *
+ * @access private
+ * @var string
+ */
+ private $_bodyId;
+ /**
+ * Whether to show the top menu
+ *
+ * @access private
+ * @var bool
+ */
+ private $_menuEnabled;
+ /**
+ * Whether to show the warnings
+ *
+ * @access private
+ * @var bool
+ */
+ private $_warningsEnabled;
+ /**
+ * Whether the page is in 'print view' mode
+ *
+ * @access private
+ * @var bool
+ */
+ private $_isPrintView;
+ /**
+ * Whether we are servicing an ajax request.
+ * We can't simply use $GLOBALS['is_ajax_request']
+ * here since it may have not been initialised yet.
+ *
+ * @access private
+ * @var bool
+ */
+ private $_isAjax;
+ /**
+ * Whether to display anything
+ *
+ * @access private
+ * @var bool
+ */
+ private $_isEnabled;
+ /**
+ * Whether the HTTP headers (and possibly some HTML)
+ * have already been sent to the browser
+ *
+ * @access private
+ * @var bool
+ */
+ private $_headerIsSent;
+
+ /**
+ * Creates a new class instance
+ *
+ * @return new PMA_Header object
+ */
+ public function __construct()
+ {
+ $this->_isEnabled = true;
+ $this->_isAjax = false;
+ $this->_bodyId = '';
+ $this->_title = '';
+ $this->_menu = new PMA_Menu(
+ $GLOBALS['server'],
+ $GLOBALS['db'],
+ $GLOBALS['table']
+ );
+ $this->_menuEnabled = true;
+ $this->_warningsEnabled = true;
+ $this->_isPrintView = false;
+ $this->_scripts = new PMA_Scripts();
+ $this->_addDefaultScripts();
+ $this->_headerIsSent = false;
+ // if database storage for user preferences is transient,
+ // offer to load exported settings from localStorage
+ // (detection will be done in JavaScript)
+ $this->_userprefsOfferImport = false;
+ if ($GLOBALS['PMA_Config']->get('user_preferences') == 'session'
+ && ! isset($_SESSION['userprefs_autoload'])
+ ) {
+ $this->_userprefsOfferImport = true;
+ }
+ }
+
+ /**
+ * Loads common scripts
+ *
+ * @return void
+ */
+ private function _addDefaultScripts()
+ {
+ $this->_scripts->addFile('jquery/jquery-1.6.2.js');
+ $this->_scripts->addFile('jquery/jquery-ui-1.8.16.custom.js');
+ $this->_scripts->addFile('jquery/jquery.sprintf.js');
+ $this->_scripts->addFile('update-location.js');
+
+ $this->_scripts->addFile('jquery/jquery.qtip-1.0.0-rc3.js');
+ if ($GLOBALS['cfg']['CodemirrorEnable']) {
+ $this->_scripts->addFile('codemirror/lib/codemirror.js');
+ $this->_scripts->addFile('codemirror/mode/mysql/mysql.js');
+ }
+ // Cross-framing protection
+ if ($GLOBALS['cfg']['AllowThirdPartyFraming'] === false) {
+ $this->_scripts->addFile('cross_framing_protection.js');
+ }
+ // Localised strings
+ $params = array('lang' => $GLOBALS['lang']);
+ if (isset($GLOBALS['db'])) {
+ $params['db'] = $GLOBALS['db'];
+ }
+ $this->_scripts->addFile('messages.php' . PMA_generate_common_url($params));
+ // Append the theme id to this url to invalidate
+ // the cache on a theme change
+ $this->_scripts->addFile(
+ 'get_image.js.php?theme='
+ . urlencode($_SESSION['PMA_Theme']->getId())
+ );
+ $this->_scripts->addFile('functions.js');
+ $this->_scripts->addCode(PMA_getReloadNavigationScript(true));
+ }
+
+ /**
+ * Disables the rendering of the header
+ *
+ * @return void
+ */
+ public function disable()
+ {
+ $this->_isEnabled = false;
+ }
+
+ /**
+ * Set the ajax flag to indicate whether
+ * we are sevicing an ajax request
+ *
+ * @param bool $isAjax Whether we are sevicing an ajax request
+ *
+ * @return void
+ */
+ public function setAjax($isAjax)
+ {
+ $this->_isAjax = ($isAjax == true);
+ }
+
+ /**
+ * Returns the PMA_Scripts object
+ *
+ * @return PMA_Scripts object
+ */
+ public function getScripts()
+ {
+ return $this->_scripts;
+ }
+
+ /**
+ * Setter for the ID attribute in the BODY tag
+ *
+ * @param string $id Value for the ID attribute
+ *
+ * @return void
+ */
+ public function setBodyId($id)
+ {
+ $this->_bodyId = htmlspecialchars($id);
+ }
+
+ /**
+ * Setter for the title of the page
+ *
+ * @param string $title New title
+ *
+ * @return void
+ */
+ public function setTitle($title)
+ {
+ $this->_title = htmlspecialchars($title);
+ }
+
+ /**
+ * Disables the display of the top menu
+ *
+ * @return void
+ */
+ public function disableMenu()
+ {
+ $this->_menuEnabled = false;
+ }
+
+ /**
+ * Disables the display of the top menu
+ *
+ * @return void
+ */
+ public function disableWarnings()
+ {
+ $this->_warningsEnabled = false;
+ }
+
+ /**
+ * Turns on 'print view' mode
+ *
+ * @return void
+ */
+ public function enablePrintView()
+ {
+ $this->disableMenu();
+ $this->setTitle(__('Print view') . ' - phpMyAdmin ' . PMA_VERSION);
+ $this->_isPrintView = true;
+ }
+
+ /**
+ * Generates the header
+ *
+ * @return string The header
+ */
+ public function getDisplay()
+ {
+ $retval = '';
+ if (! $this->_headerIsSent) {
+ if (! $this->_isAjax && $this->_isEnabled) {
+ $this->sendHttpHeaders();
+ $retval .= $this->_getHtmlStart();
+ $retval .= $this->_getMetaTags();
+ $retval .= $this->_getLinkTags();
+ $retval .= $this->_getTitleTag();
+ $title = PMA_sanitize(
+ PMA_escapeJsString($this->_getPageTitle()),
+ false,
+ true
+ );
+ $this->_scripts->addCode(
+ "if (typeof(parent.document) != 'undefined'"
+ . " && typeof(parent.document) != 'unknown'"
+ . " && typeof(parent.document.title) == 'string')"
+ . "{"
+ . "parent.document.title = '$title'"
+ . "}"
+ );
+ if ($this->_userprefsOfferImport) {
+ $this->_scripts->addFile('config.js');
+ }
+ $retval .= $this->_scripts->getDisplay();
+ $retval .= $this->_getBodyStart();
+ // Include possible custom headers
+ if (file_exists(CUSTOM_HEADER_FILE)) {
+ ob_start();
+ include CUSTOM_HEADER_FILE;
+ $retval .= ob_end_clean();
+ }
+ // offer to load user preferences from localStorage
+ if ($this->_userprefsOfferImport) {
+ include_once './libraries/user_preferences.lib.php';
+ $retval .= PMA_userprefsAutoloadGetHeader();
+ }
+ // pass configuration for hint tooltip display
+ // (to be used by PMA_createqTip in js/functions.js)
+ if (! $GLOBALS['cfg']['ShowHint']) {
+ $retval .= '<span id="no_hint" class="hide"></span>';
+ }
+ $retval .= $this->_getWarnings();
+ if ($this->_menuEnabled && $GLOBALS['server'] > 0) {
+ $retval .= $this->_menu->getDisplay();
+ }
+ $retval .= $this->_addRecentTable(
+ $GLOBALS['db'],
+ $GLOBALS['table']
+ );
+ }
+ }
+ return $retval;
+ }
+
+ /**
+ * Sends out the HTTP headers
+ *
+ * @return void
+ */
+ public function sendHttpHeaders()
+ {
+ /**
+ * Sends http headers
+ */
+ $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT';
+ /* Prevent against ClickJacking by allowing frames only from same origin */
+ if (! $GLOBALS['cfg']['AllowThirdPartyFraming']) {
+ header(
+ 'X-Frame-Options: SAMEORIGIN'
+ );
+ header(
+ "X-Content-Security-Policy: allow 'self'; "
+ . "options inline-script eval-script; "
+ . "frame-ancestors 'self'; img-src 'self' data:; "
+ . "script-src 'self' http://www.phpmyadmin.net"
+ );
+ header(
+ "X-WebKit-CSP: allow 'self' http://www.phpmyadmin.net; "
+ . "options inline-script eval-script"
+ );
+ }
+ PMA_noCacheHeader();
+ if (! defined('IS_TRANSFORMATION_WRAPPER')) {
+ // Define the charset to be used
+ header('Content-Type: text/html; charset=utf-8');
+ }
+ $this->_headerIsSent = true;
+ }
+
+ /**
+ * Returns the DOCTYPE and the start HTML tag
+ *
+ * @return string DOCTYPE and HTML tags
+ */
+ private function _getHtmlStart()
+ {
+ $lang = $GLOBALS['available_languages'][$GLOBALS['lang']][1];
+ $dir = $GLOBALS['text_dir'];
+
+ $retval = "<!DOCTYPE HTML>";
+ $retval .= "<html lang='$lang' dir='$dir'>";
+
+ return $retval;
+ }
+
+ /**
+ * Returns the META tags
+ *
+ * @return string the META tags
+ */
+ private function _getMetaTags()
+ {
+ $retval = '<meta charset="utf-8" />';
+ $retval .= '<meta name="robots" content="noindex,nofollow" />';
+ return $retval;
+ }
+
+ /**
+ * Returns the LINK tags for the favicon and the stylesheets
+ *
+ * @return string the LINK tags
+ */
+ private function _getLinkTags()
+ {
+ $retval = '<link rel="icon" href="favicon.ico" '
+ . 'type="image/x-icon" />'
+ . '<link rel="shortcut icon" href="favicon.ico" '
+ . 'type="image/x-icon" />';
+ // stylesheets
+ $basedir = defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : '';
+ $common_url = PMA_generate_common_url(array('server' => $GLOBALS['server']));
+ $theme_id = $GLOBALS['PMA_Config']->getThemeUniqueValue();
+ $theme_path = $GLOBALS['pmaThemePath'];
+
+ if ($this->_isPrintView) {
+ $retval .= '<link rel="stylesheet" type="text/css" href="'
+ . $basedir . 'print.css" media="print" />';
+ } else {
+ $retval .= '<link rel="stylesheet" type="text/css" href="'
+ . $basedir . 'phpmyadmin.css.php'
+ . $common_url . '&nocache='
+ . $theme_id . '" />';
+ $retval .= '<link rel="stylesheet" type="text/css" href="'
+ . $theme_path . '/jquery/jquery-ui-1.8.16.custom.css" />';
+ }
+
+ return $retval;
+ }
+
+ /**
+ * Returns the TITLE tag
+ *
+ * @return string the TITLE tag
+ */
+ private function _getTitleTag()
+ {
+ $retval = "<title>";
+ $retval .= $this->_getPageTitle();
+ $retval .= " ";
+ return $retval;
+ }
+
+ /**
+ * If the page is missing the title, this function
+ * will set it to something reasonable
+ *
+ * @return string
+ */
+ private function _getPageTitle()
+ {
+ if (empty($this->_title)) {
+ if ($GLOBALS['server'] > 0) {
+ if (! empty($GLOBALS['table'])) {
+ $temp_title = $GLOBALS['cfg']['TitleTable'];
+ } else if (! empty($GLOBALS['db'])) {
+ $temp_title = $GLOBALS['cfg']['TitleDatabase'];
+ } elseif (! empty($GLOBALS['cfg']['Server']['host'])) {
+ $temp_title = $GLOBALS['cfg']['TitleServer'];
+ } else {
+ $temp_title = $GLOBALS['cfg']['TitleDefault'];
+ }
+ $this->_title = htmlspecialchars(
+ PMA_expandUserString($temp_title)
+ );
+ } else {
+ $this->_title = 'phpMyAdmin';
+ }
+ }
+ return $this->_title;
+ }
+
+ /**
+ * Returns the close tag to the HEAD
+ * and the start tag for the BODY
+ *
+ * @return string HEAD and BODY tags
+ */
+ private function _getBodyStart()
+ {
+ $retval = "
_bodyId)) {
+ $retval .= " id='" . $this->_bodyId . "'";
+ }
+ $retval .= ">";
+ return $retval;
+ }
+
+ /**
+ * Returns some warnings to be displayed at the top of the page
+ *
+ * @return string The warnings
+ */
+ private function _getWarnings()
+ {
+ $retval = '';
+ if ($this->_warningsEnabled) {
+ // message of "Cookies required" displayed for auth_type http or config
+ // note: here, the decoration won't work because without cookies,
+ // our standard CSS is not operational
+ if (empty($_COOKIE)) {
+ $retval .= PMA_Message::notice(
+ __('Cookies must be enabled past this point.')
+ )->getDisplay();
+ }
+ $retval .= "";
+ $retval .= PMA_message::error(
+ __("Javascript must be enabled past this point")
+ )->getDisplay();
+ $retval .= " ";
+ }
+ return $retval;
+ }
+
+ /**
+ * Add recently used table and reload the navigation.
+ *
+ * @param string $db Database name where the table is located.
+ * @param string $table The table name
+ *
+ * @return string
+ */
+ private function _addRecentTable($db, $table)
+ {
+ $retval = '';
+ if (strlen($table) && $GLOBALS['cfg']['LeftRecentTable'] > 0) {
+ $tmp_result = PMA_RecentTable::getInstance()->add($db, $table);
+ if ($tmp_result === true) {
+ $retval = ''
. $this->getMessage() . '
';
}
diff --git a/libraries/OutputBuffering.class.php b/libraries/OutputBuffering.class.php
new file mode 100644
index 0000000000..782e7d0686
--- /dev/null
+++ b/libraries/OutputBuffering.class.php
@@ -0,0 +1,129 @@
+_mode = $this->_getMode();
+ $this->_on = false;
+ }
+
+ /**
+ * This function could be used eventually to support more modes.
+ *
+ * @return integer the output buffer mode
+ */
+ private function _getMode()
+ {
+ $mode = 0;
+ if ($GLOBALS['cfg']['OBGzip'] && function_exists('ob_start')) {
+ if (ini_get('output_handler') == 'ob_gzhandler') {
+ // If a user sets the output_handler in php.ini to ob_gzhandler, then
+ // any right frame file in phpMyAdmin will not be handled properly by
+ // the browser. My fix was to check the ini file within the
+ // PMA_outBufferModeGet() function.
+ $mode = 0;
+ } elseif (function_exists('ob_get_level') && ob_get_level() > 0) {
+ // If output buffering is enabled in php.ini it's not possible to
+ // add the ob_gzhandler without a warning message from php 4.3.0.
+ // Being better safe than sorry, check for any existing output handler
+ // instead of just checking the 'output_buffering' setting.
+ $mode = 0;
+ } else {
+ $mode = 1;
+ }
+ }
+ // Zero (0) is no mode or in other words output buffering is OFF.
+ // Follow 2^0, 2^1, 2^2, 2^3 type values for the modes.
+ // Usefull if we ever decide to combine modes. Then a bitmask field of
+ // the sum of all modes will be the natural choice.
+ return $mode;
+ }
+
+ /**
+ * Returns the singleton PMA_OutputBuffering object
+ *
+ * @return PMA_OutputBuffering object
+ */
+ public static function getInstance()
+ {
+ if (empty(self::$_instance)) {
+ self::$_instance = new PMA_OutputBuffering();
+ }
+ return self::$_instance;
+ }
+
+ /**
+ * This function will need to run at the top of all pages if output
+ * output buffering is turned on. It also needs to be passed $mode from
+ * the PMA_outBufferModeGet() function or it will be useless.
+ *
+ */
+ public function start()
+ {
+ if (! $this->_on) {
+ if ($this->_mode) {
+ ob_start('ob_gzhandler');
+ }
+ ob_start();
+ header('X-ob_mode: ' . $this->_mode);
+ register_shutdown_function('PMA_OutputBuffering::stop');
+ $this->_on = true;
+ }
+ }
+
+ /**
+ * This function will need to run at the bottom of all pages if output
+ * buffering is turned on. It also needs to be passed $mode from the
+ * PMA_outBufferModeGet() function or it will be useless.
+ *
+ */
+ public static function stop()
+ {
+ $buffer = PMA_OutputBuffering::getInstance();
+ if ($buffer->_on) {
+ $buffer->_on = false;
+ $buffer->_content = ob_get_contents();
+ ob_end_clean();
+ }
+ PMA_Response::response();
+ }
+
+ public function getContents()
+ {
+ return $this->_content;
+ }
+
+ public function flush()
+ {
+ if (ob_get_status() && $this->_mode) {
+ ob_flush();
+ }
+ /**
+ * previously we had here an "else flush()" but some PHP versions
+ * (at least PHP 5.2.11) have a bug (49816) that produces garbled
+ * data
+ */
+ }
+}
+
+?>
diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php
index 99ea2035a9..54b83e1203 100644
--- a/libraries/PDF.class.php
+++ b/libraries/PDF.class.php
@@ -85,9 +85,8 @@ class PMA_PDF extends TCPDF
*/
function Error($error_message = '')
{
- include './libraries/header.inc.php';
PMA_Message::error(__('Error while creating PDF:') . ' ' . $error_message)->display();
- include './libraries/footer.inc.php';
+ exit;
}
/**
diff --git a/libraries/Response.class.php b/libraries/Response.class.php
new file mode 100644
index 0000000000..c341acc614
--- /dev/null
+++ b/libraries/Response.class.php
@@ -0,0 +1,315 @@
+start();
+ $this->_header = new PMA_Header();
+ $this->_HTML = '';
+ $this->_JSON = array();
+ $this->_footer = new PMA_Footer();
+
+ $this->_isSuccess = true;
+ $this->_isAjax = false;
+ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
+ $this->_isAjax = true;
+ }
+ $this->_header->setAjax($this->_isAjax);
+ $this->_footer->setAjax($this->_isAjax);
+ $this->_CWD = getcwd();
+ }
+
+ /**
+ * Returns the singleton PMA_Response object
+ *
+ * @return PMA_Response object
+ */
+ public static function getInstance()
+ {
+ if (empty(self::$_instance)) {
+ self::$_instance = new PMA_Response();
+ }
+ return self::$_instance;
+ }
+
+ /**
+ * Set the status of an ajax response,
+ * whether it is a success or an error
+ *
+ * @param bool $state Whether the request was successfully processed
+ *
+ * @return void
+ */
+ public function isSuccess($state)
+ {
+ $this->_isSuccess = ($state == true);
+ }
+
+ /**
+ * Returns true or false depending on whether
+ * we are servicing an ajax request
+ *
+ * @return void
+ */
+ public function isAjax()
+ {
+ return $this->_isAjax;
+ }
+
+ /**
+ * Returns the path to the current working directory
+ * Necessary to work around a PHP bug where the CWD is
+ * reset after the initial script exits
+ *
+ * @return string
+ */
+ public function getCWD()
+ {
+ return $this->_CWD;
+ }
+
+ /**
+ * Disables the rendering of the header
+ * and the footer in responses
+ *
+ * @return void
+ */
+ public function disable()
+ {
+ $this->_header->disable();
+ $this->_footer->disable();
+ }
+
+ /**
+ * Returns a PMA_Header object
+ *
+ * @return object
+ */
+ public function getHeader()
+ {
+ return $this->_header;
+ }
+
+ /**
+ * Returns a PMA_Footer object
+ *
+ * @return object
+ */
+ public function getFooter()
+ {
+ return $this->_footer;
+ }
+
+ /**
+ * Add HTML code to the response
+ *
+ * @param string $content A string to be appended to
+ * the current output buffer
+ *
+ * @return void
+ */
+ public function addHTML($content)
+ {
+ if ($content instanceof PMA_Message) {
+ $this->_HTML .= $content->getDisplay();
+ } else {
+ $this->_HTML .= $content;
+ }
+ }
+
+ /**
+ * Add JSON code to the response
+ *
+ * @param mixed $json Either a key (string) or an
+ * array or key-value pairs
+ * @param mixed $value Null, if passing an array in $json otherwise
+ * it's a string value to the key
+ *
+ * @return void
+ */
+ public function addJSON($json, $value = null)
+ {
+ if (is_array($json)) {
+ foreach ($json as $key => $value) {
+ $this->addJSON($key, $value);
+ }
+ } else {
+ if ($value instanceof PMA_Message) {
+ $this->_JSON[$json] = $value->getDisplay();
+ } else {
+ $this->_JSON[$json] = $value;
+ }
+ }
+
+ }
+
+ /**
+ * Renders the HTML response text
+ *
+ * @return string
+ */
+ private function _getDisplay()
+ {
+ // The header may contain nothing at all,
+ // if it's content was already rendered
+ // and, in this case, the header will be
+ // in the content part of the request
+ $retval = $this->_header->getDisplay();
+ $retval .= $this->_HTML;
+ $retval .= $this->_footer->getDisplay();
+ return $retval;
+ }
+
+ /**
+ * Sends an HTML response to the browser
+ *
+ * @return void
+ */
+ private function _htmlResponse()
+ {
+ echo $this->_getDisplay();
+ }
+
+ /**
+ * Sends a JSON response to the browser
+ *
+ * @return void
+ */
+ private function _ajaxResponse()
+ {
+ if (! isset($this->_JSON['message'])) {
+ $this->_JSON['message'] = $this->_getDisplay();
+ } else if ($this->_JSON['message'] instanceof PMA_Message) {
+ $this->_JSON['message'] = $this->_JSON['message']->getDisplay();
+ }
+
+ if ($this->_isSuccess) {
+ $this->_JSON['success'] = true;
+ } else {
+ $this->_JSON['success'] = false;
+ $this->_JSON['error'] = $this->_JSON['message'];
+ unset($this->_JSON['message']);
+ }
+
+ // Set the Content-Type header to JSON so that jQuery parses the
+ // response correctly.
+ if (! defined('TESTSUITE')) {
+ header('Cache-Control: no-cache');
+ header('Content-Type: application/json');
+ }
+
+ echo json_encode($this->_JSON);
+ }
+
+ /**
+ * Sends an HTML response to the browser
+ *
+ * @static
+ * @return void
+ */
+ public static function response()
+ {
+ $response = PMA_Response::getInstance();
+ chdir($response->getCWD());
+ $buffer = PMA_OutputBuffering::getInstance();
+ if (empty($response->_HTML)) {
+ $response->_HTML = $buffer->getContents();
+ }
+ if ($response->isAjax()) {
+ $response->_ajaxResponse();
+ } else {
+ $response->_htmlResponse();
+ }
+ $buffer->flush();
+ exit;
+ }
+}
+
+?>
diff --git a/libraries/Scripts.class.php b/libraries/Scripts.class.php
new file mode 100644
index 0000000000..604f310ede
--- /dev/null
+++ b/libraries/Scripts.class.php
@@ -0,0 +1,174 @@
+' . "\n ";
+ } else {
+ $include .= '' . "\n";
+ }
+ return $include;
+ }
+
+ /**
+ * Generates new PMA_Scripts objects
+ *
+ * @return PMA_Scripts object
+ */
+ public function __construct()
+ {
+ $this->_files = array();
+ $this->_code = '';
+ $this->_events = array();
+
+ }
+
+ /**
+ * Adds a new file to the list of scripts
+ *
+ * @param string $filename The name of the file to include
+ * @param bool $conditional_ie Whether to wrap the script tag in
+ * conditional comments for IE
+ *
+ * @return void
+ */
+ public function addFile($filename, $conditional_ie = false)
+ {
+ $filename = 'js/' . $filename;
+ $hash = md5($filename);
+ if (empty($this->_files[$hash])) {
+ $timestamp = null;
+ if (strpos($filename, '?') === false) {
+ $timestamp = filemtime($filename);
+ }
+ $this->_files[$hash] = array(
+ 'filename' => $filename,
+ 'timestamp' => $timestamp,
+ 'conditional_ie' => $conditional_ie
+ );
+ }
+ }
+
+ /**
+ * Adds a new code snippet to the code to be executed
+ *
+ * @param string $code The JS code to be added
+ *
+ * @return void
+ */
+ public function addCode($code)
+ {
+ $this->_code .= "$code\n";
+ }
+
+ /**
+ * Adds a new event to the list of events
+ *
+ * @param string $event The name of the event to register
+ * @param string $function The code to execute when the event fires
+ * E.g: 'function () { doSomething(); }'
+ * or 'doSomething'
+ *
+ * @return void
+ */
+ public function addEvent($event, $function)
+ {
+ $this->_events[] = array(
+ 'event' => $event,
+ 'function' => $function
+ );
+ }
+
+ /**
+ * Renders all the JavaScript file inclusions, code and events
+ *
+ * @return string
+ */
+ public function getDisplay()
+ {
+ $retval = '';
+
+ foreach ($this->_files as $file) {
+ $retval .= $this->_includeFile(
+ $file['filename'],
+ $file['conditional_ie']
+ );
+ }
+ $retval .= '';
+
+ return $retval;
+ }
+}
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index cdb91b5334..4658cb67da 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -429,35 +429,39 @@ class PMA_Theme
}
/**
- * prints out the preview for this theme
+ * Renders the preview for this theme
*
- * @return void
+ * @return string
* @access public
*/
- public function printPreview()
+ public function getPrintPreview()
{
- echo '';
+ return $retval;
}
/**
diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
index 3aa286c119..2ecfb05c6a 100644
--- a/libraries/Theme_Manager.class.php
+++ b/libraries/Theme_Manager.class.php
@@ -400,16 +400,18 @@ class PMA_Theme_Manager
}
/**
- * prints out preview for every theme
+ * Renders the previews for all themes
*
- * @return void
+ * @return string
* @access public
*/
- public function printPreviews()
+ public function getPrintPreviews()
{
+ $retval = '';
foreach ($this->themes as $each_theme) {
- $each_theme->printPreview();
+ $retval .= $each_theme->getPrintPreview();
} // end 'open themes'
+ return $retval;
}
/**
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
index fbe39e7c8b..da81d5c73a 100644
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@@ -68,21 +68,18 @@ function PMA_auth_set_user()
function PMA_auth_fails()
{
$conn_error = PMA_DBI_getError();
- if (!$conn_error) {
+ if (! $conn_error) {
$conn_error = __('Cannot connect: invalid settings.');
}
- // Defines the charset to be used
- header('Content-Type: text/html; charset=utf-8');
/* HTML header */
- $page_title = __('Access denied');
- include './libraries/header_meta_style.inc.php';
- include './libraries/header_scripts.inc.php';
- ?>
+ $response = PMA_Response::getInstance();
+ $response->getFooter()->setMinimal();
+ $header = $response->getHeader();
+ $header->setTitle(__('Access denied'));
+ $header->disableMenu();
-
-
-
+?>
phpMyAdmin '
);
?>
@@ -306,13 +310,11 @@ function PMA_auth()
-
-