fixed issue with lack of timeout reset on some add to catalog functions and fixed batch downloads from active playlist

3 files changed, 18 insertions, 9 deletions

diff --git a/lib/batch.lib.php b/lib/batch.lib.php
index d2712170..c49e04a4 100644
--- a/lib/batch.lib.php
+++ b/lib/batch.lib.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) 2001 - 2007 Ampache.org
  All Rights Reserved
 
  This program is free software; you can redistribute it and/or
@@ -24,19 +24,19 @@
  * get_song_files
  * tmakes array of song ids and returns
  *	array of path to actual files
- * @param $song_ids        an array of song ids whose filenames you need
  */
-function get_song_files( $song_ids ) {
-        global $user;
+function get_song_files($song_ids) {
+
         $song_files = array();
-        foreach( $song_ids as $song_id ) {
-                $song = new Song( $song_id );
+        foreach ($song_ids as $song_id) {
+                $song = new Song($song_id);
 		/* Don't archive disabled songs */
-		if ($song->status != 'disabled') { 
+		if ($song->enabled) { 
 	                $total_size += sprintf("%.2f",($song->size/1048576));
-	                array_push( $song_files, $song->file );
+	                array_push($song_files, $song->file);
 		} // if song isn't disabled
         }
+
         return array($song_files,$total_size);
 } //get_song_files
 
@@ -61,12 +61,15 @@ function send_zip( $name, $song_files ) {
 	
         $arc->set_options( $options );
         $arc->add_files( $song_files );
+
 	if (count($arc->error)) { 
 		debug_event('archive',"Error: unable to add songs",'3');
+		return false; 
 	} // if failed to add songs
 	
         if (!$arc->create_archive()) { 
 		debug_event('archive',"Error: unable to create archive",'3');
+		return false; 
 	} // if failed to create archive
 	
         $arc->download_file();
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 4b8a854d..6f03e296 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -800,6 +800,9 @@ class Catalog {
 		/* Record the time.. time the catalog gen */
 		$start_time = time();
 
+                // Prevent the script from timing out and flush what we've got
+                set_time_limit(0);
+
 		/* Flush anything that has happened so they don't think it's locked */
 		flush();
 
@@ -1016,6 +1019,9 @@ class Catalog {
 		$this->path = rtrim($this->path,'/'); 
 		$this->path = rtrim($this->path,'\\');
 
+                // Prevent the script from timing out and flush what we've got
+                set_time_limit(0);
+
 		/* Get the songs and then insert them into the db */
 		$this->add_files($this->path,$type,0,$verbose);
 
diff --git a/lib/init.php b/lib/init.php
index e644924f..94dca030 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -71,7 +71,7 @@ if (!count($results)) {
 } 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.4-Alpha2';
+$results['version']		= '3.4-Alpha3 Build (001)';
 $results['int_config_version']	= '5'; 
 
 $results['raw_web_path']	= $results['web_path'];