This repository was archived by the owner on Mar 4, 2021. It is now read-only.
Update CodeIgniter library to 2.1.4 #261
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -62,7 +62,7 @@ | |
| | $autoload['plugin'] = array('captcha', 'js_calendar'); | ||
| */ | ||
|
|
||
| // $autoload['plugin'] = array(); | ||
|
|
||
|
|
||
| /* | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,4 +53,4 @@ | |
| */ | ||
| if (is_file(APPPATH.'config/cache-local.php')) { | ||
| include_once(APPPATH.'config/cache-local.php'); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; | ||
| } | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was this causing a problem or is it obsolete? If obsolete (which, if my quick search is correct, it is) this and its associated documentation comment should just be removed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed, plugins have been deprecated. I will remove the block.