Update CodeIgniter library to 2.1.4 (withdrawn)

OpenVBX/config/autoload.php

@@ -62,7 +62,7 @@
 |	$autoload['plugin'] = array('captcha', 'js_calendar');
 */
 
-$autoload['plugin'] = array();
+// $autoload['plugin'] = array();
 
 
 /*

OpenVBX/config/cache.php

@@ -53,4 +53,4 @@
  */
 if (is_file(APPPATH.'config/cache-local.php')) {
 	include_once(APPPATH.'config/cache-local.php');
-}
+}

OpenVBX/config/config.php

@@ -248,7 +248,7 @@
 | use segment based URLs.
 |
 */
-$config['enable_query_strings'] = TRUE;
+$config['enable_query_strings'] = FALSE;
 $config['controller_trigger'] 	= 'c';
 $config['function_trigger'] 	= 'm';
 $config['directory_trigger'] 	= 'd'; // experimental not currently in use
@@ -317,7 +317,7 @@
 | enabled you MUST set an encryption key.  See the user guide for info.
 |
 */
-$config['encryption_key'] = "";
+$config['encryption_key'] = '';
 
 /*
 |--------------------------------------------------------------------------
@@ -337,6 +337,7 @@
 $config['sess_use_database']	= FALSE;
 $config['sess_table_name']		= 'sessions';
 $config['sess_match_ip']		= FALSE;
+$config['sess_match_useragent'] = FALSE;
 $config['sess_time_to_update'] 	= 300;
 
 /*

OpenVBX/config/foreign_chars.php

@@ -0,0 +1,64 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/*
+| -------------------------------------------------------------------
+| Foreign Characters
+| -------------------------------------------------------------------
+| This file contains an array of foreign characters for transliteration
+| conversion used by the Text helper
+|
+*/
+$foreign_characters = array(
+	'/ä|æ|ǽ/' => 'ae',
+	'/ö|œ/' => 'oe',
+	'/ü/' => 'ue',
+	'/Ä/' => 'Ae',
+	'/Ü/' => 'Ue',
+	'/Ö/' => 'Oe',
+	'/À|Á|Â|Ã|Ä|Å|Ǻ|Ā|Ă|Ą|Ǎ/' => 'A',
+	'/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª/' => 'a',
+	'/Ç|Ć|Ĉ|Ċ|Č/' => 'C',
+	'/ç|ć|ĉ|ċ|č/' => 'c',
+	'/Ð|Ď|Đ/' => 'D',
+	'/ð|ď|đ/' => 'd',
+	'/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě/' => 'E',
+	'/è|é|ê|ë|ē|ĕ|ė|ę|ě/' => 'e',
+	'/Ĝ|Ğ|Ġ|Ģ/' => 'G',
+	'/ĝ|ğ|ġ|ģ/' => 'g',
+	'/Ĥ|Ħ/' => 'H',
+	'/ĥ|ħ/' => 'h',
+	'/Ì|Í|Î|Ï|Ĩ|Ī|Ĭ|Ǐ|Į|İ/' => 'I',
+	'/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı/' => 'i',
+	'/Ĵ/' => 'J',
+	'/ĵ/' => 'j',
+	'/Ķ/' => 'K',
+	'/ķ/' => 'k',
+	'/Ĺ|Ļ|Ľ|Ŀ|Ł/' => 'L',
+	'/ĺ|ļ|ľ|ŀ|ł/' => 'l',
+	'/Ñ|Ń|Ņ|Ň/' => 'N',
+	'/ñ|ń|ņ|ň|ʼn/' => 'n',
+	'/Ò|Ó|Ô|Õ|Ō|Ŏ|Ǒ|Ő|Ơ|Ø|Ǿ/' => 'O',
+	'/ò|ó|ô|õ|ō|ŏ|ǒ|ő|ơ|ø|ǿ|º/' => 'o',
+	'/Ŕ|Ŗ|Ř/' => 'R',
+	'/ŕ|ŗ|ř/' => 'r',
+	'/Ś|Ŝ|Ş|Š/' => 'S',
+	'/ś|ŝ|ş|š|ſ/' => 's',
+	'/Ţ|Ť|Ŧ/' => 'T',
+	'/ţ|ť|ŧ/' => 't',
+	'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ/' => 'U',
+	'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ/' => 'u',
+	'/Ý|Ÿ|Ŷ/' => 'Y',
+	'/ý|ÿ|ŷ/' => 'y',
+	'/Ŵ/' => 'W',
+	'/ŵ/' => 'w',
+	'/Ź|Ż|Ž/' => 'Z',
+	'/ź|ż|ž/' => 'z',
+	'/Æ|Ǽ/' => 'AE',
+	'/ß/'=> 'ss',
+	'/IJ/' => 'IJ',
+	'/ij/' => 'ij',
+	'/Œ/' => 'OE',
+	'/ƒ/' => 'f'
+);
+
+/* End of file foreign_chars.php */
+/* Location: ./application/config/foreign_chars.php */

