Skip to content

Commit

Permalink
Remove trailing whitespace from the code
Browse files Browse the repository at this point in the history 
Signed-off-by: Michal Čihař <[email protected]>
  • Loading branch information
@nijel
nijel committed Mar 20, 2014
1 parent 582077e commit d559fa6
Show file tree
Hide file tree
Showing 24 changed files with 110 additions and 110 deletions.
16 changes: 8 additions & 8 deletions examples/swekey.sample.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
#
# To activate the Swekey authentication add the following line to your config.inc.php file.
# $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf';
# Then rename this file "swekey-pma.conf" and copy it to the /etc directory.
# Then rename this file "swekey-pma.conf" and copy it to the /etc directory.
# Add all the Swekey ids you want to grant access to in the file.
# After each Swekey id put the corresponding user name.
#
# If you don't know the id of a Swekey just visit http://www.swekey.com?sel=support
# If you don't know the id of a Swekey just visit http://www.swekey.com?sel=support
# while your Swekey is connected.
#
# If you need to purchase a Swekey please visit http://phpmyadmin.net/auth_key
# since this link provides funding to PhpMyAdmin.
# If you need to purchase a Swekey please visit http://phpmyadmin.net/auth_key
# since this link provides funding to PhpMyAdmin.
#

0000000000000000000000000000763A:root
000000000000000000000000000089E4:steve
0000000000000000000000000000231E:scott
Expand All @@ -28,17 +28,17 @@ SERVER_STATUS=https://auth-status-ssl.musbe.net

#
# The path of the root certificate file used to ensure a secure
# communication with the authentication servers in SSL mode.
# communication with the authentication servers in SSL mode.
# If not specified, will use musbe-ca.crt found in your
# phpMyAdmin/libraries/auth/swekey.
#

#CA_FILE=/var/http-root/phpmyadmin/libraries/auth/swekey/musbe-ca.crt

#
# If your server receives many login requests, you can enable the random
# If your server receives many login requests, you can enable the random
# token caching to accelerate the authentication process.
# Token caching is enabled by default.
# Token caching is enabled by default.
#

