make use of the getIncludeFiles method

1 files changed, 6 insertions, 17 deletions

diff --git a/preferences.php b/preferences.php
index b1c6576..474b6dc 100644
--- a/preferences.php
+++ b/preferences.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_users/preferences.php,v 1.46 2007/06/14 08:24:25 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/preferences.php,v 1.47 2007/06/22 11:56:16 squareing Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
  * All Rights Reserved. See copyright.txt for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
  *
- * $Id: preferences.php,v 1.46 2007/06/14 08:24:25 squareing Exp $
+ * $Id: preferences.php,v 1.47 2007/06/22 11:56:16 squareing Exp $
  * @package users
  * @subpackage functions
  */
@@ -62,22 +62,11 @@ if( $gBitSystem->isFeatureActive( 'custom_user_fields' )) {
 }
 
 // include preferences settings from other packages - these will be included as individual tabs
-$packages = array();
-foreach( $gBitSystem->mPackages as $package ) {
-	if( $gBitSystem->isPackageActive( $package['name'] )) {
-		$php_file = $package['path'].'user_preferences_inc.php';
-		$tpl_file = $package['path'].'templates/user_preferences_inc.tpl';
-		if( file_exists( $tpl_file )) {
-			if( file_exists( $php_file ))  {
-				require( $php_file );
-			}
-			$p=array();
-			$p['template'] = $tpl_file;
-			$packages[] = $p;
-		}
-	}
+$includeFiles = $gBitSystem->getIncludeFiles( 'user_preferences_inc.php', 'user_preferences_inc.tpl' );
+foreach( $includeFiles as $file ) {
+	require_once( $file['php'] );
 }
-$gBitSmarty->assign_by_ref('packages',$packages );
+$gBitSmarty->assign( 'includFiles', $includeFiles );
 
 // fetch available languages
 $gBitLanguage->mLanguage = $editUser->getPreference( 'bitlanguage', $gBitLanguage->mLanguage );