Patch 6

administrator/components/com_cck/controller.php

@@ -268,7 +268,7 @@ public function ajax_field_li( $field = NULL, $client = '' )
 		if ( $return !== false ) {
 			return JCckDev::toJSON( $json );
 		}
-		echo JCckDev::toJSON( $json );
+		return JCckDev::toJSON( $json );
 	}
 
 	// ajax_session

administrator/components/com_cck/controllers/box.php

@@ -44,6 +44,8 @@ public function add()
 		$app->setUserState( CCK_COM.'.add.box.bx.name', $app->input->get( 'name', '' ) );
 		$app->setUserState( CCK_COM.'.add.box.bx.type', $app->input->getString( 'type', '' ) );
 		$app->setUserState( CCK_COM.'.add.box.bx.params', $app->input->getString( 'params', '' ) );
+
+		return true;
 	}
 }
 ?>

administrator/components/com_cck/controllers/field.php

@@ -74,6 +74,8 @@ public function add()
 		// Additional Vars
 		$app->setUserState( CCK_COM.'.add.field.ajax_state', $app->input->getInt( 'ajax_state' ) );
 		$app->setUserState( CCK_COM.'.edit.field.ajax_type', $app->input->getString( 'ajax_type', '' ) );
+
+        return true;
 	}
 
 	// edit
@@ -89,6 +91,8 @@ public function edit( $key = null, $urlVar = null )
 
 		// Additional Vars
 		$app->setUserState( CCK_COM.'.edit.field.ajax_type', $app->input->getString( 'ajax_type', '' ) );
+
+        return true;
 	}
 
 	// cancel

administrator/components/com_cck/controllers/form.php

@@ -118,6 +118,8 @@ public function save( $key = null, $urlVar = null, $isAjax = false )
 		}
 
 		$this->setRedirect( htmlspecialchars_decode( $link ), $msg, $msgType );
+
+        return true;
 	}
 
 	// cancel

administrator/components/com_cck/controllers/search.php

@@ -79,6 +79,8 @@ public function add()
 		$app->setUserState( CCK_COM.'.add.search.tpl_list', $app->input->getString( 'tpl_l', '' ) );
 		$app->setUserState( CCK_COM.'.add.search.tpl_item', $app->input->getString( 'tpl_i', '' ) );
 		$app->setUserState( CCK_COM.'.add.search.skip', $app->input->getString( 'skip', '' ) );
+
+        return true;
 	}
 
 	// edit
@@ -94,6 +96,8 @@ public function edit( $key = null, $urlVar = null )
 
 		// Additional Vars
 		$app->setUserState( CCK_COM.'.edit.search.client', $app->input->getString( 'client', '' ) );
+
+        return true;
 	}
 
 	// postSaveHook

administrator/components/com_cck/controllers/site.php

@@ -30,6 +30,8 @@ public function add()
 
 		// Additional Vars
 		$app->setUserState( CCK_COM.'.edit.site.type', $app->input->getString( 'type', '' ) );
+
+        return true;
 	}
 
 	// postSaveHook

administrator/components/com_cck/controllers/template.php

@@ -73,6 +73,8 @@ public function add()
 
 		// Additional Vars
 		$app->setUserState( CCK_COM.'.edit.template.mode', $app->input->getString( 'mode', '' ) );
+
+        return true;
 	}
 
 	// export_variation

administrator/components/com_cck/controllers/type.php

@@ -77,6 +77,8 @@ public function add()
 		$app->setUserState( CCK_COM.'.add.type.tpl_site', $app->input->getString( 'tpl_s', '' ) );
 		$app->setUserState( CCK_COM.'.add.type.tpl_content', $app->input->getString( 'tpl_c', '' ) );
 		$app->setUserState( CCK_COM.'.add.type.tpl_intro', $app->input->getString( 'tpl_i', '' ) );
+
+        return true;
 	}
 
 	// edit
@@ -92,6 +94,8 @@ public function edit( $key = null, $urlVar = null )
 
 		// Additional Vars
 		$app->setUserState( CCK_COM.'.edit.type.client', $app->input->getString( 'client', '' ) );
+
+        return true;
 	}
 
 	// postSaveHook

administrator/components/com_cck/models/search.php

@@ -339,6 +339,8 @@ public function duplicate( $pk )
 			// Positions			
 			$string	=	$this->_table_no_key_batch( 'where', 'searchid = '.(int)$pk, '#__cck_core_search_position', 'searchid', $table->id );
 		}
+
+        return true;
 	}
 
 	// version

administrator/components/com_cck/tables/folder.php

@@ -126,6 +126,8 @@ public function delete( $pk = null )
 				return parent::delete();
 			}
 		}
+
+        return true;
 	}
 }
 ?>

administrator/components/com_cck/views/field/view.html.php

@@ -39,6 +39,8 @@ function prepareDisplay()
 		$this->insidebox		=	Helper_Admin::addInsidebox( $this->isNew );
 
 		Helper_Admin::addToolbarEdit( $this->vName, _C3_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ) );
