Commit Graph

1807 Commits

Author SHA1 Message Date
Andrew O'Neil
6d5a49e59e #105 - FormAction $extraClass usage
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43606 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-19 01:42:14 +00:00
Ingo Schommer
633821efb4 FEATURE: Added merge() (merged from branches/2.0-inform)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43588 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-18 20:04:02 +00:00
Andrew O'Neil
a0563eaba4 GSOC #99
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-08 21:55:15 +00:00
Ingo Schommer
8dcdce64c2 documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43171 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-07 12:17:33 +00:00
Andrew O'Neil
b723898551 #115 - browscap.ini not set
Use Browscap class (http://garetjax.info/projects/browscap/) instead of get_browser()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-05 01:58:21 +00:00
Andrew O'Neil
a181f7c151 Fixed duplicate getBody()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42999 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-03 00:10:49 +00:00
Andrew O'Neil
fda211156a Fixed reverting of database code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42998 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-03 00:10:03 +00:00
Andrew O'Neil
062c319000 Ignore HTML folder, not pear folder (merged from 2.1.0 branch, r42740)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42926 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:58:26 +00:00
Andrew O'Neil
5e5f200021 Correct comment (merged from 2.1.0 branch, r42718)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42925 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:57:24 +00:00
Andrew O'Neil
ba02a631c9 Added better checking for wonky databases (merged from 2.1.0 branch, r42589)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42924 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:56:43 +00:00
Andrew O'Neil
70db5d36a0 Hack to fix Fatal error: Call to undefined method stdClass::allMethodNames() (merged from 2.0.2 branch, r42505)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42921 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:52:31 +00:00
Andrew O'Neil
bd81e2a2be Optional reporting of versions to SilverStripe (merged from 2.1.0 branch, r42422)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42920 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:51:22 +00:00
Andrew O'Neil
30efb8efc7 #1444 - DataObjectDecorator? Merge Fields HUGE PROBLEM (merged from 2.1.0 branch, r42210)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42918 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:48:37 +00:00
Andrew O'Neil
5062c955e0 Replace blank strings with null - see http://www.silverstripe.com/general-discussion/flat/5050?start=8 (merged from 2.1.0 branch, r42173)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42917 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:46:33 +00:00
Andrew O'Neil
3a6556bbd0 Remove css requirements from core, in case user does not want to include these. (merged from 2.1.0 branch, r42168)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42915 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:40:08 +00:00
Andrew O'Neil
b8b3bab508 Link to the documentation on default pages (merged from 2.1.0 branch, r41730)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42914 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:37:10 +00:00
Andrew O'Neil
717737ed27 Fix error when creating new redirector page (merged from 2.1.0 branch, r41675)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42913 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:36:13 +00:00
Andrew O'Neil
75f598de37 If there's a silverstripe-cache directory in the silverstripe folder, always use that instead of /tmp (merged from 2.1.0 branch, r41578)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42912 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:34:36 +00:00
Andrew O'Neil
7455457964 Fixed php notice (merged from 2.1.0 branch, r41552)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42911 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:33:18 +00:00
Jeremy Shipman
023778c002 fixed virtual page creation. yay!
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42849 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-01 05:23:17 +00:00
Ingo Schommer
07c3a3a32b aoneil: allow the dev servers and test servers to be set via Director (merged from branches/2.1.0)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42736 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 21:50:10 +00:00
Ingo Schommer
77cebb3352 added get_existing_translations(), adapted to coding conventions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 20:47:16 +00:00
Ingo Schommer
eb45e6ec6d added $default_locale and get_translatable_modules()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42578 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-25 22:14:48 +00:00
Ingo Schommer
ff9a292d51 Added the correct English name of some rare languages (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42575 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-25 21:57:23 +00:00
Ingo Schommer
a0723f23f9 Use the standard _manifest_exclude rather than a specific solution (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42574 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-25 21:56:45 +00:00
Sam Minnee
fad2ab3eda Updated and improved StaticExporter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42536 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-25 03:44:07 +00:00
Ingo Schommer
852d09d5f3 fixed wrong usage of type-casting which caused apache to segfault
changed die() to user_error()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42162 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 20:54:31 +00:00
Ingo Schommer
f1285c839d fixed php notices, meaningful heredoc-modifiers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42159 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 20:35:04 +00:00
Ingo Schommer
c4ab634207 Checking for static $enabled when processing $versionableExtensions,
as db/build was failing when Translatable::$enabled=false 
Fixed indentation in augumentDatabase() 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42154 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 17:24:51 +00:00
Ingo Schommer
53016680d5 isset()-check in ready()
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42153 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 17:24:24 +00:00
Ingo Schommer
266ff8a796 Added disable()
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42152 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 17:23:59 +00:00
Ingo Schommer
1b2475d9b2 bfojcapell: Refactoring
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42147 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:58:19 +00:00
Ingo Schommer
39ae17224a bfojcapell: Fixed "Notice: Object of class HTTPResponse to string conversion" that caused nothing to be written in the static file.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42146 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:57:40 +00:00
Ingo Schommer
8038a60842 bfojcapell: Removed unused function
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42145 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:56:28 +00:00
Ingo Schommer
e7bc735774 mlanthaler: The validators for the Member extensions didn't work until now, these changes fix that issue.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42144 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:55:47 +00:00
Ingo Schommer
fd4cfe1a80 mlanthaler: Bugfix: Philipp's changes broke the code... ai ai ai :-)
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42141 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:44:42 +00:00
Ingo Schommer
0edcb97d57 mlanthaler: Bugfix: Added needed checks if the $ancestry variable is set respectively if it is an array.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42140 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:40:57 +00:00
Ingo Schommer
23b88e60f6 bfojcapell: change some old query processing code to a more robust one
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42125 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:22:36 +00:00
Ingo Schommer
835574ffe4 bfojcapell: Added default use of Translatable and an html metatag with the content language
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42123 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:21:09 +00:00
Ingo Schommer
06909765d6 bfojcapell: These changes are required to Translatable versioning support correctly work. Versioned automatically adds this suffix so there is no need to add it here
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42122 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:20:07 +00:00
Ingo Schommer
b90ca2e60f bfojcapell: Added isset
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42121 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:19:31 +00:00
Ingo Schommer
54b5eee2cf bfojcapell: Changes include:
-Lists of locales and languages (added) 
-Text_collector renamed to textcollector (coding conventions) 
-Elijah's patch for ticket #71 
-New functions to simplify interaction with language lists 
-Removelang functionality to completely delete an existing language in sitetree 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42120 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:16:58 +00:00
Ingo Schommer
b90c7c86a0 bfojcapell: These changes add the ability to versionize suffixed tables, that have names that are not dataobject descendants. Some extensions might want to create new tables, for example Translatable creates SiteTree?_lang, and want versioning support to these new tables
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42119 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:15:47 +00:00
Ingo Schommer
e2f61c3649 bfojcapell: Translatable class - support for multilingual content
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42118 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:14:52 +00:00
Ingo Schommer
546d1a36be bfojcapell: i18n part modified to avoid the final semicolon
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:14:28 +00:00
Ingo Schommer
5b330d38c4 bfojcapell: If we are visiting a multilingual site Translatable::get_one should be used
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42116 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:14:01 +00:00
Ingo Schommer
e435705685 bfojcapell: Added LangAttributes? function
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42115 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:12:42 +00:00
Ingo Schommer
4ceb428cb5 bfojcapell: If we are visiting a multilingual site Translatable::get_one should be used
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:12:07 +00:00
Ingo Schommer
c294d023af mlanthaler: Bugfix: Variable was not set as needed.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:00:35 +00:00
Ingo Schommer
cc03b293ad mlanthaler: Added support for the ETag header.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42104 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:54:16 +00:00
Ingo Schommer
994b485d63 mlanthaler: Bugfix: Fixed HTTP::gmt_date and added a new method HTTP::register_modification_timestamp().
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42103 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:53:35 +00:00
Ingo Schommer
8bc94c17ea mlanthaler: Bugfix: "Notice: Trying to get property of non-object in..."
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42102 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:52:56 +00:00
Ingo Schommer
59bc3f83db qhoxie: recent views tweaks
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42101 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:43:22 +00:00
Ingo Schommer
f512d02af7 qhoxie: user activity graphing adjusted
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42100 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:41:31 +00:00
Ingo Schommer
5b886f9ae1 mlanthaler: Bugfix: Fixed "FATAL ERROR: get_browser() [function.get-browser]: browscap ini directive not set" and some E_NOTICE errors.
@Quin: Maybe you should implement some fail-back function for get_browser that evaluates the HTTP user agent header (browscap.ini is often not available!). a
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42099 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:40:27 +00:00
Ingo Schommer
0273d70259 qhoxie: modified chart generation for usability
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42098 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:38:37 +00:00
Ingo Schommer
ea40654253 qhoxie: Statistics controller added for global reporting functions, pageview datatype for recording hit data
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42097 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:37:33 +00:00
Ingo Schommer
40aa45c926 mlanthaler: Director::redirectBack() redirects now to the base URL if neither the referer nor the _REDIRECT_BACK_URL is set.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:34:05 +00:00
Ingo Schommer
e9d323b0d8 mlanthaler: The introduction of the HTTPResponse object broke some of my code. It's fixed now.
There was also a bug in the Director class: Director::redirectBack() didn't work because it stopped the script before outputting the headers. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:31:44 +00:00
Ingo Schommer
3cacc11986 nthaler: Bugfix: Removed "unchecked" set_time_limit call.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42091 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:28:08 +00:00
Ingo Schommer
e286068cc9 mlanthaler: Forgot to remove debug code, sorry :-)
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42076 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 14:43:54 +00:00
Ingo Schommer
e00bc87786 mlanthaler: Added support for default value to this data type.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42075 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 14:43:27 +00:00
Ingo Schommer
8c3a21baa4 fixed bugs introduced during merging
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42068 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:44:10 +00:00
Ingo Schommer
c35c83bad7 elofgren: USABILITY: Make Page URL input field wider as part of fix for http://support.silverstripe.com/gsoc/ticket/35
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42034 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:00:59 +00:00
Ingo Schommer
ffa33aef74 elofgren: *Blacklist bounced newsletter recipient emails by default* in order to comply with spec: 'Bounces report with tickboxes ticked by default (to not send to in the future, unticking resends)'
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42033 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:00:28 +00:00
Ingo Schommer
4622ce38fc elofgren: BUGFIX: Fix Email_BlackList::isBlocked() to check the Email_BlackList.BlockedEmail? field instead of non-existant Email field so that it will actaully return true when an email is blocked.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42025 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:54:32 +00:00
Ingo Schommer
8d89050618 mlanthaler: Refactored the created code since the coding conventions for static methods were changed (ticket #49).
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42019 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:48:38 +00:00
Ingo Schommer
cbe32dca20 elofgren: NEW FEATURE: If the contents of the X-SilverStripeMessageID header is sent to /Email_BounceHandler in the 'SilverStripeMessageID' _GET variable, then it will be logged in the Newsletter_SentRecipient table so that the bounce report will show up on the 'Sent Status Report' tab of the Newsletter. @TODO: Add checkboxes checked by default to the 'Bounced' tab of the 'Mailing List' to not send to in the future (use Email_BlackList?), unticking resends. In addition, add ability to remove bounced emails from mailing list.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41981 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:40:29 +00:00
Ingo Schommer
481781c797 elofgren: Display a 'Sorry, this bounce report has already been logged, not logging this duplicate bounce.' on duplicate bounce logs instead of a blank screen to aid in debugging.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:39:04 +00:00
Ingo Schommer
f3dde5bf6b elofgren: If the access key for Email_BounceHandler is not given, display a 'No "Key" specified' error instead of 'Invalid "Key" specified' to make things clearer.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41979 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:38:41 +00:00
Ingo Schommer
87a0535439 elofgren: Define 'EMAIL_BOUNCEHANDLER_KEY' in sapphire/_config.php and require its value to be sent as 'Key' $_GET var in pings to /Email_BounceHandler to prevent fake email bounce pings.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41977 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:35:09 +00:00
Ingo Schommer
12afad7f1e mlanthaler: Check if TEMP_FOLDER was already defined before defining it so that the user can set the temporary folder himself.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41974 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:23:00 +00:00
Ingo Schommer
9af317a264 mlanthaler: Bugfix: Indexes and defaults were not supported in DataObjectDecorators?.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41973 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:20:31 +00:00
Ingo Schommer
9b75ec925a mlanthaler: Bugfix: Fixed bug "Fatal error: Access to undeclared static property: Controller::$db in ../sapphire/core/Object.php(282) : eval()'d code on line 1". Could be implemented better if we require support for PHP 5.1 because then we can avoid the exception by calling ReflectionClass::hasProperty() respectively ReflectionClass::getStaticPropertyValue() (http://www.php.net/manual/en/language.oop5.reflection.php).
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41972 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:19:54 +00:00
Ingo Schommer
b358c50f2f mlanthaler: Bugfix: If DataObject::add_extension() is used more than once per class, previously the extensions were overwritten and so only the last one was usable.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41951 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:34:40 +00:00
Ingo Schommer
efd51a2b1e mlanthaler: Add support for _manifest_exclude files (http://support.silverstripe.com/gsoc/ticket/36).
Now it is possible to exclude directories from their inclusion by the ManifestBuilder? by simply adding a "_manifest_exclude" file. This file can be placed in any directory and then that directory and all its subdirectories won't be included anymore.
ischommer: merged with current ManifestBuilder, lots of differences 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41950 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:29:52 +00:00
Ingo Schommer
56853999bb elofgren: VAR FIX: Prevent 'auth' from being undefined in HTTP::sendRequest()
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41941 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:07:51 +00:00
Ingo Schommer
5a06cb4684 elofgren: Add note 'The constant 'BOUNCE_EMAIL' should be defined as a valid email address for where bounces should be returned to.' because I was unsure what BOUNCE_EMAIL should be set to until I found reference to it on: http://doc.silverstripe.com/assets/classes/default/_sapphire_core_Email_php.html
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41939 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:06:22 +00:00
Ingo Schommer
49fa87cceb elofgren: VAR FIX: Prevent errors when sending newsletter drafts by initializing variables and calling isset() and empty() where needed in core/Email.php
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41938 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:05:58 +00:00
Ingo Schommer
67743359a1 elofgren: Add needed isset($_GETshowtemplate?) to SSViewer_FromString::process() to prevent errors when sending a newsletter draft.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41937 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:04:33 +00:00
Ingo Schommer
5536aac284 qhoxie: ssviewer foreach interation tracking
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41914 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:07:32 +00:00
Ingo Schommer
408c8d63d5 bfojcapell: better i18n support and more flexibility allowed in templates. Also fixed some possible warnings in 2.02rc1 if more than one language file is found with the same name. ManifestBuilder? now skips language files - they cannot be autoloaded and they are already loaded on demand, so no need to be in the manifest
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41913 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:06:42 +00:00
Ingo Schommer
6b378430f4 sminnee: Changes to keep db/build working on sites that don't yet have RememberLoginToken?
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41910 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 19:42:14 +00:00
Ingo Schommer
5e0a5283b2 fixed bugs introduced by merging branches/gsoc
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41907 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 02:05:23 +00:00
Ingo Schommer
d292e5ccf0 mlantahler: Reverted Sam's changes because now we can exclude directories from the ManifestBuilder? simply by adding a "_manifest_exclude" file.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41906 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:55:55 +00:00
Ingo Schommer
fedd019322 sminnee: Changes to keep db/build working on sites that don't yet have RememberLoginToken?
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41839 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:27:40 +00:00
Ingo Schommer
ef33498a97 elofgren: In SilverStripeNavigator?(), change 'View page in:' to 'Page view:', 'CMS' to 'Edit', and group 'Edit' & 'Draft Site' together. Reason: http://www.silverstripe.com/silverstripe-development/flat/626?showPost=1785#post1785
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41838 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:26:21 +00:00
Ingo Schommer
8d3c8a51d9 elofgren: USABILITY: Change tooltip references to 'stage site' to 'draft site' instead. See: http://www.elijahlofgren.com/silverstripe/consistently-use-draft-site-instead-of-stage-site/
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41837 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:24:15 +00:00
Ingo Schommer
0872f87358 bfojcapell: Renaming of functions and new function prototype of the translator function
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41835 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:21:51 +00:00
Ingo Schommer
3444cf28e8 mlanthaler: Bugfix: Invalid code caused an parse error.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41834 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:19:29 +00:00
Ingo Schommer
e25d8bab65 bfojcapell: Added i18n api comments
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:17:37 +00:00
Ingo Schommer
7e9623f4ac bfojcapell: Added security check, only admins can use text collector
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41830 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:16:41 +00:00
Ingo Schommer
46be50f0a2 bfojcapell: LocaleAPI renamed to i18n
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41829 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:16:11 +00:00
Ingo Schommer
89b737678e bfojcapell: sapphire changes to allow i18n
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41827 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:12:28 +00:00
Ingo Schommer
be2f2243ae mlanthaler: Added permission check for edit rights and changed the labels according to Sigs suggestions.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41823 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:06:49 +00:00
Ingo Schommer
ca366a15c7 mlanthaler: Allow CMS users to limit view/edit access to a page (ticket #8, ticket #9).
Also refactored the SiteTree? class to respect the coding standards. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41821 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:03:12 +00:00
Ingo Schommer
ef54473d1b elofgren: Add 'extraClass' parameter to FormAction? and use it to assign the 'delete' CSS class to the 'Unpublish' and 'Cancel draft changes' buttons so that their background turns red on hover.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41820 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 23:43:02 +00:00
Ingo Schommer
3be2d445f9 elofgren: VAR FIX: Initialize 'has' to an array and use isset() for removeList in ComponentSet::setByIDList() to fix undefined variable errors when saving 'SubscribeForm?' page.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41819 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 23:38:26 +00:00
Ingo Schommer
f9c5f25254 mlanthaler: Bugfix: Make sure *Priority* is set, otherwise an invalid SQL statement will be generated when the page is published (Priority = ).
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 23:33:51 +00:00
Ingo Schommer
e452de966c elofgren: VAR FIX: Fix a large amount of undefined variable errors when creating and editing a 'newsletter subscription form' page by adding needed issets and initializations.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41817 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 23:31:08 +00:00
Ingo Schommer
2a2b1db203 mlanthaler: Small fix to prevent E_NOTICEs.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 23:21:35 +00:00
Ingo Schommer
fa43f70696 mlanthaler: Fixed small typo.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41813 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 23:10:25 +00:00
Ingo Schommer
4d7346825a mlanthaler: Bugfix: Fixed small bug. Also notified the OpenID library maintainer so that they fix the library itself.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41811 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 23:07:23 +00:00
Ingo Schommer
0eada9f41b Refactored getClassManifest() for clearer ignore-rules
added $ignore_files and $ignore_folders

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41810 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 23:03:29 +00:00
Ingo Schommer
17202b859e mlanthaler: Bugfix: Fixed error "Trying to get property of non-object" when the accessed page doesn't exists (passed wrong URL).
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41789 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:17:37 +00:00
Ingo Schommer
fbc375a282 mlanthaler:OpenID authentication works now. To use it simple create an user account without password and put your *complete* OpenID identifier in the email field, e.g. "http://markus-lanthaler.myopenid.com/".
You can get a free OpenID from http://www.myopenid.com  (merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41785 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:10:18 +00:00
Ingo Schommer
4ae8c85d46 mlantahler:Bugfix: Small bugfix to prevent the usage of uninitialized $funcName. Happens if the form is submitted by pressing <enter> instead of pressing the button (at least in IE7). (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41779 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 18:02:03 +00:00
Ingo Schommer
d47e6cf67c mlantahler:Bugfix: Added checks in DataObjectSet::First() and DataObjectSet::Last() to prevent errors on an empty $items array. (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41778 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 17:59:33 +00:00
Ingo Schommer
898d897c9e mlantahler: Bugfix: $URL != $url. The variable names are case-sensitive in PHP (http://www.php.net/manual/en/language.variables.php) (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41777 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 17:47:45 +00:00
Ingo Schommer
9a22699fcc elofgren: Add 2 needed calls to isset(): in Hierarchy::markingFilterMatches() and Notifications::getItems(). Errors were encountered when moving and deleting files in 'Files and Images'. (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41775 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 17:40:29 +00:00
Ingo Schommer
daca02b9a7 mlanthaler: Don't show a error message and don't quit the script when the error was expected (statement with an @ in front to suppress the error). (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41730 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 03:19:34 +00:00
Ingo Schommer
f7646412f4 fixed merging error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41727 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 02:49:36 +00:00
Ingo Schommer
817f279cf1 pkrenn: Added methods needed for testing, namely databaseExists and selectDatabase (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41713 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 01:45:06 +00:00
Ingo Schommer
f912a33b63 pkrenn: Fixing database issues (wrong DB connections, logical errors) (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41712 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 01:44:34 +00:00
Ingo Schommer
b29cc1fbc7 pkrenn: tableList() fixed, indexList() added (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41711 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 01:41:13 +00:00
Ingo Schommer
c892ad24a3 pkrenn: Issues with prepared statements fixed (as they are limited to only a few positions).
fieldList() is nearly finished, only the default values are not working correctly, but that should be done rather soon  (merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41710 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 01:39:37 +00:00
Ingo Schommer
9a516662d0 pkrenn: tableList() has been added, three different queries necessary (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41709 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 01:37:48 +00:00
Ingo Schommer
08b2874a41 pkrenn: getGeneratedID added, fixed class PDOQuery (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41707 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 01:35:54 +00:00
Ingo Schommer
c144bf1aef pkrenn: Code cleaned up and affectedRows() are now supported (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41706 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 01:32:37 +00:00
Ingo Schommer
d7a4e657dc pkrenn: Methods with alter (field, table, index) rewritten - now supporting prepared statements. (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 01:29:09 +00:00
Ingo Schommer
f0b9103de4 pkrenn: Various database updates (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41704 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 01:28:16 +00:00
Ingo Schommer
713802622b pkrenn: Various database updates (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41703 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 01:24:30 +00:00
Ingo Schommer
f2564794bf pkrenn: Basic PDO (PHP Database Object) class, including the connection strings.
Other functions need to be ported from MySQLDatabase.php into PDO syntax. (merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41702 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 01:23:36 +00:00
Ingo Schommer
d9b0843281 lperera: Fixed error message - Convert::raw2html is deprecated. (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41701 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 01:21:37 +00:00
Ingo Schommer
0d80ed0e7b wscott: Patched the director to allow modules to register a function
that will be run on every page load. 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41691 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 00:54:02 +00:00
Ingo Schommer
4cb5bd719a wscott: Added some additional fixes & such to sapphire
TooglePanel? can be created initially closed 
PasswordField? honors a max size passed to it 
SiteTree? / Pages can now have custom meta tags 
Sitemap can deal with pinging google on updates, plus a couple other minor changes 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41690 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 00:47:00 +00:00
Ingo Schommer
5857c4cab6 wscott: Added base code for a working Google Sitemaps support.
Changes in Files: 
* Sitemap.php - controller for the sitemap, new 
* Sitemap.ss - template for the sitemap, new 

* main.php - added director rule 
* SiteTree?.php - added 'priority' database field, cms code to override priority 

TODO: ping google when the sitemap is updated, 

namely when pages are added / removed, or when a priority is overridden 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 00:27:15 +00:00
Jeremy Shipman
a672aa7474 removed call by reference because it was causing a warning that it is depricated use. Refer to 41021
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41510 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-10 00:21:54 +00:00
Matt Peel
3a69b030fb Facebook doesn't like lots of nested tags, we need to close the <li> tags that we open for each database table.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41478 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-09 05:49:21 +00:00
Matt Peel
59147d10d9 Reverted previous change - null is a valid value for an argument, but not for an if statement.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41475 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-09 04:02:54 +00:00
Matt Peel
d0a256e647 $size is always 50 or something else if you set a default value for a function argument.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-09 03:30:53 +00:00
Matt Peel
aaabe7ee94 Removed junk from CVS, unnecessary newlines etc
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41462 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-08 03:18:26 +00:00
Sam Minnee
51c1e7ffec Refactored CMS page-URL accessing to use ->AbsoluteLink(), which can be overridden by defining alternateAbsoluteLink()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41283 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-05 06:42:26 +00:00
Jeremy Shipman
2cafe279a9 Included sapphire/pear in the directories to exclude from manifest builder
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41272 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-05 04:14:09 +00:00
Matt Peel
85b45924a2 When mysql_connect() fails to establish a connection, it means that it couldn't connect, not that it could. :P
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41234 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-04 09:24:55 +00:00
Romain Louis
b5c83d3513 setByIDList function update( notices and ajax problem solving )
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41165 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-03 05:08:33 +00:00
Sam Minnee
8ecb8f0d6a Added '<% if HasPerm(PERM_CODE() %>' to ViewableData for template
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41094 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-31 00:27:34 +00:00
Sam Minnee
c0660c147b Added Director::redirected_to / Controller::redirectedTo() for redirection-detection
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-31 00:26:41 +00:00
Andrew O'Neil
83020ccc03 Removed require_once - it's not needed, and for some reason it makes PHP die on some servers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41079 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-30 22:55:37 +00:00
Sam Minnee
8b582236dd Fix lloadDescendantIDListInto - it needs the & value given on the caller, for some reason.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41019 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-29 06:05:17 +00:00
Sam Minnee
b7ec0fd4df Fix ErrorPage publication
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40998 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-28 22:27:13 +00:00
Sam Minnee
c8f38617cb #write:31 - Fixed redirection from /home/ to /./ in IE6
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-28 02:49:31 +00:00
Sam Minnee
84e01faf1e Refactored newsletter system to put recipient selection and form-fieldset generation into the NewsletterType class, to allow for subclassing NewsletterType to create special system newsletters. [see oriwave2 for an example]
Removed a number of notice-level errors.
Allowed for BOUNCE_EMAIL to not exist and bounce-handling to be disabled.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-28 01:55:45 +00:00
Andrew O'Neil
35665321b9 Rename Pad PaddedImage, to be consistant with CroppedImage
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40948 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-28 01:26:52 +00:00
Sam Minnee
f199dc6cd4 Added docblock headers and removed notice-level errors
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40912 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-27 05:13:43 +00:00
Sam Minnee
79460dadfc Added HTTPResponse::getHeader(), to aid test verification
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40911 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-27 05:09:54 +00:00
Sam Minnee
8bcff1f1d6 Added DataObjectSet::find(), for using a DOS a bit like a PHP map
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40910 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-27 05:09:13 +00:00
Andrew O'Neil
5984be1856 FIxed db/build producing bad SQL when altering indexes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40829 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-24 04:45:21 +00:00
Andrew O'Neil
6600c92be0 Added Pad method to Image
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-24 03:53:37 +00:00
Jeremy Shipman
e386cbae57 created alteration_message method to replace all the code used to echo changes when dbbuild runs, with appropriate colouring.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40809 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-24 03:31:14 +00:00
Jeremy Shipman
46c9efaecc Changed colouring of db/build to be more appropriate for the actual meaning of the messages.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-24 02:47:37 +00:00
Jeremy Shipman
5b865997e0 Changed colouring of db/build to be more appropriate for the actual meaning of the messages.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40801 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-24 02:29:32 +00:00
Andrew O'Neil
acff378781 Fixed some php notices
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40776 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-23 23:50:53 +00:00
Normann Lou
3bc0eaafbb implement validation to tablefield,
fixed bug on validation of datefield, emailfield, numericefield.
make CMS validation enabled.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40755 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-23 05:47:54 +00:00
Andrew O'Neil
30fc2e2a50 Fix redirect back after failing login
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40630 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-21 22:05:40 +00:00
Jeremy Shipman
5fadf838c0 Missing calls to transInitTable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40610 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-21 03:40:09 +00:00
Sam Minnee
3007fa55d5 Added return type hinting to comments
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40596 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-20 23:22:30 +00:00
Sam Minnee
734cf2ad4f Added Director::test() for unit testing
Changed From::testSubmission to use Director::test(), so that it can check whether URLs are correctly set
Made Director::is_ajax() look at the controller data

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40590 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-20 22:39:44 +00:00
Sam Minnee
b5848c9b87 Added HTTPResponse::getLinks() for unit testing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40589 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-20 22:38:37 +00:00
Andrew O'Neil
7a150c48db Publish error page after installation is complete
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40531 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-20 05:21:39 +00:00
Andrew O'Neil
16edb3a4c2 Don't publish ErrorPage on install, as the manifest is not guaranteed to be built yet
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40516 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-20 04:23:51 +00:00
Andrew O'Neil
e4e971a18f Fix db/build problems when creating a new database
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-19 23:47:49 +00:00
Sam Minnee
44b68061d4 Fixed svn:eol-style settings
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-18 02:33:28 +00:00
Andrew O'Neil
7eb1c266a6 Fixed error introduced by Controller modifications
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40453 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-17 23:31:51 +00:00
Sam Minnee
1d3ca74a78 Typo in error message
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40452 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-17 23:14:30 +00:00
Sam Minnee
9f78d4aa5e Fixed bugs in Session implementation of nested controllers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40451 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-17 23:11:43 +00:00
Sam Minnee
9c80282dfd Updated controller model so that sessions are linked to controllers, and current-controller is represented as a stack
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40424 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-17 05:45:15 +00:00
Sam Minnee
ac29eb5b89 Removed notice-level errors
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40422 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-17 05:43:34 +00:00
Andrew O'Neil
ff00abd449 Fixed bugs in db/build (merged from gsoc branch, r40402)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40408 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-17 04:44:44 +00:00
Sam Minnee
23dab38035 Added missing file from r40392
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-17 03:32:14 +00:00
Sam Minnee
8a0688aa5d Added HTTPResponse object, to encapsulate Controller responses for aid testing and other 'quirky' uses of Controllers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-17 03:09:46 +00:00
Sam Minnee
801b94b3bf Small change in versioned to help it work with subsites
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40235 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-16 06:38:15 +00:00
Sam Minnee
ee3c18afcf Added missing changes for r40228
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40234 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-16 06:37:49 +00:00
Sam Minnee
35a87e84b3 Improved the encapsulation of ErrorPage publication
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40229 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-16 06:35:02 +00:00
Sam Minnee
0c977bf6f7 Added insertFirst(), to insert an item at the beginning of the set
Added containsIDs() and onlyContainsIDs(), to perform simple validation of DataObjectSets - useful for unit testing

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40228 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-16 06:34:30 +00:00
Sam Minnee
4566ec10a6 Remove some notice level errors
Added Query::table(), which will return a query as a simple HTML table (for debugging purposes)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40227 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-16 06:33:41 +00:00
Sam Minnee
015a7dec45 Moved extension/decorator system from DataObject to Object, so that any object in the system can be extended
Added doWrite option to duplicate, so that writing can be disabled on a duplicated node
Added augmentBeforeWrite, so that extensions can do more onBeforeWrite stuff
Added set_context_obj() so that objects can give some 'context' to the decorators during particular operations
Created a super-class of DataObjectDecorator, Extension that isn't specifically targetted at DataObjects

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40226 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-16 06:32:49 +00:00
Sam Minnee
c3f124dd95 Let controller extensions define new action MEthods
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40225 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-16 06:27:55 +00:00
Sam Minnee
f97fc4ad65 Added ability for SiteTree extensions to define contentcontrollerInit() or modelascontrollerInit(), to add extra behaviour necessary for some modules (in particular, subsites)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-16 06:27:32 +00:00
Matt Peel
f9b575dff4 Fixed < being on the wrong side of a \n character, causing XHTML errors.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-15 11:54:11 +00:00
Matt Peel
ae8da10aa9 Fixed some spelling mistakes that were causing errors when running tests via SapphireTest.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-15 10:17:18 +00:00
Sam Minnee
186e3466af Fixed bug to support tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40166 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-15 10:13:27 +00:00
Sam Minnee
f55e0bf547 Added PHPUnit unit testing framework
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40129 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-15 06:38:41 +00:00
Sam Minnee
9b1487c376 Dramatically improved performance of db/build
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40035 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-15 02:50:39 +00:00
Andrew O'Neil
7780205ba9 Check for safe mode before setting time limit
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-12 23:59:02 +00:00
Andrew O'Neil
9bedeed772 Fix title being included in $MetaTags when it shouldn't be
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39877 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-12 21:51:51 +00:00
Andrew O'Neil
037d77beca Fixed bug introduced by safe mode checks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39825 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-10 03:19:39 +00:00
Andrew O'Neil
858e877858 Don't show unmoderated comments unless user is admin, add link to accept comment
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-10 01:29:09 +00:00
Andrew O'Neil
bae1e1757d Hide errors in safe mode
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39799 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-09 22:06:39 +00:00
Andrew O'Neil
eb700a58b7 Create a temporary directory called silverstripe-cache in the project folder if access to the tmp folder is restricted
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39797 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-09 22:03:28 +00:00
Andrew O'Neil
455991f84d Removed pointless semicolon
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39659 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-07 01:20:20 +00:00
Andrew O'Neil
bd84ca66a5 Normal requirements fails quietly when there is no css, so themed requirements should do the same
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39638 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-06 23:24:22 +00:00
Andrew O'Neil
f69d610293 Fixed unique URL segment generation when there is a number in the segment - http://www.silverstripe.com/contributions/flat/3528
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39629 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-06 21:36:01 +00:00
Andrew O'Neil
4560135eb9 FIxed db/build authentification errors, merged from gsoc r39559 and r37162
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39609 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-06 00:47:31 +00:00
Andrew O'Neil
5308e76142 Check for string 'true' as well as boolean in MetaTags
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39532 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-01 21:41:09 +00:00
Kirti Nanji
94fc673f97 DataObject decorator bug fixing - addStaticVars() function.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39284 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-26 21:57:01 +00:00
Andrew O'Neil
4b901e21e6 Don't show classes user doesn't have permissions to change to in class dropdown
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-24 21:53:56 +00:00
Hayden Smith
b785d359fa Merged in Markus' changes from [37478].
Tidied up the permission checks in SiteTree->can() so they are easier to follow.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-24 03:43:21 +00:00
Andrew O'Neil
940fc3fc65 Fixed php notice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39160 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-23 23:00:11 +00:00
Andrew O'Neil
4f6a8736e2 Automatically include form css
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39081 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-20 04:32:58 +00:00
Andrew O'Neil
fccd958077 Move stuff out of Page.php into ContentController so they aren't needed at default install
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39074 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-20 04:05:51 +00:00
Andrew O'Neil
78ee5b5d30 Fixed php warning
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39064 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-20 02:17:40 +00:00
Andrew O'Neil
32995ceadc case changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39058 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-20 01:43:00 +00:00
Andrew O'Neil
aa5d463b8b Allow themes to have Includes in there templates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39035 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 23:34:42 +00:00
Andrew O'Neil
97ff1db6f9 Fixed some php notices
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39034 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 23:15:05 +00:00
Andrew O'Neil
fe2314a08e Add SQL_ prefix in place it was missing. (merge from gsoc branch, r38948)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39013 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 21:52:18 +00:00
Hayden Smith
4a5d9b03f8 Moved Sapphire module to open source path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 10:40:28 +00:00