joomla · wilsonge · Aug 19, 2016 · Aug 19, 2016
diff --git a/libraries/fof/LICENSE.txt b/libraries/fof/LICENSE.txt
diff --git a/libraries/fof/autoloader/component.php b/libraries/fof/autoloader/component.php
@@ -2,7 +2,7 @@
 /**
  *  @package     FrameworkOnFramework
  *  @subpackage  autoloader
- *  @copyright   Copyright (C) 2010 - 2015 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ *  @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
  *  @license     GNU General Public License version 2, or later
  */
 

diff --git a/libraries/fof/autoloader/fof.php b/libraries/fof/autoloader/fof.php
@@ -2,7 +2,7 @@
 /**
  *  @package     FrameworkOnFramework
  *  @subpackage  autoloader
- * @copyright   Copyright (C) 2010 - 2015 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
  *  @license     GNU General Public License version 2, or later
  */
 

diff --git a/libraries/fof/config/domain/dispatcher.php b/libraries/fof/config/domain/dispatcher.php
@@ -2,7 +2,7 @@
 /**
  *  @package     FrameworkOnFramework
  *  @subpackage  config
- * @copyright   Copyright (C) 2010 - 2015 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
  *  @license     GNU General Public License version 2, or later
  */
 

diff --git a/libraries/fof/config/domain/interface.php b/libraries/fof/config/domain/interface.php
@@ -2,7 +2,7 @@
 /**
  *  @package     FrameworkOnFramework
  *  @subpackage  config
- * @copyright   Copyright (C) 2010 - 2015 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
  *  @license     GNU General Public License version 2, or later
  */
 

diff --git a/libraries/fof/config/domain/tables.php b/libraries/fof/config/domain/tables.php
@@ -2,7 +2,7 @@
 /**
  *  @package     FrameworkOnFramework
  *  @subpackage  config
- * @copyright   Copyright (C) 2010 - 2015 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
  *  @license     GNU General Public License version 2, or later
  */
 

diff --git a/libraries/fof/config/domain/views.php b/libraries/fof/config/domain/views.php
@@ -2,7 +2,7 @@
 /**
  *  @package     FrameworkOnFramework
  *  @subpackage  config
- * @copyright   Copyright (C) 2010 - 2015 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
  *  @license     GNU General Public License version 2, or later
  */
 

diff --git a/libraries/fof/config/provider.php b/libraries/fof/config/provider.php
@@ -2,7 +2,7 @@
 /**
  *  @package     FrameworkOnFramework
  *  @subpackage  config
- * @copyright   Copyright (C) 2010 - 2015 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
  *  @license     GNU General Public License version 2, or later
  */
 