#ENABLE_TOKEN_CACHE=0
8 changes: 4 additions & 4 deletions import.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
if (! empty($open_basedir)) {

/**
* @todo make use of the config's temp dir with fallback to the
* @todo make use of the config's temp dir with fallback to the
* system's tmp dir
*/
$tmp_subdir = sys_get_temp_dir();
Expand All @@ -387,9 +387,9 @@
} else {

// If the php.ini is misconfigured (eg. there is no /tmp access defined
// with open_basedir), $tmp_subdir won't be writable and the user gets
// a 'File could not be read!' error (at PMA_detectCompression), which
// is not too meaningful. Show a meaningful error message to the user
// with open_basedir), $tmp_subdir won't be writable and the user gets
// a 'File could not be read!' error (at PMA_detectCompression), which
// is not too meaningful. Show a meaningful error message to the user
// instead.

$message = PMA_Message::error(
Expand Down
4 changes: 2 additions & 2 deletions index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}
unset($drops, $each_drop);

/*
/*
* Black list of all scripts to which front-end must submit data.
* Such scripts must not be loaded on home page.
*
Expand Down Expand Up @@ -324,7 +324,7 @@
} else {
$php_ext_string .= __('None');
}

PMA_printListItem(
$php_ext_string,
'li_used_php_extension'
Expand Down
18 changes: 9 additions & 9 deletions js/import.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,35 +58,35 @@ AJAX.registerTeardown('import.js', function () {

AJAX.registerOnload('import.js', function () {
// import_file_form validation.
$('#import_file_form').live('submit', function (event) {
$('#import_file_form').live('submit', function (event) {
var radioLocalImport = $("#radio_local_import_file");
var radioImport = $("#radio_import_file");
var fileMsg = '<div class="error"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_error" /> ' + PMA_messages.strImportDialogMessage + '</div>';

if (radioLocalImport.length !== 0) {
// remote upload.
// TODO Remove this section when all browsers support HTML5 "required" property
if (! radioLocalImport.is(":checked") && ! radioImport.is(":checked")) {
radioImport.focus();
var msg = '<div class="error"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_error" /> ';
msg += PMA_messages.strRadioUnchecked;
msg += PMA_messages.strRadioUnchecked;
msg += '</div>';
PMA_ajaxShowMessage(msg, false);
return false;
}

if (radioImport.is(":checked") && $("#input_import_file").val() === '') {
$("#input_import_file").focus();
PMA_ajaxShowMessage(fileMsg, false);
return false;
}

if (radioLocalImport.is(":checked")) {
if ($("#select_local_import_file").length === 0) {
PMA_ajaxShowMessage('<div class="error"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_error" /> ' + PMA_messages.strNoImportFile + ' </div>', false);
return false;
}

if ($("#select_local_import_file").val() === '') {
$("#select_local_import_file").focus();
PMA_ajaxShowMessage(fileMsg, false);
Expand All @@ -107,7 +107,7 @@ AJAX.registerOnload('import.js', function () {
$("#upload_form_status_info").css("display", "inline");
return;
});

// Initially display the options for the selected plugin
changePluginOpts();

Expand Down Expand Up @@ -151,7 +151,7 @@ AJAX.registerOnload('import.js', function () {
.find("h3")
.remove();
//$("form[name=import] *").unwrap();

/**
* for input element text_csv_enclosed and text_csv_escaped allow just one character to enter.
* as mysql allows just one character for these fields,
Expand All @@ -164,5 +164,5 @@ AJAX.registerOnload('import.js', function () {
}
return true;
});

});
4 changes: 2 additions & 2 deletions js/keyhandler.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */

// gloabl vars to hold Arrow Down event timeStamps
var prevTimeStamp = 0;
var prevTimeStamp = 0;
var curTimeStamp = 0;

/**
Expand All @@ -22,7 +22,7 @@ function onKeyDownArrowsHandler(e)
return;
}
prevTimeStamp = curTimeStamp;

var o = (e.srcElement || e.target);
if (!o) {
return;
Expand Down
28 changes: 14 additions & 14 deletions js/tbl_change.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ AJAX.registerOnload('tbl_change.js', function () {

var hashed_field = name_parts[1].match(/\[(.+)\]/)[1];
$this_element.attr('name', new_name);

/** If element is select[name*='funcs'], update id */
if ($this_element.is("select[name*='funcs']")) {
var this_id = $this_element.attr("id");
Expand All @@ -407,14 +407,14 @@ AJAX.registerOnload('tbl_change.js', function () {
$this_element.find("option").filter(function () {
return $(this).text() === prevSelectedValue;
}).attr("selected","selected");

// If salt field is there then update its id.
var nextSaltInput = $this_element.parent().next("td").next("td").find("input[name*='salt']");
if (nextSaltInput.length !== 0) {
nextSaltInput.attr("id", "salt_" + new_id);
}
}

// handle input text fields and textareas
if ($this_element.is('.textfield') || $this_element.is('.char')) {
// do not remove the 'value' attribute for ENUM columns
Expand Down Expand Up @@ -530,18 +530,18 @@ AJAX.registerOnload('tbl_change.js', function () {
});
// Add all the required datepickers back
addDateTimePicker();

/**
* @var $function_option_dialog object holds dialog for selected function options.
*/
*/
var $function_option_dialog = null;

PMA_tooltip(
$("select[name*='funcs']"),
'select',
PMA_messages.strFunctionHint
);

$("select[name*='funcs']").live('click', function (event) {
if (! event.shiftKey) {
return false;
Expand All @@ -555,7 +555,7 @@ AJAX.registerOnload('tbl_change.js', function () {
var targetRows = $("tr").has("input[value='" + columnName + "']");
var salt;
var copySalt = false;

if (functionName === 'AES_ENCRYPT') {
// Dialog title.
var title = functionName;
Expand All @@ -574,7 +574,7 @@ AJAX.registerOnload('tbl_change.js', function () {
applyFunctionToAllRows(currId, functionName, copySalt, salt, targetRows);
$(this).dialog("close");
};

// Contents of dialog.
var dialog = "<div>" +
"<fieldset>" +
Expand All @@ -583,7 +583,7 @@ AJAX.registerOnload('tbl_change.js', function () {
" ?" +
"</fieldset>" +
"</div>";

// Show the dialog
var width = parseInt(
(parseInt($('html').css('font-size'), 10) / 13) * 340,
Expand All @@ -608,7 +608,7 @@ AJAX.registerOnload('tbl_change.js', function () {
}
});
}

applyFunctionToAllRows(currId, functionName, copySalt, "", targetRows);
});
});
Expand Down Expand Up @@ -644,10 +644,10 @@ function applyFunctionToAllRows(currId, functionName, copySalt, salt, targetRows
return;
}
} */

// Append the function select list.
var targetSelectList = $(this).find("select[name*='funcs[multi_edit]']");

if (targetSelectList.attr("id") === currId) {
return;
}
Expand All @@ -665,7 +665,7 @@ function applyFunctionToAllRows(currId, functionName, copySalt, salt, targetRows
" id=salt_" + targetSelectList.attr("id") + " placeholder='enter Salt'>";
targetSelectList.parent().next("td").next("td").find("input[name*='fields']").after(new_salt_box);
}

if (copySalt) {
$("#salt_" + targetSelectList.attr("id")).attr("value", salt);
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/File.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ public function checkUploadedFile()
* @todo move file read part into readChunk() or getChunk()
* @todo add support for compression plugins
* @access protected
* @return mixed false on error, otherwise string MIME type of
* @return mixed false on error, otherwise string MIME type of
* compression, none for none
*/
protected function detectCompression()
Expand Down
4 changes: 2 additions & 2 deletions libraries/Table.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ static public function moveCopy($source_db, $source_table, $target_db,
$i = 0;

while ($parsed_sql[$i]['type'] != $table_delimiter) {
$i++;
$i++;
}

$parsed_sql[$i]['data'] = $target;
Expand All @@ -1014,7 +1014,7 @@ static public function moveCopy($source_db, $source_table, $target_db,
$GLOBALS['sql_query'] .= "\n" . $GLOBALS['sql_indexes'];
if ($mode == 'one_table') {
unset($GLOBALS['sql_indexes']);

}

}
Expand Down
4 changes: 2 additions & 2 deletions libraries/browse_foreigners.lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function PMA_getHtmlForRelationalFieldSelection($db, $table, $field, $foreignDat
) = PMA_getDescriptionAndTitle($descriptions[$indexByKeyname]);

// keynames and descriptions for the right section,
// sorted by descriptions
// sorted by descriptions
$rightKeyname = $keys[$indexByDescription];
list(
$rightDescription,
Expand Down Expand Up @@ -169,7 +169,7 @@ function PMA_getHtmlForRelationalFieldSelection($db, $table, $field, $foreignDat
}

/**
* Get the description (possibly truncated) and the title
* Get the description (possibly truncated) and the title
*
* @param string $description the keyname's description
*
Expand Down
Loading

0 comments on commit d559fa6

Please sign in to comment.