summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2014-02-11Merge branch 'develop' into patch-1Andrew13-147/+1013
Conflicts: system/libraries/Calendar.php
2014-02-11updates per narfbg requestAndrew1-3/+1
I did a bunch of Git tutorials, and (i think) understand a lot more now. this update is to address narfbg comments, and add to pull request.
2014-02-10CI_Security: URL-decode until possibleAndrey Andreev1-1/+5
2014-02-10[ci skip] Fix a typoAndrey Andreev1-1/+1
2014-02-10CI_Security: Expect a backslash as a tag separatorAndrey Andreev1-2/+2
2014-02-10CI_Security: Filter jscript, wscript, vbs, confirm, prompt the same way as ↵Andrey Andreev1-6/+10
javascript, alert
2014-02-10Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developAndrey Andreev2-2/+2
2014-02-10CI_Encryption: Rename 'base64' parameter to 'raw_data' and add docsAndrey Andreev1-2/+2
2014-02-10Remove bottom lineChanthoeun1-0/+1
2014-02-10Remove bottom lineChanthoeun1-1/+0
2014-02-10Remove bottom lineChanthoeun1-0/+1
2014-02-10Remove bottom lineChanthoeun1-1/+0
2014-02-10Correct word peforming to performingChanthoeun1-2/+2
2014-02-09updates per narfbg's commentsAndrew1-5/+6
2014-02-09Merge pull request #2861 from iolufemi/developAndrey Andreev1-1/+1
Fixed Typo in String Helper function
2014-02-09Removed new line at the end of file locally.iolufemi1-1/+1
2014-02-09template as array instead of stringAndrew1-39/+91
library accepts `$config['template']` as array and string, to perform template replacements. updated `$this->temp` var to `$this->replacements` to be less ambiguous about what it does
2014-02-09Merge branch 'develop' into 'feature/encryption'Andrey Andreev9-108/+78
2014-02-09Merge pull request #2866 from darwinel/developAndrey Andreev1-1/+1
Style guide
2014-02-09Style Guidedarwinel1-1/+1
Logical Operators Use of || is discouraged as its clarity on some output devices is low (looking like the number 11 for instance). && is preferred over AND but either are acceptable, and a space should always precede and follow !
2014-02-08[ci skip] Deprecate the Javascript libraryAndrey Andreev1-0/+1
2014-02-08Deprecate CI_Config::system_url()Andrey Andreev1-0/+1
2014-02-08Add method chaining support to CI_TableAndrey Andreev1-34/+38
2014-02-08Add method chaining support to Calendar & Pagination libsAndrey Andreev2-4/+10
2014-02-08Method chaining support for FV set_data(), reset_validation()Andrey Andreev1-2/+5
2014-02-08CI_Input tweaksAndrey Andreev1-65/+20
- Make get_post(), post_get() and server()'s parameter mandatory. - Change default value of parameter to NULL for cookie(), input_stream() and _fetch_from_array() (for consistency with get(), post()). - Delegate Array-vs-single and parameter detection to _fetch_from_array() to overall simplify the code.
2014-02-08Make CI_Email::set_alt_message() parameter mandatory (optional doesn't make ↵Andrey Andreev1-1/+1
sense)
2014-02-08simplify calendar libraryAndrew1-68/+35
it seemed quite strange that we ask users to pass in a template string the we parse with REGEX, to extract key/value pairs, when we can simply ask users for an array. the class still contains default variables for each part of the template. Users can simply pass in an array (instead of a string) when they initialize, $config['template'], which overwrites default values. this cuts down a little on file size by removing parse_template() function. I think arrays are much more straightforward and easy to read than 'encoded' strings. don't have to keep a running list of all template keys like in previous parse_template() function. gets rid of $this->temp[] property and changes it to $this->template[] which is more descriptive when generating output
2014-02-07Fixed Typo in String Helper functionOlanipekun Femi1-2/+2
alnum spelled as alunum in random_string function documentation comment.
2014-02-07Merge branch 'develop' into 'feature/user-guide-cleanup'Andrey Andreev11-19/+41
2014-02-07Merge branch 'develop' into feature/encryptionAndrey Andreev3-4/+3
2014-02-07Use is_really_writable() in captcha helperAndrey Andreev1-1/+1
2014-02-07Use is_really_writable() in get_file_info()Andrey Andreev1-2/+1
2014-02-07CI_Encryption: Optimizations and test casesAndrey Andreev1-26/+18
2014-02-06Typo FixVivek Dinesh1-1/+1
Signed-off-by: Vivek Dinesh <vivekdinesh5@gmail.com>
2014-02-06Merge changes from developAndrey Andreev2-2/+10
2014-02-06Make CI_Session's HMAC comparison time-attack-safeAndrey Andreev1-1/+9
2014-02-06CI_Encryption: CAST-128/CAST5 and RC4/ARCFour compatibilityAndrey Andreev1-15/+50
2014-02-06CI_Encryption: Time-attack-safe HMAC verificationAndrey Andreev1-4/+18
2014-02-05Fix #2856Andrey Andreev1-1/+1
2014-02-05CI_Encryption: HMAC to not be derived from the encryption keyAndrey Andreev1-58/+56
2014-02-05More CI_Encryption improvementsAndrey Andreev1-46/+6
- Make OpenSSL the default driver if available (because MCrypt is stupid). - Require MCRYPT_DEV_URANDOM for the MCrypt availability check (because security; also, incidentally - it's faster that way ;)).
2014-02-05CI_Encryption: More MCrypt/OpenSSL compatibility and get rid of the ↵Andrey Andreev1-17/+69
MCRYPT_MODE_* constants
2014-02-05CI_Encryption: Add Blowfish to compatibility listAndrey Andreev1-7/+11
2014-02-05CI_Encryption: Work around MCrypt's dumb behavior in ECB modeAndrey Andreev1-49/+65
2014-02-05Merge branch 'develop' into feature/encryptionAndrey Andreev1-0/+5
2014-02-05Integrate CI_Encryption into the frameworkAndrey Andreev1-25/+30
TODO: Add documentation in user_guide_src/source/libraries/encryption.rst
2014-02-04CI_Encryption: Remove ARCFour from aliased ciphers due ...Andrey Andreev1-4/+2
Seems like there are some issues with it
2014-02-04CI_Encryption: Fix more errors and add a 'portability' test caseAndrey Andreev1-17/+17
2014-02-04Fix a logical error in CI_EncryptionAndrey Andreev1-3/+3