summaryrefslogtreecommitdiffstats
path: root/lib/class
diff options
context:
space:
mode:
Diffstat (limited to 'lib/class')
-rw-r--r--lib/class/catalog.class.php3
-rw-r--r--lib/class/user.class.php2
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 311697cf..bde17ed9 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -504,7 +504,6 @@ class Catalog {
if (strcmp($full_file,iconv(Config::get('site_charset'),Config::get('site_charset') . '//IGNORE',$full_file)) != '0') {
debug_event('read',$full_file . ' has non-' . Config::get('site_charset') . ' characters and can not be indexed','1');
Error::add('catalog_add',$full_file . ' ' . _('does not match site charset'));
- continue;
}
} // end if iconv
@@ -1395,7 +1394,7 @@ class Catalog {
$file = str_replace(array('(',')','\''),'',$results['file']);
echo "<script type=\"text/javascript\">\n";
echo "update_txt('" . $count ."','clean_count_" . $this->id . "');";
- echo "update_txt('" . htmlentities($file) . "','clean_dir_" . $this->id . "');";
+ echo "update_txt('" . addslashes(htmlentities($file)) . "','clean_dir_" . $this->id . "');";
echo "\n</script>\n";
flush();
} //echos song count
diff --git a/lib/class/user.class.php b/lib/class/user.class.php
index ceeb7332..ae53038c 100644
--- a/lib/class/user.class.php
+++ b/lib/class/user.class.php
@@ -1,7 +1,7 @@
<?php
/*
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
All rights reserved.
This program is free software; you can redistribute it and/or