Version 2.2.0 RC-1

upload/sources/acp_loaders/acp_pages_components.php

@@ -2,23 +2,15 @@
 
 /*
 +---------------------------------------------------------------------------
-|   Invision Power Board 2.1.7
-|   =============================================
+|   Invision Power Board
+|   ========================================
 |   by Matthew Mecham
-|   (c) 2001 - 2005 Invision Power Services, Inc.
+|   (c) 2004 Invision Power Services
 |   http://www.invisionpower.com
-|   =============================================
-|   Web: http://www.invisionboard.com
-|        http://www.ibresource.ru/products/invisionpowerboard/
-|   Time: Tuesday 18th of July 2006 05:56:00 PM
-|   Release: 52f408a29988b02f45b5e6f4ba5af0ae
-|   Licence Info: http://www.invisionboard.com/?license
-|                 http://www.ibresource.ru/license
+|   ========================================
 +---------------------------------------------------------------------------
-|   INVISION POWER BOARD IS NOT FREE / OPEN SOURCE!
-+---------------------------------------------------------------------------
-|   INVISION POWER BOARD ÍÅ ßÂËßÅÒÑß ÁÅÑÏËÀÒÍÛÌ ÏÐÎÃÐÀÌÌÍÛÌ ÎÁÅÑÏÅ×ÅÍÈÅÌ!
-|   Ïðàâà íà ÏÎ ïðèíàäëåæàò Invision Power Services
+|   INVISION POWER BOARD IS NOT FREE SOFTWARE!
+|   http://www.invisionboard.com
 +---------------------------------------------------------------------------
 |
 |   > CONTROL PANEL (COMPONENTS) PAGES FILE
@@ -33,6 +25,11 @@
 // THIS PAGE CLASS: Generate menu from DB
 //===========================================================================
 
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
 
 global $ipsclass;
 
@@ -43,7 +40,7 @@ $PAGES = array();
 // Get info from DB
 //--------------------------------
 
-foreach( $ipsclass->menu_components as $ix => $r )
+foreach( $ipsclass->menu_components as $r )
 {
 	//--------------------------------
 	// Process data
@@ -53,18 +50,18 @@ foreach( $ipsclass->menu_components as $ix => $r )
 	$tmp_pages = array();
 	
 	//--------------------------------
-	// First item is title...
-	//--------------------------------
-	
-	$CATS[] = array( $r['com_title'] );
-	
-	//--------------------------------
-	// Work through rest
+	// Do we have any menu links?
 	//--------------------------------
 	
 	if ( is_array( $menu_data ) and count( $menu_data ) )
 	{
-		foreach( $menu_data as $id => $menu )
+		//--------------------------------
+		// First item is title...
+		//--------------------------------	
+
+		$CATS[] = array( $r['com_title'] );
+
+		foreach( $menu_data as $menu )
 		{
 			if ( $menu['menu_text'] AND $menu['menu_url'] )
 			{
@@ -78,9 +75,9 @@ foreach( $ipsclass->menu_components as $ix => $r )
 				}
 			}
 		}
+		
+		$PAGES[] = $tmp_pages;
 	}
-	
-	$PAGES[] = $tmp_pages;
 }
 
 ?>