Resolved gh-444 by adding the new phpspreadsheet library, and removing the old PHPExcel library.

README.md

@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.10.13) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.11.0) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -144,14 +144,14 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 5th April, 2020
-+ *Version*: 2.10.13
++ *Last Build*: 19th April, 2020
++ *Version*: 2.11.0
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **280662**
++ *Line count*: **280799**
 + *Field count*: **1514**
-+ *File count*: **1771**
-+ *Folder count*: **287**
++ *File count*: **1769**
++ *Folder count*: **286**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

admin/README.txt

@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.10.13) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.11.0) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -144,14 +144,14 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 5th April, 2020
-+ *Version*: 2.10.13
++ *Last Build*: 19th April, 2020
++ *Version*: 2.11.0
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **280662**
++ *Line count*: **280799**
 + *Field count*: **1514**
-+ *File count*: **1771**
-+ *Folder count*: **287**
++ *File count*: **1769**
++ *Folder count*: **286**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

admin/compiler/joomla_3/Helper.php

@@ -19,13 +19,20 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\Language\Language;
 use Joomla\String\StringHelper;
-use Joomla\Utilities\ArrayHelper;
+use Joomla\Utilities\ArrayHelper;###ADMIN_HELPER_CLASS_HEADER###
 
 /**
  * ###Component### component helper.
  */
 abstract class ###Component###Helper
 {
+	/**
+	 * Composer Switch
+	 * 
+	 * @var      array
+	 */
+	protected static $composer = array();
+
 	/**
 	 * The Main Active Language
 	 * 
@@ -34,8 +41,28 @@ abstract class ###Component###Helper
 	public static $langTag;###ADMIN_GLOBAL_EVENT_HELPER######CUSTOM_HELPER_SCRIPT######BOTH_CUSTOM_HELPER_SCRIPT###
 
 	/**
-	* Load the Component xml manifest.
-	**/
+	 * Load the Composer Vendors
+	 */
+	public static function composerAutoload($target)
+	{
+		// insure we load the composer vendor only once
+		if (!isset(self::$composer[$target]))
+		{
+			// get the function name
+			$functionName = self::safeString('compose' . $target);
+			// check if method exist
+			if (method_exists(__CLASS__, $functionName))
+			{
+				return self::{$functionName}();
+			}
+			return false;
+		}
+		return self::$composer[$target];
+	}
+
+	/**
+	 * Load the Component xml manifest.
+	 */
 	public static function manifest()
 	{
 		$manifestUrl = JPATH_ADMINISTRATOR."/components/com_###component###/###component###.xml";
@@ -43,13 +70,13 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Joomla version object
-	**/	
+	 * Joomla version object
+	 */	
 	protected static $JVersion;
 
 	/**
-	* set/get Joomla version
-	**/
+	 * set/get Joomla version
+	 */
 	public static function jVersion()
 	{
 		// check if set
@@ -61,8 +88,8 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Load the Contributors details.
-	**/
+	 * Load the Contributors details.
+	 */
 	public static function getContributors()
 	{
 		// get params
@@ -99,8 +126,8 @@ abstract class ###Component###Helper
 	}###HELP###
 
 	/**
-	* Configure the Linkbar.
-	**/
+	 * Configure the Linkbar.
+	 */
 	public static function addSubmenu($submenu)
 	{
 		// load user for access menus
@@ -320,18 +347,18 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Get the action permissions
-	*
-	* @param  string   $view        The related view name
-	* @param  int      $record      The item to act upon
-	* @param  string   $views       The related list view name
-	* @param  mixed    $target      Only get this permission (like edit, create, delete)
-	* @param  string   $component   The target component
-	* @param  object   $user        The user whose permissions we are loading
-	*
-	* @return  object   The JObject of permission/authorised actions
-	* 
-	**/
+	 * Get the action permissions
+	 *
+	 * @param  string   $view        The related view name
+	 * @param  int      $record      The item to act upon
+	 * @param  string   $views       The related list view name
+	 * @param  mixed    $target      Only get this permission (like edit, create, delete)
+	 * @param  string   $component   The target component
+	 * @param  object   $user        The user whose permissions we are loading
+	 *
+	 * @return  object   The JObject of permission/authorised actions
+	 * 
+	 */
 	public static function getActions($view, &$record = null, $views = null, $target = null, $component = '###component###', $user = 'null')
 	{
 		// load the user if not given
@@ -495,14 +522,14 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Filter the action permissions
-	*
-	* @param  string   $action   The action to check
-	* @param  array    $targets  The array of target actions
-	*
-	* @return  boolean   true if action should be filtered out
-	* 
-	**/
+	 * Filter the action permissions
+	 *
+	 * @param  string   $action   The action to check
+	 * @param  array    $targets  The array of target actions
+	 *
+	 * @return  boolean   true if action should be filtered out
+	 * 
+	 */
 	protected static function filterActions(&$view, &$action, &$targets)
 	{
 		foreach ($targets as $target)
@@ -518,8 +545,8 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Get any component's model
-	**/
+	 * Get any component's model
+	 */
 	public static function getModel($name, $path = JPATH_COMPONENT_ADMINISTRATOR, $Component = '###Component###', $config = array())
 	{
 		// fix the name
@@ -566,8 +593,8 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Add to asset Table
-	*/
+	 * Add to asset Table
+	 */
 	public static function setAsset($id, $table, $inherit = true)
 	{
 		$parent = JTable::getInstance('Asset');
@@ -874,12 +901,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Check if have an json string
-	*
-	* @input	string   The json string to check
-	*
-	* @returns bool true on success
-	**/
+	 * Check if have an json string
+	 *
+	 * @input	string   The json string to check
+	 *
+	 * @returns bool true on success
+	 */
 	public static function checkJson($string)
 	{
 		if (self::checkString($string))
@@ -891,12 +918,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Check if have an object with a length
-	*
-	* @input	object   The object to check
-	*
-	* @returns bool true on success
-	**/
+	 * Check if have an object with a length
+	 *
+	 * @input	object   The object to check
+	 *
+	 * @returns bool true on success
+	 */
 	public static function checkObject($object)
 	{
 		if (isset($object) && is_object($object))
@@ -907,12 +934,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Check if have an array with a length
-	*
-	* @input	array   The array to check
-	*
-	* @returns bool/int  number of items in array on success
-	**/
+	 * Check if have an array with a length
+	 *
+	 * @input	array   The array to check
+	 *
+	 * @returns bool/int  number of items in array on success
+	 */
 	public static function checkArray($array, $removeEmptyString = false)
 	{
 		if (isset($array) && is_array($array) && ($nr = count((array)$array)) > 0)
@@ -935,12 +962,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Check if have a string with a length
-	*
-	* @input	string   The string to check
-	*
-	* @returns bool true on success
-	**/
+	 * Check if have a string with a length
+	 *
+	 * @input	string   The string to check
+	 *
+	 * @returns bool true on success
+	 */
 	public static function checkString($string)
 	{
 		if (isset($string) && is_string($string) && strlen($string) > 0)
@@ -951,11 +978,11 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Check if we are connected
-	* Thanks https://stackoverflow.com/a/4860432/1429677
-	*
-	* @returns bool true on success
-	**/
+	 * Check if we are connected
+	 * Thanks https://stackoverflow.com/a/4860432/1429677
+	 *
+	 * @returns bool true on success
+	 */
 	public static function isConnected()
 	{
 		// If example.com is down, then probably the whole internet is down, since IANA maintains the domain. Right?
@@ -976,12 +1003,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Merge an array of array's
-	*
-	* @input	array   The arrays you would like to merge
-	*
-	* @returns array on success
-	**/
+	 * Merge an array of array's
+	 *
+	 * @input	array   The arrays you would like to merge
+	 *
+	 * @returns array on success
+	 */
 	public static function mergeArrays($arrays)
 	{
 		if(self::checkArray($arrays))
@@ -1006,12 +1033,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Shorten a string
-	*
-	* @input	string   The you would like to shorten
-	*
-	* @returns string on success
-	**/
+	 * Shorten a string
+	 *
+	 * @input	string   The you would like to shorten
+	 *
+	 * @returns string on success
+	 */
 	public static function shorten($string, $length = 40, $addTip = true)
 	{
 		if (self::checkString($string))
@@ -1047,12 +1074,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Making strings safe (various ways)
-	*
-	* @input	string   The you would like to make safe
-	*
-	* @returns string on success
-	**/
+	 * Making strings safe (various ways)
+	 *
+	 * @input	string   The you would like to make safe
+	 *
+	 * @returns string on success
+	 */
 	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true, $keepOnlyCharacters = true)
 	{
 		if ($replaceNumbers === true)
@@ -1206,12 +1233,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Convert an integer into an English word string
-	* Thanks to Tom Nicholson <http://php.net/manual/en/function.strval.php#41988>
-	*
-	* @input	an int
-	* @returns a string
-	**/
+	 * Convert an integer into an English word string
+	 * Thanks to Tom Nicholson <http://php.net/manual/en/function.strval.php#41988>
+	 *
+	 * @input	an int
+	 * @returns a string
+	 */
 	public static function numberToString($x)
 	{
 		$nwords = array( "zero", "one", "two", "three", "four", "five", "six", "seven",
@@ -1297,10 +1324,10 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Random Key
-	*
-	* @returns a string
-	**/
+	 * Random Key
+	 *
+	 * @returns a string
+	 */
 	public static function randomkey($size)
 	{
 		$bag = "abcefghijknopqrstuwxyzABCDDEFGHIJKLLMMNOPQRSTUVVWXYZabcddefghijkllmmnopqrstuvvwxyzABCEFGHIJKNOPQRSTUWXYZ";

admin/compiler/joomla_3/Helper_site.php

@@ -19,13 +19,20 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\Language\Language;
 use Joomla\String\StringHelper;
-use Joomla\Utilities\ArrayHelper;
+use Joomla\Utilities\ArrayHelper;###SITE_HELPER_CLASS_HEADER###
 
 /**
  * ###Component### component helper
  */
 abstract class ###Component###Helper
 {
+	/**
+	 * Composer Switch
+	 * 
+	 * @var      array
+	 */
+	protected static $composer = array();
+
 	/**
 	 * The Main Active Language
 	 * 
@@ -33,6 +40,29 @@ abstract class ###Component###Helper
 	 */
 	public static $langTag;###SITE_GLOBAL_EVENT_HELPER######SITE_CUSTOM_HELPER_SCRIPT######BOTH_CUSTOM_HELPER_SCRIPT###
 
+	/**
+	 * Load the Composer Vendors
+	 */
+	public static function composerAutoload($target)
+	{
+		// insure we load the composer vendor only once
+		if (!isset(self::$composer[$target]))
+		{
+			// get the function name
+			$functionName = self::safeString('compose' . $target);
+			// check if method exist
+			if (method_exists(__CLASS__, $functionName))
+			{
+				return self::{$functionName}();
+			}
+			return false;
+		}
+		return self::$composer[$target];
+	}
+
+	/**
+	 * Convert it into a string
+	 */
 	public static function jsonToString($value, $sperator = ", ", $table = null, $id = 'id', $name = 'name')
 	{
 		// do some table foot work
@@ -82,8 +112,8 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Load the Component xml manifest.
-	**/
+	 * Load the Component xml manifest.
+	 */
 	public static function manifest()
 	{
 		$manifestUrl = JPATH_ADMINISTRATOR."/components/com_###component###/###component###.xml";
@@ -91,13 +121,13 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Joomla version object
-	**/	
+	 * Joomla version object
+	 */	
 	protected static $JVersion;
 
 	/**
-	* set/get Joomla version
-	**/
+	 * set/get Joomla version
+	 */
 	public static function jVersion()
 	{
 		// check if set
@@ -109,8 +139,8 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Load the Contributors details.
-	**/
+	 * Load the Contributors details.
+	 */
 	public static function getContributors()
 	{
 		// get params
@@ -147,8 +177,8 @@ abstract class ###Component###Helper
 	}###HELP_SITE###
 
 	/**
-	* Get any component's model
-	**/
+	 * Get any component's model
+	 */
 	public static function getModel($name, $path = JPATH_COMPONENT_SITE, $Component = '###Component###', $config = array())
 	{
 		// fix the name
@@ -195,8 +225,8 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Add to asset Table
-	*/
+	 * Add to asset Table
+	 */
 	public static function setAsset($id, $table, $inherit = true)
 	{
 		$parent = JTable::getInstance('Asset');
@@ -665,18 +695,18 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Get the action permissions
-	*
-	* @param  string   $view        The related view name
-	* @param  int      $record      The item to act upon
-	* @param  string   $views       The related list view name
-	* @param  mixed    $target      Only get this permission (like edit, create, delete)
-	* @param  string   $component   The target component
-	* @param  object   $user        The user whose permissions we are loading
-	*
-	* @return  object   The JObject of permission/authorised actions
-	* 
-	**/
+	 * Get the action permissions
+	 *
+	 * @param  string   $view        The related view name
+	 * @param  int      $record      The item to act upon
+	 * @param  string   $views       The related list view name
+	 * @param  mixed    $target      Only get this permission (like edit, create, delete)
+	 * @param  string   $component   The target component
+	 * @param  object   $user        The user whose permissions we are loading
+	 *
+	 * @return  object   The JObject of permission/authorised actions
+	 * 
+	 */
 	public static function getActions($view, &$record = null, $views = null, $target = null, $component = '###component###', $user = 'null')
 	{
 		// load the user if not given
@@ -840,14 +870,14 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Filter the action permissions
-	*
-	* @param  string   $action   The action to check
-	* @param  array    $targets  The array of target actions
-	*
-	* @return  boolean   true if action should be filtered out
-	* 
-	**/
+	 * Filter the action permissions
+	 *
+	 * @param  string   $action   The action to check
+	 * @param  array    $targets  The array of target actions
+	 *
+	 * @return  boolean   true if action should be filtered out
+	 * 
+	 */
 	protected static function filterActions(&$view, &$action, &$targets)
 	{
 		foreach ($targets as $target)
@@ -863,12 +893,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Check if have an json string
-	*
-	* @input	string   The json string to check
-	*
-	* @returns bool true on success
-	**/
+	 * Check if have an json string
+	 *
+	 * @input	string   The json string to check
+	 *
+	 * @returns bool true on success
+	 */
 	public static function checkJson($string)
 	{
 		if (self::checkString($string))
@@ -880,12 +910,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Check if have an object with a length
-	*
-	* @input	object   The object to check
-	*
-	* @returns bool true on success
-	**/
+	 * Check if have an object with a length
+	 *
+	 * @input	object   The object to check
+	 *
+	 * @returns bool true on success
+	 */
 	public static function checkObject($object)
 	{
 		if (isset($object) && is_object($object))
@@ -896,12 +926,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Check if have an array with a length
-	*
-	* @input	array   The array to check
-	*
-	* @returns bool/int  number of items in array on success
-	**/
+	 * Check if have an array with a length
+	 *
+	 * @input	array   The array to check
+	 *
+	 * @returns bool/int  number of items in array on success
+	 */
 	public static function checkArray($array, $removeEmptyString = false)
 	{
 		if (isset($array) && is_array($array) && ($nr = count((array)$array)) > 0)
@@ -924,12 +954,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Check if have a string with a length
-	*
-	* @input	string   The string to check
-	*
-	* @returns bool true on success
-	**/
+	 * Check if have a string with a length
+	 *
+	 * @input	string   The string to check
+	 *
+	 * @returns bool true on success
+	 */
 	public static function checkString($string)
 	{
 		if (isset($string) && is_string($string) && strlen($string) > 0)
@@ -940,11 +970,11 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Check if we are connected
-	* Thanks https://stackoverflow.com/a/4860432/1429677
-	*
-	* @returns bool true on success
-	**/
+	 * Check if we are connected
+	 * Thanks https://stackoverflow.com/a/4860432/1429677
+	 *
+	 * @returns bool true on success
+	 */
 	public static function isConnected()
 	{
 		// If example.com is down, then probably the whole internet is down, since IANA maintains the domain. Right?
@@ -965,12 +995,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Merge an array of array's
-	*
-	* @input	array   The arrays you would like to merge
-	*
-	* @returns array on success
-	**/
+	 * Merge an array of array's
+	 *
+	 * @input	array   The arrays you would like to merge
+	 *
+	 * @returns array on success
+	 */
 	public static function mergeArrays($arrays)
 	{
 		if(self::checkArray($arrays))
@@ -995,12 +1025,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Shorten a string
-	*
-	* @input	string   The you would like to shorten
-	*
-	* @returns string on success
-	**/
+	 * Shorten a string
+	 *
+	 * @input	string   The you would like to shorten
+	 *
+	 * @returns string on success
+	 */
 	public static function shorten($string, $length = 40, $addTip = true)
 	{
 		if (self::checkString($string))
@@ -1036,12 +1066,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Making strings safe (various ways)
-	*
-	* @input	string   The you would like to make safe
-	*
-	* @returns string on success
-	**/
+	 * Making strings safe (various ways)
+	 *
+	 * @input	string   The you would like to make safe
+	 *
+	 * @returns string on success
+	 */
 	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true, $keepOnlyCharacters = true)
 	{
 		if ($replaceNumbers === true)
@@ -1195,12 +1225,12 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Convert an integer into an English word string
-	* Thanks to Tom Nicholson <http://php.net/manual/en/function.strval.php#41988>
-	*
-	* @input	an int
-	* @returns a string
-	**/
+	 * Convert an integer into an English word string
+	 * Thanks to Tom Nicholson <http://php.net/manual/en/function.strval.php#41988>
+	 *
+	 * @input	an int
+	 * @returns a string
+	 */
 	public static function numberToString($x)
 	{
 		$nwords = array( "zero", "one", "two", "three", "four", "five", "six", "seven",
@@ -1286,10 +1316,10 @@ abstract class ###Component###Helper
 	}
 
 	/**
-	* Random Key
-	*
-	* @returns a string
-	**/
+	 * Random Key
+	 *
+	 * @returns a string
+	 */
 	public static function randomkey($size)
 	{
 		$bag = "abcefghijknopqrstuwxyzABCDDEFGHIJKLLMMNOPQRSTUVVWXYZabcddefghijkllmmnopqrstuvvwxyzABCEFGHIJKNOPQRSTUWXYZ";

admin/compiler/joomla_3/JModelLegacy_import.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use PhpOffice\PhpSpreadsheet\IOFactory;
+
 /**
  * ###Component### Import Model
  */
@@ -360,30 +362,8 @@ class ###Component###ModelImport extends JModelLegacy
 		$check['type'] = $this->getType;
 		
 		return $check;
-	}
-	
-	/**
-	 * Check the extension 
-	 *
-	 * @param   string  $file    Name of the uploaded file
-	 *
-	 * @return  boolean  True on success
-	 *
-	 */
-	protected function checkExtension($file)
-	{		
-		// check the extention
-		switch(strtolower(pathinfo($file, PATHINFO_EXTENSION)))
-		{
-			case 'xls':
-			case 'ods':
-			case 'csv':
-			return true;
-			break;
-		}
-		return false;
-	}
-	
+	}###IMPORT_EXT_METHOD###
+
 	/**
 	 * Clean up temporary uploaded spreadsheet
 	 *
@@ -409,263 +389,8 @@ class ###Component###ModelImport extends JModelLegacy
 			// It might also be just a base filename
 			JFile::delete(JPath::clean($package));
 		}
-	}
-	
-	/**
-	* Set the data from the spreadsheet to the database
-	*
-	* @param string  $package Paths to the uploaded package file
-	*
-	* @return  boolean false on failure
-	*
-	**/
-	protected function setData($package,$table,$target_headers)
-	{
-		if (###Component###Helper::checkArray($target_headers))
-		{
-			// make sure the file is loaded		
-			JLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers');
-			$jinput = JFactory::getApplication()->input;
-			foreach($target_headers as $header)
-			{
-				$data['target_headers'][$header] = $jinput->getString($header, null);
-			}
-			// set the data
-			if(isset($package['dir']))
-			{
-				$inputFileType = PHPExcel_IOFactory::identify($package['dir']);
-				$excelReader = PHPExcel_IOFactory::createReader($inputFileType);
-				$excelReader->setReadDataOnly(true);
-				$excelObj = $excelReader->load($package['dir']);
-				$data['array'] = $excelObj->getActiveSheet()->toArray(null, true,true,true);
-				$excelObj->disconnectWorksheets(); 
-				unset($excelObj);
-				return $this->save($data,$table);
-			}
-		}
-		return false;
-	}
-	
-	/**
-	* Save the data from the file to the database
-	*
-	* @param string  $package Paths to the uploaded package file
-	*
-	* @return  boolean false on failure
-	*
-	**/
-	protected function save($data,$table)
-	{
-		// import the data if there is any
-		if(###Component###Helper::checkArray($data['array']))
-		{
-			// get user object
-			$user = JFactory::getUser();
-			// remove header if it has headers
-			$id_key = $data['target_headers']['id'];
-			$published_key = $data['target_headers']['published'];
-			$ordering_key = $data['target_headers']['ordering'];
-			// get the first array set
-			$firstSet = reset($data['array']);
-            
-			// check if first array is a header array and remove if true
-			if($firstSet[$id_key] == 'id' || $firstSet[$published_key] == 'published' || $firstSet[$ordering_key] == 'ordering')
-			{
-				array_shift($data['array']);
-			}
-			
-			// make sure there is still values in array and that it was not only headers
-			if(###Component###Helper::checkArray($data['array']) && $user->authorise($table.'.import', 'com_###component###') && $user->authorise('core.import', 'com_###component###'))
-			{
-				// set target.
-				$target	= array_flip($data['target_headers']);
-				// Get a db connection.
-				$db = JFactory::getDbo();
-				// set some defaults
-				$todayDate = JFactory::getDate()->toSql();
-				// get global action permissions
-				$canDo = ###Component###Helper::getActions($table);
-				$canEdit = $canDo->get('core.edit');
-				$canState = $canDo->get('core.edit.state');
-				$canCreate = $canDo->get('core.create');
-				$hasAlias = $this->getAliasesUsed($table);
-				// prosses the data
-				foreach($data['array'] as $row)
-				{
-					$found = false;
-					if (isset($row[$id_key]) && is_numeric($row[$id_key]) && $row[$id_key] > 0)
-					{
-						// raw items import & update!
-						$query = $db->getQuery(true);
-						$query
-							->select('version')
-							->from($db->quoteName('#__###component###_'.$table))
-							->where($db->quoteName('id') . ' = '. $db->quote($row[$id_key]));
-						// Reset the query using our newly populated query object.
-						$db->setQuery($query);
-						$db->execute();
-						$found = $db->getNumRows();
-					}
-					
-					if($found && $canEdit)
-					{
-						// update item
-						$id = $row[$id_key];
-						$version = $db->loadResult();
-						// reset all buckets
-						$query = $db->getQuery(true);
-						$fields = array();
-						// Fields to update.
-						foreach($row as $key => $cell)
-						{
-							// ignore column
-							if ('IGNORE' == $target[$key])
-							{
-								continue;
-							}
-							// update modified
-							if ('modified_by' == $target[$key])
-							{
-								continue;
-							}
-							// update modified
-							if ('modified' == $target[$key])
-							{
-								continue;
-							}
-							// update version
-							if ('version' == $target[$key])
-							{
-								$cell = (int) $version + 1;
-							}
-							// verify publish authority
-							if ('published' == $target[$key] && !$canState)
-							{
-								continue;
-							}
-							// set to update array
-							if(in_array($key, $data['target_headers']) && is_numeric($cell))
-							{
-								$fields[] = $db->quoteName($target[$key]) . ' = ' . $cell;
-							}
-							elseif(in_array($key, $data['target_headers']) && is_string($cell))
-							{
-								$fields[] = $db->quoteName($target[$key]) . ' = ' . $db->quote($cell);
-							}
-							elseif(in_array($key, $data['target_headers']) && is_null($cell))
-							{
-								// if import data is null then set empty
-								$fields[] = $db->quoteName($target[$key]) . " = ''";
-							}
-						}
-						// load the defaults
-						$fields[] = $db->quoteName('modified_by') . ' = ' . $db->quote($user->id);
-						$fields[] = $db->quoteName('modified') . ' = ' . $db->quote($todayDate);
-						// Conditions for which records should be updated.
-						$conditions = array(
-							$db->quoteName('id') . ' = ' . $id
-						);
-						 
-						$query->update($db->quoteName('#__###component###_'.$table))->set($fields)->where($conditions);
-						$db->setQuery($query);
-						$db->execute();
-					}
-					elseif ($canCreate)
-					{
-						// insert item
-						$query = $db->getQuery(true);
-						// reset all buckets
-						$columns = array();
-						$values = array();
-						$version = false;
-						// Insert columns. Insert values.
-						foreach($row as $key => $cell)
-						{
-							// ignore column
-							if ('IGNORE' == $target[$key])
-							{
-								continue;
-							}
-							// remove id
-							if ('id' == $target[$key])
-							{
-								continue;
-							}
-							// update created
-							if ('created_by' == $target[$key])
-							{
-								continue;
-							}
-							// update created
-							if ('created' == $target[$key])
-							{
-								continue;
-							}
-							// Make sure the alias is incremented
-							if ('alias' == $target[$key])
-							{
-								$cell = $this->getAlias($cell,$table);
-							}
-							// update version
-							if ('version' == $target[$key])
-							{
-								$cell = 1;
-								$version = true;
-							}
-							// set to insert array
-							if(in_array($key, $data['target_headers']) && is_numeric($cell))
-							{
-								$columns[] = $target[$key];
-								$values[] = $cell;
-							}
-							elseif(in_array($key, $data['target_headers']) && is_string($cell))
-							{
-								$columns[] = $target[$key];
-								$values[] = $db->quote($cell);
-							}
-							elseif(in_array($key, $data['target_headers']) && is_null($cell))
-							{
-								// if import data is null then set empty
-								$columns[] = $target[$key];
-								$values[] = "''";
-							}
-						}
-						// load the defaults
-						$columns[] = 'created_by';
-						$values[] = $db->quote($user->id);
-						$columns[] = 'created';
-						$values[] = $db->quote($todayDate);
-						if (!$version)
-						{
-							$columns[] = 'version';
-							$values[] = 1;
-						}
-						// Prepare the insert query.
-						$query
-							->insert($db->quoteName('#__###component###_'.$table))
-							->columns($db->quoteName($columns))
-							->values(implode(',', $values));
-						// Set the query using our newly populated query object and execute it.
-						$db->setQuery($query);
-						$done = $db->execute();
-						if ($done)
-						{
-							$aId = $db->insertid();
-							// make sure the access of asset is set
-							###Component###Helper::setAsset($aId,$table);
-						}
-					}
-					else
-					{
-						return false;
-					}
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-	
+	}###IMPORT_SETDATA_METHOD######IMPORT_SAVE_METHOD###
+
 	protected function getAlias($name,$type = false)
 	{
 		// sanitize the name to an alias

admin/compiler/joomla_3/JModelLegacy_import_custom.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use PhpOffice\PhpSpreadsheet\IOFactory;
+
 /**
  * ###Component### ###View### Model
  */
@@ -251,8 +253,8 @@ class ###Component###Model###View### extends JModelLegacy
 		
 		return $check;
 	}
-	###IMPORT_EXT_METHOD_CUSTOM### 
-	
+	###IMPORT_EXT_METHOD###
+
 	/**
 	 * Clean up temporary uploaded spreadsheet
 	 *
@@ -279,9 +281,9 @@ class ###Component###Model###View### extends JModelLegacy
 			JFile::delete(JPath::clean($package));
 		}
 	}
-	###IMPORT_SETDATE_METHOD_CUSTOM### 
-	###IMPORT_SAVE_METHOD_CUSTOM###
-	
+	###IMPORT_SETDATA_METHOD###
+	###IMPORT_SAVE_METHOD###
+
 	protected function getAlias($name,$type = false)
 	{
 		// sanitize the name to an alias

admin/compiler/joomla_3/script.php

@@ -96,6 +96,14 @@ class com_###component###InstallerScript
 		if ($type === 'install')
 		{###PREINSTALLSCRIPT###
 		}
+		// check if the PHPExcel stuff is still around
+		if (JFile::exists(JPATH_ADMINISTRATOR . '/components/com_###component###/helpers/PHPExcel.php'))
+		{
+			// We need to remove this old PHPExcel folder
+			$this->removeFolder(JPATH_ADMINISTRATOR . '/components/com_###component###/helpers/PHPExcel');
+			// We need to remove this old PHPExcel file
+			JFile::delete(JPATH_ADMINISTRATOR . '/components/com_###component###/helpers/PHPExcel.php');
+		}
 		return true;
 	}
 
@@ -120,5 +128,106 @@ class com_###component###InstallerScript
 		{###POSTUPDATESCRIPT###
 		}
 		return true;
+	}
+
+	/**
+	 * Remove folders with files
+	 * 
+	 * @param   string   $dir     The path to folder to remove
+	 * @param   boolean  $ignore  The folders and files to ignore and not remove
+	 *
+	 * @return  boolean   True in all is removed
+	 * 
+	 */
+	protected function removeFolder($dir, $ignore = false)
+	{
+		if (JFolder::exists($dir))
+		{
+			$it = new RecursiveDirectoryIterator($dir);
+			$it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
+			// remove ending /
+			$dir = rtrim($dir, '/');
+			// now loop the files & folders
+			foreach ($it as $file)
+			{
+				if ('.' === $file->getBasename() || '..' ===  $file->getBasename()) continue;
+				// set file dir
+				$file_dir = $file->getPathname();
+				// check if this is a dir or a file
+				if ($file->isDir())
+				{
+					$keeper = false;
+					if ($this->checkArray($ignore))
+					{
+						foreach ($ignore as $keep)
+						{
+							if (strpos($file_dir, $dir.'/'.$keep) !== false)
+							{
+								$keeper = true;
+							}
+						}
+					}
+					if ($keeper)
+					{
+						continue;
+					}
+					JFolder::delete($file_dir);
+				}
+				else
+				{
+					$keeper = false;
+					if ($this->checkArray($ignore))
+					{
+						foreach ($ignore as $keep)
+						{
+							if (strpos($file_dir, $dir.'/'.$keep) !== false)
+							{
+								$keeper = true;
+							}
+						}
+					}
+					if ($keeper)
+					{
+						continue;
+					}
+					JFile::delete($file_dir);
+				}
+			}
+			// delete the root folder if not ignore found
+			if (!$this->checkArray($ignore))
+			{
+				return JFolder::delete($dir);
+			}
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Check if have an array with a length
+	 *
+	 * @input	array   The array to check
+	 *
+	 * @returns bool/int  number of items in array on success
+	 */
+	protected function checkArray($array, $removeEmptyString = false)
+	{
+		if (isset($array) && is_array($array) && ($nr = count((array)$array)) > 0)
+		{
+			// also make sure the empty strings are removed
+			if ($removeEmptyString)
+			{
+				foreach ($array as $key => $string)
+				{
+					if (empty($string))
+					{
+						unset($array[$key]);
+					}
+				}
+				return $this->checkArray($array, false);
+			}
+			return $nr;
+		}
+		return false;
 	}###MOVEFOLDERSMETHOD###
 }

admin/custom/PHPExcel/Autoloader.php

@@ -1,89 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-PHPExcel_Autoloader::Register();
-//    As we always try to run the autoloader before anything else, we can use it to do a few
-//        simple checks and initialisations
-//PHPExcel_Shared_ZipStreamWrapper::register();
-// check mbstring.func_overload
-if (ini_get('mbstring.func_overload') & 2) {
-    throw new PHPExcel_Exception('Multibyte function overloading in PHP must be disabled for string functions (2).');
-}
-PHPExcel_Shared_String::buildCharacterSets();
-
-
-/**
- * PHPExcel_Autoloader
- *
- * @category    PHPExcel
- * @package     PHPExcel
- * @copyright   Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Autoloader
-{
-    /**
-     * Register the Autoloader with SPL
-     *
-     */
-    public static function Register() {
-        if (function_exists('__autoload')) {
-            //    Register any existing autoloader function with SPL, so we don't get any clashes
-            spl_autoload_register('__autoload');
-        }
-        //    Register ourselves with SPL
-        if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
-            return spl_autoload_register(array('PHPExcel_Autoloader', 'Load'), true, true);
-        } else {
-            return spl_autoload_register(array('PHPExcel_Autoloader', 'Load'));
-        }
-    }   //    function Register()
-
-
-    /**
-     * Autoload a class identified by name
-     *
-     * @param    string    $pClassName        Name of the object to load
-     */
-    public static function Load($pClassName){
-        if ((class_exists($pClassName,FALSE)) || (strpos($pClassName, 'PHPExcel') !== 0)) {
-            //    Either already loaded, or not a PHPExcel class request
-            return FALSE;
-        }
-
-        $pClassFilePath = PHPEXCEL_ROOT .
-                          str_replace('_',DIRECTORY_SEPARATOR,$pClassName) .
-                          '.php';
-
-        if ((file_exists($pClassFilePath) === FALSE) || (is_readable($pClassFilePath) === FALSE)) {
-            //    Can't load
-            return FALSE;
-        }
-
-        require($pClassFilePath);
-    }   //    function Load()
-
-}

admin/custom/PHPExcel/CachedObjectStorage/APC.php

@@ -1,295 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_APC
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-    /**
-     * Prefix used to uniquely identify cache data for this worksheet
-     *
-     * @access    private
-     * @var string
-     */
-    private $_cachePrefix = null;
-
-    /**
-     * Cache timeout
-     *
-     * @access    private
-     * @var integer
-     */
-    private $_cacheTime = 600;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-     * @access  private
-     * @return  void
-     * @throws  PHPExcel_Exception
-     */
-    protected function _storeData() {
-        if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-            $this->_currentObject->detach();
-
-            if (!apc_store($this->_cachePrefix.$this->_currentObjectID.'.cache',serialize($this->_currentObject),$this->_cacheTime)) {
-                $this->__destruct();
-                throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in APC');
-            }
-            $this->_currentCellIsDirty = false;
-        }
-        $this->_currentObjectID = $this->_currentObject = null;
-    }    //    function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @access  public
-     * @param   string         $pCoord  Coordinate address of the cell to update
-     * @param   PHPExcel_Cell  $cell    Cell to update
-     * @return  PHPExcel_Cell
-     * @throws  PHPExcel_Exception
-     */
-    public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-        if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-            $this->_storeData();
-        }
-        $this->_cellCache[$pCoord] = true;
-
-        $this->_currentObjectID = $pCoord;
-        $this->_currentObject = $cell;
-        $this->_currentCellIsDirty = true;
-
-        return $cell;
-    }    //    function addCacheData()
-
-
-    /**
-     * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-     *
-     * @access  public
-     * @param   string  $pCoord  Coordinate address of the cell to check
-     * @throws  PHPExcel_Exception
-     * @return  boolean
-     */
-    public function isDataSet($pCoord) {
-        //    Check if the requested entry is the current object, or exists in the cache
-        if (parent::isDataSet($pCoord)) {
-            if ($this->_currentObjectID == $pCoord) {
-                return true;
-            }
-            //    Check if the requested entry still exists in apc
-            $success = apc_fetch($this->_cachePrefix.$pCoord.'.cache');
-            if ($success === FALSE) {
-                //    Entry no longer exists in APC, so clear it from the cache array
-                parent::deleteCacheData($pCoord);
-                throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in APC cache');
-            }
-            return true;
-        }
-        return false;
-    }    //    function isDataSet()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @access  public
-     * @param   string         $pCoord  Coordinate of the cell
-     * @throws  PHPExcel_Exception
-     * @return  PHPExcel_Cell  Cell that was found, or null if not found
-     */
-    public function getCacheData($pCoord) {
-        if ($pCoord === $this->_currentObjectID) {
-            return $this->_currentObject;
-        }
-        $this->_storeData();
-
-        //    Check if the entry that has been requested actually exists
-        if (parent::isDataSet($pCoord)) {
-            $obj = apc_fetch($this->_cachePrefix.$pCoord.'.cache');
-            if ($obj === FALSE) {
-                //    Entry no longer exists in APC, so clear it from the cache array
-                parent::deleteCacheData($pCoord);
-                throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in APC cache');
-            }
-        } else {
-            //    Return null if requested entry doesn't exist in cache
-            return null;
-        }
-
-        //    Set current entry to the requested entry
-        $this->_currentObjectID = $pCoord;
-        $this->_currentObject = unserialize($obj);
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-        //    Return requested entry
-        return $this->_currentObject;
-    }    //    function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @access  public
-     * @param   string  $pCoord  Coordinate address of the cell to delete
-     * @throws  PHPExcel_Exception
-     */
-    public function deleteCacheData($pCoord) {
-        //    Delete the entry from APC
-        apc_delete($this->_cachePrefix.$pCoord.'.cache');
-
-        //    Delete the entry from our cell address array
-        parent::deleteCacheData($pCoord);
-    }    //    function deleteCacheData()
-
-
-    /**
-     * Clone the cell collection
-     *
-     * @access  public
-     * @param   PHPExcel_Worksheet  $parent  The new worksheet
-     * @throws  PHPExcel_Exception
-     * @return  void
-     */
-    public function copyCellCollection(PHPExcel_Worksheet $parent) {
-        parent::copyCellCollection($parent);
-        //    Get a new id for the new file name
-        $baseUnique = $this->_getUniqueID();
-        $newCachePrefix = substr(md5($baseUnique),0,8).'.';
-        $cacheList = $this->getCellList();
-        foreach($cacheList as $cellID) {
-            if ($cellID != $this->_currentObjectID) {
-                $obj = apc_fetch($this->_cachePrefix.$cellID.'.cache');
-                if ($obj === FALSE) {
-                    //    Entry no longer exists in APC, so clear it from the cache array
-                    parent::deleteCacheData($cellID);
-                    throw new PHPExcel_Exception('Cell entry '.$cellID.' no longer exists in APC');
-                }
-                if (!apc_store($newCachePrefix.$cellID.'.cache',$obj,$this->_cacheTime)) {
-                    $this->__destruct();
-                    throw new PHPExcel_Exception('Failed to store cell '.$cellID.' in APC');
-                }
-            }
-        }
-        $this->_cachePrefix = $newCachePrefix;
-    }    //    function copyCellCollection()
-
-
-    /**
-     * Clear the cell collection and disconnect from our parent
-     *
-     * @return  void
-     */
-    public function unsetWorksheetCells() {
-        if ($this->_currentObject !== NULL) {
-            $this->_currentObject->detach();
-            $this->_currentObject = $this->_currentObjectID = null;
-        }
-
-        //    Flush the APC cache
-        $this->__destruct();
-
-        $this->_cellCache = array();
-
-        //    detach ourself from the worksheet, so that it can then delete this object successfully
-        $this->_parent = null;
-    }    //    function unsetWorksheetCells()
-
-
-    /**
-     * Initialise this new cell collection
-     *
-     * @param  PHPExcel_Worksheet  $parent     The worksheet for this cell collection
-     * @param  array of mixed      $arguments  Additional initialisation arguments
-     */
-    public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-        $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600;
-
-        if ($this->_cachePrefix === NULL) {
-            $baseUnique = $this->_getUniqueID();
-            $this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
-            $this->_cacheTime = $cacheTime;
-
-            parent::__construct($parent);
-        }
-    }    //    function __construct()
-
-
-    /**
-     * Destroy this cell collection
-     */
-    public function __destruct() {
-        $cacheList = $this->getCellList();
-        foreach($cacheList as $cellID) {
-            apc_delete($this->_cachePrefix.$cellID.'.cache');
-        }
-    }    //    function __destruct()
-
-
-    /**
-     * Identify whether the caching method is currently available
-     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-     *
-     * @return  boolean
-     */
-    public static function cacheMethodIsAvailable() {
-        if (!function_exists('apc_store')) {
-            return FALSE;
-        }
-        if (apc_sma_info() === FALSE) {
-            return FALSE;
-        }
-
-        return TRUE;
-    }
-
-}

admin/custom/PHPExcel/CachedObjectStorage/CacheBase.php

@@ -1,347 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_CacheBase
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-abstract class PHPExcel_CachedObjectStorage_CacheBase {
-
-	/**
-	 * Parent worksheet
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	protected $_parent;
-
-	/**
-	 * The currently active Cell
-	 *
-	 * @var PHPExcel_Cell
-	 */
-	protected $_currentObject = null;
-
-	/**
-	 * Coordinate address of the currently active Cell
-	 *
-	 * @var string
-	 */
-	protected $_currentObjectID = null;
-
-
-	/**
-	 * Flag indicating whether the currently active Cell requires saving
-	 *
-	 * @var boolean
-	 */
-	protected $_currentCellIsDirty = true;
-
-	/**
-	 * An array of cells or cell pointers for the worksheet cells held in this cache,
-	 *		and indexed by their coordinate address within the worksheet
-	 *
-	 * @var array of mixed
-	 */
-	protected $_cellCache = array();
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 */
-	public function __construct(PHPExcel_Worksheet $parent) {
-		//	Set our parent worksheet.
-		//	This is maintained within the cache controller to facilitate re-attaching it to PHPExcel_Cell objects when
-		//		they are woken from a serialized state
-		$this->_parent = $parent;
-	}	//	function __construct()
-
-
-	/**
-	 * Return the parent worksheet for this cell collection
-	 *
-	 * @return	PHPExcel_Worksheet
-	 */
-	public function getParent()
-	{
-		return $this->_parent;
-	}
-
-	/**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return true;
-		}
-		//	Check if the requested entry exists in the cache
-		return isset($this->_cellCache[$pCoord]);
-	}	//	function isDataSet()
-
-
-	/**
-	 * Move a cell object from one address to another
-	 *
-	 * @param	string		$fromAddress	Current address of the cell to move
-	 * @param	string		$toAddress		Destination address of the cell to move
-	 * @return	boolean
-	 */
-	public function moveCell($fromAddress, $toAddress) {
-		if ($fromAddress === $this->_currentObjectID) {
-			$this->_currentObjectID = $toAddress;
-		}
-		$this->_currentCellIsDirty = true;
-		if (isset($this->_cellCache[$fromAddress])) {
-			$this->_cellCache[$toAddress] = &$this->_cellCache[$fromAddress];
-			unset($this->_cellCache[$fromAddress]);
-		}
-
-		return TRUE;
-	}	//	function moveCell()
-
-
-    /**
-     * Add or Update a cell in cache
-     *
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function updateCacheData(PHPExcel_Cell $cell) {
-		return $this->addCacheData($cell->getCoordinate(),$cell);
-	}	//	function updateCacheData()
-
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	PHPExcel_Exception
-     */
-	public function deleteCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			$this->_currentObject->detach();
-			$this->_currentObjectID = $this->_currentObject = null;
-		}
-
-		if (is_object($this->_cellCache[$pCoord])) {
-			$this->_cellCache[$pCoord]->detach();
-			unset($this->_cellCache[$pCoord]);
-		}
-		$this->_currentCellIsDirty = false;
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return	string[]
-	 */
-	public function getCellList() {
-		return array_keys($this->_cellCache);
-	}	//	function getCellList()
-
-
-	/**
-	 * Sort the list of all cell addresses currently held in cache by row and column
-	 *
-	 * @return	string[]
-	 */
-	public function getSortedCellList() {
-		$sortKeys = array();
-		foreach ($this->getCellList() as $coord) {
-			sscanf($coord,'%[A-Z]%d', $column, $row);
-			$sortKeys[sprintf('%09d%3s',$row,$column)] = $coord;
-		}
-		ksort($sortKeys);
-
-		return array_values($sortKeys);
-	}	//	function sortCellList()
-
-
-
-	/**
-	 * Get highest worksheet column and highest row that have cell records
-	 *
-	 * @return array Highest column name and highest row number
-	 */
-	public function getHighestRowAndColumn()
-	{
-		// Lookup highest column and highest row
-		$col = array('A' => '1A');
-		$row = array(1);
-		foreach ($this->getCellList() as $coord) {
-			sscanf($coord,'%[A-Z]%d', $c, $r);
-			$row[$r] = $r;
-			$col[$c] = strlen($c).$c;
-		}
-		if (!empty($row)) {
-			// Determine highest column and row
-			$highestRow = max($row);
-			$highestColumn = substr(max($col),1);
-		}
-
-		return array( 'row'	   => $highestRow,
-					  'column' => $highestColumn
-					);
-	}
-
-
-	/**
-	 * Return the cell address of the currently active cell object
-	 *
-	 * @return	string
-	 */
-	public function getCurrentAddress()
-	{
-		return $this->_currentObjectID;
-	}
-
-	/**
-	 * Return the column address of the currently active cell object
-	 *
-	 * @return	string
-	 */
-	public function getCurrentColumn()
-	{
-		sscanf($this->_currentObjectID, '%[A-Z]%d', $column, $row);
-		return $column;
-	}
-
-	/**
-	 * Return the row address of the currently active cell object
-	 *
-	 * @return	integer
-	 */
-	public function getCurrentRow()
-	{
-		sscanf($this->_currentObjectID, '%[A-Z]%d', $column, $row);
-		return (integer) $row;
-	}
-
-	/**
-	 * Get highest worksheet column
-	 *
-     * @param   string     $row        Return the highest column for the specified row,
-     *                                     or the highest column of any row if no row number is passed
-	 * @return  string     Highest column name
-	 */
-	public function getHighestColumn($row = null)
-	{
-        if ($row == null) {
-    		$colRow = $this->getHighestRowAndColumn();
-	    	return $colRow['column'];
-        }
-
-        $columnList = array(1);
-        foreach ($this->getCellList() as $coord) {
-            sscanf($coord,'%[A-Z]%d', $c, $r);
-            if ($r != $row) {
-                continue;
-            }
-            $columnList[] = PHPExcel_Cell::columnIndexFromString($c);
-        }
-        return PHPExcel_Cell::stringFromColumnIndex(max($columnList) - 1);
-    }
-
-	/**
-	 * Get highest worksheet row
-	 *
-     * @param   string     $column     Return the highest row for the specified column,
-     *                                     or the highest row of any column if no column letter is passed
-	 * @return  int        Highest row number
-	 */
-	public function getHighestRow($column = null)
-	{
-        if ($column == null) {
-	    	$colRow = $this->getHighestRowAndColumn();
-    		return $colRow['row'];
-        }
-
-        $rowList = array(0);
-        foreach ($this->getCellList() as $coord) {
-            sscanf($coord,'%[A-Z]%d', $c, $r);
-            if ($c != $column) {
-                continue;
-            }
-            $rowList[] = $r;
-        }
-
-        return max($rowList);
-	}
-
-
-	/**
-	 * Generate a unique ID for cache referencing
-	 *
-	 * @return string Unique Reference
-	 */
-	protected function _getUniqueID() {
-		if (function_exists('posix_getpid')) {
-			$baseUnique = posix_getpid();
-		} else {
-			$baseUnique = mt_rand();
-		}
-		return uniqid($baseUnique,true);
-	}
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		$this->_currentCellIsDirty;
-        $this->_storeData();
-
-		$this->_parent = $parent;
-		if (($this->_currentObject !== NULL) && (is_object($this->_currentObject))) {
-			$this->_currentObject->attach($this);
-		}
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		return true;
-	}
-
-}

admin/custom/PHPExcel/CachedObjectStorage/DiscISAM.php

@@ -1,219 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_DiscISAM
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Name of the file for this cache
-	 *
-	 * @var string
-	 */
-	private $_fileName = NULL;
-
-	/**
-	 * File handle for this cache file
-	 *
-	 * @var resource
-	 */
-	private $_fileHandle = NULL;
-
-	/**
-	 * Directory/Folder where the cache file is located
-	 *
-	 * @var string
-	 */
-	private $_cacheDirectory = NULL;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			fseek($this->_fileHandle,0,SEEK_END);
-
-			$this->_cellCache[$this->_currentObjectID] = array(
-                'ptr' => ftell($this->_fileHandle),
-				'sz'  => fwrite($this->_fileHandle, serialize($this->_currentObject))
-			);
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		fseek($this->_fileHandle, $this->_cellCache[$pCoord]['ptr']);
-		$this->_currentObject = unserialize(fread($this->_fileHandle, $this->_cellCache[$pCoord]['sz']));
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-		//	Get a new id for the new file name
-		$baseUnique = $this->_getUniqueID();
-		$newFileName = $this->_cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
-		//	Copy the existing cell cache file
-		copy ($this->_fileName,$newFileName);
-		$this->_fileName = $newFileName;
-		//	Open the copied cell cache file
-		$this->_fileHandle = fopen($this->_fileName,'a+');
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-
-		//	Close down the temporary cache file
-		$this->__destruct();
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 * @param	array of mixed		$arguments	Additional initialisation arguments
-	 */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$this->_cacheDirectory	= ((isset($arguments['dir'])) && ($arguments['dir'] !== NULL))
-									? $arguments['dir']
-									: PHPExcel_Shared_File::sys_get_temp_dir();
-
-		parent::__construct($parent);
-		if (is_null($this->_fileHandle)) {
-			$baseUnique = $this->_getUniqueID();
-			$this->_fileName = $this->_cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
-			$this->_fileHandle = fopen($this->_fileName,'a+');
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		if (!is_null($this->_fileHandle)) {
-			fclose($this->_fileHandle);
-			unlink($this->_fileName);
-		}
-		$this->_fileHandle = null;
-	}	//	function __destruct()
-
-}

admin/custom/PHPExcel/CachedObjectStorage/ICache.php

@@ -1,112 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_ICache
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_CachedObjectStorage_ICache
-{
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell);
-
-    /**
-     * Add or Update a cell in cache
-     *
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function updateCacheData(PHPExcel_Cell $cell);
-
-    /**
-     * Fetch a cell from cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to retrieve
-     * @return PHPExcel_Cell 	Cell that was found, or null if not found
-     * @throws	PHPExcel_Exception
-     */
-	public function getCacheData($pCoord);
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	PHPExcel_Exception
-     */
-	public function deleteCacheData($pCoord);
-
-	/**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord);
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return	string[]
-	 */
-	public function getCellList();
-
-	/**
-	 * Get the list of all cell addresses currently held in cache sorted by column and row
-	 *
-	 * @return	string[]
-	 */
-	public function getSortedCellList();
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent);
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable();
-
-}

admin/custom/PHPExcel/CachedObjectStorage/Igbinary.php

@@ -1,152 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Igbinary
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			$this->_cellCache[$this->_currentObjectID] = igbinary_serialize($this->_currentObject);
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = igbinary_unserialize($this->_cellCache[$pCoord]);
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('igbinary_serialize')) {
-			return false;
-		}
-
-		return true;
-	}
-
-}

admin/custom/PHPExcel/CachedObjectStorage/Memcache.php

@@ -1,312 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Memcache
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Prefix used to uniquely identify cache data for this worksheet
-	 *
-	 * @var string
-	 */
-	private $_cachePrefix = null;
-
-	/**
-	 * Cache timeout
-	 *
-	 * @var integer
-	 */
-	private $_cacheTime = 600;
-
-	/**
-	 * Memcache interface
-	 *
-	 * @var resource
-	 */
-	private $_memcache = null;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			$obj = serialize($this->_currentObject);
-			if (!$this->_memcache->replace($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
-				if (!$this->_memcache->add($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
-					$this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in MemCache');
-				}
-			}
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-		$this->_cellCache[$pCoord] = true;
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-	/**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		//	Check if the requested entry is the current object, or exists in the cache
-		if (parent::isDataSet($pCoord)) {
-			if ($this->_currentObjectID == $pCoord) {
-				return true;
-			}
-			//	Check if the requested entry still exists in Memcache
-			$success = $this->_memcache->get($this->_cachePrefix.$pCoord.'.cache');
-			if ($success === false) {
-				//	Entry no longer exists in Memcache, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
-			}
-			return true;
-		}
-		return false;
-	}	//	function isDataSet()
-
-
-	/**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (parent::isDataSet($pCoord)) {
-			$obj = $this->_memcache->get($this->_cachePrefix.$pCoord.'.cache');
-			if ($obj === false) {
-				//	Entry no longer exists in Memcache, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
-			}
-		} else {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($obj);
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	PHPExcel_Exception
-     */
-	public function deleteCacheData($pCoord) {
-		//	Delete the entry from Memcache
-		$this->_memcache->delete($this->_cachePrefix.$pCoord.'.cache');
-
-		//	Delete the entry from our cell address array
-		parent::deleteCacheData($pCoord);
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-		//	Get a new id for the new file name
-		$baseUnique = $this->_getUniqueID();
-		$newCachePrefix = substr(md5($baseUnique),0,8).'.';
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			if ($cellID != $this->_currentObjectID) {
-				$obj = $this->_memcache->get($this->_cachePrefix.$cellID.'.cache');
-				if ($obj === false) {
-					//	Entry no longer exists in Memcache, so clear it from the cache array
-					parent::deleteCacheData($cellID);
-					throw new PHPExcel_Exception('Cell entry '.$cellID.' no longer exists in MemCache');
-				}
-				if (!$this->_memcache->add($newCachePrefix.$cellID.'.cache',$obj,NULL,$this->_cacheTime)) {
-					$this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$cellID.' in MemCache');
-				}
-			}
-		}
-		$this->_cachePrefix = $newCachePrefix;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-
-		//	Flush the Memcache cache
-		$this->__destruct();
-
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 * @param	array of mixed		$arguments	Additional initialisation arguments
-	 */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$memcacheServer	= (isset($arguments['memcacheServer']))	? $arguments['memcacheServer']	: 'localhost';
-		$memcachePort	= (isset($arguments['memcachePort']))	? $arguments['memcachePort']	: 11211;
-		$cacheTime		= (isset($arguments['cacheTime']))		? $arguments['cacheTime']		: 600;
-
-		if (is_null($this->_cachePrefix)) {
-			$baseUnique = $this->_getUniqueID();
-			$this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
-
-			//	Set a new Memcache object and connect to the Memcache server
-			$this->_memcache = new Memcache();
-			if (!$this->_memcache->addServer($memcacheServer, $memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback'))) {
-				throw new PHPExcel_Exception('Could not connect to MemCache server at '.$memcacheServer.':'.$memcachePort);
-			}
-			$this->_cacheTime = $cacheTime;
-
-			parent::__construct($parent);
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Memcache error handler
-	 *
-	 * @param	string	$host		Memcache server
-	 * @param	integer	$port		Memcache port
-     * @throws	PHPExcel_Exception
-	 */
-	public function failureCallback($host, $port) {
-		throw new PHPExcel_Exception('memcache '.$host.':'.$port.' failed');
-	}
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			$this->_memcache->delete($this->_cachePrefix.$cellID.'.cache');
-		}
-	}	//	function __destruct()
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('memcache_add')) {
-			return false;
-		}
-
-		return true;
-	}
-
-}

admin/custom/PHPExcel/CachedObjectStorage/Memory.php

@@ -1,125 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Memory
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-    /**
-     * Dummy method callable from CacheBase, but unused by Memory cache
-     *
-	 * @return	void
-     */
-	protected function _storeData() {
-	}	//	function _storeData()
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		$this->_cellCache[$pCoord] = $cell;
-
-		//	Set current entry to the new/updated entry
-		$this->_currentObjectID = $pCoord;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			$this->_currentObjectID = NULL;
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-
-		//	Return requested entry
-		return $this->_cellCache[$pCoord];
-	}	//	function getCacheData()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-
-		$newCollection = array();
-		foreach($this->_cellCache as $k => &$cell) {
-			$newCollection[$k] = clone $cell;
-			$newCollection[$k]->attach($this);
-		}
-
-		$this->_cellCache = $newCollection;
-	}
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		//	Because cells are all stored as intact objects in memory, we need to detach each one from the parent
-		foreach($this->_cellCache as $k => &$cell) {
-			$cell->detach();
-			$this->_cellCache[$k] = null;
-		}
-		unset($cell);
-
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-}

admin/custom/PHPExcel/CachedObjectStorage/MemoryGZip.php

@@ -1,137 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_MemoryGZip
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			$this->_cellCache[$this->_currentObjectID] = gzdeflate(serialize($this->_currentObject));
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize(gzinflate($this->_cellCache[$pCoord]));
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-}

admin/custom/PHPExcel/CachedObjectStorage/MemorySerialized.php

@@ -1,137 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_MemorySerialized
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			$this->_cellCache[$this->_currentObjectID] = serialize($this->_currentObject);
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($this->_cellCache[$pCoord]);
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-}

admin/custom/PHPExcel/CachedObjectStorage/PHPTemp.php

@@ -1,206 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_PHPTemp
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Name of the file for this cache
-	 *
-	 * @var string
-	 */
-	private $_fileHandle = null;
-
-	/**
-	 * Memory limit to use before reverting to file cache
-	 *
-	 * @var integer
-	 */
-	private $_memoryCacheSize = null;
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			fseek($this->_fileHandle,0,SEEK_END);
-
-			$this->_cellCache[$this->_currentObjectID] = array(
-                'ptr' => ftell($this->_fileHandle),
-				'sz'  => fwrite($this->_fileHandle, serialize($this->_currentObject))
-			);
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		fseek($this->_fileHandle,$this->_cellCache[$pCoord]['ptr']);
-		$this->_currentObject = unserialize(fread($this->_fileHandle,$this->_cellCache[$pCoord]['sz']));
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-		//	Open a new stream for the cell cache data
-		$newFileHandle = fopen('php://temp/maxmemory:'.$this->_memoryCacheSize,'a+');
-		//	Copy the existing cell cache data to the new stream
-		fseek($this->_fileHandle,0);
-		while (!feof($this->_fileHandle)) {
-			fwrite($newFileHandle,fread($this->_fileHandle, 1024));
-		}
-		$this->_fileHandle = $newFileHandle;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-
-		//	Close down the php://temp file
-		$this->__destruct();
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 * @param	array of mixed		$arguments	Additional initialisation arguments
-	 */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$this->_memoryCacheSize	= (isset($arguments['memoryCacheSize']))	? $arguments['memoryCacheSize']	: '1MB';
-
-		parent::__construct($parent);
-		if (is_null($this->_fileHandle)) {
-			$this->_fileHandle = fopen('php://temp/maxmemory:'.$this->_memoryCacheSize,'a+');
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		if (!is_null($this->_fileHandle)) {
-			fclose($this->_fileHandle);
-		}
-		$this->_fileHandle = null;
-	}	//	function __destruct()
-
-}

admin/custom/PHPExcel/CachedObjectStorage/SQLite.php

@@ -1,306 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_SQLite
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Database table name
-	 *
-	 * @var string
-	 */
-	private $_TableName = null;
-
-	/**
-	 * Database handle
-	 *
-	 * @var resource
-	 */
-	private $_DBHandle = null;
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			if (!$this->_DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES('".$this->_currentObjectID."','".sqlite_escape_string(serialize($this->_currentObject))."')"))
-				throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		$query = "SELECT value FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
-		if ($cellResultSet === false) {
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-		} elseif ($cellResultSet->numRows() == 0) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-
-		$cellResult = $cellResultSet->fetchSingle();
-		$this->_currentObject = unserialize($cellResult);
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Is a value set for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return true;
-		}
-
-		//	Check if the requested entry exists in the cache
-		$query = "SELECT id FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
-		if ($cellResultSet === false) {
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-		} elseif ($cellResultSet->numRows() == 0) {
-			//	Return null if requested entry doesn't exist in cache
-			return false;
-		}
-		return true;
-	}	//	function isDataSet()
-
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	PHPExcel_Exception
-     */
-	public function deleteCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			$this->_currentObject->detach();
-			$this->_currentObjectID = $this->_currentObject = null;
-		}
-
-		//	Check if the requested entry exists in the cache
-		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		if (!$this->_DBHandle->queryExec($query))
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-
-		$this->_currentCellIsDirty = false;
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Move a cell object from one address to another
-	 *
-	 * @param	string		$fromAddress	Current address of the cell to move
-	 * @param	string		$toAddress		Destination address of the cell to move
-	 * @return	boolean
-	 */
-	public function moveCell($fromAddress, $toAddress) {
-		if ($fromAddress === $this->_currentObjectID) {
-			$this->_currentObjectID = $toAddress;
-		}
-
-		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$toAddress."'";
-		$result = $this->_DBHandle->exec($query);
-		if ($result === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		$query = "UPDATE kvp_".$this->_TableName." SET id='".$toAddress."' WHERE id='".$fromAddress."'";
-		$result = $this->_DBHandle->exec($query);
-		if ($result === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		return TRUE;
-	}	//	function moveCell()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return	string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		$query = "SELECT id FROM kvp_".$this->_TableName;
-		$cellIdsResult = $this->_DBHandle->unbufferedQuery($query,SQLITE_ASSOC);
-		if ($cellIdsResult === false)
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-
-		$cellKeys = array();
-		foreach($cellIdsResult as $row) {
-			$cellKeys[] = $row['id'];
-		}
-
-		return $cellKeys;
-	}	//	function getCellList()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		$this->_currentCellIsDirty;
-        $this->_storeData();
-
-		//	Get a new id for the new table name
-		$tableName = str_replace('.','_',$this->_getUniqueID());
-		if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
-													AS SELECT * FROM kvp_'.$this->_TableName))
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-
-		//	Copy the existing cell cache file
-		$this->_TableName = $tableName;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-
-		//	Close down the temporary cache file
-		$this->__destruct();
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 */
-	public function __construct(PHPExcel_Worksheet $parent) {
-		parent::__construct($parent);
-		if (is_null($this->_DBHandle)) {
-			$this->_TableName = str_replace('.','_',$this->_getUniqueID());
-			$_DBName = ':memory:';
-
-			$this->_DBHandle = new SQLiteDatabase($_DBName);
-			if ($this->_DBHandle === false)
-				throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-			if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
-				throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		if (!is_null($this->_DBHandle)) {
-			$this->_DBHandle->queryExec('DROP TABLE kvp_'.$this->_TableName);
-		}
-		$this->_DBHandle = null;
-	}	//	function __destruct()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('sqlite_open')) {
-			return false;
-		}
-
-		return true;
-	}
-
-}

admin/custom/PHPExcel/CachedObjectStorage/SQLite3.php

@@ -1,345 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_SQLite3
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Database table name
-	 *
-	 * @var string
-	 */
-	private $_TableName = null;
-
-	/**
-	 * Database handle
-	 *
-	 * @var resource
-	 */
-	private $_DBHandle = null;
-
-	/**
-	 * Prepared statement for a SQLite3 select query
-	 *
-	 * @var SQLite3Stmt
-	 */
-	private $_selectQuery;
-
-	/**
-	 * Prepared statement for a SQLite3 insert query
-	 *
-	 * @var SQLite3Stmt
-	 */
-	private $_insertQuery;
-
-	/**
-	 * Prepared statement for a SQLite3 update query
-	 *
-	 * @var SQLite3Stmt
-	 */
-	private $_updateQuery;
-
-	/**
-	 * Prepared statement for a SQLite3 delete query
-	 *
-	 * @var SQLite3Stmt
-	 */
-	private $_deleteQuery;
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			$this->_insertQuery->bindValue('id',$this->_currentObjectID,SQLITE3_TEXT);
-			$this->_insertQuery->bindValue('data',serialize($this->_currentObject),SQLITE3_BLOB);
-			$result = $this->_insertQuery->execute();
-			if ($result === false)
-				throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		$this->_selectQuery->bindValue('id',$pCoord,SQLITE3_TEXT);
-		$cellResult = $this->_selectQuery->execute();
-		if ($cellResult === FALSE) {
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-		}
-		$cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
-		if ($cellData === FALSE) {
-			//	Return null if requested entry doesn't exist in cache
-			return NULL;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-
-		$this->_currentObject = unserialize($cellData['value']);
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 *	Is a value set for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return TRUE;
-		}
-
-		//	Check if the requested entry exists in the cache
-		$this->_selectQuery->bindValue('id',$pCoord,SQLITE3_TEXT);
-		$cellResult = $this->_selectQuery->execute();
-		if ($cellResult === FALSE) {
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-		}
-		$cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
-
-		return ($cellData === FALSE) ? FALSE : TRUE;
-	}	//	function isDataSet()
-
-
-    /**
-     *	Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	PHPExcel_Exception
-     */
-	public function deleteCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			$this->_currentObject->detach();
-			$this->_currentObjectID = $this->_currentObject = NULL;
-		}
-
-		//	Check if the requested entry exists in the cache
-		$this->_deleteQuery->bindValue('id',$pCoord,SQLITE3_TEXT);
-		$result = $this->_deleteQuery->execute();
-		if ($result === FALSE)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		$this->_currentCellIsDirty = FALSE;
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Move a cell object from one address to another
-	 *
-	 * @param	string		$fromAddress	Current address of the cell to move
-	 * @param	string		$toAddress		Destination address of the cell to move
-	 * @return	boolean
-	 */
-	public function moveCell($fromAddress, $toAddress) {
-		if ($fromAddress === $this->_currentObjectID) {
-			$this->_currentObjectID = $toAddress;
-		}
-
-		$this->_deleteQuery->bindValue('id',$toAddress,SQLITE3_TEXT);
-		$result = $this->_deleteQuery->execute();
-		if ($result === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		$this->_updateQuery->bindValue('toid',$toAddress,SQLITE3_TEXT);
-		$this->_updateQuery->bindValue('fromid',$fromAddress,SQLITE3_TEXT);
-		$result = $this->_updateQuery->execute();
-		if ($result === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		return TRUE;
-	}	//	function moveCell()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return	string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		$query = "SELECT id FROM kvp_".$this->_TableName;
-		$cellIdsResult = $this->_DBHandle->query($query);
-		if ($cellIdsResult === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		$cellKeys = array();
-		while ($row = $cellIdsResult->fetchArray(SQLITE3_ASSOC)) {
-			$cellKeys[] = $row['id'];
-		}
-
-		return $cellKeys;
-	}	//	function getCellList()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		$this->_currentCellIsDirty;
-        $this->_storeData();
-
-		//	Get a new id for the new table name
-		$tableName = str_replace('.','_',$this->_getUniqueID());
-		if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
-		                                       AS SELECT * FROM kvp_'.$this->_TableName))
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		//	Copy the existing cell cache file
-		$this->_TableName = $tableName;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-
-		//	Close down the temporary cache file
-		$this->__destruct();
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 */
-	public function __construct(PHPExcel_Worksheet $parent) {
-		parent::__construct($parent);
-		if (is_null($this->_DBHandle)) {
-			$this->_TableName = str_replace('.','_',$this->_getUniqueID());
-			$_DBName = ':memory:';
-
-			$this->_DBHandle = new SQLite3($_DBName);
-			if ($this->_DBHandle === false)
-				throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-			if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
-				throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-		}
-
-		$this->_selectQuery = $this->_DBHandle->prepare("SELECT value FROM kvp_".$this->_TableName." WHERE id = :id");
-		$this->_insertQuery = $this->_DBHandle->prepare("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES(:id,:data)");
-		$this->_updateQuery = $this->_DBHandle->prepare("UPDATE kvp_".$this->_TableName." SET id=:toId WHERE id=:fromId");
-		$this->_deleteQuery = $this->_DBHandle->prepare("DELETE FROM kvp_".$this->_TableName." WHERE id = :id");
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		if (!is_null($this->_DBHandle)) {
-			$this->_DBHandle->exec('DROP TABLE kvp_'.$this->_TableName);
-			$this->_DBHandle->close();
-		}
-		$this->_DBHandle = null;
-	}	//	function __destruct()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!class_exists('SQLite3',FALSE)) {
-			return false;
-		}
-
-		return true;
-	}
-
-}

admin/custom/PHPExcel/CachedObjectStorage/Wincache.php

@@ -1,294 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Wincache
- *
- * @category   PHPExcel
- * @package	PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Prefix used to uniquely identify cache data for this worksheet
-	 *
-	 * @var string
-	 */
-	private $_cachePrefix = null;
-
-	/**
-	 * Cache timeout
-	 *
-	 * @var integer
-	 */
-	private $_cacheTime = 600;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			$obj = serialize($this->_currentObject);
-			if (wincache_ucache_exists($this->_cachePrefix.$this->_currentObjectID.'.cache')) {
-				if (!wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
-					$this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache');
-				}
-			} else {
-				if (!wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
-					$this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache');
-				}
-			}
-			$this->_currentCellIsDirty = false;
-		}
-
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-	/**
-	 * Add or Update a cell in cache identified by coordinate address
-	 *
-	 * @param	string			$pCoord		Coordinate address of the cell to update
-	 * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-	 * @throws	PHPExcel_Exception
-	 */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-		$this->_cellCache[$pCoord] = true;
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-	/**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		//	Check if the requested entry is the current object, or exists in the cache
-		if (parent::isDataSet($pCoord)) {
-			if ($this->_currentObjectID == $pCoord) {
-				return true;
-			}
-			//	Check if the requested entry still exists in cache
-			$success = wincache_ucache_exists($this->_cachePrefix.$pCoord.'.cache');
-			if ($success === false) {
-				//	Entry no longer exists in Wincache, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
-			}
-			return true;
-		}
-		return false;
-	}	//	function isDataSet()
-
-
-	/**
-	 * Get cell at a specific coordinate
-	 *
-	 * @param	string			$pCoord		Coordinate of the cell
-	 * @throws	PHPExcel_Exception
-	 * @return	PHPExcel_Cell	Cell that was found, or null if not found
-	 */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		$obj = null;
-		if (parent::isDataSet($pCoord)) {
-			$success = false;
-			$obj = wincache_ucache_get($this->_cachePrefix.$pCoord.'.cache', $success);
-			if ($success === false) {
-				//	Entry no longer exists in WinCache, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
-			}
-		} else {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($obj);
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-	/**
-	 * Delete a cell in cache identified by coordinate address
-	 *
-	 * @param	string			$pCoord		Coordinate address of the cell to delete
-	 * @throws	PHPExcel_Exception
-	 */
-	public function deleteCacheData($pCoord) {
-		//	Delete the entry from Wincache
-		wincache_ucache_delete($this->_cachePrefix.$pCoord.'.cache');
-
-		//	Delete the entry from our cell address array
-		parent::deleteCacheData($pCoord);
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-		//	Get a new id for the new file name
-		$baseUnique = $this->_getUniqueID();
-		$newCachePrefix = substr(md5($baseUnique),0,8).'.';
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			if ($cellID != $this->_currentObjectID) {
-				$success = false;
-				$obj = wincache_ucache_get($this->_cachePrefix.$cellID.'.cache', $success);
-				if ($success === false) {
-					//	Entry no longer exists in WinCache, so clear it from the cache array
-					parent::deleteCacheData($cellID);
-					throw new PHPExcel_Exception('Cell entry '.$cellID.' no longer exists in Wincache');
-				}
-				if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->_cacheTime)) {
-					$this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$cellID.' in Wincache');
-				}
-			}
-		}
-		$this->_cachePrefix = $newCachePrefix;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-
-		//	Flush the WinCache cache
-		$this->__destruct();
-
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 * @param	array of mixed		$arguments	Additional initialisation arguments
-	 */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$cacheTime	= (isset($arguments['cacheTime']))	? $arguments['cacheTime']	: 600;
-
-		if (is_null($this->_cachePrefix)) {
-			$baseUnique = $this->_getUniqueID();
-			$this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
-			$this->_cacheTime = $cacheTime;
-
-			parent::__construct($parent);
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			wincache_ucache_delete($this->_cachePrefix.$cellID.'.cache');
-		}
-	}	//	function __destruct()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('wincache_ucache_add')) {
-			return false;
-		}
-
-		return true;
-	}
-
-}

admin/custom/PHPExcel/CachedObjectStorageFactory.php

@@ -1,251 +0,0 @@
-<?php
-
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorageFactory
- *
- * @category    PHPExcel
- * @package        PHPExcel_CachedObjectStorage
- * @copyright    Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorageFactory
-{
-    const cache_in_memory               = 'Memory';
-    const cache_in_memory_gzip          = 'MemoryGZip';
-    const cache_in_memory_serialized    = 'MemorySerialized';
-    const cache_igbinary                = 'Igbinary';
-    const cache_to_discISAM             = 'DiscISAM';
-    const cache_to_apc                  = 'APC';
-    const cache_to_memcache             = 'Memcache';
-    const cache_to_phpTemp              = 'PHPTemp';
-    const cache_to_wincache             = 'Wincache';
-    const cache_to_sqlite               = 'SQLite';
-    const cache_to_sqlite3              = 'SQLite3';
-
-
-    /**
-     * Name of the method used for cell cacheing
-     *
-     * @var string
-     */
-    private static $_cacheStorageMethod = NULL;
-
-    /**
-     * Name of the class used for cell cacheing
-     *
-     * @var string
-     */
-    private static $_cacheStorageClass = NULL;
-
-
-    /**
-     * List of all possible cache storage methods
-     *
-     * @var string[]
-     */
-    private static $_storageMethods = array(
-        self::cache_in_memory,
-        self::cache_in_memory_gzip,
-        self::cache_in_memory_serialized,
-        self::cache_igbinary,
-        self::cache_to_phpTemp,
-        self::cache_to_discISAM,
-        self::cache_to_apc,
-        self::cache_to_memcache,
-        self::cache_to_wincache,
-        self::cache_to_sqlite,
-        self::cache_to_sqlite3,
-    );
-
-
-    /**
-     * Default arguments for each cache storage method
-     *
-     * @var array of mixed array
-     */
-    private static $_storageMethodDefaultParameters = array(
-        self::cache_in_memory               => array(
-                                                    ),
-        self::cache_in_memory_gzip          => array(
-                                                    ),
-        self::cache_in_memory_serialized    => array(
-                                                    ),
-        self::cache_igbinary                => array(
-                                                    ),
-        self::cache_to_phpTemp              => array( 'memoryCacheSize' => '1MB'
-                                                    ),
-        self::cache_to_discISAM             => array( 'dir'             => NULL
-                                                    ),
-        self::cache_to_apc                  => array( 'cacheTime'       => 600
-                                                    ),
-        self::cache_to_memcache             => array( 'memcacheServer'  => 'localhost',
-                                                      'memcachePort'    => 11211,
-                                                      'cacheTime'       => 600
-                                                    ),
-        self::cache_to_wincache             => array( 'cacheTime'       => 600
-                                                    ),
-        self::cache_to_sqlite               => array(
-                                                    ),
-        self::cache_to_sqlite3              => array(
-                                                    ),
-    );
-
-
-    /**
-     * Arguments for the active cache storage method
-     *
-     * @var array of mixed array
-     */
-    private static $_storageMethodParameters = array();
-
-
-    /**
-     * Return the current cache storage method
-     *
-     * @return string|NULL
-     **/
-    public static function getCacheStorageMethod()
-    {
-        return self::$_cacheStorageMethod;
-    }   //    function getCacheStorageMethod()
-
-
-    /**
-     * Return the current cache storage class
-     *
-     * @return PHPExcel_CachedObjectStorage_ICache|NULL
-     **/
-    public static function getCacheStorageClass()
-    {
-        return self::$_cacheStorageClass;
-    }   //    function getCacheStorageClass()
-
-
-    /**
-     * Return the list of all possible cache storage methods
-     *
-     * @return string[]
-     **/
-    public static function getAllCacheStorageMethods()
-    {
-        return self::$_storageMethods;
-    }   //    function getCacheStorageMethods()
-
-
-    /**
-     * Return the list of all available cache storage methods
-     *
-     * @return string[]
-     **/
-    public static function getCacheStorageMethods()
-    {
-        $activeMethods = array();
-        foreach(self::$_storageMethods as $storageMethod) {
-            $cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $storageMethod;
-            if (call_user_func(array($cacheStorageClass, 'cacheMethodIsAvailable'))) {
-                $activeMethods[] = $storageMethod;
-            }
-        }
-        return $activeMethods;
-    }   //    function getCacheStorageMethods()
-
-
-    /**
-     * Identify the cache storage method to use
-     *
-     * @param    string            $method        Name of the method to use for cell cacheing
-     * @param    array of mixed    $arguments    Additional arguments to pass to the cell caching class
-     *                                        when instantiating
-     * @return boolean
-     **/
-    public static function initialize($method = self::cache_in_memory, $arguments = array())
-    {
-        if (!in_array($method,self::$_storageMethods)) {
-            return FALSE;
-        }
-
-        $cacheStorageClass = 'PHPExcel_CachedObjectStorage_'.$method;
-        if (!call_user_func(array( $cacheStorageClass,
-                                   'cacheMethodIsAvailable'))) {
-            return FALSE;
-        }
-
-        self::$_storageMethodParameters[$method] = self::$_storageMethodDefaultParameters[$method];
-        foreach($arguments as $k => $v) {
-            if (array_key_exists($k, self::$_storageMethodParameters[$method])) {
-                self::$_storageMethodParameters[$method][$k] = $v;
-            }
-        }
-
-        if (self::$_cacheStorageMethod === NULL) {
-            self::$_cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $method;
-            self::$_cacheStorageMethod = $method;
-        }
-        return TRUE;
-    }   //    function initialize()
-
-
-    /**
-     * Initialise the cache storage
-     *
-     * @param    PHPExcel_Worksheet     $parent        Enable cell caching for this worksheet
-     * @return    PHPExcel_CachedObjectStorage_ICache
-     **/
-    public static function getInstance(PHPExcel_Worksheet $parent)
-    {
-        $cacheMethodIsAvailable = TRUE;
-        if (self::$_cacheStorageMethod === NULL) {
-            $cacheMethodIsAvailable = self::initialize();
-        }
-
-        if ($cacheMethodIsAvailable) {
-            $instance = new self::$_cacheStorageClass( $parent,
-                                                       self::$_storageMethodParameters[self::$_cacheStorageMethod]
-                                                     );
-            if ($instance !== NULL) {
-                return $instance;
-            }
-        }
-
-        return FALSE;
-    }   //    function getInstance()
-
-
-    /**
-     * Clear the cache storage
-     *
-     **/
-	public static function finalize()
-	{
-		self::$_cacheStorageMethod = NULL;
-		self::$_cacheStorageClass = NULL;
-		self::$_storageMethodParameters = array();
-	}
-
-}

admin/custom/PHPExcel/CalcEngine/CyclicReferenceStack.php

@@ -1,98 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CalcEngine_CyclicReferenceStack
- *
- * @category	PHPExcel_CalcEngine_CyclicReferenceStack
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CalcEngine_CyclicReferenceStack {
-
-	/**
-	 *  The call stack for calculated cells
-	 *
-	 *  @var mixed[]
-	 */
-	private $_stack = array();
-
-
-	/**
-	 * Return the number of entries on the stack
-	 *
-	 * @return  integer
-	 */
-	public function count() {
-		return count($this->_stack);
-	}
-
-	/**
-	 * Push a new entry onto the stack
-	 *
-	 * @param  mixed  $value
-	 */
-	public function push($value) {
-		$this->_stack[] = $value;
-	}	//	function push()
-
-	/**
-	 * Pop the last entry from the stack
-	 *
-	 * @return  mixed
-	 */
-	public function pop() {
-		return array_pop($this->_stack);
-	}	//	function pop()
-
-	/**
-	 * Test to see if a specified entry exists on the stack
-	 *
-	 * @param  mixed  $value  The value to test
-	 */
-	public function onStack($value) {
-		return in_array($value, $this->_stack);
-	}
-
-	/**
-	 * Clear the stack
-	 */
-	public function clear() {
-		$this->_stack = array();
-	}	//	function push()
-
-	/**
-	 * Return an array of all entries on the stack
-	 *
-	 * @return  mixed[]
-	 */
-	public function showStack() {
-		return $this->_stack;
-	}
-
-}	//	class PHPExcel_CalcEngine_CyclicReferenceStack

admin/custom/PHPExcel/CalcEngine/Logger.php

@@ -1,153 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_CalcEngine_Logger
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CalcEngine_Logger {
-
-	/**
-	 * Flag to determine whether a debug log should be generated by the calculation engine
-	 *		If true, then a debug log will be generated
-	 *		If false, then a debug log will not be generated
-	 *
-	 * @var boolean
-	 */
-	private $_writeDebugLog = FALSE;
-
-	/**
-	 * Flag to determine whether a debug log should be echoed by the calculation engine
-	 *		If true, then a debug log will be echoed
-	 *		If false, then a debug log will not be echoed
-	 * A debug log can only be echoed if it is generated
-	 *
-	 * @var boolean
-	 */
-	private $_echoDebugLog = FALSE;
-
-	/**
-	 * The debug log generated by the calculation engine
-	 *
-	 * @var string[]
-	 */
-	private $_debugLog = array();
-
-	/**
-	 * The calculation engine cell reference stack
-	 *
-	 * @var PHPExcel_CalcEngine_CyclicReferenceStack
-	 */
-	private $_cellStack;
-
-	
-	/**
-	 * Instantiate a Calculation engine logger
-	 *
-	 * @param  PHPExcel_CalcEngine_CyclicReferenceStack $stack
-	 */
-	public function __construct(PHPExcel_CalcEngine_CyclicReferenceStack $stack) {
-		$this->_cellStack = $stack;
-	}
-
-	/**
-	 * Enable/Disable Calculation engine logging
-	 *
-	 * @param  boolean $pValue
-	 */
-	public function setWriteDebugLog($pValue = FALSE) {
-		$this->_writeDebugLog = $pValue;
-	}
-
-	/**
-	 * Return whether calculation engine logging is enabled or disabled
-	 *
-	 * @return  boolean
-	 */
-	public function getWriteDebugLog() {
-		return $this->_writeDebugLog;
-	}
-
-	/**
-	 * Enable/Disable echoing of debug log information
-	 *
-	 * @param  boolean $pValue
-	 */
-	public function setEchoDebugLog($pValue = FALSE) {
-		$this->_echoDebugLog = $pValue;
-	}
-
-	/**
-	 * Return whether echoing of debug log information is enabled or disabled
-	 *
-	 * @return  boolean
-	 */
-	public function getEchoDebugLog() {
-		return $this->_echoDebugLog;
-	}
-
-	/**
-	 * Write an entry to the calculation engine debug log
-	 */
-	public function writeDebugLog() {
-		//	Only write the debug log if logging is enabled
-		if ($this->_writeDebugLog) {
-			$message = implode(func_get_args());
-			$cellReference = implode(' -> ', $this->_cellStack->showStack());
-			if ($this->_echoDebugLog) {
-				echo $cellReference, 
-					($this->_cellStack->count() > 0 ? ' => ' : ''), 
-					$message, 
-					PHP_EOL;
-			}
-			$this->_debugLog[] = $cellReference . 
-				($this->_cellStack->count() > 0 ? ' => ' : '') . 
-				$message;
-		}
-	}	//	function _writeDebug()
-
-	/**
-	 * Clear the calculation engine debug log
-	 */
-	public function clearLog() {
-		$this->_debugLog = array();
-	}	//	function flushLogger()
-
-	/**
-	 * Return the calculation engine debug log
-	 *
-	 * @return  string[]
-	 */
-	public function getLog() {
-		return $this->_debugLog;
-	}	//	function flushLogger()
-
-}	//	class PHPExcel_CalcEngine_Logger
-

admin/custom/PHPExcel/CalcEngine/index.html

@@ -1 +0,0 @@
-<html><body bgcolor="#FFFFFF"></body></html>

admin/custom/PHPExcel/Calculation/Database.php

@@ -1,725 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_Database
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Database {
-
-
-	/**
-	 * __fieldExtract
-	 *
-	 * Extracts the column ID to use for the data field.
-	 *
-	 * @access	private
-	 * @param	mixed[]		$database		The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	mixed		$field			Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @return	string|NULL
-	 *
-	 */
-	private static function __fieldExtract($database,$field) {
-		$field = strtoupper(PHPExcel_Calculation_Functions::flattenSingleValue($field));
-		$fieldNames = array_map('strtoupper',array_shift($database));
-
-		if (is_numeric($field)) {
-			$keys = array_keys($fieldNames);
-			return $keys[$field-1];
-		}
-		$key = array_search($field,$fieldNames);
-		return ($key) ? $key : NULL;
-	}
-
-	/**
-	 * __filter
-	 *
-	 * Parses the selection criteria, extracts the database rows that match those criteria, and
-	 * returns that subset of rows.
-	 *
-	 * @access	private
-	 * @param	mixed[]		$database		The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	mixed[]		$criteria		The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	array of mixed
-	 *
-	 */
-	private static function __filter($database,$criteria) {
-		$fieldNames = array_shift($database);
-		$criteriaNames = array_shift($criteria);
-
-		//	Convert the criteria into a set of AND/OR conditions with [:placeholders]
-		$testConditions = $testValues = array();
-		$testConditionsCount = 0;
-		foreach($criteriaNames as $key => $criteriaName) {
-			$testCondition = array();
-			$testConditionCount = 0;
-			foreach($criteria as $row => $criterion) {
-				if ($criterion[$key] > '') {
-					$testCondition[] = '[:'.$criteriaName.']'.PHPExcel_Calculation_Functions::_ifCondition($criterion[$key]);
-					$testConditionCount++;
-				}
-			}
-			if ($testConditionCount > 1) {
-				$testConditions[] = 'OR('.implode(',',$testCondition).')';
-				$testConditionsCount++;
-			} elseif($testConditionCount == 1) {
-				$testConditions[] = $testCondition[0];
-				$testConditionsCount++;
-			}
-		}
-
-		if ($testConditionsCount > 1) {
-			$testConditionSet = 'AND('.implode(',',$testConditions).')';
-		} elseif($testConditionsCount == 1) {
-			$testConditionSet = $testConditions[0];
-		}
-
-		//	Loop through each row of the database
-		foreach($database as $dataRow => $dataValues) {
-			//	Substitute actual values from the database row for our [:placeholders]
-			$testConditionList = $testConditionSet;
-			foreach($criteriaNames as $key => $criteriaName) {
-				$k = array_search($criteriaName,$fieldNames);
-				if (isset($dataValues[$k])) {
-					$dataValue = $dataValues[$k];
-					$dataValue = (is_string($dataValue)) ? PHPExcel_Calculation::_wrapResult(strtoupper($dataValue)) : $dataValue;
-					$testConditionList = str_replace('[:'.$criteriaName.']',$dataValue,$testConditionList);
-				}
-			}
-			//	evaluate the criteria against the row data
-			$result = PHPExcel_Calculation::getInstance()->_calculateFormulaValue('='.$testConditionList);
-			//	If the row failed to meet the criteria, remove it from the database
-			if (!$result) {
-				unset($database[$dataRow]);
-			}
-		}
-
-		return $database;
-	}
-
-
-	/**
-	 * DAVERAGE
-	 *
-	 * Averages the values in a column of a list or database that match conditions you specify.
-	 *
-	 * Excel Function:
-	 *		DAVERAGE(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DAVERAGE($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::AVERAGE($colData);
-	}	//	function DAVERAGE()
-
-
-	/**
-	 * DCOUNT
-	 *
-	 * Counts the cells that contain numbers in a column of a list or database that match conditions
-	 * that you specify.
-	 *
-	 * Excel Function:
-	 *		DCOUNT(database,[field],criteria)
-	 *
-	 * Excel Function:
-	 *		DAVERAGE(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	integer
-	 *
-	 * @TODO	The field argument is optional. If field is omitted, DCOUNT counts all records in the
-	 *			database that match the criteria.
-	 *
-	 */
-	public static function DCOUNT($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::COUNT($colData);
-	}	//	function DCOUNT()
-
-
-	/**
-	 * DCOUNTA
-	 *
-	 * Counts the nonblank cells in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DCOUNTA(database,[field],criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	integer
-	 *
-	 * @TODO	The field argument is optional. If field is omitted, DCOUNTA counts all records in the
-	 *			database that match the criteria.
-	 *
-	 */
-	public static function DCOUNTA($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::COUNTA($colData);
-	}	//	function DCOUNTA()
-
-
-	/**
-	 * DGET
-	 *
-	 * Extracts a single value from a column of a list or database that matches conditions that you
-	 * specify.
-	 *
-	 * Excel Function:
-	 *		DGET(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	mixed
-	 *
-	 */
-	public static function DGET($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		if (count($colData) > 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		return $colData[0];
-	}	//	function DGET()
-
-
-	/**
-	 * DMAX
-	 *
-	 * Returns the largest number in a column of a list or database that matches conditions you that
-	 * specify.
-	 *
-	 * Excel Function:
-	 *		DMAX(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DMAX($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::MAX($colData);
-	}	//	function DMAX()
-
-
-	/**
-	 * DMIN
-	 *
-	 * Returns the smallest number in a column of a list or database that matches conditions you that
-	 * specify.
-	 *
-	 * Excel Function:
-	 *		DMIN(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DMIN($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::MIN($colData);
-	}	//	function DMIN()
-
-
-	/**
-	 * DPRODUCT
-	 *
-	 * Multiplies the values in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DPRODUCT(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DPRODUCT($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_MathTrig::PRODUCT($colData);
-	}	//	function DPRODUCT()
-
-
-	/**
-	 * DSTDEV
-	 *
-	 * Estimates the standard deviation of a population based on a sample by using the numbers in a
-	 * column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DSTDEV(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DSTDEV($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::STDEV($colData);
-	}	//	function DSTDEV()
-
-
-	/**
-	 * DSTDEVP
-	 *
-	 * Calculates the standard deviation of a population based on the entire population by using the
-	 * numbers in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DSTDEVP(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DSTDEVP($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::STDEVP($colData);
-	}	//	function DSTDEVP()
-
-
-	/**
-	 * DSUM
-	 *
-	 * Adds the numbers in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DSUM(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DSUM($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_MathTrig::SUM($colData);
-	}	//	function DSUM()
-
-
-	/**
-	 * DVAR
-	 *
-	 * Estimates the variance of a population based on a sample by using the numbers in a column
-	 * of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DVAR(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DVAR($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::VARFunc($colData);
-	}	//	function DVAR()
-
-
-	/**
-	 * DVARP
-	 *
-	 * Calculates the variance of a population based on the entire population by using the numbers
-	 * in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DVARP(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DVARP($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::VARP($colData);
-	}	//	function DVARP()
-
-
-}	//	class PHPExcel_Calculation_Database

admin/custom/PHPExcel/Calculation/Exception.php

@@ -1,52 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Calculation_Exception
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Exception extends PHPExcel_Exception {
-	/**
-	 * Error handler callback
-	 *
-	 * @param mixed $code
-	 * @param mixed $string
-	 * @param mixed $file
-	 * @param mixed $line
-	 * @param mixed $context
-	 */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
-		$e = new self($string, $code);
-		$e->line = $line;
-		$e->file = $file;
-		throw $e;
-	}
-}

admin/custom/PHPExcel/Calculation/ExceptionHandler.php

@@ -1,49 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Calculation_ExceptionHandler
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_ExceptionHandler {
-	/**
-	 * Register errorhandler
-	 */
-	public function __construct() {
-		set_error_handler(array('PHPExcel_Calculation_Exception', 'errorHandlerCallback'), E_ALL);
-	}
-
-	/**
-	 * Unregister errorhandler
-	 */
-	public function __destruct() {
-		restore_error_handler();
-	}
-}

admin/custom/PHPExcel/Calculation/FormulaParser.php

@@ -1,614 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/*
-PARTLY BASED ON:
-	Copyright (c) 2007 E. W. Bachtal, Inc.
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-	and associated documentation files (the "Software"), to deal in the Software without restriction,
-	including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-	and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-	subject to the following conditions:
-
-	  The above copyright notice and this permission notice shall be included in all copies or substantial
-	  portions of the Software.
-
-	The software is provided "as is", without warranty of any kind, express or implied, including but not
-	limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
-	no event shall the authors or copyright holders be liable for any claim, damages or other liability,
-	whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
-	software or the use or other dealings in the software.
-
-	http://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
-	http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
-*/
-
-/**
- * PHPExcel_Calculation_FormulaParser
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_FormulaParser {
-	/* Character constants */
-	const QUOTE_DOUBLE  = '"';
-	const QUOTE_SINGLE  = '\'';
-	const BRACKET_CLOSE = ']';
-	const BRACKET_OPEN  = '[';
-	const BRACE_OPEN    = '{';
-	const BRACE_CLOSE   = '}';
-	const PAREN_OPEN    = '(';
-	const PAREN_CLOSE   = ')';
-	const SEMICOLON     = ';';
-	const WHITESPACE    = ' ';
-	const COMMA         = ',';
-	const ERROR_START   = '#';
-
-	const OPERATORS_SN 			= "+-";
-	const OPERATORS_INFIX 		= "+-*/^&=><";
-	const OPERATORS_POSTFIX 	= "%";
-
-	/**
-	 * Formula
-	 *
-	 * @var string
-	 */
-	private $_formula;
-
-	/**
-	 * Tokens
-	 *
-	 * @var PHPExcel_Calculation_FormulaToken[]
-	 */
-	private $_tokens = array();
-
-    /**
-     * Create a new PHPExcel_Calculation_FormulaParser
-     *
-     * @param 	string		$pFormula	Formula to parse
-     * @throws 	PHPExcel_Calculation_Exception
-     */
-    public function __construct($pFormula = '')
-    {
-    	// Check parameters
-    	if (is_null($pFormula)) {
-    		throw new PHPExcel_Calculation_Exception("Invalid parameter passed: formula");
-    	}
-
-    	// Initialise values
-    	$this->_formula = trim($pFormula);
-    	// Parse!
-    	$this->_parseToTokens();
-    }
-
-    /**
-     * Get Formula
-     *
-     * @return string
-     */
-    public function getFormula() {
-    	return $this->_formula;
-    }
-
-    /**
-     * Get Token
-     *
-     * @param 	int		$pId	Token id
-     * @return	string
-     * @throws  PHPExcel_Calculation_Exception
-     */
-    public function getToken($pId = 0) {
-    	if (isset($this->_tokens[$pId])) {
-    		return $this->_tokens[$pId];
-    	} else {
-    		throw new PHPExcel_Calculation_Exception("Token with id $pId does not exist.");
-    	}
-    }
-
-    /**
-     * Get Token count
-     *
-     * @return string
-     */
-    public function getTokenCount() {
-    	return count($this->_tokens);
-    }
-
-    /**
-     * Get Tokens
-     *
-     * @return PHPExcel_Calculation_FormulaToken[]
-     */
-    public function getTokens() {
-    	return $this->_tokens;
-    }
-
-    /**
-     * Parse to tokens
-     */
-    private function _parseToTokens() {
-		// No attempt is made to verify formulas; assumes formulas are derived from Excel, where
-		// they can only exist if valid; stack overflows/underflows sunk as nulls without exceptions.
-
-		// Check if the formula has a valid starting =
-		$formulaLength = strlen($this->_formula);
-		if ($formulaLength < 2 || $this->_formula{0} != '=') return;
-
-		// Helper variables
-		$tokens1	= $tokens2 	= $stack = array();
-		$inString	= $inPath 	= $inRange 	= $inError = false;
-		$token		= $previousToken	= $nextToken	= null;
-
-		$index	= 1;
-		$value	= '';
-
-		$ERRORS 			= array("#NULL!", "#DIV/0!", "#VALUE!", "#REF!", "#NAME?", "#NUM!", "#N/A");
-		$COMPARATORS_MULTI 	= array(">=", "<=", "<>");
-
-		while ($index < $formulaLength) {
-			// state-dependent character evaluation (order is important)
-
-			// double-quoted strings
-			// embeds are doubled
-			// end marks token
-			if ($inString) {
-				if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) {
-					if ((($index + 2) <= $formulaLength) && ($this->_formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE)) {
-						$value .= PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE;
-						++$index;
-					} else {
-						$inString = false;
-						$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_TEXT);
-						$value = "";
-					}
-				} else {
-					$value .= $this->_formula{$index};
-				}
-				++$index;
-				continue;
-			}
-
-			// single-quoted strings (links)
-			// embeds are double
-			// end does not mark a token
-			if ($inPath) {
-				if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) {
-					if ((($index + 2) <= $formulaLength) && ($this->_formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE)) {
-						$value .= PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE;
-						++$index;
-					} else {
-						$inPath = false;
-					}
-				} else {
-					$value .= $this->_formula{$index};
-				}
-				++$index;
-				continue;
-			}
-
-			// bracked strings (R1C1 range index or linked workbook name)
-			// no embeds (changed to "()" by Excel)
-			// end does not mark a token
-			if ($inRange) {
-				if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_CLOSE) {
-					$inRange = false;
-				}
-				$value .= $this->_formula{$index};
-				++$index;
-				continue;
-			}
-
-			// error values
-			// end marks a token, determined from absolute list of values
-			if ($inError) {
-				$value .= $this->_formula{$index};
-				++$index;
-				if (in_array($value, $ERRORS)) {
-					$inError = false;
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_ERROR);
-					$value = "";
-				}
-				continue;
-			}
-
-			// scientific notation check
-			if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_SN, $this->_formula{$index}) !== false) {
-				if (strlen($value) > 1) {
-					if (preg_match("/^[1-9]{1}(\.[0-9]+)?E{1}$/", $this->_formula{$index}) != 0) {
-						$value .= $this->_formula{$index};
-						++$index;
-						continue;
-					}
-				}
-			}
-
-			// independent character evaluation (order not important)
-
-			// establish state-dependent character evaluations
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) {
-				if (strlen($value > 0)) {  // unexpected
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
-					$value = "";
-				}
-				$inString = true;
-				++$index;
-				continue;
- 			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) {
-				if (strlen($value) > 0) { // unexpected
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
-					$value = "";
-				}
-				$inPath = true;
-				++$index;
-				continue;
-			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_OPEN) {
-				$inRange = true;
-				$value .= PHPExcel_Calculation_FormulaParser::BRACKET_OPEN;
-				++$index;
-				continue;
-			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::ERROR_START) {
-				if (strlen($value) > 0) { // unexpected
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
-					$value = "";
-				}
-				$inError = true;
-				$value .= PHPExcel_Calculation_FormulaParser::ERROR_START;
-				++$index;
-				continue;
-			}
-
-			// mark start and end of arrays and array rows
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_OPEN) {
-				if (strlen($value) > 0) { // unexpected
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
-					$value = "";
-				}
-
-				$tmp = new PHPExcel_Calculation_FormulaToken("ARRAY", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-				$tokens1[] = $tmp;
-				$stack[] = clone $tmp;
-
-				$tmp = new PHPExcel_Calculation_FormulaToken("ARRAYROW", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-				$tokens1[] = $tmp;
-				$stack[] = clone $tmp;
-
-				++$index;
-				continue;
-			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::SEMICOLON) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$tokens1[] = $tmp;
-
-				$tmp = new PHPExcel_Calculation_FormulaToken(",", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_ARGUMENT);
-				$tokens1[] = $tmp;
-
-				$tmp = new PHPExcel_Calculation_FormulaToken("ARRAYROW", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-				$tokens1[] = $tmp;
-				$stack[] = clone $tmp;
-
-				++$index;
-				continue;
-			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_CLOSE) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$tokens1[] = $tmp;
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$tokens1[] = $tmp;
-
-				++$index;
-				continue;
-			}
-
-			// trim white-space
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-				$tokens1[] = new PHPExcel_Calculation_FormulaToken("", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_WHITESPACE);
-				++$index;
-				while (($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) && ($index < $formulaLength)) {
-					++$index;
-				}
-				continue;
-			}
-
-			// multi-character comparators
-			if (($index + 2) <= $formulaLength) {
-				if (in_array(substr($this->_formula, $index, 2), $COMPARATORS_MULTI)) {
-					if (strlen($value) > 0) {
-						$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-						$value = "";
-					}
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken(substr($this->_formula, $index, 2), PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
-					$index += 2;
-					continue;
-				}
-			}
-
-			// standard infix operators
-			if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_INFIX, $this->_formula{$index}) !== false) {
-				if (strlen($value) > 0) {
-					$tokens1[] =new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-				$tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX);
-				++$index;
-				continue;
-			}
-
-			// standard postfix operators (only one)
-			if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_POSTFIX, $this->_formula{$index}) !== false) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-				$tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX);
-				++$index;
-				continue;
-			}
-
-			// start subexpression or function
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_OPEN) {
-				if (strlen($value) > 0) {
-					$tmp = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-					$tokens1[] = $tmp;
-					$stack[] = clone $tmp;
-					$value = "";
-				} else {
-					$tmp = new PHPExcel_Calculation_FormulaToken("", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-					$tokens1[] = $tmp;
-					$stack[] = clone $tmp;
-				}
-				++$index;
-				continue;
-			}
-
-			// function, subexpression, or array parameters, or operand unions
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::COMMA) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$stack[] = $tmp;
-
-				if ($tmp->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken(",", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_UNION);
-				} else {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken(",", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_ARGUMENT);
-				}
-				++$index;
-				continue;
-			}
-
-			// stop subexpression
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_CLOSE) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$tokens1[] = $tmp;
-
-				++$index;
-				continue;
-			}
-
-        	// token accumulation
-			$value .= $this->_formula{$index};
-			++$index;
-		}
-
-		// dump remaining accumulation
-		if (strlen($value) > 0) {
-			$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-		}
-
-		// move tokenList to new set, excluding unnecessary white-space tokens and converting necessary ones to intersections
-		$tokenCount = count($tokens1);
-		for ($i = 0; $i < $tokenCount; ++$i) {
-			$token = $tokens1[$i];
-			if (isset($tokens1[$i - 1])) {
-				$previousToken = $tokens1[$i - 1];
-			} else {
-				$previousToken = null;
-			}
-			if (isset($tokens1[$i + 1])) {
-				$nextToken = $tokens1[$i + 1];
-			} else {
-				$nextToken = null;
-			}
-
-			if (is_null($token)) {
-				continue;
-			}
-
-			if ($token->getTokenType() != PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_WHITESPACE) {
-				$tokens2[] = $token;
-				continue;
-			}
-
-			if (is_null($previousToken)) {
-				continue;
-			}
-
-			if (! (
-					(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-					(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-					($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
-				  ) ) {
-				continue;
-			}
-
-			if (is_null($nextToken)) {
-				continue;
-			}
-
-			if (! (
-					(($nextToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START)) ||
-					(($nextToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START)) ||
-					($nextToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
-				  ) ) {
-				continue;
-			}
-
-			$tokens2[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_INTERSECTION);
-		}
-
-		// move tokens to final list, switching infix "-" operators to prefix when appropriate, switching infix "+" operators
-		// to noop when appropriate, identifying operand and infix-operator subtypes, and pulling "@" from function names
-		$this->_tokens = array();
-
-		$tokenCount = count($tokens2);
-		for ($i = 0; $i < $tokenCount; ++$i) {
-			$token = $tokens2[$i];
-			if (isset($tokens2[$i - 1])) {
-				$previousToken = $tokens2[$i - 1];
-			} else {
-				$previousToken = null;
-			}
-			if (isset($tokens2[$i + 1])) {
-				$nextToken = $tokens2[$i + 1];
-			} else {
-				$nextToken = null;
-			}
-
-			if (is_null($token)) {
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == "-") {
-				if ($i == 0) {
-					$token->setTokenType(PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
-				} else if (
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-							($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
-							($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
-						) {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
-				} else {
-					$token->setTokenType(PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
-				}
-
-				$this->_tokens[] = $token;
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == "+") {
-				if ($i == 0) {
-					continue;
-				} else if (
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-							($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
-							($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
-						) {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
-				} else {
-					continue;
-				}
-
-				$this->_tokens[] = $token;
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
-				if (strpos("<>=", substr($token->getValue(), 0, 1)) !== false) {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
-				} else if ($token->getValue() == "&") {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_CONCATENATION);
-				} else {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
-				}
-
-				$this->_tokens[] = $token;
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND && $token->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
-				if (!is_numeric($token->getValue())) {
-					if (strtoupper($token->getValue()) == "TRUE" || strtoupper($token->getValue() == "FALSE")) {
-						$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
-					} else {
-						$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_RANGE);
-					}
-				} else {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NUMBER);
-				}
-
-				$this->_tokens[] = $token;
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) {
-				if (strlen($token->getValue() > 0)) {
-					if (substr($token->getValue(), 0, 1) == "@") {
-						$token->setValue(substr($token->getValue(), 1));
-					}
-				}
-			}
-
-        	$this->_tokens[] = $token;
-		}
-    }
-}

admin/custom/PHPExcel/Calculation/FormulaToken.php

@@ -1,176 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/*
-PARTLY BASED ON:
-	Copyright (c) 2007 E. W. Bachtal, Inc.
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-	and associated documentation files (the "Software"), to deal in the Software without restriction,
-	including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-	and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-	subject to the following conditions:
-
-	  The above copyright notice and this permission notice shall be included in all copies or substantial
-	  portions of the Software.
-
-	The software is provided "as is", without warranty of any kind, express or implied, including but not
-	limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
-	no event shall the authors or copyright holders be liable for any claim, damages or other liability,
-	whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
-	software or the use or other dealings in the software.
-
-	http://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
-	http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
-*/
-
-
-/**
- * PHPExcel_Calculation_FormulaToken
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_FormulaToken {
-	/* Token types */
-	const TOKEN_TYPE_NOOP					= 'Noop';
-	const TOKEN_TYPE_OPERAND				= 'Operand';
-	const TOKEN_TYPE_FUNCTION				= 'Function';
-	const TOKEN_TYPE_SUBEXPRESSION			= 'Subexpression';
-	const TOKEN_TYPE_ARGUMENT				= 'Argument';
-	const TOKEN_TYPE_OPERATORPREFIX			= 'OperatorPrefix';
-	const TOKEN_TYPE_OPERATORINFIX			= 'OperatorInfix';
-	const TOKEN_TYPE_OPERATORPOSTFIX		= 'OperatorPostfix';
-	const TOKEN_TYPE_WHITESPACE				= 'Whitespace';
-	const TOKEN_TYPE_UNKNOWN				= 'Unknown';
-
-	/* Token subtypes */
-	const TOKEN_SUBTYPE_NOTHING				= 'Nothing';
-	const TOKEN_SUBTYPE_START				= 'Start';
-	const TOKEN_SUBTYPE_STOP				= 'Stop';
-	const TOKEN_SUBTYPE_TEXT				= 'Text';
-	const TOKEN_SUBTYPE_NUMBER				= 'Number';
-	const TOKEN_SUBTYPE_LOGICAL				= 'Logical';
-	const TOKEN_SUBTYPE_ERROR				= 'Error';
-	const TOKEN_SUBTYPE_RANGE				= 'Range';
-	const TOKEN_SUBTYPE_MATH				= 'Math';
-	const TOKEN_SUBTYPE_CONCATENATION		= 'Concatenation';
-	const TOKEN_SUBTYPE_INTERSECTION		= 'Intersection';
-	const TOKEN_SUBTYPE_UNION				= 'Union';
-
-	/**
-	 * Value
-	 *
-	 * @var string
-	 */
-	private $_value;
-
-	/**
-	 * Token Type (represented by TOKEN_TYPE_*)
-	 *
-	 * @var string
-	 */
-	private $_tokenType;
-
-	/**
-	 * Token SubType (represented by TOKEN_SUBTYPE_*)
-	 *
-	 * @var string
-	 */
-	private $_tokenSubType;
-
-    /**
-     * Create a new PHPExcel_Calculation_FormulaToken
-     *
-     * @param string	$pValue
-     * @param string	$pTokenType 	Token type (represented by TOKEN_TYPE_*)
-     * @param string	$pTokenSubType 	Token Subtype (represented by TOKEN_SUBTYPE_*)
-     */
-    public function __construct($pValue, $pTokenType = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN, $pTokenSubType = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING)
-    {
-    	// Initialise values
-    	$this->_value				= $pValue;
-    	$this->_tokenType			= $pTokenType;
-    	$this->_tokenSubType 		= $pTokenSubType;
-    }
-
-    /**
-     * Get Value
-     *
-     * @return string
-     */
-    public function getValue() {
-    	return $this->_value;
-    }
-
-    /**
-     * Set Value
-     *
-     * @param string	$value
-     */
-    public function setValue($value) {
-    	$this->_value = $value;
-    }
-
-    /**
-     * Get Token Type (represented by TOKEN_TYPE_*)
-     *
-     * @return string
-     */
-    public function getTokenType() {
-    	return $this->_tokenType;
-    }
-
-    /**
-     * Set Token Type
-     *
-     * @param string	$value
-     */
-    public function setTokenType($value = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN) {
-    	$this->_tokenType = $value;
-    }
-
-    /**
-     * Get Token SubType (represented by TOKEN_SUBTYPE_*)
-     *
-     * @return string
-     */
-    public function getTokenSubType() {
-    	return $this->_tokenSubType;
-    }
-
-    /**
-     * Set Token SubType
-     *
-     * @param string	$value
-     */
-    public function setTokenSubType($value = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
-    	$this->_tokenSubType = $value;
-    }
-}

admin/custom/PHPExcel/Calculation/Function.php

@@ -1,149 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Calculation_Function
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Function {
-	/* Function categories */
-	const CATEGORY_CUBE						= 'Cube';
-	const CATEGORY_DATABASE					= 'Database';
-	const CATEGORY_DATE_AND_TIME			= 'Date and Time';
-	const CATEGORY_ENGINEERING				= 'Engineering';
-	const CATEGORY_FINANCIAL				= 'Financial';
-	const CATEGORY_INFORMATION				= 'Information';
-	const CATEGORY_LOGICAL					= 'Logical';
-	const CATEGORY_LOOKUP_AND_REFERENCE		= 'Lookup and Reference';
-	const CATEGORY_MATH_AND_TRIG			= 'Math and Trig';
-	const CATEGORY_STATISTICAL				= 'Statistical';
-	const CATEGORY_TEXT_AND_DATA			= 'Text and Data';
-
-	/**
-	 * Category (represented by CATEGORY_*)
-	 *
-	 * @var string
-	 */
-	private $_category;
-
-	/**
-	 * Excel name
-	 *
-	 * @var string
-	 */
-	private $_excelName;
-
-	/**
-	 * PHPExcel name
-	 *
-	 * @var string
-	 */
-	private $_phpExcelName;
-
-    /**
-     * Create a new PHPExcel_Calculation_Function
-     *
-     * @param 	string		$pCategory 		Category (represented by CATEGORY_*)
-     * @param 	string		$pExcelName		Excel function name
-     * @param 	string		$pPHPExcelName	PHPExcel function mapping
-     * @throws 	PHPExcel_Calculation_Exception
-     */
-    public function __construct($pCategory = NULL, $pExcelName = NULL, $pPHPExcelName = NULL)
-    {
-    	if (($pCategory !== NULL) && ($pExcelName !== NULL) && ($pPHPExcelName !== NULL)) {
-    		// Initialise values
-    		$this->_category 		= $pCategory;
-    		$this->_excelName 		= $pExcelName;
-    		$this->_phpExcelName 	= $pPHPExcelName;
-    	} else {
-    		throw new PHPExcel_Calculation_Exception("Invalid parameters passed.");
-    	}
-    }
-
-    /**
-     * Get Category (represented by CATEGORY_*)
-     *
-     * @return string
-     */
-    public function getCategory() {
-    	return $this->_category;
-    }
-
-    /**
-     * Set Category (represented by CATEGORY_*)
-     *
-     * @param 	string		$value
-     * @throws 	PHPExcel_Calculation_Exception
-     */
-    public function setCategory($value = null) {
-    	if (!is_null($value)) {
-    		$this->_category = $value;
-    	} else {
-    		throw new PHPExcel_Calculation_Exception("Invalid parameter passed.");
-    	}
-    }
-
-    /**
-     * Get Excel name
-     *
-     * @return string
-     */
-    public function getExcelName() {
-    	return $this->_excelName;
-    }
-
-    /**
-     * Set Excel name
-     *
-     * @param string	$value
-     */
-    public function setExcelName($value) {
-    	$this->_excelName = $value;
-    }
-
-    /**
-     * Get PHPExcel name
-     *
-     * @return string
-     */
-    public function getPHPExcelName() {
-    	return $this->_phpExcelName;
-    }
-
-    /**
-     * Set PHPExcel name
-     *
-     * @param string	$value
-     */
-    public function setPHPExcelName($value) {
-    	$this->_phpExcelName = $value;
-    }
-}

admin/custom/PHPExcel/Calculation/Functions.php

@@ -1,725 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/** MAX_VALUE */
-define('MAX_VALUE', 1.2e308);
-
-/** 2 / PI */
-define('M_2DIVPI', 0.63661977236758134307553505349006);
-
-/** MAX_ITERATIONS */
-define('MAX_ITERATIONS', 256);
-
-/** PRECISION */
-define('PRECISION', 8.88E-016);
-
-
-/**
- * PHPExcel_Calculation_Functions
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Functions {
-
-	/** constants */
-	const COMPATIBILITY_EXCEL		= 'Excel';
-	const COMPATIBILITY_GNUMERIC	= 'Gnumeric';
-	const COMPATIBILITY_OPENOFFICE	= 'OpenOfficeCalc';
-
-	const RETURNDATE_PHP_NUMERIC	= 'P';
-	const RETURNDATE_PHP_OBJECT		= 'O';
-	const RETURNDATE_EXCEL			= 'E';
-
-
-	/**
-	 * Compatibility mode to use for error checking and responses
-	 *
-	 * @access	private
-	 * @var string
-	 */
-	protected static $compatibilityMode	= self::COMPATIBILITY_EXCEL;
-
-	/**
-	 * Data Type to use when returning date values
-	 *
-	 * @access	private
-	 * @var string
-	 */
-	protected static $ReturnDateType	= self::RETURNDATE_EXCEL;
-
-	/**
-	 * List of error codes
-	 *
-	 * @access	private
-	 * @var array
-	 */
-	protected static $_errorCodes	= array( 'null'				=> '#NULL!',
-											 'divisionbyzero'	=> '#DIV/0!',
-											 'value'			=> '#VALUE!',
-											 'reference'		=> '#REF!',
-											 'name'				=> '#NAME?',
-											 'num'				=> '#NUM!',
-											 'na'				=> '#N/A',
-											 'gettingdata'		=> '#GETTING_DATA'
-										   );
-
-
-	/**
-	 * Set the Compatibility Mode
-	 *
-	 * @access	public
-	 * @category Function Configuration
-	 * @param	 string		$compatibilityMode		Compatibility Mode
-	 *												Permitted values are:
-	 *													PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL			'Excel'
-	 *													PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC		'Gnumeric'
-	 *													PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE	'OpenOfficeCalc'
-	 * @return	 boolean	(Success or Failure)
-	 */
-	public static function setCompatibilityMode($compatibilityMode) {
-		if (($compatibilityMode == self::COMPATIBILITY_EXCEL) ||
-			($compatibilityMode == self::COMPATIBILITY_GNUMERIC) ||
-			($compatibilityMode == self::COMPATIBILITY_OPENOFFICE)) {
-			self::$compatibilityMode = $compatibilityMode;
-			return True;
-		}
-		return False;
-	}	//	function setCompatibilityMode()
-
-
-	/**
-	 * Return the current Compatibility Mode
-	 *
-	 * @access	public
-	 * @category Function Configuration
-	 * @return	 string		Compatibility Mode
-	 *							Possible Return values are:
-	 *								PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL			'Excel'
-	 *								PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC		'Gnumeric'
-	 *								PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE	'OpenOfficeCalc'
-	 */
-	public static function getCompatibilityMode() {
-		return self::$compatibilityMode;
-	}	//	function getCompatibilityMode()
-
-
-	/**
-	 * Set the Return Date Format used by functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object)
-	 *
-	 * @access	public
-	 * @category Function Configuration
-	 * @param	 string	$returnDateType			Return Date Format
-	 *												Permitted values are:
-	 *													PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC		'P'
-	 *													PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT		'O'
-	 *													PHPExcel_Calculation_Functions::RETURNDATE_EXCEL			'E'
-	 * @return	 boolean							Success or failure
-	 */
-	public static function setReturnDateType($returnDateType) {
-		if (($returnDateType == self::RETURNDATE_PHP_NUMERIC) ||
-			($returnDateType == self::RETURNDATE_PHP_OBJECT) ||
-			($returnDateType == self::RETURNDATE_EXCEL)) {
-			self::$ReturnDateType = $returnDateType;
-			return True;
-		}
-		return False;
-	}	//	function setReturnDateType()
-
-
-	/**
-	 * Return the current Return Date Format for functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object)
-	 *
-	 * @access	public
-	 * @category Function Configuration
-	 * @return	 string		Return Date Format
-	 *							Possible Return values are:
-	 *								PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC		'P'
-	 *								PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT		'O'
-	 *								PHPExcel_Calculation_Functions::RETURNDATE_EXCEL			'E'
-	 */
-	public static function getReturnDateType() {
-		return self::$ReturnDateType;
-	}	//	function getReturnDateType()
-
-
-	/**
-	 * DUMMY
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#Not Yet Implemented
-	 */
-	public static function DUMMY() {
-		return '#Not Yet Implemented';
-	}	//	function DUMMY()
-
-
-	/**
-	 * DIV0
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#Not Yet Implemented
-	 */
-	public static function DIV0() {
-		return self::$_errorCodes['divisionbyzero'];
-	}	//	function DIV0()
-
-
-	/**
-	 * NA
-	 *
-	 * Excel Function:
-	 *		=NA()
-	 *
-	 * Returns the error value #N/A
-	 *		#N/A is the error value that means "no value is available."
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @return	string	#N/A!
-	 */
-	public static function NA() {
-		return self::$_errorCodes['na'];
-	}	//	function NA()
-
-
-	/**
-	 * NaN
-	 *
-	 * Returns the error value #NUM!
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#NUM!
-	 */
-	public static function NaN() {
-		return self::$_errorCodes['num'];
-	}	//	function NaN()
-
-
-	/**
-	 * NAME
-	 *
-	 * Returns the error value #NAME?
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#NAME?
-	 */
-	public static function NAME() {
-		return self::$_errorCodes['name'];
-	}	//	function NAME()
-
-
-	/**
-	 * REF
-	 *
-	 * Returns the error value #REF!
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#REF!
-	 */
-	public static function REF() {
-		return self::$_errorCodes['reference'];
-	}	//	function REF()
-
-
-	/**
-	 * NULL
-	 *
-	 * Returns the error value #NULL!
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#NULL!
-	 */
-	public static function NULL() {
-		return self::$_errorCodes['null'];
-	}	//	function NULL()
-
-
-	/**
-	 * VALUE
-	 *
-	 * Returns the error value #VALUE!
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#VALUE!
-	 */
-	public static function VALUE() {
-		return self::$_errorCodes['value'];
-	}	//	function VALUE()
-
-
-	public static function isMatrixValue($idx) {
-		return ((substr_count($idx,'.') <= 1) || (preg_match('/\.[A-Z]/',$idx) > 0));
-	}
-
-
-	public static function isValue($idx) {
-		return (substr_count($idx,'.') == 0);
-	}
-
-
-	public static function isCellValue($idx) {
-		return (substr_count($idx,'.') > 1);
-	}
-
-
-	public static function _ifCondition($condition) {
-		$condition	= PHPExcel_Calculation_Functions::flattenSingleValue($condition);
-		if (!isset($condition{0}))
-			$condition = '=""';
-		if (!in_array($condition{0},array('>', '<', '='))) {
-			if (!is_numeric($condition)) { $condition = PHPExcel_Calculation::_wrapResult(strtoupper($condition)); }
-			return '='.$condition;
-		} else {
-			preg_match('/([<>=]+)(.*)/',$condition,$matches);
-			list(,$operator,$operand) = $matches;
-
-			if (!is_numeric($operand)) {
-				$operand = str_replace('"', '""', $operand);
-				$operand = PHPExcel_Calculation::_wrapResult(strtoupper($operand));
-			}
-
-			return $operator.$operand;
-		}
-	}	//	function _ifCondition()
-
-
-	/**
-	 * ERROR_TYPE
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function ERROR_TYPE($value = '') {
-		$value	= self::flattenSingleValue($value);
-
-		$i = 1;
-		foreach(self::$_errorCodes as $errorCode) {
-			if ($value === $errorCode) {
-				return $i;
-			}
-			++$i;
-		}
-		return self::NA();
-	}	//	function ERROR_TYPE()
-
-
-	/**
-	 * IS_BLANK
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_BLANK($value = NULL) {
-		if (!is_null($value)) {
-			$value	= self::flattenSingleValue($value);
-		}
-
-		return is_null($value);
-	}	//	function IS_BLANK()
-
-
-	/**
-	 * IS_ERR
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_ERR($value = '') {
-		$value		= self::flattenSingleValue($value);
-
-		return self::IS_ERROR($value) && (!self::IS_NA($value));
-	}	//	function IS_ERR()
-
-
-	/**
-	 * IS_ERROR
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_ERROR($value = '') {
-		$value		= self::flattenSingleValue($value);
-
-		if (!is_string($value))
-			return false;
-		return in_array($value, array_values(self::$_errorCodes));
-	}	//	function IS_ERROR()
-
-
-	/**
-	 * IS_NA
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_NA($value = '') {
-		$value		= self::flattenSingleValue($value);
-
-		return ($value === self::NA());
-	}	//	function IS_NA()
-
-
-	/**
-	 * IS_EVEN
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_EVEN($value = NULL) {
-		$value = self::flattenSingleValue($value);
-
-		if ($value === NULL)
-			return self::NAME();
-		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value))))
-			return self::VALUE();
-		return ($value % 2 == 0);
-	}	//	function IS_EVEN()
-
-
-	/**
-	 * IS_ODD
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_ODD($value = NULL) {
-		$value = self::flattenSingleValue($value);
-
-		if ($value === NULL)
-			return self::NAME();
-		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value))))
-			return self::VALUE();
-		return (abs($value) % 2 == 1);
-	}	//	function IS_ODD()
-
-
-	/**
-	 * IS_NUMBER
-	 *
-	 * @param	mixed	$value		Value to check
-	 * @return	boolean
-	 */
-	public static function IS_NUMBER($value = NULL) {
-		$value		= self::flattenSingleValue($value);
-
-		if (is_string($value)) {
-			return False;
-		}
-		return is_numeric($value);
-	}	//	function IS_NUMBER()
-
-
-	/**
-	 * IS_LOGICAL
-	 *
-	 * @param	mixed	$value		Value to check
-	 * @return	boolean
-	 */
-	public static function IS_LOGICAL($value = NULL) {
-		$value		= self::flattenSingleValue($value);
-
-		return is_bool($value);
-	}	//	function IS_LOGICAL()
-
-
-	/**
-	 * IS_TEXT
-	 *
-	 * @param	mixed	$value		Value to check
-	 * @return	boolean
-	 */
-	public static function IS_TEXT($value = NULL) {
-		$value		= self::flattenSingleValue($value);
-
-		return (is_string($value) && !self::IS_ERROR($value));
-	}	//	function IS_TEXT()
-
-
-	/**
-	 * IS_NONTEXT
-	 *
-	 * @param	mixed	$value		Value to check
-	 * @return	boolean
-	 */
-	public static function IS_NONTEXT($value = NULL) {
-		return !self::IS_TEXT($value);
-	}	//	function IS_NONTEXT()
-
-
-	/**
-	 * VERSION
-	 *
-	 * @return	string	Version information
-	 */
-	public static function VERSION() {
-		return 'PHPExcel ##VERSION##, ##DATE##';
-	}	//	function VERSION()
-
-
-	/**
-	 * N
-	 *
-	 * Returns a value converted to a number
-	 *
-	 * @param	value		The value you want converted
-	 * @return	number		N converts values listed in the following table
-	 *		If value is or refers to N returns
-	 *		A number			That number
-	 *		A date				The serial number of that date
-	 *		TRUE				1
-	 *		FALSE				0
-	 *		An error value		The error value
-	 *		Anything else		0
-	 */
-	public static function N($value = NULL) {
-		while (is_array($value)) {
-			$value = array_shift($value);
-		}
-
-		switch (gettype($value)) {
-			case 'double'	:
-			case 'float'	:
-			case 'integer'	:
-				return $value;
-				break;
-			case 'boolean'	:
-				return (integer) $value;
-				break;
-			case 'string'	:
-				//	Errors
-				if ((strlen($value) > 0) && ($value{0} == '#')) {
-					return $value;
-				}
-				break;
-		}
-		return 0;
-	}	//	function N()
-
-
-	/**
-	 * TYPE
-	 *
-	 * Returns a number that identifies the type of a value
-	 *
-	 * @param	value		The value you want tested
-	 * @return	number		N converts values listed in the following table
-	 *		If value is or refers to N returns
-	 *		A number			1
-	 *		Text				2
-	 *		Logical Value		4
-	 *		An error value		16
-	 *		Array or Matrix		64
-	 */
-	public static function TYPE($value = NULL) {
-		$value	= self::flattenArrayIndexed($value);
-		if (is_array($value) && (count($value) > 1)) {
-			$a = array_keys($value);
-			$a = array_pop($a);
-			//	Range of cells is an error
-			if (self::isCellValue($a)) {
-				return 16;
-			//	Test for Matrix
-			} elseif (self::isMatrixValue($a)) {
-				return 64;
-			}
-		} elseif(empty($value)) {
-			//	Empty Cell
-			return 1;
-		}
-		$value	= self::flattenSingleValue($value);
-
-		if (($value === NULL) || (is_float($value)) || (is_int($value))) {
-				return 1;
-		} elseif(is_bool($value)) {
-				return 4;
-		} elseif(is_array($value)) {
-				return 64;
-		} elseif(is_string($value)) {
-			//	Errors
-			if ((strlen($value) > 0) && ($value{0} == '#')) {
-				return 16;
-			}
-			return 2;
-		}
-		return 0;
-	}	//	function TYPE()
-
-
-	/**
-	 * Convert a multi-dimensional array to a simple 1-dimensional array
-	 *
-	 * @param	array	$array	Array to be flattened
-	 * @return	array	Flattened array
-	 */
-	public static function flattenArray($array) {
-		if (!is_array($array)) {
-			return (array) $array;
-		}
-
-		$arrayValues = array();
-		foreach ($array as $value) {
-			if (is_array($value)) {
-				foreach ($value as $val) {
-					if (is_array($val)) {
-						foreach ($val as $v) {
-							$arrayValues[] = $v;
-						}
-					} else {
-						$arrayValues[] = $val;
-					}
-				}
-			} else {
-				$arrayValues[] = $value;
-			}
-		}
-
-		return $arrayValues;
-	}	//	function flattenArray()
-
-
-	/**
-	 * Convert a multi-dimensional array to a simple 1-dimensional array, but retain an element of indexing
-	 *
-	 * @param	array	$array	Array to be flattened
-	 * @return	array	Flattened array
-	 */
-	public static function flattenArrayIndexed($array) {
-		if (!is_array($array)) {
-			return (array) $array;
-		}
-
-		$arrayValues = array();
-		foreach ($array as $k1 => $value) {
-			if (is_array($value)) {
-				foreach ($value as $k2 => $val) {
-					if (is_array($val)) {
-						foreach ($val as $k3 => $v) {
-							$arrayValues[$k1.'.'.$k2.'.'.$k3] = $v;
-						}
-					} else {
-						$arrayValues[$k1.'.'.$k2] = $val;
-					}
-				}
-			} else {
-				$arrayValues[$k1] = $value;
-			}
-		}
-
-		return $arrayValues;
-	}	//	function flattenArrayIndexed()
-
-
-	/**
-	 * Convert an array to a single scalar value by extracting the first element
-	 *
-	 * @param	mixed		$value		Array or scalar value
-	 * @return	mixed
-	 */
-	public static function flattenSingleValue($value = '') {
-		while (is_array($value)) {
-			$value = array_pop($value);
-		}
-
-		return $value;
-	}	//	function flattenSingleValue()
-
-}	//	class PHPExcel_Calculation_Functions
-
-
-//
-//	There are a few mathematical functions that aren't available on all versions of PHP for all platforms
-//	These functions aren't available in Windows implementations of PHP prior to version 5.3.0
-//	So we test if they do exist for this version of PHP/operating platform; and if not we create them
-//
-if (!function_exists('acosh')) {
-	function acosh($x) {
-		return 2 * log(sqrt(($x + 1) / 2) + sqrt(($x - 1) / 2));
-	}	//	function acosh()
-}
-
-if (!function_exists('asinh')) {
-	function asinh($x) {
-		return log($x + sqrt(1 + $x * $x));
-	}	//	function asinh()
-}
-
-if (!function_exists('atanh')) {
-	function atanh($x) {
-		return (log(1 + $x) - log(1 - $x)) / 2;
-	}	//	function atanh()
-}
-
-
-//
-//	Strangely, PHP doesn't have a mb_str_replace multibyte function
-//	As we'll only ever use this function with UTF-8 characters, we can simply "hard-code" the character set
-//
-if ((!function_exists('mb_str_replace')) &&
-	(function_exists('mb_substr')) && (function_exists('mb_strlen')) && (function_exists('mb_strpos'))) {
-	function mb_str_replace($search, $replace, $subject) {
-		if(is_array($subject)) {
-			$ret = array();
-			foreach($subject as $key => $val) {
-				$ret[$key] = mb_str_replace($search, $replace, $val);
-			}
-			return $ret;
-		}
-
-		foreach((array) $search as $key => $s) {
-			if($s == '') {
-				continue;
-			}
-			$r = !is_array($replace) ? $replace : (array_key_exists($key, $replace) ? $replace[$key] : '');
-			$pos = mb_strpos($subject, $s, 0, 'UTF-8');
-			while($pos !== false) {
-				$subject = mb_substr($subject, 0, $pos, 'UTF-8') . $r . mb_substr($subject, $pos + mb_strlen($s, 'UTF-8'), 65535, 'UTF-8');
-				$pos = mb_strpos($subject, $s, $pos + mb_strlen($r, 'UTF-8'), 'UTF-8');
-			}
-		}
-		return $subject;
-	}
-}

admin/custom/PHPExcel/Calculation/Logical.php

@@ -1,288 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_Logical
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Logical {
-
-	/**
-	 * TRUE
-	 *
-	 * Returns the boolean TRUE.
-	 *
-	 * Excel Function:
-	 *		=TRUE()
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @return	boolean		True
-	 */
-	public static function TRUE() {
-		return TRUE;
-	}	//	function TRUE()
-
-
-	/**
-	 * FALSE
-	 *
-	 * Returns the boolean FALSE.
-	 *
-	 * Excel Function:
-	 *		=FALSE()
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @return	boolean		False
-	 */
-	public static function FALSE() {
-		return FALSE;
-	}	//	function FALSE()
-
-
-	/**
-	 * LOGICAL_AND
-	 *
-	 * Returns boolean TRUE if all its arguments are TRUE; returns FALSE if one or more argument is FALSE.
-	 *
-	 * Excel Function:
-	 *		=AND(logical1[,logical2[, ...]])
-	 *
-	 *		The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
-	 *			or references that contain logical values.
-	 *
-	 *		Boolean arguments are treated as True or False as appropriate
-	 *		Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
-	 *		If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
-	 *			the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	boolean		The logical AND of the arguments.
-	 */
-	public static function LOGICAL_AND() {
-		// Return value
-		$returnValue = TRUE;
-
-		// Loop through the arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$argCount = -1;
-		foreach ($aArgs as $argCount => $arg) {
-			// Is it a boolean value?
-			if (is_bool($arg)) {
-				$returnValue = $returnValue && $arg;
-			} elseif ((is_numeric($arg)) && (!is_string($arg))) {
-				$returnValue = $returnValue && ($arg != 0);
-			} elseif (is_string($arg)) {
-				$arg = strtoupper($arg);
-				if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
-					$arg = TRUE;
-				} elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
-					$arg = FALSE;
-				} else {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-				$returnValue = $returnValue && ($arg != 0);
-			}