diff options
| -rw-r--r-- | bin/migrate_config.inc | 6 | ||||
| -rwxr-xr-x | docs/CHANGELOG | 4 | ||||
| -rwxr-xr-x | docs/MIGRATION | 13 | ||||
| -rwxr-xr-x | docs/README | 14 | ||||
| -rw-r--r-- | lib/init.php | 3 |
5 files changed, 22 insertions, 18 deletions
diff --git a/bin/migrate_config.inc b/bin/migrate_config.inc index 713a1656..4559f9c4 100644 --- a/bin/migrate_config.inc +++ b/bin/migrate_config.inc @@ -39,7 +39,9 @@ $translate = array('local_host'=>'database_hostname', 'sess_cookielife'=>'session_cookielife', 'sess_cookiesecure'=>'session_cookiesecure'); -$old_config = file_get_contents('../config/ampache.cfg.php'); +$path = dirname(__FILE__); +$prefix = realpath($path . '/../'); +$old_config = file_get_contents($prefix . '/config/ampache.cfg.php'); $data = explode("\n",$old_config); @@ -75,7 +77,7 @@ foreach ($data as $line) { echo "Parse complete, writing\n"; -$handle = fopen('../config/ampache.cfg.php','w'); +$handle = fopen($prefix . '/config/ampache.cfg.php','w'); $worked = fwrite($handle,$new_config); diff --git a/docs/CHANGELOG b/docs/CHANGELOG index 54b9d0d3..8a5eb7c6 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -1,9 +1,9 @@ -------------------------------------------------------------------------- ---------- Ampache -- CHANGELOG --------- +--------- Ampache -- CHANGELOG --------- -------------------------------------------------------------------------- -------------------------------------------------------------------------- - v.3.4-Alpha1 + v.3.4-Alpha1 07/29/2007 - Improved Albums of the Moment performance on large catalogs (Thx Vlet) - Added Migration script for config file. Also added in sane diff --git a/docs/MIGRATION b/docs/MIGRATION index 8751e0d8..3b826133 100755 --- a/docs/MIGRATION +++ b/docs/MIGRATION @@ -1,8 +1,13 @@ ------------------------------------------------------------------------------- ---------- MIGRATION - Ampache v.3.3.3 ----------- +--------- MIGRATION - Ampache v.3.4 ----------- ------------------------------------------------------------------------------- -- Migrating from Ampache 3.3.X --> 3.3.3 +- Migrating from Ampache 3.3.x --> 3.4 + + The config file format has changed, please follow the instructions + in the web interface. + +- Migrating from Ampache 3.3.x --> 3.3.3 The newest release of Ampache will prompt Admins to download and install a config file if their current one is out of date. While @@ -10,13 +15,13 @@ it is strongly recommended that if prompted you install the newly created config file -- Migrating from Ampache 3.3 --> 3.X+ +- Migrating from Ampache 3.3 --> 3.x+ After running /update.php check /test.php to make sure that you still meet all the requirements, and that your config file is up to date. -- Migrating from Ampache 3.3 --> 3.3.X+ +- Migrating from Ampache 3.3 --> 3.3.x+ Rename your /config/ampache.cfg to /config/ampache.cfg.php diff --git a/docs/README b/docs/README index 04f7475e..2e4d54e5 100755 --- a/docs/README +++ b/docs/README @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- ---------- README - Ampache v.3.3.3 ----------- +--------- README - Ampache v.3.4 ----------- ------------------------------------------------------------------------------- Contents: @@ -116,12 +116,12 @@ Contents: 2. Getting all the components Apache >= 1.3.19 http://www.apache.org OR other webserver - PHP >= 4.3.x http://www.php.net - PHP4-Mysql - PHP4-Session - PHP4-gd (recommended) - PHP4 ICONV - PHP4 ZLIB support (recommended) + PHP >= 5.0.x http://www.php.net + PHP5-Mysql + PHP5-Session + PHP5-gd (recommended) + PHP5 ICONV + PHP5 ZLIB support (recommended) MySQL >= 4.x http://www.mysql.com 24MB of Ram diff --git a/lib/init.php b/lib/init.php index ebef623c..d5f7eaa9 100644 --- a/lib/init.php +++ b/lib/init.php @@ -90,9 +90,6 @@ if (!$_SERVER['SERVER_NAME']) { if (!$results['user_ip_cardinality']) { $results['user_ip_cardinality'] = 42; } -if (!$results['local_length']) { - $results['local_length'] = '900'; -} /* Variables needed for vauth Module */ $results['cookie_path'] = $results['raw_web_path']; |