+
+        return true;
 	}
 }
 ?>

administrator/components/com_cck/views/field/view.raw.php

@@ -38,6 +38,8 @@ function prepareDisplay()
 		$this->item->type		=	Helper_Admin::getSelected( $this->vName, 'type', $app->input->getString( 'ajax_type', $this->state->get( 'ajax.type', $this->item->type ) ), 'text' );
 
 		Helper_Admin::addToolbarEdit( $this->vName, _C3_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ) );
+
+        return true;
 	}
 }
 ?>

administrator/components/com_cck/views/folder/view.html.php

@@ -37,6 +37,8 @@ function prepareDisplay()
 		$this->insidebox		=	Helper_Admin::addInsidebox( $this->isNew );
 
 		Helper_Admin::addToolbarEdit( $this->vName, 'COM_CCK_'._C0_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ) );
+
+        return true;
 	}
 
 	// prepareDelete

administrator/components/com_cck/views/search/view.html.php

@@ -143,6 +143,8 @@ function prepareDisplay()
 		$this->insidebox		=	Helper_Admin::addInsidebox( $this->isNew );
 
 		Helper_Admin::addToolbarEdit( $this->vName, 'COM_CCK_'._C4_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ), array( 'template' => $this->item->template ) );
+
+        return true;
 	}
 }
 ?>

administrator/components/com_cck/views/search/view.raw.php

@@ -120,6 +120,8 @@ function prepareDisplay()
 		$this->item->template	=	( isset( $this->style->template ) ) ? $this->style->template : '';
 
 		Helper_Admin::addToolbarEdit( $this->vName, 'COM_CCK_'._C4_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ), array( 'template' => $this->item->template ) );
+
+        return true;
 	}
 
 	// prepareDisplay_Ajax

administrator/components/com_cck/views/session/view.html.php

@@ -10,7 +10,7 @@
 
 defined( '_JEXEC' ) or die;
 
-require_once JPATH_COMPONENT.'/helpers/helper_session.php';
+require_once JPATH_COMPONENT.'/helpers/helper_session.php';
 
 // View
 class CCKViewSession extends JCckBaseLegacyViewForm
@@ -39,6 +39,8 @@ function prepareDisplay()
 		$this->isNew			=	( @$this->item->id > 0 ) ? 0 : 1;
 
 		Helper_Admin::addToolbarEdit( $this->vName, _C8_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>0, 'checked_out'=>'' ) );
+
+        return true;
 	}
 }
 ?>

administrator/components/com_cck/views/site/view.html.php

@@ -39,6 +39,8 @@ function prepareDisplay()
 		$this->item->options	=	( $this->item->options ) ? JCckDev::fromJSON( $this->item->options ) : array();
 
 		Helper_Admin::addToolbarEdit( $this->vName, _C5_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>0, 'checked_out'=>$this->item->checked_out ) );
+
+        return true;
 	}
 }
 ?>

administrator/components/com_cck/views/template/view.html.php

@@ -44,6 +44,8 @@ function prepareDisplay()
 		}
 
 		Helper_Admin::addToolbarEdit( $this->vName, _C1_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ) );
+
+        return true;
 	}
 
 	// _generateTree

administrator/components/com_cck/views/type/view.html.php

@@ -134,6 +134,8 @@ function prepareDisplay()
 		$this->insidebox		=	Helper_Admin::addInsidebox( $this->isNew );
 
 		Helper_Admin::addToolbarEdit( $this->vName, 'COM_CCK_'._C2_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ), array( 'template' => $this->style->template ) );
+
+        return true;
 	}
 }
 ?>

administrator/components/com_cck/views/type/view.raw.php

@@ -108,6 +108,8 @@ function prepareDisplay()
 		$this->item->template	=	$this->style->template;
 
 		Helper_Admin::addToolbarEdit( $this->vName, 'COM_CCK_'._C2_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ), array( 'template' => $this->style->template ) );
+
+        return true;
 	}
 
 	// prepareDisplay_Ajax

administrator/components/com_cck/views/version/view.html.php

@@ -37,6 +37,8 @@ function prepareDisplay()
 		$this->item->title		=	JCckDatabase::loadResult( 'SELECT title FROM #__cck_core_'.$type.'s WHERE id = '.(int)$this->item->e_id );
 
 		Helper_Admin::addToolbarEdit( $this->vName, _C6_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>0, 'checked_out'=>$this->item->checked_out ) );
+
+        return true;
 	}
 }
 ?>

components/com_cck/controller.php

@@ -395,7 +395,7 @@ public function getRoute()
 			return JUri::root();
 		}
 		require_once JPATH_SITE.'/plugins/cck_storage_location/'.$location.'/'.$location.'.php';
-		echo JCck::callFunc_Array( 'plgCCK_Storage_Location'.$location, 'getRoute', array( $pk, $sef, $itemId, array( 'type'=>$type ) ) );
+		return JCck::callFunc_Array( 'plgCCK_Storage_Location'.$location, 'getRoute', array( $pk, $sef, $itemId, array( 'type'=>$type ) ) );
 	}
 
 	// process