OpenVBX/config/mimes.php

@@ -10,12 +10,12 @@
 
 $mimes = array(	'hqx'	=>	'application/mac-binhex40',
 				'cpt'	=>	'application/mac-compactpro',
-				'csv'	=>	array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'),
+				'csv'	=>	array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'),
 				'bin'	=>	'application/macbinary',
 				'dms'	=>	'application/octet-stream',
 				'lha'	=>	'application/octet-stream',
 				'lzh'	=>	'application/octet-stream',
-				'exe'	=>	'application/octet-stream',
+				'exe'	=>	array('application/octet-stream', 'application/x-msdownload'),
 				'class'	=>	'application/octet-stream',
 				'psd'	=>	'application/x-photoshop',
 				'so'	=>	'application/octet-stream',
@@ -48,15 +48,15 @@
 				'swf'	=>	'application/x-shockwave-flash',
 				'sit'	=>	'application/x-stuffit',
 				'tar'	=>	'application/x-tar',
-				'tgz'	=>	'application/x-tar',
+				'tgz'	=>	array('application/x-tar', 'application/x-gzip-compressed'),
 				'xhtml'	=>	'application/xhtml+xml',
 				'xht'	=>	'application/xhtml+xml',
 				'zip'	=>  array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
 				'mid'	=>	'audio/midi',
 				'midi'	=>	'audio/midi',
 				'mpga'	=>	'audio/mpeg',
 				'mp2'	=>	'audio/mpeg',
-				'mp3'	=>	array('audio/mpeg', 'audio/mpg'),
+				'mp3'	=>	array('audio/mpeg', 'audio/mpg', 'audio/mpeg3', 'audio/mp3'),
 				'aif'	=>	'audio/x-aiff',
 				'aiff'	=>	'audio/x-aiff',
 				'aifc'	=>	'audio/x-aiff',
@@ -65,8 +65,8 @@
 				'rpm'	=>	'audio/x-pn-realaudio-plugin',
 				'ra'	=>	'audio/x-realaudio',
 				'rv'	=>	'video/vnd.rn-realvideo',
-				'wav'	=>	'audio/x-wav',
-				'bmp'	=>	'image/bmp',
+				'wav'	=>	array('audio/x-wav', 'audio/wave', 'audio/wav'),
+				'bmp'	=>	array('image/bmp', 'image/x-windows-bmp'),
 				'gif'	=>	'image/gif',
 				'jpeg'	=>	array('image/jpeg', 'image/pjpeg'),
 				'jpg'	=>	array('image/jpeg', 'image/pjpeg'),
@@ -93,13 +93,14 @@
 				'avi'	=>	'video/x-msvideo',
 				'movie'	=>	'video/x-sgi-movie',
 				'doc'	=>	'application/msword',
-				'docx'	=>	'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-				'xlsx'	=>	'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+				'docx'	=>	array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip'),
+				'xlsx'	=>	array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip'),
 				'word'	=>	array('application/msword', 'application/octet-stream'),
 				'xl'	=>	'application/excel',
-				'eml'	=>	'message/rfc822'
+				'eml'	=>	'message/rfc822',
+				'json' => array('application/json', 'text/json')
 			);
 
 
 /* End of file mimes.php */
