diff options
author | Michal Čihař <mcihar@suse.cz> | 2011-07-22 12:08:22 +0400 |
---|---|---|
committer | Michal Čihař <mcihar@suse.cz> | 2011-07-22 12:15:08 +0400 |
commit | d55306252b4a8b4389dfaa0245a3aab6ed0b6376 (patch) | |
tree | f3d4dee63fd17942835b4f38f8380a83b62971d2 /setup | |
parent | 3f8badd37f3e7ea78a718660e615ecf1c856e2f0 (diff) |
Replace tabs with spaces, cleanup identation
Diffstat (limited to 'setup')
-rw-r--r-- | setup/frames/index.inc.php | 12 | ||||
-rw-r--r-- | setup/frames/menu.inc.php | 14 | ||||
-rw-r--r-- | setup/lib/form_processing.lib.php | 6 | ||||
-rw-r--r-- | setup/scripts.js | 8 |
4 files changed, 20 insertions, 20 deletions
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index ea88aa759e..83c6684742 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -88,12 +88,12 @@ if (!$is_https) { <?php // Check for done action info and set notice message if present switch ($action_done) { - case 'config_saved': - messages_set('notice', 'config_saved', __('Configuration saved.'), - PMA_lang(__('Configuration saved to file config/config.inc.php in phpMyAdmin top level directory, copy it to top level one and delete directory config to use it.'))); - break; - default: - break; + case 'config_saved': + messages_set('notice', 'config_saved', __('Configuration saved.'), + PMA_lang(__('Configuration saved to file config/config.inc.php in phpMyAdmin top level directory, copy it to top level one and delete directory config to use it.'))); + break; + default: + break; } ?> diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php index 4a1ae9c2b4..978a47becb 100644 --- a/setup/frames/menu.inc.php +++ b/setup/frames/menu.inc.php @@ -12,11 +12,11 @@ if (!defined('PHPMYADMIN')) { $separator = PMA_get_arg_separator('html'); ?> <ul> - <li><a href="index.php"><?php echo __('Overview') ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=Features"><?php echo __('Features') ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=Sql_queries"><?php echo __('SQL queries') ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=Left_frame"><?php echo __('Navigation frame') ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=Main_frame"><?php echo __('Main frame') ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=Import"><?php echo __('Import') ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=Export"><?php echo __('Export') ?></a></li> + <li><a href="index.php"><?php echo __('Overview') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=Features"><?php echo __('Features') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=Sql_queries"><?php echo __('SQL queries') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=Left_frame"><?php echo __('Navigation frame') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=Main_frame"><?php echo __('Main frame') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=Import"><?php echo __('Import') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=Export"><?php echo __('Export') ?></a></li> </ul> diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php index 17f58a60e0..d54fd807c6 100644 --- a/setup/lib/form_processing.lib.php +++ b/setup/lib/form_processing.lib.php @@ -12,7 +12,7 @@ * @param FormDisplay $form_display */ function process_formset(FormDisplay $form_display) { - if (filter_input(INPUT_GET, 'mode') == 'revert') { + if (filter_input(INPUT_GET, 'mode') == 'revert') { // revert erroneous fields to their default values $form_display->fixErrors(); // drop post data @@ -33,8 +33,8 @@ function process_formset(FormDisplay $form_display) { $formset = $formset ? "{$separator}formset=$formset" : ''; $id = filter_input(INPUT_GET, 'id', FILTER_VALIDATE_INT); if ($id === null && $page == 'servers') { - // we've just added a new server, get it's id - $id = ConfigFile::getInstance()->getServerCount(); + // we've just added a new server, get it's id + $id = ConfigFile::getInstance()->getServerCount(); } $id = $id ? "{$separator}id=$id" : ''; ?> diff --git a/setup/scripts.js b/setup/scripts.js index f223e0436f..b4e97dc6b3 100644 --- a/setup/scripts.js +++ b/setup/scripts.js @@ -57,7 +57,7 @@ $.extend(true, validators, { } return true; }, - /** + /** * TrustedProxies field * * @param {boolean} isKeyUp @@ -121,7 +121,7 @@ $.extend(true, validators, { * @param {Object} values values hash {element1_id: value, ...} */ function ajaxValidate(parent, id, values) { - parent = $(parent); + parent = $(parent); // ensure that parent is a fieldset if (parent.attr('tagName') != 'FIELDSET') { parent = parent.closest('fieldset'); @@ -131,7 +131,7 @@ function ajaxValidate(parent, id, values) { } if (parent.data('ajax') != null) { - parent.data('ajax').abort(); + parent.data('ajax').abort(); } parent.data('ajax', $.ajax({ @@ -155,7 +155,7 @@ function ajaxValidate(parent, id, values) { error[parent.id] = [response['error']]; } else { for (var key in response) { - var value = response[key]; + var value = response[key]; error[key] = jQuery.isArray(value) ? value : [value]; } } |