few more tweaks to make upload work correctly

4 files changed, 15 insertions, 8 deletions

diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 2ce3532c..4649ae44 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -241,7 +241,13 @@ class Catalog {
 			if(!$this->check_local_mp3($filename,$gather_type)) { 
 				$this->insert_local_song($filename,$file_size);
 			}
+			elseif (conf('debug')) { 
+				log_event($_SESSION['userdata']['username'], ' add_file ', "Error: File exists");
+			}
 		} // if valid file
+		elseif (conf('debug')) { 
+			log_event($_SESSION['userdata']['username'], ' add_file ', "Error: File doesn't match pattern");
+		}
 
 
 	} // add_file
diff --git a/lib/upload.php b/lib/upload.php
index b78e4e5b..97c60118 100644
--- a/lib/upload.php
+++ b/lib/upload.php
@@ -84,17 +84,18 @@ function check_upload_directory($directory) {
 		to make sure that is true. returns id of catalog found or false
 */
 function find_upload_catalog($directory) { 
-        $cat_error = -1;
-        $cat_id = $cat_error;
 
         $sql = "SELECT id, path FROM catalog";
         $db_results = mysql_query($sql, dbh());
 
-        while( $results = mysql_fetch_object($db_results)) {
+        while( $results = mysql_fetch_assoc($db_results)) {
+		
+		$catalog_path = str_replace("\\","/",$results['path']);
 
-                if( substr($dir, 0, strlen($results->path)) == $results->path ) { 
-                        return $results->id;
-                } // end if file path is in a catalog path
+		$directory = str_replace("\\","/",$directory);
+		if (strncmp($directory,$catalog_path,strlen($catalog_path)) == '0') { 
+			return $results['id'];
+		}
 
         } // end while loop through catalog records
 
diff --git a/modules/init.php b/modules/init.php
index eedc6d12..c733e92c 100644
--- a/modules/init.php
+++ b/modules/init.php
@@ -83,7 +83,7 @@ if (!$results['conf']['allow_stream_playback']) {
 }
 
 $results['conf']['web_path']		= $http_type . $_SERVER['HTTP_HOST'] . $results['conf']['web_path'];
-$results['conf']['version']		= '3.3.2-Alpha2 Build (004)';
+$results['conf']['version']		= '3.3.2-Alpha2 Build (005)';
 $results['conf']['catalog_file_pattern']= 'mp3|mpc|m4p|m4a|mp4|aac|ogg|rm|wma|asf|flac|spx';
 $results['libglue']['local_table']	= 'session';
 $results['libglue']['local_sid']	= 'id';
@@ -168,6 +168,7 @@ require_once(conf('prefix') . "/lib/stream.lib.php");
 require_once(conf('prefix') . "/modules/lib.php");
 require_once(conf('prefix') . "/modules/admin.php");
 require_once(conf('prefix') . "/modules/catalog.php");
+require_once(conf('prefix') . "/lib/upload.php");
 
 // Modules (These are conditionaly included depending upon config values)
 require_once(conf('prefix') . "/modules/id3/audioinfo.class.php");
diff --git a/upload.php b/upload.php
index 367efe0a..e5efad0f 100644
--- a/upload.php
+++ b/upload.php
@@ -36,7 +36,6 @@
 */
 
 require_once( "modules/init.php" );
-require_once( "lib/upload.php" );
 // Set page header
 show_template('header');
 show_menu_items('Upload');