--- mambo/branches/4.6/administrator/components/com_menus/content_typed/content_typed.class.php	2009/01/23 00:10:31	1753
+++ mambo/branches/4.6/administrator/components/com_menus/content_typed/content_typed.class.php	2009/02/17 11:25:53	1754
@@ -1,7 +1,7 @@
-<?php
-/**
-* @package Mambo
-* @subpackage Menus
+<?php
+/**
+* @package Mambo
+* @subpackage Menus
 * @author Mambo Foundation Inc see README.php
 * @copyright Mambo Foundation Inc.
 * See COPYRIGHT.php for copyright notices and details.
@@ -10,103 +10,104 @@
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; version 2 of the License.
 */
-
-/** ensure this file is being included by a parent file */
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-class content_typed_menu {
-
-	function edit( &$uid, $menutype, $option ) {
-		global $database, $my, $mainframe;
-		global $mosConfig_absolute_path;
-	
-		$menu = new mosMenu( $database );
-		$menu->load( $uid );
-	
-		// fail if checked out not by 'me'
-		if ($menu->checked_out && $menu->checked_out <> $my->id) {
-			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
-			exit(0);
-		}
-	
-		if ( $uid ) {
-			$menu->checkout( $my->id );
-		} else {
-			// load values for new entry
-			$menu->type = 'content_typed';
-			$menu->menutype = $menutype;
-			$menu->browserNav = 0;
-			$menu->ordering = 9999;
-			$menu->parent = intval( mosGetParam( $_POST, 'parent', 0 ) );
-			$menu->published = 1;
-		}
-	
-		if ( $uid ) {
-			$temp = explode( 'id=', $menu->link );
-			 $query = "SELECT a.title, a.title_alias, a.id"
-			. "\n FROM #__content AS a"
-			. "\n WHERE a.id = '". $temp[1] ."'"
-			;
-			$database->setQuery( $query );
-			$content = $database->loadObjectlist();
-			// outputs item name, category & section instead of the select list
-			if ( $content[0]->title_alias ) {
-				$alias = '  (<i>'. $content[0]->title_alias .'</i>)';
-			} else {
-				$alias = '';
-			}
-			$contents 	= '';
-			$link 		= 'javascript:submitbutton( \'redirect\' );';
-			$lists['content'] = '<input type="hidden" name="content_typed" value="'. $temp[1] .'" />';
-			$lists['content'] .= '<a href="'. $link .'" title="Edit Static Content Item">'. $content[0]->title . $alias .'</a>';			
-		} else {
-			$query = "SELECT a.id AS value, CONCAT( a.title, '(', a.title_alias, ')' ) AS text"
-			. "\n FROM #__content AS a"
-			. "\n WHERE a.state = '1'"
-			. "\n AND a.sectionid = '0'"
-			. "\n AND a.catid = '0'"
-			. "\n ORDER BY a.id, a.title"
-			;
-			$database->setQuery( $query );
-			$contents = $database->loadObjectList( );
-	
-			//	Create a list of links
-			$lists['content'] = mosHTML::selectList( $contents, 'content_typed', 'class="inputbox" size="10"', 'value', 'text', '' );
-		}
-		
-		// build html select list for target window
-		$lists['target'] 		= mosAdminMenus::Target( $menu );
-	
-		// build the html select list for ordering
-		$lists['ordering'] 		= mosAdminMenus::Ordering( $menu, $uid );
-		// build the html select list for the group access
-		$lists['access'] 		= mosAdminMenus::Access( $menu );
-		// build the html select list for paraent item
-		$lists['parent'] 		= mosAdminMenus::Parent( $menu );
-		// build published button option
-		$lists['published'] 	= mosAdminMenus::Published( $menu );
-		// build the url link output
-		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
-		
-		// get params definitions
-		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
-	
-		content_menu_html::edit( $menu, $lists, $params, $option, $contents );
-	}
-	
-	function redirect( $id ) {
-		global $database;
-		
-		$menu = new mosMenu( $database );
-		$menu->bind( $_POST );
-		$menuid = mosGetParam( $_POST, 'menuid', 0 );
-		if ( $menuid ) {
-			$menu->id = $menuid;
-		}
-		$menu->checkin();
-	
-		mosRedirect( 'index2.php?option=com_typedcontent&task=edit&id='. $id );	
-	}
-}
-
-?>
+
+/** ensure this file is being included by a parent file */
+defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
+
+class content_typed_menu {
+
+	function edit( &$uid, $menutype, $option ) {
+		global $database, $my, $mainframe;
+		global $mosConfig_absolute_path;
+	
+		$menu = new mosMenu( $database );
+		$menu->load( $uid );
+	
+		// fail if checked out not by 'me'
+		if ($menu->checked_out && $menu->checked_out <> $my->id) {
+			echo "<script>alert('".sprintf(T_('The module % is currently being edited by another administrator'), $menu->title)."'); document.location.href='index2.php?option=$option'</script>\n";
+			exit(0);
+		}
+	
+		if ( $uid ) {
+			$menu->checkout( $my->id );
+		} else {
+			// load values for new entry
+			$menu->type = 'content_typed';
+			$menu->menutype = $menutype;
+			$menu->browserNav = 0;
+			$menu->ordering = 9999;
+			$menu->parent = intval( mosGetParam( $_POST, 'parent', 0 ) );
+			$menu->published = 1;
+		}
+	
+		if ( $uid ) {
+			$temp = explode( 'id=', $menu->link );
+			// @RawSQLUse, trivial_implementation, SELECT, CONCEPT
+			 $query = "SELECT a.title, a.title_alias, a.id"
+			. "\n FROM #__content AS a"
+			. "\n WHERE a.id = '". $temp[1] ."'"
+			;
+			$database->setQuery( $query );
+			$content = $database->loadObjectlist();
+			// outputs item name, category & section instead of the select list
+			if ( $content[0]->title_alias ) {
+				$alias = '  (<i>'. $content[0]->title_alias .'</i>)';
+			} else {
+				$alias = '';
+			}
+			$contents 	= '';
+			$link 		= 'javascript:submitbutton( \'redirect\' );';
+			$lists['content'] = '<input type="hidden" name="content_typed" value="'. $temp[1] .'" />';
+			$lists['content'] .= '<a href="'. $link .'" title="Edit Static Content Item">'. $content[0]->title . $alias .'</a>';			
+		} else {
+			$query = "SELECT a.id AS value, CONCAT( a.title, '(', a.title_alias, ')' ) AS text"
+			. "\n FROM #__content AS a"
+			. "\n WHERE a.state = '1'"
+			. "\n AND a.sectionid = '0'"
+			. "\n AND a.catid = '0'"
+			. "\n ORDER BY a.id, a.title"
+			;
+			$database->setQuery( $query );
+			$contents = $database->loadObjectList( );
+	
+			//	Create a list of links
+			$lists['content'] = mosHTML::selectList( $contents, 'content_typed', 'class="inputbox" size="10"', 'value', 'text', '' );
+		}
+		
+		// build html select list for target window
+		$lists['target'] 		= mosAdminMenus::Target( $menu );
+	
+		// build the html select list for ordering
+		$lists['ordering'] 		= mosAdminMenus::Ordering( $menu, $uid );
+		// build the html select list for the group access
+		$lists['access'] 		= mosAdminMenus::Access( $menu );
+		// build the html select list for paraent item
+		$lists['parent'] 		= mosAdminMenus::Parent( $menu );
+		// build published button option
+		$lists['published'] 	= mosAdminMenus::Published( $menu );
+		// build the url link output
+		$lists['link'] 		= mosAdminMenus::Link( $menu, $uid );
+		
+		// get params definitions
+		$params =& new mosAdminParameters( $menu->params, $mainframe->getPath( 'menu_xml', $menu->type ), 'menu' );
+	
+		content_menu_html::edit( $menu, $lists, $params, $option, $contents );
+	}
+	
+	function redirect( $id ) {
+		global $database;
+		
+		$menu = new mosMenu( $database );
+		$menu->bind( $_POST );
+		$menuid = mosGetParam( $_POST, 'menuid', 0 );
+		if ( $menuid ) {
+			$menu->id = $menuid;
+		}
+		$menu->checkin();
+	
+		mosRedirect( 'index2.php?option=com_typedcontent&task=edit&id='. $id );	
+	}
+}
+
+?>