summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-06-17 16:32:04 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-06-17 16:32:04 +0000
commite3734f063ed58356f9653a81f6dea86aa55931f4 (patch)
tree3aace945cfd5d8e988395170ff92ab75c0419819 /bin
parentc6c2320170b488f64f1c67de23a35f4ca4de59de (diff)
downloadampache-e3734f063ed58356f9653a81f6dea86aa55931f4.tar.gz
ampache-e3734f063ed58356f9653a81f6dea86aa55931f4.tar.bz2
ampache-e3734f063ed58356f9653a81f6dea86aa55931f4.zip
moved init.php improved vainfo a bit, removed checkboxes from search page
Diffstat (limited to 'bin')
-rw-r--r--bin/catalog_update.php.inc2
-rw-r--r--bin/compare_config.php.inc6
-rw-r--r--bin/dump_album_art.php.inc2
-rw-r--r--bin/parse_m3u.php.inc2
-rwxr-xr-xbin/print_amazon.php.inc2
-rw-r--r--bin/print_tags.php.inc5
-rw-r--r--bin/quarantine_migration.php.inc2
-rw-r--r--bin/sort_files.php.inc2
8 files changed, 12 insertions, 11 deletions
diff --git a/bin/catalog_update.php.inc b/bin/catalog_update.php.inc
index 4ad80076..16dff65e 100644
--- a/bin/catalog_update.php.inc
+++ b/bin/catalog_update.php.inc
@@ -21,7 +21,7 @@
*/
$no_session='1';
-require ("../modules/init.php");
+require ('../lib/init.php');
echo "[catalog_update.php.inc]\nStarting Catalog Clean/Update And Add\n\n";
diff --git a/bin/compare_config.php.inc b/bin/compare_config.php.inc
index af29b381..c5393ede 100644
--- a/bin/compare_config.php.inc
+++ b/bin/compare_config.php.inc
@@ -1,7 +1,7 @@
<?php
/*
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
All rights reserved
This program is free software; you can redistribute it and/or
@@ -21,8 +21,8 @@
*/
$no_session = '1';
-require ("../modules/init.php");
-require ("../lib/debug.php");
+require ('../lib/init.php');
+require ('../lib/debug.php');
$results = debug_read_config(conf('prefix') . "/config/ampache.cfg.php");
diff --git a/bin/dump_album_art.php.inc b/bin/dump_album_art.php.inc
index 093e7b71..8748cd41 100644
--- a/bin/dump_album_art.php.inc
+++ b/bin/dump_album_art.php.inc
@@ -22,7 +22,7 @@
$no_session = '1';
-require ("../modules/init.php");
+require ("../lib/init.php");
$catalogs = Catalog::get_catalogs();
diff --git a/bin/parse_m3u.php.inc b/bin/parse_m3u.php.inc
index 9b720bb3..71c5c2f4 100644
--- a/bin/parse_m3u.php.inc
+++ b/bin/parse_m3u.php.inc
@@ -23,7 +23,7 @@ $filename = "/data/music/Live/L/Life'll Kill Ya/Warren Zevon.m3u";
$no_session = '1';
-require ("../modules/init.php");
+require ("../lib/init.php");
$handle = fopen($filename,'r');
diff --git a/bin/print_amazon.php.inc b/bin/print_amazon.php.inc
index 09118ae7..32f864b2 100755
--- a/bin/print_amazon.php.inc
+++ b/bin/print_amazon.php.inc
@@ -25,7 +25,7 @@ $search['artist_name'] = "Bent";
$no_session = '1';
-require ("../modules/init.php");
+require ("../lib/init.php");
echo "<pre>\n";
$amazon = new AmazonSearch(conf('amazon_developer_key'));
// Prevent the script from timing out
diff --git a/bin/print_tags.php.inc b/bin/print_tags.php.inc
index 68d84b27..aef52594 100644
--- a/bin/print_tags.php.inc
+++ b/bin/print_tags.php.inc
@@ -20,13 +20,14 @@
*/
$no_session = '1';
-require ("../modules/init.php");
+require ("../lib/init.php");
$filename = usage();
echo "Reading: $filename\n";
-$info = new Audioinfo();
+$info = new vainfo();
+$info->get_info();
$results = $info->info($filename);
$results['file'] = $filename;
$key = get_tag_type($results);
diff --git a/bin/quarantine_migration.php.inc b/bin/quarantine_migration.php.inc
index 803317ef..cb428a56 100644
--- a/bin/quarantine_migration.php.inc
+++ b/bin/quarantine_migration.php.inc
@@ -24,7 +24,7 @@
*/
$no_session='1';
-require_once('../modules/init.php');
+require_once('../lib/init.php');
usage();
diff --git a/bin/sort_files.php.inc b/bin/sort_files.php.inc
index 7f446873..f270e86e 100644
--- a/bin/sort_files.php.inc
+++ b/bin/sort_files.php.inc
@@ -39,7 +39,7 @@
$alphabet_prefix = true;
$no_session = '1';
-require ("../modules/init.php");
+require ("../lib/init.php");
/* First Clean the catalog to we don't try to write anything we shouldn't */