";
- $renderer->writeFooter();
+ public function runRegisteredController(SS_HTTPRequest $request){
+ $controllerClass = null;
+
+ $baseUrlPart = $request->param('Action');
+ $reg = Config::inst()->get(__CLASS__, 'registered_controllers');
+ if(isset($reg[$baseUrlPart])){
+ $controllerClass = $reg[$baseUrlPart]['controller'];
+ }
+
+ if($controllerClass && class_exists($controllerClass)){
+ return $controllerClass::create();
+ }
+
+ $msg = 'Error: no controller registered in '.__CLASS__.' for: '.$request->param('Action');
+ if(Director::is_cli()){
+ // in CLI we cant use httpError because of a bug with stuff being in the output already, see DevAdminControllerTest
+ throw new Exception($msg);
+ }else{
+ $this->httpError(500, $msg);
}
}
+
+
+
+ /*
+ * Internal methods
+ */
+
+ /**
+ * @return array of url => description
+ */
+ protected static function get_links(){
+ $links = array();
+
+ $reg = Config::inst()->get(__CLASS__, 'registered_controllers');
+ foreach($reg as $registeredController){
+ foreach($registeredController['links'] as $url => $desc){
+ $links[$url] = $desc;
+ }
+ }
+ return $links;
+ }
+
+ protected function getRegisteredController($baseUrlPart){
+ $reg = Config::inst()->get(__CLASS__, 'registered_controllers');
+
+ if(isset($reg[$baseUrlPart])){
+ $controllerClass = $reg[$baseUrlPart]['controller'];
+ return $controllerClass;
+ }
+
+ return null;
+ }
+
+
+
+
+ /*
+ * Unregistered (hidden) actions
+ */
+
/**
* Build the default data, calling requireDefaultRecords on all
* DataObject classes
diff --git a/dev/FunctionalTest.php b/dev/FunctionalTest.php
index 45a8ebc3d..885f5d425 100644
--- a/dev/FunctionalTest.php
+++ b/dev/FunctionalTest.php
@@ -110,6 +110,30 @@ class FunctionalTest extends SapphireTest {
}
}
+ /**
+ * Run a test while mocking the base url with the provided value
+ * @param string $url The base URL to use for this test
+ * @param callable $callback The test to run
+ */
+ protected function withBaseURL($url, $callback) {
+ $oldBase = Config::inst()->get('Director', 'alternate_base_url');
+ Config::inst()->update('Director', 'alternate_base_url', $url);
+ $callback($this);
+ Config::inst()->update('Director', 'alternate_base_url', $oldBase);
+ }
+
+ /**
+ * Run a test while mocking the base folder with the provided value
+ * @param string $folder The base folder to use for this test
+ * @param callable $callback The test to run
+ */
+ protected function withBaseFolder($folder, $callback) {
+ $oldFolder = Config::inst()->get('Director', 'alternate_base_folder');
+ Config::inst()->update('Director', 'alternate_base_folder', $folder);
+ $callback($this);
+ Config::inst()->update('Director', 'alternate_base_folder', $oldFolder);
+ }
+
/**
* Submit a get request
* @uses Director::test()
diff --git a/dev/TaskRunner.php b/dev/TaskRunner.php
index ee177863f..6e1b9845a 100644
--- a/dev/TaskRunner.php
+++ b/dev/TaskRunner.php
@@ -86,7 +86,7 @@ class TaskRunner extends Controller {
}
}
- $message(sprintf('The build task "%s" could not be found', $name));
+ $message(sprintf('The build task "%s" could not be found', Convert::raw2xml($name)));
}
/**
diff --git a/dev/TestRunner.php b/dev/TestRunner.php
index 451780a6c..bfb855b3a 100755
--- a/dev/TestRunner.php
+++ b/dev/TestRunner.php
@@ -82,19 +82,24 @@ class TestRunner extends Controller {
* top of the loader stacks.
*/
public static function use_test_manifest() {
+ $flush = true;
+ if(isset($_GET['flush']) && $_GET['flush'] === '0') {
+ $flush = false;
+ }
+
$classManifest = new SS_ClassManifest(
- BASE_PATH, true, isset($_GET['flush'])
+ BASE_PATH, true, $flush
);
SS_ClassLoader::instance()->pushManifest($classManifest, false);
SapphireTest::set_test_class_manifest($classManifest);
SS_TemplateLoader::instance()->pushManifest(new SS_TemplateManifest(
- BASE_PATH, project(), true, isset($_GET['flush'])
+ BASE_PATH, project(), true, $flush
));
Config::inst()->pushConfigStaticManifest(new SS_ConfigStaticManifest(
- BASE_PATH, true, isset($_GET['flush'])
+ BASE_PATH, true, $flush
));
// Invalidate classname spec since the test manifest will now pull out new subclasses for each internal class
@@ -111,15 +116,7 @@ class TestRunner extends Controller {
if (!self::$default_reporter) self::set_reporter(Director::is_cli() ? 'CliDebugView' : 'DebugView');
if(!PhpUnitWrapper::has_php_unit()) {
- die("Please install PHPUnit using pear");
- }
-
- if(!isset($_GET['flush']) || !$_GET['flush']) {
- Debug::message(
- "WARNING: Manifest not flushed. " .
- "Add flush=1 as an argument to discover new classes or files.\n",
- false
- );
+ die("Please install PHPUnit using Composer");
}
}
@@ -392,7 +389,7 @@ class TestRunner extends Controller {
if (count($classList) > 1) {
self::$default_reporter->writeInfo("All Tests", "Running test cases: ",implode(", ", $classList));
} elseif (count($classList) == 1) {
- self::$default_reporter->writeInfo($classList[0], '');
+ self::$default_reporter->writeInfo(reset($classList), '');
} else {
// border case: no tests are available.
self::$default_reporter->writeInfo('', '');
diff --git a/dev/install/install.php5 b/dev/install/install.php5
index f827be986..24bd7d79b 100755
--- a/dev/install/install.php5
+++ b/dev/install/install.php5
@@ -1588,8 +1588,7 @@ ErrorDocument 500 /assets/error-500.html
RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_URI} !\.php$
- RewriteRule .* $modulePath/main.php?url=%1&%{QUERY_STRING} [L]
+ RewriteRule .* $modulePath/main.php?url=%1 [QSA]
TEXT;
diff --git a/dev/phpunit/PhpUnitWrapper.php b/dev/phpunit/PhpUnitWrapper.php
index 6c94f8710..014504ba6 100644
--- a/dev/phpunit/PhpUnitWrapper.php
+++ b/dev/phpunit/PhpUnitWrapper.php
@@ -260,7 +260,7 @@ class PhpUnitWrapper_Exception extends Exception {}
//
if(!PhpUnitWrapper::has_php_unit()) {
/**
- * PHPUnit is a testing framework that can be installed using PEAR.
+ * PHPUnit is a testing framework that can be installed using Composer.
* It's not bundled with SilverStripe, you will need to install it yourself.
*
* @package framework
diff --git a/docs/en/changelogs/3.1.6.md b/docs/en/changelogs/3.1.6.md
index 54d68db30..c7b6c1aaf 100644
--- a/docs/en/changelogs/3.1.6.md
+++ b/docs/en/changelogs/3.1.6.md
@@ -7,3 +7,62 @@
follows the same process as the use of the 'flush' query string parameter, and will redirect
requests containing this argument with a token in the querystring.
Director::isDev, Director::isTest, and Director::isLive no longer have any parameters.
+
+### API Changes
+
+ * 2014-07-28 [0e78e3f](https://github.com/silverstripe/sapphire/commit/0e78e3f) Let update interval of tinymce be changed or disabled (Damian Mooyman)
+ * 2014-07-21 [4453caf](https://github.com/silverstripe/sapphire/commit/4453caf) Let extensions control folder selector in HtmlEditorField_Toolbar (Damian Mooyman)
+ * 2014-07-05 [3c5e51a](https://github.com/silverstripe/sapphire/commit/3c5e51a) Debug::dump in CLI no longer generates HTML. Uses colours. API Column size is configurable in DebugView (Damian Mooyman)
+ * 2014-05-22 [ec325a3](https://github.com/silverstripe/sapphire/commit/ec325a3) Fix HTTPS proxy header detection (Ingo Schommer)
+
+### Features and Enhancements
+
+ * 2014-08-13 [5704ae2](https://github.com/silverstripe/sapphire/commit/5704ae2) Sanitise task name in runTask (Kirk Mayo)
+ * 2014-07-28 [482c23f](https://github.com/silverstripe/silverstripe-cms/commit/482c23f) Adding CMS sitetree filter to see the current 'live' site (Stig Lindqvist)
+ * 2014-06-28 [1d86fe4](https://github.com/silverstripe/sapphire/commit/1d86fe4) allow force resampling on images (Stevie Mayhew)
+ * 2014-07-28 [ac95a87](https://github.com/silverstripe/sapphire/commit/ac95a87) Allow configuring Image backend via yaml. (Jeremy Shipman)
+
+### Bugfixes
+
+ * 2014-08-15 [7e70b8d](https://github.com/silverstripe/sapphire/commit/7e70b8d) Reapply fix for cms crashing due to History.js blindly appending slashes to end of url (Damian Mooyman)
+ * 2014-05-15 [7277dc1](https://github.com/silverstripe/silverstripe-cms/commit/7277dc1) Fix sorting on main ReportAdmin grid ref: CWPBUG-133 (Damian Mooyman)
+ * 2014-06-01 [e535c35](https://github.com/silverstripe/sapphire/commit/e535c35) New JS sprintf and inject replacement functions (colymba)
+ * 2014-08-11 [98907fb](https://github.com/silverstripe/sapphire/commit/98907fb) Fix incorrect parsing of HTML content (Damian Mooyman)
+ * 2014-08-08 [a369094](https://github.com/silverstripe/sapphire/commit/a369094) Fix issue with generating tree data for missing pages (Damian Mooyman)
+ * 2014-08-06 [53dbbb7](https://github.com/silverstripe/silverstripe-cms/commit/53dbbb7) Fix CMSMain::getList to correctly respect filter result Fixes #1064 CMSSiteTreeFilter refactored to allow SS_List of filtered pages to be returned (Damian Mooyman)
+ * 2014-08-06 [1c48cb6](https://github.com/silverstripe/silverstripe-cms/commit/1c48cb6) Fix search range for asset filter (Damian Mooyman)
+ * 2014-06-27 [f19b1ee](https://github.com/silverstripe/sapphire/commit/f19b1ee) declarations matching PHPUnit_Framework_Assert (Michael Parkhill)
+ * 2014-08-04 [b2dac64](https://github.com/silverstripe/sapphire/commit/b2dac64) Fixed escaping of name/value in options of form fields (Sean Harvey)
+ * 2014-08-01 [9281089](https://github.com/silverstripe/sapphire/commit/9281089) Return the promise instead of the whole deferred object. (Mateusz Uzdowski)
+ * 2014-07-31 [d8302a0](https://github.com/silverstripe/sapphire/commit/d8302a0) Add a synthetic event to workaround IE8 issues. (Mateusz Uzdowski)
+ * 2014-07-30 [31c9fb5](https://github.com/silverstripe/sapphire/commit/31c9fb5) Fix the anchor selector to work for internal pages. (Mateusz Uzdowski)
+ * 2014-07-29 [baa2b69](https://github.com/silverstripe/sapphire/commit/baa2b69) Fixing incorrect error message on failed UploadField upload (Sean Harvey)
+ * 2014-07-29 [329dffd](https://github.com/silverstripe/sapphire/commit/329dffd) AssetUploadField hides "generic" file upload messages. (Sean Harvey)
+ * 2014-07-28 [62ed2d0](https://github.com/silverstripe/sapphire/commit/62ed2d0) Fix periodic tinymce layout refresh (Damian Mooyman)
+ * 2014-07-24 [3eefd65](https://github.com/silverstripe/silverstripe-cms/commit/3eefd65) Narrowing site tree search to one date shows no pages (Stig Lindqvist)
+ * 2014-07-20 [333a2aa](https://github.com/silverstripe/sapphire/commit/333a2aa) CMS tree filters doesn't count the correct number of children for deleted pages (Stig Lindqvist)
+ * 2014-07-17 [ac64d25](https://github.com/silverstripe/sapphire/commit/ac64d25) If user is logged out getHtmlEditorConfigForCMS() gets called on non object (Stig Lindqvist)
+ * 2014-07-17 [df6a8b6](https://github.com/silverstripe/sapphire/commit/df6a8b6) #3282: Added ability to subselect with in left or inner join (Senorgeno)
+ * 2014-07-14 [b34aaca](https://github.com/silverstripe/sapphire/commit/b34aaca) Fix several issues around onmatch/onunmatch entwines. (Mateusz Uzdowski)
+ * 2014-07-03 [c329f07](https://github.com/silverstripe/sapphire/commit/c329f07) Fix incorrect common_languages config (Damian Mooyman)
+ * 2014-07-01 [d3c7e41](https://github.com/silverstripe/sapphire/commit/d3c7e41) using isDev or isTest query string no longer triggers basic auth (Damian Mooyman)
+ * 2014-07-01 [a777266](https://github.com/silverstripe/silverstripe-cms/commit/a777266) ensure controller stack is updated when execution halted by an exception. (Will Rossiter)
+ * 2014-06-28 [2c741fe](https://github.com/silverstripe/sapphire/commit/2c741fe) Add support for compositedbfield within many_many_extraFields (Will Rossiter)
+ * 2014-06-16 [3d71a22](https://github.com/silverstripe/sapphire/commit/3d71a22) ClassManifest errors if files contain duplicate class names (fixes #3210) (Loz Calver)
+ * 2014-06-12 [d516063](https://github.com/silverstripe/sapphire/commit/d516063) fix dependency injection stumbling over ViewableData's __isset (Damian Mooyman)
+ * 2014-06-11 [18b6870](https://github.com/silverstripe/sapphire/commit/18b6870) Sanitise the PHP output. (Mateusz Uzdowski)
+ * 2014-06-10 [1e19485](https://github.com/silverstripe/silverstripe-cms/commit/1e19485) Ensure that all child pages are deleted (regardless of ShowInMenu status) under enforce_strict_hierarchy. (Rodney Way)
+ * 2014-05-30 [b8d19ba](https://github.com/silverstripe/silverstripe-cms/commit/b8d19ba) Fix deleted pages redirecting the CMS Update behat tests for Mink 1.6 compatibility (Damian Mooyman)
+ * 2014-05-22 [f9e7d47](https://github.com/silverstripe/sapphire/commit/f9e7d47) fix listview not working with IE9 (Igor)
+ * 2014-05-20 [4a34c36](https://github.com/silverstripe/sapphire/commit/4a34c36) Fix access to protected Session::current_session() Fixes #3144 (Damian Mooyman)
+ * 2014-05-15 [c24a2c2](https://github.com/silverstripe/sapphire/commit/c24a2c2) ArrayList failing to respect the SS_Sortable interface ref: CWPBUG-133 (Damian Mooyman)
+ * 2014-05-15 [ee6e496](https://github.com/silverstripe/sapphire/commit/ee6e496) Fix grid field showing search without search component added ref: CWPBUG-133 (Damian Mooyman)
+ * 2014-05-12 [51c3346](https://github.com/silverstripe/sapphire/commit/51c3346) Fix deprecated use of statics in test cases (Damian Mooyman)
+ * 2014-05-10 [d012b79](https://github.com/silverstripe/sapphire/commit/d012b79) Prevent i18n clearing all SS_Caches (fixes #3122) (Loz Calver)
+ * 2014-05-02 [807755f](https://github.com/silverstripe/sapphire/commit/807755f) TemplateManifest prevent cache collision (Will Morgan)
+
+## Changelog
+
+ * [framework](https://github.com/silverstripe/silverstripe-framework/releases/tag/3.1.6)
+ * [cms](https://github.com/silverstripe/silverstripe-cms/releases/tag/3.1.6)
+ * [installer](https://github.com/silverstripe/silverstripe-installer/releases/tag/3.1.6)
diff --git a/docs/en/changelogs/3.1.7.md b/docs/en/changelogs/3.1.7.md
new file mode 100644
index 000000000..df2c17287
--- /dev/null
+++ b/docs/en/changelogs/3.1.7.md
@@ -0,0 +1,81 @@
+# 3.1.7
+
+## Upgrading
+
+### Authentication
+
+3.1.7 introduces a re-authentication feature, which allows user working in the CMS to quickly re-enter their password
+and continue working should their session expire. This occurs through a popup dialog, which asks the user for their
+current password to continue working.
+
+If using a custom `[api:Authenticator]` class to replace the default MemberAuthenticator, then by default this feature
+will be disabled. If multiple authenticators are used, only supported ones will be available within the CMS.
+
+In order to create a CMS supported version the `Authenticator::supports_cms` and `Authenticator::get_cms_login_form`
+methods should be overridden. See `[api:MemberAuthenticator]` for an example implementation.
+
+Check the documentation at the [Authentication](/topics/authentication) topic.
+
+### Default Admin
+
+In this version the way that the default admin user is managed is slightly changed. Rather than defaulting to the first
+administrator user in the CMS, a user logging in as a default admin will always be assigned to a "Default Admin"
+user with admin privileges. In the past, this user would only be created if no other administrators existed.
+
+## Security
+
+This release includes only minor security related patches.
+
+ * 2014-07-05 [c247dd5](https://github.com/silverstripe/silverstripe-framework/commit/c247dd5) Add default $lock_out_after_incorrect_logins value [SS-2014-016](http://www.silverstripe.org/software/download/security-releases/ss-2014-016).
+ * 2014-10-24 [5d27ea4](https://github.com/silverstripe/sapphire/commit/5d27ea4) File attach handler is no longer accessible if attachment is disallowed or disabled [SS-2014-014](http://www.silverstripe.org/software/download/security-releases/ss-2014-014-front-end-uploadfield-exposes-lists-of-assets).
+
+### API Changes
+
+ * 2014-10-06 [53c40a9](https://github.com/silverstripe/sapphire/commit/53c40a9) Enable re-authentication within the CMS if a user session is lost BUG Resolve issue with error redirection being ignored within CMS BUG Fix issue with invalid securityID being re-emitted on failure (Damian Mooyman)
+ * 2014-08-18 [920978d](https://github.com/silverstripe/sapphire/commit/920978d) Add ClassInfo::table_for_object_field (Will Rossiter)
+ * 2014-06-01 [8fb5e9c](https://github.com/silverstripe/sapphire/commit/8fb5e9c) New JS sprintf and inject replacement functions (colymba)
+ * 2013-12-05 [b273f3b](https://github.com/silverstripe/sapphire/commit/b273f3b) Updated aspect proxy service (Marcus Nyeholt)
+ * 2013-12-05 [b8f4576](https://github.com/silverstripe/sapphire/commit/b8f4576) Use injector to create database class (Marcus Nyeholt)
+
+### Features and Enhancements
+
+ * 2014-08-16 [2b316e7](https://github.com/silverstripe/sapphire/commit/2b316e7) Provide a consistent way of triggering flush (Sean Harvey)
+ * 2014-08-13 [62f4fdb](https://github.com/silverstripe/sapphire/commit/62f4fdb) Sanitise task name in runTask (Kirk Mayo)
+
+### Bugfixes
+
+ * 2014-11-03 [56142b8](https://github.com/silverstripe/silverstripe-cms/commit/56142b8) sprintf missing on exception in SilverStripeNavigator (Sean Harvey)
+ * 2014-10-30 [392ddef](https://github.com/silverstripe/sapphire/commit/392ddef) Image resizing breaks when one of the resized image dimensions is between 0 and 1. Solution: Round up to 1 instead of down to 0. Converted php errors to exceptions in the process. (Jeremy Shipman)
+ * 2014-10-23 [d6e1c51](https://github.com/silverstripe/sapphire/commit/d6e1c51) Prevent JSON response showing when re-opening closed tab (fixes silverstripe/silverstripe-cms#1121) (Loz Calver)
+ * 2014-10-21 [478edfa](https://github.com/silverstripe/sapphire/commit/478edfa) Upload: File versioning with existing files reinsert oldFilePath = relativeFilePath in while loop (Devlin)
+ * 2014-10-20 [49cb38d](https://github.com/silverstripe/sapphire/commit/49cb38d) Fix static call to protected instance method (Damian Mooyman)
+ * 2014-10-20 [8310135](https://github.com/silverstripe/silverstripe-cms/commit/8310135) Broken links on dependent pages tab (micmania1)
+ * 2014-10-17 [20af30e](https://github.com/silverstripe/sapphire/commit/20af30e) GridFieldExportButton exporting only Paginated list when using ArrayList as source (Stephen McMahon)
+ * 2014-10-15 [570f261](https://github.com/silverstripe/sapphire/commit/570f261) Tag-less cache backends error on flush (Loz Calver)
+ * 2014-10-14 [793784e](https://github.com/silverstripe/sapphire/commit/793784e) Fix flushing of SSViewer cache via testing (Damian Mooyman)
+ * 2014-10-09 [bad9aa1](https://github.com/silverstripe/sapphire/commit/bad9aa1) i18n support in LookupField (Milan Jelicanin)
+ * 2014-10-07 [48eb0e6](https://github.com/silverstripe/sapphire/commit/48eb0e6) Deliberately clear partial cache blocks on flush (fixes #1383) (Loz Calver)
+ * 2014-10-01 [776f697](https://github.com/silverstripe/sapphire/commit/776f697) Text::BigSummary() fails with undefined $data when $plain = false (Sean Harvey)
+ * 2014-09-03 [fe42abc](https://github.com/silverstripe/sapphire/commit/fe42abc) CSSContentParser fails if CLI tidy doesn't output anything. (Sean Harvey)
+ * 2014-09-03 [56d84d2](https://github.com/silverstripe/sapphire/commit/56d84d2) MySQLDatabase performs queries on wrong DB connection when using connection $name != 'default' (Damian Mooyman)
+ * 2014-08-26 [cf456d6](https://github.com/silverstripe/sapphire/commit/cf456d6) use @param $colName in column call (Gabrijel Gavranović)
+ * 2014-08-26 [7993875](https://github.com/silverstripe/sapphire/commit/7993875) Sorting a DataQuery over a relation. (Will Rossiter)
+ * 2014-08-22 [8063b34](https://github.com/silverstripe/sapphire/commit/8063b34) Fixing Director::test() failing on BASE_URL prefixed URLs (Sean Harvey)
+ * 2014-08-20 [61c6dee](https://github.com/silverstripe/sapphire/commit/61c6dee) Fixing plural_name messing up singular words ending in "e" (#3251) (Sean Harvey)
+ * 2014-08-15 [79c7276](https://github.com/silverstripe/sapphire/commit/79c7276) Reapply fix for cms crashing due to History.js blindly appending slashes to end of url (Damian Mooyman)
+ * 2014-08-14 [5f1552b](https://github.com/silverstripe/sapphire/commit/5f1552b) Custom label set in summary_fields config gets overridden (Sean Harvey)
+ * 2014-08-14 [7c2eee1](https://github.com/silverstripe/sapphire/commit/7c2eee1) Fix 'undefined index 0' (Damian Mooyman)
+ * 2014-08-11 [69de7e3](https://github.com/silverstripe/sapphire/commit/69de7e3) Fix incorrect parsing of HTML content (Damian Mooyman)
+ * 2014-08-08 [fbc7e7c](https://github.com/silverstripe/sapphire/commit/fbc7e7c) Fix issue with generating tree data for missing pages (Damian Mooyman)
+ * 2014-07-28 [02265dc](https://github.com/silverstripe/sapphire/commit/02265dc) Correctly paddedResize images in IMagickBackend. FIX: Compression quality setting now takes effect. (Jeremy Shipman)
+ * 2014-07-28 [47cc157](https://github.com/silverstripe/sapphire/commit/47cc157) Keep ImagickBackend API consistent with Image_Backend interface and fix color formatting. (Jeremy Shipman)
+ * 2014-07-28 [bf3ad56](https://github.com/silverstripe/sapphire/commit/bf3ad56) Image_Backend -> croppedResize function doesn't include a backgroundColor, therefore this shouldn't be assumed in ImageMagick->croppedResize (Jeremy Shipman)
+ * 2014-06-27 [19e0d5e](https://github.com/silverstripe/sapphire/commit/19e0d5e) declarations matching PHPUnit_Framework_Assert (Michael Parkhill)
+ * 2014-03-12 [96d0874](https://github.com/silverstripe/sapphire/commit/96d0874) Fix issue with inheritance of Injector service configuration (Damian Mooyman)
+ * 2014-01-31 [1661213](https://github.com/silverstripe/sapphire/commit/1661213) Opt-out pf form message escaping (fixes #2796) (Ingo Schommer)
+
+## Changelog
+
+ * [framework](https://github.com/silverstripe/silverstripe-framework/releases/tag/3.1.7)
+ * [cms](https://github.com/silverstripe/silverstripe-cms/releases/tag/3.1.7)
+ * [installer](https://github.com/silverstripe/silverstripe-installer/releases/tag/3.1.7)
diff --git a/docs/en/changelogs/index.md b/docs/en/changelogs/index.md
index bdb543fcf..95869ff14 100644
--- a/docs/en/changelogs/index.md
+++ b/docs/en/changelogs/index.md
@@ -11,6 +11,8 @@ For information on how to upgrade to newer versions consult the [upgrading](/ins
* [3.2.0](3.2.0) - Unreleased
+ * [3.1.7](3.1.7) - 14 November 2014
+ * [3.1.6](3.1.6) - 25 August 2014
* [3.1.5](3.1.5) - 13 May 2014
* [3.1.4](3.1.4) - 8 April 2014
* [3.1.0](3.1.0) - 1 October 2013
@@ -79,8 +81,10 @@ For information on how to upgrade to newer versions consult the [upgrading](/ins
* [2.0.1](2.0.1) - 17 April 2007
* 2.0.0 - 3 February 2007 (initial release)
-## Alpha/beta/release candidate ##
+## Alpha/beta/release candidate
+ * [3.1.7-rc1](rc/3.1.7-rc1) - 8 November 2014
+ * [3.1.6-rc3](rc/3.1.6-rc3) - 18 August 2014
* [3.1.6-rc2](rc/3.1.6-rc2) - 12 August 2014
* [3.1.6-rc1](rc/3.1.6-rc1) - 5 August 2014
* [3.1.5-rc1](rc/3.1.5-rc1) - 7 May 2014
diff --git a/docs/en/changelogs/rc/3.1.6-rc3.md b/docs/en/changelogs/rc/3.1.6-rc3.md
new file mode 100644
index 000000000..10b10d0ab
--- /dev/null
+++ b/docs/en/changelogs/rc/3.1.6-rc3.md
@@ -0,0 +1,16 @@
+# 3.1.6-rc3
+
+### Features and Enhancements
+
+ * 2014-08-13 [5704ae2](https://github.com/silverstripe/sapphire/commit/5704ae2) Sanitise task name in runTask (Kirk Mayo)
+
+### Bugfixes
+
+ * 2014-08-15 [7e70b8d](https://github.com/silverstripe/sapphire/commit/7e70b8d) Reapply fix for cms crashing due to History.js blindly appending slashes to end of url (Damian Mooyman)
+ * 2014-05-15 [7277dc1](https://github.com/silverstripe/silverstripe-cms/commit/7277dc1) Fix sorting on main ReportAdmin grid ref: CWPBUG-133 (Damian Mooyman)
+
+## Downloads
+
+ * [framework](https://github.com/silverstripe/silverstripe-framework/releases/tag/3.1.6-rc3)
+ * [cms](https://github.com/silverstripe/silverstripe-cms/releases/tag/3.1.6-rc3)
+ * [installer](https://github.com/silverstripe/silverstripe-installer/releases/tag/3.1.6-rc3)
diff --git a/docs/en/changelogs/rc/3.1.7-rc1.md b/docs/en/changelogs/rc/3.1.7-rc1.md
new file mode 100644
index 000000000..3e8219d0c
--- /dev/null
+++ b/docs/en/changelogs/rc/3.1.7-rc1.md
@@ -0,0 +1,81 @@
+# 3.1.7-rc1
+
+## Upgrading
+
+### Authentication
+
+3.1.7 introduces a re-authentication feature, which allows user working in the CMS to quickly re-enter their password
+and continue working should their session expire. This occurs through a popup dialog, which asks the user for their
+current password to continue working.
+
+If using a custom `[api:Authenticator]` class to replace the default MemberAuthenticator, then by default this feature
+will be disabled. If multiple authenticators are used, only supported ones will be available within the CMS.
+
+In order to create a CMS supported version the `Authenticator::supports_cms` and `Authenticator::get_cms_login_form`
+methods should be overridden. See `[api:MemberAuthenticator]` for an example implementation.
+
+Check the documentation at the [Authentication](/topics/authentication) topic.
+
+### Default Admin
+
+In this version the way that the default admin user is managed is slightly changed. Rather than defaulting to the first
+administrator user in the CMS, a user logging in as a default admin will always be assigned to a "Default Admin"
+user with admin privileges. In the past, this user would only be created if no other administrators existed.
+
+## Security
+
+This release includes only minor security related patches.
+
+ * 2014-07-05 [c247dd5](https://github.com/silverstripe/silverstripe-framework/commit/c247dd5) Add default $lock_out_after_incorrect_logins value [SS-2014-016](http://www.silverstripe.org/software/download/security-releases/ss-2014-016).
+ * 2014-10-24 [5d27ea4](https://github.com/silverstripe/sapphire/commit/5d27ea4) File attach handler is no longer accessible if attachment is disallowed or disabled [SS-2014-014](http://www.silverstripe.org/software/download/security-releases/ss-2014-014-front-end-uploadfield-exposes-lists-of-assets).
+
+### API Changes
+
+ * 2014-10-06 [53c40a9](https://github.com/silverstripe/sapphire/commit/53c40a9) Enable re-authentication within the CMS if a user session is lost BUG Resolve issue with error redirection being ignored within CMS BUG Fix issue with invalid securityID being re-emitted on failure (Damian Mooyman)
+ * 2014-08-18 [920978d](https://github.com/silverstripe/sapphire/commit/920978d) Add ClassInfo::table_for_object_field (Will Rossiter)
+ * 2014-06-01 [8fb5e9c](https://github.com/silverstripe/sapphire/commit/8fb5e9c) New JS sprintf and inject replacement functions (colymba)
+ * 2013-12-05 [b273f3b](https://github.com/silverstripe/sapphire/commit/b273f3b) Updated aspect proxy service (Marcus Nyeholt)
+ * 2013-12-05 [b8f4576](https://github.com/silverstripe/sapphire/commit/b8f4576) Use injector to create database class (Marcus Nyeholt)
+
+### Features and Enhancements
+
+ * 2014-08-16 [2b316e7](https://github.com/silverstripe/sapphire/commit/2b316e7) Provide a consistent way of triggering flush (Sean Harvey)
+ * 2014-08-13 [62f4fdb](https://github.com/silverstripe/sapphire/commit/62f4fdb) Sanitise task name in runTask (Kirk Mayo)
+
+### Bugfixes
+
+ * 2014-11-03 [56142b8](https://github.com/silverstripe/silverstripe-cms/commit/56142b8) sprintf missing on exception in SilverStripeNavigator (Sean Harvey)
+ * 2014-10-30 [392ddef](https://github.com/silverstripe/sapphire/commit/392ddef) Image resizing breaks when one of the resized image dimensions is between 0 and 1. Solution: Round up to 1 instead of down to 0. Converted php errors to exceptions in the process. (Jeremy Shipman)
+ * 2014-10-23 [d6e1c51](https://github.com/silverstripe/sapphire/commit/d6e1c51) Prevent JSON response showing when re-opening closed tab (fixes silverstripe/silverstripe-cms#1121) (Loz Calver)
+ * 2014-10-21 [478edfa](https://github.com/silverstripe/sapphire/commit/478edfa) Upload: File versioning with existing files reinsert oldFilePath = relativeFilePath in while loop (Devlin)
+ * 2014-10-20 [49cb38d](https://github.com/silverstripe/sapphire/commit/49cb38d) Fix static call to protected instance method (Damian Mooyman)
+ * 2014-10-20 [8310135](https://github.com/silverstripe/silverstripe-cms/commit/8310135) Broken links on dependent pages tab (micmania1)
+ * 2014-10-17 [20af30e](https://github.com/silverstripe/sapphire/commit/20af30e) GridFieldExportButton exporting only Paginated list when using ArrayList as source (Stephen McMahon)
+ * 2014-10-15 [570f261](https://github.com/silverstripe/sapphire/commit/570f261) Tag-less cache backends error on flush (Loz Calver)
+ * 2014-10-14 [793784e](https://github.com/silverstripe/sapphire/commit/793784e) Fix flushing of SSViewer cache via testing (Damian Mooyman)
+ * 2014-10-09 [bad9aa1](https://github.com/silverstripe/sapphire/commit/bad9aa1) i18n support in LookupField (Milan Jelicanin)
+ * 2014-10-07 [48eb0e6](https://github.com/silverstripe/sapphire/commit/48eb0e6) Deliberately clear partial cache blocks on flush (fixes #1383) (Loz Calver)
+ * 2014-10-01 [776f697](https://github.com/silverstripe/sapphire/commit/776f697) Text::BigSummary() fails with undefined $data when $plain = false (Sean Harvey)
+ * 2014-09-03 [fe42abc](https://github.com/silverstripe/sapphire/commit/fe42abc) CSSContentParser fails if CLI tidy doesn't output anything. (Sean Harvey)
+ * 2014-09-03 [56d84d2](https://github.com/silverstripe/sapphire/commit/56d84d2) MySQLDatabase performs queries on wrong DB connection when using connection $name != 'default' (Damian Mooyman)
+ * 2014-08-26 [cf456d6](https://github.com/silverstripe/sapphire/commit/cf456d6) use @param $colName in column call (Gabrijel Gavranović)
+ * 2014-08-26 [7993875](https://github.com/silverstripe/sapphire/commit/7993875) Sorting a DataQuery over a relation. (Will Rossiter)
+ * 2014-08-22 [8063b34](https://github.com/silverstripe/sapphire/commit/8063b34) Fixing Director::test() failing on BASE_URL prefixed URLs (Sean Harvey)
+ * 2014-08-20 [61c6dee](https://github.com/silverstripe/sapphire/commit/61c6dee) Fixing plural_name messing up singular words ending in "e" (#3251) (Sean Harvey)
+ * 2014-08-15 [79c7276](https://github.com/silverstripe/sapphire/commit/79c7276) Reapply fix for cms crashing due to History.js blindly appending slashes to end of url (Damian Mooyman)
+ * 2014-08-14 [5f1552b](https://github.com/silverstripe/sapphire/commit/5f1552b) Custom label set in summary_fields config gets overridden (Sean Harvey)
+ * 2014-08-14 [7c2eee1](https://github.com/silverstripe/sapphire/commit/7c2eee1) Fix 'undefined index 0' (Damian Mooyman)
+ * 2014-08-11 [69de7e3](https://github.com/silverstripe/sapphire/commit/69de7e3) Fix incorrect parsing of HTML content (Damian Mooyman)
+ * 2014-08-08 [fbc7e7c](https://github.com/silverstripe/sapphire/commit/fbc7e7c) Fix issue with generating tree data for missing pages (Damian Mooyman)
+ * 2014-07-28 [02265dc](https://github.com/silverstripe/sapphire/commit/02265dc) Correctly paddedResize images in IMagickBackend. FIX: Compression quality setting now takes effect. (Jeremy Shipman)
+ * 2014-07-28 [47cc157](https://github.com/silverstripe/sapphire/commit/47cc157) Keep ImagickBackend API consistent with Image_Backend interface and fix color formatting. (Jeremy Shipman)
+ * 2014-07-28 [bf3ad56](https://github.com/silverstripe/sapphire/commit/bf3ad56) Image_Backend -> croppedResize function doesn't include a backgroundColor, therefore this shouldn't be assumed in ImageMagick->croppedResize (Jeremy Shipman)
+ * 2014-06-27 [19e0d5e](https://github.com/silverstripe/sapphire/commit/19e0d5e) declarations matching PHPUnit_Framework_Assert (Michael Parkhill)
+ * 2014-03-12 [96d0874](https://github.com/silverstripe/sapphire/commit/96d0874) Fix issue with inheritance of Injector service configuration (Damian Mooyman)
+ * 2014-01-31 [1661213](https://github.com/silverstripe/sapphire/commit/1661213) Opt-out pf form message escaping (fixes #2796) (Ingo Schommer)
+
+## Changelog
+
+ * [framework](https://github.com/silverstripe/silverstripe-framework/releases/tag/3.1.7-rc1)
+ * [cms](https://github.com/silverstripe/silverstripe-cms/releases/tag/3.1.7-rc1)
+ * [installer](https://github.com/silverstripe/silverstripe-installer/releases/tag/3.1.7-rc1)
diff --git a/docs/en/changelogs/rc/3.2.0.md b/docs/en/changelogs/rc/3.2.0.md
index 3e0489ac9..2f6f57909 100644
--- a/docs/en/changelogs/rc/3.2.0.md
+++ b/docs/en/changelogs/rc/3.2.0.md
@@ -12,8 +12,9 @@ Otherwise, you'll need to include the module yourself
### Framework
* API: Removed URL routing by controller name
- * Security: The multiple authenticator login page should now be styled manually - i.e. without the default jQuery UI layout. A new template, Security_MultiAuthenticatorLogin.ss is available.
- * Security: This controller's templates can be customised by overriding the `getTemplate` function.
+ * Security: The multiple authenticator login page should now be styled manually - i.e. without the default jQuery
+ UI layout. A new template, Security_MultiAuthenticatorLogin.ss is available.
+ * Security: This controller's templates can be customised by overriding the `getTemplatesFor` function.
* API: Form and FormField ID attributes rewritten.
## Details
diff --git a/docs/en/howto/cache-control.md b/docs/en/howto/cache-control.md
index a2b4de40d..e8a6184f9 100644
--- a/docs/en/howto/cache-control.md
+++ b/docs/en/howto/cache-control.md
@@ -16,10 +16,10 @@ Default setting:
Overriding these defaults
* `[api:HTTP::$cache_age]` can be used to set the max-age component of the cache-control line, in seconds.
-Set it to 0 to disable caching; the "no-cache" clause in `Cache-Control` and `Pragma` will be included.
+Set it to 0 to disable caching; the "no-cache" clause in `Cache-Control` and `Pragma` will be included. It works only for live sites, if `SS_ENVIRONMENT_TYPE` is set to "dev" `[api:HTTP::$cache_age]` will be always overridden with 0.
* `[api:HTTP::register_modification_date()]` can be used to set the modification date to something more recent than the default.
How it works:
* `[api:DataObject::__construct()]` calls `[api:HTTP::register_modification_date()]` whenever a record comes from the database
- * `Controller::run()` calls `[api:HTTP::add_cache_headers()]` before outputting the page
\ No newline at end of file
+ * `Controller::run()` calls `[api:HTTP::add_cache_headers()]` before outputting the page
diff --git a/docs/en/howto/phpunit-configuration.md b/docs/en/howto/phpunit-configuration.md
index 4ac184feb..92db5bfbe 100644
--- a/docs/en/howto/phpunit-configuration.md
+++ b/docs/en/howto/phpunit-configuration.md
@@ -76,17 +76,31 @@ Example `mysite/_config.php`:
if($db == 'sqlite3') $databaseConfig['type'] = 'SQLite3Database';
}
}
-
+
You can either use the database on a single invocation:
phpunit framework/tests "" db=sqlite3
-
+
or through a `` flag in your `phpunit.xml` (see [Appenix C: "Setting PHP INI settings"](http://www.phpunit.de/manual/current/en/appendixes.configuration.html)):
-
+
+
+
+
+Note that on every test run, the manifest is flushed to avoid any bugs where a test doesn't clean up after
+itself properly. You can override that behaviour by passing `flush=0` to the test command:
+
+ phpunit framework/tests flush=0
+
+Alternatively, you can set the var in your `phpunit.xml` file:
+
+
+
+
+
diff --git a/docs/en/installation/composer.md b/docs/en/installation/composer.md
index c74654d49..30c8f59ae 100644
--- a/docs/en/installation/composer.md
+++ b/docs/en/installation/composer.md
@@ -40,7 +40,7 @@ If you already have composer installed you can update it by running:
Composer updates regularly, so you should run this command fairly often. These instructions assume you are running the latest version.
## Installing Composer on Windows WAMP
-For those that use WAMP as a development environment, [detailed information is available on installing using Composer.](/windows-wamp#install-wamp)
+For those that use WAMP as a development environment, [detailed information is available on installing using Composer.](/installation/windows-wamp#install-wamp)
## Create a new site
diff --git a/docs/en/installation/index.md b/docs/en/installation/index.md
index e1d4a6fed..66c2a3ee0 100644
--- a/docs/en/installation/index.md
+++ b/docs/en/installation/index.md
@@ -28,6 +28,7 @@ To run SilverStripe on Linux/Unix, set up one of the following web servers:
* [Install using Apache](webserver) - our preferred platform
* [Install using Lighttpd](lighttpd) - fast, but a bit tricker to get going
* [Install using Nginx](nginx) - Super fast at serving static files. Great for large traffic sites.
+* [Install using nginx and HHVM](nginx-hhvm) - nginx and [HHVM](http://hhvm.com/) as a faster alternative to PHP
### Windows
diff --git a/docs/en/installation/nginx-hhvm.md b/docs/en/installation/nginx-hhvm.md
new file mode 100644
index 000000000..c981290bc
--- /dev/null
+++ b/docs/en/installation/nginx-hhvm.md
@@ -0,0 +1,107 @@
+# nginx and HHVM
+
+[HHVM](http://hhvm.com/) is a faster alternative to PHP, in that it runs in a virtual machine
+and uses just-in-time (JIT) compilation to achieve better performance over standard PHP.
+
+Installation on Debian or Ubuntu is relatively straightforward, in that HHVM already provide
+packages available to use.
+
+Install apt sources on Debian 7 (wheezy):
+
+ wget -O - http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
+ echo deb http://dl.hhvm.com/debian wheezy main | sudo tee /etc/apt/sources.list.d/hhvm.list
+
+Install apt sources on Ubuntu 14.04 (trusty):
+
+ wget -O - http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
+ echo deb http://dl.hhvm.com/ubuntu trusty main | sudo tee /etc/apt/sources.list.d/hhvm.list
+
+Now install the required packages:
+
+ sudo apt-get update
+ sudo apt-get install hhvm libgmp-dev libmemcached-dev
+
+Start HHVM automatically on boot:
+
+ sudo update-rc.d hhvm defaults
+
+Please see [Prebuilt Packages for HHVM on HHVM wiki](https://github.com/facebook/hhvm/wiki/Prebuilt%20Packages%20for%20HHVM) for more
+installation options.
+
+Assuming you already have nginx installed, you can then run a script to enable support for
+nginx and/or apache2 depending on whether they are installed or not:
+
+ sudo /usr/share/hhvm/install_fastcgi.sh
+
+For nginx, this will place a file at `/etc/nginx/hhvm.conf` which you can use to include in
+your nginx server definitions to provide support for PHP requests.
+
+In order to get SilverStripe working, you need to add some custom nginx configuration.
+
+Create `/etc/nginx/silverstripe.conf` and add this configuration:
+
+ fastcgi_buffer_size 32k;
+ fastcgi_busy_buffers_size 64k;
+ fastcgi_buffers 4 32k;
+
+ location / {
+ try_files $uri /framework/main.php?url=$uri&$query_string;
+ }
+
+ error_page 404 /assets/error-404.html;
+ error_page 500 /assets/error-500.html;
+
+ location ^~ /assets/ {
+ try_files $uri =404;
+ }
+ location ~ /(mysite|framework|cms)/.*\.(php|php3|php4|php5|phtml|inc)$ {
+ deny all;
+ }
+ location ~ /\.. {
+ deny all;
+ }
+ location ~ \.ss$ {
+ satisfy any;
+ allow 127.0.0.1;
+ deny all;
+ }
+ location ~ web\.config$ {
+ deny all;
+ }
+ location ~ \.ya?ml$ {
+ deny all;
+ }
+ location ^~ /vendor/ {
+ deny all;
+ }
+ location ~* /silverstripe-cache/ {
+ deny all;
+ }
+ location ~* composer\.(json|lock)$ {
+ deny all;
+ }
+ location ~* /(cms|framework)/silverstripe_version$ {
+ deny all;
+ }
+
+The above script passes all non-static file requests to `/framework/main.php` in the webroot which relies on
+`hhvm.conf` being included prior so that php requests are handled.
+
+Now in your nginx `server` configuration you can then include the `hhvm.conf` and `silverstripe.conf` files
+to complete the configuration required for PHP/HHVM and SilverStripe.
+
+e.g. `/etc/nginx/sites-enabled/mysite`:
+
+ server {
+ listen 80;
+ root /var/www/mysite;
+ server_name www.mysite.com;
+
+ error_log /var/log/nginx/mysite.error.log;
+ access_log /var/log/nginx/mysite.access.log;
+
+ include /etc/nginx/hhvm.conf;
+ include /etc/nginx/silverstripe.conf;
+ }
+
+For more information on nginx configuration, please see the [nginx installation](nginx) page.
diff --git a/docs/en/misc/contributing/code.md b/docs/en/misc/contributing/code.md
index a367d7ab1..feba60564 100644
--- a/docs/en/misc/contributing/code.md
+++ b/docs/en/misc/contributing/code.md
@@ -98,19 +98,17 @@ After you have edited the file, GitHub will offer to create a pull request for y
* Adhere to our [coding conventions](/misc/coding-conventions)
* If your patch is extensive, discuss it first on the [silverstripe-dev google group](https://groups.google.com/group/silverstripe-dev) (ideally before doing any serious coding)
-* When working on existing tickets, assign them to you and provide status updates through ticket comments
-* Check your patches against the latest "trunk" or "master", as well as the latest release.
-Please not that the latest stable release will often not be sufficient! (of all modules)
-* Provide complete [unit test coverage](/topics/testing) - depending on the complexity of your work, this is a required
-step.
-* Do not set milestones. If you think your patch should be looked at with priority, mark it as "critical".
+* When working on existing tickets, provide status updates through ticket comments
+* Check your patches against the "master" branch, as well as the latest release branch
+* Write [unit tests](/topics/testing)
+* Write [Behat integration tests](https://github.com/silverstripe-labs/silverstripe-behat-extension) for any interface changes
* Describe specifics on how to test the effects of the patch
* It's better to submit multiple patches with separate bits of functionality than a big patch containing lots of
changes
+* Only submit a pull request for work you expect to be ready to merge. Work in progress is best discussed in an issue, or on your own repository fork.
* Document your code inline through [PHPDoc](http://en.wikipedia.org/wiki/PHPDoc) syntax. See our
[API documentation](http://api.silverstripe.org/3.1/) for good examples.
-* Also check and update documentation on [doc.silverstripe.org](http://doc.silverstripe.org). Check for any references to functionality deprecated or extended through your patch. Documentation changes should be included in the patch.
-* We will attribute the change to you whereever possible (git does this automatically for pull requests)
+* Check and update documentation on [doc.silverstripe.org](http://doc.silverstripe.org). Check for any references to functionality deprecated or extended through your patch. Documentation changes should be included in the patch.
* If you get stuck, please post to the [forum](http://silverstripe.org/forum) or for deeper core problems, to the [core mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)
* When working with the CMS, please read the ["CMS Architecture Guide"](/reference/cms-architecture) first
@@ -137,7 +135,7 @@ Same goes for version control plumbing like merges, file renames or reverts.
Further guidelines:
* Each commit should form a logical unit - if you fix two unrelated bugs, commit each one separately
-* If you are fixing a ticket from our [bugtracker](https://github.com/silverstripe/sapphire/issues), please append `(fixes #)`
+* If you are fixing a issue from our bugtracker ([cms](http://github.com/silverstripe/silverstripe-framework) and [framework](http://github.com/silverstripe/silverstripe-framework)), please append `(fixes #)`
* When fixing issues across repos (e.g. a commit to `framework` fixes an issue raised in the `cms` bugtracker),
use `(fixes silverstripe/silverstripe-cms#)` ([details](https://github.com/blog/1439-closing-issues-across-repositories))
* If your change is related to another commit, reference it with its abbreviated commit hash.
diff --git a/docs/en/misc/contributing/issues.md b/docs/en/misc/contributing/issues.md
index 7b16758a5..b98726255 100644
--- a/docs/en/misc/contributing/issues.md
+++ b/docs/en/misc/contributing/issues.md
@@ -11,6 +11,7 @@ well written bug reports can be half of the solution already!
* [CMS Bugtracker](https://github.com/silverstripe/silverstripe-cms/issues)
* [Documentation Bugtracker](https://github.com/silverstripe/silverstripe-framework/issues)
* Search on [http://silverstripe.org/modules](http://silverstripe.org/modules) for module-specific bugtrackers
+ * Request features: [UserVoice](http://silverstripe.uservoice.com).
Before submitting a bug:
diff --git a/docs/en/reference/dataextension.md b/docs/en/reference/dataextension.md
index e68fd4d8a..635f7981a 100644
--- a/docs/en/reference/dataextension.md
+++ b/docs/en/reference/dataextension.md
@@ -184,7 +184,7 @@ initialization. The code needs to assign a value if not specified in
function __construct() {
$self = $this;
- $this->beforeExtending('populateDefaults', function() uses ($self) {
+ $this->beforeExtending('populateDefaults', function() use ($self) {
if(empty($self->MyField)) {
$self->MyField = 'Value we want as a default if not specified in $defaults, but set before extensions';
}
diff --git a/docs/en/reference/execution-pipeline.md b/docs/en/reference/execution-pipeline.md
index 96c3a1b34..8242c6096 100644
--- a/docs/en/reference/execution-pipeline.md
+++ b/docs/en/reference/execution-pipeline.md
@@ -9,7 +9,7 @@ This page documents all the steps from an URL request to the delivered page.
Silverstripe uses **[mod_rewrite](http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html)** to deal with page requests.
So instead of having your normal everyday `index.php` file which tells all, you need to look elsewhere.
-The basic .htaccess file after installing SilverStripe look like this:
+The basic .htaccess file after installing SilverStripe looks like this:
### SILVERSTRIPE START ###
@@ -23,11 +23,13 @@ The basic .htaccess file after installing SilverStripe look like this:
RewriteEngine On
- RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$)
+ RewriteRule ^vendor(/|$) - [F,L,NC]
+ RewriteRule silverstripe-cache(/|$) - [F,L,NC]
+ RewriteRule composer\.(json|lock) - [F,L,NC]
RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f
- RewriteRule .* framework/main.php?url=%1&%{QUERY_STRING} [L]
+ RewriteRule .* framework/main.php?url=%1 [QSA]
### SILVERSTRIPE END ###
@@ -93,3 +95,12 @@ You can access the following controller-method with /team/signup
## SSViewer template rendering
See [templates](/reference/templates) for information on the SSViewer template system.
+
+## Flush requests
+
+If `?flush=1` is requested in the URL, e.g. http://mysite.com?flush=1, this will trigger a call to `flush()` on
+any classes that implement the `Flushable` interface.
+
+See [reference documentation on Flushable](/reference/flushable) for more details.
+
+
diff --git a/docs/en/reference/flushable.md b/docs/en/reference/flushable.md
new file mode 100644
index 000000000..9f2c61815
--- /dev/null
+++ b/docs/en/reference/flushable.md
@@ -0,0 +1,56 @@
+# Flushable
+
+## Introduction
+
+Allows a class to define it's own flush functionality, which is triggered when `flush=1` is requested in the URL.
+
+`[api:FlushRequestFilter]` is run before a request is made, calling `flush()` statically on all
+implementors of `[api:Flushable]`.
+
+## Usage
+
+To use this API, you need to make your class implement `[api:Flushable]`, and define a `flush()` static function,
+this defines the actions that need to be executed on a flush request.
+
+### Using with SS_Cache
+
+This example uses `[api:SS_Cache]` in some custom code, and the same cache is cleaned on flush:
+
+ :::php
+ clean(Zend_Cache::CLEANING_MODE_ALL);
+ }
+
+ public function MyCachedContent() {
+ $cache = SS_Cache::factory('mycache')
+ $something = $cache->load('mykey');
+ if(!$something) {
+ $something = 'value to be cached';
+ $cache->save($something);
+ }
+ return $something;
+ }
+
+ }
+
+### Using with filesystem
+
+Another example, some temporary files are created in a directory in assets, and are deleted on flush. This would be
+useful in an example like `GD` or `Imagick` generating resampled images, but we want to delete any cached images on
+flush so they are re-created on demand.
+
+ :::php
+
+ <% with $SiteConfig %>
$Title $AnotherField
- <% end_loop %>
+ <% end_with %>
Or if you want to access variables in the PHP you can do
@@ -48,7 +48,7 @@ Create a mysite/code/CustomSiteConfig.php file.
}
-Then activate your extension in your `[config.yml](/topics/configuration)` file.
+Then activate your extension in your [config.yml](/topics/configuration) file.
:::yml
SiteConfig:
@@ -65,4 +65,4 @@ You can define as many extensions for `[api:SiteConfig]` as you need. For exampl
your own global settings for the dashboard.
## API Documentation
-`[api:SiteConfig]`
\ No newline at end of file
+`[api:SiteConfig]`
diff --git a/docs/en/reference/templates.md b/docs/en/reference/templates.md
index da8f0a19a..1311bd120 100644
--- a/docs/en/reference/templates.md
+++ b/docs/en/reference/templates.md
@@ -705,8 +705,6 @@ width independently.
* Break down your templates into groups of includes. Site integrators would then have the power to override individual
includes, rather than entire templates.
-For more information about templates go to the [Advanced Templates](/reference/advanced-templates) page.
-
## Related
* [Built in page controls](/reference/built-in-page-controls)
diff --git a/docs/en/reference/urlvariabletools.md b/docs/en/reference/urlvariabletools.md
index 4352a3689..66c028665 100644
--- a/docs/en/reference/urlvariabletools.md
+++ b/docs/en/reference/urlvariabletools.md
@@ -18,7 +18,7 @@ Append the option and corresponding value to your URL in your browser's address
| URL Variable | | Values | | Description |
| ------------ | | ------ | | ----------- |
| flush=1 | | 1 | | Clears out all caches. Used mainly during development, e.g. when adding new classes or templates. Requires "dev" mode or ADMIN login |
- | showtemplate | | 1 | | Show the compiled version of all the templates used, including line numbers. Good when you have a syntax error in a template. Cannot be used on a Live site without **isDev**. **flush** can be used with the following values: |
+ | showtemplate | | 1 | | Show the compiled version of all the templates used, including line numbers. Good when you have a syntax error in a template. Cannot be used on a Live site without **isDev**. |
## General Testing
diff --git a/docs/en/topics/authentication.md b/docs/en/topics/authentication.md
new file mode 100644
index 000000000..7bf25c10b
--- /dev/null
+++ b/docs/en/topics/authentication.md
@@ -0,0 +1,55 @@
+# Authentication
+
+By default, silverstripe provides a `[api:MemberAuthenticator]` class which hooks into its own internal
+authentication system.
+
+The main login system uses these controllers to handle the various security requests:
+
+ * `[api:Security]` Which is the controller which handles most front-end security requests, including
+ Logging in, logging out, resetting password, or changing password. This class also provides an interface
+ to allow configured `[api:Authenticator]` classes to each display a custom login form.
+ * `[api:CMSSecurity]` Which is the controller which handles security requests within the CMS, and allows
+ users to re-login without leaving the CMS.
+
+## Member Authentication
+
+The default member authentication system is implemented in the following classes:
+
+ * `[api:MemberAuthenticator]` Which is the default member authentication implementation. This uses the email
+ and password stored internally for each member to authenticate them.
+ * `[api:MemberLoginForm]` Is the default form used by `MemberAuthenticator`, and is displayed on the public site
+ at the url `Security/login` by default.
+ * `[api:CMSMemberLoginForm]` Is the secondary form used by `MemberAuthenticator`, and will be displayed to the
+ user within the CMS any time their session expires or they are logged out via an action. This form is
+ presented via a popup dialog, and can be used to re-authenticate that user automatically without them having
+ to lose their workspace. E.g. if editing a form, the user can login and continue to publish their content.
+
+## Custom Authentication
+
+Additional authentication methods (oauth, etc) can be implemented by creating custom implementations of each of the
+following base classes:
+
+ * `[api:Authenticator]` The base class for authentication systems. This class also acts as the factory
+ to generate various login forms for parts of the system. If an authenticator supports in-cms
+ reauthentication then it will be necessary to override the `supports_cms` and `get_cms_login_form` methods.
+ * `[api:LoginForm]` which is the base class for a login form which links to a specific authenticator. At the very
+ least, it will be necessary to implement a form class which provides a default login interface. If in-cms
+ re-authentication is desired, then a specialised subclass of this method may be necessary. For example, this form
+ could be extended to require confirmation of username as well as password.
+
+## Default Admin
+
+When a new silverstripe site is created for the first time, it may be necessary to create a default admin to provide
+CMS access for the first time. SilverStripe provides a default admin configuration system, which allows a username
+and password to be configured for a single special user outside of the normal membership system.
+
+It is advisable to configure this user in your `_ss_environment.php` file outside of the web root, as below:
+
+ :::php
+ // Configure a default username and password to access the CMS on all sites in this environment.
+ define('SS_DEFAULT_ADMIN_USERNAME', 'admin');
+ define('SS_DEFAULT_ADMIN_PASSWORD', 'password');
+
+When a user logs in with these credentials, then a `[api:Member]` with the Email 'admin' will be generated in
+the database, but without any password information. This means that the password can be reset or changed by simply
+updating the `_ss_environment.php` file.
diff --git a/docs/en/topics/caching.md b/docs/en/topics/caching.md
index 26c8d55e4..91a08140d 100644
--- a/docs/en/topics/caching.md
+++ b/docs/en/topics/caching.md
@@ -98,6 +98,13 @@ this is reasonably quick, but still requires access to slow disk I/O.
The `Zend_Cache` API supports various caching backends ([list](http://framework.zend.com/manual/1.12/en/zend.cache.backends.html))
which can provide better performance, including APC, Xcache, ZendServer, Memcached and SQLite.
+## Cleaning caches on flush=1 requests
+
+If `?flush=1` is requested in the URL, e.g. http://mysite.com?flush=1, this will trigger a call to `flush()` on
+any classes that implement the `Flushable` interface. Using this, you can trigger your caches to clean.
+
+See [reference documentation on Flushable](/reference/flushable) for implementation details.
+
### Memcached
This backends stores cache records into a [memcached](http://www.danga.com/memcached/)
@@ -144,4 +151,4 @@ a fast one (but limited) like Apc, Memcache... and a "slow" one like File or Sql
'cache_dir' => TEMP_FOLDER . DIRECTORY_SEPARATOR . 'cache'
)
));
- SS_Cache::pick_backend('two_level', 'any', 10);
\ No newline at end of file
+ SS_Cache::pick_backend('two_level', 'any', 10);
diff --git a/docs/en/topics/datamodel.md b/docs/en/topics/datamodel.md
index 2a380190f..012facf2a 100755
--- a/docs/en/topics/datamodel.md
+++ b/docs/en/topics/datamodel.md
@@ -138,7 +138,7 @@ You can also sort randomly
:::php
$member = Member::get()->sort('RAND()')
-
+
### Filter
As you might expect, the `filter()` method filters the list of objects that gets
@@ -272,8 +272,7 @@ This would be equivalent to a SQL query of
The where clauses showcased in the previous two sections (filter and exclude)
specify exact matches by default. However, there are a number of suffixes that
you can put on field names to change this behavior such as `":StartsWith"`,
-`":EndsWith"`, `":PartialMatch"`, `":GreaterThan"`, `":GreaterThanOrEqual"`, `":LessThan"`, `":LessThanOrEqual"`,
-`":Negation"`.
+`":EndsWith"`, `":PartialMatch"`, `":GreaterThan"`, `":GreaterThanOrEqual"`, `":LessThan"`, `":LessThanOrEqual"`.
Each of these suffixes is represented in the ORM as a subclass of
`[api:SearchFilter]`. Developers can define their own SearchFilters if needing
diff --git a/docs/en/topics/environment-management.md b/docs/en/topics/environment-management.md
index fb2fe7c21..9066aa8f8 100644
--- a/docs/en/topics/environment-management.md
+++ b/docs/en/topics/environment-management.md
@@ -105,7 +105,7 @@ This is my `_ss_environment.php` file. I have it placed in `/var`, as each of th
| Name | Description |
| ---- | ----------- |
-| `TEMP_FOLDER` | Absolute file path to store temporary files such as cached templates or the class manifest. Needs to be writeable by the webserver user. Defaults to *sys_get_temp_dir()*, and falls back to *silverstripe-cache* in the webroot. See *getTempFolder()* in *framework/core/Core.php* |
+| `TEMP_FOLDER` | Absolute file path to store temporary files such as cached templates or the class manifest. Needs to be writeable by the webserver user. Defaults to *silverstripe-cache* in the webroot, and falls back to *sys_get_temp_dir()*. See *getTempFolder()* in *framework/core/TempPath.php* |
| `SS_DATABASE_CLASS` | The database class to use, MySQLDatabase, MSSQLDatabase, etc. defaults to MySQLDatabase|
| `SS_DATABASE_SERVER`| The database server to use, defaulting to localhost|
| `SS_DATABASE_USERNAME`| The database username (mandatory)|
@@ -117,8 +117,8 @@ This is my `_ss_environment.php` file. I have it placed in `/var`, as each of th
| `SS_DATABASE_NAME` | Set the database name. Assumes the `$database` global variable in your config is missing or empty. |
| `SS_DATABASE_CHOOSE_NAME`| Boolean/Int. If set, then the system will choose a default database name for you if one isn't give in the $database variable. The database name will be "SS_" followed by the name of the folder into which you have installed SilverStripe. If this is enabled, it means that the phpinstaller will work out of the box without the installer needing to alter any files. This helps prevent accidental changes to the environment. If `SS_DATABASE_CHOOSE_NAME` is an integer greater than one, then an ancestor folder will be used for the database name. This is handy for a site that's hosted from /sites/examplesite/www or /buildbot/allmodules-2.3/build. If it's 2, the parent folder will be chosen; if it's 3 the grandparent, and so on.|
| `SS_ENVIRONMENT_TYPE`| The environment type: dev, test or live.|
-| `SS_DEFAULT_ADMIN_USERNAME`| The username of the default admin - this is a non-database user with administrative privileges.|
-| `SS_DEFAULT_ADMIN_PASSWORD`| The password of the default admin.|
+| `SS_DEFAULT_ADMIN_USERNAME`| The username of the default admin. This is a user with administrative privileges.|
+| `SS_DEFAULT_ADMIN_PASSWORD`| The password of the default admin. This will not be stored in the database.|
| `SS_USE_BASIC_AUTH`| Protect the site with basic auth (good for test sites)|
| `SS_SEND_ALL_EMAILS_TO`| If you set this define, all emails will be redirected to this address.|
| `SS_SEND_ALL_EMAILS_FROM`| If you set this define, all emails will be send from this address.|
diff --git a/docs/en/topics/forms.md b/docs/en/topics/forms.md
index cb0c902a3..ec38465a8 100644
--- a/docs/en/topics/forms.md
+++ b/docs/en/topics/forms.md
@@ -369,7 +369,7 @@ these methods:
- FormField->setTemplate()
- FormField->setFieldHolderTemplate()
-- FormField->getSmallFieldHolderTemplate()
+- FormField->setSmallFieldHolderTemplate()
Caution: Not all FormFields consistently uses templates set by the above methods.
@@ -534,10 +534,8 @@ own validation.
// Limit extensions on upload (in PHP)
// Markup contains
$exts = array('jpg', 'jpeg', 'gif');
- $validator = new Upload_Validator();
- $validator->setAllowedExtensions($exts);
- $upload = Upload::create()->setValidator($validator);
- $fileField = FileField::create('MyFile')->setUpload(new);
+ $fileField = FileField::create('MyFile');
+ $fileField->getValidator()->setAllowedExtensions($exts);
$fileField->setAttribute('data-allowed-extensions', implode(',', $exts));
Note that these examples don't have any effect on the client as such, but are
diff --git a/docs/en/topics/index.md b/docs/en/topics/index.md
index b55721314..5eaaa0c7f 100644
--- a/docs/en/topics/index.md
+++ b/docs/en/topics/index.md
@@ -3,7 +3,8 @@
This section provides an overview on how things fit together, the "conceptual glue" between APIs and features.
It is where most documentation should live, and is the natural "second step" after finishing the tutorials.
- * [Access Control and Page Security](access-control): Restricting access and setting up permissions on your website
+ * [Access Control and Page Security](access-control): Restricting access and setting up permissions on your website.
+ * [Authentication](authentication): Overview of the default member authentication system.
* [Caching](caching): Explains built-in caches for classes, config and templates. How to use your own caches.
* [Command line Usage](commandline): Calling controllers via the command line interface using `sake`
* [Configuration](configuration): Influence behaviour through PHP and YAML configuration
diff --git a/docs/en/topics/testing/fixtures.md b/docs/en/topics/testing/fixtures.md
index 5053cd143..696528814 100644
--- a/docs/en/topics/testing/fixtures.md
+++ b/docs/en/topics/testing/fixtures.md
@@ -162,7 +162,7 @@ team.
private static $many_many_extraFields = array(
"Players" => array(
"Role" => "Varchar"
- );
+ )
);
}
diff --git a/docs/en/topics/testing/index.md b/docs/en/topics/testing/index.md
index 4aed3e7b8..657a68d79 100644
--- a/docs/en/topics/testing/index.md
+++ b/docs/en/topics/testing/index.md
@@ -13,39 +13,30 @@ If you're more familiar with unit testing, but want a refresher of some of the c
the [Testing Glossary](glossary). To get started now, follow the installation instructions below, and check
[Troubleshooting](testing-guide-troubleshooting) in case you run into any problems.
-If you are familiar with PHP coding but new to unit testing, you should read the [Introduction](/topics/testing) and
-check out Mark's presentation [Getting to Grips with SilverStripe Testing](http://www.slideshare.net/maetl/getting-to-grips-with-silverstripe-testing).
+If you are familiar with PHP coding but new to unit testing then check out Mark's presentation [Getting to Grips with SilverStripe Testing](http://www.slideshare.net/maetl/getting-to-grips-with-silverstripe-testing).
[Why Unit Test?](why-should-i-test) will give you reasons why you should be testing your code.
You should also read over [the PHPUnit manual](http://www.phpunit.de/manual/current/en/). It provides a lot of
fundamental concepts that we build on in this documentation.
-## Installation
-
-### Via Composer
-
-Unit tests are not included in the normal SilverStripe downloads, you are expected to work with local git repositories
+Unit tests are not included in the normal SilverStripe downloads so you need to install them through git repositories
([installation instructions](/installation/composer)).
-Once you've got the project up and running, check out the additional requirements to run unit tests:
+## Install with Composer
- composer update --dev
+Once you've got your project up and running, open a terminal and cd to your project root.
-This will install (among other things) the [PHPUnit](http://www.phpunit.de/) dependency, which is the framework we're
-building our unit tests on. Composer installs it alongside the required PHP classes into the `vendor/bin/` directory.
-You can either use it through its full path (`vendor/bin/phpunit`), or symlink it into the root directory of your website:
+ composer require --dev "phpunit/phpunit:*@stable"
+
+This will install [PHPUnit](http://www.phpunit.de/) dependency, which is the framework we're
+building our unit tests on. Composer installs it alongside the required PHP classes into the `vendor/bin/` directory.
+
+### Symlinking the PHPUnit Binary
+You can either use PHPUnit through its full path (`vendor/bin/phpunit`), or symlink it into the root directory of your website:
ln -s vendor/bin/phpunit phpunit
-### Via PEAR
-
-Alternatively, you can check out PHPUnit globally via the PEAR package manager
-([instructions](https://github.com/sebastianbergmann/phpunit/)).
-
- pear config-set auto_discover 1
- pear install pear.phpunit.de/PHPUnit
-
## Configuration
### phpunit.xml
@@ -83,8 +74,6 @@ You will generally write two different kinds of test classes.
* **Unit Test:** Test the behaviour of one of your DataObjects.
* **Functional Test:** Test the behaviour of one of your controllers.
-Some people may note that we have used the same naming convention as Ruby on Rails.
-
Tutorials and recipes for creating tests using the SilverStripe framework:
* [Creating a SilverStripe test](creating-a-silverstripe-test): Writing tests to check core data objects
@@ -140,7 +129,6 @@ particularly around formatting test output.
### Via Web Browser
Executing tests from the command line is recommended, since it most closely reflects
-test runs in any automated testing environments. If for some reason you don't have
-access to the command line, you can also run tests through the browser.
+test runs in any automated testing environments. However, you can also run tests through the browser (requires PHPUnit version 3.7.*@stable):
http://localhost/dev/tests
diff --git a/docs/en/topics/versioning.md b/docs/en/topics/versioning.md
index 58fd33a91..c6741ab9d 100644
--- a/docs/en/topics/versioning.md
+++ b/docs/en/topics/versioning.md
@@ -186,6 +186,10 @@ from the `Controller` class.
## Recipes
+It can be useful to add the variable `$SilverStripeNavigator` somewhere into the template, since it allows you to put a mini "admin" bar on the page which isn't visible to non editors. It shows the current stage and provides a convenient CMS link and version changing link.
+
+Keep in mind that `$SilverStripeNavigator` is only available on ContentController, so useful when the Versioned extension is applied to SiteTree (default), and not when it's applied to DataObject.
+
### Trapping the publication event
Sometimes, you'll want to do something whenever a particular kind of page is published. This example sends an email
@@ -196,6 +200,5 @@ whenever a blog entry has been published.
// ...
public function onAfterPublish() {
mail("sam@silverstripe.com", "Blog published", "The blog has been published");
- parent::onAfterPublish();
}
}
diff --git a/docs/en/tutorials/5-dataobject-relationship-management.md b/docs/en/tutorials/5-dataobject-relationship-management.md
index bf7ef6275..feea33d67 100644
--- a/docs/en/tutorials/5-dataobject-relationship-management.md
+++ b/docs/en/tutorials/5-dataobject-relationship-management.md
@@ -249,7 +249,7 @@ by clicking on the **Add Mentor** button.
-To associate the mentor with a project, select one the the mentors, and click on the projects tab. Add all the projects a mentor is associated with (see the [list](#What_are_we_working_towards?)), by typing the name in "Find Projects by Page name" and clicking the "Link Existing" button.
+To associate the mentor with a project, select one of the mentors, and click on the projects tab. Add all the projects a mentor is associated with (see the [list](#What_are_we_working_towards?)), by typing the name in "Find Projects by Page name" and clicking the "Link Existing" button.
You will notice that you are able to select the same `Project` for multiple mentors.
This is the definition of a **many-to-many** relation.
@@ -406,7 +406,7 @@ lightweight `DataObject` classes. The transition between
the two classes is intentionally fluent in the CMS, you can
manage them depending on your needs.
`DataObject` gives you a no-frills solution to data storage,
-but `Page` allows for built-in WYSIWIG editing, versioning,
+but `Page` allows for built-in WYSIWYG editing, versioning,
publication and hierarchical organization.
## Exercises
diff --git a/filesystem/GD.php b/filesystem/GD.php
index b9f35ed1e..050a9afb2 100644
--- a/filesystem/GD.php
+++ b/filesystem/GD.php
@@ -222,18 +222,21 @@ class GDBackend extends Object implements Image_Backend {
*/
public function resize($width, $height) {
if(!$this->gd) return;
+
+ if($width < 0 || $height < 0) throw new InvalidArgumentException("Image resizing dimensions cannot be negative");
+ if(!$width && !$height) throw new InvalidArgumentException("No dimensions given when resizing image");
+ if(!$width) throw new InvalidArgumentException("Width not given when resizing image");
+ if(!$height) throw new InvalidArgumentException("Height not given when resizing image");
- $width = round($width);
- $height = round($height);
+ //use whole numbers, ensuring that size is at least 1x1
+ $width = max(1, round($width));
+ $height = max(1, round($height));
// Check that a resize is actually necessary.
if ($width == $this->width && $height == $this->height) {
return $this;
}
- if(!$width && !$height) user_error("No dimensions given", E_USER_ERROR);
- if(!$width) user_error("Width not given", E_USER_ERROR);
- if(!$height) user_error("Height not given", E_USER_ERROR);
$newGD = imagecreatetruecolor($width, $height);
diff --git a/filesystem/ImagickBackend.php b/filesystem/ImagickBackend.php
index 57a41579c..1f5309cef 100644
--- a/filesystem/ImagickBackend.php
+++ b/filesystem/ImagickBackend.php
@@ -23,9 +23,8 @@ class ImagickBackend extends Imagick implements Image_Backend {
public function __construct($filename = null) {
if(is_string($filename)) {
parent::__construct($filename);
- } else {
- self::setImageCompressionQuality($this->config()->default_quality);
}
+ $this->setQuality(Config::inst()->get('ImagickBackend','default_quality'));
}
/**
@@ -115,9 +114,15 @@ class ImagickBackend extends Imagick implements Image_Backend {
*/
public function resize($width, $height) {
if(!$this->valid()) return;
-
- $width = round($width);
- $height = round($height);
+
+ if($width < 0 || $height < 0) throw new InvalidArgumentException("Image resizing dimensions cannot be negative");
+ if(!$width && !$height) throw new InvalidArgumentException("No dimensions given when resizing image");
+ if(!$width) throw new InvalidArgumentException("Width not given when resizing image");
+ if(!$height) throw new InvalidArgumentException("Height not given when resizing image");
+
+ //use whole numbers, ensuring that size is at least 1x1
+ $width = max(1, round($width));
+ $height = max(1, round($height));
$geometry = $this->getImageGeometry();
@@ -125,11 +130,7 @@ class ImagickBackend extends Imagick implements Image_Backend {
if ($width == $geometry["width"] && $height == $geometry["height"]) {
return $this;
}
-
- if(!$width && !$height) user_error("No dimensions given", E_USER_ERROR);
- if(!$width) user_error("Width not given", E_USER_ERROR);
- if(!$height) user_error("Height not given", E_USER_ERROR);
-
+
$new = clone $this;
$new->resizeImage($width, $height, self::FILTER_LANCZOS, 1);
@@ -194,47 +195,13 @@ class ImagickBackend extends Imagick implements Image_Backend {
* @param int $height
* @return Image_Backend
*/
- public function paddedResize($width, $height, $backgroundColor = "#FFFFFF00") {
- if(!$this->valid()) return;
-
- $width = round($width);
- $height = round($height);
- $geometry = $this->getImageGeometry();
-
- // Check that a resize is actually necessary.
- if ($width == $geometry["width"] && $height == $geometry["height"]) {
- return $this;
- }
-
- $new = clone $this;
- $new->setBackgroundColor($backgroundColor);
-
- $destAR = $width / $height;
- if ($geometry["width"] > 0 && $geometry["height"] > 0) {
- // We can't divide by zero theres something wrong.
-
- $srcAR = $geometry["width"] / $geometry["height"];
-
- // Destination narrower than the source
- if($destAR > $srcAR) {
- $destY = 0;
- $destHeight = $height;
-
- $destWidth = round( $height * $srcAR );
- $destX = round( ($width - $destWidth) / 2 );
-
- // Destination shorter than the source
- } else {
- $destX = 0;
- $destWidth = $width;
-
- $destHeight = round( $width / $srcAR );
- $destY = round( ($height - $destHeight) / 2 );
- }
-
- $new->extentImage($width, $height, $destX, $destY);
- }
-
+ public function paddedResize($width, $height, $backgroundColor = "FFFFFF") {
+ $new = $this->resizeRatio($width, $height);
+ $new->setImageBackgroundColor("#".$backgroundColor);
+ $w = $new->getImageWidth();
+ $h = $new->getImageHeight();
+ $new->extentImage($width,$height,($w-$width)/2,($h-$height)/2);
+
return $new;
}
@@ -256,13 +223,9 @@ class ImagickBackend extends Imagick implements Image_Backend {
if ($width == $geo["width"] && $height == $geo["height"]) {
return $this;
}
-
- if(!$backgroundColor){
- $backgroundColor = new ImagickPixel('transparent');
- }
-
+
$new = clone $this;
- $new->setBackgroundColor($backgroundColor);
+ $new->setBackgroundColor(new ImagickPixel('transparent'));
if(($geo['width']/$width) < ($geo['height']/$height)){
$new->cropImage($geo['width'], floor($height*$geo['width']/$width),
diff --git a/filesystem/Upload.php b/filesystem/Upload.php
index fa8c11b19..e69301855 100644
--- a/filesystem/Upload.php
+++ b/filesystem/Upload.php
@@ -134,9 +134,10 @@ class Upload extends Controller {
$file = $nameFilter->filter($tmpFile['name']);
$fileName = basename($file);
- $relativeFilePath = $parentFolder
- ? $parentFolder->getRelativePath() . "$fileName"
- : ASSETS_DIR . "/" . $fileName;
+ $relativeFolderPath = $parentFolder
+ ? $parentFolder->getRelativePath()
+ : ASSETS_DIR . '/';
+ $relativeFilePath = $relativeFolderPath . $fileName;
// Create a new file record (or try to retrieve an existing one)
if(!$this->file) {
@@ -156,22 +157,32 @@ class Upload extends Controller {
}
}
- // if filename already exists, version the filename (e.g. test.gif to test1.gif)
+ // if filename already exists, version the filename (e.g. test.gif to test2.gif, test2.gif to test3.gif)
if(!$this->replaceFile) {
+ $fileSuffixArray = explode('.', $fileName);
+ $fileTitle = array_shift($fileSuffixArray);
+ $fileSuffix = !empty($fileSuffixArray)
+ ? '.' . implode('.', $fileSuffixArray)
+ : null;
+
+ // make sure files retain valid extensions
+ $oldFilePath = $relativeFilePath;
+ $relativeFilePath = $relativeFolderPath . $fileTitle . $fileSuffix;
+ if($oldFilePath !== $relativeFilePath) {
+ user_error("Couldn't fix $relativeFilePath", E_USER_ERROR);
+ }
while(file_exists("$base/$relativeFilePath")) {
$i = isset($i) ? ($i+1) : 2;
$oldFilePath = $relativeFilePath;
- // make sure archives retain valid extensions
- if(substr($relativeFilePath, strlen($relativeFilePath) - strlen('.tar.gz')) == '.tar.gz' ||
- substr($relativeFilePath, strlen($relativeFilePath) - strlen('.tar.bz2')) == '.tar.bz2') {
- $relativeFilePath = preg_replace('/[0-9]*(\.tar\.[^.]+$)/', $i . '\\1', $relativeFilePath);
- } else if (strpos($relativeFilePath, '.') !== false) {
- $relativeFilePath = preg_replace('/[0-9]*(\.[^.]+$)/', $i . '\\1', $relativeFilePath);
- } else if (strpos($relativeFilePath, '_') !== false) {
- $relativeFilePath = preg_replace('/_([^_]+$)/', '_'.$i, $relativeFilePath);
+
+ $pattern = '/([0-9]+$)/';
+ if(preg_match($pattern, $fileTitle)) {
+ $fileTitle = preg_replace($pattern, $i, $fileTitle);
} else {
- $relativeFilePath .= '_'.$i;
+ $fileTitle .= $i;
}
+ $relativeFilePath = $relativeFolderPath . $fileTitle . $fileSuffix;
+
if($oldFilePath == $relativeFilePath && $i > 2) {
user_error("Couldn't fix $relativeFilePath with $i tries", E_USER_ERROR);
}
diff --git a/forms/DropdownField.php b/forms/DropdownField.php
index c7a1b3675..cdea1df0e 100644
--- a/forms/DropdownField.php
+++ b/forms/DropdownField.php
@@ -13,7 +13,7 @@
*
* public function getCMSFields() {
* $fields = parent::getCMSFields();
- * $field = new DropdownField('GalleryID', 'Gallery', Gallery::get()->map('ID', 'Title'));
+ * $field = DropdownField::create('GalleryID', 'Gallery', Gallery::get()->map('ID', 'Title'));
* $field->setEmptyString('(Select one)');
* $fields->addFieldToTab('Root.Content', $field, 'Content');
*
diff --git a/forms/Form.php b/forms/Form.php
index 47eee2fe2..918f16bc1 100644
--- a/forms/Form.php
+++ b/forms/Form.php
@@ -58,6 +58,9 @@ class Form extends RequestHandler {
protected $actions;
+ /**
+ * @var Controller
+ */
protected $controller;
protected $name;
@@ -155,10 +158,6 @@ class Form extends RequestHandler {
'forTemplate',
);
- private static $casting = array(
- 'Message' => 'Text'
- );
-
/**
* @var FormTemplateHelper
*/
@@ -293,12 +292,17 @@ class Form extends RequestHandler {
// Protection against CSRF attacks
$token = $this->getSecurityToken();
if( ! $token->checkRequest($request)) {
- if (empty($vars['SecurityID'])) {
+ $securityID = $token->getName();
+ if (empty($vars[$securityID])) {
$this->httpError(400, _t("Form.CSRF_FAILED_MESSAGE",
- "There seems to have been a technical problem. Please click the back button,
- refresh your browser, and try again."));
+ "There seems to have been a technical problem. Please click the back button, ".
+ "refresh your browser, and try again."
+ ));
} else {
- Session::set("FormInfo.{$this->FormName()}.data", $this->getData());
+ // Clear invalid token on refresh
+ $data = $this->getData();
+ unset($data[$securityID]);
+ Session::set("FormInfo.{$this->FormName()}.data", $data);
Session::set("FormInfo.{$this->FormName()}.errors", array());
$this->sessionMessage(
_t("Form.CSRF_EXPIRED_MESSAGE", "Your session has expired. Please re-submit the form."),
@@ -523,10 +527,10 @@ class Form extends RequestHandler {
* Add a plain text error message to a field on this form. It will be saved into the session
* and used the next time this form is displayed.
*/
- public function addErrorMessage($fieldName, $message, $messageType) {
+ public function addErrorMessage($fieldName, $message, $messageType, $escapeHtml = true) {
Session::add_to_array("FormInfo.{$this->FormName()}.errors", array(
'fieldName' => $fieldName,
- 'message' => $message,
+ 'message' => $escapeHtml ? Convert::raw2xml($message) : $message,
'messageType' => $messageType,
));
}
@@ -1109,29 +1113,41 @@ class Form extends RequestHandler {
/**
* Set a status message for the form.
- *
+ *
* @param string $message the text of the message
* @param string $type Should be set to good, bad, or warning.
+ * @param boolean $escapeHtml Automatically sanitize the message. Set to FALSE if the message contains HTML.
+ * In that case, you might want to use {@link Convert::raw2xml()} to escape any
+ * user supplied data in the message.
*/
- public function setMessage($message, $type) {
- $this->message = $message;
+ public function setMessage($message, $type, $escapeHtml = true) {
+ $this->message = ($escapeHtml) ? Convert::raw2xml($message) : $message;
$this->messageType = $type;
return $this;
}
/**
* Set a message to the session, for display next time this form is shown.
- *
+ *
* @param string $message the text of the message
* @param string $type Should be set to good, bad, or warning.
+ * @param boolean $escapeHtml Automatically sanitize the message. Set to FALSE if the message contains HTML.
+ * In that case, you might want to use {@link Convert::raw2xml()} to escape any
+ * user supplied data in the message.
*/
- public function sessionMessage($message, $type) {
- Session::set("FormInfo.{$this->FormName()}.formError.message", $message);
+ public function sessionMessage($message, $type, $escapeHtml = true) {
+ Session::set(
+ "FormInfo.{$this->FormName()}.formError.message",
+ $escapeHtml ? Convert::raw2xml($message) : $message
+ );
Session::set("FormInfo.{$this->FormName()}.formError.type", $type);
}
- public static function messageForForm($formName, $message, $type ) {
- Session::set("FormInfo.{$formName}.formError.message", $message);
+ public static function messageForForm($formName, $message, $type, $escapeHtml = true) {
+ Session::set(
+ "FormInfo.{$formName}.formError.message",
+ $escapeHtml ? Convert::raw2xml($message) : $message
+ );
Session::set("FormInfo.{$formName}.formError.type", $type);
}
diff --git a/forms/FormField.php b/forms/FormField.php
index bd059abb0..4456d956a 100644
--- a/forms/FormField.php
+++ b/forms/FormField.php
@@ -97,10 +97,6 @@ class FormField extends RequestHandler {
*/
protected $attributes = array();
- private static $casting = array(
- 'Message' => 'Text'
- );
-
/**
* Takes a fieldname and converts camelcase to spaced
* words. Also resolves combined fieldnames with dot syntax
@@ -563,13 +559,9 @@ class FormField extends RequestHandler {
}
/**
- * Sets the error message to be displayed on the {@link FormField}.
- *
- * Set by php validation of the form.
- *
- * @param string $message
+ * @param string $message Message to show to the user. Allows HTML content,
+ * which means you need to use Convert::raw2xml() for any user supplied data.
* @param string $messageType
- *
* @return FormField
*/
public function setError($message, $messageType) {
diff --git a/forms/HtmlEditorConfig.php b/forms/HtmlEditorConfig.php
index e2ad679b1..58cb41b08 100644
--- a/forms/HtmlEditorConfig.php
+++ b/forms/HtmlEditorConfig.php
@@ -125,7 +125,7 @@ class HtmlEditorConfig {
* Set the value of one option
* @param $k string - The key of the option to set
* @param $v mixed - The value of the option to set
- * @return mixed - $v returned for chaining
+ * @return HtmlEditorConfig
*/
public function setOption($k,$v) {
$this->settings[$k] = $v;
@@ -135,7 +135,7 @@ class HtmlEditorConfig {
/**
* Set multiple options
* @param $a array - The options to set, as keys and values of the array
- * @return null
+ * @return HtmlEditorConfig
*/
public function setOptions($a) {
foreach ($a as $k=>$v) {
@@ -153,7 +153,7 @@ class HtmlEditorConfig {
* @see http://wiki.moxiecode.com/index.php/TinyMCE:API/tinymce.PluginManager/load
*
* @param String [0..] a string, or several strings, or a single array of strings - The plugins to enable
- * @return null
+ * @return HtmlEditorConfig
*/
public function enablePlugins() {
$plugins = func_get_args();
@@ -166,12 +166,13 @@ class HtmlEditorConfig {
}
if (!array_key_exists($plugin, $this->plugins)) $this->plugins[$plugin] = $path;
}
+ return $this;
}
/**
* Enable one or several plugins. Will properly handle being passed a plugin that is already disabled
* @param String [0..] a string, or several strings, or a single array of strings - The plugins to disable
- * @return null
+ * @return HtmlEditorConfig
*/
public function disablePlugins() {
$plugins = func_get_args();
@@ -198,7 +199,7 @@ class HtmlEditorConfig {
* @param integer from 1..3 - The line number to redefine
* @param string a string or several strings, or a single array of strings - The button names to make this line
* contain
- * @return null
+ * @return HtmlEditorConfig
*/
public function setButtonsForLine() {
if (func_num_args() == 2) {
@@ -217,7 +218,7 @@ class HtmlEditorConfig {
* @param integer from 1..3
* @param string a string, or several strings, or a single array of strings - The button names to add to the end
* of this line
- * @return null
+ * @return HtmlEditorConfig
*/
public function addButtonsToLine() {
$inserts = func_get_args();
diff --git a/forms/LookupField.php b/forms/LookupField.php
index a404ec8f3..7dab87f21 100644
--- a/forms/LookupField.php
+++ b/forms/LookupField.php
@@ -67,7 +67,7 @@ class LookupField extends DropdownField {
$inputValue = implode(', ', array_values($values));
} else {
- $attrValue = "(none)";
+ $attrValue = '('._t('FormField.NONE', 'none').')';
$inputValue = '';
}
diff --git a/forms/NumericField.php b/forms/NumericField.php
index 2897e18e3..48dc0e534 100644
--- a/forms/NumericField.php
+++ b/forms/NumericField.php
@@ -57,4 +57,26 @@ class NumericField extends TextField {
public function dataValue() {
return (is_numeric($this->value)) ? $this->value : 0;
}
+
+ /**
+ * Returns a readonly version of this field
+ */
+ public function performReadonlyTransformation() {
+ $field = new NumericField_Readonly($this->name, $this->title, $this->value);
+ $field->setForm($this->form);
+ return $field;
+ }
+
+}
+
+class NumericField_Readonly extends ReadonlyField {
+
+ public function performReadonlyTransformation() {
+ return clone $this;
+ }
+
+ public function Value() {
+ return Convert::raw2xml($this->value ? "$this->value" : "0");
+ }
+
}
diff --git a/forms/UploadField.php b/forms/UploadField.php
index ff4026fbc..06f2e5b3d 100644
--- a/forms/UploadField.php
+++ b/forms/UploadField.php
@@ -1053,6 +1053,7 @@ class UploadField extends FileField {
* @return UploadField_ItemHandler
*/
public function handleSelect(SS_HTTPRequest $request) {
+ if(!$this->canAttachExisting()) return $this->httpError(403);
return UploadField_SelectHandler::create($this, $this->getFolderName());
}
diff --git a/forms/gridfield/GridFieldDetailForm.php b/forms/gridfield/GridFieldDetailForm.php
index 7fab3e8c5..265b138fb 100644
--- a/forms/gridfield/GridFieldDetailForm.php
+++ b/forms/gridfield/GridFieldDetailForm.php
@@ -528,7 +528,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
$this->record->write();
$list->add($this->record, $extraData);
} catch(ValidationException $e) {
- $form->sessionMessage($e->getResult()->message(), 'bad');
+ $form->sessionMessage($e->getResult()->message(), 'bad', false);
$responseNegotiator = new PjaxResponseNegotiator(array(
'CurrentForm' => function() use(&$form) {
return $form->forTemplate();
@@ -545,11 +545,9 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
// TODO Save this item into the given relationship
- // TODO Allow HTML in form messages
- // $link = '"'
- // . htmlspecialchars($this->record->Title, ENT_QUOTES)
- // . '"';
- $link = '"' . $this->record->Title . '"';
+ $link = '"'
+ . htmlspecialchars($this->record->Title, ENT_QUOTES)
+ . '"';
$message = _t(
'GridFieldDetailForm.Saved',
'Saved {name} {link}',
@@ -559,7 +557,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
)
);
- $form->sessionMessage($message, 'good');
+ $form->sessionMessage($message, 'good', false);
if($new_record) {
return $controller->redirect($this->Link());
@@ -586,7 +584,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
$this->record->delete();
} catch(ValidationException $e) {
- $form->sessionMessage($e->getResult()->message(), 'bad');
+ $form->sessionMessage($e->getResult()->message(), 'bad', false);
return $this->getToplevelController()->redirectBack();
}
@@ -599,9 +597,9 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
$toplevelController = $this->getToplevelController();
if($toplevelController && $toplevelController instanceof LeftAndMain) {
$backForm = $toplevelController->getEditForm();
- $backForm->sessionMessage($message, 'good');
+ $backForm->sessionMessage($message, 'good', false);
} else {
- $form->sessionMessage($message, 'good');
+ $form->sessionMessage($message, 'good', false);
}
//when an item is deleted, redirect to the parent controller
diff --git a/forms/gridfield/GridFieldExportButton.php b/forms/gridfield/GridFieldExportButton.php
index 9f829c7c9..94e24dcb9 100644
--- a/forms/gridfield/GridFieldExportButton.php
+++ b/forms/gridfield/GridFieldExportButton.php
@@ -118,7 +118,10 @@ class GridFieldExportButton implements GridField_HTMLProvider, GridField_ActionP
$fileData .= "\"" . implode("\"{$separator}\"", array_values($headers)) . "\"";
$fileData .= "\n";
}
-
+
+ //Remove GridFieldPaginator as we're going to export the entire list.
+ $gridField->getConfig()->removeComponentsByType('GridFieldPaginator');
+
$items = $gridField->getManipulatedList();
// @todo should GridFieldComponents change behaviour based on whether others are available in the config?
diff --git a/forms/gridfield/GridFieldFooter.php b/forms/gridfield/GridFieldFooter.php
index 4d897e85a..1fba1c2a6 100644
--- a/forms/gridfield/GridFieldFooter.php
+++ b/forms/gridfield/GridFieldFooter.php
@@ -21,15 +21,17 @@ class GridFieldFooter implements GridField_HTMLProvider {
* @var string - a message to display in the footer
*/
protected $message = null;
+ protected $showrecordcount;
/**
*
* @param string $message - a message to display in the footer
*/
- public function __construct($message = null) {
+ public function __construct($message = null, $showrecordcount = true) {
if($message) {
$this->message = $message;
}
+ $this->showrecordcount = $showrecordcount;
}
@@ -37,6 +39,7 @@ class GridFieldFooter implements GridField_HTMLProvider {
$count = $gridField->getList()->count();
$forTemplate = new ArrayData(array(
+ 'ShowRecordCount' => $this->showrecordcount,
'Message' => $this->message,
'FirstShownRecord' => 1,
'LastShownRecord' => $count,
diff --git a/forms/gridfield/GridFieldSortableHeader.php b/forms/gridfield/GridFieldSortableHeader.php
index c121dcbb0..eeaef3cb0 100644
--- a/forms/gridfield/GridFieldSortableHeader.php
+++ b/forms/gridfield/GridFieldSortableHeader.php
@@ -192,8 +192,9 @@ class GridFieldSortableHeader implements GridField_HTMLProvider, GridField_DataM
}
/**
- * Returns the manipulated (sorted) DataList. Field names will simply add an 'ORDER BY'
- * clause, relation names will add appropriate joins to the DataQuery first.
+ * Returns the manipulated (sorted) DataList. Field names will simply add an
+ * 'ORDER BY' clause, relation names will add appropriate joins to the
+ * {@link DataQuery} first.
*
* @param GridField
* @param SS_List
@@ -223,10 +224,19 @@ class GridFieldSortableHeader implements GridField_HTMLProvider, GridField_DataM
// Traverse to the relational list
$tmpItem = $tmpItem->$methodName();
- // Add a left join to the query
+ $joinClass = ClassInfo::table_for_object_field(
+ $lastAlias,
+ $methodName . "ID"
+ );
+
+ // if the field isn't in the object tree then it is likely
+ // been aliased. In that event, assume what the user has
+ // provided is the correct value
+ if(!$joinClass) $joinClass = $lastAlias;
+
$dataList = $dataList->leftJoin(
$tmpItem->class,
- '"' . $methodName . '"."ID" = "' . $lastAlias . '"."' . $methodName . 'ID"',
+ '"' . $methodName . '"."ID" = "' . $joinClass . '"."' . $methodName . 'ID"',
$methodName
);
diff --git a/i18n/i18n.php b/i18n/i18n.php
index 42a0c0f3a..5d09fabe4 100644
--- a/i18n/i18n.php
+++ b/i18n/i18n.php
@@ -61,7 +61,7 @@ require_once 'i18nSSLegacyAdapter.php';
* @package framework
* @subpackage misc
*/
-class i18n extends Object implements TemplateGlobalProvider {
+class i18n extends Object implements TemplateGlobalProvider, Flushable {
/**
* This static variable is used to store the current defined locale.
@@ -97,6 +97,32 @@ class i18n extends Object implements TemplateGlobalProvider {
*/
protected static $translators;
+ /**
+ * Triggered early in the request when someone requests a flush.
+ */
+ public static function flush() {
+ $cache = self::get_cache();
+ $backend = $cache->getBackend();
+
+ if(
+ $backend instanceof Zend_Cache_Backend_ExtendedInterface
+ && ($capabilities = $backend->getCapabilities())
+ && $capabilities['tags']
+ ) {
+ $cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG, $cache->getTags());
+ } else {
+ $cache->clean(Zend_Cache::CLEANING_MODE_ALL);
+ }
+ }
+
+ /**
+ * Return an instance of the cache used for i18n data.
+ * @return Zend_Cache
+ */
+ public static function get_cache() {
+ return SS_Cache::factory('i18n', 'Output', array('lifetime' => null, 'automatic_serialization' => true));
+ }
+
/**
* Use javascript i18n through the ss.i18n class (enabled by default).
* If set to TRUE, includes javascript requirements for the base library
@@ -2037,11 +2063,11 @@ class i18n extends Object implements TemplateGlobalProvider {
// which is instanciated by core with a $clean instance variable.
if(!$adapter->isAvailable($lang)) {
- i18n::include_by_locale($lang, (isset($_GET['flush'])));
+ i18n::include_by_locale($lang);
}
if(!$adapter->isAvailable($locale)) {
- i18n::include_by_locale($locale, (isset($_GET['flush'])));
+ i18n::include_by_locale($locale);
}
$translation = $adapter->translate($entity, $locale);
@@ -2105,9 +2131,7 @@ class i18n extends Object implements TemplateGlobalProvider {
*/
public static function get_translators() {
if(!Zend_Translate::getCache()) {
- Zend_Translate::setCache(
- SS_Cache::factory('i18n', 'Output', array('lifetime' => null, 'automatic_serialization' => true))
- );
+ Zend_Translate::setCache(self::get_cache());
}
if(!self::$translators) {
@@ -2120,8 +2144,8 @@ class i18n extends Object implements TemplateGlobalProvider {
))
);
- i18n::include_by_locale('en', isset($_GET['flush']));
- i18n::include_by_locale('en_US', isset($_GET['flush']));
+ i18n::include_by_locale('en');
+ i18n::include_by_locale('en_US');
}
return self::$translators;
@@ -2513,7 +2537,7 @@ class i18n extends Object implements TemplateGlobalProvider {
*/
public static function include_by_locale($locale, $clean = false) {
if($clean) {
- Zend_Translate::clearCache();
+ self::flush();
}
// Get list of module => path pairs, and then just the names
diff --git a/javascript/UploadField.js b/javascript/UploadField.js
index 277707d5f..bc3b322b9 100644
--- a/javascript/UploadField.js
+++ b/javascript/UploadField.js
@@ -449,8 +449,6 @@
self._prepareIframe(iframe, editform, itemInfo);
iframe.data('src', '');
}
-
- if (editform.hasClass('opened')) editform.fitHeight();
});
} else {
self._prepareIframe(iframe, editform, itemInfo);
@@ -499,27 +497,19 @@
$('div.ss-upload .ss-uploadfield-item-editform').entwine({
fitHeight: function() {
- var iframe = this.find('iframe'), padding = 32, parentPadding = 2;
- var h = iframe.contents().find('form').height() + padding;
+ var iframe = this.find('iframe'),
+ contents = iframe.contents().find('body'),
+ bodyH = contents.find('form').outerHeight(true), // We set the height to match the form's outer height
+ iframeH = bodyH + (iframe.outerHeight(true) - iframe.height()), // content's height + padding on iframe elem
+ containerH = iframeH + (this.outerHeight(true) - this.height()); // iframe height + padding on container elem
- if(this.hasClass('includeParent')){
- padding=0;
- parentPadding=12;
- }
-
- /* Set height of body except in IE8. Setting this in IE8 breaks the
- dropdown */
- if(!$.browser.msie && $.browser.version.slice(0,3) != "8.0"){
- iframe.contents().find('body').css({'height':(h-padding)});
+ /* Set height of body except in IE8. Setting this in IE8 breaks the dropdown */
+ if( ! $.browser.msie && $.browser.version.slice(0,3) != "8.0"){
+ contents.find('body').css({'height': bodyH});
}
- // Set iframe to match its contents height
- iframe.height(h);
-
- // set container to match the same height
- iframe.parent().animate({height: h+parentPadding}, 500);
- iframe.contents().find('body form').css({'width':'98%'});
-
+ iframe.height(iframeH);
+ this.animate({height: containerH}, 500);
},
toggleEditForm: function() {
var itemInfo = this.prev('.ss-uploadfield-item-info'), status = itemInfo.find('.ss-uploadfield-item-status');
diff --git a/lang/en.yml b/lang/en.yml
index 3923e3d1f..cb09c0646 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -85,6 +85,18 @@ en:
YESANSWER: Yes
CheckboxFieldSetField:
SOURCE_VALIDATION: 'Please select a value within the list provided. {value} is not a valid option'
+ CMSMemberLoginForm:
+ BUTTONFORGOTPASSWORD: 'Forgot password?'
+ BUTTONLOGIN: 'Log back in'
+ BUTTONLOGOUT: 'Log out'
+ PASSWORDEXPIRED: '
If you have any unsaved work you can return to where you left off by logging back in below.
'
+ SUCCESS: Success
+ SUCCESSCONTENT: '
Login success. If you are not automatically redirected click here
'
+ TimedOutTitleAnonymous: 'Your session has timed out.'
+ TimedOutTitleMember: 'Hey {name}! Your session has timed out.'
ConfirmedPasswordField:
ATLEAST: 'Passwords must be at least {min} characters long.'
BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -179,7 +191,8 @@ en:
TEXT2: 'password reset link'
TEXT3: for
Form:
- CSRF_FAILED_MESSAGE: "There seems to have been a technical problem. Please click the back button, \n refresh your browser, and try again."
+ CSRF_EXPIRED_MESSAGE: 'Your session has expired. Please re-submit the form.'
+ CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
FIELDISREQUIRED: '{name} is required'
SubmitBtnLabel: Go
VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
@@ -255,6 +268,8 @@ en:
HtmlEditorField:
ADDURL: 'Add URL'
ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
+ ANCHORSCANNOTACCESSPAGE: 'You are not permitted to access the content of the target page.'
+ ANCHORSPAGENOTFOUND: 'Target page not found.'
ANCHORVALUE: Anchor
BUTTONADDURL: 'Add url'
BUTTONINSERT: Insert
@@ -360,6 +375,7 @@ en:
NEWPASSWORD: 'New Password'
NoPassword: 'There is no password on this member.'
PASSWORD: Password
+ PASSWORDEXPIRED: 'Your password has expired. Please choose a new one.'
PLURALNAME: Members
REMEMBERME: 'Remember me next time?'
SINGULARNAME: Member
@@ -466,8 +482,8 @@ en:
SINGULARNAME: Role
Title: Title
PermissionRoleCode:
- PLURALNAME: 'Permission Role Cods'
PermsError: 'Can''t assign code "%s" with privileged permissions (requires ADMIN access)'
+ PLURALNAME: 'Permission Role Codes'
SINGULARNAME: 'Permission Role Code'
Permissions:
PERMISSIONS_CATEGORY: 'Roles and access permissions'
diff --git a/lang/hr.yml b/lang/hr.yml
index cfd588b8b..7756312c6 100644
--- a/lang/hr.yml
+++ b/lang/hr.yml
@@ -1,15 +1,33 @@
hr:
AssetAdmin:
NEWFOLDER: Novi direktorij
+ SHOWALLOWEDEXTS: 'Prikaži dozvoljene ekstenzije'
AssetTableField:
CREATED: 'Uploadano'
DIM: Dimenzije
FILENAME: Ime datoteke
+ FOLDER: Mapa
LASTEDIT: 'Zadnja promjena'
OWNER: Vlasnik
SIZE: 'Veličina'
TITLE: Naslov
TYPE: 'Tip'
+ URL: URL
+ AssetUploadField:
+ ChooseFiles: 'Odaberite datoteke'
+ DRAGFILESHERE: 'Povucite datoteke ovdje'
+ EDITALL: 'Uredi sve'
+ EDITANDORGANIZE: 'Uredi i organiziraj'
+ EDITINFO: 'Uredi datoteke'
+ FILES: Datoteke
+ FROMCOMPUTER: 'Odaberite datoteke sa svog računala'
+ FROMCOMPUTERINFO: 'Uploadajte sa svog računala'
+ TOTAL: Ukupno
+ TOUPLOAD: 'Odaberite datoteke za upload...'
+ UPLOADINPROGRESS: 'Molim pričekajte... upload u tijeku'
+ UPLOADOR: ILI
+ BBCodeParser:
+ ALIGNEMENT: Poravnanje
BasicAuth:
ENTERINFO: 'Unesite korisničko ime i lozinu'
ERRORNOTADMIN: 'Korisnik nije administrator'
@@ -21,23 +39,49 @@ hr:
CHANGEPASSWORDTEXT2: 'Za prijavu koristite slijedeće podatke'
HELLO: Pozdrav
ConfirmedPasswordField:
- SHOWONCLICKTITLE: 'Promjeni Lozinku'
+ SHOWONCLICKTITLE: 'Promjenite lozinku'
DataObject:
- PLURALNAME: 'Podatkovni Objekti'
- SINGULARNAME: 'Podatkovni Objekt'
+ PLURALNAME: 'Podatkovni objekti'
+ SINGULARNAME: 'Podatkovni objekt'
+ Date:
+ DAY: dan
+ DAYS: dana
+ HOUR: sat
+ HOURS: sati
+ LessThanMinuteAgo: 'manje od minute'
+ MIN: min
+ MINS: minuta
+ MONTH: mjesec
+ MONTHS: mjeseci
+ SEC: sek
+ SECS: sekundi
+ TIMEDIFFAGO: 'prije {difference}'
+ TIMEDIFFIN: 'za {difference}'
+ YEAR: godina
+ YEARS: godina
+ DateField:
+ NOTSET: 'nije postavljeno'
+ TODAY: danas
+ VALIDDATEFORMAT2: 'Molimo unesite datum u ispravnom formatu ({format})'
+ DatetimeField:
+ NOTSET: 'Nije postavljeno'
+ Director:
+ INVALID_REQUEST: 'Neispravan zahtjev'
DropdownField:
- CHOOSE: (Odaberi)
+ CHOOSE: (Odaberite)
+ EmailField:
+ VALIDATION: 'Molimo unesite email adresu'
File:
PLURALNAME: Datoteke
SINGULARNAME: Datoteka
ForgotPasswordEmail_ss:
HELLO: Pozdrav
- TEXT1: 'Ovdje je vaš'
- TEXT2: 'link za resetiranje zaporke'
+ TEXT1: 'Ovdje je Vaš'
+ TEXT2: 'link za resetiranje lozinke'
TEXT3: za
Form:
- VALIDATIONNOTUNIQUE: 'Unesena vrijednost nije unikatna'
- VALIDATIONPASSWORDSDONTMATCH: 'Lozine se ne slažu'
+ VALIDATIONNOTUNIQUE: 'Unešena vrijednost nije unikatna'
+ VALIDATIONPASSWORDSDONTMATCH: 'Lozinke se ne slažu'
VALIDATIONPASSWORDSNOTEMPTY: 'Lozinke moraju imati najmanje jedan broj i jedan alfanumerički znak'
Group:
Code: 'Krupni kod'
@@ -58,11 +102,11 @@ hr:
IMAGEDIMENSIONS: Dimenzije
IMAGEHEIGHTPX: Visina
IMAGEWIDTHPX: Širina
- LINK: 'Ubaci/editiraj link za označeni tekst'
+ LINK: 'Ubaci/uredi link za označeni tekst'
LINKDESCR: 'Opis veze'
LINKEMAIL: 'Email adresa'
LINKEXTERNAL: 'Na drugom webu'
- LINKFILE: 'Downlad datoteke'
+ LINKFILE: 'Preuzmite datoteku'
LINKINTERNAL: 'Stranicu na ovom webu'
LINKOPENNEWWIN: 'Otvori vezu (link) u novom prozoru?'
LINKTO: 'Poveži na'
@@ -72,18 +116,18 @@ hr:
LeftAndMain:
HELP: Pomoć
PAGETYPE: 'Tip Stranice:'
- PERMAGAIN: 'Odjavili ste se sa CMS-a. Želite li se ponovno prijaviti, upišite korisničko ime i lozinku'
- PERMALREADY: 'Nažalost, ne možete pristupiti tom dijelu CMS-a. Želite li se prijaviti kao netko drugi, učinite to ispod'
- PERMDEFAULT: 'Odaberite metodu autorizacije te upišite svoje podatke za pristup CMS-u.'
- PLEASESAVE: 'Molim spremite stranicu: Nemože biti ažurirano dok nije spremljeno.'
+ PERMAGAIN: 'Odjavili ste se sa sustava. Želite li se ponovno prijaviti upišite korisničko ime i lozinku.'
+ PERMALREADY: 'Nažalost, ne možete pristupiti tom dijelu sustava. Želite li se prijaviti kao netko drugi učinite to ispod'
+ PERMDEFAULT: 'Odaberite metodu autorizacije te upišite svoje podatke za pristup sustavu.'
+ PLEASESAVE: 'Molim spremite stranicu: Stranica ne može biti ažurirana jer još uvijek nije spremljena.'
Member:
BUTTONCHANGEPASSWORD: 'Promjeni lozinku'
- BUTTONLOGIN: 'Prijavi'
+ BUTTONLOGIN: 'Prijava'
BUTTONLOGINOTHER: 'Prijavite se kao netko drugi'
- BUTTONLOSTPASSWORD: 'Zaboraljena lozinka'
+ BUTTONLOSTPASSWORD: 'Zaboravljena lozinka?'
CONFIRMNEWPASSWORD: 'Potvrdite novu lozinku'
CONFIRMPASSWORD: 'Potvrdi lozinku'
- ERRORNEWPASSWORD: 'Pogrečno ste upisali novu lozinku, pokušajte ponovno'
+ ERRORNEWPASSWORD: 'Pogrešno ste upisali novu lozinku, pokušajte ponovno.'
ERRORPASSWORDNOTMATCH: 'Vaša trenutna lozinka se ne podudara, probajte ponovno'
FIRSTNAME: 'Ime'
INTERFACELANG: 'Jezik sučelja'
@@ -92,10 +136,10 @@ hr:
PLURALNAME: Članovi
REMEMBERME: 'Zapamti me'
SINGULARNAME: Član
- SUBJECTPASSWORDCHANGED: 'Vaša lozinka je promjenjena'
+ SUBJECTPASSWORDCHANGED: 'Vaša lozinka je izmjenjena'
SUBJECTPASSWORDRESET: 'Link za reset lozinke'
SURNAME: Prezime
- VALIDATIONMEMBEREXISTS: 'Već postoji korisnik sa tim Emailom'
+ VALIDATIONMEMBEREXISTS: 'Već postoji korisnik sa istim %s'
YOUROLDPASSWORD: 'Stara lozinka'
belongs_many_many_Groups: Grupe
db_LockedOutUntil: 'Zaključano do'
@@ -105,7 +149,7 @@ hr:
PhoneNumberField:
VALIDATION: 'Molim unesite ispravan telefonski broj'
Security:
- ALREADYLOGGEDIN: 'Nemate pristup na ovu stranicu. Imate li drugi korisnički račun, koristite njega'
+ ALREADYLOGGEDIN: 'Nije Vam dozvoljen pristup ovoj stranici. Imate li drugi korisnički račun koji ima prava pristupa ovoj stranici možete se koristiti njime.'
BUTTONSEND: 'Pošalji mi link za reset lozinke'
CHANGEPASSWORDBELOW: 'Svoju lozinku možete promjeniti ovdje'
CHANGEPASSWORDHEADER: 'Promjeni lozinku'
@@ -113,12 +157,12 @@ hr:
ERRORPASSWORDPERMISSION: 'Morate biti prijavljeni kako bi ste promjenili lozinku'
LOGGEDOUT: 'Odlogirani ste. Želite li se ponovno logirati, upišite podatke'
LOGIN: 'Logiraj se'
- NOTEPAGESECURED: 'Stranica je osigurana. Upišite svoje podatke i poslat ćemo Vam.'
- NOTERESETPASSWORD: 'Upišite vaš e-mail i polati ćemo Vam link na kojem možete dobiti novu lozinku'
+ NOTEPAGESECURED: 'Ova stranica je zaštićena. Prijavite se na sustav sa svojim pristupnim podatcima i odmah ćemo vas preusmjeriti.'
+ NOTERESETPASSWORD: 'Unesite svoju e-mail adresu, a mi ćemo Vam poslati link putem kojega možete resetirati Vašu lozinku.'
SecurityAdmin:
NEWGROUP: 'Nova Grupa'
SiteTree:
- TABMAIN: '''Main'''
+ TABMAIN: Osnovno
ToggleField:
LESS: manje
MORE: više
diff --git a/lang/sv.yml b/lang/sv.yml
index 1eba1feba..f9fb8dca0 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -11,6 +11,7 @@ sv:
SIZE: 'Filstorlek'
TITLE: Titel
TYPE: 'Filtyp'
+ URL: URL
AssetUploadField:
ChooseFiles: 'Välj filer'
DRAGFILESHERE: 'Dra filer hit'
@@ -71,6 +72,7 @@ sv:
ChangePasswordEmail_ss:
CHANGEPASSWORDTEXT1: 'Du har ändrat ditt lösenord för'
CHANGEPASSWORDTEXT2: 'Du kan nu använda följande uppgifter för att logga in:'
+ EMAIL: E-post
HELLO: Hej
PASSWORD: Lösenord
ConfirmedPasswordField:
@@ -78,6 +80,8 @@ sv:
BETWEEN: 'Lösenord måste vara {min} till {max} tecken långa.'
MAXIMUM: 'Lösenord får som längst vara {max} tecken långa.'
SHOWONCLICKTITLE: 'Ändra lösenord'
+ ContentController:
+ NOTLOGGEDIN: 'Inte inloggad'
CreditCardField:
FIRST: första
FOURTH: fjärde
@@ -87,8 +91,18 @@ sv:
PLURALNAME: 'Dataobjekt'
SINGULARNAME: 'Dataobjekt'
Date:
+ DAY: dag
+ DAYS: dagar
+ HOUR: timme
+ HOURS: timmar
+ LessThanMinuteAgo: 'mindre än en minut'
+ MONTH: månad
+ MONTHS: månader
+ SEC: sek
TIMEDIFFAGO: '{difference} sen'
TIMEDIFFIN: 'om {difference}'
+ YEAR: år
+ YEARS: år
DateField:
NOTSET: 'inte angivet'
TODAY: i dag
@@ -101,6 +115,7 @@ sv:
INVALID_REQUEST: 'Ogiltig förfrågan'
DropdownField:
CHOOSE: (Välj)
+ CHOOSESEARCH: '(Välj eller sök)'
EmailField:
VALIDATION: 'Var snäll och ange en epostadress'
Enum:
@@ -183,11 +198,21 @@ sv:
DeletePermissionsFailure: 'Rättighet för att radera saknas'
Deleted: 'Raderade %s %s'
Save: Spara
+ GridFieldEditButton_ss:
+ EDIT: Redigera
+ GridFieldItemEditView:
+ Go_back: 'Gå tillbaka'
Group:
AddRole: 'Lägg till roll för den här gruppen'
+ Code: 'Gruppkod'
+ DefaultGroupTitleAdministrators: Administratörer
DefaultGroupTitleContentAuthors: 'Författare'
+ Description: Beskrivning
GroupReminder: 'Om du väljer en förälder till gruppen så kommer gruppen ärva alla förälderns roller'
+ Locked: 'Låst?'
+ NoRoles: 'Inga roller fun'
PLURALNAME: Grupper
+ RolesAddEditLink: 'Hantera roller'
SINGULARNAME: Grupp
Sort: 'Sorteringsordning'
has_many_Permissions: Behörigheter
@@ -204,6 +229,7 @@ sv:
ADDURL: 'Lägg till URL'
ADJUSTDETAILSDIMENSIONS: 'Detaljer & dimensioner'
ANCHORVALUE: Ankare
+ BUTTONADDURL: 'Lägg till URL'
BUTTONINSERT: Infoga
BUTTONINSERTLINK: 'Infoga länk'
BUTTONREMOVELINK: 'Ta bort länk'
@@ -241,6 +267,7 @@ sv:
LINKOPENNEWWIN: 'Öppna länk i nytt fönster?'
LINKTO: 'Länka till'
PAGE: Sida
+ URL: URL
URLNOTANOEMBEDRESOURCE: 'URLen ''{url}'' gick inte att omvandla till ett media.'
UpdateMEDIA: 'Uppdatera media'
Image:
@@ -264,6 +291,9 @@ sv:
PreviewButton: Förhandsgranska
REORGANISATIONSUCCESSFUL: 'Omorganisationen av sidträdet luyckades.'
SAVEDUP: Sparad.
+ ShowAsList: 'visa som lista'
+ TooManyPages: 'För många sidor'
+ ValidationError: 'Valideringsfel'
VersionUnknown: okänd
LeftAndMain_Menu_ss:
Hello: Hej
@@ -273,6 +303,7 @@ sv:
IP: 'IP-adress'
PLURALNAME: 'Inloggningsförsök'
SINGULARNAME: 'Inloggningsförsök'
+ Status: Status
Member:
ADDGROUP: 'Lägg till grupp'
BUTTONCHANGEPASSWORD: 'Ändra lösenord'
@@ -295,6 +326,7 @@ sv:
INVALIDNEWPASSWORD: 'Vi kunde inte godkänna det lösenordet: {password}'
LOGGEDINAS: 'Du är inloggad som {name}.'
NEWPASSWORD: 'Nytt lösenord'
+ NoPassword: 'Det finns inget lösenord för den här medlemmen'
PASSWORD: Lösenord
PLURALNAME: Medlemmar
REMEMBERME: 'Kom ihåg mig nästa gång?'
@@ -335,6 +367,7 @@ sv:
TWODIGITMONTH: 'Tvåsiffrig månad (01 = januari osv)'
TWODIGITSECOND: 'Två siffror för sekund (00 till 59)'
TWODIGITYEAR: 'Två siffror för år'
+ Toggle: 'Visa fomateringshjälp'
MemberImportForm:
Help1: '
Importera användare i CSV-format (kommaseparerade värden). Visa avancerat
'
Help2: "
\n
Avancerat
\n
\n
Tillåtna kolumner: %s
\n
Existerade användare matchas av deras unika kod-attribut och uppdateras med alla nya värden från den importerade filen
\n
Grupper kan anges i Grupp-kolumnen. Grupper identiferas av deras Code-attribut. Anges flera grupper separeras dessa med kommatecken. Existerande användarrättigheter till grupperna tas inte bort.
\n
\n
"
@@ -350,6 +383,7 @@ sv:
ModelAdmin:
DELETE: Radera
DELETEDRECORDS: 'Raderade {count} poster.'
+ EMPTYBEFOREIMPORT: 'Ersätt data'
IMPORT: 'Importera från CSV'
IMPORTEDRECORDS: 'Importerade {count} poster.'
NOCSVFILE: 'Var god och bläddra efter en CSV-fil för import'
@@ -439,7 +473,9 @@ sv:
BtnImport: 'Importera från CSV'
FileFieldLabel: 'CSV-fil (Tillåtna filtyper: *.csv)'
SilverStripeNavigator:
+ Auto: Auto
Edit: Ändra
+ Width: bredd
TableListField:
CSVEXPORT: 'Exportera till CSV'
Print: Skriv ut
@@ -454,6 +490,8 @@ sv:
ATTACHFILE: 'Bifoga en fil'
ATTACHFILES: 'Bifoga fil(er)'
AttachFile: 'Bifoga fil(er)'
+ CHOOSEANOTHERFILE: 'Välj en annan fil'
+ CHOOSEANOTHERINFO: 'Ersätt den här filen med en annan från filarkivet'
DELETE: 'Radera från filer'
DELETEINFO: 'Ta bort filen permanent från filarkivet'
DOEDIT: Spara
@@ -468,10 +506,13 @@ sv:
FROMFILES: 'Från filer'
HOTLINKINFO: 'Information: Denna bild kommer att bli länkad till. Var god kontrollera med ägaren till sajten att du har tillåtelse att länka till bilden.'
MAXNUMBEROFFILES: 'Max antal ({count}) filer överstiget.'
+ MAXNUMBEROFFILESONE: 'Kan bara ladda upp en fil'
MAXNUMBEROFFILESSHORT: 'Kan bara ladda upp {count} files'
+ OVERWRITEWARNING: 'En fil med samma namn finns redan'
REMOVE: Ta bort
REMOVEINFO: 'Ta bort filen härifrån, men radera den inte från filarkivet'
STARTALL: 'Starta alla'
Saved: Sparad
+ UPLOADSINTO: 'sparas till /{path}'
Versioned:
has_many_Versions: Versioner
diff --git a/lang/tr.yml b/lang/tr.yml
index 0b6af1398..9bc334766 100644
--- a/lang/tr.yml
+++ b/lang/tr.yml
@@ -104,10 +104,10 @@ tr:
has_many_Permissions: İzinler
many_many_Members: Üyeler
HtmlEditorField:
- ANCHORVALUE: Anchor(çapa)
+ ANCHORVALUE: Çapa
BUTTONINSERTLINK: 'Bağlantı ekle'
BUTTONREMOVELINK: 'Bağlantıyı sil'
- CSSCLASS: 'Hizalama / stil'
+ CSSCLASS: 'Hizalama / biçem'
CSSCLASSCENTER: 'Ortalanmış, kendi başına'
CSSCLASSLEFT: 'Sol tarafta, metin ile çevrili.'
CSSCLASSLEFTALONE: 'Solda, kendisinde.'
@@ -119,7 +119,7 @@ tr:
IMAGEHEIGHTPX: Yükseklik
IMAGEWIDTHPX: Genişlik
LINK: 'Link'
- LINKANCHOR: 'Bu sayfadaki Anchor(çapa)'
+ LINKANCHOR: 'Bu sayfadaki çapa'
LINKDESCR: 'Bağlantı açıklaması'
LINKEMAIL: 'Eposta adresi'
LINKEXTERNAL: 'Başka bir sitedeki sayfa (dış bağlantı)'
@@ -139,9 +139,9 @@ tr:
PERMDEFAULT: 'İYS erişimi için eposta adresinizi ve parolanızı giriniz.e kolaylık sağlama'
PLEASESAVE: 'Lütfen Sayfayı Kaydedin: Bu sayfa henüz kaydedilmediği için güncellenemedi.'
PreviewButton: Önizleme
- SAVEDUP: Kaydedilmiş.
+ SAVEDUP: Kaydedildi.
LoginAttempt:
- Email: 'Eposta Adresi'
+ Email: 'E-posta Adresi'
IP: 'IP Adresi'
Status: Durum
Member:
@@ -179,12 +179,12 @@ tr:
MemberAuthenticator:
TITLE: 'E-posta & Şifre'
MemberDatetimeOptionsetField:
- DATEFORMATBAD: 'Tarih formatı yanlış'
+ DATEFORMATBAD: 'Tarih biçimi geçersiz'
ModelAdmin:
DELETE: Sil
IMPORT: 'CSV''den içer aktar'
NOCSVFILE: 'CSV dosyası ekleme'
- NOIMPORT: 'İçe aktarılacak birşey yok'
+ NOIMPORT: 'İçe aktarılacak bir şey yok'
RESET: Sıfırla
NullableField:
IsNullLabel: 'Boş değer'
@@ -232,7 +232,7 @@ tr:
EDITINFO: 'Dosyayı düzenle'
FIELDNOTSET: 'Dosya bilgisi bulunamadı'
FROMCOMPUTER: 'Kendi makinenizden'
- FROMFILES: 'Kimden dosyaları'
+ FROMFILES: 'Dosyalardan'
STARTALL: 'Tümünü başlat'
Saved: Kaydedilmiş
Versioned:
diff --git a/main.php b/main.php
index 192907c93..b5cb17132 100644
--- a/main.php
+++ b/main.php
@@ -158,6 +158,7 @@ global $databaseConfig;
// Redirect to the installer if no database is selected
if(!isset($databaseConfig) || !isset($databaseConfig['database']) || !$databaseConfig['database']) {
if(!file_exists(BASE_PATH . '/install.php')) {
+ header($_SERVER['SERVER_PROTOCOL'] . " 500 Server Error");
die('SilverStripe Framework requires a $databaseConfig defined.');
}
$s = (isset($_SERVER['SSL']) || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off')) ? 's' : '';
diff --git a/model/DataList.php b/model/DataList.php
index 28c2d2433..802365046 100644
--- a/model/DataList.php
+++ b/model/DataList.php
@@ -263,6 +263,17 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
});
}
+ /**
+ * Return a new DataList instance with distinct records or not
+ *
+ * @param bool $value
+ */
+ public function distinct($value) {
+ return $this->alterDataQuery(function($query) use ($value){
+ $query->distinct($value);
+ });
+ }
+
/**
* Return a new DataList instance as a copy of this data list with the sort
* order set.
@@ -383,21 +394,21 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
}
/**
- * Return a copy of this list which does not contain items matching any of these charactaristics.
+ * Return a copy of this list which contains items matching any of these charactaristics.
*
- * @example // filter bob from list
+ * @example // only bob in the list
* $list = $list->filterAny('Name', 'bob');
* // SQL: WHERE "Name" = 'bob'
- * @example // filter aziz and bob from list
+ * @example // azis or bob in the list
* $list = $list->filterAny('Name', array('aziz', 'bob');
* // SQL: WHERE ("Name" IN ('aziz','bob'))
- * @example // filter by bob or anybody aged 21
+ * @example // bob or anyone aged 21 in the list
* $list = $list->filterAny(array('Name'=>'bob, 'Age'=>21));
* // SQL: WHERE ("Name" = 'bob' OR "Age" = '21')
- * @example // filter by bob or anybody aged 21 or 43
+ * @example // bob or anyone aged 21 or 43 in the list
* $list = $list->filterAny(array('Name'=>'bob, 'Age'=>array(21, 43)));
* // SQL: WHERE ("Name" = 'bob' OR ("Age" IN ('21', '43'))
- * @example // bob age 21 or 43, phil age 21 or 43 would be excluded
+ * @example // all bobs, phils or anyone aged 21 or 43 in the list
* $list = $list->filterAny(array('Name'=>array('bob','phil'), 'Age'=>array(21, 43)));
* // SQL: WHERE (("Name" IN ('bob', 'phil')) OR ("Age" IN ('21', '43'))
*
diff --git a/model/DataObject.php b/model/DataObject.php
index 3d49251d9..8c47bb8b5 100644
--- a/model/DataObject.php
+++ b/model/DataObject.php
@@ -765,9 +765,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
return $name;
} else {
$name = $this->singular_name();
- if(substr($name,-1) == 'e') $name = substr($name,0,-1);
- else if(substr($name,-1) == 'y') $name = substr($name,0,-1) . 'ie';
-
+ if(substr($name,-1) == 'y') $name = substr($name,0,-1) . 'ie';
return ucfirst($name . 's');
}
}
@@ -1050,7 +1048,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* It is expected that you call validate() in your own application to test that an object is valid before
* attempting a write, and respond appropriately if it isn't.
*
- * @return A {@link ValidationResult} object
+ * @see {@link ValidationResult}
+ * @return ValidationResult
*/
public function validate() {
$result = ValidationResult::create();
@@ -1817,19 +1816,10 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @return array The database fields
*/
public function db($fieldName = null) {
- $classes = ClassInfo::ancestry($this);
- $good = false;
+ $classes = ClassInfo::ancestry($this, true);
$items = array();
- foreach($classes as $class) {
- // Wait until after we reach DataObject
- if(!$good) {
- if($class == 'DataObject') {
- $good = true;
- }
- continue;
- }
-
+ foreach(array_reverse($classes) as $class) {
if(isset(self::$_cache_db[$class])) {
$dbItems = self::$_cache_db[$class];
} else {
@@ -3404,6 +3394,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
$types['has_one'] = (array)singleton($ancestorClass)->uninherited('has_one', true);
$types['has_many'] = (array)singleton($ancestorClass)->uninherited('has_many', true);
$types['many_many'] = (array)singleton($ancestorClass)->uninherited('many_many', true);
+ $types['belongs_many_many'] = (array)singleton($ancestorClass)->uninherited('belongs_many_many', true);
}
foreach($types as $type => $attrs) {
foreach($attrs as $name => $spec) {
@@ -3442,7 +3433,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
*
* @return array
*/
- public function summaryFields(){
+ public function summaryFields() {
$fields = $this->stat('summary_fields');
// if fields were passed in numeric array,
@@ -3466,7 +3457,11 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
// Localize fields (if possible)
foreach($this->fieldLabels(false) as $name => $label) {
- if(isset($fields[$name])) $fields[$name] = $label;
+ // only attempt to localize if the label definition is the same as the field name.
+ // this will preserve any custom labels set in the summary_fields configuration
+ if(isset($fields[$name]) && $name === $fields[$name]) {
+ $fields[$name] = $label;
+ }
}
return $fields;
diff --git a/model/DataQuery.php b/model/DataQuery.php
index 119329ff0..b21a1fac2 100644
--- a/model/DataQuery.php
+++ b/model/DataQuery.php
@@ -288,6 +288,7 @@ class DataQuery {
if($orderby = $query->getOrderBy()) {
$newOrderby = array();
+ $i = 0;
foreach($orderby as $k => $dir) {
$newOrderby[$k] = $dir;
@@ -300,7 +301,10 @@ class DataQuery {
// Pull through SortColumn references from the originalSelect variables
if(preg_match('/_SortColumn/', $col)) {
- if(isset($originalSelect[$col])) $query->selectField($originalSelect[$col], $col);
+ if(isset($originalSelect[$col])) {
+ $query->selectField($originalSelect[$col], $col);
+ }
+
continue;
}
@@ -314,6 +318,7 @@ class DataQuery {
// remove original sort
unset($newOrderby[$k]);
+
// add new columns sort
$newOrderby[$qualCol] = $dir;
@@ -326,12 +331,16 @@ class DataQuery {
} else {
$qualCol = '"' . implode('"."', $parts) . '"';
- // To-do: Remove this if block once SQLSelect::$select has been refactored to store getSelect()
- // format internally; then this check can be part of selectField()
if(!in_array($qualCol, $query->getSelect())) {
- $query->selectField($qualCol);
+ unset($newOrderby[$k]);
+
+ $newOrderby["\"_SortColumn$i\""] = $dir;
+ $query->selectField($qualCol, "_SortColumn$i");
+
+ $i++;
}
}
+
}
$query->setOrderBy($newOrderby);
@@ -577,6 +586,17 @@ class DataQuery {
return $this;
}
+ /**
+ * Set whether this query should be distinct or not.
+ *
+ * @param bool $value
+ * @return DataQuery
+ */
+ public function distinct($value) {
+ $this->query->setDistinct($value);
+ return $this;
+ }
+
/**
* Add an INNER JOIN clause to this query.
*
@@ -633,9 +653,11 @@ class DataQuery {
$model = singleton($modelClass);
if ($component = $model->has_one($rel)) {
if(!$this->query->isJoinedTo($component)) {
- $foreignKey = $model->getReverseAssociation($component);
+ $has_one = array_flip($model->has_one());
+ $foreignKey = $has_one[$component];
+ $realModelClass = ClassInfo::table_for_object_field($modelClass, "{$foreignKey}ID");
$this->query->addLeftJoin($component,
- "\"$component\".\"ID\" = \"{$modelClass}\".\"{$foreignKey}ID\"");
+ "\"$component\".\"ID\" = \"{$realModelClass}\".\"{$foreignKey}ID\"");
/**
* add join clause to the component's ancestry classes so that the search filter could search on
diff --git a/model/Image.php b/model/Image.php
index 3fe846655..c38ed012b 100644
--- a/model/Image.php
+++ b/model/Image.php
@@ -6,7 +6,7 @@
* @package framework
* @subpackage filesystem
*/
-class Image extends File {
+class Image extends File implements Flushable {
const ORIENTATION_SQUARE = 0;
const ORIENTATION_PORTRAIT = 1;
@@ -72,6 +72,19 @@ class Image extends File {
*/
private static $force_resample = false;
+ /**
+ * @config
+ * @var bool Regenerates images if set to true. This is set by {@link flush()}
+ */
+ private static $flush = false;
+
+ /**
+ * Triggered early in the request when someone requests a flush.
+ */
+ public static function flush() {
+ self::$flush = true;
+ }
+
public static function set_backend($backend) {
self::config()->backend = $backend;
}
@@ -424,7 +437,7 @@ class Image extends File {
if($this->ID && $this->Filename && Director::fileExists($this->Filename)) {
$cacheFile = call_user_func_array(array($this, "cacheFilename"), $args);
- if(!file_exists(Director::baseFolder()."/".$cacheFile) || isset($_GET['flush'])) {
+ if(!file_exists(Director::baseFolder()."/".$cacheFile) || self::$flush) {
call_user_func_array(array($this, "generateFormattedImage"), $args);
}
@@ -599,6 +612,7 @@ class Image extends File {
closedir($handle);
}
}
+ $pattern = "/^(({$generateFuncs}).*\-)+" . preg_quote($this->Name) . "$/i";
$pattern = $this->getFilenamePatterns($this->Name);
diff --git a/model/UnsavedRelationList.php b/model/UnsavedRelationList.php
index c3ebf19b1..05db48c92 100644
--- a/model/UnsavedRelationList.php
+++ b/model/UnsavedRelationList.php
@@ -261,7 +261,7 @@ class UnsavedRelationList extends ArrayList {
*/
public function column($colName = 'ID') {
$list = new ArrayList($this->toArray());
- return $list->column('ID');
+ return $list->column($colName);
}
/**
diff --git a/model/connect/DBConnector.php b/model/connect/DBConnector.php
index b36d7ea76..a3fda60fe 100644
--- a/model/connect/DBConnector.php
+++ b/model/connect/DBConnector.php
@@ -85,7 +85,7 @@ abstract class DBConnector {
$starttime = microtime(true);
$result = $callback($sql);
$endtime = round(microtime(true) - $starttime, 4);
- Debug::message("\n$sql\n{$endtime}ms\n", false);
+ Debug::message("\n$sql\n{$endtime}s\n", false);
return $result;
} else {
return $callback($sql);
diff --git a/model/connect/MySQLSchemaManager.php b/model/connect/MySQLSchemaManager.php
index 1cf196c33..2490dcca6 100644
--- a/model/connect/MySQLSchemaManager.php
+++ b/model/connect/MySQLSchemaManager.php
@@ -347,7 +347,7 @@ class MySQLSchemaManager extends DBSchemaManager {
public function enumValuesForField($tableName, $fieldName) {
// Get the enum of all page types from the SiteTree table
- $classnameinfo = DB::query("DESCRIBE \"$tableName\" \"$fieldName\"")->first();
+ $classnameinfo = $this->query("DESCRIBE \"$tableName\" \"$fieldName\"")->first();
preg_match_all("/'[^,]+'/", $classnameinfo["Type"], $matches);
$classes = array();
diff --git a/model/fieldtypes/DBField.php b/model/fieldtypes/DBField.php
index 89849aa97..fc7f05cd9 100644
--- a/model/fieldtypes/DBField.php
+++ b/model/fieldtypes/DBField.php
@@ -150,7 +150,7 @@ abstract class DBField extends ViewableData {
* @return boolean
*/
public function exists() {
- return ($this->value);
+ return (bool)$this->value;
}
/**
diff --git a/model/fieldtypes/HTMLText.php b/model/fieldtypes/HTMLText.php
index 6a1194da4..e24a80b15 100644
--- a/model/fieldtypes/HTMLText.php
+++ b/model/fieldtypes/HTMLText.php
@@ -175,6 +175,14 @@ class HTMLText extends Text {
return $this->Summary();
}
+ /**
+ * Return the value of the field with relative links converted to absolute urls (with placeholders parsed).
+ * @return string
+ */
+ public function AbsoluteLinks() {
+ return HTTP::absoluteURLs($this->forTemplate());
+ }
+
public function forTemplate() {
if ($this->processShortcodes) {
return ShortcodeParser::get_active()->parse($this->value);
diff --git a/model/fieldtypes/StringField.php b/model/fieldtypes/StringField.php
index f92b7717e..ce79b69ed 100644
--- a/model/fieldtypes/StringField.php
+++ b/model/fieldtypes/StringField.php
@@ -21,6 +21,7 @@ abstract class StringField extends DBField {
'LimitWordCountXML' => 'HTMLText',
"LowerCase" => "Text",
"UpperCase" => "Text",
+ 'NoHTML' => 'Text',
);
/**
@@ -187,4 +188,13 @@ abstract class StringField extends DBField {
public function UpperCase() {
return mb_strtoupper($this->value);
}
+
+ /**
+ * Return the value of the field stripped of html tags.
+ *
+ * @return string
+ */
+ public function NoHTML() {
+ return strip_tags($this->value);
+ }
}
diff --git a/model/fieldtypes/Text.php b/model/fieldtypes/Text.php
index fc4fbca98..97ad02b81 100644
--- a/model/fieldtypes/Text.php
+++ b/model/fieldtypes/Text.php
@@ -30,7 +30,6 @@ class Text extends StringField {
'EscapeXML' => 'Text',
'LimitWordCount' => 'Text',
'LimitWordCountXML' => 'HTMLText',
- 'NoHTML' => 'Text',
);
/**
@@ -53,15 +52,6 @@ class Text extends StringField {
DB::require_field($this->tableName, $this->name, $values, $this->default);
}
- /**
- * Return the value of the field stripped of html tags.
- *
- * @return string
- */
- public function NoHTML() {
- return strip_tags($this->value);
- }
-
/**
* Return the value of the field with relative links converted to absolute urls.
* @return string
@@ -159,14 +149,14 @@ class Text extends StringField {
* Performs the same function as the big summary, but doesn't trim new paragraphs off data.
* Caution: Not XML/HTML-safe - does not respect closing tags.
*/
- public function BigSummary($maxWords = 50, $plain = 1) {
- $result = "";
+ public function BigSummary($maxWords = 50, $plain = true) {
+ $result = '';
// get first sentence?
// this needs to be more robust
- if($plain) $data = Convert::xml2raw($this->value, true);
+ $data = $plain ? Convert::xml2raw($this->value, true) : $this->value;
- if(!$data) return "";
+ if(!$data) return '';
$sentences = explode('.', $data);
$count = count(explode(' ', $sentences[0]));
diff --git a/model/queries/SQLSelect.php b/model/queries/SQLSelect.php
index 11fb53df8..17c09fcdd 100644
--- a/model/queries/SQLSelect.php
+++ b/model/queries/SQLSelect.php
@@ -534,8 +534,8 @@ class SQLSelect extends SQLConditionalExpression {
if($this->groupby) {
// @todo Test case required here
$countQuery = new SQLSelect();
- $countQuery->select("count(*)");
- $countQuery->addFrom(array('(' . $clone->sql($innerParameters) . ') all_distinct'));
+ $countQuery->setSelect("count(*)");
+ $countQuery->setFrom(array('(' . $clone->sql($innerParameters) . ') all_distinct'));
$sql = $countQuery->sql($parameters); // $parameters should be empty
$result = DB::prepared_query($sql, $innerParameters);
return $result->value();
diff --git a/scss/AssetUploadField.scss b/scss/AssetUploadField.scss
index 21494ab25..26d4b9d7d 100644
--- a/scss/AssetUploadField.scss
+++ b/scss/AssetUploadField.scss
@@ -23,8 +23,7 @@
padding-left: 12px;
}
-body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fieldset {
- padding: $grid-x*2;
+body.cms.ss-uploadfield-edit-iframe {
overflow: auto;
background: #E2E2E2;
@@ -41,6 +40,11 @@ body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fie
}
}
+.composite.ss-assetuploadfield .details fieldset {
+ @extend body.cms.ss-uploadfield-edit-iframe;
+ padding: $grid-x*2;
+}
+
.ss-assetuploadfield {
border-bottom: 0;
@include box-shadow(none);
@@ -268,6 +272,8 @@ body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fie
iframe {
width: 100%;
+ padding: $grid-x*2;
+ background: #E2E2E2;
}
}
}
diff --git a/search/filters/SearchFilter.php b/search/filters/SearchFilter.php
index 61fa42b16..5452d1d1e 100644
--- a/search/filters/SearchFilter.php
+++ b/search/filters/SearchFilter.php
@@ -165,20 +165,10 @@ abstract class SearchFilter extends Object {
return $this->name;
}
- // This code finds the table where the field named $this->name lives
- // Todo: move to somewhere more appropriate, such as DataMapper, the
- // magical class-to-be?
- $candidateClass = $this->model;
-
- while($candidateClass != 'DataObject') {
- if( DataObject::has_own_table($candidateClass)
- && DataObject::has_own_table_database_field($candidateClass, $this->name)
- ) {
- break;
- }
-
- $candidateClass = get_parent_class($candidateClass);
- }
+ $candidateClass = ClassInfo::table_for_object_field(
+ $this->model,
+ $this->name
+ );
if($candidateClass == 'DataObject') {
// fallback to the provided name in the event of a joined column
diff --git a/security/Authenticator.php b/security/Authenticator.php
index 739e1b16a..de3619c82 100644
--- a/security/Authenticator.php
+++ b/security/Authenticator.php
@@ -51,6 +51,23 @@ abstract class Authenticator extends Object {
public static function get_login_form(Controller $controller) {
}
+ /**
+ * Method that creates the re-authentication form for the in-CMS view
+ *
+ * @param Controller $controller
+ */
+ public static function get_cms_login_form(Controller $controller) {
+ }
+
+ /**
+ * Determine if this authenticator supports in-cms reauthentication
+ *
+ * @return bool
+ */
+ public static function supports_cms() {
+ return false;
+ }
+
/**
* Get the name of the authentication method
@@ -61,7 +78,7 @@ abstract class Authenticator extends Object {
}
public static function register($authenticator) {
- self::register_authenticator($authenticator);
+ self::register_authenticator($authenticator);
}
@@ -108,10 +125,10 @@ abstract class Authenticator extends Object {
*/
public static function unregister_authenticator($authenticator) {
if(call_user_func(array($authenticator, 'on_unregister')) === true) {
- if(in_array($authenticator, self::$authenticators)) {
- unset(self::$authenticators[array_search($authenticator, self::$authenticators)]);
- }
- };
+ if(in_array($authenticator, self::$authenticators)) {
+ unset(self::$authenticators[array_search($authenticator, self::$authenticators)]);
+ }
+ }
}
diff --git a/security/CMSMemberLoginForm.php b/security/CMSMemberLoginForm.php
new file mode 100644
index 000000000..8806ba330
--- /dev/null
+++ b/security/CMSMemberLoginForm.php
@@ -0,0 +1,166 @@
+Link($action);
+ }
+
+ public function __construct(Controller $controller, $name) {
+ // Set default fields
+ $fields = new FieldList(
+ HiddenField::create("AuthenticationMethod", null, $this->authenticator_class, $this),
+ HiddenField::create('tempid', null, $controller->getRequest()->requestVar('tempid')),
+ PasswordField::create("Password", _t('Member.PASSWORD', 'Password')),
+ LiteralField::create(
+ 'forgotPassword',
+ sprintf(
+ '