@@ -662,6 +662,8 @@ public function save( $isAjax = false )
 		} else {
 			$this->setRedirect( htmlspecialchars_decode( $link ) );
 		}
+
+        return true;
 	}
 
 	// saveOrderAjax

components/com_cck/controllers/box.php

@@ -41,6 +41,8 @@ public function add()
 		$app->setUserState( 'com_cck.add.box.bx.name', $app->input->get( 'name', '' ) );
 		$app->setUserState( 'com_cck.add.box.bx.type', $app->input->getString( 'type', '' ) );
 		$app->setUserState( 'com_cck.add.box.bx.params', $app->input->getString( 'params', '' ) );
+
+        return true;
 	}
 }
 ?>

libraries/cck/base/install/export.php

@@ -211,6 +211,8 @@ public static function findFields( $paths, $dest = '' )
 				}
 			}
 		}
+
+        return true;
 	}
 
 	// exportFields

libraries/cck/development/plugins/plg_cck_field/%name%.php

@@ -91,6 +91,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array()
 		if ( $return === true ) {
 			return $field;
 		}
+
+		return true;
 	}
 
 	// onCCK_FieldPrepareSearch
@@ -107,6 +109,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array
 		if ( $return === true ) {
 			return $field;
 		}
+
+        return true;
 	}
 
 	// onCCK_FieldPrepareStore
@@ -131,7 +135,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(
 			return $value;
 		}
 		$field->value	=	$value;
-		parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config );
+        return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config );
 	}
 
 	// -------- -------- -------- -------- -------- -------- -------- -------- // Render

libraries/cck/development/plugins/plg_cck_storage_location/%name%.php

@@ -239,8 +239,8 @@ protected function _core( $data, &$config = array(), $pk = 0 )
 
 		$config['author']	=	$table->{self::$author}; // TODO
 		$config['parent']	=	$table->{self::$parent}; // TODO
-		
-		parent::g_onCCK_Storage_LocationStore( $data, self::$table, self::$pk, $config );
+
+        return parent::g_onCCK_Storage_LocationStore( $data, self::$table, self::$pk, $config );
 	}
 
 	// _getTable

libraries/cck/joomla/access/rules.php

@@ -59,6 +59,8 @@ public function __construct($input = '', $component = '', $section = '')
 				$this->mergeAction($action, $identities);
 			}
 		}
+
+        return true;
 	}
 
 	/**

libraries/cck/joomla/application/component/controllerform.php

@@ -34,6 +34,8 @@ public function save($key = null, $urlVar = null)
 		} else {
 			return parent::save( $key, $urlVar );
 		}
+
+        return true;
 	}
 
 	/**

libraries/cck/rendering/document/document.php

@@ -51,6 +51,8 @@ class CCK_Document extends JObject
 	public function __construct($options = array())
 	{
 		parent::__construct();
+
+        return true;
 	}
 
 	/**
@@ -120,6 +122,8 @@ public static function &getInstance($type = 'html', $attributes = array()) //pub
 	public function setType($type)
 	{
 		$this->_type = $type;
+
+        return true;
 	}
 
 	/**
@@ -212,6 +216,8 @@ public function parse($params = array())
 	public function render($cache = false, $params = array())
 	{
 		$this->id++;
+
+        return true;
 	}
 
 	// finalize

libraries/cck/rendering/document/html/html.php

@@ -312,6 +312,8 @@ protected function _parseTemplate() // !
 
 			$this->_template_tags = $template_tags_first + $template_tags_last;
 		}
+
+        return true;
 	}
 
 	/**

libraries/cck/rendering/document/html/renderer/component.php

@@ -24,5 +24,6 @@ class CCK_DocumentRendererComponent extends CCK_DocumentRenderer
 	 */
 	public function render($component = null, $params = array(), $content = null)
 	{
+        return true;
 	}
 }

libraries/cck/rendering/document/html/renderer/head.php

@@ -26,6 +26,7 @@ class CCK_DocumentRendererHead extends CCK_DocumentRenderer
 	 */
 	public function render($head, $params = array(), $content = null)
 	{
+        return true;
 	}
 
 	/**
@@ -39,5 +40,6 @@ public function render($head, $params = array(), $content = null)
 	 */
 	public function fetchHead(&$document)
 	{
+        return true;
 	}
 }

libraries/cck/rendering/document/html/renderer/message.php

@@ -24,5 +24,6 @@ class CCK_DocumentRendererMessage extends CCK_DocumentRenderer
 	 */
 	public function render($name, $params = array (), $content = null)
 	{
+        return true;
 	}
 }

libraries/cck/rendering/document/html/renderer/module.php

@@ -24,5 +24,6 @@ class CCK_DocumentRendererModule extends CCK_DocumentRenderer
 	 */
 	public function render($module, $attribs = array(), $content = null)
 	{
+        return true;
 	}
 }