diff options
24 files changed, 110 insertions, 110 deletions
diff --git a/examples/swekey.sample.conf b/examples/swekey.sample.conf index ebf1aedf02..5de2007da3 100644 --- a/examples/swekey.sample.conf +++ b/examples/swekey.sample.conf @@ -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 @@ -28,7 +28,7 @@ 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. # @@ -36,9 +36,9 @@ SERVER_STATUS=https://auth-status-ssl.musbe.net #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 diff --git a/import.php b/import.php index 96dff3bc89..344acef6f7 100644 --- a/import.php +++ b/import.php @@ -370,7 +370,7 @@ if ($import_file != 'none' && ! $error) { 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(); @@ -387,9 +387,9 @@ if ($import_file != 'none' && ! $error) { } 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( @@ -33,7 +33,7 @@ foreach ($drops as $each_drop) { } 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. * @@ -324,7 +324,7 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) { } else { $php_ext_string .= __('None'); } - + PMA_printListItem( $php_ext_string, 'li_used_php_extension' diff --git a/js/import.js b/js/import.js index 5b00f44bf6..ab881598bf 100644 --- a/js/import.js +++ b/js/import.js @@ -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); @@ -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(); @@ -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, @@ -164,5 +164,5 @@ AJAX.registerOnload('import.js', function () { } return true; }); - + }); diff --git a/js/keyhandler.js b/js/keyhandler.js index a378249c7a..5be6619d02 100644 --- a/js/keyhandler.js +++ b/js/keyhandler.js @@ -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; /** @@ -22,7 +22,7 @@ function onKeyDownArrowsHandler(e) return; } prevTimeStamp = curTimeStamp; - + var o = (e.srcElement || e.target); if (!o) { return; diff --git a/js/tbl_change.js b/js/tbl_change.js index c28e9be00e..579097bf0a 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -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"); @@ -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 @@ -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; @@ -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; @@ -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>" + @@ -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, @@ -608,7 +608,7 @@ AJAX.registerOnload('tbl_change.js', function () { } }); } - + applyFunctionToAllRows(currId, functionName, copySalt, "", targetRows); }); }); @@ -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; } @@ -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); } diff --git a/libraries/File.class.php b/libraries/File.class.php index abb6e6f575..a9ff862f29 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -512,7 +512,7 @@ class PMA_File * @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() diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 73790338b8..e5a11e508e 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -989,7 +989,7 @@ class PMA_Table $i = 0; while ($parsed_sql[$i]['type'] != $table_delimiter) { - $i++; + $i++; } $parsed_sql[$i]['data'] = $target; @@ -1014,7 +1014,7 @@ class PMA_Table $GLOBALS['sql_query'] .= "\n" . $GLOBALS['sql_indexes']; if ($mode == 'one_table') { unset($GLOBALS['sql_indexes']); - + } } diff --git a/libraries/browse_foreigners.lib.php b/libraries/browse_foreigners.lib.php index abd02c88d4..1ba612603b 100644 --- a/libraries/browse_foreigners.lib.php +++ b/libraries/browse_foreigners.lib.php @@ -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, @@ -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 * diff --git a/libraries/export.lib.php b/libraries/export.lib.php index 06fa0ebea4..210f9cdcf2 100644 --- a/libraries/export.lib.php +++ b/libraries/export.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * function for the main export logic + * function for the main export logic * * @package PhpMyAdmin */ @@ -12,9 +12,9 @@ if (! defined('PHPMYADMIN')) { } /** - * Sets a session variable upon a possible fatal error during export + * Sets a session variable upon a possible fatal error during export * - * @return void + * @return void */ function PMA_shutdownDuringExport() { @@ -173,7 +173,7 @@ function PMA_exportOutputHandler($line) function PMA_getHtmlForDisplayedExportFooter($back_button) { /** - * Close the html tags and add the footers for on-screen export + * Close the html tags and add the footers for on-screen export */ $html = '</textarea>' . ' </form>' @@ -192,9 +192,9 @@ function PMA_getHtmlForDisplayedExportFooter($back_button) } /** - * Computes the memory limit for export + * Computes the memory limit for export * - * @return int $memory_limit the memory limit + * @return int $memory_limit the memory limit */ function PMA_getMemoryLimitForExport() { @@ -226,7 +226,7 @@ function PMA_getMemoryLimitForExport() } /** - * Return the filename and MIME type for export file + * Return the filename and MIME type for export file * * @param string $export_type type of export * @param string $remember_template whether to remember template @@ -234,7 +234,7 @@ function PMA_getMemoryLimitForExport() * @param string $compression compression asked * @param string $filename_template the filename template * - * @return array the filename template and mime type + * @return array the filename template and mime type */ function PMA_getExportFilenameAndMimetype( $export_type, $remember_template, $export_plugin, $compression, @@ -299,9 +299,9 @@ function PMA_getExportFilenameAndMimetype( * Open the export file * * @param string $filename the export filename - * @param boolean $quick_export whether it's a quick export or not + * @param boolean $quick_export whether it's a quick export or not * - * @return array the full save filename, possible message and the file handle + * @return array the full save filename, possible message and the file handle */ function PMA_openExportFile($filename, $quick_export) { @@ -446,7 +446,7 @@ function PMA_getHtmlForDisplayedExportHeader($export_type, $db, $table) } /** - * Export at the server level + * Export at the server level * * @param string $db_select the selected databases to export * @param string $whatStrucOrData structure or data or both @@ -459,7 +459,7 @@ function PMA_getHtmlForDisplayedExportHeader($export_type, $db, $table) * @param string $do_mime whether to add MIME info * @param string $do_dates whether to add dates * - * @return void + * @return void */ function PMA_exportServer( $db_select, $whatStrucOrData, $export_plugin, $crlf, $err_url, @@ -500,7 +500,7 @@ function PMA_exportServer( * @param string $do_dates whether to add dates * * @return void - */ + */ function PMA_exportDatabase( $db, $tables, $whatStrucOrData, $export_plugin, $crlf, $err_url, $export_type, $do_relation, $do_comments, $do_mime, $do_dates @@ -533,9 +533,9 @@ function PMA_exportDatabase( ) { // for a view, export a stand-in definition of the table // to resolve view dependencies - + if ($is_view) { - + if (isset($GLOBALS['sql_create_view'])) { if (! $export_plugin->exportStructure( $db, $table, $crlf, $err_url, @@ -545,9 +545,9 @@ function PMA_exportDatabase( break 1; } } - + } else if (isset($GLOBALS['sql_create_table'])) { - + if (! $export_plugin->exportStructure( $db, $table, $crlf, $err_url, 'create_table', $export_type, @@ -555,9 +555,9 @@ function PMA_exportDatabase( )) { break 1; } - + } - + } // if this is a view or a merge table, don't export data if (($whatStrucOrData == 'data' @@ -586,9 +586,9 @@ function PMA_exportDatabase( } } } - + if (isset($GLOBALS['sql_create_view'])) { - + foreach ($views as $view) { // no data export for a view if ($whatStrucOrData == 'structure' @@ -603,7 +603,7 @@ function PMA_exportDatabase( } } } - + } if (! $export_plugin->exportDBFooter($db)) { @@ -612,7 +612,7 @@ function PMA_exportDatabase( } /** - * Export at the table level + * Export at the table level * * @param string $db the database to export * @param string $table the table to export @@ -625,9 +625,9 @@ function PMA_exportDatabase( * @param string $do_comments whether to add comments * @param string $do_mime whether to add MIME info * @param string $do_dates whether to add dates - * @param string $allrows whether "dump all rows" was ticked - * @param string $limit_to upper limit - * @param string $limit_from starting limit + * @param string $allrows whether "dump all rows" was ticked + * @param string $limit_to upper limit + * @param string $limit_from starting limit * @param string $sql_query query for which exporting is requested * * @return void @@ -656,9 +656,9 @@ function PMA_exportTable( if ($whatStrucOrData == 'structure' || $whatStrucOrData == 'structure_and_data' ) { - + if ($is_view) { - + if (isset($GLOBALS['sql_create_view'])) { if (! $export_plugin->exportStructure( $db, $table, $crlf, $err_url, @@ -668,9 +668,9 @@ function PMA_exportTable( return; } } - + } else if (isset($GLOBALS['sql_create_table'])) { - + if (! $export_plugin->exportStructure( $db, $table, $crlf, $err_url, 'create_table', $export_type, @@ -678,9 +678,9 @@ function PMA_exportTable( )) { return; } - + } - + } // If this is an export of a single view, we have to export data; // for example, a PDF report diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 72a8d0d282..7b56aa2c92 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -1313,7 +1313,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, /** * Stops the import on (mostly upload/file related) error * - * @param PMA_Message $error_message The error message + * @param PMA_Message $error_message The error message * * @return void * @access public diff --git a/libraries/navigation/NavigationHeader.class.php b/libraries/navigation/NavigationHeader.class.php index 651de0af18..41d34ed2ca 100644 --- a/libraries/navigation/NavigationHeader.class.php +++ b/libraries/navigation/NavigationHeader.class.php @@ -175,7 +175,7 @@ class PMA_NavigationHeader /** * Creates the code for displaying the links - * at the top of the navigation panel + * at the top of the navigation panel * * @return string HTML code for the links */ diff --git a/libraries/plugins/import/ImportCsv.class.php b/libraries/plugins/import/ImportCsv.class.php index 8925842f75..ce7af48b32 100644 --- a/libraries/plugins/import/ImportCsv.class.php +++ b/libraries/plugins/import/ImportCsv.class.php @@ -296,7 +296,7 @@ class ImportCsv extends AbstractImportCsv $buffer, $ch, $i, $csv_terminated_len ); $i += $csv_terminated_len-1; - + } while ($i < $len) { // Deadlock protection @@ -652,7 +652,7 @@ class ImportCsv extends AbstractImportCsv } /** - * Read the expected column_separated_with String of length + * Read the expected column_separated_with String of length * $csv_terminated_len from the $buffer * into variable $ch and return the read string $ch * @@ -667,7 +667,7 @@ class ImportCsv extends AbstractImportCsv * * @return string */ - + public function readCsvTerminatedString($buffer, $ch, $i, $csv_terminated_len) { for ($j = 0; $j < $csv_terminated_len - 1; $j++) { @@ -700,5 +700,5 @@ class ImportCsv extends AbstractImportCsv { $this->_analyze = $analyze; } - + } diff --git a/libraries/plugins/import/README b/libraries/plugins/import/README index 815cf2b69c..9d435e9e7a 100644 --- a/libraries/plugins/import/README +++ b/libraries/plugins/import/README @@ -1,6 +1,6 @@ This directory holds import plugins for phpMyAdmin. Any new plugin should basically follow the structure presented here. The messages must use our -gettext mechanism, see http://wiki.phpmyadmin.net/pma/Gettext_for_developers. +gettext mechanism, see http://wiki.phpmyadmin.net/pma/Gettext_for_developers. <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ diff --git a/libraries/plugins/transformations/abstract/Bool2TextTransformationsPlugin.class.php b/libraries/plugins/transformations/abstract/Bool2TextTransformationsPlugin.class.php index 5385c6911a..618a702e1e 100644 --- a/libraries/plugins/transformations/abstract/Bool2TextTransformationsPlugin.class.php +++ b/libraries/plugins/transformations/abstract/Bool2TextTransformationsPlugin.class.php @@ -52,7 +52,7 @@ abstract class Bool2TextTransformationsPlugin extends TransformationsPlugin if (! isset($options[1])) { $options[1] = 'F'; // default false option } - + if ($buffer == '0') { return $options[1]; // return false label } diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 773e951151..cf255e784e 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -1037,7 +1037,7 @@ function PMA_SQP_analyze($arr) * |MIN|MAX|BIT_OR|BIT_AND * ['queryflags']['is_count'] = 1; for the presence of SELECT COUNT * ['queryflags']['is_procedure'] = 1; for the presence of CALL - * ['queryflags']['is_subquery'] = 1; contains a subquery + * ['queryflags']['is_subquery'] = 1; contains a subquery * * query clauses * ------------- diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index bcf4b7e4d1..4526fcaba2 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -2232,7 +2232,7 @@ function PMA_getHtmlForDisplayTableStats($showtable, $table_info_num_rows, (isset ($avg_size) ? $avg_size : ''), (isset ($avg_unit) ? $avg_unit : '') ); - + $html_output .= '</fieldset>' . '</div>'; diff --git a/scripts/generate-mo b/scripts/generate-mo index d8c8ab2245..7ac521b278 100755 --- a/scripts/generate-mo +++ b/scripts/generate-mo @@ -20,6 +20,6 @@ if [ ! -z "$1" ] ; then exit 0 fi -for x in po/*.po ; do +for x in po/*.po ; do compile $x done diff --git a/scripts/locales-contributors b/scripts/locales-contributors index 8bdfc70587..021eca3659 100755 --- a/scripts/locales-contributors +++ b/scripts/locales-contributors @@ -1,5 +1,5 @@ #!/bin/sh -for x in po/*.po ; do +for x in po/*.po ; do grep 'Team' $x | sed 's/.*: \(.*\)<.*/\1/' git shortlog -sne --no-merges -- $x | grep '^ [ 0-9][0-9]\{3\}' done diff --git a/scripts/remove-incomplete-mo b/scripts/remove-incomplete-mo index ec7d3b3dd3..8d703452fc 100755 --- a/scripts/remove-incomplete-mo +++ b/scripts/remove-incomplete-mo @@ -20,11 +20,11 @@ if [ ! -z "$1" ] ; then THRESHOLD=$1 fi -echo '<?php' > $TMPOUTPUTFILE -echo '/* Automatically generated file, do not edit! */' >> $TMPOUTPUTFILE -echo '/* Generated by scripts/remove-incomplete-mo */' >> $TMPOUTPUTFILE -echo '' >> $TMPOUTPUTFILE -echo '$GLOBALS["language_stats"] = array (' >> $TMPOUTPUTFILE +echo '<?php' > $TMPOUTPUTFILE +echo '/* Automatically generated file, do not edit! */' >> $TMPOUTPUTFILE +echo '/* Generated by scripts/remove-incomplete-mo */' >> $TMPOUTPUTFILE +echo '' >> $TMPOUTPUTFILE +echo '$GLOBALS["language_stats"] = array (' >> $TMPOUTPUTFILE check() { TMPOUTPUTFILE=$2 @@ -46,21 +46,21 @@ check() { UNTRANSLATED=0 fi PERCENT=`expr 100 \* $TRANSLATED / \( $TRANSLATED + $FUZZY + $UNTRANSLATED \) || true` - echo " '$lang' => $PERCENT," >> $TMPOUTPUTFILE + echo " '$lang' => $PERCENT," >> $TMPOUTPUTFILE if [ $PERCENT -lt $THRESHOLD ] ; then echo "Removing $lang, only $PERCENT%" - rm -f locale/$lang/LC_MESSAGES/phpmyadmin.mo + rm -f locale/$lang/LC_MESSAGES/phpmyadmin.mo rmdir locale/$lang/LC_MESSAGES rmdir locale/$lang fi } -for x in po/*.po ; do +for x in po/*.po ; do check $x $TMPOUTPUTFILE done -echo ');' >> $TMPOUTPUTFILE -echo '?>' >> $TMPOUTPUTFILE +echo ');' >> $TMPOUTPUTFILE +echo '?>' >> $TMPOUTPUTFILE -mv $TMPOUTPUTFILE $OUTPUTFILE +mv $TMPOUTPUTFILE $OUTPUTFILE diff --git a/test/README.rst b/test/README.rst index 29b715f625..60409ec041 100644 --- a/test/README.rst +++ b/test/README.rst @@ -3,7 +3,7 @@ PhpMyAdmin test suite This directory is protected from web visitors by a .htaccess file. -For more information on allowing http access to this directory see: +For more information on allowing http access to this directory see: http://httpd.apache.org/docs/current/mod/mod_authz_host.html#allow Please visit the wiki for more information on unit testing: diff --git a/test/classes/PMA_Font_test.php b/test/classes/PMA_Font_test.php index 4478cf4397..482f7f82bc 100644 --- a/test/classes/PMA_Font_test.php +++ b/test/classes/PMA_Font_test.php @@ -47,7 +47,7 @@ class PMA_Font_Test extends PHPUnit_Framework_TestCase 12, PMA_Font::getStringWidth("aa", "arial", "10") ); - + // string "i" $this->assertEquals( 3, diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php index d54ddfa5d6..03b2245a5b 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php @@ -1058,7 +1058,7 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase $this->object->blowfishEncrypt('data123', 'sec321') ); } else { - //using our own iv for testing + //using our own iv for testing $tmp = $GLOBALS['iv']; $GLOBALS['iv'] = "testiv09"; $this->assertEquals( @@ -1077,8 +1077,8 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase public function testBlowfishDecrypt() { if (function_exists('mcrypt_encrypt')) { - - //using our own iv for testing + + //using our own iv for testing $tmp = $GLOBALS['iv']; $GLOBALS['iv'] = "testiv09"; $this->assertEquals( @@ -1086,7 +1086,7 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase $this->object->blowfishDecrypt('x/2GwHKoPyc=', 'sec321') ); $GLOBALS['iv'] = $tmp; - + } else { $this->assertEquals( 'data123', diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php index 286b0f48ec..59b8055e89 100644 --- a/test/classes/plugin/export/PMA_ExportSql_test.php +++ b/test/classes/plugin/export/PMA_ExportSql_test.php @@ -279,19 +279,19 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase '<code> / EVENT</code><code> / TRIGGER</code> statement', $leaf->getText() ); - + $leaf = array_shift($leaves); $this->assertInstanceOf( 'BoolPropertyItem', $leaf ); - + $leaf = array_shift($leaves); $this->assertInstanceOf( 'BoolPropertyItem', $leaf ); - + $leaf = array_shift($leaves); $this->assertInstanceOf( 'BoolPropertyItem', @@ -1689,7 +1689,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase $GLOBALS['sql_create_trigger'] = true; $GLOBALS['sql_drop_table'] = true; - + ob_start(); $this->assertTrue( $this->object->exportStructure( @@ -1707,7 +1707,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase "foo;\nDELIMITER //\nbarDELIMITER ;\n", $result ); - + unset($GLOBALS['sql_create_trigger']); unset($GLOBALS['sql_drop_table']); |