diff --git a/libraries/fof/controller/controller.php b/libraries/fof/controller/controller.php
@@ -2,7 +2,7 @@
 /**
  * @package    FrameworkOnFramework
  * @subpackage controller
- * @copyright   Copyright (C) 2010 - 2015 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -480,6 +480,13 @@ public function __construct($config = array())
 		{
 			$mName = $rMethod->getName();
 
+			// If the developer screwed up and declared one of the helper method public do NOT make them available as
+			// tasks.
+			if ((substr($mName, 0, 8) == 'onBefore') || (substr($mName, 0, 7) == 'onAfter') || substr($mName, 0, 1) == '_')
+			{
+				continue;
+			}
+
 			// Add default display method if not explicitly declared.
 			if (!in_array($mName, $xMethods) || in_array($mName, $iMethods))
 			{
@@ -1049,8 +1056,9 @@ public function display($cachable = false, $urlparams = false, $tpl = null)
 				$groups = $user->groups;
 			}
 
-			// Set up safe URL parameters
+			$importantParameters = array();
 
+			// Set up safe URL parameters
 			if (!is_array($urlparams))
 			{
 				$urlparams = array(
@@ -1090,6 +1098,9 @@ public function display($cachable = false, $urlparams = false, $tpl = null)
 				{
 					// Add your safe url parameters with variable type as value {@see JFilterInput::clean()}.
 					$registeredurlparams->$key = $value;
+
+					// Add the URL-important parameters into the array
+					$importantParameters[$key] = $this->input->get($key, null, $value);
 				}
 
 				if (version_compare(JVERSION, '3.0', 'ge'))
@@ -1103,7 +1114,7 @@ public function display($cachable = false, $urlparams = false, $tpl = null)
 			}
 
 			// Create the cache ID after setting the registered URL params, as they are used to generate the ID
-			$cacheId = md5(serialize(array(JCache::makeId(), $view->getName(), $this->doTask, $groups)));
+			$cacheId = md5(serialize(array(JCache::makeId(), $view->getName(), $this->doTask, $groups, $importantParameters)));
 
 			// Get the cached view or cache the current view
 			$cache->get($view, 'display', $cacheId);
@@ -1347,7 +1358,7 @@ public function apply()
 				$customURL = base64_decode($customURL);
 			}
 
-			$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . $this->view . '&task=edit&id=' . $id  . $this->getItemidURLSuffix();
+			$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . $this->view . '&task=edit&id=' . $id . $this->getItemidURLSuffix();
 			$this->setRedirect($url, JText::_($textkey));
 		}
 

diff --git a/libraries/fof/database/database.php b/libraries/fof/database/database.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Database connector class.
+ *
+ * @since       11.1
+ * @deprecated  13.3 (Platform) & 4.0 (CMS)
+ */
+abstract class FOFDatabase
+{
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 * @deprecated  13.1 (Platform) & 4.0 (CMS)
+	 */
+	public function query()
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::query() is deprecated, use FOFDatabaseDriver::execute() instead.', JLog::WARNING, 'deprecated');
+		}
+
+		return $this->execute();
+	}
+
+	/**
+	 * Get a list of available database connectors.  The list will only be populated with connectors that both
+	 * the class exists and the static test method returns true.  This gives us the ability to have a multitude
+	 * of connector classes that are self-aware as to whether or not they are able to be used on a given system.
+	 *
+	 * @return  array  An array of available database connectors.
+	 *
+	 * @since   11.1
+	 * @deprecated  13.1 (Platform) & 4.0 (CMS)
+	 */
+	public static function getConnectors()
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::getConnectors() is deprecated, use FOFDatabaseDriver::getConnectors() instead.', JLog::WARNING, 'deprecated');
+		}
+
+		return FOFDatabaseDriver::getConnectors();
+	}
+
+	/**
+	 * Gets the error message from the database connection.
+	 *
+	 * @param   boolean  $escaped  True to escape the message string for use in JavaScript.
+	 *
+	 * @return  string  The error message for the most recent query.
+	 *
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS)
+	 * @since   11.1
+	 */
+	public function getErrorMsg($escaped = false)
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::getErrorMsg() is deprecated, use exception handling instead.', JLog::WARNING, 'deprecated');
+		}
+
+		if ($escaped)
+		{
+			return addslashes($this->errorMsg);
+		}
+		else
+		{
+			return $this->errorMsg;
+		}
+	}
+
+	/**
+	 * Gets the error number from the database connection.
+	 *
+	 * @return      integer  The error number for the most recent query.
+	 *
+	 * @since       11.1
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS)
+	 */
+	public function getErrorNum()
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::getErrorNum() is deprecated, use exception handling instead.', JLog::WARNING, 'deprecated');
+		}
+
+		return $this->errorNum;
+	}
+
+	/**
+	 * Method to return a FOFDatabaseDriver instance based on the given options.  There are three global options and then
+	 * the rest are specific to the database driver.  The 'driver' option defines which FOFDatabaseDriver class is
+	 * used for the connection -- the default is 'mysqli'.  The 'database' option determines which database is to
+	 * be used for the connection.  The 'select' option determines whether the connector should automatically select
+	 * the chosen database.
+	 *
+	 * Instances are unique to the given options and new objects are only created when a unique options array is
+	 * passed into the method.  This ensures that we don't end up with unnecessary database connection resources.
+	 *
+	 * @param   array  $options  Parameters to be passed to the database driver.
+	 *
+	 * @return  FOFDatabaseDriver  A database object.
+	 *
+	 * @since       11.1
+	 * @deprecated  13.1 (Platform) & 4.0 (CMS)
+	 */
+	public static function getInstance($options = array())
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::getInstance() is deprecated, use FOFDatabaseDriver::getInstance() instead.', JLog::WARNING, 'deprecated');
+		}
+
+		return FOFDatabaseDriver::getInstance($options);
+	}
+
+	/**
+	 * Splits a string of multiple queries into an array of individual queries.
+	 *
+	 * @param   string  $query  Input SQL string with which to split into individual queries.
+	 *
+	 * @return  array  The queries from the input string separated into an array.
+	 *
+	 * @since   11.1
+	 * @deprecated  13.1 (Platform) & 4.0 (CMS)
+	 */
+	public static function splitSql($query)
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::splitSql() is deprecated, use FOFDatabaseDriver::splitSql() instead.', JLog::WARNING, 'deprecated');
+		}
+
+		return FOFDatabaseDriver::splitSql($query);
+	}
+
+	/**
+	 * Return the most recent error message for the database connector.
+	 *
+	 * @param   boolean  $showSQL  True to display the SQL statement sent to the database as well as the error.
+	 *
+	 * @return  string  The error message for the most recent query.
+	 *
+	 * @since   11.1
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS)
+	 */
+	public function stderr($showSQL = false)
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::stderr() is deprecated.', JLog::WARNING, 'deprecated');
+		}
+
+		if ($this->errorNum != 0)
+		{
+			return JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $this->errorNum, $this->errorMsg)
+			. ($showSQL ? "<br />SQL = <pre>$this->sql</pre>" : '');
+		}
+		else
+		{
+			return JText::_('JLIB_DATABASE_FUNCTION_NOERROR');
+		}
+	}
+
+	/**
+	 * Test to see if the connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 * @deprecated  12.3 (Platform) & 4.0 (CMS) - Use FOFDatabaseDriver::isSupported() instead.
+	 */
+	public static function test()
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::test() is deprecated. Use FOFDatabaseDriver::isSupported() instead.', JLog::WARNING, 'deprecated');
+		}
+
+		return static::isSupported();
+	}
+}