-/* Location: ./system/application/config/mimes.php */
+/* Location: ./application/config/mimes.php */

OpenVBX/config/profiler.php

@@ -0,0 +1,17 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/*
+| -------------------------------------------------------------------------
+| Profiler Sections
+| -------------------------------------------------------------------------
+| This file lets you determine whether or not various sections of Profiler
+| data are displayed when the Profiler is enabled.
+| Please see the user guide for info:
+|
+|	http://codeigniter.com/user_guide/general/profiling.html
+|
+*/
+
+
+
+/* End of file profiler.php */
+/* Location: ./application/config/profiler.php */

OpenVBX/config/routes.php

@@ -41,7 +41,6 @@
 */
 
 $route['default_controller'] = 'iframe';
-$route['scaffolding_trigger'] = '';
 
 $route['install'] = 'install';
 $route['upgrade'] = 'upgrade';

OpenVBX/config/user_agents.php

@@ -48,6 +48,8 @@
 // The order of this array should NOT be changed. Many browsers return
 // multiple browser types so we want to identify the sub-type first.
 $browsers = array(
+					'Flock'				=> 'Flock',
+					'Chrome'			=> 'Chrome',
 					'Opera'				=> 'Opera',
 					'MSIE'				=> 'Internet Explorer',
 					'Internet Explorer'	=> 'Internet Explorer',
@@ -59,8 +61,8 @@
 					'Camino'			=> 'Camino',
 					'Netscape'			=> 'Netscape',
 					'OmniWeb'			=> 'OmniWeb',
-					'Mozilla'			=> 'Mozilla',
 					'Safari'			=> 'Safari',
+					'Mozilla'			=> 'Mozilla',
 					'Konqueror'			=> 'Konqueror',
 					'icab'				=> 'iCab',
 					'Lynx'				=> 'Lynx',
@@ -92,6 +94,7 @@
 					'nokia'				=> "Nokia",
 					'palm'				=> "Palm",
 					'iphone'			=> "Apple iPhone",
+					'ipad'				=> "iPad",
 					'ipod'				=> "Apple iPod Touch",
 					'sony'				=> "Sony Ericsson",
 					'ericsson'			=> "Sony Ericsson",
@@ -111,7 +114,7 @@
 					'benq'				=> "BenQ",
 					'ipaq'				=> "HP iPaq",
 					'mot-'				=> "Motorola",
-					'playstation portable' 	=> "PlayStation Portable",
+					'playstation portable'	=> "PlayStation Portable",
 					'hiptop'			=> "Danger Hiptop",
 					'nec-'				=> "NEC",
 					'panasonic'			=> "Panasonic",
@@ -124,7 +127,7 @@
 
 					// Operating Systems
 					'symbian'				=> "Symbian",
-					'SymbianOS'				=> "SymbianOS", 
+					'SymbianOS'				=> "SymbianOS",
 					'elaine'				=> "Palm",
 					'palm'					=> "Palm",
 					'series60'				=> "Symbian S60",
@@ -149,7 +152,7 @@
 
 					// Fallback
 					'mobile'				=> "Generic Mobile",
-					'wireless' 				=> "Generic Mobile",
+					'wireless'				=> "Generic Mobile",
 					'j2me'					=> "Generic Mobile",
 					'midp'					=> "Generic Mobile",
 					'cldc'					=> "Generic Mobile",
@@ -172,4 +175,4 @@
 				);
 
 /* End of file user_agents.php */
-/* Location: ./system/application/config/user_agents.php */
+/* Location: ./application/config/user_agents.php */

OpenVBX/core/MY_Config.php

