openrat-cms

commit 60ac479225a1e26003db2f17dfa37743584c8b67
parent 1afb0492b1a322a8aa83153209b0a8528db3df2d
Author: dankert <devnull@localhost>
Date:   Tue, 24 Jan 2006 00:05:51 +0100

CVS-Verzeichnisse ignorieren

Diffstat:
serviceClasses/Preferences.class.php
 | 
12
+++++++-----

1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/serviceClasses/Preferences.class.php b/serviceClasses/Preferences.class.php
@@ -23,17 +23,19 @@ class Preferences
 				while( ($file = readdir($dh)) !== false )
 				{
 					$file = basename($file);
-					if	( substr($file,0,1) != '.' && is_dir($dir.$file) )
+//					if	( substr($file,0,1) != '.' && $file != 'CVS' && is_dir($dir.$file) && is_file($dir.$file.'/prefs.ini.php') )
+					if	( substr($file,0,1) != '.' && is_file($dir.$file.'/prefs.ini.php') )
 					{
 						$values[$file] = $this->load($dir.$file.'/');
 					}
 		        }
 		        closedir($dh);
 		    }
-		    
-		    if	( is_file($dir.'prefs.ini.php') )
-				$values = $values + parse_ini_file( $dir.'prefs.ini.php' );
-				
+
+		    if	( !is_file($dir.'prefs.ini.php') )
+				die( 'file not found: '.$dir.'prefs.ini.php');
+
+		    $values = $values + parse_ini_file( $dir.'prefs.ini.php' );
 			ksort($values);
 			
 			return $values;