summaryrefslogtreecommitdiffstats
path: root/templates/show_install_config.inc.php
diff options
context:
space:
mode:
authorPaul Arthur <paul.arthur@flowerysong.com>2013-01-26 03:00:32 -0500
committerPaul Arthur <paul.arthur@flowerysong.com>2013-01-26 03:38:46 -0500
commitef4d3660605efc7f1328d4533b0f4bfb6c1107e2 (patch)
treee4377fb129a899e65aaaf421f8c97098aecaedd5 /templates/show_install_config.inc.php
parent8a750c3e875d590d351c3042570a134fcdf03e5d (diff)
downloadampache-ef4d3660605efc7f1328d4533b0f4bfb6c1107e2.tar.gz
ampache-ef4d3660605efc7f1328d4533b0f4bfb6c1107e2.tar.bz2
ampache-ef4d3660605efc7f1328d4533b0f4bfb6c1107e2.zip
Cosmetics: death to tabs
The refactoring I've been doing has reminded me of my strong preference for spaces, and I feel inclined to impose my will on the tree.
Diffstat (limited to 'templates/show_install_config.inc.php')
-rw-r--r--templates/show_install_config.inc.php102
1 files changed, 51 insertions, 51 deletions
diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php
index 703ef890..bae4d3ba 100644
--- a/templates/show_install_config.inc.php
+++ b/templates/show_install_config.inc.php
@@ -1,5 +1,5 @@
<?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -23,62 +23,62 @@
$prefix = realpath(dirname(__FILE__). "/../");
require $prefix . '/templates/install_header.inc.php';
?>
- <div class="content">
- <?php echo T_('Step 1 - Create the Ampache database'); ?><br />
- <strong><?php echo T_('Step 2 - Create ampache.cfg.php'); ?></strong><br />
- <dl>
- <dd><?php printf(T_('This step takes the basic config values and generates the config file. If your config/ directory is writable, you can select "write" to have Ampache write the config file directly to the correct location. If you select "download" it will prompt you to download the config file, and you can then manually place the config file in %s'), $prefix . '/config'); ?></dd>
- </dl>
- <?php echo T_('Step 3 - Set up the initial account'); ?><br />
- <?php Error::display('general'); ?>
- <br />
+ <div class="content">
+ <?php echo T_('Step 1 - Create the Ampache database'); ?><br />
+ <strong><?php echo T_('Step 2 - Create ampache.cfg.php'); ?></strong><br />
+ <dl>
+ <dd><?php printf(T_('This step takes the basic config values and generates the config file. If your config/ directory is writable, you can select "write" to have Ampache write the config file directly to the correct location. If you select "download" it will prompt you to download the config file, and you can then manually place the config file in %s'), $prefix . '/config'); ?></dd>
+ </dl>
+ <?php echo T_('Step 3 - Set up the initial account'); ?><br />
+ <?php Error::display('general'); ?>
+ <br />
<span class="header2"><?php echo T_('Generate Config File'); ?></span>
<?php Error::display('config'); ?>
<form method="post" action="<?php echo WEB_PATH . "?action=create_config"; ?>" enctype="multipart/form-data" >
<table>
<tr>
- <td class="align"><?php echo T_('Web Path'); ?></td>
- <td class="align"><input type="text" name="web_path" value="<?php echo $web_path; ?>" /></td>
+ <td class="align"><?php echo T_('Web Path'); ?></td>
+ <td class="align"><input type="text" name="web_path" value="<?php echo $web_path; ?>" /></td>
</tr>
<tr>
- <td class="align"><?php echo T_('Database Name'); ?></td>
- <td class="align"><input type="text" name="local_db" value="<?php echo scrub_out($_REQUEST['local_db']); ?>" /></td>
+ <td class="align"><?php echo T_('Database Name'); ?></td>
+ <td class="align"><input type="text" name="local_db" value="<?php echo scrub_out($_REQUEST['local_db']); ?>" /></td>
</tr>
<tr>
- <td class="align"><?php echo T_('MySQL Hostname'); ?></td>
- <td class="align"><input type="text" name="local_host" value="<?php echo scrub_out($_REQUEST['local_host']); ?>" /></td>
+ <td class="align"><?php echo T_('MySQL Hostname'); ?></td>
+ <td class="align"><input type="text" name="local_host" value="<?php echo scrub_out($_REQUEST['local_host']); ?>" /></td>
</tr>
<tr>
- <td class="align"><?php echo T_('MySQL Username'); ?></td>
- <td class="align"><input type="text" name="local_username" value="<?php echo scrub_out($_REQUEST['local_username']); ?>" /></td>
+ <td class="align"><?php echo T_('MySQL Username'); ?></td>
+ <td class="align"><input type="text" name="local_username" value="<?php echo scrub_out($_REQUEST['local_username']); ?>" /></td>
</tr>
<tr>
- <td class="align"><?php echo T_('MySQL Password'); ?></td>
- <td class="align"><input type="password" name="local_pass" value="" /></td>
+ <td class="align"><?php echo T_('MySQL Password'); ?></td>
+ <td class="align"><input type="password" name="local_pass" value="" /></td>
</tr>
<tr>
- <td>&nbsp;</td>
- <td>
- <input type="submit" name="download" value="<?php echo T_('Download'); ?>" />
- <input type="submit" name="write" value="<?php echo T_('Write'); ?>" <?php if (!check_config_writable()) { echo "disabled "; } ?>/>
- <input type="hidden" name="htmllang" value="<?php echo $htmllang; ?>" />
- <input type="hidden" name="charset" value="<?php echo $charset; ?>" />
- </td>
+ <td>&nbsp;</td>
+ <td>
+ <input type="submit" name="download" value="<?php echo T_('Download'); ?>" />
+ <input type="submit" name="write" value="<?php echo T_('Write'); ?>" <?php if (!check_config_writable()) { echo "disabled "; } ?>/>
+ <input type="hidden" name="htmllang" value="<?php echo $htmllang; ?>" />
+ <input type="hidden" name="charset" value="<?php echo $charset; ?>" />
+ </td>
</tr>
- </table>
- </form>
- <br />
- <table>
+ </table>
+ </form>
+ <br />
+ <table>
<tr>
<td class="align"><?php echo T_('ampache.cfg.php exists?'); ?></td>
<td>[
<?php
if (!is_readable($configfile)) {
- echo debug_result('',false);
+ echo debug_result('',false);
}
else {
- echo debug_result('',true);
+ echo debug_result('',true);
}
?>
]
@@ -92,32 +92,32 @@ require $prefix . '/templates/install_header.inc.php';
<?php
$results = @parse_ini_file($configfile);
if (!check_config_values($results)) {
- echo debug_result('',false);
+ echo debug_result('',false);
}
else {
- echo debug_result('',true);
+ echo debug_result('',true);
}
?>
]
</td>
</tr>
<tr>
- <td>&nbsp;</td>
- <td>
- <?php $check_url = WEB_PATH . "?action=show_create_config&amp;htmllang=$htmllang&amp;charset=$charset&amp;local_db=" . $_REQUEST['local_db'] . "&amp;local_host=" . $_REQUEST['local_host']; ?>
- <a href="<?php echo $check_url; ?>">[<?php echo T_('Recheck Config'); ?>]</a>
- </td>
- </tr>
- </table>
- <br />
- <form method="post" action="<?php echo WEB_PATH . "?action=show_create_account&amp;htmllang=$htmllang&amp;charset=$charset"; ?>" enctype="multipart/form-data">
- <input type="submit" value="<?php echo T_('Continue to Step 3'); ?>" />
- </form>
- </div>
- <div id="bottom">
- <p><strong>Ampache Installation.</strong><br />
- For the love of Music.</p>
- </div>
+ <td>&nbsp;</td>
+ <td>
+ <?php $check_url = WEB_PATH . "?action=show_create_config&amp;htmllang=$htmllang&amp;charset=$charset&amp;local_db=" . $_REQUEST['local_db'] . "&amp;local_host=" . $_REQUEST['local_host']; ?>
+ <a href="<?php echo $check_url; ?>">[<?php echo T_('Recheck Config'); ?>]</a>
+ </td>
+ </tr>
+ </table>
+ <br />
+ <form method="post" action="<?php echo WEB_PATH . "?action=show_create_account&amp;htmllang=$htmllang&amp;charset=$charset"; ?>" enctype="multipart/form-data">
+ <input type="submit" value="<?php echo T_('Continue to Step 3'); ?>" />
+ </form>
+ </div>
+ <div id="bottom">
+ <p><strong>Ampache Installation.</strong><br />
+ For the love of Music.</p>
+ </div>
</div>
</body>