diff options
author | Nisarg Jhaveri <nisargjhaveri@gmail.com> | 2015-05-14 10:24:30 +0300 |
---|---|---|
committer | Nisarg Jhaveri <nisargjhaveri@gmail.com> | 2015-05-14 22:26:26 +0300 |
commit | 431847b39ea32cbd20a7e58117df5029540f0e3c (patch) | |
tree | 85e7bace95ccb23f0dbba04ce5c3eb21e8112c30 /setup | |
parent | 9207b6726406885d487e2e0ed8d066fa01c5383a (diff) |
Return HTML instead of echo-ing directly in FormDisplay
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
Diffstat (limited to 'setup')
-rw-r--r-- | setup/frames/config.inc.php | 8 | ||||
-rw-r--r-- | setup/frames/index.inc.php | 14 | ||||
-rw-r--r-- | setup/lib/form_processing.lib.php | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php index f265160989..04778a04b8 100644 --- a/setup/frames/config.inc.php +++ b/setup/frames/config.inc.php @@ -23,10 +23,10 @@ $config_exists = false; PMA_checkConfigRw($config_readable, $config_writable, $config_exists); echo '<h2>' . __('Configuration file') . '</h2>'; -PMA_displayFormTop('config.php'); +echo PMA_displayFormTop('config.php'); echo '<input type="hidden" name="eol" value="' . htmlspecialchars(PMA_ifSetOr($_GET['eol'], 'unix')) . '" />'; -PMA_displayFieldsetTop('config.inc.php', '', null, array('class' => 'simple')); +echo PMA_displayFieldsetTop('config.inc.php', '', null, array('class' => 'simple')); echo '<tr>'; echo '<td>'; echo '<textarea cols="50" rows="20" name="textconfig" ' @@ -47,6 +47,6 @@ echo '/>'; echo '</td>'; echo '</tr>'; -PMA_displayFieldsetBottomSimple(); -PMA_displayFormBottom(); +echo PMA_displayFieldsetBottomSimple(); +echo PMA_displayFormBottom(); ?> diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index 2c341ec2c9..a07f57ba9d 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -147,7 +147,7 @@ echo '</legend>'; // // Display server list // -PMA_displayFormTop( +echo PMA_displayFormTop( 'index.php', 'get', array( 'page' => 'servers', @@ -205,7 +205,7 @@ echo '</tr>'; echo '</table>'; echo '</div>'; -PMA_displayFormBottom(); +echo PMA_displayFormBottom(); echo '</fieldset>'; @@ -216,7 +216,7 @@ echo '<fieldset class="simple"><legend>' . __('Configuration file') . '</legend> // $form_display = new FormDisplay($cf); -PMA_displayFormTop('config.php'); +echo PMA_displayFormTop('config.php'); echo '<table width="100%" cellspacing="0">'; // Display language list @@ -228,7 +228,7 @@ foreach ($all_languages as $each_lang_key => $each_lang) { $lang_name = PMA_languageName($each_lang); $opts['values'][$each_lang_key] = $lang_name; } -PMA_displayInput( +echo PMA_displayInput( 'DefaultLang', __('Default language'), 'select', $cf->getValue('DefaultLang'), '', true, $opts ); @@ -253,7 +253,7 @@ if ($cf->getServerCount() > 0) { $opts['values']['1'] = __('- none -'); $opts['values_escaped'] = true; } -PMA_displayInput( +echo PMA_displayInput( 'ServerDefault', __('Default server'), 'select', $cf->getValue('ServerDefault'), '', true, $opts ); @@ -265,7 +265,7 @@ $opts = array( 'win' => 'Windows (\r\n)'), 'values_escaped' => true); $eol = PMA_ifSetOr($_SESSION['eol'], (PMA_IS_WINDOWS ? 'win' : 'unix')); -PMA_displayInput( +echo PMA_displayInput( 'eol', __('End of line'), 'select', $eol, '', true, $opts ); @@ -301,7 +301,7 @@ echo '</td>'; echo '</tr>'; echo '</table>'; -PMA_displayFormBottom(); +echo PMA_displayFormBottom(); echo '</fieldset>'; echo '<div id="footer">'; diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php index d8eadf6610..5a65588021 100644 --- a/setup/lib/form_processing.lib.php +++ b/setup/lib/form_processing.lib.php @@ -23,7 +23,7 @@ function PMA_Process_formset(FormDisplay $form_display) if (!$form_display->process(false)) { // handle form view and failed POST - $form_display->display(true, true); + echo $form_display->getDisplay(true, true); return; } @@ -52,7 +52,7 @@ function PMA_Process_formset(FormDisplay $form_display) <?php echo __('Try to revert erroneous fields to their default values') ?> </a> </div> - <?php $form_display->displayErrors() ?> + <?php echo $form_display->displayErrors() ?> <a class="btn" href="index.php<?php echo PMA_URL_getCommon() ?>"> <?php echo __('Ignore errors') ?> </a> |