+ * Current is the inline edit anchor.
+ */
+ var this_row_index = $(this).index();
+ /**
+ * @var input_siblings Object referring to all inline editable events from same row
+ */
+ var input_siblings = $(this).parents('tbody').find('tr').find('.data_inline_edit:nth('+this_row_index+')');
+ /**
+ * @var where_clause String containing the WHERE clause to select this row
+ */
+ var where_clause = $(this).parents('tbody').find('tr').find('.where_clause:nth('+this_row_index+')').val();
+ }
+ else {
+ var input_siblings = $(this).parent('tr').find('.data_inline_edit');
+ var where_clause = $(this).parent('tr').find('.where_clause').val();
+ }
+
+ /**
+ * @var nonunique Boolean, whether this row is unique or not
+ */
+ if($(this).is('.nonunique')) {
+ var nonunique = 0;
+ }
+ else {
+ var nonunique = 1;
+ }
+
+ // Collect values of all fields to submit, we don't know which changed
+ /**
+ * @var params_to_submit Array containing the name/value pairs of all fields
+ */
+ var params_to_submit = {};
+ /**
+ * @var relation_fields Array containing the name/value pairs of relational fields
+ */
+ var relation_fields = {};
+ /**
+ * @var transform_fields Array containing the name/value pairs for transformed fields
+ */
+ var transform_fields = {};
+ /**
+ * @var transformation_fields Boolean, if there are any transformed fields in this row
+ */
+ var transformation_fields = false;
+
+ $(input_siblings).each(function() {
+ /** @lends jQuery */
+ /**
+ * @var this_field Object referring to this field ( )
+ */
+ var this_field = $(this);
+ /**
+ * @var field_name String containing the name of this field.
+ * @see getFieldName()
+ */
+ var field_name = getFieldName($(this), disp_mode);
+
+ /**
+ * @var this_field_params Array temporary storage for the name/value of current field
+ */
+ var this_field_params = {};
+
+ if($(this).is('.transformed')) {
+ transformation_fields = true;
+ }
+
+ if($(this).is(":not(.relation, .enum)")) {
+ this_field_params[field_name] = $(this).find('textarea').val();
+ if($(this).is('.transformed')) {
+ $.extend(transform_fields, this_field_params);
+ }
+ }
+ else {
+ this_field_params[field_name] = $(this).find('select').val();
+
+ if($(this).is('.relation')) {
+ $.extend(relation_fields, this_field_params);
+ }
+ }
+
+ $.extend(params_to_submit, this_field_params);
+ })
+
+ /**
+ * @var sql_query String containing the SQL query to update this row
+ */
+ var sql_query = 'UPDATE ' + window.parent.table + ' SET ';
+
+ $.each(params_to_submit, function(key, value) {
+ if(value.length == 0) {
+ value = 'NULL'
+ }
+ sql_query += ' ' + key + "='" + value + "' , ";
+ })
+ //Remove the last ',' appended in the above loop
+ sql_query = sql_query.replace(/,\s$/, '');
+ sql_query += ' WHERE ' + where_clause;
+
+ /**
+ * @var rel_fields_list String, url encoded representation of {@link relations_fields}
+ */
+ var rel_fields_list = $.param(relation_fields);
+
+ /**
+ * @var transform_fields_list String, url encoded representation of {@link transform_fields}
+ */
+ var transform_fields_list = $.param(transform_fields);
+
+ // Make the Ajax post after setting all parameters
+ /**
+ * @var post_params Object containing parameters for the POST request
+ */
+ var post_params = {'ajax_request' : true,
+ 'sql_query' : sql_query,
+ 'disp_direction' : disp_mode,
+ 'token' : window.parent.token,
+ 'db' : window.parent.db,
+ 'table' : window.parent.table,
+ 'clause_is_unique' : nonunique,
+ 'where_clause' : where_clause,
+ 'rel_fields_list' : rel_fields_list,
+ 'do_transformations' : transformation_fields,
+ 'transform_fields_list' : transform_fields_list,
+ 'goto' : 'sql.php'
+ };
+
+ $.post('tbl_replace.php', post_params, function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ $(this_row).removeClass('edit_row_anchor_active').addClass('edit_row_anchor');
+
+ $(input_siblings).each(function() {
+ // Inline edit post has been successful.
+ if($(this).is(':not(.relation, .enum)')) {
+ /**
+ * @var new_html String containing value of the data field after edit
+ */
+ var new_html = $(this).find('textarea').val();
+
+ if($(this).is('.transformed')) {
+ var field_name = getFieldName($(this), disp_mode);
+ var this_field = $(this);
+
+ $.each(data.transformations, function(key, value) {
+ if(key == field_name) {
+ if($(this_field).is('.text_plain, .application_octetstream')) {
+ new_html = value;
+ return false;
+ }
+ else {
+ var new_value = $(this_field).find('textarea').val();
+ new_html = $(value).append(new_value);
+ return false;
+ }
+ }
+ })
+ }
+ }
+ else {
+ var new_html = $(this).find('select').val();
+ if($(this).is('.relation')) {
+ var field_name = getFieldName($(this), disp_mode);
+ var this_field = $(this);
+
+ $.each(data.relations, function(key, value) {
+ if(key == field_name) {
+ var new_value = $(this_field).find('select').val();
+ new_html = $(value).append(new_value);
+ return false;
+ }
+ })
+ }
+ }
+ $(this).html(new_html);
+ })
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ };
+ }) // end $.post()
+ }) // End After editing, clicking again should post data
+}, 'top.frame_content') // end $(document).ready()
+
+/**#@- */
diff --git a/js/tbl_change.js b/js/tbl_change.js
old mode 100644
new mode 100755
index 36c4303ef..a092171cd
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -1,6 +1,10 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
- * function used in table data manipulation pages
+ * @fileoverview function used in table data manipulation pages
+ *
+ * @requires jQuery
+ * @requires jQueryUI
+ * @requires js/functions.js
*
* @version $Id$
*/
@@ -247,3 +251,151 @@ function unNullify(urlField, multi_edit)
return true;
} // end of the 'unNullify()' function
+
+/**
+ * Ajax handlers for Change Table page
+ *
+ * Actions Ajaxified here:
+ * Submit Data to be inserted into the table
+ * Restart insertion with 'N' rows.
+ */
+$(document).ready(function() {
+
+ /**
+ * Submission of data to be inserted into table
+ *
+ * @uses PMA_ajaxShowMessage()
+ */
+ $("#insertForm").live('submit', function(event) {
+
+ /**
+ * @var the_form Object referring to the insertion form
+ */
+ var the_form = $(this);
+ event.preventDefault();
+
+ PMA_ajaxShowMessage();
+ $(the_form).append(']
+ */
+
+ /**
+ * @var this_name String containing name of the input/select elements
+ */
+ var this_name = $(this).attr('name');
+ /** split {@link this_name} at [10], so we have the parts that can be concatenated later */
+ var name_parts = this_name.split(/\[\d+\]/);
+ /** extract the [10] from {@link name_parts} */
+ var old_row_index_string = this_name.match(/\[\d+\]/)[0];
+ /** extract 10 - had to split into two steps to accomodate double digits */
+ var old_row_index = parseInt(old_row_index_string.match(/\d+/)[0]);
+
+ /** calculate next index i.e. 11 */
+ var new_row_index = old_row_index + 1;
+ /** generate the new name i.e. funcs[multi_edit][11][foobarbaz] */
+ var new_name = name_parts[0] + '[' + new_row_index + ']' + name_parts[1];
+
+ $(this).attr('name', new_name);
+ });
+
+ //Insert/Clone the ignore checkboxes
+ if(curr_rows == 1 ) {
+ $('' + PMA_messages['strIgnore'] + ' ');
+ }
+ else {
+
+ /**
+ * @var last_checkbox Object reference to the last checkbox in #insertForm
+ */
+ var last_checkbox = $("#insertForm").children('input:checkbox:last');
+
+ /** name of {@link last_checkbox} */
+ var last_checkbox_name = $(last_checkbox).attr('name');
+ /** index of {@link last_checkbox} */
+ var last_checkbox_index = parseInt(last_checkbox_name.match(/\d+/));
+ /** name of new {@link last_checkbox} */
+ var new_name = last_checkbox_name.replace(/\d+/,last_checkbox_index+1);
+
+ $(last_checkbox)
+ .clone()
+ .attr({'id':new_name, 'name': new_name})
+ .add('label[for^=insert_ignore_check]:last')
+ .clone()
+ .attr('for', new_name)
+ .before(''
- . ' '
+ . ' '
. PMA_getIcon('b_drop.png', __('Drop')) . ' '
. ' ' . "\n";
+
+ $r .= '' . htmlspecialchars($index->getName()) . ' ';
diff --git a/libraries/List.class.php b/libraries/List.class.php
old mode 100644
new mode 100755
diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
old mode 100644
new mode 100755
diff --git a/libraries/Message.class.php b/libraries/Message.class.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel.php b/libraries/PHPExcel/PHPExcel.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Autoloader.php b/libraries/PHPExcel/PHPExcel/Autoloader.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation.php b/libraries/PHPExcel/PHPExcel/Calculation.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Exception.php b/libraries/PHPExcel/PHPExcel/Calculation/Exception.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php b/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php b/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php b/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Function.php b/libraries/PHPExcel/PHPExcel/Calculation/Function.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Functions.php b/libraries/PHPExcel/PHPExcel/Calculation/Functions.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation/functionlist.txt b/libraries/PHPExcel/PHPExcel/Calculation/functionlist.txt
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Cell.php b/libraries/PHPExcel/PHPExcel/Cell.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Cell/DataType.php b/libraries/PHPExcel/PHPExcel/Cell/DataType.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php b/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php b/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Comment.php b/libraries/PHPExcel/PHPExcel/Comment.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/DocumentProperties.php b/libraries/PHPExcel/PHPExcel/DocumentProperties.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/DocumentSecurity.php b/libraries/PHPExcel/PHPExcel/DocumentSecurity.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/HashTable.php b/libraries/PHPExcel/PHPExcel/HashTable.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/IComparable.php b/libraries/PHPExcel/PHPExcel/IComparable.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/IOFactory.php b/libraries/PHPExcel/PHPExcel/IOFactory.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/NamedRange.php b/libraries/PHPExcel/PHPExcel/NamedRange.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/CSV.php b/libraries/PHPExcel/PHPExcel/Reader/CSV.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php b/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php b/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel5.php b/libraries/PHPExcel/PHPExcel/Reader/Excel5.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php b/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php b/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/IReader.php b/libraries/PHPExcel/PHPExcel/Reader/IReader.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/Serialized.php b/libraries/PHPExcel/PHPExcel/Reader/Serialized.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/ReferenceHelper.php b/libraries/PHPExcel/PHPExcel/ReferenceHelper.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/RichText.php b/libraries/PHPExcel/PHPExcel/RichText.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php b/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/RichText/Run.php b/libraries/PHPExcel/PHPExcel/RichText/Run.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/RichText/TextElement.php b/libraries/PHPExcel/PHPExcel/RichText/TextElement.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Date.php b/libraries/PHPExcel/PHPExcel/Shared/Date.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Drawing.php b/libraries/PHPExcel/PHPExcel/Shared/Drawing.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher.php b/libraries/PHPExcel/PHPExcel/Shared/Escher.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Excel5.php b/libraries/PHPExcel/PHPExcel/Shared/Excel5.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/File.php b/libraries/PHPExcel/PHPExcel/Shared/File.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Font.php b/libraries/PHPExcel/PHPExcel/Shared/Font.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/CHANGELOG.TXT b/libraries/PHPExcel/PHPExcel/Shared/JAMA/CHANGELOG.TXT
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/LUDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/LUDecomposition.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/Matrix.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/Matrix.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/QRDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/QRDecomposition.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Error.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Error.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Maths.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Maths.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE.php b/libraries/PHPExcel/PHPExcel/Shared/OLE.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/File.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/File.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLERead.php b/libraries/PHPExcel/PHPExcel/Shared/OLERead.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php b/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/String.php b/libraries/PHPExcel/PHPExcel/Shared/String.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php b/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php b/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/trendClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/trendClass.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style.php b/libraries/PHPExcel/PHPExcel/Style.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Alignment.php b/libraries/PHPExcel/PHPExcel/Style/Alignment.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Border.php b/libraries/PHPExcel/PHPExcel/Style/Border.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Borders.php b/libraries/PHPExcel/PHPExcel/Style/Borders.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Color.php b/libraries/PHPExcel/PHPExcel/Style/Color.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Conditional.php b/libraries/PHPExcel/PHPExcel/Style/Conditional.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Fill.php b/libraries/PHPExcel/PHPExcel/Style/Fill.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Font.php b/libraries/PHPExcel/PHPExcel/Style/Font.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php b/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Protection.php b/libraries/PHPExcel/PHPExcel/Style/Protection.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet.php b/libraries/PHPExcel/PHPExcel/Worksheet.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php b/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php b/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php b/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php b/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php b/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php b/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php b/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Row.php b/libraries/PHPExcel/PHPExcel/Worksheet/Row.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php b/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php b/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php b/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/WorksheetIterator.php b/libraries/PHPExcel/PHPExcel/WorksheetIterator.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/CSV.php b/libraries/PHPExcel/PHPExcel/Writer/CSV.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/HTML.php b/libraries/PHPExcel/PHPExcel/Writer/HTML.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/IWriter.php b/libraries/PHPExcel/PHPExcel/Writer/IWriter.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/PDF.php b/libraries/PHPExcel/PHPExcel/Writer/PDF.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Serialized.php b/libraries/PHPExcel/PHPExcel/Writer/Serialized.php
old mode 100644
new mode 100755
diff --git a/libraries/PMA.php b/libraries/PMA.php
old mode 100644
new mode 100755
diff --git a/libraries/Partition.class.php b/libraries/Partition.class.php
old mode 100644
new mode 100755
diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php
old mode 100644
new mode 100755
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
old mode 100644
new mode 100755
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
old mode 100644
new mode 100755
diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
old mode 100644
new mode 100755
diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php
old mode 100644
new mode 100755
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/auth/swekey/authentication.inc.php b/libraries/auth/swekey/authentication.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/auth/swekey/musbe-ca.crt b/libraries/auth/swekey/musbe-ca.crt
old mode 100644
new mode 100755
diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/auth/swekey/swekey.php b/libraries/auth/swekey/swekey.php
old mode 100644
new mode 100755
diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/blowfish.php b/libraries/blowfish.php
old mode 100644
new mode 100755
diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
old mode 100644
new mode 100755
index ab22f178b..b01a6ee2f
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -539,6 +539,10 @@ $GLOBALS['js_include'] = array();
$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2.js';
$GLOBALS['js_include'][] = 'update-location.js';
+/**
+ * Add common jQuery functions script here if necessary.
+ */
+
/**
* JavaScript events that will be registered
* @global array $js_events
@@ -967,6 +971,33 @@ $GLOBALS['PMA_Config']->set('default_server', '');
/* Tell tracker that it can actually work */
PMA_Tracker::enable();
+/**
+ * @global boolean $GLOBALS['is_ajax_request']
+ * @todo should this be moved to the variables init section above?
+ *
+ * Check if the current request is an AJAX request, and set is_ajax_request
+ * accordingly. Suppress headers, footers and unnecessary output if set to
+ * true
+ */
+if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
+ $GLOBALS['is_ajax_request'] = true;
+} else {
+ $GLOBALS['is_ajax_request'] = false;
+}
+
+/**
+ * @global boolean $GLOBALS['inline_edit']
+ *
+ * Set to true if this is a request made during an inline edit process. This
+ * request is made to retrieve the non-truncated/transformed values.
+ */
+if(isset($_REQUEST['inline_edit']) && $_REQUEST['inline_edit'] == true) {
+ $GLOBALS['inline_edit'] = true;
+}
+else {
+ $GLOBALS['inline_edit'] = false;
+}
+
if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) {
/**
* include subform target page
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
old mode 100644
new mode 100755
index dd7f40a8d..665298b49
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -662,11 +662,16 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
$error_msg_output .= '' . "\n\n";
}
- echo $error_msg_output;
- /**
- * display footer and exit
- */
-
+ /**
+ * If in an Ajax request, don't just echo and exit. Use PMA_ajaxResponse()
+ */
+ if($GLOBALS['is_ajax_request'] == true) {
+ PMA_ajaxResponse($error_msg_output, false);
+ }
+ echo $error_msg_output;
+ /**
+ * display footer and exit
+ */
require './libraries/footer.inc.php';
} else {
echo $error_msg_output;
@@ -937,6 +942,15 @@ if (!$jsonly)
*/
function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view = false)
{
+ /*
+ * PMA_ajaxResponse uses this function to collect the string of HTML generated
+ * for showing the message. Use output buffering to collect it and return it
+ * in a string. In some special cases on sql.php, buffering has to be disabled
+ * and hence we check with $GLOBALS['buffer_message']
+ */
+ if( $GLOBALS['is_ajax_request'] == true && !isset($GLOBALS['buffer_message']) ) {
+ ob_start();
+ }
global $cfg;
if (null === $sql_query) {
@@ -975,7 +989,9 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
}
unset($tbl_status);
- echo '' . "\n";
+ // In an Ajax request, $GLOBALS['cell_align_left'] may not be defined. Hence,
+ // check for it's presence before using it
+ echo '
' . "\n";
if ($message instanceof PMA_Message) {
if (isset($GLOBALS['special_message'])) {
@@ -1211,9 +1227,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
}
// see in js/functions.js the jQuery code attached to id inline_edit
+ // document.write conflicts with jQuery, hence used $().append()
$inline_edit = "
';
}
/**
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
old mode 100644
new mode 100755
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php
old mode 100644
new mode 100755
diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/string.lib.php b/libraries/string.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/string_type_ctype.lib.php b/libraries/string_type_ctype.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/string_type_native.lib.php b/libraries/string_type_native.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/tbl_common.php b/libraries/tbl_common.php
old mode 100644
new mode 100755
diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
old mode 100644
new mode 100755
index 845f752f1..8a7b9eadc
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -610,7 +610,7 @@ document.onkeydown = onKeyDownArrowsHandler;
}
?>
-
'
+ : __('Check Privileges')) . '';
+ $new_db_string .= '