Merge branch 'origin-develop' into develop

BenWallmeyer · Apr 3, 2017 · 65a942a · 65a942a
2 parents f5cec93 + 0b7fc4a
commit 65a942a
Show file tree

Hide file tree

Showing 216 changed files with 3,539 additions and 2,567 deletions.
diff --git a/application/config/address.php b/application/config/address.php
@@ -650,24 +650,24 @@
         'ZA' => 'Zacatecas',
     ),
     'NZ' => array(
-		'E7' => 'Auckland',
-		'E8' => 'Bay of Plenty',
-		'E9' => 'Canterbury',
-		'10' => 'Chatham Islands',
-		'F1' => 'Gisborne',
-		'F2' => "Hawke's Bay",
-		'F3' => 'Manawatu-Wanganui',
-		'F4' => 'Marlborough',
-		'F5' => 'Nelson',
-		'F6' => 'Northland',
-		'F7' => 'Otago',
-		'F8' => 'Southland',
-		'F9' => 'Taranaki',
-		'TAS' => 'Tasman',
-		'G1' => 'Waikato',
-		'G2' => 'Wellington',
-		'G3' => 'West Coast'
-	), 
+        'E7'  => 'Auckland',
+        'E8'  => 'Bay of Plenty',
+        'E9'  => 'Canterbury',
+        '10'  => 'Chatham Islands',
+        'F1'  => 'Gisborne',
+        'F2'  => "Hawke's Bay",
+        'F3'  => 'Manawatu-Wanganui',
+        'F4'  => 'Marlborough',
+        'F5'  => 'Nelson',
+        'F6'  => 'Northland',
+        'F7'  => 'Otago',
+        'F8'  => 'Southland',
+        'F9'  => 'Taranaki',
+        'TAS' => 'Tasman',
+        'G1'  => 'Waikato',
+        'G2'  => 'Wellington',
+        'G3'  => 'West Coast'
+    ), 
     'US' => array(
         'AK' => 'Alaska',
         'AL' => 'Alabama',

diff --git a/application/config/autoload.php b/application/config/autoload.php
@@ -75,7 +75,13 @@
 |
 | Prototype:
 |
-|	$autoload['drivers'] = array('cache');
+|	$autoload['drivers'] = ['cache'];
+|
+| You can also supply an alternative property name to be assigned in
+| the controller:
+|
+|   $autoload['drivers'] = array('cache' => 'cch');
+|
 */
 $autoload['drivers'] = array();
 

diff --git a/application/config/config.php b/application/config/config.php
@@ -11,10 +11,16 @@
 |
 |	http://example.com/
 |
-| If this is not set then CodeIgniter will try guess the protocol, domain
-| and path to your installation. However, you should always configure this
-| explicitly and never rely on auto-guessing, especially in production
-| environments.
+| WARNING: You MUST set this value!
+|
+| If it is not set, then CodeIgniter will try guess the protocol and path
+| your installation, but due to security concerns the hostname will be set
+| to $_SERVER['SERVER_ADDR'] if available, or localhost otherwise.
+| The auto-detection mechanism exists only for convenience during
+| development and MUST NOT be used in production!
+|
+| If you need to allow multiple domains, remember that this file is still
+| a PHP script and you can easily do that on your own.
 |
  */
 $config['base_url']	= '';
@@ -57,7 +63,7 @@
 | This option allows you to add a suffix to all URLs generated by CodeIgniter.
 | For more information please see the user guide:
 |
-| http://codeigniter.com/user_guide/general/urls.html
+| https://codeigniter.com/user_guide/general/urls.html
  */
 $config['url_suffix'] = '';
 
@@ -105,8 +111,8 @@
 | This item allows you to set the filename/classname prefix when extending
 | native libraries.  For more information please see the user guide:
 |
-| http://codeigniter.com/user_guide/general/core_classes.html
-| http://codeigniter.com/user_guide/general/creating_libraries.html
+| https://codeigniter.com/user_guide/general/core_classes.html
+| https://codeigniter.com/user_guide/general/creating_libraries.html
 |
  */
 $config['subclass_prefix'] = 'MY_';
@@ -278,7 +284,7 @@
 | Leave this BLANK unless you would like to set something other than the default
 | application/cache/ directory.  Use a full server path with trailing slash.
 |
- */
+*/
 $config['cache_path'] = APPPATH . 'cache/';
 
 /*
@@ -296,7 +302,7 @@
 |	array('q') = Enabled, but only take into account the specified list
 |	             of query parameters.
 |
- */
+*/
 $config['cache_query_string'] = false;
 
 /*
@@ -307,9 +313,9 @@
 | If you use the Encryption class, you must set an encryption key.
 | See the user guide for more info.
 |
-| http://codeigniter.com/user_guide/libraries/encryption.html
+| https://codeigniter.com/user_guide/libraries/encryption.html
 |
- */
+*/
 $config['encryption_key'] = "58f62e7a5c072527eb00fad7ccb6f547";
 
 /*
@@ -366,7 +372,7 @@
 | Other session cookie settings are shared with the rest of the application,
 | except for 'cookie_prefix' and 'cookie_httponly', which are ignored here.
 |
- */
+*/
 $config['sess_driver'] = 'database';
 $config['sess_cookie_name']		= 'bf_session';
 $config['sess_expiration']		= 7200;
@@ -389,7 +395,7 @@
 | Note: These settings (with the exception of 'cookie_prefix' and
 |       'cookie_httponly') will also affect sessions.
 |
- */
+*/
 $config['cookie_prefix']	= '';
 $config['cookie_domain']	= '';
 $config['cookie_path']		= '/';
@@ -421,7 +427,7 @@
 | WARNING: This feature is DEPRECATED and currently available only
 |          for backwards compatibility purposes!
 |
- */
+*/
 $config['global_xss_filtering'] = false;
 
 /*
@@ -437,7 +443,7 @@
 | 'csrf_expire' = The number in seconds the token should expire.
 | 'csrf_regenerate' = Regenerate token on every submission
 | 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
- */
+*/
 $config['csrf_protection']  = true;
 $config['csrf_token_name'] = 'ci_csrf_token';
 $config['csrf_cookie_name'] = 'ci_csrf_token';
@@ -464,7 +470,7 @@
 | compression to work, nothing can be sent before the output buffer is called
 | by the output class.  Do not 'echo' any values with compression enabled.
 |
- */
+*/
 $config['compress_output'] = false;
 
 /*
@@ -477,7 +483,7 @@
 | reference, or convert it to the configured one timezone. See the 'date
 | helper' page of the user guide for information regarding date handling.
 |
- */
+*/
 $config['time_reference'] = 'utc';
 
 /*
@@ -491,7 +497,7 @@
 |
 | Note: You need to have eval() enabled for this to work.
 |
- */
+*/
 $config['rewrite_short_tags'] = false;
 
 /*

diff --git a/application/config/hooks.php b/application/config/hooks.php
@@ -3,7 +3,7 @@
  * Define "hooks" to extend CI without hacking the core files. Please see the
  * user guide for info:
  *
- * @link http://www.codeigniter.com/user_guide/general/hooks.html
+ * @link https://www.codeigniter.com/user_guide/general/hooks.html
  */
 
 // Store the requested URL, which will sometimes be different from previous URL.

diff --git a/application/config/memcached.php b/application/config/memcached.php
@@ -7,7 +7,7 @@
 | -------------------------------------------------------------------------
 | Your Memcached servers can be specified below.
 |
-|	See: http://codeigniter.com/user_guide/libraries/caching.html#memcached
+|	See: https://codeigniter.com/user_guide/libraries/caching.html#memcached
 |
 */
 $config = array(

diff --git a/application/config/mimes.php b/application/config/mimes.php
@@ -77,7 +77,15 @@
     'jpeg'  =>	array('image/jpeg', 'image/pjpeg'),
     'jpg'   =>	array('image/jpeg', 'image/pjpeg'),
     'jpe'   =>	array('image/jpeg', 'image/pjpeg'),
-    'png'   =>	array('image/png',  'image/x-png'),
+    'jp2'   =>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
+    'j2k'   =>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
+    'jpf'   =>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
+    'jpg2'  =>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
+    'jpx'   =>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
+    'jpm'   =>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
+    'mj2'   =>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
+    'mjp2'  =>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
+    'png'   =>	array('image/png', 'image/x-png'),
     'tiff'  =>	'image/tiff',
     'tif'   =>	'image/tiff',
     'css'   =>	array('text/css', 'text/plain'),
@@ -129,7 +137,8 @@
     '3gp'   =>	array('video/3gp', 'video/3gpp'),
     'mp4'   =>	'video/mp4',
     'm4a'   =>	'audio/x-m4a',
-    'f4v'   =>	'video/mp4',
+    'f4v'   =>	array('video/mp4', 'video/x-f4v'),
+    'flv'   =>	'video/x-flv',
     'webm'  =>	'video/webm',
     'aac'   =>	'audio/x-acc',
     'm4u'   =>	'application/vnd.mpegurl',
@@ -140,7 +149,7 @@
     'au'    =>	'audio/x-au',
     'ac3'   =>	'audio/ac3',
     'flac'  =>	'audio/x-flac',
-    'ogg'   =>	'audio/ogg',
+    'ogg'   =>	array('audio/ogg', 'video/ogg', 'application/ogg'),
     'kmz'   =>	array('application/vnd.google-earth.kmz', 'application/zip', 'application/x-zip'),
     'kml'   =>	array('application/vnd.google-earth.kml+xml', 'application/xml', 'text/xml'),
     'ics'   =>	'text/calendar',

diff --git a/application/config/profiler.php b/application/config/profiler.php
@@ -9,6 +9,6 @@
 | data are displayed when the Profiler is enabled.
 | Please see the user guide for info:
 |
-|	http://codeigniter.com/user_guide/general/profiling.html
+|	https://codeigniter.com/user_guide/general/profiling.html
 |
 */
diff --git a/application/config/routes.php b/application/config/routes.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') || exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------------
@@ -11,29 +11,29 @@
 | and its corresponding controller class/method. The segments in a
 | URL normally follow this pattern:
 |
-|	example.com/class/method/id/
+|   example.com/class/method/id/
 |
 | In some instances, however, you may want to remap this relationship
 | so that a different class/function is called than the one
 | corresponding to the URL.
 |
 | Please see the user guide for complete details:
 |
-|	http://codeigniter.com/user_guide/general/routing.html
+|	https://codeigniter.com/user_guide/general/routing.html
 |
 | -------------------------------------------------------------------------
 | RESERVED ROUTES
 | -------------------------------------------------------------------------
 |
 | There are three reserved routes:
 |
-|	$route['default_controller'] = 'welcome';
+|   $route['default_controller'] = 'welcome';
 |
 | This route indicates which controller class should be loaded if the
 | URI contains no data. In the above example, the "welcome" class
 | would be loaded.
 |
-|	$route['404_override'] = 'errors/page_missing';
+|   $route['404_override'] = 'errors/page_missing';
 |
 | This route will tell the Router which controller/method to use if those
 | provided in the URL cannot be matched to a valid route.

diff --git a/application/config/smileys.php b/application/config/smileys.php
@@ -10,7 +10,7 @@
 | :-) and :) use the same image replacement.
 |
 | Please see user guide for more info:
