From 08aa19a7b22338e6514438a1cc30192478cc758b Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Thu, 8 May 2008 19:41:17 +0000
Subject: re-imposed my evil charset validation

---
 docs/CHANGELOG              | 2 --
 lib/class/catalog.class.php | 1 +
 lib/stream.lib.php          | 2 +-
 lib/themes.php              | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 789fd718..884dbcdc 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -9,8 +9,6 @@
 	- Add Debug page with current configuration and php state information
 		as well as links to generate new config file and reset database
 		charset
-	- Relaxed Charset restrictions on catalog add filename with invalid
-		characters is now a warning, not a fatal error
 	- Fixed lack of loading indication during catalog processes
 	- Fixed flash player not working if playlist_method included clear
 	- Fixed album art thumbs never saving due to incorrect table reference
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index bde17ed9..63cbaada 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -504,6 +504,7 @@ 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
 		
diff --git a/lib/stream.lib.php b/lib/stream.lib.php
index 588f9251..de3adde1 100644
--- a/lib/stream.lib.php
+++ b/lib/stream.lib.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright 2001 - 2007 Ampache.org
+ Copyright Ampache.org
  All Rights Reserved
 
  This program is free software; you can redistribute it and/or
diff --git a/lib/themes.php b/lib/themes.php
index 164cb89a..d8af2512 100644
--- a/lib/themes.php
+++ b/lib/themes.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) Ampache.org
  All Rights Reserved
 
  This program is free software; you can redistribute it and/or
-- 
cgit