Commit graph

15349 commits

Author SHA1 Message Date
Marc Würth
af4451de7f Removed superfluous brackets in regex
The outer brackets are just another grouping
2013-02-14 17:24:58 +01:00
Mark
3b02013f7d Merge pull request #1127 from dereuromark/master-strict-comparison
Strict comparison for strings where applicable
2013-02-14 01:10:48 -08:00
mark_story
afbc6d84b0 Merge branch 'nojimage-db-postgres-rename-field'
Fixes #3622
2013-02-13 22:48:56 -05:00
mark_story
f104bd3504 Use simpler asserts.
Refs #3622
2013-02-13 22:43:18 -05:00
nojimage
fbb1a812dd Create rename field statements in postgres
Refs #3622
2013-02-13 22:24:21 -05:00
ADmad
1b22d48a35 trivial optimization 2013-02-13 00:54:03 +05:30
ADmad
213e81bdbd Removing redudant code.
Filelog with scopes needs the file name to be specified so the first `if` covers scopes too.
2013-02-13 00:42:21 +05:30
ADmad
f6215129f6 Fix type casting of string scopes to array in log engines 2013-02-13 00:10:32 +05:30
mark_story
0d9ef854ff Fix FULLTEXT column generation
Fixes #3618
2013-02-12 09:00:57 -05:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
Mark
e0a9dd81f8 Merge pull request #1128 from ravage84/patch-1
Fixed small typo
2013-02-11 14:46:52 -08:00
Marc Würth
019c3aa721 Fixed small typo 2013-02-11 22:21:50 +01:00
ADmad
ee4a116936 Fix coding standards 2013-02-10 12:51:22 +05:30
ADmad
a7c751922d Replace loose comparison with casting to boolean.
In any case AuthComponent::user() returns null not empty array when user isn't logged in.
2013-02-10 12:16:20 +05:30
mark_story
974ac44fb4 Use random iv values in rijndael.
Using fixed iv values has a number of known problems like dictionary
attacks against the cipher key. Use a random iv value for all future
encrpyted values. Provide backwards compatibility for values encrypted
with fixed iv's, and silently upgrade values for enhanced security.
2013-02-09 20:48:27 -05:00
mark_story
613aa19d94 Use constants instead of strings.
Using built-in constants where possible is generally a good idea,
making code less error prone.
2013-02-09 14:14:27 -05:00
mark_story
fee6172958 Update docs for SecurityComponent::requireAuth() 2013-02-09 14:06:24 -05:00
mark_story
e4110b1e01 Deprecate features in SecurityComponent
These features are available in CakeRequest now. The CakeRequest
version is improved as it raises more appropriate exceptions.
2013-02-09 13:57:55 -05:00
ADmad
74b9cdb36f Fix failing tests caused by previous commit 2013-02-09 18:24:27 +05:30
ADmad
a9bbfd80c7 Added type hinting 2013-02-09 18:09:11 +05:30
Mark Story
0e0f521a10 Merge pull request #1122 from ravage84/skel-sync+gitignore
Updated .gitignore, synced app & skel
2013-02-08 07:02:52 -08:00
Marc Würth
514d9675d8 Updated .gitignore, synced app & skel
Added some good practice rules from https://help.github.com/articles/ignoring-files to gitignore
Changed .gitignore to only ignore /app/Config/database.php instead of all files in /app/Config/ (helps to keep it in sync with its skel folder!)

Brought \app\ and \lib\Cake\Console\Templates\skel\ in sync
Fixed various @package annotations in \app\
Fixed various @package annotations in \lib\Cake\Console\Templates\skel\
2013-02-08 15:54:36 +01:00
ADmad
431e610317 Fix broken tests 2013-02-08 19:04:41 +05:30
Graham Weldon
a3702fcf2b More copyright updates 2013-02-08 21:29:18 +09:00
Graham Weldon
26a08c6780 Updated copyright 2013-02-08 21:28:17 +09:00
Graham Weldon
97a60c28c7 Updated copyright and added references to license file for non-standard copyright references 2013-02-08 21:26:18 +09:00
Graham Weldon
66d856d883 Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Graham Weldon
ea4545e914 Formatted CSF address 2013-02-08 21:08:15 +09:00
Graham Weldon
3a0e0181b8 Updated copyright date, added CSF address (Thanks Larry) 2013-02-08 21:06:59 +09:00
Graham Weldon
7b860debe4 This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
mark_story
fb8c2a5e46 Make paths platform dependent.
This fixes issues with the built-in PHP webserver on windows.