-| http://codeigniter.com/user_guide/helpers/smiley_helper.html
+| https://codeigniter.com/user_guide/helpers/smiley_helper.html
 |
 */
 $smileys = array(

diff --git a/application/third_party/MX/Loader.php b/application/third_party/MX/Loader.php
@@ -187,7 +187,7 @@ public function library($library, $params = NULL, $object_name = NULL)
 	/** Load an array of libraries **/
 	public function libraries($libraries)
 	{
-		foreach ($libraries as $library => $alias) 
+		foreach ($libraries as $library => $alias)
 		{
 			(is_int($library)) ? $this->library($alias) : $this->library($library, NULL, $alias);
 		}
@@ -235,7 +235,7 @@ class_exists('CI_Model', FALSE) OR load_class('Model', 'core');
 	/** Load an array of models **/
 	public function models($models)
 	{
-		foreach ($models as $model => $alias) 
+		foreach ($models as $model => $alias)
 		{
 			(is_int($model)) ? $this->model($alias) : $this->model($model, $alias);
 		}
@@ -297,7 +297,7 @@ public function view($view, $vars = array(), $return = FALSE)
 			$view = $_view;
 		}
 
-		return $this->_ci_load(array('_ci_view' => $view, '_ci_vars' => $this->_ci_object_to_array($vars), '_ci_return' => $return));
+		return $this->_ci_load(array('_ci_view' => $view, '_ci_vars' => $this->_ci_prepare_view_vars($vars), '_ci_return' => $return));
 	}
 
 	protected function &_ci_get_component($component)
@@ -469,4 +469,4 @@ public function _autoloader($autoload)
 }
 
 /** load the CI class for Modular Separation **/
-(class_exists('CI', FALSE)) OR require dirname(__FILE__).'/Ci.php';
+(class_exists('CI', FALSE)) OR require dirname(__FILE__).'/Ci.php';
diff --git a/bonfire/ci3/core/Benchmark.php b/bonfire/ci3/core/Benchmark.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,10 +28,10 @@
  *
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
+ * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
- * @link	http://codeigniter.com
+ * @link	https://codeigniter.com
  * @since	Version 1.0.0
  * @filesource
  */
@@ -47,7 +47,7 @@
  * @subpackage	Libraries
  * @category	Libraries
  * @author		EllisLab Dev Team
- * @link		http://codeigniter.com/user_guide/libraries/benchmark.html
+ * @link		https://codeigniter.com/user_guide/libraries/benchmark.html
  */
 class CI_Benchmark {