@@ -0,0 +1,117 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * "The contents of this file are subject to the Mozilla Public License
+ *  Version 1.1 (the "License"); you may not use this file except in
+ *  compliance with the License. You may obtain a copy of the License at
+ *  http://www.mozilla.org/MPL/
+
+ *  Software distributed under the License is distributed on an "AS IS"
+ *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing rights and limitations
+ *  under the License.
+
+ *  The Original Code is OpenVBX, released June 15, 2010.
+
+ *  The Initial Developer of the Original Code is Twilio Inc.
+ *  Portions created by Twilio Inc. are Copyright (C) 2010.
+ *  All Rights Reserved.
+
+ * Contributor(s):
+ **/
+
+class MY_Config extends CI_Config
+{
+
+	CONST REGEX_REPLACE_DOUBLE_SLASH = '!([^:\s]{1})(//+)!';
+
+	public static function url_trim($url) {
+	    return preg_replace('!([^:\s]{1})(//+)!', '$1/', $url);
+	}
+
+	public function site_url($url)
+	{
+		$ci = &get_instance();
+		if(!empty($ci->router->tenant))
+		{
+			$url = $ci->router->tenant . '/' . $url;
+		}
+
+		return self::url_trim(parent::site_url($url));
+	}
+
+	public function real_site_url($uri)
+	{
+		return self::url_trim(parent::site_url($uri));
+	}
+}
+
+function real_site_url($uri)
+{
+	$CI =& get_instance();
+	return $CI->config->real_site_url($uri);
+}
+
+function asset_url($uri)
+{
+	$CI = &get_instance();
+	$url = $CI->config->real_site_url($uri);
+	$index_page = $CI->config->item('index_page');
+	if(strlen($index_page))
+	{
+		$url = str_replace('/'.$index_page, '', $url);
+	}
+
+	return $url;
+}
+
+function iphone_handler_url($uri)
+{
+	$CI =& get_instance();
+	return 'openvbx://'.$CI->config->item('server_name').'/'.$uri;
+}
+
+function tenant_url($uri, $tenant_id = NULL)
+{
+	$CI = & get_instance();
+	if(!$tenant_id)
+		$tenant_id = $CI->tenant->id;
+	$tenant = $CI->settings->get_tenant_by_id($tenant_id);
+	return $CI->config->real_site_url($tenant->url_prefix . '/' . $uri);
+}
+
+function current_url()
+{
+	$CI =& get_instance();
+	return $CI->config->site_url($CI->uri->uri_string());
+}
+
+function redirect($uri = '', $method = 'location', $http_response_code = 302)
+{
+	if(!headers_sent())
+	{
+		$ci = &get_instance();
+		if(is_object($ci)
+		   && isset($ci->session)
+		   && is_object($ci->session))
+		   $ci->session->persist();
+	}
+	else
+	{
+		error_log('Unable to write session, headers already sent');
+	}
+
+	if ( ! preg_match('#^https?://#i', $uri))
+	{
+		$uri = site_url($uri);
+	}
+
+	switch($method)
+	{
+		case 'refresh'	: header("Refresh:0;url=".$uri);
+			break;
+		default			: header("Location: ".$uri, TRUE, $http_response_code);
+			break;
+	}
+	exit;
+}
+

OpenVBX/libraries/MY_Controller.php → OpenVBX/core/MY_Controller.php

@@ -33,7 +33,7 @@
 require_once BASEPATH . '../OpenVBX/libraries/AppletInstance.php';
 require_once BASEPATH . '../OpenVBX/libraries/Caches/Abstract.php';
 
-class MY_Controller extends Controller
+class MY_Controller extends CI_Controller
 {
 	protected $user_id;
 	protected $section;

OpenVBX/libraries/MY_Model.php → OpenVBX/core/MY_Model.php

@@ -36,7 +36,7 @@ public function __toString()
 	}
 }
 
-class MY_Model extends Model
+class MY_Model extends CI_Model
 {
 	public static $caching = true;
 	protected static $__CLASS__ = __CLASS__;