Fixes #3608
2013-02-07 20:41:04 -05:00
mark_story
95bc8be4d5 Make path to router script absolute in server shell.
Relative paths fail when you run the server from inside app/Console
or any other path.
2013-02-07 20:32:26 -05:00
Mark
abf1bd8d12 Merge pull request #1105 from dereuromark/master-fix-disabled
Resolve incomplete regression fix for FormHelper selection and disabled.
2013-02-07 07:09:16 -08:00
euromark
d522f412db Fix disabled elements as array for multiple select and make in_array() work properly here, fix same in_array issues for radio elements and move tests correctly - #1105 2013-02-07 15:36:00 +01:00
mark_story
7d72a6f249 Fix issue where bake was missing habtm associations
If the current model is not the first table, habtm associations would be
missed. This was caused by eff4004261

Refs #3532
Fixes #3605
2013-02-06 20:31:15 -05:00
Marc Würth
94ca499dec Brought home.ctp in skel folder in sync 2013-02-06 03:16:48 +01:00
Marc Würth
5ce6542b98 Adjusted link for my docs-patch
https://github.com/cakephp/docs/pull/484

Moved url rewriting section
2013-02-06 03:14:33 +01:00
ADmad
758d717096 Remove banner from default homepage 2013-02-06 01:39:41 +05:30
José Lorenzo Rodríguez
1024a373da Merge pull request #1118 from ravage84/patch-1
Fixed wrong statement in Sqlserver class header
2013-02-05 09:40:40 -08:00
Marc Würth
02e2fbe800 Fixed wrong statement in Sqlserver class header
http://www.php.net/manual/en/ref.pdo-sqlsrv.php

--> PDO_SQLSRV is a driver that implements the PHP Data Objects (PDO) interface to enable access from PHP to MS SQL Server (starting with SQL Server 2005) and SQL Azure databases.
2013-02-05 18:32:40 +01:00
mark_story
0d1ee40f8f Merge branch 'cakeshell-indexes-fix'
Fix schema generation in SQLserver by returning the correct
empty type.

Fixes #3559
2013-02-04 21:24:10 -05:00
Marc Würth
fa118a73a9 Fix for CakeShell schema generate for Sqlsrv
Do not generate invalid schema.php when using SQLServer

Refs #3559
2013-02-04 21:19:56 -05:00
euromark
05546aff32 coding standards 2013-02-04 09:26:50 +01:00
José Lorenzo Rodríguez
00c8c654fb Merge pull request #1114 from ravage84/config-sync
Brought \app\Config and \lib\Cake\Console\Templates\skel\Config in sync
2013-02-03 11:18:47 -08:00
Marc Würth
72765a2afc Brought \app\Config and \lib\Cake\Console\Templates\skel\Config in sync 2013-02-03 20:00:32 +01:00
ravage84
af8b1e22ef Added a note about plugin assets not working witout url rewrite
http://cakephp.lighthouseapp.com/projects/42880/tickets/25-i-installed-but-dont-see-the-images-and-css-of-debugkit

> Plugin assets do not work without url rewriting, this is in the
documentation for CakePHP itself. I guess it could be repeated for this
and every other plugin.

> I could have sworn it was with the Plugin Assets section, but
apparently its not there. Perhaps its just something I know from
experience.

See also:

* http://cakephp.lighthouseapp.com/projects/42648/tickets/1755-plugin-webroot-without-mod_rewrite-problem
* http://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/500-plugin-css-directories-bug#ticket-500-8

Signed-off-by: mark_story <mark@mark-story.com>

Refs #GH-1113
2013-02-03 13:12:29 -05:00
mark_story
77a5adac6a Fix help & default properties file.
Having a totally useless default property makes doing releases hard.
Change it to a sane default.
2013-02-03 13:05:55 -05:00
mark_story
ad3bfd7a5f CakePHP 2.2.7
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (Darwin)
 
 iQEcBAABAgAGBQJRDHxxAAoJEDwHD15Vs66gQbMIAK2hk9RX8iV26mpHhSAc6+BU
 w1WaCO1TMQShqHy8EzS4rCORbj+d8qIbYkVvmUKiMCRQf3GCXj4lsla8oUkW3W4T
 v6OR9txz3kIbEmWuPuAiddbzEmE9IK2YiAFrl1bS8UTMEPzAB/xOf0aqdVlp1t5B
 UHjSaF38RTsYFTItespw9uUOA5l3OtYzsTzTchkIeLxM5aftY4igc2OrUaKLFruR
 Iii7AY6kUM4CghNKt4e1aUkSZ7lYmHEGE7TF8bT2mE/WuL+1ZkR91nvWZoANreaf
 ZFPrWKe6Tl8XZ9T/OctcZEVuinaqELIfotaEKRdAEt8xUb63FW8r0eLLTNcHgy8=
 =+hp4
 -----END PGP SIGNATURE-----

Merge tag '2.2.7'

CakePHP 2.2.7

Conflicts:
	lib/Cake/VERSION.txt
2013-02-01 21:45:25 -05:00
mark_story
6a4160f2ae Update version number to 2.2.7 2013-02-01 21:39:45 -05:00
mark_story
cc361135e0 Add cacert.pem file to pear package.
Fixes #3591
2013-02-01 21:19:50 -05:00