summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-08-05 18:37:04 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-08-05 18:37:04 +0000
commit859f0c052276ba71414a9885aecdf02ef2521662 (patch)
tree921e42a214b07b20d255e507f3c6ebc681fcf1c2 /lib
parentb086b1d014e700e092f33e4d561636410e193f7a (diff)
downloadampache-859f0c052276ba71414a9885aecdf02ef2521662.tar.gz
ampache-859f0c052276ba71414a9885aecdf02ef2521662.tar.bz2
ampache-859f0c052276ba71414a9885aecdf02ef2521662.zip
fixed the catalog updating, so it doesnt throw w3c warnings
Diffstat (limited to 'lib')
-rw-r--r--lib/class/catalog.class.php28
1 files changed, 14 insertions, 14 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index fc77db8f..839412a8 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -417,10 +417,10 @@ class Catalog {
$this->count++;
if ( !($this->count%10)) {
$file = str_replace(array('(',')','\''),'',$full_file);
- echo "<script type=\"text/javascript\">";
+ echo "<script type=\"text/javascript\"><!--\n";
echo "update_txt('" . $this->count ."','add_count_" . $this->id . "');";
echo "update_txt('" . htmlentities($file) . "','add_dir_" . $this->id . "');";
- echo "</script>\n";
+ echo "\n--></script>\n";
flush();
} // update our current state
@@ -533,10 +533,10 @@ class Catalog {
/* Stupid little cutesie thing */
$search_count++;
if ( !($search_count%5)) {
- echo "<script type=\"text/javascript\">";
+ echo "<script type=\"text/javascript\"><!--\n";
echo "update_txt('" . $search_count ."','count_art_" . $this->id . "');";
echo "update_txt('" . $album->name . "','read_art_" . $this->id . "');";
- echo "</script>\n";
+ echo "\n--></script>\n";
flush();
} //echos song count
@@ -840,9 +840,9 @@ class Catalog {
/* Get the songs and then insert them into the db */
$this->add_files($this->path,$type,$parse_m3u);
- echo "<script type=\"text/javascript\">";
+ echo "<script type=\"text/javascript\"><!--\n";
echo "update_txt('" . $this->count . "','count_add_" . $this->id ."');";
- echo "</script>\n";
+ echo "\n--></script>\n";
flush();
@@ -1259,10 +1259,10 @@ class Catalog {
$count++;
if (!($count%10)) {
$file = str_replace(array('(',')','\''),'',$results['file']);
- echo "<script type=\"text/javascript\">";
+ echo "<script type=\"text/javascript\"><!--\n";
echo "update_txt('" . $count ."','clean_count_" . $this->id . "');";
echo "update_txt('" . htmlentities($file) . "','clean_dir_" . $this->id . "');";
- echo "</script>\n";
+ echo "\n--></script>\n";
flush();
} //echos song count
@@ -1302,9 +1302,9 @@ class Catalog {
self::clean($catalog_id);
/* Return dead files, so they can be listed */
- echo "<script type=\"text/javascript\"><!--";
+ echo "<script type=\"text/javascript\"><!--\n";
echo "update_txt('" . $count ."','clean_count_" . $this->id . "');";
- echo "--></script>\n";
+ echo "\n--></script>\n";
show_box_top();
echo "<strong>" . _('Catalog Clean Done') . " [" . count($dead_files) . "] " . _('files removed') . "</strong><br />\n";
echo "<strong>" . _('Optimizing Tables') . "...</strong><br />\n";
@@ -1564,10 +1564,10 @@ class Catalog {
$count++;
if (!($count%10) ) {
$file = str_replace(array('(',')','\''),'',$song->file);
- echo "<script type=\"text/javascript\"><!--";
+ echo "<script type=\"text/javascript\"><!--\n";
echo "update_txt('" . $count . "','verify_count_" . $catalog_id . "');";
echo "update_txt('" . scrub_out($file) . "','verify_dir_" . $catalog_id . "');";
- echo "--></script>\n";
+ echo "\n--></script>\n";
flush();
} //echos song count
@@ -1587,9 +1587,9 @@ class Catalog {
$this->update_last_update();
// One final time!
- echo "<script type=\"text/javascript\"><!--";
+ echo "<script type=\"text/javascript\"><!--\n";
echo "update_txt('" . $this->count . "','count_verify_" . $this->id . "');";
- echo "--></script>\n";
+ echo "\n--></script>\n";
flush();
show_box_top();