summaryrefslogtreecommitdiffstats
path: root/system/core
AgeCommit message (Collapse)AuthorFilesLines
2013-02-15Fix some stuff from recent pull requestsAndrey Andreev2-10/+20
2013-02-15Merge pull request #2245 from maltzurra/patch-1Andrey Andreev1-2/+2
Fixed is_https() to avoid incorrect detection.
2013-02-15Merge pull request #2243 from chrispassas/developAndrey Andreev1-1/+6
Update system/core/Log.php
2013-02-15Revert "Update system/core/Common.php"Chris Passas1-2/+2
This reverts commit 8af05ac97513764cc539919e179794df87352c30.
2013-02-15Revert "Update system/core/Log.php"Chris Passas1-9/+2
This reverts commit bbc6ab4736a896be83e3e3d5f8856374ffa2984c.
2013-02-15Revert "Revert "Update system/core/Common.php""Chris Passas1-2/+2
This reverts commit 3de57eaea8510ea9cfd70f063565c24904669c4c.
2013-02-15Revert "Update system/core/Common.php"Chris Passas1-2/+2
This reverts commit 8af05ac97513764cc539919e179794df87352c30.
2013-02-15Update system/core/Common.phpChris Passas1-2/+2
If using nginx instead of apache by default nginx will not populate the $_SERVER['HTTPS'] value.  This change allows falling back to checking the port number of the request to determine if your on SSL or not. The other option is adding the following to your nginx config. fastcgi_param HTTPS on; #some php apps require this to detent https
2013-02-15Update system/core/Log.phpChris Passas1-1/+1
Added a space after the comma on the ltrim().
2013-02-15Various cosmetic fixesvlakoff2-2/+2
2013-02-14Update system/core/Common.phpmaltzurra1-2/+1
2013-02-14Update system/core/Common.phpmaltzurra1-1/+2
2013-02-14Update system/core/Log.phpChris Passas1-1/+4
Don't print no script access code into log file if log file is not .php anymore.
2013-02-14Update system/core/Log.phpChris Passas1-1/+1
Added ltrim() as requested to strip '.' incase it's added by mistake.
2013-02-14Update system/core/Common.phpmaltzurra1-2/+2
Updated is_https() to avoid "NULL" or "0" values to set HTTPS.
2013-02-13Added support for changing the default log file extension from .php to ↵Chris Passas1-0/+2
whatever is preferred. example (.log) This is a follow up to this pull request. https://github.com/EllisLab/CodeIgniter/pull/2243
2013-02-13Update system/core/Log.phpChris Passas1-2/+9
Updated Log.php so that a developer can extend it and change the log file extension. It makes sense to default to .php when logs are in the public web folder.  It would be nice if a developer moves the log file path we have the option to use a standard extension like .log
2013-01-30core comment error.Bo-Yi Wu1-1/+1
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2013-01-29Replace CI_Upload::clean_file_name() usage with CI_Security::sanitize_filename()Andrey Andreev1-1/+9
Also applied @xeptor's fix (a big thanks) to the sanitize_filename() method and added a changelog entry for it - fixes issue #73.
2013-01-29Replace is_file() with the faster file_exists()Andrey Andreev3-8/+10
(where it makes sense) Also: - Implemented caching of configuration arrays for smileys, foreign characters and doctypes. - Implemented cascading-style loading of configuration files (except for library configs, DB and constants.php).
2013-01-28Fix issue #2202 and alter Loader Class docsAndrey Andreev1-1/+1
2013-01-28Libraries' filenames must be named in a ucfirst-like mannerAndrey Andreev1-84/+60
2013-01-28Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developAndrey Andreev1-2/+2
2013-01-28Remove unnecessary defined('ENVIRONMENT') checksAndrey Andreev6-13/+9
As suggested in issue #2134 & PR #2149
2013-01-28Fix newline standardization.Eric Roberts1-2/+2
Signed-off-by: Eric Roberts <eric@cryode.com>
2013-01-25Updated all cases of exit() to return a valid codeDaniel Hunsaker5-11/+27
Specific codes are as follows, but can easily be changed if a different order/breakdown makes more sense: - 0: Success; everything executed as planned - 1: Configuration Error; something is wrong with/in the configuration file(s) - 2: Class Not Found; what it says - 3: Driver Method Unsupported; the method you're trying to use on a Driver doesn't exist - 4: File Not Found; 404 error - 5: Database Error; something is broken in the database somewhere - 6: Invalid Input; the user attempted to submit a request with invlaid characters in 1+ key names 7 through 26 are reserved for future use - 27: Generic Error; generated by show_error() when the status code is >= 100 28 through 127 are errors generated by user applications, normally by using show_error() with a status code below 100 128 through 254 should not be used by applications, as they are reserved by system-level functions - 255: PHP Fatal Error; automatically generated by PHP for fatal errors, and therefore not allowed for our use Status codes below 100 are shifted up by 28 to place them in the user error range. It may make more sense to have these codes left alone and instead shift the CI errors into the 101 through 127 space, but that's not what I opted for here. It would probably also be a good idea to replace the hard-coded numbers with constants or some such, but I was in a bit of a hurry when I made these changes, so I didn't look around for the best place to do this. With proper guidance, I could easily amend this commit with another that uses such constant values. Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
2013-01-21Partially implement PR #2155Andrey Andreev1-0/+2
2013-01-21[ci skip] Manually apply #2162, #2163Andrey Andreev1-1/+1
2013-01-19Support minify table blockPurwandi1-4/+4
2013-01-18Return spacing on var definitions.Eric Roberts1-6/+6
Signed-off-by: Eric Roberts <eric@cryode.com>
2013-01-17Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into ↵Eric Roberts1-4/+4
feature/output-cache-improvements
2013-01-14Replace is_null() with === / !== NULLvlakoff1-4/+4
Exact same behavior, but faster. I also think it's more readable.
2013-01-12Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into ↵Eric Roberts1-2/+2
feature/output-cache-improvements
2013-01-12Improve output cache.Eric Roberts1-10/+24
2013-01-12Implement autoload model aliasing (#2117)Andrey Andreev1-2/+2
2013-01-11URI->_remove_url_suffix() : more efficient codevlakoff1-3/+3
related to #2135
2013-01-10URI->_remove_url_suffix() : suffix has to be at the end of uri_stringvlakoff1-2/+9
related to #2135
2013-01-07minor tweaks and optimizations: minimize function calls in ↵Ted Wood1-7/+7
_fetch_uri_string(); use constant PHP_SAPI instead of function php_sapi_name()
2013-01-06Merge pull request #2120 from mikezilla/developAndrey Andreev1-1/+1
Fix MSIE conditionals regex in minify output
2013-01-06Slight performance improvement by moving some class property initialization ↵Ted Wood1-8/+4
to the class property declarations rather than setting them in the constructor. Subclasses can always override in their own constructor if they wish to. Is there a reason why it was done the way it was done? A policy that I am not aware of?
2013-01-06utilize static function variables in Common::log_message() to "cache" log ↵Ted Wood1-3/+12
threshold and Log library instance to reduce function calls
2013-01-05Fix MSIE conditionals regex in minify outputMichael Dodge1-1/+1
Allows IE conditionals like the following to remain unmodified. ```html <!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]--> ``` Credit to joebert regex from http://www.sitepoint.com/forums/showthread.php?696559-Regex-pattern-to-strip-HTML-comments-but-leave-conditonals&s=3eef4ceb0a59b2fdb946fa56220fb6fd&p=4678083&viewfull=1#post4678083
2013-01-05Revert "Fix MSIE conditionals regex in minify output func"Michael Dodge1-921/+921
This reverts commit 8e12c787042396e172a7448c65bd16c3015ffb0f.
2013-01-05Fix MSIE conditionals regex in minify output funcMichael Dodge1-921/+921
Allows IE conditionals like the following to remain unmodified. <!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]--> Credit to joebert regex from http://www.sitepoint.com/forums/showthread.php?696559-Regex-pattern-to-strip-HTML-comments-but-leave-conditonals&s=3eef4ceb0a59b2fdb946fa56220fb6fd&p=4678083&viewfull=1#post4678083
2013-01-03Replaced array_push function reference with a faster ordinary element ↵and-ers1-1/+1
insertion method
2013-01-03Merge pull request #2106 from danhunsaker/feature/uri-extensibilityAndrey Andreev1-12/+2
Improved extensibility of the URI class
2013-01-01[ci skip] Happy new yearAndrey Andreev17-17/+17
2012-12-31Fixed normalization of headers under ApacheDaniel Hunsaker1-1/+1
The existing header normalization routine converts headers provided by Apache (that is, with `-` in the name instead of `_`) to all lowercase, with the exception of the first character. This is different from the expected result, wherein each word of the header is capitalized. For example, `CONTENT-LENGTH` would normalize to `Content-length` instead of the expected `Content-Length`. The reason for this is that the existing code is only converting underscores to spaces, and leaving hyphens untouched. The fix is to replace hyphens with spaces as well before passing the result through `ucwords()`. That fix is included here. Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
2012-12-31Improved extensibility of the URI class by modifying `_uri_assoc()` to (1) ↵Daniel Hunsaker1-12/+2
not force a specific list of valid options for `$which`, and (2) build the `$segment_array` and `$total_segments` dynamically regardless of the contents of `$which`. Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
2012-12-28Minor improvements to the Output classAndrey Andreev1-10/+14