diff options
| -rw-r--r-- | server/xml.server.php | 8 | ||||
| -rw-r--r-- | templates/show_install.inc.php | 6 | ||||
| -rw-r--r-- | templates/show_install_config.inc.php | 2 | ||||
| -rw-r--r-- | test.php | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/server/xml.server.php b/server/xml.server.php index 04475bca..3cb56e20 100644 --- a/server/xml.server.php +++ b/server/xml.server.php @@ -27,6 +27,9 @@ define('NO_SESSION','1'); require_once '../lib/init.php'; +// If we don't even have access control on then we can't use this! +if (!Config::get('access_control')) { access_denied(); exit; } + /** * Verify the existance of the Session they passed in we do allow them to * login via this interface so we do have an exception for action=login @@ -36,6 +39,11 @@ if (!Access::session_exists(array(),$_REQUEST['auth'],'api') AND $_REQUEST['acti exit(); } +// If it's not a handshake then we can allow it to take up lots of time +if (!$_REQUEST['action'] != 'handshake') { + set_time_limit(0); +} + /* Set the correct headers */ header("Content-type: text/xml; charset=" . Config::get('site_charset')); header("Content-Disposition: attachment; filename=information.xml"); diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php index 5a477e74..5d3a05eb 100644 --- a/templates/show_install.inc.php +++ b/templates/show_install.inc.php @@ -30,7 +30,7 @@ if (INSTALL != '1') { exit; } <script src="lib/javascript-base.js" language="javascript" type="text/javascript"></script> <div id="header"> <h1><?php echo _("Ampache Installation"); ?></h1> -<p>For the love of Music</p> +<p>Pour l'Amour de la Musique</p> </div> <div id="text-box"> @@ -58,7 +58,7 @@ if (INSTALL != '1') { exit; } <br /> <?php Error::display('general'); ?> <br /> - <span class="header2">Insert Ampache Database</span> + <span class="header2"><?php echo _('Insert Ampache Database'); ?></span> <form method="post" action="<?php echo $http_type . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . "?action=create_db&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data" > <table> <tr> @@ -104,7 +104,7 @@ if (INSTALL != '1') { exit; } </div> <div id="bottom"> <p><b>Ampache Installation.</b><br /> - For the love of Music.</p> + Pour l'Amour de la Musique</p> </div> </div> diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php index 9b5c477b..d68d47bd 100644 --- a/templates/show_install_config.inc.php +++ b/templates/show_install_config.inc.php @@ -30,7 +30,7 @@ if (INSTALL != '1') { exit; } <body> <div id="header"> <h1><?php echo _('Ampache Installation'); ?></h1> -<p>For the love of Music</p> +<p>Pour l'Amour de la Musique</p> </div> <div id="text-box"> @@ -20,7 +20,7 @@ */ // Set the Error level manualy... I'm to lazy to fix notices -error_reporting(E_ALL ^ E_NOTICE); +error_reporting(0); $prefix = dirname(__FILE__); $configfile = "$prefix/config/ampache.cfg.php"; |