diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-07-25 07:48:28 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-07-25 07:48:28 +0000 |
| commit | f5a947aa0c2d197d679a3ff53ae17cfdaad41eae (patch) | |
| tree | 82a00cc11df0a850ba08d2ee05ca656071c27bc0 | |
| parent | fe5e72104ab0c622a58cd11c56afb00e3ebb7208 (diff) | |
| download | ampache-f5a947aa0c2d197d679a3ff53ae17cfdaad41eae.tar.gz ampache-f5a947aa0c2d197d679a3ff53ae17cfdaad41eae.tar.bz2 ampache-f5a947aa0c2d197d679a3ff53ae17cfdaad41eae.zip | |
first step to the migration hotness, detect failed config files and show migration docs
| -rw-r--r-- | config/ampache.cfg.php.dist | 2 | ||||
| -rw-r--r-- | lib/init.php | 2 | ||||
| -rw-r--r-- | templates/show_test_config.inc.php | 74 | ||||
| -rw-r--r-- | test.php | 3 |
4 files changed, 79 insertions, 2 deletions
diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist index b4692d28..91e98847 100644 --- a/config/ampache.cfg.php.dist +++ b/config/ampache.cfg.php.dist @@ -224,7 +224,7 @@ show_album_art = "true" ; Amazon base urls ; An array of Amazon sites to search. ; NOTE: This will search each of these sites in turn so don't expect it -; to be lightening fast! +; to be lighting fast! ; It is strongly recommended that only one of these is selected at any ; one time ; POSSIBLE VALUES: diff --git a/lib/init.php b/lib/init.php index 6d3a1d5c..b7032e29 100644 --- a/lib/init.php +++ b/lib/init.php @@ -61,7 +61,7 @@ $results = @parse_ini_file($configfile); if (!count($results)) { $path = preg_replace("/(.*)\/(\w+\.php)$/","\${1}", $_SERVER['PHP_SELF']); - $link = $http_type . $_SERVER['HTTP_HOST'] . $path . "/test.php"; + $link = $http_type . $_SERVER['HTTP_HOST'] . $path . "/test.php?action=config"; header ("Location: $link"); exit(); } diff --git a/templates/show_test_config.inc.php b/templates/show_test_config.inc.php new file mode 100644 index 00000000..6d3220d4 --- /dev/null +++ b/templates/show_test_config.inc.php @@ -0,0 +1,74 @@ +<?php +/* + + Copyright (c) 2001 - 2007 Ampache.org + All Rights Reserved + + this program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +*/ +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> +<html lang="en-US"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<title>Ampache -- Config Debug Page</title> +</head> +<body bgcolor="#f0f0f0"> +<link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" /> +<style type="text/css"> +body { + text-align:left; +} +#content { + padding-left: 10px; +} +</style> +<div id="header"> +<h1><?php echo _('Ampache Debug'); ?></h1> +<p>Ampache.cfg.php error detected</p> +</div> +<div id="content"> +<h3>Migrating from 3.3.x to 3.4.x</h3> +<p>Ampache 3.4 uses a different config parser that is over 10x faster then the previous version. Unfortunately the new parser is +unable to read the old config files. You must run <strong>/bin/generate_config.inc</strong> from the command line to create your +new config file.</p> + +<p>The following settings will not be migrated by the <strong>generate_config.inc</strong> script due to major changes between versions. The default +values from the ampache.cfg.php.dist file will be used.</p> + +<strong>auth_methods</strong> (<i>mysql</i>)<br /> +This defines which auth methods vauth will attempt to use and in which order, if auto_create isn't enabled. +The user must exist locally as well<br /> +<br /> +<strong>tag_order</strong> (<i>id3v2,id3v1,vorbiscomment,quicktime,ape,asf</i>)<br /> +This determines the tag order for all cataloged music. If none of the listed tags are found then ampache will default to +the first tag format that was found. <br /> +<br /> +<strong>album_art_order</strong> (<i>db,id3,folder,lastfm,amazon</i>)<br /> +Simply arrange the following in the order you would like ampache to search if you want to disable one of the search +method simply comment it out valid values are<br /> +<br /> +<strong>amazon_base_urls</strong> (<i>http://webservices.amazon.com</i>)<br /> +An array of Amazon sites to search. NOTE: This will search each of these sites in turn so don't expect it +to be lighting fast! It is strongly recommended that only one of these is selected at any<br /> +<br /> +</div> +<div id="bottom"> +<p><b>Ampache Debug.</b><br /> +For the love of Music.</p> +</div> +</body> +</html> @@ -41,6 +41,9 @@ require_once $prefix . '/lib/debug.lib.php'; Dba::_auto_init(); switch ($_REQUEST['action']) { + case 'config': + require_once $prefix . '/templates/show_test_config.inc.php'; + break; default: require_once $prefix . '/templates/show_test.inc.php'; break; |