From 0a64b07b2c25b39ec89dbbe1f8aaa213e9184386 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 13 Sep 2018 19:00:04 +0200 Subject: [PATCH 001/175] NEW Use Bootstrap alerts throughout the CMS --- templates/SilverStripe/Security/CMSSecurity_login.ss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/SilverStripe/Security/CMSSecurity_login.ss b/templates/SilverStripe/Security/CMSSecurity_login.ss index a4834f0b6..cd02e2032 100644 --- a/templates/SilverStripe/Security/CMSSecurity_login.ss +++ b/templates/SilverStripe/Security/CMSSecurity_login.ss @@ -7,7 +7,7 @@ <% with $Form %> <% if $Message %> -
+

$Message

<% end_if %> From 274657f4f815cfb990c23b39ab81c1def91b37ad Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Fri, 14 Sep 2018 11:19:53 +0200 Subject: [PATCH 002/175] FIX Add support in "I should see a message" step definition for Bootstrap alerts --- tests/behat/src/CmsUiContext.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/behat/src/CmsUiContext.php b/tests/behat/src/CmsUiContext.php index 209835615..aea6f2ea1 100644 --- a/tests/behat/src/CmsUiContext.php +++ b/tests/behat/src/CmsUiContext.php @@ -85,7 +85,13 @@ class CmsUiContext implements Context */ public function iShouldSeeAMessage($message) { - $this->getMainContext()->assertElementContains('.message', $message); + $page = $this->getMainContext()->getSession()->getPage(); + if ($page->find('css', '.message')) { + $this->getMainContext()->assertElementContains('.message', $message); + } else { + // Support for new Bootstrap alerts + $this->getMainContext()->assertElementContains('.alert', $message); + } } protected function getCmsTabsElement() From a6a17439976710b2311558d363b5467fa429dcca Mon Sep 17 00:00:00 2001 From: bergice Date: Tue, 16 Oct 2018 18:49:51 +1300 Subject: [PATCH 003/175] BUG: Fix `ENTER` not triggering form save button as `GridField`s used `submit` type buttons --- src/Forms/GridField/GridField_FormAction.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Forms/GridField/GridField_FormAction.php b/src/Forms/GridField/GridField_FormAction.php index 627ef8b87..10dc772bc 100644 --- a/src/Forms/GridField/GridField_FormAction.php +++ b/src/Forms/GridField/GridField_FormAction.php @@ -101,6 +101,7 @@ class GridField_FormAction extends FormAction // will strip it from the requests 'name' => 'action_gridFieldAlterAction' . '?' . http_build_query($actionData), 'data-url' => $this->gridField->Link(), + 'type' => "button", ) ); } From e211e27470ec4ff21ccc30656741458d5344df2c Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 14:27:57 +0200 Subject: [PATCH 004/175] Add more unit tests for DebugViewFriendlyErrorFormatter, tidy up Director::is_ajax() return --- src/Control/Director.php | 10 +-- .../DebugViewFriendlyErrorFormatter.php | 7 ++- .../DebugViewFriendlyErrorFormatterTest.php | 61 ++++++++++++++++++- 3 files changed, 69 insertions(+), 9 deletions(-) diff --git a/src/Control/Director.php b/src/Control/Director.php index 8b85e1fee..86491bd05 100644 --- a/src/Control/Director.php +++ b/src/Control/Director.php @@ -1004,12 +1004,12 @@ class Director implements TemplateGlobalProvider $request = self::currentRequest($request); if ($request) { return $request->isAjax(); - } else { - return ( - isset($_REQUEST['ajax']) || - (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == "XMLHttpRequest") - ); } + + return ( + isset($_REQUEST['ajax']) || + (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == "XMLHttpRequest") + ); } /** diff --git a/src/Logging/DebugViewFriendlyErrorFormatter.php b/src/Logging/DebugViewFriendlyErrorFormatter.php index fca78fcf4..7356076c4 100644 --- a/src/Logging/DebugViewFriendlyErrorFormatter.php +++ b/src/Logging/DebugViewFriendlyErrorFormatter.php @@ -97,7 +97,7 @@ class DebugViewFriendlyErrorFormatter implements FormatterInterface public function format(array $record) { // Get error code - $code = empty($record['code']) ? $this->statusCode : $record['code']; + $code = empty($record['code']) ? $this->getStatusCode() : $record['code']; return $this->output($code); } @@ -127,8 +127,9 @@ class DebugViewFriendlyErrorFormatter implements FormatterInterface $output = $renderer->renderHeader(); $output .= $renderer->renderInfo("Website Error", $this->getTitle(), $this->getBody()); - if (Email::config()->admin_email) { - $mailto = Email::obfuscate(Email::config()->admin_email); + $adminEmail = Email::config()->get('admin_email'); + if ($adminEmail) { + $mailto = Email::obfuscate($adminEmail); $output .= $renderer->renderParagraph('Contact an administrator: ' . $mailto . ''); } diff --git a/tests/php/Logging/DebugViewFriendlyErrorFormatterTest.php b/tests/php/Logging/DebugViewFriendlyErrorFormatterTest.php index 49d834457..04f2c64c1 100644 --- a/tests/php/Logging/DebugViewFriendlyErrorFormatterTest.php +++ b/tests/php/Logging/DebugViewFriendlyErrorFormatterTest.php @@ -2,18 +2,66 @@ namespace SilverStripe\Logging\Tests; +use PHPUnit_Framework_MockObject_MockObject; use SilverStripe\Control\Email\Email; +use SilverStripe\Control\HTTPRequest; +use SilverStripe\Core\Injector\Injector; +use SilverStripe\Dev\DebugView; use SilverStripe\Dev\SapphireTest; use SilverStripe\Logging\DebugViewFriendlyErrorFormatter; class DebugViewFriendlyErrorFormatterTest extends SapphireTest { - public function setUp() + protected function setUp() { parent::setUp(); Email::config()->set('admin_email', 'testy@mctest.face'); } + public function testFormatPassesRecordCodeToOutput() + { + /** @var DebugViewFriendlyErrorFormatter|PHPUnit_Framework_MockObject_MockObject $mock */ + $mock = $this->getMockBuilder(DebugViewFriendlyErrorFormatter::class) + ->setMethods(['output']) + ->getMock(); + + $mock->expects($this->once())->method('output')->with(403)->willReturn('foo'); + $this->assertSame('foo', $mock->format(['code' => 403])); + } + + public function testFormatPassesInstanceStatusCodeToOutputWhenNotProvidedByRecord() + { + /** @var DebugViewFriendlyErrorFormatter|PHPUnit_Framework_MockObject_MockObject $mock */ + $mock = $this->getMockBuilder(DebugViewFriendlyErrorFormatter::class) + ->setMethods(['output']) + ->getMock(); + + $mock->setStatusCode(404); + + $mock->expects($this->once())->method('output')->with(404)->willReturn('foo'); + $this->assertSame('foo', $mock->format(['notacode' => 'bar'])); + } + + public function testFormatBatch() + { + $records = [ + ['message' => 'bar'], + ['open' => 'sausage'], + ['horse' => 'caballo'], + ]; + + /** @var DebugViewFriendlyErrorFormatter|PHPUnit_Framework_MockObject_MockObject $mock */ + $mock = $this->getMockBuilder(DebugViewFriendlyErrorFormatter::class) + ->setMethods(['format']) + ->getMock(); + + $mock->expects($this->exactly(3)) + ->method('format') + ->willReturn('foo'); + + $this->assertSame('foofoofoo', $mock->formatBatch($records)); + } + public function testOutput() { $formatter = new DebugViewFriendlyErrorFormatter(); @@ -34,4 +82,15 @@ TEXT $this->assertEquals($expected, $formatter->output(404)); } + + public function testOutputReturnsTitleWhenRequestIsAjax() + { + // Mock an AJAX request + Injector::inst()->registerService(new HTTPRequest('GET', '', ['ajax' => true])); + + $formatter = new DebugViewFriendlyErrorFormatter(); + $formatter->setTitle('The Diary of Anne Frank'); + + $this->assertSame('The Diary of Anne Frank', $formatter->output(200)); + } } From 73df3166b7d3eac4a3b7b4600a6033f668b8ca77 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 14:30:15 +0200 Subject: [PATCH 005/175] Switch to short array syntax in DetailedErrorFormatter, add spaces between array values --- src/Logging/DetailedErrorFormatter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Logging/DetailedErrorFormatter.php b/src/Logging/DetailedErrorFormatter.php index 2d47bd999..4b845d5d6 100644 --- a/src/Logging/DetailedErrorFormatter.php +++ b/src/Logging/DetailedErrorFormatter.php @@ -25,7 +25,7 @@ class DetailedErrorFormatter implements FormatterInterface ); } else { $context = isset($record['context']) ? $record['context'] : $record; - foreach (array('code','message','file','line') as $key) { + foreach (['code', 'message', 'file', 'line'] as $key) { if (!isset($context[$key])) { $context[$key] = isset($record[$key]) ? $record[$key] : null; } @@ -57,7 +57,7 @@ class DetailedErrorFormatter implements FormatterInterface public function formatBatch(array $records) { - return implode("\n", array_map(array($this, 'format'), $records)); + return implode("\n", array_map([$this, 'format'], $records)); } /** From 2694a47c45a01ae5f7228a61f665d0b15f300b31 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 14:41:45 +0200 Subject: [PATCH 006/175] Add more tests for DetailedErrorFormatter --- .../DebugViewFriendlyErrorFormatterTest.php | 1 - .../Logging/DetailedErrorFormatterTest.php | 46 ++++++++++++++++++- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/tests/php/Logging/DebugViewFriendlyErrorFormatterTest.php b/tests/php/Logging/DebugViewFriendlyErrorFormatterTest.php index 04f2c64c1..0b40bcf38 100644 --- a/tests/php/Logging/DebugViewFriendlyErrorFormatterTest.php +++ b/tests/php/Logging/DebugViewFriendlyErrorFormatterTest.php @@ -6,7 +6,6 @@ use PHPUnit_Framework_MockObject_MockObject; use SilverStripe\Control\Email\Email; use SilverStripe\Control\HTTPRequest; use SilverStripe\Core\Injector\Injector; -use SilverStripe\Dev\DebugView; use SilverStripe\Dev\SapphireTest; use SilverStripe\Logging\DebugViewFriendlyErrorFormatter; diff --git a/tests/php/Logging/DetailedErrorFormatterTest.php b/tests/php/Logging/DetailedErrorFormatterTest.php index 40f9b75a7..b36786f81 100644 --- a/tests/php/Logging/DetailedErrorFormatterTest.php +++ b/tests/php/Logging/DetailedErrorFormatterTest.php @@ -8,7 +8,7 @@ use SilverStripe\Logging\Tests\DetailedErrorFormatterTest\ErrorGenerator; class DetailedErrorFormatterTest extends SapphireTest { - public function testFormat() + public function testFormatWithException() { $generator = new ErrorGenerator(); $formatter = new DetailedErrorFormatter(); @@ -27,4 +27,48 @@ class DetailedErrorFormatterTest extends SapphireTest $output ); } + + public function testFormatWithoutException() + { + $record = [ + 'code' => 401, + 'message' => 'Denied', + 'file' => 'index.php', + 'line' => 4, + ]; + + $formatter = new DetailedErrorFormatter(); + $result = $formatter->format($record); + + $this->assertContains('ERRNO 401', $result, 'Status code was not found in trace'); + $this->assertContains('Denied', $result, 'Message was not found in trace'); + $this->assertContains('Line 4 in index.php', $result, 'Line or filename were not found in trace'); + $this->assertContains(self::class, $result, 'Backtrace doesn\'t show current test class'); + } + + public function testFormatBatch() + { + $records = [ + [ + 'code' => 401, + 'message' => 'Denied', + 'file' => 'index.php', + 'line' => 4, + ], + [ + 'code' => 404, + 'message' => 'Not found', + 'file' => 'admin.php', + 'line' => 7, + ], + ]; + + $formatter = new DetailedErrorFormatter(); + $result = $formatter->formatBatch($records); + + $this->assertContains('ERRNO 401', $result, 'First status code was not found in trace'); + $this->assertContains('ERRNO 404', $result, 'Second status code was not found in trace'); + $this->assertContains('Denied', $result, 'First message was not found in trace'); + $this->assertContains('Not found', $result, 'Second message was not found in trace'); + } } From 9911c9c9ef0d78398f31431964d58a3055679045 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 14:51:08 +0200 Subject: [PATCH 007/175] Use single quotes and getters over direct prop access in HTTPOutputHandler --- src/Logging/HTTPOutputHandler.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Logging/HTTPOutputHandler.php b/src/Logging/HTTPOutputHandler.php index 206039cd1..45f51c785 100644 --- a/src/Logging/HTTPOutputHandler.php +++ b/src/Logging/HTTPOutputHandler.php @@ -18,7 +18,7 @@ class HTTPOutputHandler extends AbstractProcessingHandler /** * @var string */ - private $contentType = "text/html"; + private $contentType = 'text/html'; /** * @var int @@ -155,8 +155,8 @@ class HTTPOutputHandler extends AbstractProcessingHandler // If headers have been sent then these won't be used, and may throw errors that we wont' want to see. if (!headers_sent()) { - $response->setStatusCode($this->statusCode); - $response->addHeader("Content-Type", $this->contentType); + $response->setStatusCode($this->getStatusCode()); + $response->addHeader('Content-Type', $this->getContentType()); } else { // To supress errors aboot errors $response->setStatusCode(200); @@ -165,6 +165,6 @@ class HTTPOutputHandler extends AbstractProcessingHandler $response->setBody($record['formatted']); $response->output(); - return false === $this->bubble; + return false === $this->getBubble(); } } From 5bd05a2deba610e67836c1f6f292ce02b6aa743a Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 14:51:53 +0200 Subject: [PATCH 008/175] Reduce setUp visibility and remove check for CLI - tests always run on CLI now --- tests/php/Logging/HTTPOutputHandlerTest.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/php/Logging/HTTPOutputHandlerTest.php b/tests/php/Logging/HTTPOutputHandlerTest.php index 352fdf13d..198361bf5 100644 --- a/tests/php/Logging/HTTPOutputHandlerTest.php +++ b/tests/php/Logging/HTTPOutputHandlerTest.php @@ -3,7 +3,6 @@ namespace SilverStripe\Logging\Tests; use Monolog\Handler\HandlerInterface; -use PhpParser\Node\Scalar\MagicConst\Dir; use SilverStripe\Control\Director; use SilverStripe\Core\Injector\Injector; use SilverStripe\Dev\SapphireTest; @@ -13,14 +12,12 @@ use SilverStripe\Logging\HTTPOutputHandler; class HTTPOutputHandlerTest extends SapphireTest { - public function setUp() + protected function setUp() { parent::setUp(); - if (!Director::is_cli()) { - $this->markTestSkipped("This test only runs in CLI mode"); - } + if (!Director::isDev()) { - $this->markTestSkipped("This test only runs in dev mode"); + $this->markTestSkipped('This test only runs in dev mode'); } } From 3cdb73bd44376161c79e0ccd38394f52203458c7 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 15:00:08 +0200 Subject: [PATCH 009/175] NEW Add getLogger() to MonologErrorHandler and add test for exception without one --- src/Logging/MonologErrorHandler.php | 16 ++++++++++++++-- tests/php/Logging/MonologErrorHandlerTest.php | 19 +++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 tests/php/Logging/MonologErrorHandlerTest.php diff --git a/src/Logging/MonologErrorHandler.php b/src/Logging/MonologErrorHandler.php index 8d2ccdb80..3b5e7727f 100644 --- a/src/Logging/MonologErrorHandler.php +++ b/src/Logging/MonologErrorHandler.php @@ -16,19 +16,31 @@ class MonologErrorHandler implements ErrorHandler * Set the PSR-3 logger to send errors & exceptions to * * @param LoggerInterface $logger + * @return $this */ public function setLogger(LoggerInterface $logger) { $this->logger = $logger; + return $this; + } + + /** + * Get the PSR-3 logger to send errors & exceptions to + * + * @return LoggerInterface + */ + public function getLogger() + { + return $this->logger; } public function start() { - if (!$this->logger) { + if (!$this->getLogger()) { throw new \InvalidArgumentException("No Logger property passed to MonologErrorHandler." . "Is your Injector config correct?"); } - MonologHandler::register($this->logger); + MonologHandler::register($this->getLogger()); } } diff --git a/tests/php/Logging/MonologErrorHandlerTest.php b/tests/php/Logging/MonologErrorHandlerTest.php new file mode 100644 index 000000000..c7ec4628e --- /dev/null +++ b/tests/php/Logging/MonologErrorHandlerTest.php @@ -0,0 +1,19 @@ +start(); + } +} From 60b375d99500284e71c2c60fbda583f4c4a9cd7b Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 15:18:34 +0200 Subject: [PATCH 010/175] Add more tests for CheckboxField_Readonly and CompositeField, improve PHPDocs --- src/Forms/CompositeField.php | 10 +- .../php/Forms/CheckboxField_ReadonlyTest.php | 17 ++ tests/php/Forms/CompositeFieldTest.php | 150 +++++++++++++++++- 3 files changed, 171 insertions(+), 6 deletions(-) create mode 100644 tests/php/Forms/CheckboxField_ReadonlyTest.php diff --git a/src/Forms/CompositeField.php b/src/Forms/CompositeField.php index e86b55fd8..e02a3c9df 100644 --- a/src/Forms/CompositeField.php +++ b/src/Forms/CompositeField.php @@ -21,11 +21,13 @@ class CompositeField extends FormField /** * Set to true when this field is a readonly field + * + * @var bool */ protected $readonly; /** - * @var $columnCount int Toggle different css-rendering for multiple columns + * @var int Toggle different css-rendering for multiple columns * ("onecolumn", "twocolumns", "threecolumns"). The content is determined * by the $children-array, so wrap all items you want to have grouped in a * column inside a CompositeField. @@ -35,12 +37,12 @@ class CompositeField extends FormField protected $columnCount = null; /** - * @var String custom HTML tag to render with, e.g. to produce a
. + * @var string custom HTML tag to render with, e.g. to produce a
. */ protected $tag = 'div'; /** - * @var String Optional description for this set of fields. + * @var string Optional description for this set of fields. * If the {@link $tag} property is set to use a 'fieldset', this will be * rendered as a tag, otherwise its a 'title' attribute. */ @@ -214,7 +216,7 @@ class CompositeField extends FormField 'tabindex' => null, 'type' => null, 'value' => null, - 'title' => ($this->tag == 'fieldset') ? null : $this->legend + 'title' => ($this->tag === 'fieldset') ? null : $this->legend ) ); } diff --git a/tests/php/Forms/CheckboxField_ReadonlyTest.php b/tests/php/Forms/CheckboxField_ReadonlyTest.php new file mode 100644 index 000000000..4996deda8 --- /dev/null +++ b/tests/php/Forms/CheckboxField_ReadonlyTest.php @@ -0,0 +1,17 @@ +performReadonlyTransformation(); + $this->assertInstanceOf(CheckboxField_Readonly::class, $result); + $this->assertNotSame($result, $field); + } +} diff --git a/tests/php/Forms/CompositeFieldTest.php b/tests/php/Forms/CompositeFieldTest.php index 6a4629fd8..382c339dc 100644 --- a/tests/php/Forms/CompositeFieldTest.php +++ b/tests/php/Forms/CompositeFieldTest.php @@ -2,13 +2,14 @@ namespace SilverStripe\Forms\Tests; +use PHPUnit_Framework_Error; use SilverStripe\Dev\CSSContentParser; use SilverStripe\Dev\SapphireTest; -use SilverStripe\Forms\FieldList; -use SilverStripe\Forms\TextField; use SilverStripe\Forms\CompositeField; use SilverStripe\Forms\DropdownField; +use SilverStripe\Forms\FieldList; use SilverStripe\Forms\RequiredFields; +use SilverStripe\Forms\TextField; class CompositeFieldTest extends SapphireTest { @@ -36,6 +37,9 @@ class CompositeFieldTest extends SapphireTest $this->assertEquals(0, $compositeOuter->fieldPosition('A')); $this->assertEquals(1, $compositeOuter->fieldPosition('AB')); $this->assertEquals(2, $compositeOuter->fieldPosition('B')); + + $this->assertFalse($compositeOuter->fieldPosition(null), 'Falsy input should return false'); + $this->assertFalse($compositeOuter->fieldPosition('FOO'), 'Non-exitent child should return false'); } public function testTag() @@ -124,4 +128,146 @@ class CompositeFieldTest extends SapphireTest $this->assertEquals($expectedChildren, $field->getChildren()); $this->assertEquals($field, $expectedChildren->getContainerField()); } + + public function testExtraClass() + { + $field = CompositeField::create(); + $field->setColumnCount(3); + $result = $field->extraClass(); + + $this->assertContains('field', $result, 'Default class was not added'); + $this->assertContains('CompositeField', $result, 'Default class was not added'); + $this->assertContains('multicolumn', $result, 'Multi column field did not have extra class added'); + } + + public function testGetAttributes() + { + $field = CompositeField::create(); + $field->setLegend('test'); + $result = $field->getAttributes(); + + $this->assertNull($result['tabindex']); + $this->assertNull($result['type']); + $this->assertNull($result['value']); + $this->assertSame('test', $result['title']); + } + + public function testGetAttributesReturnsEmptyTitleForFieldSets() + { + $field = CompositeField::create(); + $field->setLegend('not used'); + $field->setTag('fieldset'); + $result = $field->getAttributes(); + $this->assertNull($result['title']); + } + + /** + * @expectedException PHPUnit_Framework_Error + * @expectedExceptionMessageRegExp /a field called 'Test' appears twice in your form.*TextField.*TextField/ + */ + public function testCollateDataFieldsThrowsErrorOnDuplicateChildren() + { + $field = CompositeField::create( + TextField::create('Test'), + TextField::create('Test') + ); + + $list = []; + $field->collateDataFields($list); + } + + public function testCollateDataFieldsWithSaveableOnly() + { + $field = CompositeField::create( + TextField::create('Test') + ->setReadonly(false) + ->setDisabled(true) + ); + + $list = []; + $field->collateDataFields($list, true); + $this->assertEmpty($list, 'Unsaveable fields should not be collated when $saveableOnly = true'); + + $field->collateDataFields($list, false); + $this->assertNotEmpty($list, 'Unsavable fields should be collated when $saveableOnly = false'); + } + + public function testSetDisabledPropagatesToChildren() + { + $field = CompositeField::create( + $testField = TextField::create('Test') + ->setDisabled(false) + )->setDisabled(true); + $this->assertTrue($field->fieldByName('Test')->isDisabled(), 'Children should also be set to disabled'); + } + + public function testIsComposite() + { + $this->assertTrue(CompositeField::create()->isComposite()); + } + + public function testMakeFieldReadonlyPassedFieldName() + { + $field = CompositeField::create( + TextField::create('Test')->setDisabled(false) + ); + + $this->assertFalse($field->fieldByName('Test')->isReadonly()); + $this->assertTrue($field->makeFieldReadonly('Test'), 'makeFieldReadonly should return true'); + $this->assertTrue($field->fieldByName('Test')->isReadonly(), 'Named child field should be made readonly'); + } + + public function testMakeFieldReadonlyPassedFormField() + { + $field = CompositeField::create( + $testField = TextField::create('Test')->setDisabled(false) + ); + + $this->assertFalse($field->fieldByName('Test')->isReadonly()); + $this->assertTrue($field->makeFieldReadonly($testField), 'makeFieldReadonly should return true'); + $this->assertTrue($field->fieldByName('Test')->isReadonly(), 'Named child field should be made readonly'); + } + + public function testMakeFieldReadonlyWithNestedCompositeFields() + { + $field = CompositeField::create( + CompositeField::create( + TextField::create('Test')->setDisabled(false) + ) + ); + + $this->assertFalse($field->getChildren()->first()->fieldByName('Test')->isReadonly()); + $this->assertTrue($field->makeFieldReadonly('Test'), 'makeFieldReadonly should return true'); + $this->assertTrue( + $field->getChildren()->first()->fieldByName('Test')->isReadonly(), + 'Named child field should be made readonly' + ); + } + + public function testMakeFieldReadonlyReturnsFalseWhenFieldNotFound() + { + $field = CompositeField::create( + CompositeField::create( + TextField::create('Test') + ) + ); + + $this->assertFalse( + $field->makeFieldReadonly('NonExistent'), + 'makeFieldReadonly should return false when field is not found' + ); + } + + public function testDebug() + { + $field = new CompositeField( + new TextField('TestTextField') + ); + $field->setName('TestComposite'); + + $result = $field->debug(); + $this->assertContains(CompositeField::class . ' (TestComposite)', $result); + $this->assertContains('TestTextField', $result); + $this->assertContains(''); + } } From c418ee2915634ba4277688589a1ecf1d89fa6fba Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 16:34:36 +0200 Subject: [PATCH 011/175] NEW Add getters and setters for public properties in ConfirmPasswordField, add tests Some of the validation parts of ConfirmPasswordField are previously untested, this adds tests --- src/Forms/ConfirmedPasswordField.php | 168 +++++++++++++----- .../php/Forms/ConfirmedPasswordFieldTest.php | 155 +++++++++++++--- 2 files changed, 256 insertions(+), 67 deletions(-) diff --git a/src/Forms/ConfirmedPasswordField.php b/src/Forms/ConfirmedPasswordField.php index 0b14bd037..e4b3840ec 100644 --- a/src/Forms/ConfirmedPasswordField.php +++ b/src/Forms/ConfirmedPasswordField.php @@ -140,12 +140,12 @@ class ConfirmedPasswordField extends FormField $title = isset($title) ? $title : _t('SilverStripe\\Security\\Member.PASSWORD', 'Password'); // naming with underscores to prevent values from actually being saved somewhere - $this->children = new FieldList( - $this->passwordField = new PasswordField( + $this->children = FieldList::create( + $this->passwordField = PasswordField::create( "{$name}[_Password]", $title ), - $this->confirmPasswordfield = new PasswordField( + $this->confirmPasswordfield = PasswordField::create( "{$name}[_ConfirmPassword]", (isset($titleConfirmField)) ? $titleConfirmField : _t('SilverStripe\\Security\\Member.CONFIRMPASSWORD', 'Confirm Password') ) @@ -153,11 +153,11 @@ class ConfirmedPasswordField extends FormField // has to be called in constructor because Field() isn't triggered upon saving the instance if ($showOnClick) { - $this->children->push($this->hiddenField = new HiddenField("{$name}[_PasswordFieldVisible]")); + $this->getChildren()->push($this->hiddenField = HiddenField::create("{$name}[_PasswordFieldVisible]")); } // disable auto complete - foreach ($this->children as $child) { + foreach ($this->getChildren() as $child) { /** @var FormField $child */ $child->setAttribute('autocomplete', 'off'); } @@ -176,8 +176,8 @@ class ConfirmedPasswordField extends FormField public function setTitle($title) { - parent::setTitle($title); - $this->passwordField->setTitle($title); + $this->getPasswordField()->setTitle($title); + return parent::setTitle($title); } /** @@ -189,7 +189,7 @@ class ConfirmedPasswordField extends FormField { // Build inner content $fieldContent = ''; - foreach ($this->children as $field) { + foreach ($this->getChildren() as $field) { /** @var FormField $field */ $field->setDisabled($this->isDisabled()); $field->setReadonly($this->isReadonly()); @@ -207,8 +207,8 @@ class ConfirmedPasswordField extends FormField return $fieldContent; } - if ($this->showOnClickTitle) { - $title = $this->showOnClickTitle; + if ($this->getShowOnClickTitle()) { + $title = $this->getShowOnClickTitle(); } else { $title = _t( __CLASS__ . '.SHOWONCLICKTITLE', @@ -286,11 +286,11 @@ class ConfirmedPasswordField extends FormField /** * @param string $title * - * @return ConfirmedPasswordField + * @return $this */ public function setRightTitle($title) { - foreach ($this->children as $field) { + foreach ($this->getChildren() as $field) { /** @var FormField $field */ $field->setRightTitle($title); } @@ -310,8 +310,8 @@ class ConfirmedPasswordField extends FormField public function setChildrenTitles($titles) { $expectedChildren = $this->getRequireExistingPassword() ? 3 : 2; - if (is_array($titles) && count($titles) == $expectedChildren) { - foreach ($this->children as $field) { + if (is_array($titles) && count($titles) === $expectedChildren) { + foreach ($this->getChildren() as $field) { if (isset($titles[0])) { /** @var FormField $field */ $field->setTitle($titles[0]); @@ -350,7 +350,7 @@ class ConfirmedPasswordField extends FormField : null; if ($this->showOnClick && isset($value['_PasswordFieldVisible'])) { - $this->children->fieldByName($this->getName() . '[_PasswordFieldVisible]') + $this->getChildren()->fieldByName($this->getName() . '[_PasswordFieldVisible]') ->setValue($value['_PasswordFieldVisible']); } } else { @@ -362,10 +362,10 @@ class ConfirmedPasswordField extends FormField //looking up field by name is expensive, so lets check it needs to change if ($oldValue != $this->value) { - $this->children->fieldByName($this->getName() . '[_Password]') + $this->getChildren()->fieldByName($this->getName() . '[_Password]') ->setValue($this->value); - $this->children->fieldByName($this->getName() . '[_ConfirmPassword]') + $this->getChildren()->fieldByName($this->getName() . '[_ConfirmPassword]') ->setValue($this->confirmValue); } @@ -380,8 +380,8 @@ class ConfirmedPasswordField extends FormField */ public function setName($name) { - $this->passwordField->setName($name . '[_Password]'); - $this->confirmPasswordfield->setName($name . '[_ConfirmPassword]'); + $this->getPasswordField()->setName($name . '[_Password]'); + $this->getConfirmPasswordField()->setName($name . '[_ConfirmPassword]'); if ($this->hiddenField) { $this->hiddenField->setName($name . '[_PasswordFieldVisible]'); } @@ -417,12 +417,12 @@ class ConfirmedPasswordField extends FormField return true; } - $this->passwordField->setValue($this->value); - $this->confirmPasswordfield->setValue($this->confirmValue); - $value = $this->passwordField->Value(); + $this->getPasswordField()->setValue($this->value); + $this->getConfirmPasswordField()->setValue($this->confirmValue); + $value = $this->getPasswordField()->Value(); // both password-fields should be the same - if ($value != $this->confirmPasswordfield->Value()) { + if ($value != $this->getConfirmPasswordField()->Value()) { $validator->validationError( $name, _t('SilverStripe\\Forms\\Form.VALIDATIONPASSWORDSDONTMATCH', "Passwords don't match"), @@ -434,7 +434,7 @@ class ConfirmedPasswordField extends FormField if (!$this->canBeEmpty) { // both password-fields shouldn't be empty - if (!$value || !$this->confirmPasswordfield->Value()) { + if (!$value || !$this->getConfirmPasswordField()->Value()) { $validator->validationError( $name, _t('SilverStripe\\Forms\\Form.VALIDATIONPASSWORDSNOTEMPTY', "Passwords can't be empty"), @@ -446,29 +446,31 @@ class ConfirmedPasswordField extends FormField } // lengths - if (($this->minLength || $this->maxLength)) { + $minLength = $this->getMinLength(); + $maxLength = $this->getMaxLength(); + if ($minLength || $maxLength) { $errorMsg = null; $limit = null; - if ($this->minLength && $this->maxLength) { - $limit = "{{$this->minLength},{$this->maxLength}}"; + if ($minLength && $maxLength) { + $limit = "{{$minLength},{$maxLength}}"; $errorMsg = _t( - 'SilverStripe\\Forms\\ConfirmedPasswordField.BETWEEN', + __CLASS__ . '.BETWEEN', 'Passwords must be {min} to {max} characters long.', - array('min' => $this->minLength, 'max' => $this->maxLength) + ['min' => $minLength, 'max' => $maxLength] ); - } elseif ($this->minLength) { - $limit = "{{$this->minLength}}.*"; + } elseif ($minLength) { + $limit = "{{$minLength}}.*"; $errorMsg = _t( - 'SilverStripe\\Forms\\ConfirmedPasswordField.ATLEAST', + __CLASS__ . '.ATLEAST', 'Passwords must be at least {min} characters long.', - array('min' => $this->minLength) + ['min' => $minLength] ); - } elseif ($this->maxLength) { - $limit = "{0,{$this->maxLength}}"; + } elseif ($maxLength) { + $limit = "{0,{$maxLength}}"; $errorMsg = _t( - 'SilverStripe\\Forms\\ConfirmedPasswordField.MAXIMUM', + __CLASS__ . '.MAXIMUM', 'Passwords must be at most {max} characters long.', - array('max' => $this->maxLength) + ['max' => $maxLength] ); } $limitRegex = '/^.' . $limit . '$/'; @@ -478,16 +480,18 @@ class ConfirmedPasswordField extends FormField $errorMsg, "validation" ); + + return false; } } - if ($this->requireStrongPassword) { + if ($this->getRequireStrongPassword()) { if (!preg_match('/^(([a-zA-Z]+\d+)|(\d+[a-zA-Z]+))[a-zA-Z0-9]*$/', $value)) { $validator->validationError( $name, _t( 'SilverStripe\\Forms\\Form.VALIDATIONSTRONGPASSWORD', - "Passwords must have at least one digit and one alphanumeric character" + 'Passwords must have at least one digit and one alphanumeric character' ), "validation" ); @@ -502,8 +506,8 @@ class ConfirmedPasswordField extends FormField $validator->validationError( $name, _t( - 'SilverStripe\\Forms\\ConfirmedPasswordField.CURRENT_PASSWORD_MISSING', - "You must enter your current password." + __CLASS__ . '.CURRENT_PASSWORD_MISSING', + 'You must enter your current password.' ), "validation" ); @@ -516,7 +520,7 @@ class ConfirmedPasswordField extends FormField $validator->validationError( $name, _t( - 'SilverStripe\\Forms\\ConfirmedPasswordField.LOGGED_IN_ERROR', + __CLASS__ . '.LOGGED_IN_ERROR', "You must be logged in to change your password." ), "validation" @@ -532,7 +536,7 @@ class ConfirmedPasswordField extends FormField $validator->validationError( $name, _t( - 'SilverStripe\\Forms\\ConfirmedPasswordField.CURRENT_PASSWORD_ERROR', + __CLASS__ . '.CURRENT_PASSWORD_ERROR', "The current password you have entered is not correct." ), "validation" @@ -608,10 +612,84 @@ class ConfirmedPasswordField extends FormField $currentName = "{$name}[_CurrentPassword]"; if ($show) { $confirmField = PasswordField::create($currentName, _t('SilverStripe\\Security\\Member.CURRENT_PASSWORD', 'Current Password')); - $this->children->unshift($confirmField); + $this->getChildren()->unshift($confirmField); } else { - $this->children->removeByName($currentName, true); + $this->getChildren()->removeByName($currentName, true); } return $this; } + + /** + * @return PasswordField + */ + public function getPasswordField() + { + return $this->passwordField; + } + + /** + * @return PasswordField + */ + public function getConfirmPasswordField() + { + return $this->confirmPasswordfield; + } + + /** + * Set the minimum length required for passwords + * + * @param int $minLength + * @return $this + */ + public function setMinLength($minLength) + { + $this->minLength = (int) $minLength; + return $this; + } + + /** + * @return int + */ + public function getMinLength() + { + return $this->minLength; + } + + /** + * Set the maximum length required for passwords + * + * @param int $maxLength + * @return $this + */ + public function setMaxLength($maxLength) + { + $this->maxLength = (int) $maxLength; + return $this; + } + + /** + * @return int + */ + public function getMaxLength() + { + return $this->maxLength; + } + + /** + * @param bool $requireStrongPassword + * @return $this + */ + public function setRequireStrongPassword($requireStrongPassword) + { + $this->requireStrongPassword = (bool) $requireStrongPassword; + return $this; + } + + /** + * @return bool + */ + public function getRequireStrongPassword() + { + return $this->requireStrongPassword; + } } diff --git a/tests/php/Forms/ConfirmedPasswordFieldTest.php b/tests/php/Forms/ConfirmedPasswordFieldTest.php index c034ef0cb..f4fd8b253 100644 --- a/tests/php/Forms/ConfirmedPasswordFieldTest.php +++ b/tests/php/Forms/ConfirmedPasswordFieldTest.php @@ -83,33 +83,40 @@ class ConfirmedPasswordFieldTest extends SapphireTest $field = new ConfirmedPasswordField( 'Test', 'Testing', - array( - "_Password" => "abc123", - "_ConfirmPassword" => "abc123" - ) + [ + '_Password' => 'abc123', + '_ConfirmPassword' => 'abc123', + ] ); $validator = new RequiredFields(); - /** @skipUpgrade */ - new Form(Controller::curr(), 'Form', new FieldList($field), new FieldList(), $validator); $this->assertTrue( $field->validate($validator), - "Validates when both passwords are the same" + 'Validates when both passwords are the same' ); - $field->setName("TestNew"); //try changing name of field + $field->setName('TestNew'); //try changing name of field $this->assertTrue( $field->validate($validator), - "Validates when field name is changed" + 'Validates when field name is changed' ); //non-matching password should make the field invalid - $field->setValue( - array( - "_Password" => "abc123", - "_ConfirmPassword" => "123abc" - ) - ); + $field->setValue([ + '_Password' => 'abc123', + '_ConfirmPassword' => '123abc', + ]); $this->assertFalse( $field->validate($validator), - "Does not validate when passwords differ" + 'Does not validate when passwords differ' + ); + + // Empty passwords should make the field invalid + $field->setCanBeEmpty(false); + $field->setValue([ + '_Password' => '', + '_ConfirmPassword' => '', + ]); + $this->assertFalse( + $field->validate($validator), + 'Empty passwords should not be allowed when canBeEmpty is false' ); } @@ -123,17 +130,121 @@ class ConfirmedPasswordFieldTest extends SapphireTest new FieldList() ); - $form->loadDataFrom( - array( - 'Password' => array( + $form->loadDataFrom([ + 'Password' => [ '_Password' => '123', '_ConfirmPassword' => '999', - ) - ) - ); + ], + ]); $this->assertEquals('123', $field->children->first()->Value()); $this->assertEquals('999', $field->children->last()->Value()); $this->assertNotEquals($field->children->first()->Value(), $field->children->last()->Value()); } + + /** + * @param int|null $minLength + * @param int|null $maxLength + * @param bool $expectValid + * @param string $expectedMessage + * @dataProvider lengthValidationProvider + */ + public function testLengthValidation($minLength, $maxLength, $expectValid, $expectedMessage = '') + { + $field = new ConfirmedPasswordField('Test', 'Testing', [ + '_Password' => 'abc123', + '_ConfirmPassword' => 'abc123', + ]); + $field->setMinLength($minLength)->setMaxLength($maxLength); + + $validator = new RequiredFields(); + $result = $field->validate($validator); + + $this->assertSame($expectValid, $result, 'Validate method should return its result'); + $this->assertSame($expectValid, $validator->getResult()->isValid()); + if ($expectedMessage) { + $this->assertContains($expectedMessage, $validator->getResult()->serialize()); + } + } + + /** + * @return array[] + */ + public function lengthValidationProvider() + { + return [ + 'valid: within min and max' => [3, 8, true], + 'invalid: lower than min with max' => [8, 12, false, 'Passwords must be 8 to 12 characters long'], + 'valid: greater than min' => [3, null, true], + 'invalid: lower than min' => [8, null, false, 'Passwords must be at least 8 characters long'], + 'valid: less than max' => [null, 8, true], + 'invalid: greater than max' => [null, 4, false, 'Passwords must be at most 4 characters long'], + + ]; + } + + public function testStrengthValidation() + { + $field = new ConfirmedPasswordField('Test', 'Testing', [ + '_Password' => 'abc', + '_ConfirmPassword' => 'abc', + ]); + $field->setRequireStrongPassword(true); + + $validator = new RequiredFields(); + $result = $field->validate($validator); + + $this->assertFalse($result, 'Validate method should return its result'); + $this->assertFalse($validator->getResult()->isValid()); + $this->assertContains( + 'Passwords must have at least one digit and one alphanumeric character', + $validator->getResult()->serialize() + ); + } + + public function testTitle() + { + $this->assertNull(ConfirmedPasswordField::create('Test')->Title(), 'Should not have it\'s own title'); + } + + public function testSetTitlePropagatesToPasswordField() + { + /** @var ConfirmedPasswordField $field */ + $field = ConfirmedPasswordField::create('Test') + ->setTitle('My password'); + + $this->assertSame('My password', $field->getPasswordField()->Title()); + } + + public function testSetRightTitlePropagatesToChildren() + { + /** @var ConfirmedPasswordField $field */ + $field = ConfirmedPasswordField::create('Test'); + + $this->assertCount(2, $field->getChildren()); + foreach ($field->getChildren() as $child) { + $this->assertEmpty($child->RightTitle()); + } + + $field->setRightTitle('Please confirm'); + foreach ($field->getChildren() as $child) { + $this->assertSame('Please confirm', $child->RightTitle()); + } + } + + public function testSetChildrenTitles() + { + /** @var ConfirmedPasswordField $field */ + $field = ConfirmedPasswordField::create('Test'); + $field->setRequireExistingPassword(true); + $field->setChildrenTitles([ + 'Current Password', + 'Password', + 'Confirm Password', + ]); + + $this->assertSame('Current Password', $field->getChildren()->shift()->Title()); + $this->assertSame('Password', $field->getChildren()->shift()->Title()); + $this->assertSame('Confirm Password', $field->getChildren()->shift()->Title()); + } } From 8929b8204fdb9a9d1a48331feb38c2b4ba48ab1e Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 17:18:31 +0200 Subject: [PATCH 012/175] More validation tests for ConfirmedPasswordField --- src/Forms/ConfirmedPasswordField.php | 2 +- .../php/Forms/ConfirmedPasswordFieldTest.php | 112 +++++++++++++++++- 2 files changed, 108 insertions(+), 6 deletions(-) diff --git a/src/Forms/ConfirmedPasswordField.php b/src/Forms/ConfirmedPasswordField.php index e4b3840ec..dd022be49 100644 --- a/src/Forms/ConfirmedPasswordField.php +++ b/src/Forms/ConfirmedPasswordField.php @@ -573,7 +573,7 @@ class ConfirmedPasswordField extends FormField public function performReadonlyTransformation() { /** @var ReadonlyField $field */ - $field = $this->castedCopy('SilverStripe\\Forms\\ReadonlyField') + $field = $this->castedCopy(ReadonlyField::class) ->setTitle($this->title ? $this->title : _t('SilverStripe\\Security\\Member.PASSWORD', 'Password')) ->setValue('*****'); diff --git a/tests/php/Forms/ConfirmedPasswordFieldTest.php b/tests/php/Forms/ConfirmedPasswordFieldTest.php index f4fd8b253..d5b7218d5 100644 --- a/tests/php/Forms/ConfirmedPasswordFieldTest.php +++ b/tests/php/Forms/ConfirmedPasswordFieldTest.php @@ -7,12 +7,12 @@ use SilverStripe\Dev\SapphireTest; use SilverStripe\Forms\ConfirmedPasswordField; use SilverStripe\Forms\FieldList; use SilverStripe\Forms\Form; +use SilverStripe\Forms\ReadonlyField; use SilverStripe\Forms\RequiredFields; use SilverStripe\Security\Member; class ConfirmedPasswordFieldTest extends SapphireTest { - public function testSetValue() { $field = new ConfirmedPasswordField('Test', 'Testing', 'valueA'); @@ -25,6 +25,9 @@ class ConfirmedPasswordFieldTest extends SapphireTest $this->assertEquals('valueB', $field->children->fieldByName($field->getName() . '[_ConfirmPassword]')->Value()); } + /** + * @useDatabase true + */ public function testHashHidden() { $field = new ConfirmedPasswordField('Password', 'Password', 'valueA'); @@ -202,6 +205,73 @@ class ConfirmedPasswordFieldTest extends SapphireTest ); } + public function testCurrentPasswordValidation() + { + $field = new ConfirmedPasswordField('Test', 'Testing', [ + '_Password' => 'abc', + '_ConfirmPassword' => 'abc', + ]); + $field->setRequireExistingPassword(true); + + $validator = new RequiredFields(); + $result = $field->validate($validator); + + $this->assertFalse($result, 'Validate method should return its result'); + $this->assertFalse($validator->getResult()->isValid()); + $this->assertContains( + 'You must enter your current password', + $validator->getResult()->serialize() + ); + } + + public function testMustBeLoggedInToChangePassword() + { + $field = new ConfirmedPasswordField('Test', 'Testing'); + $field->setRequireExistingPassword(true); + $field->setValue([ + '_CurrentPassword' => 'foo', + '_Password' => 'abc', + '_ConfirmPassword' => 'abc', + ]); + + $validator = new RequiredFields(); + $this->logOut(); + $result = $field->validate($validator); + + $this->assertFalse($result, 'Validate method should return its result'); + $this->assertFalse($validator->getResult()->isValid()); + $this->assertContains( + 'You must be logged in to change your password', + $validator->getResult()->serialize() + ); + } + + /** + * @useDatabase true + */ + public function testValidateCorrectPassword() + { + $this->logInWithPermission('ADMIN'); + + $field = new ConfirmedPasswordField('Test', 'Testing'); + $field->setRequireExistingPassword(true); + $field->setValue([ + '_CurrentPassword' => 'foo-not-going-to-be-the-correct-password', + '_Password' => 'abc', + '_ConfirmPassword' => 'abc', + ]); + + $validator = new RequiredFields(); + $result = $field->validate($validator); + + $this->assertFalse($result, 'Validate method should return its result'); + $this->assertFalse($validator->getResult()->isValid()); + $this->assertContains( + 'The current password you have entered is not correct', + $validator->getResult()->serialize() + ); + } + public function testTitle() { $this->assertNull(ConfirmedPasswordField::create('Test')->Title(), 'Should not have it\'s own title'); @@ -218,8 +288,7 @@ class ConfirmedPasswordFieldTest extends SapphireTest public function testSetRightTitlePropagatesToChildren() { - /** @var ConfirmedPasswordField $field */ - $field = ConfirmedPasswordField::create('Test'); + $field = new ConfirmedPasswordField('Test'); $this->assertCount(2, $field->getChildren()); foreach ($field->getChildren() as $child) { @@ -234,8 +303,7 @@ class ConfirmedPasswordFieldTest extends SapphireTest public function testSetChildrenTitles() { - /** @var ConfirmedPasswordField $field */ - $field = ConfirmedPasswordField::create('Test'); + $field = new ConfirmedPasswordField('Test'); $field->setRequireExistingPassword(true); $field->setChildrenTitles([ 'Current Password', @@ -247,4 +315,38 @@ class ConfirmedPasswordFieldTest extends SapphireTest $this->assertSame('Password', $field->getChildren()->shift()->Title()); $this->assertSame('Confirm Password', $field->getChildren()->shift()->Title()); } + + public function testPerformReadonlyTransformation() + { + $field = new ConfirmedPasswordField('Test', 'Change it'); + $result = $field->performReadonlyTransformation(); + + $this->assertInstanceOf(ReadonlyField::class, $result); + $this->assertSame('Change it', $result->Title()); + $this->assertContains('***', $result->Value()); + } + + public function testPerformDisabledTransformation() + { + $field = new ConfirmedPasswordField('Test', 'Change it'); + $result = $field->performDisabledTransformation(); + + $this->assertInstanceOf(ReadonlyField::class, $result); + } + + public function testSetRequireExistingPasswordOnlyRunsOnce() + { + $field = new ConfirmedPasswordField('Test', 'Change it'); + + $this->assertCount(2, $field->getChildren()); + + $field->setRequireExistingPassword(true); + $this->assertCount(3, $field->getChildren(), 'Current password field was not pushed'); + + $field->setRequireExistingPassword(true); + $this->assertCount(3, $field->getChildren(), 'Current password field should not be pushed again'); + + $field->setRequireExistingPassword(false); + $this->assertCount(2, $field->getChildren(), 'Current password field should not be removed'); + } } From d56bad7568df1b4da0e196c961b7d0d3b310f285 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 17:33:59 +0200 Subject: [PATCH 013/175] Add tests for edge cases in CurrencyField --- src/Forms/CurrencyField.php | 5 +-- tests/php/Forms/CurrencyFieldTest.php | 59 +++++++++++++++++++-------- 2 files changed, 45 insertions(+), 19 deletions(-) diff --git a/src/Forms/CurrencyField.php b/src/Forms/CurrencyField.php index 80bf1a51e..5e2555c70 100644 --- a/src/Forms/CurrencyField.php +++ b/src/Forms/CurrencyField.php @@ -39,9 +39,8 @@ class CurrencyField extends TextField { if ($this->value) { return preg_replace('/[^0-9.\-]/', '', $this->value); - } else { - return 0.00; } + return 0.00; } public function Type() @@ -54,7 +53,7 @@ class CurrencyField extends TextField */ public function performReadonlyTransformation() { - return $this->castedCopy('SilverStripe\\Forms\\CurrencyField_Readonly'); + return $this->castedCopy(CurrencyField_Readonly::class); } public function validate($validator) diff --git a/tests/php/Forms/CurrencyFieldTest.php b/tests/php/Forms/CurrencyFieldTest.php index a985dffe1..dbb595996 100644 --- a/tests/php/Forms/CurrencyFieldTest.php +++ b/tests/php/Forms/CurrencyFieldTest.php @@ -5,6 +5,7 @@ namespace SilverStripe\Forms\Tests; use SilverStripe\Core\Config\Config; use SilverStripe\Dev\SapphireTest; use SilverStripe\Forms\CurrencyField; +use SilverStripe\Forms\CurrencyField_Readonly; use SilverStripe\Forms\RequiredFields; use SilverStripe\ORM\FieldType\DBCurrency; @@ -124,56 +125,56 @@ class CurrencyFieldTest extends SapphireTest //tests with default currency symbol setting $f->setValue('123.45'); $this->assertEquals( - $f->value, + $f->Value(), '$123.45', 'Prepends dollar sign to positive decimal' ); $f->setValue('-123.45'); $this->assertEquals( - $f->value, + $f->Value(), '$-123.45', 'Prepends dollar sign to negative decimal' ); $f->setValue('$1'); $this->assertEquals( - $f->value, + $f->Value(), '$1.00', 'Formats small value' ); $f->setValue('$2.5'); $this->assertEquals( - $f->value, + $f->Value(), '$2.50', 'Formats small value' ); $f->setValue('$2500000.13'); $this->assertEquals( - $f->value, + $f->Value(), '$2,500,000.13', 'Formats large value' ); $f->setValue('$2.50000013'); $this->assertEquals( - $f->value, + $f->Value(), '$2.50', 'Truncates long decimal portions' ); $f->setValue('test123.00test'); $this->assertEquals( - $f->value, + $f->Value(), '$123.00', 'Strips alpha values' ); $f->setValue('test'); $this->assertEquals( - $f->value, + $f->Value(), '$0.00', 'Does not set alpha values' ); @@ -183,56 +184,56 @@ class CurrencyFieldTest extends SapphireTest $f->setValue('123.45'); $this->assertEquals( - $f->value, + $f->Value(), '€123.45', 'Prepends dollar sign to positive decimal' ); $f->setValue('-123.45'); $this->assertEquals( - $f->value, + $f->Value(), '€-123.45', 'Prepends dollar sign to negative decimal' ); $f->setValue('€1'); $this->assertEquals( - $f->value, + $f->Value(), '€1.00', 'Formats small value' ); $f->setValue('€2.5'); $this->assertEquals( - $f->value, + $f->Value(), '€2.50', 'Formats small value' ); $f->setValue('€2500000.13'); $this->assertEquals( - $f->value, + $f->Value(), '€2,500,000.13', 'Formats large value' ); $f->setValue('€2.50000013'); $this->assertEquals( - $f->value, + $f->Value(), '€2.50', 'Truncates long decimal portions' ); $f->setValue('test123.00test'); $this->assertEquals( - $f->value, + $f->Value(), '€123.00', 'Strips alpha values' ); $f->setValue('test'); $this->assertEquals( - $f->value, + $f->Value(), '€0.00', 'Does not set alpha values' ); @@ -282,4 +283,30 @@ class CurrencyFieldTest extends SapphireTest -123.45 ); } + + public function testDataValueReturnsEmptyFloat() + { + $field = new CurrencyField('Test', '', null); + $this->assertSame(0.00, $field->dataValue()); + } + + public function testPerformReadonlyTransformation() + { + $field = new CurrencyField('Test'); + $result = $field->performReadonlyTransformation(); + $this->assertInstanceOf(CurrencyField_Readonly::class, $result); + } + + public function testInvalidCurrencySymbol() + { + $field = new CurrencyField('Test', '', '$5.00'); + $validator = new RequiredFields(); + + DBCurrency::config()->update('currency_symbol', '€'); + $result = $field->validate($validator); + + $this->assertFalse($result, 'Validation should fail since wrong currency was used'); + $this->assertFalse($validator->getResult()->isValid(), 'Validator should receive failed state'); + $this->assertContains('Please enter a valid currency', $validator->getResult()->serialize()); + } } From c06cf4820e02a923a683419b03979bd3677f38db Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 17:41:41 +0200 Subject: [PATCH 014/175] BUG Readonly and disabled CurrencyFields no longer always returns dollar currency sign, now respect config --- src/Forms/CurrencyField_Disabled.php | 6 ++- src/Forms/CurrencyField_Readonly.php | 8 +-- .../php/Forms/CurrencyField_DisabledTest.php | 34 ++++++++++++ .../php/Forms/CurrencyField_ReadonlyTest.php | 53 +++++++++++++++++++ 4 files changed, 96 insertions(+), 5 deletions(-) create mode 100644 tests/php/Forms/CurrencyField_DisabledTest.php create mode 100644 tests/php/Forms/CurrencyField_ReadonlyTest.php diff --git a/src/Forms/CurrencyField_Disabled.php b/src/Forms/CurrencyField_Disabled.php index 7e743755e..68145d41f 100644 --- a/src/Forms/CurrencyField_Disabled.php +++ b/src/Forms/CurrencyField_Disabled.php @@ -3,6 +3,7 @@ namespace SilverStripe\Forms; use SilverStripe\Core\Convert; +use SilverStripe\ORM\FieldType\DBCurrency; /** * Readonly version of a {@link CurrencyField}. @@ -13,7 +14,7 @@ class CurrencyField_Disabled extends CurrencyField protected $disabled = true; /** - * overloaded to display the correctly formated value for this datatype + * Overloaded to display the correctly formatted value for this data type * * @param array $properties * @return string @@ -22,7 +23,8 @@ class CurrencyField_Disabled extends CurrencyField { if ($this->value) { $val = Convert::raw2xml($this->value); - $val = _t('SilverStripe\\Forms\\CurrencyField.CURRENCYSYMBOL', '$') . number_format(preg_replace('/[^0-9.-]/', "", $val), 2); + $val = DBCurrency::config()->get('currency_symbol') + . number_format(preg_replace('/[^0-9.-]/', '', $val), 2); $valforInput = Convert::raw2att($val); } else { $valforInput = ''; diff --git a/src/Forms/CurrencyField_Readonly.php b/src/Forms/CurrencyField_Readonly.php index 775b9eb6b..292827600 100644 --- a/src/Forms/CurrencyField_Readonly.php +++ b/src/Forms/CurrencyField_Readonly.php @@ -3,6 +3,7 @@ namespace SilverStripe\Forms; use SilverStripe\Core\Convert; +use SilverStripe\ORM\FieldType\DBCurrency; /** * Readonly version of a {@link CurrencyField}. @@ -11,19 +12,20 @@ class CurrencyField_Readonly extends ReadonlyField { /** - * Overloaded to display the correctly formated value for this datatype + * Overloaded to display the correctly formatted value for this data type * * @param array $properties * @return string */ public function Field($properties = array()) { + $currencySymbol = DBCurrency::config()->get('currency_symbol'); if ($this->value) { $val = Convert::raw2xml($this->value); - $val = _t('SilverStripe\\Forms\\CurrencyField.CURRENCYSYMBOL', '$') . number_format(preg_replace('/[^0-9.-]/', "", $val), 2); + $val = $currencySymbol . number_format(preg_replace('/[^0-9.-]/', '', $val), 2); $valforInput = Convert::raw2att($val); } else { - $val = '' . _t('SilverStripe\\Forms\\CurrencyField.CURRENCYSYMBOL', '$') . '0.00'; + $val = '' . $currencySymbol . '0.00'; $valforInput = ''; } return "extraClass() . "\" id=\"" . $this->ID() . "\">$val" diff --git a/tests/php/Forms/CurrencyField_DisabledTest.php b/tests/php/Forms/CurrencyField_DisabledTest.php new file mode 100644 index 000000000..ed832521c --- /dev/null +++ b/tests/php/Forms/CurrencyField_DisabledTest.php @@ -0,0 +1,34 @@ +Field(); + + $this->assertContains('assertContains('disabled', $result, 'The input should be disabled'); + $this->assertContains('$5.00', $result, 'The value should be rendered'); + } + + /** + * @todo: Update the expectation when intl for currencies is implemented + */ + public function testFieldWithCustomisedCurrencySymbol() + { + DBCurrency::config()->update('currency_symbol', '€'); + $field = new CurrencyField_Disabled('Test', '', '€5.00'); + $result = $field->Field(); + + $this->assertContains('assertContains('disabled', $result, 'The input should be disabled'); + $this->assertContains('€5.00', $result, 'The value should be rendered'); + } +} diff --git a/tests/php/Forms/CurrencyField_ReadonlyTest.php b/tests/php/Forms/CurrencyField_ReadonlyTest.php new file mode 100644 index 000000000..289327cd1 --- /dev/null +++ b/tests/php/Forms/CurrencyField_ReadonlyTest.php @@ -0,0 +1,53 @@ +performReadonlyTransformation(); + $this->assertInstanceOf(CurrencyField_Readonly::class, $result); + $this->assertNotSame($result, $field, 'Should return a clone of the field'); + } + + public function testFieldWithValue() + { + $field = new CurrencyField_Readonly('Test', '', '$5.00'); + $result = $field->Field(); + + $this->assertContains('assertContains('readonly', $result, 'The input should be readonly'); + $this->assertContains('$5.00', $result, 'The value should be rendered'); + } + + public function testFieldWithOutValue() + { + DBCurrency::config()->update('currency_symbol', 'AUD'); + $field = new CurrencyField_Readonly('Test', '', null); + $result = $field->Field(); + + $this->assertContains('assertContains('readonly', $result, 'The input should be readonly'); + $this->assertContains('AUD0.00', $result, 'The value should be rendered'); + } + + /** + * @todo: Update the expectation when intl for currencies is implemented + */ + public function testFieldWithCustomisedCurrencySymbol() + { + DBCurrency::config()->update('currency_symbol', '€'); + $field = new CurrencyField_Readonly('Test', '', '€5.00'); + $result = $field->Field(); + + $this->assertContains('assertContains('readonly', $result, 'The input should be readonly'); + $this->assertContains('€5.00', $result, 'The value should be rendered'); + } +} From 0e2847e2899b6587e3195e2bb8dc064cecd0d0c4 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 17:59:55 +0200 Subject: [PATCH 015/175] Add tests for DatalessField --- tests/php/Forms/DatalessFieldTest.php | 45 +++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 tests/php/Forms/DatalessFieldTest.php diff --git a/tests/php/Forms/DatalessFieldTest.php b/tests/php/Forms/DatalessFieldTest.php new file mode 100644 index 000000000..a67cfc9a6 --- /dev/null +++ b/tests/php/Forms/DatalessFieldTest.php @@ -0,0 +1,45 @@ +getAttributes(); + $this->assertSame('hidden', $result['type']); + } + + public function testFieldHolderAndSmallFieldHolderReturnField() + { + /** @var DatalessField|PHPUnit_Framework_MockObject_MockObject $mock */ + $mock = $this->getMockBuilder(DatalessField::class) + ->disableOriginalConstructor() + ->setMethods(['Field']) + ->getMock(); + + $properties = [ + 'foo' => 'bar', + ]; + + $mock->expects($this->exactly(2))->method('Field')->with($properties)->willReturn('boo!'); + + $fieldHolder = $mock->FieldHolder($properties); + $smallFieldHolder = $mock->SmallFieldHolder($properties); + + $this->assertSame('boo!', $fieldHolder); + $this->assertSame('boo!', $smallFieldHolder); + } + + public function testPerformReadonlyTransformation() + { + $field = new DatalessField('Test'); + $result = $field->performReadonlyTransformation(); + $this->assertInstanceOf(DatalessField::class, $result); + $this->assertTrue($result->isReadonly()); + } +} From 97209bc919e5ce6f991f224fc9deadbbd58332f7 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 18:15:42 +0200 Subject: [PATCH 016/175] Add edge case unit tests for DateField --- src/Forms/DateField.php | 2 +- tests/php/Forms/DateFieldTest.php | 52 +++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/src/Forms/DateField.php b/src/Forms/DateField.php index a9c72e033..a58113b6f 100644 --- a/src/Forms/DateField.php +++ b/src/Forms/DateField.php @@ -10,7 +10,7 @@ use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\ValidationResult; /** - * Form used for editing a date stirng + * Form used for editing a date string * * Caution: The form field does not include any JavaScript or CSS when used outside of the CMS context, * since the required frontend dependencies are included through CMS bundling. diff --git a/tests/php/Forms/DateFieldTest.php b/tests/php/Forms/DateFieldTest.php index 5ea4d9a03..87065fc8a 100644 --- a/tests/php/Forms/DateFieldTest.php +++ b/tests/php/Forms/DateFieldTest.php @@ -5,8 +5,10 @@ namespace SilverStripe\Forms\Tests; use IntlDateFormatter; use SilverStripe\Dev\SapphireTest; use SilverStripe\Forms\DateField; +use SilverStripe\Forms\DateField_Disabled; use SilverStripe\Forms\RequiredFields; use SilverStripe\i18n\i18n; +use SilverStripe\ORM\FieldType\DBDate; use SilverStripe\ORM\FieldType\DBDatetime; /** @@ -225,4 +227,54 @@ class DateFieldTest extends SapphireTest $dateField->setLocale('de_DE'); $dateField->Value(); } + + public function testGetDateFormatHTML5() + { + $field = new DateField('Date'); + $field->setHTML5(true); + $this->assertSame(DBDate::ISO_DATE, $field->getDateFormat()); + } + + public function testGetDateFormatViaSetter() + { + $field = new DateField('Date'); + $field->setHTML5(false); + $field->setDateFormat('d-m-Y'); + $this->assertSame('d-m-Y', $field->getDateFormat()); + } + + public function testGetAttributes() + { + $field = new DateField('Date'); + $field + ->setHTML5(true) + ->setMinDate('1980-05-10') + ->setMaxDate('1980-05-20'); + + $result = $field->getAttributes(); + $this->assertSame('1980-05-10', $result['min']); + $this->assertSame('1980-05-20', $result['max']); + } + + public function testSetSubmittedValueNull() + { + $field = new DateField('Date'); + $field->setSubmittedValue(false); + $this->assertNull($field->Value()); + } + + public function testPerformReadonlyTransformation() + { + $field = new DateField('Date'); + $result = $field->performReadonlyTransformation(); + $this->assertInstanceOf(DateField_Disabled::class, $result); + $this->assertTrue($result->isReadonly()); + } + + public function testValidateWithoutValueReturnsTrue() + { + $field = new DateField('Date'); + $validator = new RequiredFields(); + $this->assertTrue($field->validate($validator)); + } } From fd50ce629572673090c6a4fa64b718464b1a5a92 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 18:29:07 +0200 Subject: [PATCH 017/175] Add more edge case tests for disabled DateFields and DatetimeField --- tests/php/Forms/DateField_DisabledTest.php | 10 ++- tests/php/Forms/DatetimeFieldTest.php | 75 +++++++++++++++++++--- 2 files changed, 73 insertions(+), 12 deletions(-) diff --git a/tests/php/Forms/DateField_DisabledTest.php b/tests/php/Forms/DateField_DisabledTest.php index a8e5e3d1f..0108b751d 100644 --- a/tests/php/Forms/DateField_DisabledTest.php +++ b/tests/php/Forms/DateField_DisabledTest.php @@ -2,10 +2,8 @@ namespace SilverStripe\Forms\Tests; -use IntlDateFormatter; use SilverStripe\Dev\SapphireTest; use SilverStripe\Forms\DateField_Disabled; -use SilverStripe\Forms\RequiredFields; use SilverStripe\i18n\i18n; use SilverStripe\ORM\FieldType\DBDatetime; @@ -76,4 +74,12 @@ class DateField_DisabledTest extends SapphireTest $actual = DateField_Disabled::create('Test')->setValue('This is not a date')->Field(); $this->assertEquals($expected, $actual); } + + public function testType() + { + $field = new DateField_Disabled('Test'); + $result = $field->Type(); + $this->assertContains('readonly', $result, 'Disabled field should be treated as readonly'); + $this->assertContains('date_disabled', $result, 'Field should contain date_disabled class'); + } } diff --git a/tests/php/Forms/DatetimeFieldTest.php b/tests/php/Forms/DatetimeFieldTest.php index d3ca4db24..37fe628e3 100644 --- a/tests/php/Forms/DatetimeFieldTest.php +++ b/tests/php/Forms/DatetimeFieldTest.php @@ -86,6 +86,13 @@ class DatetimeFieldTest extends SapphireTest $this->assertEquals('2003-01-30 11:59:38', $f->dataValue()); // server timezone (Berlin) } + public function testSetSubmittedValueNull() + { + $field = new DatetimeField('Datetime'); + $field->setSubmittedValue(false); + $this->assertNull($field->Value()); + } + public function testConstructorWithoutArgs() { $f = new DatetimeField('Datetime'); @@ -148,21 +155,24 @@ class DatetimeFieldTest extends SapphireTest public function testValidate() { - $f = new DatetimeField('Datetime', 'Datetime', '2003-03-29 23:59:38'); - $this->assertTrue($f->validate(new RequiredFields())); + $field = new DatetimeField('Datetime', 'Datetime', '2003-03-29 23:59:38'); + $this->assertTrue($field->validate(new RequiredFields())); - $f = new DatetimeField('Datetime', 'Datetime', '2003-03-29T23:59:38'); - $this->assertTrue($f->validate(new RequiredFields()), 'Normalised ISO'); + $field = new DatetimeField('Datetime', 'Datetime', '2003-03-29T23:59:38'); + $this->assertTrue($field->validate(new RequiredFields()), 'Normalised ISO'); - $f = new DatetimeField('Datetime', 'Datetime', '2003-03-29'); - $this->assertFalse($f->validate(new RequiredFields()), 'Leaving out time'); + $field = new DatetimeField('Datetime', 'Datetime', '2003-03-29'); + $this->assertFalse($field->validate(new RequiredFields()), 'Leaving out time'); - $f = (new DatetimeField('Datetime', 'Datetime')) + $field = (new DatetimeField('Datetime', 'Datetime')) ->setSubmittedValue('2003-03-29T00:00'); - $this->assertTrue($f->validate(new RequiredFields()), 'Leaving out seconds (like many browsers)'); + $this->assertTrue($field->validate(new RequiredFields()), 'Leaving out seconds (like many browsers)'); - $f = new DatetimeField('Datetime', 'Datetime', 'wrong'); - $this->assertFalse($f->validate(new RequiredFields())); + $field = new DatetimeField('Datetime', 'Datetime', 'wrong'); + $this->assertFalse($field->validate(new RequiredFields())); + + $field = new DatetimeField('Datetime', 'Datetime', false); + $this->assertTrue($field->validate(new RequiredFields())); } public function testSetMinDate() @@ -446,6 +456,51 @@ class DatetimeFieldTest extends SapphireTest $this->assertEquals($attrs['max'], '2010-01-31T23:00:00'); // frontend timezone } + public function testAttributesNonHTML5() + { + $field = new DatetimeField('Datetime'); + $field->setHTML5(false); + $result = $field->getAttributes(); + $this->assertSame('text', $result['type']); + } + + public function testFrontendToInternalEdgeCases() + { + $field = new DatetimeField('Datetime'); + + $this->assertNull($field->frontendToInternal(false)); + $this->assertNull($field->frontendToInternal('sdfsdfsfs$%^&*')); + } + + public function testInternalToFrontendEdgeCases() + { + $field = new DatetimeField('Datetime'); + + $this->assertNull($field->internalToFrontend(false)); + $this->assertNull($field->internalToFrontend('sdfsdfsfs$%^&*')); + } + + public function testPerformReadonlyTransformation() + { + $field = new DatetimeField('Datetime'); + + $result = $field->performReadonlyTransformation(); + $this->assertInstanceOf(DatetimeField::class, $result); + $this->assertNotSame($result, $field, 'Readonly field should be cloned'); + $this->assertTrue($result->isReadonly()); + } + + /** + * @expectedException \BadMethodCallException + * @expectedExceptionMessage Can't change timezone after setting a value + */ + public function testSetTimezoneThrowsExceptionWhenChangingTimezoneAfterSettingValue() + { + date_default_timezone_set('Europe/Berlin'); + $field = new DatetimeField('Datetime', 'Time', '2003-03-29 23:59:38'); + $field->setTimezone('Pacific/Auckland'); + } + protected function getMockForm() { /** @skipUpgrade */ From 449b2cf29187ca7e786c2bbcdd1eeebef1bee0cf Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 19:47:11 +0200 Subject: [PATCH 018/175] Add tests for DefaultFormFactory --- src/Forms/DefaultFormFactory.php | 1 + tests/php/Forms/DefaultFormFactoryTest.php | 38 ++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 tests/php/Forms/DefaultFormFactoryTest.php diff --git a/src/Forms/DefaultFormFactory.php b/src/Forms/DefaultFormFactory.php index 8aeaf3088..24c6e3feb 100644 --- a/src/Forms/DefaultFormFactory.php +++ b/src/Forms/DefaultFormFactory.php @@ -30,6 +30,7 @@ class DefaultFormFactory implements FormFactory * @param string $name * @param array $context * @return Form + * @throws InvalidArgumentException When required context is missing */ public function getForm(RequestHandler $controller = null, $name = FormFactory::DEFAULT_NAME, $context = []) { diff --git a/tests/php/Forms/DefaultFormFactoryTest.php b/tests/php/Forms/DefaultFormFactoryTest.php new file mode 100644 index 000000000..c8ab715f3 --- /dev/null +++ b/tests/php/Forms/DefaultFormFactoryTest.php @@ -0,0 +1,38 @@ +getForm(); + } + + public function testGetForm() + { + $record = new DataObject(); + $record->Title = 'Test'; + + $factory = new DefaultFormFactory(); + $form = $factory->getForm(null, null, ['Record' => $record]); + + $this->assertSame($record, $form->getRecord()); + } + + public function testGetRequiredContext() + { + $factory = new DefaultFormFactory(); + $this->assertContains('Record', $factory->getRequiredContext()); + } +} From bea4101e216c98da0c14df009ebd8be5341c56ed Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 20 Oct 2018 19:49:21 +0200 Subject: [PATCH 019/175] Add tests for DisabledTransformation, PrintableTransformation and PrintableTransformation_TabSet --- src/Forms/PrintableTransformation_TabSet.php | 4 +-- src/Forms/TabSet.php | 3 +- .../php/Forms/DisabledTransformationTest.php | 20 +++++++++++ .../php/Forms/PrintableTransformationTest.php | 25 +++++++++++++ .../PrintableTransformation_TabSetTest.php | 36 +++++++++++++++++++ 5 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 tests/php/Forms/DisabledTransformationTest.php create mode 100644 tests/php/Forms/PrintableTransformationTest.php create mode 100644 tests/php/Forms/PrintableTransformation_TabSetTest.php diff --git a/src/Forms/PrintableTransformation_TabSet.php b/src/Forms/PrintableTransformation_TabSet.php index f25598e5a..2be4f72d7 100644 --- a/src/Forms/PrintableTransformation_TabSet.php +++ b/src/Forms/PrintableTransformation_TabSet.php @@ -19,9 +19,9 @@ class PrintableTransformation_TabSet extends TabSet public function FieldHolder($properties = array()) { // This gives us support for sub-tabs. - $tag = ($this->tabSet) ? "h2>" : "h1>"; + $tag = $this->getTabSet() ? 'h2>' : 'h1>'; $retVal = ''; - foreach ($this->children as $tab) { + foreach ($this->getChildren() as $tab) { $retVal .= "<$tag" . $tab->Title() . "FieldHolder(); } diff --git a/src/Forms/TabSet.php b/src/Forms/TabSet.php index da18e9d48..dc0b60217 100644 --- a/src/Forms/TabSet.php +++ b/src/Forms/TabSet.php @@ -106,9 +106,8 @@ class TabSet extends CompositeField { if ($this->tabSet) { return $this->tabSet->ID() . '_' . $this->id . '_set'; - } else { - return $this->id; } + return $this->id; } /** diff --git a/tests/php/Forms/DisabledTransformationTest.php b/tests/php/Forms/DisabledTransformationTest.php new file mode 100644 index 000000000..74b460f39 --- /dev/null +++ b/tests/php/Forms/DisabledTransformationTest.php @@ -0,0 +1,20 @@ +transform($field); + + $this->assertTrue($newField->isDisabled(), 'Transformation failed to transform field to be disabled'); + } +} diff --git a/tests/php/Forms/PrintableTransformationTest.php b/tests/php/Forms/PrintableTransformationTest.php new file mode 100644 index 000000000..8a54d8d49 --- /dev/null +++ b/tests/php/Forms/PrintableTransformationTest.php @@ -0,0 +1,25 @@ +transformTabSet($tabSet); + + $this->assertInstanceOf(PrintableTransformation_TabSet::class, $result); + $this->assertSame('Root', $result->Title()); + } +} diff --git a/tests/php/Forms/PrintableTransformation_TabSetTest.php b/tests/php/Forms/PrintableTransformation_TabSetTest.php new file mode 100644 index 000000000..11ca4efd8 --- /dev/null +++ b/tests/php/Forms/PrintableTransformation_TabSetTest.php @@ -0,0 +1,36 @@ +FieldHolder(); + + $this->assertContains('

Main

', $result); + $this->assertContains('

Secondary

', $result); + + $transformationTabSet->setTabSet($optionsTabSet); + $result = $transformationTabSet->FieldHolder(); + + $this->assertContains('

Options

', $result); + } +} From af46381dca9ef11a407dbb7016a6ac1621a4b376 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Tue, 23 Oct 2018 11:52:25 +1300 Subject: [PATCH 020/175] MINOR Correct implementation of single lookup field when valueToLabel returns null --- src/Forms/SingleLookupField.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Forms/SingleLookupField.php b/src/Forms/SingleLookupField.php index a8dfc47bb..99b38f4c3 100644 --- a/src/Forms/SingleLookupField.php +++ b/src/Forms/SingleLookupField.php @@ -94,7 +94,7 @@ class SingleLookupField extends SingleSelectField return $label; } - return $value; + return parent::Value(); } /** From e9bffe40204af9aaee40d0d46f13900cb1573144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Jaramillo=20Mart=C3=ADnez?= Date: Mon, 22 Oct 2018 22:33:16 -0500 Subject: [PATCH 021/175] Update comment about locks in MySQL MySQL 5.7.5 and newer allow for multiple lock form the same session. This information is now reflected in the comment. --- src/ORM/Connect/MySQLDatabase.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ORM/Connect/MySQLDatabase.php b/src/ORM/Connect/MySQLDatabase.php index 7a518ee70..74f155e30 100644 --- a/src/ORM/Connect/MySQLDatabase.php +++ b/src/ORM/Connect/MySQLDatabase.php @@ -495,8 +495,9 @@ class MySQLDatabase extends Database { $id = $this->getLockIdentifier($name); - // MySQL auto-releases existing locks on subsequent GET_LOCK() calls, - // in contrast to PostgreSQL and SQL Server who stack the locks. + // MySQL 5.7.4 and below auto-releases existing locks on subsequent GET_LOCK() calls. + // MySQL 5.7.5 and newer allow multiple locks per sessions even with the same name. + // https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_get-lock return (bool) $this->query(sprintf("SELECT GET_LOCK('%s', %d)", $id, $timeout))->value(); } From 364eb417548ccaf614e77e2a46d1e461e39229e8 Mon Sep 17 00:00:00 2001 From: Luke Fromhold Date: Tue, 23 Oct 2018 19:06:55 +1100 Subject: [PATCH 022/175] Adding $Up. prefix to $ColumnCount references within $Fieldlist loops --- templates/SilverStripe/Forms/CompositeField.ss | 4 ++-- templates/SilverStripe/Forms/CompositeField_holder_small.ss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/SilverStripe/Forms/CompositeField.ss b/templates/SilverStripe/Forms/CompositeField.ss index 41a3ea9b5..3a42cd042 100644 --- a/templates/SilverStripe/Forms/CompositeField.ss +++ b/templates/SilverStripe/Forms/CompositeField.ss @@ -1,6 +1,6 @@ <% loop $FieldList %> - <% if $ColumnCount %> -
+ <% if $Up.ColumnCount %> +
$FieldHolder
<% else %> diff --git a/templates/SilverStripe/Forms/CompositeField_holder_small.ss b/templates/SilverStripe/Forms/CompositeField_holder_small.ss index 081da5b4f..c7b433f13 100644 --- a/templates/SilverStripe/Forms/CompositeField_holder_small.ss +++ b/templates/SilverStripe/Forms/CompositeField_holder_small.ss @@ -4,8 +4,8 @@ <% end_if %> <% loop $FieldList %> - <% if $ColumnCount %> -
+ <% if $Up.ColumnCount %> +
$SmallFieldHolder
<% else %> From 66a404ad1a83ca2f26c5f968935503306eb54578 Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Wed, 24 Oct 2018 12:11:57 +1300 Subject: [PATCH 023/175] FIX use Injector for FormField::castedCopy Allows LookupField to be replaced with user specificed classes. --- src/Forms/FormField.php | 2 +- src/Forms/TreeDropdownField_Readonly.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Forms/FormField.php b/src/Forms/FormField.php index 632335391..5a9b65bef 100644 --- a/src/Forms/FormField.php +++ b/src/Forms/FormField.php @@ -1424,7 +1424,7 @@ class FormField extends RequestHandler $field = $classOrCopy; if (!is_object($field)) { - $field = new $classOrCopy($this->name); + $field = $classOrCopy::create($this->name); } $field diff --git a/src/Forms/TreeDropdownField_Readonly.php b/src/Forms/TreeDropdownField_Readonly.php index fed1a1765..c51867098 100644 --- a/src/Forms/TreeDropdownField_Readonly.php +++ b/src/Forms/TreeDropdownField_Readonly.php @@ -17,7 +17,7 @@ class TreeDropdownField_Readonly extends TreeDropdownField } $source = [ $this->value => $title ]; - $field = new LookupField($this->name, $this->title, $source); + $field = LookupField::create($this->name, $this->title, $source); $field->setValue($this->value); $field->setForm($this->form); return $field->Field(); From 4e62698391035e330815c83293a50bcc09f8413f Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Wed, 24 Oct 2018 15:27:15 +1300 Subject: [PATCH 024/175] Add entry to change log about CMSPageHistoryController deprecation. (#8508) * Add entry to change log about CMSPageHistoryController deprecation. * Correct typo #8508 * Tweaking CMS History controller changelog entry #8508 --- docs/en/04_Changelogs/4.3.0.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docs/en/04_Changelogs/4.3.0.md b/docs/en/04_Changelogs/4.3.0.md index 58f9a5b9d..9dba198d9 100644 --- a/docs/en/04_Changelogs/4.3.0.md +++ b/docs/en/04_Changelogs/4.3.0.md @@ -7,6 +7,7 @@ - Take care with `stageChildren()` overrides. `Hierarchy::numChildren() ` results will only make use of `stageChildren()` customisations that are applied to the base class and don't include record-specific behaviour. - New React-based search UI for the CMS, Asset-Admin, GridFields and ModelAdmins. - A new `GridFieldLazyLoader` component can be added to `GridField`. This will delay the fetching of data until the user access the container Tab of the GridField. + - `SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController` is now the default CMS history controller and `SilverStripe\CMS\Controllers\CMSPageHistoryController` has been deprecated. ## Upgrading {#upgrading} @@ -41,3 +42,23 @@ public function getCMSFields() } ``` + +### Keep using the legacy `CMSPageHistoryController` + +To keep using the old CMS history controller for every page type, add the following entry to your YML config. + +```yml +SilverStripe\Core\Injector\Injector: + SilverStripe\CMS\Controllers\CMSPageHistoryController: + class: SilverStripe\CMS\Controllers\CMSPageHistoryController +``` + +If you want to use both CMS history controllers in different contexts, you can implement your own _Factory_ class. +```yml +SilverStripe\Core\Injector\Injector: + SilverStripe\CMS\Controllers\CMSPageHistoryController: + factory: + App\MySite\MyCustomControllerFactory +``` + +[Implementing a _Factory_ with the Injector](/developer_guides/extending/injector/#factories) From a3a4f48cb7385820b0a5ce97d717ffaadb614cea Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Wed, 24 Oct 2018 16:47:16 +1300 Subject: [PATCH 025/175] MINOR Update doc to explain how to use and build the pattern lib --- .../02_CMS_Architecture.md | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/02_CMS_Architecture.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/02_CMS_Architecture.md index c98c7fdfe..f90a7fa4b 100644 --- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/02_CMS_Architecture.md +++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/02_CMS_Architecture.md @@ -55,15 +55,35 @@ coding conventions. A pattern library is a collection of user interface design elements, this helps developers and designers collaborate and to provide a quick preview of elements as they were intended without the need to build an entire interface to see it. Components built in React and used by the CMS are actively being added to the pattern library. +The pattern library can be used to preview React components without including them in the SilverStripe CMS. -To access the pattern library, starting from your project root: +### Viewing the latest pattern library -``` -cd vendor/silverstripe/admin && yarn pattern-lib +The easiest way to access the pattern library is to view it online. The pattern library for the latest SilverStripe 4 development branch is automatically built and deployed. Note that this may include new components that are not yet available in a stable release. + +[Browse the SilverStripe pattern library online](https://silverstripe.github.io/silverstripe-admin). + +### Running the pattern library + +If you're developing a new React component, running the pattern library locally is a good way to interact with it. + +The pattern library is built from the `silverstripe/admin` module, but it also requires `silverstripe/asset-admin`, `silversrtipe/cms` and `silverstripe/campaign-admin`. + +To run the pattern library locally, you'll need a SilverStripe project based on `silverstripe/recipe-cms` and `yarn` installed locally. The pattern library requires the JS source files so you'll need to use the `--prefer-source` flag when installing your dependencies with Composer. + +```bash +composer install --prefer-source +(cd vendor/silverstripe/asset-admin && yarn install) +(cd vendor/silverstripe/campaign-admin && yarn install) +(cd vendor/silverstripe/cms && yarn install) +cd vendor/silverstripe/admin && yarn install && yarn pattern-lib ``` -Then browse to `http://localhost:6006/` +The pattern library will be available at [http://localhost:6006](http://localhost:6006). The JS source files will be watched, so every time you make a change to a JavaScript file, the pattern library will automatically update itself. +If you want to build a static version of the pattern library, you can replace `yarn pattern-lib` with `yarn build-storybook`. This will output the pattern library files to a `storybook-static` folder. + +The SilverStripe pattern library is built using the [StoryBook JS library](https://storybook.js.org/). You can read the StoryBook documentation to learn about more advanced features and customisation options. ## The Admin URL From e72fc9e3d0f35a1d43f55f83f9919f67d72fb7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sam=20Minn=C3=A9e?= Date: Thu, 25 Oct 2018 11:42:45 +1300 Subject: [PATCH 026/175] FIX DataObject singleton creation (#8516) Ensure DataObject instances are aware they are singletons so functions like populateDefaults() can be skipped. (fixes #4878) Correctly applies https://github.com/silverstripe/silverstripe-framework/pull/7850 to the 4.x line This has already been fixed in 3.x --- src/Core/Injector/Injector.php | 9 +++++++ tests/php/ORM/DataObjectTest.php | 45 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/src/Core/Injector/Injector.php b/src/Core/Injector/Injector.php index 6b0885132..6cf980cbf 100644 --- a/src/Core/Injector/Injector.php +++ b/src/Core/Injector/Injector.php @@ -13,6 +13,7 @@ use SilverStripe\Core\ClassInfo; use SilverStripe\Core\Config\Config; use SilverStripe\Core\Environment; use SilverStripe\Dev\Deprecation; +use SilverStripe\ORM\DataObject; /** * A simple injection manager that manages creating objects and injecting @@ -581,6 +582,14 @@ class Injector implements ContainerInterface $constructorParams = $spec['constructor']; } + // If we're dealing with a DataObject singleton without specific constructor params, pass through Singleton + // flag as second argument + if ((!$type || $type !== self::PROTOTYPE) + && empty($constructorParams) + && is_subclass_of($class, DataObject::class)) { + $constructorParams = array(null, true); + } + $factory = isset($spec['factory']) ? $this->get($spec['factory']) : $this->getObjectCreator(); $object = $factory->create($class, $constructorParams); diff --git a/tests/php/ORM/DataObjectTest.php b/tests/php/ORM/DataObjectTest.php index 55c2ea659..3a2158c4c 100644 --- a/tests/php/ORM/DataObjectTest.php +++ b/tests/php/ORM/DataObjectTest.php @@ -66,6 +66,51 @@ class DataObjectTest extends SapphireTest ); } + /** + * @dataProvider provideSingletons + */ + public function testSingleton($inst, $defaultValue, $altDefaultValue) + { + $inst = $inst(); + // Test that populateDefaults() isn't called on singletons + // which can lead to SQL errors during build, and endless loops + if ($defaultValue) { + $this->assertEquals($defaultValue, $inst->MyFieldWithDefault); + } else { + $this->assertEmpty($inst->MyFieldWithDefault); + } + + if ($altDefaultValue) { + $this->assertEquals($altDefaultValue, $inst->MyFieldWithAltDefault); + } else { + $this->assertEmpty($inst->MyFieldWithAltDefault); + } + } + + public function provideSingletons() + { + // because PHPUnit evalutes test providers *before* setUp methods + // any extensions added in the setUp methods won't be available + // we must return closures to generate the arguments at run time + return array( + 'create() static method' => array(function () { + return DataObjectTest\Fixture::create(); + }, 'Default Value', 'Default Value'), + 'New object creation' => array(function () { + return new DataObjectTest\Fixture(); + }, 'Default Value', 'Default Value'), + 'singleton() function' => array(function () { + return singleton(DataObjectTest\Fixture::class); + }, null, null), + 'singleton() static method' => array(function () { + return DataObjectTest\Fixture::singleton(); + }, null, null), + 'Manual constructor args' => array(function () { + return new DataObjectTest\Fixture(null, true); + }, null, null), + ); + } + public function testDb() { $schema = DataObject::getSchema(); From d879148bffe31506345257b731d75756570b971a Mon Sep 17 00:00:00 2001 From: Luke Edwards Date: Fri, 26 Oct 2018 14:28:15 +1300 Subject: [PATCH 027/175] Add config to force legacy filter header globally --- docs/en/04_Changelogs/4.3.0.md | 6 ++++++ src/Forms/GridField/GridFieldFilterHeader.php | 15 +++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/docs/en/04_Changelogs/4.3.0.md b/docs/en/04_Changelogs/4.3.0.md index 9dba198d9..3965ad378 100644 --- a/docs/en/04_Changelogs/4.3.0.md +++ b/docs/en/04_Changelogs/4.3.0.md @@ -26,6 +26,12 @@ To enable the legacy search API on a `GridFieldFilterHeader`, you can either: * set the `useLegacyFilterHeader` property to `true`, * or pass `true` to the first argument of its constructor. +To force the legacy search API on all instances of `GridFieldFilterHeader`, you can set it in your [configuration file](../../configuration): +```yml +SilverStripe\Forms\GridField\GridFieldFilterHeader: + force_legacy: true +``` + ```php public function getCMSFields() { diff --git a/src/Forms/GridField/GridFieldFilterHeader.php b/src/Forms/GridField/GridFieldFilterHeader.php index fd3dd8ea9..13ad12354 100755 --- a/src/Forms/GridField/GridFieldFilterHeader.php +++ b/src/Forms/GridField/GridFieldFilterHeader.php @@ -6,6 +6,7 @@ use LogicException; use SilverStripe\Admin\LeftAndMain; use SilverStripe\Control\Controller; use SilverStripe\Control\HTTPResponse; +use SilverStripe\Core\Config\Config; use SilverStripe\Core\Convert; use SilverStripe\Dev\Deprecation; use SilverStripe\Forms\FieldGroup; @@ -43,6 +44,16 @@ class GridFieldFilterHeader implements GridField_URLHandler, GridField_HTMLProvi */ public $useLegacyFilterHeader = false; + /** + * Forces all filter components to revert to displaying the legacy + * table header style rather than the react driven search box + * + * @deprecated 4.3.0:5.0.0 Will be removed in 5.0 + * @config + * @var bool + */ + private static $force_legacy = false; + /** * @var \SilverStripe\ORM\Search\SearchContext */ @@ -76,7 +87,7 @@ class GridFieldFilterHeader implements GridField_URLHandler, GridField_HTMLProvi } /** - * @param bool $useLegacy + * @param bool $useLegacy This will be removed in 5.0 * @param callable|null $updateSearchContext This will be removed in 5.0 * @param callable|null $updateSearchForm This will be removed in 5.0 */ @@ -85,7 +96,7 @@ class GridFieldFilterHeader implements GridField_URLHandler, GridField_HTMLProvi callable $updateSearchContext = null, callable $updateSearchForm = null ) { - $this->useLegacyFilterHeader = $useLegacy; + $this->useLegacyFilterHeader = Config::inst()->get(self::class, 'force_legacy') || $useLegacy; $this->updateSearchContextCallback = $updateSearchContext; $this->updateSearchFormCallback = $updateSearchForm; } From 3284bf48d6e3da8b2b1a7831e2d7fe4b401e2fd6 Mon Sep 17 00:00:00 2001 From: Luke Edwards Date: Fri, 26 Oct 2018 14:43:56 +1300 Subject: [PATCH 028/175] Fix search filtering relations and clear filters (#8477) --- src/Forms/GridField/GridFieldFilterHeader.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/Forms/GridField/GridFieldFilterHeader.php b/src/Forms/GridField/GridFieldFilterHeader.php index fd3dd8ea9..ab0dd58e0 100755 --- a/src/Forms/GridField/GridFieldFilterHeader.php +++ b/src/Forms/GridField/GridFieldFilterHeader.php @@ -154,7 +154,7 @@ class GridFieldFilterHeader implements GridField_URLHandler, GridField_HTMLProvi * If the GridField has a filterable datalist, return an array of actions * * @param GridField $gridField - * @return array + * @return void */ public function handleAction(GridField $gridField, $actionName, $arguments, $data) { @@ -163,14 +163,13 @@ class GridFieldFilterHeader implements GridField_URLHandler, GridField_HTMLProvi } $state = $gridField->State->GridFieldFilterHeader; + $state->Columns = null; if ($actionName === 'filter') { if (isset($data['filter'][$gridField->getName()])) { foreach ($data['filter'][$gridField->getName()] as $key => $filter) { $state->Columns->$key = $filter; } } - } elseif ($actionName === 'reset') { - $state->Columns = null; } } @@ -193,12 +192,10 @@ class GridFieldFilterHeader implements GridField_URLHandler, GridField_HTMLProvi $filterArguments = $columns->toArray(); $dataListClone = clone($dataList); - foreach ($filterArguments as $columnName => $value) { - if ($dataList->canFilterBy($columnName) && $value) { - $dataListClone = $dataListClone->filter($columnName . ':PartialMatch', $value); - } - } - return $dataListClone; + $results = $this->getSearchContext($gridField) + ->getQuery($filterArguments, false, false, $dataListClone); + + return $results; } /** @@ -337,9 +334,11 @@ class GridFieldFilterHeader implements GridField_URLHandler, GridField_HTMLProvi $field->addExtraClass('stacked'); } + $name = $gridField->Title ?: singleton($gridField->getModelClass())->i18n_plural_name(); + $this->searchForm = $form = new Form( $gridField, - "SearchForm", + $name . "SearchForm", $searchFields, new FieldList() ); From 1c6e222391d37f879c8575c94d125e99780cbbef Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Mon, 29 Oct 2018 15:46:54 +1300 Subject: [PATCH 029/175] Fix the GitHub issue template Add description of how to find the installed framework version in CMS for 4.3.0 and later. Fixes #8530 --- .github/ISSUE_TEMPLATE.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 778f3ce7f..9fcd614d2 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,7 +1,9 @@ ## Affected Version Show version numbers by pasting the output of `composer info --direct`. -Alternatively, hover over the SilverStripe logo in the CMS to basic version information. +Alternatively, get the framework version information from the CMS. +In SilverStripe 4.3 and newer you may find the Help menu in the bottom left corner, unfold it and hover over the version number to get the information. +Otherwise, simply hover over the SilverStripe logo in the bottom left corner of the CMS. ## Description @@ -11,4 +13,4 @@ Please read https://docs.silverstripe.org/en/contributing/issues_and_bugs/ ## Steps to Reproduce -Help us with step-by-step instructions. \ No newline at end of file +Help us with step-by-step instructions. From c7b8b80e8b33a12667dfa9e5147bfbc583ccfc56 Mon Sep 17 00:00:00 2001 From: Luke Edwards Date: Thu, 1 Nov 2018 11:12:52 +1300 Subject: [PATCH 030/175] Persist GridField readonly state, add view button (#8535) * Persist GridField readonly state, add view button * Minor clarity fixes --- src/Forms/GridField/GridField.php | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/Forms/GridField/GridField.php b/src/Forms/GridField/GridField.php index 0585e3703..a180fa5dc 100644 --- a/src/Forms/GridField/GridField.php +++ b/src/Forms/GridField/GridField.php @@ -113,11 +113,13 @@ class GridField extends FormField protected $readonlyComponents = [ GridField_ActionMenu::class, GridFieldConfig_RecordViewer::class, + GridFieldButtonRow::class, GridFieldDataColumns::class, GridFieldDetailForm::class, GridFieldLazyLoader::class, GridFieldPageCount::class, GridFieldPaginator::class, + GridFieldFilterHeader::class, GridFieldSortableHeader::class, GridFieldToolbarHeader::class, GridFieldViewButton::class, @@ -241,16 +243,22 @@ class GridField extends FormField { $copy = clone $this; $copy->setReadonly(true); + $copyConfig = $copy->getConfig(); // get the whitelist for allowable readonly components $allowedComponents = $this->getReadonlyComponents(); foreach ($this->getConfig()->getComponents() as $component) { // if a component doesn't exist, remove it from the readonly version. if (!in_array(get_class($component), $allowedComponents)) { - $copy->getConfig()->removeComponent($component); + $copyConfig->removeComponent($component); } } + // As the edit button may have been removed, add a view button if it doesn't have one + if (!$copyConfig->getComponentByType(GridFieldViewButton::class)) { + $copyConfig->addComponent(new GridFieldViewButton); + } + return $copy; } @@ -290,6 +298,18 @@ class GridField extends FormField return $this; } + /** + * @param bool $readonly + * + * @return $this + */ + public function setReadonly($readonly) + { + parent::setReadonly($readonly); + $this->getState()->Readonly = $readonly; + return $this; + } + /** * @return ArrayList */ @@ -1009,6 +1029,9 @@ class GridField extends FormField } if ($request->getHeader('X-Pjax') === 'CurrentField') { + if ($this->getState()->Readonly) { + $this->performDisabledTransformation(); + } return $this->FieldHolder(); } From 7086f2ea3a86184c0d6aa3eb3ebe04fe3a9a9164 Mon Sep 17 00:00:00 2001 From: Michael Strong Date: Thu, 1 Nov 2018 13:42:27 +1300 Subject: [PATCH 031/175] BUGFIX many many through not sorting by join table (#8534) * BUGFIX many many through not sorting by join table * #8534 added docs to support many many sorting fix * #8534 added test cases for many_many default sorting --- .../00_Model/02_Relations.md | 15 +++++++ src/ORM/DataObject.php | 6 +++ src/ORM/ManyManyThroughQueryManipulator.php | 7 ---- tests/php/ORM/ManyManyListTest.php | 41 +++++++++++++++++++ tests/php/ORM/ManyManyThroughListTest.php | 33 +++++++++++++++ tests/php/ORM/ManyManyThroughListTest.yml | 25 +++++++++++ .../FallbackLocale.php | 22 ++++++++++ .../ORM/ManyManyThroughListTest/Locale.php | 36 ++++++++++++++++ 8 files changed, 178 insertions(+), 7 deletions(-) create mode 100644 tests/php/ORM/ManyManyThroughListTest/FallbackLocale.php create mode 100644 tests/php/ORM/ManyManyThroughListTest/Locale.php diff --git a/docs/en/02_Developer_Guides/00_Model/02_Relations.md b/docs/en/02_Developer_Guides/00_Model/02_Relations.md index bc0876f4f..938de1a9d 100644 --- a/docs/en/02_Developer_Guides/00_Model/02_Relations.md +++ b/docs/en/02_Developer_Guides/00_Model/02_Relations.md @@ -295,6 +295,15 @@ class Supporter extends DataObject } ``` +To ensure this `many_many` is sorted by "Ranking" by default you can add this to your config: + +```yaml +Team_Supporters: + default_sort: '"Team_Supporter"."Ranking" ASC' +``` + +`Team_Supporters` is the table name automatically generated for the many_many relation in this case. + ### many_many through relationship joined on a separate DataObject If necessary, a third DataObject class can instead be specified as the joining table, @@ -312,6 +321,9 @@ This is declared via array syntax, with the following keys on the many_many: - `from` Name of the has_one relationship pointing back at the object declaring many_many - `to` Name of the has_one relationship pointing to the object declaring belongs_many_many. +Just like a any normal DataObject, you can apply a default sort which will be applied when +accessing many many through relations. + Note: The `through` class must not also be the name of any field or relation on the parent or child record. @@ -348,6 +360,8 @@ class TeamSupporter extends DataObject 'Team' => Team::class, 'Supporter' => Supporter::class, ]; + + private static $default_sort = '"TeamSupporter"."Ranking" ASC' } ``` @@ -468,6 +482,7 @@ the best way to think about it is that the object where the relationship will be Product => Categories, the `Product` should contain the `many_many`, because it is much more likely that the user will select Categories for a Product than vice-versa. + ## Cascading deletions Relationships between objects can cause cascading deletions, if necessary, through configuration of the diff --git a/src/ORM/DataObject.php b/src/ORM/DataObject.php index 1092afc32..a47034381 100644 --- a/src/ORM/DataObject.php +++ b/src/ORM/DataObject.php @@ -2051,6 +2051,12 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity $query->setQueryParam('Component.ExtraFields', $extraFields); }); + // If we have a default sort set for our "join" then we should overwrite any default already set. + $joinSort = Config::inst()->get($manyManyComponent['join'], 'default_sort'); + if (!empty($joinSort)) { + $result = $result->sort($joinSort); + } + $this->extend('updateManyManyComponents', $result); // If this is called on a singleton, then we return an 'orphaned relation' that can have the diff --git a/src/ORM/ManyManyThroughQueryManipulator.php b/src/ORM/ManyManyThroughQueryManipulator.php index 2024a65aa..6fffbbe60 100644 --- a/src/ORM/ManyManyThroughQueryManipulator.php +++ b/src/ORM/ManyManyThroughQueryManipulator.php @@ -254,13 +254,6 @@ class ManyManyThroughQueryManipulator implements DataQueryManipulator ); } - // Set a default sort from the join model if available and nothing is already set - if (empty($sqlSelect->getOrderBy()) - && $sort = Config::inst()->get($this->getJoinClass(), 'default_sort') - ) { - $sqlSelect->setOrderBy($sort); - } - // Apply join and record sql for later insertion (at end of replacements) // By using a string placeholder $$_SUBQUERY_$$ we protect field/table rewrites from interfering twice // on the already-finalised inner list diff --git a/tests/php/ORM/ManyManyListTest.php b/tests/php/ORM/ManyManyListTest.php index aa6218474..564864f35 100644 --- a/tests/php/ORM/ManyManyListTest.php +++ b/tests/php/ORM/ManyManyListTest.php @@ -2,6 +2,7 @@ namespace SilverStripe\ORM\Tests; +use SilverStripe\Core\Config\Config; use SilverStripe\ORM\FieldType\DBMoney; use SilverStripe\ORM\ManyManyList; use SilverStripe\Core\Convert; @@ -369,6 +370,46 @@ class ManyManyListTest extends SapphireTest $this->assertSQLEquals($expected, $list->sql($parameters)); } + /** + * This tests that we can set a default sort on a join table, even though the class doesn't exist. + * + * @return void + */ + public function testSortByExtraFieldsDefaultSort() + { + $obj = new ManyManyListTest\ExtraFieldsObject(); + $obj->write(); + + $obj2 = new ManyManyListTest\ExtraFieldsObject(); + $obj2->write(); + + $money = new DBMoney(); + $money->setAmount(100); + $money->setCurrency('USD'); + + // Add two objects as relations (first is linking back to itself) + $obj->Clients()->add($obj, ['Worth' => $money, 'Reference' => 'A']); + $obj->Clients()->add($obj2, ['Worth' => $money, 'Reference' => 'B']); + + // Set the default sort for this relation + Config::inst()->update('ManyManyListTest_ExtraFields_Clients', 'default_sort', 'Reference ASC'); + $clients = $obj->Clients(); + $this->assertCount(2, $clients); + + list($first, $second) = $obj->Clients(); + $this->assertEquals('A', $first->Reference); + $this->assertEquals('B', $second->Reference); + + // Now we ensure the default sort is being respected by reversing its order + Config::inst()->update('ManyManyListTest_ExtraFields_Clients', 'default_sort', 'Reference DESC'); + $reverseClients = $obj->Clients(); + $this->assertCount(2, $reverseClients); + + list($reverseFirst, $reverseSecond) = $obj->Clients(); + $this->assertEquals('B', $reverseFirst->Reference); + $this->assertEquals('A', $reverseSecond->Reference); + } + public function testFilteringOnPreviouslyJoinedTable() { /** @var ManyManyListTest\Category $category */ diff --git a/tests/php/ORM/ManyManyThroughListTest.php b/tests/php/ORM/ManyManyThroughListTest.php index b85c6317b..0b18cbec5 100644 --- a/tests/php/ORM/ManyManyThroughListTest.php +++ b/tests/php/ORM/ManyManyThroughListTest.php @@ -2,11 +2,14 @@ namespace SilverStripe\ORM\Tests; +use SilverStripe\Core\Config\Config; use SilverStripe\Dev\SapphireTest; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\ManyManyThroughList; use SilverStripe\ORM\Tests\ManyManyThroughListTest\PolyItem; use SilverStripe\ORM\Tests\ManyManyThroughListTest\PolyJoinObject; +use SilverStripe\ORM\Tests\ManyManyThroughListTest\Locale; +use SilverStripe\ORM\Tests\ManyManyThroughListTest\FallbackLocale; class ManyManyThroughListTest extends SapphireTest { @@ -20,6 +23,8 @@ class ManyManyThroughListTest extends SapphireTest ManyManyThroughListTest\PolyJoinObject::class, ManyManyThroughListTest\PolyObjectA::class, ManyManyThroughListTest\PolyObjectB::class, + ManyManyThroughListTest\Locale::class, + ManyManyThroughListTest\FallbackLocale::class, ]; protected function setUp() @@ -320,4 +325,32 @@ class ManyManyThroughListTest extends SapphireTest $this->assertEquals($joinTable, $objB1->Items()->getJoinTable()); $this->assertEquals($joinTable, $objB2->Items()->getJoinTable()); } + + /** + * This tests that default sort works when the join table has a default sort set, and the main + * dataobject has a default sort set. + * + * @return void + */ + public function testDefaultSortOnJoinAndMain() + { + // We have spanish mexico with two fall back locales; argentina and international sorted in that order. + $mexico = $this->objFromFixture(Locale::class, 'mexico'); + + $fallbacks = $mexico->Fallbacks(); + $this->assertCount(2, $fallbacks); + + // Ensure the default sort is is correct + list($first, $second) = $fallbacks; + $this->assertSame('Argentina', $first->Title); + $this->assertSame('International', $second->Title); + + // Ensure that we're respecting the default sort by reversing it + Config::inst()->update(FallbackLocale::class, 'default_sort', '"ManyManyThroughTest_FallbackLocale"."Sort" DESC'); + + $reverse = $mexico->Fallbacks(); + list($firstReverse, $secondReverse) = $reverse; + $this->assertSame('International', $firstReverse->Title); + $this->assertSame('Argentina', $secondReverse->Title); + } } diff --git a/tests/php/ORM/ManyManyThroughListTest.yml b/tests/php/ORM/ManyManyThroughListTest.yml index 88750a29d..c7c3c3c2a 100644 --- a/tests/php/ORM/ManyManyThroughListTest.yml +++ b/tests/php/ORM/ManyManyThroughListTest.yml @@ -51,3 +51,28 @@ SilverStripe\ORM\Tests\ManyManyThroughListTest\PolyJoinObject: Sort: 2 Parent: =>SilverStripe\ORM\Tests\ManyManyThroughListTest\PolyObjectB.objb2 Child: =>SilverStripe\ORM\Tests\ManyManyThroughListTest\PolyItem.child2 +SilverStripe\ORM\Tests\ManyManyThroughListTest\Locale: + international: + Title: 'International' + Locale: 'en_NZ' + URLSegment: 'international' + IsGlobalDefault: 1 + mexico: + Title: 'Mexico' + Locale: 'es_MX' + URLSegment: 'mexico' + IsGlobalDefault: 0 + argentina: + Title: 'Argentina' + Locale: 'es_AR' + URLSegment: 'argentina' + IsGlobalDefault: 0 +SilverStripe\ORM\Tests\ManyManyThroughListTest\FallbackLocale: + mexico_international: + Sort: 2 + Parent: =>SilverStripe\ORM\Tests\ManyManyThroughListTest\Locale.mexico + Locale: =>SilverStripe\ORM\Tests\ManyManyThroughListTest\Locale.international + mexico_argentina: + Sort: 1 + Parent: =>SilverStripe\ORM\Tests\ManyManyThroughListTest\Locale.mexico + Locale: =>SilverStripe\ORM\Tests\ManyManyThroughListTest\Locale.argentina \ No newline at end of file diff --git a/tests/php/ORM/ManyManyThroughListTest/FallbackLocale.php b/tests/php/ORM/ManyManyThroughListTest/FallbackLocale.php new file mode 100644 index 000000000..cb865028f --- /dev/null +++ b/tests/php/ORM/ManyManyThroughListTest/FallbackLocale.php @@ -0,0 +1,22 @@ + 'Int', + ]; + + private static $has_one = [ + 'Parent' => Locale::class, + 'Locale' => Locale::class, + ]; + + private static $table_name = 'ManyManyThroughTest_FallbackLocale'; + + private static $default_sort = 'Sort'; +} diff --git a/tests/php/ORM/ManyManyThroughListTest/Locale.php b/tests/php/ORM/ManyManyThroughListTest/Locale.php new file mode 100644 index 000000000..37bff23d9 --- /dev/null +++ b/tests/php/ORM/ManyManyThroughListTest/Locale.php @@ -0,0 +1,36 @@ + 'Varchar(100)', + 'Locale' => 'Varchar(10)', + 'URLSegment' => 'Varchar(100)', + 'IsGlobalDefault' => 'Boolean', + ]; + + private static $has_many = [ + 'FallbackLocales' => FallbackLocale::class . '.Parent', + ]; + + private static $many_many = [ + 'Fallbacks' => [ + 'through' => FallbackLocale::class, + 'from' => 'Parent', + 'to' => 'Locale', + ], + ]; + + private static $default_sort = '"ManyManyThroughTest_Locale"."Locale" ASC'; +} From 55f95b7bc8f91384df459bd70c87cacf92225f68 Mon Sep 17 00:00:00 2001 From: Michael Strong Date: Thu, 1 Nov 2018 13:42:27 +1300 Subject: [PATCH 032/175] BUGFIX many many through not sorting by join table (#8534) * BUGFIX many many through not sorting by join table * #8534 added docs to support many many sorting fix * #8534 added test cases for many_many default sorting --- .../00_Model/02_Relations.md | 15 +++++++ src/ORM/DataObject.php | 6 +++ src/ORM/ManyManyThroughQueryManipulator.php | 7 ---- tests/php/ORM/ManyManyListTest.php | 41 +++++++++++++++++++ tests/php/ORM/ManyManyThroughListTest.php | 33 +++++++++++++++ tests/php/ORM/ManyManyThroughListTest.yml | 25 +++++++++++ .../FallbackLocale.php | 22 ++++++++++ .../ORM/ManyManyThroughListTest/Locale.php | 36 ++++++++++++++++ 8 files changed, 178 insertions(+), 7 deletions(-) create mode 100644 tests/php/ORM/ManyManyThroughListTest/FallbackLocale.php create mode 100644 tests/php/ORM/ManyManyThroughListTest/Locale.php diff --git a/docs/en/02_Developer_Guides/00_Model/02_Relations.md b/docs/en/02_Developer_Guides/00_Model/02_Relations.md index bc0876f4f..938de1a9d 100644 --- a/docs/en/02_Developer_Guides/00_Model/02_Relations.md +++ b/docs/en/02_Developer_Guides/00_Model/02_Relations.md @@ -295,6 +295,15 @@ class Supporter extends DataObject } ``` +To ensure this `many_many` is sorted by "Ranking" by default you can add this to your config: + +```yaml +Team_Supporters: + default_sort: '"Team_Supporter"."Ranking" ASC' +``` + +`Team_Supporters` is the table name automatically generated for the many_many relation in this case. + ### many_many through relationship joined on a separate DataObject If necessary, a third DataObject class can instead be specified as the joining table, @@ -312,6 +321,9 @@ This is declared via array syntax, with the following keys on the many_many: - `from` Name of the has_one relationship pointing back at the object declaring many_many - `to` Name of the has_one relationship pointing to the object declaring belongs_many_many. +Just like a any normal DataObject, you can apply a default sort which will be applied when +accessing many many through relations. + Note: The `through` class must not also be the name of any field or relation on the parent or child record. @@ -348,6 +360,8 @@ class TeamSupporter extends DataObject 'Team' => Team::class, 'Supporter' => Supporter::class, ]; + + private static $default_sort = '"TeamSupporter"."Ranking" ASC' } ``` @@ -468,6 +482,7 @@ the best way to think about it is that the object where the relationship will be Product => Categories, the `Product` should contain the `many_many`, because it is much more likely that the user will select Categories for a Product than vice-versa. + ## Cascading deletions Relationships between objects can cause cascading deletions, if necessary, through configuration of the diff --git a/src/ORM/DataObject.php b/src/ORM/DataObject.php index 1092afc32..a47034381 100644 --- a/src/ORM/DataObject.php +++ b/src/ORM/DataObject.php @@ -2051,6 +2051,12 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity $query->setQueryParam('Component.ExtraFields', $extraFields); }); + // If we have a default sort set for our "join" then we should overwrite any default already set. + $joinSort = Config::inst()->get($manyManyComponent['join'], 'default_sort'); + if (!empty($joinSort)) { + $result = $result->sort($joinSort); + } + $this->extend('updateManyManyComponents', $result); // If this is called on a singleton, then we return an 'orphaned relation' that can have the diff --git a/src/ORM/ManyManyThroughQueryManipulator.php b/src/ORM/ManyManyThroughQueryManipulator.php index 2024a65aa..6fffbbe60 100644 --- a/src/ORM/ManyManyThroughQueryManipulator.php +++ b/src/ORM/ManyManyThroughQueryManipulator.php @@ -254,13 +254,6 @@ class ManyManyThroughQueryManipulator implements DataQueryManipulator ); } - // Set a default sort from the join model if available and nothing is already set - if (empty($sqlSelect->getOrderBy()) - && $sort = Config::inst()->get($this->getJoinClass(), 'default_sort') - ) { - $sqlSelect->setOrderBy($sort); - } - // Apply join and record sql for later insertion (at end of replacements) // By using a string placeholder $$_SUBQUERY_$$ we protect field/table rewrites from interfering twice // on the already-finalised inner list diff --git a/tests/php/ORM/ManyManyListTest.php b/tests/php/ORM/ManyManyListTest.php index aa6218474..564864f35 100644 --- a/tests/php/ORM/ManyManyListTest.php +++ b/tests/php/ORM/ManyManyListTest.php @@ -2,6 +2,7 @@ namespace SilverStripe\ORM\Tests; +use SilverStripe\Core\Config\Config; use SilverStripe\ORM\FieldType\DBMoney; use SilverStripe\ORM\ManyManyList; use SilverStripe\Core\Convert; @@ -369,6 +370,46 @@ class ManyManyListTest extends SapphireTest $this->assertSQLEquals($expected, $list->sql($parameters)); } + /** + * This tests that we can set a default sort on a join table, even though the class doesn't exist. + * + * @return void + */ + public function testSortByExtraFieldsDefaultSort() + { + $obj = new ManyManyListTest\ExtraFieldsObject(); + $obj->write(); + + $obj2 = new ManyManyListTest\ExtraFieldsObject(); + $obj2->write(); + + $money = new DBMoney(); + $money->setAmount(100); + $money->setCurrency('USD'); + + // Add two objects as relations (first is linking back to itself) + $obj->Clients()->add($obj, ['Worth' => $money, 'Reference' => 'A']); + $obj->Clients()->add($obj2, ['Worth' => $money, 'Reference' => 'B']); + + // Set the default sort for this relation + Config::inst()->update('ManyManyListTest_ExtraFields_Clients', 'default_sort', 'Reference ASC'); + $clients = $obj->Clients(); + $this->assertCount(2, $clients); + + list($first, $second) = $obj->Clients(); + $this->assertEquals('A', $first->Reference); + $this->assertEquals('B', $second->Reference); + + // Now we ensure the default sort is being respected by reversing its order + Config::inst()->update('ManyManyListTest_ExtraFields_Clients', 'default_sort', 'Reference DESC'); + $reverseClients = $obj->Clients(); + $this->assertCount(2, $reverseClients); + + list($reverseFirst, $reverseSecond) = $obj->Clients(); + $this->assertEquals('B', $reverseFirst->Reference); + $this->assertEquals('A', $reverseSecond->Reference); + } + public function testFilteringOnPreviouslyJoinedTable() { /** @var ManyManyListTest\Category $category */ diff --git a/tests/php/ORM/ManyManyThroughListTest.php b/tests/php/ORM/ManyManyThroughListTest.php index b85c6317b..0b18cbec5 100644 --- a/tests/php/ORM/ManyManyThroughListTest.php +++ b/tests/php/ORM/ManyManyThroughListTest.php @@ -2,11 +2,14 @@ namespace SilverStripe\ORM\Tests; +use SilverStripe\Core\Config\Config; use SilverStripe\Dev\SapphireTest; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\ManyManyThroughList; use SilverStripe\ORM\Tests\ManyManyThroughListTest\PolyItem; use SilverStripe\ORM\Tests\ManyManyThroughListTest\PolyJoinObject; +use SilverStripe\ORM\Tests\ManyManyThroughListTest\Locale; +use SilverStripe\ORM\Tests\ManyManyThroughListTest\FallbackLocale; class ManyManyThroughListTest extends SapphireTest { @@ -20,6 +23,8 @@ class ManyManyThroughListTest extends SapphireTest ManyManyThroughListTest\PolyJoinObject::class, ManyManyThroughListTest\PolyObjectA::class, ManyManyThroughListTest\PolyObjectB::class, + ManyManyThroughListTest\Locale::class, + ManyManyThroughListTest\FallbackLocale::class, ]; protected function setUp() @@ -320,4 +325,32 @@ class ManyManyThroughListTest extends SapphireTest $this->assertEquals($joinTable, $objB1->Items()->getJoinTable()); $this->assertEquals($joinTable, $objB2->Items()->getJoinTable()); } + + /** + * This tests that default sort works when the join table has a default sort set, and the main + * dataobject has a default sort set. + * + * @return void + */ + public function testDefaultSortOnJoinAndMain() + { + // We have spanish mexico with two fall back locales; argentina and international sorted in that order. + $mexico = $this->objFromFixture(Locale::class, 'mexico'); + + $fallbacks = $mexico->Fallbacks(); + $this->assertCount(2, $fallbacks); + + // Ensure the default sort is is correct + list($first, $second) = $fallbacks; + $this->assertSame('Argentina', $first->Title); + $this->assertSame('International', $second->Title); + + // Ensure that we're respecting the default sort by reversing it + Config::inst()->update(FallbackLocale::class, 'default_sort', '"ManyManyThroughTest_FallbackLocale"."Sort" DESC'); + + $reverse = $mexico->Fallbacks(); + list($firstReverse, $secondReverse) = $reverse; + $this->assertSame('International', $firstReverse->Title); + $this->assertSame('Argentina', $secondReverse->Title); + } } diff --git a/tests/php/ORM/ManyManyThroughListTest.yml b/tests/php/ORM/ManyManyThroughListTest.yml index 88750a29d..c7c3c3c2a 100644 --- a/tests/php/ORM/ManyManyThroughListTest.yml +++ b/tests/php/ORM/ManyManyThroughListTest.yml @@ -51,3 +51,28 @@ SilverStripe\ORM\Tests\ManyManyThroughListTest\PolyJoinObject: Sort: 2 Parent: =>SilverStripe\ORM\Tests\ManyManyThroughListTest\PolyObjectB.objb2 Child: =>SilverStripe\ORM\Tests\ManyManyThroughListTest\PolyItem.child2 +SilverStripe\ORM\Tests\ManyManyThroughListTest\Locale: + international: + Title: 'International' + Locale: 'en_NZ' + URLSegment: 'international' + IsGlobalDefault: 1 + mexico: + Title: 'Mexico' + Locale: 'es_MX' + URLSegment: 'mexico' + IsGlobalDefault: 0 + argentina: + Title: 'Argentina' + Locale: 'es_AR' + URLSegment: 'argentina' + IsGlobalDefault: 0 +SilverStripe\ORM\Tests\ManyManyThroughListTest\FallbackLocale: + mexico_international: + Sort: 2 + Parent: =>SilverStripe\ORM\Tests\ManyManyThroughListTest\Locale.mexico + Locale: =>SilverStripe\ORM\Tests\ManyManyThroughListTest\Locale.international + mexico_argentina: + Sort: 1 + Parent: =>SilverStripe\ORM\Tests\ManyManyThroughListTest\Locale.mexico + Locale: =>SilverStripe\ORM\Tests\ManyManyThroughListTest\Locale.argentina \ No newline at end of file diff --git a/tests/php/ORM/ManyManyThroughListTest/FallbackLocale.php b/tests/php/ORM/ManyManyThroughListTest/FallbackLocale.php new file mode 100644 index 000000000..cb865028f --- /dev/null +++ b/tests/php/ORM/ManyManyThroughListTest/FallbackLocale.php @@ -0,0 +1,22 @@ + 'Int', + ]; + + private static $has_one = [ + 'Parent' => Locale::class, + 'Locale' => Locale::class, + ]; + + private static $table_name = 'ManyManyThroughTest_FallbackLocale'; + + private static $default_sort = 'Sort'; +} diff --git a/tests/php/ORM/ManyManyThroughListTest/Locale.php b/tests/php/ORM/ManyManyThroughListTest/Locale.php new file mode 100644 index 000000000..37bff23d9 --- /dev/null +++ b/tests/php/ORM/ManyManyThroughListTest/Locale.php @@ -0,0 +1,36 @@ + 'Varchar(100)', + 'Locale' => 'Varchar(10)', + 'URLSegment' => 'Varchar(100)', + 'IsGlobalDefault' => 'Boolean', + ]; + + private static $has_many = [ + 'FallbackLocales' => FallbackLocale::class . '.Parent', + ]; + + private static $many_many = [ + 'Fallbacks' => [ + 'through' => FallbackLocale::class, + 'from' => 'Parent', + 'to' => 'Locale', + ], + ]; + + private static $default_sort = '"ManyManyThroughTest_Locale"."Locale" ASC'; +} From 2ff7ee6752cc505fd538a12e1a0c1709231961a8 Mon Sep 17 00:00:00 2001 From: Guy Marriott Date: Thu, 1 Nov 2018 19:51:15 +1300 Subject: [PATCH 033/175] NEW Deprecate RandomGenerator::generateEntropy in favour of using random_bytes directly --- src/Security/RandomGenerator.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Security/RandomGenerator.php b/src/Security/RandomGenerator.php index b7279e0b6..89c223eb9 100644 --- a/src/Security/RandomGenerator.php +++ b/src/Security/RandomGenerator.php @@ -4,6 +4,7 @@ namespace SilverStripe\Security; use Error; use Exception; +use SilverStripe\Dev\Deprecation; /** * Convenience class for generating cryptographically secure pseudo-random strings/tokens @@ -13,9 +14,12 @@ class RandomGenerator /** * @return string A 128-character, randomly generated ASCII string * @throws Exception If no suitable CSPRNG is installed + * @deprecated 4.4:5.0 */ public function generateEntropy() { + Deprecation::notice('4.4', __METHOD__ . ' has been deprecated. Use random_bytes instead'); + try { return bin2hex(random_bytes(64)); } catch (Error $e) { @@ -38,9 +42,10 @@ class RandomGenerator * * @param string $algorithm Any identifier listed in hash_algos() (Default: whirlpool) * @return string Returned length will depend on the used $algorithm + * @throws Exception When there is no valid source of CSPRNG */ public function randomToken($algorithm = 'whirlpool') { - return hash($algorithm, $this->generateEntropy()); + return hash($algorithm, random_bytes(64)); } } From 46e4c19070688df74757bd9a44dc2f0b2fdcd6a9 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Thu, 1 Nov 2018 22:38:26 +1300 Subject: [PATCH 034/175] MINOR Add a reference to SS_Object in .upgrade.yml to allow upgrade from SS3.7 --- .upgrade.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.upgrade.yml b/.upgrade.yml index e4e2c392a..33d42e81e 100644 --- a/.upgrade.yml +++ b/.upgrade.yml @@ -958,6 +958,9 @@ warnings: 'Object': message: 'Replaced with traits' url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#object-replace' + 'SS_Object': + message: 'Replaced with traits' + url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#object-replace' 'SS_Log': message: 'Replaced with a PSR-3 logger' url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#psr3-logging' From 8866e7674a1a9c2be48c8e9532cfcaa667cdf7b5 Mon Sep 17 00:00:00 2001 From: Luke Edwards Date: Fri, 2 Nov 2018 12:26:53 +1300 Subject: [PATCH 035/175] BUG: Fix duplicate plugins on HTML editor fields (#8559) * BUG: Fix duplicate plugins on HTML editor fields * Add new test --- src/Forms/HTMLEditor/HTMLEditorConfig.php | 2 ++ src/Forms/HTMLEditor/TinyMCECombinedGenerator.php | 2 ++ tests/php/Forms/HTMLEditor/HTMLEditorConfigTest.php | 2 +- tests/php/Forms/HTMLEditor/TinyMCEConfigTest.php | 7 +++++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Forms/HTMLEditor/HTMLEditorConfig.php b/src/Forms/HTMLEditor/HTMLEditorConfig.php index 27a1527aa..6672971d8 100644 --- a/src/Forms/HTMLEditor/HTMLEditorConfig.php +++ b/src/Forms/HTMLEditor/HTMLEditorConfig.php @@ -83,6 +83,7 @@ abstract class HTMLEditorConfig // Create new instance if unconfigured if (!isset(self::$configs[$identifier])) { self::$configs[$identifier] = static::create(); + self::$configs[$identifier]->setOption('editorIdentifier', $identifier); } return self::$configs[$identifier]; } @@ -98,6 +99,7 @@ abstract class HTMLEditorConfig { if ($config) { self::$configs[$identifier] = $config; + self::$configs[$identifier]->setOption('editorIdentifier', $identifier); } else { unset(self::$configs[$identifier]); } diff --git a/src/Forms/HTMLEditor/TinyMCECombinedGenerator.php b/src/Forms/HTMLEditor/TinyMCECombinedGenerator.php index f2f3a3b09..a037cb355 100644 --- a/src/Forms/HTMLEditor/TinyMCECombinedGenerator.php +++ b/src/Forms/HTMLEditor/TinyMCECombinedGenerator.php @@ -130,11 +130,13 @@ class TinyMCECombinedGenerator implements TinyMCEScriptGenerator, Flushable // Register vars for config $baseDirJS = Convert::raw2js(Director::absoluteBaseURL()); + $name = Convert::raw2js($this->checkName($config)); $buffer = []; $buffer[] = << + +You are being redirected. If you are not redirected soon, click here to continue +HTML; + + // Build response + $result = new HTTPResponse($body); + $result->redirect($location); + return $result; + } + + /** + * Is this parameter requested without a valid token? + * + * @return bool True if the parameter is given without a valid token + */ + abstract public function reloadRequired(); + + /** + * Check if this token is provided either in the backurl, or directly, + * but without a token + * + * @return bool + */ + abstract public function reloadRequiredIfError(); + + /** + * Suppress the current parameter for the duration of this request + */ + abstract public function suppress(); + + /** + * Determine the querystring parameters to include + * + * @param bool $includeToken Include the token value? + * @return array List of querystring parameters, possibly including token parameter + */ + abstract public function params($includeToken = true); + + /** + * Get redirection URL + * + * @return string + */ + abstract protected function redirectURL(); +} diff --git a/src/Core/Startup/ErrorControlChain.php b/src/Core/Startup/ErrorControlChain.php index f34a2c802..e2d14db65 100644 --- a/src/Core/Startup/ErrorControlChain.php +++ b/src/Core/Startup/ErrorControlChain.php @@ -15,8 +15,7 @@ use Exception; * $chain = new ErrorControlChain(); * $chain->then($callback1)->then($callback2)->thenIfErrored($callback3)->execute(); * - * WARNING: This class is experimental and designed specifically for use pre-startup. - * It will likely be heavily refactored before the release of 3.2 + * @internal This class is designed specifically for use pre-startup and may change without warning */ class ErrorControlChain { diff --git a/src/Core/Startup/ErrorControlChainMiddleware.php b/src/Core/Startup/ErrorControlChainMiddleware.php index bdb5ff0a3..e81444629 100644 --- a/src/Core/Startup/ErrorControlChainMiddleware.php +++ b/src/Core/Startup/ErrorControlChainMiddleware.php @@ -12,6 +12,8 @@ use SilverStripe\Security\Security; /** * Decorates application bootstrapping with errorcontrolchain + * + * @internal This class is designed specifically for use pre-startup and may change without warning */ class ErrorControlChainMiddleware implements HTTPMiddleware { @@ -30,27 +32,42 @@ class ErrorControlChainMiddleware implements HTTPMiddleware $this->application = $application; } + /** + * @param HTTPRequest $request + * @return ConfirmationToken|null + */ + protected function prepareConfirmationTokenIfRequired(HTTPRequest $request) + { + $token = URLConfirmationToken::prepare_tokens(['dev/build'], $request); + + if (!$token) { + $token = ParameterConfirmationToken::prepare_tokens( + ['isTest', 'isDev', 'flush'], + $request + ); + } + + return $token; + } + public function process(HTTPRequest $request, callable $next) { $result = null; // Prepare tokens and execute chain - $reloadToken = ParameterConfirmationToken::prepare_tokens( - ['isTest', 'isDev', 'flush'], - $request - ); + $confirmationToken = $this->prepareConfirmationTokenIfRequired($request); $chain = new ErrorControlChain(); $chain - ->then(function () use ($request, $chain, $reloadToken, $next, &$result) { + ->then(function () use ($request, $chain, $confirmationToken, $next, &$result) { // If no redirection is necessary then we can disable error supression - if (!$reloadToken) { + if (!$confirmationToken) { $chain->setSuppression(false); } try { // Check if a token is requesting a redirect - if ($reloadToken && $reloadToken->reloadRequired()) { - $result = $this->safeReloadWithToken($request, $reloadToken); + if ($confirmationToken && $confirmationToken->reloadRequired()) { + $result = $this->safeReloadWithToken($request, $confirmationToken); } else { // If no reload necessary, process application $result = call_user_func($next, $request); @@ -60,9 +77,9 @@ class ErrorControlChainMiddleware implements HTTPMiddleware } }) // Finally if a token was requested but there was an error while figuring out if it's allowed, do it anyway - ->thenIfErrored(function () use ($reloadToken) { - if ($reloadToken && $reloadToken->reloadRequiredIfError()) { - $result = $reloadToken->reloadWithToken(); + ->thenIfErrored(function () use ($confirmationToken) { + if ($confirmationToken && $confirmationToken->reloadRequiredIfError()) { + $result = $confirmationToken->reloadWithToken(); $result->output(); } }) @@ -85,7 +102,7 @@ class ErrorControlChainMiddleware implements HTTPMiddleware // Ensure session is started $request->getSession()->init($request); - + // Request with ErrorDirector $result = ErrorDirector::singleton()->handleRequestWithToken( $request, @@ -98,7 +115,7 @@ class ErrorControlChainMiddleware implements HTTPMiddleware // Fail and redirect the user to the login page $params = array_merge($request->getVars(), $reloadToken->params(false)); - $backURL = $request->getURL() . '?' . http_build_query($params); + $backURL = $reloadToken->currentURL() . '?' . http_build_query($params); $loginPage = Director::absoluteURL(Security::config()->get('login_url')); $loginPage .= "?BackURL=" . urlencode($backURL); $result = new HTTPResponse(); diff --git a/src/Core/Startup/ErrorDirector.php b/src/Core/Startup/ErrorDirector.php index 3c994c6af..54001fd05 100644 --- a/src/Core/Startup/ErrorDirector.php +++ b/src/Core/Startup/ErrorDirector.php @@ -21,11 +21,11 @@ class ErrorDirector extends Director * Redirect with token if allowed, or null if not allowed * * @param HTTPRequest $request - * @param ParameterConfirmationToken $token + * @param ConfirmationToken $token * @param Kernel $kernel * @return null|HTTPResponse Redirection response, or null if not able to redirect */ - public function handleRequestWithToken(HTTPRequest $request, ParameterConfirmationToken $token, Kernel $kernel) + public function handleRequestWithToken(HTTPRequest $request, ConfirmationToken $token, Kernel $kernel) { Injector::inst()->registerService($request, HTTPRequest::class); diff --git a/src/Core/Startup/ParameterConfirmationToken.php b/src/Core/Startup/ParameterConfirmationToken.php index 1c80db1d0..4e90f1ef7 100644 --- a/src/Core/Startup/ParameterConfirmationToken.php +++ b/src/Core/Startup/ParameterConfirmationToken.php @@ -9,30 +9,21 @@ use SilverStripe\Core\Convert; use SilverStripe\Security\RandomGenerator; /** - * Class ParameterConfirmationToken + * This is used to protect dangerous GET parameters that need to be detected early in the request + * lifecycle by generating a one-time-use token & redirecting with that token included in the + * redirected URL * - * When you need to use a dangerous GET parameter that needs to be set before core/Core.php is - * established, this class takes care of allowing some other code of confirming the parameter, - * by generating a one-time-use token & redirecting with that token included in the redirected URL - * - * WARNING: This class is experimental and designed specifically for use pre-startup. - * It will likely be heavily refactored before the release of 3.2 + * @internal This class is designed specifically for use pre-startup and may change without warning */ -class ParameterConfirmationToken +class ParameterConfirmationToken extends ConfirmationToken { - /** * The name of the parameter * * @var string */ protected $parameterName = null; - - /** - * @var HTTPRequest - */ - protected $request = null; - + /** * The parameter given in the main request * @@ -48,60 +39,6 @@ class ParameterConfirmationToken protected $parameterBackURL = null; /** - * The validated and checked token for this parameter - * - * @var string|null A string value, or null if either not provided or invalid - */ - protected $token = null; - - protected function pathForToken($token) - { - return TEMP_PATH . DIRECTORY_SEPARATOR . 'token_' . preg_replace('/[^a-z0-9]+/', '', $token); - } - - /** - * Generate a new random token and store it - * - * @return string Token name - */ - protected function genToken() - { - // Generate a new random token (as random as possible) - $rg = new RandomGenerator(); - $token = $rg->randomToken('md5'); - - // Store a file in the session save path (safer than /tmp, as open_basedir might limit that) - file_put_contents($this->pathForToken($token), $token); - - return $token; - } - - /** - * Validate a token - * - * @param string $token - * @return boolean True if the token is valid - */ - protected function checkToken($token) - { - if (!$token) { - return false; - } - - $file = $this->pathForToken($token); - $content = null; - - if (file_exists($file)) { - $content = file_get_contents($file); - unlink($file); - } - - return $content == $token; - } - - /** - * Create a new ParameterConfirmationToken - * * @param string $parameterName Name of the querystring parameter to check * @param HTTPRequest $request */ @@ -176,54 +113,23 @@ class ParameterConfirmationToken return $this->parameterBackURL !== null; } - /** - * Is the necessary token provided for this parameter? - * A value must be provided for the token - * - * @return bool - */ - public function tokenProvided() - { - return !empty($this->token); - } - - /** - * Is this parameter requested without a valid token? - * - * @return bool True if the parameter is given without a valid token - */ public function reloadRequired() { return $this->parameterProvided() && !$this->tokenProvided(); } - /** - * Check if this token is provided either in the backurl, or directly, - * but without a token - * - * @return bool - */ public function reloadRequiredIfError() { // Don't reload if token exists return $this->reloadRequired() || $this->existsInReferer(); } - - /** - * Suppress the current parameter by unsetting it from $_GET - */ + public function suppress() { unset($_GET[$this->parameterName]); $this->request->offsetUnset($this->parameterName); } - /** - * Determine the querystring parameters to include - * - * @param bool $includeToken Include the token value as well? - * @return array List of querystring parameters with name and token parameters - */ public function params($includeToken = true) { $params = array( @@ -234,25 +140,7 @@ class ParameterConfirmationToken } return $params; } - - /** - * Get redirect url, excluding querystring - * - * @return string - */ - protected function currentURL() - { - return Controller::join_links( - BASE_URL ?: '/', - $this->request->getURL(false) - ); - } - - /** - * Get redirection URL - * - * @return string - */ + protected function redirectURL() { // If url is encoded via BackURL, defer to home page (prevent redirect to form action) @@ -267,48 +155,4 @@ class ParameterConfirmationToken // Merge get params with current url return Controller::join_links($url, '?' . http_build_query($params)); } - - /** - * Forces a reload of the request with the token included - * - * @return HTTPResponse - */ - public function reloadWithToken() - { - $location = $this->redirectURL(); - $locationJS = Convert::raw2js($location); - $locationATT = Convert::raw2att($location); - $body = <<location.href='$locationJS'; - -You are being redirected. If you are not redirected soon, click here to continue the flush -HTML; - - // Build response - $result = new HTTPResponse($body); - $result->redirect($location); - return $result; - } - - /** - * Given a list of token names, suppress all tokens that have not been validated, and - * return the non-validated token with the highest priority - * - * @param array $keys List of token keys in ascending priority (low to high) - * @param HTTPRequest $request - * @return ParameterConfirmationToken The token container for the unvalidated $key given with the highest priority - */ - public static function prepare_tokens($keys, HTTPRequest $request) - { - $target = null; - foreach ($keys as $key) { - $token = new ParameterConfirmationToken($key, $request); - // Validate this token - if ($token->reloadRequired() || $token->reloadRequiredIfError()) { - $token->suppress(); - $target = $token; - } - } - return $target; - } } diff --git a/src/Core/Startup/URLConfirmationToken.php b/src/Core/Startup/URLConfirmationToken.php new file mode 100644 index 000000000..8176a41b8 --- /dev/null +++ b/src/Core/Startup/URLConfirmationToken.php @@ -0,0 +1,136 @@ +urlToCheck = $urlToCheck; + $this->request = $request; + $this->currentURL = $request->getURL(false); + + $this->tokenParameterName = preg_replace('/[^a-z0-9]/i', '', $urlToCheck) . 'token'; + $this->urlExistsInBackURL = $this->getURLExistsInBackURL($request); + + // If the token provided is valid, mark it as such + $token = $request->getVar($this->tokenParameterName); + if ($this->checkToken($token)) { + $this->token = $token; + } + } + + /** + * @param HTTPRequest $request + * @return bool + */ + protected function getURLExistsInBackURL(HTTPRequest $request) + { + $backURL = $request->getVar('BackURL'); + return (strpos($backURL, $this->urlToCheck) === 0); + } + + /** + * @return bool + */ + protected function urlMatches() + { + return ($this->currentURL === $this->urlToCheck); + } + + /** + * @return string + */ + public function getURLToCheck() + { + return $this->urlToCheck; + } + + /** + * @return bool + */ + public function urlExistsInBackURL() + { + return $this->urlExistsInBackURL; + } + + public function reloadRequired() + { + return $this->urlMatches() && !$this->tokenProvided(); + } + + public function reloadRequiredIfError() + { + return $this->reloadRequired() || $this->urlExistsInBackURL(); + } + + public function suppress() + { + $_SERVER['REQUEST_URI'] = '/'; + $this->request->setURL('/'); + } + + public function params($includeToken = true) + { + $params = []; + if ($includeToken) { + $params[$this->tokenParameterName] = $this->genToken(); + } + + return $params; + } + + public function currentURL() + { + return Controller::join_links(Director::baseURL(), $this->currentURL); + } + + protected function redirectURL() + { + // If url is encoded via BackURL, defer to home page (prevent redirect to form action) + if ($this->urlExistsInBackURL && !$this->urlMatches()) { + $url = BASE_URL ?: '/'; + $params = $this->params(); + } else { + $url = $this->currentURL(); + $params = array_merge($this->request->getVars(), $this->params()); + } + + // Merge get params with current url + return Controller::join_links($url, '?' . http_build_query($params)); + } +} diff --git a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php index 5cce89d3e..7df6f6ebf 100644 --- a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php +++ b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php @@ -73,4 +73,52 @@ class ErrorControlChainMiddlewareTest extends SapphireTest $this->assertNotContains('?flush=1&flushtoken=', $location); $this->assertContains('Security/login', $location); } + + public function testLiveBuildAdmin() + { + // Mock admin + $adminID = $this->logInWithPermission('ADMIN'); + $this->logOut(); + + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as admin + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build/'); + $request->setSession(new Session(['loggedInAs' => $adminID])); + $result = $chain->process($request, function () { + return null; + }); + + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertContains('/dev/build', $location); + $this->assertContains('?devbuildtoken=', $location); + $this->assertNotContains('Security/login', $location); + } + + public function testLiveBuildUnauthenticated() + { + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as no one + Security::setCurrentUser(null); + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build'); + $request->setSession(new Session(['loggedInAs' => 0])); + $result = $chain->process($request, function () { + return null; + }); + + // Should be directed to login, not to flush + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertNotContains('/dev/build', $location); + $this->assertNotContains('?devbuildtoken=', $location); + $this->assertContains('Security/login', $location); + } } diff --git a/tests/php/Core/Startup/ParameterConfirmationTokenTest.php b/tests/php/Core/Startup/ParameterConfirmationTokenTest.php index 66616433f..e28af8ea5 100644 --- a/tests/php/Core/Startup/ParameterConfirmationTokenTest.php +++ b/tests/php/Core/Startup/ParameterConfirmationTokenTest.php @@ -149,14 +149,14 @@ class ParameterConfirmationTokenTest extends SapphireTest } /** - * currentAbsoluteURL needs to handle base or url being missing, or any combination of slashes. + * currentURL needs to handle base or url being missing, or any combination of slashes. * * There should always be exactly one slash between each part in the result, and any trailing slash * should be preserved. * * @dataProvider dataProviderURLs */ - public function testCurrentAbsoluteURLHandlesSlashes($url) + public function testCurrentURLHandlesSlashes($url) { $this->request->setUrl($url); diff --git a/tests/php/Core/Startup/URLConfirmationTokenTest.php b/tests/php/Core/Startup/URLConfirmationTokenTest.php new file mode 100644 index 000000000..73b07eb13 --- /dev/null +++ b/tests/php/Core/Startup/URLConfirmationTokenTest.php @@ -0,0 +1,148 @@ + 'value']); + $validToken = new StubValidToken('token/test/url', $request); + $this->assertTrue($validToken->urlMatches()); + $this->assertFalse($validToken->urlExistsInBackURL()); + $this->assertTrue($validToken->tokenProvided()); // Actually forced to true for this test + $this->assertFalse($validToken->reloadRequired()); + $this->assertFalse($validToken->reloadRequiredIfError()); + $this->assertStringStartsWith(Controller::join_links(BASE_URL, '/', 'token/test/url'), $validToken->redirectURL()); + } + + public function testTokenWithLeadingSlashInUrl() + { + $request = new HTTPRequest('GET', '/leading/slash/url', []); + $leadingSlash = new StubToken('leading/slash/url', $request); + $this->assertTrue($leadingSlash->urlMatches()); + $this->assertFalse($leadingSlash->urlExistsInBackURL()); + $this->assertFalse($leadingSlash->tokenProvided()); + $this->assertTrue($leadingSlash->reloadRequired()); + $this->assertTrue($leadingSlash->reloadRequiredIfError()); + $this->assertContains('leading/slash/url', $leadingSlash->redirectURL()); + $this->assertContains('leadingslashurltoken', $leadingSlash->redirectURL()); + } + + public function testTokenWithTrailingSlashInUrl() + { + $request = new HTTPRequest('GET', 'trailing/slash/url/', []); + $trailingSlash = new StubToken('trailing/slash/url', $request); + $this->assertTrue($trailingSlash->urlMatches()); + $this->assertFalse($trailingSlash->urlExistsInBackURL()); + $this->assertFalse($trailingSlash->tokenProvided()); + $this->assertTrue($trailingSlash->reloadRequired()); + $this->assertTrue($trailingSlash->reloadRequiredIfError()); + $this->assertContains('trailing/slash/url', $trailingSlash->redirectURL()); + $this->assertContains('trailingslashurltoken', $trailingSlash->redirectURL()); + } + + public function testTokenWithUrlMatchedInBackUrl() + { + $request = new HTTPRequest('GET', '/', ['BackURL' => 'back/url']); + $backUrl = new StubToken('back/url', $request); + $this->assertFalse($backUrl->urlMatches()); + $this->assertTrue($backUrl->urlExistsInBackURL()); + $this->assertFalse($backUrl->tokenProvided()); + $this->assertFalse($backUrl->reloadRequired()); + $this->assertTrue($backUrl->reloadRequiredIfError()); + $home = (BASE_URL ?: '/') . '?'; + $this->assertStringStartsWith($home, $backUrl->redirectURL()); + $this->assertContains('backurltoken', $backUrl->redirectURL()); + } + + public function testUrlSuppressionWhenTokenMissing() + { + // Check suppression + $request = new HTTPRequest('GET', 'test/url', []); + $token = new StubToken('test/url', $request); + $this->assertEquals('test/url', $request->getURL(false)); + $token->suppress(); + $this->assertEquals('', $request->getURL(false)); + } + + public function testPrepareTokens() + { + $request = new HTTPRequest('GET', 'test/url', []); + $token = URLConfirmationToken::prepare_tokens( + [ + 'test/url', + 'test', + 'url' + ], + $request + ); + // Test no invalid tokens + $this->assertEquals('test/url', $token->getURLToCheck()); + $this->assertNotEquals('test/url', $request->getURL(false), 'prepare_tokens() did not suppress URL'); + } + + public function testPrepareTokensDoesntSuppressWhenNotMatched() + { + $request = new HTTPRequest('GET', 'test/url', []); + $token = URLConfirmationToken::prepare_tokens( + ['another/url'], + $request + ); + $this->assertEmpty($token); + $this->assertEquals('test/url', $request->getURL(false), 'prepare_tokens() incorrectly suppressed URL'); + } + + public function testPrepareTokensWithUrlMatchedInBackUrl() + { + // Test backurl token + $request = new HTTPRequest('GET', '/', ['BackURL' => 'back/url']); + $token = URLConfirmationToken::prepare_tokens( + [ 'back/url' ], + $request + ); + $this->assertNotEmpty($token); + $this->assertEquals('back/url', $token->getURLToCheck()); + $this->assertNotEquals('back/url', $request->getURL(false), 'prepare_tokens() did not suppress URL'); + } + + public function dataProviderURLs() + { + return [ + [''], + ['/'], + ['bar'], + ['bar/'], + ['/bar'], + ['/bar/'], + ]; + } + + /** + * currentURL needs to handle base or url being missing, or any combination of slashes. + * + * There should always be exactly one slash between each part in the result, and any trailing slash + * should be preserved. + * + * @dataProvider dataProviderURLs + */ + public function testCurrentURLHandlesSlashes($url) + { + $request = new HTTPRequest('GET', $url, []); + + $token = new StubToken( + 'another/url', + $request + ); + $expected = rtrim(Controller::join_links(BASE_URL, '/', $url), '/') ?: '/'; + $this->assertEquals($expected, $token->currentURL(), "Invalid redirect for request url $url"); + } +} diff --git a/tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php b/tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php new file mode 100644 index 000000000..ca08d3e1f --- /dev/null +++ b/tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php @@ -0,0 +1,27 @@ + Date: Mon, 30 Jul 2018 11:50:11 +1200 Subject: [PATCH 044/175] [SS-2018-018] Ignore arguments in mysqli::real_connect backtrace calls --- src/Dev/Backtrace.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Dev/Backtrace.php b/src/Dev/Backtrace.php index daceca751..648cc883f 100644 --- a/src/Dev/Backtrace.php +++ b/src/Dev/Backtrace.php @@ -26,6 +26,7 @@ class Backtrace array('PDO', '__construct'), array('mysqli', 'mysqli'), array('mysqli', 'select_db'), + array('mysqli', 'real_connect'), array('SilverStripe\\ORM\\DB', 'connect'), array('SilverStripe\\Security\\Security', 'check_default_admin'), array('SilverStripe\\Security\\Security', 'encrypt_password'), From 0877442c6409ad94aa57d32debc875b636cf9be0 Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Fri, 24 Aug 2018 15:36:51 +0100 Subject: [PATCH 045/175] Implement ConfirmationTokenChain to handle multiple tokens at once --- ...oken.php => AbstractConfirmationToken.php} | 12 +- src/Core/Startup/ConfirmationTokenChain.php | 178 +++++++++++++++++ .../Startup/ErrorControlChainMiddleware.php | 62 +++--- src/Core/Startup/ErrorDirector.php | 13 +- .../Startup/ParameterConfirmationToken.php | 28 +-- src/Core/Startup/URLConfirmationToken.php | 29 +-- .../Startup/ConfirmationTokenChainTest.php | 185 ++++++++++++++++++ .../ErrorControlChainMiddlewareTest.php | 52 +++++ 8 files changed, 500 insertions(+), 59 deletions(-) rename src/Core/Startup/{ConfirmationToken.php => AbstractConfirmationToken.php} (95%) create mode 100644 src/Core/Startup/ConfirmationTokenChain.php create mode 100644 tests/php/Core/Startup/ConfirmationTokenChainTest.php diff --git a/src/Core/Startup/ConfirmationToken.php b/src/Core/Startup/AbstractConfirmationToken.php similarity index 95% rename from src/Core/Startup/ConfirmationToken.php rename to src/Core/Startup/AbstractConfirmationToken.php index d23563f46..11f78b48a 100644 --- a/src/Core/Startup/ConfirmationToken.php +++ b/src/Core/Startup/AbstractConfirmationToken.php @@ -15,7 +15,7 @@ use SilverStripe\Security\RandomGenerator; * * @internal This class is designed specifically for use pre-startup and may change without warning */ -abstract class ConfirmationToken +abstract class AbstractConfirmationToken { /** * @var HTTPRequest @@ -173,6 +173,16 @@ HTML; */ abstract public function params($includeToken = true); + /** + * @return string + */ + abstract public function getRedirectUrlBase(); + + /** + * @return array + */ + abstract public function getRedirectUrlParams(); + /** * Get redirection URL * diff --git a/src/Core/Startup/ConfirmationTokenChain.php b/src/Core/Startup/ConfirmationTokenChain.php new file mode 100644 index 000000000..a47f2c4c0 --- /dev/null +++ b/src/Core/Startup/ConfirmationTokenChain.php @@ -0,0 +1,178 @@ +tokens[] = $token; + } + + /** + * Collect all tokens that require a redirect + * + * @return \Generator + */ + protected function filteredTokens() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequired() || $token->reloadRequiredIfError()) { + yield $token; + } + } + } + + /** + * @return bool + */ + public function suppressionRequired() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequired()) { + return true; + } + } + + return false; + } + + /** + * Suppress URLs & GET vars from tokens that require a redirect + */ + public function suppressTokens() + { + foreach ($this->filteredTokens() as $token) { + $token->suppress(); + } + } + + /** + * @return bool + */ + public function reloadRequired() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequired()) { + return true; + } + } + + return false; + } + + /** + * @return bool + */ + public function reloadRequiredIfError() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequiredIfError()) { + return true; + } + } + + return false; + } + + /** + * @param bool $includeToken + * @return array + */ + public function params($includeToken = true) + { + $params = []; + foreach ($this->tokens as $token) { + $params = array_merge($params, $token->params($includeToken)); + } + + return $params; + } + + /** + * Fetch the URL we want to redirect to, excluding query string parameters. This may + * be the same URL (with a token to be added outside this method), or to a different + * URL if the current one has been suppressed + * + * @return string + */ + public function getRedirectUrlBase() + { + // URLConfirmationTokens may alter the URL to suppress the URL they're protecting, + // so we need to ensure they're inspected last and therefore take priority + $tokens = iterator_to_array($this->filteredTokens(), false); + usort($tokens, function ($a, $b) { + return ($a instanceof URLConfirmationToken) ? 1 : 0; + }); + + $urlBase = Director::baseURL(); + foreach ($tokens as $token) { + $urlBase = $token->getRedirectUrlBase(); + } + + return $urlBase; + } + + /** + * Collate GET vars from all token providers that need to apply a token + * + * @return array + */ + public function getRedirectUrlParams() + { + $params = []; + foreach ($this->filteredTokens() as $token) { + $params = array_merge($params, $token->getRedirectUrlParams()); + } + + return $params; + } + + /** + * @return string + */ + protected function redirectURL() + { + $params = http_build_query($this->getRedirectUrlParams()); + return Controller::join_links($this->getRedirectUrlBase(), '?' . $params); + } + + /** + * @return HTTPResponse + */ + public function reloadWithTokens() + { + $location = $this->redirectURL(); + $locationJS = Convert::raw2js($location); + $locationATT = Convert::raw2att($location); + $body = <<location.href='$locationJS'; + +You are being redirected. If you are not redirected soon, click here to continue +HTML; + + // Build response + $result = new HTTPResponse($body); + $result->redirect($location); + return $result; + } +} diff --git a/src/Core/Startup/ErrorControlChainMiddleware.php b/src/Core/Startup/ErrorControlChainMiddleware.php index e81444629..c29878e15 100644 --- a/src/Core/Startup/ErrorControlChainMiddleware.php +++ b/src/Core/Startup/ErrorControlChainMiddleware.php @@ -34,20 +34,18 @@ class ErrorControlChainMiddleware implements HTTPMiddleware /** * @param HTTPRequest $request - * @return ConfirmationToken|null + * @return ConfirmationTokenChain */ - protected function prepareConfirmationTokenIfRequired(HTTPRequest $request) + protected function prepareConfirmationTokenChain(HTTPRequest $request) { - $token = URLConfirmationToken::prepare_tokens(['dev/build'], $request); + $chain = new ConfirmationTokenChain(); + $chain->pushToken(new URLConfirmationToken('dev/build', $request)); - if (!$token) { - $token = ParameterConfirmationToken::prepare_tokens( - ['isTest', 'isDev', 'flush'], - $request - ); + foreach (['isTest', 'isDev', 'flush'] as $parameter) { + $chain->pushToken(new ParameterConfirmationToken($parameter, $request)); } - return $token; + return $chain; } public function process(HTTPRequest $request, callable $next) @@ -55,19 +53,21 @@ class ErrorControlChainMiddleware implements HTTPMiddleware $result = null; // Prepare tokens and execute chain - $confirmationToken = $this->prepareConfirmationTokenIfRequired($request); - $chain = new ErrorControlChain(); - $chain - ->then(function () use ($request, $chain, $confirmationToken, $next, &$result) { - // If no redirection is necessary then we can disable error supression - if (!$confirmationToken) { - $chain->setSuppression(false); + $confirmationTokenChain = $this->prepareConfirmationTokenChain($request); + $errorControlChain = new ErrorControlChain(); + $errorControlChain + ->then(function () use ($request, $errorControlChain, $confirmationTokenChain, $next, &$result) { + if ($confirmationTokenChain->suppressionRequired()) { + $confirmationTokenChain->suppressTokens(); + } else { + // If no redirection is necessary then we can disable error supression + $errorControlChain->setSuppression(false); } try { // Check if a token is requesting a redirect - if ($confirmationToken && $confirmationToken->reloadRequired()) { - $result = $this->safeReloadWithToken($request, $confirmationToken); + if ($confirmationTokenChain && $confirmationTokenChain->reloadRequired()) { + $result = $this->safeReloadWithTokens($request, $confirmationTokenChain); } else { // If no reload necessary, process application $result = call_user_func($next, $request); @@ -77,10 +77,16 @@ class ErrorControlChainMiddleware implements HTTPMiddleware } }) // Finally if a token was requested but there was an error while figuring out if it's allowed, do it anyway - ->thenIfErrored(function () use ($confirmationToken) { - if ($confirmationToken && $confirmationToken->reloadRequiredIfError()) { - $result = $confirmationToken->reloadWithToken(); - $result->output(); + ->thenIfErrored(function () use ($confirmationTokenChain) { + if ($confirmationTokenChain && $confirmationTokenChain->reloadRequiredIfError()) { + try { + // Reload requires manual boot + $this->getApplication()->getKernel()->boot(false); + } finally { + // Given we're in an error state here, try to continue even if the kernel boot fails + $result = $confirmationTokenChain->reloadWithTokens(); + $result->output(); + } } }) ->execute(); @@ -92,10 +98,10 @@ class ErrorControlChainMiddleware implements HTTPMiddleware * or authentication is impossible. * * @param HTTPRequest $request - * @param ParameterConfirmationToken $reloadToken + * @param ConfirmationTokenChain $confirmationTokenChain * @return HTTPResponse */ - protected function safeReloadWithToken(HTTPRequest $request, $reloadToken) + protected function safeReloadWithTokens(HTTPRequest $request, ConfirmationTokenChain $confirmationTokenChain) { // Safe reload requires manual boot $this->getApplication()->getKernel()->boot(false); @@ -104,9 +110,9 @@ class ErrorControlChainMiddleware implements HTTPMiddleware $request->getSession()->init($request); // Request with ErrorDirector - $result = ErrorDirector::singleton()->handleRequestWithToken( + $result = ErrorDirector::singleton()->handleRequestWithTokenChain( $request, - $reloadToken, + $confirmationTokenChain, $this->getApplication()->getKernel() ); if ($result) { @@ -114,8 +120,8 @@ class ErrorControlChainMiddleware implements HTTPMiddleware } // Fail and redirect the user to the login page - $params = array_merge($request->getVars(), $reloadToken->params(false)); - $backURL = $reloadToken->currentURL() . '?' . http_build_query($params); + $params = array_merge($request->getVars(), $confirmationTokenChain->params(false)); + $backURL = $confirmationTokenChain->getRedirectUrlBase() . '?' . http_build_query($params); $loginPage = Director::absoluteURL(Security::config()->get('login_url')); $loginPage .= "?BackURL=" . urlencode($backURL); $result = new HTTPResponse(); diff --git a/src/Core/Startup/ErrorDirector.php b/src/Core/Startup/ErrorDirector.php index 54001fd05..575df7183 100644 --- a/src/Core/Startup/ErrorDirector.php +++ b/src/Core/Startup/ErrorDirector.php @@ -21,18 +21,21 @@ class ErrorDirector extends Director * Redirect with token if allowed, or null if not allowed * * @param HTTPRequest $request - * @param ConfirmationToken $token + * @param ConfirmationTokenChain $confirmationTokenChain * @param Kernel $kernel * @return null|HTTPResponse Redirection response, or null if not able to redirect */ - public function handleRequestWithToken(HTTPRequest $request, ConfirmationToken $token, Kernel $kernel) - { + public function handleRequestWithTokenChain( + HTTPRequest $request, + ConfirmationTokenChain $confirmationTokenChain, + Kernel $kernel + ) { Injector::inst()->registerService($request, HTTPRequest::class); // Next, check if we're in dev mode, or the database doesn't have any security data, or we are admin - $reload = function (HTTPRequest $request) use ($token, $kernel) { + $reload = function (HTTPRequest $request) use ($confirmationTokenChain, $kernel) { if ($kernel->getEnvironment() === Kernel::DEV || !Security::database_is_ready() || Permission::check('ADMIN')) { - return $token->reloadWithToken(); + return $confirmationTokenChain->reloadWithTokens(); } return null; }; diff --git a/src/Core/Startup/ParameterConfirmationToken.php b/src/Core/Startup/ParameterConfirmationToken.php index 4e90f1ef7..bc751a2c3 100644 --- a/src/Core/Startup/ParameterConfirmationToken.php +++ b/src/Core/Startup/ParameterConfirmationToken.php @@ -3,6 +3,7 @@ namespace SilverStripe\Core\Startup; use SilverStripe\Control\Controller; +use SilverStripe\Control\Director; use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPResponse; use SilverStripe\Core\Convert; @@ -15,7 +16,7 @@ use SilverStripe\Security\RandomGenerator; * * @internal This class is designed specifically for use pre-startup and may change without warning */ -class ParameterConfirmationToken extends ConfirmationToken +class ParameterConfirmationToken extends AbstractConfirmationToken { /** * The name of the parameter @@ -140,19 +141,22 @@ class ParameterConfirmationToken extends ConfirmationToken } return $params; } + + public function getRedirectUrlBase() + { + return ($this->existsInReferer() && !$this->parameterProvided()) ? Director::baseURL() : $this->currentURL(); + } + + public function getRedirectUrlParams() + { + return ($this->existsInReferer() && !$this->parameterProvided()) + ? $this->params() + : array_merge($this->request->getVars(), $this->params()); + } protected function redirectURL() { - // If url is encoded via BackURL, defer to home page (prevent redirect to form action) - if ($this->existsInReferer() && !$this->parameterProvided()) { - $url = BASE_URL ?: '/'; - $params = $this->params(); - } else { - $url = $this->currentURL(); - $params = array_merge($this->request->getVars(), $this->params()); - } - - // Merge get params with current url - return Controller::join_links($url, '?' . http_build_query($params)); + $query = http_build_query($this->getRedirectUrlParams()); + return Controller::join_links($this->getRedirectUrlBase(), '?' . $query); } } diff --git a/src/Core/Startup/URLConfirmationToken.php b/src/Core/Startup/URLConfirmationToken.php index 8176a41b8..bb509931e 100644 --- a/src/Core/Startup/URLConfirmationToken.php +++ b/src/Core/Startup/URLConfirmationToken.php @@ -12,7 +12,7 @@ use SilverStripe\Control\HTTPRequest; * * @internal This class is designed specifically for use pre-startup and may change without warning */ -class URLConfirmationToken extends ConfirmationToken +class URLConfirmationToken extends AbstractConfirmationToken { /** * @var string @@ -60,7 +60,7 @@ class URLConfirmationToken extends ConfirmationToken */ protected function getURLExistsInBackURL(HTTPRequest $request) { - $backURL = $request->getVar('BackURL'); + $backURL = ltrim($request->getVar('BackURL'), '/'); return (strpos($backURL, $this->urlToCheck) === 0); } @@ -119,18 +119,21 @@ class URLConfirmationToken extends ConfirmationToken return Controller::join_links(Director::baseURL(), $this->currentURL); } + public function getRedirectUrlBase() + { + return ($this->urlExistsInBackURL && !$this->urlMatches()) ? Director::baseURL() : $this->currentURL(); + } + + public function getRedirectUrlParams() + { + return ($this->urlExistsInBackURL && !$this->urlMatches()) + ? $this->params() + : array_merge($this->request->getVars(), $this->params()); + } + protected function redirectURL() { - // If url is encoded via BackURL, defer to home page (prevent redirect to form action) - if ($this->urlExistsInBackURL && !$this->urlMatches()) { - $url = BASE_URL ?: '/'; - $params = $this->params(); - } else { - $url = $this->currentURL(); - $params = array_merge($this->request->getVars(), $this->params()); - } - - // Merge get params with current url - return Controller::join_links($url, '?' . http_build_query($params)); + $query = http_build_query($this->getRedirectUrlParams()); + return Controller::join_links($this->getRedirectUrlBase(), '?' . $query); } } diff --git a/tests/php/Core/Startup/ConfirmationTokenChainTest.php b/tests/php/Core/Startup/ConfirmationTokenChainTest.php new file mode 100644 index 000000000..adb8fba36 --- /dev/null +++ b/tests/php/Core/Startup/ConfirmationTokenChainTest.php @@ -0,0 +1,185 @@ +createPartialMock(ParameterConfirmationToken::class, $methods); + $mock->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue($requiresReload)); + return $mock; + } + + protected function getTokenRequiringReloadIfError($requiresReload = true, $extraMethods = []) + { + $methods = array_merge(['reloadRequired', 'reloadRequiredIfError'], $extraMethods); + $mock = $this->createPartialMock(ParameterConfirmationToken::class, $methods); + $mock->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue(false)); + $mock->expects($this->any()) + ->method('reloadRequiredIfError') + ->will($this->returnValue($requiresReload)); + return $mock; + } + + public function testFilteredTokens() + { + $chain = new ConfirmationTokenChain(); + $chain->pushToken($tokenRequiringReload = $this->getTokenRequiringReload()); + $chain->pushToken($tokenNotRequiringReload = $this->getTokenRequiringReload(false)); + $chain->pushToken($tokenRequiringReloadIfError = $this->getTokenRequiringReloadIfError()); + $chain->pushToken($tokenNotRequiringReloadIfError = $this->getTokenRequiringReloadIfError(false)); + + $reflectionMethod = new \ReflectionMethod(ConfirmationTokenChain::class, 'filteredTokens'); + $reflectionMethod->setAccessible(true); + $tokens = iterator_to_array($reflectionMethod->invoke($chain)); + + $this->assertContains($tokenRequiringReload, $tokens, 'Token requiring a reload was not returned'); + $this->assertNotContains($tokenNotRequiringReload, $tokens, 'Token not requiring a reload was returned'); + $this->assertContains($tokenRequiringReloadIfError, $tokens, 'Token requiring a reload on error was not returned'); + $this->assertNotContains($tokenNotRequiringReloadIfError, $tokens, 'Token not requiring a reload on error was returned'); + } + + public function testSuppressionRequired() + { + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReload(false)); + $this->assertFalse($chain->suppressionRequired(), 'Suppression incorrectly marked as required'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReloadIfError(false)); + $this->assertFalse($chain->suppressionRequired(), 'Suppression incorrectly marked as required'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReload()); + $this->assertTrue($chain->suppressionRequired(), 'Suppression not marked as required'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReloadIfError()); + $this->assertFalse($chain->suppressionRequired(), 'Suppression incorrectly marked as required'); + } + + public function testSuppressTokens() + { + $mockToken = $this->getTokenRequiringReload(true, ['suppress']); + $mockToken->expects($this->once()) + ->method('suppress'); + $secondMockToken = $this->getTokenRequiringReloadIfError(true, ['suppress']); + $secondMockToken->expects($this->once()) + ->method('suppress'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $chain->suppressTokens(); + } + + public function testReloadRequired() + { + $mockToken = $this->getTokenRequiringReload(true); + $secondMockToken = $this->getTokenRequiringReload(false); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertTrue($chain->reloadRequired()); + } + + public function testReloadRequiredIfError() + { + $mockToken = $this->getTokenRequiringReloadIfError(true); + $secondMockToken = $this->getTokenRequiringReloadIfError(false); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertTrue($chain->reloadRequiredIfError()); + } + + public function testParams() + { + $mockToken = $this->getTokenRequiringReload(true, ['params']); + $mockToken->expects($this->once()) + ->method('params') + ->with($this->isTrue()) + ->will($this->returnValue(['mockTokenParam' => '1'])); + $secondMockToken = $this->getTokenRequiringReload(true, ['params']); + $secondMockToken->expects($this->once()) + ->method('params') + ->with($this->isTrue()) + ->will($this->returnValue(['secondMockTokenParam' => '2'])); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertEquals(['mockTokenParam' => '1', 'secondMockTokenParam' => '2'], $chain->params(true)); + + $mockToken = $this->getTokenRequiringReload(true, ['params']); + $mockToken->expects($this->once()) + ->method('params') + ->with($this->isFalse()) + ->will($this->returnValue(['mockTokenParam' => '1'])); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $this->assertEquals(['mockTokenParam' => '1'], $chain->params(false)); + } + + public function testGetRedirectUrlBase() + { + $mockUrlToken = $this->createPartialMock(URLConfirmationToken::class, ['reloadRequired', 'getRedirectUrlBase']); + $mockUrlToken->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue(true)); + $mockUrlToken->expects($this->any()) + ->method('getRedirectUrlBase') + ->will($this->returnValue('url-base')); + + $mockParameterToken = $this->createPartialMock(ParameterConfirmationToken::class, ['reloadRequired', 'getRedirectUrlBase']); + $mockParameterToken->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue(true)); + $mockParameterToken->expects($this->any()) + ->method('getRedirectUrlBase') + ->will($this->returnValue('parameter-base')); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockParameterToken); + $chain->pushToken($mockUrlToken); + $this->assertEquals('url-base', $chain->getRedirectUrlBase(), 'URLConfirmationToken url base should take priority'); + + // Push them in reverse order to check priority still correct + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockUrlToken); + $chain->pushToken($mockParameterToken); + $this->assertEquals('url-base', $chain->getRedirectUrlBase(), 'URLConfirmationToken url base should take priority'); + } + + public function testGetRedirectUrlParams() + { + $mockToken = $this->getTokenRequiringReload(true, ['getRedirectUrlParams']); + $mockToken->expects($this->once()) + ->method('getRedirectUrlParams') + ->will($this->returnValue(['mockTokenParam' => '1'])); + + $secondMockToken = $this->getTokenRequiringReload(true, ['getRedirectUrlParams']); + $secondMockToken->expects($this->once()) + ->method('getRedirectUrlParams') + ->will($this->returnValue(['secondMockTokenParam' => '2'])); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertEquals(['mockTokenParam' => '1', 'secondMockTokenParam' => '2'], $chain->getRedirectUrlParams()); + } +} diff --git a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php index 7df6f6ebf..a90799026 100644 --- a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php +++ b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php @@ -121,4 +121,56 @@ class ErrorControlChainMiddlewareTest extends SapphireTest $this->assertNotContains('?devbuildtoken=', $location); $this->assertContains('Security/login', $location); } + + public function testLiveBuildAndFlushAdmin() + { + // Mock admin + $adminID = $this->logInWithPermission('ADMIN'); + $this->logOut(); + + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as admin + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build/', ['flush' => '1']); + $request->setSession(new Session(['loggedInAs' => $adminID])); + $result = $chain->process($request, function () { + return null; + }); + + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertContains('/dev/build', $location); + $this->assertContains('flush=1', $location); + $this->assertContains('devbuildtoken=', $location); + $this->assertContains('flushtoken=', $location); + $this->assertNotContains('Security/login', $location); + } + + public function testLiveBuildAndFlushUnauthenticated() + { + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as no one + Security::setCurrentUser(null); + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build', ['flush' => '1']); + $request->setSession(new Session(['loggedInAs' => 0])); + $result = $chain->process($request, function () { + return null; + }); + + // Should be directed to login, not to flush + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertNotContains('/dev/build', $location); + $this->assertNotContains('flush=1', $location); + $this->assertNotContains('devbuildtoken=', $location); + $this->assertNotContains('flushtoken=', $location); + $this->assertContains('Security/login', $location); + } } From 0610f76da02ac53a1b51cdfe9eac34e943a66991 Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Tue, 21 Aug 2018 11:20:15 +0100 Subject: [PATCH 046/175] [SS-2018-019] Add confirmation token to dev/build --- src/Control/HTTPApplication.php | 2 +- src/Core/Startup/ConfirmationToken.php | 182 ++++++++++++++++++ src/Core/Startup/ErrorControlChain.php | 3 +- .../Startup/ErrorControlChainMiddleware.php | 43 +++-- src/Core/Startup/ErrorDirector.php | 4 +- .../Startup/ParameterConfirmationToken.php | 172 +---------------- src/Core/Startup/URLConfirmationToken.php | 136 +++++++++++++ .../ErrorControlChainMiddlewareTest.php | 48 +++++ .../ParameterConfirmationTokenTest.php | 4 +- .../Core/Startup/URLConfirmationTokenTest.php | 148 ++++++++++++++ .../URLConfirmationTokenTest/StubToken.php | 27 +++ .../StubValidToken.php | 15 ++ 12 files changed, 600 insertions(+), 184 deletions(-) create mode 100644 src/Core/Startup/ConfirmationToken.php create mode 100644 src/Core/Startup/URLConfirmationToken.php create mode 100644 tests/php/Core/Startup/URLConfirmationTokenTest.php create mode 100644 tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php create mode 100644 tests/php/Core/Startup/URLConfirmationTokenTest/StubValidToken.php diff --git a/src/Control/HTTPApplication.php b/src/Control/HTTPApplication.php index 4d0f7cb9d..35f453d6d 100644 --- a/src/Control/HTTPApplication.php +++ b/src/Control/HTTPApplication.php @@ -41,7 +41,7 @@ class HTTPApplication implements Application */ public function handle(HTTPRequest $request) { - $flush = array_key_exists('flush', $request->getVars()) || strpos($request->getURL(), 'dev/build') === 0; + $flush = array_key_exists('flush', $request->getVars()) || ($request->getURL() === 'dev/build'); // Ensure boot is invoked return $this->execute($request, function (HTTPRequest $request) { diff --git a/src/Core/Startup/ConfirmationToken.php b/src/Core/Startup/ConfirmationToken.php new file mode 100644 index 000000000..d23563f46 --- /dev/null +++ b/src/Core/Startup/ConfirmationToken.php @@ -0,0 +1,182 @@ +reloadRequired() || $token->reloadRequiredIfError()) { + $token->suppress(); + $target = $token; + } + } + return $target; + } + + /** + * Generate a local filesystem path to store a token + * + * @param $token + * @return string + */ + protected function pathForToken($token) + { + return TEMP_PATH . DIRECTORY_SEPARATOR . 'token_' . preg_replace('/[^a-z0-9]+/', '', $token); + } + + /** + * Generate a new random token and store it + * + * @return string Token name + */ + protected function genToken() + { + // Generate a new random token (as random as possible) + $rg = new RandomGenerator(); + $token = $rg->randomToken('md5'); + + // Store a file in the session save path (safer than /tmp, as open_basedir might limit that) + file_put_contents($this->pathForToken($token), $token); + + return $token; + } + + /** + * Is the necessary token provided for this parameter? + * A value must be provided for the token + * + * @return bool + */ + public function tokenProvided() + { + return !empty($this->token); + } + + /** + * Validate a token + * + * @param string $token + * @return boolean True if the token is valid + */ + protected function checkToken($token) + { + if (!$token) { + return false; + } + + $file = $this->pathForToken($token); + $content = null; + + if (file_exists($file)) { + $content = file_get_contents($file); + unlink($file); + } + + return $content === $token; + } + + /** + * Get redirect url, excluding querystring + * + * @return string + */ + public function currentURL() + { + return Controller::join_links(Director::baseURL(), $this->request->getURL(false)); + } + + /** + * Forces a reload of the request with the token included + * + * @return HTTPResponse + */ + public function reloadWithToken() + { + $location = $this->redirectURL(); + $locationJS = Convert::raw2js($location); + $locationATT = Convert::raw2att($location); + $body = <<location.href='$locationJS'; + +You are being redirected. If you are not redirected soon, click here to continue +HTML; + + // Build response + $result = new HTTPResponse($body); + $result->redirect($location); + return $result; + } + + /** + * Is this parameter requested without a valid token? + * + * @return bool True if the parameter is given without a valid token + */ + abstract public function reloadRequired(); + + /** + * Check if this token is provided either in the backurl, or directly, + * but without a token + * + * @return bool + */ + abstract public function reloadRequiredIfError(); + + /** + * Suppress the current parameter for the duration of this request + */ + abstract public function suppress(); + + /** + * Determine the querystring parameters to include + * + * @param bool $includeToken Include the token value? + * @return array List of querystring parameters, possibly including token parameter + */ + abstract public function params($includeToken = true); + + /** + * Get redirection URL + * + * @return string + */ + abstract protected function redirectURL(); +} diff --git a/src/Core/Startup/ErrorControlChain.php b/src/Core/Startup/ErrorControlChain.php index f34a2c802..e2d14db65 100644 --- a/src/Core/Startup/ErrorControlChain.php +++ b/src/Core/Startup/ErrorControlChain.php @@ -15,8 +15,7 @@ use Exception; * $chain = new ErrorControlChain(); * $chain->then($callback1)->then($callback2)->thenIfErrored($callback3)->execute(); * - * WARNING: This class is experimental and designed specifically for use pre-startup. - * It will likely be heavily refactored before the release of 3.2 + * @internal This class is designed specifically for use pre-startup and may change without warning */ class ErrorControlChain { diff --git a/src/Core/Startup/ErrorControlChainMiddleware.php b/src/Core/Startup/ErrorControlChainMiddleware.php index bdb5ff0a3..e81444629 100644 --- a/src/Core/Startup/ErrorControlChainMiddleware.php +++ b/src/Core/Startup/ErrorControlChainMiddleware.php @@ -12,6 +12,8 @@ use SilverStripe\Security\Security; /** * Decorates application bootstrapping with errorcontrolchain + * + * @internal This class is designed specifically for use pre-startup and may change without warning */ class ErrorControlChainMiddleware implements HTTPMiddleware { @@ -30,27 +32,42 @@ class ErrorControlChainMiddleware implements HTTPMiddleware $this->application = $application; } + /** + * @param HTTPRequest $request + * @return ConfirmationToken|null + */ + protected function prepareConfirmationTokenIfRequired(HTTPRequest $request) + { + $token = URLConfirmationToken::prepare_tokens(['dev/build'], $request); + + if (!$token) { + $token = ParameterConfirmationToken::prepare_tokens( + ['isTest', 'isDev', 'flush'], + $request + ); + } + + return $token; + } + public function process(HTTPRequest $request, callable $next) { $result = null; // Prepare tokens and execute chain - $reloadToken = ParameterConfirmationToken::prepare_tokens( - ['isTest', 'isDev', 'flush'], - $request - ); + $confirmationToken = $this->prepareConfirmationTokenIfRequired($request); $chain = new ErrorControlChain(); $chain - ->then(function () use ($request, $chain, $reloadToken, $next, &$result) { + ->then(function () use ($request, $chain, $confirmationToken, $next, &$result) { // If no redirection is necessary then we can disable error supression - if (!$reloadToken) { + if (!$confirmationToken) { $chain->setSuppression(false); } try { // Check if a token is requesting a redirect - if ($reloadToken && $reloadToken->reloadRequired()) { - $result = $this->safeReloadWithToken($request, $reloadToken); + if ($confirmationToken && $confirmationToken->reloadRequired()) { + $result = $this->safeReloadWithToken($request, $confirmationToken); } else { // If no reload necessary, process application $result = call_user_func($next, $request); @@ -60,9 +77,9 @@ class ErrorControlChainMiddleware implements HTTPMiddleware } }) // Finally if a token was requested but there was an error while figuring out if it's allowed, do it anyway - ->thenIfErrored(function () use ($reloadToken) { - if ($reloadToken && $reloadToken->reloadRequiredIfError()) { - $result = $reloadToken->reloadWithToken(); + ->thenIfErrored(function () use ($confirmationToken) { + if ($confirmationToken && $confirmationToken->reloadRequiredIfError()) { + $result = $confirmationToken->reloadWithToken(); $result->output(); } }) @@ -85,7 +102,7 @@ class ErrorControlChainMiddleware implements HTTPMiddleware // Ensure session is started $request->getSession()->init($request); - + // Request with ErrorDirector $result = ErrorDirector::singleton()->handleRequestWithToken( $request, @@ -98,7 +115,7 @@ class ErrorControlChainMiddleware implements HTTPMiddleware // Fail and redirect the user to the login page $params = array_merge($request->getVars(), $reloadToken->params(false)); - $backURL = $request->getURL() . '?' . http_build_query($params); + $backURL = $reloadToken->currentURL() . '?' . http_build_query($params); $loginPage = Director::absoluteURL(Security::config()->get('login_url')); $loginPage .= "?BackURL=" . urlencode($backURL); $result = new HTTPResponse(); diff --git a/src/Core/Startup/ErrorDirector.php b/src/Core/Startup/ErrorDirector.php index 3c994c6af..54001fd05 100644 --- a/src/Core/Startup/ErrorDirector.php +++ b/src/Core/Startup/ErrorDirector.php @@ -21,11 +21,11 @@ class ErrorDirector extends Director * Redirect with token if allowed, or null if not allowed * * @param HTTPRequest $request - * @param ParameterConfirmationToken $token + * @param ConfirmationToken $token * @param Kernel $kernel * @return null|HTTPResponse Redirection response, or null if not able to redirect */ - public function handleRequestWithToken(HTTPRequest $request, ParameterConfirmationToken $token, Kernel $kernel) + public function handleRequestWithToken(HTTPRequest $request, ConfirmationToken $token, Kernel $kernel) { Injector::inst()->registerService($request, HTTPRequest::class); diff --git a/src/Core/Startup/ParameterConfirmationToken.php b/src/Core/Startup/ParameterConfirmationToken.php index 1c80db1d0..4e90f1ef7 100644 --- a/src/Core/Startup/ParameterConfirmationToken.php +++ b/src/Core/Startup/ParameterConfirmationToken.php @@ -9,30 +9,21 @@ use SilverStripe\Core\Convert; use SilverStripe\Security\RandomGenerator; /** - * Class ParameterConfirmationToken + * This is used to protect dangerous GET parameters that need to be detected early in the request + * lifecycle by generating a one-time-use token & redirecting with that token included in the + * redirected URL * - * When you need to use a dangerous GET parameter that needs to be set before core/Core.php is - * established, this class takes care of allowing some other code of confirming the parameter, - * by generating a one-time-use token & redirecting with that token included in the redirected URL - * - * WARNING: This class is experimental and designed specifically for use pre-startup. - * It will likely be heavily refactored before the release of 3.2 + * @internal This class is designed specifically for use pre-startup and may change without warning */ -class ParameterConfirmationToken +class ParameterConfirmationToken extends ConfirmationToken { - /** * The name of the parameter * * @var string */ protected $parameterName = null; - - /** - * @var HTTPRequest - */ - protected $request = null; - + /** * The parameter given in the main request * @@ -48,60 +39,6 @@ class ParameterConfirmationToken protected $parameterBackURL = null; /** - * The validated and checked token for this parameter - * - * @var string|null A string value, or null if either not provided or invalid - */ - protected $token = null; - - protected function pathForToken($token) - { - return TEMP_PATH . DIRECTORY_SEPARATOR . 'token_' . preg_replace('/[^a-z0-9]+/', '', $token); - } - - /** - * Generate a new random token and store it - * - * @return string Token name - */ - protected function genToken() - { - // Generate a new random token (as random as possible) - $rg = new RandomGenerator(); - $token = $rg->randomToken('md5'); - - // Store a file in the session save path (safer than /tmp, as open_basedir might limit that) - file_put_contents($this->pathForToken($token), $token); - - return $token; - } - - /** - * Validate a token - * - * @param string $token - * @return boolean True if the token is valid - */ - protected function checkToken($token) - { - if (!$token) { - return false; - } - - $file = $this->pathForToken($token); - $content = null; - - if (file_exists($file)) { - $content = file_get_contents($file); - unlink($file); - } - - return $content == $token; - } - - /** - * Create a new ParameterConfirmationToken - * * @param string $parameterName Name of the querystring parameter to check * @param HTTPRequest $request */ @@ -176,54 +113,23 @@ class ParameterConfirmationToken return $this->parameterBackURL !== null; } - /** - * Is the necessary token provided for this parameter? - * A value must be provided for the token - * - * @return bool - */ - public function tokenProvided() - { - return !empty($this->token); - } - - /** - * Is this parameter requested without a valid token? - * - * @return bool True if the parameter is given without a valid token - */ public function reloadRequired() { return $this->parameterProvided() && !$this->tokenProvided(); } - /** - * Check if this token is provided either in the backurl, or directly, - * but without a token - * - * @return bool - */ public function reloadRequiredIfError() { // Don't reload if token exists return $this->reloadRequired() || $this->existsInReferer(); } - - /** - * Suppress the current parameter by unsetting it from $_GET - */ + public function suppress() { unset($_GET[$this->parameterName]); $this->request->offsetUnset($this->parameterName); } - /** - * Determine the querystring parameters to include - * - * @param bool $includeToken Include the token value as well? - * @return array List of querystring parameters with name and token parameters - */ public function params($includeToken = true) { $params = array( @@ -234,25 +140,7 @@ class ParameterConfirmationToken } return $params; } - - /** - * Get redirect url, excluding querystring - * - * @return string - */ - protected function currentURL() - { - return Controller::join_links( - BASE_URL ?: '/', - $this->request->getURL(false) - ); - } - - /** - * Get redirection URL - * - * @return string - */ + protected function redirectURL() { // If url is encoded via BackURL, defer to home page (prevent redirect to form action) @@ -267,48 +155,4 @@ class ParameterConfirmationToken // Merge get params with current url return Controller::join_links($url, '?' . http_build_query($params)); } - - /** - * Forces a reload of the request with the token included - * - * @return HTTPResponse - */ - public function reloadWithToken() - { - $location = $this->redirectURL(); - $locationJS = Convert::raw2js($location); - $locationATT = Convert::raw2att($location); - $body = <<location.href='$locationJS'; - -You are being redirected. If you are not redirected soon, click here to continue the flush -HTML; - - // Build response - $result = new HTTPResponse($body); - $result->redirect($location); - return $result; - } - - /** - * Given a list of token names, suppress all tokens that have not been validated, and - * return the non-validated token with the highest priority - * - * @param array $keys List of token keys in ascending priority (low to high) - * @param HTTPRequest $request - * @return ParameterConfirmationToken The token container for the unvalidated $key given with the highest priority - */ - public static function prepare_tokens($keys, HTTPRequest $request) - { - $target = null; - foreach ($keys as $key) { - $token = new ParameterConfirmationToken($key, $request); - // Validate this token - if ($token->reloadRequired() || $token->reloadRequiredIfError()) { - $token->suppress(); - $target = $token; - } - } - return $target; - } } diff --git a/src/Core/Startup/URLConfirmationToken.php b/src/Core/Startup/URLConfirmationToken.php new file mode 100644 index 000000000..8176a41b8 --- /dev/null +++ b/src/Core/Startup/URLConfirmationToken.php @@ -0,0 +1,136 @@ +urlToCheck = $urlToCheck; + $this->request = $request; + $this->currentURL = $request->getURL(false); + + $this->tokenParameterName = preg_replace('/[^a-z0-9]/i', '', $urlToCheck) . 'token'; + $this->urlExistsInBackURL = $this->getURLExistsInBackURL($request); + + // If the token provided is valid, mark it as such + $token = $request->getVar($this->tokenParameterName); + if ($this->checkToken($token)) { + $this->token = $token; + } + } + + /** + * @param HTTPRequest $request + * @return bool + */ + protected function getURLExistsInBackURL(HTTPRequest $request) + { + $backURL = $request->getVar('BackURL'); + return (strpos($backURL, $this->urlToCheck) === 0); + } + + /** + * @return bool + */ + protected function urlMatches() + { + return ($this->currentURL === $this->urlToCheck); + } + + /** + * @return string + */ + public function getURLToCheck() + { + return $this->urlToCheck; + } + + /** + * @return bool + */ + public function urlExistsInBackURL() + { + return $this->urlExistsInBackURL; + } + + public function reloadRequired() + { + return $this->urlMatches() && !$this->tokenProvided(); + } + + public function reloadRequiredIfError() + { + return $this->reloadRequired() || $this->urlExistsInBackURL(); + } + + public function suppress() + { + $_SERVER['REQUEST_URI'] = '/'; + $this->request->setURL('/'); + } + + public function params($includeToken = true) + { + $params = []; + if ($includeToken) { + $params[$this->tokenParameterName] = $this->genToken(); + } + + return $params; + } + + public function currentURL() + { + return Controller::join_links(Director::baseURL(), $this->currentURL); + } + + protected function redirectURL() + { + // If url is encoded via BackURL, defer to home page (prevent redirect to form action) + if ($this->urlExistsInBackURL && !$this->urlMatches()) { + $url = BASE_URL ?: '/'; + $params = $this->params(); + } else { + $url = $this->currentURL(); + $params = array_merge($this->request->getVars(), $this->params()); + } + + // Merge get params with current url + return Controller::join_links($url, '?' . http_build_query($params)); + } +} diff --git a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php index 5cce89d3e..7df6f6ebf 100644 --- a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php +++ b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php @@ -73,4 +73,52 @@ class ErrorControlChainMiddlewareTest extends SapphireTest $this->assertNotContains('?flush=1&flushtoken=', $location); $this->assertContains('Security/login', $location); } + + public function testLiveBuildAdmin() + { + // Mock admin + $adminID = $this->logInWithPermission('ADMIN'); + $this->logOut(); + + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as admin + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build/'); + $request->setSession(new Session(['loggedInAs' => $adminID])); + $result = $chain->process($request, function () { + return null; + }); + + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertContains('/dev/build', $location); + $this->assertContains('?devbuildtoken=', $location); + $this->assertNotContains('Security/login', $location); + } + + public function testLiveBuildUnauthenticated() + { + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as no one + Security::setCurrentUser(null); + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build'); + $request->setSession(new Session(['loggedInAs' => 0])); + $result = $chain->process($request, function () { + return null; + }); + + // Should be directed to login, not to flush + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertNotContains('/dev/build', $location); + $this->assertNotContains('?devbuildtoken=', $location); + $this->assertContains('Security/login', $location); + } } diff --git a/tests/php/Core/Startup/ParameterConfirmationTokenTest.php b/tests/php/Core/Startup/ParameterConfirmationTokenTest.php index 66616433f..e28af8ea5 100644 --- a/tests/php/Core/Startup/ParameterConfirmationTokenTest.php +++ b/tests/php/Core/Startup/ParameterConfirmationTokenTest.php @@ -149,14 +149,14 @@ class ParameterConfirmationTokenTest extends SapphireTest } /** - * currentAbsoluteURL needs to handle base or url being missing, or any combination of slashes. + * currentURL needs to handle base or url being missing, or any combination of slashes. * * There should always be exactly one slash between each part in the result, and any trailing slash * should be preserved. * * @dataProvider dataProviderURLs */ - public function testCurrentAbsoluteURLHandlesSlashes($url) + public function testCurrentURLHandlesSlashes($url) { $this->request->setUrl($url); diff --git a/tests/php/Core/Startup/URLConfirmationTokenTest.php b/tests/php/Core/Startup/URLConfirmationTokenTest.php new file mode 100644 index 000000000..73b07eb13 --- /dev/null +++ b/tests/php/Core/Startup/URLConfirmationTokenTest.php @@ -0,0 +1,148 @@ + 'value']); + $validToken = new StubValidToken('token/test/url', $request); + $this->assertTrue($validToken->urlMatches()); + $this->assertFalse($validToken->urlExistsInBackURL()); + $this->assertTrue($validToken->tokenProvided()); // Actually forced to true for this test + $this->assertFalse($validToken->reloadRequired()); + $this->assertFalse($validToken->reloadRequiredIfError()); + $this->assertStringStartsWith(Controller::join_links(BASE_URL, '/', 'token/test/url'), $validToken->redirectURL()); + } + + public function testTokenWithLeadingSlashInUrl() + { + $request = new HTTPRequest('GET', '/leading/slash/url', []); + $leadingSlash = new StubToken('leading/slash/url', $request); + $this->assertTrue($leadingSlash->urlMatches()); + $this->assertFalse($leadingSlash->urlExistsInBackURL()); + $this->assertFalse($leadingSlash->tokenProvided()); + $this->assertTrue($leadingSlash->reloadRequired()); + $this->assertTrue($leadingSlash->reloadRequiredIfError()); + $this->assertContains('leading/slash/url', $leadingSlash->redirectURL()); + $this->assertContains('leadingslashurltoken', $leadingSlash->redirectURL()); + } + + public function testTokenWithTrailingSlashInUrl() + { + $request = new HTTPRequest('GET', 'trailing/slash/url/', []); + $trailingSlash = new StubToken('trailing/slash/url', $request); + $this->assertTrue($trailingSlash->urlMatches()); + $this->assertFalse($trailingSlash->urlExistsInBackURL()); + $this->assertFalse($trailingSlash->tokenProvided()); + $this->assertTrue($trailingSlash->reloadRequired()); + $this->assertTrue($trailingSlash->reloadRequiredIfError()); + $this->assertContains('trailing/slash/url', $trailingSlash->redirectURL()); + $this->assertContains('trailingslashurltoken', $trailingSlash->redirectURL()); + } + + public function testTokenWithUrlMatchedInBackUrl() + { + $request = new HTTPRequest('GET', '/', ['BackURL' => 'back/url']); + $backUrl = new StubToken('back/url', $request); + $this->assertFalse($backUrl->urlMatches()); + $this->assertTrue($backUrl->urlExistsInBackURL()); + $this->assertFalse($backUrl->tokenProvided()); + $this->assertFalse($backUrl->reloadRequired()); + $this->assertTrue($backUrl->reloadRequiredIfError()); + $home = (BASE_URL ?: '/') . '?'; + $this->assertStringStartsWith($home, $backUrl->redirectURL()); + $this->assertContains('backurltoken', $backUrl->redirectURL()); + } + + public function testUrlSuppressionWhenTokenMissing() + { + // Check suppression + $request = new HTTPRequest('GET', 'test/url', []); + $token = new StubToken('test/url', $request); + $this->assertEquals('test/url', $request->getURL(false)); + $token->suppress(); + $this->assertEquals('', $request->getURL(false)); + } + + public function testPrepareTokens() + { + $request = new HTTPRequest('GET', 'test/url', []); + $token = URLConfirmationToken::prepare_tokens( + [ + 'test/url', + 'test', + 'url' + ], + $request + ); + // Test no invalid tokens + $this->assertEquals('test/url', $token->getURLToCheck()); + $this->assertNotEquals('test/url', $request->getURL(false), 'prepare_tokens() did not suppress URL'); + } + + public function testPrepareTokensDoesntSuppressWhenNotMatched() + { + $request = new HTTPRequest('GET', 'test/url', []); + $token = URLConfirmationToken::prepare_tokens( + ['another/url'], + $request + ); + $this->assertEmpty($token); + $this->assertEquals('test/url', $request->getURL(false), 'prepare_tokens() incorrectly suppressed URL'); + } + + public function testPrepareTokensWithUrlMatchedInBackUrl() + { + // Test backurl token + $request = new HTTPRequest('GET', '/', ['BackURL' => 'back/url']); + $token = URLConfirmationToken::prepare_tokens( + [ 'back/url' ], + $request + ); + $this->assertNotEmpty($token); + $this->assertEquals('back/url', $token->getURLToCheck()); + $this->assertNotEquals('back/url', $request->getURL(false), 'prepare_tokens() did not suppress URL'); + } + + public function dataProviderURLs() + { + return [ + [''], + ['/'], + ['bar'], + ['bar/'], + ['/bar'], + ['/bar/'], + ]; + } + + /** + * currentURL needs to handle base or url being missing, or any combination of slashes. + * + * There should always be exactly one slash between each part in the result, and any trailing slash + * should be preserved. + * + * @dataProvider dataProviderURLs + */ + public function testCurrentURLHandlesSlashes($url) + { + $request = new HTTPRequest('GET', $url, []); + + $token = new StubToken( + 'another/url', + $request + ); + $expected = rtrim(Controller::join_links(BASE_URL, '/', $url), '/') ?: '/'; + $this->assertEquals($expected, $token->currentURL(), "Invalid redirect for request url $url"); + } +} diff --git a/tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php b/tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php new file mode 100644 index 000000000..ca08d3e1f --- /dev/null +++ b/tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php @@ -0,0 +1,27 @@ + Date: Mon, 30 Jul 2018 11:50:11 +1200 Subject: [PATCH 047/175] [SS-2018-018] Ignore arguments in mysqli::real_connect backtrace calls --- src/Dev/Backtrace.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Dev/Backtrace.php b/src/Dev/Backtrace.php index daceca751..648cc883f 100644 --- a/src/Dev/Backtrace.php +++ b/src/Dev/Backtrace.php @@ -26,6 +26,7 @@ class Backtrace array('PDO', '__construct'), array('mysqli', 'mysqli'), array('mysqli', 'select_db'), + array('mysqli', 'real_connect'), array('SilverStripe\\ORM\\DB', 'connect'), array('SilverStripe\\Security\\Security', 'check_default_admin'), array('SilverStripe\\Security\\Security', 'encrypt_password'), From 5563537cc8c2383ba5fbe039886b10c4444f6434 Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Fri, 24 Aug 2018 15:36:51 +0100 Subject: [PATCH 048/175] Implement ConfirmationTokenChain to handle multiple tokens at once --- ...oken.php => AbstractConfirmationToken.php} | 12 +- src/Core/Startup/ConfirmationTokenChain.php | 178 +++++++++++++++++ .../Startup/ErrorControlChainMiddleware.php | 62 +++--- src/Core/Startup/ErrorDirector.php | 13 +- .../Startup/ParameterConfirmationToken.php | 28 +-- src/Core/Startup/URLConfirmationToken.php | 29 +-- .../Startup/ConfirmationTokenChainTest.php | 185 ++++++++++++++++++ .../ErrorControlChainMiddlewareTest.php | 52 +++++ 8 files changed, 500 insertions(+), 59 deletions(-) rename src/Core/Startup/{ConfirmationToken.php => AbstractConfirmationToken.php} (95%) create mode 100644 src/Core/Startup/ConfirmationTokenChain.php create mode 100644 tests/php/Core/Startup/ConfirmationTokenChainTest.php diff --git a/src/Core/Startup/ConfirmationToken.php b/src/Core/Startup/AbstractConfirmationToken.php similarity index 95% rename from src/Core/Startup/ConfirmationToken.php rename to src/Core/Startup/AbstractConfirmationToken.php index d23563f46..11f78b48a 100644 --- a/src/Core/Startup/ConfirmationToken.php +++ b/src/Core/Startup/AbstractConfirmationToken.php @@ -15,7 +15,7 @@ use SilverStripe\Security\RandomGenerator; * * @internal This class is designed specifically for use pre-startup and may change without warning */ -abstract class ConfirmationToken +abstract class AbstractConfirmationToken { /** * @var HTTPRequest @@ -173,6 +173,16 @@ HTML; */ abstract public function params($includeToken = true); + /** + * @return string + */ + abstract public function getRedirectUrlBase(); + + /** + * @return array + */ + abstract public function getRedirectUrlParams(); + /** * Get redirection URL * diff --git a/src/Core/Startup/ConfirmationTokenChain.php b/src/Core/Startup/ConfirmationTokenChain.php new file mode 100644 index 000000000..a47f2c4c0 --- /dev/null +++ b/src/Core/Startup/ConfirmationTokenChain.php @@ -0,0 +1,178 @@ +tokens[] = $token; + } + + /** + * Collect all tokens that require a redirect + * + * @return \Generator + */ + protected function filteredTokens() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequired() || $token->reloadRequiredIfError()) { + yield $token; + } + } + } + + /** + * @return bool + */ + public function suppressionRequired() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequired()) { + return true; + } + } + + return false; + } + + /** + * Suppress URLs & GET vars from tokens that require a redirect + */ + public function suppressTokens() + { + foreach ($this->filteredTokens() as $token) { + $token->suppress(); + } + } + + /** + * @return bool + */ + public function reloadRequired() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequired()) { + return true; + } + } + + return false; + } + + /** + * @return bool + */ + public function reloadRequiredIfError() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequiredIfError()) { + return true; + } + } + + return false; + } + + /** + * @param bool $includeToken + * @return array + */ + public function params($includeToken = true) + { + $params = []; + foreach ($this->tokens as $token) { + $params = array_merge($params, $token->params($includeToken)); + } + + return $params; + } + + /** + * Fetch the URL we want to redirect to, excluding query string parameters. This may + * be the same URL (with a token to be added outside this method), or to a different + * URL if the current one has been suppressed + * + * @return string + */ + public function getRedirectUrlBase() + { + // URLConfirmationTokens may alter the URL to suppress the URL they're protecting, + // so we need to ensure they're inspected last and therefore take priority + $tokens = iterator_to_array($this->filteredTokens(), false); + usort($tokens, function ($a, $b) { + return ($a instanceof URLConfirmationToken) ? 1 : 0; + }); + + $urlBase = Director::baseURL(); + foreach ($tokens as $token) { + $urlBase = $token->getRedirectUrlBase(); + } + + return $urlBase; + } + + /** + * Collate GET vars from all token providers that need to apply a token + * + * @return array + */ + public function getRedirectUrlParams() + { + $params = []; + foreach ($this->filteredTokens() as $token) { + $params = array_merge($params, $token->getRedirectUrlParams()); + } + + return $params; + } + + /** + * @return string + */ + protected function redirectURL() + { + $params = http_build_query($this->getRedirectUrlParams()); + return Controller::join_links($this->getRedirectUrlBase(), '?' . $params); + } + + /** + * @return HTTPResponse + */ + public function reloadWithTokens() + { + $location = $this->redirectURL(); + $locationJS = Convert::raw2js($location); + $locationATT = Convert::raw2att($location); + $body = <<location.href='$locationJS'; + +You are being redirected. If you are not redirected soon, click here to continue +HTML; + + // Build response + $result = new HTTPResponse($body); + $result->redirect($location); + return $result; + } +} diff --git a/src/Core/Startup/ErrorControlChainMiddleware.php b/src/Core/Startup/ErrorControlChainMiddleware.php index e81444629..c29878e15 100644 --- a/src/Core/Startup/ErrorControlChainMiddleware.php +++ b/src/Core/Startup/ErrorControlChainMiddleware.php @@ -34,20 +34,18 @@ class ErrorControlChainMiddleware implements HTTPMiddleware /** * @param HTTPRequest $request - * @return ConfirmationToken|null + * @return ConfirmationTokenChain */ - protected function prepareConfirmationTokenIfRequired(HTTPRequest $request) + protected function prepareConfirmationTokenChain(HTTPRequest $request) { - $token = URLConfirmationToken::prepare_tokens(['dev/build'], $request); + $chain = new ConfirmationTokenChain(); + $chain->pushToken(new URLConfirmationToken('dev/build', $request)); - if (!$token) { - $token = ParameterConfirmationToken::prepare_tokens( - ['isTest', 'isDev', 'flush'], - $request - ); + foreach (['isTest', 'isDev', 'flush'] as $parameter) { + $chain->pushToken(new ParameterConfirmationToken($parameter, $request)); } - return $token; + return $chain; } public function process(HTTPRequest $request, callable $next) @@ -55,19 +53,21 @@ class ErrorControlChainMiddleware implements HTTPMiddleware $result = null; // Prepare tokens and execute chain - $confirmationToken = $this->prepareConfirmationTokenIfRequired($request); - $chain = new ErrorControlChain(); - $chain - ->then(function () use ($request, $chain, $confirmationToken, $next, &$result) { - // If no redirection is necessary then we can disable error supression - if (!$confirmationToken) { - $chain->setSuppression(false); + $confirmationTokenChain = $this->prepareConfirmationTokenChain($request); + $errorControlChain = new ErrorControlChain(); + $errorControlChain + ->then(function () use ($request, $errorControlChain, $confirmationTokenChain, $next, &$result) { + if ($confirmationTokenChain->suppressionRequired()) { + $confirmationTokenChain->suppressTokens(); + } else { + // If no redirection is necessary then we can disable error supression + $errorControlChain->setSuppression(false); } try { // Check if a token is requesting a redirect - if ($confirmationToken && $confirmationToken->reloadRequired()) { - $result = $this->safeReloadWithToken($request, $confirmationToken); + if ($confirmationTokenChain && $confirmationTokenChain->reloadRequired()) { + $result = $this->safeReloadWithTokens($request, $confirmationTokenChain); } else { // If no reload necessary, process application $result = call_user_func($next, $request); @@ -77,10 +77,16 @@ class ErrorControlChainMiddleware implements HTTPMiddleware } }) // Finally if a token was requested but there was an error while figuring out if it's allowed, do it anyway - ->thenIfErrored(function () use ($confirmationToken) { - if ($confirmationToken && $confirmationToken->reloadRequiredIfError()) { - $result = $confirmationToken->reloadWithToken(); - $result->output(); + ->thenIfErrored(function () use ($confirmationTokenChain) { + if ($confirmationTokenChain && $confirmationTokenChain->reloadRequiredIfError()) { + try { + // Reload requires manual boot + $this->getApplication()->getKernel()->boot(false); + } finally { + // Given we're in an error state here, try to continue even if the kernel boot fails + $result = $confirmationTokenChain->reloadWithTokens(); + $result->output(); + } } }) ->execute(); @@ -92,10 +98,10 @@ class ErrorControlChainMiddleware implements HTTPMiddleware * or authentication is impossible. * * @param HTTPRequest $request - * @param ParameterConfirmationToken $reloadToken + * @param ConfirmationTokenChain $confirmationTokenChain * @return HTTPResponse */ - protected function safeReloadWithToken(HTTPRequest $request, $reloadToken) + protected function safeReloadWithTokens(HTTPRequest $request, ConfirmationTokenChain $confirmationTokenChain) { // Safe reload requires manual boot $this->getApplication()->getKernel()->boot(false); @@ -104,9 +110,9 @@ class ErrorControlChainMiddleware implements HTTPMiddleware $request->getSession()->init($request); // Request with ErrorDirector - $result = ErrorDirector::singleton()->handleRequestWithToken( + $result = ErrorDirector::singleton()->handleRequestWithTokenChain( $request, - $reloadToken, + $confirmationTokenChain, $this->getApplication()->getKernel() ); if ($result) { @@ -114,8 +120,8 @@ class ErrorControlChainMiddleware implements HTTPMiddleware } // Fail and redirect the user to the login page - $params = array_merge($request->getVars(), $reloadToken->params(false)); - $backURL = $reloadToken->currentURL() . '?' . http_build_query($params); + $params = array_merge($request->getVars(), $confirmationTokenChain->params(false)); + $backURL = $confirmationTokenChain->getRedirectUrlBase() . '?' . http_build_query($params); $loginPage = Director::absoluteURL(Security::config()->get('login_url')); $loginPage .= "?BackURL=" . urlencode($backURL); $result = new HTTPResponse(); diff --git a/src/Core/Startup/ErrorDirector.php b/src/Core/Startup/ErrorDirector.php index 54001fd05..575df7183 100644 --- a/src/Core/Startup/ErrorDirector.php +++ b/src/Core/Startup/ErrorDirector.php @@ -21,18 +21,21 @@ class ErrorDirector extends Director * Redirect with token if allowed, or null if not allowed * * @param HTTPRequest $request - * @param ConfirmationToken $token + * @param ConfirmationTokenChain $confirmationTokenChain * @param Kernel $kernel * @return null|HTTPResponse Redirection response, or null if not able to redirect */ - public function handleRequestWithToken(HTTPRequest $request, ConfirmationToken $token, Kernel $kernel) - { + public function handleRequestWithTokenChain( + HTTPRequest $request, + ConfirmationTokenChain $confirmationTokenChain, + Kernel $kernel + ) { Injector::inst()->registerService($request, HTTPRequest::class); // Next, check if we're in dev mode, or the database doesn't have any security data, or we are admin - $reload = function (HTTPRequest $request) use ($token, $kernel) { + $reload = function (HTTPRequest $request) use ($confirmationTokenChain, $kernel) { if ($kernel->getEnvironment() === Kernel::DEV || !Security::database_is_ready() || Permission::check('ADMIN')) { - return $token->reloadWithToken(); + return $confirmationTokenChain->reloadWithTokens(); } return null; }; diff --git a/src/Core/Startup/ParameterConfirmationToken.php b/src/Core/Startup/ParameterConfirmationToken.php index 4e90f1ef7..bc751a2c3 100644 --- a/src/Core/Startup/ParameterConfirmationToken.php +++ b/src/Core/Startup/ParameterConfirmationToken.php @@ -3,6 +3,7 @@ namespace SilverStripe\Core\Startup; use SilverStripe\Control\Controller; +use SilverStripe\Control\Director; use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPResponse; use SilverStripe\Core\Convert; @@ -15,7 +16,7 @@ use SilverStripe\Security\RandomGenerator; * * @internal This class is designed specifically for use pre-startup and may change without warning */ -class ParameterConfirmationToken extends ConfirmationToken +class ParameterConfirmationToken extends AbstractConfirmationToken { /** * The name of the parameter @@ -140,19 +141,22 @@ class ParameterConfirmationToken extends ConfirmationToken } return $params; } + + public function getRedirectUrlBase() + { + return ($this->existsInReferer() && !$this->parameterProvided()) ? Director::baseURL() : $this->currentURL(); + } + + public function getRedirectUrlParams() + { + return ($this->existsInReferer() && !$this->parameterProvided()) + ? $this->params() + : array_merge($this->request->getVars(), $this->params()); + } protected function redirectURL() { - // If url is encoded via BackURL, defer to home page (prevent redirect to form action) - if ($this->existsInReferer() && !$this->parameterProvided()) { - $url = BASE_URL ?: '/'; - $params = $this->params(); - } else { - $url = $this->currentURL(); - $params = array_merge($this->request->getVars(), $this->params()); - } - - // Merge get params with current url - return Controller::join_links($url, '?' . http_build_query($params)); + $query = http_build_query($this->getRedirectUrlParams()); + return Controller::join_links($this->getRedirectUrlBase(), '?' . $query); } } diff --git a/src/Core/Startup/URLConfirmationToken.php b/src/Core/Startup/URLConfirmationToken.php index 8176a41b8..bb509931e 100644 --- a/src/Core/Startup/URLConfirmationToken.php +++ b/src/Core/Startup/URLConfirmationToken.php @@ -12,7 +12,7 @@ use SilverStripe\Control\HTTPRequest; * * @internal This class is designed specifically for use pre-startup and may change without warning */ -class URLConfirmationToken extends ConfirmationToken +class URLConfirmationToken extends AbstractConfirmationToken { /** * @var string @@ -60,7 +60,7 @@ class URLConfirmationToken extends ConfirmationToken */ protected function getURLExistsInBackURL(HTTPRequest $request) { - $backURL = $request->getVar('BackURL'); + $backURL = ltrim($request->getVar('BackURL'), '/'); return (strpos($backURL, $this->urlToCheck) === 0); } @@ -119,18 +119,21 @@ class URLConfirmationToken extends ConfirmationToken return Controller::join_links(Director::baseURL(), $this->currentURL); } + public function getRedirectUrlBase() + { + return ($this->urlExistsInBackURL && !$this->urlMatches()) ? Director::baseURL() : $this->currentURL(); + } + + public function getRedirectUrlParams() + { + return ($this->urlExistsInBackURL && !$this->urlMatches()) + ? $this->params() + : array_merge($this->request->getVars(), $this->params()); + } + protected function redirectURL() { - // If url is encoded via BackURL, defer to home page (prevent redirect to form action) - if ($this->urlExistsInBackURL && !$this->urlMatches()) { - $url = BASE_URL ?: '/'; - $params = $this->params(); - } else { - $url = $this->currentURL(); - $params = array_merge($this->request->getVars(), $this->params()); - } - - // Merge get params with current url - return Controller::join_links($url, '?' . http_build_query($params)); + $query = http_build_query($this->getRedirectUrlParams()); + return Controller::join_links($this->getRedirectUrlBase(), '?' . $query); } } diff --git a/tests/php/Core/Startup/ConfirmationTokenChainTest.php b/tests/php/Core/Startup/ConfirmationTokenChainTest.php new file mode 100644 index 000000000..adb8fba36 --- /dev/null +++ b/tests/php/Core/Startup/ConfirmationTokenChainTest.php @@ -0,0 +1,185 @@ +createPartialMock(ParameterConfirmationToken::class, $methods); + $mock->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue($requiresReload)); + return $mock; + } + + protected function getTokenRequiringReloadIfError($requiresReload = true, $extraMethods = []) + { + $methods = array_merge(['reloadRequired', 'reloadRequiredIfError'], $extraMethods); + $mock = $this->createPartialMock(ParameterConfirmationToken::class, $methods); + $mock->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue(false)); + $mock->expects($this->any()) + ->method('reloadRequiredIfError') + ->will($this->returnValue($requiresReload)); + return $mock; + } + + public function testFilteredTokens() + { + $chain = new ConfirmationTokenChain(); + $chain->pushToken($tokenRequiringReload = $this->getTokenRequiringReload()); + $chain->pushToken($tokenNotRequiringReload = $this->getTokenRequiringReload(false)); + $chain->pushToken($tokenRequiringReloadIfError = $this->getTokenRequiringReloadIfError()); + $chain->pushToken($tokenNotRequiringReloadIfError = $this->getTokenRequiringReloadIfError(false)); + + $reflectionMethod = new \ReflectionMethod(ConfirmationTokenChain::class, 'filteredTokens'); + $reflectionMethod->setAccessible(true); + $tokens = iterator_to_array($reflectionMethod->invoke($chain)); + + $this->assertContains($tokenRequiringReload, $tokens, 'Token requiring a reload was not returned'); + $this->assertNotContains($tokenNotRequiringReload, $tokens, 'Token not requiring a reload was returned'); + $this->assertContains($tokenRequiringReloadIfError, $tokens, 'Token requiring a reload on error was not returned'); + $this->assertNotContains($tokenNotRequiringReloadIfError, $tokens, 'Token not requiring a reload on error was returned'); + } + + public function testSuppressionRequired() + { + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReload(false)); + $this->assertFalse($chain->suppressionRequired(), 'Suppression incorrectly marked as required'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReloadIfError(false)); + $this->assertFalse($chain->suppressionRequired(), 'Suppression incorrectly marked as required'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReload()); + $this->assertTrue($chain->suppressionRequired(), 'Suppression not marked as required'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReloadIfError()); + $this->assertFalse($chain->suppressionRequired(), 'Suppression incorrectly marked as required'); + } + + public function testSuppressTokens() + { + $mockToken = $this->getTokenRequiringReload(true, ['suppress']); + $mockToken->expects($this->once()) + ->method('suppress'); + $secondMockToken = $this->getTokenRequiringReloadIfError(true, ['suppress']); + $secondMockToken->expects($this->once()) + ->method('suppress'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $chain->suppressTokens(); + } + + public function testReloadRequired() + { + $mockToken = $this->getTokenRequiringReload(true); + $secondMockToken = $this->getTokenRequiringReload(false); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertTrue($chain->reloadRequired()); + } + + public function testReloadRequiredIfError() + { + $mockToken = $this->getTokenRequiringReloadIfError(true); + $secondMockToken = $this->getTokenRequiringReloadIfError(false); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertTrue($chain->reloadRequiredIfError()); + } + + public function testParams() + { + $mockToken = $this->getTokenRequiringReload(true, ['params']); + $mockToken->expects($this->once()) + ->method('params') + ->with($this->isTrue()) + ->will($this->returnValue(['mockTokenParam' => '1'])); + $secondMockToken = $this->getTokenRequiringReload(true, ['params']); + $secondMockToken->expects($this->once()) + ->method('params') + ->with($this->isTrue()) + ->will($this->returnValue(['secondMockTokenParam' => '2'])); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertEquals(['mockTokenParam' => '1', 'secondMockTokenParam' => '2'], $chain->params(true)); + + $mockToken = $this->getTokenRequiringReload(true, ['params']); + $mockToken->expects($this->once()) + ->method('params') + ->with($this->isFalse()) + ->will($this->returnValue(['mockTokenParam' => '1'])); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $this->assertEquals(['mockTokenParam' => '1'], $chain->params(false)); + } + + public function testGetRedirectUrlBase() + { + $mockUrlToken = $this->createPartialMock(URLConfirmationToken::class, ['reloadRequired', 'getRedirectUrlBase']); + $mockUrlToken->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue(true)); + $mockUrlToken->expects($this->any()) + ->method('getRedirectUrlBase') + ->will($this->returnValue('url-base')); + + $mockParameterToken = $this->createPartialMock(ParameterConfirmationToken::class, ['reloadRequired', 'getRedirectUrlBase']); + $mockParameterToken->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue(true)); + $mockParameterToken->expects($this->any()) + ->method('getRedirectUrlBase') + ->will($this->returnValue('parameter-base')); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockParameterToken); + $chain->pushToken($mockUrlToken); + $this->assertEquals('url-base', $chain->getRedirectUrlBase(), 'URLConfirmationToken url base should take priority'); + + // Push them in reverse order to check priority still correct + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockUrlToken); + $chain->pushToken($mockParameterToken); + $this->assertEquals('url-base', $chain->getRedirectUrlBase(), 'URLConfirmationToken url base should take priority'); + } + + public function testGetRedirectUrlParams() + { + $mockToken = $this->getTokenRequiringReload(true, ['getRedirectUrlParams']); + $mockToken->expects($this->once()) + ->method('getRedirectUrlParams') + ->will($this->returnValue(['mockTokenParam' => '1'])); + + $secondMockToken = $this->getTokenRequiringReload(true, ['getRedirectUrlParams']); + $secondMockToken->expects($this->once()) + ->method('getRedirectUrlParams') + ->will($this->returnValue(['secondMockTokenParam' => '2'])); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertEquals(['mockTokenParam' => '1', 'secondMockTokenParam' => '2'], $chain->getRedirectUrlParams()); + } +} diff --git a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php index 7df6f6ebf..a90799026 100644 --- a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php +++ b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php @@ -121,4 +121,56 @@ class ErrorControlChainMiddlewareTest extends SapphireTest $this->assertNotContains('?devbuildtoken=', $location); $this->assertContains('Security/login', $location); } + + public function testLiveBuildAndFlushAdmin() + { + // Mock admin + $adminID = $this->logInWithPermission('ADMIN'); + $this->logOut(); + + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as admin + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build/', ['flush' => '1']); + $request->setSession(new Session(['loggedInAs' => $adminID])); + $result = $chain->process($request, function () { + return null; + }); + + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertContains('/dev/build', $location); + $this->assertContains('flush=1', $location); + $this->assertContains('devbuildtoken=', $location); + $this->assertContains('flushtoken=', $location); + $this->assertNotContains('Security/login', $location); + } + + public function testLiveBuildAndFlushUnauthenticated() + { + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as no one + Security::setCurrentUser(null); + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build', ['flush' => '1']); + $request->setSession(new Session(['loggedInAs' => 0])); + $result = $chain->process($request, function () { + return null; + }); + + // Should be directed to login, not to flush + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertNotContains('/dev/build', $location); + $this->assertNotContains('flush=1', $location); + $this->assertNotContains('devbuildtoken=', $location); + $this->assertNotContains('flushtoken=', $location); + $this->assertContains('Security/login', $location); + } } From af000bea9b16ea553cae7f7f662f74ab8dc343df Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Tue, 21 Aug 2018 11:20:15 +0100 Subject: [PATCH 049/175] [SS-2018-019] Add confirmation token to dev/build --- src/Control/HTTPApplication.php | 2 +- src/Core/Startup/ConfirmationToken.php | 182 ++++++++++++++++++ src/Core/Startup/ErrorControlChain.php | 3 +- .../Startup/ErrorControlChainMiddleware.php | 43 +++-- src/Core/Startup/ErrorDirector.php | 4 +- .../Startup/ParameterConfirmationToken.php | 172 +---------------- src/Core/Startup/URLConfirmationToken.php | 136 +++++++++++++ .../ErrorControlChainMiddlewareTest.php | 48 +++++ .../ParameterConfirmationTokenTest.php | 4 +- .../Core/Startup/URLConfirmationTokenTest.php | 148 ++++++++++++++ .../URLConfirmationTokenTest/StubToken.php | 27 +++ .../StubValidToken.php | 15 ++ 12 files changed, 600 insertions(+), 184 deletions(-) create mode 100644 src/Core/Startup/ConfirmationToken.php create mode 100644 src/Core/Startup/URLConfirmationToken.php create mode 100644 tests/php/Core/Startup/URLConfirmationTokenTest.php create mode 100644 tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php create mode 100644 tests/php/Core/Startup/URLConfirmationTokenTest/StubValidToken.php diff --git a/src/Control/HTTPApplication.php b/src/Control/HTTPApplication.php index 4d0f7cb9d..35f453d6d 100644 --- a/src/Control/HTTPApplication.php +++ b/src/Control/HTTPApplication.php @@ -41,7 +41,7 @@ class HTTPApplication implements Application */ public function handle(HTTPRequest $request) { - $flush = array_key_exists('flush', $request->getVars()) || strpos($request->getURL(), 'dev/build') === 0; + $flush = array_key_exists('flush', $request->getVars()) || ($request->getURL() === 'dev/build'); // Ensure boot is invoked return $this->execute($request, function (HTTPRequest $request) { diff --git a/src/Core/Startup/ConfirmationToken.php b/src/Core/Startup/ConfirmationToken.php new file mode 100644 index 000000000..d23563f46 --- /dev/null +++ b/src/Core/Startup/ConfirmationToken.php @@ -0,0 +1,182 @@ +reloadRequired() || $token->reloadRequiredIfError()) { + $token->suppress(); + $target = $token; + } + } + return $target; + } + + /** + * Generate a local filesystem path to store a token + * + * @param $token + * @return string + */ + protected function pathForToken($token) + { + return TEMP_PATH . DIRECTORY_SEPARATOR . 'token_' . preg_replace('/[^a-z0-9]+/', '', $token); + } + + /** + * Generate a new random token and store it + * + * @return string Token name + */ + protected function genToken() + { + // Generate a new random token (as random as possible) + $rg = new RandomGenerator(); + $token = $rg->randomToken('md5'); + + // Store a file in the session save path (safer than /tmp, as open_basedir might limit that) + file_put_contents($this->pathForToken($token), $token); + + return $token; + } + + /** + * Is the necessary token provided for this parameter? + * A value must be provided for the token + * + * @return bool + */ + public function tokenProvided() + { + return !empty($this->token); + } + + /** + * Validate a token + * + * @param string $token + * @return boolean True if the token is valid + */ + protected function checkToken($token) + { + if (!$token) { + return false; + } + + $file = $this->pathForToken($token); + $content = null; + + if (file_exists($file)) { + $content = file_get_contents($file); + unlink($file); + } + + return $content === $token; + } + + /** + * Get redirect url, excluding querystring + * + * @return string + */ + public function currentURL() + { + return Controller::join_links(Director::baseURL(), $this->request->getURL(false)); + } + + /** + * Forces a reload of the request with the token included + * + * @return HTTPResponse + */ + public function reloadWithToken() + { + $location = $this->redirectURL(); + $locationJS = Convert::raw2js($location); + $locationATT = Convert::raw2att($location); + $body = <<location.href='$locationJS'; + +You are being redirected. If you are not redirected soon, click here to continue +HTML; + + // Build response + $result = new HTTPResponse($body); + $result->redirect($location); + return $result; + } + + /** + * Is this parameter requested without a valid token? + * + * @return bool True if the parameter is given without a valid token + */ + abstract public function reloadRequired(); + + /** + * Check if this token is provided either in the backurl, or directly, + * but without a token + * + * @return bool + */ + abstract public function reloadRequiredIfError(); + + /** + * Suppress the current parameter for the duration of this request + */ + abstract public function suppress(); + + /** + * Determine the querystring parameters to include + * + * @param bool $includeToken Include the token value? + * @return array List of querystring parameters, possibly including token parameter + */ + abstract public function params($includeToken = true); + + /** + * Get redirection URL + * + * @return string + */ + abstract protected function redirectURL(); +} diff --git a/src/Core/Startup/ErrorControlChain.php b/src/Core/Startup/ErrorControlChain.php index f34a2c802..e2d14db65 100644 --- a/src/Core/Startup/ErrorControlChain.php +++ b/src/Core/Startup/ErrorControlChain.php @@ -15,8 +15,7 @@ use Exception; * $chain = new ErrorControlChain(); * $chain->then($callback1)->then($callback2)->thenIfErrored($callback3)->execute(); * - * WARNING: This class is experimental and designed specifically for use pre-startup. - * It will likely be heavily refactored before the release of 3.2 + * @internal This class is designed specifically for use pre-startup and may change without warning */ class ErrorControlChain { diff --git a/src/Core/Startup/ErrorControlChainMiddleware.php b/src/Core/Startup/ErrorControlChainMiddleware.php index bdb5ff0a3..e81444629 100644 --- a/src/Core/Startup/ErrorControlChainMiddleware.php +++ b/src/Core/Startup/ErrorControlChainMiddleware.php @@ -12,6 +12,8 @@ use SilverStripe\Security\Security; /** * Decorates application bootstrapping with errorcontrolchain + * + * @internal This class is designed specifically for use pre-startup and may change without warning */ class ErrorControlChainMiddleware implements HTTPMiddleware { @@ -30,27 +32,42 @@ class ErrorControlChainMiddleware implements HTTPMiddleware $this->application = $application; } + /** + * @param HTTPRequest $request + * @return ConfirmationToken|null + */ + protected function prepareConfirmationTokenIfRequired(HTTPRequest $request) + { + $token = URLConfirmationToken::prepare_tokens(['dev/build'], $request); + + if (!$token) { + $token = ParameterConfirmationToken::prepare_tokens( + ['isTest', 'isDev', 'flush'], + $request + ); + } + + return $token; + } + public function process(HTTPRequest $request, callable $next) { $result = null; // Prepare tokens and execute chain - $reloadToken = ParameterConfirmationToken::prepare_tokens( - ['isTest', 'isDev', 'flush'], - $request - ); + $confirmationToken = $this->prepareConfirmationTokenIfRequired($request); $chain = new ErrorControlChain(); $chain - ->then(function () use ($request, $chain, $reloadToken, $next, &$result) { + ->then(function () use ($request, $chain, $confirmationToken, $next, &$result) { // If no redirection is necessary then we can disable error supression - if (!$reloadToken) { + if (!$confirmationToken) { $chain->setSuppression(false); } try { // Check if a token is requesting a redirect - if ($reloadToken && $reloadToken->reloadRequired()) { - $result = $this->safeReloadWithToken($request, $reloadToken); + if ($confirmationToken && $confirmationToken->reloadRequired()) { + $result = $this->safeReloadWithToken($request, $confirmationToken); } else { // If no reload necessary, process application $result = call_user_func($next, $request); @@ -60,9 +77,9 @@ class ErrorControlChainMiddleware implements HTTPMiddleware } }) // Finally if a token was requested but there was an error while figuring out if it's allowed, do it anyway - ->thenIfErrored(function () use ($reloadToken) { - if ($reloadToken && $reloadToken->reloadRequiredIfError()) { - $result = $reloadToken->reloadWithToken(); + ->thenIfErrored(function () use ($confirmationToken) { + if ($confirmationToken && $confirmationToken->reloadRequiredIfError()) { + $result = $confirmationToken->reloadWithToken(); $result->output(); } }) @@ -85,7 +102,7 @@ class ErrorControlChainMiddleware implements HTTPMiddleware // Ensure session is started $request->getSession()->init($request); - + // Request with ErrorDirector $result = ErrorDirector::singleton()->handleRequestWithToken( $request, @@ -98,7 +115,7 @@ class ErrorControlChainMiddleware implements HTTPMiddleware // Fail and redirect the user to the login page $params = array_merge($request->getVars(), $reloadToken->params(false)); - $backURL = $request->getURL() . '?' . http_build_query($params); + $backURL = $reloadToken->currentURL() . '?' . http_build_query($params); $loginPage = Director::absoluteURL(Security::config()->get('login_url')); $loginPage .= "?BackURL=" . urlencode($backURL); $result = new HTTPResponse(); diff --git a/src/Core/Startup/ErrorDirector.php b/src/Core/Startup/ErrorDirector.php index 3c994c6af..54001fd05 100644 --- a/src/Core/Startup/ErrorDirector.php +++ b/src/Core/Startup/ErrorDirector.php @@ -21,11 +21,11 @@ class ErrorDirector extends Director * Redirect with token if allowed, or null if not allowed * * @param HTTPRequest $request - * @param ParameterConfirmationToken $token + * @param ConfirmationToken $token * @param Kernel $kernel * @return null|HTTPResponse Redirection response, or null if not able to redirect */ - public function handleRequestWithToken(HTTPRequest $request, ParameterConfirmationToken $token, Kernel $kernel) + public function handleRequestWithToken(HTTPRequest $request, ConfirmationToken $token, Kernel $kernel) { Injector::inst()->registerService($request, HTTPRequest::class); diff --git a/src/Core/Startup/ParameterConfirmationToken.php b/src/Core/Startup/ParameterConfirmationToken.php index 1c80db1d0..4e90f1ef7 100644 --- a/src/Core/Startup/ParameterConfirmationToken.php +++ b/src/Core/Startup/ParameterConfirmationToken.php @@ -9,30 +9,21 @@ use SilverStripe\Core\Convert; use SilverStripe\Security\RandomGenerator; /** - * Class ParameterConfirmationToken + * This is used to protect dangerous GET parameters that need to be detected early in the request + * lifecycle by generating a one-time-use token & redirecting with that token included in the + * redirected URL * - * When you need to use a dangerous GET parameter that needs to be set before core/Core.php is - * established, this class takes care of allowing some other code of confirming the parameter, - * by generating a one-time-use token & redirecting with that token included in the redirected URL - * - * WARNING: This class is experimental and designed specifically for use pre-startup. - * It will likely be heavily refactored before the release of 3.2 + * @internal This class is designed specifically for use pre-startup and may change without warning */ -class ParameterConfirmationToken +class ParameterConfirmationToken extends ConfirmationToken { - /** * The name of the parameter * * @var string */ protected $parameterName = null; - - /** - * @var HTTPRequest - */ - protected $request = null; - + /** * The parameter given in the main request * @@ -48,60 +39,6 @@ class ParameterConfirmationToken protected $parameterBackURL = null; /** - * The validated and checked token for this parameter - * - * @var string|null A string value, or null if either not provided or invalid - */ - protected $token = null; - - protected function pathForToken($token) - { - return TEMP_PATH . DIRECTORY_SEPARATOR . 'token_' . preg_replace('/[^a-z0-9]+/', '', $token); - } - - /** - * Generate a new random token and store it - * - * @return string Token name - */ - protected function genToken() - { - // Generate a new random token (as random as possible) - $rg = new RandomGenerator(); - $token = $rg->randomToken('md5'); - - // Store a file in the session save path (safer than /tmp, as open_basedir might limit that) - file_put_contents($this->pathForToken($token), $token); - - return $token; - } - - /** - * Validate a token - * - * @param string $token - * @return boolean True if the token is valid - */ - protected function checkToken($token) - { - if (!$token) { - return false; - } - - $file = $this->pathForToken($token); - $content = null; - - if (file_exists($file)) { - $content = file_get_contents($file); - unlink($file); - } - - return $content == $token; - } - - /** - * Create a new ParameterConfirmationToken - * * @param string $parameterName Name of the querystring parameter to check * @param HTTPRequest $request */ @@ -176,54 +113,23 @@ class ParameterConfirmationToken return $this->parameterBackURL !== null; } - /** - * Is the necessary token provided for this parameter? - * A value must be provided for the token - * - * @return bool - */ - public function tokenProvided() - { - return !empty($this->token); - } - - /** - * Is this parameter requested without a valid token? - * - * @return bool True if the parameter is given without a valid token - */ public function reloadRequired() { return $this->parameterProvided() && !$this->tokenProvided(); } - /** - * Check if this token is provided either in the backurl, or directly, - * but without a token - * - * @return bool - */ public function reloadRequiredIfError() { // Don't reload if token exists return $this->reloadRequired() || $this->existsInReferer(); } - - /** - * Suppress the current parameter by unsetting it from $_GET - */ + public function suppress() { unset($_GET[$this->parameterName]); $this->request->offsetUnset($this->parameterName); } - /** - * Determine the querystring parameters to include - * - * @param bool $includeToken Include the token value as well? - * @return array List of querystring parameters with name and token parameters - */ public function params($includeToken = true) { $params = array( @@ -234,25 +140,7 @@ class ParameterConfirmationToken } return $params; } - - /** - * Get redirect url, excluding querystring - * - * @return string - */ - protected function currentURL() - { - return Controller::join_links( - BASE_URL ?: '/', - $this->request->getURL(false) - ); - } - - /** - * Get redirection URL - * - * @return string - */ + protected function redirectURL() { // If url is encoded via BackURL, defer to home page (prevent redirect to form action) @@ -267,48 +155,4 @@ class ParameterConfirmationToken // Merge get params with current url return Controller::join_links($url, '?' . http_build_query($params)); } - - /** - * Forces a reload of the request with the token included - * - * @return HTTPResponse - */ - public function reloadWithToken() - { - $location = $this->redirectURL(); - $locationJS = Convert::raw2js($location); - $locationATT = Convert::raw2att($location); - $body = <<location.href='$locationJS'; - -You are being redirected. If you are not redirected soon, click here to continue the flush -HTML; - - // Build response - $result = new HTTPResponse($body); - $result->redirect($location); - return $result; - } - - /** - * Given a list of token names, suppress all tokens that have not been validated, and - * return the non-validated token with the highest priority - * - * @param array $keys List of token keys in ascending priority (low to high) - * @param HTTPRequest $request - * @return ParameterConfirmationToken The token container for the unvalidated $key given with the highest priority - */ - public static function prepare_tokens($keys, HTTPRequest $request) - { - $target = null; - foreach ($keys as $key) { - $token = new ParameterConfirmationToken($key, $request); - // Validate this token - if ($token->reloadRequired() || $token->reloadRequiredIfError()) { - $token->suppress(); - $target = $token; - } - } - return $target; - } } diff --git a/src/Core/Startup/URLConfirmationToken.php b/src/Core/Startup/URLConfirmationToken.php new file mode 100644 index 000000000..8176a41b8 --- /dev/null +++ b/src/Core/Startup/URLConfirmationToken.php @@ -0,0 +1,136 @@ +urlToCheck = $urlToCheck; + $this->request = $request; + $this->currentURL = $request->getURL(false); + + $this->tokenParameterName = preg_replace('/[^a-z0-9]/i', '', $urlToCheck) . 'token'; + $this->urlExistsInBackURL = $this->getURLExistsInBackURL($request); + + // If the token provided is valid, mark it as such + $token = $request->getVar($this->tokenParameterName); + if ($this->checkToken($token)) { + $this->token = $token; + } + } + + /** + * @param HTTPRequest $request + * @return bool + */ + protected function getURLExistsInBackURL(HTTPRequest $request) + { + $backURL = $request->getVar('BackURL'); + return (strpos($backURL, $this->urlToCheck) === 0); + } + + /** + * @return bool + */ + protected function urlMatches() + { + return ($this->currentURL === $this->urlToCheck); + } + + /** + * @return string + */ + public function getURLToCheck() + { + return $this->urlToCheck; + } + + /** + * @return bool + */ + public function urlExistsInBackURL() + { + return $this->urlExistsInBackURL; + } + + public function reloadRequired() + { + return $this->urlMatches() && !$this->tokenProvided(); + } + + public function reloadRequiredIfError() + { + return $this->reloadRequired() || $this->urlExistsInBackURL(); + } + + public function suppress() + { + $_SERVER['REQUEST_URI'] = '/'; + $this->request->setURL('/'); + } + + public function params($includeToken = true) + { + $params = []; + if ($includeToken) { + $params[$this->tokenParameterName] = $this->genToken(); + } + + return $params; + } + + public function currentURL() + { + return Controller::join_links(Director::baseURL(), $this->currentURL); + } + + protected function redirectURL() + { + // If url is encoded via BackURL, defer to home page (prevent redirect to form action) + if ($this->urlExistsInBackURL && !$this->urlMatches()) { + $url = BASE_URL ?: '/'; + $params = $this->params(); + } else { + $url = $this->currentURL(); + $params = array_merge($this->request->getVars(), $this->params()); + } + + // Merge get params with current url + return Controller::join_links($url, '?' . http_build_query($params)); + } +} diff --git a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php index d1e4175f8..27de7f930 100644 --- a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php +++ b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php @@ -74,4 +74,52 @@ class ErrorControlChainMiddlewareTest extends SapphireTest $this->assertNotContains('?flush=1&flushtoken=', $location); $this->assertContains('Security/login', $location); } + + public function testLiveBuildAdmin() + { + // Mock admin + $adminID = $this->logInWithPermission('ADMIN'); + $this->logOut(); + + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as admin + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build/'); + $request->setSession(new Session(['loggedInAs' => $adminID])); + $result = $chain->process($request, function () { + return null; + }); + + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertContains('/dev/build', $location); + $this->assertContains('?devbuildtoken=', $location); + $this->assertNotContains('Security/login', $location); + } + + public function testLiveBuildUnauthenticated() + { + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as no one + Security::setCurrentUser(null); + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build'); + $request->setSession(new Session(['loggedInAs' => 0])); + $result = $chain->process($request, function () { + return null; + }); + + // Should be directed to login, not to flush + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertNotContains('/dev/build', $location); + $this->assertNotContains('?devbuildtoken=', $location); + $this->assertContains('Security/login', $location); + } } diff --git a/tests/php/Core/Startup/ParameterConfirmationTokenTest.php b/tests/php/Core/Startup/ParameterConfirmationTokenTest.php index 66616433f..e28af8ea5 100644 --- a/tests/php/Core/Startup/ParameterConfirmationTokenTest.php +++ b/tests/php/Core/Startup/ParameterConfirmationTokenTest.php @@ -149,14 +149,14 @@ class ParameterConfirmationTokenTest extends SapphireTest } /** - * currentAbsoluteURL needs to handle base or url being missing, or any combination of slashes. + * currentURL needs to handle base or url being missing, or any combination of slashes. * * There should always be exactly one slash between each part in the result, and any trailing slash * should be preserved. * * @dataProvider dataProviderURLs */ - public function testCurrentAbsoluteURLHandlesSlashes($url) + public function testCurrentURLHandlesSlashes($url) { $this->request->setUrl($url); diff --git a/tests/php/Core/Startup/URLConfirmationTokenTest.php b/tests/php/Core/Startup/URLConfirmationTokenTest.php new file mode 100644 index 000000000..73b07eb13 --- /dev/null +++ b/tests/php/Core/Startup/URLConfirmationTokenTest.php @@ -0,0 +1,148 @@ + 'value']); + $validToken = new StubValidToken('token/test/url', $request); + $this->assertTrue($validToken->urlMatches()); + $this->assertFalse($validToken->urlExistsInBackURL()); + $this->assertTrue($validToken->tokenProvided()); // Actually forced to true for this test + $this->assertFalse($validToken->reloadRequired()); + $this->assertFalse($validToken->reloadRequiredIfError()); + $this->assertStringStartsWith(Controller::join_links(BASE_URL, '/', 'token/test/url'), $validToken->redirectURL()); + } + + public function testTokenWithLeadingSlashInUrl() + { + $request = new HTTPRequest('GET', '/leading/slash/url', []); + $leadingSlash = new StubToken('leading/slash/url', $request); + $this->assertTrue($leadingSlash->urlMatches()); + $this->assertFalse($leadingSlash->urlExistsInBackURL()); + $this->assertFalse($leadingSlash->tokenProvided()); + $this->assertTrue($leadingSlash->reloadRequired()); + $this->assertTrue($leadingSlash->reloadRequiredIfError()); + $this->assertContains('leading/slash/url', $leadingSlash->redirectURL()); + $this->assertContains('leadingslashurltoken', $leadingSlash->redirectURL()); + } + + public function testTokenWithTrailingSlashInUrl() + { + $request = new HTTPRequest('GET', 'trailing/slash/url/', []); + $trailingSlash = new StubToken('trailing/slash/url', $request); + $this->assertTrue($trailingSlash->urlMatches()); + $this->assertFalse($trailingSlash->urlExistsInBackURL()); + $this->assertFalse($trailingSlash->tokenProvided()); + $this->assertTrue($trailingSlash->reloadRequired()); + $this->assertTrue($trailingSlash->reloadRequiredIfError()); + $this->assertContains('trailing/slash/url', $trailingSlash->redirectURL()); + $this->assertContains('trailingslashurltoken', $trailingSlash->redirectURL()); + } + + public function testTokenWithUrlMatchedInBackUrl() + { + $request = new HTTPRequest('GET', '/', ['BackURL' => 'back/url']); + $backUrl = new StubToken('back/url', $request); + $this->assertFalse($backUrl->urlMatches()); + $this->assertTrue($backUrl->urlExistsInBackURL()); + $this->assertFalse($backUrl->tokenProvided()); + $this->assertFalse($backUrl->reloadRequired()); + $this->assertTrue($backUrl->reloadRequiredIfError()); + $home = (BASE_URL ?: '/') . '?'; + $this->assertStringStartsWith($home, $backUrl->redirectURL()); + $this->assertContains('backurltoken', $backUrl->redirectURL()); + } + + public function testUrlSuppressionWhenTokenMissing() + { + // Check suppression + $request = new HTTPRequest('GET', 'test/url', []); + $token = new StubToken('test/url', $request); + $this->assertEquals('test/url', $request->getURL(false)); + $token->suppress(); + $this->assertEquals('', $request->getURL(false)); + } + + public function testPrepareTokens() + { + $request = new HTTPRequest('GET', 'test/url', []); + $token = URLConfirmationToken::prepare_tokens( + [ + 'test/url', + 'test', + 'url' + ], + $request + ); + // Test no invalid tokens + $this->assertEquals('test/url', $token->getURLToCheck()); + $this->assertNotEquals('test/url', $request->getURL(false), 'prepare_tokens() did not suppress URL'); + } + + public function testPrepareTokensDoesntSuppressWhenNotMatched() + { + $request = new HTTPRequest('GET', 'test/url', []); + $token = URLConfirmationToken::prepare_tokens( + ['another/url'], + $request + ); + $this->assertEmpty($token); + $this->assertEquals('test/url', $request->getURL(false), 'prepare_tokens() incorrectly suppressed URL'); + } + + public function testPrepareTokensWithUrlMatchedInBackUrl() + { + // Test backurl token + $request = new HTTPRequest('GET', '/', ['BackURL' => 'back/url']); + $token = URLConfirmationToken::prepare_tokens( + [ 'back/url' ], + $request + ); + $this->assertNotEmpty($token); + $this->assertEquals('back/url', $token->getURLToCheck()); + $this->assertNotEquals('back/url', $request->getURL(false), 'prepare_tokens() did not suppress URL'); + } + + public function dataProviderURLs() + { + return [ + [''], + ['/'], + ['bar'], + ['bar/'], + ['/bar'], + ['/bar/'], + ]; + } + + /** + * currentURL needs to handle base or url being missing, or any combination of slashes. + * + * There should always be exactly one slash between each part in the result, and any trailing slash + * should be preserved. + * + * @dataProvider dataProviderURLs + */ + public function testCurrentURLHandlesSlashes($url) + { + $request = new HTTPRequest('GET', $url, []); + + $token = new StubToken( + 'another/url', + $request + ); + $expected = rtrim(Controller::join_links(BASE_URL, '/', $url), '/') ?: '/'; + $this->assertEquals($expected, $token->currentURL(), "Invalid redirect for request url $url"); + } +} diff --git a/tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php b/tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php new file mode 100644 index 000000000..ca08d3e1f --- /dev/null +++ b/tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php @@ -0,0 +1,27 @@ + Date: Mon, 30 Jul 2018 11:50:11 +1200 Subject: [PATCH 050/175] [SS-2018-018] Ignore arguments in mysqli::real_connect backtrace calls --- src/Dev/Backtrace.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Dev/Backtrace.php b/src/Dev/Backtrace.php index daceca751..648cc883f 100644 --- a/src/Dev/Backtrace.php +++ b/src/Dev/Backtrace.php @@ -26,6 +26,7 @@ class Backtrace array('PDO', '__construct'), array('mysqli', 'mysqli'), array('mysqli', 'select_db'), + array('mysqli', 'real_connect'), array('SilverStripe\\ORM\\DB', 'connect'), array('SilverStripe\\Security\\Security', 'check_default_admin'), array('SilverStripe\\Security\\Security', 'encrypt_password'), From 02ad0f44aae917283784d4e9594594285f45c27d Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Fri, 24 Aug 2018 15:36:51 +0100 Subject: [PATCH 051/175] Implement ConfirmationTokenChain to handle multiple tokens at once --- ...oken.php => AbstractConfirmationToken.php} | 12 +- src/Core/Startup/ConfirmationTokenChain.php | 178 +++++++++++++++++ .../Startup/ErrorControlChainMiddleware.php | 62 +++--- src/Core/Startup/ErrorDirector.php | 13 +- .../Startup/ParameterConfirmationToken.php | 28 +-- src/Core/Startup/URLConfirmationToken.php | 29 +-- .../Startup/ConfirmationTokenChainTest.php | 185 ++++++++++++++++++ .../ErrorControlChainMiddlewareTest.php | 52 +++++ 8 files changed, 500 insertions(+), 59 deletions(-) rename src/Core/Startup/{ConfirmationToken.php => AbstractConfirmationToken.php} (95%) create mode 100644 src/Core/Startup/ConfirmationTokenChain.php create mode 100644 tests/php/Core/Startup/ConfirmationTokenChainTest.php diff --git a/src/Core/Startup/ConfirmationToken.php b/src/Core/Startup/AbstractConfirmationToken.php similarity index 95% rename from src/Core/Startup/ConfirmationToken.php rename to src/Core/Startup/AbstractConfirmationToken.php index d23563f46..11f78b48a 100644 --- a/src/Core/Startup/ConfirmationToken.php +++ b/src/Core/Startup/AbstractConfirmationToken.php @@ -15,7 +15,7 @@ use SilverStripe\Security\RandomGenerator; * * @internal This class is designed specifically for use pre-startup and may change without warning */ -abstract class ConfirmationToken +abstract class AbstractConfirmationToken { /** * @var HTTPRequest @@ -173,6 +173,16 @@ HTML; */ abstract public function params($includeToken = true); + /** + * @return string + */ + abstract public function getRedirectUrlBase(); + + /** + * @return array + */ + abstract public function getRedirectUrlParams(); + /** * Get redirection URL * diff --git a/src/Core/Startup/ConfirmationTokenChain.php b/src/Core/Startup/ConfirmationTokenChain.php new file mode 100644 index 000000000..a47f2c4c0 --- /dev/null +++ b/src/Core/Startup/ConfirmationTokenChain.php @@ -0,0 +1,178 @@ +tokens[] = $token; + } + + /** + * Collect all tokens that require a redirect + * + * @return \Generator + */ + protected function filteredTokens() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequired() || $token->reloadRequiredIfError()) { + yield $token; + } + } + } + + /** + * @return bool + */ + public function suppressionRequired() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequired()) { + return true; + } + } + + return false; + } + + /** + * Suppress URLs & GET vars from tokens that require a redirect + */ + public function suppressTokens() + { + foreach ($this->filteredTokens() as $token) { + $token->suppress(); + } + } + + /** + * @return bool + */ + public function reloadRequired() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequired()) { + return true; + } + } + + return false; + } + + /** + * @return bool + */ + public function reloadRequiredIfError() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequiredIfError()) { + return true; + } + } + + return false; + } + + /** + * @param bool $includeToken + * @return array + */ + public function params($includeToken = true) + { + $params = []; + foreach ($this->tokens as $token) { + $params = array_merge($params, $token->params($includeToken)); + } + + return $params; + } + + /** + * Fetch the URL we want to redirect to, excluding query string parameters. This may + * be the same URL (with a token to be added outside this method), or to a different + * URL if the current one has been suppressed + * + * @return string + */ + public function getRedirectUrlBase() + { + // URLConfirmationTokens may alter the URL to suppress the URL they're protecting, + // so we need to ensure they're inspected last and therefore take priority + $tokens = iterator_to_array($this->filteredTokens(), false); + usort($tokens, function ($a, $b) { + return ($a instanceof URLConfirmationToken) ? 1 : 0; + }); + + $urlBase = Director::baseURL(); + foreach ($tokens as $token) { + $urlBase = $token->getRedirectUrlBase(); + } + + return $urlBase; + } + + /** + * Collate GET vars from all token providers that need to apply a token + * + * @return array + */ + public function getRedirectUrlParams() + { + $params = []; + foreach ($this->filteredTokens() as $token) { + $params = array_merge($params, $token->getRedirectUrlParams()); + } + + return $params; + } + + /** + * @return string + */ + protected function redirectURL() + { + $params = http_build_query($this->getRedirectUrlParams()); + return Controller::join_links($this->getRedirectUrlBase(), '?' . $params); + } + + /** + * @return HTTPResponse + */ + public function reloadWithTokens() + { + $location = $this->redirectURL(); + $locationJS = Convert::raw2js($location); + $locationATT = Convert::raw2att($location); + $body = <<location.href='$locationJS'; + +You are being redirected. If you are not redirected soon, click here to continue +HTML; + + // Build response + $result = new HTTPResponse($body); + $result->redirect($location); + return $result; + } +} diff --git a/src/Core/Startup/ErrorControlChainMiddleware.php b/src/Core/Startup/ErrorControlChainMiddleware.php index e81444629..c29878e15 100644 --- a/src/Core/Startup/ErrorControlChainMiddleware.php +++ b/src/Core/Startup/ErrorControlChainMiddleware.php @@ -34,20 +34,18 @@ class ErrorControlChainMiddleware implements HTTPMiddleware /** * @param HTTPRequest $request - * @return ConfirmationToken|null + * @return ConfirmationTokenChain */ - protected function prepareConfirmationTokenIfRequired(HTTPRequest $request) + protected function prepareConfirmationTokenChain(HTTPRequest $request) { - $token = URLConfirmationToken::prepare_tokens(['dev/build'], $request); + $chain = new ConfirmationTokenChain(); + $chain->pushToken(new URLConfirmationToken('dev/build', $request)); - if (!$token) { - $token = ParameterConfirmationToken::prepare_tokens( - ['isTest', 'isDev', 'flush'], - $request - ); + foreach (['isTest', 'isDev', 'flush'] as $parameter) { + $chain->pushToken(new ParameterConfirmationToken($parameter, $request)); } - return $token; + return $chain; } public function process(HTTPRequest $request, callable $next) @@ -55,19 +53,21 @@ class ErrorControlChainMiddleware implements HTTPMiddleware $result = null; // Prepare tokens and execute chain - $confirmationToken = $this->prepareConfirmationTokenIfRequired($request); - $chain = new ErrorControlChain(); - $chain - ->then(function () use ($request, $chain, $confirmationToken, $next, &$result) { - // If no redirection is necessary then we can disable error supression - if (!$confirmationToken) { - $chain->setSuppression(false); + $confirmationTokenChain = $this->prepareConfirmationTokenChain($request); + $errorControlChain = new ErrorControlChain(); + $errorControlChain + ->then(function () use ($request, $errorControlChain, $confirmationTokenChain, $next, &$result) { + if ($confirmationTokenChain->suppressionRequired()) { + $confirmationTokenChain->suppressTokens(); + } else { + // If no redirection is necessary then we can disable error supression + $errorControlChain->setSuppression(false); } try { // Check if a token is requesting a redirect - if ($confirmationToken && $confirmationToken->reloadRequired()) { - $result = $this->safeReloadWithToken($request, $confirmationToken); + if ($confirmationTokenChain && $confirmationTokenChain->reloadRequired()) { + $result = $this->safeReloadWithTokens($request, $confirmationTokenChain); } else { // If no reload necessary, process application $result = call_user_func($next, $request); @@ -77,10 +77,16 @@ class ErrorControlChainMiddleware implements HTTPMiddleware } }) // Finally if a token was requested but there was an error while figuring out if it's allowed, do it anyway - ->thenIfErrored(function () use ($confirmationToken) { - if ($confirmationToken && $confirmationToken->reloadRequiredIfError()) { - $result = $confirmationToken->reloadWithToken(); - $result->output(); + ->thenIfErrored(function () use ($confirmationTokenChain) { + if ($confirmationTokenChain && $confirmationTokenChain->reloadRequiredIfError()) { + try { + // Reload requires manual boot + $this->getApplication()->getKernel()->boot(false); + } finally { + // Given we're in an error state here, try to continue even if the kernel boot fails + $result = $confirmationTokenChain->reloadWithTokens(); + $result->output(); + } } }) ->execute(); @@ -92,10 +98,10 @@ class ErrorControlChainMiddleware implements HTTPMiddleware * or authentication is impossible. * * @param HTTPRequest $request - * @param ParameterConfirmationToken $reloadToken + * @param ConfirmationTokenChain $confirmationTokenChain * @return HTTPResponse */ - protected function safeReloadWithToken(HTTPRequest $request, $reloadToken) + protected function safeReloadWithTokens(HTTPRequest $request, ConfirmationTokenChain $confirmationTokenChain) { // Safe reload requires manual boot $this->getApplication()->getKernel()->boot(false); @@ -104,9 +110,9 @@ class ErrorControlChainMiddleware implements HTTPMiddleware $request->getSession()->init($request); // Request with ErrorDirector - $result = ErrorDirector::singleton()->handleRequestWithToken( + $result = ErrorDirector::singleton()->handleRequestWithTokenChain( $request, - $reloadToken, + $confirmationTokenChain, $this->getApplication()->getKernel() ); if ($result) { @@ -114,8 +120,8 @@ class ErrorControlChainMiddleware implements HTTPMiddleware } // Fail and redirect the user to the login page - $params = array_merge($request->getVars(), $reloadToken->params(false)); - $backURL = $reloadToken->currentURL() . '?' . http_build_query($params); + $params = array_merge($request->getVars(), $confirmationTokenChain->params(false)); + $backURL = $confirmationTokenChain->getRedirectUrlBase() . '?' . http_build_query($params); $loginPage = Director::absoluteURL(Security::config()->get('login_url')); $loginPage .= "?BackURL=" . urlencode($backURL); $result = new HTTPResponse(); diff --git a/src/Core/Startup/ErrorDirector.php b/src/Core/Startup/ErrorDirector.php index 54001fd05..575df7183 100644 --- a/src/Core/Startup/ErrorDirector.php +++ b/src/Core/Startup/ErrorDirector.php @@ -21,18 +21,21 @@ class ErrorDirector extends Director * Redirect with token if allowed, or null if not allowed * * @param HTTPRequest $request - * @param ConfirmationToken $token + * @param ConfirmationTokenChain $confirmationTokenChain * @param Kernel $kernel * @return null|HTTPResponse Redirection response, or null if not able to redirect */ - public function handleRequestWithToken(HTTPRequest $request, ConfirmationToken $token, Kernel $kernel) - { + public function handleRequestWithTokenChain( + HTTPRequest $request, + ConfirmationTokenChain $confirmationTokenChain, + Kernel $kernel + ) { Injector::inst()->registerService($request, HTTPRequest::class); // Next, check if we're in dev mode, or the database doesn't have any security data, or we are admin - $reload = function (HTTPRequest $request) use ($token, $kernel) { + $reload = function (HTTPRequest $request) use ($confirmationTokenChain, $kernel) { if ($kernel->getEnvironment() === Kernel::DEV || !Security::database_is_ready() || Permission::check('ADMIN')) { - return $token->reloadWithToken(); + return $confirmationTokenChain->reloadWithTokens(); } return null; }; diff --git a/src/Core/Startup/ParameterConfirmationToken.php b/src/Core/Startup/ParameterConfirmationToken.php index 4e90f1ef7..bc751a2c3 100644 --- a/src/Core/Startup/ParameterConfirmationToken.php +++ b/src/Core/Startup/ParameterConfirmationToken.php @@ -3,6 +3,7 @@ namespace SilverStripe\Core\Startup; use SilverStripe\Control\Controller; +use SilverStripe\Control\Director; use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPResponse; use SilverStripe\Core\Convert; @@ -15,7 +16,7 @@ use SilverStripe\Security\RandomGenerator; * * @internal This class is designed specifically for use pre-startup and may change without warning */ -class ParameterConfirmationToken extends ConfirmationToken +class ParameterConfirmationToken extends AbstractConfirmationToken { /** * The name of the parameter @@ -140,19 +141,22 @@ class ParameterConfirmationToken extends ConfirmationToken } return $params; } + + public function getRedirectUrlBase() + { + return ($this->existsInReferer() && !$this->parameterProvided()) ? Director::baseURL() : $this->currentURL(); + } + + public function getRedirectUrlParams() + { + return ($this->existsInReferer() && !$this->parameterProvided()) + ? $this->params() + : array_merge($this->request->getVars(), $this->params()); + } protected function redirectURL() { - // If url is encoded via BackURL, defer to home page (prevent redirect to form action) - if ($this->existsInReferer() && !$this->parameterProvided()) { - $url = BASE_URL ?: '/'; - $params = $this->params(); - } else { - $url = $this->currentURL(); - $params = array_merge($this->request->getVars(), $this->params()); - } - - // Merge get params with current url - return Controller::join_links($url, '?' . http_build_query($params)); + $query = http_build_query($this->getRedirectUrlParams()); + return Controller::join_links($this->getRedirectUrlBase(), '?' . $query); } } diff --git a/src/Core/Startup/URLConfirmationToken.php b/src/Core/Startup/URLConfirmationToken.php index 8176a41b8..bb509931e 100644 --- a/src/Core/Startup/URLConfirmationToken.php +++ b/src/Core/Startup/URLConfirmationToken.php @@ -12,7 +12,7 @@ use SilverStripe\Control\HTTPRequest; * * @internal This class is designed specifically for use pre-startup and may change without warning */ -class URLConfirmationToken extends ConfirmationToken +class URLConfirmationToken extends AbstractConfirmationToken { /** * @var string @@ -60,7 +60,7 @@ class URLConfirmationToken extends ConfirmationToken */ protected function getURLExistsInBackURL(HTTPRequest $request) { - $backURL = $request->getVar('BackURL'); + $backURL = ltrim($request->getVar('BackURL'), '/'); return (strpos($backURL, $this->urlToCheck) === 0); } @@ -119,18 +119,21 @@ class URLConfirmationToken extends ConfirmationToken return Controller::join_links(Director::baseURL(), $this->currentURL); } + public function getRedirectUrlBase() + { + return ($this->urlExistsInBackURL && !$this->urlMatches()) ? Director::baseURL() : $this->currentURL(); + } + + public function getRedirectUrlParams() + { + return ($this->urlExistsInBackURL && !$this->urlMatches()) + ? $this->params() + : array_merge($this->request->getVars(), $this->params()); + } + protected function redirectURL() { - // If url is encoded via BackURL, defer to home page (prevent redirect to form action) - if ($this->urlExistsInBackURL && !$this->urlMatches()) { - $url = BASE_URL ?: '/'; - $params = $this->params(); - } else { - $url = $this->currentURL(); - $params = array_merge($this->request->getVars(), $this->params()); - } - - // Merge get params with current url - return Controller::join_links($url, '?' . http_build_query($params)); + $query = http_build_query($this->getRedirectUrlParams()); + return Controller::join_links($this->getRedirectUrlBase(), '?' . $query); } } diff --git a/tests/php/Core/Startup/ConfirmationTokenChainTest.php b/tests/php/Core/Startup/ConfirmationTokenChainTest.php new file mode 100644 index 000000000..adb8fba36 --- /dev/null +++ b/tests/php/Core/Startup/ConfirmationTokenChainTest.php @@ -0,0 +1,185 @@ +createPartialMock(ParameterConfirmationToken::class, $methods); + $mock->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue($requiresReload)); + return $mock; + } + + protected function getTokenRequiringReloadIfError($requiresReload = true, $extraMethods = []) + { + $methods = array_merge(['reloadRequired', 'reloadRequiredIfError'], $extraMethods); + $mock = $this->createPartialMock(ParameterConfirmationToken::class, $methods); + $mock->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue(false)); + $mock->expects($this->any()) + ->method('reloadRequiredIfError') + ->will($this->returnValue($requiresReload)); + return $mock; + } + + public function testFilteredTokens() + { + $chain = new ConfirmationTokenChain(); + $chain->pushToken($tokenRequiringReload = $this->getTokenRequiringReload()); + $chain->pushToken($tokenNotRequiringReload = $this->getTokenRequiringReload(false)); + $chain->pushToken($tokenRequiringReloadIfError = $this->getTokenRequiringReloadIfError()); + $chain->pushToken($tokenNotRequiringReloadIfError = $this->getTokenRequiringReloadIfError(false)); + + $reflectionMethod = new \ReflectionMethod(ConfirmationTokenChain::class, 'filteredTokens'); + $reflectionMethod->setAccessible(true); + $tokens = iterator_to_array($reflectionMethod->invoke($chain)); + + $this->assertContains($tokenRequiringReload, $tokens, 'Token requiring a reload was not returned'); + $this->assertNotContains($tokenNotRequiringReload, $tokens, 'Token not requiring a reload was returned'); + $this->assertContains($tokenRequiringReloadIfError, $tokens, 'Token requiring a reload on error was not returned'); + $this->assertNotContains($tokenNotRequiringReloadIfError, $tokens, 'Token not requiring a reload on error was returned'); + } + + public function testSuppressionRequired() + { + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReload(false)); + $this->assertFalse($chain->suppressionRequired(), 'Suppression incorrectly marked as required'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReloadIfError(false)); + $this->assertFalse($chain->suppressionRequired(), 'Suppression incorrectly marked as required'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReload()); + $this->assertTrue($chain->suppressionRequired(), 'Suppression not marked as required'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReloadIfError()); + $this->assertFalse($chain->suppressionRequired(), 'Suppression incorrectly marked as required'); + } + + public function testSuppressTokens() + { + $mockToken = $this->getTokenRequiringReload(true, ['suppress']); + $mockToken->expects($this->once()) + ->method('suppress'); + $secondMockToken = $this->getTokenRequiringReloadIfError(true, ['suppress']); + $secondMockToken->expects($this->once()) + ->method('suppress'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $chain->suppressTokens(); + } + + public function testReloadRequired() + { + $mockToken = $this->getTokenRequiringReload(true); + $secondMockToken = $this->getTokenRequiringReload(false); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertTrue($chain->reloadRequired()); + } + + public function testReloadRequiredIfError() + { + $mockToken = $this->getTokenRequiringReloadIfError(true); + $secondMockToken = $this->getTokenRequiringReloadIfError(false); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertTrue($chain->reloadRequiredIfError()); + } + + public function testParams() + { + $mockToken = $this->getTokenRequiringReload(true, ['params']); + $mockToken->expects($this->once()) + ->method('params') + ->with($this->isTrue()) + ->will($this->returnValue(['mockTokenParam' => '1'])); + $secondMockToken = $this->getTokenRequiringReload(true, ['params']); + $secondMockToken->expects($this->once()) + ->method('params') + ->with($this->isTrue()) + ->will($this->returnValue(['secondMockTokenParam' => '2'])); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertEquals(['mockTokenParam' => '1', 'secondMockTokenParam' => '2'], $chain->params(true)); + + $mockToken = $this->getTokenRequiringReload(true, ['params']); + $mockToken->expects($this->once()) + ->method('params') + ->with($this->isFalse()) + ->will($this->returnValue(['mockTokenParam' => '1'])); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $this->assertEquals(['mockTokenParam' => '1'], $chain->params(false)); + } + + public function testGetRedirectUrlBase() + { + $mockUrlToken = $this->createPartialMock(URLConfirmationToken::class, ['reloadRequired', 'getRedirectUrlBase']); + $mockUrlToken->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue(true)); + $mockUrlToken->expects($this->any()) + ->method('getRedirectUrlBase') + ->will($this->returnValue('url-base')); + + $mockParameterToken = $this->createPartialMock(ParameterConfirmationToken::class, ['reloadRequired', 'getRedirectUrlBase']); + $mockParameterToken->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue(true)); + $mockParameterToken->expects($this->any()) + ->method('getRedirectUrlBase') + ->will($this->returnValue('parameter-base')); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockParameterToken); + $chain->pushToken($mockUrlToken); + $this->assertEquals('url-base', $chain->getRedirectUrlBase(), 'URLConfirmationToken url base should take priority'); + + // Push them in reverse order to check priority still correct + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockUrlToken); + $chain->pushToken($mockParameterToken); + $this->assertEquals('url-base', $chain->getRedirectUrlBase(), 'URLConfirmationToken url base should take priority'); + } + + public function testGetRedirectUrlParams() + { + $mockToken = $this->getTokenRequiringReload(true, ['getRedirectUrlParams']); + $mockToken->expects($this->once()) + ->method('getRedirectUrlParams') + ->will($this->returnValue(['mockTokenParam' => '1'])); + + $secondMockToken = $this->getTokenRequiringReload(true, ['getRedirectUrlParams']); + $secondMockToken->expects($this->once()) + ->method('getRedirectUrlParams') + ->will($this->returnValue(['secondMockTokenParam' => '2'])); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertEquals(['mockTokenParam' => '1', 'secondMockTokenParam' => '2'], $chain->getRedirectUrlParams()); + } +} diff --git a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php index 27de7f930..7cf793c2f 100644 --- a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php +++ b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php @@ -122,4 +122,56 @@ class ErrorControlChainMiddlewareTest extends SapphireTest $this->assertNotContains('?devbuildtoken=', $location); $this->assertContains('Security/login', $location); } + + public function testLiveBuildAndFlushAdmin() + { + // Mock admin + $adminID = $this->logInWithPermission('ADMIN'); + $this->logOut(); + + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as admin + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build/', ['flush' => '1']); + $request->setSession(new Session(['loggedInAs' => $adminID])); + $result = $chain->process($request, function () { + return null; + }); + + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertContains('/dev/build', $location); + $this->assertContains('flush=1', $location); + $this->assertContains('devbuildtoken=', $location); + $this->assertContains('flushtoken=', $location); + $this->assertNotContains('Security/login', $location); + } + + public function testLiveBuildAndFlushUnauthenticated() + { + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as no one + Security::setCurrentUser(null); + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build', ['flush' => '1']); + $request->setSession(new Session(['loggedInAs' => 0])); + $result = $chain->process($request, function () { + return null; + }); + + // Should be directed to login, not to flush + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertNotContains('/dev/build', $location); + $this->assertNotContains('flush=1', $location); + $this->assertNotContains('devbuildtoken=', $location); + $this->assertNotContains('flushtoken=', $location); + $this->assertContains('Security/login', $location); + } } From 8d7c2dafabad505d769f3774c44e0595fb1a4cd9 Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Tue, 21 Aug 2018 11:20:15 +0100 Subject: [PATCH 052/175] [SS-2018-019] Add confirmation token to dev/build --- src/Control/HTTPApplication.php | 2 +- src/Core/Startup/ConfirmationToken.php | 182 ++++++++++++++++++ src/Core/Startup/ErrorControlChain.php | 3 +- .../Startup/ErrorControlChainMiddleware.php | 43 +++-- src/Core/Startup/ErrorDirector.php | 4 +- .../Startup/ParameterConfirmationToken.php | 172 +---------------- src/Core/Startup/URLConfirmationToken.php | 136 +++++++++++++ .../ErrorControlChainMiddlewareTest.php | 48 +++++ .../ParameterConfirmationTokenTest.php | 4 +- .../Core/Startup/URLConfirmationTokenTest.php | 148 ++++++++++++++ .../URLConfirmationTokenTest/StubToken.php | 27 +++ .../StubValidToken.php | 15 ++ 12 files changed, 600 insertions(+), 184 deletions(-) create mode 100644 src/Core/Startup/ConfirmationToken.php create mode 100644 src/Core/Startup/URLConfirmationToken.php create mode 100644 tests/php/Core/Startup/URLConfirmationTokenTest.php create mode 100644 tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php create mode 100644 tests/php/Core/Startup/URLConfirmationTokenTest/StubValidToken.php diff --git a/src/Control/HTTPApplication.php b/src/Control/HTTPApplication.php index 4d0f7cb9d..35f453d6d 100644 --- a/src/Control/HTTPApplication.php +++ b/src/Control/HTTPApplication.php @@ -41,7 +41,7 @@ class HTTPApplication implements Application */ public function handle(HTTPRequest $request) { - $flush = array_key_exists('flush', $request->getVars()) || strpos($request->getURL(), 'dev/build') === 0; + $flush = array_key_exists('flush', $request->getVars()) || ($request->getURL() === 'dev/build'); // Ensure boot is invoked return $this->execute($request, function (HTTPRequest $request) { diff --git a/src/Core/Startup/ConfirmationToken.php b/src/Core/Startup/ConfirmationToken.php new file mode 100644 index 000000000..d23563f46 --- /dev/null +++ b/src/Core/Startup/ConfirmationToken.php @@ -0,0 +1,182 @@ +reloadRequired() || $token->reloadRequiredIfError()) { + $token->suppress(); + $target = $token; + } + } + return $target; + } + + /** + * Generate a local filesystem path to store a token + * + * @param $token + * @return string + */ + protected function pathForToken($token) + { + return TEMP_PATH . DIRECTORY_SEPARATOR . 'token_' . preg_replace('/[^a-z0-9]+/', '', $token); + } + + /** + * Generate a new random token and store it + * + * @return string Token name + */ + protected function genToken() + { + // Generate a new random token (as random as possible) + $rg = new RandomGenerator(); + $token = $rg->randomToken('md5'); + + // Store a file in the session save path (safer than /tmp, as open_basedir might limit that) + file_put_contents($this->pathForToken($token), $token); + + return $token; + } + + /** + * Is the necessary token provided for this parameter? + * A value must be provided for the token + * + * @return bool + */ + public function tokenProvided() + { + return !empty($this->token); + } + + /** + * Validate a token + * + * @param string $token + * @return boolean True if the token is valid + */ + protected function checkToken($token) + { + if (!$token) { + return false; + } + + $file = $this->pathForToken($token); + $content = null; + + if (file_exists($file)) { + $content = file_get_contents($file); + unlink($file); + } + + return $content === $token; + } + + /** + * Get redirect url, excluding querystring + * + * @return string + */ + public function currentURL() + { + return Controller::join_links(Director::baseURL(), $this->request->getURL(false)); + } + + /** + * Forces a reload of the request with the token included + * + * @return HTTPResponse + */ + public function reloadWithToken() + { + $location = $this->redirectURL(); + $locationJS = Convert::raw2js($location); + $locationATT = Convert::raw2att($location); + $body = <<location.href='$locationJS'; + +You are being redirected. If you are not redirected soon, click here to continue +HTML; + + // Build response + $result = new HTTPResponse($body); + $result->redirect($location); + return $result; + } + + /** + * Is this parameter requested without a valid token? + * + * @return bool True if the parameter is given without a valid token + */ + abstract public function reloadRequired(); + + /** + * Check if this token is provided either in the backurl, or directly, + * but without a token + * + * @return bool + */ + abstract public function reloadRequiredIfError(); + + /** + * Suppress the current parameter for the duration of this request + */ + abstract public function suppress(); + + /** + * Determine the querystring parameters to include + * + * @param bool $includeToken Include the token value? + * @return array List of querystring parameters, possibly including token parameter + */ + abstract public function params($includeToken = true); + + /** + * Get redirection URL + * + * @return string + */ + abstract protected function redirectURL(); +} diff --git a/src/Core/Startup/ErrorControlChain.php b/src/Core/Startup/ErrorControlChain.php index f34a2c802..e2d14db65 100644 --- a/src/Core/Startup/ErrorControlChain.php +++ b/src/Core/Startup/ErrorControlChain.php @@ -15,8 +15,7 @@ use Exception; * $chain = new ErrorControlChain(); * $chain->then($callback1)->then($callback2)->thenIfErrored($callback3)->execute(); * - * WARNING: This class is experimental and designed specifically for use pre-startup. - * It will likely be heavily refactored before the release of 3.2 + * @internal This class is designed specifically for use pre-startup and may change without warning */ class ErrorControlChain { diff --git a/src/Core/Startup/ErrorControlChainMiddleware.php b/src/Core/Startup/ErrorControlChainMiddleware.php index bdb5ff0a3..e81444629 100644 --- a/src/Core/Startup/ErrorControlChainMiddleware.php +++ b/src/Core/Startup/ErrorControlChainMiddleware.php @@ -12,6 +12,8 @@ use SilverStripe\Security\Security; /** * Decorates application bootstrapping with errorcontrolchain + * + * @internal This class is designed specifically for use pre-startup and may change without warning */ class ErrorControlChainMiddleware implements HTTPMiddleware { @@ -30,27 +32,42 @@ class ErrorControlChainMiddleware implements HTTPMiddleware $this->application = $application; } + /** + * @param HTTPRequest $request + * @return ConfirmationToken|null + */ + protected function prepareConfirmationTokenIfRequired(HTTPRequest $request) + { + $token = URLConfirmationToken::prepare_tokens(['dev/build'], $request); + + if (!$token) { + $token = ParameterConfirmationToken::prepare_tokens( + ['isTest', 'isDev', 'flush'], + $request + ); + } + + return $token; + } + public function process(HTTPRequest $request, callable $next) { $result = null; // Prepare tokens and execute chain - $reloadToken = ParameterConfirmationToken::prepare_tokens( - ['isTest', 'isDev', 'flush'], - $request - ); + $confirmationToken = $this->prepareConfirmationTokenIfRequired($request); $chain = new ErrorControlChain(); $chain - ->then(function () use ($request, $chain, $reloadToken, $next, &$result) { + ->then(function () use ($request, $chain, $confirmationToken, $next, &$result) { // If no redirection is necessary then we can disable error supression - if (!$reloadToken) { + if (!$confirmationToken) { $chain->setSuppression(false); } try { // Check if a token is requesting a redirect - if ($reloadToken && $reloadToken->reloadRequired()) { - $result = $this->safeReloadWithToken($request, $reloadToken); + if ($confirmationToken && $confirmationToken->reloadRequired()) { + $result = $this->safeReloadWithToken($request, $confirmationToken); } else { // If no reload necessary, process application $result = call_user_func($next, $request); @@ -60,9 +77,9 @@ class ErrorControlChainMiddleware implements HTTPMiddleware } }) // Finally if a token was requested but there was an error while figuring out if it's allowed, do it anyway - ->thenIfErrored(function () use ($reloadToken) { - if ($reloadToken && $reloadToken->reloadRequiredIfError()) { - $result = $reloadToken->reloadWithToken(); + ->thenIfErrored(function () use ($confirmationToken) { + if ($confirmationToken && $confirmationToken->reloadRequiredIfError()) { + $result = $confirmationToken->reloadWithToken(); $result->output(); } }) @@ -85,7 +102,7 @@ class ErrorControlChainMiddleware implements HTTPMiddleware // Ensure session is started $request->getSession()->init($request); - + // Request with ErrorDirector $result = ErrorDirector::singleton()->handleRequestWithToken( $request, @@ -98,7 +115,7 @@ class ErrorControlChainMiddleware implements HTTPMiddleware // Fail and redirect the user to the login page $params = array_merge($request->getVars(), $reloadToken->params(false)); - $backURL = $request->getURL() . '?' . http_build_query($params); + $backURL = $reloadToken->currentURL() . '?' . http_build_query($params); $loginPage = Director::absoluteURL(Security::config()->get('login_url')); $loginPage .= "?BackURL=" . urlencode($backURL); $result = new HTTPResponse(); diff --git a/src/Core/Startup/ErrorDirector.php b/src/Core/Startup/ErrorDirector.php index 3c994c6af..54001fd05 100644 --- a/src/Core/Startup/ErrorDirector.php +++ b/src/Core/Startup/ErrorDirector.php @@ -21,11 +21,11 @@ class ErrorDirector extends Director * Redirect with token if allowed, or null if not allowed * * @param HTTPRequest $request - * @param ParameterConfirmationToken $token + * @param ConfirmationToken $token * @param Kernel $kernel * @return null|HTTPResponse Redirection response, or null if not able to redirect */ - public function handleRequestWithToken(HTTPRequest $request, ParameterConfirmationToken $token, Kernel $kernel) + public function handleRequestWithToken(HTTPRequest $request, ConfirmationToken $token, Kernel $kernel) { Injector::inst()->registerService($request, HTTPRequest::class); diff --git a/src/Core/Startup/ParameterConfirmationToken.php b/src/Core/Startup/ParameterConfirmationToken.php index 1c80db1d0..4e90f1ef7 100644 --- a/src/Core/Startup/ParameterConfirmationToken.php +++ b/src/Core/Startup/ParameterConfirmationToken.php @@ -9,30 +9,21 @@ use SilverStripe\Core\Convert; use SilverStripe\Security\RandomGenerator; /** - * Class ParameterConfirmationToken + * This is used to protect dangerous GET parameters that need to be detected early in the request + * lifecycle by generating a one-time-use token & redirecting with that token included in the + * redirected URL * - * When you need to use a dangerous GET parameter that needs to be set before core/Core.php is - * established, this class takes care of allowing some other code of confirming the parameter, - * by generating a one-time-use token & redirecting with that token included in the redirected URL - * - * WARNING: This class is experimental and designed specifically for use pre-startup. - * It will likely be heavily refactored before the release of 3.2 + * @internal This class is designed specifically for use pre-startup and may change without warning */ -class ParameterConfirmationToken +class ParameterConfirmationToken extends ConfirmationToken { - /** * The name of the parameter * * @var string */ protected $parameterName = null; - - /** - * @var HTTPRequest - */ - protected $request = null; - + /** * The parameter given in the main request * @@ -48,60 +39,6 @@ class ParameterConfirmationToken protected $parameterBackURL = null; /** - * The validated and checked token for this parameter - * - * @var string|null A string value, or null if either not provided or invalid - */ - protected $token = null; - - protected function pathForToken($token) - { - return TEMP_PATH . DIRECTORY_SEPARATOR . 'token_' . preg_replace('/[^a-z0-9]+/', '', $token); - } - - /** - * Generate a new random token and store it - * - * @return string Token name - */ - protected function genToken() - { - // Generate a new random token (as random as possible) - $rg = new RandomGenerator(); - $token = $rg->randomToken('md5'); - - // Store a file in the session save path (safer than /tmp, as open_basedir might limit that) - file_put_contents($this->pathForToken($token), $token); - - return $token; - } - - /** - * Validate a token - * - * @param string $token - * @return boolean True if the token is valid - */ - protected function checkToken($token) - { - if (!$token) { - return false; - } - - $file = $this->pathForToken($token); - $content = null; - - if (file_exists($file)) { - $content = file_get_contents($file); - unlink($file); - } - - return $content == $token; - } - - /** - * Create a new ParameterConfirmationToken - * * @param string $parameterName Name of the querystring parameter to check * @param HTTPRequest $request */ @@ -176,54 +113,23 @@ class ParameterConfirmationToken return $this->parameterBackURL !== null; } - /** - * Is the necessary token provided for this parameter? - * A value must be provided for the token - * - * @return bool - */ - public function tokenProvided() - { - return !empty($this->token); - } - - /** - * Is this parameter requested without a valid token? - * - * @return bool True if the parameter is given without a valid token - */ public function reloadRequired() { return $this->parameterProvided() && !$this->tokenProvided(); } - /** - * Check if this token is provided either in the backurl, or directly, - * but without a token - * - * @return bool - */ public function reloadRequiredIfError() { // Don't reload if token exists return $this->reloadRequired() || $this->existsInReferer(); } - - /** - * Suppress the current parameter by unsetting it from $_GET - */ + public function suppress() { unset($_GET[$this->parameterName]); $this->request->offsetUnset($this->parameterName); } - /** - * Determine the querystring parameters to include - * - * @param bool $includeToken Include the token value as well? - * @return array List of querystring parameters with name and token parameters - */ public function params($includeToken = true) { $params = array( @@ -234,25 +140,7 @@ class ParameterConfirmationToken } return $params; } - - /** - * Get redirect url, excluding querystring - * - * @return string - */ - protected function currentURL() - { - return Controller::join_links( - BASE_URL ?: '/', - $this->request->getURL(false) - ); - } - - /** - * Get redirection URL - * - * @return string - */ + protected function redirectURL() { // If url is encoded via BackURL, defer to home page (prevent redirect to form action) @@ -267,48 +155,4 @@ class ParameterConfirmationToken // Merge get params with current url return Controller::join_links($url, '?' . http_build_query($params)); } - - /** - * Forces a reload of the request with the token included - * - * @return HTTPResponse - */ - public function reloadWithToken() - { - $location = $this->redirectURL(); - $locationJS = Convert::raw2js($location); - $locationATT = Convert::raw2att($location); - $body = <<location.href='$locationJS'; - -You are being redirected. If you are not redirected soon, click here to continue the flush -HTML; - - // Build response - $result = new HTTPResponse($body); - $result->redirect($location); - return $result; - } - - /** - * Given a list of token names, suppress all tokens that have not been validated, and - * return the non-validated token with the highest priority - * - * @param array $keys List of token keys in ascending priority (low to high) - * @param HTTPRequest $request - * @return ParameterConfirmationToken The token container for the unvalidated $key given with the highest priority - */ - public static function prepare_tokens($keys, HTTPRequest $request) - { - $target = null; - foreach ($keys as $key) { - $token = new ParameterConfirmationToken($key, $request); - // Validate this token - if ($token->reloadRequired() || $token->reloadRequiredIfError()) { - $token->suppress(); - $target = $token; - } - } - return $target; - } } diff --git a/src/Core/Startup/URLConfirmationToken.php b/src/Core/Startup/URLConfirmationToken.php new file mode 100644 index 000000000..8176a41b8 --- /dev/null +++ b/src/Core/Startup/URLConfirmationToken.php @@ -0,0 +1,136 @@ +urlToCheck = $urlToCheck; + $this->request = $request; + $this->currentURL = $request->getURL(false); + + $this->tokenParameterName = preg_replace('/[^a-z0-9]/i', '', $urlToCheck) . 'token'; + $this->urlExistsInBackURL = $this->getURLExistsInBackURL($request); + + // If the token provided is valid, mark it as such + $token = $request->getVar($this->tokenParameterName); + if ($this->checkToken($token)) { + $this->token = $token; + } + } + + /** + * @param HTTPRequest $request + * @return bool + */ + protected function getURLExistsInBackURL(HTTPRequest $request) + { + $backURL = $request->getVar('BackURL'); + return (strpos($backURL, $this->urlToCheck) === 0); + } + + /** + * @return bool + */ + protected function urlMatches() + { + return ($this->currentURL === $this->urlToCheck); + } + + /** + * @return string + */ + public function getURLToCheck() + { + return $this->urlToCheck; + } + + /** + * @return bool + */ + public function urlExistsInBackURL() + { + return $this->urlExistsInBackURL; + } + + public function reloadRequired() + { + return $this->urlMatches() && !$this->tokenProvided(); + } + + public function reloadRequiredIfError() + { + return $this->reloadRequired() || $this->urlExistsInBackURL(); + } + + public function suppress() + { + $_SERVER['REQUEST_URI'] = '/'; + $this->request->setURL('/'); + } + + public function params($includeToken = true) + { + $params = []; + if ($includeToken) { + $params[$this->tokenParameterName] = $this->genToken(); + } + + return $params; + } + + public function currentURL() + { + return Controller::join_links(Director::baseURL(), $this->currentURL); + } + + protected function redirectURL() + { + // If url is encoded via BackURL, defer to home page (prevent redirect to form action) + if ($this->urlExistsInBackURL && !$this->urlMatches()) { + $url = BASE_URL ?: '/'; + $params = $this->params(); + } else { + $url = $this->currentURL(); + $params = array_merge($this->request->getVars(), $this->params()); + } + + // Merge get params with current url + return Controller::join_links($url, '?' . http_build_query($params)); + } +} diff --git a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php index d1e4175f8..27de7f930 100644 --- a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php +++ b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php @@ -74,4 +74,52 @@ class ErrorControlChainMiddlewareTest extends SapphireTest $this->assertNotContains('?flush=1&flushtoken=', $location); $this->assertContains('Security/login', $location); } + + public function testLiveBuildAdmin() + { + // Mock admin + $adminID = $this->logInWithPermission('ADMIN'); + $this->logOut(); + + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as admin + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build/'); + $request->setSession(new Session(['loggedInAs' => $adminID])); + $result = $chain->process($request, function () { + return null; + }); + + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertContains('/dev/build', $location); + $this->assertContains('?devbuildtoken=', $location); + $this->assertNotContains('Security/login', $location); + } + + public function testLiveBuildUnauthenticated() + { + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as no one + Security::setCurrentUser(null); + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build'); + $request->setSession(new Session(['loggedInAs' => 0])); + $result = $chain->process($request, function () { + return null; + }); + + // Should be directed to login, not to flush + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertNotContains('/dev/build', $location); + $this->assertNotContains('?devbuildtoken=', $location); + $this->assertContains('Security/login', $location); + } } diff --git a/tests/php/Core/Startup/ParameterConfirmationTokenTest.php b/tests/php/Core/Startup/ParameterConfirmationTokenTest.php index 66616433f..e28af8ea5 100644 --- a/tests/php/Core/Startup/ParameterConfirmationTokenTest.php +++ b/tests/php/Core/Startup/ParameterConfirmationTokenTest.php @@ -149,14 +149,14 @@ class ParameterConfirmationTokenTest extends SapphireTest } /** - * currentAbsoluteURL needs to handle base or url being missing, or any combination of slashes. + * currentURL needs to handle base or url being missing, or any combination of slashes. * * There should always be exactly one slash between each part in the result, and any trailing slash * should be preserved. * * @dataProvider dataProviderURLs */ - public function testCurrentAbsoluteURLHandlesSlashes($url) + public function testCurrentURLHandlesSlashes($url) { $this->request->setUrl($url); diff --git a/tests/php/Core/Startup/URLConfirmationTokenTest.php b/tests/php/Core/Startup/URLConfirmationTokenTest.php new file mode 100644 index 000000000..73b07eb13 --- /dev/null +++ b/tests/php/Core/Startup/URLConfirmationTokenTest.php @@ -0,0 +1,148 @@ + 'value']); + $validToken = new StubValidToken('token/test/url', $request); + $this->assertTrue($validToken->urlMatches()); + $this->assertFalse($validToken->urlExistsInBackURL()); + $this->assertTrue($validToken->tokenProvided()); // Actually forced to true for this test + $this->assertFalse($validToken->reloadRequired()); + $this->assertFalse($validToken->reloadRequiredIfError()); + $this->assertStringStartsWith(Controller::join_links(BASE_URL, '/', 'token/test/url'), $validToken->redirectURL()); + } + + public function testTokenWithLeadingSlashInUrl() + { + $request = new HTTPRequest('GET', '/leading/slash/url', []); + $leadingSlash = new StubToken('leading/slash/url', $request); + $this->assertTrue($leadingSlash->urlMatches()); + $this->assertFalse($leadingSlash->urlExistsInBackURL()); + $this->assertFalse($leadingSlash->tokenProvided()); + $this->assertTrue($leadingSlash->reloadRequired()); + $this->assertTrue($leadingSlash->reloadRequiredIfError()); + $this->assertContains('leading/slash/url', $leadingSlash->redirectURL()); + $this->assertContains('leadingslashurltoken', $leadingSlash->redirectURL()); + } + + public function testTokenWithTrailingSlashInUrl() + { + $request = new HTTPRequest('GET', 'trailing/slash/url/', []); + $trailingSlash = new StubToken('trailing/slash/url', $request); + $this->assertTrue($trailingSlash->urlMatches()); + $this->assertFalse($trailingSlash->urlExistsInBackURL()); + $this->assertFalse($trailingSlash->tokenProvided()); + $this->assertTrue($trailingSlash->reloadRequired()); + $this->assertTrue($trailingSlash->reloadRequiredIfError()); + $this->assertContains('trailing/slash/url', $trailingSlash->redirectURL()); + $this->assertContains('trailingslashurltoken', $trailingSlash->redirectURL()); + } + + public function testTokenWithUrlMatchedInBackUrl() + { + $request = new HTTPRequest('GET', '/', ['BackURL' => 'back/url']); + $backUrl = new StubToken('back/url', $request); + $this->assertFalse($backUrl->urlMatches()); + $this->assertTrue($backUrl->urlExistsInBackURL()); + $this->assertFalse($backUrl->tokenProvided()); + $this->assertFalse($backUrl->reloadRequired()); + $this->assertTrue($backUrl->reloadRequiredIfError()); + $home = (BASE_URL ?: '/') . '?'; + $this->assertStringStartsWith($home, $backUrl->redirectURL()); + $this->assertContains('backurltoken', $backUrl->redirectURL()); + } + + public function testUrlSuppressionWhenTokenMissing() + { + // Check suppression + $request = new HTTPRequest('GET', 'test/url', []); + $token = new StubToken('test/url', $request); + $this->assertEquals('test/url', $request->getURL(false)); + $token->suppress(); + $this->assertEquals('', $request->getURL(false)); + } + + public function testPrepareTokens() + { + $request = new HTTPRequest('GET', 'test/url', []); + $token = URLConfirmationToken::prepare_tokens( + [ + 'test/url', + 'test', + 'url' + ], + $request + ); + // Test no invalid tokens + $this->assertEquals('test/url', $token->getURLToCheck()); + $this->assertNotEquals('test/url', $request->getURL(false), 'prepare_tokens() did not suppress URL'); + } + + public function testPrepareTokensDoesntSuppressWhenNotMatched() + { + $request = new HTTPRequest('GET', 'test/url', []); + $token = URLConfirmationToken::prepare_tokens( + ['another/url'], + $request + ); + $this->assertEmpty($token); + $this->assertEquals('test/url', $request->getURL(false), 'prepare_tokens() incorrectly suppressed URL'); + } + + public function testPrepareTokensWithUrlMatchedInBackUrl() + { + // Test backurl token + $request = new HTTPRequest('GET', '/', ['BackURL' => 'back/url']); + $token = URLConfirmationToken::prepare_tokens( + [ 'back/url' ], + $request + ); + $this->assertNotEmpty($token); + $this->assertEquals('back/url', $token->getURLToCheck()); + $this->assertNotEquals('back/url', $request->getURL(false), 'prepare_tokens() did not suppress URL'); + } + + public function dataProviderURLs() + { + return [ + [''], + ['/'], + ['bar'], + ['bar/'], + ['/bar'], + ['/bar/'], + ]; + } + + /** + * currentURL needs to handle base or url being missing, or any combination of slashes. + * + * There should always be exactly one slash between each part in the result, and any trailing slash + * should be preserved. + * + * @dataProvider dataProviderURLs + */ + public function testCurrentURLHandlesSlashes($url) + { + $request = new HTTPRequest('GET', $url, []); + + $token = new StubToken( + 'another/url', + $request + ); + $expected = rtrim(Controller::join_links(BASE_URL, '/', $url), '/') ?: '/'; + $this->assertEquals($expected, $token->currentURL(), "Invalid redirect for request url $url"); + } +} diff --git a/tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php b/tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php new file mode 100644 index 000000000..ca08d3e1f --- /dev/null +++ b/tests/php/Core/Startup/URLConfirmationTokenTest/StubToken.php @@ -0,0 +1,27 @@ + Date: Mon, 30 Jul 2018 11:50:11 +1200 Subject: [PATCH 053/175] [SS-2018-018] Ignore arguments in mysqli::real_connect backtrace calls --- src/Dev/Backtrace.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Dev/Backtrace.php b/src/Dev/Backtrace.php index 756945c52..0b61f5a1b 100644 --- a/src/Dev/Backtrace.php +++ b/src/Dev/Backtrace.php @@ -26,6 +26,7 @@ class Backtrace array('PDO', '__construct'), array('mysqli', 'mysqli'), array('mysqli', 'select_db'), + array('mysqli', 'real_connect'), array('SilverStripe\\ORM\\DB', 'connect'), array('SilverStripe\\Security\\Security', 'check_default_admin'), array('SilverStripe\\Security\\Security', 'encrypt_password'), From 11fe5b3adffd36037ed62e490a4e8bedb7b76ac9 Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Fri, 24 Aug 2018 15:36:51 +0100 Subject: [PATCH 054/175] Implement ConfirmationTokenChain to handle multiple tokens at once --- ...oken.php => AbstractConfirmationToken.php} | 12 +- src/Core/Startup/ConfirmationTokenChain.php | 178 +++++++++++++++++ .../Startup/ErrorControlChainMiddleware.php | 62 +++--- src/Core/Startup/ErrorDirector.php | 13 +- .../Startup/ParameterConfirmationToken.php | 28 +-- src/Core/Startup/URLConfirmationToken.php | 29 +-- .../Startup/ConfirmationTokenChainTest.php | 185 ++++++++++++++++++ .../ErrorControlChainMiddlewareTest.php | 52 +++++ 8 files changed, 500 insertions(+), 59 deletions(-) rename src/Core/Startup/{ConfirmationToken.php => AbstractConfirmationToken.php} (95%) create mode 100644 src/Core/Startup/ConfirmationTokenChain.php create mode 100644 tests/php/Core/Startup/ConfirmationTokenChainTest.php diff --git a/src/Core/Startup/ConfirmationToken.php b/src/Core/Startup/AbstractConfirmationToken.php similarity index 95% rename from src/Core/Startup/ConfirmationToken.php rename to src/Core/Startup/AbstractConfirmationToken.php index d23563f46..11f78b48a 100644 --- a/src/Core/Startup/ConfirmationToken.php +++ b/src/Core/Startup/AbstractConfirmationToken.php @@ -15,7 +15,7 @@ use SilverStripe\Security\RandomGenerator; * * @internal This class is designed specifically for use pre-startup and may change without warning */ -abstract class ConfirmationToken +abstract class AbstractConfirmationToken { /** * @var HTTPRequest @@ -173,6 +173,16 @@ HTML; */ abstract public function params($includeToken = true); + /** + * @return string + */ + abstract public function getRedirectUrlBase(); + + /** + * @return array + */ + abstract public function getRedirectUrlParams(); + /** * Get redirection URL * diff --git a/src/Core/Startup/ConfirmationTokenChain.php b/src/Core/Startup/ConfirmationTokenChain.php new file mode 100644 index 000000000..a47f2c4c0 --- /dev/null +++ b/src/Core/Startup/ConfirmationTokenChain.php @@ -0,0 +1,178 @@ +tokens[] = $token; + } + + /** + * Collect all tokens that require a redirect + * + * @return \Generator + */ + protected function filteredTokens() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequired() || $token->reloadRequiredIfError()) { + yield $token; + } + } + } + + /** + * @return bool + */ + public function suppressionRequired() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequired()) { + return true; + } + } + + return false; + } + + /** + * Suppress URLs & GET vars from tokens that require a redirect + */ + public function suppressTokens() + { + foreach ($this->filteredTokens() as $token) { + $token->suppress(); + } + } + + /** + * @return bool + */ + public function reloadRequired() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequired()) { + return true; + } + } + + return false; + } + + /** + * @return bool + */ + public function reloadRequiredIfError() + { + foreach ($this->tokens as $token) { + if ($token->reloadRequiredIfError()) { + return true; + } + } + + return false; + } + + /** + * @param bool $includeToken + * @return array + */ + public function params($includeToken = true) + { + $params = []; + foreach ($this->tokens as $token) { + $params = array_merge($params, $token->params($includeToken)); + } + + return $params; + } + + /** + * Fetch the URL we want to redirect to, excluding query string parameters. This may + * be the same URL (with a token to be added outside this method), or to a different + * URL if the current one has been suppressed + * + * @return string + */ + public function getRedirectUrlBase() + { + // URLConfirmationTokens may alter the URL to suppress the URL they're protecting, + // so we need to ensure they're inspected last and therefore take priority + $tokens = iterator_to_array($this->filteredTokens(), false); + usort($tokens, function ($a, $b) { + return ($a instanceof URLConfirmationToken) ? 1 : 0; + }); + + $urlBase = Director::baseURL(); + foreach ($tokens as $token) { + $urlBase = $token->getRedirectUrlBase(); + } + + return $urlBase; + } + + /** + * Collate GET vars from all token providers that need to apply a token + * + * @return array + */ + public function getRedirectUrlParams() + { + $params = []; + foreach ($this->filteredTokens() as $token) { + $params = array_merge($params, $token->getRedirectUrlParams()); + } + + return $params; + } + + /** + * @return string + */ + protected function redirectURL() + { + $params = http_build_query($this->getRedirectUrlParams()); + return Controller::join_links($this->getRedirectUrlBase(), '?' . $params); + } + + /** + * @return HTTPResponse + */ + public function reloadWithTokens() + { + $location = $this->redirectURL(); + $locationJS = Convert::raw2js($location); + $locationATT = Convert::raw2att($location); + $body = <<location.href='$locationJS'; + +You are being redirected. If you are not redirected soon, click here to continue +HTML; + + // Build response + $result = new HTTPResponse($body); + $result->redirect($location); + return $result; + } +} diff --git a/src/Core/Startup/ErrorControlChainMiddleware.php b/src/Core/Startup/ErrorControlChainMiddleware.php index e81444629..c29878e15 100644 --- a/src/Core/Startup/ErrorControlChainMiddleware.php +++ b/src/Core/Startup/ErrorControlChainMiddleware.php @@ -34,20 +34,18 @@ class ErrorControlChainMiddleware implements HTTPMiddleware /** * @param HTTPRequest $request - * @return ConfirmationToken|null + * @return ConfirmationTokenChain */ - protected function prepareConfirmationTokenIfRequired(HTTPRequest $request) + protected function prepareConfirmationTokenChain(HTTPRequest $request) { - $token = URLConfirmationToken::prepare_tokens(['dev/build'], $request); + $chain = new ConfirmationTokenChain(); + $chain->pushToken(new URLConfirmationToken('dev/build', $request)); - if (!$token) { - $token = ParameterConfirmationToken::prepare_tokens( - ['isTest', 'isDev', 'flush'], - $request - ); + foreach (['isTest', 'isDev', 'flush'] as $parameter) { + $chain->pushToken(new ParameterConfirmationToken($parameter, $request)); } - return $token; + return $chain; } public function process(HTTPRequest $request, callable $next) @@ -55,19 +53,21 @@ class ErrorControlChainMiddleware implements HTTPMiddleware $result = null; // Prepare tokens and execute chain - $confirmationToken = $this->prepareConfirmationTokenIfRequired($request); - $chain = new ErrorControlChain(); - $chain - ->then(function () use ($request, $chain, $confirmationToken, $next, &$result) { - // If no redirection is necessary then we can disable error supression - if (!$confirmationToken) { - $chain->setSuppression(false); + $confirmationTokenChain = $this->prepareConfirmationTokenChain($request); + $errorControlChain = new ErrorControlChain(); + $errorControlChain + ->then(function () use ($request, $errorControlChain, $confirmationTokenChain, $next, &$result) { + if ($confirmationTokenChain->suppressionRequired()) { + $confirmationTokenChain->suppressTokens(); + } else { + // If no redirection is necessary then we can disable error supression + $errorControlChain->setSuppression(false); } try { // Check if a token is requesting a redirect - if ($confirmationToken && $confirmationToken->reloadRequired()) { - $result = $this->safeReloadWithToken($request, $confirmationToken); + if ($confirmationTokenChain && $confirmationTokenChain->reloadRequired()) { + $result = $this->safeReloadWithTokens($request, $confirmationTokenChain); } else { // If no reload necessary, process application $result = call_user_func($next, $request); @@ -77,10 +77,16 @@ class ErrorControlChainMiddleware implements HTTPMiddleware } }) // Finally if a token was requested but there was an error while figuring out if it's allowed, do it anyway - ->thenIfErrored(function () use ($confirmationToken) { - if ($confirmationToken && $confirmationToken->reloadRequiredIfError()) { - $result = $confirmationToken->reloadWithToken(); - $result->output(); + ->thenIfErrored(function () use ($confirmationTokenChain) { + if ($confirmationTokenChain && $confirmationTokenChain->reloadRequiredIfError()) { + try { + // Reload requires manual boot + $this->getApplication()->getKernel()->boot(false); + } finally { + // Given we're in an error state here, try to continue even if the kernel boot fails + $result = $confirmationTokenChain->reloadWithTokens(); + $result->output(); + } } }) ->execute(); @@ -92,10 +98,10 @@ class ErrorControlChainMiddleware implements HTTPMiddleware * or authentication is impossible. * * @param HTTPRequest $request - * @param ParameterConfirmationToken $reloadToken + * @param ConfirmationTokenChain $confirmationTokenChain * @return HTTPResponse */ - protected function safeReloadWithToken(HTTPRequest $request, $reloadToken) + protected function safeReloadWithTokens(HTTPRequest $request, ConfirmationTokenChain $confirmationTokenChain) { // Safe reload requires manual boot $this->getApplication()->getKernel()->boot(false); @@ -104,9 +110,9 @@ class ErrorControlChainMiddleware implements HTTPMiddleware $request->getSession()->init($request); // Request with ErrorDirector - $result = ErrorDirector::singleton()->handleRequestWithToken( + $result = ErrorDirector::singleton()->handleRequestWithTokenChain( $request, - $reloadToken, + $confirmationTokenChain, $this->getApplication()->getKernel() ); if ($result) { @@ -114,8 +120,8 @@ class ErrorControlChainMiddleware implements HTTPMiddleware } // Fail and redirect the user to the login page - $params = array_merge($request->getVars(), $reloadToken->params(false)); - $backURL = $reloadToken->currentURL() . '?' . http_build_query($params); + $params = array_merge($request->getVars(), $confirmationTokenChain->params(false)); + $backURL = $confirmationTokenChain->getRedirectUrlBase() . '?' . http_build_query($params); $loginPage = Director::absoluteURL(Security::config()->get('login_url')); $loginPage .= "?BackURL=" . urlencode($backURL); $result = new HTTPResponse(); diff --git a/src/Core/Startup/ErrorDirector.php b/src/Core/Startup/ErrorDirector.php index 54001fd05..575df7183 100644 --- a/src/Core/Startup/ErrorDirector.php +++ b/src/Core/Startup/ErrorDirector.php @@ -21,18 +21,21 @@ class ErrorDirector extends Director * Redirect with token if allowed, or null if not allowed * * @param HTTPRequest $request - * @param ConfirmationToken $token + * @param ConfirmationTokenChain $confirmationTokenChain * @param Kernel $kernel * @return null|HTTPResponse Redirection response, or null if not able to redirect */ - public function handleRequestWithToken(HTTPRequest $request, ConfirmationToken $token, Kernel $kernel) - { + public function handleRequestWithTokenChain( + HTTPRequest $request, + ConfirmationTokenChain $confirmationTokenChain, + Kernel $kernel + ) { Injector::inst()->registerService($request, HTTPRequest::class); // Next, check if we're in dev mode, or the database doesn't have any security data, or we are admin - $reload = function (HTTPRequest $request) use ($token, $kernel) { + $reload = function (HTTPRequest $request) use ($confirmationTokenChain, $kernel) { if ($kernel->getEnvironment() === Kernel::DEV || !Security::database_is_ready() || Permission::check('ADMIN')) { - return $token->reloadWithToken(); + return $confirmationTokenChain->reloadWithTokens(); } return null; }; diff --git a/src/Core/Startup/ParameterConfirmationToken.php b/src/Core/Startup/ParameterConfirmationToken.php index 4e90f1ef7..bc751a2c3 100644 --- a/src/Core/Startup/ParameterConfirmationToken.php +++ b/src/Core/Startup/ParameterConfirmationToken.php @@ -3,6 +3,7 @@ namespace SilverStripe\Core\Startup; use SilverStripe\Control\Controller; +use SilverStripe\Control\Director; use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPResponse; use SilverStripe\Core\Convert; @@ -15,7 +16,7 @@ use SilverStripe\Security\RandomGenerator; * * @internal This class is designed specifically for use pre-startup and may change without warning */ -class ParameterConfirmationToken extends ConfirmationToken +class ParameterConfirmationToken extends AbstractConfirmationToken { /** * The name of the parameter @@ -140,19 +141,22 @@ class ParameterConfirmationToken extends ConfirmationToken } return $params; } + + public function getRedirectUrlBase() + { + return ($this->existsInReferer() && !$this->parameterProvided()) ? Director::baseURL() : $this->currentURL(); + } + + public function getRedirectUrlParams() + { + return ($this->existsInReferer() && !$this->parameterProvided()) + ? $this->params() + : array_merge($this->request->getVars(), $this->params()); + } protected function redirectURL() { - // If url is encoded via BackURL, defer to home page (prevent redirect to form action) - if ($this->existsInReferer() && !$this->parameterProvided()) { - $url = BASE_URL ?: '/'; - $params = $this->params(); - } else { - $url = $this->currentURL(); - $params = array_merge($this->request->getVars(), $this->params()); - } - - // Merge get params with current url - return Controller::join_links($url, '?' . http_build_query($params)); + $query = http_build_query($this->getRedirectUrlParams()); + return Controller::join_links($this->getRedirectUrlBase(), '?' . $query); } } diff --git a/src/Core/Startup/URLConfirmationToken.php b/src/Core/Startup/URLConfirmationToken.php index 8176a41b8..bb509931e 100644 --- a/src/Core/Startup/URLConfirmationToken.php +++ b/src/Core/Startup/URLConfirmationToken.php @@ -12,7 +12,7 @@ use SilverStripe\Control\HTTPRequest; * * @internal This class is designed specifically for use pre-startup and may change without warning */ -class URLConfirmationToken extends ConfirmationToken +class URLConfirmationToken extends AbstractConfirmationToken { /** * @var string @@ -60,7 +60,7 @@ class URLConfirmationToken extends ConfirmationToken */ protected function getURLExistsInBackURL(HTTPRequest $request) { - $backURL = $request->getVar('BackURL'); + $backURL = ltrim($request->getVar('BackURL'), '/'); return (strpos($backURL, $this->urlToCheck) === 0); } @@ -119,18 +119,21 @@ class URLConfirmationToken extends ConfirmationToken return Controller::join_links(Director::baseURL(), $this->currentURL); } + public function getRedirectUrlBase() + { + return ($this->urlExistsInBackURL && !$this->urlMatches()) ? Director::baseURL() : $this->currentURL(); + } + + public function getRedirectUrlParams() + { + return ($this->urlExistsInBackURL && !$this->urlMatches()) + ? $this->params() + : array_merge($this->request->getVars(), $this->params()); + } + protected function redirectURL() { - // If url is encoded via BackURL, defer to home page (prevent redirect to form action) - if ($this->urlExistsInBackURL && !$this->urlMatches()) { - $url = BASE_URL ?: '/'; - $params = $this->params(); - } else { - $url = $this->currentURL(); - $params = array_merge($this->request->getVars(), $this->params()); - } - - // Merge get params with current url - return Controller::join_links($url, '?' . http_build_query($params)); + $query = http_build_query($this->getRedirectUrlParams()); + return Controller::join_links($this->getRedirectUrlBase(), '?' . $query); } } diff --git a/tests/php/Core/Startup/ConfirmationTokenChainTest.php b/tests/php/Core/Startup/ConfirmationTokenChainTest.php new file mode 100644 index 000000000..adb8fba36 --- /dev/null +++ b/tests/php/Core/Startup/ConfirmationTokenChainTest.php @@ -0,0 +1,185 @@ +createPartialMock(ParameterConfirmationToken::class, $methods); + $mock->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue($requiresReload)); + return $mock; + } + + protected function getTokenRequiringReloadIfError($requiresReload = true, $extraMethods = []) + { + $methods = array_merge(['reloadRequired', 'reloadRequiredIfError'], $extraMethods); + $mock = $this->createPartialMock(ParameterConfirmationToken::class, $methods); + $mock->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue(false)); + $mock->expects($this->any()) + ->method('reloadRequiredIfError') + ->will($this->returnValue($requiresReload)); + return $mock; + } + + public function testFilteredTokens() + { + $chain = new ConfirmationTokenChain(); + $chain->pushToken($tokenRequiringReload = $this->getTokenRequiringReload()); + $chain->pushToken($tokenNotRequiringReload = $this->getTokenRequiringReload(false)); + $chain->pushToken($tokenRequiringReloadIfError = $this->getTokenRequiringReloadIfError()); + $chain->pushToken($tokenNotRequiringReloadIfError = $this->getTokenRequiringReloadIfError(false)); + + $reflectionMethod = new \ReflectionMethod(ConfirmationTokenChain::class, 'filteredTokens'); + $reflectionMethod->setAccessible(true); + $tokens = iterator_to_array($reflectionMethod->invoke($chain)); + + $this->assertContains($tokenRequiringReload, $tokens, 'Token requiring a reload was not returned'); + $this->assertNotContains($tokenNotRequiringReload, $tokens, 'Token not requiring a reload was returned'); + $this->assertContains($tokenRequiringReloadIfError, $tokens, 'Token requiring a reload on error was not returned'); + $this->assertNotContains($tokenNotRequiringReloadIfError, $tokens, 'Token not requiring a reload on error was returned'); + } + + public function testSuppressionRequired() + { + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReload(false)); + $this->assertFalse($chain->suppressionRequired(), 'Suppression incorrectly marked as required'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReloadIfError(false)); + $this->assertFalse($chain->suppressionRequired(), 'Suppression incorrectly marked as required'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReload()); + $this->assertTrue($chain->suppressionRequired(), 'Suppression not marked as required'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($this->getTokenRequiringReloadIfError()); + $this->assertFalse($chain->suppressionRequired(), 'Suppression incorrectly marked as required'); + } + + public function testSuppressTokens() + { + $mockToken = $this->getTokenRequiringReload(true, ['suppress']); + $mockToken->expects($this->once()) + ->method('suppress'); + $secondMockToken = $this->getTokenRequiringReloadIfError(true, ['suppress']); + $secondMockToken->expects($this->once()) + ->method('suppress'); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $chain->suppressTokens(); + } + + public function testReloadRequired() + { + $mockToken = $this->getTokenRequiringReload(true); + $secondMockToken = $this->getTokenRequiringReload(false); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertTrue($chain->reloadRequired()); + } + + public function testReloadRequiredIfError() + { + $mockToken = $this->getTokenRequiringReloadIfError(true); + $secondMockToken = $this->getTokenRequiringReloadIfError(false); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertTrue($chain->reloadRequiredIfError()); + } + + public function testParams() + { + $mockToken = $this->getTokenRequiringReload(true, ['params']); + $mockToken->expects($this->once()) + ->method('params') + ->with($this->isTrue()) + ->will($this->returnValue(['mockTokenParam' => '1'])); + $secondMockToken = $this->getTokenRequiringReload(true, ['params']); + $secondMockToken->expects($this->once()) + ->method('params') + ->with($this->isTrue()) + ->will($this->returnValue(['secondMockTokenParam' => '2'])); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertEquals(['mockTokenParam' => '1', 'secondMockTokenParam' => '2'], $chain->params(true)); + + $mockToken = $this->getTokenRequiringReload(true, ['params']); + $mockToken->expects($this->once()) + ->method('params') + ->with($this->isFalse()) + ->will($this->returnValue(['mockTokenParam' => '1'])); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $this->assertEquals(['mockTokenParam' => '1'], $chain->params(false)); + } + + public function testGetRedirectUrlBase() + { + $mockUrlToken = $this->createPartialMock(URLConfirmationToken::class, ['reloadRequired', 'getRedirectUrlBase']); + $mockUrlToken->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue(true)); + $mockUrlToken->expects($this->any()) + ->method('getRedirectUrlBase') + ->will($this->returnValue('url-base')); + + $mockParameterToken = $this->createPartialMock(ParameterConfirmationToken::class, ['reloadRequired', 'getRedirectUrlBase']); + $mockParameterToken->expects($this->any()) + ->method('reloadRequired') + ->will($this->returnValue(true)); + $mockParameterToken->expects($this->any()) + ->method('getRedirectUrlBase') + ->will($this->returnValue('parameter-base')); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockParameterToken); + $chain->pushToken($mockUrlToken); + $this->assertEquals('url-base', $chain->getRedirectUrlBase(), 'URLConfirmationToken url base should take priority'); + + // Push them in reverse order to check priority still correct + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockUrlToken); + $chain->pushToken($mockParameterToken); + $this->assertEquals('url-base', $chain->getRedirectUrlBase(), 'URLConfirmationToken url base should take priority'); + } + + public function testGetRedirectUrlParams() + { + $mockToken = $this->getTokenRequiringReload(true, ['getRedirectUrlParams']); + $mockToken->expects($this->once()) + ->method('getRedirectUrlParams') + ->will($this->returnValue(['mockTokenParam' => '1'])); + + $secondMockToken = $this->getTokenRequiringReload(true, ['getRedirectUrlParams']); + $secondMockToken->expects($this->once()) + ->method('getRedirectUrlParams') + ->will($this->returnValue(['secondMockTokenParam' => '2'])); + + $chain = new ConfirmationTokenChain(); + $chain->pushToken($mockToken); + $chain->pushToken($secondMockToken); + $this->assertEquals(['mockTokenParam' => '1', 'secondMockTokenParam' => '2'], $chain->getRedirectUrlParams()); + } +} diff --git a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php index 27de7f930..7cf793c2f 100644 --- a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php +++ b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php @@ -122,4 +122,56 @@ class ErrorControlChainMiddlewareTest extends SapphireTest $this->assertNotContains('?devbuildtoken=', $location); $this->assertContains('Security/login', $location); } + + public function testLiveBuildAndFlushAdmin() + { + // Mock admin + $adminID = $this->logInWithPermission('ADMIN'); + $this->logOut(); + + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as admin + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build/', ['flush' => '1']); + $request->setSession(new Session(['loggedInAs' => $adminID])); + $result = $chain->process($request, function () { + return null; + }); + + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertContains('/dev/build', $location); + $this->assertContains('flush=1', $location); + $this->assertContains('devbuildtoken=', $location); + $this->assertContains('flushtoken=', $location); + $this->assertNotContains('Security/login', $location); + } + + public function testLiveBuildAndFlushUnauthenticated() + { + // Mock app + $app = new HTTPApplication(new BlankKernel(BASE_PATH)); + $app->getKernel()->setEnvironment(Kernel::LIVE); + + // Test being logged in as no one + Security::setCurrentUser(null); + $chain = new ErrorControlChainMiddleware($app); + $request = new HTTPRequest('GET', '/dev/build', ['flush' => '1']); + $request->setSession(new Session(['loggedInAs' => 0])); + $result = $chain->process($request, function () { + return null; + }); + + // Should be directed to login, not to flush + $this->assertInstanceOf(HTTPResponse::class, $result); + $location = $result->getHeader('Location'); + $this->assertNotContains('/dev/build', $location); + $this->assertNotContains('flush=1', $location); + $this->assertNotContains('devbuildtoken=', $location); + $this->assertNotContains('flushtoken=', $location); + $this->assertContains('Security/login', $location); + } } From 1944a5a99b1c02c497676f6872882a2cf2250bea Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Wed, 7 Nov 2018 16:31:27 +1300 Subject: [PATCH 055/175] Update translations --- lang/ar.yml | 3 - lang/bg.yml | 3 - lang/cs.yml | 3 - lang/da.yml | 325 ++++++++++++++++++++++++++++++++++++++++++- lang/de.yml | 3 - lang/en.yml | 8 +- lang/eo.yml | 9 +- lang/es.yml | 3 - lang/et_EE.yml | 3 - lang/fa_IR.yml | 1 - lang/fi.yml | 17 ++- lang/fr.yml | 6 - lang/id.yml | 3 - lang/id_ID.yml | 3 - lang/it.yml | 15 +- lang/ja.yml | 3 - lang/lt.yml | 3 - lang/mi.yml | 3 - lang/nb.yml | 3 - lang/nl.yml | 160 ++++++++++++++++++++- lang/pl.yml | 6 - lang/ru.yml | 3 - lang/sk.yml | 3 - lang/sl.yml | 3 - lang/sr.yml | 3 - lang/sr@latin.yml | 3 - lang/sr_RS.yml | 3 - lang/sr_RS@latin.yml | 3 - lang/sv.yml | 19 ++- lang/zh.yml | 3 - 30 files changed, 534 insertions(+), 92 deletions(-) diff --git a/lang/ar.yml b/lang/ar.yml index 19381589f..518bf1344 100644 --- a/lang/ar.yml +++ b/lang/ar.yml @@ -150,7 +150,4 @@ ar: LOGIN: دخول LOSTPASSWORDHEADER: 'كلمة مرور مفقودة' NOTEPAGESECURED: 'هذه الصفحة محمية بكلمة مرور ، أدخل بيانات دخولك بالأسفل ليتم السماح لك بالوصول للصفحة' - NOTERESETLINKINVALID: "

رابط إعادة تعيين كلمة المرور غير صحيح أو نفذت صلاحيته.

\n

\nيمكنك طلب رابط جديد <\"{a href=\"{link1\"> هنا \n أو تغيير كلمة المرور الخاصة بك بعد <\"{a href=\"{link2\"> تسجيل دخولك.\n

" NOTERESETPASSWORD: 'أدخل بريدك الإلكتروني و سيتم إرسال رابط إعادة تهيئة كلمة المرور ' - PASSWORDSENTHEADER: 'رابط استعادة كلمة المرور تم إرساله إلى ''{بريدك}''' - PASSWORDSENTTEXT: 'شكرا لك! تم إرسال رابط إعادة تعيين إلى ''{بريدك}''، بشرط وجود حساب قائم بالنسبة لعنوان هذا البريد الإلكتروني .' diff --git a/lang/bg.yml b/lang/bg.yml index 3e1eba6a0..241841f1e 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -313,7 +313,4 @@ bg: LOGOUT: Изход LOSTPASSWORDHEADER: 'Забравена парола' NOTEPAGESECURED: 'Тази страница е защитена. Въведете вашите данни по-долу, за да продължите.' - NOTERESETLINKINVALID: '

Връзката за нулиране на парола не е вярна или е просрочена.

Можете да заявите нова тук или да промените паролата си след като влезете.

' NOTERESETPASSWORD: 'Въведете вашият email адрес и ще ви изпратим линк, с който ще можете да смените паролата си' - PASSWORDSENTHEADER: 'Връзка за нулиране на парола беше изпратена на ''{email}''' - PASSWORDSENTTEXT: 'Благодарим ви! Връзка за нулиране на паролата беше изпратен на ''{email}'', ако съществува акаунт с този имейл адрес.' diff --git a/lang/cs.yml b/lang/cs.yml index 4a3cae3ab..759f0268e 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -194,7 +194,4 @@ cs: LOGIN: Přihlásit LOSTPASSWORDHEADER: 'Zapomenuté heslo' NOTEPAGESECURED: 'Tato stránka je zabezpečená. Vložte své přihlašovací údaje a my Vám zároveň pošleme práva.' - NOTERESETLINKINVALID: '

Odkaz na resetování hesla není platný nebo je prošlý.

Můžete požádat o nový zde nebo změňte své heslo až se přihlásíte.

' NOTERESETPASSWORD: 'Zadejte svou e-mailovou adresu a bude vám zaslán nulovací odkaz pro Vaše heslo' - PASSWORDSENTHEADER: 'Odkaz na resetování hesla byl odeslán na ''{email}''' - PASSWORDSENTTEXT: 'Děkujeme! Resetovací odkaz byl odeslán na ''{email}'', pokud účet existuje pro tuto emailovou adresu.' diff --git a/lang/da.yml b/lang/da.yml index 8dc512b23..3fe62969a 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -1,5 +1,328 @@ da: + SilverStripe\Admin\LeftAndMain: + VersionUnknown: ukendt + SilverStripe\AssetAdmin\Forms\UploadField: + Dimensions: Dimensioner + EDIT: Rediger + EDITINFO: 'Rediger denne fil' + REMOVE: Fjern + SilverStripe\Control\ChangePasswordEmail_ss: + CHANGEPASSWORDFOREMAIL: 'Koden for kontoen med email addressen {email} er ændret. Hvis du ikke har skiftet din kode, så skift venligst din kode ved at klikke på linket herunder' + CHANGEPASSWORDTEXT1: 'Du skiftede dit kodeord for' + CHANGEPASSWORDTEXT3: 'Skift kodeord' + HELLO: Hej + SilverStripe\Control\Email\ForgotPasswordEmail_ss: + HELLO: Hej + TEXT1: 'Her er din' + TEXT2: 'link til at nulstille dit kodeord' + TEXT3: for + SilverStripe\Control\RequestProcessor: + INVALID_REQUEST: 'Ugyldig forespørgsel' + REQUEST_ABORTED: 'Forespørgsel annulleret' + SilverStripe\Core\Manifest\VersionProvider: + VERSIONUNKNOWN: Ukendt + SilverStripe\Forms\CheckboxField: + NOANSWER: Nej + YESANSWER: Ja + SilverStripe\Forms\CheckboxSetField_ss: + NOOPTIONSAVAILABLE: 'Ingen tilgængelige muligheder' + SilverStripe\Forms\ConfirmedPasswordField: + ATLEAST: 'Kodeord skal være mindst {min} tegn lang.' + BETWEEN: 'Kodeord skal være {min} til {max} karakterer lang.' + CURRENT_PASSWORD_ERROR: 'Det nuværende kodeord du har indtastet er ikke korrekt.' + CURRENT_PASSWORD_MISSING: 'Du skal indtaste dit nuværende kodeord.' + LOGGED_IN_ERROR: 'Du skal være logget ind for at skifte dit kodeord.' + MAXIMUM: 'Kodeord må maks være {max} tegn lang' + SHOWONCLICKTITLE: 'Skift kodeord' + SilverStripe\Forms\CurrencyField: + CURRENCYSYMBOL: DKK + SilverStripe\Forms\DateField: + VALIDDATEFORMAT2: 'Indtats venligst et gyldigt datoformat ({format})' + VALIDDATEMAXDATE: 'Din dato skal være ældre end eller matche den maksimalt tilladte dato ({date})' + VALIDDATEMINDATE: 'Din dato skal være yngre end eller matche den minimum tilladte dato ({date})' + SilverStripe\Forms\DatetimeField: + VALIDDATEMAXDATETIME: 'Din dato skal være ældre end eller matche den maksimalt tilladte dato ({datetime})' + VALIDDATETIMEFORMAT: 'Indtats venligst et gyldigt dato- og tidsformat ({format})' + VALIDDATETIMEMINDATE: 'Din dato skal være yngre end eller matche den minimum tilladte dato og tid ({datetime})' + SilverStripe\Forms\DropdownField: + CHOOSE: (Vælg) + CHOOSE_MODEL: '(Vælg {name})' + SOURCE_VALIDATION: 'Venligst vælg en eksisterende værdi fra listen. {value} er ikke en tilladt mulighed' + SilverStripe\Forms\EmailField: + VALIDATION: 'Indtast venligst en emailadresse' + SilverStripe\Forms\FileUploadReceiver: + FIELDNOTSET: 'Fil information ikke fundet' + SilverStripe\Forms\Form: + BAD_METHOD: 'Denne form kræver en {method} indsendelse' + CSRF_EXPIRED_MESSAGE: 'Din session er udløbet. Venligst gensend formularen.' + CSRF_FAILED_MESSAGE: 'Det ser ud til der har været et teknisk problem. Klik venligst på tilbageknappen, tryk opdater i din browser og prøv igen.' + VALIDATIONPASSWORDSDONTMATCH: 'Kodeordene er ikke identiske' + VALIDATIONPASSWORDSNOTEMPTY: 'Kodeord kan ikke være tomme' + VALIDATIONSTRONGPASSWORD: 'Kodeord skal mindst have et tal og et alfanumerisk tegn' + VALIDATOR: Validering + VALIDCURRENCY: 'Indtast venligst en gyldig valuta' + SilverStripe\Forms\FormField: + EXAMPLE: 'f.eks. {format}' + NONE: ingen + SilverStripe\Forms\FormScaffolder: + TABMAIN: Primær SilverStripe\Forms\GridField\GridField: - Filter: Filter + Add: 'Tilføj {name}' + CSVEXPORT: 'Eksporter til CSV' + CSVIMPORT: 'Importer CSV' + Filter: Filtrer + FilterBy: 'Filtrer på' + Find: Find + LinkExisting: 'Link eksisterende' + NewRecord: 'Ny {type}' + NoItemsFound: 'Ingen elementer fundet' + PRINTEDAT: 'Printet d.' + PRINTEDBY: 'Printet af' + PlaceHolder: 'Find {type}' + PlaceHolderWithLabels: 'Find {type} på {name}' + Print: Print + RelationSearch: Relationssøgning + ResetFilter: Nulstil + SilverStripe\Forms\GridField\GridFieldDeleteAction: + Delete: Slet + DeletePermissionsFailure: 'Ingen slette rettigheder' + EditPermissionsFailure: 'Ingen rettighed til at fjerne emnet' + UnlinkRelation: Fjern + SilverStripe\Forms\GridField\GridFieldDetailForm: + CancelBtn: Annuller + Create: Opret + Delete: Slet + DeletePermissionsFailure: 'Ingen slette rettigheder' + Deleted: 'Slet {type} {name}' + Save: Gem + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Rediger + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'Kan ikke fjerne dig selv fra denne gruppe, du vil miste administrator rettigheder' + SilverStripe\Forms\GridField\GridFieldPaginator: + OF: af + Page: Side + View: Vis + SilverStripe\Forms\MoneyField: + FIELDLABELAMOUNT: Beløb + FIELDLABELCURRENCY: Valuta + INVALID_CURRENCY: 'Valuta {currency} er ikke i listen over tilladte valutaer' + SilverStripe\Forms\MultiSelectField: + SOURCE_VALIDATION: 'Vælg venligst eksisterende værdier fra listen. Ugyldig mulighed(er) {value} valgt' + SilverStripe\Forms\NullableField: + IsNullLabel: 'Er Null' + SilverStripe\Forms\NumericField: + VALIDATION: '''{value}'' er ikke et tal, kun tal accepteres i dette felt' + SilverStripe\Forms\TimeField: + VALIDATEFORMAT: 'Indtats venligst et gyldigt tidsformat ({format})' + SilverStripe\ORM\DataObject: + PLURALNAME: Dataobjekter + PLURALS: + one: 'Et dataobjekt' + other: '{count} dataobjekter' + SINGULARNAME: Dataobjekt + SilverStripe\ORM\FieldType\DBBoolean: + ANY: Enhver + NOANSWER: Nej + YESANSWER: Ja + SilverStripe\ORM\FieldType\DBDate: + DAYS_SHORT_PLURALS: + one: '{count} dag' + other: '{count} dage' + HOURS_SHORT_PLURALS: + one: '{count} time' + other: '{count} timer' + LessThanMinuteAgo: 'mindre end et minut' + MINUTES_SHORT_PLURALS: + one: '{count} minut' + other: '{count} minutter' + MONTHS_SHORT_PLURALS: + one: '{count} måned' + other: '{count} måneder' + SECONDS_SHORT_PLURALS: + one: '{count} sekund' + other: '{count} sekunder' + TIMEDIFFAGO: '{difference} siden' + TIMEDIFFIN: 'i {difference}' + YEARS_SHORT_PLURALS: + one: '{count} år' + other: '{count} år' + SilverStripe\ORM\FieldType\DBEnum: + ANY: Enhver + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'For mange relaterede objekter; fallback felt i brug' + SilverStripe\ORM\Hierarchy: + LIMITED_TITLE: 'For mange underelementer ({count})' + SilverStripe\ORM\Hierarchy\Hierarchy: + InfiniteLoopNotAllowed: 'Uendeligt løkke fundet i "{type}" hierarkiet. Ændre venligst det overliggende element for at løse dette' + LIMITED_TITLE: 'For mange underelementer ({count})' + SilverStripe\ORM\ValidationException: + DEFAULT_ERROR: Valideringsfejl + SilverStripe\Security\BasicAuth: + ENTERINFO: 'Indtast venligst et brugernavn og kodeord.' + ERRORNOTADMIN: 'Den bruger er ikke en administrator.' + ERRORNOTREC: 'Brugernavn / kodeord kunne ikke genkendes' + SilverStripe\Security\CMSMemberLoginForm: + PASSWORDEXPIRED: '

Dit kodeord er udløbet. Vælg venligst et nyt.

' + SilverStripe\Security\CMSSecurity: + INVALIDUSER: '

Ugyldig bruger. Log venligst ind igen her for at fortsætte.

' + LOGIN_MESSAGE: '

Din session er løbet ud pga. inaktivitet

' + LOGIN_TITLE: 'Log ind igen, for at fortsætte hvor du slap.' + SUCCESS: Succes + SUCCESSCONTENT: '

Logget ind. Hvis du ikke automatisk viderestilles så klik her

' + SUCCESS_TITLE: 'Logget ind med sucess' + SilverStripe\Security\DefaultAdminService: + DefaultAdminFirstname: 'Standard admin' + SilverStripe\Security\Group: + AddRole: 'Tilføj en rolle for denne gruppe' + Code: 'Gruppe kode' + DefaultGroupTitleAdministrators: Administratorer + DefaultGroupTitleContentAuthors: Indholdsforfattere + Description: Beskrivelse + GROUPNAME: Gruppenavn + GroupReminder: 'Hvis du vælger en overliggende gruppe, får denne gruppe alle dens roller' + HierarchyPermsError: 'Kan ikke tildele overliggende gruppe "{group}" med fortrinsrettigheder (kræver ADMIN adgang)' + Locked: 'Låst?' + MEMBERS: Brugere + NEWGROUP: 'Ny gruppe' + NoRoles: 'Ingen roller fundet' + PERMISSIONS: Rettigheder + PLURALNAME: Grupper + PLURALS: + one: 'En gruppe' + other: '{count} grupper' + Parent: 'Overliggende gruppe' + ROLES: Roller + ROLESDESCRIPTION: 'Roller er et prædefineret sæt af rettigheder, som kan tildeles grupper.
De bliver nedarvet fra en overliggende grupper hvis krævet.' + RolesAddEditLink: 'Administrer roller' + SINGULARNAME: Gruppe + Sort: Sortering + has_many_Permissions: Rettigheder + many_many_Members: Brugere + SilverStripe\Security\LoginAttempt: + Email: 'Email adresse' + EmailHashed: 'Email adresse (hashed)' + IP: 'IP addresse' + PLURALNAME: Loginforsøg + PLURALS: + one: 'Et loginforsøg' + other: '{count} loginforsøg' + SINGULARNAME: 'Login forsøg' + Status: Status + SilverStripe\Security\Member: + ADDGROUP: 'Tilføj gruppe' + BUTTONCHANGEPASSWORD: 'Skift kodeord' + BUTTONLOGIN: 'Log ind' + BUTTONLOGINOTHER: 'Log ind med en anden bruger' + BUTTONLOGOUT: 'Log ud' + BUTTONLOSTPASSWORD: 'Jeg har glemt mit kodeord' + CONFIRMNEWPASSWORD: 'Bekræft nyt kodeord' + CONFIRMPASSWORD: 'Bekræft kodeord' + CURRENT_PASSWORD: 'Nuværende kodeord' + EDIT_PASSWORD: 'Nyt kodeord' + EMAIL: Email + EMPTYNEWPASSWORD: 'Det nye kodeord kan ikke være tom, prøv venligst igen' + ENTEREMAIL: 'Indtast venligst en email adresse for at få et nulstillingslink.' + ERRORLOCKEDOUT2: 'Din konto er blevet midlertidigt deaktiveret pga. for mange fejlslagne loginforsøg. Forsøg venligst igen om {count} minutter.' + ERRORNEWPASSWORD: 'Du har indtastet dit nye kodeord forskelligt, forsøg igen' + ERRORPASSWORDNOTMATCH: 'Dit nuværende kodeord matcher ikke, forsøg venligst igen' + ERRORWRONGCRED: 'De indtastede værdier ser ikke ud til at være korrekte. Forsøg venligst igen.' + FIRSTNAME: Fornavn + INTERFACELANG: 'Sprog i brugerfladen' + KEEPMESIGNEDIN: 'Hold mig logget ind' + LOGGEDINAS: 'Du er logget ind som {name}.' + NEWPASSWORD: 'Nyt kodeord' + PASSWORD: Kodeord + PASSWORDEXPIRED: 'Dit kodeord er udløbet. Vælg venligst et nyt.' + PLURALNAME: Brugere + PLURALS: + one: 'En bruger' + other: '{count} brugere' + REMEMBERME: 'Husk mig til næste gang? (i {count} dage på denne enhed)' + SINGULARNAME: Bruger + SUBJECTPASSWORDCHANGED: 'Dit kodeord er blevet ændret' + SUBJECTPASSWORDRESET: 'Link til at nulstille dit kodeord' + SURNAME: Efternavn + VALIDATIONADMINLOSTACCESS: 'Kan ikke fjerne alle admin grupper fra din profil' + ValidationIdentifierFailed: 'Kan ikke overskrive eksisterende bruger #{id} med identisk identifikator ({name} = {value}))' + WELCOMEBACK: 'Velkommen tilbage, {firstname}' + YOUROLDPASSWORD: 'Dit gamle kodeord' + belongs_many_many_Groups: Grupper + db_Locale: 'Sprog i brugerfladen' + db_LockedOutUntil: 'Låst ude indtil' + db_Password: Kodeord + db_PasswordExpiry: Kodeordsudløbsdato + SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: + AUTHENTICATORNAME: 'CMS bruger loginform' + BUTTONFORGOTPASSWORD: 'Glemt kodeord' + BUTTONLOGIN: 'Log mig ind igen' + BUTTONLOGOUT: 'Log ud' + SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: + ERRORWRONGCRED: 'De indtastede værdier ser ikke ud til at være korrekte. Forsøg venligst igen.' + NoPassword: 'Der er ikke en kode på denne bruger.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'Email og kodeord' + SilverStripe\Security\MemberPassword: + PLURALNAME: 'Bruger kodeord' + PLURALS: + one: 'Et bruger kodeord' + other: '{count} bruger kodeord' + SINGULARNAME: 'Bruger kodeord' + SilverStripe\Security\PasswordValidator: + LOWCHARSTRENGTH: 'Forøg venligst kodeordets styrke, ved at tilføje nogle af følgende tegn: {chars}' + PREVPASSWORD: 'Du har tidligere brugt dette kodeord, vælg venligst et nyt kodeord' + TOOSHORT: 'Kodeordet er for kort, det skal mindst være {minimum} eller flere tegn langt' SilverStripe\Security\Permission: + AdminGroup: Administrator + CMS_ACCESS_CATEGORY: 'CMS Adgang' CONTENT_CATEGORY: Indholdsrettigheder + FULLADMINRIGHTS: 'Fuld administrator rettighed' + FULLADMINRIGHTS_HELP: 'Indebærer og overskriver alle andre tildelte rettigheder.' + PERMISSIONS_CATEGORY: 'Roller og adgangsrettigheder' + PLURALNAME: Rettigheder + PLURALS: + one: 'En rettighed' + other: '{count} rettigheder' + SINGULARNAME: Rettighed + UserPermissionsIntro: 'Tildeling af grupper til denne bruger, ændrer de rettigheder brugeren har. Se gruppe området for rettigheds detaljer på de individuelle grupper.' + SilverStripe\Security\PermissionCheckboxSetField: + AssignedTo: 'tildelt til "{title}"' + FromGroup: 'nedarvet fra gruppen "{title}"' + FromRole: 'nedarvet fra rollen "{title}"' + FromRoleOnGroup: 'nedarvet fra rollen "{roletitle}" på gruppen "{grouptitle}"' + SilverStripe\Security\PermissionRole: + OnlyAdminCanApply: 'Kun administratorer kan tilføje' + PLURALNAME: Roller + PLURALS: + one: 'En rolle' + other: '{count} roller' + SINGULARNAME: Rolle + Title: Titel + SilverStripe\Security\PermissionRoleCode: + PLURALNAME: 'Rettigheds rolle koder' + PLURALS: + one: 'En rettigheds rolle kode' + other: '{count} rettigheds rolle koder' + PermsError: 'Kan ikke tildele koden "{code}" med fortrinsrettigheder (kræver ADMIN adgang)' + SINGULARNAME: 'Rettighed rolle kode' + SilverStripe\Security\RememberLoginHash: + PLURALNAME: 'Login hashes' + PLURALS: + one: 'Et login hash' + other: '{count} Login Hashes' + SINGULARNAME: 'Login hash' + SilverStripe\Security\Security: + ALREADYLOGGEDIN: 'Du har ikke adgang til denne side. Hvis du har en anden bruger der har adgang til denne side, kan du logge ind med denne herunder.' + BUTTONSEND: 'Send mig linket til at nulstille kodeordet' + CHANGEPASSWORDBELOW: 'Du kan ændre dit kodeord herunder.' + CHANGEPASSWORDHEADER: 'Skift dit kodeord' + CONFIRMLOGOUT: 'Klik venligst på knappen herunder, for at bekræfte at du vil logge ud.' + ENTERNEWPASSWORD: 'Indtast venligst et nyt kodeord.' + ERRORPASSWORDPERMISSION: 'Du skal være logget ind, for at kunne ændre dit kodeord!' + LOGIN: 'Log ind' + LOGOUT: 'Log ud' + LOSTPASSWORDHEADER: 'Glemt kodeord' + NOTEPAGESECURED: 'Denne side er beskyttet. Indtast dine loginoplysninger herunder for at få adgang.' + NOTERESETPASSWORD: 'Indtast din email adresse, så sender vi dig et link som du kan nulstille dit kodeord med' + PASSWORDRESETSENTHEADER: 'link til at nulstille kodeord afsendt' + PASSWORDRESETSENTTEXT: 'Tak for det. Et link til at nulstille dit kodeord er afsendt, hvis der findes en bruger med denne email adresse.' diff --git a/lang/de.yml b/lang/de.yml index 1e9f16e5e..77e2f1584 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -190,7 +190,4 @@ de: LOGIN: Anmelden LOSTPASSWORDHEADER: 'Passwort vergessen' NOTEPAGESECURED: 'Diese Seite ist geschützt. Bitte melden Sie sich an und Sie werden sofort weitergeleitet.' - NOTERESETLINKINVALID: '

Der Link zum Zurücksetzen des Passworts ist entweder nicht korrekt oder abgelaufen

Sie können einen neuen Link anfordern oder Ihr Passwort nach dem einloggen ändern.

' NOTERESETPASSWORD: 'Geben Sie Ihre E-Mail-Adresse ein und wir werden Ihnen einen Link zuschicken, mit dem Sie Ihr Passwort zurücksetzen können.' - PASSWORDSENTHEADER: 'Der Link zum Zurücksetzen des Passworts wurde an ''{email}'' gesendet' - PASSWORDSENTTEXT: 'Vielen Dank! Wenn ein Account zu der E-Mail Adresse ''{email}'' existiert, wurde eine E-Mail mit dem Link zum Zurücksetzen des Passworts verschickt.' diff --git a/lang/en.yml b/lang/en.yml index a81c56613..42a437d01 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -78,6 +78,7 @@ en: LinkExisting: 'Link Existing' NewRecord: 'New {type}' NoItemsFound: 'No items found' + OpenFilter: 'Open search and filter' PRINTEDAT: 'Printed at' PRINTEDBY: 'Printed by' PlaceHolder: 'Find {type}' @@ -85,10 +86,6 @@ en: Print: Print RelationSearch: 'Relation search' ResetFilter: Reset - OpenFilter: 'Open search and filter' - SilverStripe\Forms\GridField\GridFieldFilterHeader: - Search: 'Search "{name}"' - SearchFormFaliure: 'No search form could be generated' SilverStripe\Forms\GridField\GridFieldDeleteAction: Delete: Delete DeletePermissionsFailure: 'No delete permissions' @@ -103,6 +100,9 @@ en: Save: Save SilverStripe\Forms\GridField\GridFieldEditButton: EDIT: Edit + SilverStripe\Forms\GridField\GridFieldFilterHeader: + Search: 'Search "{name}"' + SearchFormFaliure: 'No search form could be generated' SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Cannot remove yourself from this group, you will lose admin rights' SilverStripe\Forms\GridField\GridFieldPaginator: diff --git a/lang/eo.yml b/lang/eo.yml index 59806b953..fb6b74ca9 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -95,6 +95,8 @@ eo: DeletePermissionsFailure: 'Mankas permeso forigi' Deleted: 'Forigita {type} {name}' Save: Konservi + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Redakti SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Ne povas forigi vin el ĉi tiu grupo; vi perdus administrajn rajtojn' SilverStripe\Forms\GridField\GridFieldPaginator: @@ -147,6 +149,8 @@ eo: other: '{count} jaroj' SilverStripe\ORM\FieldType\DBEnum: ANY: Ajna + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Tro multaj objektoj; retropaŝa kampo uzata' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Tro da idoj ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -319,7 +323,6 @@ eo: LOGOUT: Elsaluti LOSTPASSWORDHEADER: 'Perdis pasvorton' NOTEPAGESECURED: 'Tiu paĝo estas sekurigita. Enigu viajn akreditaĵojn sube kaj vi aliros pluen.' - NOTERESETLINKINVALID: '

La pasvorta reagorda ligilo estas malvalida aŭ finiĝis.

Vi povas peti novan ĉi tie aŭ ŝanĝi vian pasvorton post vi ensalutis.

' NOTERESETPASSWORD: 'Enigu vian retpoŝtan adreson kaj ni sendos al vi ligilon per kiu vi povas reagordi vian pasvorton' - PASSWORDSENTHEADER: 'Pasvorta reagorda ligilo sendiĝis al ''{email}''' - PASSWORDSENTTEXT: 'Dankon! Reagordita ligilo sendiĝis al ''{email}'', kondiĉe ke konto ekzistas por tiu retadreso.' + PASSWORDRESETSENTHEADER: 'Pasvorta reagorda ligilo sendiĝis' + PASSWORDRESETSENTTEXT: 'Dankon. Reagorda ligilo sendiĝis, kondiĉe ke konto ekzistas por ĉi tiu retadreso.' diff --git a/lang/es.yml b/lang/es.yml index 0009c7a4a..debd4b4a7 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -249,7 +249,4 @@ es: LOGIN: Entrar LOSTPASSWORDHEADER: '¿Contraseña Perdida?' NOTEPAGESECURED: 'Esa página está protegida. Introduzca sus datos de acreditación a continuación y lo enviaremos a ella en un momento.' - NOTERESETLINKINVALID: '

El enlace para restablecer la contraseña es inválido o ha expirado.

Usted puede solicitar uno nuevo aqui o cambiar su contraseña después de que se haya conectado.

' NOTERESETPASSWORD: 'Introduzca su dirección de e-mail, y le enviaremos un enlace, con el cual podrá restaurar su contraseña' - PASSWORDSENTHEADER: 'Un enlace para restablecer la contraseña ha sido enviado a ''{email}''' - PASSWORDSENTTEXT: 'Gracias! Un enlace para restablecer la contraseña ha sido enviado a ''{email}'', siempre que una cuenta exista para la dirección de email indicada.' diff --git a/lang/et_EE.yml b/lang/et_EE.yml index 63fc4cd5d..a8fb3b686 100644 --- a/lang/et_EE.yml +++ b/lang/et_EE.yml @@ -139,7 +139,4 @@ et_EE: ERRORPASSWORDPERMISSION: 'Pead olema sisseloginud, et parooli muuta!' LOGIN: 'Logi sisse' NOTEPAGESECURED: 'See leht on turvatud. Sisesta enda andmed allpool ja me saadame sind otse edasi' - NOTERESETLINKINVALID: '

Parooli lähtestamise link on kehtetu või aegunud.

Saate taotleda uut linki siin või muuta parooli pärast sisselogimist.

' NOTERESETPASSWORD: 'Sisesta oma email ja me saadame sulle lingi kus saad oma parooli tühistada.' - PASSWORDSENTHEADER: 'Parooli lähtestamise link saadeti aadressile ''{email}''' - PASSWORDSENTTEXT: 'Aitäh! Lähtestamislink saadeti aadressile ''{email}'' eeldusel, et selle e-posti aadressiga seotud konto on olemas.' diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml index b292b25d7..b9aa0ebea 100644 --- a/lang/fa_IR.yml +++ b/lang/fa_IR.yml @@ -168,4 +168,3 @@ fa_IR: ERRORPASSWORDPERMISSION: 'جهت تغییر گذرواژه خود باید وارد شده باشید!' LOGIN: ورود LOSTPASSWORDHEADER: 'فراموشی گذرواژه' - PASSWORDSENTHEADER: 'لینک ازنوسازی گذرواژه به ''{email}'' ارسال شد' diff --git a/lang/fi.yml b/lang/fi.yml index 364762d3a..b19807225 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -76,6 +76,7 @@ fi: LinkExisting: 'Linkitä olemassaoleva' NewRecord: 'Uusi {type}' NoItemsFound: 'Ei kohteita' + OpenFilter: 'Avaa haku ja suodatus' PRINTEDAT: Tulostettu PRINTEDBY: Tulostaja PlaceHolder: 'Etsi {type}' @@ -95,12 +96,19 @@ fi: DeletePermissionsFailure: 'Ei oikeuksia poistamiseen' Deleted: 'Poistettiin {type} {name}' Save: Tallenna + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Muokkaa + SilverStripe\Forms\GridField\GridFieldFilterHeader: + Search: 'Haku "{name}"' + SearchFormFaliure: 'Hakulomaketta ei pystytty luomaan.' SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Et voi siirtää itseäsi pois tästä ryhmästä: menettäisit pääkäyttäjän oikeudet' SilverStripe\Forms\GridField\GridFieldPaginator: OF: / Page: Sivu View: Näytä + SilverStripe\Forms\GridField\GridFieldViewButton: + VIEW: Avaa SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Määrä FIELDLABELCURRENCY: Valuutta @@ -147,6 +155,8 @@ fi: other: '{count} vuotta' SilverStripe\ORM\FieldType\DBEnum: ANY: Yhtään + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Liian monta samaan liittyvää objektia: oletuskenttä käytössä' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Liian monta lapsiobjektia ({count}}' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -197,6 +207,7 @@ fi: many_many_Members: Jäsenet SilverStripe\Security\LoginAttempt: Email: Sähköpostiosoite + EmailHashed: 'Sähköpostiosoite (tiivistetty)' IP: IP-osoite PLURALNAME: Kirjautumisyritykset PLURALS: @@ -255,6 +266,8 @@ fi: SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: ERRORWRONGCRED: 'Antamasi tiedot eivät näytä oikeilta. Yritä uudelleen.' NoPassword: 'Tällä käyttäjällä ei ole salasanaa' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'Sähköpostiosoite & salasana' SilverStripe\Security\MemberPassword: PLURALNAME: 'Käyttäjän salasanat' PLURALS: @@ -318,5 +331,5 @@ fi: NOTEPAGESECURED: 'Tämä sivu on suojattu. Syötä tunnistetietosi alle niin pääset eteenpäin.' NOTERESETLINKINVALID: '

Salasanan palautuslinkki on virheellinen tai vanhentunut.

Voit pyytää uuden napsauttamalla tästä tai vaihtaa salasanasi kirjautumisen jälkeen.

' NOTERESETPASSWORD: 'Syötä sähköpostiosoitteesi ja lähetämme sinulle linkin, jonka avulla saat palautettua salasanasi' - PASSWORDSENTHEADER: 'Salasanan palautuslinkki lähetettiin osoitteeseen ''{email}''' - PASSWORDSENTTEXT: 'Kiitos! Salasanan palautuslinkki lähetettiin osoitteeseen ''{email}'', joka on liitettynä tähän käyttäjätiliin.' + PASSWORDRESETSENTHEADER: 'Salasanan palautuslinkki lähetetty' + PASSWORDRESETSENTTEXT: 'Kiitos, palautuslinkki on lähetetty käyttäjätilille asetettuun sähköpostiosoitteeseen.' diff --git a/lang/fr.yml b/lang/fr.yml index 5a18188da..450cfdb87 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -84,7 +84,6 @@ fr: RelationSearch: 'Rechercher relations' ResetFilter: Réinitialiser SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Supprimer Delete: Supprimer DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer' EditPermissionsFailure: 'Pas de permissions pour délier l''enregistrement' @@ -96,8 +95,6 @@ fr: DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer' Deleted: '{type} {name} supprimés' Save: Enregistrer - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Éditer SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Impossible de retirer votre propre profil de ce groupe, vous perdriez vos droits d''administration' SilverStripe\Forms\GridField\GridFieldPaginator: @@ -322,7 +319,4 @@ fr: LOGOUT: 'Se déconnecter' LOSTPASSWORDHEADER: 'Mot de passe oublié' NOTEPAGESECURED: 'Cette page est sécurisée. Entrez vos identifiants ci-dessous et vous pourrez y avoir accès.' - NOTERESETLINKINVALID: '

Le lien de réinitialisation du mot de passe n’est pas valide ou a expiré.

Vous pouvez en demander un nouveau en suivant ce lien ou changer de mot de passe après connexion.

' NOTERESETPASSWORD: 'Entrez votre adresse email et nous vous enverrons un lien pour modifier votre mot de passe' - PASSWORDSENTHEADER: "Lien de réinitialisation de mot de passe envoyé à «\_{email}\_»" - PASSWORDSENTTEXT: "Merci\_! Un lien de réinitialisation vient d’être envoyé à «\_{email}\_», à condition que cette adresse existe." diff --git a/lang/id.yml b/lang/id.yml index d17eac338..c9c06bbff 100644 --- a/lang/id.yml +++ b/lang/id.yml @@ -167,7 +167,4 @@ id: LOGIN: Masuk LOSTPASSWORDHEADER: 'Kata Kunci yang Terlupa' NOTEPAGESECURED: 'Laman ini diamankan. Isikan data berikut untuk dikirimkan hak akses Anda.' - NOTERESETLINKINVALID: '

Tautan penggantian kata kunci tidak valid atau sudah kadaluarsa.

Anda dapat meminta yang baru di sini atau mengganti kata kunci setelah Anda masuk.

' NOTERESETPASSWORD: 'Isikan alamat email Anda untuk mendapatkan tautan penggantian kata kunci' - PASSWORDSENTHEADER: 'Tautan penggantian kata kunci dikirimkan ke ''{email}''' - PASSWORDSENTTEXT: 'Terimakasih! Tautan reset telah dikirim ke ''{email}'', berisi informasi akun untuk alamat email ini.' diff --git a/lang/id_ID.yml b/lang/id_ID.yml index 22ebcb2e5..11d1f2bb3 100644 --- a/lang/id_ID.yml +++ b/lang/id_ID.yml @@ -166,7 +166,4 @@ id_ID: LOGIN: Masuk LOSTPASSWORDHEADER: 'Kata Kunci yang Terlupa' NOTEPAGESECURED: 'Laman ini diamankan. Isikan data berikut untuk dikirimkan hak akses Anda.' - NOTERESETLINKINVALID: '

Tautan penggantian kata kunci tidak valid atau sudah kadaluarsa.

Anda dapat meminta yang baru di sini atau mengganti kata kunci setelah Anda masuk.

' NOTERESETPASSWORD: 'Isikan alamat email Anda untuk mendapatkan tautan penggantian kata kunci' - PASSWORDSENTHEADER: 'Tautan penggantian kata kunci dikirimkan ke ''{email}''' - PASSWORDSENTTEXT: 'Terimakasih! Tautan reset telah dikirim ke ''{email}'', berisi informasi akun untuk alamat email ini.' diff --git a/lang/it.yml b/lang/it.yml index 05bf5dc83..4089faf9b 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -95,6 +95,10 @@ it: DeletePermissionsFailure: 'Non hai i permessi per eliminare' Deleted: 'Eliminato {type} {name}' Save: Salva + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Modifica + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'Non è possibile rimuovere te stesso da questo gruppo, perderesti i diritti di admin' SilverStripe\Forms\GridField\GridFieldPaginator: OF: di Page: Pagina @@ -145,6 +149,8 @@ it: other: '{count} anni' SilverStripe\ORM\FieldType\DBEnum: ANY: Qualsiasi + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Troppi oggetti correlati; campo di fallback in uso' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Troppi figli ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -195,6 +201,7 @@ it: many_many_Members: Membri SilverStripe\Security\LoginAttempt: Email: 'Indirizzo e-mail' + EmailHashed: 'Indirizzo email (hash)' IP: 'Indirizzo IP' PLURALNAME: 'Tentativi d''accesso' PLURALS: @@ -236,6 +243,7 @@ it: SUBJECTPASSWORDCHANGED: 'La tua password è stata cambiata' SUBJECTPASSWORDRESET: 'Link per azzerare la tua password' SURNAME: Cognome + VALIDATIONADMINLOSTACCESS: 'Non è possibile rimuovere tutti i gruppi admin dal tuo profilo' ValidationIdentifierFailed: 'Non posso sovrascrivere l''utente esistente #{id} con identificatore identico ({name} = {value}))' WELCOMEBACK: 'Bentornato, {firstname}' YOUROLDPASSWORD: 'La tua vecchia password' @@ -252,6 +260,8 @@ it: SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: ERRORWRONGCRED: 'I dettagli forniti non sembrano corretti. Per favore riprovare.' NoPassword: 'Manca la password per questo utente.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'E-mail & Password' SilverStripe\Security\MemberPassword: PLURALNAME: 'Password utenti' PLURALS: @@ -313,7 +323,6 @@ it: LOGOUT: Scollegati LOSTPASSWORDHEADER: 'Password smarrita' NOTEPAGESECURED: 'La pagina è protetta. Inserisci le credenziali qui sotto per poter andare avanti.' - NOTERESETLINKINVALID: '

Il link per azzerare la password non è valido o è scaduto.

Puoi richiederne uno nuovo qui o cambiare la tua password dopo che ti sei connesso.

' NOTERESETPASSWORD: 'Inserisci il tuo indirizzo e-mail e ti verrà inviato un link per poter azzerare la tua password.' - PASSWORDSENTHEADER: 'Link per azzeramento della password inviato a ''{email}''' - PASSWORDSENTTEXT: 'Grazie! Un link di azzeramento è stato inviato a ''{email}'', fornito un account esistente per questo indirizzo e-mail.' + PASSWORDRESETSENTHEADER: 'Link di azzeramento password inviato' + PASSWORDRESETSENTTEXT: 'Grazie! Un link di azzeramento è stato inviato, supponendo un account esista a quell''indirizzo e-mail.' diff --git a/lang/ja.yml b/lang/ja.yml index b2f92eb1e..433a832e2 100644 --- a/lang/ja.yml +++ b/lang/ja.yml @@ -146,7 +146,4 @@ ja: ERRORPASSWORDPERMISSION: パスワードを変更する為に、ログインしなければなりません！ LOGIN: ログイン NOTEPAGESECURED: このページはセキュリティで保護されております証明書キーを下記に入力してください。こちらからすぐに送信します - NOTERESETLINKINVALID: '

パスワードのリセットリンクは有効でないか期限切れです。

新しいパスワードを要求することができます ここ もしくはパスワードを変更することができます ログインした後 .

' NOTERESETPASSWORD: メールアドレスを入力してください、パスワードをリセットするURLを送信致します - PASSWORDSENTHEADER: 'パスワードリセットリンクは ''{email}'' に送信されました' - PASSWORDSENTTEXT: 'ありがとうございました！　リセットリンクは、''{email}'' に、このアカウントが存在することを前提として送信されました。' diff --git a/lang/lt.yml b/lang/lt.yml index abdbaea25..3ca7adbff 100644 --- a/lang/lt.yml +++ b/lang/lt.yml @@ -167,7 +167,4 @@ lt: LOGIN: Prisijungti LOSTPASSWORDHEADER: 'Slaptažodžio atstatymas' NOTEPAGESECURED: 'Šis puslapis yra apsaugotas. Įveskite savo duomenis į žemiau esančius laukelius.' - NOTERESETLINKINVALID: '

Neteisinga arba negaliojanti slaptažodžio atstatymo nuoroda.

Galite atsisiųsti naują čia arba pasikeisti slaptažodį po to, kai prisijungsite.

' NOTERESETPASSWORD: 'Įveskite savo e. pašto adresą ir atsiųsime slaptažodžio atstatymui skirtą nuorodą' - PASSWORDSENTHEADER: 'Slaptažodžio atstatymo nuoroda nusiųsta į ''{email}''' - PASSWORDSENTTEXT: 'Atstatymo nuoroda nusiųsta į ''{email}''' diff --git a/lang/mi.yml b/lang/mi.yml index 7a2601ed5..e9fe2308e 100644 --- a/lang/mi.yml +++ b/lang/mi.yml @@ -149,7 +149,4 @@ mi: LOGIN: Takiuru LOSTPASSWORDHEADER: 'Kupuhipa Ngaro' NOTEPAGESECURED: 'Kua ngita tēnā whārangi. Tāurua ō taipitoptio tuakiri ki raro, ā, mā mātou koe e tuku kia haere tonu.' - NOTERESETLINKINVALID: '

He muhu, kua mōnehu rānei te hono tautuhi kupuhipa anō.

Ka taea te tono i te mea hōui konei ka huri rānei i tō kupuhipa ā muri i tōtakiuru.

' NOTERESETPASSWORD: 'Tāurua tō wāhitau īmēra, mā mātou e tuku tētahi hono ki a koe e taea ai te tautuhi anō i tō kupuhipa' - PASSWORDSENTHEADER: 'I tukuna he hono tautuhi kupuhipa anō ki ''{email}''' - PASSWORDSENTTEXT: 'Kia ora! Kua tukuna he hono tautuhi anō ki ''{email}'',engari rā kei te tīariari he pūkete mō taua wāhitau īmēra.' diff --git a/lang/nb.yml b/lang/nb.yml index 91dd9f758..f1dc4c74d 100644 --- a/lang/nb.yml +++ b/lang/nb.yml @@ -152,7 +152,4 @@ nb: LOGIN: 'Logg inn' LOSTPASSWORDHEADER: 'Mistet passord' NOTEPAGESECURED: 'Den siden er sikret. Skriv inn gyldig innloggingsinfo så kommer du inn.' - NOTERESETLINKINVALID: '

Lenken for å nullstille passordet er ugyldig eller utgått.

Du kan kreve en ny her eller endre passordet etter at du har logget inn.

' NOTERESETPASSWORD: 'Skriv inn epostadressen din og vi vil sende deg en lenke som nullstiller passordet.' - PASSWORDSENTHEADER: 'Lenke for nullstilling av passord ble sendt til ''{email}''' - PASSWORDSENTTEXT: 'Takk! En lenke for å lage nytt passord er sendt til ''{email}'', forutsatt at det eksisterer en konto for denne epostadressen.' diff --git a/lang/nl.yml b/lang/nl.yml index 64f191213..f6de04299 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -1,4 +1,26 @@ nl: + SilverStripe\Admin\LeftAndMain: + VersionUnknown: onbekend + SilverStripe\AssetAdmin\Forms\UploadField: + Dimensions: Afmetingen + EDIT: Bewerken + EDITINFO: 'Bewerk dit bestand' + REMOVE: Verwijder + SilverStripe\Control\ChangePasswordEmail_ss: + CHANGEPASSWORDFOREMAIL: 'Het wachtwoord voor het account met e-mailadres {email} is aangepast. Indien u uw wachtwoord niet heeft aangepast kunt u dat doen met onderstaande link.' + CHANGEPASSWORDTEXT1: 'U heeft het wachtwoord veranderd voor' + CHANGEPASSWORDTEXT3: 'Wachtwoord veranderen' + HELLO: Hallo + SilverStripe\Control\Email\ForgotPasswordEmail_ss: + HELLO: Hallo + TEXT1: 'Hier is uw' + TEXT2: 'link om uw wachtwoord opnieuw aan te maken' + TEXT3: voor + SilverStripe\Control\RequestProcessor: + INVALID_REQUEST: 'Fout bij verwerken' + REQUEST_ABORTED: 'Fout bij verwerken (geannuleerd)' + SilverStripe\Core\Manifest\VersionProvider: + VERSIONUNKNOWN: Onbekend SilverStripe\Forms\CheckboxField: NOANSWER: Nee YESANSWER: Ja @@ -8,6 +30,8 @@ nl: ATLEAST: 'Een wachtwoord moet tenminste {min} karakters hebben.' BETWEEN: 'Een wachtwoord moet tussen de {min} en {max} karakters hebben' CURRENT_PASSWORD_ERROR: 'Het wachtwoord dat u heeft ingevoerd is niet juist.' + CURRENT_PASSWORD_MISSING: 'Voer uw huidige wachtwoord in.' + LOGGED_IN_ERROR: 'U moet ingelogd zijn om uw wachtwoord te kunnen veranderen!' MAXIMUM: 'Een wachtwoord mag maximaal {max} karakters hebben.' SHOWONCLICKTITLE: 'Verander wachtwoord' SilverStripe\Forms\CurrencyField: @@ -16,12 +40,20 @@ nl: VALIDDATEFORMAT2: 'Vul een geldig datumformaat in ({format})' VALIDDATEMAXDATE: 'De datum moet ouder of gelijk zijn aan de maximale datum ({date})' VALIDDATEMINDATE: 'De datum moet nieuwer of gelijk zijn aan de minimale datum ({date})' + SilverStripe\Forms\DatetimeField: + VALIDDATEMAXDATETIME: 'De datum moet ouder of gelijk zijn aan de maximale datum ({datetime})' + VALIDDATETIMEFORMAT: 'Vul een geldige datum in ({format})' + VALIDDATETIMEMINDATE: 'De datum moet nieuwer of gelijk zijn aan de minimale datum ({datetime})' SilverStripe\Forms\DropdownField: CHOOSE: (Kies) + CHOOSE_MODEL: '(Selecteer {name})' SOURCE_VALIDATION: 'Selecteer een optie uit de lijst. {value} is geen geldige keuze.' SilverStripe\Forms\EmailField: VALIDATION: 'Gelieve een e-mailadres in te voeren.' + SilverStripe\Forms\FileUploadReceiver: + FIELDNOTSET: 'Bestandsinformatie niet gevonden' SilverStripe\Forms\Form: + BAD_METHOD: 'Dit formulier moet middels {method} verzonden worden' CSRF_EXPIRED_MESSAGE: 'Uw sessie is verlopen. Verzend het formulier opnieuw.' CSRF_FAILED_MESSAGE: 'Er lijkt een technisch probleem te zijn. Klik op de knop terug, vernieuw uw browser, en probeer het opnieuw.' VALIDATIONPASSWORDSDONTMATCH: 'Wachtwoorden komen niet overeen' @@ -30,7 +62,10 @@ nl: VALIDATOR: Validator VALIDCURRENCY: 'Vul een geldige munteenheid in' SilverStripe\Forms\FormField: + EXAMPLE: 'bijv. {format}' NONE: geen + SilverStripe\Forms\FormScaffolder: + TABMAIN: Hoofdgedeelte SilverStripe\Forms\GridField\GridField: Add: '{name} toevoegen' CSVEXPORT: 'Exporteer naar CSV' @@ -41,6 +76,7 @@ nl: LinkExisting: 'Koppel een bestaand item' NewRecord: 'Nieuw {type}' NoItemsFound: 'Geen items gevonden.' + OpenFilter: 'Zoeken en filteren openen' PRINTEDAT: 'Geprint op' PRINTEDBY: 'Geprint door' PlaceHolder: 'Zoek {type}' @@ -60,27 +96,72 @@ nl: DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen' Deleted: '{type} {name} verwijderd' Save: Opslaan + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Bewerken + SilverStripe\Forms\GridField\GridFieldFilterHeader: + Search: 'Zoek naar "{name}"' + SearchFormFaliure: 'Er kon geen zoekformulier worden aangemaakt' + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'U kunt uzelf niet verwijderen van deze groep, omdat u dan geen admin-rechten meer heeft.' + SilverStripe\Forms\GridField\GridFieldPaginator: + OF: van + Page: Pagina + View: Bekijk + SilverStripe\Forms\GridField\GridFieldViewButton: + VIEW: Bekijk SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Aantal FIELDLABELCURRENCY: Munteenheid + INVALID_CURRENCY: 'Valuta {currency} is niet toegestaan' + SilverStripe\Forms\MultiSelectField: + SOURCE_VALIDATION: 'Selecteer een optie uit de lijst. {value} is geen geldige keuze.' SilverStripe\Forms\NullableField: IsNullLabel: 'Is null' SilverStripe\Forms\NumericField: VALIDATION: '''{value}'' is geen getal, enkel getallen worden door dit veld geaccepteerd' SilverStripe\Forms\TimeField: VALIDATEFORMAT: 'Vul een geldig datumformaat in ({format})' + SilverStripe\ORM\DataObject: + PLURALNAME: 'Data objecten' + PLURALS: + one: 'Data object' + other: '{count} Data objecten' + SINGULARNAME: 'Data object' SilverStripe\ORM\FieldType\DBBoolean: ANY: Elke NOANSWER: Nee YESANSWER: Ja SilverStripe\ORM\FieldType\DBDate: + DAYS_SHORT_PLURALS: + one: '{count} dag' + other: '{count} dagen' + HOURS_SHORT_PLURALS: + one: '{count} uur' + other: '{count} uren' LessThanMinuteAgo: 'minder dan één minuut' + MINUTES_SHORT_PLURALS: + one: '{count} minuut' + other: '{count} minuten' + MONTHS_SHORT_PLURALS: + one: '{count} maand' + other: '{count} maanden' + SECONDS_SHORT_PLURALS: + one: '{count} seconde' + other: '{count} seconden' TIMEDIFFAGO: '{difference} geleden' TIMEDIFFIN: 'in {difference}' + YEARS_SHORT_PLURALS: + one: '{count} jaar' + other: '{count} jaren' SilverStripe\ORM\FieldType\DBEnum: ANY: Elke + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Teveel keuzes in de lijst; een alternatief veld wordt getoond.' + SilverStripe\ORM\Hierarchy: + LIMITED_TITLE: 'Teveel onderliggende items ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: InfiniteLoopNotAllowed: 'Oneindige lus gevonden in "{type}" hiërarchie. Wijzig het hogere niveau om dit op te lossen' + LIMITED_TITLE: 'Teveel onderliggende items ({count})' SilverStripe\ORM\ValidationException: DEFAULT_ERROR: Validatiefout SilverStripe\Security\BasicAuth: @@ -91,34 +172,60 @@ nl: PASSWORDEXPIRED: '

Uw wachtwoord is verlopen. Kies een nieuw wachtwoord.

' SilverStripe\Security\CMSSecurity: INVALIDUSER: '

Ongeldige gebruiker Log hier opnieuw in om verder te gaan.

' + LOGIN_MESSAGE: 'Sessie is verlopen' + LOGIN_TITLE: '

U kunt verder met wat u aan het doen was, door opnieuw in te loggen.

' SUCCESS: Succes SUCCESSCONTENT: '

U bent ingelogd. Klik hier als u niet automatisch wordt doorgestuurd.

' + SUCCESS_TITLE: 'Inloggen is gelukt' + SilverStripe\Security\DefaultAdminService: + DefaultAdminFirstname: 'Standaard Beheerder' SilverStripe\Security\Group: AddRole: 'Voeg een rol toe aan deze groep' Code: 'Groep code' DefaultGroupTitleAdministrators: Beheerders DefaultGroupTitleContentAuthors: 'Inhoud Auteurs' Description: 'Omschrijving ' + GROUPNAME: 'Groep naam' GroupReminder: 'Als u de bovenliggende groep selecteert, neemt deze groep alle rollen over' HierarchyPermsError: 'U moet (ADMIN) rechten hebben om de bovenliggende groep "{group}" toe te kennen' Locked: 'Gesloten?' + MEMBERS: Leden + NEWGROUP: 'Nieuwe groep' NoRoles: 'Geen rollen gevonden' + PERMISSIONS: Rechten + PLURALNAME: Groepen + PLURALS: + one: 'Een groep' + other: '{count} groepen' Parent: 'Bovenliggende groep' + ROLES: Rollen + ROLESDESCRIPTION: 'Rollen zijn logische groeperingen van rechten die in het Rollen tabblad gewijzigd kunnen worden.
Rollen worden automatisch overgenomen van bovenliggende groepen.' RolesAddEditLink: 'Rollen beheren' + SINGULARNAME: Groep Sort: Sorteer-richting has_many_Permissions: Rechten many_many_Members: Leden SilverStripe\Security\LoginAttempt: + Email: 'E-mailadres ' + EmailHashed: 'E-mailadres (versleuteld)' IP: 'IP adres' + PLURALNAME: Inlogpogingen + PLURALS: + one: 'Een inlogpoging' + other: '{count} inlogpogingen' + SINGULARNAME: Inlogpogingen Status: Status SilverStripe\Security\Member: ADDGROUP: 'Groep toevoegen' BUTTONCHANGEPASSWORD: 'Wachtwoord veranderen' BUTTONLOGIN: Inloggen BUTTONLOGINOTHER: 'Als iemand anders inloggen' + BUTTONLOGOUT: Uitloggen BUTTONLOSTPASSWORD: 'Ik ben mijn wachtwoord vergeten' CONFIRMNEWPASSWORD: 'Bevestig het nieuwe wachtwoord' CONFIRMPASSWORD: 'Bevestig wachtwoord' + CURRENT_PASSWORD: 'Huidige wachtwoord' + EDIT_PASSWORD: 'Nieuw wachtwoord' EMAIL: E-mail EMPTYNEWPASSWORD: 'Het nieuwe wachtwoord mag niet leeg zijn, probeer opnieuw' ENTEREMAIL: 'Typ uw e-mailadres om een link te ontvangen waarmee u uw wachtwoord kunt resetten.' @@ -128,13 +235,21 @@ nl: ERRORWRONGCRED: 'De ingevulde gegevens lijken niet correct. Probeer het nog een keer.' FIRSTNAME: Voornaam INTERFACELANG: 'Interface taal' + KEEPMESIGNEDIN: 'Houd mij ingelogd' LOGGEDINAS: 'U bent ingelogd als {name}.' NEWPASSWORD: 'Nieuw wachtwoord' PASSWORD: Wachtwoord PASSWORDEXPIRED: 'Uw wachtwoord is verlopen. Kies een nieuw wachtwoord.' + PLURALNAME: Leden + PLURALS: + one: 'Een lid' + other: '{count} leden' + REMEMBERME: 'Onthoud mij voor volgende keer? (voor {count} dagen op dit apparaat)' + SINGULARNAME: Lid SUBJECTPASSWORDCHANGED: 'Uw wachtwoord is veranderd' SUBJECTPASSWORDRESET: 'Link om uw wachtwoord opnieuw aan te maken' SURNAME: Achternaam + VALIDATIONADMINLOSTACCESS: 'Niet mogelijk om alle admin-groepen te verwijderen van uw profiel' ValidationIdentifierFailed: 'Een bestaande gebruiker #{id} kan niet dezelfde unieke velden hebben ({name} = {value}))' WELCOMEBACK: 'Welkom terug, {firstname}' YOUROLDPASSWORD: 'Uw oude wachtwoord' @@ -143,15 +258,38 @@ nl: db_LockedOutUntil: 'Gesloten tot' db_Password: Wachtwoord db_PasswordExpiry: 'Wachtwoord vervaldatum' + SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: + AUTHENTICATORNAME: Inlogformulier + BUTTONFORGOTPASSWORD: 'Wachtwoord vergeten' + BUTTONLOGIN: 'Opnieuw inloggen' + BUTTONLOGOUT: Uitloggen + SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: + ERRORWRONGCRED: 'De ingevulde gegevens lijken niet correct. Probeer het nog een keer.' + NoPassword: 'Er is geen wachtwoord voor deze gebruiker.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'E-mail & wachtwoord' + SilverStripe\Security\MemberPassword: + PLURALNAME: Gebruikerswachtwoorden + PLURALS: + one: 'Een gebruikerswachtwoord' + other: '{count} Gebruikerswachtwoorden' + SINGULARNAME: Gebruikerswachtwoord SilverStripe\Security\PasswordValidator: LOWCHARSTRENGTH: 'Maak a.u.b. uw wachtwoord sterker door enkele van de volgende karakters te gebruiken: {chars}' PREVPASSWORD: 'U heeft dit wachtwoord in het verleden al gebruikt, kies a.u.b. een nieuw wachtwoord.' TOOSHORT: 'Het wachtwoord is te kort, het moet minimaal {minimum} karakters hebben' SilverStripe\Security\Permission: AdminGroup: Beheerder + CMS_ACCESS_CATEGORY: 'CMS toegang' CONTENT_CATEGORY: Inhoudsrechten FULLADMINRIGHTS: 'Volledige admin rechten' FULLADMINRIGHTS_HELP: 'Impliceert en overstemt alle andere toegewezen rechten.' + PERMISSIONS_CATEGORY: 'Rollen en toegangsrechten' + PLURALNAME: Rechten + PLURALS: + one: Machtiging + other: '{count} rechten' + SINGULARNAME: Machtiging UserPermissionsIntro: 'Groepen aan deze gebruiker toewijzen zullen diens permissies aanpassen. Zie de sectie Groepen voor meer informatie over machtigingen voor afzonderlijke groepen.' SilverStripe\Security\PermissionCheckboxSetField: AssignedTo: 'toegewezen aan "{title}"' @@ -161,21 +299,37 @@ nl: SilverStripe\Security\PermissionRole: OnlyAdminCanApply: 'Alleen admin kan doorvoeren' PLURALNAME: Rollen + PLURALS: + one: 'Een rol' + other: '{count} rollen' SINGULARNAME: Rol Title: Titel SilverStripe\Security\PermissionRoleCode: + PLURALNAME: 'Permissie codes' + PLURALS: + one: 'Een permissiecode' + other: '{count} permissiecodes' PermsError: 'U moet (ADMIN) rechten hebben om de code "{code}" toe te kennen' + SINGULARNAME: Permissiecode + SilverStripe\Security\RememberLoginHash: + PLURALNAME: 'Versleutelde logins' + PLURALS: + one: 'Een versleutelde login' + other: '{count} versleutelde logins' + SINGULARNAME: 'Versleutelde login' SilverStripe\Security\Security: ALREADYLOGGEDIN: 'U hebt geen toegang tot deze pagina. Als u een andere account met de nodige rechten hebt, kan u hieronder opnieuw inloggen.' BUTTONSEND: 'Nieuw wachtwoord aanmaken' CHANGEPASSWORDBELOW: 'U kunt uw wachtwoord hieronder veranderen.' CHANGEPASSWORDHEADER: 'Verander uw wachtwoord' + CONFIRMLOGOUT: 'Klik op onderstaande knop om uit te loggen.' ENTERNEWPASSWORD: 'Voer een nieuw wachtwoord in.' ERRORPASSWORDPERMISSION: 'U moet ingelogd zijn om uw wachtwoord te kunnen veranderen!' LOGIN: 'Meld aan' + LOGOUT: Uitloggen LOSTPASSWORDHEADER: 'Wachtwoord vergeten' NOTEPAGESECURED: 'Deze pagina is beveiligd. Voer uw gegevens in en u wordt automatisch doorgestuurd.' - NOTERESETLINKINVALID: '

De link om uw wachtwoord te kunnen wijzigen is niet meer geldig.

U kunt een nieuwe link aanvragen of uw wachtwoord aanpassen door in te loggen.

' + NOTERESETLINKINVALID: '

De reset link is ongeldig of komen te vervallen.

Je kan hier een nieuwe link aanvragen of het wachtwoord veranderen nadat je bent ingelogd.

' NOTERESETPASSWORD: 'Voer uw e-mailadres in en we sturen een link waarmee u een nieuw wachtwoord kunt instellen.' - PASSWORDSENTHEADER: 'Wachtwoord herstel link verzonden naar {email}' - PASSWORDSENTTEXT: 'Bedankt! Er is een link verstuurd naar {email} om uw wachtwoord opnieuw in te stellen, in de veronderstelling dat er een account bestaat voor dit e-mailadres.' + PASSWORDRESETSENTHEADER: 'link om uw wachtwoord opnieuw aan te maken' + PASSWORDRESETSENTTEXT: 'Bedankt! Er is een link verstuurd om uw wachtwoord opnieuw in te stellen (mits het mailadres reeds bekend is bij ons).' diff --git a/lang/pl.yml b/lang/pl.yml index 3774d27f3..1905acb38 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -84,7 +84,6 @@ pl: RelationSearch: 'Wyszukiwanie powiązań' ResetFilter: Resetuj SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Usuń Delete: Usuń DeletePermissionsFailure: 'Brak uprawnień do usuwania' EditPermissionsFailure: 'Nie masz uprawnień, aby odłączyć rekord' @@ -96,8 +95,6 @@ pl: DeletePermissionsFailure: 'Brak uprawnień do usuwania' Deleted: 'Usunięto {type} {name}' Save: Zapisz - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Edytuj SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Nie możesz usunąć siebie z tej grupy, stracone zostałby prawa administratora' SilverStripe\Forms\GridField\GridFieldPaginator: @@ -352,7 +349,4 @@ pl: LOGOUT: 'Wyloguj się' LOSTPASSWORDHEADER: 'Nie pamiętam hasła' NOTEPAGESECURED: 'Ta strona jest zabezpieczona. Wpisz swoje dane a my wyślemy Ci potwierdzenie niebawem' - NOTERESETLINKINVALID: '

Link resetujący hasło wygasł lub jest nieprawidłowy.

Możesz poprosić o nowy tutaj lub zmień swoje hasło po zalogowaniu się.

' NOTERESETPASSWORD: 'Wpisz adres e-mail, na który mamy wysłać link gdzie możesz zresetować swoje hasło' - PASSWORDSENTHEADER: 'Link resetujący hasła został wysłany do ''{email}''' - PASSWORDSENTTEXT: 'Dziękujemy! Link resetujący hasło został wysłany do ''{email}'', o ile konto użytkownika dla takiego e-maila istnieje.' diff --git a/lang/ru.yml b/lang/ru.yml index 73602e013..add72be7f 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -339,7 +339,4 @@ ru: LOGOUT: Выйти LOSTPASSWORDHEADER: 'Восстановление пароля' NOTEPAGESECURED: 'Эта страница защищена. Пожалуйста, введите свои учетные данные для входа.' - NOTERESETLINKINVALID: '

Неверная ссылка переустановки пароля или время действия ссылки истекло.

Вы можете повторно запросить ссылку, щелкнув здесь, или поменять пароль, войдя в систему.

' NOTERESETPASSWORD: 'Введите Ваш адрес email, и Вам будет отправлена ссылка, по которой Вы сможете переустановить свой пароль' - PASSWORDSENTHEADER: 'Ссылка для переустановки пароля выслана на ''{email}''' - PASSWORDSENTTEXT: 'Ссылка переустановки пароля была выслана на адрес ''{email}'' (письмо дойдет до получателя только в том случае, если аккаунт с таким электронным адресом действительно зарегистрирован).' diff --git a/lang/sk.yml b/lang/sk.yml index 861045fc6..88f4bf260 100644 --- a/lang/sk.yml +++ b/lang/sk.yml @@ -228,7 +228,4 @@ sk: LOGIN: Prihlásiť LOSTPASSWORDHEADER: 'Zabudnuté heslo' NOTEPAGESECURED: 'Táto stránka je zabezpečená. Zadajte svoje prihlasovacie údaje a my Vám zároveň pošleme práva.' - NOTERESETLINKINVALID: '

Odkaz na resetovanie hesla nie je platný alebo je vypršala jeho platnosť.

Môžete požiadať o nový tu alebo zmeňte svoje heslo po prihlásení.

' NOTERESETPASSWORD: 'Zadajte svoju e-mailovú adresu a my Vám pošleme odkaz na resetovanie hesla' - PASSWORDSENTHEADER: 'Odkaz na resetovanie hesla bol odoslaný na ''{email}''' - PASSWORDSENTTEXT: 'Ďakujeme! Resetovací odkaz bol odoslaný na ''''{email}'''', pokiaľ účet existuje pre túto emailovú adresu.' diff --git a/lang/sl.yml b/lang/sl.yml index bccd51826..5496aff5f 100644 --- a/lang/sl.yml +++ b/lang/sl.yml @@ -135,7 +135,4 @@ sl: LOGIN: Prijava LOSTPASSWORDHEADER: 'Izgubljeno geslo' NOTEPAGESECURED: 'Stran je zaščitena. Da bi lahko nadaljevali, vpišite svoje podatke.' - NOTERESETLINKINVALID: '

Povezava za ponastavitev gesla je napačna ali pa je njena veljavnost potekla.

Tukaj lahko zaprosite za novo povezavo or pa zamenjate geslo, ko se prijavite v sistem.

' NOTERESETPASSWORD: 'Vpišite e-naslov, na katerega vam bomo poslali povezavo za ponastavitev gesla' - PASSWORDSENTHEADER: 'Povezava za ponastavitev gesla je bila poslana na e-naslov ''{email}''.' - PASSWORDSENTTEXT: 'Hvala! Povezava za ponastavitev gesla je bila poslana na e-naslov ''{email}'', ki je naveden kot e-naslov vašega računa. ' diff --git a/lang/sr.yml b/lang/sr.yml index 07f642278..622b657b3 100644 --- a/lang/sr.yml +++ b/lang/sr.yml @@ -151,7 +151,4 @@ sr: ERRORPASSWORDPERMISSION: 'Морате да будете пријављени да бисте променили своју лозинку!' LOGIN: Пријављивање NOTEPAGESECURED: 'Ова страна је обезбеђена. Унесите своје податке и ми ћемо вам послати садржај.' - NOTERESETLINKINVALID: '

Линк за ресетовање лозинке је погрешан или је истекло време за његово коришћење.

Можете да захтевате нови овде или да промените Вашу лозинку након што се пријавите.

' NOTERESETPASSWORD: 'Унесите своју адресу е-поште и ми ћемо вам послати линк помоћу којег можете да промените своју лозинку' - PASSWORDSENTHEADER: 'Линк за ресетовање лозинке послат је на адресу е-поште: ''{email}''' - PASSWORDSENTTEXT: 'Хвала Вам! Линк за ресетовање лозинке је послат не адресу е-поште ''{email}''. Порука ће стићи примаоцу само ако постоји регистрован налог са том адресом е-поште.' diff --git a/lang/sr@latin.yml b/lang/sr@latin.yml index 1b210ae51..f91aa9337 100644 --- a/lang/sr@latin.yml +++ b/lang/sr@latin.yml @@ -150,7 +150,4 @@ sr@latin: ERRORPASSWORDPERMISSION: 'Morate da budete prijavljeni da biste promenili svoju lozinku!' LOGIN: Prijavljivanje NOTEPAGESECURED: 'Ova strana je obezbeđena. Unesite svoje podatke i mi ćemo vam poslati sadržaj.' - NOTERESETLINKINVALID: '

Link za resetovanje lozinke je pogrešan ili je isteklo vreme za njegovo korišćenje.

Možete da zahtevate novi ovde ili da promenite Vašu lozinku nakon što se prijavite.

' NOTERESETPASSWORD: 'Unesite svoju adresu e-pošte i mi ćemo vam poslati link pomoću kojeg možete da promenite svoju lozinku' - PASSWORDSENTHEADER: 'Link za resetovanje lozinke poslat je na adresu e-pošte: ''{email}''' - PASSWORDSENTTEXT: 'Hvala Vam! Link za resetovanje lozinke je poslat ne adresu e-pošte ''{email}''. Poruka će stići primaocu samo ako postoji registrovan nalog sa tom adresom e-pošte.' diff --git a/lang/sr_RS.yml b/lang/sr_RS.yml index fc79812da..298049430 100644 --- a/lang/sr_RS.yml +++ b/lang/sr_RS.yml @@ -150,7 +150,4 @@ sr_RS: ERRORPASSWORDPERMISSION: 'Морате да будете пријављени да бисте променили своју лозинку!' LOGIN: Пријављивање NOTEPAGESECURED: 'Ова страна је обезбеђена. Унесите своје податке и ми ћемо вам послати садржај.' - NOTERESETLINKINVALID: '

Линк за ресетовање лозинке је погрешан или је истекло време за његово коришћење.

Можете да захтевате нови овде или да промените Вашу лозинку након што се пријавите.

' NOTERESETPASSWORD: 'Унесите своју адресу е-поште и ми ћемо вам послати линк помоћу којег можете да промените своју лозинку' - PASSWORDSENTHEADER: 'Линк за ресетовање лозинке послат је на адресу е-поште: ''{email}''' - PASSWORDSENTTEXT: 'Хвала Вам! Линк за ресетовање лозинке је послат не адресу е-поште ''{email}''. Порука ће стићи примаоцу само ако постоји регистрован налог са том адресом е-поште.' diff --git a/lang/sr_RS@latin.yml b/lang/sr_RS@latin.yml index f39b36058..453ffa17d 100644 --- a/lang/sr_RS@latin.yml +++ b/lang/sr_RS@latin.yml @@ -151,7 +151,4 @@ sr_RS@latin: ERRORPASSWORDPERMISSION: 'Morate da budete prijavljeni da biste promenili svoju lozinku!' LOGIN: Prijavljivanje NOTEPAGESECURED: 'Ova strana je obezbeđena. Unesite svoje podatke i mi ćemo vam poslati sadržaj.' - NOTERESETLINKINVALID: '

Link za resetovanje lozinke je pogrešan ili je isteklo vreme za njegovo korišćenje.

Možete da zahtevate novi ovde ili da promenite Vašu lozinku nakon što se prijavite.

' NOTERESETPASSWORD: 'Unesite svoju adresu e-pošte i mi ćemo vam poslati link pomoću kojeg možete da promenite svoju lozinku' - PASSWORDSENTHEADER: 'Link za resetovanje lozinke poslat je na adresu e-pošte: ''{email}''' - PASSWORDSENTTEXT: 'Hvala Vam! Link za resetovanje lozinke je poslat ne adresu e-pošte ''{email}''. Poruka će stići primaocu samo ako postoji registrovan nalog sa tom adresom e-pošte.' diff --git a/lang/sv.yml b/lang/sv.yml index f35c2ee99..f2a18d659 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -93,7 +93,12 @@ sv: DeletePermissionsFailure: 'Rättighet för att radera saknas' Deleted: 'Raderade {type} {name}' Save: Spara + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Ändra + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'Du kan inte radera dig själv från den här gruppen, då du då kommer att förlora dina admin-rättigheter' SilverStripe\Forms\GridField\GridFieldPaginator: + OF: av Page: Sida View: Visa SilverStripe\Forms\MoneyField: @@ -108,6 +113,12 @@ sv: VALIDATION: '''{value}'' är inget nummer, bara siffror (utan mellanslag) kan accepteras för det här fältet' SilverStripe\Forms\TimeField: VALIDATEFORMAT: 'Var god att ange tid i ett giltigt format ({format})' + SilverStripe\ORM\DataObject: + PLURALNAME: Dataobjekt + PLURALS: + one: 'Ett dataobjekt' + other: '{count} Dataobjekt' + SINGULARNAME: Dataobjekt SilverStripe\ORM\FieldType\DBBoolean: ANY: 'Vilken som helst' NOANSWER: Nej @@ -136,6 +147,8 @@ sv: other: '{count} år' SilverStripe\ORM\FieldType\DBEnum: ANY: 'Vilken som helst' + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'För många relaterade objekt; använder fallback-fält' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'För många barn ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -221,6 +234,7 @@ sv: PLURALS: one: 'En medlem' other: '{count} medlemmar' + REMEMBERME: 'Kom ihåg mig nästa gång? (i {count} dagar på denna enhet)' SINGULARNAME: Medlem SUBJECTPASSWORDCHANGED: 'Ditt lösenord har ändrats' SUBJECTPASSWORDRESET: 'Din återställningslänk' @@ -288,7 +302,6 @@ sv: LOGOUT: 'Logga ut' LOSTPASSWORDHEADER: 'Bortglömt lösenord' NOTEPAGESECURED: 'Den här sidan är låst. Fyll i dina uppgifter nedan så skickar vi dig vidare.' - NOTERESETLINKINVALID: '

Återställningslänk för lösenord är felaktig eller för gammal.

Du kan begära en ny här eller ändra ditt lösenord när du loggat in.

' NOTERESETPASSWORD: 'Ange din e-postadress så skickar vi en länk med vilken du kan återställa ditt lösenord' - PASSWORDSENTHEADER: 'Återställningslänk för lösenord har skickats till ''{email}''' - PASSWORDSENTTEXT: 'Tack en återställningslänk har skickats till ''{email}'', förutsatt att ett konto med den addressen finns.' + PASSWORDRESETSENTHEADER: 'Återställningslänk för lösenord skickad' + PASSWORDRESETSENTTEXT: 'Tack. En återställningslänk har skickats, förutsatt att ett konto med denna adress existerar.' diff --git a/lang/zh.yml b/lang/zh.yml index 26c8e2893..748ee671c 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -166,7 +166,4 @@ zh: LOGIN: 登录 LOSTPASSWORDHEADER: 忘记密码 NOTEPAGESECURED: 该页面受安全保护。请在下面输入您的证书，然后我们会立即将您引导至该页面。 - NOTERESETLINKINVALID: '

密码重设链接无效或已过期。

您可以在这里 要求一个新的或在登录后更改您的密码。

' NOTERESETPASSWORD: 请输入您的电子邮件地址，然后我们会将一个链接发送给您，您可以用它来重设您的密码 - PASSWORDSENTHEADER: '密码重设链接已发送至''{email}''' - PASSWORDSENTTEXT: '谢谢！复位链接已发送到 ''{email}''，假定此电子邮件地址存在一个帐户。' From 74de2ce3b7d6132043ffb7238761a5fe2016f507 Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Wed, 7 Nov 2018 17:57:45 +1300 Subject: [PATCH 056/175] Update translations --- lang/ar.yml | 3 - lang/bg.yml | 3 - lang/cs.yml | 3 - lang/da.yml | 325 ++++++++++++++++++++++++++++++++++++++++++- lang/de.yml | 3 - lang/eo.yml | 9 +- lang/es.yml | 3 - lang/et_EE.yml | 3 - lang/fa_IR.yml | 1 - lang/fi.yml | 17 ++- lang/fr.yml | 6 - lang/id.yml | 3 - lang/id_ID.yml | 3 - lang/it.yml | 15 +- lang/ja.yml | 3 - lang/lt.yml | 3 - lang/mi.yml | 3 - lang/nb.yml | 3 - lang/nl.yml | 160 ++++++++++++++++++++- lang/pl.yml | 6 - lang/ru.yml | 3 - lang/sk.yml | 3 - lang/sl.yml | 3 - lang/sr.yml | 3 - lang/sr@latin.yml | 3 - lang/sr_RS.yml | 3 - lang/sr_RS@latin.yml | 3 - lang/sv.yml | 19 ++- lang/zh.yml | 3 - 29 files changed, 530 insertions(+), 88 deletions(-) diff --git a/lang/ar.yml b/lang/ar.yml index 19381589f..518bf1344 100644 --- a/lang/ar.yml +++ b/lang/ar.yml @@ -150,7 +150,4 @@ ar: LOGIN: دخول LOSTPASSWORDHEADER: 'كلمة مرور مفقودة' NOTEPAGESECURED: 'هذه الصفحة محمية بكلمة مرور ، أدخل بيانات دخولك بالأسفل ليتم السماح لك بالوصول للصفحة' - NOTERESETLINKINVALID: "

رابط إعادة تعيين كلمة المرور غير صحيح أو نفذت صلاحيته.

\n

\nيمكنك طلب رابط جديد <\"{a href=\"{link1\"> هنا \n أو تغيير كلمة المرور الخاصة بك بعد <\"{a href=\"{link2\"> تسجيل دخولك.\n

" NOTERESETPASSWORD: 'أدخل بريدك الإلكتروني و سيتم إرسال رابط إعادة تهيئة كلمة المرور ' - PASSWORDSENTHEADER: 'رابط استعادة كلمة المرور تم إرساله إلى ''{بريدك}''' - PASSWORDSENTTEXT: 'شكرا لك! تم إرسال رابط إعادة تعيين إلى ''{بريدك}''، بشرط وجود حساب قائم بالنسبة لعنوان هذا البريد الإلكتروني .' diff --git a/lang/bg.yml b/lang/bg.yml index 3e1eba6a0..241841f1e 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -313,7 +313,4 @@ bg: LOGOUT: Изход LOSTPASSWORDHEADER: 'Забравена парола' NOTEPAGESECURED: 'Тази страница е защитена. Въведете вашите данни по-долу, за да продължите.' - NOTERESETLINKINVALID: '

Връзката за нулиране на парола не е вярна или е просрочена.

Можете да заявите нова тук или да промените паролата си след като влезете.

' NOTERESETPASSWORD: 'Въведете вашият email адрес и ще ви изпратим линк, с който ще можете да смените паролата си' - PASSWORDSENTHEADER: 'Връзка за нулиране на парола беше изпратена на ''{email}''' - PASSWORDSENTTEXT: 'Благодарим ви! Връзка за нулиране на паролата беше изпратен на ''{email}'', ако съществува акаунт с този имейл адрес.' diff --git a/lang/cs.yml b/lang/cs.yml index 4a3cae3ab..759f0268e 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -194,7 +194,4 @@ cs: LOGIN: Přihlásit LOSTPASSWORDHEADER: 'Zapomenuté heslo' NOTEPAGESECURED: 'Tato stránka je zabezpečená. Vložte své přihlašovací údaje a my Vám zároveň pošleme práva.' - NOTERESETLINKINVALID: '

Odkaz na resetování hesla není platný nebo je prošlý.

Můžete požádat o nový zde nebo změňte své heslo až se přihlásíte.

' NOTERESETPASSWORD: 'Zadejte svou e-mailovou adresu a bude vám zaslán nulovací odkaz pro Vaše heslo' - PASSWORDSENTHEADER: 'Odkaz na resetování hesla byl odeslán na ''{email}''' - PASSWORDSENTTEXT: 'Děkujeme! Resetovací odkaz byl odeslán na ''{email}'', pokud účet existuje pro tuto emailovou adresu.' diff --git a/lang/da.yml b/lang/da.yml index 8dc512b23..3fe62969a 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -1,5 +1,328 @@ da: + SilverStripe\Admin\LeftAndMain: + VersionUnknown: ukendt + SilverStripe\AssetAdmin\Forms\UploadField: + Dimensions: Dimensioner + EDIT: Rediger + EDITINFO: 'Rediger denne fil' + REMOVE: Fjern + SilverStripe\Control\ChangePasswordEmail_ss: + CHANGEPASSWORDFOREMAIL: 'Koden for kontoen med email addressen {email} er ændret. Hvis du ikke har skiftet din kode, så skift venligst din kode ved at klikke på linket herunder' + CHANGEPASSWORDTEXT1: 'Du skiftede dit kodeord for' + CHANGEPASSWORDTEXT3: 'Skift kodeord' + HELLO: Hej + SilverStripe\Control\Email\ForgotPasswordEmail_ss: + HELLO: Hej + TEXT1: 'Her er din' + TEXT2: 'link til at nulstille dit kodeord' + TEXT3: for + SilverStripe\Control\RequestProcessor: + INVALID_REQUEST: 'Ugyldig forespørgsel' + REQUEST_ABORTED: 'Forespørgsel annulleret' + SilverStripe\Core\Manifest\VersionProvider: + VERSIONUNKNOWN: Ukendt + SilverStripe\Forms\CheckboxField: + NOANSWER: Nej + YESANSWER: Ja + SilverStripe\Forms\CheckboxSetField_ss: + NOOPTIONSAVAILABLE: 'Ingen tilgængelige muligheder' + SilverStripe\Forms\ConfirmedPasswordField: + ATLEAST: 'Kodeord skal være mindst {min} tegn lang.' + BETWEEN: 'Kodeord skal være {min} til {max} karakterer lang.' + CURRENT_PASSWORD_ERROR: 'Det nuværende kodeord du har indtastet er ikke korrekt.' + CURRENT_PASSWORD_MISSING: 'Du skal indtaste dit nuværende kodeord.' + LOGGED_IN_ERROR: 'Du skal være logget ind for at skifte dit kodeord.' + MAXIMUM: 'Kodeord må maks være {max} tegn lang' + SHOWONCLICKTITLE: 'Skift kodeord' + SilverStripe\Forms\CurrencyField: + CURRENCYSYMBOL: DKK + SilverStripe\Forms\DateField: + VALIDDATEFORMAT2: 'Indtats venligst et gyldigt datoformat ({format})' + VALIDDATEMAXDATE: 'Din dato skal være ældre end eller matche den maksimalt tilladte dato ({date})' + VALIDDATEMINDATE: 'Din dato skal være yngre end eller matche den minimum tilladte dato ({date})' + SilverStripe\Forms\DatetimeField: + VALIDDATEMAXDATETIME: 'Din dato skal være ældre end eller matche den maksimalt tilladte dato ({datetime})' + VALIDDATETIMEFORMAT: 'Indtats venligst et gyldigt dato- og tidsformat ({format})' + VALIDDATETIMEMINDATE: 'Din dato skal være yngre end eller matche den minimum tilladte dato og tid ({datetime})' + SilverStripe\Forms\DropdownField: + CHOOSE: (Vælg) + CHOOSE_MODEL: '(Vælg {name})' + SOURCE_VALIDATION: 'Venligst vælg en eksisterende værdi fra listen. {value} er ikke en tilladt mulighed' + SilverStripe\Forms\EmailField: + VALIDATION: 'Indtast venligst en emailadresse' + SilverStripe\Forms\FileUploadReceiver: + FIELDNOTSET: 'Fil information ikke fundet' + SilverStripe\Forms\Form: + BAD_METHOD: 'Denne form kræver en {method} indsendelse' + CSRF_EXPIRED_MESSAGE: 'Din session er udløbet. Venligst gensend formularen.' + CSRF_FAILED_MESSAGE: 'Det ser ud til der har været et teknisk problem. Klik venligst på tilbageknappen, tryk opdater i din browser og prøv igen.' + VALIDATIONPASSWORDSDONTMATCH: 'Kodeordene er ikke identiske' + VALIDATIONPASSWORDSNOTEMPTY: 'Kodeord kan ikke være tomme' + VALIDATIONSTRONGPASSWORD: 'Kodeord skal mindst have et tal og et alfanumerisk tegn' + VALIDATOR: Validering + VALIDCURRENCY: 'Indtast venligst en gyldig valuta' + SilverStripe\Forms\FormField: + EXAMPLE: 'f.eks. {format}' + NONE: ingen + SilverStripe\Forms\FormScaffolder: + TABMAIN: Primær SilverStripe\Forms\GridField\GridField: - Filter: Filter + Add: 'Tilføj {name}' + CSVEXPORT: 'Eksporter til CSV' + CSVIMPORT: 'Importer CSV' + Filter: Filtrer + FilterBy: 'Filtrer på' + Find: Find + LinkExisting: 'Link eksisterende' + NewRecord: 'Ny {type}' + NoItemsFound: 'Ingen elementer fundet' + PRINTEDAT: 'Printet d.' + PRINTEDBY: 'Printet af' + PlaceHolder: 'Find {type}' + PlaceHolderWithLabels: 'Find {type} på {name}' + Print: Print + RelationSearch: Relationssøgning + ResetFilter: Nulstil + SilverStripe\Forms\GridField\GridFieldDeleteAction: + Delete: Slet + DeletePermissionsFailure: 'Ingen slette rettigheder' + EditPermissionsFailure: 'Ingen rettighed til at fjerne emnet' + UnlinkRelation: Fjern + SilverStripe\Forms\GridField\GridFieldDetailForm: + CancelBtn: Annuller + Create: Opret + Delete: Slet + DeletePermissionsFailure: 'Ingen slette rettigheder' + Deleted: 'Slet {type} {name}' + Save: Gem + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Rediger + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'Kan ikke fjerne dig selv fra denne gruppe, du vil miste administrator rettigheder' + SilverStripe\Forms\GridField\GridFieldPaginator: + OF: af + Page: Side + View: Vis + SilverStripe\Forms\MoneyField: + FIELDLABELAMOUNT: Beløb + FIELDLABELCURRENCY: Valuta + INVALID_CURRENCY: 'Valuta {currency} er ikke i listen over tilladte valutaer' + SilverStripe\Forms\MultiSelectField: + SOURCE_VALIDATION: 'Vælg venligst eksisterende værdier fra listen. Ugyldig mulighed(er) {value} valgt' + SilverStripe\Forms\NullableField: + IsNullLabel: 'Er Null' + SilverStripe\Forms\NumericField: + VALIDATION: '''{value}'' er ikke et tal, kun tal accepteres i dette felt' + SilverStripe\Forms\TimeField: + VALIDATEFORMAT: 'Indtats venligst et gyldigt tidsformat ({format})' + SilverStripe\ORM\DataObject: + PLURALNAME: Dataobjekter + PLURALS: + one: 'Et dataobjekt' + other: '{count} dataobjekter' + SINGULARNAME: Dataobjekt + SilverStripe\ORM\FieldType\DBBoolean: + ANY: Enhver + NOANSWER: Nej + YESANSWER: Ja + SilverStripe\ORM\FieldType\DBDate: + DAYS_SHORT_PLURALS: + one: '{count} dag' + other: '{count} dage' + HOURS_SHORT_PLURALS: + one: '{count} time' + other: '{count} timer' + LessThanMinuteAgo: 'mindre end et minut' + MINUTES_SHORT_PLURALS: + one: '{count} minut' + other: '{count} minutter' + MONTHS_SHORT_PLURALS: + one: '{count} måned' + other: '{count} måneder' + SECONDS_SHORT_PLURALS: + one: '{count} sekund' + other: '{count} sekunder' + TIMEDIFFAGO: '{difference} siden' + TIMEDIFFIN: 'i {difference}' + YEARS_SHORT_PLURALS: + one: '{count} år' + other: '{count} år' + SilverStripe\ORM\FieldType\DBEnum: + ANY: Enhver + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'For mange relaterede objekter; fallback felt i brug' + SilverStripe\ORM\Hierarchy: + LIMITED_TITLE: 'For mange underelementer ({count})' + SilverStripe\ORM\Hierarchy\Hierarchy: + InfiniteLoopNotAllowed: 'Uendeligt løkke fundet i "{type}" hierarkiet. Ændre venligst det overliggende element for at løse dette' + LIMITED_TITLE: 'For mange underelementer ({count})' + SilverStripe\ORM\ValidationException: + DEFAULT_ERROR: Valideringsfejl + SilverStripe\Security\BasicAuth: + ENTERINFO: 'Indtast venligst et brugernavn og kodeord.' + ERRORNOTADMIN: 'Den bruger er ikke en administrator.' + ERRORNOTREC: 'Brugernavn / kodeord kunne ikke genkendes' + SilverStripe\Security\CMSMemberLoginForm: + PASSWORDEXPIRED: '

Dit kodeord er udløbet. Vælg venligst et nyt.

' + SilverStripe\Security\CMSSecurity: + INVALIDUSER: '

Ugyldig bruger. Log venligst ind igen her for at fortsætte.

' + LOGIN_MESSAGE: '

Din session er løbet ud pga. inaktivitet

' + LOGIN_TITLE: 'Log ind igen, for at fortsætte hvor du slap.' + SUCCESS: Succes + SUCCESSCONTENT: '

Logget ind. Hvis du ikke automatisk viderestilles så klik her

' + SUCCESS_TITLE: 'Logget ind med sucess' + SilverStripe\Security\DefaultAdminService: + DefaultAdminFirstname: 'Standard admin' + SilverStripe\Security\Group: + AddRole: 'Tilføj en rolle for denne gruppe' + Code: 'Gruppe kode' + DefaultGroupTitleAdministrators: Administratorer + DefaultGroupTitleContentAuthors: Indholdsforfattere + Description: Beskrivelse + GROUPNAME: Gruppenavn + GroupReminder: 'Hvis du vælger en overliggende gruppe, får denne gruppe alle dens roller' + HierarchyPermsError: 'Kan ikke tildele overliggende gruppe "{group}" med fortrinsrettigheder (kræver ADMIN adgang)' + Locked: 'Låst?' + MEMBERS: Brugere + NEWGROUP: 'Ny gruppe' + NoRoles: 'Ingen roller fundet' + PERMISSIONS: Rettigheder + PLURALNAME: Grupper + PLURALS: + one: 'En gruppe' + other: '{count} grupper' + Parent: 'Overliggende gruppe' + ROLES: Roller + ROLESDESCRIPTION: 'Roller er et prædefineret sæt af rettigheder, som kan tildeles grupper.
De bliver nedarvet fra en overliggende grupper hvis krævet.' + RolesAddEditLink: 'Administrer roller' + SINGULARNAME: Gruppe + Sort: Sortering + has_many_Permissions: Rettigheder + many_many_Members: Brugere + SilverStripe\Security\LoginAttempt: + Email: 'Email adresse' + EmailHashed: 'Email adresse (hashed)' + IP: 'IP addresse' + PLURALNAME: Loginforsøg + PLURALS: + one: 'Et loginforsøg' + other: '{count} loginforsøg' + SINGULARNAME: 'Login forsøg' + Status: Status + SilverStripe\Security\Member: + ADDGROUP: 'Tilføj gruppe' + BUTTONCHANGEPASSWORD: 'Skift kodeord' + BUTTONLOGIN: 'Log ind' + BUTTONLOGINOTHER: 'Log ind med en anden bruger' + BUTTONLOGOUT: 'Log ud' + BUTTONLOSTPASSWORD: 'Jeg har glemt mit kodeord' + CONFIRMNEWPASSWORD: 'Bekræft nyt kodeord' + CONFIRMPASSWORD: 'Bekræft kodeord' + CURRENT_PASSWORD: 'Nuværende kodeord' + EDIT_PASSWORD: 'Nyt kodeord' + EMAIL: Email + EMPTYNEWPASSWORD: 'Det nye kodeord kan ikke være tom, prøv venligst igen' + ENTEREMAIL: 'Indtast venligst en email adresse for at få et nulstillingslink.' + ERRORLOCKEDOUT2: 'Din konto er blevet midlertidigt deaktiveret pga. for mange fejlslagne loginforsøg. Forsøg venligst igen om {count} minutter.' + ERRORNEWPASSWORD: 'Du har indtastet dit nye kodeord forskelligt, forsøg igen' + ERRORPASSWORDNOTMATCH: 'Dit nuværende kodeord matcher ikke, forsøg venligst igen' + ERRORWRONGCRED: 'De indtastede værdier ser ikke ud til at være korrekte. Forsøg venligst igen.' + FIRSTNAME: Fornavn + INTERFACELANG: 'Sprog i brugerfladen' + KEEPMESIGNEDIN: 'Hold mig logget ind' + LOGGEDINAS: 'Du er logget ind som {name}.' + NEWPASSWORD: 'Nyt kodeord' + PASSWORD: Kodeord + PASSWORDEXPIRED: 'Dit kodeord er udløbet. Vælg venligst et nyt.' + PLURALNAME: Brugere + PLURALS: + one: 'En bruger' + other: '{count} brugere' + REMEMBERME: 'Husk mig til næste gang? (i {count} dage på denne enhed)' + SINGULARNAME: Bruger + SUBJECTPASSWORDCHANGED: 'Dit kodeord er blevet ændret' + SUBJECTPASSWORDRESET: 'Link til at nulstille dit kodeord' + SURNAME: Efternavn + VALIDATIONADMINLOSTACCESS: 'Kan ikke fjerne alle admin grupper fra din profil' + ValidationIdentifierFailed: 'Kan ikke overskrive eksisterende bruger #{id} med identisk identifikator ({name} = {value}))' + WELCOMEBACK: 'Velkommen tilbage, {firstname}' + YOUROLDPASSWORD: 'Dit gamle kodeord' + belongs_many_many_Groups: Grupper + db_Locale: 'Sprog i brugerfladen' + db_LockedOutUntil: 'Låst ude indtil' + db_Password: Kodeord + db_PasswordExpiry: Kodeordsudløbsdato + SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: + AUTHENTICATORNAME: 'CMS bruger loginform' + BUTTONFORGOTPASSWORD: 'Glemt kodeord' + BUTTONLOGIN: 'Log mig ind igen' + BUTTONLOGOUT: 'Log ud' + SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: + ERRORWRONGCRED: 'De indtastede værdier ser ikke ud til at være korrekte. Forsøg venligst igen.' + NoPassword: 'Der er ikke en kode på denne bruger.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'Email og kodeord' + SilverStripe\Security\MemberPassword: + PLURALNAME: 'Bruger kodeord' + PLURALS: + one: 'Et bruger kodeord' + other: '{count} bruger kodeord' + SINGULARNAME: 'Bruger kodeord' + SilverStripe\Security\PasswordValidator: + LOWCHARSTRENGTH: 'Forøg venligst kodeordets styrke, ved at tilføje nogle af følgende tegn: {chars}' + PREVPASSWORD: 'Du har tidligere brugt dette kodeord, vælg venligst et nyt kodeord' + TOOSHORT: 'Kodeordet er for kort, det skal mindst være {minimum} eller flere tegn langt' SilverStripe\Security\Permission: + AdminGroup: Administrator + CMS_ACCESS_CATEGORY: 'CMS Adgang' CONTENT_CATEGORY: Indholdsrettigheder + FULLADMINRIGHTS: 'Fuld administrator rettighed' + FULLADMINRIGHTS_HELP: 'Indebærer og overskriver alle andre tildelte rettigheder.' + PERMISSIONS_CATEGORY: 'Roller og adgangsrettigheder' + PLURALNAME: Rettigheder + PLURALS: + one: 'En rettighed' + other: '{count} rettigheder' + SINGULARNAME: Rettighed + UserPermissionsIntro: 'Tildeling af grupper til denne bruger, ændrer de rettigheder brugeren har. Se gruppe området for rettigheds detaljer på de individuelle grupper.' + SilverStripe\Security\PermissionCheckboxSetField: + AssignedTo: 'tildelt til "{title}"' + FromGroup: 'nedarvet fra gruppen "{title}"' + FromRole: 'nedarvet fra rollen "{title}"' + FromRoleOnGroup: 'nedarvet fra rollen "{roletitle}" på gruppen "{grouptitle}"' + SilverStripe\Security\PermissionRole: + OnlyAdminCanApply: 'Kun administratorer kan tilføje' + PLURALNAME: Roller + PLURALS: + one: 'En rolle' + other: '{count} roller' + SINGULARNAME: Rolle + Title: Titel + SilverStripe\Security\PermissionRoleCode: + PLURALNAME: 'Rettigheds rolle koder' + PLURALS: + one: 'En rettigheds rolle kode' + other: '{count} rettigheds rolle koder' + PermsError: 'Kan ikke tildele koden "{code}" med fortrinsrettigheder (kræver ADMIN adgang)' + SINGULARNAME: 'Rettighed rolle kode' + SilverStripe\Security\RememberLoginHash: + PLURALNAME: 'Login hashes' + PLURALS: + one: 'Et login hash' + other: '{count} Login Hashes' + SINGULARNAME: 'Login hash' + SilverStripe\Security\Security: + ALREADYLOGGEDIN: 'Du har ikke adgang til denne side. Hvis du har en anden bruger der har adgang til denne side, kan du logge ind med denne herunder.' + BUTTONSEND: 'Send mig linket til at nulstille kodeordet' + CHANGEPASSWORDBELOW: 'Du kan ændre dit kodeord herunder.' + CHANGEPASSWORDHEADER: 'Skift dit kodeord' + CONFIRMLOGOUT: 'Klik venligst på knappen herunder, for at bekræfte at du vil logge ud.' + ENTERNEWPASSWORD: 'Indtast venligst et nyt kodeord.' + ERRORPASSWORDPERMISSION: 'Du skal være logget ind, for at kunne ændre dit kodeord!' + LOGIN: 'Log ind' + LOGOUT: 'Log ud' + LOSTPASSWORDHEADER: 'Glemt kodeord' + NOTEPAGESECURED: 'Denne side er beskyttet. Indtast dine loginoplysninger herunder for at få adgang.' + NOTERESETPASSWORD: 'Indtast din email adresse, så sender vi dig et link som du kan nulstille dit kodeord med' + PASSWORDRESETSENTHEADER: 'link til at nulstille kodeord afsendt' + PASSWORDRESETSENTTEXT: 'Tak for det. Et link til at nulstille dit kodeord er afsendt, hvis der findes en bruger med denne email adresse.' diff --git a/lang/de.yml b/lang/de.yml index 1e9f16e5e..77e2f1584 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -190,7 +190,4 @@ de: LOGIN: Anmelden LOSTPASSWORDHEADER: 'Passwort vergessen' NOTEPAGESECURED: 'Diese Seite ist geschützt. Bitte melden Sie sich an und Sie werden sofort weitergeleitet.' - NOTERESETLINKINVALID: '

Der Link zum Zurücksetzen des Passworts ist entweder nicht korrekt oder abgelaufen

Sie können einen neuen Link anfordern oder Ihr Passwort nach dem einloggen ändern.

' NOTERESETPASSWORD: 'Geben Sie Ihre E-Mail-Adresse ein und wir werden Ihnen einen Link zuschicken, mit dem Sie Ihr Passwort zurücksetzen können.' - PASSWORDSENTHEADER: 'Der Link zum Zurücksetzen des Passworts wurde an ''{email}'' gesendet' - PASSWORDSENTTEXT: 'Vielen Dank! Wenn ein Account zu der E-Mail Adresse ''{email}'' existiert, wurde eine E-Mail mit dem Link zum Zurücksetzen des Passworts verschickt.' diff --git a/lang/eo.yml b/lang/eo.yml index 59806b953..fb6b74ca9 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -95,6 +95,8 @@ eo: DeletePermissionsFailure: 'Mankas permeso forigi' Deleted: 'Forigita {type} {name}' Save: Konservi + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Redakti SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Ne povas forigi vin el ĉi tiu grupo; vi perdus administrajn rajtojn' SilverStripe\Forms\GridField\GridFieldPaginator: @@ -147,6 +149,8 @@ eo: other: '{count} jaroj' SilverStripe\ORM\FieldType\DBEnum: ANY: Ajna + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Tro multaj objektoj; retropaŝa kampo uzata' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Tro da idoj ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -319,7 +323,6 @@ eo: LOGOUT: Elsaluti LOSTPASSWORDHEADER: 'Perdis pasvorton' NOTEPAGESECURED: 'Tiu paĝo estas sekurigita. Enigu viajn akreditaĵojn sube kaj vi aliros pluen.' - NOTERESETLINKINVALID: '

La pasvorta reagorda ligilo estas malvalida aŭ finiĝis.

Vi povas peti novan ĉi tie aŭ ŝanĝi vian pasvorton post vi ensalutis.

' NOTERESETPASSWORD: 'Enigu vian retpoŝtan adreson kaj ni sendos al vi ligilon per kiu vi povas reagordi vian pasvorton' - PASSWORDSENTHEADER: 'Pasvorta reagorda ligilo sendiĝis al ''{email}''' - PASSWORDSENTTEXT: 'Dankon! Reagordita ligilo sendiĝis al ''{email}'', kondiĉe ke konto ekzistas por tiu retadreso.' + PASSWORDRESETSENTHEADER: 'Pasvorta reagorda ligilo sendiĝis' + PASSWORDRESETSENTTEXT: 'Dankon. Reagorda ligilo sendiĝis, kondiĉe ke konto ekzistas por ĉi tiu retadreso.' diff --git a/lang/es.yml b/lang/es.yml index 0009c7a4a..debd4b4a7 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -249,7 +249,4 @@ es: LOGIN: Entrar LOSTPASSWORDHEADER: '¿Contraseña Perdida?' NOTEPAGESECURED: 'Esa página está protegida. Introduzca sus datos de acreditación a continuación y lo enviaremos a ella en un momento.' - NOTERESETLINKINVALID: '

El enlace para restablecer la contraseña es inválido o ha expirado.

Usted puede solicitar uno nuevo aqui o cambiar su contraseña después de que se haya conectado.

' NOTERESETPASSWORD: 'Introduzca su dirección de e-mail, y le enviaremos un enlace, con el cual podrá restaurar su contraseña' - PASSWORDSENTHEADER: 'Un enlace para restablecer la contraseña ha sido enviado a ''{email}''' - PASSWORDSENTTEXT: 'Gracias! Un enlace para restablecer la contraseña ha sido enviado a ''{email}'', siempre que una cuenta exista para la dirección de email indicada.' diff --git a/lang/et_EE.yml b/lang/et_EE.yml index 63fc4cd5d..a8fb3b686 100644 --- a/lang/et_EE.yml +++ b/lang/et_EE.yml @@ -139,7 +139,4 @@ et_EE: ERRORPASSWORDPERMISSION: 'Pead olema sisseloginud, et parooli muuta!' LOGIN: 'Logi sisse' NOTEPAGESECURED: 'See leht on turvatud. Sisesta enda andmed allpool ja me saadame sind otse edasi' - NOTERESETLINKINVALID: '

Parooli lähtestamise link on kehtetu või aegunud.

Saate taotleda uut linki siin või muuta parooli pärast sisselogimist.

' NOTERESETPASSWORD: 'Sisesta oma email ja me saadame sulle lingi kus saad oma parooli tühistada.' - PASSWORDSENTHEADER: 'Parooli lähtestamise link saadeti aadressile ''{email}''' - PASSWORDSENTTEXT: 'Aitäh! Lähtestamislink saadeti aadressile ''{email}'' eeldusel, et selle e-posti aadressiga seotud konto on olemas.' diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml index b292b25d7..b9aa0ebea 100644 --- a/lang/fa_IR.yml +++ b/lang/fa_IR.yml @@ -168,4 +168,3 @@ fa_IR: ERRORPASSWORDPERMISSION: 'جهت تغییر گذرواژه خود باید وارد شده باشید!' LOGIN: ورود LOSTPASSWORDHEADER: 'فراموشی گذرواژه' - PASSWORDSENTHEADER: 'لینک ازنوسازی گذرواژه به ''{email}'' ارسال شد' diff --git a/lang/fi.yml b/lang/fi.yml index 364762d3a..b19807225 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -76,6 +76,7 @@ fi: LinkExisting: 'Linkitä olemassaoleva' NewRecord: 'Uusi {type}' NoItemsFound: 'Ei kohteita' + OpenFilter: 'Avaa haku ja suodatus' PRINTEDAT: Tulostettu PRINTEDBY: Tulostaja PlaceHolder: 'Etsi {type}' @@ -95,12 +96,19 @@ fi: DeletePermissionsFailure: 'Ei oikeuksia poistamiseen' Deleted: 'Poistettiin {type} {name}' Save: Tallenna + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Muokkaa + SilverStripe\Forms\GridField\GridFieldFilterHeader: + Search: 'Haku "{name}"' + SearchFormFaliure: 'Hakulomaketta ei pystytty luomaan.' SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Et voi siirtää itseäsi pois tästä ryhmästä: menettäisit pääkäyttäjän oikeudet' SilverStripe\Forms\GridField\GridFieldPaginator: OF: / Page: Sivu View: Näytä + SilverStripe\Forms\GridField\GridFieldViewButton: + VIEW: Avaa SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Määrä FIELDLABELCURRENCY: Valuutta @@ -147,6 +155,8 @@ fi: other: '{count} vuotta' SilverStripe\ORM\FieldType\DBEnum: ANY: Yhtään + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Liian monta samaan liittyvää objektia: oletuskenttä käytössä' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Liian monta lapsiobjektia ({count}}' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -197,6 +207,7 @@ fi: many_many_Members: Jäsenet SilverStripe\Security\LoginAttempt: Email: Sähköpostiosoite + EmailHashed: 'Sähköpostiosoite (tiivistetty)' IP: IP-osoite PLURALNAME: Kirjautumisyritykset PLURALS: @@ -255,6 +266,8 @@ fi: SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: ERRORWRONGCRED: 'Antamasi tiedot eivät näytä oikeilta. Yritä uudelleen.' NoPassword: 'Tällä käyttäjällä ei ole salasanaa' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'Sähköpostiosoite & salasana' SilverStripe\Security\MemberPassword: PLURALNAME: 'Käyttäjän salasanat' PLURALS: @@ -318,5 +331,5 @@ fi: NOTEPAGESECURED: 'Tämä sivu on suojattu. Syötä tunnistetietosi alle niin pääset eteenpäin.' NOTERESETLINKINVALID: '

Salasanan palautuslinkki on virheellinen tai vanhentunut.

Voit pyytää uuden napsauttamalla tästä tai vaihtaa salasanasi kirjautumisen jälkeen.

' NOTERESETPASSWORD: 'Syötä sähköpostiosoitteesi ja lähetämme sinulle linkin, jonka avulla saat palautettua salasanasi' - PASSWORDSENTHEADER: 'Salasanan palautuslinkki lähetettiin osoitteeseen ''{email}''' - PASSWORDSENTTEXT: 'Kiitos! Salasanan palautuslinkki lähetettiin osoitteeseen ''{email}'', joka on liitettynä tähän käyttäjätiliin.' + PASSWORDRESETSENTHEADER: 'Salasanan palautuslinkki lähetetty' + PASSWORDRESETSENTTEXT: 'Kiitos, palautuslinkki on lähetetty käyttäjätilille asetettuun sähköpostiosoitteeseen.' diff --git a/lang/fr.yml b/lang/fr.yml index 5a18188da..450cfdb87 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -84,7 +84,6 @@ fr: RelationSearch: 'Rechercher relations' ResetFilter: Réinitialiser SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Supprimer Delete: Supprimer DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer' EditPermissionsFailure: 'Pas de permissions pour délier l''enregistrement' @@ -96,8 +95,6 @@ fr: DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer' Deleted: '{type} {name} supprimés' Save: Enregistrer - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Éditer SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Impossible de retirer votre propre profil de ce groupe, vous perdriez vos droits d''administration' SilverStripe\Forms\GridField\GridFieldPaginator: @@ -322,7 +319,4 @@ fr: LOGOUT: 'Se déconnecter' LOSTPASSWORDHEADER: 'Mot de passe oublié' NOTEPAGESECURED: 'Cette page est sécurisée. Entrez vos identifiants ci-dessous et vous pourrez y avoir accès.' - NOTERESETLINKINVALID: '

Le lien de réinitialisation du mot de passe n’est pas valide ou a expiré.

Vous pouvez en demander un nouveau en suivant ce lien ou changer de mot de passe après connexion.

' NOTERESETPASSWORD: 'Entrez votre adresse email et nous vous enverrons un lien pour modifier votre mot de passe' - PASSWORDSENTHEADER: "Lien de réinitialisation de mot de passe envoyé à «\_{email}\_»" - PASSWORDSENTTEXT: "Merci\_! Un lien de réinitialisation vient d’être envoyé à «\_{email}\_», à condition que cette adresse existe." diff --git a/lang/id.yml b/lang/id.yml index d17eac338..c9c06bbff 100644 --- a/lang/id.yml +++ b/lang/id.yml @@ -167,7 +167,4 @@ id: LOGIN: Masuk LOSTPASSWORDHEADER: 'Kata Kunci yang Terlupa' NOTEPAGESECURED: 'Laman ini diamankan. Isikan data berikut untuk dikirimkan hak akses Anda.' - NOTERESETLINKINVALID: '

Tautan penggantian kata kunci tidak valid atau sudah kadaluarsa.

Anda dapat meminta yang baru di sini atau mengganti kata kunci setelah Anda masuk.

' NOTERESETPASSWORD: 'Isikan alamat email Anda untuk mendapatkan tautan penggantian kata kunci' - PASSWORDSENTHEADER: 'Tautan penggantian kata kunci dikirimkan ke ''{email}''' - PASSWORDSENTTEXT: 'Terimakasih! Tautan reset telah dikirim ke ''{email}'', berisi informasi akun untuk alamat email ini.' diff --git a/lang/id_ID.yml b/lang/id_ID.yml index 22ebcb2e5..11d1f2bb3 100644 --- a/lang/id_ID.yml +++ b/lang/id_ID.yml @@ -166,7 +166,4 @@ id_ID: LOGIN: Masuk LOSTPASSWORDHEADER: 'Kata Kunci yang Terlupa' NOTEPAGESECURED: 'Laman ini diamankan. Isikan data berikut untuk dikirimkan hak akses Anda.' - NOTERESETLINKINVALID: '

Tautan penggantian kata kunci tidak valid atau sudah kadaluarsa.

Anda dapat meminta yang baru di sini atau mengganti kata kunci setelah Anda masuk.

' NOTERESETPASSWORD: 'Isikan alamat email Anda untuk mendapatkan tautan penggantian kata kunci' - PASSWORDSENTHEADER: 'Tautan penggantian kata kunci dikirimkan ke ''{email}''' - PASSWORDSENTTEXT: 'Terimakasih! Tautan reset telah dikirim ke ''{email}'', berisi informasi akun untuk alamat email ini.' diff --git a/lang/it.yml b/lang/it.yml index 05bf5dc83..4089faf9b 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -95,6 +95,10 @@ it: DeletePermissionsFailure: 'Non hai i permessi per eliminare' Deleted: 'Eliminato {type} {name}' Save: Salva + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Modifica + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'Non è possibile rimuovere te stesso da questo gruppo, perderesti i diritti di admin' SilverStripe\Forms\GridField\GridFieldPaginator: OF: di Page: Pagina @@ -145,6 +149,8 @@ it: other: '{count} anni' SilverStripe\ORM\FieldType\DBEnum: ANY: Qualsiasi + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Troppi oggetti correlati; campo di fallback in uso' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Troppi figli ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -195,6 +201,7 @@ it: many_many_Members: Membri SilverStripe\Security\LoginAttempt: Email: 'Indirizzo e-mail' + EmailHashed: 'Indirizzo email (hash)' IP: 'Indirizzo IP' PLURALNAME: 'Tentativi d''accesso' PLURALS: @@ -236,6 +243,7 @@ it: SUBJECTPASSWORDCHANGED: 'La tua password è stata cambiata' SUBJECTPASSWORDRESET: 'Link per azzerare la tua password' SURNAME: Cognome + VALIDATIONADMINLOSTACCESS: 'Non è possibile rimuovere tutti i gruppi admin dal tuo profilo' ValidationIdentifierFailed: 'Non posso sovrascrivere l''utente esistente #{id} con identificatore identico ({name} = {value}))' WELCOMEBACK: 'Bentornato, {firstname}' YOUROLDPASSWORD: 'La tua vecchia password' @@ -252,6 +260,8 @@ it: SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: ERRORWRONGCRED: 'I dettagli forniti non sembrano corretti. Per favore riprovare.' NoPassword: 'Manca la password per questo utente.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'E-mail & Password' SilverStripe\Security\MemberPassword: PLURALNAME: 'Password utenti' PLURALS: @@ -313,7 +323,6 @@ it: LOGOUT: Scollegati LOSTPASSWORDHEADER: 'Password smarrita' NOTEPAGESECURED: 'La pagina è protetta. Inserisci le credenziali qui sotto per poter andare avanti.' - NOTERESETLINKINVALID: '

Il link per azzerare la password non è valido o è scaduto.

Puoi richiederne uno nuovo qui o cambiare la tua password dopo che ti sei connesso.

' NOTERESETPASSWORD: 'Inserisci il tuo indirizzo e-mail e ti verrà inviato un link per poter azzerare la tua password.' - PASSWORDSENTHEADER: 'Link per azzeramento della password inviato a ''{email}''' - PASSWORDSENTTEXT: 'Grazie! Un link di azzeramento è stato inviato a ''{email}'', fornito un account esistente per questo indirizzo e-mail.' + PASSWORDRESETSENTHEADER: 'Link di azzeramento password inviato' + PASSWORDRESETSENTTEXT: 'Grazie! Un link di azzeramento è stato inviato, supponendo un account esista a quell''indirizzo e-mail.' diff --git a/lang/ja.yml b/lang/ja.yml index b2f92eb1e..433a832e2 100644 --- a/lang/ja.yml +++ b/lang/ja.yml @@ -146,7 +146,4 @@ ja: ERRORPASSWORDPERMISSION: パスワードを変更する為に、ログインしなければなりません！ LOGIN: ログイン NOTEPAGESECURED: このページはセキュリティで保護されております証明書キーを下記に入力してください。こちらからすぐに送信します - NOTERESETLINKINVALID: '

パスワードのリセットリンクは有効でないか期限切れです。

新しいパスワードを要求することができます ここ もしくはパスワードを変更することができます ログインした後 .

' NOTERESETPASSWORD: メールアドレスを入力してください、パスワードをリセットするURLを送信致します - PASSWORDSENTHEADER: 'パスワードリセットリンクは ''{email}'' に送信されました' - PASSWORDSENTTEXT: 'ありがとうございました！　リセットリンクは、''{email}'' に、このアカウントが存在することを前提として送信されました。' diff --git a/lang/lt.yml b/lang/lt.yml index abdbaea25..3ca7adbff 100644 --- a/lang/lt.yml +++ b/lang/lt.yml @@ -167,7 +167,4 @@ lt: LOGIN: Prisijungti LOSTPASSWORDHEADER: 'Slaptažodžio atstatymas' NOTEPAGESECURED: 'Šis puslapis yra apsaugotas. Įveskite savo duomenis į žemiau esančius laukelius.' - NOTERESETLINKINVALID: '

Neteisinga arba negaliojanti slaptažodžio atstatymo nuoroda.

Galite atsisiųsti naują čia arba pasikeisti slaptažodį po to, kai prisijungsite.

' NOTERESETPASSWORD: 'Įveskite savo e. pašto adresą ir atsiųsime slaptažodžio atstatymui skirtą nuorodą' - PASSWORDSENTHEADER: 'Slaptažodžio atstatymo nuoroda nusiųsta į ''{email}''' - PASSWORDSENTTEXT: 'Atstatymo nuoroda nusiųsta į ''{email}''' diff --git a/lang/mi.yml b/lang/mi.yml index 7a2601ed5..e9fe2308e 100644 --- a/lang/mi.yml +++ b/lang/mi.yml @@ -149,7 +149,4 @@ mi: LOGIN: Takiuru LOSTPASSWORDHEADER: 'Kupuhipa Ngaro' NOTEPAGESECURED: 'Kua ngita tēnā whārangi. Tāurua ō taipitoptio tuakiri ki raro, ā, mā mātou koe e tuku kia haere tonu.' - NOTERESETLINKINVALID: '

He muhu, kua mōnehu rānei te hono tautuhi kupuhipa anō.

Ka taea te tono i te mea hōui konei ka huri rānei i tō kupuhipa ā muri i tōtakiuru.

' NOTERESETPASSWORD: 'Tāurua tō wāhitau īmēra, mā mātou e tuku tētahi hono ki a koe e taea ai te tautuhi anō i tō kupuhipa' - PASSWORDSENTHEADER: 'I tukuna he hono tautuhi kupuhipa anō ki ''{email}''' - PASSWORDSENTTEXT: 'Kia ora! Kua tukuna he hono tautuhi anō ki ''{email}'',engari rā kei te tīariari he pūkete mō taua wāhitau īmēra.' diff --git a/lang/nb.yml b/lang/nb.yml index 91dd9f758..f1dc4c74d 100644 --- a/lang/nb.yml +++ b/lang/nb.yml @@ -152,7 +152,4 @@ nb: LOGIN: 'Logg inn' LOSTPASSWORDHEADER: 'Mistet passord' NOTEPAGESECURED: 'Den siden er sikret. Skriv inn gyldig innloggingsinfo så kommer du inn.' - NOTERESETLINKINVALID: '

Lenken for å nullstille passordet er ugyldig eller utgått.

Du kan kreve en ny her eller endre passordet etter at du har logget inn.

' NOTERESETPASSWORD: 'Skriv inn epostadressen din og vi vil sende deg en lenke som nullstiller passordet.' - PASSWORDSENTHEADER: 'Lenke for nullstilling av passord ble sendt til ''{email}''' - PASSWORDSENTTEXT: 'Takk! En lenke for å lage nytt passord er sendt til ''{email}'', forutsatt at det eksisterer en konto for denne epostadressen.' diff --git a/lang/nl.yml b/lang/nl.yml index 64f191213..f6de04299 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -1,4 +1,26 @@ nl: + SilverStripe\Admin\LeftAndMain: + VersionUnknown: onbekend + SilverStripe\AssetAdmin\Forms\UploadField: + Dimensions: Afmetingen + EDIT: Bewerken + EDITINFO: 'Bewerk dit bestand' + REMOVE: Verwijder + SilverStripe\Control\ChangePasswordEmail_ss: + CHANGEPASSWORDFOREMAIL: 'Het wachtwoord voor het account met e-mailadres {email} is aangepast. Indien u uw wachtwoord niet heeft aangepast kunt u dat doen met onderstaande link.' + CHANGEPASSWORDTEXT1: 'U heeft het wachtwoord veranderd voor' + CHANGEPASSWORDTEXT3: 'Wachtwoord veranderen' + HELLO: Hallo + SilverStripe\Control\Email\ForgotPasswordEmail_ss: + HELLO: Hallo + TEXT1: 'Hier is uw' + TEXT2: 'link om uw wachtwoord opnieuw aan te maken' + TEXT3: voor + SilverStripe\Control\RequestProcessor: + INVALID_REQUEST: 'Fout bij verwerken' + REQUEST_ABORTED: 'Fout bij verwerken (geannuleerd)' + SilverStripe\Core\Manifest\VersionProvider: + VERSIONUNKNOWN: Onbekend SilverStripe\Forms\CheckboxField: NOANSWER: Nee YESANSWER: Ja @@ -8,6 +30,8 @@ nl: ATLEAST: 'Een wachtwoord moet tenminste {min} karakters hebben.' BETWEEN: 'Een wachtwoord moet tussen de {min} en {max} karakters hebben' CURRENT_PASSWORD_ERROR: 'Het wachtwoord dat u heeft ingevoerd is niet juist.' + CURRENT_PASSWORD_MISSING: 'Voer uw huidige wachtwoord in.' + LOGGED_IN_ERROR: 'U moet ingelogd zijn om uw wachtwoord te kunnen veranderen!' MAXIMUM: 'Een wachtwoord mag maximaal {max} karakters hebben.' SHOWONCLICKTITLE: 'Verander wachtwoord' SilverStripe\Forms\CurrencyField: @@ -16,12 +40,20 @@ nl: VALIDDATEFORMAT2: 'Vul een geldig datumformaat in ({format})' VALIDDATEMAXDATE: 'De datum moet ouder of gelijk zijn aan de maximale datum ({date})' VALIDDATEMINDATE: 'De datum moet nieuwer of gelijk zijn aan de minimale datum ({date})' + SilverStripe\Forms\DatetimeField: + VALIDDATEMAXDATETIME: 'De datum moet ouder of gelijk zijn aan de maximale datum ({datetime})' + VALIDDATETIMEFORMAT: 'Vul een geldige datum in ({format})' + VALIDDATETIMEMINDATE: 'De datum moet nieuwer of gelijk zijn aan de minimale datum ({datetime})' SilverStripe\Forms\DropdownField: CHOOSE: (Kies) + CHOOSE_MODEL: '(Selecteer {name})' SOURCE_VALIDATION: 'Selecteer een optie uit de lijst. {value} is geen geldige keuze.' SilverStripe\Forms\EmailField: VALIDATION: 'Gelieve een e-mailadres in te voeren.' + SilverStripe\Forms\FileUploadReceiver: + FIELDNOTSET: 'Bestandsinformatie niet gevonden' SilverStripe\Forms\Form: + BAD_METHOD: 'Dit formulier moet middels {method} verzonden worden' CSRF_EXPIRED_MESSAGE: 'Uw sessie is verlopen. Verzend het formulier opnieuw.' CSRF_FAILED_MESSAGE: 'Er lijkt een technisch probleem te zijn. Klik op de knop terug, vernieuw uw browser, en probeer het opnieuw.' VALIDATIONPASSWORDSDONTMATCH: 'Wachtwoorden komen niet overeen' @@ -30,7 +62,10 @@ nl: VALIDATOR: Validator VALIDCURRENCY: 'Vul een geldige munteenheid in' SilverStripe\Forms\FormField: + EXAMPLE: 'bijv. {format}' NONE: geen + SilverStripe\Forms\FormScaffolder: + TABMAIN: Hoofdgedeelte SilverStripe\Forms\GridField\GridField: Add: '{name} toevoegen' CSVEXPORT: 'Exporteer naar CSV' @@ -41,6 +76,7 @@ nl: LinkExisting: 'Koppel een bestaand item' NewRecord: 'Nieuw {type}' NoItemsFound: 'Geen items gevonden.' + OpenFilter: 'Zoeken en filteren openen' PRINTEDAT: 'Geprint op' PRINTEDBY: 'Geprint door' PlaceHolder: 'Zoek {type}' @@ -60,27 +96,72 @@ nl: DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen' Deleted: '{type} {name} verwijderd' Save: Opslaan + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Bewerken + SilverStripe\Forms\GridField\GridFieldFilterHeader: + Search: 'Zoek naar "{name}"' + SearchFormFaliure: 'Er kon geen zoekformulier worden aangemaakt' + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'U kunt uzelf niet verwijderen van deze groep, omdat u dan geen admin-rechten meer heeft.' + SilverStripe\Forms\GridField\GridFieldPaginator: + OF: van + Page: Pagina + View: Bekijk + SilverStripe\Forms\GridField\GridFieldViewButton: + VIEW: Bekijk SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Aantal FIELDLABELCURRENCY: Munteenheid + INVALID_CURRENCY: 'Valuta {currency} is niet toegestaan' + SilverStripe\Forms\MultiSelectField: + SOURCE_VALIDATION: 'Selecteer een optie uit de lijst. {value} is geen geldige keuze.' SilverStripe\Forms\NullableField: IsNullLabel: 'Is null' SilverStripe\Forms\NumericField: VALIDATION: '''{value}'' is geen getal, enkel getallen worden door dit veld geaccepteerd' SilverStripe\Forms\TimeField: VALIDATEFORMAT: 'Vul een geldig datumformaat in ({format})' + SilverStripe\ORM\DataObject: + PLURALNAME: 'Data objecten' + PLURALS: + one: 'Data object' + other: '{count} Data objecten' + SINGULARNAME: 'Data object' SilverStripe\ORM\FieldType\DBBoolean: ANY: Elke NOANSWER: Nee YESANSWER: Ja SilverStripe\ORM\FieldType\DBDate: + DAYS_SHORT_PLURALS: + one: '{count} dag' + other: '{count} dagen' + HOURS_SHORT_PLURALS: + one: '{count} uur' + other: '{count} uren' LessThanMinuteAgo: 'minder dan één minuut' + MINUTES_SHORT_PLURALS: + one: '{count} minuut' + other: '{count} minuten' + MONTHS_SHORT_PLURALS: + one: '{count} maand' + other: '{count} maanden' + SECONDS_SHORT_PLURALS: + one: '{count} seconde' + other: '{count} seconden' TIMEDIFFAGO: '{difference} geleden' TIMEDIFFIN: 'in {difference}' + YEARS_SHORT_PLURALS: + one: '{count} jaar' + other: '{count} jaren' SilverStripe\ORM\FieldType\DBEnum: ANY: Elke + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Teveel keuzes in de lijst; een alternatief veld wordt getoond.' + SilverStripe\ORM\Hierarchy: + LIMITED_TITLE: 'Teveel onderliggende items ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: InfiniteLoopNotAllowed: 'Oneindige lus gevonden in "{type}" hiërarchie. Wijzig het hogere niveau om dit op te lossen' + LIMITED_TITLE: 'Teveel onderliggende items ({count})' SilverStripe\ORM\ValidationException: DEFAULT_ERROR: Validatiefout SilverStripe\Security\BasicAuth: @@ -91,34 +172,60 @@ nl: PASSWORDEXPIRED: '

Uw wachtwoord is verlopen. Kies een nieuw wachtwoord.

' SilverStripe\Security\CMSSecurity: INVALIDUSER: '

Ongeldige gebruiker Log hier opnieuw in om verder te gaan.

' + LOGIN_MESSAGE: 'Sessie is verlopen' + LOGIN_TITLE: '

U kunt verder met wat u aan het doen was, door opnieuw in te loggen.

' SUCCESS: Succes SUCCESSCONTENT: '

U bent ingelogd. Klik hier als u niet automatisch wordt doorgestuurd.

' + SUCCESS_TITLE: 'Inloggen is gelukt' + SilverStripe\Security\DefaultAdminService: + DefaultAdminFirstname: 'Standaard Beheerder' SilverStripe\Security\Group: AddRole: 'Voeg een rol toe aan deze groep' Code: 'Groep code' DefaultGroupTitleAdministrators: Beheerders DefaultGroupTitleContentAuthors: 'Inhoud Auteurs' Description: 'Omschrijving ' + GROUPNAME: 'Groep naam' GroupReminder: 'Als u de bovenliggende groep selecteert, neemt deze groep alle rollen over' HierarchyPermsError: 'U moet (ADMIN) rechten hebben om de bovenliggende groep "{group}" toe te kennen' Locked: 'Gesloten?' + MEMBERS: Leden + NEWGROUP: 'Nieuwe groep' NoRoles: 'Geen rollen gevonden' + PERMISSIONS: Rechten + PLURALNAME: Groepen + PLURALS: + one: 'Een groep' + other: '{count} groepen' Parent: 'Bovenliggende groep' + ROLES: Rollen + ROLESDESCRIPTION: 'Rollen zijn logische groeperingen van rechten die in het Rollen tabblad gewijzigd kunnen worden.
Rollen worden automatisch overgenomen van bovenliggende groepen.' RolesAddEditLink: 'Rollen beheren' + SINGULARNAME: Groep Sort: Sorteer-richting has_many_Permissions: Rechten many_many_Members: Leden SilverStripe\Security\LoginAttempt: + Email: 'E-mailadres ' + EmailHashed: 'E-mailadres (versleuteld)' IP: 'IP adres' + PLURALNAME: Inlogpogingen + PLURALS: + one: 'Een inlogpoging' + other: '{count} inlogpogingen' + SINGULARNAME: Inlogpogingen Status: Status SilverStripe\Security\Member: ADDGROUP: 'Groep toevoegen' BUTTONCHANGEPASSWORD: 'Wachtwoord veranderen' BUTTONLOGIN: Inloggen BUTTONLOGINOTHER: 'Als iemand anders inloggen' + BUTTONLOGOUT: Uitloggen BUTTONLOSTPASSWORD: 'Ik ben mijn wachtwoord vergeten' CONFIRMNEWPASSWORD: 'Bevestig het nieuwe wachtwoord' CONFIRMPASSWORD: 'Bevestig wachtwoord' + CURRENT_PASSWORD: 'Huidige wachtwoord' + EDIT_PASSWORD: 'Nieuw wachtwoord' EMAIL: E-mail EMPTYNEWPASSWORD: 'Het nieuwe wachtwoord mag niet leeg zijn, probeer opnieuw' ENTEREMAIL: 'Typ uw e-mailadres om een link te ontvangen waarmee u uw wachtwoord kunt resetten.' @@ -128,13 +235,21 @@ nl: ERRORWRONGCRED: 'De ingevulde gegevens lijken niet correct. Probeer het nog een keer.' FIRSTNAME: Voornaam INTERFACELANG: 'Interface taal' + KEEPMESIGNEDIN: 'Houd mij ingelogd' LOGGEDINAS: 'U bent ingelogd als {name}.' NEWPASSWORD: 'Nieuw wachtwoord' PASSWORD: Wachtwoord PASSWORDEXPIRED: 'Uw wachtwoord is verlopen. Kies een nieuw wachtwoord.' + PLURALNAME: Leden + PLURALS: + one: 'Een lid' + other: '{count} leden' + REMEMBERME: 'Onthoud mij voor volgende keer? (voor {count} dagen op dit apparaat)' + SINGULARNAME: Lid SUBJECTPASSWORDCHANGED: 'Uw wachtwoord is veranderd' SUBJECTPASSWORDRESET: 'Link om uw wachtwoord opnieuw aan te maken' SURNAME: Achternaam + VALIDATIONADMINLOSTACCESS: 'Niet mogelijk om alle admin-groepen te verwijderen van uw profiel' ValidationIdentifierFailed: 'Een bestaande gebruiker #{id} kan niet dezelfde unieke velden hebben ({name} = {value}))' WELCOMEBACK: 'Welkom terug, {firstname}' YOUROLDPASSWORD: 'Uw oude wachtwoord' @@ -143,15 +258,38 @@ nl: db_LockedOutUntil: 'Gesloten tot' db_Password: Wachtwoord db_PasswordExpiry: 'Wachtwoord vervaldatum' + SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: + AUTHENTICATORNAME: Inlogformulier + BUTTONFORGOTPASSWORD: 'Wachtwoord vergeten' + BUTTONLOGIN: 'Opnieuw inloggen' + BUTTONLOGOUT: Uitloggen + SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: + ERRORWRONGCRED: 'De ingevulde gegevens lijken niet correct. Probeer het nog een keer.' + NoPassword: 'Er is geen wachtwoord voor deze gebruiker.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'E-mail & wachtwoord' + SilverStripe\Security\MemberPassword: + PLURALNAME: Gebruikerswachtwoorden + PLURALS: + one: 'Een gebruikerswachtwoord' + other: '{count} Gebruikerswachtwoorden' + SINGULARNAME: Gebruikerswachtwoord SilverStripe\Security\PasswordValidator: LOWCHARSTRENGTH: 'Maak a.u.b. uw wachtwoord sterker door enkele van de volgende karakters te gebruiken: {chars}' PREVPASSWORD: 'U heeft dit wachtwoord in het verleden al gebruikt, kies a.u.b. een nieuw wachtwoord.' TOOSHORT: 'Het wachtwoord is te kort, het moet minimaal {minimum} karakters hebben' SilverStripe\Security\Permission: AdminGroup: Beheerder + CMS_ACCESS_CATEGORY: 'CMS toegang' CONTENT_CATEGORY: Inhoudsrechten FULLADMINRIGHTS: 'Volledige admin rechten' FULLADMINRIGHTS_HELP: 'Impliceert en overstemt alle andere toegewezen rechten.' + PERMISSIONS_CATEGORY: 'Rollen en toegangsrechten' + PLURALNAME: Rechten + PLURALS: + one: Machtiging + other: '{count} rechten' + SINGULARNAME: Machtiging UserPermissionsIntro: 'Groepen aan deze gebruiker toewijzen zullen diens permissies aanpassen. Zie de sectie Groepen voor meer informatie over machtigingen voor afzonderlijke groepen.' SilverStripe\Security\PermissionCheckboxSetField: AssignedTo: 'toegewezen aan "{title}"' @@ -161,21 +299,37 @@ nl: SilverStripe\Security\PermissionRole: OnlyAdminCanApply: 'Alleen admin kan doorvoeren' PLURALNAME: Rollen + PLURALS: + one: 'Een rol' + other: '{count} rollen' SINGULARNAME: Rol Title: Titel SilverStripe\Security\PermissionRoleCode: + PLURALNAME: 'Permissie codes' + PLURALS: + one: 'Een permissiecode' + other: '{count} permissiecodes' PermsError: 'U moet (ADMIN) rechten hebben om de code "{code}" toe te kennen' + SINGULARNAME: Permissiecode + SilverStripe\Security\RememberLoginHash: + PLURALNAME: 'Versleutelde logins' + PLURALS: + one: 'Een versleutelde login' + other: '{count} versleutelde logins' + SINGULARNAME: 'Versleutelde login' SilverStripe\Security\Security: ALREADYLOGGEDIN: 'U hebt geen toegang tot deze pagina. Als u een andere account met de nodige rechten hebt, kan u hieronder opnieuw inloggen.' BUTTONSEND: 'Nieuw wachtwoord aanmaken' CHANGEPASSWORDBELOW: 'U kunt uw wachtwoord hieronder veranderen.' CHANGEPASSWORDHEADER: 'Verander uw wachtwoord' + CONFIRMLOGOUT: 'Klik op onderstaande knop om uit te loggen.' ENTERNEWPASSWORD: 'Voer een nieuw wachtwoord in.' ERRORPASSWORDPERMISSION: 'U moet ingelogd zijn om uw wachtwoord te kunnen veranderen!' LOGIN: 'Meld aan' + LOGOUT: Uitloggen LOSTPASSWORDHEADER: 'Wachtwoord vergeten' NOTEPAGESECURED: 'Deze pagina is beveiligd. Voer uw gegevens in en u wordt automatisch doorgestuurd.' - NOTERESETLINKINVALID: '

De link om uw wachtwoord te kunnen wijzigen is niet meer geldig.

U kunt een nieuwe link aanvragen of uw wachtwoord aanpassen door in te loggen.

' + NOTERESETLINKINVALID: '

De reset link is ongeldig of komen te vervallen.

Je kan hier een nieuwe link aanvragen of het wachtwoord veranderen nadat je bent ingelogd.

' NOTERESETPASSWORD: 'Voer uw e-mailadres in en we sturen een link waarmee u een nieuw wachtwoord kunt instellen.' - PASSWORDSENTHEADER: 'Wachtwoord herstel link verzonden naar {email}' - PASSWORDSENTTEXT: 'Bedankt! Er is een link verstuurd naar {email} om uw wachtwoord opnieuw in te stellen, in de veronderstelling dat er een account bestaat voor dit e-mailadres.' + PASSWORDRESETSENTHEADER: 'link om uw wachtwoord opnieuw aan te maken' + PASSWORDRESETSENTTEXT: 'Bedankt! Er is een link verstuurd om uw wachtwoord opnieuw in te stellen (mits het mailadres reeds bekend is bij ons).' diff --git a/lang/pl.yml b/lang/pl.yml index 3774d27f3..1905acb38 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -84,7 +84,6 @@ pl: RelationSearch: 'Wyszukiwanie powiązań' ResetFilter: Resetuj SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Usuń Delete: Usuń DeletePermissionsFailure: 'Brak uprawnień do usuwania' EditPermissionsFailure: 'Nie masz uprawnień, aby odłączyć rekord' @@ -96,8 +95,6 @@ pl: DeletePermissionsFailure: 'Brak uprawnień do usuwania' Deleted: 'Usunięto {type} {name}' Save: Zapisz - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Edytuj SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Nie możesz usunąć siebie z tej grupy, stracone zostałby prawa administratora' SilverStripe\Forms\GridField\GridFieldPaginator: @@ -352,7 +349,4 @@ pl: LOGOUT: 'Wyloguj się' LOSTPASSWORDHEADER: 'Nie pamiętam hasła' NOTEPAGESECURED: 'Ta strona jest zabezpieczona. Wpisz swoje dane a my wyślemy Ci potwierdzenie niebawem' - NOTERESETLINKINVALID: '

Link resetujący hasło wygasł lub jest nieprawidłowy.

Możesz poprosić o nowy tutaj lub zmień swoje hasło po zalogowaniu się.

' NOTERESETPASSWORD: 'Wpisz adres e-mail, na który mamy wysłać link gdzie możesz zresetować swoje hasło' - PASSWORDSENTHEADER: 'Link resetujący hasła został wysłany do ''{email}''' - PASSWORDSENTTEXT: 'Dziękujemy! Link resetujący hasło został wysłany do ''{email}'', o ile konto użytkownika dla takiego e-maila istnieje.' diff --git a/lang/ru.yml b/lang/ru.yml index 73602e013..add72be7f 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -339,7 +339,4 @@ ru: LOGOUT: Выйти LOSTPASSWORDHEADER: 'Восстановление пароля' NOTEPAGESECURED: 'Эта страница защищена. Пожалуйста, введите свои учетные данные для входа.' - NOTERESETLINKINVALID: '

Неверная ссылка переустановки пароля или время действия ссылки истекло.

Вы можете повторно запросить ссылку, щелкнув здесь, или поменять пароль, войдя в систему.

' NOTERESETPASSWORD: 'Введите Ваш адрес email, и Вам будет отправлена ссылка, по которой Вы сможете переустановить свой пароль' - PASSWORDSENTHEADER: 'Ссылка для переустановки пароля выслана на ''{email}''' - PASSWORDSENTTEXT: 'Ссылка переустановки пароля была выслана на адрес ''{email}'' (письмо дойдет до получателя только в том случае, если аккаунт с таким электронным адресом действительно зарегистрирован).' diff --git a/lang/sk.yml b/lang/sk.yml index 861045fc6..88f4bf260 100644 --- a/lang/sk.yml +++ b/lang/sk.yml @@ -228,7 +228,4 @@ sk: LOGIN: Prihlásiť LOSTPASSWORDHEADER: 'Zabudnuté heslo' NOTEPAGESECURED: 'Táto stránka je zabezpečená. Zadajte svoje prihlasovacie údaje a my Vám zároveň pošleme práva.' - NOTERESETLINKINVALID: '

Odkaz na resetovanie hesla nie je platný alebo je vypršala jeho platnosť.

Môžete požiadať o nový tu alebo zmeňte svoje heslo po prihlásení.

' NOTERESETPASSWORD: 'Zadajte svoju e-mailovú adresu a my Vám pošleme odkaz na resetovanie hesla' - PASSWORDSENTHEADER: 'Odkaz na resetovanie hesla bol odoslaný na ''{email}''' - PASSWORDSENTTEXT: 'Ďakujeme! Resetovací odkaz bol odoslaný na ''''{email}'''', pokiaľ účet existuje pre túto emailovú adresu.' diff --git a/lang/sl.yml b/lang/sl.yml index bccd51826..5496aff5f 100644 --- a/lang/sl.yml +++ b/lang/sl.yml @@ -135,7 +135,4 @@ sl: LOGIN: Prijava LOSTPASSWORDHEADER: 'Izgubljeno geslo' NOTEPAGESECURED: 'Stran je zaščitena. Da bi lahko nadaljevali, vpišite svoje podatke.' - NOTERESETLINKINVALID: '

Povezava za ponastavitev gesla je napačna ali pa je njena veljavnost potekla.

Tukaj lahko zaprosite za novo povezavo or pa zamenjate geslo, ko se prijavite v sistem.

' NOTERESETPASSWORD: 'Vpišite e-naslov, na katerega vam bomo poslali povezavo za ponastavitev gesla' - PASSWORDSENTHEADER: 'Povezava za ponastavitev gesla je bila poslana na e-naslov ''{email}''.' - PASSWORDSENTTEXT: 'Hvala! Povezava za ponastavitev gesla je bila poslana na e-naslov ''{email}'', ki je naveden kot e-naslov vašega računa. ' diff --git a/lang/sr.yml b/lang/sr.yml index 07f642278..622b657b3 100644 --- a/lang/sr.yml +++ b/lang/sr.yml @@ -151,7 +151,4 @@ sr: ERRORPASSWORDPERMISSION: 'Морате да будете пријављени да бисте променили своју лозинку!' LOGIN: Пријављивање NOTEPAGESECURED: 'Ова страна је обезбеђена. Унесите своје податке и ми ћемо вам послати садржај.' - NOTERESETLINKINVALID: '

Линк за ресетовање лозинке је погрешан или је истекло време за његово коришћење.

Можете да захтевате нови овде или да промените Вашу лозинку након што се пријавите.

' NOTERESETPASSWORD: 'Унесите своју адресу е-поште и ми ћемо вам послати линк помоћу којег можете да промените своју лозинку' - PASSWORDSENTHEADER: 'Линк за ресетовање лозинке послат је на адресу е-поште: ''{email}''' - PASSWORDSENTTEXT: 'Хвала Вам! Линк за ресетовање лозинке је послат не адресу е-поште ''{email}''. Порука ће стићи примаоцу само ако постоји регистрован налог са том адресом е-поште.' diff --git a/lang/sr@latin.yml b/lang/sr@latin.yml index 1b210ae51..f91aa9337 100644 --- a/lang/sr@latin.yml +++ b/lang/sr@latin.yml @@ -150,7 +150,4 @@ sr@latin: ERRORPASSWORDPERMISSION: 'Morate da budete prijavljeni da biste promenili svoju lozinku!' LOGIN: Prijavljivanje NOTEPAGESECURED: 'Ova strana je obezbeđena. Unesite svoje podatke i mi ćemo vam poslati sadržaj.' - NOTERESETLINKINVALID: '

Link za resetovanje lozinke je pogrešan ili je isteklo vreme za njegovo korišćenje.

Možete da zahtevate novi ovde ili da promenite Vašu lozinku nakon što se prijavite.

' NOTERESETPASSWORD: 'Unesite svoju adresu e-pošte i mi ćemo vam poslati link pomoću kojeg možete da promenite svoju lozinku' - PASSWORDSENTHEADER: 'Link za resetovanje lozinke poslat je na adresu e-pošte: ''{email}''' - PASSWORDSENTTEXT: 'Hvala Vam! Link za resetovanje lozinke je poslat ne adresu e-pošte ''{email}''. Poruka će stići primaocu samo ako postoji registrovan nalog sa tom adresom e-pošte.' diff --git a/lang/sr_RS.yml b/lang/sr_RS.yml index fc79812da..298049430 100644 --- a/lang/sr_RS.yml +++ b/lang/sr_RS.yml @@ -150,7 +150,4 @@ sr_RS: ERRORPASSWORDPERMISSION: 'Морате да будете пријављени да бисте променили своју лозинку!' LOGIN: Пријављивање NOTEPAGESECURED: 'Ова страна је обезбеђена. Унесите своје податке и ми ћемо вам послати садржај.' - NOTERESETLINKINVALID: '

Линк за ресетовање лозинке је погрешан или је истекло време за његово коришћење.

Можете да захтевате нови овде или да промените Вашу лозинку након што се пријавите.

' NOTERESETPASSWORD: 'Унесите своју адресу е-поште и ми ћемо вам послати линк помоћу којег можете да промените своју лозинку' - PASSWORDSENTHEADER: 'Линк за ресетовање лозинке послат је на адресу е-поште: ''{email}''' - PASSWORDSENTTEXT: 'Хвала Вам! Линк за ресетовање лозинке је послат не адресу е-поште ''{email}''. Порука ће стићи примаоцу само ако постоји регистрован налог са том адресом е-поште.' diff --git a/lang/sr_RS@latin.yml b/lang/sr_RS@latin.yml index f39b36058..453ffa17d 100644 --- a/lang/sr_RS@latin.yml +++ b/lang/sr_RS@latin.yml @@ -151,7 +151,4 @@ sr_RS@latin: ERRORPASSWORDPERMISSION: 'Morate da budete prijavljeni da biste promenili svoju lozinku!' LOGIN: Prijavljivanje NOTEPAGESECURED: 'Ova strana je obezbeđena. Unesite svoje podatke i mi ćemo vam poslati sadržaj.' - NOTERESETLINKINVALID: '

Link za resetovanje lozinke je pogrešan ili je isteklo vreme za njegovo korišćenje.

Možete da zahtevate novi ovde ili da promenite Vašu lozinku nakon što se prijavite.

' NOTERESETPASSWORD: 'Unesite svoju adresu e-pošte i mi ćemo vam poslati link pomoću kojeg možete da promenite svoju lozinku' - PASSWORDSENTHEADER: 'Link za resetovanje lozinke poslat je na adresu e-pošte: ''{email}''' - PASSWORDSENTTEXT: 'Hvala Vam! Link za resetovanje lozinke je poslat ne adresu e-pošte ''{email}''. Poruka će stići primaocu samo ako postoji registrovan nalog sa tom adresom e-pošte.' diff --git a/lang/sv.yml b/lang/sv.yml index f35c2ee99..f2a18d659 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -93,7 +93,12 @@ sv: DeletePermissionsFailure: 'Rättighet för att radera saknas' Deleted: 'Raderade {type} {name}' Save: Spara + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Ändra + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'Du kan inte radera dig själv från den här gruppen, då du då kommer att förlora dina admin-rättigheter' SilverStripe\Forms\GridField\GridFieldPaginator: + OF: av Page: Sida View: Visa SilverStripe\Forms\MoneyField: @@ -108,6 +113,12 @@ sv: VALIDATION: '''{value}'' är inget nummer, bara siffror (utan mellanslag) kan accepteras för det här fältet' SilverStripe\Forms\TimeField: VALIDATEFORMAT: 'Var god att ange tid i ett giltigt format ({format})' + SilverStripe\ORM\DataObject: + PLURALNAME: Dataobjekt + PLURALS: + one: 'Ett dataobjekt' + other: '{count} Dataobjekt' + SINGULARNAME: Dataobjekt SilverStripe\ORM\FieldType\DBBoolean: ANY: 'Vilken som helst' NOANSWER: Nej @@ -136,6 +147,8 @@ sv: other: '{count} år' SilverStripe\ORM\FieldType\DBEnum: ANY: 'Vilken som helst' + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'För många relaterade objekt; använder fallback-fält' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'För många barn ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -221,6 +234,7 @@ sv: PLURALS: one: 'En medlem' other: '{count} medlemmar' + REMEMBERME: 'Kom ihåg mig nästa gång? (i {count} dagar på denna enhet)' SINGULARNAME: Medlem SUBJECTPASSWORDCHANGED: 'Ditt lösenord har ändrats' SUBJECTPASSWORDRESET: 'Din återställningslänk' @@ -288,7 +302,6 @@ sv: LOGOUT: 'Logga ut' LOSTPASSWORDHEADER: 'Bortglömt lösenord' NOTEPAGESECURED: 'Den här sidan är låst. Fyll i dina uppgifter nedan så skickar vi dig vidare.' - NOTERESETLINKINVALID: '

Återställningslänk för lösenord är felaktig eller för gammal.

Du kan begära en ny här eller ändra ditt lösenord när du loggat in.

' NOTERESETPASSWORD: 'Ange din e-postadress så skickar vi en länk med vilken du kan återställa ditt lösenord' - PASSWORDSENTHEADER: 'Återställningslänk för lösenord har skickats till ''{email}''' - PASSWORDSENTTEXT: 'Tack en återställningslänk har skickats till ''{email}'', förutsatt att ett konto med den addressen finns.' + PASSWORDRESETSENTHEADER: 'Återställningslänk för lösenord skickad' + PASSWORDRESETSENTTEXT: 'Tack. En återställningslänk har skickats, förutsatt att ett konto med denna adress existerar.' diff --git a/lang/zh.yml b/lang/zh.yml index 26c8e2893..748ee671c 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -166,7 +166,4 @@ zh: LOGIN: 登录 LOSTPASSWORDHEADER: 忘记密码 NOTEPAGESECURED: 该页面受安全保护。请在下面输入您的证书，然后我们会立即将您引导至该页面。 - NOTERESETLINKINVALID: '

密码重设链接无效或已过期。

您可以在这里 要求一个新的或在登录后更改您的密码。

' NOTERESETPASSWORD: 请输入您的电子邮件地址，然后我们会将一个链接发送给您，您可以用它来重设您的密码 - PASSWORDSENTHEADER: '密码重设链接已发送至''{email}''' - PASSWORDSENTTEXT: '谢谢！复位链接已发送到 ''{email}''，假定此电子邮件地址存在一个帐户。' From a65d313fd79dd5078b26d496f889e31da9054df2 Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Wed, 7 Nov 2018 19:12:38 +1300 Subject: [PATCH 057/175] Added 4.2.2 changelog --- docs/en/04_Changelogs/4.2.2.md | 61 ++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 docs/en/04_Changelogs/4.2.2.md diff --git a/docs/en/04_Changelogs/4.2.2.md b/docs/en/04_Changelogs/4.2.2.md new file mode 100644 index 000000000..f0df5cec5 --- /dev/null +++ b/docs/en/04_Changelogs/4.2.2.md @@ -0,0 +1,61 @@ +# 4.2.2 + + + +## Change Log + +### Security + + * 2018-08-21 [0610f76da](https://github.com/silverstripe/silverstripe-framework/commit/0610f76da02ac53a1b51cdfe9eac34e943a66991) Add confirmation token to dev/build (Loz Calver) - See [ss-2018-019](https://www.silverstripe.org/download/security-releases/ss-2018-019) + * 2018-08-12 [909ab03](https://github.com/silverstripe/silverstripe-admin/commit/909ab03fc4e742a05a06c33c5233691fd7466836) Add CSRF to Apollo (Aaron Carlino) - See [ss-2018-007](https://www.silverstripe.org/download/security-releases/ss-2018-007) + * 2018-07-29 [214e28127](https://github.com/silverstripe/silverstripe-framework/commit/214e28127f5425b61c15b69f884afdbad31133c2) Ignore arguments in mysqli::real_connect backtrace calls (Robbie Averill) - See [ss-2018-018](https://www.silverstripe.org/download/security-releases/ss-2018-018) + +### Features and Enhancements + + * 2018-08-24 [2b335b4](https://github.com/silverstripe/silverstripe-graphql/commit/2b335b4239946f9a6fb1d525452cf1fe6d22a9ce) Proof of concept of cached graphql queries (#166) (Damian Mooyman) + * 2018-07-01 [73d3da2](https://github.com/silverstripe/silverstripe-admin/commit/73d3da2bc8566cb1cb5da0124b7deb513728b5ab) Pattern library now has FormAction examples (Robbie Averill) + +### Bugfixes + + * 2018-10-24 [e72fc9e3d](https://github.com/silverstripe/silverstripe-framework/commit/e72fc9e3d0f35a1d43f55f83f9919f67d72fb7cb) DataObject singleton creation (#8516) (Sam Minnée) + * 2018-10-19 [7c65916](https://github.com/silverstripe/silverstripe-asset-admin/commit/7c659167f2eda63d882a097f2f413b9f3cb79e31) Use fixtured file title in test assertion (Robbie Averill) + * 2018-10-17 [d71ee0c](https://github.com/silverstripe/silverstripe-admin/commit/d71ee0ce9898e73c9a7d913356fc6bfe6c2b42fc) Fixes #674 TinyMCE width - this should match form field widths at lower width resolutions but expand up to the max width on wider resolutions (bergice) + * 2018-10-16 [a6a174399](https://github.com/silverstripe/silverstripe-framework/commit/a6a17439976710b2311558d363b5467fa429dcca) Fix `ENTER` not triggering form save button as `GridField`s used `submit` type buttons (bergice) + * 2018-10-14 [c0c446a](https://github.com/silverstripe/silverstripe-versioned/commit/c0c446ad8f29dd66398feb38f5d92fa4f60a4a8b) Fix relations between staged/unstaged objects (Harsh Chokshi) + * 2018-10-09 [f710c5c](https://github.com/silverstripe/silverstripe-admin/commit/f710c5cdcd2cf95fdaa738f55c0f2529fcbe826d) Only hide overflow from inactive chosen fields (Robbie Averill) + * 2018-10-01 [5422e28](https://github.com/silverstripe/silverstripe-asset-admin/commit/5422e28635cec8f285eb422fa85f57f4418c09b8) Folder sort incorrect (Luke Edwards) + * 2018-09-28 [231d6d9a9](https://github.com/silverstripe/silverstripe-framework/commit/231d6d9a9f388e10cf77149aec22e947db648644) New members now receive the configured default locale, not the current locale (Robbie Averill) + * 2018-09-21 [1d5ecd342](https://github.com/silverstripe/silverstripe-framework/commit/1d5ecd342e417b4707a3bbc34e97949bffd14afb) Prevent error on valid response status codes (Damian Mooyman) + * 2018-09-18 [bbe7c66](https://github.com/silverstripe/silverstripe-asset-admin/commit/bbe7c660cf40d4c942eaf6e76755eeaf46c63471) Add `AssetAdmin::getMinimalistObjectFromData()` to build file metadata for UploadField (#829) (Maxime Rainville) + * 2018-09-18 [db63f55fb](https://github.com/silverstripe/silverstripe-framework/commit/db63f55fbb8e635e4e7215b7b7eff4e1f1cb7b22) Changes being detected on TreeMulti as values not sorted (Luke Edwards) + * 2018-09-13 [5c102dec](https://github.com/silverstripe/silverstripe-cms/commit/5c102decbde43395e14aeff83a20c4c6f1d048ae) Improve performance of CMSMain::getArchiveWarningMessage (#2231) (Maxime Rainville) + * 2018-09-10 [8ae0ef0](https://github.com/silverstripe/silverstripe-versioned/commit/8ae0ef0002a229d233f7395cfed15c979c3f1698) Do not update LeftAndMain link with Stage param (#173) (Maxime Rainville) + * 2018-09-03 [1c4311d](https://github.com/silverstripe/silverstripe-asset-admin/commit/1c4311d4e6548600272daa0ce83afa12cf7e99c3) fix description for docs.silverstripe.org (wernerkrauss) + * 2018-09-03 [b922c0d73](https://github.com/silverstripe/silverstripe-framework/commit/b922c0d7327b5d0222dd280afcb64f83a09ea859) Check scheme is truthy before setting it to the request (Robbie Averill) + * 2018-08-31 [68c2c976d](https://github.com/silverstripe/silverstripe-framework/commit/68c2c976d4813607a420ac4cda7b01f0a7aee8c7) Fix alignment test step definition (#8354) (Luke Edwards) + * 2018-08-30 [234b795f8](https://github.com/silverstripe/silverstripe-framework/commit/234b795f89657c6b25da6101a9fc878e3297c301) Use classes for TinyMCE alignment buttons (Luke Edwards) + * 2018-08-28 [d651d0fbf](https://github.com/silverstripe/silverstripe-framework/commit/d651d0fbfcababeaf317b27cb00b4f33b9d99eab) Use base class (not remapping target class) when looking up whether object is versioned (Robbie Averill) + * 2018-08-27 [4da556923](https://github.com/silverstripe/silverstripe-framework/commit/4da5569232505ee574e0b5106ff2116611393aa4) ensure createFromVariables takes correct params on CLIRequestBuilder (Scott Hutchinson) + * 2018-08-27 [f3230c78](https://github.com/silverstripe/silverstripe-reports/commit/f3230c78d4e3731a10a5f4c508bc68c6a8534866) Use requestVar() to include post vars as well as get vars (Robbie Averill) + * 2018-08-23 [f37dd74](https://github.com/silverstripe/silverstripe-admin/commit/f37dd74be7afae5e40e85ce2a90a4d92bf7e80bb) Site tree items do not disappear on save with source file comments enabled (Robbie Averill) + * 2018-08-20 [dbab69669](https://github.com/silverstripe/silverstripe-framework/commit/dbab6966908f0a293ee6d469cec6b4650dc5a0f1) Message when changing password with invalid token now contains correct links to login (Robbie Averill) + * 2018-08-20 [9da7f99](https://github.com/silverstripe/silverstripe-versioned/commit/9da7f991f33ac16070b2e47b764b216a87f96622) Draft content requiring login message now correctly renders HTML link (Robbie Averill) + * 2018-08-17 [c361b09](https://github.com/silverstripe/silverstripe-admin/commit/c361b091b1640c25f1d23914489212fce1e29377) overflow of chosen dropdowns when inactive (Scott Hutchinson) + * 2018-08-16 [66cd3af](https://github.com/silverstripe/silverstripe-admin/commit/66cd3af09fcf68bf177a46ac57434442642d1b7c) Filtering or paginating a gridfield causing a change event (Luke Edwards) + * 2018-08-15 [0db594b2d](https://github.com/silverstripe/silverstripe-framework/commit/0db594b2d39c93dd2e911414bee5520c84048906) Remove double escaping of HTML values in print views (Robbie Averill) + * 2018-08-15 [0c713b5](https://github.com/silverstripe/silverstripe-assets/commit/0c713b5b1eb6a08ac00dcadb187b8b3ef7115fc4) Fix routing for files with dots in filename (Damian Mooyman) + * 2018-08-14 [873873dc3](https://github.com/silverstripe/silverstripe-framework/commit/873873dc303ce2041aa23e365464133a359e1561) Pass request to dummy controller before calling init (Robbie Averill) + * 2018-08-14 [27ac001d5](https://github.com/silverstripe/silverstripe-framework/commit/27ac001d5b27cce4f80ce4b3335c14708b116830) email rendering should not include requirements (Thomas Portelange) + * 2018-08-14 [8ec551e5](https://github.com/silverstripe/silverstripe-cms/commit/8ec551e57b04d00d6897d06c2779557f0ec8109d) Broken "show as list" (#2232) (Maxime Rainville) + * 2018-08-12 [9f5b0086c](https://github.com/silverstripe/silverstripe-framework/commit/9f5b0086cb1a0259c5c87ea205390c5e69dcae90) Paginating a gridfield causing a change event (Luke Edwards) + * 2018-08-10 [d4995f52](https://github.com/silverstripe/silverstripe-cms/commit/d4995f5204f020f75fbddb3e49b944a54be5c6c2) Separating ModelAsController catch-all route to apply after all other configuration (Guy Marriott) + * 2018-08-08 [e14ab99](https://github.com/silverstripe/silverstripe-graphql/commit/e14ab991f5c99cee6b1bdfa18ab07a1e4b40961e) Don't rely on return value of GraphQL scaffolding providers (#171) (Guy Marriott) + * 2018-08-06 [df7396e8](https://github.com/silverstripe/silverstripe-cms/commit/df7396e8845eea7a75e73237de9ee7e4cb6568f6) CMS routes are now run after #coreroutes without re-including itself (Robbie Averill) + * 2018-07-27 [85b4b48fb](https://github.com/silverstripe/silverstripe-framework/commit/85b4b48fb5489cdba4b18cbf510d883986dd61c1) Restore default delete action on GridFieldConfig_RecordEditor (Maxime Rainville) + * 2018-07-27 [0d90cdb05](https://github.com/silverstripe/silverstripe-framework/commit/0d90cdb05d058763e5e52720ab653c5cc391dc3b) Altering ID of authenticator tabs to resolve ID conflict (Guy Marriott) + * 2018-07-26 [fea9ef7](https://github.com/silverstripe/silverstripe-admin/commit/fea9ef7d2a53904086f9fad6eedba7bb307c8578) #579 BUG Ambiguous column RecordID when doing batch actions (Ed Linklater) + * 2018-07-23 [a0487e5](https://github.com/silverstripe/silverstripe-admin/commit/a0487e59fc04af0d15e66d4c2874051288b4e63e) Treat readonly as disabled and fix handling for ui-constructive class (Robbie Averill) + * 2018-07-16 [e1296d48](https://github.com/silverstripe/silverstripe-reports/commit/e1296d4813ac1b677aa7a612ba0ad3b2ba62ccae) Filter var can be returned correctly from get variables as a fallback (Robbie Averill) + * 2018-06-27 [8ccebf8](https://github.com/silverstripe/silverstripe-admin/commit/8ccebf813e95980363a92ec37332d2241327441f) Stop sslink from hijacking anchor plugin (Will Rossiter) + * 2018-05-18 [953153500](https://github.com/silverstripe/silverstripe-framework/commit/953153500d490f5b5abf7283c34242c3b22a855a) Polymorphic relationship class columns have obsolete class names remapped (Robbie Averill) + * 2018-05-08 [97a8f56](https://github.com/silverstripe/silverstripe-admin/commit/97a8f56c43ddb3c77a5bbc452755d44afb9a9472) Add missing focus styles for preview options (fixes silverstripe/silverstripe-framework #2101) (Loz Calver) From 26d404ca4ce1ca3f09d3334d4091995525b6b7f4 Mon Sep 17 00:00:00 2001 From: Vagrant Default User Date: Wed, 7 Nov 2018 21:37:35 +1300 Subject: [PATCH 058/175] Update translations --- lang/ar.yml | 3 - lang/bg.yml | 3 - lang/cs.yml | 3 - lang/da.yml | 325 ++++++++++++++++++++++++++++++++++++++++++- lang/de.yml | 3 - lang/eo.yml | 9 +- lang/es.yml | 3 - lang/et_EE.yml | 3 - lang/fa_IR.yml | 1 - lang/fi.yml | 11 +- lang/fr.yml | 3 - lang/id.yml | 3 - lang/id_ID.yml | 3 - lang/it.yml | 15 +- lang/ja.yml | 3 - lang/lt.yml | 3 - lang/mi.yml | 3 - lang/nb.yml | 3 - lang/nl.yml | 154 +++++++++++++++++++- lang/pl.yml | 202 ++++++++++++++++++++++++++- lang/ru.yml | 3 - lang/sk.yml | 3 - lang/sl.yml | 3 - lang/sr.yml | 3 - lang/sr@latin.yml | 3 - lang/sr_RS.yml | 3 - lang/sr_RS@latin.yml | 3 - lang/sv.yml | 19 ++- lang/zh.yml | 3 - 29 files changed, 716 insertions(+), 83 deletions(-) diff --git a/lang/ar.yml b/lang/ar.yml index 19381589f..518bf1344 100644 --- a/lang/ar.yml +++ b/lang/ar.yml @@ -150,7 +150,4 @@ ar: LOGIN: دخول LOSTPASSWORDHEADER: 'كلمة مرور مفقودة' NOTEPAGESECURED: 'هذه الصفحة محمية بكلمة مرور ، أدخل بيانات دخولك بالأسفل ليتم السماح لك بالوصول للصفحة' - NOTERESETLINKINVALID: "

رابط إعادة تعيين كلمة المرور غير صحيح أو نفذت صلاحيته.

\n

\nيمكنك طلب رابط جديد <\"{a href=\"{link1\"> هنا \n أو تغيير كلمة المرور الخاصة بك بعد <\"{a href=\"{link2\"> تسجيل دخولك.\n

" NOTERESETPASSWORD: 'أدخل بريدك الإلكتروني و سيتم إرسال رابط إعادة تهيئة كلمة المرور ' - PASSWORDSENTHEADER: 'رابط استعادة كلمة المرور تم إرساله إلى ''{بريدك}''' - PASSWORDSENTTEXT: 'شكرا لك! تم إرسال رابط إعادة تعيين إلى ''{بريدك}''، بشرط وجود حساب قائم بالنسبة لعنوان هذا البريد الإلكتروني .' diff --git a/lang/bg.yml b/lang/bg.yml index 3e1eba6a0..241841f1e 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -313,7 +313,4 @@ bg: LOGOUT: Изход LOSTPASSWORDHEADER: 'Забравена парола' NOTEPAGESECURED: 'Тази страница е защитена. Въведете вашите данни по-долу, за да продължите.' - NOTERESETLINKINVALID: '

Връзката за нулиране на парола не е вярна или е просрочена.

Можете да заявите нова тук или да промените паролата си след като влезете.

' NOTERESETPASSWORD: 'Въведете вашият email адрес и ще ви изпратим линк, с който ще можете да смените паролата си' - PASSWORDSENTHEADER: 'Връзка за нулиране на парола беше изпратена на ''{email}''' - PASSWORDSENTTEXT: 'Благодарим ви! Връзка за нулиране на паролата беше изпратен на ''{email}'', ако съществува акаунт с този имейл адрес.' diff --git a/lang/cs.yml b/lang/cs.yml index 4a3cae3ab..759f0268e 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -194,7 +194,4 @@ cs: LOGIN: Přihlásit LOSTPASSWORDHEADER: 'Zapomenuté heslo' NOTEPAGESECURED: 'Tato stránka je zabezpečená. Vložte své přihlašovací údaje a my Vám zároveň pošleme práva.' - NOTERESETLINKINVALID: '

Odkaz na resetování hesla není platný nebo je prošlý.

Můžete požádat o nový zde nebo změňte své heslo až se přihlásíte.

' NOTERESETPASSWORD: 'Zadejte svou e-mailovou adresu a bude vám zaslán nulovací odkaz pro Vaše heslo' - PASSWORDSENTHEADER: 'Odkaz na resetování hesla byl odeslán na ''{email}''' - PASSWORDSENTTEXT: 'Děkujeme! Resetovací odkaz byl odeslán na ''{email}'', pokud účet existuje pro tuto emailovou adresu.' diff --git a/lang/da.yml b/lang/da.yml index 8dc512b23..3fe62969a 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -1,5 +1,328 @@ da: + SilverStripe\Admin\LeftAndMain: + VersionUnknown: ukendt + SilverStripe\AssetAdmin\Forms\UploadField: + Dimensions: Dimensioner + EDIT: Rediger + EDITINFO: 'Rediger denne fil' + REMOVE: Fjern + SilverStripe\Control\ChangePasswordEmail_ss: + CHANGEPASSWORDFOREMAIL: 'Koden for kontoen med email addressen {email} er ændret. Hvis du ikke har skiftet din kode, så skift venligst din kode ved at klikke på linket herunder' + CHANGEPASSWORDTEXT1: 'Du skiftede dit kodeord for' + CHANGEPASSWORDTEXT3: 'Skift kodeord' + HELLO: Hej + SilverStripe\Control\Email\ForgotPasswordEmail_ss: + HELLO: Hej + TEXT1: 'Her er din' + TEXT2: 'link til at nulstille dit kodeord' + TEXT3: for + SilverStripe\Control\RequestProcessor: + INVALID_REQUEST: 'Ugyldig forespørgsel' + REQUEST_ABORTED: 'Forespørgsel annulleret' + SilverStripe\Core\Manifest\VersionProvider: + VERSIONUNKNOWN: Ukendt + SilverStripe\Forms\CheckboxField: + NOANSWER: Nej + YESANSWER: Ja + SilverStripe\Forms\CheckboxSetField_ss: + NOOPTIONSAVAILABLE: 'Ingen tilgængelige muligheder' + SilverStripe\Forms\ConfirmedPasswordField: + ATLEAST: 'Kodeord skal være mindst {min} tegn lang.' + BETWEEN: 'Kodeord skal være {min} til {max} karakterer lang.' + CURRENT_PASSWORD_ERROR: 'Det nuværende kodeord du har indtastet er ikke korrekt.' + CURRENT_PASSWORD_MISSING: 'Du skal indtaste dit nuværende kodeord.' + LOGGED_IN_ERROR: 'Du skal være logget ind for at skifte dit kodeord.' + MAXIMUM: 'Kodeord må maks være {max} tegn lang' + SHOWONCLICKTITLE: 'Skift kodeord' + SilverStripe\Forms\CurrencyField: + CURRENCYSYMBOL: DKK + SilverStripe\Forms\DateField: + VALIDDATEFORMAT2: 'Indtats venligst et gyldigt datoformat ({format})' + VALIDDATEMAXDATE: 'Din dato skal være ældre end eller matche den maksimalt tilladte dato ({date})' + VALIDDATEMINDATE: 'Din dato skal være yngre end eller matche den minimum tilladte dato ({date})' + SilverStripe\Forms\DatetimeField: + VALIDDATEMAXDATETIME: 'Din dato skal være ældre end eller matche den maksimalt tilladte dato ({datetime})' + VALIDDATETIMEFORMAT: 'Indtats venligst et gyldigt dato- og tidsformat ({format})' + VALIDDATETIMEMINDATE: 'Din dato skal være yngre end eller matche den minimum tilladte dato og tid ({datetime})' + SilverStripe\Forms\DropdownField: + CHOOSE: (Vælg) + CHOOSE_MODEL: '(Vælg {name})' + SOURCE_VALIDATION: 'Venligst vælg en eksisterende værdi fra listen. {value} er ikke en tilladt mulighed' + SilverStripe\Forms\EmailField: + VALIDATION: 'Indtast venligst en emailadresse' + SilverStripe\Forms\FileUploadReceiver: + FIELDNOTSET: 'Fil information ikke fundet' + SilverStripe\Forms\Form: + BAD_METHOD: 'Denne form kræver en {method} indsendelse' + CSRF_EXPIRED_MESSAGE: 'Din session er udløbet. Venligst gensend formularen.' + CSRF_FAILED_MESSAGE: 'Det ser ud til der har været et teknisk problem. Klik venligst på tilbageknappen, tryk opdater i din browser og prøv igen.' + VALIDATIONPASSWORDSDONTMATCH: 'Kodeordene er ikke identiske' + VALIDATIONPASSWORDSNOTEMPTY: 'Kodeord kan ikke være tomme' + VALIDATIONSTRONGPASSWORD: 'Kodeord skal mindst have et tal og et alfanumerisk tegn' + VALIDATOR: Validering + VALIDCURRENCY: 'Indtast venligst en gyldig valuta' + SilverStripe\Forms\FormField: + EXAMPLE: 'f.eks. {format}' + NONE: ingen + SilverStripe\Forms\FormScaffolder: + TABMAIN: Primær SilverStripe\Forms\GridField\GridField: - Filter: Filter + Add: 'Tilføj {name}' + CSVEXPORT: 'Eksporter til CSV' + CSVIMPORT: 'Importer CSV' + Filter: Filtrer + FilterBy: 'Filtrer på' + Find: Find + LinkExisting: 'Link eksisterende' + NewRecord: 'Ny {type}' + NoItemsFound: 'Ingen elementer fundet' + PRINTEDAT: 'Printet d.' + PRINTEDBY: 'Printet af' + PlaceHolder: 'Find {type}' + PlaceHolderWithLabels: 'Find {type} på {name}' + Print: Print + RelationSearch: Relationssøgning + ResetFilter: Nulstil + SilverStripe\Forms\GridField\GridFieldDeleteAction: + Delete: Slet + DeletePermissionsFailure: 'Ingen slette rettigheder' + EditPermissionsFailure: 'Ingen rettighed til at fjerne emnet' + UnlinkRelation: Fjern + SilverStripe\Forms\GridField\GridFieldDetailForm: + CancelBtn: Annuller + Create: Opret + Delete: Slet + DeletePermissionsFailure: 'Ingen slette rettigheder' + Deleted: 'Slet {type} {name}' + Save: Gem + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Rediger + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'Kan ikke fjerne dig selv fra denne gruppe, du vil miste administrator rettigheder' + SilverStripe\Forms\GridField\GridFieldPaginator: + OF: af + Page: Side + View: Vis + SilverStripe\Forms\MoneyField: + FIELDLABELAMOUNT: Beløb + FIELDLABELCURRENCY: Valuta + INVALID_CURRENCY: 'Valuta {currency} er ikke i listen over tilladte valutaer' + SilverStripe\Forms\MultiSelectField: + SOURCE_VALIDATION: 'Vælg venligst eksisterende værdier fra listen. Ugyldig mulighed(er) {value} valgt' + SilverStripe\Forms\NullableField: + IsNullLabel: 'Er Null' + SilverStripe\Forms\NumericField: + VALIDATION: '''{value}'' er ikke et tal, kun tal accepteres i dette felt' + SilverStripe\Forms\TimeField: + VALIDATEFORMAT: 'Indtats venligst et gyldigt tidsformat ({format})' + SilverStripe\ORM\DataObject: + PLURALNAME: Dataobjekter + PLURALS: + one: 'Et dataobjekt' + other: '{count} dataobjekter' + SINGULARNAME: Dataobjekt + SilverStripe\ORM\FieldType\DBBoolean: + ANY: Enhver + NOANSWER: Nej + YESANSWER: Ja + SilverStripe\ORM\FieldType\DBDate: + DAYS_SHORT_PLURALS: + one: '{count} dag' + other: '{count} dage' + HOURS_SHORT_PLURALS: + one: '{count} time' + other: '{count} timer' + LessThanMinuteAgo: 'mindre end et minut' + MINUTES_SHORT_PLURALS: + one: '{count} minut' + other: '{count} minutter' + MONTHS_SHORT_PLURALS: + one: '{count} måned' + other: '{count} måneder' + SECONDS_SHORT_PLURALS: + one: '{count} sekund' + other: '{count} sekunder' + TIMEDIFFAGO: '{difference} siden' + TIMEDIFFIN: 'i {difference}' + YEARS_SHORT_PLURALS: + one: '{count} år' + other: '{count} år' + SilverStripe\ORM\FieldType\DBEnum: + ANY: Enhver + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'For mange relaterede objekter; fallback felt i brug' + SilverStripe\ORM\Hierarchy: + LIMITED_TITLE: 'For mange underelementer ({count})' + SilverStripe\ORM\Hierarchy\Hierarchy: + InfiniteLoopNotAllowed: 'Uendeligt løkke fundet i "{type}" hierarkiet. Ændre venligst det overliggende element for at løse dette' + LIMITED_TITLE: 'For mange underelementer ({count})' + SilverStripe\ORM\ValidationException: + DEFAULT_ERROR: Valideringsfejl + SilverStripe\Security\BasicAuth: + ENTERINFO: 'Indtast venligst et brugernavn og kodeord.' + ERRORNOTADMIN: 'Den bruger er ikke en administrator.' + ERRORNOTREC: 'Brugernavn / kodeord kunne ikke genkendes' + SilverStripe\Security\CMSMemberLoginForm: + PASSWORDEXPIRED: '

Dit kodeord er udløbet. Vælg venligst et nyt.

' + SilverStripe\Security\CMSSecurity: + INVALIDUSER: '

Ugyldig bruger. Log venligst ind igen her for at fortsætte.

' + LOGIN_MESSAGE: '

Din session er løbet ud pga. inaktivitet

' + LOGIN_TITLE: 'Log ind igen, for at fortsætte hvor du slap.' + SUCCESS: Succes + SUCCESSCONTENT: '

Logget ind. Hvis du ikke automatisk viderestilles så klik her

' + SUCCESS_TITLE: 'Logget ind med sucess' + SilverStripe\Security\DefaultAdminService: + DefaultAdminFirstname: 'Standard admin' + SilverStripe\Security\Group: + AddRole: 'Tilføj en rolle for denne gruppe' + Code: 'Gruppe kode' + DefaultGroupTitleAdministrators: Administratorer + DefaultGroupTitleContentAuthors: Indholdsforfattere + Description: Beskrivelse + GROUPNAME: Gruppenavn + GroupReminder: 'Hvis du vælger en overliggende gruppe, får denne gruppe alle dens roller' + HierarchyPermsError: 'Kan ikke tildele overliggende gruppe "{group}" med fortrinsrettigheder (kræver ADMIN adgang)' + Locked: 'Låst?' + MEMBERS: Brugere + NEWGROUP: 'Ny gruppe' + NoRoles: 'Ingen roller fundet' + PERMISSIONS: Rettigheder + PLURALNAME: Grupper + PLURALS: + one: 'En gruppe' + other: '{count} grupper' + Parent: 'Overliggende gruppe' + ROLES: Roller + ROLESDESCRIPTION: 'Roller er et prædefineret sæt af rettigheder, som kan tildeles grupper.
De bliver nedarvet fra en overliggende grupper hvis krævet.' + RolesAddEditLink: 'Administrer roller' + SINGULARNAME: Gruppe + Sort: Sortering + has_many_Permissions: Rettigheder + many_many_Members: Brugere + SilverStripe\Security\LoginAttempt: + Email: 'Email adresse' + EmailHashed: 'Email adresse (hashed)' + IP: 'IP addresse' + PLURALNAME: Loginforsøg + PLURALS: + one: 'Et loginforsøg' + other: '{count} loginforsøg' + SINGULARNAME: 'Login forsøg' + Status: Status + SilverStripe\Security\Member: + ADDGROUP: 'Tilføj gruppe' + BUTTONCHANGEPASSWORD: 'Skift kodeord' + BUTTONLOGIN: 'Log ind' + BUTTONLOGINOTHER: 'Log ind med en anden bruger' + BUTTONLOGOUT: 'Log ud' + BUTTONLOSTPASSWORD: 'Jeg har glemt mit kodeord' + CONFIRMNEWPASSWORD: 'Bekræft nyt kodeord' + CONFIRMPASSWORD: 'Bekræft kodeord' + CURRENT_PASSWORD: 'Nuværende kodeord' + EDIT_PASSWORD: 'Nyt kodeord' + EMAIL: Email + EMPTYNEWPASSWORD: 'Det nye kodeord kan ikke være tom, prøv venligst igen' + ENTEREMAIL: 'Indtast venligst en email adresse for at få et nulstillingslink.' + ERRORLOCKEDOUT2: 'Din konto er blevet midlertidigt deaktiveret pga. for mange fejlslagne loginforsøg. Forsøg venligst igen om {count} minutter.' + ERRORNEWPASSWORD: 'Du har indtastet dit nye kodeord forskelligt, forsøg igen' + ERRORPASSWORDNOTMATCH: 'Dit nuværende kodeord matcher ikke, forsøg venligst igen' + ERRORWRONGCRED: 'De indtastede værdier ser ikke ud til at være korrekte. Forsøg venligst igen.' + FIRSTNAME: Fornavn + INTERFACELANG: 'Sprog i brugerfladen' + KEEPMESIGNEDIN: 'Hold mig logget ind' + LOGGEDINAS: 'Du er logget ind som {name}.' + NEWPASSWORD: 'Nyt kodeord' + PASSWORD: Kodeord + PASSWORDEXPIRED: 'Dit kodeord er udløbet. Vælg venligst et nyt.' + PLURALNAME: Brugere + PLURALS: + one: 'En bruger' + other: '{count} brugere' + REMEMBERME: 'Husk mig til næste gang? (i {count} dage på denne enhed)' + SINGULARNAME: Bruger + SUBJECTPASSWORDCHANGED: 'Dit kodeord er blevet ændret' + SUBJECTPASSWORDRESET: 'Link til at nulstille dit kodeord' + SURNAME: Efternavn + VALIDATIONADMINLOSTACCESS: 'Kan ikke fjerne alle admin grupper fra din profil' + ValidationIdentifierFailed: 'Kan ikke overskrive eksisterende bruger #{id} med identisk identifikator ({name} = {value}))' + WELCOMEBACK: 'Velkommen tilbage, {firstname}' + YOUROLDPASSWORD: 'Dit gamle kodeord' + belongs_many_many_Groups: Grupper + db_Locale: 'Sprog i brugerfladen' + db_LockedOutUntil: 'Låst ude indtil' + db_Password: Kodeord + db_PasswordExpiry: Kodeordsudløbsdato + SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: + AUTHENTICATORNAME: 'CMS bruger loginform' + BUTTONFORGOTPASSWORD: 'Glemt kodeord' + BUTTONLOGIN: 'Log mig ind igen' + BUTTONLOGOUT: 'Log ud' + SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: + ERRORWRONGCRED: 'De indtastede værdier ser ikke ud til at være korrekte. Forsøg venligst igen.' + NoPassword: 'Der er ikke en kode på denne bruger.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'Email og kodeord' + SilverStripe\Security\MemberPassword: + PLURALNAME: 'Bruger kodeord' + PLURALS: + one: 'Et bruger kodeord' + other: '{count} bruger kodeord' + SINGULARNAME: 'Bruger kodeord' + SilverStripe\Security\PasswordValidator: + LOWCHARSTRENGTH: 'Forøg venligst kodeordets styrke, ved at tilføje nogle af følgende tegn: {chars}' + PREVPASSWORD: 'Du har tidligere brugt dette kodeord, vælg venligst et nyt kodeord' + TOOSHORT: 'Kodeordet er for kort, det skal mindst være {minimum} eller flere tegn langt' SilverStripe\Security\Permission: + AdminGroup: Administrator + CMS_ACCESS_CATEGORY: 'CMS Adgang' CONTENT_CATEGORY: Indholdsrettigheder + FULLADMINRIGHTS: 'Fuld administrator rettighed' + FULLADMINRIGHTS_HELP: 'Indebærer og overskriver alle andre tildelte rettigheder.' + PERMISSIONS_CATEGORY: 'Roller og adgangsrettigheder' + PLURALNAME: Rettigheder + PLURALS: + one: 'En rettighed' + other: '{count} rettigheder' + SINGULARNAME: Rettighed + UserPermissionsIntro: 'Tildeling af grupper til denne bruger, ændrer de rettigheder brugeren har. Se gruppe området for rettigheds detaljer på de individuelle grupper.' + SilverStripe\Security\PermissionCheckboxSetField: + AssignedTo: 'tildelt til "{title}"' + FromGroup: 'nedarvet fra gruppen "{title}"' + FromRole: 'nedarvet fra rollen "{title}"' + FromRoleOnGroup: 'nedarvet fra rollen "{roletitle}" på gruppen "{grouptitle}"' + SilverStripe\Security\PermissionRole: + OnlyAdminCanApply: 'Kun administratorer kan tilføje' + PLURALNAME: Roller + PLURALS: + one: 'En rolle' + other: '{count} roller' + SINGULARNAME: Rolle + Title: Titel + SilverStripe\Security\PermissionRoleCode: + PLURALNAME: 'Rettigheds rolle koder' + PLURALS: + one: 'En rettigheds rolle kode' + other: '{count} rettigheds rolle koder' + PermsError: 'Kan ikke tildele koden "{code}" med fortrinsrettigheder (kræver ADMIN adgang)' + SINGULARNAME: 'Rettighed rolle kode' + SilverStripe\Security\RememberLoginHash: + PLURALNAME: 'Login hashes' + PLURALS: + one: 'Et login hash' + other: '{count} Login Hashes' + SINGULARNAME: 'Login hash' + SilverStripe\Security\Security: + ALREADYLOGGEDIN: 'Du har ikke adgang til denne side. Hvis du har en anden bruger der har adgang til denne side, kan du logge ind med denne herunder.' + BUTTONSEND: 'Send mig linket til at nulstille kodeordet' + CHANGEPASSWORDBELOW: 'Du kan ændre dit kodeord herunder.' + CHANGEPASSWORDHEADER: 'Skift dit kodeord' + CONFIRMLOGOUT: 'Klik venligst på knappen herunder, for at bekræfte at du vil logge ud.' + ENTERNEWPASSWORD: 'Indtast venligst et nyt kodeord.' + ERRORPASSWORDPERMISSION: 'Du skal være logget ind, for at kunne ændre dit kodeord!' + LOGIN: 'Log ind' + LOGOUT: 'Log ud' + LOSTPASSWORDHEADER: 'Glemt kodeord' + NOTEPAGESECURED: 'Denne side er beskyttet. Indtast dine loginoplysninger herunder for at få adgang.' + NOTERESETPASSWORD: 'Indtast din email adresse, så sender vi dig et link som du kan nulstille dit kodeord med' + PASSWORDRESETSENTHEADER: 'link til at nulstille kodeord afsendt' + PASSWORDRESETSENTTEXT: 'Tak for det. Et link til at nulstille dit kodeord er afsendt, hvis der findes en bruger med denne email adresse.' diff --git a/lang/de.yml b/lang/de.yml index 1e9f16e5e..77e2f1584 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -190,7 +190,4 @@ de: LOGIN: Anmelden LOSTPASSWORDHEADER: 'Passwort vergessen' NOTEPAGESECURED: 'Diese Seite ist geschützt. Bitte melden Sie sich an und Sie werden sofort weitergeleitet.' - NOTERESETLINKINVALID: '

Der Link zum Zurücksetzen des Passworts ist entweder nicht korrekt oder abgelaufen

Sie können einen neuen Link anfordern oder Ihr Passwort nach dem einloggen ändern.

' NOTERESETPASSWORD: 'Geben Sie Ihre E-Mail-Adresse ein und wir werden Ihnen einen Link zuschicken, mit dem Sie Ihr Passwort zurücksetzen können.' - PASSWORDSENTHEADER: 'Der Link zum Zurücksetzen des Passworts wurde an ''{email}'' gesendet' - PASSWORDSENTTEXT: 'Vielen Dank! Wenn ein Account zu der E-Mail Adresse ''{email}'' existiert, wurde eine E-Mail mit dem Link zum Zurücksetzen des Passworts verschickt.' diff --git a/lang/eo.yml b/lang/eo.yml index 59806b953..fb6b74ca9 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -95,6 +95,8 @@ eo: DeletePermissionsFailure: 'Mankas permeso forigi' Deleted: 'Forigita {type} {name}' Save: Konservi + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Redakti SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Ne povas forigi vin el ĉi tiu grupo; vi perdus administrajn rajtojn' SilverStripe\Forms\GridField\GridFieldPaginator: @@ -147,6 +149,8 @@ eo: other: '{count} jaroj' SilverStripe\ORM\FieldType\DBEnum: ANY: Ajna + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Tro multaj objektoj; retropaŝa kampo uzata' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Tro da idoj ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -319,7 +323,6 @@ eo: LOGOUT: Elsaluti LOSTPASSWORDHEADER: 'Perdis pasvorton' NOTEPAGESECURED: 'Tiu paĝo estas sekurigita. Enigu viajn akreditaĵojn sube kaj vi aliros pluen.' - NOTERESETLINKINVALID: '

La pasvorta reagorda ligilo estas malvalida aŭ finiĝis.

Vi povas peti novan ĉi tie aŭ ŝanĝi vian pasvorton post vi ensalutis.

' NOTERESETPASSWORD: 'Enigu vian retpoŝtan adreson kaj ni sendos al vi ligilon per kiu vi povas reagordi vian pasvorton' - PASSWORDSENTHEADER: 'Pasvorta reagorda ligilo sendiĝis al ''{email}''' - PASSWORDSENTTEXT: 'Dankon! Reagordita ligilo sendiĝis al ''{email}'', kondiĉe ke konto ekzistas por tiu retadreso.' + PASSWORDRESETSENTHEADER: 'Pasvorta reagorda ligilo sendiĝis' + PASSWORDRESETSENTTEXT: 'Dankon. Reagorda ligilo sendiĝis, kondiĉe ke konto ekzistas por ĉi tiu retadreso.' diff --git a/lang/es.yml b/lang/es.yml index 0009c7a4a..debd4b4a7 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -249,7 +249,4 @@ es: LOGIN: Entrar LOSTPASSWORDHEADER: '¿Contraseña Perdida?' NOTEPAGESECURED: 'Esa página está protegida. Introduzca sus datos de acreditación a continuación y lo enviaremos a ella en un momento.' - NOTERESETLINKINVALID: '

El enlace para restablecer la contraseña es inválido o ha expirado.

Usted puede solicitar uno nuevo aqui o cambiar su contraseña después de que se haya conectado.

' NOTERESETPASSWORD: 'Introduzca su dirección de e-mail, y le enviaremos un enlace, con el cual podrá restaurar su contraseña' - PASSWORDSENTHEADER: 'Un enlace para restablecer la contraseña ha sido enviado a ''{email}''' - PASSWORDSENTTEXT: 'Gracias! Un enlace para restablecer la contraseña ha sido enviado a ''{email}'', siempre que una cuenta exista para la dirección de email indicada.' diff --git a/lang/et_EE.yml b/lang/et_EE.yml index 63fc4cd5d..a8fb3b686 100644 --- a/lang/et_EE.yml +++ b/lang/et_EE.yml @@ -139,7 +139,4 @@ et_EE: ERRORPASSWORDPERMISSION: 'Pead olema sisseloginud, et parooli muuta!' LOGIN: 'Logi sisse' NOTEPAGESECURED: 'See leht on turvatud. Sisesta enda andmed allpool ja me saadame sind otse edasi' - NOTERESETLINKINVALID: '

Parooli lähtestamise link on kehtetu või aegunud.

Saate taotleda uut linki siin või muuta parooli pärast sisselogimist.

' NOTERESETPASSWORD: 'Sisesta oma email ja me saadame sulle lingi kus saad oma parooli tühistada.' - PASSWORDSENTHEADER: 'Parooli lähtestamise link saadeti aadressile ''{email}''' - PASSWORDSENTTEXT: 'Aitäh! Lähtestamislink saadeti aadressile ''{email}'' eeldusel, et selle e-posti aadressiga seotud konto on olemas.' diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml index b292b25d7..b9aa0ebea 100644 --- a/lang/fa_IR.yml +++ b/lang/fa_IR.yml @@ -168,4 +168,3 @@ fa_IR: ERRORPASSWORDPERMISSION: 'جهت تغییر گذرواژه خود باید وارد شده باشید!' LOGIN: ورود LOSTPASSWORDHEADER: 'فراموشی گذرواژه' - PASSWORDSENTHEADER: 'لینک ازنوسازی گذرواژه به ''{email}'' ارسال شد' diff --git a/lang/fi.yml b/lang/fi.yml index 364762d3a..7f8579e7f 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -95,6 +95,8 @@ fi: DeletePermissionsFailure: 'Ei oikeuksia poistamiseen' Deleted: 'Poistettiin {type} {name}' Save: Tallenna + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Muokkaa SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Et voi siirtää itseäsi pois tästä ryhmästä: menettäisit pääkäyttäjän oikeudet' SilverStripe\Forms\GridField\GridFieldPaginator: @@ -147,6 +149,8 @@ fi: other: '{count} vuotta' SilverStripe\ORM\FieldType\DBEnum: ANY: Yhtään + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Liian monta samaan liittyvää objektia: oletuskenttä käytössä' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Liian monta lapsiobjektia ({count}}' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -197,6 +201,7 @@ fi: many_many_Members: Jäsenet SilverStripe\Security\LoginAttempt: Email: Sähköpostiosoite + EmailHashed: 'Sähköpostiosoite (tiivistetty)' IP: IP-osoite PLURALNAME: Kirjautumisyritykset PLURALS: @@ -255,6 +260,8 @@ fi: SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: ERRORWRONGCRED: 'Antamasi tiedot eivät näytä oikeilta. Yritä uudelleen.' NoPassword: 'Tällä käyttäjällä ei ole salasanaa' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'Sähköpostiosoite & salasana' SilverStripe\Security\MemberPassword: PLURALNAME: 'Käyttäjän salasanat' PLURALS: @@ -318,5 +325,5 @@ fi: NOTEPAGESECURED: 'Tämä sivu on suojattu. Syötä tunnistetietosi alle niin pääset eteenpäin.' NOTERESETLINKINVALID: '

Salasanan palautuslinkki on virheellinen tai vanhentunut.

Voit pyytää uuden napsauttamalla tästä tai vaihtaa salasanasi kirjautumisen jälkeen.

' NOTERESETPASSWORD: 'Syötä sähköpostiosoitteesi ja lähetämme sinulle linkin, jonka avulla saat palautettua salasanasi' - PASSWORDSENTHEADER: 'Salasanan palautuslinkki lähetettiin osoitteeseen ''{email}''' - PASSWORDSENTTEXT: 'Kiitos! Salasanan palautuslinkki lähetettiin osoitteeseen ''{email}'', joka on liitettynä tähän käyttäjätiliin.' + PASSWORDRESETSENTHEADER: 'Salasanan palautuslinkki lähetetty' + PASSWORDRESETSENTTEXT: 'Kiitos, palautuslinkki on lähetetty käyttäjätilille asetettuun sähköpostiosoitteeseen.' diff --git a/lang/fr.yml b/lang/fr.yml index 15b6dab42..450cfdb87 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -319,7 +319,4 @@ fr: LOGOUT: 'Se déconnecter' LOSTPASSWORDHEADER: 'Mot de passe oublié' NOTEPAGESECURED: 'Cette page est sécurisée. Entrez vos identifiants ci-dessous et vous pourrez y avoir accès.' - NOTERESETLINKINVALID: '

Le lien de réinitialisation du mot de passe n’est pas valide ou a expiré.

Vous pouvez en demander un nouveau en suivant ce lien ou changer de mot de passe après connexion.

' NOTERESETPASSWORD: 'Entrez votre adresse email et nous vous enverrons un lien pour modifier votre mot de passe' - PASSWORDSENTHEADER: "Lien de réinitialisation de mot de passe envoyé à «\_{email}\_»" - PASSWORDSENTTEXT: "Merci\_! Un lien de réinitialisation vient d’être envoyé à «\_{email}\_», à condition que cette adresse existe." diff --git a/lang/id.yml b/lang/id.yml index d17eac338..c9c06bbff 100644 --- a/lang/id.yml +++ b/lang/id.yml @@ -167,7 +167,4 @@ id: LOGIN: Masuk LOSTPASSWORDHEADER: 'Kata Kunci yang Terlupa' NOTEPAGESECURED: 'Laman ini diamankan. Isikan data berikut untuk dikirimkan hak akses Anda.' - NOTERESETLINKINVALID: '

Tautan penggantian kata kunci tidak valid atau sudah kadaluarsa.

Anda dapat meminta yang baru di sini atau mengganti kata kunci setelah Anda masuk.

' NOTERESETPASSWORD: 'Isikan alamat email Anda untuk mendapatkan tautan penggantian kata kunci' - PASSWORDSENTHEADER: 'Tautan penggantian kata kunci dikirimkan ke ''{email}''' - PASSWORDSENTTEXT: 'Terimakasih! Tautan reset telah dikirim ke ''{email}'', berisi informasi akun untuk alamat email ini.' diff --git a/lang/id_ID.yml b/lang/id_ID.yml index 22ebcb2e5..11d1f2bb3 100644 --- a/lang/id_ID.yml +++ b/lang/id_ID.yml @@ -166,7 +166,4 @@ id_ID: LOGIN: Masuk LOSTPASSWORDHEADER: 'Kata Kunci yang Terlupa' NOTEPAGESECURED: 'Laman ini diamankan. Isikan data berikut untuk dikirimkan hak akses Anda.' - NOTERESETLINKINVALID: '

Tautan penggantian kata kunci tidak valid atau sudah kadaluarsa.

Anda dapat meminta yang baru di sini atau mengganti kata kunci setelah Anda masuk.

' NOTERESETPASSWORD: 'Isikan alamat email Anda untuk mendapatkan tautan penggantian kata kunci' - PASSWORDSENTHEADER: 'Tautan penggantian kata kunci dikirimkan ke ''{email}''' - PASSWORDSENTTEXT: 'Terimakasih! Tautan reset telah dikirim ke ''{email}'', berisi informasi akun untuk alamat email ini.' diff --git a/lang/it.yml b/lang/it.yml index 05bf5dc83..4089faf9b 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -95,6 +95,10 @@ it: DeletePermissionsFailure: 'Non hai i permessi per eliminare' Deleted: 'Eliminato {type} {name}' Save: Salva + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Modifica + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'Non è possibile rimuovere te stesso da questo gruppo, perderesti i diritti di admin' SilverStripe\Forms\GridField\GridFieldPaginator: OF: di Page: Pagina @@ -145,6 +149,8 @@ it: other: '{count} anni' SilverStripe\ORM\FieldType\DBEnum: ANY: Qualsiasi + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Troppi oggetti correlati; campo di fallback in uso' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Troppi figli ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -195,6 +201,7 @@ it: many_many_Members: Membri SilverStripe\Security\LoginAttempt: Email: 'Indirizzo e-mail' + EmailHashed: 'Indirizzo email (hash)' IP: 'Indirizzo IP' PLURALNAME: 'Tentativi d''accesso' PLURALS: @@ -236,6 +243,7 @@ it: SUBJECTPASSWORDCHANGED: 'La tua password è stata cambiata' SUBJECTPASSWORDRESET: 'Link per azzerare la tua password' SURNAME: Cognome + VALIDATIONADMINLOSTACCESS: 'Non è possibile rimuovere tutti i gruppi admin dal tuo profilo' ValidationIdentifierFailed: 'Non posso sovrascrivere l''utente esistente #{id} con identificatore identico ({name} = {value}))' WELCOMEBACK: 'Bentornato, {firstname}' YOUROLDPASSWORD: 'La tua vecchia password' @@ -252,6 +260,8 @@ it: SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: ERRORWRONGCRED: 'I dettagli forniti non sembrano corretti. Per favore riprovare.' NoPassword: 'Manca la password per questo utente.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'E-mail & Password' SilverStripe\Security\MemberPassword: PLURALNAME: 'Password utenti' PLURALS: @@ -313,7 +323,6 @@ it: LOGOUT: Scollegati LOSTPASSWORDHEADER: 'Password smarrita' NOTEPAGESECURED: 'La pagina è protetta. Inserisci le credenziali qui sotto per poter andare avanti.' - NOTERESETLINKINVALID: '

Il link per azzerare la password non è valido o è scaduto.

Puoi richiederne uno nuovo qui o cambiare la tua password dopo che ti sei connesso.

' NOTERESETPASSWORD: 'Inserisci il tuo indirizzo e-mail e ti verrà inviato un link per poter azzerare la tua password.' - PASSWORDSENTHEADER: 'Link per azzeramento della password inviato a ''{email}''' - PASSWORDSENTTEXT: 'Grazie! Un link di azzeramento è stato inviato a ''{email}'', fornito un account esistente per questo indirizzo e-mail.' + PASSWORDRESETSENTHEADER: 'Link di azzeramento password inviato' + PASSWORDRESETSENTTEXT: 'Grazie! Un link di azzeramento è stato inviato, supponendo un account esista a quell''indirizzo e-mail.' diff --git a/lang/ja.yml b/lang/ja.yml index b2f92eb1e..433a832e2 100644 --- a/lang/ja.yml +++ b/lang/ja.yml @@ -146,7 +146,4 @@ ja: ERRORPASSWORDPERMISSION: パスワードを変更する為に、ログインしなければなりません！ LOGIN: ログイン NOTEPAGESECURED: このページはセキュリティで保護されております証明書キーを下記に入力してください。こちらからすぐに送信します - NOTERESETLINKINVALID: '

パスワードのリセットリンクは有効でないか期限切れです。

新しいパスワードを要求することができます ここ もしくはパスワードを変更することができます ログインした後 .

' NOTERESETPASSWORD: メールアドレスを入力してください、パスワードをリセットするURLを送信致します - PASSWORDSENTHEADER: 'パスワードリセットリンクは ''{email}'' に送信されました' - PASSWORDSENTTEXT: 'ありがとうございました！　リセットリンクは、''{email}'' に、このアカウントが存在することを前提として送信されました。' diff --git a/lang/lt.yml b/lang/lt.yml index abdbaea25..3ca7adbff 100644 --- a/lang/lt.yml +++ b/lang/lt.yml @@ -167,7 +167,4 @@ lt: LOGIN: Prisijungti LOSTPASSWORDHEADER: 'Slaptažodžio atstatymas' NOTEPAGESECURED: 'Šis puslapis yra apsaugotas. Įveskite savo duomenis į žemiau esančius laukelius.' - NOTERESETLINKINVALID: '

Neteisinga arba negaliojanti slaptažodžio atstatymo nuoroda.

Galite atsisiųsti naują čia arba pasikeisti slaptažodį po to, kai prisijungsite.

' NOTERESETPASSWORD: 'Įveskite savo e. pašto adresą ir atsiųsime slaptažodžio atstatymui skirtą nuorodą' - PASSWORDSENTHEADER: 'Slaptažodžio atstatymo nuoroda nusiųsta į ''{email}''' - PASSWORDSENTTEXT: 'Atstatymo nuoroda nusiųsta į ''{email}''' diff --git a/lang/mi.yml b/lang/mi.yml index 7a2601ed5..e9fe2308e 100644 --- a/lang/mi.yml +++ b/lang/mi.yml @@ -149,7 +149,4 @@ mi: LOGIN: Takiuru LOSTPASSWORDHEADER: 'Kupuhipa Ngaro' NOTEPAGESECURED: 'Kua ngita tēnā whārangi. Tāurua ō taipitoptio tuakiri ki raro, ā, mā mātou koe e tuku kia haere tonu.' - NOTERESETLINKINVALID: '

He muhu, kua mōnehu rānei te hono tautuhi kupuhipa anō.

Ka taea te tono i te mea hōui konei ka huri rānei i tō kupuhipa ā muri i tōtakiuru.

' NOTERESETPASSWORD: 'Tāurua tō wāhitau īmēra, mā mātou e tuku tētahi hono ki a koe e taea ai te tautuhi anō i tō kupuhipa' - PASSWORDSENTHEADER: 'I tukuna he hono tautuhi kupuhipa anō ki ''{email}''' - PASSWORDSENTTEXT: 'Kia ora! Kua tukuna he hono tautuhi anō ki ''{email}'',engari rā kei te tīariari he pūkete mō taua wāhitau īmēra.' diff --git a/lang/nb.yml b/lang/nb.yml index 91dd9f758..f1dc4c74d 100644 --- a/lang/nb.yml +++ b/lang/nb.yml @@ -152,7 +152,4 @@ nb: LOGIN: 'Logg inn' LOSTPASSWORDHEADER: 'Mistet passord' NOTEPAGESECURED: 'Den siden er sikret. Skriv inn gyldig innloggingsinfo så kommer du inn.' - NOTERESETLINKINVALID: '

Lenken for å nullstille passordet er ugyldig eller utgått.

Du kan kreve en ny her eller endre passordet etter at du har logget inn.

' NOTERESETPASSWORD: 'Skriv inn epostadressen din og vi vil sende deg en lenke som nullstiller passordet.' - PASSWORDSENTHEADER: 'Lenke for nullstilling av passord ble sendt til ''{email}''' - PASSWORDSENTTEXT: 'Takk! En lenke for å lage nytt passord er sendt til ''{email}'', forutsatt at det eksisterer en konto for denne epostadressen.' diff --git a/lang/nl.yml b/lang/nl.yml index 64f191213..242eccc45 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -1,4 +1,26 @@ nl: + SilverStripe\Admin\LeftAndMain: + VersionUnknown: onbekend + SilverStripe\AssetAdmin\Forms\UploadField: + Dimensions: Afmetingen + EDIT: Bewerken + EDITINFO: 'Bewerk dit bestand' + REMOVE: Verwijder + SilverStripe\Control\ChangePasswordEmail_ss: + CHANGEPASSWORDFOREMAIL: 'Het wachtwoord voor het account met e-mailadres {email} is aangepast. Indien u uw wachtwoord niet heeft aangepast kunt u dat doen met onderstaande link.' + CHANGEPASSWORDTEXT1: 'U heeft het wachtwoord veranderd voor' + CHANGEPASSWORDTEXT3: 'Wachtwoord veranderen' + HELLO: Hallo + SilverStripe\Control\Email\ForgotPasswordEmail_ss: + HELLO: Hallo + TEXT1: 'Hier is uw' + TEXT2: 'link om uw wachtwoord opnieuw aan te maken' + TEXT3: voor + SilverStripe\Control\RequestProcessor: + INVALID_REQUEST: 'Fout bij verwerken' + REQUEST_ABORTED: 'Fout bij verwerken (geannuleerd)' + SilverStripe\Core\Manifest\VersionProvider: + VERSIONUNKNOWN: Onbekend SilverStripe\Forms\CheckboxField: NOANSWER: Nee YESANSWER: Ja @@ -8,6 +30,8 @@ nl: ATLEAST: 'Een wachtwoord moet tenminste {min} karakters hebben.' BETWEEN: 'Een wachtwoord moet tussen de {min} en {max} karakters hebben' CURRENT_PASSWORD_ERROR: 'Het wachtwoord dat u heeft ingevoerd is niet juist.' + CURRENT_PASSWORD_MISSING: 'Voer uw huidige wachtwoord in.' + LOGGED_IN_ERROR: 'U moet ingelogd zijn om uw wachtwoord te kunnen veranderen!' MAXIMUM: 'Een wachtwoord mag maximaal {max} karakters hebben.' SHOWONCLICKTITLE: 'Verander wachtwoord' SilverStripe\Forms\CurrencyField: @@ -16,12 +40,20 @@ nl: VALIDDATEFORMAT2: 'Vul een geldig datumformaat in ({format})' VALIDDATEMAXDATE: 'De datum moet ouder of gelijk zijn aan de maximale datum ({date})' VALIDDATEMINDATE: 'De datum moet nieuwer of gelijk zijn aan de minimale datum ({date})' + SilverStripe\Forms\DatetimeField: + VALIDDATEMAXDATETIME: 'De datum moet ouder of gelijk zijn aan de maximale datum ({datetime})' + VALIDDATETIMEFORMAT: 'Vul een geldige datum in ({format})' + VALIDDATETIMEMINDATE: 'De datum moet nieuwer of gelijk zijn aan de minimale datum ({datetime})' SilverStripe\Forms\DropdownField: CHOOSE: (Kies) + CHOOSE_MODEL: '(Selecteer {name})' SOURCE_VALIDATION: 'Selecteer een optie uit de lijst. {value} is geen geldige keuze.' SilverStripe\Forms\EmailField: VALIDATION: 'Gelieve een e-mailadres in te voeren.' + SilverStripe\Forms\FileUploadReceiver: + FIELDNOTSET: 'Bestandsinformatie niet gevonden' SilverStripe\Forms\Form: + BAD_METHOD: 'Dit formulier moet middels {method} verzonden worden' CSRF_EXPIRED_MESSAGE: 'Uw sessie is verlopen. Verzend het formulier opnieuw.' CSRF_FAILED_MESSAGE: 'Er lijkt een technisch probleem te zijn. Klik op de knop terug, vernieuw uw browser, en probeer het opnieuw.' VALIDATIONPASSWORDSDONTMATCH: 'Wachtwoorden komen niet overeen' @@ -30,7 +62,10 @@ nl: VALIDATOR: Validator VALIDCURRENCY: 'Vul een geldige munteenheid in' SilverStripe\Forms\FormField: + EXAMPLE: 'bijv. {format}' NONE: geen + SilverStripe\Forms\FormScaffolder: + TABMAIN: Hoofdgedeelte SilverStripe\Forms\GridField\GridField: Add: '{name} toevoegen' CSVEXPORT: 'Exporteer naar CSV' @@ -60,27 +95,67 @@ nl: DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen' Deleted: '{type} {name} verwijderd' Save: Opslaan + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Bewerken + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'U kunt uzelf niet verwijderen van deze groep, omdat u dan geen admin-rechten meer heeft.' + SilverStripe\Forms\GridField\GridFieldPaginator: + OF: van + Page: Pagina + View: Bekijk SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Aantal FIELDLABELCURRENCY: Munteenheid + INVALID_CURRENCY: 'Valuta {currency} is niet toegestaan' + SilverStripe\Forms\MultiSelectField: + SOURCE_VALIDATION: 'Selecteer een optie uit de lijst. {value} is geen geldige keuze.' SilverStripe\Forms\NullableField: IsNullLabel: 'Is null' SilverStripe\Forms\NumericField: VALIDATION: '''{value}'' is geen getal, enkel getallen worden door dit veld geaccepteerd' SilverStripe\Forms\TimeField: VALIDATEFORMAT: 'Vul een geldig datumformaat in ({format})' + SilverStripe\ORM\DataObject: + PLURALNAME: 'Data objecten' + PLURALS: + one: 'Data object' + other: '{count} Data objecten' + SINGULARNAME: 'Data object' SilverStripe\ORM\FieldType\DBBoolean: ANY: Elke NOANSWER: Nee YESANSWER: Ja SilverStripe\ORM\FieldType\DBDate: + DAYS_SHORT_PLURALS: + one: '{count} dag' + other: '{count} dagen' + HOURS_SHORT_PLURALS: + one: '{count} uur' + other: '{count} uren' LessThanMinuteAgo: 'minder dan één minuut' + MINUTES_SHORT_PLURALS: + one: '{count} minuut' + other: '{count} minuten' + MONTHS_SHORT_PLURALS: + one: '{count} maand' + other: '{count} maanden' + SECONDS_SHORT_PLURALS: + one: '{count} seconde' + other: '{count} seconden' TIMEDIFFAGO: '{difference} geleden' TIMEDIFFIN: 'in {difference}' + YEARS_SHORT_PLURALS: + one: '{count} jaar' + other: '{count} jaren' SilverStripe\ORM\FieldType\DBEnum: ANY: Elke + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Teveel keuzes in de lijst; een alternatief veld wordt getoond.' + SilverStripe\ORM\Hierarchy: + LIMITED_TITLE: 'Teveel onderliggende items ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: InfiniteLoopNotAllowed: 'Oneindige lus gevonden in "{type}" hiërarchie. Wijzig het hogere niveau om dit op te lossen' + LIMITED_TITLE: 'Teveel onderliggende items ({count})' SilverStripe\ORM\ValidationException: DEFAULT_ERROR: Validatiefout SilverStripe\Security\BasicAuth: @@ -91,34 +166,60 @@ nl: PASSWORDEXPIRED: '

Uw wachtwoord is verlopen. Kies een nieuw wachtwoord.

' SilverStripe\Security\CMSSecurity: INVALIDUSER: '

Ongeldige gebruiker Log hier opnieuw in om verder te gaan.

' + LOGIN_MESSAGE: 'Sessie is verlopen' + LOGIN_TITLE: '

U kunt verder met wat u aan het doen was, door opnieuw in te loggen.

' SUCCESS: Succes SUCCESSCONTENT: '

U bent ingelogd. Klik hier als u niet automatisch wordt doorgestuurd.

' + SUCCESS_TITLE: 'Inloggen is gelukt' + SilverStripe\Security\DefaultAdminService: + DefaultAdminFirstname: 'Standaard Beheerder' SilverStripe\Security\Group: AddRole: 'Voeg een rol toe aan deze groep' Code: 'Groep code' DefaultGroupTitleAdministrators: Beheerders DefaultGroupTitleContentAuthors: 'Inhoud Auteurs' Description: 'Omschrijving ' + GROUPNAME: 'Groep naam' GroupReminder: 'Als u de bovenliggende groep selecteert, neemt deze groep alle rollen over' HierarchyPermsError: 'U moet (ADMIN) rechten hebben om de bovenliggende groep "{group}" toe te kennen' Locked: 'Gesloten?' + MEMBERS: Leden + NEWGROUP: 'Nieuwe groep' NoRoles: 'Geen rollen gevonden' + PERMISSIONS: Rechten + PLURALNAME: Groepen + PLURALS: + one: 'Een groep' + other: '{count} groepen' Parent: 'Bovenliggende groep' + ROLES: Rollen + ROLESDESCRIPTION: 'Rollen zijn logische groeperingen van rechten die in het Rollen tabblad gewijzigd kunnen worden.
Rollen worden automatisch overgenomen van bovenliggende groepen.' RolesAddEditLink: 'Rollen beheren' + SINGULARNAME: Groep Sort: Sorteer-richting has_many_Permissions: Rechten many_many_Members: Leden SilverStripe\Security\LoginAttempt: + Email: 'E-mailadres ' + EmailHashed: 'E-mailadres (versleuteld)' IP: 'IP adres' + PLURALNAME: Inlogpogingen + PLURALS: + one: 'Een inlogpoging' + other: '{count} inlogpogingen' + SINGULARNAME: Inlogpogingen Status: Status SilverStripe\Security\Member: ADDGROUP: 'Groep toevoegen' BUTTONCHANGEPASSWORD: 'Wachtwoord veranderen' BUTTONLOGIN: Inloggen BUTTONLOGINOTHER: 'Als iemand anders inloggen' + BUTTONLOGOUT: Uitloggen BUTTONLOSTPASSWORD: 'Ik ben mijn wachtwoord vergeten' CONFIRMNEWPASSWORD: 'Bevestig het nieuwe wachtwoord' CONFIRMPASSWORD: 'Bevestig wachtwoord' + CURRENT_PASSWORD: 'Huidige wachtwoord' + EDIT_PASSWORD: 'Nieuw wachtwoord' EMAIL: E-mail EMPTYNEWPASSWORD: 'Het nieuwe wachtwoord mag niet leeg zijn, probeer opnieuw' ENTEREMAIL: 'Typ uw e-mailadres om een link te ontvangen waarmee u uw wachtwoord kunt resetten.' @@ -128,13 +229,21 @@ nl: ERRORWRONGCRED: 'De ingevulde gegevens lijken niet correct. Probeer het nog een keer.' FIRSTNAME: Voornaam INTERFACELANG: 'Interface taal' + KEEPMESIGNEDIN: 'Houd mij ingelogd' LOGGEDINAS: 'U bent ingelogd als {name}.' NEWPASSWORD: 'Nieuw wachtwoord' PASSWORD: Wachtwoord PASSWORDEXPIRED: 'Uw wachtwoord is verlopen. Kies een nieuw wachtwoord.' + PLURALNAME: Leden + PLURALS: + one: 'Een lid' + other: '{count} leden' + REMEMBERME: 'Onthoud mij voor volgende keer? (voor {count} dagen op dit apparaat)' + SINGULARNAME: Lid SUBJECTPASSWORDCHANGED: 'Uw wachtwoord is veranderd' SUBJECTPASSWORDRESET: 'Link om uw wachtwoord opnieuw aan te maken' SURNAME: Achternaam + VALIDATIONADMINLOSTACCESS: 'Niet mogelijk om alle admin-groepen te verwijderen van uw profiel' ValidationIdentifierFailed: 'Een bestaande gebruiker #{id} kan niet dezelfde unieke velden hebben ({name} = {value}))' WELCOMEBACK: 'Welkom terug, {firstname}' YOUROLDPASSWORD: 'Uw oude wachtwoord' @@ -143,15 +252,38 @@ nl: db_LockedOutUntil: 'Gesloten tot' db_Password: Wachtwoord db_PasswordExpiry: 'Wachtwoord vervaldatum' + SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: + AUTHENTICATORNAME: Inlogformulier + BUTTONFORGOTPASSWORD: 'Wachtwoord vergeten' + BUTTONLOGIN: 'Opnieuw inloggen' + BUTTONLOGOUT: Uitloggen + SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: + ERRORWRONGCRED: 'De ingevulde gegevens lijken niet correct. Probeer het nog een keer.' + NoPassword: 'Er is geen wachtwoord voor deze gebruiker.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'E-mail & wachtwoord' + SilverStripe\Security\MemberPassword: + PLURALNAME: Gebruikerswachtwoorden + PLURALS: + one: 'Een gebruikerswachtwoord' + other: '{count} Gebruikerswachtwoorden' + SINGULARNAME: Gebruikerswachtwoord SilverStripe\Security\PasswordValidator: LOWCHARSTRENGTH: 'Maak a.u.b. uw wachtwoord sterker door enkele van de volgende karakters te gebruiken: {chars}' PREVPASSWORD: 'U heeft dit wachtwoord in het verleden al gebruikt, kies a.u.b. een nieuw wachtwoord.' TOOSHORT: 'Het wachtwoord is te kort, het moet minimaal {minimum} karakters hebben' SilverStripe\Security\Permission: AdminGroup: Beheerder + CMS_ACCESS_CATEGORY: 'CMS toegang' CONTENT_CATEGORY: Inhoudsrechten FULLADMINRIGHTS: 'Volledige admin rechten' FULLADMINRIGHTS_HELP: 'Impliceert en overstemt alle andere toegewezen rechten.' + PERMISSIONS_CATEGORY: 'Rollen en toegangsrechten' + PLURALNAME: Rechten + PLURALS: + one: Machtiging + other: '{count} rechten' + SINGULARNAME: Machtiging UserPermissionsIntro: 'Groepen aan deze gebruiker toewijzen zullen diens permissies aanpassen. Zie de sectie Groepen voor meer informatie over machtigingen voor afzonderlijke groepen.' SilverStripe\Security\PermissionCheckboxSetField: AssignedTo: 'toegewezen aan "{title}"' @@ -161,21 +293,37 @@ nl: SilverStripe\Security\PermissionRole: OnlyAdminCanApply: 'Alleen admin kan doorvoeren' PLURALNAME: Rollen + PLURALS: + one: 'Een rol' + other: '{count} rollen' SINGULARNAME: Rol Title: Titel SilverStripe\Security\PermissionRoleCode: + PLURALNAME: 'Permissie codes' + PLURALS: + one: 'Een permissiecode' + other: '{count} permissiecodes' PermsError: 'U moet (ADMIN) rechten hebben om de code "{code}" toe te kennen' + SINGULARNAME: Permissiecode + SilverStripe\Security\RememberLoginHash: + PLURALNAME: 'Versleutelde logins' + PLURALS: + one: 'Een versleutelde login' + other: '{count} versleutelde logins' + SINGULARNAME: 'Versleutelde login' SilverStripe\Security\Security: ALREADYLOGGEDIN: 'U hebt geen toegang tot deze pagina. Als u een andere account met de nodige rechten hebt, kan u hieronder opnieuw inloggen.' BUTTONSEND: 'Nieuw wachtwoord aanmaken' CHANGEPASSWORDBELOW: 'U kunt uw wachtwoord hieronder veranderen.' CHANGEPASSWORDHEADER: 'Verander uw wachtwoord' + CONFIRMLOGOUT: 'Klik op onderstaande knop om uit te loggen.' ENTERNEWPASSWORD: 'Voer een nieuw wachtwoord in.' ERRORPASSWORDPERMISSION: 'U moet ingelogd zijn om uw wachtwoord te kunnen veranderen!' LOGIN: 'Meld aan' + LOGOUT: Uitloggen LOSTPASSWORDHEADER: 'Wachtwoord vergeten' NOTEPAGESECURED: 'Deze pagina is beveiligd. Voer uw gegevens in en u wordt automatisch doorgestuurd.' - NOTERESETLINKINVALID: '

De link om uw wachtwoord te kunnen wijzigen is niet meer geldig.

U kunt een nieuwe link aanvragen of uw wachtwoord aanpassen door in te loggen.

' + NOTERESETLINKINVALID: '

De reset link is ongeldig of komen te vervallen.

Je kan hier een nieuwe link aanvragen of het wachtwoord veranderen nadat je bent ingelogd.

' NOTERESETPASSWORD: 'Voer uw e-mailadres in en we sturen een link waarmee u een nieuw wachtwoord kunt instellen.' - PASSWORDSENTHEADER: 'Wachtwoord herstel link verzonden naar {email}' - PASSWORDSENTTEXT: 'Bedankt! Er is een link verstuurd naar {email} om uw wachtwoord opnieuw in te stellen, in de veronderstelling dat er een account bestaat voor dit e-mailadres.' + PASSWORDRESETSENTHEADER: 'link om uw wachtwoord opnieuw aan te maken' + PASSWORDRESETSENTTEXT: 'Bedankt! Er is een link verstuurd om uw wachtwoord opnieuw in te stellen (mits het mailadres reeds bekend is bij ons).' diff --git a/lang/pl.yml b/lang/pl.yml index c0359c922..1905acb38 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -1,7 +1,37 @@ pl: + SilverStripe\Admin\LeftAndMain: + VersionUnknown: Nieznany + SilverStripe\AssetAdmin\Forms\UploadField: + Dimensions: Rozmiar + EDIT: Edytuj + EDITINFO: 'Edytuj plik' + REMOVE: Usuń + SilverStripe\Control\ChangePasswordEmail_ss: + CHANGEPASSWORDFOREMAIL: 'Hasło do konta o adresie e-mail {email} zostało zmienione. Jeśli nie zmieniłeś swojego hasła, zmień hasło, korzystając z poniższego linku' + CHANGEPASSWORDTEXT1: 'Zmieniłeś hasło na' + CHANGEPASSWORDTEXT3: 'Zmień hasło' + HELLO: 'Witaj,' + SilverStripe\Control\Email\ForgotPasswordEmail_ss: + HELLO: 'Witaj,' + TEXT1: 'Oto twój' + TEXT2: 'link zmiany hasła' + TEXT3: dla + SilverStripe\Control\RequestProcessor: + INVALID_REQUEST: 'Nieprawidłowe żądanie' + REQUEST_ABORTED: 'Żądanie zostało przerwane' + SilverStripe\Core\Manifest\VersionProvider: + VERSIONUNKNOWN: Nieznany + SilverStripe\Forms\CheckboxField: + NOANSWER: Nie + YESANSWER: Tak + SilverStripe\Forms\CheckboxSetField_ss: + NOOPTIONSAVAILABLE: 'Brak dostępnych opcji' SilverStripe\Forms\ConfirmedPasswordField: ATLEAST: 'Hasła muszą mieć przynajmniej {min} znaków.' BETWEEN: 'Hasła muszą mieć długość pomiędzy {min} a {max} znaków.' + CURRENT_PASSWORD_ERROR: 'Podane hasło jest nieprawidłowe' + CURRENT_PASSWORD_MISSING: 'Musisz podać swoje aktualne hasło.' + LOGGED_IN_ERROR: 'Musisz być zalogowany aby zmienić hasło' MAXIMUM: 'Hasła mogą mieć co najwyżej {max} znaków.' SHOWONCLICKTITLE: 'Zmiana Hasła' SilverStripe\Forms\CurrencyField: @@ -10,23 +40,38 @@ pl: VALIDDATEFORMAT2: 'Proszę wprowadź prawidłowy format daty ({format})' VALIDDATEMAXDATE: 'Twoja data musi być wcześniejsza lub taka sama, jak maksymalna dozwolona data ({date})' VALIDDATEMINDATE: 'Twoja data musi być późniejsza lub taka sama, jak minimalna dozwolona data ({date})' + SilverStripe\Forms\DatetimeField: + VALIDDATEMAXDATETIME: 'Twoja data musi być wcześniejsza lub taka sama, jak maksymalna dozwolona data ({date})' + VALIDDATETIMEFORMAT: 'Proszę wprowadź prawidłowy format czasu ({format})' + VALIDDATETIMEMINDATE: 'Twoja data musi być późniejsza lub taka sama, jak minimalna dozwolona data ({date})' SilverStripe\Forms\DropdownField: CHOOSE: (wybierz) + CHOOSE_MODEL: '(Wybierz {name})' + SOURCE_VALIDATION: 'Wybierz wartość z podanej listy. {value} nie jest poprawną opcją' SilverStripe\Forms\EmailField: VALIDATION: 'Proszę podaj adres e-mail' + SilverStripe\Forms\FileUploadReceiver: + FIELDNOTSET: 'Nie znaleziono informacji o pliku' SilverStripe\Forms\Form: + BAD_METHOD: 'Ten formularz wymaga {metody} przesłania' + CSRF_EXPIRED_MESSAGE: 'Twoja sesja wygasła. Prześlij ponownie formularz.' + CSRF_FAILED_MESSAGE: 'Wygląda na to, że wystąpił błąd techniczny. Kliknij przycisk wstecz, następnie odśwież przeglądarkę aby wczytać stronę ponownie.' VALIDATIONPASSWORDSDONTMATCH: 'Hasła nie są takie same' VALIDATIONPASSWORDSNOTEMPTY: 'Hasło nie może być puste' VALIDATIONSTRONGPASSWORD: 'Hasła muszą mieć przynajmniej jedną cyfrę oraz jeden znak alfanumeryczny.' VALIDATOR: Walidator VALIDCURRENCY: 'Proszę podaj prawidłową walutę' SilverStripe\Forms\FormField: + EXAMPLE: 'na przykład {format}' NONE: brak + SilverStripe\Forms\FormScaffolder: + TABMAIN: Główny SilverStripe\Forms\GridField\GridField: Add: 'Dodaj {name}' CSVEXPORT: 'Eksportuj do CSV' + CSVIMPORT: 'Import z CSV' Filter: Filtr - FilterBy: 'Filtruj wg' + FilterBy: 'Filtruj wg ' Find: Wyszukaj LinkExisting: 'Linkuj istniejący' NewRecord: 'Nowy {type}' @@ -50,55 +95,145 @@ pl: DeletePermissionsFailure: 'Brak uprawnień do usuwania' Deleted: 'Usunięto {type} {name}' Save: Zapisz + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'Nie możesz usunąć siebie z tej grupy, stracone zostałby prawa administratora' + SilverStripe\Forms\GridField\GridFieldPaginator: + OF: z + Page: Strona + View: Widok SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Ilość FIELDLABELCURRENCY: waluta + INVALID_CURRENCY: 'Waluta {currency} nie znajduje się na liście dozwolonych walut' + SilverStripe\Forms\MultiSelectField: + SOURCE_VALIDATION: 'Wybierz wartości z podanej listy. Podano niepoprawną opcję {value}' SilverStripe\Forms\NullableField: IsNullLabel: 'Jest Pusty' SilverStripe\Forms\NumericField: VALIDATION: '''{value}'' nie jest liczbą, to pole przyjmuje tylko liczby' SilverStripe\Forms\TimeField: VALIDATEFORMAT: 'Proszę wprowadź prawidłowy format czasu ({format})' + SilverStripe\ORM\DataObject: + PLURALNAME: 'Obiekty danych' + PLURALS: + one: 'Obiekt danych' + few: 'Obiektów danych' + many: 'Obiektów danych' + other: 'Obiektów danych {count}' + SINGULARNAME: 'Obiekt danych' SilverStripe\ORM\FieldType\DBBoolean: ANY: Jakikolwiek + NOANSWER: Nie + YESANSWER: Tak SilverStripe\ORM\FieldType\DBDate: + DAYS_SHORT_PLURALS: + one: '{count} dzień' + few: '{count} dni' + many: '{count} dni' + other: '{count} dni' + HOURS_SHORT_PLURALS: + one: '{count} godzina' + few: '{count} godzin' + many: '{count} godzin' + other: '{count} godzin' LessThanMinuteAgo: 'mniej niż minuta' + MINUTES_SHORT_PLURALS: + one: '{count} minuta' + few: '{count} minut' + many: '{count} minut' + other: '{count} minut' + MONTHS_SHORT_PLURALS: + one: '{count} miesiąc' + few: '{count} miesięcy' + many: '{count} miesięcy' + other: '{count} miesięcy' + SECONDS_SHORT_PLURALS: + one: '{count} sekunda' + few: '{count} sekund' + many: '{count} sekund' + other: '{count} sekund' TIMEDIFFAGO: '{difference} temu' TIMEDIFFIN: 'w {difference}' + YEARS_SHORT_PLURALS: + one: '{count} rok' + few: '{count} lat' + many: '{count} lat' + other: '{count} lat' SilverStripe\ORM\FieldType\DBEnum: ANY: Jakikolwiek + SilverStripe\ORM\Hierarchy: + LIMITED_TITLE: 'Zbyt wiele dzieci ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: InfiniteLoopNotAllowed: 'Znaleziono nieskończoną pętlę wewnątrz hierarchii "{type}". Proszę zmień rodzica by to rozwiązać.' + LIMITED_TITLE: 'Zbyt wiele dzieci ({count})' + SilverStripe\ORM\ValidationException: + DEFAULT_ERROR: 'Niepoprawne dane' SilverStripe\Security\BasicAuth: ENTERINFO: 'Wprowadź username i hasło' ERRORNOTADMIN: 'Ten użytkownik nie jest administratorem' ERRORNOTREC: 'Nie istnieje taki username/hasło' + SilverStripe\Security\CMSMemberLoginForm: + PASSWORDEXPIRED: '

Twoje hasło wygasło. Prosimy wybrać nowe.

' + SilverStripe\Security\CMSSecurity: + INVALIDUSER: '

Niepoprawny użytkownik. Prosimy o ponownie uwierzytelnienie – aby kontynuować.

' + LOGIN_MESSAGE: '

Twoja sesja wygasła z powodu braku aktywności

' + LOGIN_TITLE: 'Wróć do strony, z którym połączenie zostało przerwane, logując się ponownie' + SUCCESS: Sukces + SUCCESSCONTENT: '

Zalogowano poprawnie! Jeżeli nie zostaniesz automatycznie przekierowany kliknij tutaj

' + SUCCESS_TITLE: 'Zalogowano poprawne' + SilverStripe\Security\DefaultAdminService: + DefaultAdminFirstname: 'Domyślny administrator' SilverStripe\Security\Group: AddRole: 'Dodaj rolę dla tej grupy' Code: 'Kod Grupy' DefaultGroupTitleAdministrators: Administratorzy DefaultGroupTitleContentAuthors: 'Autor treści' Description: Opis + GROUPNAME: 'Nazwa Grupy' GroupReminder: 'Jeśli wybierzesz nadrzędną grupę, obecna grupa otrzyma wszystkie jej role' HierarchyPermsError: 'Nie można przyporządkować uprzywilejowanej grupy "{group}" (wymagane uprawnienie ADMIN)' Locked: 'Zablokowana?' + MEMBERS: Użytkownicy + NEWGROUP: 'Nowa grupa' NoRoles: 'Nie znaleziono ról' + PERMISSIONS: Uprawnienia + PLURALNAME: Grupy + PLURALS: + one: Grupa + few: Grup + many: Grup + other: '{count} grup' Parent: 'Grupa nadrzędna' + ROLES: Role + ROLESDESCRIPTION: 'Role są wstępnie zdefiniowanymi zestawami uprawnień i można je przypisać do grup.
TW razie potrzeby są one dziedziczone z grup nadrzędnych.' RolesAddEditLink: 'Zarządzaj rolami' + SINGULARNAME: Grupa Sort: 'Kolejność Sortowania' has_many_Permissions: Zezwolenia many_many_Members: Użytkownicy SilverStripe\Security\LoginAttempt: + Email: 'Adres e-mail' + EmailHashed: 'Adres e-mail (hashed)' IP: 'Adres IP' + PLURALNAME: 'Próby logowania' + PLURALS: + one: 'Próba logowania' + few: 'Prób logowania' + many: 'Próby logowania {count}' + other: 'Próby logowania {count}' + SINGULARNAME: 'Próba logowania' Status: Status SilverStripe\Security\Member: ADDGROUP: 'Dodaj grupę' BUTTONCHANGEPASSWORD: 'Zmień hasło' BUTTONLOGIN: Zaloguj BUTTONLOGINOTHER: 'Zaloguj jako ktoś inny' + BUTTONLOGOUT: 'Wyloguj się' BUTTONLOSTPASSWORD: 'Zgubiłem hasło' CONFIRMNEWPASSWORD: 'Potwierdź nowe hasło' CONFIRMPASSWORD: 'Potwierdź hasło' + CURRENT_PASSWORD: 'Aktualne hasło' + EDIT_PASSWORD: 'Nowe hasło' EMAIL: E-mail EMPTYNEWPASSWORD: 'Nowe hasło nie może być puste, spróbuj ponownie.' ENTEREMAIL: 'Wpisz adres e-mail aby otrzymać link do zmiany hasła.' @@ -108,12 +243,23 @@ pl: ERRORWRONGCRED: 'Podane dane są niepoprawne. Proszę spróbować ponownie.' FIRSTNAME: Imię INTERFACELANG: 'Język interfejsu' + KEEPMESIGNEDIN: 'Zapamiętaj mnie' LOGGEDINAS: 'Zostałeś zalogowany jako {name}.' NEWPASSWORD: 'Nowe hasło' PASSWORD: Hasło + PASSWORDEXPIRED: 'Twoje hasło wygasło. Prosimy ustawić nowe.' + PLURALNAME: Użytkownicy + PLURALS: + one: Użytkownik + few: '{count} użytkowników' + many: '{count} użytkowników' + other: '{count} użytkowników' + REMEMBERME: 'Pamiętaj mnie następnym razem? (przez {count} dni na tym urządzeniu)' + SINGULARNAME: Użytkownik SUBJECTPASSWORDCHANGED: 'Twoje hasło zostało zmienione' SUBJECTPASSWORDRESET: 'Twój link do zmiany hasła' SURNAME: Nazwisko + VALIDATIONADMINLOSTACCESS: 'Nie można usunąć wszystkich grup administracyjnych z Twojego profilu' ValidationIdentifierFailed: 'Nie można nadpisać istniejącego użytkownika #{id} o identycznym identyfikatorze ({name} = {value})' WELCOMEBACK: 'Witaj ponownie, {firstname}' YOUROLDPASSWORD: 'Twoje stare hasło' @@ -122,15 +268,42 @@ pl: db_LockedOutUntil: 'Zablokowany do' db_Password: Hasło db_PasswordExpiry: 'Data wygaśnięcia hasła' + SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: + AUTHENTICATORNAME: 'Formularz logowania użytkownika CMS' + BUTTONFORGOTPASSWORD: 'Zapomniałeś hasła?' + BUTTONLOGIN: 'Zaloguj mnie spowrotem' + BUTTONLOGOUT: 'Wyloguj się' + SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: + ERRORWRONGCRED: 'Podane dane są niepoprawne. Proszę spróbować ponownie.' + NoPassword: 'Hasło nie zostało skonfigurowane dla tego użytkownika.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'E-mail i hasło' + SilverStripe\Security\MemberPassword: + PLURALNAME: 'Hasła użytkownika' + PLURALS: + one: 'Hasło użytkownika' + few: 'Haseł użytkownika' + many: 'Haseł użytkownika' + other: '{count} haseł użytkownika ' + SINGULARNAME: 'Hasło użytkownika' SilverStripe\Security\PasswordValidator: LOWCHARSTRENGTH: 'Proszę zwiększyć siłę hasła, dodając niektóre z następujących znaków: % s' PREVPASSWORD: 'Użyłeś już tego hasła wcześniej, proszę wybrać nowe' TOOSHORT: 'Hasło jest za krótkie, proszę podać {minimum} znaków lub więcej' SilverStripe\Security\Permission: AdminGroup: Administrator + CMS_ACCESS_CATEGORY: 'Dostęp do CMS''a' CONTENT_CATEGORY: 'Uprawnienie edycji treści' FULLADMINRIGHTS: 'Pełne prawa administracyjne' FULLADMINRIGHTS_HELP: 'Zatwierdza i nadpisuje wszystkie istniejące uprawnienia' + PERMISSIONS_CATEGORY: 'Uprawnienia ról i dostępu' + PLURALNAME: Uprawnienia + PLURALS: + one: Uprawnienie + few: Uprawnień + many: Uprawnień + other: '{count} uprawnień' + SINGULARNAME: Uprawnienie UserPermissionsIntro: 'Przydzielenie grup temu użytkownikowi spowoduje zmianę jego uprawnień. Odwołaj się do sekcji Grupy aby dowiedzieć się więcej o uprawnieniach grupowych.' SilverStripe\Security\PermissionCheckboxSetField: AssignedTo: 'przypisany do "{title}"' @@ -139,20 +312,41 @@ pl: FromRoleOnGroup: 'odziedziczone z roli "{roletitle}" w grupie "{grouptitle}"' SilverStripe\Security\PermissionRole: OnlyAdminCanApply: 'Tylko administrator może to zastosować' + PLURALNAME: Role + PLURALS: + one: Rola + few: ról + many: ról + other: '{count} ról' + SINGULARNAME: Rola Title: Tytuł SilverStripe\Security\PermissionRoleCode: + PLURALNAME: 'Kod roli uprawnienia' + PLURALS: + one: 'Kod roli uprawnienia' + few: 'Kodów ról uprawnień' + many: 'Kodów ról uprawnień' + other: '{count} kodów ról uprawnień' PermsError: 'Nie można przyporządkować uprzywilejowanego uprawnienia "{code}" (wymagane uprawnienie ADMIN)' + SINGULARNAME: 'Kod roli uprawnienia' + SilverStripe\Security\RememberLoginHash: + PLURALNAME: 'Hasła logowania' + PLURALS: + one: 'Hasło logowania' + few: 'Haseł logowania' + many: 'Haseł logowania' + other: '{count} haseł logowania' + SINGULARNAME: 'Hasło logowania' SilverStripe\Security\Security: ALREADYLOGGEDIN: 'Nie masz dostępu do tej strony. Jeśli posiadasz inne konto, które umożliwi Ci dostęp do tej strony, możesz się zalogować poniżej' BUTTONSEND: 'Wyślij mi link do zresetowania hasła' CHANGEPASSWORDBELOW: 'Możesz zmienić swoje hasło poniżej' CHANGEPASSWORDHEADER: 'Zmień swoje hasło' + CONFIRMLOGOUT: 'Kliknij przycisk poniżej, aby potwierdzić, że chcesz się wylogować.' ENTERNEWPASSWORD: 'Proszę wprowadż nowe hasło' ERRORPASSWORDPERMISSION: 'Musisz być zalogowany aby zmienić hasło' LOGIN: Logowanie + LOGOUT: 'Wyloguj się' LOSTPASSWORDHEADER: 'Nie pamiętam hasła' NOTEPAGESECURED: 'Ta strona jest zabezpieczona. Wpisz swoje dane a my wyślemy Ci potwierdzenie niebawem' - NOTERESETLINKINVALID: '

Link resetujący hasło wygasł lub jest nieprawidłowy.

Możesz poprosić o nowy tutaj lub zmień swoje hasło po zalogowaniu się.

' NOTERESETPASSWORD: 'Wpisz adres e-mail, na który mamy wysłać link gdzie możesz zresetować swoje hasło' - PASSWORDSENTHEADER: 'Link resetujący hasła został wysłany do ''{email}''' - PASSWORDSENTTEXT: 'Dziękujemy! Link resetujący hasło został wysłany do ''{email}'', o ile konto użytkownika dla takiego e-maila istnieje.' diff --git a/lang/ru.yml b/lang/ru.yml index 73602e013..add72be7f 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -339,7 +339,4 @@ ru: LOGOUT: Выйти LOSTPASSWORDHEADER: 'Восстановление пароля' NOTEPAGESECURED: 'Эта страница защищена. Пожалуйста, введите свои учетные данные для входа.' - NOTERESETLINKINVALID: '

Неверная ссылка переустановки пароля или время действия ссылки истекло.

Вы можете повторно запросить ссылку, щелкнув здесь, или поменять пароль, войдя в систему.

' NOTERESETPASSWORD: 'Введите Ваш адрес email, и Вам будет отправлена ссылка, по которой Вы сможете переустановить свой пароль' - PASSWORDSENTHEADER: 'Ссылка для переустановки пароля выслана на ''{email}''' - PASSWORDSENTTEXT: 'Ссылка переустановки пароля была выслана на адрес ''{email}'' (письмо дойдет до получателя только в том случае, если аккаунт с таким электронным адресом действительно зарегистрирован).' diff --git a/lang/sk.yml b/lang/sk.yml index 861045fc6..88f4bf260 100644 --- a/lang/sk.yml +++ b/lang/sk.yml @@ -228,7 +228,4 @@ sk: LOGIN: Prihlásiť LOSTPASSWORDHEADER: 'Zabudnuté heslo' NOTEPAGESECURED: 'Táto stránka je zabezpečená. Zadajte svoje prihlasovacie údaje a my Vám zároveň pošleme práva.' - NOTERESETLINKINVALID: '

Odkaz na resetovanie hesla nie je platný alebo je vypršala jeho platnosť.

Môžete požiadať o nový tu alebo zmeňte svoje heslo po prihlásení.

' NOTERESETPASSWORD: 'Zadajte svoju e-mailovú adresu a my Vám pošleme odkaz na resetovanie hesla' - PASSWORDSENTHEADER: 'Odkaz na resetovanie hesla bol odoslaný na ''{email}''' - PASSWORDSENTTEXT: 'Ďakujeme! Resetovací odkaz bol odoslaný na ''''{email}'''', pokiaľ účet existuje pre túto emailovú adresu.' diff --git a/lang/sl.yml b/lang/sl.yml index bccd51826..5496aff5f 100644 --- a/lang/sl.yml +++ b/lang/sl.yml @@ -135,7 +135,4 @@ sl: LOGIN: Prijava LOSTPASSWORDHEADER: 'Izgubljeno geslo' NOTEPAGESECURED: 'Stran je zaščitena. Da bi lahko nadaljevali, vpišite svoje podatke.' - NOTERESETLINKINVALID: '

Povezava za ponastavitev gesla je napačna ali pa je njena veljavnost potekla.

Tukaj lahko zaprosite za novo povezavo or pa zamenjate geslo, ko se prijavite v sistem.

' NOTERESETPASSWORD: 'Vpišite e-naslov, na katerega vam bomo poslali povezavo za ponastavitev gesla' - PASSWORDSENTHEADER: 'Povezava za ponastavitev gesla je bila poslana na e-naslov ''{email}''.' - PASSWORDSENTTEXT: 'Hvala! Povezava za ponastavitev gesla je bila poslana na e-naslov ''{email}'', ki je naveden kot e-naslov vašega računa. ' diff --git a/lang/sr.yml b/lang/sr.yml index 07f642278..622b657b3 100644 --- a/lang/sr.yml +++ b/lang/sr.yml @@ -151,7 +151,4 @@ sr: ERRORPASSWORDPERMISSION: 'Морате да будете пријављени да бисте променили своју лозинку!' LOGIN: Пријављивање NOTEPAGESECURED: 'Ова страна је обезбеђена. Унесите своје податке и ми ћемо вам послати садржај.' - NOTERESETLINKINVALID: '

Линк за ресетовање лозинке је погрешан или је истекло време за његово коришћење.

Можете да захтевате нови овде или да промените Вашу лозинку након што се пријавите.

' NOTERESETPASSWORD: 'Унесите своју адресу е-поште и ми ћемо вам послати линк помоћу којег можете да промените своју лозинку' - PASSWORDSENTHEADER: 'Линк за ресетовање лозинке послат је на адресу е-поште: ''{email}''' - PASSWORDSENTTEXT: 'Хвала Вам! Линк за ресетовање лозинке је послат не адресу е-поште ''{email}''. Порука ће стићи примаоцу само ако постоји регистрован налог са том адресом е-поште.' diff --git a/lang/sr@latin.yml b/lang/sr@latin.yml index 1b210ae51..f91aa9337 100644 --- a/lang/sr@latin.yml +++ b/lang/sr@latin.yml @@ -150,7 +150,4 @@ sr@latin: ERRORPASSWORDPERMISSION: 'Morate da budete prijavljeni da biste promenili svoju lozinku!' LOGIN: Prijavljivanje NOTEPAGESECURED: 'Ova strana je obezbeđena. Unesite svoje podatke i mi ćemo vam poslati sadržaj.' - NOTERESETLINKINVALID: '

Link za resetovanje lozinke je pogrešan ili je isteklo vreme za njegovo korišćenje.

Možete da zahtevate novi ovde ili da promenite Vašu lozinku nakon što se prijavite.

' NOTERESETPASSWORD: 'Unesite svoju adresu e-pošte i mi ćemo vam poslati link pomoću kojeg možete da promenite svoju lozinku' - PASSWORDSENTHEADER: 'Link za resetovanje lozinke poslat je na adresu e-pošte: ''{email}''' - PASSWORDSENTTEXT: 'Hvala Vam! Link za resetovanje lozinke je poslat ne adresu e-pošte ''{email}''. Poruka će stići primaocu samo ako postoji registrovan nalog sa tom adresom e-pošte.' diff --git a/lang/sr_RS.yml b/lang/sr_RS.yml index fc79812da..298049430 100644 --- a/lang/sr_RS.yml +++ b/lang/sr_RS.yml @@ -150,7 +150,4 @@ sr_RS: ERRORPASSWORDPERMISSION: 'Морате да будете пријављени да бисте променили своју лозинку!' LOGIN: Пријављивање NOTEPAGESECURED: 'Ова страна је обезбеђена. Унесите своје податке и ми ћемо вам послати садржај.' - NOTERESETLINKINVALID: '

Линк за ресетовање лозинке је погрешан или је истекло време за његово коришћење.

Можете да захтевате нови овде или да промените Вашу лозинку након што се пријавите.

' NOTERESETPASSWORD: 'Унесите своју адресу е-поште и ми ћемо вам послати линк помоћу којег можете да промените своју лозинку' - PASSWORDSENTHEADER: 'Линк за ресетовање лозинке послат је на адресу е-поште: ''{email}''' - PASSWORDSENTTEXT: 'Хвала Вам! Линк за ресетовање лозинке је послат не адресу е-поште ''{email}''. Порука ће стићи примаоцу само ако постоји регистрован налог са том адресом е-поште.' diff --git a/lang/sr_RS@latin.yml b/lang/sr_RS@latin.yml index f39b36058..453ffa17d 100644 --- a/lang/sr_RS@latin.yml +++ b/lang/sr_RS@latin.yml @@ -151,7 +151,4 @@ sr_RS@latin: ERRORPASSWORDPERMISSION: 'Morate da budete prijavljeni da biste promenili svoju lozinku!' LOGIN: Prijavljivanje NOTEPAGESECURED: 'Ova strana je obezbeđena. Unesite svoje podatke i mi ćemo vam poslati sadržaj.' - NOTERESETLINKINVALID: '

Link za resetovanje lozinke je pogrešan ili je isteklo vreme za njegovo korišćenje.

Možete da zahtevate novi ovde ili da promenite Vašu lozinku nakon što se prijavite.

' NOTERESETPASSWORD: 'Unesite svoju adresu e-pošte i mi ćemo vam poslati link pomoću kojeg možete da promenite svoju lozinku' - PASSWORDSENTHEADER: 'Link za resetovanje lozinke poslat je na adresu e-pošte: ''{email}''' - PASSWORDSENTTEXT: 'Hvala Vam! Link za resetovanje lozinke je poslat ne adresu e-pošte ''{email}''. Poruka će stići primaocu samo ako postoji registrovan nalog sa tom adresom e-pošte.' diff --git a/lang/sv.yml b/lang/sv.yml index f35c2ee99..f2a18d659 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -93,7 +93,12 @@ sv: DeletePermissionsFailure: 'Rättighet för att radera saknas' Deleted: 'Raderade {type} {name}' Save: Spara + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Ändra + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'Du kan inte radera dig själv från den här gruppen, då du då kommer att förlora dina admin-rättigheter' SilverStripe\Forms\GridField\GridFieldPaginator: + OF: av Page: Sida View: Visa SilverStripe\Forms\MoneyField: @@ -108,6 +113,12 @@ sv: VALIDATION: '''{value}'' är inget nummer, bara siffror (utan mellanslag) kan accepteras för det här fältet' SilverStripe\Forms\TimeField: VALIDATEFORMAT: 'Var god att ange tid i ett giltigt format ({format})' + SilverStripe\ORM\DataObject: + PLURALNAME: Dataobjekt + PLURALS: + one: 'Ett dataobjekt' + other: '{count} Dataobjekt' + SINGULARNAME: Dataobjekt SilverStripe\ORM\FieldType\DBBoolean: ANY: 'Vilken som helst' NOANSWER: Nej @@ -136,6 +147,8 @@ sv: other: '{count} år' SilverStripe\ORM\FieldType\DBEnum: ANY: 'Vilken som helst' + SilverStripe\ORM\FieldType\DBForeignKey: + DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'För många relaterade objekt; använder fallback-fält' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'För många barn ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -221,6 +234,7 @@ sv: PLURALS: one: 'En medlem' other: '{count} medlemmar' + REMEMBERME: 'Kom ihåg mig nästa gång? (i {count} dagar på denna enhet)' SINGULARNAME: Medlem SUBJECTPASSWORDCHANGED: 'Ditt lösenord har ändrats' SUBJECTPASSWORDRESET: 'Din återställningslänk' @@ -288,7 +302,6 @@ sv: LOGOUT: 'Logga ut' LOSTPASSWORDHEADER: 'Bortglömt lösenord' NOTEPAGESECURED: 'Den här sidan är låst. Fyll i dina uppgifter nedan så skickar vi dig vidare.' - NOTERESETLINKINVALID: '

Återställningslänk för lösenord är felaktig eller för gammal.

Du kan begära en ny här eller ändra ditt lösenord när du loggat in.

' NOTERESETPASSWORD: 'Ange din e-postadress så skickar vi en länk med vilken du kan återställa ditt lösenord' - PASSWORDSENTHEADER: 'Återställningslänk för lösenord har skickats till ''{email}''' - PASSWORDSENTTEXT: 'Tack en återställningslänk har skickats till ''{email}'', förutsatt att ett konto med den addressen finns.' + PASSWORDRESETSENTHEADER: 'Återställningslänk för lösenord skickad' + PASSWORDRESETSENTTEXT: 'Tack. En återställningslänk har skickats, förutsatt att ett konto med denna adress existerar.' diff --git a/lang/zh.yml b/lang/zh.yml index 26c8e2893..748ee671c 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -166,7 +166,4 @@ zh: LOGIN: 登录 LOSTPASSWORDHEADER: 忘记密码 NOTEPAGESECURED: 该页面受安全保护。请在下面输入您的证书，然后我们会立即将您引导至该页面。 - NOTERESETLINKINVALID: '

密码重设链接无效或已过期。

您可以在这里 要求一个新的或在登录后更改您的密码。

' NOTERESETPASSWORD: 请输入您的电子邮件地址，然后我们会将一个链接发送给您，您可以用它来重设您的密码 - PASSWORDSENTHEADER: '密码重设链接已发送至''{email}''' - PASSWORDSENTTEXT: '谢谢！复位链接已发送到 ''{email}''，假定此电子邮件地址存在一个帐户。' From 55674959f8a48237bf1fdee9ccac149301bd9619 Mon Sep 17 00:00:00 2001 From: Vagrant Default User Date: Wed, 7 Nov 2018 22:38:52 +1300 Subject: [PATCH 059/175] Added 4.1.3 changelog --- docs/en/04_Changelogs/4.1.3.md | 36 ++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/docs/en/04_Changelogs/4.1.3.md b/docs/en/04_Changelogs/4.1.3.md index 26ac3041c..c7b1ba1b4 100644 --- a/docs/en/04_Changelogs/4.1.3.md +++ b/docs/en/04_Changelogs/4.1.3.md @@ -10,3 +10,39 @@ behaviour to that of SilverStripe 3 where `Extension` instances are of lowest im default value. If you rely on your `Extension` or module providing an overriding config value, please move this to yaml. + +## Change Log + +### Security + + * 2018-11-06 [6cb1bf5](https://github.com/silverstripe/silverstripe-admin/commit/6cb1bf53a6fd5b54b6f7bbe7a1d7b939e176cf53) Add CSRF protection (Aaron Carlino) - See [ss-2018-007](https://www.silverstripe.org/download/security-releases/ss-2018-007) + * 2018-08-21 [af000be](https://github.com/silverstripe/silverstripe-framework/commit/af000bea9b16ea553cae7f7f662f74ab8dc343df) Add confirmation token to dev/build (Loz Calver) - See [ss-2018-019](https://www.silverstripe.org/download/security-releases/ss-2018-019) + * 2018-07-29 [5425195](https://github.com/silverstripe/silverstripe-framework/commit/54251952387394d72b221e797a80edfbf9a973ee) Ignore arguments in mysqli::real_connect backtrace calls (Robbie Averill) - See [ss-2018-018](https://www.silverstripe.org/download/security-releases/ss-2018-018) + +### Features and Enhancements + + * 2018-04-18 [fef734b](https://github.com/silverstripe/recipe-core/commit/fef734b5484d86f5afd4e857c556b8c1d8d66c16) Provide default IIS rewriting rules with recipe (Damian Mooyman) + +### Bugfixes + + * 2018-10-24 [e72fc9e](https://github.com/silverstripe/silverstripe-framework/commit/e72fc9e3d0f35a1d43f55f83f9919f67d72fb7cb) DataObject singleton creation (#8516) (Sam Minnée) + * 2018-09-18 [bbe7c66](https://github.com/silverstripe/silverstripe-asset-admin/commit/bbe7c660cf40d4c942eaf6e76755eeaf46c63471) Add `AssetAdmin::getMinimalistObjectFromData()` to build file metadata for UploadField (#829) (Maxime Rainville) + * 2018-09-13 [5c102de](https://github.com/silverstripe/silverstripe-cms/commit/5c102decbde43395e14aeff83a20c4c6f1d048ae) Improve performance of CMSMain::getArchiveWarningMessage (#2231) (Maxime Rainville) + * 2018-09-03 [1c4311d](https://github.com/silverstripe/silverstripe-asset-admin/commit/1c4311d4e6548600272daa0ce83afa12cf7e99c3) description for docs.silverstripe.org (wernerkrauss) + * 2018-09-03 [b922c0d](https://github.com/silverstripe/silverstripe-framework/commit/b922c0d7327b5d0222dd280afcb64f83a09ea859) Check scheme is truthy before setting it to the request (Robbie Averill) + * 2018-08-28 [d651d0f](https://github.com/silverstripe/silverstripe-framework/commit/d651d0fbfcababeaf317b27cb00b4f33b9d99eab) Use base class (not remapping target class) when looking up whether object is versioned (Robbie Averill) + * 2018-08-27 [4da5569](https://github.com/silverstripe/silverstripe-framework/commit/4da5569232505ee574e0b5106ff2116611393aa4) ensure createFromVariables takes correct params on CLIRequestBuilder (Scott Hutchinson) + * 2018-08-15 [0c713b5](https://github.com/silverstripe/silverstripe-assets/commit/0c713b5b1eb6a08ac00dcadb187b8b3ef7115fc4) Fix routing for files with dots in filename (Damian Mooyman) + * 2018-08-14 [27ac001](https://github.com/silverstripe/silverstripe-framework/commit/27ac001d5b27cce4f80ce4b3335c14708b116830) email rendering should not include requirements (Thomas Portelange) + * 2018-08-14 [8ec551e](https://github.com/silverstripe/silverstripe-cms/commit/8ec551e57b04d00d6897d06c2779557f0ec8109d) Broken "show as list" (#2232) (Maxime Rainville) + * 2018-07-26 [fea9ef7](https://github.com/silverstripe/silverstripe-admin/commit/fea9ef7d2a53904086f9fad6eedba7bb307c8578) #579 BUG Ambiguous column RecordID when doing batch actions (Ed Linklater) + * 2018-07-14 [a0e0bed](https://github.com/silverstripe/recipe-core/commit/a0e0bed7e7fe83b98264563efdeffa82d0d01d04) Use Injector to create PasswordValidators (Daniel Hensby) + * 2018-07-14 [8703839](https://github.com/silverstripe/silverstripe-framework/commit/8703839eb142ba0414f4d84f885ff898c39d6786) updateValidatePassword calls need to be masked from backtraces (Daniel Hensby) + * 2018-07-12 [e80c7e7](https://github.com/silverstripe/silverstripe-cms/commit/e80c7e712b916712d4ec7b6b8359ccf71dc9da04) Restore button now has warning colour and correct icon (Robbie Averill) + * 2018-07-12 [d122995](https://github.com/silverstripe/silverstripe-framework/commit/d1229956523d69f63c9e725b261c0142d5ee1de3) Duplicate config values for cascade_duplicates no longer duplicate their duplicates (Robbie Averill) + * 2018-06-19 [725212a](https://github.com/silverstripe/silverstripe-framework/commit/725212a707f6b724aff6548c3680b2cd66e9a6bb) Allow dispatcher in Embed to be configured with injector (#8192) (Robbie Averill) + * 2018-06-13 [932eb2b](https://github.com/silverstripe/silverstripe-cms/commit/932eb2b22dfe6c30473b1cf973661c28c5b9c635) Fix CMS components failing to register on other CMS sections (#2182) (Damian Mooyman) + * 2018-05-21 [bf5b578](https://github.com/silverstripe/silverstripe-admin/commit/bf5b5787685765c35c175c303f3f7ee719ac9453) Adding a min-width to flexbox-area-grow that allows flex blocks to shrink below their content width (Guy) + * 2018-05-18 [9531535](https://github.com/silverstripe/silverstripe-framework/commit/953153500d490f5b5abf7283c34242c3b22a855a) Polymorphic relationship class columns have obsolete class names remapped (Robbie Averill) + * 2018-05-08 [97a8f56](https://github.com/silverstripe/silverstripe-admin/commit/97a8f56c43ddb3c77a5bbc452755d44afb9a9472) Add missing focus styles for preview options (fixes silverstripe/silverstripe-framework #2101) (Loz Calver) + * 2018-03-29 [4acec33](https://github.com/silverstripe/silverstripe-framework/commit/4acec33562e4e1230092eee7d76c2b8061ffc914) Fixed bug in config merging priorities so that config values set by extensions are now least important instead of most important (Daniel Hensby) From 687e8c84b13f661bf9e644ae60d96fa6f3cfcceb Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Wed, 7 Nov 2018 23:20:11 +1300 Subject: [PATCH 060/175] Add changelog --- docs/en/04_Changelogs/rc/4.3.0-rc1.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 docs/en/04_Changelogs/rc/4.3.0-rc1.md diff --git a/docs/en/04_Changelogs/rc/4.3.0-rc1.md b/docs/en/04_Changelogs/rc/4.3.0-rc1.md new file mode 100644 index 000000000..7584cc59b --- /dev/null +++ b/docs/en/04_Changelogs/rc/4.3.0-rc1.md @@ -0,0 +1,13 @@ +# 4.3.0-rc1 + + + +## Change Log + +### Features and Enhancements + + * 2018-07-25 [79a5ea3](https://github.com/silverstripe/recipe-cms/commit/79a5ea3dace336558ef4d5be4a86cc1a0e84badc) Add versioned-admin (Luke Edwards) + +### Bugfixes + + * 2018-06-15 [5e4ad34](https://github.com/silverstripe/silverstripe-installer/commit/5e4ad341622565cc998bd8537ad3ec7a6a6a7913) Fix incorrect base recipe dependency (Damian Mooyman) From 9c474a71b9898d9cb07ca58c07a066edc9797024 Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Wed, 7 Nov 2018 23:41:26 +1300 Subject: [PATCH 061/175] MINOR: Use all-inclusive 4.3.0-rc1 backlog --- docs/en/04_Changelogs/rc/4.3.0-rc1.md | 284 +++++++++++++++++++++++++- 1 file changed, 283 insertions(+), 1 deletion(-) diff --git a/docs/en/04_Changelogs/rc/4.3.0-rc1.md b/docs/en/04_Changelogs/rc/4.3.0-rc1.md index 7584cc59b..fe242d44a 100644 --- a/docs/en/04_Changelogs/rc/4.3.0-rc1.md +++ b/docs/en/04_Changelogs/rc/4.3.0-rc1.md @@ -4,10 +4,292 @@ ## Change Log +### Security + + * 2018-10-24 [88391f2](https://github.com/silverstripe/silverstripe-graphql/commit/88391f27463cac553360d7d94b0760e797247855) CSRF protection (Aaron Carlino) - See [ss-2018-007](https://www.silverstripe.org/download/security-releases/ss-2018-007) + * 2018-08-21 [3dbb10625](https://github.com/silverstripe/silverstripe-framework/commit/3dbb10625c6918094a18cd9a29f1f9daca8129c5) Add confirmation token to dev/build (Loz Calver) - See [ss-2018-019](https://www.silverstripe.org/download/security-releases/ss-2018-019) + * 2018-08-12 [3424431](https://github.com/silverstripe/silverstripe-admin/commit/3424431a5ed52fc9aae97423268aea5eba7334a2) Add CSRF to Apollo (Aaron Carlino) - See [ss-2018-007](https://www.silverstripe.org/download/security-releases/ss-2018-007) + * 2018-07-29 [637b4225c](https://github.com/silverstripe/silverstripe-framework/commit/637b4225c6a85bfa0d59e516a8c602203cc980d9) Ignore arguments in mysqli::real_connect backtrace calls (Robbie Averill) - See [ss-2018-018](https://www.silverstripe.org/download/security-releases/ss-2018-018) + +### API Changes + + * 2018-10-23 [d9e8341](https://github.com/silverstripe/silverstripe-versioned-admin/commit/d9e83412a309cb0f03cdd50a218f4dc45b470821) Deprecate HistoryControllerFactory and default to CMSPageHistoryV… (#71) (Maxime Rainville) + * 2018-10-05 [5276b6cbb](https://github.com/silverstripe/silverstripe-framework/commit/5276b6cbb1ebd49d704734d940b0467c51b0d064) Add FieldList::getContainerField (Maxime Rainville) + * 2018-10-04 [dba237e](https://github.com/silverstripe/silverstripe-admin/commit/dba237e5d6ab13a7a5f8cbc9a9e594d98478c566) Allow Gridfield to be lazy loadable. (Maxime Rainville) + * 2018-10-04 [bdb53979a](https://github.com/silverstripe/silverstripe-framework/commit/bdb53979aaed743f278b299e3dab7b13e321fbe7) Create a new GridFieldLazyLoader GridField component (Maxime Rainville) + * 2018-09-28 [cb2b9498f](https://github.com/silverstripe/silverstripe-framework/commit/cb2b9498fb33bd57a19ba6a7ceed6d3fbc976d70) Deprecate updateSearchContextCallback and updateSearchFormCallback (Robbie Averill) + * 2018-09-03 [f48ab77](https://github.com/silverstripe/silverstripe-assets/commit/f48ab777c2845d7b414ebae0ff7903c6bb423340) Add `show_file_link_tracking` config to `FileLinkTracking` extension to control visibility of the File Tracking tab (bergice) + * 2018-08-31 [01db5c9e9](https://github.com/silverstripe/silverstripe-framework/commit/01db5c9e98f5406e8d6b0f1f4ea660edb24b199f) Add Link Tracking section to Relations developer guide and describe `show_sitetree_link_tracking`, `show_file_link_tracking`. (bergice) + * 2018-08-31 [115ed92e](https://github.com/silverstripe/silverstripe-cms/commit/115ed92e0aed63df1620700955afd6248fa97fae) Add `show_sitetree_link_tracking` config to `SiteTreeLinkTracking` extension to control visibility of the Link Tracking tab (bergice) + * 2018-08-05 [02be4cc](https://github.com/silverstripe/silverstripe-graphql/commit/02be4cc3e1cab7c1ed8e8f9d6dde6ee102364fa6) Multi-schema support (#169) (Aaron Carlino) + * 2018-07-31 [47e3ae2](https://github.com/silverstripe/silverstripe-versioned-admin/commit/47e3ae27ea451f769c5e90f4c31589a5265c337c) Versions from and to are now stored as objects in the store (#29) (Dylan Wagstaff) + * 2018-07-12 [0343203](https://github.com/silverstripe/silverstripe-versioned/commit/03432030e99a496c6cd81f4bec780164851aa955) Add new RestoreAction and canRestoreToDraft method (#168) (Luke Edwards) + ### Features and Enhancements + * 2018-11-01 [2f2fb2b](https://github.com/silverstripe/silverstripe-admin/commit/2f2fb2bfdcd88b54ac9426f172bec77a3c210172) Improve loading screen and indicator (#582) (Luke Edwards) + * 2018-10-29 [e51be58](https://github.com/silverstripe/silverstripe-asset-admin/commit/e51be58685527b512bf20e7542d506aef14f4ed8) Move Remove button into preview-image message (#859) (Sacha Judd) + * 2018-10-29 [2440432](https://github.com/silverstripe/silverstripe-asset-admin/commit/24404324790a26b0c19f68f862bb2679618199ee) Move the replace file into the more options action set (#848) (Sacha Judd) + * 2018-10-29 [952f37a](https://github.com/silverstripe/silverstripe-admin/commit/952f37abdc78d9f87da20461537c88cf570d7cba) Adding an HOC to provide DragDropContext for consumers of ReactDND (#711) (Guy Marriott) + * 2018-10-26 [2c3665d](https://github.com/silverstripe/silverstripe-admin/commit/2c3665d83375364249adf02c2eef6382d73e7c43) Adding a component for a generic popover filled with buttons (#684) (Guy Marriott) + * 2018-10-19 [e88b8e7](https://github.com/silverstripe/silverstripe-admin/commit/e88b8e7b2fa4c47e62d737ea3a3ccee8c7ff8794) Expose TabsActions (#703) (Raissa North) + * 2018-10-18 [761a6f7](https://github.com/silverstripe/silverstripe-admin/commit/761a6f7f6f809c36f21dd804ce1d6325909b5d1c) Reverse argument signature of methods using path (#698) (Aaron Carlino) + * 2018-10-17 [902fec0](https://github.com/silverstripe/silverstripe-asset-admin/commit/902fec0f89bb49783b2dc5f64b4d0c24c33531fb) Extensible readFiles query (#847) (Aaron Carlino) + * 2018-10-17 [437e53f2f](https://github.com/silverstripe/silverstripe-framework/commit/437e53f2fec17bc778cc7bba39de322d43214441) Some minor refactoring of the PDO and MySQLi connectors (Robbie Averill) + * 2018-10-15 [3e2ce31](https://github.com/silverstripe/silverstripe-admin/commit/3e2ce3138d88674fc27aa465dc9be9ea4533c830) Add nested fields, args, distribute args to fields (#683) (Aaron Carlino) + * 2018-10-08 [2775895d0](https://github.com/silverstripe/silverstripe-framework/commit/2775895d03af93d207079637a8eb6afdfad5ab01) Adding a helper to find a form field by label content (Guy Marriott) + * 2018-10-05 [6e66c48](https://github.com/silverstripe/silverstripe-admin/commit/6e66c48d65b52d568fbd34f8a7c630b4a829c2c9) Add CMS community help menu to cms-menu (#615) (Sacha Judd) + * 2018-10-04 [9ea7b58a8](https://github.com/silverstripe/silverstripe-framework/commit/9ea7b58a8f26ca8856211da30eed5751706d0c4b) Add memory cache to ThemeResourceLoader::findTemplate() (Robbie Averill) + * 2018-10-03 [90afb2037](https://github.com/silverstripe/silverstripe-framework/commit/90afb2037a6d2d9be3f605aad9ddfbda0bbab2e7) TabSet react component is no longer structural (Raissa North) + * 2018-10-03 [0be4a9a](https://github.com/silverstripe/silverstripe-admin/commit/0be4a9abfa4482deb2753c50c47dbf0192581a12) Adding an extension point to FormBuilderLoader after redux form is initialised (Raissa North) + * 2018-10-02 [cba5d30](https://github.com/silverstripe/silverstripe-admin/commit/cba5d307f499471b88f77fd201df2a4baacf0038) Connect Tabs component to redux-form to handle activeTab state (Raissa North) + * 2018-10-02 [e1f2f89d3](https://github.com/silverstripe/silverstripe-framework/commit/e1f2f89d37e44c706d350d02774733dd867ccdc7) Add test for PHP 7.3 support (SS4 version) (Sam Minnee) + * 2018-09-28 [bd37b90a](https://github.com/silverstripe/silverstripe-cms/commit/bd37b90a3a5811555248ef616698efbe24466b11) Add CMSMain.enable_archive_warning_message config (Sam Minnee) + * 2018-09-27 [4b155b9](https://github.com/silverstripe/silverstripe-graphql/commit/4b155b982ca6fd737aa70e281ce679bb43404060) Add getSortableFields to return sortable fields for query (#185) (Robbie Averill) + * 2018-09-27 [25759ffc5](https://github.com/silverstripe/silverstripe-framework/commit/25759ffc5fe532a239b1487ca6b025140d2e144f) Show file path on PHP parser exceptions (Ingo Schommer) + * 2018-09-25 [5b7a84141](https://github.com/silverstripe/silverstripe-framework/commit/5b7a84141b0fbef66a9f3f52a9ccee12e02ef1e0) Add Hierarchy::prepopulate_numchildren_cache() (#8380) (Sam Minnée) + * 2018-09-21 [e2701a4](https://github.com/silverstripe/silverstripe-admin/commit/e2701a4cd00ffc2136b935038d8422a25acfa2dd) TinyMCE inline toolbar for images and embeds (Luke Edwards) + * 2018-09-20 [c928e83](https://github.com/silverstripe/silverstripe-versioned/commit/c928e830825ec8ae5336d254835f754a11bac350) Backport of DataList for list of versions, for SS 4.3.x (Robbie Averill) + * 2018-09-19 [d9a6c10](https://github.com/silverstripe/silverstripe-admin/commit/d9a6c10a157d6c1fd17351b0097ce9d8c5336ecf) Form state & schema persists across form remounting (Guy Marriott) + * 2018-09-19 [40dde226f](https://github.com/silverstripe/silverstripe-framework/commit/40dde226fd1b8997308ef0f5718763a298295cdf) Add ?showqueries=backtrace (Sam Minnee) + * 2018-09-19 [6de12e1](https://github.com/silverstripe/silverstripe-asset-admin/commit/6de12e1375d146d61052f1a6dd001aa3a6c437bc) TinyMCE inline toolbar for images and embeds (Luke Edwards) + * 2018-09-17 [588bf83e1](https://github.com/silverstripe/silverstripe-framework/commit/588bf83e1238a79793da4bc4145b7597ae2626be) Add hideNav flag to schema defaults (Raissa North) + * 2018-09-17 [a800ce7](https://github.com/silverstripe/silverstripe-admin/commit/a800ce714a99a631b8a7401322df0653e2ee476c) Add hideNav flag to allow hiding of navigation in Tabs (Raissa North) + * 2018-09-12 [d8bf873](https://github.com/silverstripe/silverstripe-admin/commit/d8bf873e1236ff5cb634cce0a47c992366ae6139) Use bootstrap modal footer, use our icon font for close icon (Luke Edwards) + * 2018-09-12 [c03c685](https://github.com/silverstripe/silverstripe-asset-admin/commit/c03c685da247b8baa6d4180816bda35bc29fcf2d) Use bootstrap modal footer, use our icon font for close icon (Luke Edwards) + * 2018-09-03 [2394194](https://github.com/silverstripe/silverstripe-admin/commit/239419424ee001200830bc8b77dfef3ce7a05d7e) HtmlEditorField component for react rich text (Dylan Wagstaff) + * 2018-08-28 [b5d322d](https://github.com/silverstripe/silverstripe-versioned-admin/commit/b5d322d277efd1fec846f6fca3a92d317542a7ae) HistoryViewerField now uses schemaData to inject necessary input props (Robbie Averill) + * 2018-08-24 [2b335b4](https://github.com/silverstripe/silverstripe-graphql/commit/2b335b4239946f9a6fb1d525452cf1fe6d22a9ce) Proof of concept of cached graphql queries (#166) (Damian Mooyman) + * 2018-08-22 [a257c1c](https://github.com/silverstripe/silverstripe-admin/commit/a257c1cea84ebcdd27df5043c3690bdcb09f43da) Add toggleCallback function (Raissa North) + * 2018-08-22 [8153d12](https://github.com/silverstripe/silverstripe-admin/commit/8153d12537b53bd208ddb28675aa82bd84da2a16) Add dropdownToggleClassName prop to ActionMenu (Raissa North) + * 2018-08-20 [26262ea](https://github.com/silverstripe/silverstripe-admin/commit/26262ea3a9d64e4172ed277845a53e58c48772ef) Insert link shortcut for HTMLEditorField (#599) (Luke Edwards) + * 2018-08-12 [8d3b022](https://github.com/silverstripe/silverstripe-assets/commit/8d3b02259167ce08fd30742475a29219d64df0c8) Support setting quality on a per-image basis (#153) (Loz Calver) + * 2018-08-05 [9d0ae97](https://github.com/silverstripe/silverstripe-admin/commit/9d0ae970e5cdf2ec8710b471884d75b5485b9309) ViewModeToggle states are now stored in constants (Robbie Averill) + * 2018-08-01 [4213eeb](https://github.com/silverstripe/silverstripe-asset-admin/commit/4213eeb1513662ef2dd177065310c2062532a424) Use the new general purpose search component. (#812) (Maxime Rainville) + * 2018-08-01 [5a00d84](https://github.com/silverstripe/silverstripe-admin/commit/5a00d8462ec2806c640f1214971f4747f276d398) General purpose search form component (#572) (Maxime Rainville) + * 2018-07-30 [163ca65](https://github.com/silverstripe/silverstripe-graphql/commit/163ca65a1f2e858c7d47d4b15775153ea0451d5b) DataObjectScaffolder instantiation is now handled through Injector (Robbie Averill) + * 2018-07-30 [24d3023](https://github.com/silverstripe/silverstripe-graphql/commit/24d3023b0d361fee66b4e68aca1814b7dfdbcac2) Allow non-internal input types passed as args (#168) (Aaron Carlino) * 2018-07-25 [79a5ea3](https://github.com/silverstripe/recipe-cms/commit/79a5ea3dace336558ef4d5be4a86cc1a0e84badc) Add versioned-admin (Luke Edwards) + * 2018-07-24 [dee3fc2](https://github.com/silverstripe/silverstripe-versioned-admin/commit/dee3fc286fc7448e24222640167e37ae95ec705b) History Viewer now uses ViewModeToggle to control the preview panel (Robbie Averill) + * 2018-07-24 [064bb9a](https://github.com/silverstripe/silverstripe-versioned-admin/commit/064bb9a6544a78212ba23b946b57454ebed4dbdb) Add behat tests for using compare mode (Robbie Averill) + * 2018-07-23 [a8e0d63](https://github.com/silverstripe/silverstripe-versioned-admin/commit/a8e0d6394456b00a41bf815b1a6c50a6a09e49a2) styles and fixes for styling and code cleanliness (Robbie Averill) + * 2018-07-19 [e029b73](https://github.com/silverstripe/silverstripe-versioned-admin/commit/e029b73106ef9bffa53ba38822e3b5a1ba975cdf) Alter components to allow for compare mode (Dylan Wagstaff) + * 2018-07-19 [75c2c85](https://github.com/silverstripe/silverstripe-versioned-admin/commit/75c2c8572a32139dce267976aa58fb0d765d1a83) Add schema endpoint and shell method for returning compareForm (Robbie Averill) + * 2018-07-18 [db72f6d](https://github.com/silverstripe/silverstripe-versioned-admin/commit/db72f6d1149eabbc902f0725a75c38858e464210) Adjust history viewer to allow for compare mode (Dylan Wagstaff) + * 2018-07-18 [359a260](https://github.com/silverstripe/silverstripe-versioned-admin/commit/359a260ddba5d29fdbc22b154897dd45c0797c3f) Dropdown atop history viewer for holding actions (Raissa North) + * 2018-07-18 [11ea083](https://github.com/silverstripe/silverstripe-versioned-admin/commit/11ea083ba1749722e3fb76685e602e23f7f301ad) Adding a compare mode active notice to the history viewer (Guy Marriott) + * 2018-07-17 [337da78](https://github.com/silverstripe/silverstripe-campaign-admin/commit/337da782bd520beebdb734542b5403b69257d058) Update webpack-config constraint (Raissa North) + * 2018-07-16 [786446fb](https://github.com/silverstripe/silverstripe-reports/commit/786446fb670905832b6bfe49775b9c2eaff262cc) Use Injector to create new class instances and pass $params (Robbie Averill) + * 2018-07-12 [f2ebdb7f](https://github.com/silverstripe/silverstripe-cms/commit/f2ebdb7f5ec894e8c0c8f29b9aac984aef4ca8ed) add SiteTree::updateAnchorsOnPage() for user defining additional page anchors (Will Rossiter) + * 2018-07-12 [114b0a5ea](https://github.com/silverstripe/silverstripe-framework/commit/114b0a5ea7ea6b8f33b8c9b8d1611e5ee6619a1c) Option for secure "remember me" cookie (Ingo Schommer) + * 2018-07-12 [05a6c17](https://github.com/silverstripe/silverstripe-versioned-admin/commit/05a6c17bd3330fe85a74a59c3dcc4a75fc88b75c) Archive admin for managing archived records (#29) (Luke Edwards) + * 2018-07-12 [3292a8b77](https://github.com/silverstripe/silverstripe-framework/commit/3292a8b773c5b29a69b72718f996a36f3daead1d) Add `columnUnique` API SS_List classes. (Al Twohill) + * 2018-07-09 [0fc7660](https://github.com/silverstripe/silverstripe-versioned-admin/commit/0fc766020c1f970c42a173016b98e7dc865516aa) Add diff view form transform for comparisons (Dylan Wagstaff) + * 2018-07-06 [6c1a34c](https://github.com/silverstripe/silverstripe-campaign-admin/commit/6c1a34cc2c9bfbc3bca471c7ca77976bac194918) Make use of ViewModeToggle component. (Raissa North) + * 2018-07-01 [73d3da2](https://github.com/silverstripe/silverstripe-admin/commit/73d3da2bc8566cb1cb5da0124b7deb513728b5ab) Pattern library now has FormAction examples (Robbie Averill) + * 2018-04-15 [5108734](https://github.com/silverstripe/silverstripe-admin/commit/5108734b19edbe9d6404b747e25059a586b009fe) Add ViewModeToggle component (Raissa North) + * 2018-01-30 [1857f00](https://github.com/silverstripe/silverstripe-admin/commit/1857f00bd2b172acb933064d3d454e91bc855200) Add tests for Form component (Robbie Averill) + * 2018-01-30 [cc945f0](https://github.com/silverstripe/silverstripe-admin/commit/cc945f09aac38dea25ec57538c51e6089ddac124) Add tests for CompositeField (Robbie Averill) ### Bugfixes - * 2018-06-15 [5e4ad34](https://github.com/silverstripe/silverstripe-installer/commit/5e4ad341622565cc998bd8537ad3ec7a6a6a7913) Fix incorrect base recipe dependency (Damian Mooyman) + * 2018-11-05 [7fd4a4e](https://github.com/silverstripe/silverstripe-admin/commit/7fd4a4ef76733968ed3babbc14564b2d0f7417b3) Fix duplicate plugins on HTML editor fields (#721) (Luke Edwards) + * 2018-11-05 [4a65d59](https://github.com/silverstripe/silverstripe-admin/commit/4a65d59dc340719f67df1d2c1998ea2645d58473) Fix form changes triggered, GridField add existing (#743) (Luke Edwards) + * 2018-11-02 [97180c261](https://github.com/silverstripe/silverstripe-framework/commit/97180c261258861b5b2b91609a71d044456625d7) Fix readonly grid state always being truthy (#8562) (Luke Edwards) + * 2018-11-02 [12e2cc3](https://github.com/silverstripe/silverstripe-asset-admin/commit/12e2cc37a7a2806310ac7ffd2ad704fb7ad37fe0) Fix duplicate plugins on HTML editor fields (#861) (Luke Edwards) + * 2018-11-02 [d9b1721a](https://github.com/silverstripe/silverstripe-cms/commit/d9b1721ac32829a33f54a9e628680cb3894191b3) Fix duplicate plugins on HTML editor fields (#2307) (Luke Edwards) + * 2018-11-01 [8866e7674](https://github.com/silverstripe/silverstripe-framework/commit/8866e7674a1a9c2be48c8e9532cfcaa667cdf7b5) Fix duplicate plugins on HTML editor fields (#8559) (Luke Edwards) + * 2018-11-01 [55f95b7bc](https://github.com/silverstripe/silverstripe-framework/commit/55f95b7bc8f91384df459bd70c87cacf92225f68) many many through not sorting by join table (#8534) (Michael Strong) + * 2018-10-31 [af7086a](https://github.com/silverstripe/silverstripe-asset-admin/commit/af7086a3adf86b06b6c6b6f938acabf2cfa3352b) Remove outdated CSS Safari hack interfering with the search panel and submit button (Serge Latyntcev) + * 2018-10-31 [2ef7bd29](https://github.com/silverstripe/silverstripe-cms/commit/2ef7bd29754f84fa6eafce08c00d6e1e794713af) IE11+Edge17 Pages tree List View button (Serge Latyntcev) + * 2018-10-30 [3f4d5ae0](https://github.com/silverstripe/silverstripe-cms/commit/3f4d5ae03e9fee10c54f3e628a194d03c07b5c3a) Bypass cached versions to prevent stale state (Aaron Carlino) + * 2018-10-30 [4b0e69a](https://github.com/silverstripe/silverstripe-admin/commit/4b0e69a084028eb60c9d3da90e648acd87946d73) Add aria-expanded to help menu toggle for screenreader accessibility (Sacha Judd) + * 2018-10-30 [2900ac6](https://github.com/silverstripe/silverstripe-admin/commit/2900ac6481b5cca1df1b6708522a60d8a946b790) Remove text-align start with IE supported left (Raissa North) + * 2018-10-29 [f2467d3](https://github.com/silverstripe/silverstripe-admin/commit/f2467d37241ca08b0cc4a112d1dc9054adf891a8) Fix search filtering and clearing (#687) (Luke Edwards) + * 2018-10-26 [3284bf48d](https://github.com/silverstripe/silverstripe-framework/commit/3284bf48d6e3da8b2b1a7831e2d7fe4b401e2fd6) Fix search filtering relations and clear filters (#8477) (Luke Edwards) + * 2018-10-24 [e72fc9e3d](https://github.com/silverstripe/silverstripe-framework/commit/e72fc9e3d0f35a1d43f55f83f9919f67d72fb7cb) DataObject singleton creation (#8516) (Sam Minnée) + * 2018-10-22 [df86335](https://github.com/silverstripe/silverstripe-admin/commit/df863357b1413508f985f6f12a48f5d414a6d75f) Fix decimal search filter not showing up (bergice) + * 2018-10-20 [7f6f5c9ec](https://github.com/silverstripe/silverstripe-framework/commit/7f6f5c9ec9352172f37f8980d823e85c1c39062a) Flush extra methods cache on DataObjects after each unit test class has finished (Robbie Averill) + * 2018-10-19 [311fd62d9](https://github.com/silverstripe/silverstripe-framework/commit/311fd62d9527a47586d90a6f4e2c80922d15d44f) getExtensionInstance can return null, add a case to handle that (Robbie Averill) + * 2018-10-19 [a6855ec](https://github.com/silverstripe/silverstripe-admin/commit/a6855ecf02d41378b1ad03729a103d193aecd853) Remove deprecated help_link definition in testGetHelpLinks (Robbie Averill) + * 2018-10-19 [7c65916](https://github.com/silverstripe/silverstripe-asset-admin/commit/7c659167f2eda63d882a097f2f413b9f3cb79e31) Use fixtured file title in test assertion (Robbie Averill) + * 2018-10-19 [a28e2e183](https://github.com/silverstripe/silverstripe-framework/commit/a28e2e183e1d0684dd32bc7bcf72d4a9c573a8f4) Fix enum filter in Search component from adding `Any` as a filter (bergice) + * 2018-10-18 [e3d0bcb](https://github.com/silverstripe/silverstripe-admin/commit/e3d0bcb051e45d3e7b90dcdf6554e97d173ef6ce) Change one tab not all tabs (Raissa North) + * 2018-10-17 [87a5d07](https://github.com/silverstripe/silverstripe-admin/commit/87a5d07b9f22b894dd9f4397ff50868e662b79b2) Fix body overflow causing scroll bars (Loz Calver) + * 2018-10-17 [d71ee0c](https://github.com/silverstripe/silverstripe-admin/commit/d71ee0ce9898e73c9a7d913356fc6bfe6c2b42fc) Fixes #674 TinyMCE width - this should match form field widths at lower width resolutions but expand up to the max width on wider resolutions (bergice) + * 2018-10-16 [a3d611f](https://github.com/silverstripe/silverstripe-admin/commit/a3d611f0b7f6cd024783a7037245364237329375) Fix `ENTER` not triggering form save button (bergice) + * 2018-10-16 [c35e18110](https://github.com/silverstripe/silverstripe-framework/commit/c35e18110baa72756f2a5378b7e7d4d7803c7c33) Gridfield pagination detected as form change (Luke Edwards) + * 2018-10-16 [5d626fa](https://github.com/silverstripe/silverstripe-admin/commit/5d626fa53b6c67e586d6c6d4d19471709175e8f4) Don’t track gridstate changes as form edits (Luke Edwards) + * 2018-10-16 [a6a174399](https://github.com/silverstripe/silverstripe-framework/commit/a6a17439976710b2311558d363b5467fa429dcca) Fix `ENTER` not triggering form save button as `GridField`s used `submit` type buttons (bergice) + * 2018-10-16 [3d3c407](https://github.com/silverstripe/silverstripe-admin/commit/3d3c407caf099831af0e7b3a6320cad61e5801b0) Fix long gridfield actions overflowing (Luke Edwards) + * 2018-10-15 [ab259af](https://github.com/silverstripe/silverstripe-errorpage/commit/ab259af0707518f94561909c989617e155fd3b1b) Move phpcs to composer dependency, update Travis for it, add 7.2 to Travis (Robbie Averill) + * 2018-10-15 [ab0d7d9](https://github.com/silverstripe/silverstripe-versioned/commit/ab0d7d9e8c18b0e5ae6ee3e352317bbe0c70de53) Fix codesniffer runs in Travis (Robbie Averill) + * 2018-10-14 [c0c446a](https://github.com/silverstripe/silverstripe-versioned/commit/c0c446ad8f29dd66398feb38f5d92fa4f60a4a8b) Fix relations between staged/unstaged objects (Harsh Chokshi) + * 2018-10-11 [0aa2d66](https://github.com/silverstripe/silverstripe-admin/commit/0aa2d6615b7f207791716b6e8654d16940597be4) Use correct lazy loadable class names for GridFieldLazyLoader (Robbie Averill) + * 2018-10-11 [ee21c4201](https://github.com/silverstripe/silverstripe-framework/commit/ee21c42011fd40b2065bb2acb868a427e2232d0a) Re-instate missing SS_DATABASE_SUFFIX functionality (fixes #7966) (Loz Calver) + * 2018-10-11 [4702a22](https://github.com/silverstripe/silverstripe-admin/commit/4702a223ed2c85cd8a55501351526648a70c41b7) Defensively programming some possible failure points (Guy Marriott) + * 2018-10-11 [0db2f84ad](https://github.com/silverstripe/silverstripe-framework/commit/0db2f84ade9b1e8e2811cd7c32bf5f3510544c74) Persist TinyMCE updates when writing with Behat (Guy Marriott) + * 2018-10-10 [e941a56](https://github.com/silverstripe/silverstripe-admin/commit/e941a56b9e918908f16712f2e7be1b43d5810062) Changing the value of a TinyMCE field will correctly trigger a change in the React component (Guy Marriott) + * 2018-10-09 [f710c5c](https://github.com/silverstripe/silverstripe-admin/commit/f710c5cdcd2cf95fdaa738f55c0f2529fcbe826d) Only hide overflow from inactive chosen fields (Robbie Averill) + * 2018-10-09 [56d562193](https://github.com/silverstripe/silverstripe-framework/commit/56d56219345b4a8ba318261af98bcd62f3ce060d) Flush extra_methods statics between test runs (Robbie Averill) + * 2018-10-09 [d1281a571](https://github.com/silverstripe/silverstripe-framework/commit/d1281a571a56dca9d40b59a7baf31d32b09a37f5) Escape HTML in PHPDoc to fix API docs from rendering incorrectly (Robbie Averill) + * 2018-10-09 [522b288](https://github.com/silverstripe/silverstripe-admin/commit/522b28890e6b11b3a324a38c65199f96f86c4b2f) ModelAdmin pagination with a filter (Luke Edwards) + * 2018-10-08 [4766cae](https://github.com/silverstripe/silverstripe-admin/commit/4766cae7918e75c3b47d69487fecdb69b2993077) Retain polyfill for display block style in .collapse.show with Bootstrap 4.1.x (Robbie Averill) + * 2018-10-08 [6e649b57](https://github.com/silverstripe/silverstripe-cms/commit/6e649b570d70d83729527ea8fbbc069426f11338) CMSMain::duplicate() now checks canCreate() but not canEdit() (Robbie Averill) + * 2018-10-08 [c4788803e](https://github.com/silverstripe/silverstripe-framework/commit/c4788803ee7b903bc45541ccc0ef8446cf99922f) Remove unused cacheData prop from #8451 (Robbie Averill) + * 2018-10-08 [884a12c](https://github.com/silverstripe/silverstripe-admin/commit/884a12c864dd856a4beb8e636eb56c46be2dfa2e) Add fix for potential tabnabbing on community help links (Sacha Judd) + * 2018-10-08 [979dd38](https://github.com/silverstripe/silverstripe-assets/commit/979dd385947900b9df48928ad7ba4c2eb7a1361f) Fix migrating files with an incorrect class (Luke Edwards) + * 2018-10-08 [fdb53311b](https://github.com/silverstripe/silverstripe-framework/commit/fdb53311bac68bcee5f6b026c0f526c98ea1da65) Fix linting issue. (Maxime Rainville) + * 2018-10-08 [e06bb05](https://github.com/silverstripe/silverstripe-admin/commit/e06bb051d29c9aceb0d6863637bf038ae0715777) Ensure TinyMCE field changes are persisted before updating redux state (Guy Marriott) + * 2018-10-06 [8c7459a70](https://github.com/silverstripe/silverstripe-framework/commit/8c7459a7082ab3880202a3541bd11ed183465ef1) Fix CompositeField test that relied on a DropdownField bug (Sam Minnee) + * 2018-10-05 [e5d3b28a4](https://github.com/silverstripe/silverstripe-framework/commit/e5d3b28a4d10cb4d960897d37071246532ab8ebc) Don’t break validation on selects without a source. (Sam Minnee) + * 2018-10-05 [98568262f](https://github.com/silverstripe/silverstripe-framework/commit/98568262f2c5d7cc9a9cd39af158d5df7dce12a7) Fixed phpcs violations (Robbie Averill) + * 2018-10-04 [fafd9dad6](https://github.com/silverstripe/silverstripe-framework/commit/fafd9dad6d60731c0ed6695a2df5535ea433632e) fixing name of constant ASSETS_PATH (Philipp Staender) + * 2018-10-04 [0fc06e51e](https://github.com/silverstripe/silverstripe-framework/commit/0fc06e51e5020b8959310682bade02f97653dc73) Drop seconds from DBDatetime::Nice() to restore SS3 behaviour. (Sam Minnee) + * 2018-10-03 [19af1ac](https://github.com/silverstripe/silverstripe-graphql/commit/19af1ac6d77089a5365ed9f1892306fdd943a2ca) Add codesniffer as a dev dependency and use it in Travis (Robbie Averill) + * 2018-10-03 [4668fab](https://github.com/silverstripe/silverstripe-assets/commit/4668fabc3a02d996a0a9be13245cf3ab3fba1079) Shortcode provider does not always request a protected asset grant, add tests for FlysystemAssetStore (Robbie Averill) + * 2018-10-03 [ce9496d](https://github.com/silverstripe/silverstripe-admin/commit/ce9496d2b9bcda50a4e74c386d31bac7c4dc0939) Quote injector alias references, deprecated and removed support for in Symfony 4 (Robbie Averill) + * 2018-10-03 [d535e71](https://github.com/silverstripe/silverstripe-graphql/commit/d535e71ef81165ac6e02c8b27b1e577b3a291b65) Quote injector alias references, deprecated and removed support for in Symfony 4 (Robbie Averill) + * 2018-10-03 [4740346ed](https://github.com/silverstripe/silverstripe-framework/commit/4740346ed8766549f0f948a4396954227f2494bb) Make ArrayList::limit() consistent with DataList::limit() (Sam Minnee) + * 2018-10-03 [0cc72c91a](https://github.com/silverstripe/silverstripe-framework/commit/0cc72c91ada58d6927dab6e93bfe785b623f3e7a) Use DELETE FROM instead of TRUNCATE for clearTable (Sam Minnee) + * 2018-10-02 [5970fc241](https://github.com/silverstripe/silverstripe-framework/commit/5970fc2417bcd29cfc85c209117b7ed6625141ad) Moving test to correct director (Guy Marriott) + * 2018-10-02 [79c2b5ad4](https://github.com/silverstripe/silverstripe-framework/commit/79c2b5ad427f4e95c8fb51b46c4ba31cdf2997c1) Use DELETE FROM instead of TRUNCATE for clearTable (Sam Minnee) + * 2018-10-01 [f2cbc1dfb](https://github.com/silverstripe/silverstripe-framework/commit/f2cbc1dfbb8b1972eeb72d230f7b5cc2ebad26ee) Don’t use USE_FRM in MySQL repair. Fixes #6300. (Sam Minnee) + * 2018-10-01 [638e6ec28](https://github.com/silverstripe/silverstripe-framework/commit/638e6ec2814b4b4cbabd0adc0e166c4812b94740) Throw deprecation notice on limit=0 (Sam Minnee) + * 2018-10-01 [ad87890b2](https://github.com/silverstripe/silverstripe-framework/commit/ad87890b2e92f3f4092bbf9a70ab0d439d40ce31) Don’t change state in ArrayList::getIterator() (Sam Minnee) + * 2018-10-01 [63cabc7](https://github.com/silverstripe/silverstripe-assets/commit/63cabc7fc84f295a95e88f2ce37f940b61b97223) Keep folder Name and Title in sync on update (Luke Edwards) + * 2018-10-01 [5c7b0da](https://github.com/silverstripe/silverstripe-admin/commit/5c7b0da18d894d32f3884fcd2f4e18e8ccd7b629) Searching now allows + symbols, use own method over jQuery serialisation (Robbie Averill) + * 2018-10-01 [71dad5f68](https://github.com/silverstripe/silverstripe-framework/commit/71dad5f68518b9052b657c8dc70d4581fb771e98) Append any fields that don’t match name in insertBefore/insertAfter (Sam Minnee) + * 2018-10-01 [b0c4c5a1](https://github.com/silverstripe/silverstripe-cms/commit/b0c4c5a1775c95e1abd878f233e78b009f5d01ec) Updating SiteTree search fields to work with new search namespacing (Guy Marriott) + * 2018-10-01 [81292c5](https://github.com/silverstripe/silverstripe-asset-admin/commit/81292c52f04690349ea8d3634398faeda2190f8d) Fix outdated data in Apollo GraphQL cache when deleting/moving files (bergice) + * 2018-10-01 [5422e28](https://github.com/silverstripe/silverstripe-asset-admin/commit/5422e28635cec8f285eb422fa85f57f4418c09b8) Folder sort incorrect (Luke Edwards) + * 2018-09-28 [231d6d9a9](https://github.com/silverstripe/silverstripe-framework/commit/231d6d9a9f388e10cf77149aec22e947db648644) New members now receive the configured default locale, not the current locale (Robbie Averill) + * 2018-09-28 [ac1fe5e9d](https://github.com/silverstripe/silverstripe-framework/commit/ac1fe5e9d5de92dbdd7c03c187471fe6b5d8d7c0) joinClass's default_sort is used when nothing else has been set already (Robbie Averill) + * 2018-09-27 [fa4e031](https://github.com/silverstripe/silverstripe-admin/commit/fa4e031ef961215653e315ea441059c6945e5e3b) Update field names in Behat tests for new namespaces (Robbie Averill) + * 2018-09-27 [44b92c90](https://github.com/silverstripe/silverstripe-cms/commit/44b92c90bc18e629a73584a2a2eb0db8a02d740a) Update field names in Behat tests for new search form namespacing (Robbie Averill) + * 2018-09-27 [c54e7317d](https://github.com/silverstripe/silverstripe-framework/commit/c54e7317d2016727b1e2083996fc925fe862e9ab) Avoid having search fields with the same names as form elements (Guy Marriott) + * 2018-09-27 [2e41ea8](https://github.com/silverstripe/silverstripe-admin/commit/2e41ea83b95509ba1f68cf895c49fd846ec15841) Avoid having search fields with the same name as form elements (Guy Marriott) + * 2018-09-25 [dc59bd8](https://github.com/silverstripe/silverstripe-versioned/commit/dc59bd8e5613442b214f951ca16ec376e1ee1cda) Published GraphQL field now correctly indicates whether the record's version is published (Robbie Averill) + * 2018-09-25 [05b372c](https://github.com/silverstripe/silverstripe-versioned/commit/05b372c85f6720c931ac5dceba5fd05a84c74482) Use Hierarchy::prepopulateTreeDataCache() in CMS. (#183) (Sam Minnée) + * 2018-09-25 [5bfc37ff](https://github.com/silverstripe/silverstripe-cms/commit/5bfc37ff4bd22e8bbc02dc4f6dae59d25a4d5e67) Use Hierarchy::prepopulateTreeDataCache() in CMS (#2266) (Sam Minnée) + * 2018-09-24 [0276f6c08](https://github.com/silverstripe/silverstripe-framework/commit/0276f6c089ff5557a36eaf7367c8fc75fc6af20c) Revert semver break in adding GridField type hint to method signature (Robbie Averill) + * 2018-09-24 [f76fb26](https://github.com/silverstripe/silverstripe-asset-admin/commit/f76fb269b3450077623045ce84726dfd60f92894) fix psr (Thomas Portelange) + * 2018-09-24 [5e069ec](https://github.com/silverstripe/silverstripe-versioned/commit/5e069ec85c3b3cb74054b5cc18012531cfe22ce6) fix inferReciprocalComponent called on unsaved (Thomas Portelange) + * 2018-09-24 [9b5425d](https://github.com/silverstripe/silverstripe-graphql/commit/9b5425d5ba8a25eb799743e62733c57eb2837175) Incorrect parameter order of (Guy Marriott) + * 2018-09-24 [a2bb70c46](https://github.com/silverstripe/silverstripe-framework/commit/a2bb70c46dec00a6c9164bcc134e3fdc64a452e9) Don't flush manifests in tests by default (Ingo Schommer) + * 2018-09-21 [1d5ecd342](https://github.com/silverstripe/silverstripe-framework/commit/1d5ecd342e417b4707a3bbc34e97949bffd14afb) Prevent error on valid response status codes (Damian Mooyman) + * 2018-09-20 [9a89aad](https://github.com/silverstripe/silverstripe-admin/commit/9a89aad5df0d5c67a5575a7e20d723cf9d6c4d95) Whitelist nonce parameters from JS resources to be loaded. (Luke Edwards) + * 2018-09-20 [16b3d18](https://github.com/silverstripe/silverstripe-assets/commit/16b3d18ebdf8896ed216faf2a33daa729c6b2c09) FlysystemAssetStore::getAsURL() only grant for protected filesystems (Christopher Darling) + * 2018-09-20 [a9b2443](https://github.com/silverstripe/silverstripe-admin/commit/a9b244349435028c7b55b30475a9fe4d50207fc1) Revert changes to default dropdownToggleClassNames on ActionMenu (Sacha Judd) + * 2018-09-19 [b98c87a6c](https://github.com/silverstripe/silverstripe-framework/commit/b98c87a6c51baa6696ef9f077775f633c4c5ecd4) Ensure existing session can be accessed if headers_sent() (Sam Minnee) + * 2018-09-18 [bbe7c66](https://github.com/silverstripe/silverstripe-asset-admin/commit/bbe7c660cf40d4c942eaf6e76755eeaf46c63471) Add `AssetAdmin::getMinimalistObjectFromData()` to build file metadata for UploadField (#829) (Maxime Rainville) + * 2018-09-18 [db63f55fb](https://github.com/silverstripe/silverstripe-framework/commit/db63f55fbb8e635e4e7215b7b7eff4e1f1cb7b22) Changes being detected on TreeMulti as values not sorted (Luke Edwards) + * 2018-09-17 [d597166](https://github.com/silverstripe/silverstripe-versioned/commit/d5971661cec5fdf12dbfe895fad08ce6bbb05e25) Performance optimisation for draft pages in treeview (Sam Minnee) + * 2018-09-14 [0bab772](https://github.com/silverstripe/silverstripe-versioned-admin/commit/0bab77230efff516d109177ec05b22aec45c8c35) Remove apollo and graphql requirements from module, not implemented (Robbie Averill) + * 2018-09-14 [ac1de94](https://github.com/silverstripe/silverstripe-versioned-admin/commit/ac1de94890e3226ced8019609a48dc22d785b0ff) Versioned-admin now declares its dependency on silverstripe-graphql (Robbie Averill) + * 2018-09-13 [5c102dec](https://github.com/silverstripe/silverstripe-cms/commit/5c102decbde43395e14aeff83a20c4c6f1d048ae) Improve performance of CMSMain::getArchiveWarningMessage (#2231) (Maxime Rainville) + * 2018-09-12 [41c0b8fb](https://github.com/silverstripe/silverstripe-cms/commit/41c0b8fb85b7ac11f18eb1813f9e063e13cbafa2) Fix 'Insert links into a page' test (Luke Edwards) + * 2018-09-10 [fb0d81d](https://github.com/silverstripe/silverstripe-admin/commit/fb0d81d6c02bff292e69a0dcd42e3e01be728c01) Remove action menu toggle styles (Sacha Judd) + * 2018-09-10 [8ae0ef0](https://github.com/silverstripe/silverstripe-versioned/commit/8ae0ef0002a229d233f7395cfed15c979c3f1698) Do not update LeftAndMain link with Stage param (#173) (Maxime Rainville) + * 2018-09-04 [fbd8843](https://github.com/silverstripe/silverstripe-assets/commit/fbd88434cfc89eac7d75e34cdcc48f97821198ff) Remove unnecessary UploadTest\Validator (Sam Minnee) + * 2018-09-04 [40c7a0a](https://github.com/silverstripe/silverstripe-assets/commit/40c7a0aac6390237515cd30d9b23de8e7ad0f5ba) Better error message for invalid upload (Sam Minnee) + * 2018-09-03 [1c4311d](https://github.com/silverstripe/silverstripe-asset-admin/commit/1c4311d4e6548600272daa0ce83afa12cf7e99c3) fix description for docs.silverstripe.org (wernerkrauss) + * 2018-09-03 [b922c0d73](https://github.com/silverstripe/silverstripe-framework/commit/b922c0d7327b5d0222dd280afcb64f83a09ea859) Check scheme is truthy before setting it to the request (Robbie Averill) + * 2018-09-03 [1dd4c7b](https://github.com/silverstripe/silverstripe-versioned-admin/commit/1dd4c7b052d20170c6b5624083ca61f070ee2c49) Text collector translations now compile without errors (Robbie Averill) + * 2018-09-03 [641208dc](https://github.com/silverstripe/silverstripe-siteconfig/commit/641208dcd29a7afaf70c3100a1b02a0bd149b667) Text collector translations now compile without errors (Robbie Averill) + * 2018-09-03 [225445931](https://github.com/silverstripe/silverstripe-framework/commit/22544593101ce670a809f3b354f5ff850840006b) Text collector translations now compile without errors (Robbie Averill) + * 2018-08-31 [f5869a5](https://github.com/silverstripe/silverstripe-campaign-admin/commit/f5869a56ba1c34568d424a2cf71000abfa0ef206) Do not render view mode toggle on campaign toolbar if the campaign is empty (bergice) + * 2018-08-31 [68c2c976d](https://github.com/silverstripe/silverstripe-framework/commit/68c2c976d4813607a420ac4cda7b01f0a7aee8c7) Fix alignment test step definition (#8354) (Luke Edwards) + * 2018-08-30 [234b795f8](https://github.com/silverstripe/silverstripe-framework/commit/234b795f89657c6b25da6101a9fc878e3297c301) Use classes for TinyMCE alignment buttons (Luke Edwards) + * 2018-08-30 [5488b31](https://github.com/silverstripe/silverstripe-admin/commit/5488b31f84f47a18d40cf34d7da53d498b169496) Add explicit `0` z-index to `cms-content` so the menu toggle can render above it (#620) (Andre Kiste) + * 2018-08-30 [463fdef](https://github.com/silverstripe/silverstripe-admin/commit/463fdefde0f827d783f9a519f261d1e4d35c01ab) Remove "more" action icon size, add btn-sm and fix icon alignment in gridfield (Sacha Judd) + * 2018-08-28 [dbfc25302](https://github.com/silverstripe/silverstripe-framework/commit/dbfc253021bce3997af0934b9015215047bbac7b) Fix incorrect version number in 4.3.0 changelog (Loz Calver) + * 2018-08-28 [d1951c94](https://github.com/silverstripe/silverstripe-cms/commit/d1951c946fe143e79ea6a7e1ee55ae90586c8a33) Sort history viewer versions in descending order (Robbie Averill) + * 2018-08-28 [10ef38f](https://github.com/silverstripe/silverstripe-campaign-admin/commit/10ef38f039fa4bf29be764ffd99196b0f9b62554) Hide 1px left border in preview component if we are in 'Preview Only' mode (bergice) + * 2018-08-28 [d651d0fbf](https://github.com/silverstripe/silverstripe-framework/commit/d651d0fbfcababeaf317b27cb00b4f33b9d99eab) Use base class (not remapping target class) when looking up whether object is versioned (Robbie Averill) + * 2018-08-27 [2ab622f](https://github.com/silverstripe/silverstripe-admin/commit/2ab622f88a5a179a7186b46699055cf761d3b749) Fix Add mock store to the loadComponent AppolloProvider (Maxime Rainville) + * 2018-08-27 [4da556923](https://github.com/silverstripe/silverstripe-framework/commit/4da5569232505ee574e0b5106ff2116611393aa4) ensure createFromVariables takes correct params on CLIRequestBuilder (Scott Hutchinson) + * 2018-08-27 [f3230c78](https://github.com/silverstripe/silverstripe-reports/commit/f3230c78d4e3731a10a5f4c508bc68c6a8534866) Use requestVar() to include post vars as well as get vars (Robbie Averill) + * 2018-08-24 [e196475](https://github.com/silverstripe/silverstripe-assets/commit/e196475220e1b97cc61f8e026b55984d2e240e0d) Graceful validation of image shortcode (Aaron Carlino) + * 2018-08-24 [9b7b476](https://github.com/silverstripe/silverstripe-versioned-admin/commit/9b7b47689558f184ed7b448fd81ef80ed0c47926) Label RestoreAction clearer as 'Restore *to* draft' (#42) (Luke Edwards) + * 2018-08-24 [2b16e2a](https://github.com/silverstripe/silverstripe-admin/commit/2b16e2afbaa322ef4ab2fce6c2add9b8f5596ba4) GridField delete button to offer archive action if possible (#602) (Luke Edwards) + * 2018-08-24 [6164d01d6](https://github.com/silverstripe/silverstripe-framework/commit/6164d01d65648ce6b25a7ef82fabaa10b81565d0) GridField delete button to offer archive action if possible (#8325) (Luke Edwards) + * 2018-08-23 [f37dd74](https://github.com/silverstripe/silverstripe-admin/commit/f37dd74be7afae5e40e85ce2a90a4d92bf7e80bb) Site tree items do not disappear on save with source file comments enabled (Robbie Averill) + * 2018-08-23 [d6b1d31](https://github.com/silverstripe/silverstripe-versioned-admin/commit/d6b1d31f7aee8a57d97d387870b7e7c02ba98f58) Check ID is numeric before using it (Robbie Averill) + * 2018-08-22 [1b67bb08c](https://github.com/silverstripe/silverstripe-framework/commit/1b67bb08c8b61ad7e5324ef07eaea2834772b818) Fix failing HTML button test step (Luke Edwards) + * 2018-08-21 [6be253c](https://github.com/silverstripe/silverstripe-versioned-admin/commit/6be253c1b59fd04443591912abeb2dfe8d3dbc2a) Use get_one_by_stage when fetching SiteTree for a specific stage (Guy Marriott) + * 2018-08-21 [7d18f3a](https://github.com/silverstripe/silverstripe-versioned-admin/commit/7d18f3a5ec17a8893d346bc0743071c38d15146c) Disable compare mode when there is only one version available (Robbie Averill) + * 2018-08-20 [6684fc2](https://github.com/silverstripe/silverstripe-versioned-admin/commit/6684fc2d829ea966b36ada7bc5f2cace7a59e7e8) Center alert message and conditionally show close button/selected message for IE (Raissa North) + * 2018-08-20 [dbab69669](https://github.com/silverstripe/silverstripe-framework/commit/dbab6966908f0a293ee6d469cec6b4650dc5a0f1) Message when changing password with invalid token now contains correct links to login (Robbie Averill) + * 2018-08-20 [9da7f99](https://github.com/silverstripe/silverstripe-versioned/commit/9da7f991f33ac16070b2e47b764b216a87f96622) Draft content requiring login message now correctly renders HTML link (Robbie Averill) + * 2018-08-17 [160d595e2](https://github.com/silverstripe/silverstripe-framework/commit/160d595e226edcbaa64a47a0be74193a8b8058cc) fix trailing whitespace (maks) + * 2018-08-17 [16217f365](https://github.com/silverstripe/silverstripe-framework/commit/16217f3655c28ddcf6a721bca82d45d65b91e3ed) fix accidentaly deleted comma (maks) + * 2018-08-17 [c361b09](https://github.com/silverstripe/silverstripe-admin/commit/c361b091b1640c25f1d23914489212fce1e29377) overflow of chosen dropdowns when inactive (Scott Hutchinson) + * 2018-08-16 [81e9c0c](https://github.com/silverstripe/silverstripe-versioned-admin/commit/81e9c0ce3bfad85a9e78d18b4c0d3fc4a245eab2) When exiting compare mode, the version shown is the last selected version to compare from (Robbie Averill) + * 2018-08-16 [61c046c](https://github.com/silverstripe/silverstripe-versioned/commit/61c046c9cd6ce97456b6123a05438c7cd05d07cc) If archive's possible switch GridField delete button with archive (Luke Edwards) + * 2018-08-16 [66cd3af](https://github.com/silverstripe/silverstripe-admin/commit/66cd3af09fcf68bf177a46ac57434442642d1b7c) Filtering or paginating a gridfield causing a change event (Luke Edwards) + * 2018-08-15 [726c464](https://github.com/silverstripe/silverstripe-versioned-admin/commit/726c464461fc3291ef004408d39bc77e8c8f3367) Don't indicate pointer cursor when hovering a selected version in the list (Robbie Averill) + * 2018-08-15 [7d94029](https://github.com/silverstripe/silverstripe-versioned-admin/commit/7d94029547ce8857729967153a3e6c85391e7c54) Inconsistent background and border colours in compare mode notice (Robbie Averill) + * 2018-08-15 [c189f14](https://github.com/silverstripe/silverstripe-versioned-admin/commit/c189f14322f8980f4d3218a64439db916ae32dfe) Reduce size of border radius on compare mode notice close button (Robbie Averill) + * 2018-08-15 [d9154bffb](https://github.com/silverstripe/silverstripe-framework/commit/d9154bffbf7b0031e5bd3ed1f68db3fae6ab5959) text/json is not a valid mimetype (Daniel Hensby) + * 2018-08-15 [d18b5ee](https://github.com/silverstripe/silverstripe-campaign-admin/commit/d18b5eed63e081a4cbcbb30edcf51839a2ae3461) text/json is not a valid mimetype (Daniel Hensby) + * 2018-08-15 [41a2a0c](https://github.com/silverstripe/silverstripe-admin/commit/41a2a0c38c073d82b96fd4fa2fa09bea3b556aa5) text/json is not a mimetype (Daniel Hensby) + * 2018-08-15 [0db594b2d](https://github.com/silverstripe/silverstripe-framework/commit/0db594b2d39c93dd2e911414bee5520c84048906) Remove double escaping of HTML values in print views (Robbie Averill) + * 2018-08-15 [0c713b5](https://github.com/silverstripe/silverstripe-assets/commit/0c713b5b1eb6a08ac00dcadb187b8b3ef7115fc4) Fix routing for files with dots in filename (Damian Mooyman) + * 2018-08-14 [fcaa9ba](https://github.com/silverstripe/silverstripe-versioned/commit/fcaa9ba7a68a839d84ff23d32275c510d0f9890e) Restore and archive action improvements (Luke Edwards) + * 2018-08-14 [fc7f712](https://github.com/silverstripe/silverstripe-admin/commit/fc7f7120a67ce95b03f13b4c8fb90b36f810f7b1) Modal response animation appearing outside the modal (#601) (Luke Edwards) + * 2018-08-14 [873873dc3](https://github.com/silverstripe/silverstripe-framework/commit/873873dc303ce2041aa23e365464133a359e1561) Pass request to dummy controller before calling init (Robbie Averill) + * 2018-08-14 [27ac001d5](https://github.com/silverstripe/silverstripe-framework/commit/27ac001d5b27cce4f80ce4b3335c14708b116830) email rendering should not include requirements (Thomas Portelange) + * 2018-08-14 [8ec551e5](https://github.com/silverstripe/silverstripe-cms/commit/8ec551e57b04d00d6897d06c2779557f0ec8109d) Broken "show as list" (#2232) (Maxime Rainville) + * 2018-08-12 [9f5b0086c](https://github.com/silverstripe/silverstripe-framework/commit/9f5b0086cb1a0259c5c87ea205390c5e69dcae90) Paginating a gridfield causing a change event (Luke Edwards) + * 2018-08-10 [8611e47](https://github.com/silverstripe/silverstripe-versioned-admin/commit/8611e472f62cc7f94fed1e6a9b1239a76cdf008a) Allow more width for version numbers in list, so alignment of state column is unaffected (Raissa North) + * 2018-08-10 [d4995f52](https://github.com/silverstripe/silverstripe-cms/commit/d4995f5204f020f75fbddb3e49b944a54be5c6c2) Separating ModelAsController catch-all route to apply after all other configuration (Guy Marriott) + * 2018-08-08 [5596ae2](https://github.com/silverstripe/silverstripe-versioned-admin/commit/5596ae2ff1b8ee99fa0667b8f0caa7007debb629) Remove new gridfield search, data query needs to be altered to work (Luke Edwards) + * 2018-08-08 [eed1ca9](https://github.com/silverstripe/silverstripe-versioned-admin/commit/eed1ca93d3da1f74c06995bb603e062c4042aaab) Change list item anchor for span with role="button" to justify using tabIndex="0" (Robbie Averill) + * 2018-08-08 [e14ab99](https://github.com/silverstripe/silverstripe-graphql/commit/e14ab991f5c99cee6b1bdfa18ab07a1e4b40961e) Don't rely on return value of GraphQL scaffolding providers (#171) (Guy Marriott) + * 2018-08-08 [aed0726](https://github.com/silverstripe/silverstripe-versioned-admin/commit/aed072680836a30ea482faf1aa8c72b93a7a5eda) Add roles to list and list items, make list items keyboard accessible (Robbie Averill) + * 2018-08-07 [c2b54c7](https://github.com/silverstripe/silverstripe-admin/commit/c2b54c72a990df9d453bedc307f613f23107bfad) graphql route getting overwritten (Aaron Carlino) + * 2018-08-06 [df7396e8](https://github.com/silverstripe/silverstripe-cms/commit/df7396e8845eea7a75e73237de9ee7e4cb6568f6) CMS routes are now run after #coreroutes without re-including itself (Robbie Averill) + * 2018-08-06 [2614804](https://github.com/silverstripe/silverstripe-versioned-admin/commit/26148046d967ddc80df76b4e280731ed338bb8df) getLatestVersion now looks at the LatestDraftVersion version property (Robbie Averill) + * 2018-08-06 [e7cb0156](https://github.com/silverstripe/silverstripe-cms/commit/e7cb0156c69a3701b248dbbae4e72f8c0b372efd) Use LatestDraftVersion in GraphQL query to determine latest draft version (Robbie Averill) + * 2018-08-06 [13372f9a3](https://github.com/silverstripe/silverstripe-framework/commit/13372f9a37d1cb19f658404c79c2be6fbfa557b1) Installer redirect to home/ (without domain) (Michael Strong) + * 2018-08-06 [855e1f2](https://github.com/silverstripe/silverstripe-versioned-admin/commit/855e1f2ec7eb03674d3a3d3f4b051ae86924d949) Margins are correct when both in and out of a GridField, and colours used in compare warning (Robbie Averill) + * 2018-08-02 [24927c5](https://github.com/silverstripe/silverstripe-campaign-admin/commit/24927c5aa18f9adc8ef79f0adf879f6bcd5c130c) Ensure only toolbar buttons that are immediate descendants of toolbars are given margins (Robbie Averill) + * 2018-08-01 [a981584](https://github.com/silverstripe/silverstripe-admin/commit/a9815845c0e923587fa81bdbac77be43f6d4dd1a) Remove rogue CSS margin on toolbar buttons. Implemented in campaign-admin preview instead. (Robbie Averill) + * 2018-08-01 [405d8a3](https://github.com/silverstripe/silverstripe-campaign-admin/commit/405d8a3213852f4a35e7cf8101df72c206d1b2f9) Toolbar button margins are constrained to campaign previews, and update ViewModeActions name (Robbie Averill) + * 2018-08-01 [6889a1a](https://github.com/silverstripe/silverstripe-admin/commit/6889a1adf0005e91288c4e2ddc6a2f3ea1b6b593) ViewModeToggle now uses BEM class naming convention (Robbie Averill) + * 2018-08-01 [58d128e](https://github.com/silverstripe/silverstripe-versioned-admin/commit/58d128ebe02223a4b9412673140441a5e3ec7a5f) Update case on viewModeActions import and recompile (Robbie Averill) + * 2018-08-01 [8e611ac](https://github.com/silverstripe/silverstripe-versioned-admin/commit/8e611acd818aea731548edb9dcaee19ab2920e9b) Convert compareType to use version objects, restructure tests and use variables for colours (Robbie Averill) + * 2018-08-01 [763138f](https://github.com/silverstripe/silverstripe-versioned-admin/commit/763138fdd4eb2bb84019b437cb7f373c2fe540ca) remove double-margins from version comparison (Dylan Wagstaff) + * 2018-07-30 [2758348](https://github.com/silverstripe/silverstripe-versioned-admin/commit/2758348be0b84fdda27d0dbf5ee4078eece6929e) fix rebase (Dylan Wagstaff) + * 2018-07-30 [420c3f8](https://github.com/silverstripe/silverstripe-asset-admin/commit/420c3f807d7426af2c76d778faa4ef26ab5dda11) Editor should ignore drag-and-drop files (#814) (Luke Edwards) + * 2018-07-30 [fde7b9ddc](https://github.com/silverstripe/silverstripe-framework/commit/fde7b9ddc5da697395897249819b3c52530692b6) Specify minimum composer version (Maxime Rainville) + * 2018-07-27 [85b4b48fb](https://github.com/silverstripe/silverstripe-framework/commit/85b4b48fb5489cdba4b18cbf510d883986dd61c1) Restore default delete action on GridFieldConfig_RecordEditor (Maxime Rainville) + * 2018-07-27 [67254da1](https://github.com/silverstripe/silverstripe-reports/commit/67254da18599f0fe86921098524ec3303d9de41e) Apply missing class to report header. (Maxime Rainville) + * 2018-07-27 [0d90cdb05](https://github.com/silverstripe/silverstripe-framework/commit/0d90cdb05d058763e5e52720ab653c5cc391dc3b) Altering ID of authenticator tabs to resolve ID conflict (Guy Marriott) + * 2018-07-26 [900ca9c8d](https://github.com/silverstripe/silverstripe-framework/commit/900ca9c8d75b70b13b425365022ec3f1f0ebe461) Recommend install of upgrader with PHAR exec. (Maxime Rainville) + * 2018-07-26 [fea9ef7](https://github.com/silverstripe/silverstripe-admin/commit/fea9ef7d2a53904086f9fad6eedba7bb307c8578) #579 BUG Ambiguous column RecordID when doing batch actions (Ed Linklater) + * 2018-07-25 [0035f4a90](https://github.com/silverstripe/silverstripe-framework/commit/0035f4a90728d9e109b12585b32491a2afeaa916) Fix backtick in changelog breaking sentence formatting (Michal Kleiner) + * 2018-07-24 [3e044dc](https://github.com/silverstripe/silverstripe-versioned-admin/commit/3e044dcba6c558a42b2afa4e52c484a0fbb7e2a2) History viewer list is now rendered as an unordered list instead of a table (Robbie Averill) + * 2018-07-24 [6c421b5](https://github.com/silverstripe/silverstripe-versioned-admin/commit/6c421b5ef15f2ffd21ec8d36ebbc7de2cb034ea0) Badge margin is moved to the text to allow it to break lines nicely on mobile (Robbie Averill) + * 2018-07-23 [a0487e5](https://github.com/silverstripe/silverstripe-admin/commit/a0487e59fc04af0d15e66d4c2874051288b4e63e) Treat readonly as disabled and fix handling for ui-constructive class (Robbie Averill) + * 2018-07-23 [55dc009](https://github.com/silverstripe/silverstripe-versioned-admin/commit/55dc0095b992cae9500109a94f0050bf797b7099) SET_COMPARE_MODE reducer no longer clears previously set compareFrom value (Robbie Averill) + * 2018-07-23 [35afd7f](https://github.com/silverstripe/silverstripe-versioned-admin/commit/35afd7fbb2f0bd330fc68fc9b52197ccd024be63) Padding and scrolling around detail views is now consistent (Robbie Averill) + * 2018-07-23 [9ac05c7](https://github.com/silverstripe/silverstripe-versioned-admin/commit/9ac05c7c8fd2438ebb9f8a3941197c46cd46ed65) Set min-width for compare enabled table to 100% to prevent margin overflow (Robbie Averill) + * 2018-07-23 [9d26ba0](https://github.com/silverstripe/silverstripe-versioned-admin/commit/9d26ba0a71633b0afc455563eac19137579186b9) Fix margins when choosing versions to compare (#11) (Raissa North) + * 2018-07-23 [92eab59](https://github.com/silverstripe/silverstripe-versioned-admin/commit/92eab5969d664531efb909ffee54476fb052c4f7) selecting two rows in list view UI issues (Guy Marriott) + * 2018-07-16 [e1296d48](https://github.com/silverstripe/silverstripe-reports/commit/e1296d4813ac1b677aa7a612ba0ad3b2ba62ccae) Filter var can be returned correctly from get variables as a fallback (Robbie Averill) + * 2018-07-13 [d1024ee](https://github.com/silverstripe/silverstripe-assets/commit/d1024ee00b12c3a212fe12d168f4521e2188274b) Add HTMLFragment casting to $Tag (#148) (Jake Bentvelzen) + * 2018-07-12 [a8e5616](https://github.com/silverstripe/silverstripe-admin/commit/a8e56166f01ef0fb8ecd46edb4eddde30447cdb0) Update GridField.js so it works with new Archive View (#559) (Luke Edwards) + * 2018-07-12 [599a4420b](https://github.com/silverstripe/silverstripe-framework/commit/599a4420bf0d982343faa6145afaf6592566bb40) Improve GridFieldViewButton to work with new Archive Admin (#8240) (Luke Edwards) + * 2018-07-11 [c2347310](https://github.com/silverstripe/silverstripe-cms/commit/c23473103e4f93b82d60f1260923c9e413d02c41) URLSegment field styling fixes #2193 (Maxime Rainville) + * 2018-07-05 [91068c23b](https://github.com/silverstripe/silverstripe-framework/commit/91068c23b5cb448fe63ae9f40875a8f0818dbe1f) Make column query not distinct (Al Twohill) + * 2018-07-05 [730fc42](https://github.com/silverstripe/silverstripe-admin/commit/730fc42ef3e6d25345516f1583d05bf968bf762c) Fix test for password recovery (Ingo Schommer) + * 2018-07-01 [3262665b2](https://github.com/silverstripe/silverstripe-framework/commit/3262665b2d6bb6d56186be2e2e370b853f13c6b5) Fix link and turn of phrase. (Maxime Rainville) + * 2018-06-29 [cc9b36e01](https://github.com/silverstripe/silverstripe-framework/commit/cc9b36e01124349ea7ccbd0902d1b01c764f82f7) fix link (Lukas) + * 2018-06-27 [8ccebf8](https://github.com/silverstripe/silverstripe-admin/commit/8ccebf813e95980363a92ec37332d2241327441f) Stop sslink from hijacking anchor plugin (Will Rossiter) + * 2018-06-22 [f9de357](https://github.com/silverstripe/silverstripe-admin/commit/f9de35724c4fb75c8a6d38e4f5b9185531fc961c) - Grid field headers misaligned (Petar Simic) + * 2018-06-18 [2f1c2992f](https://github.com/silverstripe/silverstripe-framework/commit/2f1c2992f8f61b4a87a0a363db289a19ac5a821b) Default cache state should be `no-cache` (Daniel Hensby) + * 2018-06-17 [25b0a18](https://github.com/silverstripe/silverstripe-admin/commit/25b0a18a743e81951a2d2df387b6e5442d0253c3) Fix display of GridField link existing button (Luke Edwards) + * 2018-05-18 [953153500](https://github.com/silverstripe/silverstripe-framework/commit/953153500d490f5b5abf7283c34242c3b22a855a) Polymorphic relationship class columns have obsolete class names remapped (Robbie Averill) + * 2018-05-08 [97a8f56](https://github.com/silverstripe/silverstripe-admin/commit/97a8f56c43ddb3c77a5bbc452755d44afb9a9472) Add missing focus styles for preview options (fixes silverstripe/silverstripe-framework #2101) (Loz Calver) \ No newline at end of file From 3f321f935a0b7faa3d4ef788b4f69425db979095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Werner=20M=2E=20Krau=C3=9F?= Date: Wed, 7 Nov 2018 17:01:36 +0100 Subject: [PATCH 062/175] Convert::memstring2bytes should return integer value bytes are by nature an integer fixes #8572 --- src/Core/Convert.php | 6 +++--- tests/php/Core/ConvertTest.php | 32 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Core/Convert.php b/src/Core/Convert.php index 7c8717724..3e4158111 100644 --- a/src/Core/Convert.php +++ b/src/Core/Convert.php @@ -556,7 +556,7 @@ class Convert * Preserves integer values like "1024" or "-1" * * @param string $memString A memory limit string, such as "64M" - * @return float + * @return int */ public static function memstring2bytes($memString) { @@ -568,10 +568,10 @@ class Convert if ($unit) { // Find the position of the unit in the ordered string which is the power // of magnitude to multiply a kilobyte by - return round($size * pow(1024, stripos('bkmgtpezy', $unit[0]))); + return (int)round($size * pow(1024, stripos('bkmgtpezy', $unit[0]))); } - return round($size); + return (int)round($size); } /** diff --git a/tests/php/Core/ConvertTest.php b/tests/php/Core/ConvertTest.php index 679c611e7..d1c1139d3 100644 --- a/tests/php/Core/ConvertTest.php +++ b/tests/php/Core/ConvertTest.php @@ -2,12 +2,12 @@ namespace SilverStripe\Core\Tests; +use Exception; +use InvalidArgumentException; use SilverStripe\Core\Convert; use SilverStripe\Dev\SapphireTest; use SilverStripe\View\Parsers\URLSegmentFilter; use stdClass; -use Exception; -use InvalidArgumentException; /** * Test various functions on the {@link Convert} class. @@ -576,15 +576,15 @@ XML public function memString2BytesProvider() { return [ - ['-1', (float)-1], - ['2048', (float)(2 * 1024)], - ['2k', (float)(2 * 1024)], - ['512M', (float)(512 * 1024 * 1024)], - ['512MiB', (float)(512 * 1024 * 1024)], - ['512 mbytes', (float)(512 * 1024 * 1024)], - ['512 megabytes', (float)(512 * 1024 * 1024)], - ['1024g', (float)(1024 * 1024 * 1024 * 1024)], - ['1024G', (float)(1024 * 1024 * 1024 * 1024)] + 'infinite' => ['-1', -1], + 'integer' => ['2048', 2 * 1024], + 'kilo' => ['2k', 2 * 1024], + 'mega' => ['512M', 512 * 1024 * 1024], + 'MiB' => ['512MiB', 512 * 1024 * 1024], + 'mbytes' => ['512 mbytes', 512 * 1024 * 1024], + 'megabytes' => ['512 megabytes', 512 * 1024 * 1024], + 'giga' => ['1024g', 1024 * 1024 * 1024 * 1024], + 'G' => ['1024G', 1024 * 1024 * 1024 * 1024] ]; } @@ -607,11 +607,11 @@ XML { return [ [200, '200B'], - [(2 * 1024), '2K'], - [(512 * 1024 * 1024), '512M'], - [(512 * 1024 * 1024 * 1024), '512G'], - [(512 * 1024 * 1024 * 1024 * 1024), '512T'], - [(512 * 1024 * 1024 * 1024 * 1024 * 1024), '512P'] + [2 * 1024, '2K'], + [512 * 1024 * 1024, '512M'], + [512 * 1024 * 1024 * 1024, '512G'], + [512 * 1024 * 1024 * 1024 * 1024, '512T'], + [512 * 1024 * 1024 * 1024 * 1024 * 1024, '512P'] ]; } } From bc0f17fb0972749cf5ca7b0b1815a7f330727e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Werner=20M=2E=20Krau=C3=9F?= Date: Wed, 7 Nov 2018 17:45:01 +0100 Subject: [PATCH 063/175] Cleanup Convert * remove unneeded parenthesis and double quotes * simplify flow / remove unneeded else --- src/Core/Convert.php | 84 +++++++++++++++++----------------- tests/php/Core/ConvertTest.php | 20 ++++---- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/Core/Convert.php b/src/Core/Convert.php index 313d64aae..3ff3336ce 100644 --- a/src/Core/Convert.php +++ b/src/Core/Convert.php @@ -70,9 +70,9 @@ class Convert } return $val; - } else { - return self::raw2att($val); } + + return self::raw2att($val); } /** @@ -93,16 +93,16 @@ class Convert } return $val; - } else { - return trim( - preg_replace( - '/_+/', - '_', - preg_replace('/[^a-zA-Z0-9\-_:.]+/', '_', $val) - ), - '_' - ); } + + return trim( + preg_replace( + '/_+/', + '_', + preg_replace('/[^a-zA-Z0-9\-_:.]+/', '_', $val) + ), + '_' + ); } /** @@ -119,9 +119,9 @@ class Convert $val[$k] = self::raw2xml($v); } return $val; - } else { - return htmlspecialchars($val, ENT_QUOTES, 'UTF-8'); } + + return htmlspecialchars($val, ENT_QUOTES, 'UTF-8'); } /** @@ -137,14 +137,14 @@ class Convert $val[$k] = self::raw2js($v); } return $val; - } else { - return str_replace( - // Intercepts some characters such as <, >, and & which can interfere - array("\\", '"', "\n", "\r", "'", "<", ">", "&"), - array("\\\\", '\"', '\n', '\r', "\\'", "\\x3c", "\\x3e", "\\x26"), - $val - ); } + + return str_replace( + // Intercepts some characters such as <, >, and & which can interfere + array("\\", '"', "\n", "\r", "'", '<', '>', '&'), + array("\\\\", '\"', '\n', '\r', "\\'", "\\x3c", "\\x3e", "\\x26"), + $val + ); } /** @@ -195,13 +195,13 @@ class Convert $val[$k] = self::raw2sql($v, $quoted); } return $val; - } else { - if ($quoted) { - return DB::get_conn()->quoteString($val); - } else { - return DB::get_conn()->escapeString($val); - } } + + if ($quoted) { + return DB::get_conn()->quoteString($val); + } + + return DB::get_conn()->escapeString($val); } /** @@ -233,14 +233,14 @@ class Convert $val[$k] = self::xml2raw($v); } return $val; - } else { - // More complex text needs to use html2raw instead - if (strpos($val, '<') !== false) { - return self::html2raw($val); - } else { - return html_entity_decode($val, ENT_QUOTES, 'UTF-8'); - } } + + // More complex text needs to use html2raw instead + if (strpos($val, '<') !== false) { + return self::html2raw($val); + } + + return html_entity_decode($val, ENT_QUOTES, 'UTF-8'); } /** @@ -332,7 +332,7 @@ class Convert $xml = get_object_vars($xml); } if (is_array($xml)) { - if (count($xml) == 0) { + if (count($xml) === 0) { return (string)$x; } // for CDATA $r = []; @@ -359,9 +359,9 @@ class Convert { if (preg_match('/^[a-z+]+\:\/\/[a-zA-Z0-9$-_.+?&=!*\'()%]+$/', $string)) { return "$string"; - } else { - return $string; } + + return $string; } /** @@ -387,8 +387,8 @@ class Convert $config = $defaultConfig; } - $data = preg_replace("/][^>]*)?>.*?<\/style[^>]*>/is", "", $data); - $data = preg_replace("/][^>]*)?>.*?<\/script[^>]*>/is", "", $data); + $data = preg_replace("/][^>]*)?>.*?<\/style[^>]*>/is", '', $data); + $data = preg_replace("/][^>]*)?>.*?<\/script[^>]*>/is", '', $data); if ($config['ReplaceBoldAsterisk']) { $data = preg_replace('%<(strong|b)( [^>]*)?>|%i', '*', $data); @@ -412,7 +412,7 @@ class Convert // Compress whitespace if ($config['CompressWhitespace']) { - $data = preg_replace("/\s+/u", " ", $data); + $data = preg_replace("/\s+/u", ' ', $data); } // Parse newline tags @@ -421,9 +421,9 @@ class Convert $data = preg_replace("/\s*<[Dd][Ii][Vv]([^A-Za-z0-9>][^>]*)?> */u", "\n\n", $data); $data = preg_replace("/\n\n\n+/", "\n\n", $data); - $data = preg_replace("/<[Bb][Rr]([^A-Za-z0-9>][^>]*)?> */", "\n", $data); - $data = preg_replace("/<[Tt][Rr]([^A-Za-z0-9>][^>]*)?> */", "\n", $data); - $data = preg_replace("/<\/[Tt][Dd]([^A-Za-z0-9>][^>]*)?> */", " ", $data); + $data = preg_replace('/<[Bb][Rr]([^A-Za-z0-9>][^>]*)?> */', "\n", $data); + $data = preg_replace('/<[Tt][Rr]([^A-Za-z0-9>][^>]*)?> */', "\n", $data); + $data = preg_replace("/<\/[Tt][Dd]([^A-Za-z0-9>][^>]*)?> */", ' ', $data); $data = preg_replace('/<\/p>/i', "\n\n", $data); // Replace HTML entities diff --git a/tests/php/Core/ConvertTest.php b/tests/php/Core/ConvertTest.php index af8d454c1..a37fbc81c 100644 --- a/tests/php/Core/ConvertTest.php +++ b/tests/php/Core/ConvertTest.php @@ -133,7 +133,7 @@ class ConvertTest extends SapphireTest $this->assertEquals( "That's absolutely correct", Convert::html2raw($val7), - "Single quotes are decoded correctly" + 'Single quotes are decoded correctly' ); $val8 = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor ' . 'incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ' . 'exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute ' . 'irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla ' . 'pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia ' . 'deserunt mollit anim id est laborum.'; @@ -280,7 +280,7 @@ PHP protected function assertEqualsQuoted($expected, $actual) { $message = sprintf( - "Expected \"%s\" but given \"%s\"", + 'Expected "%s" but given "%s"', addcslashes($expected, "\r\n"), addcslashes($actual, "\r\n") ); @@ -296,8 +296,8 @@ PHP foreach (array("\r\n", "\r", "\n") as $nl) { // Base case: no action $this->assertEqualsQuoted( - "Base case", - Convert::nl2os("Base case", $nl) + 'Base case', + Convert::nl2os('Base case', $nl) ); // Mixed formats @@ -426,7 +426,7 @@ XML // Test without doctype validation $expected = array( 'result' => array( - "Now include SOME_SUPER_LONG_STRING lots of times to expand the in-memory size of this XML structure", + 'Now include SOME_SUPER_LONG_STRING lots of times to expand the in-memory size of this XML structure', array( 'long' => array( array( @@ -607,11 +607,11 @@ XML { return [ [200, '200B'], - [(2 * 1024), '2K'], - [(512 * 1024 * 1024), '512M'], - [(512 * 1024 * 1024 * 1024), '512G'], - [(512 * 1024 * 1024 * 1024 * 1024), '512T'], - [(512 * 1024 * 1024 * 1024 * 1024 * 1024), '512P'] + [2 * 1024, '2K'], + [512 * 1024 * 1024, '512M'], + [512 * 1024 * 1024 * 1024, '512G'], + [512 * 1024 * 1024 * 1024 * 1024, '512T'], + [512 * 1024 * 1024 * 1024 * 1024 * 1024, '512P'] ]; } From 4b4fbabed5d70bf577e4b0d6fdbc9dab9da80451 Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Thu, 8 Nov 2018 14:36:16 +1300 Subject: [PATCH 064/175] FIX TreeMultiselectField passes value 'unchanged' as null to ORM for 'ID' column key --- src/Forms/TreeMultiselectField.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/Forms/TreeMultiselectField.php b/src/Forms/TreeMultiselectField.php index 72de4dc11..1c0166f64 100644 --- a/src/Forms/TreeMultiselectField.php +++ b/src/Forms/TreeMultiselectField.php @@ -261,4 +261,30 @@ class TreeMultiselectField extends TreeDropdownField $copy->setTitleField($this->getTitleField()); return $copy; } + + /** + * {@inheritdoc} + * + * @deprecated 4.0..5.0 + */ + protected function objectForKey($key) + { + /** + * Fixes https://github.com/silverstripe/silverstripe-framework/issues/8332 + * + * Due to historic reasons, the default (empty) value for this field is 'unchanged', even though + * the field is usually integer on the database side. + * MySQL handles that gracefully and returns an empty result in that case, + * whereas some other databases (e.g. PostgreSQL) do not support comparison + * of numeric types with string values, issuing a database error. + * + * This fix is not ideal, but supposed to keep backward compatibility for SS4. + * Since SS5 this method should be removed and NULL should be used instead of 'unchanged'. + */ + if ($this->getKeyField() ==='ID' && $key === 'unchanged') { + $key = null; + } + + return parent::objectForKey($key); + } } From 1db568cdb6bf7f6d0438b83b95d76f77999fc0f2 Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Thu, 8 Nov 2018 16:25:41 +1300 Subject: [PATCH 065/175] Update translations --- lang/af.yml | 3 - lang/ar.yml | 8 -- lang/az.yml | 3 - lang/bg.yml | 8 -- lang/bs.yml | 3 - lang/ca.yml | 3 - lang/cs.yml | 8 -- lang/da.yml | 319 ++++++++++++++++++++++++++++++++++++++++++- lang/de.yml | 8 -- lang/de_DE.yml | 159 +++++++++++++++++++++ lang/en.yml | 2 - lang/eo.yml | 19 +-- lang/es.yml | 8 -- lang/es_AR.yml | 3 - lang/es_MX.yml | 2 - lang/et_EE.yml | 8 -- lang/fa_IR.yml | 6 - lang/fi.yml | 20 +-- lang/fo.yml | 3 - lang/fr.yml | 20 +-- lang/gl_ES.yml | 2 - lang/hr.yml | 5 - lang/id.yml | 8 -- lang/id_ID.yml | 8 -- lang/is.yml | 3 - lang/it.yml | 23 +--- lang/ja.yml | 8 -- lang/lt.yml | 8 -- lang/lv.yml | 3 - lang/mi.yml | 8 -- lang/nb.yml | 8 -- lang/nl.yml | 152 +++++++++++++++++++-- lang/pl.yml | 207 ++++++++++++++++++++++++++-- lang/pt.yml | 3 - lang/pt_BR.yml | 3 - lang/ro.yml | 2 - lang/ru.yml | 8 -- lang/sk.yml | 10 -- lang/sl.yml | 8 -- lang/sl_SI.yml | 5 - lang/sr.yml | 8 -- lang/sr@latin.yml | 8 -- lang/sr_RS.yml | 8 -- lang/sr_RS@latin.yml | 8 -- lang/sv.yml | 137 +++++++++++++++++-- lang/th.yml | 4 - lang/tr.yml | 3 - lang/uk.yml | 3 - lang/zh.yml | 8 -- 49 files changed, 962 insertions(+), 320 deletions(-) create mode 100644 lang/de_DE.yml diff --git a/lang/af.yml b/lang/af.yml index ddf2abee0..bbaf0c9cb 100644 --- a/lang/af.yml +++ b/lang/af.yml @@ -4,8 +4,6 @@ af: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: R SilverStripe\Forms\DateField: - NOTSET: 'Nie gestel nie' - TODAY: vandag VALIDDATEFORMAT2: 'Sleutel asseblief ''n geldige datum formaat in ({format})' VALIDDATEMAXDATE: 'Jou datum moet gelykstaande of ouer wees as die maksimum toelaatbare datum ({date})' VALIDDATEMINDATE: 'Jou datum moet net so out of nuwer wees as die minimum toelaatbare datum ({date})' @@ -36,7 +34,6 @@ af: RelationSearch: 'Soek vir verwantskap' ResetFilter: Herstel SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Verwyder Delete: Verwyder DeletePermissionsFailure: 'Geen toestemming om te verwyder nie' UnlinkRelation: Ontkoppel diff --git a/lang/ar.yml b/lang/ar.yml index ef2f216cf..518bf1344 100644 --- a/lang/ar.yml +++ b/lang/ar.yml @@ -5,8 +5,6 @@ ar: MAXIMUM: 'يجب أن تكون كلمات المرور على الأكثر {الحد الأقصى} حرفاً.' SHOWONCLICKTITLE: 'تغيير كلمة المرور' SilverStripe\Forms\DateField: - NOTSET: 'غير محدد' - TODAY: اليوم VALIDDATEFORMAT2: 'الرجاء إدخال صيغة تاريخ صحيحة ({صيغة})' VALIDDATEMAXDATE: 'التسجيل الخاص بك قد يكون أقدم أو مطابق لأقصى تاريخ مسموح به ({تاريخ})' VALIDDATEMINDATE: 'التسجيل الخاص بك قد يكون أحدث أو مطابق للحد الأدنى للتاريخ المسموح به ({تاريخ})' @@ -39,7 +37,6 @@ ar: RelationSearch: 'ابحث عن علاقة' ResetFilter: 'إعادة تعيين' SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: حذف Delete: حذف DeletePermissionsFailure: 'لا يوجد أية تصريحات حذف' EditPermissionsFailure: 'لا يوجد تصريح لإلغاء الربط بين السجلات' @@ -51,8 +48,6 @@ ar: DeletePermissionsFailure: 'لا يوجد تصريحات بالحذف' Deleted: '{type} {name} تم حذفه' Save: حفظ - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: تعديل SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: الكمية FIELDLABELCURRENCY: العملة @@ -155,7 +150,4 @@ ar: LOGIN: دخول LOSTPASSWORDHEADER: 'كلمة مرور مفقودة' NOTEPAGESECURED: 'هذه الصفحة محمية بكلمة مرور ، أدخل بيانات دخولك بالأسفل ليتم السماح لك بالوصول للصفحة' - NOTERESETLINKINVALID: "

رابط إعادة تعيين كلمة المرور غير صحيح أو نفذت صلاحيته.

\n

\nيمكنك طلب رابط جديد <\"{a href=\"{link1\"> هنا \n أو تغيير كلمة المرور الخاصة بك بعد <\"{a href=\"{link2\"> تسجيل دخولك.\n

" NOTERESETPASSWORD: 'أدخل بريدك الإلكتروني و سيتم إرسال رابط إعادة تهيئة كلمة المرور ' - PASSWORDSENTHEADER: 'رابط استعادة كلمة المرور تم إرساله إلى ''{بريدك}''' - PASSWORDSENTTEXT: 'شكرا لك! تم إرسال رابط إعادة تعيين إلى ''{بريدك}''، بشرط وجود حساب قائم بالنسبة لعنوان هذا البريد الإلكتروني .' diff --git a/lang/az.yml b/lang/az.yml index 392264a1b..7629d5d3b 100644 --- a/lang/az.yml +++ b/lang/az.yml @@ -1,9 +1,6 @@ az: SilverStripe\Forms\ConfirmedPasswordField: SHOWONCLICKTITLE: 'Parolu dəyiş' - SilverStripe\Forms\DateField: - NOTSET: 'təyin edilməyib' - TODAY: 'bu gün' SilverStripe\Forms\DropdownField: CHOOSE: (Seçin) SilverStripe\Forms\Form: diff --git a/lang/bg.yml b/lang/bg.yml index 91c831c04..241841f1e 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -37,8 +37,6 @@ bg: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'не е зададена' - TODAY: днес VALIDDATEFORMAT2: 'Моля, въведете валиден формат за дата ({format})' VALIDDATEMAXDATE: 'Датата трябва да бъде същата или преди ({date})' VALIDDATEMINDATE: 'Датата трябва да бъде същата или след ({date})' @@ -86,7 +84,6 @@ bg: RelationSearch: 'Търсене на връзка' ResetFilter: Изчистване SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Изтриване Delete: Изтрий DeletePermissionsFailure: 'Изтриването не е разрешено' EditPermissionsFailure: 'Нямате права за премахване на връзката' @@ -98,8 +95,6 @@ bg: DeletePermissionsFailure: 'Изтриването не е разрешено' Deleted: 'Изтрити {type} {name}' Save: Запис - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Редактиране SilverStripe\Forms\GridField\GridFieldPaginator: OF: от Page: Страница @@ -318,7 +313,4 @@ bg: LOGOUT: Изход LOSTPASSWORDHEADER: 'Забравена парола' NOTEPAGESECURED: 'Тази страница е защитена. Въведете вашите данни по-долу, за да продължите.' - NOTERESETLINKINVALID: '

Връзката за нулиране на парола не е вярна или е просрочена.

Можете да заявите нова тук или да промените паролата си след като влезете.

' NOTERESETPASSWORD: 'Въведете вашият email адрес и ще ви изпратим линк, с който ще можете да смените паролата си' - PASSWORDSENTHEADER: 'Връзка за нулиране на парола беше изпратена на ''{email}''' - PASSWORDSENTTEXT: 'Благодарим ви! Връзка за нулиране на паролата беше изпратен на ''{email}'', ако съществува акаунт с този имейл адрес.' diff --git a/lang/bs.yml b/lang/bs.yml index eca1e7246..3a2ac1a35 100644 --- a/lang/bs.yml +++ b/lang/bs.yml @@ -4,9 +4,6 @@ bs: YESANSWER: Da SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: KM - SilverStripe\Forms\DateField: - NOTSET: 'nije postavljeno' - TODAY: danas SilverStripe\Forms\DropdownField: CHOOSE: (Izaberite) SilverStripe\Forms\Form: diff --git a/lang/ca.yml b/lang/ca.yml index b93a85cc0..4ffdc98fe 100644 --- a/lang/ca.yml +++ b/lang/ca.yml @@ -3,9 +3,6 @@ ca: SHOWONCLICKTITLE: 'Canvia la contrasenya' SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: €E - SilverStripe\Forms\DateField: - NOTSET: 'no definit' - TODAY: avui SilverStripe\Forms\DropdownField: CHOOSE: (Trieu) SilverStripe\Forms\Form: diff --git a/lang/cs.yml b/lang/cs.yml index 9e7bf5d6a..759f0268e 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -13,8 +13,6 @@ cs: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: Kč SilverStripe\Forms\DateField: - NOTSET: nenastaveno - TODAY: dnes VALIDDATEFORMAT2: 'Prosím zadejte platný formát datumu ({format})' VALIDDATEMAXDATE: 'Váš datum musí být starší nebo odpovídající maximu povoleného datumu ({date})' VALIDDATEMINDATE: 'Váš datum musí být novější nebo odpovídající minimu povoleného datumu ({date})' @@ -51,7 +49,6 @@ cs: RelationSearch: 'Vztah hledání' ResetFilter: Resetovat SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Smazat Delete: Smazat DeletePermissionsFailure: 'Žádná oprávnění mazat' EditPermissionsFailure: 'Žádné oprávnění pro rozpojení záznamu' @@ -63,8 +60,6 @@ cs: DeletePermissionsFailure: 'Žádná oprávnění mazat' Deleted: 'Smazáno {type} {name}' Save: Uložit - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Editovat SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Částka FIELDLABELCURRENCY: Měna @@ -199,7 +194,4 @@ cs: LOGIN: Přihlásit LOSTPASSWORDHEADER: 'Zapomenuté heslo' NOTEPAGESECURED: 'Tato stránka je zabezpečená. Vložte své přihlašovací údaje a my Vám zároveň pošleme práva.' - NOTERESETLINKINVALID: '

Odkaz na resetování hesla není platný nebo je prošlý.

Můžete požádat o nový zde nebo změňte své heslo až se přihlásíte.

' NOTERESETPASSWORD: 'Zadejte svou e-mailovou adresu a bude vám zaslán nulovací odkaz pro Vaše heslo' - PASSWORDSENTHEADER: 'Odkaz na resetování hesla byl odeslán na ''{email}''' - PASSWORDSENTTEXT: 'Děkujeme! Resetovací odkaz byl odeslán na ''{email}'', pokud účet existuje pro tuto emailovou adresu.' diff --git a/lang/da.yml b/lang/da.yml index 8dc512b23..e203c1876 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -1,5 +1,322 @@ da: + SilverStripe\Admin\LeftAndMain: + VersionUnknown: ukendt + SilverStripe\AssetAdmin\Forms\UploadField: + Dimensions: Dimensioner + EDIT: Rediger + EDITINFO: 'Rediger denne fil' + REMOVE: Fjern + SilverStripe\Control\ChangePasswordEmail_ss: + CHANGEPASSWORDFOREMAIL: 'Koden for kontoen med email addressen {email} er ændret. Hvis du ikke har skiftet din kode, så skift venligst din kode ved at klikke på linket herunder' + CHANGEPASSWORDTEXT1: 'Du skiftede dit kodeord for' + CHANGEPASSWORDTEXT3: 'Skift kodeord' + HELLO: Hej + SilverStripe\Control\Email\ForgotPasswordEmail_ss: + HELLO: Hej + TEXT1: 'Her er din' + TEXT2: 'link til at nulstille dit kodeord' + TEXT3: for + SilverStripe\Control\RequestProcessor: + INVALID_REQUEST: 'Ugyldig forespørgsel' + REQUEST_ABORTED: 'Forespørgsel annulleret' + SilverStripe\Core\Manifest\VersionProvider: + VERSIONUNKNOWN: Ukendt + SilverStripe\Forms\CheckboxField: + NOANSWER: Nej + YESANSWER: Ja + SilverStripe\Forms\CheckboxSetField_ss: + NOOPTIONSAVAILABLE: 'Ingen tilgængelige muligheder' + SilverStripe\Forms\ConfirmedPasswordField: + ATLEAST: 'Kodeord skal være mindst {min} tegn lang.' + BETWEEN: 'Kodeord skal være {min} til {max} karakterer lang.' + CURRENT_PASSWORD_ERROR: 'Det nuværende kodeord du har indtastet er ikke korrekt.' + CURRENT_PASSWORD_MISSING: 'Du skal indtaste dit nuværende kodeord.' + LOGGED_IN_ERROR: 'Du skal være logget ind for at skifte dit kodeord.' + MAXIMUM: 'Kodeord må maks være {max} tegn lang' + SHOWONCLICKTITLE: 'Skift kodeord' + SilverStripe\Forms\CurrencyField: + CURRENCYSYMBOL: DKK + SilverStripe\Forms\DateField: + VALIDDATEFORMAT2: 'Indtats venligst et gyldigt datoformat ({format})' + VALIDDATEMAXDATE: 'Din dato skal være ældre end eller matche den maksimalt tilladte dato ({date})' + VALIDDATEMINDATE: 'Din dato skal være yngre end eller matche den minimum tilladte dato ({date})' + SilverStripe\Forms\DatetimeField: + VALIDDATEMAXDATETIME: 'Din dato skal være ældre end eller matche den maksimalt tilladte dato ({datetime})' + VALIDDATETIMEFORMAT: 'Indtats venligst et gyldigt dato- og tidsformat ({format})' + VALIDDATETIMEMINDATE: 'Din dato skal være yngre end eller matche den minimum tilladte dato og tid ({datetime})' + SilverStripe\Forms\DropdownField: + CHOOSE: (Vælg) + CHOOSE_MODEL: '(Vælg {name})' + SOURCE_VALIDATION: 'Venligst vælg en eksisterende værdi fra listen. {value} er ikke en tilladt mulighed' + SilverStripe\Forms\EmailField: + VALIDATION: 'Indtast venligst en emailadresse' + SilverStripe\Forms\FileUploadReceiver: + FIELDNOTSET: 'Fil information ikke fundet' + SilverStripe\Forms\Form: + BAD_METHOD: 'Denne form kræver en {method} indsendelse' + CSRF_EXPIRED_MESSAGE: 'Din session er udløbet. Venligst gensend formularen.' + CSRF_FAILED_MESSAGE: 'Det ser ud til der har været et teknisk problem. Klik venligst på tilbageknappen, tryk opdater i din browser og prøv igen.' + VALIDATIONPASSWORDSDONTMATCH: 'Kodeordene er ikke identiske' + VALIDATIONPASSWORDSNOTEMPTY: 'Kodeord kan ikke være tomme' + VALIDATIONSTRONGPASSWORD: 'Kodeord skal mindst have et tal og et alfanumerisk tegn' + VALIDATOR: Validering + VALIDCURRENCY: 'Indtast venligst en gyldig valuta' + SilverStripe\Forms\FormField: + EXAMPLE: 'f.eks. {format}' + NONE: ingen + SilverStripe\Forms\FormScaffolder: + TABMAIN: Primær SilverStripe\Forms\GridField\GridField: - Filter: Filter + Add: 'Tilføj {name}' + CSVEXPORT: 'Eksporter til CSV' + CSVIMPORT: 'Importer CSV' + Filter: Filtrer + FilterBy: 'Filtrer på' + Find: Find + LinkExisting: 'Link eksisterende' + NewRecord: 'Ny {type}' + NoItemsFound: 'Ingen elementer fundet' + PRINTEDAT: 'Printet d.' + PRINTEDBY: 'Printet af' + PlaceHolder: 'Find {type}' + PlaceHolderWithLabels: 'Find {type} på {name}' + Print: Print + RelationSearch: Relationssøgning + ResetFilter: Nulstil + SilverStripe\Forms\GridField\GridFieldDeleteAction: + Delete: Slet + DeletePermissionsFailure: 'Ingen slette rettigheder' + EditPermissionsFailure: 'Ingen rettighed til at fjerne emnet' + UnlinkRelation: Fjern + SilverStripe\Forms\GridField\GridFieldDetailForm: + CancelBtn: Annuller + Create: Opret + Delete: Slet + DeletePermissionsFailure: 'Ingen slette rettigheder' + Deleted: 'Slet {type} {name}' + Save: Gem + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'Kan ikke fjerne dig selv fra denne gruppe, du vil miste administrator rettigheder' + SilverStripe\Forms\GridField\GridFieldPaginator: + OF: af + Page: Side + View: Vis + SilverStripe\Forms\MoneyField: + FIELDLABELAMOUNT: Beløb + FIELDLABELCURRENCY: Valuta + INVALID_CURRENCY: 'Valuta {currency} er ikke i listen over tilladte valutaer' + SilverStripe\Forms\MultiSelectField: + SOURCE_VALIDATION: 'Vælg venligst eksisterende værdier fra listen. Ugyldig mulighed(er) {value} valgt' + SilverStripe\Forms\NullableField: + IsNullLabel: 'Er Null' + SilverStripe\Forms\NumericField: + VALIDATION: '''{value}'' er ikke et tal, kun tal accepteres i dette felt' + SilverStripe\Forms\TimeField: + VALIDATEFORMAT: 'Indtats venligst et gyldigt tidsformat ({format})' + SilverStripe\ORM\DataObject: + PLURALNAME: Dataobjekter + PLURALS: + one: 'Et dataobjekt' + other: '{count} dataobjekter' + SINGULARNAME: Dataobjekt + SilverStripe\ORM\FieldType\DBBoolean: + ANY: Enhver + NOANSWER: Nej + YESANSWER: Ja + SilverStripe\ORM\FieldType\DBDate: + DAYS_SHORT_PLURALS: + one: '{count} dag' + other: '{count} dage' + HOURS_SHORT_PLURALS: + one: '{count} time' + other: '{count} timer' + LessThanMinuteAgo: 'mindre end et minut' + MINUTES_SHORT_PLURALS: + one: '{count} minut' + other: '{count} minutter' + MONTHS_SHORT_PLURALS: + one: '{count} måned' + other: '{count} måneder' + SECONDS_SHORT_PLURALS: + one: '{count} sekund' + other: '{count} sekunder' + TIMEDIFFAGO: '{difference} siden' + TIMEDIFFIN: 'i {difference}' + YEARS_SHORT_PLURALS: + one: '{count} år' + other: '{count} år' + SilverStripe\ORM\FieldType\DBEnum: + ANY: Enhver + SilverStripe\ORM\Hierarchy: + LIMITED_TITLE: 'For mange underelementer ({count})' + SilverStripe\ORM\Hierarchy\Hierarchy: + InfiniteLoopNotAllowed: 'Uendeligt løkke fundet i "{type}" hierarkiet. Ændre venligst det overliggende element for at løse dette' + LIMITED_TITLE: 'For mange underelementer ({count})' + SilverStripe\ORM\ValidationException: + DEFAULT_ERROR: Valideringsfejl + SilverStripe\Security\BasicAuth: + ENTERINFO: 'Indtast venligst et brugernavn og kodeord.' + ERRORNOTADMIN: 'Den bruger er ikke en administrator.' + ERRORNOTREC: 'Brugernavn / kodeord kunne ikke genkendes' + SilverStripe\Security\CMSMemberLoginForm: + PASSWORDEXPIRED: '

Dit kodeord er udløbet. Vælg venligst et nyt.

' + SilverStripe\Security\CMSSecurity: + INVALIDUSER: '

Ugyldig bruger. Log venligst ind igen her for at fortsætte.

' + LOGIN_MESSAGE: '

Din session er løbet ud pga. inaktivitet

' + LOGIN_TITLE: 'Log ind igen, for at fortsætte hvor du slap.' + SUCCESS: Succes + SUCCESSCONTENT: '

Logget ind. Hvis du ikke automatisk viderestilles så klik her

' + SUCCESS_TITLE: 'Logget ind med sucess' + SilverStripe\Security\DefaultAdminService: + DefaultAdminFirstname: 'Standard admin' + SilverStripe\Security\Group: + AddRole: 'Tilføj en rolle for denne gruppe' + Code: 'Gruppe kode' + DefaultGroupTitleAdministrators: Administratorer + DefaultGroupTitleContentAuthors: Indholdsforfattere + Description: Beskrivelse + GROUPNAME: Gruppenavn + GroupReminder: 'Hvis du vælger en overliggende gruppe, får denne gruppe alle dens roller' + HierarchyPermsError: 'Kan ikke tildele overliggende gruppe "{group}" med fortrinsrettigheder (kræver ADMIN adgang)' + Locked: 'Låst?' + MEMBERS: Brugere + NEWGROUP: 'Ny gruppe' + NoRoles: 'Ingen roller fundet' + PERMISSIONS: Rettigheder + PLURALNAME: Grupper + PLURALS: + one: 'En gruppe' + other: '{count} grupper' + Parent: 'Overliggende gruppe' + ROLES: Roller + ROLESDESCRIPTION: 'Roller er et prædefineret sæt af rettigheder, som kan tildeles grupper.
De bliver nedarvet fra en overliggende grupper hvis krævet.' + RolesAddEditLink: 'Administrer roller' + SINGULARNAME: Gruppe + Sort: Sortering + has_many_Permissions: Rettigheder + many_many_Members: Brugere + SilverStripe\Security\LoginAttempt: + Email: 'Email adresse' + EmailHashed: 'Email adresse (hashed)' + IP: 'IP addresse' + PLURALNAME: Loginforsøg + PLURALS: + one: 'Et loginforsøg' + other: '{count} loginforsøg' + SINGULARNAME: 'Login forsøg' + Status: Status + SilverStripe\Security\Member: + ADDGROUP: 'Tilføj gruppe' + BUTTONCHANGEPASSWORD: 'Skift kodeord' + BUTTONLOGIN: 'Log ind' + BUTTONLOGINOTHER: 'Log ind med en anden bruger' + BUTTONLOGOUT: 'Log ud' + BUTTONLOSTPASSWORD: 'Jeg har glemt mit kodeord' + CONFIRMNEWPASSWORD: 'Bekræft nyt kodeord' + CONFIRMPASSWORD: 'Bekræft kodeord' + CURRENT_PASSWORD: 'Nuværende kodeord' + EDIT_PASSWORD: 'Nyt kodeord' + EMAIL: Email + EMPTYNEWPASSWORD: 'Det nye kodeord kan ikke være tom, prøv venligst igen' + ENTEREMAIL: 'Indtast venligst en email adresse for at få et nulstillingslink.' + ERRORLOCKEDOUT2: 'Din konto er blevet midlertidigt deaktiveret pga. for mange fejlslagne loginforsøg. Forsøg venligst igen om {count} minutter.' + ERRORNEWPASSWORD: 'Du har indtastet dit nye kodeord forskelligt, forsøg igen' + ERRORPASSWORDNOTMATCH: 'Dit nuværende kodeord matcher ikke, forsøg venligst igen' + ERRORWRONGCRED: 'De indtastede værdier ser ikke ud til at være korrekte. Forsøg venligst igen.' + FIRSTNAME: Fornavn + INTERFACELANG: 'Sprog i brugerfladen' + KEEPMESIGNEDIN: 'Hold mig logget ind' + LOGGEDINAS: 'Du er logget ind som {name}.' + NEWPASSWORD: 'Nyt kodeord' + PASSWORD: Kodeord + PASSWORDEXPIRED: 'Dit kodeord er udløbet. Vælg venligst et nyt.' + PLURALNAME: Brugere + PLURALS: + one: 'En bruger' + other: '{count} brugere' + REMEMBERME: 'Husk mig til næste gang? (i {count} dage på denne enhed)' + SINGULARNAME: Bruger + SUBJECTPASSWORDCHANGED: 'Dit kodeord er blevet ændret' + SUBJECTPASSWORDRESET: 'Link til at nulstille dit kodeord' + SURNAME: Efternavn + VALIDATIONADMINLOSTACCESS: 'Kan ikke fjerne alle admin grupper fra din profil' + ValidationIdentifierFailed: 'Kan ikke overskrive eksisterende bruger #{id} med identisk identifikator ({name} = {value}))' + WELCOMEBACK: 'Velkommen tilbage, {firstname}' + YOUROLDPASSWORD: 'Dit gamle kodeord' + belongs_many_many_Groups: Grupper + db_Locale: 'Sprog i brugerfladen' + db_LockedOutUntil: 'Låst ude indtil' + db_Password: Kodeord + db_PasswordExpiry: Kodeordsudløbsdato + SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: + AUTHENTICATORNAME: 'CMS bruger loginform' + BUTTONFORGOTPASSWORD: 'Glemt kodeord' + BUTTONLOGIN: 'Log mig ind igen' + BUTTONLOGOUT: 'Log ud' + SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: + ERRORWRONGCRED: 'De indtastede værdier ser ikke ud til at være korrekte. Forsøg venligst igen.' + NoPassword: 'Der er ikke en kode på denne bruger.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'Email og kodeord' + SilverStripe\Security\MemberPassword: + PLURALNAME: 'Bruger kodeord' + PLURALS: + one: 'Et bruger kodeord' + other: '{count} bruger kodeord' + SINGULARNAME: 'Bruger kodeord' + SilverStripe\Security\PasswordValidator: + LOWCHARSTRENGTH: 'Forøg venligst kodeordets styrke, ved at tilføje nogle af følgende tegn: {chars}' + PREVPASSWORD: 'Du har tidligere brugt dette kodeord, vælg venligst et nyt kodeord' + TOOSHORT: 'Kodeordet er for kort, det skal mindst være {minimum} eller flere tegn langt' SilverStripe\Security\Permission: + AdminGroup: Administrator + CMS_ACCESS_CATEGORY: 'CMS Adgang' CONTENT_CATEGORY: Indholdsrettigheder + FULLADMINRIGHTS: 'Fuld administrator rettighed' + FULLADMINRIGHTS_HELP: 'Indebærer og overskriver alle andre tildelte rettigheder.' + PERMISSIONS_CATEGORY: 'Roller og adgangsrettigheder' + PLURALNAME: Rettigheder + PLURALS: + one: 'En rettighed' + other: '{count} rettigheder' + SINGULARNAME: Rettighed + UserPermissionsIntro: 'Tildeling af grupper til denne bruger, ændrer de rettigheder brugeren har. Se gruppe området for rettigheds detaljer på de individuelle grupper.' + SilverStripe\Security\PermissionCheckboxSetField: + AssignedTo: 'tildelt til "{title}"' + FromGroup: 'nedarvet fra gruppen "{title}"' + FromRole: 'nedarvet fra rollen "{title}"' + FromRoleOnGroup: 'nedarvet fra rollen "{roletitle}" på gruppen "{grouptitle}"' + SilverStripe\Security\PermissionRole: + OnlyAdminCanApply: 'Kun administratorer kan tilføje' + PLURALNAME: Roller + PLURALS: + one: 'En rolle' + other: '{count} roller' + SINGULARNAME: Rolle + Title: Titel + SilverStripe\Security\PermissionRoleCode: + PLURALNAME: 'Rettigheds rolle koder' + PLURALS: + one: 'En rettigheds rolle kode' + other: '{count} rettigheds rolle koder' + PermsError: 'Kan ikke tildele koden "{code}" med fortrinsrettigheder (kræver ADMIN adgang)' + SINGULARNAME: 'Rettighed rolle kode' + SilverStripe\Security\RememberLoginHash: + PLURALNAME: 'Login hashes' + PLURALS: + one: 'Et login hash' + other: '{count} Login Hashes' + SINGULARNAME: 'Login hash' + SilverStripe\Security\Security: + ALREADYLOGGEDIN: 'Du har ikke adgang til denne side. Hvis du har en anden bruger der har adgang til denne side, kan du logge ind med denne herunder.' + BUTTONSEND: 'Send mig linket til at nulstille kodeordet' + CHANGEPASSWORDBELOW: 'Du kan ændre dit kodeord herunder.' + CHANGEPASSWORDHEADER: 'Skift dit kodeord' + CONFIRMLOGOUT: 'Klik venligst på knappen herunder, for at bekræfte at du vil logge ud.' + ENTERNEWPASSWORD: 'Indtast venligst et nyt kodeord.' + ERRORPASSWORDPERMISSION: 'Du skal være logget ind, for at kunne ændre dit kodeord!' + LOGIN: 'Log ind' + LOGOUT: 'Log ud' + LOSTPASSWORDHEADER: 'Glemt kodeord' + NOTEPAGESECURED: 'Denne side er beskyttet. Indtast dine loginoplysninger herunder for at få adgang.' + NOTERESETPASSWORD: 'Indtast din email adresse, så sender vi dig et link som du kan nulstille dit kodeord med' diff --git a/lang/de.yml b/lang/de.yml index 3bbf8cdb5..77e2f1584 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -11,8 +11,6 @@ de: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: € SilverStripe\Forms\DateField: - NOTSET: 'nicht gesetzt' - TODAY: heute VALIDDATEFORMAT2: 'Bitte geben sie das Datum im korrekten Format ein ({format})' VALIDDATEMAXDATE: 'Ihr Datum muss vor dem erlaubtem Datum ({date}) liegen oder gleich sein' VALIDDATEMINDATE: 'Ihr Datum muss nach dem erlaubtem Datum ({date}) liegen oder gleich sein' @@ -49,7 +47,6 @@ de: RelationSearch: Relationssuche ResetFilter: Zurücksetzen SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Löschen Delete: Löschen DeletePermissionsFailure: 'Keine Berechtigung zum Löschen' EditPermissionsFailure: 'Sie haben keine Berechtigung, die Verknüpfung zu lösen' @@ -61,8 +58,6 @@ de: DeletePermissionsFailure: 'Keine Berechtigungen zum löschen' Deleted: 'Gelöscht {type} {name}' Save: Speichern - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Bearbeiten SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Betrag FIELDLABELCURRENCY: Währung @@ -195,7 +190,4 @@ de: LOGIN: Anmelden LOSTPASSWORDHEADER: 'Passwort vergessen' NOTEPAGESECURED: 'Diese Seite ist geschützt. Bitte melden Sie sich an und Sie werden sofort weitergeleitet.' - NOTERESETLINKINVALID: '

Der Link zum Zurücksetzen des Passworts ist entweder nicht korrekt oder abgelaufen

Sie können einen neuen Link anfordern oder Ihr Passwort nach dem einloggen ändern.

' NOTERESETPASSWORD: 'Geben Sie Ihre E-Mail-Adresse ein und wir werden Ihnen einen Link zuschicken, mit dem Sie Ihr Passwort zurücksetzen können.' - PASSWORDSENTHEADER: 'Der Link zum Zurücksetzen des Passworts wurde an ''{email}'' gesendet' - PASSWORDSENTTEXT: 'Vielen Dank! Wenn ein Account zu der E-Mail Adresse ''{email}'' existiert, wurde eine E-Mail mit dem Link zum Zurücksetzen des Passworts verschickt.' diff --git a/lang/de_DE.yml b/lang/de_DE.yml new file mode 100644 index 000000000..e1bea0c6e --- /dev/null +++ b/lang/de_DE.yml @@ -0,0 +1,159 @@ +de_DE: + SilverStripe\Admin\LeftAndMain: + VersionUnknown: Unbekannt + SilverStripe\AssetAdmin\Forms\UploadField: + Dimensions: Maße + EDIT: Bearbeiten + EDITINFO: 'Datei bearbeiten' + REMOVE: Entfernen + SilverStripe\Control\ChangePasswordEmail_ss: + CHANGEPASSWORDFOREMAIL: 'Das Passwort für das Konto mit der E-Mail-Adresse {email} wurde geändert. Wenn Sie Ihr Passwort nicht geändert haben, ändern Sie bitte Ihr Passwort mit dem folgenden Link' + CHANGEPASSWORDTEXT1: 'Sie haben Ihr Passwort für geändert' + CHANGEPASSWORDTEXT3: 'Passwort ändern' + HELLO: Hallo + SilverStripe\Control\Email\ForgotPasswordEmail_ss: + HELLO: Hallo + TEXT1: 'Hier ist dein' + TEXT2: 'Link zum Zurücksetzen des Passworts' + TEXT3: für + SilverStripe\Core\Manifest\VersionProvider: + VERSIONUNKNOWN: Unbekannt + SilverStripe\Forms\CheckboxField: + NOANSWER: Nein + YESANSWER: Ja + SilverStripe\Forms\CheckboxSetField_ss: + NOOPTIONSAVAILABLE: 'Keine Optionen vorhanden' + SilverStripe\Forms\ConfirmedPasswordField: + ATLEAST: 'Passwörter müssen mindestens {min} Zeichen lang sein.' + BETWEEN: 'Passwörter müssen {min} bis {max} Zeichen lang sein.' + SHOWONCLICKTITLE: 'Passwort ändern' + SilverStripe\Forms\DateField: + TODAY: heute + SilverStripe\Forms\DropdownField: + CHOOSE: (Auswählen) + CHOOSE_MODEL: '({name} auswählen)' + SilverStripe\Forms\GridField\GridField: + Add: '{name} hinzufügen' + CSVEXPORT: 'Als CSV exportieren' + CSVIMPORT: 'CSV importieren' + Filter: Filtern + FilterBy: 'Filtern nach' + Print: Drucken + ResetFilter: Zurücksetzen + SilverStripe\Forms\GridField\GridFieldDeleteAction: + Delete: Löschen + SilverStripe\Forms\GridField\GridFieldDetailForm: + CancelBtn: Abbrechen + Save: Speichern + SilverStripe\Forms\GridField\GridFieldEditButton: + EDIT: Bearbeiten + SilverStripe\Forms\GridField\GridFieldFilterHeader: + Search: 'Suche "{name}"' + SilverStripe\Forms\GridField\GridFieldPaginator: + Page: Seite + SilverStripe\Forms\MoneyField: + FIELDLABELAMOUNT: Betrag + FIELDLABELCURRENCY: Währung + INVALID_CURRENCY: 'Die Währung {currency} ist nicht in der Liste der erlauben Währungen' + SilverStripe\ORM\DataObject: + PLURALNAME: DatenObjekte + PLURALS: + one: 'Ein DatenObjekt' + other: '{count} DatenObjekte' + SINGULARNAME: DatenObjekt + SilverStripe\ORM\FieldType\DBBoolean: + NOANSWER: Nein + YESANSWER: Ja + SilverStripe\ORM\FieldType\DBDate: + DAYS_SHORT_PLURALS: + one: '{count} Tag' + other: '{count} Tage' + HOURS_SHORT_PLURALS: + one: '{count} Stunde' + other: '{count} Stunden' + LessThanMinuteAgo: 'weniger als 1 Minute' + MINUTES_SHORT_PLURALS: + one: '{count} Minute' + other: '{count} Minuten' + MONTHS_SHORT_PLURALS: + one: '{count} Monat' + other: '{count} Monate' + SECONDS_SHORT_PLURALS: + one: '{count} Sekunde' + other: '{count} Sekunden' + TIMEDIFFAGO: 'vor {difference}' + TIMEDIFFIN: 'in {difference}' + YEARS_SHORT_PLURALS: + one: '{count} Jahr' + other: '{count} Jahre' + SilverStripe\Security\BasicAuth: + ENTERINFO: 'Bitte geben Sie einen Benutzernamen und ein Passwort ein' + ERRORNOTADMIN: 'Dieser Benutzer ist kein Administrator' + ERRORNOTREC: 'Dieser Benutzer bzw. dieses Passwort ist unbekannt' + SilverStripe\Security\CMSMemberLoginForm: + PASSWORDEXPIRED: '

Ihr Passwort ist abgelaufen. Bitte wählen Sie ein neues Passwort.

' + SilverStripe\Security\CMSSecurity: + SUCCESS_TITLE: 'Login erfolgreich' + SilverStripe\Security\DefaultAdminService: + DefaultAdminFirstname: 'Standard Administrator' + SilverStripe\Security\Group: + DefaultGroupTitleAdministrators: Administratoren + DefaultGroupTitleContentAuthors: Inhaltsautoren + Description: Beschreibung + GROUPNAME: Gruppenname + MEMBERS: Mitglieder + NEWGROUP: 'Neue Gruppe' + NoRoles: 'Keine Rollen gefunden' + PLURALNAME: Gruppen + PLURALS: + one: 'Eine Gruppe' + other: '{count} Gruppen' + SINGULARNAME: Gruppe + Sort: Sortierreihenfolge + has_many_Permissions: Rechte + many_many_Members: Mitglieder + SilverStripe\Security\LoginAttempt: + Email: 'E-Mail Adresse' + EmailHashed: 'E-Mail Adresse (gehasht)' + IP: 'IP Adresse' + PLURALNAME: Loginversuche + PLURALS: + one: 'Ein Loginversuch' + other: '{count} Loginversuche' + SINGULARNAME: Loginversuch + Status: Status + SilverStripe\Security\Member: + ADDGROUP: 'Gruppe hinzufügen' + BUTTONCHANGEPASSWORD: 'Passwort ändern' + BUTTONLOGIN: Einloggen + BUTTONLOGINOTHER: 'Als jemand anderes einloggen' + BUTTONLOGOUT: Ausloggen + BUTTONLOSTPASSWORD: 'Ich habe mein Passwort vergessen' + CONFIRMNEWPASSWORD: 'Neues Passwort bestätigen' + CONFIRMPASSWORD: 'Passwort bestätigen' + CURRENT_PASSWORD: 'Derzeitiges Passwort' + EDIT_PASSWORD: 'Neues Passwort' + EMAIL: E-Mail + EMPTYNEWPASSWORD: 'Das neue Passwort kann nicht leer sein, bitte versuchen Sie es erneut' + ENTEREMAIL: 'Bitte geben Sie Ihre E-Mail Adresse an. Sie erhalten eine E-Mail mit einem Link zum Zurücksetzen des Passworts.' + FIRSTNAME: Vorname + NEWPASSWORD: 'Neues Passwort' + PASSWORD: Passwort + PASSWORDEXPIRED: 'Ihr Passwort ist abgelaufen. Bitte wählen Sie ein neues Passwort.' + PLURALNAME: Mitglieder + PLURALS: + one: 'Ein Mitglied' + other: '{count} Mitglieder' + SINGULARNAME: Mitglied + SURNAME: Nachname + WELCOMEBACK: 'Willkommen zurück, {firstname}' + YOUROLDPASSWORD: 'Ihr altes Passwort' + belongs_many_many_Groups: Grouppen + db_Password: Passwort + SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: + BUTTONFORGOTPASSWORD: 'Passwort vergessen' + SilverStripe\Security\Permission: + AdminGroup: Administrator + SilverStripe\Security\Security: + LOGIN: Einloggen + LOGOUT: Ausloggen diff --git a/lang/en.yml b/lang/en.yml index ef6596a01..2a6fa6c18 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -37,8 +37,6 @@ en: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'not set' - TODAY: today VALIDDATEFORMAT2: 'Please enter a valid date format ({format})' VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})' VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})' diff --git a/lang/eo.yml b/lang/eo.yml index 6660d9b1b..cc792bab4 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -37,8 +37,6 @@ eo: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'ne agordita' - TODAY: hodiaŭ VALIDDATEFORMAT2: 'Bonvole enigu validan datan formaton ({format})' VALIDDATEMAXDATE: 'Necesas ke via dato estu pli aĝa ol, aŭ egala al la maksimuma permesita dato ({date})' VALIDDATEMINDATE: 'Necesas ke via dato estu pli nova ol, aŭ egala al la minimuma permesita dato ({date})' @@ -86,7 +84,6 @@ eo: RelationSearch: 'Serĉi rilatojn' ResetFilter: Restartigi SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Forigi Delete: Forigi DeletePermissionsFailure: 'Mankas permeso forigi' EditPermissionsFailure: 'Mankas permeso malligi rikordon' @@ -98,23 +95,12 @@ eo: DeletePermissionsFailure: 'Mankas permeso forigi' Deleted: 'Forigita {type} {name}' Save: Konservi - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Redakti SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Ne povas forigi vin el ĉi tiu grupo; vi perdus administrajn rajtojn' SilverStripe\Forms\GridField\GridFieldPaginator: OF: de Page: Paĝo View: Vido - SilverStripe\Forms\GridField\GridFieldVersionedState: - ADDEDTODRAFTHELP: 'Ero ankoraŭ estas ne publikigita' - ADDEDTODRAFTSHORT: Malneto - ARCHIVEDPAGEHELP: 'Ero estas forigita el malneta kaj publika' - ARCHIVEDPAGESHORT: Enarkivigita - MODIFIEDONDRAFTHELP: 'Ero enhavas nepublikigitajn ŝanĝojn' - MODIFIEDONDRAFTSHORT: Ŝanĝita - ONLIVEONLYSHORT: 'Nur ĉe publika' - ONLIVEONLYSHORTHELP: 'Ero estas publikigita, sed ĝi estas forigita el malneto' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Kvanto FIELDLABELCURRENCY: Kurzo @@ -270,6 +256,8 @@ eo: SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: ERRORWRONGCRED: 'La donitaj detaloj ŝajnas malĝustaj. Bonvole reprovu.' NoPassword: 'Mankas pasvorto por ĉi tiu membro.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'Retpoŝtadreso kaj pasvorto' SilverStripe\Security\MemberPassword: PLURALNAME: 'Membraj pasvortoj' PLURALS: @@ -331,7 +319,4 @@ eo: LOGOUT: Elsaluti LOSTPASSWORDHEADER: 'Perdis pasvorton' NOTEPAGESECURED: 'Tiu paĝo estas sekurigita. Enigu viajn akreditaĵojn sube kaj vi aliros pluen.' - NOTERESETLINKINVALID: '

La pasvorta reagorda ligilo estas malvalida aŭ finiĝis.

Vi povas peti novan ĉi tie aŭ ŝanĝi vian pasvorton post vi ensalutis.

' NOTERESETPASSWORD: 'Enigu vian retpoŝtan adreson kaj ni sendos al vi ligilon per kiu vi povas reagordi vian pasvorton' - PASSWORDSENTHEADER: 'Pasvorta reagorda ligilo sendiĝis al ''{email}''' - PASSWORDSENTTEXT: 'Dankon! Reagordita ligilo sendiĝis al ''{email}'', kondiĉe ke konto ekzistas por tiu retadreso.' diff --git a/lang/es.yml b/lang/es.yml index 5251bdbf6..debd4b4a7 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -15,8 +15,6 @@ es: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: Símbolo SilverStripe\Forms\DateField: - NOTSET: 'sin establecer' - TODAY: hoy VALIDDATEFORMAT2: 'Por favor, introduzca un formato de fecha válido ({format})' VALIDDATEMAXDATE: 'La fecha tiene que ser mayor o igual a la fecha máxima permitida ({date})' VALIDDATEMINDATE: 'La fecha tiene que ser posterior o coincidente a la fecha mínima permitida ({date})' @@ -55,7 +53,6 @@ es: RelationSearch: 'Búsqueda de relación' ResetFilter: Restaurar SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Borrar Delete: Borrar DeletePermissionsFailure: 'Sin permiso para borrar' EditPermissionsFailure: 'No se pudo editar permisos' @@ -67,8 +64,6 @@ es: DeletePermissionsFailure: 'Sin permiso para borrar' Deleted: 'Borrado {type} {name}' Save: Guardar - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Editar SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Cantidad FIELDLABELCURRENCY: Moneda @@ -254,7 +249,4 @@ es: LOGIN: Entrar LOSTPASSWORDHEADER: '¿Contraseña Perdida?' NOTEPAGESECURED: 'Esa página está protegida. Introduzca sus datos de acreditación a continuación y lo enviaremos a ella en un momento.' - NOTERESETLINKINVALID: '

El enlace para restablecer la contraseña es inválido o ha expirado.

Usted puede solicitar uno nuevo aqui o cambiar su contraseña después de que se haya conectado.

' NOTERESETPASSWORD: 'Introduzca su dirección de e-mail, y le enviaremos un enlace, con el cual podrá restaurar su contraseña' - PASSWORDSENTHEADER: 'Un enlace para restablecer la contraseña ha sido enviado a ''{email}''' - PASSWORDSENTTEXT: 'Gracias! Un enlace para restablecer la contraseña ha sido enviado a ''{email}'', siempre que una cuenta exista para la dirección de email indicada.' diff --git a/lang/es_AR.yml b/lang/es_AR.yml index 3539b9101..773d79948 100644 --- a/lang/es_AR.yml +++ b/lang/es_AR.yml @@ -1,9 +1,6 @@ es_AR: SilverStripe\Forms\ConfirmedPasswordField: SHOWONCLICKTITLE: 'Cambiar Contraseña' - SilverStripe\Forms\DateField: - NOTSET: 'no especificada' - TODAY: hoy SilverStripe\Forms\DropdownField: CHOOSE: (Selecciona) SilverStripe\Forms\Form: diff --git a/lang/es_MX.yml b/lang/es_MX.yml index 5fd337559..04baa70a6 100644 --- a/lang/es_MX.yml +++ b/lang/es_MX.yml @@ -2,8 +2,6 @@ es_MX: SilverStripe\Forms\ConfirmedPasswordField: SHOWONCLICKTITLE: 'Cambiar contraseña' SilverStripe\Forms\DateField: - NOTSET: 'no especificada' - TODAY: ahora VALIDDATEFORMAT2: 'Por favor ingresar un formato válido de fecha ({format})' VALIDDATEMAXDATE: 'Tu fecha tiene que ser más antigua o al menos coincidir con la fecha mínima permitida ({date})' VALIDDATEMINDATE: 'Tu fecha tiene que ser nueva o al menos coincidir con la fecha mínima permitida ({date})' diff --git a/lang/et_EE.yml b/lang/et_EE.yml index 2c44eee9b..a8fb3b686 100644 --- a/lang/et_EE.yml +++ b/lang/et_EE.yml @@ -8,8 +8,6 @@ et_EE: MAXIMUM: 'Parool võib olla kuni {max} märki pikk.' SHOWONCLICKTITLE: 'Muuda parool' SilverStripe\Forms\DateField: - NOTSET: 'Pole seadistatud' - TODAY: Täna VALIDDATEFORMAT2: 'Sisestage sobivas vormingus kuupäev ({format})' VALIDDATEMAXDATE: 'Teie kuupäev peab oleme lubatud kuupäevast ({date}) varasem või ühtima sellega.' VALIDDATEMINDATE: 'Teie kuupäev peab oleme lubatud kuupäevast ({date}) hilisem või ühtima sellega.' @@ -41,7 +39,6 @@ et_EE: RelationSearch: 'Seose otsing' ResetFilter: Lähtesta SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Kustuta Delete: Kustuta DeletePermissionsFailure: 'Kustutamisõigused puuduvad' UnlinkRelation: 'Tühista linkimine' @@ -52,8 +49,6 @@ et_EE: DeletePermissionsFailure: 'Kustutamisõigused puuduvad' Deleted: '{type} {name} on kustutatud' Save: Salvesta - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Redigeeri SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Hulk FIELDLABELCURRENCY: Valuuta @@ -144,7 +139,4 @@ et_EE: ERRORPASSWORDPERMISSION: 'Pead olema sisseloginud, et parooli muuta!' LOGIN: 'Logi sisse' NOTEPAGESECURED: 'See leht on turvatud. Sisesta enda andmed allpool ja me saadame sind otse edasi' - NOTERESETLINKINVALID: '

Parooli lähtestamise link on kehtetu või aegunud.

Saate taotleda uut linki siin või muuta parooli pärast sisselogimist.

' NOTERESETPASSWORD: 'Sisesta oma email ja me saadame sulle lingi kus saad oma parooli tühistada.' - PASSWORDSENTHEADER: 'Parooli lähtestamise link saadeti aadressile ''{email}''' - PASSWORDSENTTEXT: 'Aitäh! Lähtestamislink saadeti aadressile ''{email}'' eeldusel, et selle e-posti aadressiga seotud konto on olemas.' diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml index 14c967ba9..b9aa0ebea 100644 --- a/lang/fa_IR.yml +++ b/lang/fa_IR.yml @@ -13,8 +13,6 @@ fa_IR: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: ﷼ SilverStripe\Forms\DateField: - NOTSET: نامشخص - TODAY: امروز VALIDDATEFORMAT2: 'لطفاً یک قالب تاریخ معتبر وارد نمایید ({format})' VALIDDATEMAXDATE: 'تاریخ شما باید قدیمی‌تر یا برابر با حداکثر تاریخ مجاز ({date}) باشد' VALIDDATEMINDATE: 'تاریخ شما باید جدیدتر یا برابر با حداقل تاریخ مجاز ({date}) باشد' @@ -50,7 +48,6 @@ fa_IR: RelationSearch: 'جستجوی رابط' ResetFilter: 'از نو' SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: حذف Delete: حذف DeletePermissionsFailure: 'دسترسی‌های حذف وجود ندارد' EditPermissionsFailure: 'دسترسی‌های حذف لینک وجود ندارد' @@ -62,8 +59,6 @@ fa_IR: DeletePermissionsFailure: 'دسترسی‌های حذف وجود ندارد' Deleted: 'حذف شده {type} {name}' Save: ذخیره - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: ویرایش SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: مقدار FIELDLABELCURRENCY: 'واحد پول' @@ -173,4 +168,3 @@ fa_IR: ERRORPASSWORDPERMISSION: 'جهت تغییر گذرواژه خود باید وارد شده باشید!' LOGIN: ورود LOSTPASSWORDHEADER: 'فراموشی گذرواژه' - PASSWORDSENTHEADER: 'لینک ازنوسازی گذرواژه به ''{email}'' ارسال شد' diff --git a/lang/fi.yml b/lang/fi.yml index 53eae99ed..01899f2af 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -37,8 +37,6 @@ fi: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'ei asetettu' - TODAY: tänään VALIDDATEFORMAT2: 'Ole hyvä ja kirjaa päivämäärä sallitussa muodossa ({format})' VALIDDATEMAXDATE: 'Päivämäärän on oltava vanhempi tai sovittava asetettuun maksimiin ({date})' VALIDDATEMINDATE: 'Päivämäärän on oltava uudempi tai sovittava asetettuun minimiin ({date})' @@ -86,7 +84,6 @@ fi: RelationSearch: Relaatiohaku ResetFilter: Nollaa SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Poista Delete: Poista DeletePermissionsFailure: 'Ei oikeuksia poistamiseen' EditPermissionsFailure: 'Ei oikeuksia purkaa linkitystä tietueeseen' @@ -98,23 +95,12 @@ fi: DeletePermissionsFailure: 'Ei oikeuksia poistamiseen' Deleted: 'Poistettiin {type} {name}' Save: Tallenna - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Muokkaa SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Et voi siirtää itseäsi pois tästä ryhmästä: menettäisit pääkäyttäjän oikeudet' SilverStripe\Forms\GridField\GridFieldPaginator: OF: / Page: Sivu View: Näytä - SilverStripe\Forms\GridField\GridFieldVersionedState: - ADDEDTODRAFTHELP: 'Kohdetta ei ole julkaistu vielä' - ADDEDTODRAFTSHORT: Luonnos - ARCHIVEDPAGEHELP: 'Kohde on poistettu luonnoksista ja julkaisusta' - ARCHIVEDPAGESHORT: Arkistoitu - MODIFIEDONDRAFTHELP: 'Kohteella on julkaisemattomia muutoksia' - MODIFIEDONDRAFTSHORT: Muokattu - ONLIVEONLYSHORT: 'Vain julkaistuna' - ONLIVEONLYSHORTHELP: 'Kohde on julkaistu, mutta poistettu luonnoksista' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Määrä FIELDLABELCURRENCY: Valuutta @@ -211,6 +197,7 @@ fi: many_many_Members: Jäsenet SilverStripe\Security\LoginAttempt: Email: Sähköpostiosoite + EmailHashed: 'Sähköpostiosoite (tiivistetty)' IP: IP-osoite PLURALNAME: Kirjautumisyritykset PLURALS: @@ -269,6 +256,8 @@ fi: SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: ERRORWRONGCRED: 'Antamasi tiedot eivät näytä oikeilta. Yritä uudelleen.' NoPassword: 'Tällä käyttäjällä ei ole salasanaa' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'Sähköpostiosoite & salasana' SilverStripe\Security\MemberPassword: PLURALNAME: 'Käyttäjän salasanat' PLURALS: @@ -330,7 +319,4 @@ fi: LOGOUT: 'Kirjaudu ulos' LOSTPASSWORDHEADER: 'Unohtunut salasana' NOTEPAGESECURED: 'Tämä sivu on suojattu. Syötä tunnistetietosi alle niin pääset eteenpäin.' - NOTERESETLINKINVALID: '

Salasanan palautuslinkki on virheellinen tai vanhentunut.

Voit pyytää uuden napsauttamalla tästä tai vaihtaa salasanasi kirjautumisen jälkeen.

' NOTERESETPASSWORD: 'Syötä sähköpostiosoitteesi ja lähetämme sinulle linkin, jonka avulla saat palautettua salasanasi' - PASSWORDSENTHEADER: 'Salasanan palautuslinkki lähetettiin osoitteeseen ''{email}''' - PASSWORDSENTTEXT: 'Kiitos! Salasanan palautuslinkki lähetettiin osoitteeseen ''{email}'', joka on liitettynä tähän käyttäjätiliin.' diff --git a/lang/fo.yml b/lang/fo.yml index b9f881ac6..e95dfc85c 100644 --- a/lang/fo.yml +++ b/lang/fo.yml @@ -1,9 +1,6 @@ fo: SilverStripe\Forms\ConfirmedPasswordField: SHOWONCLICKTITLE: 'Broyt loyniorð' - SilverStripe\Forms\DateField: - NOTSET: 'ikki ásett' - TODAY: 'í dag' SilverStripe\Forms\DropdownField: CHOOSE: (Áset) SilverStripe\Forms\Form: diff --git a/lang/fr.yml b/lang/fr.yml index c6f59e67f..450cfdb87 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -37,8 +37,6 @@ fr: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'non renseigné' - TODAY: 'aujourd''hui' VALIDDATEFORMAT2: 'Saisissez une date au format valide ({format})' VALIDDATEMAXDATE: 'La date doit être antérieure ou égale à celle autorisée ({date})' VALIDDATEMINDATE: 'La date doit être postérieure ou égale à celle autorisée ({date})' @@ -86,7 +84,6 @@ fr: RelationSearch: 'Rechercher relations' ResetFilter: Réinitialiser SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Supprimer Delete: Supprimer DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer' EditPermissionsFailure: 'Pas de permissions pour délier l''enregistrement' @@ -98,23 +95,12 @@ fr: DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer' Deleted: '{type} {name} supprimés' Save: Enregistrer - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Editer SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Impossible de retirer votre propre profil de ce groupe, vous perdriez vos droits d''administration' SilverStripe\Forms\GridField\GridFieldPaginator: OF: de Page: Page View: Vue - SilverStripe\Forms\GridField\GridFieldVersionedState: - ADDEDTODRAFTHELP: 'L''élément n''a pas encore été publié' - ADDEDTODRAFTSHORT: Brouillon - ARCHIVEDPAGEHELP: 'Elément retiré du brouillon et du site public' - ARCHIVEDPAGESHORT: Archivé - MODIFIEDONDRAFTHELP: 'L''élément comporte des modifications non sauvegardées' - MODIFIEDONDRAFTSHORT: Modifié - ONLIVEONLYSHORT: 'Site public uniquement' - ONLIVEONLYSHORTHELP: 'L''élément a été publié, mais sa version brouillon a été supprimée' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Quantité FIELDLABELCURRENCY: Devise @@ -211,6 +197,7 @@ fr: many_many_Members: Membres SilverStripe\Security\LoginAttempt: Email: 'Adresse email' + EmailHashed: 'Adresse Email (hashed)' IP: 'Adresse IP' PLURALNAME: 'Tentatives de connexion' PLURALS: @@ -269,6 +256,8 @@ fr: SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: ERRORWRONGCRED: 'Les renseignements fournis semblent incorrects. Merci de réessayer.' NoPassword: 'Ce membre n''a pas de mot de passe' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'Email & Mot de passe' SilverStripe\Security\MemberPassword: PLURALNAME: 'Mots de passe utilisateur' PLURALS: @@ -330,7 +319,4 @@ fr: LOGOUT: 'Se déconnecter' LOSTPASSWORDHEADER: 'Mot de passe oublié' NOTEPAGESECURED: 'Cette page est sécurisée. Entrez vos identifiants ci-dessous et vous pourrez y avoir accès.' - NOTERESETLINKINVALID: '

Le lien de réinitialisation du mot de passe n’est pas valide ou a expiré.

Vous pouvez en demander un nouveau en suivant ce lien ou changer de mot de passe après connexion.

' NOTERESETPASSWORD: 'Entrez votre adresse email et nous vous enverrons un lien pour modifier votre mot de passe' - PASSWORDSENTHEADER: "Lien de réinitialisation de mot de passe envoyé à «\_{email}\_»" - PASSWORDSENTTEXT: "Merci\_! Un lien de réinitialisation vient d’être envoyé à «\_{email}\_», à condition que cette adresse existe." diff --git a/lang/gl_ES.yml b/lang/gl_ES.yml index c165b63a1..b9773f123 100644 --- a/lang/gl_ES.yml +++ b/lang/gl_ES.yml @@ -3,8 +3,6 @@ gl_ES: SHOWONCLICKTITLE: 'Mudar Contrasinal' SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: € - SilverStripe\Forms\DateField: - NOTSET: 'sen establecer' SilverStripe\Forms\DropdownField: CHOOSE: (Escoller) SilverStripe\Forms\Form: diff --git a/lang/hr.yml b/lang/hr.yml index c0823ee2b..f7087f039 100644 --- a/lang/hr.yml +++ b/lang/hr.yml @@ -7,8 +7,6 @@ hr: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'nije postavljeno' - TODAY: danas VALIDDATEFORMAT2: 'Molimo unesite datum u ispravnom formatu ({format})' SilverStripe\Forms\DropdownField: CHOOSE: (Odaberite) @@ -26,7 +24,6 @@ hr: Find: Pronađi Print: Ispiši SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Obriši Delete: Obriši SilverStripe\Forms\GridField\GridFieldDetailForm: CancelBtn: Odustani @@ -35,8 +32,6 @@ hr: DeletePermissionsFailure: 'Nema dozvole brisanja' Deleted: 'Obrisano {type} {name}' Save: Spremi - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Uredi SilverStripe\Forms\MoneyField: FIELDLABELCURRENCY: Valuta SilverStripe\ORM\FieldType\DBBoolean: diff --git a/lang/id.yml b/lang/id.yml index 4e8bf8875..c9c06bbff 100644 --- a/lang/id.yml +++ b/lang/id.yml @@ -10,8 +10,6 @@ id: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'tidak diatur' - TODAY: 'hari ini' VALIDDATEFORMAT2: 'Mohon isikan format tanggal yang valid ({format})' VALIDDATEMAXDATE: 'Tanggal Anda harus lebih lama atau sama dengan tanggal maksimum ({date})' VALIDDATEMINDATE: 'Tanggal Anda harus lebih baru atau sama dengan tanggal minimum ({date})' @@ -47,7 +45,6 @@ id: RelationSearch: 'Cari yang terkait' ResetFilter: Reset SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Hapus Delete: Hapus DeletePermissionsFailure: 'Tidak ada ijin menghapus' EditPermissionsFailure: 'Tidak ada ijin membuka tautan' @@ -59,8 +56,6 @@ id: DeletePermissionsFailure: 'Tidak ada ijin menghapus' Deleted: '{type} {name} dihapus' Save: Simpan - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Edit SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Jumlah FIELDLABELCURRENCY: 'Mata Uang' @@ -172,7 +167,4 @@ id: LOGIN: Masuk LOSTPASSWORDHEADER: 'Kata Kunci yang Terlupa' NOTEPAGESECURED: 'Laman ini diamankan. Isikan data berikut untuk dikirimkan hak akses Anda.' - NOTERESETLINKINVALID: '

Tautan penggantian kata kunci tidak valid atau sudah kadaluarsa.

Anda dapat meminta yang baru di sini atau mengganti kata kunci setelah Anda masuk.

' NOTERESETPASSWORD: 'Isikan alamat email Anda untuk mendapatkan tautan penggantian kata kunci' - PASSWORDSENTHEADER: 'Tautan penggantian kata kunci dikirimkan ke ''{email}''' - PASSWORDSENTTEXT: 'Terimakasih! Tautan reset telah dikirim ke ''{email}'', berisi informasi akun untuk alamat email ini.' diff --git a/lang/id_ID.yml b/lang/id_ID.yml index 9d4b6a922..11d1f2bb3 100644 --- a/lang/id_ID.yml +++ b/lang/id_ID.yml @@ -10,8 +10,6 @@ id_ID: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'tidak diatur' - TODAY: 'hari ini' VALIDDATEFORMAT2: 'Mohon isikan format tanggal yang valid ({format})' VALIDDATEMAXDATE: 'Tanggal Anda harus lebih lama atau sama dengan tanggal maksimum ({date})' VALIDDATEMINDATE: 'Tanggal Anda harus lebih baru atau sama dengan tanggal minimum ({date})' @@ -47,7 +45,6 @@ id_ID: RelationSearch: 'Cari yang terkait' ResetFilter: Reset SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Hapus Delete: Hapus DeletePermissionsFailure: 'Tidak ada ijin menghapus' EditPermissionsFailure: 'Tidak ada ijin membuka tautan' @@ -59,8 +56,6 @@ id_ID: DeletePermissionsFailure: 'Tidak ada ijin menghapus' Deleted: '{type} {name} dihapus' Save: Simpan - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Edit SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Jumlah FIELDLABELCURRENCY: 'Mata Uang' @@ -171,7 +166,4 @@ id_ID: LOGIN: Masuk LOSTPASSWORDHEADER: 'Kata Kunci yang Terlupa' NOTEPAGESECURED: 'Laman ini diamankan. Isikan data berikut untuk dikirimkan hak akses Anda.' - NOTERESETLINKINVALID: '

Tautan penggantian kata kunci tidak valid atau sudah kadaluarsa.

Anda dapat meminta yang baru di sini atau mengganti kata kunci setelah Anda masuk.

' NOTERESETPASSWORD: 'Isikan alamat email Anda untuk mendapatkan tautan penggantian kata kunci' - PASSWORDSENTHEADER: 'Tautan penggantian kata kunci dikirimkan ke ''{email}''' - PASSWORDSENTTEXT: 'Terimakasih! Tautan reset telah dikirim ke ''{email}'', berisi informasi akun untuk alamat email ini.' diff --git a/lang/is.yml b/lang/is.yml index 9da7485ab..dd322dfa5 100644 --- a/lang/is.yml +++ b/lang/is.yml @@ -3,9 +3,6 @@ is: SHOWONCLICKTITLE: 'Breyta lykliorði' SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: kr - SilverStripe\Forms\DateField: - NOTSET: 'ekki valið' - TODAY: 'í dag' SilverStripe\Forms\DropdownField: CHOOSE: (Veldu) SilverStripe\Forms\Form: diff --git a/lang/it.yml b/lang/it.yml index dddfb094a..adbdeb0fd 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -37,8 +37,6 @@ it: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'non impostato' - TODAY: oggi VALIDDATEFORMAT2: 'Inserisci un formato di data valido ({format})' VALIDDATEMAXDATE: 'La tua data deve essere più vecchia o uguale alla data massima consentita ({date})' VALIDDATEMINDATE: 'La tua data deve essere più nuova o uguale alla data minima consentita ({date})' @@ -86,7 +84,6 @@ it: RelationSearch: 'Cerca relazione' ResetFilter: Azzera SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Elimina Delete: Elimina DeletePermissionsFailure: 'Non hai i permessi per eliminare' EditPermissionsFailure: 'Non hai i permessi per modificare' @@ -98,21 +95,12 @@ it: DeletePermissionsFailure: 'Non hai i permessi per eliminare' Deleted: 'Eliminato {type} {name}' Save: Salva - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Modifica + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'Non è possibile rimuovere te stesso da questo gruppo, perderesti i diritti di admin' SilverStripe\Forms\GridField\GridFieldPaginator: OF: di Page: Pagina View: Visualizza - SilverStripe\Forms\GridField\GridFieldVersionedState: - ADDEDTODRAFTHELP: 'L''elemento non è stato ancora pubblicato' - ADDEDTODRAFTSHORT: Bozza - ARCHIVEDPAGEHELP: 'Elemento rimosso da bozza e live' - ARCHIVEDPAGESHORT: Archiviato - MODIFIEDONDRAFTHELP: 'L''elemento ha modifiche nascoste' - MODIFIEDONDRAFTSHORT: Modificato - ONLIVEONLYSHORT: 'Solo su live' - ONLIVEONLYSHORTHELP: 'L''elemento è pubblicato, ma è stato eliminato dal sito bozza' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Importo FIELDLABELCURRENCY: Valuta @@ -209,6 +197,7 @@ it: many_many_Members: Membri SilverStripe\Security\LoginAttempt: Email: 'Indirizzo e-mail' + EmailHashed: 'Indirizzo email (hash)' IP: 'Indirizzo IP' PLURALNAME: 'Tentativi d''accesso' PLURALS: @@ -250,6 +239,7 @@ it: SUBJECTPASSWORDCHANGED: 'La tua password è stata cambiata' SUBJECTPASSWORDRESET: 'Link per azzerare la tua password' SURNAME: Cognome + VALIDATIONADMINLOSTACCESS: 'Non è possibile rimuovere tutti i gruppi admin dal tuo profilo' ValidationIdentifierFailed: 'Non posso sovrascrivere l''utente esistente #{id} con identificatore identico ({name} = {value}))' WELCOMEBACK: 'Bentornato, {firstname}' YOUROLDPASSWORD: 'La tua vecchia password' @@ -266,6 +256,8 @@ it: SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: ERRORWRONGCRED: 'I dettagli forniti non sembrano corretti. Per favore riprovare.' NoPassword: 'Manca la password per questo utente.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'E-mail & Password' SilverStripe\Security\MemberPassword: PLURALNAME: 'Password utenti' PLURALS: @@ -327,7 +319,4 @@ it: LOGOUT: Scollegati LOSTPASSWORDHEADER: 'Password smarrita' NOTEPAGESECURED: 'La pagina è protetta. Inserisci le credenziali qui sotto per poter andare avanti.' - NOTERESETLINKINVALID: '

Il link per azzerare la password non è valido o è scaduto.

Puoi richiederne uno nuovo qui o cambiare la tua password dopo che ti sei connesso.

' NOTERESETPASSWORD: 'Inserisci il tuo indirizzo e-mail e ti verrà inviato un link per poter azzerare la tua password.' - PASSWORDSENTHEADER: 'Link per azzeramento della password inviato a ''{email}''' - PASSWORDSENTTEXT: 'Grazie! Un link di azzeramento è stato inviato a ''{email}'', fornito un account esistente per questo indirizzo e-mail.' diff --git a/lang/ja.yml b/lang/ja.yml index 7f76ad481..433a832e2 100644 --- a/lang/ja.yml +++ b/lang/ja.yml @@ -5,8 +5,6 @@ ja: MAXIMUM: 'パスワードは{max} 文字以内でなければなりません。' SHOWONCLICKTITLE: パスワード変更 SilverStripe\Forms\DateField: - NOTSET: セットされていません - TODAY: 今日 VALIDDATEFORMAT2: '{{format}}日付フォーマットの正しい日付を入力してください。' VALIDDATEMAXDATE: '許可されている最も新しい日付{{date}}より古い日付か同じ日付である必要があります。' VALIDDATEMINDATE: '許可されている最も古い日付{{date}}より新しい日付か同じ日付である必要があります' @@ -39,7 +37,6 @@ ja: RelationSearch: 関連検索 ResetFilter: リセット SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: 削除 Delete: 削除 DeletePermissionsFailure: 削除権限がありません EditPermissionsFailure: レコードのリンクを解除するための権限がありません @@ -51,8 +48,6 @@ ja: DeletePermissionsFailure: 削除権限がありません Deleted: '削除済み {type} {name}' Save: 保存 - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: 編集 SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: 総計 FIELDLABELCURRENCY: 通貨 @@ -151,7 +146,4 @@ ja: ERRORPASSWORDPERMISSION: パスワードを変更する為に、ログインしなければなりません！ LOGIN: ログイン NOTEPAGESECURED: このページはセキュリティで保護されております証明書キーを下記に入力してください。こちらからすぐに送信します - NOTERESETLINKINVALID: '

パスワードのリセットリンクは有効でないか期限切れです。

新しいパスワードを要求することができます ここ もしくはパスワードを変更することができます ログインした後 .

' NOTERESETPASSWORD: メールアドレスを入力してください、パスワードをリセットするURLを送信致します - PASSWORDSENTHEADER: 'パスワードリセットリンクは ''{email}'' に送信されました' - PASSWORDSENTTEXT: 'ありがとうございました！　リセットリンクは、''{email}'' に、このアカウントが存在することを前提として送信されました。' diff --git a/lang/lt.yml b/lang/lt.yml index 5f70dd239..3ca7adbff 100644 --- a/lang/lt.yml +++ b/lang/lt.yml @@ -10,8 +10,6 @@ lt: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: € SilverStripe\Forms\DateField: - NOTSET: nenustatyta - TODAY: šiandien VALIDDATEFORMAT2: 'Prašome suvesti datą reikiamu formatu ({format})' VALIDDATEMAXDATE: 'Data privalo būti senesnė arba lygi vėliausiai galimai datai ({date})' VALIDDATEMINDATE: 'Data privalo būti naujesnė arba lygi anksčiausiai galimai datai ({date})' @@ -47,7 +45,6 @@ lt: RelationSearch: 'Sąryšių paieška' ResetFilter: Atstatyti SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Ištrinti Delete: Ištrinti DeletePermissionsFailure: 'Nėra leidimų trynimui' EditPermissionsFailure: 'Nėra leidimų atjungti įrašą' @@ -59,8 +56,6 @@ lt: DeletePermissionsFailure: 'Nėra leidimų trynimui' Deleted: 'Ištrinta {type} {name}' Save: Išsaugoti - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Redaguoti SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Kiekis FIELDLABELCURRENCY: Valiuta @@ -172,7 +167,4 @@ lt: LOGIN: Prisijungti LOSTPASSWORDHEADER: 'Slaptažodžio atstatymas' NOTEPAGESECURED: 'Šis puslapis yra apsaugotas. Įveskite savo duomenis į žemiau esančius laukelius.' - NOTERESETLINKINVALID: '

Neteisinga arba negaliojanti slaptažodžio atstatymo nuoroda.

Galite atsisiųsti naują čia arba pasikeisti slaptažodį po to, kai prisijungsite.

' NOTERESETPASSWORD: 'Įveskite savo e. pašto adresą ir atsiųsime slaptažodžio atstatymui skirtą nuorodą' - PASSWORDSENTHEADER: 'Slaptažodžio atstatymo nuoroda nusiųsta į ''{email}''' - PASSWORDSENTTEXT: 'Atstatymo nuoroda nusiųsta į ''{email}''' diff --git a/lang/lv.yml b/lang/lv.yml index d7106a435..cfa2299d9 100644 --- a/lang/lv.yml +++ b/lang/lv.yml @@ -3,9 +3,6 @@ lv: SHOWONCLICKTITLE: 'Mainīt paroli' SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: Ls - SilverStripe\Forms\DateField: - NOTSET: 'nav uzstādīts' - TODAY: šodien SilverStripe\Forms\DropdownField: CHOOSE: (Izvēlieties) SilverStripe\Forms\Form: diff --git a/lang/mi.yml b/lang/mi.yml index 954732f27..e9fe2308e 100644 --- a/lang/mi.yml +++ b/lang/mi.yml @@ -7,8 +7,6 @@ mi: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'kāore i tautuhia' - TODAY: 'tēnei rā' VALIDDATEFORMAT2: 'Tāurua he hōputu rā tika ({format})' VALIDDATEMAXDATE: 'Me tawhito ake tō rā, kia ōrite rānei ki te rā mōrahi ({date}) kua whakaaetia' VALIDDATEMINDATE: 'Me hōu ake tō rā, kia ōrite rānei ki te rā moroiti ({date}) kua whakaaetia' @@ -41,7 +39,6 @@ mi: RelationSearch: 'Rapu whanaunga' ResetFilter: 'Tautuhi anō' SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Muku Delete: Muku DeletePermissionsFailure: 'Kāore he muku whakaaetanga' EditPermissionsFailure: 'Kāore ō whakaaetanga kia wetehono pūkete' @@ -53,8 +50,6 @@ mi: DeletePermissionsFailure: 'Kāore he whakaaetanga muku' Deleted: 'Kua mukua {type} {name}' Save: Tiaki - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Whakatika SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Rahinga FIELDLABELCURRENCY: Moni @@ -154,7 +149,4 @@ mi: LOGIN: Takiuru LOSTPASSWORDHEADER: 'Kupuhipa Ngaro' NOTEPAGESECURED: 'Kua ngita tēnā whārangi. Tāurua ō taipitoptio tuakiri ki raro, ā, mā mātou koe e tuku kia haere tonu.' - NOTERESETLINKINVALID: '

He muhu, kua mōnehu rānei te hono tautuhi kupuhipa anō.

Ka taea te tono i te mea hōui konei ka huri rānei i tō kupuhipa ā muri i tōtakiuru.

' NOTERESETPASSWORD: 'Tāurua tō wāhitau īmēra, mā mātou e tuku tētahi hono ki a koe e taea ai te tautuhi anō i tō kupuhipa' - PASSWORDSENTHEADER: 'I tukuna he hono tautuhi kupuhipa anō ki ''{email}''' - PASSWORDSENTTEXT: 'Kia ora! Kua tukuna he hono tautuhi anō ki ''{email}'',engari rā kei te tīariari he pūkete mō taua wāhitau īmēra.' diff --git a/lang/nb.yml b/lang/nb.yml index 2825f7543..f1dc4c74d 100644 --- a/lang/nb.yml +++ b/lang/nb.yml @@ -7,8 +7,6 @@ nb: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'Ikke satt' - TODAY: 'i dag' VALIDDATEFORMAT2: 'Vennligst skriv inn et gyldig datoformat ({format})' VALIDDATEMAXDATE: 'Din dato må være eldre eller i samsvar med maksimum tillatte dato ({date})' VALIDDATEMINDATE: 'Din dato må være nyere eller i samsvar med minimum tillatte dato ({date})' @@ -41,7 +39,6 @@ nb: RelationSearch: Relasjonssøk ResetFilter: Tilbakestille SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Slett Delete: Slett DeletePermissionsFailure: 'Ikke tillatt å slette' EditPermissionsFailure: 'Ikke tilgang til å fjerne oppføringer' @@ -53,8 +50,6 @@ nb: DeletePermissionsFailure: 'Ikke tillatt å slette' Deleted: 'Slettet {type} {name}' Save: Lagre - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Rediger SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Mengde FIELDLABELCURRENCY: Valuta @@ -157,7 +152,4 @@ nb: LOGIN: 'Logg inn' LOSTPASSWORDHEADER: 'Mistet passord' NOTEPAGESECURED: 'Den siden er sikret. Skriv inn gyldig innloggingsinfo så kommer du inn.' - NOTERESETLINKINVALID: '

Lenken for å nullstille passordet er ugyldig eller utgått.

Du kan kreve en ny her eller endre passordet etter at du har logget inn.

' NOTERESETPASSWORD: 'Skriv inn epostadressen din og vi vil sende deg en lenke som nullstiller passordet.' - PASSWORDSENTHEADER: 'Lenke for nullstilling av passord ble sendt til ''{email}''' - PASSWORDSENTTEXT: 'Takk! En lenke for å lage nytt passord er sendt til ''{email}'', forutsatt at det eksisterer en konto for denne epostadressen.' diff --git a/lang/nl.yml b/lang/nl.yml index 2903dff05..f4e35af66 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -1,4 +1,26 @@ nl: + SilverStripe\Admin\LeftAndMain: + VersionUnknown: onbekend + SilverStripe\AssetAdmin\Forms\UploadField: + Dimensions: Afmetingen + EDIT: Bewerken + EDITINFO: 'Bewerk dit bestand' + REMOVE: Verwijder + SilverStripe\Control\ChangePasswordEmail_ss: + CHANGEPASSWORDFOREMAIL: 'Het wachtwoord voor het account met e-mailadres {email} is aangepast. Indien u uw wachtwoord niet heeft aangepast kunt u dat doen met onderstaande link.' + CHANGEPASSWORDTEXT1: 'U heeft het wachtwoord veranderd voor' + CHANGEPASSWORDTEXT3: 'Wachtwoord veranderen' + HELLO: Hallo + SilverStripe\Control\Email\ForgotPasswordEmail_ss: + HELLO: Hallo + TEXT1: 'Hier is uw' + TEXT2: 'link om uw wachtwoord opnieuw aan te maken' + TEXT3: voor + SilverStripe\Control\RequestProcessor: + INVALID_REQUEST: 'Fout bij verwerken' + REQUEST_ABORTED: 'Fout bij verwerken (geannuleerd)' + SilverStripe\Core\Manifest\VersionProvider: + VERSIONUNKNOWN: Onbekend SilverStripe\Forms\CheckboxField: NOANSWER: Nee YESANSWER: Ja @@ -8,22 +30,30 @@ nl: ATLEAST: 'Een wachtwoord moet tenminste {min} karakters hebben.' BETWEEN: 'Een wachtwoord moet tussen de {min} en {max} karakters hebben' CURRENT_PASSWORD_ERROR: 'Het wachtwoord dat u heeft ingevoerd is niet juist.' + CURRENT_PASSWORD_MISSING: 'Voer uw huidige wachtwoord in.' + LOGGED_IN_ERROR: 'U moet ingelogd zijn om uw wachtwoord te kunnen veranderen!' MAXIMUM: 'Een wachtwoord mag maximaal {max} karakters hebben.' SHOWONCLICKTITLE: 'Verander wachtwoord' SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'niet ingesteld' - TODAY: vandaag VALIDDATEFORMAT2: 'Vul een geldig datumformaat in ({format})' VALIDDATEMAXDATE: 'De datum moet ouder of gelijk zijn aan de maximale datum ({date})' VALIDDATEMINDATE: 'De datum moet nieuwer of gelijk zijn aan de minimale datum ({date})' + SilverStripe\Forms\DatetimeField: + VALIDDATEMAXDATETIME: 'De datum moet ouder of gelijk zijn aan de maximale datum ({datetime})' + VALIDDATETIMEFORMAT: 'Vul een geldige datum in ({format})' + VALIDDATETIMEMINDATE: 'De datum moet nieuwer of gelijk zijn aan de minimale datum ({datetime})' SilverStripe\Forms\DropdownField: CHOOSE: (Kies) + CHOOSE_MODEL: '(Selecteer {name})' SOURCE_VALIDATION: 'Selecteer een optie uit de lijst. {value} is geen geldige keuze.' SilverStripe\Forms\EmailField: VALIDATION: 'Gelieve een e-mailadres in te voeren.' + SilverStripe\Forms\FileUploadReceiver: + FIELDNOTSET: 'Bestandsinformatie niet gevonden' SilverStripe\Forms\Form: + BAD_METHOD: 'Dit formulier moet middels {method} verzonden worden' CSRF_EXPIRED_MESSAGE: 'Uw sessie is verlopen. Verzend het formulier opnieuw.' CSRF_FAILED_MESSAGE: 'Er lijkt een technisch probleem te zijn. Klik op de knop terug, vernieuw uw browser, en probeer het opnieuw.' VALIDATIONPASSWORDSDONTMATCH: 'Wachtwoorden komen niet overeen' @@ -32,7 +62,10 @@ nl: VALIDATOR: Validator VALIDCURRENCY: 'Vul een geldige munteenheid in' SilverStripe\Forms\FormField: + EXAMPLE: 'bijv. {format}' NONE: geen + SilverStripe\Forms\FormScaffolder: + TABMAIN: Hoofdgedeelte SilverStripe\Forms\GridField\GridField: Add: '{name} toevoegen' CSVEXPORT: 'Exporteer naar CSV' @@ -51,7 +84,6 @@ nl: RelationSearch: 'Zoek relatie' ResetFilter: Resetten SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Verwijderen Delete: Verwijder DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen' EditPermissionsFailure: 'Geen toelating om te ontkoppelen' @@ -63,29 +95,63 @@ nl: DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen' Deleted: '{type} {name} verwijderd' Save: Opslaan - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Bewerken + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'U kunt uzelf niet verwijderen van deze groep, omdat u dan geen admin-rechten meer heeft.' + SilverStripe\Forms\GridField\GridFieldPaginator: + OF: van + Page: Pagina + View: Bekijk SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Aantal FIELDLABELCURRENCY: Munteenheid + INVALID_CURRENCY: 'Valuta {currency} is niet toegestaan' + SilverStripe\Forms\MultiSelectField: + SOURCE_VALIDATION: 'Selecteer een optie uit de lijst. {value} is geen geldige keuze.' SilverStripe\Forms\NullableField: IsNullLabel: 'Is null' SilverStripe\Forms\NumericField: VALIDATION: '''{value}'' is geen getal, enkel getallen worden door dit veld geaccepteerd' SilverStripe\Forms\TimeField: VALIDATEFORMAT: 'Vul een geldig datumformaat in ({format})' + SilverStripe\ORM\DataObject: + PLURALNAME: 'Data objecten' + PLURALS: + one: 'Data object' + other: '{count} Data objecten' + SINGULARNAME: 'Data object' SilverStripe\ORM\FieldType\DBBoolean: ANY: Elke NOANSWER: Nee YESANSWER: Ja SilverStripe\ORM\FieldType\DBDate: + DAYS_SHORT_PLURALS: + one: '{count} dag' + other: '{count} dagen' + HOURS_SHORT_PLURALS: + one: '{count} uur' + other: '{count} uren' LessThanMinuteAgo: 'minder dan één minuut' + MINUTES_SHORT_PLURALS: + one: '{count} minuut' + other: '{count} minuten' + MONTHS_SHORT_PLURALS: + one: '{count} maand' + other: '{count} maanden' + SECONDS_SHORT_PLURALS: + one: '{count} seconde' + other: '{count} seconden' TIMEDIFFAGO: '{difference} geleden' TIMEDIFFIN: 'in {difference}' + YEARS_SHORT_PLURALS: + one: '{count} jaar' + other: '{count} jaren' SilverStripe\ORM\FieldType\DBEnum: ANY: Elke + SilverStripe\ORM\Hierarchy: + LIMITED_TITLE: 'Teveel onderliggende items ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: InfiniteLoopNotAllowed: 'Oneindige lus gevonden in "{type}" hiërarchie. Wijzig het hogere niveau om dit op te lossen' + LIMITED_TITLE: 'Teveel onderliggende items ({count})' SilverStripe\ORM\ValidationException: DEFAULT_ERROR: Validatiefout SilverStripe\Security\BasicAuth: @@ -96,34 +162,60 @@ nl: PASSWORDEXPIRED: '

Uw wachtwoord is verlopen. Kies een nieuw wachtwoord.

' SilverStripe\Security\CMSSecurity: INVALIDUSER: '

Ongeldige gebruiker Log hier opnieuw in om verder te gaan.

' + LOGIN_MESSAGE: 'Sessie is verlopen' + LOGIN_TITLE: '

U kunt verder met wat u aan het doen was, door opnieuw in te loggen.

' SUCCESS: Succes SUCCESSCONTENT: '

U bent ingelogd. Klik hier als u niet automatisch wordt doorgestuurd.

' + SUCCESS_TITLE: 'Inloggen is gelukt' + SilverStripe\Security\DefaultAdminService: + DefaultAdminFirstname: 'Standaard Beheerder' SilverStripe\Security\Group: AddRole: 'Voeg een rol toe aan deze groep' Code: 'Groep code' DefaultGroupTitleAdministrators: Beheerders DefaultGroupTitleContentAuthors: 'Inhoud Auteurs' Description: 'Omschrijving ' + GROUPNAME: 'Groep naam' GroupReminder: 'Als u de bovenliggende groep selecteert, neemt deze groep alle rollen over' HierarchyPermsError: 'U moet (ADMIN) rechten hebben om de bovenliggende groep "{group}" toe te kennen' Locked: 'Gesloten?' + MEMBERS: Leden + NEWGROUP: 'Nieuwe groep' NoRoles: 'Geen rollen gevonden' + PERMISSIONS: Rechten + PLURALNAME: Groepen + PLURALS: + one: 'Een groep' + other: '{count} groepen' Parent: 'Bovenliggende groep' + ROLES: Rollen + ROLESDESCRIPTION: 'Rollen zijn logische groeperingen van rechten die in het Rollen tabblad gewijzigd kunnen worden.
Rollen worden automatisch overgenomen van bovenliggende groepen.' RolesAddEditLink: 'Rollen beheren' + SINGULARNAME: Groep Sort: Sorteer-richting has_many_Permissions: Rechten many_many_Members: Leden SilverStripe\Security\LoginAttempt: + Email: 'E-mailadres ' + EmailHashed: 'E-mailadres (versleuteld)' IP: 'IP adres' + PLURALNAME: Inlogpogingen + PLURALS: + one: 'Een inlogpoging' + other: '{count} inlogpogingen' + SINGULARNAME: Inlogpogingen Status: Status SilverStripe\Security\Member: ADDGROUP: 'Groep toevoegen' BUTTONCHANGEPASSWORD: 'Wachtwoord veranderen' BUTTONLOGIN: Inloggen BUTTONLOGINOTHER: 'Als iemand anders inloggen' + BUTTONLOGOUT: Uitloggen BUTTONLOSTPASSWORD: 'Ik ben mijn wachtwoord vergeten' CONFIRMNEWPASSWORD: 'Bevestig het nieuwe wachtwoord' CONFIRMPASSWORD: 'Bevestig wachtwoord' + CURRENT_PASSWORD: 'Huidige wachtwoord' + EDIT_PASSWORD: 'Nieuw wachtwoord' EMAIL: E-mail EMPTYNEWPASSWORD: 'Het nieuwe wachtwoord mag niet leeg zijn, probeer opnieuw' ENTEREMAIL: 'Typ uw e-mailadres om een link te ontvangen waarmee u uw wachtwoord kunt resetten.' @@ -133,13 +225,21 @@ nl: ERRORWRONGCRED: 'De ingevulde gegevens lijken niet correct. Probeer het nog een keer.' FIRSTNAME: Voornaam INTERFACELANG: 'Interface taal' + KEEPMESIGNEDIN: 'Houd mij ingelogd' LOGGEDINAS: 'U bent ingelogd als {name}.' NEWPASSWORD: 'Nieuw wachtwoord' PASSWORD: Wachtwoord PASSWORDEXPIRED: 'Uw wachtwoord is verlopen. Kies een nieuw wachtwoord.' + PLURALNAME: Leden + PLURALS: + one: 'Een lid' + other: '{count} leden' + REMEMBERME: 'Onthoud mij voor volgende keer? (voor {count} dagen op dit apparaat)' + SINGULARNAME: Lid SUBJECTPASSWORDCHANGED: 'Uw wachtwoord is veranderd' SUBJECTPASSWORDRESET: 'Link om uw wachtwoord opnieuw aan te maken' SURNAME: Achternaam + VALIDATIONADMINLOSTACCESS: 'Niet mogelijk om alle admin-groepen te verwijderen van uw profiel' ValidationIdentifierFailed: 'Een bestaande gebruiker #{id} kan niet dezelfde unieke velden hebben ({name} = {value}))' WELCOMEBACK: 'Welkom terug, {firstname}' YOUROLDPASSWORD: 'Uw oude wachtwoord' @@ -148,15 +248,38 @@ nl: db_LockedOutUntil: 'Gesloten tot' db_Password: Wachtwoord db_PasswordExpiry: 'Wachtwoord vervaldatum' + SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: + AUTHENTICATORNAME: Inlogformulier + BUTTONFORGOTPASSWORD: 'Wachtwoord vergeten' + BUTTONLOGIN: 'Opnieuw inloggen' + BUTTONLOGOUT: Uitloggen + SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: + ERRORWRONGCRED: 'De ingevulde gegevens lijken niet correct. Probeer het nog een keer.' + NoPassword: 'Er is geen wachtwoord voor deze gebruiker.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'E-mail & wachtwoord' + SilverStripe\Security\MemberPassword: + PLURALNAME: Gebruikerswachtwoorden + PLURALS: + one: 'Een gebruikerswachtwoord' + other: '{count} Gebruikerswachtwoorden' + SINGULARNAME: Gebruikerswachtwoord SilverStripe\Security\PasswordValidator: LOWCHARSTRENGTH: 'Maak a.u.b. uw wachtwoord sterker door enkele van de volgende karakters te gebruiken: {chars}' PREVPASSWORD: 'U heeft dit wachtwoord in het verleden al gebruikt, kies a.u.b. een nieuw wachtwoord.' TOOSHORT: 'Het wachtwoord is te kort, het moet minimaal {minimum} karakters hebben' SilverStripe\Security\Permission: AdminGroup: Beheerder + CMS_ACCESS_CATEGORY: 'CMS toegang' CONTENT_CATEGORY: Inhoudsrechten FULLADMINRIGHTS: 'Volledige admin rechten' FULLADMINRIGHTS_HELP: 'Impliceert en overstemt alle andere toegewezen rechten.' + PERMISSIONS_CATEGORY: 'Rollen en toegangsrechten' + PLURALNAME: Rechten + PLURALS: + one: Machtiging + other: '{count} rechten' + SINGULARNAME: Machtiging UserPermissionsIntro: 'Groepen aan deze gebruiker toewijzen zullen diens permissies aanpassen. Zie de sectie Groepen voor meer informatie over machtigingen voor afzonderlijke groepen.' SilverStripe\Security\PermissionCheckboxSetField: AssignedTo: 'toegewezen aan "{title}"' @@ -166,21 +289,34 @@ nl: SilverStripe\Security\PermissionRole: OnlyAdminCanApply: 'Alleen admin kan doorvoeren' PLURALNAME: Rollen + PLURALS: + one: 'Een rol' + other: '{count} rollen' SINGULARNAME: Rol Title: Titel SilverStripe\Security\PermissionRoleCode: + PLURALNAME: 'Permissie codes' + PLURALS: + one: 'Een permissiecode' + other: '{count} permissiecodes' PermsError: 'U moet (ADMIN) rechten hebben om de code "{code}" toe te kennen' + SINGULARNAME: Permissiecode + SilverStripe\Security\RememberLoginHash: + PLURALNAME: 'Versleutelde logins' + PLURALS: + one: 'Een versleutelde login' + other: '{count} versleutelde logins' + SINGULARNAME: 'Versleutelde login' SilverStripe\Security\Security: ALREADYLOGGEDIN: 'U hebt geen toegang tot deze pagina. Als u een andere account met de nodige rechten hebt, kan u hieronder opnieuw inloggen.' BUTTONSEND: 'Nieuw wachtwoord aanmaken' CHANGEPASSWORDBELOW: 'U kunt uw wachtwoord hieronder veranderen.' CHANGEPASSWORDHEADER: 'Verander uw wachtwoord' + CONFIRMLOGOUT: 'Klik op onderstaande knop om uit te loggen.' ENTERNEWPASSWORD: 'Voer een nieuw wachtwoord in.' ERRORPASSWORDPERMISSION: 'U moet ingelogd zijn om uw wachtwoord te kunnen veranderen!' LOGIN: 'Meld aan' + LOGOUT: Uitloggen LOSTPASSWORDHEADER: 'Wachtwoord vergeten' NOTEPAGESECURED: 'Deze pagina is beveiligd. Voer uw gegevens in en u wordt automatisch doorgestuurd.' - NOTERESETLINKINVALID: '

De link om uw wachtwoord te kunnen wijzigen is niet meer geldig.

U kunt een nieuwe link aanvragen of uw wachtwoord aanpassen door in te loggen.

' NOTERESETPASSWORD: 'Voer uw e-mailadres in en we sturen een link waarmee u een nieuw wachtwoord kunt instellen.' - PASSWORDSENTHEADER: 'Wachtwoord herstel link verzonden naar {email}' - PASSWORDSENTTEXT: 'Bedankt! Er is een link verstuurd naar {email} om uw wachtwoord opnieuw in te stellen, in de veronderstelling dat er een account bestaat voor dit e-mailadres.' diff --git a/lang/pl.yml b/lang/pl.yml index 03753f33b..1905acb38 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -1,34 +1,77 @@ pl: + SilverStripe\Admin\LeftAndMain: + VersionUnknown: Nieznany + SilverStripe\AssetAdmin\Forms\UploadField: + Dimensions: Rozmiar + EDIT: Edytuj + EDITINFO: 'Edytuj plik' + REMOVE: Usuń + SilverStripe\Control\ChangePasswordEmail_ss: + CHANGEPASSWORDFOREMAIL: 'Hasło do konta o adresie e-mail {email} zostało zmienione. Jeśli nie zmieniłeś swojego hasła, zmień hasło, korzystając z poniższego linku' + CHANGEPASSWORDTEXT1: 'Zmieniłeś hasło na' + CHANGEPASSWORDTEXT3: 'Zmień hasło' + HELLO: 'Witaj,' + SilverStripe\Control\Email\ForgotPasswordEmail_ss: + HELLO: 'Witaj,' + TEXT1: 'Oto twój' + TEXT2: 'link zmiany hasła' + TEXT3: dla + SilverStripe\Control\RequestProcessor: + INVALID_REQUEST: 'Nieprawidłowe żądanie' + REQUEST_ABORTED: 'Żądanie zostało przerwane' + SilverStripe\Core\Manifest\VersionProvider: + VERSIONUNKNOWN: Nieznany + SilverStripe\Forms\CheckboxField: + NOANSWER: Nie + YESANSWER: Tak + SilverStripe\Forms\CheckboxSetField_ss: + NOOPTIONSAVAILABLE: 'Brak dostępnych opcji' SilverStripe\Forms\ConfirmedPasswordField: ATLEAST: 'Hasła muszą mieć przynajmniej {min} znaków.' BETWEEN: 'Hasła muszą mieć długość pomiędzy {min} a {max} znaków.' + CURRENT_PASSWORD_ERROR: 'Podane hasło jest nieprawidłowe' + CURRENT_PASSWORD_MISSING: 'Musisz podać swoje aktualne hasło.' + LOGGED_IN_ERROR: 'Musisz być zalogowany aby zmienić hasło' MAXIMUM: 'Hasła mogą mieć co najwyżej {max} znaków.' SHOWONCLICKTITLE: 'Zmiana Hasła' SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'nie ustawiono' - TODAY: dzisiaj VALIDDATEFORMAT2: 'Proszę wprowadź prawidłowy format daty ({format})' VALIDDATEMAXDATE: 'Twoja data musi być wcześniejsza lub taka sama, jak maksymalna dozwolona data ({date})' VALIDDATEMINDATE: 'Twoja data musi być późniejsza lub taka sama, jak minimalna dozwolona data ({date})' + SilverStripe\Forms\DatetimeField: + VALIDDATEMAXDATETIME: 'Twoja data musi być wcześniejsza lub taka sama, jak maksymalna dozwolona data ({date})' + VALIDDATETIMEFORMAT: 'Proszę wprowadź prawidłowy format czasu ({format})' + VALIDDATETIMEMINDATE: 'Twoja data musi być późniejsza lub taka sama, jak minimalna dozwolona data ({date})' SilverStripe\Forms\DropdownField: CHOOSE: (wybierz) + CHOOSE_MODEL: '(Wybierz {name})' + SOURCE_VALIDATION: 'Wybierz wartość z podanej listy. {value} nie jest poprawną opcją' SilverStripe\Forms\EmailField: VALIDATION: 'Proszę podaj adres e-mail' + SilverStripe\Forms\FileUploadReceiver: + FIELDNOTSET: 'Nie znaleziono informacji o pliku' SilverStripe\Forms\Form: + BAD_METHOD: 'Ten formularz wymaga {metody} przesłania' + CSRF_EXPIRED_MESSAGE: 'Twoja sesja wygasła. Prześlij ponownie formularz.' + CSRF_FAILED_MESSAGE: 'Wygląda na to, że wystąpił błąd techniczny. Kliknij przycisk wstecz, następnie odśwież przeglądarkę aby wczytać stronę ponownie.' VALIDATIONPASSWORDSDONTMATCH: 'Hasła nie są takie same' VALIDATIONPASSWORDSNOTEMPTY: 'Hasło nie może być puste' VALIDATIONSTRONGPASSWORD: 'Hasła muszą mieć przynajmniej jedną cyfrę oraz jeden znak alfanumeryczny.' VALIDATOR: Walidator VALIDCURRENCY: 'Proszę podaj prawidłową walutę' SilverStripe\Forms\FormField: + EXAMPLE: 'na przykład {format}' NONE: brak + SilverStripe\Forms\FormScaffolder: + TABMAIN: Główny SilverStripe\Forms\GridField\GridField: Add: 'Dodaj {name}' CSVEXPORT: 'Eksportuj do CSV' + CSVIMPORT: 'Import z CSV' Filter: Filtr - FilterBy: 'Filtruj wg' + FilterBy: 'Filtruj wg ' Find: Wyszukaj LinkExisting: 'Linkuj istniejący' NewRecord: 'Nowy {type}' @@ -41,7 +84,6 @@ pl: RelationSearch: 'Wyszukiwanie powiązań' ResetFilter: Resetuj SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Usuń Delete: Usuń DeletePermissionsFailure: 'Brak uprawnień do usuwania' EditPermissionsFailure: 'Nie masz uprawnień, aby odłączyć rekord' @@ -53,57 +95,145 @@ pl: DeletePermissionsFailure: 'Brak uprawnień do usuwania' Deleted: 'Usunięto {type} {name}' Save: Zapisz - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Edytuj + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'Nie możesz usunąć siebie z tej grupy, stracone zostałby prawa administratora' + SilverStripe\Forms\GridField\GridFieldPaginator: + OF: z + Page: Strona + View: Widok SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Ilość FIELDLABELCURRENCY: waluta + INVALID_CURRENCY: 'Waluta {currency} nie znajduje się na liście dozwolonych walut' + SilverStripe\Forms\MultiSelectField: + SOURCE_VALIDATION: 'Wybierz wartości z podanej listy. Podano niepoprawną opcję {value}' SilverStripe\Forms\NullableField: IsNullLabel: 'Jest Pusty' SilverStripe\Forms\NumericField: VALIDATION: '''{value}'' nie jest liczbą, to pole przyjmuje tylko liczby' SilverStripe\Forms\TimeField: VALIDATEFORMAT: 'Proszę wprowadź prawidłowy format czasu ({format})' + SilverStripe\ORM\DataObject: + PLURALNAME: 'Obiekty danych' + PLURALS: + one: 'Obiekt danych' + few: 'Obiektów danych' + many: 'Obiektów danych' + other: 'Obiektów danych {count}' + SINGULARNAME: 'Obiekt danych' SilverStripe\ORM\FieldType\DBBoolean: ANY: Jakikolwiek + NOANSWER: Nie + YESANSWER: Tak SilverStripe\ORM\FieldType\DBDate: + DAYS_SHORT_PLURALS: + one: '{count} dzień' + few: '{count} dni' + many: '{count} dni' + other: '{count} dni' + HOURS_SHORT_PLURALS: + one: '{count} godzina' + few: '{count} godzin' + many: '{count} godzin' + other: '{count} godzin' LessThanMinuteAgo: 'mniej niż minuta' + MINUTES_SHORT_PLURALS: + one: '{count} minuta' + few: '{count} minut' + many: '{count} minut' + other: '{count} minut' + MONTHS_SHORT_PLURALS: + one: '{count} miesiąc' + few: '{count} miesięcy' + many: '{count} miesięcy' + other: '{count} miesięcy' + SECONDS_SHORT_PLURALS: + one: '{count} sekunda' + few: '{count} sekund' + many: '{count} sekund' + other: '{count} sekund' TIMEDIFFAGO: '{difference} temu' TIMEDIFFIN: 'w {difference}' + YEARS_SHORT_PLURALS: + one: '{count} rok' + few: '{count} lat' + many: '{count} lat' + other: '{count} lat' SilverStripe\ORM\FieldType\DBEnum: ANY: Jakikolwiek + SilverStripe\ORM\Hierarchy: + LIMITED_TITLE: 'Zbyt wiele dzieci ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: InfiniteLoopNotAllowed: 'Znaleziono nieskończoną pętlę wewnątrz hierarchii "{type}". Proszę zmień rodzica by to rozwiązać.' + LIMITED_TITLE: 'Zbyt wiele dzieci ({count})' + SilverStripe\ORM\ValidationException: + DEFAULT_ERROR: 'Niepoprawne dane' SilverStripe\Security\BasicAuth: ENTERINFO: 'Wprowadź username i hasło' ERRORNOTADMIN: 'Ten użytkownik nie jest administratorem' ERRORNOTREC: 'Nie istnieje taki username/hasło' + SilverStripe\Security\CMSMemberLoginForm: + PASSWORDEXPIRED: '

Twoje hasło wygasło. Prosimy wybrać nowe.

' + SilverStripe\Security\CMSSecurity: + INVALIDUSER: '

Niepoprawny użytkownik. Prosimy o ponownie uwierzytelnienie – aby kontynuować.

' + LOGIN_MESSAGE: '

Twoja sesja wygasła z powodu braku aktywności

' + LOGIN_TITLE: 'Wróć do strony, z którym połączenie zostało przerwane, logując się ponownie' + SUCCESS: Sukces + SUCCESSCONTENT: '

Zalogowano poprawnie! Jeżeli nie zostaniesz automatycznie przekierowany kliknij tutaj

' + SUCCESS_TITLE: 'Zalogowano poprawne' + SilverStripe\Security\DefaultAdminService: + DefaultAdminFirstname: 'Domyślny administrator' SilverStripe\Security\Group: AddRole: 'Dodaj rolę dla tej grupy' Code: 'Kod Grupy' DefaultGroupTitleAdministrators: Administratorzy DefaultGroupTitleContentAuthors: 'Autor treści' Description: Opis + GROUPNAME: 'Nazwa Grupy' GroupReminder: 'Jeśli wybierzesz nadrzędną grupę, obecna grupa otrzyma wszystkie jej role' HierarchyPermsError: 'Nie można przyporządkować uprzywilejowanej grupy "{group}" (wymagane uprawnienie ADMIN)' Locked: 'Zablokowana?' + MEMBERS: Użytkownicy + NEWGROUP: 'Nowa grupa' NoRoles: 'Nie znaleziono ról' + PERMISSIONS: Uprawnienia + PLURALNAME: Grupy + PLURALS: + one: Grupa + few: Grup + many: Grup + other: '{count} grup' Parent: 'Grupa nadrzędna' + ROLES: Role + ROLESDESCRIPTION: 'Role są wstępnie zdefiniowanymi zestawami uprawnień i można je przypisać do grup.
TW razie potrzeby są one dziedziczone z grup nadrzędnych.' RolesAddEditLink: 'Zarządzaj rolami' + SINGULARNAME: Grupa Sort: 'Kolejność Sortowania' has_many_Permissions: Zezwolenia many_many_Members: Użytkownicy SilverStripe\Security\LoginAttempt: + Email: 'Adres e-mail' + EmailHashed: 'Adres e-mail (hashed)' IP: 'Adres IP' + PLURALNAME: 'Próby logowania' + PLURALS: + one: 'Próba logowania' + few: 'Prób logowania' + many: 'Próby logowania {count}' + other: 'Próby logowania {count}' + SINGULARNAME: 'Próba logowania' Status: Status SilverStripe\Security\Member: ADDGROUP: 'Dodaj grupę' BUTTONCHANGEPASSWORD: 'Zmień hasło' BUTTONLOGIN: Zaloguj BUTTONLOGINOTHER: 'Zaloguj jako ktoś inny' + BUTTONLOGOUT: 'Wyloguj się' BUTTONLOSTPASSWORD: 'Zgubiłem hasło' CONFIRMNEWPASSWORD: 'Potwierdź nowe hasło' CONFIRMPASSWORD: 'Potwierdź hasło' + CURRENT_PASSWORD: 'Aktualne hasło' + EDIT_PASSWORD: 'Nowe hasło' EMAIL: E-mail EMPTYNEWPASSWORD: 'Nowe hasło nie może być puste, spróbuj ponownie.' ENTEREMAIL: 'Wpisz adres e-mail aby otrzymać link do zmiany hasła.' @@ -113,12 +243,23 @@ pl: ERRORWRONGCRED: 'Podane dane są niepoprawne. Proszę spróbować ponownie.' FIRSTNAME: Imię INTERFACELANG: 'Język interfejsu' + KEEPMESIGNEDIN: 'Zapamiętaj mnie' LOGGEDINAS: 'Zostałeś zalogowany jako {name}.' NEWPASSWORD: 'Nowe hasło' PASSWORD: Hasło + PASSWORDEXPIRED: 'Twoje hasło wygasło. Prosimy ustawić nowe.' + PLURALNAME: Użytkownicy + PLURALS: + one: Użytkownik + few: '{count} użytkowników' + many: '{count} użytkowników' + other: '{count} użytkowników' + REMEMBERME: 'Pamiętaj mnie następnym razem? (przez {count} dni na tym urządzeniu)' + SINGULARNAME: Użytkownik SUBJECTPASSWORDCHANGED: 'Twoje hasło zostało zmienione' SUBJECTPASSWORDRESET: 'Twój link do zmiany hasła' SURNAME: Nazwisko + VALIDATIONADMINLOSTACCESS: 'Nie można usunąć wszystkich grup administracyjnych z Twojego profilu' ValidationIdentifierFailed: 'Nie można nadpisać istniejącego użytkownika #{id} o identycznym identyfikatorze ({name} = {value})' WELCOMEBACK: 'Witaj ponownie, {firstname}' YOUROLDPASSWORD: 'Twoje stare hasło' @@ -127,15 +268,42 @@ pl: db_LockedOutUntil: 'Zablokowany do' db_Password: Hasło db_PasswordExpiry: 'Data wygaśnięcia hasła' + SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: + AUTHENTICATORNAME: 'Formularz logowania użytkownika CMS' + BUTTONFORGOTPASSWORD: 'Zapomniałeś hasła?' + BUTTONLOGIN: 'Zaloguj mnie spowrotem' + BUTTONLOGOUT: 'Wyloguj się' + SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: + ERRORWRONGCRED: 'Podane dane są niepoprawne. Proszę spróbować ponownie.' + NoPassword: 'Hasło nie zostało skonfigurowane dla tego użytkownika.' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'E-mail i hasło' + SilverStripe\Security\MemberPassword: + PLURALNAME: 'Hasła użytkownika' + PLURALS: + one: 'Hasło użytkownika' + few: 'Haseł użytkownika' + many: 'Haseł użytkownika' + other: '{count} haseł użytkownika ' + SINGULARNAME: 'Hasło użytkownika' SilverStripe\Security\PasswordValidator: LOWCHARSTRENGTH: 'Proszę zwiększyć siłę hasła, dodając niektóre z następujących znaków: % s' PREVPASSWORD: 'Użyłeś już tego hasła wcześniej, proszę wybrać nowe' TOOSHORT: 'Hasło jest za krótkie, proszę podać {minimum} znaków lub więcej' SilverStripe\Security\Permission: AdminGroup: Administrator + CMS_ACCESS_CATEGORY: 'Dostęp do CMS''a' CONTENT_CATEGORY: 'Uprawnienie edycji treści' FULLADMINRIGHTS: 'Pełne prawa administracyjne' FULLADMINRIGHTS_HELP: 'Zatwierdza i nadpisuje wszystkie istniejące uprawnienia' + PERMISSIONS_CATEGORY: 'Uprawnienia ról i dostępu' + PLURALNAME: Uprawnienia + PLURALS: + one: Uprawnienie + few: Uprawnień + many: Uprawnień + other: '{count} uprawnień' + SINGULARNAME: Uprawnienie UserPermissionsIntro: 'Przydzielenie grup temu użytkownikowi spowoduje zmianę jego uprawnień. Odwołaj się do sekcji Grupy aby dowiedzieć się więcej o uprawnieniach grupowych.' SilverStripe\Security\PermissionCheckboxSetField: AssignedTo: 'przypisany do "{title}"' @@ -144,20 +312,41 @@ pl: FromRoleOnGroup: 'odziedziczone z roli "{roletitle}" w grupie "{grouptitle}"' SilverStripe\Security\PermissionRole: OnlyAdminCanApply: 'Tylko administrator może to zastosować' + PLURALNAME: Role + PLURALS: + one: Rola + few: ról + many: ról + other: '{count} ról' + SINGULARNAME: Rola Title: Tytuł SilverStripe\Security\PermissionRoleCode: + PLURALNAME: 'Kod roli uprawnienia' + PLURALS: + one: 'Kod roli uprawnienia' + few: 'Kodów ról uprawnień' + many: 'Kodów ról uprawnień' + other: '{count} kodów ról uprawnień' PermsError: 'Nie można przyporządkować uprzywilejowanego uprawnienia "{code}" (wymagane uprawnienie ADMIN)' + SINGULARNAME: 'Kod roli uprawnienia' + SilverStripe\Security\RememberLoginHash: + PLURALNAME: 'Hasła logowania' + PLURALS: + one: 'Hasło logowania' + few: 'Haseł logowania' + many: 'Haseł logowania' + other: '{count} haseł logowania' + SINGULARNAME: 'Hasło logowania' SilverStripe\Security\Security: ALREADYLOGGEDIN: 'Nie masz dostępu do tej strony. Jeśli posiadasz inne konto, które umożliwi Ci dostęp do tej strony, możesz się zalogować poniżej' BUTTONSEND: 'Wyślij mi link do zresetowania hasła' CHANGEPASSWORDBELOW: 'Możesz zmienić swoje hasło poniżej' CHANGEPASSWORDHEADER: 'Zmień swoje hasło' + CONFIRMLOGOUT: 'Kliknij przycisk poniżej, aby potwierdzić, że chcesz się wylogować.' ENTERNEWPASSWORD: 'Proszę wprowadż nowe hasło' ERRORPASSWORDPERMISSION: 'Musisz być zalogowany aby zmienić hasło' LOGIN: Logowanie + LOGOUT: 'Wyloguj się' LOSTPASSWORDHEADER: 'Nie pamiętam hasła' NOTEPAGESECURED: 'Ta strona jest zabezpieczona. Wpisz swoje dane a my wyślemy Ci potwierdzenie niebawem' - NOTERESETLINKINVALID: '

Link resetujący hasło wygasł lub jest nieprawidłowy.

Możesz poprosić o nowy tutaj lub zmień swoje hasło po zalogowaniu się.

' NOTERESETPASSWORD: 'Wpisz adres e-mail, na który mamy wysłać link gdzie możesz zresetować swoje hasło' - PASSWORDSENTHEADER: 'Link resetujący hasła został wysłany do ''{email}''' - PASSWORDSENTTEXT: 'Dziękujemy! Link resetujący hasło został wysłany do ''{email}'', o ile konto użytkownika dla takiego e-maila istnieje.' diff --git a/lang/pt.yml b/lang/pt.yml index b4b030690..2a7c645d2 100644 --- a/lang/pt.yml +++ b/lang/pt.yml @@ -1,9 +1,6 @@ pt: SilverStripe\Forms\ConfirmedPasswordField: SHOWONCLICKTITLE: 'Mudar password' - SilverStripe\Forms\DateField: - NOTSET: 'Não inserido' - TODAY: Hoje SilverStripe\Forms\DropdownField: CHOOSE: (Escolha) SilverStripe\Forms\Form: diff --git a/lang/pt_BR.yml b/lang/pt_BR.yml index fc7c41713..10d37fa3d 100644 --- a/lang/pt_BR.yml +++ b/lang/pt_BR.yml @@ -3,9 +3,6 @@ pt_BR: SHOWONCLICKTITLE: 'Trocar senha' SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: R$ - SilverStripe\Forms\DateField: - NOTSET: 'não informado' - TODAY: hoje SilverStripe\Forms\DropdownField: CHOOSE: Selecione SilverStripe\Forms\Form: diff --git a/lang/ro.yml b/lang/ro.yml index aa855a0d0..e02135a75 100644 --- a/lang/ro.yml +++ b/lang/ro.yml @@ -4,8 +4,6 @@ ro: BETWEEN: 'Parola trebuie să conțină între {min} și {max} caractere.' MAXIMUM: 'Parola trebuie să conțină cel mult {max} caractere.' SHOWONCLICKTITLE: 'Schimbare Parola' - SilverStripe\Forms\DateField: - TODAY: astăzi SilverStripe\Forms\DropdownField: CHOOSE: (Alege) SilverStripe\Forms\GridField\GridField: diff --git a/lang/ru.yml b/lang/ru.yml index 5d8cf119d..add72be7f 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -33,8 +33,6 @@ ru: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'не установлено' - TODAY: сегодня VALIDDATEFORMAT2: 'Пожалуйста, задайте верный формат даты ({format})' VALIDDATEMAXDATE: 'Требуется значение даты, совпадающее с максимальным ({date}) или более старое' VALIDDATEMINDATE: 'Требуется значение даты, совпадающее с минимальным ({date}) или более новое' @@ -82,7 +80,6 @@ ru: RelationSearch: 'Поиск отношений' ResetFilter: Сброс SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Удалить Delete: Удалить DeletePermissionsFailure: 'Нет прав на удаление' EditPermissionsFailure: 'Не достаточно прав для удаления записи' @@ -94,8 +91,6 @@ ru: DeletePermissionsFailure: 'Нет прав на удаление' Deleted: 'Удалено {type} {name}' Save: Сохранить - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Редактировать SilverStripe\Forms\GridField\GridFieldPaginator: OF: из Page: Страница @@ -344,7 +339,4 @@ ru: LOGOUT: Выйти LOSTPASSWORDHEADER: 'Восстановление пароля' NOTEPAGESECURED: 'Эта страница защищена. Пожалуйста, введите свои учетные данные для входа.' - NOTERESETLINKINVALID: '

Неверная ссылка переустановки пароля или время действия ссылки истекло.

Вы можете повторно запросить ссылку, щелкнув здесь, или поменять пароль, войдя в систему.

' NOTERESETPASSWORD: 'Введите Ваш адрес email, и Вам будет отправлена ссылка, по которой Вы сможете переустановить свой пароль' - PASSWORDSENTHEADER: 'Ссылка для переустановки пароля выслана на ''{email}''' - PASSWORDSENTTEXT: 'Ссылка переустановки пароля была выслана на адрес ''{email}'' (письмо дойдет до получателя только в том случае, если аккаунт с таким электронным адресом действительно зарегистрирован).' diff --git a/lang/sk.yml b/lang/sk.yml index dba7ecaaf..88f4bf260 100644 --- a/lang/sk.yml +++ b/lang/sk.yml @@ -37,8 +37,6 @@ sk: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: nezadané - TODAY: dnes VALIDDATEFORMAT2: 'Prosím zadajte platný formát dátumu ({format})' VALIDDATEMAXDATE: 'Váš dátum musí byť starší alebo odpovedajúci maximu povoleného dátumu ({date})' VALIDDATEMINDATE: 'Váš dátum musí byť novší alebo odpovedajúci minimu povoleného dátumu ({date})' @@ -78,7 +76,6 @@ sk: RelationSearch: 'Vzťah hľadania' ResetFilter: Reset SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Zmazať Delete: Zmazať DeletePermissionsFailure: 'Žiadne oprávnenia zmazať' EditPermissionsFailure: 'Žiadne oprávnenie pre odpojenie záznamu' @@ -90,12 +87,8 @@ sk: DeletePermissionsFailure: 'Žiadne oprávnenia zmazať' Deleted: 'Zmazané {type} {name}' Save: Uložiť - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Editovať SilverStripe\Forms\GridField\GridFieldPaginator: Page: Stránka - SilverStripe\Forms\GridField\GridFieldVersionedState: - ONLIVEONLYSHORT: 'Len publikované' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Množstvo FIELDLABELCURRENCY: Mena @@ -235,7 +228,4 @@ sk: LOGIN: Prihlásiť LOSTPASSWORDHEADER: 'Zabudnuté heslo' NOTEPAGESECURED: 'Táto stránka je zabezpečená. Zadajte svoje prihlasovacie údaje a my Vám zároveň pošleme práva.' - NOTERESETLINKINVALID: '

Odkaz na resetovanie hesla nie je platný alebo je vypršala jeho platnosť.

Môžete požiadať o nový tu alebo zmeňte svoje heslo po prihlásení.

' NOTERESETPASSWORD: 'Zadajte svoju e-mailovú adresu a my Vám pošleme odkaz na resetovanie hesla' - PASSWORDSENTHEADER: 'Odkaz na resetovanie hesla bol odoslaný na ''{email}''' - PASSWORDSENTTEXT: 'Ďakujeme! Resetovací odkaz bol odoslaný na ''''{email}'''', pokiaľ účet existuje pre túto emailovú adresu.' diff --git a/lang/sl.yml b/lang/sl.yml index 7e5138547..5496aff5f 100644 --- a/lang/sl.yml +++ b/lang/sl.yml @@ -5,8 +5,6 @@ sl: MAXIMUM: 'Geslo je lahko dolgo največ {max} znakov.' SHOWONCLICKTITLE: 'Spremeni geslo' SilverStripe\Forms\DateField: - NOTSET: 'ni nastavljeno' - TODAY: danes VALIDDATEFORMAT2: 'Prosim, vnesite ustrezno obliko datuma ({format})' VALIDDATEMAXDATE: 'Datum mora biti starejši ali enak največjemu dovoljenemu datumu ({date})' VALIDDATEMINDATE: 'Datum mora biti novejši ali enak najmanjšemu dovoljenemu datumu ({date})' @@ -40,7 +38,6 @@ sl: RelationSearch: 'Povezano iskanje' ResetFilter: Ponastavi SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Izbriši Delete: Izbriši DeletePermissionsFailure: 'Ni dovoljenja za brisanje' UnlinkRelation: 'Odstrani povezavo' @@ -51,8 +48,6 @@ sl: DeletePermissionsFailure: 'Ni dovoljenja za brisanje' Deleted: 'Izbrisanih {type} {name}' Save: Shrani - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Uredi SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Znesek FIELDLABELCURRENCY: Valuta @@ -140,7 +135,4 @@ sl: LOGIN: Prijava LOSTPASSWORDHEADER: 'Izgubljeno geslo' NOTEPAGESECURED: 'Stran je zaščitena. Da bi lahko nadaljevali, vpišite svoje podatke.' - NOTERESETLINKINVALID: '

Povezava za ponastavitev gesla je napačna ali pa je njena veljavnost potekla.

Tukaj lahko zaprosite za novo povezavo or pa zamenjate geslo, ko se prijavite v sistem.

' NOTERESETPASSWORD: 'Vpišite e-naslov, na katerega vam bomo poslali povezavo za ponastavitev gesla' - PASSWORDSENTHEADER: 'Povezava za ponastavitev gesla je bila poslana na e-naslov ''{email}''.' - PASSWORDSENTTEXT: 'Hvala! Povezava za ponastavitev gesla je bila poslana na e-naslov ''{email}'', ki je naveden kot e-naslov vašega računa. ' diff --git a/lang/sl_SI.yml b/lang/sl_SI.yml index 01fb8b0a3..ec4ad09e8 100644 --- a/lang/sl_SI.yml +++ b/lang/sl_SI.yml @@ -7,8 +7,6 @@ sl_SI: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: € SilverStripe\Forms\DateField: - NOTSET: 'ni nastavljeno' - TODAY: danes VALIDDATEFORMAT2: 'Prosimo vnesite veljavno obliko datuma ({format})' SilverStripe\Forms\DropdownField: CHOOSE: (Izberi) @@ -24,7 +22,6 @@ sl_SI: Print: Natisni ResetFilter: Resetiraj SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Izbriši Delete: Izbriši UnlinkRelation: 'Odstrani povezavo' SilverStripe\Forms\GridField\GridFieldDetailForm: @@ -34,8 +31,6 @@ sl_SI: DeletePermissionsFailure: 'Nimate pravic za brisanje' Deleted: 'Izbrisano {type} {name}' Save: Shrani - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Uredi SilverStripe\ORM\FieldType\DBBoolean: NOANSWER: Ne YESANSWER: Da diff --git a/lang/sr.yml b/lang/sr.yml index 4a989ee97..622b657b3 100644 --- a/lang/sr.yml +++ b/lang/sr.yml @@ -7,8 +7,6 @@ sr: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: дин. SilverStripe\Forms\DateField: - NOTSET: 'није подешено' - TODAY: данас VALIDDATEFORMAT2: 'Молимо Вас да унесете исправан формат датума ({format})' VALIDDATEMAXDATE: 'Датум не сме бити после ({date})' VALIDDATEMINDATE: 'Датум не сме бити пре ({date})' @@ -41,7 +39,6 @@ sr: RelationSearch: 'Претраживање релације' ResetFilter: 'Врати у пређашње стање' SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Избриши Delete: Избриши DeletePermissionsFailure: 'Немате дозволу за брисање' EditPermissionsFailure: 'Немате дозволу да раскинете линк са записом' @@ -53,8 +50,6 @@ sr: DeletePermissionsFailure: 'Немате право брисања' Deleted: 'Избрисано {type} {name}' Save: Сачувај - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Измени SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Износ FIELDLABELCURRENCY: Валута @@ -156,7 +151,4 @@ sr: ERRORPASSWORDPERMISSION: 'Морате да будете пријављени да бисте променили своју лозинку!' LOGIN: Пријављивање NOTEPAGESECURED: 'Ова страна је обезбеђена. Унесите своје податке и ми ћемо вам послати садржај.' - NOTERESETLINKINVALID: '

Линк за ресетовање лозинке је погрешан или је истекло време за његово коришћење.

Можете да захтевате нови овде или да промените Вашу лозинку након што се пријавите.

' NOTERESETPASSWORD: 'Унесите своју адресу е-поште и ми ћемо вам послати линк помоћу којег можете да промените своју лозинку' - PASSWORDSENTHEADER: 'Линк за ресетовање лозинке послат је на адресу е-поште: ''{email}''' - PASSWORDSENTTEXT: 'Хвала Вам! Линк за ресетовање лозинке је послат не адресу е-поште ''{email}''. Порука ће стићи примаоцу само ако постоји регистрован налог са том адресом е-поште.' diff --git a/lang/sr@latin.yml b/lang/sr@latin.yml index 957457b82..f91aa9337 100644 --- a/lang/sr@latin.yml +++ b/lang/sr@latin.yml @@ -7,8 +7,6 @@ sr@latin: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: din. SilverStripe\Forms\DateField: - NOTSET: 'nije podešeno' - TODAY: danas VALIDDATEFORMAT2: 'Molimo Vas da unesete ispravan format datuma ({format})' VALIDDATEMAXDATE: 'Datum ne sme biti posle ({date})' VALIDDATEMINDATE: 'Datum ne sme biti pre ({date})' @@ -41,7 +39,6 @@ sr@latin: RelationSearch: 'Pretraživanje relacije' ResetFilter: 'Vrati u pređašnje stanje' SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Izbriši Delete: Izbriši DeletePermissionsFailure: 'Nemate dozvolu za brisanje' EditPermissionsFailure: 'Nemate dozvolu da raskinete link sa zapisom' @@ -53,8 +50,6 @@ sr@latin: DeletePermissionsFailure: 'Nemate pravo brisanja' Deleted: 'Izbrisano {type} {name}' Save: Sačuvaj - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Izmeni SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Iznos FIELDLABELCURRENCY: Valuta @@ -155,7 +150,4 @@ sr@latin: ERRORPASSWORDPERMISSION: 'Morate da budete prijavljeni da biste promenili svoju lozinku!' LOGIN: Prijavljivanje NOTEPAGESECURED: 'Ova strana je obezbeđena. Unesite svoje podatke i mi ćemo vam poslati sadržaj.' - NOTERESETLINKINVALID: '

Link za resetovanje lozinke je pogrešan ili je isteklo vreme za njegovo korišćenje.

Možete da zahtevate novi ovde ili da promenite Vašu lozinku nakon što se prijavite.

' NOTERESETPASSWORD: 'Unesite svoju adresu e-pošte i mi ćemo vam poslati link pomoću kojeg možete da promenite svoju lozinku' - PASSWORDSENTHEADER: 'Link za resetovanje lozinke poslat je na adresu e-pošte: ''{email}''' - PASSWORDSENTTEXT: 'Hvala Vam! Link za resetovanje lozinke je poslat ne adresu e-pošte ''{email}''. Poruka će stići primaocu samo ako postoji registrovan nalog sa tom adresom e-pošte.' diff --git a/lang/sr_RS.yml b/lang/sr_RS.yml index 62d6aef15..298049430 100644 --- a/lang/sr_RS.yml +++ b/lang/sr_RS.yml @@ -7,8 +7,6 @@ sr_RS: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: дин. SilverStripe\Forms\DateField: - NOTSET: 'није подешено' - TODAY: данас VALIDDATEFORMAT2: 'Молимо Вас да унесете исправан формат датума ({format})' VALIDDATEMAXDATE: 'Датум не сме бити после ({date})' VALIDDATEMINDATE: 'Датум не сме бити пре ({date})' @@ -41,7 +39,6 @@ sr_RS: RelationSearch: 'Претраживање релације' ResetFilter: 'Врати у пређашње стање' SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Избриши Delete: Избриши DeletePermissionsFailure: 'Немате дозволу за брисање' EditPermissionsFailure: 'Немате дозволу да раскинете линк са записом' @@ -53,8 +50,6 @@ sr_RS: DeletePermissionsFailure: 'Немате право брисања' Deleted: 'Избрисано {type} {name}' Save: Сачувај - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Измени SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Износ FIELDLABELCURRENCY: Валута @@ -155,7 +150,4 @@ sr_RS: ERRORPASSWORDPERMISSION: 'Морате да будете пријављени да бисте променили своју лозинку!' LOGIN: Пријављивање NOTEPAGESECURED: 'Ова страна је обезбеђена. Унесите своје податке и ми ћемо вам послати садржај.' - NOTERESETLINKINVALID: '

Линк за ресетовање лозинке је погрешан или је истекло време за његово коришћење.

Можете да захтевате нови овде или да промените Вашу лозинку након што се пријавите.

' NOTERESETPASSWORD: 'Унесите своју адресу е-поште и ми ћемо вам послати линк помоћу којег можете да промените своју лозинку' - PASSWORDSENTHEADER: 'Линк за ресетовање лозинке послат је на адресу е-поште: ''{email}''' - PASSWORDSENTTEXT: 'Хвала Вам! Линк за ресетовање лозинке је послат не адресу е-поште ''{email}''. Порука ће стићи примаоцу само ако постоји регистрован налог са том адресом е-поште.' diff --git a/lang/sr_RS@latin.yml b/lang/sr_RS@latin.yml index c4c4b6900..453ffa17d 100644 --- a/lang/sr_RS@latin.yml +++ b/lang/sr_RS@latin.yml @@ -7,8 +7,6 @@ sr_RS@latin: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: din. SilverStripe\Forms\DateField: - NOTSET: 'nije podešeno' - TODAY: danas VALIDDATEFORMAT2: 'Molimo Vas da unesete ispravan format datuma ({format})' VALIDDATEMAXDATE: 'Datum ne sme biti posle ({date})' VALIDDATEMINDATE: 'Datum ne sme biti pre ({date})' @@ -41,7 +39,6 @@ sr_RS@latin: RelationSearch: 'Pretraživanje relacije' ResetFilter: 'Vrati u pređašnje stanje' SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Izbriši Delete: Izbriši DeletePermissionsFailure: 'Nemate dozvolu za brisanje' EditPermissionsFailure: 'Nemate dozvolu da raskinete link sa zapisom' @@ -53,8 +50,6 @@ sr_RS@latin: DeletePermissionsFailure: 'Nemate pravo brisanja' Deleted: 'Izbrisano {type} {name}' Save: Sačuvaj - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Izmeni SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Iznos FIELDLABELCURRENCY: Valuta @@ -156,7 +151,4 @@ sr_RS@latin: ERRORPASSWORDPERMISSION: 'Morate da budete prijavljeni da biste promenili svoju lozinku!' LOGIN: Prijavljivanje NOTEPAGESECURED: 'Ova strana je obezbeđena. Unesite svoje podatke i mi ćemo vam poslati sadržaj.' - NOTERESETLINKINVALID: '

Link za resetovanje lozinke je pogrešan ili je isteklo vreme za njegovo korišćenje.

Možete da zahtevate novi ovde ili da promenite Vašu lozinku nakon što se prijavite.

' NOTERESETPASSWORD: 'Unesite svoju adresu e-pošte i mi ćemo vam poslati link pomoću kojeg možete da promenite svoju lozinku' - PASSWORDSENTHEADER: 'Link za resetovanje lozinke poslat je na adresu e-pošte: ''{email}''' - PASSWORDSENTTEXT: 'Hvala Vam! Link za resetovanje lozinke je poslat ne adresu e-pošte ''{email}''. Poruka će stići primaocu samo ako postoji registrovan nalog sa tom adresom e-pošte.' diff --git a/lang/sv.yml b/lang/sv.yml index 7a8b5b903..88a3b3959 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -1,10 +1,35 @@ sv: + SilverStripe\Admin\LeftAndMain: + VersionUnknown: okänd + SilverStripe\AssetAdmin\Forms\UploadField: + Dimensions: Dimensioner + EDIT: Redigera + EDITINFO: 'Redigera filen' + REMOVE: 'Ta bort' + SilverStripe\Control\ChangePasswordEmail_ss: + CHANGEPASSWORDFOREMAIL: 'Lösenordet för kontot med e-postadressen {email} har ändrats. Om du inte ändrade ditt lösenord, vänligen ändra lösenordet via länken nedan.' + CHANGEPASSWORDTEXT1: 'Du har ändrat ditt lösenord för' + CHANGEPASSWORDTEXT3: 'Ändra lösenord' + HELLO: Hej + SilverStripe\Control\Email\ForgotPasswordEmail_ss: + HELLO: Hej + TEXT1: 'Här är din' + TEXT2: 'återställningslänk för lösenord' + TEXT3: för + SilverStripe\Control\RequestProcessor: + INVALID_REQUEST: 'Ogiltig förfrågan' + REQUEST_ABORTED: 'Förfrågan avbruten' + SilverStripe\Core\Manifest\VersionProvider: + VERSIONUNKNOWN: Okänd SilverStripe\Forms\CheckboxField: NOANSWER: Nej YESANSWER: Ja + SilverStripe\Forms\CheckboxSetField_ss: + NOOPTIONSAVAILABLE: 'Inga tillgängliga val' SilverStripe\Forms\ConfirmedPasswordField: ATLEAST: 'Lösenord måste vara minst {min} tecken långa.' BETWEEN: 'Lösenord måste vara {min} till {max} tecken långa.' + CURRENT_PASSWORD_ERROR: 'Lösenordet du angav är inte korrekt' CURRENT_PASSWORD_MISSING: 'Du måste ange ditt nuvarande lösenord' LOGGED_IN_ERROR: 'Du måste vara inloggad för att ändra ditt lösenord' MAXIMUM: 'Lösenord får som längst vara {max} tecken långa.' @@ -12,17 +37,23 @@ sv: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: $ SilverStripe\Forms\DateField: - NOTSET: 'inte angivet' - TODAY: 'i dag' VALIDDATEFORMAT2: 'Var god att ange datumet i ett giltigt format ({format})' VALIDDATEMAXDATE: 'Angivet datum måste vara tidigare eller samma som det senaste godkända datumet ({date})' VALIDDATEMINDATE: 'Angivet datum måste vara senare eller samma som det tidigaste godkända datumet ({date})' + SilverStripe\Forms\DatetimeField: + VALIDDATEMAXDATETIME: 'Angivet datum måste vara tidigare eller samma som det senast godkända datumet ({datetime})' + VALIDDATETIMEFORMAT: 'Vänligen ange datum och tid i ett giltigt format ({format})' + VALIDDATETIMEMINDATE: 'Angivet datum måste vara senare eller samma som det tidigast godkända datumet ({datetime})' SilverStripe\Forms\DropdownField: CHOOSE: (Välj) + CHOOSE_MODEL: '(Välj {name})' SOURCE_VALIDATION: 'Vänligen välj att värde i listan. {value} är inget giltigt val' SilverStripe\Forms\EmailField: VALIDATION: 'Var snäll och ange en epostadress' + SilverStripe\Forms\FileUploadReceiver: + FIELDNOTSET: 'Hittade ingen filinformation' SilverStripe\Forms\Form: + BAD_METHOD: 'Detta formulär måste skickas med metoden {method}' CSRF_EXPIRED_MESSAGE: 'Din session har upphört. Var god och skicka in formuläret på nytt.' CSRF_FAILED_MESSAGE: 'Ett tekniskt fel uppstod. Var god klicka på bakåt-knappen, ladda om sidan i webbläsaren och försök igen' VALIDATIONPASSWORDSDONTMATCH: 'Lösenorden stämmer inte överrens ' @@ -31,10 +62,12 @@ sv: VALIDATOR: Validator VALIDCURRENCY: 'Var vänlig ange en korrekt valuta' SilverStripe\Forms\FormField: + EXAMPLE: 't.ex. {format}' NONE: ingen SilverStripe\Forms\GridField\GridField: Add: 'Lägg till {name}' CSVEXPORT: 'Exportera till CSV' + CSVIMPORT: 'Importera från CSV' Filter: Filtrera FilterBy: 'Filtrera på' Find: Hitta @@ -49,7 +82,6 @@ sv: RelationSearch: Relationssökning ResetFilter: Rensa SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: Radera Delete: Radera DeletePermissionsFailure: 'Rättighet för att radera saknas' EditPermissionsFailure: 'Rättigheter för avlänkning saknas' @@ -61,29 +93,65 @@ sv: DeletePermissionsFailure: 'Rättighet för att radera saknas' Deleted: 'Raderade {type} {name}' Save: Spara - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: Redigera + SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: + UnlinkSelfFailure: 'Du kan inte radera dig själv från den här gruppen, då du då kommer att förlora dina admin-rättigheter' + SilverStripe\Forms\GridField\GridFieldPaginator: + OF: av + Page: Sida + View: Visa SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Belopp FIELDLABELCURRENCY: Valuta + INVALID_CURRENCY: 'Valutan {currency} finns inte med i listan med tillåtna valutor' + SilverStripe\Forms\MultiSelectField: + SOURCE_VALIDATION: 'Vänligen välj ett värde i listan. {value} är inget giltigt val' SilverStripe\Forms\NullableField: IsNullLabel: 'Är NULL' SilverStripe\Forms\NumericField: VALIDATION: '''{value}'' är inget nummer, bara siffror (utan mellanslag) kan accepteras för det här fältet' SilverStripe\Forms\TimeField: VALIDATEFORMAT: 'Var god att ange tid i ett giltigt format ({format})' + SilverStripe\ORM\DataObject: + PLURALNAME: Dataobjekt + PLURALS: + one: 'Ett dataobjekt' + other: '{count} Dataobjekt' + SINGULARNAME: Dataobjekt SilverStripe\ORM\FieldType\DBBoolean: ANY: 'Vilken som helst' NOANSWER: Nej YESANSWER: Ja SilverStripe\ORM\FieldType\DBDate: + DAYS_SHORT_PLURALS: + one: '{count} dag' + other: '{count} dagar' + HOURS_SHORT_PLURALS: + one: '{count} timme' + other: '{count} timmar' LessThanMinuteAgo: 'mindre än en minut' + MINUTES_SHORT_PLURALS: + one: '{count} min' + other: '{count} min' + MONTHS_SHORT_PLURALS: + one: '{count} månad' + other: '{count} månader' + SECONDS_SHORT_PLURALS: + one: '{count} sek' + other: '{count} sek' TIMEDIFFAGO: '{difference} sen' TIMEDIFFIN: 'om {difference}' + YEARS_SHORT_PLURALS: + one: '{count} år' + other: '{count} år' SilverStripe\ORM\FieldType\DBEnum: ANY: 'Vilken som helst' + SilverStripe\ORM\Hierarchy: + LIMITED_TITLE: 'För många barn ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: InfiniteLoopNotAllowed: 'Oändlig loop hittades i hierarkin "{type}". Var vänlig ändra föräldern för att lösa detta' + LIMITED_TITLE: 'För många barn ({count})' + SilverStripe\ORM\ValidationException: + DEFAULT_ERROR: Valideringsfel SilverStripe\Security\BasicAuth: ENTERINFO: 'Var god ange användarnamn och lösenord' ERRORNOTADMIN: 'Den användaren är inte administratör' @@ -92,34 +160,58 @@ sv: PASSWORDEXPIRED: '

Ditt lösenard har gått ut. Vänligen ange ett nytt.

' SilverStripe\Security\CMSSecurity: INVALIDUSER: '

Ogiltig användare. Vänligen ange dina inloggnings-uppgifter igen för att fortsätta.

' + LOGIN_MESSAGE: '

Din session har upphört på grund av inaktivitet

' + LOGIN_TITLE: 'Fortsätt där du slutade genom att logga in igen' SUCCESS: Framgång SUCCESSCONTENT: '

Inloggningen lyckades. Klicka här om du inte skickas vidare automatiskt.

' + SUCCESS_TITLE: 'Inloggning lyckades' SilverStripe\Security\Group: AddRole: 'Lägg till roll för den här gruppen' Code: Gruppkod DefaultGroupTitleAdministrators: Administratörer DefaultGroupTitleContentAuthors: Författare Description: Beskrivning + GROUPNAME: Gruppnamn GroupReminder: 'Om du väljer en förälder till gruppen så kommer gruppen ärva alla förälderns roller' HierarchyPermsError: 'Den överordnade gruppen "{group}" kan inte ges priviligerad tillgång (adminrättigheter krävs)' Locked: 'Låst?' + MEMBERS: Medlemmar + NEWGROUP: 'Ny grupp' NoRoles: 'Inga roller fun' + PERMISSIONS: Behörigheter + PLURALNAME: Grupper + PLURALS: + one: 'En grupp' + other: '{count} grupper' Parent: 'Överordnad grupp' + ROLES: Roller + ROLESDESCRIPTION: 'Roller är fördefinierade samlingar med behörigheter och kan tilldelas grupper.
De ärvs från föräldragrupper om det krävs.' RolesAddEditLink: 'Hantera roller' + SINGULARNAME: Grupp Sort: Sorteringsordning has_many_Permissions: Behörigheter many_many_Members: Medlemmar SilverStripe\Security\LoginAttempt: + Email: E-postadress + EmailHashed: 'E-postadress (hash)' IP: IP-adress + PLURALNAME: Inloggningsförsök + PLURALS: + one: 'Ett inloggningsförsök' + other: '{count} inloggningsförsök' + SINGULARNAME: Inloggningsförsök Status: Status SilverStripe\Security\Member: ADDGROUP: 'Lägg till grupp' BUTTONCHANGEPASSWORD: 'Ändra lösenord' BUTTONLOGIN: 'Logga in' BUTTONLOGINOTHER: 'Logga in som annan användare' + BUTTONLOGOUT: 'Logga ut' BUTTONLOSTPASSWORD: 'Jag har glömt mitt lösenord' CONFIRMNEWPASSWORD: 'Bekräfta nytt lösenord' CONFIRMPASSWORD: 'Bekräfta lösenord' + CURRENT_PASSWORD: 'Nuvarande lösenord' + EDIT_PASSWORD: 'Nytt lösenord' EMAIL: E-post EMPTYNEWPASSWORD: 'Det nya lösenordet kan inte vara tomt, vänligen försök igen' ENTEREMAIL: 'Ange en e-postadress för att få en återställningslänk för lösenordet.' @@ -129,13 +221,21 @@ sv: ERRORWRONGCRED: 'Antingen e-postadressen eller lösenordet är fel. Försök igen.' FIRSTNAME: Förnamn INTERFACELANG: Gränssnittsspråk + KEEPMESIGNEDIN: 'Håll mig inloggad' LOGGEDINAS: 'Du är inloggad som {name}.' NEWPASSWORD: 'Nytt lösenord' PASSWORD: Lösenord PASSWORDEXPIRED: 'Ditt lösenord har gått ut. Vänligen ange ett nytt.' + PLURALNAME: Medlemmar + PLURALS: + one: 'En medlem' + other: '{count} medlemmar' + REMEMBERME: 'Kom ihåg mig nästa gång? (i {count} dagar på denna enhet)' + SINGULARNAME: Medlem SUBJECTPASSWORDCHANGED: 'Ditt lösenord har ändrats' SUBJECTPASSWORDRESET: 'Din återställningslänk' SURNAME: Efternamn + VALIDATIONADMINLOSTACCESS: 'Kan inte radera alla admin-grupper från din profil' ValidationIdentifierFailed: 'Kan inte skriva över medlem #{id} med samma identifierare ({name} = {value}))' WELCOMEBACK: 'Välkommen tillbaka, {firstname}' YOUROLDPASSWORD: 'Ditt gamla lösenord' @@ -144,15 +244,32 @@ sv: db_LockedOutUntil: 'Utelåst till' db_Password: Lösenord db_PasswordExpiry: 'Lösenordet upphör att gälla' + SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm: + AUTHENTICATORNAME: 'CMS inloggnings-formulär' + BUTTONFORGOTPASSWORD: 'Glömt lösenord' + BUTTONLOGIN: 'Logga in igen' + BUTTONLOGOUT: 'Logga ut' + SilverStripe\Security\MemberAuthenticator\MemberAuthenticator: + ERRORWRONGCRED: 'De angivna uppgifterna verkar inte vara korrekta. Var god försök igen.' + NoPassword: 'Det finns inget lösenord för den här medlemmen' + SilverStripe\Security\MemberAuthenticator\MemberLoginForm: + AUTHENTICATORNAME: 'E-post & lösenord' SilverStripe\Security\PasswordValidator: LOWCHARSTRENGTH: 'Var god och stärk ditt lösenord genom att lägga till något av följande tecken: {chars}' PREVPASSWORD: 'Du har redan använt samma lösenord tidigare, var god och välj ett nytt lösenord' TOOSHORT: 'Lösenordet är för kort, det måste innehålla {minimum} eller fler tecken.' SilverStripe\Security\Permission: AdminGroup: Administratör + CMS_ACCESS_CATEGORY: CMS-åtkomst CONTENT_CATEGORY: Innehållsåtkomst FULLADMINRIGHTS: 'Fulla administrativa rättigheter' FULLADMINRIGHTS_HELP: 'Implicerar och gäller över alla andra tillskrivna rättigheter.' + PERMISSIONS_CATEGORY: 'Roller och åtkomstbehörigheter' + PLURALNAME: Behörigheter + PLURALS: + one: 'En behörighet' + other: '{count} behörigheter' + SINGULARNAME: Behörighet UserPermissionsIntro: 'Genom att välja grupper för denna användare så ändras användarens rättigheter. Gå till grupper för att se vilka rättigheter de olika grupperna har.' SilverStripe\Security\PermissionCheckboxSetField: AssignedTo: 'tilldelad till "{title}"' @@ -161,6 +278,11 @@ sv: FromRoleOnGroup: 'ärvt från roll "{roletitle}" i grupp "{grouptitle}"' SilverStripe\Security\PermissionRole: OnlyAdminCanApply: 'Endast administratörer kan tillämpa denna roll' + PLURALNAME: Roller + PLURALS: + one: 'En roll' + other: '{count} roller' + SINGULARNAME: Roll Title: Rollnamn SilverStripe\Security\PermissionRoleCode: PermsError: 'Koden "{code}" kan inte ges privilegierad tillgång (adminrättigheter krävs)' @@ -169,12 +291,11 @@ sv: BUTTONSEND: 'Skicka återställningslänk' CHANGEPASSWORDBELOW: 'Du kan ändra ditt lösenord nedan' CHANGEPASSWORDHEADER: 'Ändra ditt lösenord' + CONFIRMLOGOUT: 'Vänligen klicka på knappen nedan för att bekräfta att du vill logga ut.' ENTERNEWPASSWORD: 'Var god ange ett nytt lösenord.' ERRORPASSWORDPERMISSION: 'Du måste vara inloggad för att kunna ändra ditt lösenord!' LOGIN: 'Logga in' + LOGOUT: 'Logga ut' LOSTPASSWORDHEADER: 'Bortglömt lösenord' NOTEPAGESECURED: 'Den här sidan är låst. Fyll i dina uppgifter nedan så skickar vi dig vidare.' - NOTERESETLINKINVALID: '

Återställningslänk för lösenord är felaktig eller för gammal.

Du kan begära en ny här eller ändra ditt lösenord när du loggat in.

' NOTERESETPASSWORD: 'Ange din e-postadress så skickar vi en länk med vilken du kan återställa ditt lösenord' - PASSWORDSENTHEADER: 'Återställningslänk för lösenord har skickats till ''{email}''' - PASSWORDSENTTEXT: 'Tack en återställningslänk har skickats till ''{email}'', förutsatt att ett konto med den addressen finns.' diff --git a/lang/th.yml b/lang/th.yml index b30883ed4..a94e91ed4 100644 --- a/lang/th.yml +++ b/lang/th.yml @@ -2,9 +2,6 @@ th: SilverStripe\Forms\ConfirmedPasswordField: BETWEEN: 'รหัสผ่านต้องมีความยาวตัวอักษรอย่างน้อย {min} ถึง {max} ตัวอักษร' SHOWONCLICKTITLE: เปลี่ยนรหัสผ่าน - SilverStripe\Forms\DateField: - NOTSET: ไม่ต้องตั้งค่า - TODAY: วันนี้ SilverStripe\Forms\DropdownField: CHOOSE: (เลือก) SilverStripe\Forms\EmailField: @@ -30,7 +27,6 @@ th: Print: พิมพ์ ResetFilter: รีเซ็ต SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: ลบ Delete: ลบ DeletePermissionsFailure: ไม่ได้รับสิทธิ์ให้ลบได้ UnlinkRelation: ยกเลิกการลิงก์ diff --git a/lang/tr.yml b/lang/tr.yml index d354d3444..e40237592 100644 --- a/lang/tr.yml +++ b/lang/tr.yml @@ -6,9 +6,6 @@ tr: SHOWONCLICKTITLE: 'Parola Değiştir' SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: USD - SilverStripe\Forms\DateField: - NOTSET: ayarlanmamış - TODAY: bugün SilverStripe\Forms\DropdownField: CHOOSE: (Seçiniz) SilverStripe\Forms\Form: diff --git a/lang/uk.yml b/lang/uk.yml index ca0be2b5a..9c30b7d1f 100644 --- a/lang/uk.yml +++ b/lang/uk.yml @@ -4,9 +4,6 @@ uk: BETWEEN: 'Пароль повинен містити від {min} до {max} символів.' MAXIMUM: 'Пароль повинен містити не більше ніж {max} символів.' SHOWONCLICKTITLE: 'Змінити пароль' - SilverStripe\Forms\DateField: - NOTSET: 'не встановлено' - TODAY: сьогодні SilverStripe\Forms\DropdownField: CHOOSE: (Оберіть) SilverStripe\Forms\Form: diff --git a/lang/zh.yml b/lang/zh.yml index 792565ac6..748ee671c 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -10,8 +10,6 @@ zh: SilverStripe\Forms\CurrencyField: CURRENCYSYMBOL: 货币字符 SilverStripe\Forms\DateField: - NOTSET: 未设置 - TODAY: 今天 VALIDDATEFORMAT2: '请输入一个有效的日期格式 ({format})' VALIDDATEMAXDATE: '您的日期必须更早或者符合最大允许日期 ({date})' VALIDDATEMINDATE: '您的日期必须更迟或者符合最小允许日期 ({date})' @@ -46,7 +44,6 @@ zh: RelationSearch: 关系搜索 ResetFilter: 重设 SilverStripe\Forms\GridField\GridFieldDeleteAction: - DELETE_DESCRIPTION: 删除 Delete: 删除 DeletePermissionsFailure: 没有删除权限 EditPermissionsFailure: 没有解除记录链接的权限 @@ -58,8 +55,6 @@ zh: DeletePermissionsFailure: 没有删除权限 Deleted: '已删除的 {type} {name}' Save: 保存 - SilverStripe\Forms\GridField\GridFieldEditButton_ss: - EDIT: 编辑 SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: 金额 FIELDLABELCURRENCY: 货币 @@ -171,7 +166,4 @@ zh: LOGIN: 登录 LOSTPASSWORDHEADER: 忘记密码 NOTEPAGESECURED: 该页面受安全保护。请在下面输入您的证书，然后我们会立即将您引导至该页面。 - NOTERESETLINKINVALID: '

密码重设链接无效或已过期。

您可以在这里 要求一个新的或在登录后更改您的密码。

' NOTERESETPASSWORD: 请输入您的电子邮件地址，然后我们会将一个链接发送给您，您可以用它来重设您的密码 - PASSWORDSENTHEADER: '密码重设链接已发送至''{email}''' - PASSWORDSENTTEXT: '谢谢！复位链接已发送到 ''{email}''，假定此电子邮件地址存在一个帐户。' From cf4b16ed380c336a7eaec7e46bec03f7767e10ba Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 8 Nov 2018 13:23:53 +0200 Subject: [PATCH 066/175] FIX Move password complexity requirements into framework --- _config/passwords.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 _config/passwords.yml diff --git a/_config/passwords.yml b/_config/passwords.yml new file mode 100644 index 000000000..fc865200a --- /dev/null +++ b/_config/passwords.yml @@ -0,0 +1,13 @@ +--- +Name: corepasswords +--- +SilverStripe\Core\Injector\Injector: + SilverStripe\Security\PasswordValidator: + properties: + MinLength: 8 + HistoricCount: 6 + +# In the case someone uses `new PasswordValidator` instead of Injector, provide some safe defaults through config. +SilverStripe\Security\PasswordValidator: + min_length: 8 + historic_count: 6 From 0111b98b18a273ca5c37013d880c5d21f94396af Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Thu, 4 Oct 2018 16:13:32 +1300 Subject: [PATCH 067/175] FIX: Ensure that types are preserved fetching from database MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ensures that numeric fields appear in PHP as int/float values rather than strings, which allows the development of more type-safe PHP code. This doesn’t work on the legacy mysql driver and this will now throw a notice-level error. It requires mysqlnd. --- src/ORM/Connect/MySQLiConnector.php | 12 +++++++ src/ORM/Connect/PDOConnector.php | 34 ++++++++++++++++---- src/ORM/Connect/PDOQuery.php | 42 +++++++++++++++++++++++-- tests/php/ORM/DatabaseTest.php | 34 ++++++++++++++++++++ tests/php/ORM/DatabaseTest/MyObject.php | 5 ++- 5 files changed, 118 insertions(+), 9 deletions(-) diff --git a/src/ORM/Connect/MySQLiConnector.php b/src/ORM/Connect/MySQLiConnector.php index 43805c705..ba118db81 100644 --- a/src/ORM/Connect/MySQLiConnector.php +++ b/src/ORM/Connect/MySQLiConnector.php @@ -78,6 +78,18 @@ class MySQLiConnector extends DBConnector $this->dbConn = mysqli_init(); + // Use native types (MysqlND only) + if (defined('MYSQLI_OPT_INT_AND_FLOAT_NATIVE')) { + $this->dbConn->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, true); + + // The alternative is not ideal, throw a notice-level error + } else { + user_error( + 'mysqlnd PHP library is not available, numeric values will be fetched from the DB as strings', + E_USER_NOTICE + ); + } + // Set SSL parameters if they exist. All parameters are required. if (array_key_exists('ssl_key', $parameters) && array_key_exists('ssl_cert', $parameters) && diff --git a/src/ORM/Connect/PDOConnector.php b/src/ORM/Connect/PDOConnector.php index 7d9f1af4a..6cea5590e 100644 --- a/src/ORM/Connect/PDOConnector.php +++ b/src/ORM/Connect/PDOConnector.php @@ -64,6 +64,12 @@ class PDOConnector extends DBConnector */ protected $cachedStatements = array(); + /** + * Driver + * @var string + */ + private $driver = null; + /** * Flush all prepared statements */ @@ -113,10 +119,11 @@ class PDOConnector extends DBConnector { $this->flushStatements(); - // Build DSN string // Note that we don't select the database here until explicitly // requested via selectDatabase - $driver = $parameters['driver'] . ":"; + $this->driver = $parameters['driver']; + + // Build DSN string $dsn = array(); // Typically this is false, but some drivers will request this @@ -195,13 +202,18 @@ class PDOConnector extends DBConnector $options[PDO::MYSQL_ATTR_SSL_CIPHER] = array_key_exists('ssl_cipher', $parameters) ? $parameters['ssl_cipher'] : self::config()->get('ssl_cipher_default'); } - if (self::is_emulate_prepare()) { - $options[PDO::ATTR_EMULATE_PREPARES] = true; + // Set emulate prepares (unless null / default) + $isEmulatePrepares = self::is_emulate_prepare(); + if (isset($isEmulatePrepares)) { + $options[PDO::ATTR_EMULATE_PREPARES] = (bool)$isEmulatePrepares; } + // Disable stringified fetches + $options[PDO::ATTR_STRINGIFY_FETCHES] = false; + // May throw a PDOException if fails $this->pdoConnection = new PDO( - $driver . implode(';', $dsn), + $this->driver . ':' . implode(';', $dsn), empty($parameters['username']) ? '' : $parameters['username'], empty($parameters['password']) ? '' : $parameters['password'], $options @@ -213,6 +225,16 @@ class PDOConnector extends DBConnector } } + + /** + * Return the driver for this connector + * E.g. 'mysql', 'sqlsrv', 'pgsql' + */ + public function getDriver() + { + return $this->driver; + } + public function getVersion() { return $this->pdoConnection->getAttribute(PDO::ATTR_SERVER_VERSION); @@ -383,7 +405,7 @@ class PDOConnector extends DBConnector } elseif ($statement) { // Count and return results $this->rowCount = $statement->rowCount(); - return new PDOQuery($statement); + return new PDOQuery($statement, $this); } // Ensure statement is closed diff --git a/src/ORM/Connect/PDOQuery.php b/src/ORM/Connect/PDOQuery.php index f5a9739b3..826432219 100644 --- a/src/ORM/Connect/PDOQuery.php +++ b/src/ORM/Connect/PDOQuery.php @@ -22,16 +22,54 @@ class PDOQuery extends Query * Hook the result-set given into a Query class, suitable for use by SilverStripe. * @param PDOStatement $statement The internal PDOStatement containing the results */ - public function __construct(PDOStatement $statement) + public function __construct(PDOStatement $statement, PDOConnector $conn) { $this->statement = $statement; // Since no more than one PDOStatement for any one connection can be safely // traversed, each statement simply requests all rows at once for safety. // This could be re-engineered to call fetchAll on an as-needed basis - $this->results = $statement->fetchAll(PDO::FETCH_ASSOC); + + // Special case for Postgres + if ($conn->getDriver() == 'pgsql') { + $this->results = $this->fetchAllPgsql($statement); + } else { + $this->results = $statement->fetchAll(PDO::FETCH_ASSOC); + } $statement->closeCursor(); } + /** + * Fetch a record form the statement with its type data corrected + * Necessary to fix float data retrieved from PGSQL + * Returns data as an array of maps + * @return array + */ + protected function fetchAllPgsql($statement) + { + $columnCount = $statement->columnCount(); + $columnMeta = []; + for ($i = 0; $i<$columnCount; $i++) { + $columnMeta[$i] = $statement->getColumnMeta($i); + } + + // Re-map fetched data using columnMeta + return array_map( + function ($rowArray) use ($columnMeta) { + $row = []; + foreach ($columnMeta as $i => $meta) { + // Coerce floats from string to float + // PDO PostgreSQL fails to do this + if (isset($meta['native_type']) && strpos($meta['native_type'], 'float') === 0) { + $rowArray[$i] = (float)$rowArray[$i]; + } + $row[$meta['name']] = $rowArray[$i]; + } + return $row; + }, + $statement->fetchAll(PDO::FETCH_NUM) + ); + } + public function seek($row) { $this->rowNum = $row - 1; diff --git a/tests/php/ORM/DatabaseTest.php b/tests/php/ORM/DatabaseTest.php index b9a6fca31..d05a44fc8 100644 --- a/tests/php/ORM/DatabaseTest.php +++ b/tests/php/ORM/DatabaseTest.php @@ -231,4 +231,38 @@ class DatabaseTest extends SapphireTest $this->assertInstanceOf('Exception', $ex); $this->assertEquals('error', $ex->getMessage()); } + + + public function testFieldTypes() + { + // Scaffold some data + $obj = new MyObject(); + $obj->MyField = "value"; + $obj->MyInt = 5; + $obj->MyFloat = 6.0; + $obj->MyBoolean = true; + $obj->write(); + + $record = DB::prepared_query( + 'SELECT * FROM "DatabaseTest_MyObject" WHERE "ID" = ?', + [ $obj->ID ] + )->record(); + + // IDs and ints are returned as ints + $this->assertInternalType('int', $record['ID']); + $this->assertInternalType('int', $record['MyInt']); + + $this->assertInternalType('float', $record['MyFloat']); + + // Booleans are returned as ints – we follow MySQL's lead + $this->assertInternalType('int', $record['MyBoolean']); + + // Strings and enums are returned as strings + $this->assertInternalType('string', $record['MyField']); + $this->assertInternalType('string', $record['ClassName']); + + // Dates are returned as strings + $this->assertInternalType('string', $record['Created']); + $this->assertInternalType('string', $record['LastEdited']); + } } diff --git a/tests/php/ORM/DatabaseTest/MyObject.php b/tests/php/ORM/DatabaseTest/MyObject.php index 83d7fced1..3d09cb1cf 100644 --- a/tests/php/ORM/DatabaseTest/MyObject.php +++ b/tests/php/ORM/DatabaseTest/MyObject.php @@ -13,6 +13,9 @@ class MyObject extends DataObject implements TestOnly private static $create_table_options = array(MySQLSchemaManager::ID => 'ENGINE=InnoDB'); private static $db = array( - 'MyField' => 'Varchar' + 'MyField' => 'Varchar', + 'MyInt' => 'Int', + 'MyFloat' => 'Float', + 'MyBoolean' => 'Boolean', ); } From 261539953568e18361d30d7603c22ad3cb7c8cef Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Thu, 4 Oct 2018 20:25:53 +1300 Subject: [PATCH 068/175] =?UTF-8?q?FIX:=20Use=20PDO=E2=80=99s=20built-in?= =?UTF-8?q?=20transaction=20support=20in=20MySQLDatabase.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ORM/Connect/Database.php | 11 ++ src/ORM/Connect/MySQLDatabase.php | 97 +++++++------- src/ORM/Connect/MySQLTransactionManager.php | 100 +++++++++++++++ src/ORM/Connect/NestedTransactionManager.php | 127 +++++++++++++++++++ src/ORM/Connect/PDOConnector.php | 96 ++++++++++++-- src/ORM/Connect/TransactionManager.php | 59 +++++++++ tests/php/ORM/DatabaseTest.php | 5 + tests/php/ORM/TransactionTest.php | 16 +-- 8 files changed, 445 insertions(+), 66 deletions(-) create mode 100644 src/ORM/Connect/MySQLTransactionManager.php create mode 100644 src/ORM/Connect/NestedTransactionManager.php create mode 100644 src/ORM/Connect/TransactionManager.php diff --git a/src/ORM/Connect/Database.php b/src/ORM/Connect/Database.php index 729770895..fa32db16d 100644 --- a/src/ORM/Connect/Database.php +++ b/src/ORM/Connect/Database.php @@ -583,6 +583,17 @@ abstract class Database */ abstract public function supportsTransactions(); + /** + * Does this database support savepoints in transactions + * By default it is assumed that they don't unless they are explicitly enabled. + * + * @return boolean Flag indicating support for savepoints in transactions + */ + public function supportsSavepoints() + { + return false; + } + /** * Invoke $callback within a transaction * diff --git a/src/ORM/Connect/MySQLDatabase.php b/src/ORM/Connect/MySQLDatabase.php index 74f155e30..c19004885 100644 --- a/src/ORM/Connect/MySQLDatabase.php +++ b/src/ORM/Connect/MySQLDatabase.php @@ -21,7 +21,7 @@ use Exception; * You are advised to backup your tables if changing settings on an existing database * `connection_charset` and `charset` should be equal, similarly so should `connection_collation` and `collation` */ -class MySQLDatabase extends Database +class MySQLDatabase extends Database implements TransactionManager { use Configurable; @@ -49,6 +49,13 @@ class MySQLDatabase extends Database */ private static $charset = 'utf8'; + /** + * Cache for getTransactionManager() + * + * @var TransactionManager + */ + private $transactionManager = null; + /** * Default collation * @@ -57,11 +64,6 @@ class MySQLDatabase extends Database */ private static $collation = 'utf8_general_ci'; - /** - * @var bool - */ - protected $transactionNesting = 0; - public function connect($parameters) { // Ensure that driver is available (required by PDO) @@ -298,73 +300,64 @@ class MySQLDatabase extends Database return $list; } + + /** + * Returns the TransactionManager to handle transactions for this database. + * + * @return TransactionManager + */ + protected function getTransactionManager() + { + if (!$this->transactionManager) { + // PDOConnector providers this + if ($this->connector instanceof TransactionManager) { + $this->transactionManager = new NestedTransactionManager($this->connector); + // Direct database access does not + } else { + $this->transactionManager = new NestedTransactionManager(new MySQLTransactionManager($this)); + } + } + return $this->transactionManager; + } public function supportsTransactions() { return true; } + public function supportsSavepoints() + { + return $this->getTransactionManager()->supportsSavepoints(); + } public function transactionStart($transactionMode = false, $sessionCharacteristics = false) { - if ($this->transactionNesting > 0) { - $this->transactionSavepoint('NESTEDTRANSACTION' . $this->transactionNesting); - } else { - // This sets the isolation level for the NEXT transaction, not the current one. - if ($transactionMode) { - $this->query('SET TRANSACTION ' . $transactionMode); - } - - $this->query('START TRANSACTION'); - - if ($sessionCharacteristics) { - $this->query('SET SESSION TRANSACTION ' . $sessionCharacteristics); - } - } - ++$this->transactionNesting; + $this->getTransactionManager()->transactionStart($transactionMode, $sessionCharacteristics); } public function transactionSavepoint($savepoint) { - $this->query("SAVEPOINT $savepoint"); + $this->getTransactionManager()->transactionSavepoint($savepoint); } public function transactionRollback($savepoint = false) { - // Named transaction - if ($savepoint) { - $this->query('ROLLBACK TO ' . $savepoint); - return true; - } - - // Fail if transaction isn't available - if (!$this->transactionNesting) { - return false; - } - --$this->transactionNesting; - if ($this->transactionNesting > 0) { - $this->transactionRollback('NESTEDTRANSACTION' . $this->transactionNesting); - } else { - $this->query('ROLLBACK'); - } - return true; + return $this->getTransactionManager()->transactionRollback($savepoint); } public function transactionDepth() { - return $this->transactionNesting; + return $this->getTransactionManager()->transactionDepth(); } public function transactionEnd($chain = false) { - // Fail if transaction isn't available - if (!$this->transactionNesting) { - return false; + $result = $this->getTransactionManager()->transactionEnd(); + + if ($chain) { + Deprecation::notice('4.4', '$chain argument is deprecated'); + return $this->getTransactionManager()->transactionStart(); } - --$this->transactionNesting; - if ($this->transactionNesting <= 0) { - $this->transactionNesting = 0; - $this->query('COMMIT AND ' . ($chain ? '' : 'NO ') . 'CHAIN'); - } - return true; + + return $result; } /** @@ -372,6 +365,12 @@ class MySQLDatabase extends Database */ protected function resetTransactionNesting() { + // Check whether to use a connector's built-in transaction methods + if ($this->connector instanceof TransactionalDBConnector) { + if ($this->transactionNesting > 0) { + $this->connector->transactionRollback(); + } + } $this->transactionNesting = 0; } diff --git a/src/ORM/Connect/MySQLTransactionManager.php b/src/ORM/Connect/MySQLTransactionManager.php new file mode 100644 index 000000000..452ce334a --- /dev/null +++ b/src/ORM/Connect/MySQLTransactionManager.php @@ -0,0 +1,100 @@ +dbConn = $dbConn; + } + + public function transactionStart($transactionMode = false, $sessionCharacteristics = false) + { + if ($transactionMode || $sessionCharacteristics) { + Deprecation::notice( + '4.4', + '$transactionMode and $sessionCharacteristics are deprecated and will be removed in SS5' + ); + } + + if ($this->inTransaction) { + throw new DatabaseException( + "Already in transaction, can't start another. Consider decorating with NestedTransactionManager." + ); + } + + // This sets the isolation level for the NEXT transaction, not the current one. + if ($transactionMode) { + $this->dbConn->query('SET TRANSACTION ' . $transactionMode); + } + + $this->dbConn->query('START TRANSACTION'); + + if ($sessionCharacteristics) { + $this->dbConn->query('SET SESSION TRANSACTION ' . $sessionCharacteristics); + } + + $this->inTransaction = true; + return true; + } + + public function transactionEnd($chain = false) + { + if (!$this->inTransaction) { + throw new DatabaseException("Not in transaction, can't end."); + } + + if ($chain) { + user_error( + "transactionEnd() chain argument no longer implemented. Use NestedTransactionManager", + E_USER_WARNING + ); + } + + $this->dbConn->query('COMMIT'); + + $this->inTransaction = false; + return true; + } + + public function transactionRollback($savepoint = null) + { + if (!$this->inTransaction) { + throw new DatabaseException("Not in transaction, can't roll back."); + } + + if ($savepoint) { + $this->dbConn->query("ROLLBACK TO SAVEPOINT $savepoint"); + } else { + $this->dbConn->query('ROLLBACK'); + $this->inTransaction = false; + } + + return true; + } + + public function transactionSavepoint($savepoint) + { + $this->dbConn->query("SAVEPOINT $savepoint"); + } + + public function transactionDepth() + { + return (int)$this->inTransaction; + } + + public function supportsSavepoints() + { + return true; + } +} diff --git a/src/ORM/Connect/NestedTransactionManager.php b/src/ORM/Connect/NestedTransactionManager.php new file mode 100644 index 000000000..46e8090a3 --- /dev/null +++ b/src/ORM/Connect/NestedTransactionManager.php @@ -0,0 +1,127 @@ +child = $child; + } + + /** + * Start a transaction + * @throws DatabaseException on failure + * @return bool True on success + */ + public function transactionStart($transactionMode = false, $sessionCharacteristics = false) + { + if ($this->transactionNesting <= 0) { + $this->transactionNesting = 1; + $this->child->transactionStart($transactionMode, $sessionCharacteristics); + } else { + if ($this->child->supportsSavepoints()) { + $this->child->transactionSavepoint("nesting" . $this->transactionNesting); + } + $this->transactionNesting++; + } + } + + public function transactionEnd($chain = false) + { + if ($this->mustRollback) { + throw new DatabaseException("Child transaction was rolled back, so parent can't be committed"); + } + + if ($this->transactionNesting < 1) { + throw new DatabaseException("Not within a transaction, so can't commit"); + } + + $this->transactionNesting--; + + if ($this->transactionNesting === 0) { + $this->child->transactionEnd(); + } + + if ($chain) { + return $this->transactionStart(); + } + } + + public function transactionRollback($savepoint = null) + { + if ($this->transactionNesting < 1) { + throw new DatabaseException("Not within a transaction, so can't roll back"); + } + + if ($savepoint) { + return $this->child->transactionRollback($savepoint); + } + + $this->transactionNesting--; + + if ($this->transactionNesting === 0) { + $this->child->transactionRollback(); + $this->mustRollback = false; + } else { + if ($this->child->supportsSavepoints()) { + $this->child->transactionRollback("nesting" . $this->transactionNesting); + $this->mustRollback = false; + + // Without savepoints, parent transactions must roll back if a child one has + } else { + $this->mustRollback = true; + } + } + } + + /** + * Return the depth of the transaction. + * + * @return int + */ + public function transactionDepth() + { + return $this->transactionNesting; + } + + public function transactionSavepoint($savepoint) + { + return $this->child->transactionSavepoint($savepoint); + } + + public function supportsSavepoints() + { + return $this->child->supportsSavepoints(); + } +} diff --git a/src/ORM/Connect/PDOConnector.php b/src/ORM/Connect/PDOConnector.php index 6cea5590e..85aba8d84 100644 --- a/src/ORM/Connect/PDOConnector.php +++ b/src/ORM/Connect/PDOConnector.php @@ -10,7 +10,7 @@ use InvalidArgumentException; /** * PDO driver database connector */ -class PDOConnector extends DBConnector +class PDOConnector extends DBConnector implements TransactionManager { /** @@ -21,6 +21,15 @@ class PDOConnector extends DBConnector */ private static $emulate_prepare = false; + /** + * Should we return everything as a string in order to allow transaction savepoints? + * This preserves the behaviour of <= 4.3, including some bugs. + * + * @config + * @var boolean + */ + private static $legacy_types = false; + /** * Default strong SSL cipher to be used * @@ -68,7 +77,13 @@ class PDOConnector extends DBConnector * Driver * @var string */ - private $driver = null; + protected $driver = null; + + /* + * Is a transaction currently active? + * @var bool + */ + protected $inTransaction = false; /** * Flush all prepared statements @@ -202,14 +217,19 @@ class PDOConnector extends DBConnector $options[PDO::MYSQL_ATTR_SSL_CIPHER] = array_key_exists('ssl_cipher', $parameters) ? $parameters['ssl_cipher'] : self::config()->get('ssl_cipher_default'); } - // Set emulate prepares (unless null / default) - $isEmulatePrepares = self::is_emulate_prepare(); - if (isset($isEmulatePrepares)) { - $options[PDO::ATTR_EMULATE_PREPARES] = (bool)$isEmulatePrepares; - } + if (static::config()->get('legacy_types')) { + $options[PDO::ATTR_STRINGIFY_FETCHES] = true; + $options[PDO::ATTR_EMULATE_PREPARES] = true; + } else { + // Set emulate prepares (unless null / default) + $isEmulatePrepares = self::is_emulate_prepare(); + if (isset($isEmulatePrepares)) { + $options[PDO::ATTR_EMULATE_PREPARES] = (bool)$isEmulatePrepares; + } - // Disable stringified fetches - $options[PDO::ATTR_STRINGIFY_FETCHES] = false; + // Disable stringified fetches + $options[PDO::ATTR_STRINGIFY_FETCHES] = false; + } // May throw a PDOException if fails $this->pdoConnection = new PDO( @@ -229,6 +249,8 @@ class PDOConnector extends DBConnector /** * Return the driver for this connector * E.g. 'mysql', 'sqlsrv', 'pgsql' + * + * @return string */ public function getDriver() { @@ -490,4 +512,60 @@ class PDOConnector extends DBConnector { return $this->databaseName && $this->pdoConnection; } + + public function transactionStart($transactionMode = false, $sessionCharacteristics = false) + { + $this->inTransaction = true; + + if ($transactionMode) { + $this->query("SET TRANSACTION $transactionMode"); + } + + if ($this->pdoConnection->beginTransaction()) { + if ($sessionCharacteristics) { + $this->query("SET SESSION CHARACTERISTICS AS TRANSACTION $sessionCharacteristics"); + } + return true; + } + return false; + } + + public function transactionEnd() + { + $this->inTransaction = false; + return $this->pdoConnection->commit(); + } + + public function transactionRollback($savepoint = null) + { + if ($savepoint) { + if ($this->supportsSavepoints()) { + $this->exec("ROLLBACK TO SAVEPOINT $savepoint"); + } else { + throw new DatabaseException("Savepoints not supported on this PDO connection"); + } + } + + $this->inTransaction = false; + return $this->pdoConnection->rollBack(); + } + + public function transactionDepth() + { + return (int)$this->inTransaction; + } + + public function transactionSavepoint($savepoint = null) + { + if ($this->supportsSavepoints()) { + $this->exec("SAVEPOINT $savepoint"); + } else { + throw new DatabaseException("Savepoints not supported on this PDO connection"); + } + } + + public function supportsSavepoints() + { + return static::config()->get('legacy_types'); + } } diff --git a/src/ORM/Connect/TransactionManager.php b/src/ORM/Connect/TransactionManager.php new file mode 100644 index 000000000..bec59835f --- /dev/null +++ b/src/ORM/Connect/TransactionManager.php @@ -0,0 +1,59 @@ +transactionStart(); $obj = new TransactionTest\TestObject(); $obj->Title = 'First page'; @@ -59,10 +62,10 @@ class TransactionTest extends SapphireTest $obj = new TransactionTest\TestObject(); $obj->Title = 'Second page'; $obj->write(); + DB::get_conn()->transactionEnd(); - //Create a savepoint here: - DB::get_conn()->transactionSavepoint('rollback'); - + // Third/Fourth in a rolled back transaction + DB::get_conn()->transactionStart(); $obj = new TransactionTest\TestObject(); $obj->Title = 'Third page'; $obj->write(); @@ -70,11 +73,8 @@ class TransactionTest extends SapphireTest $obj = new TransactionTest\TestObject(); $obj->Title = 'Fourth page'; $obj->write(); + DB::get_conn()->transactionRollback(); - //Revert to a savepoint: - DB::get_conn()->transactionRollback('rollback'); - - DB::get_conn()->transactionEnd(); $first = DataObject::get(TransactionTest\TestObject::class, "\"Title\"='First page'"); $second = DataObject::get(TransactionTest\TestObject::class, "\"Title\"='Second page'"); @@ -85,7 +85,7 @@ class TransactionTest extends SapphireTest $this->assertTrue(is_object($first) && $first->exists()); $this->assertTrue(is_object($second) && $second->exists()); - //These pages should NOT exist, we reverted to a savepoint: + //These pages should NOT exist, we rolled back $this->assertFalse(is_object($third) && $third->exists()); $this->assertFalse(is_object($fourth) && $fourth->exists()); } From a7b5de5de47319b204324d23e5a33403f28df5f7 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Thu, 4 Oct 2018 20:38:55 +1300 Subject: [PATCH 069/175] FIX: ensure that there are PGSQL builds both with and without PDO --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff7c3f758..1411144aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,20 +20,20 @@ matrix: include: - php: 5.6 env: - - DB=MYSQL + - DB=PGSQL - PHPCS_TEST=1 - PHPUNIT_TEST=framework - php: 7.0 env: - DB=PGSQL + - PDO=1 - PHPUNIT_TEST=framework - php: 7.1 if: type IN (cron) env: - DB=MYSQL - - PDO=1 - PHPUNIT_COVERAGE_TEST=framework - php: 7.2 @@ -50,7 +50,6 @@ matrix: - php: 7.3.0RC1 env: - DB=MYSQL - - PDO=1 - PHPUNIT_TEST=framework sudo: required dist: xenial @@ -74,7 +73,7 @@ before_script: # Install composer dependencies - composer validate - mkdir ./public - - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.1.x-dev --no-update; fi + - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.2.x-dev --no-update; fi - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.0.x-dev --no-update; fi - composer require silverstripe/recipe-testing:^1 silverstripe/recipe-core:4.4.x-dev silverstripe/admin:1.4.x-dev silverstripe/versioned:1.4.x-dev --no-update - if [[ $PHPUNIT_TEST == cms ]]; then composer require silverstripe/recipe-cms:4.4.x-dev --no-update; fi From 5531baa87f2cbfae76b5733016f860917813eea5 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Thu, 18 Oct 2018 20:19:39 +1300 Subject: [PATCH 070/175] FIX: Introduce readonly transaction test to all database. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should work on MySQL and PDO; let’s test this. --- tests/php/ORM/DatabaseTest.php | 51 --------------- tests/php/ORM/TransactionTest.php | 104 ++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 51 deletions(-) diff --git a/tests/php/ORM/DatabaseTest.php b/tests/php/ORM/DatabaseTest.php index 247224ae5..0fd108120 100644 --- a/tests/php/ORM/DatabaseTest.php +++ b/tests/php/ORM/DatabaseTest.php @@ -21,11 +21,6 @@ class DatabaseTest extends SapphireTest protected $usesDatabase = true; - /** - * Disable transactions so that we can test them - */ - protected $usesTransactions = false; - public function testDontRequireField() { $schema = DB::get_schema(); @@ -192,52 +187,6 @@ class DatabaseTest extends SapphireTest $this->assertTrue($db->canLock('DatabaseTest'), 'Can lock again after releasing it'); } - public function testTransactions() - { - $conn = DB::get_conn(); - if (!$conn->supportsTransactions()) { - $this->markTestSkipped("DB Doesn't support transactions"); - return; - } - - // Test that successful transactions are comitted - $obj = new DatabaseTest\MyObject(); - $failed = false; - $conn->withTransaction( - function () use (&$obj) { - $obj->MyField = 'Save 1'; - $obj->write(); - }, - function () use (&$failed) { - $failed = true; - } - ); - $this->assertEquals('Save 1', DatabaseTest\MyObject::get()->first()->MyField); - $this->assertFalse($failed); - - // Test failed transactions are rolled back - $ex = null; - $failed = false; - try { - $conn->withTransaction( - function () use (&$obj) { - $obj->MyField = 'Save 2'; - $obj->write(); - throw new Exception("error"); - }, - function () use (&$failed) { - $failed = true; - } - ); - } catch (Exception $ex) { - } - $this->assertTrue($failed); - $this->assertEquals('Save 1', DatabaseTest\MyObject::get()->first()->MyField); - $this->assertInstanceOf('Exception', $ex); - $this->assertEquals('error', $ex->getMessage()); - } - - public function testFieldTypes() { // Scaffold some data diff --git a/tests/php/ORM/TransactionTest.php b/tests/php/ORM/TransactionTest.php index 88617f26c..c6e892f28 100644 --- a/tests/php/ORM/TransactionTest.php +++ b/tests/php/ORM/TransactionTest.php @@ -5,6 +5,7 @@ namespace SilverStripe\ORM\Tests; use SilverStripe\ORM\DB; use SilverStripe\ORM\DataObject; use SilverStripe\Dev\SapphireTest; +use SilverStripe\Dev\Deprecation; use SilverStripe\ORM\Tests\TransactionTest\TestObject; class TransactionTest extends SapphireTest @@ -17,6 +18,20 @@ class TransactionTest extends SapphireTest TransactionTest\TestObject::class, ]; + private static $originalVersionInfo; + + protected function setUp() + { + parent::setUp(); + self::$originalVersionInfo = Deprecation::dump_settings(); + } + + protected function tearDown() + { + Deprecation::restore_settings(self::$originalVersionInfo); + parent::tearDown(); + } + public static function setUpBeforeClass() { parent::setUpBeforeClass(); @@ -25,8 +40,57 @@ class TransactionTest extends SapphireTest } } + public function testTransactions() + { + $conn = DB::get_conn(); + if (!$conn->supportsTransactions()) { + $this->markTestSkipped("DB Doesn't support transactions"); + return; + } + + // Test that successful transactions are comitted + $obj = new TestObject(); + $failed = false; + $conn->withTransaction( + function () use (&$obj) { + $obj->Title = 'Save 1'; + $obj->write(); + }, + function () use (&$failed) { + $failed = true; + } + ); + $this->assertEquals('Save 1', TestObject::get()->first()->Title); + $this->assertFalse($failed); + + // Test failed transactions are rolled back + $ex = null; + $failed = false; + try { + $conn->withTransaction( + function () use (&$obj) { + $obj->Title = 'Save 2'; + $obj->write(); + throw new \Exception("error"); + }, + function () use (&$failed) { + $failed = true; + } + ); + } catch (\Exception $ex) { + } + $this->assertTrue($failed); + $this->assertEquals('Save 1', TestObject::get()->first()->Title); + $this->assertInstanceOf('Exception', $ex); + $this->assertEquals('error', $ex->getMessage()); + } + public function testNestedTransaction() { + if (!DB::get_conn()->supportsSavepoints()) { + static::markTestSkipped('Current database does not support savepoints'); + } + $this->assertCount(0, TestObject::get()); try { DB::get_conn()->withTransaction(function () { @@ -89,4 +153,44 @@ class TransactionTest extends SapphireTest $this->assertFalse(is_object($third) && $third->exists()); $this->assertFalse(is_object($fourth) && $fourth->exists()); } + + public function testReadOnlyTransaction() + { + if (!DB::get_conn()->supportsTransactions()) { + $this->markTestSkipped('Current database is doesn\'t support transactions'); + return; + } + + // This feature is deprecated in 4.4, but we're still testing it. + Deprecation::notification_version('4.3.0'); + + $page = new TestObject(); + $page->Title = 'Read only success'; + $page->write(); + + DB::get_conn()->transactionStart('READ ONLY'); + + try { + $page = new TestObject(); + $page->Title = 'Read only page failed'; + $page->write(); + DB::get_conn()->transactionEnd(); + } catch (\Exception $e) { + //could not write this record + //We need to do a rollback or a commit otherwise we'll get error messages + DB::get_conn()->transactionRollback(); + } + + DataObject::flush_and_destroy_cache(); + + $success = DataObject::get_one(TestObject::class, "\"Title\"='Read only success'"); + $fail = DataObject::get_one(TestObject::class, "\"Title\"='Read only page failed'"); + + //This page should be in the system + $this->assertInternalType('object', $success); + $this->assertTrue($success->exists()); + + //This page should NOT exist, we had 'read only' permissions + $this->assertNull($fail); + } } From 0cc39af382513b48a29634556cb25dda42b7e02e Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Fri, 9 Nov 2018 11:08:36 +1300 Subject: [PATCH 071/175] DOC: Added documentation for strict type changes --- .../00_Model/08_SQL_Select.md | 12 ++++++++++++ docs/en/04_Changelogs/4.4.0.md | 14 ++++++++++++++ src/ORM/Connect/Query.php | 16 ++++++++++++++-- src/ORM/Connect/TransactionManager.php | 12 ++++++++++-- 4 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 docs/en/04_Changelogs/4.4.0.md diff --git a/docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md b/docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md index dc85ec060..ee4c31c81 100644 --- a/docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md +++ b/docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md @@ -291,6 +291,18 @@ $players = Player::get(); $map = $players->map('Name', 'NameWithBirthyear'); ``` +### Data types + +As of SilverStripe 4.4, the following PHP types will be used to return datbase content: + + * booleans will be an integer 1 or 0, to ensure consistency with MySQL that doesn't have native booleans. + * integer types returned as integers + * floating point / decimal types returned as floats + * strings returned as strings + * dates / datetimes returned as strings + +Up until SilverStripe 4.3, bugs meant that strings were used for every column type. + ## Related Lessons * [Building custom SQL](https://www.silverstripe.org/learn/lessons/v4/beyond-the-orm-building-custom-sql-1) diff --git a/docs/en/04_Changelogs/4.4.0.md b/docs/en/04_Changelogs/4.4.0.md new file mode 100644 index 000000000..f37ba13a6 --- /dev/null +++ b/docs/en/04_Changelogs/4.4.0.md @@ -0,0 +1,14 @@ +# 4.4.0 + +## Overview {#overview} + + - [Correct PHP types are now returned from database queries](/developer_guides/model/sql_select#data-types) + +## Upgrading {#upgrading} + +tbc + +## Changes to internal APIs + + - `PDOQuery::__construct()` now has a 2nd argument. If you have subclassed PDOQuery and overridden __construct() + you may see an E_STRICT error diff --git a/src/ORM/Connect/Query.php b/src/ORM/Connect/Query.php index 4a1b28b88..1f994dd7f 100644 --- a/src/ORM/Connect/Query.php +++ b/src/ORM/Connect/Query.php @@ -6,12 +6,24 @@ use SilverStripe\Core\Convert; use Iterator; /** - * Abstract query-result class. + * Abstract query-result class. A query result provides an iterator that returns a map for each record of a query + * result. + * + * The map should be keyed by the column names, and the values should use the following types: + * + * - boolean returned as integer 1 or 0 (to ensure consistency with MySQL that doesn't have native booleans) + * - integer types returned as integers + * - floating point / decimal types returned as floats + * - strings returned as strings + * - dates / datetimes returned as strings + * + * Note that until SilverStripe 4.3, bugs meant that strings were used for every column type. + * * Once again, this should be subclassed by an actual database implementation. It will only * ever be constructed by a subclass of SS_Database. The result of a database query - an iteratable object * that's returned by DB::SS_Query * - * Primarily, the SS_Query class takes care of the iterator plumbing, letting the subclasses focusing + * Primarily, the Query class takes care of the iterator plumbing, letting the subclasses focusing * on providing the specific data-access methods that are required: {@link nextRecord()}, {@link numRecords()} * and {@link seek()} */ diff --git a/src/ORM/Connect/TransactionManager.php b/src/ORM/Connect/TransactionManager.php index bec59835f..7dbb6be1f 100644 --- a/src/ORM/Connect/TransactionManager.php +++ b/src/ORM/Connect/TransactionManager.php @@ -3,7 +3,13 @@ namespace SilverStripe\ORM\Connect; /** - * Represents an object that is capable of controlling transactions + * Represents an object that is capable of controlling transactions. + * + * The TransactionManager might be the database connection itself, calling queries to orchestrate + * transactions, or a connector such as the PDOConnector. + * + * Generally speaking you should rely on your Database object to manage the creation of a TansactionManager + * for you; unless you are building new database connectors this should be treated as an internal API. */ interface TransactionManager { @@ -51,7 +57,9 @@ interface TransactionManager public function transactionDepth(); /** - * Return true if savepoints are supported by this transaction manager + * Return true if savepoints are supported by this transaction manager. + * Savepoints aren't supported by all database connectors (notably PDO doesn't support them) + * and should be used with caution. * * @return boolean */ From a843e136e8f653d2a979cdcdf0ced38575ae0e49 Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Fri, 9 Nov 2018 11:09:07 +1300 Subject: [PATCH 072/175] Added 4.0.5 changelog --- docs/en/04_Changelogs/4.0.5.md | 100 +++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/docs/en/04_Changelogs/4.0.5.md b/docs/en/04_Changelogs/4.0.5.md index 0fc65d7f7..52bb06871 100644 --- a/docs/en/04_Changelogs/4.0.5.md +++ b/docs/en/04_Changelogs/4.0.5.md @@ -10,3 +10,103 @@ behaviour to that of SilverStripe 3 where `Extension` instances are of lowest im default value. If you rely on your `Extension` or module providing an overriding config value, please move this to yaml. + +## Change Log + +### Security + + * 2018-11-02 [aebaa46](https://github.com/silverstripe/silverstripe-admin/commit/aebaa46f1f8834fefa09bdaf85bfdd51229f58b3) Add CSRF to Apollo (Aaron Carlino) - See [ss-2018-007](https://www.silverstripe.org/download/security-releases/ss-2018-007) + * 2018-08-21 [8d7c2dafa](https://github.com/silverstripe/silverstripe-framework/commit/8d7c2dafabad505d769f3774c44e0595fb1a4cd9) Add confirmation token to dev/build (Loz Calver) - See [ss-2018-019](https://www.silverstripe.org/download/security-releases/ss-2018-019) + * 2018-07-29 [9aabe0a0f](https://github.com/silverstripe/silverstripe-framework/commit/9aabe0a0f7a061d87cc92923f8811e14d7a032f5) Ignore arguments in mysqli::real_connect backtrace calls (Robbie Averill) - See [ss-2018-018](https://www.silverstripe.org/download/security-releases/ss-2018-018) + * 2018-05-08 [19fdebfa2](https://github.com/silverstripe/silverstripe-framework/commit/19fdebfa245506626561bc9626d9ac325acb14da) Remove dotm, potm, jar, css, js, xltm from default File.allowed_extensions (Robbie Averill) - See [ss-2018-014](https://www.silverstripe.org/download/security-releases/ss-2018-014) + * 2018-04-11 [577138882](https://github.com/silverstripe/silverstripe-framework/commit/577138882163e4b8782ea043487944d30d88e753) Restrict non-admins from being assigned to admin groups (Damian Mooyman) - See [ss-2018-001](https://www.silverstripe.org/download/security-releases/ss-2018-001) + +### API Changes + + * 2017-09-12 [c54b07a95](https://github.com/silverstripe/silverstripe-framework/commit/c54b07a9528aeef3907b4342a725af10d9797cd8) Update to use new chromedriver + behat-extension + facebook/webdriver (Damian Mooyman) + +### Features and Enhancements + + * 2018-04-19 [1509a12fd](https://github.com/silverstripe/silverstripe-framework/commit/1509a12fdf0fe8cbd300271fd5c60c3d76647d84) Only run coverage test as a cron (Damian Mooyman) + * 2018-04-09 [87d69ba7](https://github.com/silverstripe/silverstripe-cms/commit/87d69ba75366ff63563e5b9b159fb643daa4f1d7) Use i18n template for page tree title (Damian Mooyman) + * 2018-03-05 [32637413d](https://github.com/silverstripe/silverstripe-framework/commit/32637413deceb1a3c647fd51a78e1352e91ee15a) Improve upgrade rules to support advanced upgrader rewrites (#7903) (Damian Mooyman) + * 2018-03-05 [8c35e339](https://github.com/silverstripe/silverstripe-cms/commit/8c35e3391cf334917c5e314c6f1c459e9d06fbbc) Improve upgrade rules to support advanced upgrader rewrites (#2114) (Damian Mooyman) + * 2018-03-01 [61cfcc5](https://github.com/silverstripe/silverstripe-versioned/commit/61cfcc52a46895b6ff7fdb12956e01c48bfcf343) Improve upgrade rules to support advanced upgrader rewrites (Damian Mooyman) + * 2018-03-01 [e77e0f7](https://github.com/silverstripe/silverstripe-assets/commit/e77e0f758ed243a249c6056dbfc44f48b9fa535d) Improve upgrade rules to support advanced upgrader rewrites (Damian Mooyman) + * 2018-02-12 [9ce21338a](https://github.com/silverstripe/silverstripe-framework/commit/9ce21338a3083c80128c5923eab3d8b968f4dd83) composer.json missing notice (zanderwar) + * 2017-11-15 [c7ab5846d](https://github.com/silverstripe/silverstripe-framework/commit/c7ab5846df7e3f460b1c38e04a0946a914a35c19) Don't infer trace if explicitly provided (Damian Mooyman) + +### Bugfixes + + * 2018-09-18 [bbe7c66](https://github.com/silverstripe/silverstripe-asset-admin/commit/bbe7c660cf40d4c942eaf6e76755eeaf46c63471) Add `AssetAdmin::getMinimalistObjectFromData()` to build file metadata for UploadField (#829) (Maxime Rainville) + * 2018-09-03 [1c4311d](https://github.com/silverstripe/silverstripe-asset-admin/commit/1c4311d4e6548600272daa0ce83afa12cf7e99c3) fix description for docs.silverstripe.org (wernerkrauss) + * 2018-09-03 [b922c0d73](https://github.com/silverstripe/silverstripe-framework/commit/b922c0d7327b5d0222dd280afcb64f83a09ea859) Check scheme is truthy before setting it to the request (Robbie Averill) + * 2018-08-28 [d651d0fbf](https://github.com/silverstripe/silverstripe-framework/commit/d651d0fbfcababeaf317b27cb00b4f33b9d99eab) Use base class (not remapping target class) when looking up whether object is versioned (Robbie Averill) + * 2018-07-26 [fea9ef7](https://github.com/silverstripe/silverstripe-admin/commit/fea9ef7d2a53904086f9fad6eedba7bb307c8578) #579 BUG Ambiguous column RecordID when doing batch actions (Ed Linklater) + * 2018-06-13 [a2a8004](https://github.com/silverstripe/silverstripe-admin/commit/a2a800464b8f430529ee291a8b75e422ceca7914) Update user help link to 4 (Sacha Judd) + * 2018-06-13 [932eb2b2](https://github.com/silverstripe/silverstripe-cms/commit/932eb2b22dfe6c30473b1cf973661c28c5b9c635) Fix CMS components failing to register on other CMS sections (#2182) (Damian Mooyman) + * 2018-06-12 [7b04949ca](https://github.com/silverstripe/silverstripe-framework/commit/7b04949caa11d6e5c8cace3453cf2ed29996fb06) Remove duplicate key (Damian Mooyman) + * 2018-06-12 [c9bcc07](https://github.com/silverstripe/silverstripe-assets/commit/c9bcc070fdbb76fef49f7564eb98a4a81e2ed65f) Remove duplicate .upgrade.yml keys (Damian Mooyman) + * 2018-06-12 [674b92c](https://github.com/silverstripe/silverstripe-admin/commit/674b92c125488cb6bc43cade4c93e9adccb27e9b) Fix invalid .upgrade.yml (Damian Mooyman) + * 2018-06-11 [2a51f34c3](https://github.com/silverstripe/silverstripe-framework/commit/2a51f34c3e3c44acd603def241ac4447e715b165) Prevent canonical URL causing a redirect on CLI unless explicitly enabled (Damian Mooyman) + * 2018-06-07 [29f9b1c18](https://github.com/silverstripe/silverstripe-framework/commit/29f9b1c18fb38dab912a0b9dcae63eacae19335d) Fix linting issues (Damian Mooyman) + * 2018-06-07 [e37e3e174](https://github.com/silverstripe/silverstripe-framework/commit/e37e3e1746e56c866ee875f41a7fddf61c926d9f) Fix test that relies on implicit ID order breaking postgres (Damian Mooyman) + * 2018-06-07 [66f57bd4d](https://github.com/silverstripe/silverstripe-framework/commit/66f57bd4dac0bd4c8106f8071ddc45103c2643f2) Only set MYSQL_ATTR_INIT_COMMAND when using mysql driver (fixes #8103) (Loz Calver) + * 2018-06-06 [c070e989c](https://github.com/silverstripe/silverstripe-framework/commit/c070e989c4de41441d1061d2678b461f3f13d63b) Safely handle empty injector factory responses (Damian Mooyman) + * 2018-06-04 [41e601a03](https://github.com/silverstripe/silverstripe-framework/commit/41e601a036307065d9ea2ba8862f67be738d402f) Regression from #8009 (Daniel Hensby) + * 2018-06-01 [5a5ba1e5c](https://github.com/silverstripe/silverstripe-framework/commit/5a5ba1e5c001de161fbeb19d6d662391dccc4c1e) Fix: negative values in read only currency field (Jonathon Menz) + * 2018-06-01 [582c69d32](https://github.com/silverstripe/silverstripe-framework/commit/582c69d32fd8f18e6c06bc0b4c0a7e3e87e67966) Fix issue with Disabled DateField always display (not set). (Maxime Rainville) + * 2018-05-29 [1cbf27e0f](https://github.com/silverstripe/silverstripe-framework/commit/1cbf27e0f47c3547914b03193d0f5f77c87ff8d5) PHP 5.3 compat for referencing $this in closure, and make method public for same reason (Robbie Averill) + * 2018-05-21 [bf5b578](https://github.com/silverstripe/silverstripe-admin/commit/bf5b5787685765c35c175c303f3f7ee719ac9453) Adding a min-width to flexbox-area-grow that allows flex blocks to shrink below their content width (Guy) + * 2018-05-18 [953153500](https://github.com/silverstripe/silverstripe-framework/commit/953153500d490f5b5abf7283c34242c3b22a855a) Polymorphic relationship class columns have obsolete class names remapped (Robbie Averill) + * 2018-05-08 [97a8f56](https://github.com/silverstripe/silverstripe-admin/commit/97a8f56c43ddb3c77a5bbc452755d44afb9a9472) Add missing focus styles for preview options (fixes silverstripe/silverstripe-framework #2101) (Loz Calver) + * 2018-05-02 [80bf0fc48](https://github.com/silverstripe/silverstripe-framework/commit/80bf0fc48774b2a25f95feb24ffcc9df8e5ad77c) bad syntax (Daniel Hensby) + * 2018-04-18 [fe4b90edc](https://github.com/silverstripe/silverstripe-framework/commit/fe4b90edc0ead9c6c77d606101bfbf568a963fb4) Duplicating many_many relationships looses the extra fields in 4.0 (UndefinedOffset) + * 2018-04-17 [f83691e7f](https://github.com/silverstripe/silverstripe-framework/commit/f83691e7f7e7a75657df1211673b72d9cf4c4b4f) Make invalid dev actions 404 not 500 error (Damian Mooyman) + * 2018-04-17 [af3a9f3ec](https://github.com/silverstripe/silverstripe-framework/commit/af3a9f3ec8a5465f841c5aa8ee1faf40c1b76bf4) Duplicating many_many relationships looses the extra fields (fixes #7973) (UndefinedOffset) + * 2018-04-10 [e11ba9a2d](https://github.com/silverstripe/silverstripe-framework/commit/e11ba9a2d7c89a1ecea8613589f05399b45a33bf) Fix many_many through crashing ModelAdmin (Damian Mooyman) + * 2018-04-08 [eeac1d1](https://github.com/silverstripe/silverstripe-admin/commit/eeac1d11800e70f19055bfa2ba4aec8b6a9b2ccb) Fix issue with selected values in large trees breaking initialisation (#476) (Damian Mooyman) + * 2018-03-29 [4acec3356](https://github.com/silverstripe/silverstripe-framework/commit/4acec33562e4e1230092eee7d76c2b8061ffc914) Fixed bug in config merging priorities so that config values set by extensions are now least important instead of most important (Daniel Hensby) + * 2018-03-28 [dd44deacb](https://github.com/silverstripe/silverstripe-framework/commit/dd44deacb462d80dbbda507fdb4e9527f049d3bd) Fix for "too few parameters" error when using DBMultiEnum (Andreas Lindahl) + * 2018-03-22 [cf5a0984](https://github.com/silverstripe/silverstripe-cms/commit/cf5a0984addf308d2cb10df9b67386be2a080f18) Correct SilverStripeNavigator correctly in templates (Daniel Hensby) + * 2018-03-15 [d17d93f7](https://github.com/silverstripe/silverstripe-cms/commit/d17d93f784a6e01f3d396c55adc623d69a90261a) Remove SearchForm results() function from allowed_actions (Steve Dixon) + * 2018-03-11 [2b9faf46](https://github.com/silverstripe/silverstripe-cms/commit/2b9faf46fe6606a9236f9e1ec987f9a22689a2c7) Fix InSection failing on non-page controllers (Damian Mooyman) + * 2018-03-07 [bf2cee398](https://github.com/silverstripe/silverstripe-framework/commit/bf2cee3989028aaa461e9f0f929724b7738c1399) Bugfix - Correct duplicate nesting of 'Content' to be returned to template (Joe Harvey) + * 2018-03-06 [5fee4a81a](https://github.com/silverstripe/silverstripe-framework/commit/5fee4a81aa880338fba7bb72731fd2b7be4643de) Files dataobjects with missing asset shouldn't un-attach themselves from parent object on save (Damian Mooyman) + * 2018-03-05 [dde13493](https://github.com/silverstripe/silverstripe-cms/commit/dde134936825e196ca97cb86ac3f5bc24d52278e) Fix invalid css classname in virtualpage (Damian Mooyman) + * 2018-03-05 [985a0af](https://github.com/silverstripe/silverstripe-admin/commit/985a0af292bb833ba48fa907a1b75892182ec390) Fix page icons (Damian Mooyman) + * 2018-03-02 [3bd714d](https://github.com/silverstripe/silverstripe-assets/commit/3bd714d293c3f6c12e8f7a0b3c7e054d99b410bd) Typo in "audio file" translation (Robbie Averill) + * 2018-03-01 [40c2e299a](https://github.com/silverstripe/silverstripe-framework/commit/40c2e299a0a9a63b4e64e14dff95e9f7d480db6e) Fix "mb_stripos(): Empty delimiter" warning when no search-keywords are given for `DBText::ContextSummary`. (Roman Schmid) + * 2018-02-27 [d91c6ed](https://github.com/silverstripe/silverstripe-admin/commit/d91c6ed0dc699f769802e5d1310f3fe111dd8ecf) Fix $CMSVersion appearing visually (Damian Mooyman) + * 2018-02-26 [b27102f81](https://github.com/silverstripe/silverstripe-framework/commit/b27102f810e873d287fa04678a4ff242c40699f6) Fix incorrect assets created when ASSETS_PATH !== BASE_PATH . '/assets' (Damian Mooyman) + * 2018-02-22 [012bfec5](https://github.com/silverstripe/silverstripe-cms/commit/012bfec5bf8e0902f3325c8e7fb237d48bd189ad) Bug field help text translations no longer need to be HTML encoded (Rick Hambrook) + * 2018-02-20 [83c4ab8d](https://github.com/silverstripe/silverstripe-cms/commit/83c4ab8d180954b3d80d16ed5f5764e3c647ca6d) Fix test regressions in CMS page filters (Damian Mooyman) + * 2018-02-19 [cfe82e9](https://github.com/silverstripe/silverstripe-assets/commit/cfe82e912616ca230b8fd29fba3bd3270fac2502) Fix behaviour towards versioned but unstagable records (Damian Mooyman) + * 2018-02-19 [4fc8166](https://github.com/silverstripe/silverstripe-versioned/commit/4fc816653e84c0a883a01afe30e16e8bd4129f53) Fix behaviour towards versioned but unstagable records (Damian Mooyman) + * 2018-02-19 [0e26c0664](https://github.com/silverstripe/silverstripe-framework/commit/0e26c066440d2591401e84d9688cbeef0595afcc) Fix behaviour towards versioned but unstagable records (Damian Mooyman) + * 2018-02-19 [3be0478e](https://github.com/silverstripe/silverstripe-cms/commit/3be0478e1c40cd2b9f577818596c4222b365b6b6) Fix behaviour towards versioned but unstagable records (Damian Mooyman) + * 2018-02-19 [8be3930](https://github.com/silverstripe/silverstripe-versioned/commit/8be393061e8578c3bd9056c6540e5f0bbff43801) Fix doRollbackTo() writing old / unsaved version over restored version (Damian Mooyman) + * 2018-02-16 [86addea1d](https://github.com/silverstripe/silverstripe-framework/commit/86addea1d2a7b2e28ae8115279ae358bcb46648a) Split HTML manipulation to onadd, so elements are not accidentally duplicated (Christopher Joe) + * 2018-02-13 [c767e472d](https://github.com/silverstripe/silverstripe-framework/commit/c767e472dc494408460ef47c27b8d34475da4ac6) DataObject singleton creation (Jonathon Menz) + * 2018-02-13 [f2b82b1f7](https://github.com/silverstripe/silverstripe-framework/commit/f2b82b1f77a60de4bf1b5807e1b820aad263ae1b) Fix docs for configuring before/after a specific config file (Christopher Joe) + * 2018-02-13 [c6095cf](https://github.com/silverstripe/silverstripe-config/commit/c6095cfc0a07a74bb932e2191215d06f102e992a) Fix word boundary issue with pathname matching (Christopher Joe) + * 2018-02-13 [1d27a14](https://github.com/silverstripe/silverstripe-admin/commit/1d27a14be75efb33a503f7f1c15b093ab3b59c7f) Remove border-radius add hover states to non-active tabs (Sacha Judd) + * 2018-02-12 [ad52ced](https://github.com/silverstripe/silverstripe-versioned/commit/ad52ced4353b8abe312aeacfb2c95657169feedc) Prevent nested permissions from breaking recursive publishing (Damian Mooyman) + * 2018-02-12 [0f08f85](https://github.com/silverstripe/silverstripe-admin/commit/0f08f85508d01a578015848caff032ae0fd62e4c) improve the browser warning logic show (Christopher Joe) + * 2018-02-08 [d86e5dfc](https://github.com/silverstripe/silverstripe-cms/commit/d86e5dfc883267ffaa0c43e9ece7576c4f42ed61) remove now superfluous print action destroyer (Dylan Wagstaff) + * 2018-02-08 [d3278d547](https://github.com/silverstripe/silverstripe-framework/commit/d3278d5470165bba14ee5026453ec7d529901f42) Add Nested DB transaction support (#7848) (Daniel Hensby) + * 2018-02-08 [0a486b8f5](https://github.com/silverstripe/silverstripe-framework/commit/0a486b8f5705242de523489190f3975d55b3b3e6) Fix issue with CLIDebugView failing on class name of existing class (Damian Mooyman) + * 2018-02-06 [0094c19](https://github.com/silverstripe/silverstripe-admin/commit/0094c19304eea5ac02daf42095da341315dae84f) Add text-colour to status-archived, remove span.badge styles (Sacha Judd) + * 2018-02-06 [6b38031a1](https://github.com/silverstripe/silverstripe-framework/commit/6b38031a1e16e94d5bafcbcce4bdcb2d6b3680ed) Fix Director::test() not persisting removed session keys on teardown (Damian Mooyman) + * 2018-02-06 [660dfd34a](https://github.com/silverstripe/silverstripe-framework/commit/660dfd34a828e7eb7dc8ef9986b201a14620d17f) Issue where default admin has no password encryption (Daniel Hensby) + * 2018-02-05 [28ca11dd7](https://github.com/silverstripe/silverstripe-framework/commit/28ca11dd7e5e9a1c4fd1f5d4acbec856adfb7176) Regex range identifier correctly escaped (Daniel Hensby) + * 2018-02-04 [1ff32b3](https://github.com/silverstripe/silverstripe-admin/commit/1ff32b347911c1a6f8521f31e79131db68ed3084) Ensure lang is detected from html tag (Martin P) + * 2018-01-26 [416915b08](https://github.com/silverstripe/silverstripe-framework/commit/416915b08248285083518850ad8d015ca8ed25c2) tableName is blank in CompositeDBField->addToQuery (Dominik Beerbohm) + * 2018-01-25 [cf69d0486](https://github.com/silverstripe/silverstripe-framework/commit/cf69d048665befa90eb43146f86cde984b876b3a) Fix ping including requirements (Damian Mooyman) + * 2018-01-24 [c2cd6b383](https://github.com/silverstripe/silverstripe-framework/commit/c2cd6b3832c6bc4775b2742df593b445c2aca391) Fix Member_GroupSet::removeAll() (fixes #3948) (Loz Calver) + * 2018-01-24 [f2b4c192e](https://github.com/silverstripe/silverstripe-framework/commit/f2b4c192ec4d70779f7c667a976e741a7f3a26c5) Fix UploadField cuts off “Save” button (closes #2862) (Loz Calver) + * 2018-01-23 [7384e3fc2](https://github.com/silverstripe/silverstripe-framework/commit/7384e3fc25987742ea08af74b704857a936e8ec0) Gridfields with dropdowns having lots of overflow (Scott Hutchinson) + * 2018-01-19 [5849820](https://github.com/silverstripe/silverstripe-asset-admin/commit/58498200190cba086477c158d1fe6112cf3b0a1e) Fix compatibility issue with chromedriver (Damian Mooyman) + * 2016-10-21 [8e5bb6fbd](https://github.com/silverstripe/silverstripe-framework/commit/8e5bb6fbdce0b2ca2d08a45534df2264db5e6b12) Fix : relObject() should return null if one of the node is null (Jason) + * 2016-03-15 [22b3a71ec](https://github.com/silverstripe/silverstripe-framework/commit/22b3a71ec0c8cd8c38030fa0bf5449abefafe8a3) fixing val reference to url in https hotlink (Denise Rivera) + * 2015-04-22 [1f63637b9](https://github.com/silverstripe/silverstripe-framework/commit/1f63637b9369d4644a92523ada5d1a5dc0576c12) for #4095, TinyMCE not able to modify props of embed media (bug 1) and invalid HTML inserted (bug 2) (Patrick Nelson) From 0f2eebe5d41698e3d8de74e4b2cf38ea89bf7d1e Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Fri, 9 Nov 2018 13:59:14 +0200 Subject: [PATCH 073/175] NEW Change to variadic calls in ListDecorator and add unit tests --- src/ORM/ListDecorator.php | 13 +- tests/php/ORM/ListDecoratorTest.php | 278 ++++++++++++++++++++++++++++ 2 files changed, 283 insertions(+), 8 deletions(-) create mode 100644 tests/php/ORM/ListDecoratorTest.php diff --git a/src/ORM/ListDecorator.php b/src/ORM/ListDecorator.php index b141d548e..8620168ff 100644 --- a/src/ORM/ListDecorator.php +++ b/src/ORM/ListDecorator.php @@ -173,8 +173,7 @@ abstract class ListDecorator extends ViewableData implements SS_List, Sortable, */ public function sort() { - $args = func_get_args(); - return call_user_func_array(array($this->list, 'sort'), $args); + return $this->list->sort(...func_get_args()); } public function canFilterBy($by) @@ -192,8 +191,7 @@ abstract class ListDecorator extends ViewableData implements SS_List, Sortable, */ public function filter() { - $args = func_get_args(); - return call_user_func_array(array($this->list, 'filter'), $args); + return $this->list->filter(...func_get_args()); } /** @@ -220,7 +218,7 @@ abstract class ListDecorator extends ViewableData implements SS_List, Sortable, */ public function filterAny() { - return call_user_func_array(array($this->list, __FUNCTION__), func_get_args()); + return $this->list->filterAny(...func_get_args()); } /** @@ -242,7 +240,7 @@ abstract class ListDecorator extends ViewableData implements SS_List, Sortable, } $output = ArrayList::create(); foreach ($this->list as $item) { - if (call_user_func($callback, $item, $this->list)) { + if ($callback($item, $this->list)) { $output->push($item); } } @@ -286,8 +284,7 @@ abstract class ListDecorator extends ViewableData implements SS_List, Sortable, */ public function exclude() { - $args = func_get_args(); - return call_user_func_array(array($this->list, 'exclude'), $args); + return $this->list->exclude(...func_get_args()); } public function debug() diff --git a/tests/php/ORM/ListDecoratorTest.php b/tests/php/ORM/ListDecoratorTest.php new file mode 100644 index 000000000..6fe45fdd2 --- /dev/null +++ b/tests/php/ORM/ListDecoratorTest.php @@ -0,0 +1,278 @@ +list = $this->createMock(ArrayList::class); + $this->decorator = $this->getMockForAbstractClass(ListDecorator::class, [$this->list]); + } + + public function testGetIterator() + { + $this->list->expects($this->once())->method('getIterator')->willReturn('mock'); + $this->assertSame('mock', $this->decorator->getIterator()); + } + + public function testCanSortBy() + { + $this->list->expects($this->once())->method('canSortBy')->with('foo')->willReturn(true); + $this->assertTrue($this->decorator->canSortBy('foo')); + } + + public function testRemove() + { + $this->list->expects($this->once())->method('remove')->with('foo'); + $this->decorator->remove('foo'); + } + + /** + * @param array $input + * @dataProvider filterProvider + */ + public function testExclude($input) + { + $this->list->expects($this->once())->method('exclude')->with($input)->willReturn('mock'); + $this->assertSame('mock', $this->decorator->exclude($input)); + } + + /** + * @param array $input + * @dataProvider filterProvider + */ + public function testFilter($input) + { + $this->list->expects($this->once())->method('filter')->with($input)->willReturn('mock'); + $this->assertSame('mock', $this->decorator->filter($input)); + } + + /** + * @param array $input + * @dataProvider filterProvider + */ + public function testFilterAny($input) + { + $this->list->expects($this->once())->method('filterAny')->with($input)->willReturn('mock'); + $this->assertSame('mock', $this->decorator->filterAny($input)); + } + + /** + * @param array $input + * @dataProvider filterProvider + */ + public function testSort($input) + { + $this->list->expects($this->once())->method('sort')->with($input)->willReturn('mock'); + $this->assertSame('mock', $this->decorator->sort($input)); + } + + /** + * @return array[] + */ + public function filterProvider() + { + return [ + ['Name', 'Bob'], + ['Name', ['aziz', 'Bob']], + [['Name' =>'bob', 'Age' => 21]], + [['Name' =>'bob', 'Age' => [21, 43]]], + ]; + } + + public function testCanFilterBy() + { + $this->list->expects($this->once())->method('canFilterBy')->with('Title')->willReturn(false); + $this->assertFalse($this->decorator->canFilterBy('Title')); + } + + /** + * @expectedException \LogicException + * @expectedExceptionMessage SS_Filterable::filterByCallback() passed callback must be callable, 'boolean' given + */ + public function testFilterByCallbackThrowsExceptionWhenGivenNonCallable() + { + $this->decorator->filterByCallback(true); + } + + public function testFilterByCallback() + { + $input = new ArrayList([ + ['Name' => 'Leslie'], + ['Name' => 'Maxime'], + ['Name' => 'Sal'], + ]); + + $callback = function ($item, SS_List $list) { + return $item->Name === 'Maxime'; + }; + + $this->decorator->setList($input); + $result = $this->decorator->filterByCallback($callback); + + $this->assertCount(1, $result); + $this->assertSame('Maxime', $result->first()->Name); + } + + public function testFind() + { + $this->list->expects($this->once())->method('find')->with('foo', 'bar')->willReturn('mock'); + $this->assertSame('mock', $this->decorator->find('foo', 'bar')); + } + + public function testDebug() + { + $this->list->expects($this->once())->method('debug')->willReturn('mock'); + $this->assertSame('mock', $this->decorator->debug()); + } + + public function testCount() + { + $this->list->expects($this->once())->method('count')->willReturn(5); + $this->assertSame(5, $this->decorator->Count()); + } + + public function testEach() + { + $callable = function () { + // noop + }; + $this->list->expects($this->once())->method('each')->with($callable)->willReturn('mock'); + $this->assertSame('mock', $this->decorator->each($callable)); + } + + public function testOffsetExists() + { + $this->list->expects($this->once())->method('offsetExists')->with('foo')->willReturn('mock'); + $this->assertSame('mock', $this->decorator->offsetExists('foo')); + } + + public function testGetList() + { + $this->assertSame($this->list, $this->decorator->getList()); + } + + public function testColumnUnique() + { + $this->list->expects($this->once())->method('columnUnique')->with('ID')->willReturn('mock'); + $this->assertSame('mock', $this->decorator->columnUnique('ID')); + } + + public function testMap() + { + $this->list->expects($this->once())->method('map')->with('ID', 'Title')->willReturn('mock'); + $this->assertSame('mock', $this->decorator->map('ID', 'Title')); + } + + public function testReverse() + { + $this->list->expects($this->once())->method('reverse')->willReturn('mock'); + $this->assertSame('mock', $this->decorator->reverse()); + } + + public function testOffsetGet() + { + $this->list->expects($this->once())->method('offsetGet')->with(2)->willReturn('mock'); + $this->assertSame('mock', $this->decorator->offsetGet(2)); + } + + public function testExists() + { + $this->list->expects($this->once())->method('exists')->willReturn(false); + $this->assertFalse($this->decorator->exists()); + } + + public function testByID() + { + $this->list->expects($this->once())->method('byID')->with(123)->willReturn('mock'); + $this->assertSame('mock', $this->decorator->byID(123)); + } + + public function testByIDs() + { + $this->list->expects($this->once())->method('byIDs')->with([1, 2])->willReturn('mock'); + $this->assertSame('mock', $this->decorator->byIDs([1, 2])); + } + + public function testToArray() + { + $this->list->expects($this->once())->method('toArray')->willReturn(['foo', 'bar']); + $this->assertSame(['foo', 'bar'], $this->decorator->toArray()); + } + + public function testToNestedArray() + { + $this->list->expects($this->once())->method('toNestedArray')->willReturn(['foo', 'bar']); + $this->assertSame(['foo', 'bar'], $this->decorator->toNestedArray()); + } + + public function testOffsetSet() + { + $this->list->expects($this->once())->method('offsetSet')->with('foo', 'bar'); + $this->decorator->offsetSet('foo', 'bar'); + } + + public function testOffsetUnset() + { + $this->list->expects($this->once())->method('offsetUnset')->with('foo'); + $this->decorator->offsetUnset('foo'); + } + + public function testLimit() + { + $this->list->expects($this->once())->method('limit')->with(5, 3)->willReturn('mock'); + $this->assertSame('mock', $this->decorator->limit(5, 3)); + } + + public function testTotalItems() + { + $this->list->expects($this->once())->method('count')->willReturn(5); + $this->assertSame(5, $this->decorator->TotalItems()); + } + + public function testAdd() + { + $this->list->expects($this->once())->method('add')->with('foo')->willReturn('mock'); + $this->decorator->add('foo'); + } + + public function testFirst() + { + $this->list->expects($this->once())->method('first')->willReturn(1); + $this->assertSame(1, $this->decorator->first()); + } + + public function testLast() + { + $this->list->expects($this->once())->method('last')->willReturn(10); + $this->assertSame(10, $this->decorator->last()); + } + + public function testColumn() + { + $this->list->expects($this->once())->method('column')->with('DOB')->willReturn('mock'); + $this->assertSame('mock', $this->decorator->column('DOB')); + } +} From bd5a815909d735c8223a552d8e79ebc13481a3aa Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Mon, 8 Oct 2018 17:07:50 +1300 Subject: [PATCH 074/175] FIX: Make all enums non-destructive, not just ClassName MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change also renders a portion of DBSchemaManager irrelevant, that destructively “fixes” old values. This is in keeping with the non-destructive principle of dev/build, and some suggestions to move away from enum fields altogether. Fixes https://github.com/silverstripe/silverstripe-framework/issues/1387 --- docs/en/04_Changelogs/4.4.0.md | 2 +- src/ORM/Connect/DBSchemaManager.php | 31 -------- src/ORM/DataObject.php | 3 +- src/ORM/FieldType/DBClassName.php | 53 +------------- src/ORM/FieldType/DBEnum.php | 62 +++++++++++++++- tests/php/ORM/DBEnumTest.php | 70 +++++++++++++++++++ .../ORM/DataObjectSchemaGenerationTest.php | 10 +-- tests/php/ORM/FieldType/DBEnumTestObject.php | 15 ++++ tests/php/Security/SecurityTest.php | 4 +- 9 files changed, 158 insertions(+), 92 deletions(-) create mode 100644 tests/php/ORM/FieldType/DBEnumTestObject.php diff --git a/docs/en/04_Changelogs/4.4.0.md b/docs/en/04_Changelogs/4.4.0.md index f37ba13a6..1b761129b 100644 --- a/docs/en/04_Changelogs/4.4.0.md +++ b/docs/en/04_Changelogs/4.4.0.md @@ -6,7 +6,7 @@ ## Upgrading {#upgrading} -tbc + - dev/build is now non-destructive for all Enums, not just ClassNames. This means your data won't be lost if you're switching between versions, but watch out for code that breaks when it sees an unrecognised value! ## Changes to internal APIs diff --git a/src/ORM/Connect/DBSchemaManager.php b/src/ORM/Connect/DBSchemaManager.php index 38ef02fd6..20ea84242 100644 --- a/src/ORM/Connect/DBSchemaManager.php +++ b/src/ORM/Connect/DBSchemaManager.php @@ -713,37 +713,6 @@ MESSAGE $this->transCreateField($table, $field, $spec_orig); $this->alterationMessage("Field $table.$field: created as $spec_orig", "created"); } elseif ($fieldValue != $specValue) { - // If enums/sets are being modified, then we need to fix existing data in the table. - // Update any records where the enum is set to a legacy value to be set to the default. - foreach (array('enum', 'set') as $enumtype) { - if (preg_match("/^$enumtype/i", $specValue)) { - $newStr = preg_replace("/(^$enumtype\\s*\\(')|('\\).*)/i", "", $spec_orig); - $new = preg_split("/'\\s*,\\s*'/", $newStr); - - $oldStr = preg_replace("/(^$enumtype\\s*\\(')|('\\).*)/i", "", $fieldValue); - $old = preg_split("/'\\s*,\\s*'/", $oldStr); - - $holder = array(); - foreach ($old as $check) { - if (!in_array($check, $new)) { - $holder[] = $check; - } - } - if (count($holder)) { - $default = explode('default ', $spec_orig); - $default = $default[1]; - $query = "UPDATE \"$table\" SET $field=$default WHERE $field IN ("; - for ($i = 0; $i + 1 < count($holder); $i++) { - $query .= "'{$holder[$i]}', "; - } - $query .= "'{$holder[$i]}')"; - $this->query($query); - $amount = $this->database->affectedRows(); - $this->alterationMessage("Changed $amount rows to default value of field $field" - . " (Value: $default)"); - } - } - } $this->transAlterField($table, $field, $spec_orig); $this->alterationMessage( "Field $table.$field: changed to $specValue (from {$fieldValue})", diff --git a/src/ORM/DataObject.php b/src/ORM/DataObject.php index 3fbf3afa4..6c3730703 100644 --- a/src/ORM/DataObject.php +++ b/src/ORM/DataObject.php @@ -19,6 +19,7 @@ use SilverStripe\i18n\i18n; use SilverStripe\i18n\i18nEntityProvider; use SilverStripe\ORM\Connect\MySQLSchemaManager; use SilverStripe\ORM\FieldType\DBClassName; +use SilverStripe\ORM\FieldType\DBEnum; use SilverStripe\ORM\FieldType\DBComposite; use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\FieldType\DBField; @@ -3197,7 +3198,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity public static function reset() { // @todo Decouple these - DBClassName::clear_classname_cache(); + DBEnum::flushCache(); ClassInfo::reset_db_cache(); static::getSchema()->reset(); self::$_cache_get_one = array(); diff --git a/src/ORM/FieldType/DBClassName.php b/src/ORM/FieldType/DBClassName.php index 7b7689f7c..3255aef15 100644 --- a/src/ORM/FieldType/DBClassName.php +++ b/src/ORM/FieldType/DBClassName.php @@ -6,6 +6,7 @@ use SilverStripe\Core\ClassInfo; use SilverStripe\Core\Config\Config; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DB; +use SilverStripe\Dev\Deprecation; /** * Represents a classname selector, which respects obsolete clasess. @@ -29,14 +30,6 @@ class DBClassName extends DBEnum */ protected $record = null; - /** - * Classname spec cache for obsolete classes. The top level keys are the table, each of which contains - * nested arrays with keys mapped to field names. The values of the lowest level array are the classnames - * - * @var array - */ - protected static $classname_cache = array(); - private static $index = true; /** @@ -45,7 +38,8 @@ class DBClassName extends DBEnum */ public static function clear_classname_cache() { - self::$classname_cache = array(); + Deprecation::notice('4.3', 'Call DBEnum::flushCache() instead'); + DBEnum::flushCache(); } /** @@ -149,47 +143,6 @@ class DBClassName extends DBEnum return array_values($classNames); } - /** - * Get the list of classnames, including obsolete classes. - * - * If table or name are not set, or if it is not a valid field on the given table, - * then only known classnames are returned. - * - * Values cached in this method can be cleared via `DBClassName::clear_classname_cache();` - * - * @return array - */ - public function getEnumObsolete() - { - // Without a table or field specified, we can only retrieve known classes - $table = $this->getTable(); - $name = $this->getName(); - if (empty($table) || empty($name)) { - return $this->getEnum(); - } - - // Ensure the table level cache exists - if (empty(self::$classname_cache[$table])) { - self::$classname_cache[$table] = array(); - } - - // Check existing cache - if (!empty(self::$classname_cache[$table][$name])) { - return self::$classname_cache[$table][$name]; - } - - // Get all class names - $classNames = $this->getEnum(); - if (DB::get_schema()->hasField($table, $name)) { - $existing = DB::query("SELECT DISTINCT \"{$name}\" FROM \"{$table}\"")->column(); - $classNames = array_unique(array_merge($classNames, $existing)); - } - - // Cache and return - self::$classname_cache[$table][$name] = $classNames; - return $classNames; - } - public function setValue($value, $record = null, $markChanged = true) { parent::setValue($value, $record, $markChanged); diff --git a/src/ORM/FieldType/DBEnum.php b/src/ORM/FieldType/DBEnum.php index cb3126cec..3715365a7 100644 --- a/src/ORM/FieldType/DBEnum.php +++ b/src/ORM/FieldType/DBEnum.php @@ -20,7 +20,7 @@ class DBEnum extends DBString * * @var array */ - protected $enum = array(); + protected $enum = []; /** * Default value @@ -31,6 +31,22 @@ class DBEnum extends DBString private static $default_search_filter_class = 'ExactMatchFilter'; + /** + * Internal cache for obsolete enum values. The top level keys are the table, each of which contains + * nested arrays with keys mapped to field names. The values of the lowest level array are the enum values + * + * @var array + */ + protected static $enum_cache = []; + + /** + * Clear all cached enum values. + */ + public static function flushCache() + { + self::$enum_cache = []; + } + /** * Create a new Enum field, which is a value within a defined set, with an optional default. * @@ -88,7 +104,7 @@ class DBEnum extends DBString $parts = array( 'datatype' => 'enum', - 'enums' => $this->getEnum(), + 'enums' => $this->getEnumObsolete(), 'character set' => $charset, 'collate' => $collation, 'default' => $this->getDefault(), @@ -173,6 +189,48 @@ class DBEnum extends DBString return $this->enum; } + + /** + * Get the list of enum values, including obsolete values still present in the database + * + * If table or name are not set, or if it is not a valid field on the given table, + * then only known enum values are returned. + * + * Values cached in this method can be cleared via `DBEnum::flushCache();` + * + * @return array + */ + public function getEnumObsolete() + { + // Without a table or field specified, we can only retrieve known enum values + $table = $this->getTable(); + $name = $this->getName(); + if (empty($table) || empty($name)) { + return $this->getEnum(); + } + + // Ensure the table level cache exists + if (empty(self::$enum_cache[$table])) { + self::$enum_cache[$table] = array(); + } + + // Check existing cache + if (!empty(self::$enum_cache[$table][$name])) { + return self::$enum_cache[$table][$name]; + } + + // Get all enum values + $enumValues = $this->getEnum(); + if (DB::get_schema()->hasField($table, $name)) { + $existing = DB::query("SELECT DISTINCT \"{$name}\" FROM \"{$table}\"")->column(); + $enumValues = array_unique(array_merge($enumValues, $existing)); + } + + // Cache and return + self::$enum_cache[$table][$name] = $enumValues; + return $enumValues; + } + /** * Set enum options * diff --git a/tests/php/ORM/DBEnumTest.php b/tests/php/ORM/DBEnumTest.php index 3ed633f15..7fe37403a 100644 --- a/tests/php/ORM/DBEnumTest.php +++ b/tests/php/ORM/DBEnumTest.php @@ -5,9 +5,17 @@ namespace SilverStripe\ORM\Tests; use SilverStripe\Dev\SapphireTest; use SilverStripe\ORM\FieldType\DBEnum; use SilverStripe\ORM\FieldType\DBField; +use SilverStripe\ORM\DB; class DBEnumTest extends SapphireTest { + + protected $extraDataObjects = [ + FieldType\DBEnumTestObject::class, + ]; + + protected $usesDatabase = true; + public function testDefault() { /** @var DBEnum $enum1 */ @@ -28,4 +36,66 @@ class DBEnumTest extends SapphireTest $this->assertEquals('B', $enum4->getDefaultValue()); $this->assertEquals('B', $enum4->getDefault()); } + + public function testObsoleteValues() + { + $obj = new FieldType\DBEnumTestObject(); + $colourField = $obj->obj('Colour'); + $colourField->setTable('FieldType_DBEnumTestObject'); + + // Test values prior to any database content + $this->assertEquals( + ['Red', 'Blue', 'Green'], + $colourField->getEnumObsolete() + ); + + // Test values with a record + $obj->Colour = 'Red'; + $obj->write(); + DBEnum::flushCache(); + + $this->assertEquals( + ['Red', 'Blue', 'Green'], + $colourField->getEnumObsolete() + ); + + // If the value is removed from the enum, obsolete content is still retained + $colourField->setEnum(['Blue', 'Green', 'Purple']); + DBEnum::flushCache(); + + $this->assertEquals( + ['Blue', 'Green', 'Purple', 'Red'], // Red on the end now, because it's obsolete + $colourField->getEnumObsolete() + ); + + // Check that old and new data is preserved after a schema update + DB::get_schema()->schemaUpdate(function () use ($colourField) { + $colourField->requireField(); + }); + + $obj2 = new FieldType\DBEnumTestObject(); + $obj2->Colour = 'Purple'; + $obj2->write(); + + $this->assertEquals( + ['Purple', 'Red'], + FieldType\DBEnumTestObject::get()->sort('Colour')->column('Colour') + ); + + // Ensure that enum columns are retained + $colourField->setEnum(['Blue', 'Green']); + $this->assertEquals( + ['Blue', 'Green', 'Purple', 'Red'], + $colourField->getEnumObsolete() + ); + + // If obsolete records are deleted, the extra values go away + $obj->delete(); + $obj2->delete(); + DBEnum::flushCache(); + $this->assertEquals( + ['Blue', 'Green'], + $colourField->getEnumObsolete() + ); + } } diff --git a/tests/php/ORM/DataObjectSchemaGenerationTest.php b/tests/php/ORM/DataObjectSchemaGenerationTest.php index b366d5d51..73313d63b 100644 --- a/tests/php/ORM/DataObjectSchemaGenerationTest.php +++ b/tests/php/ORM/DataObjectSchemaGenerationTest.php @@ -5,7 +5,7 @@ namespace SilverStripe\ORM\Tests; use SilverStripe\Core\Config\Config; use SilverStripe\ORM\Connect\MySQLSchemaManager; use SilverStripe\ORM\DB; -use SilverStripe\ORM\FieldType\DBClassName; +use SilverStripe\ORM\FieldType\DBEnum; use SilverStripe\ORM\DataObject; use SilverStripe\Dev\SapphireTest; use SilverStripe\ORM\Tests\DataObjectSchemaGenerationTest\SortedObject; @@ -208,7 +208,7 @@ class DataObjectSchemaGenerationTest extends SapphireTest $schema = DataObject::getSchema(); // Test with blank entries - DBClassName::clear_classname_cache(); + DBEnum::flushCache(); $do1 = new TestObject(); $fields = $schema->databaseFields(TestObject::class, false); $this->assertEquals("DBClassName", $fields['ClassName']); @@ -224,7 +224,7 @@ class DataObjectSchemaGenerationTest extends SapphireTest // Test with instance of subclass $item1 = new TestIndexObject(); $item1->write(); - DBClassName::clear_classname_cache(); + DBEnum::flushCache(); $this->assertEquals( [ TestObject::class, @@ -237,7 +237,7 @@ class DataObjectSchemaGenerationTest extends SapphireTest // Test with instance of main class $item2 = new TestObject(); $item2->write(); - DBClassName::clear_classname_cache(); + DBEnum::flushCache(); $this->assertEquals( [ TestObject::class, @@ -252,7 +252,7 @@ class DataObjectSchemaGenerationTest extends SapphireTest $item1->write(); $item2 = new TestObject(); $item2->write(); - DBClassName::clear_classname_cache(); + DBEnum::flushCache(); $this->assertEquals( [ TestObject::class, diff --git a/tests/php/ORM/FieldType/DBEnumTestObject.php b/tests/php/ORM/FieldType/DBEnumTestObject.php new file mode 100644 index 000000000..b9c70d71c --- /dev/null +++ b/tests/php/ORM/FieldType/DBEnumTestObject.php @@ -0,0 +1,15 @@ + 'Enum("Red,Blue,Green")', + ]; +} diff --git a/tests/php/Security/SecurityTest.php b/tests/php/Security/SecurityTest.php index 9ac158758..1c81911d4 100644 --- a/tests/php/Security/SecurityTest.php +++ b/tests/php/Security/SecurityTest.php @@ -14,7 +14,7 @@ use SilverStripe\Dev\FunctionalTest; use SilverStripe\i18n\i18n; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DB; -use SilverStripe\ORM\FieldType\DBClassName; +use SilverStripe\ORM\FieldType\DBEnum; use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\FieldType\DBField; use SilverStripe\ORM\ValidationResult; @@ -671,7 +671,7 @@ class SecurityTest extends FunctionalTest public function testDatabaseIsReadyWithInsufficientMemberColumns() { Security::clear_database_is_ready(); - DBClassName::clear_classname_cache(); + DBEnum::flushCache(); // Assumption: The database has been built correctly by the test runner, // and has all columns present in the ORM From a8d3b95175c8336999e617e3334551ada5a49919 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Fri, 9 Nov 2018 16:23:50 +1300 Subject: [PATCH 075/175] FIX: Make test work with utf8mb4 --- .../php/ORM/DataObjectSchemaGenerationTest/TestIndexObject.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/php/ORM/DataObjectSchemaGenerationTest/TestIndexObject.php b/tests/php/ORM/DataObjectSchemaGenerationTest/TestIndexObject.php index 72032715e..d0d7134a2 100644 --- a/tests/php/ORM/DataObjectSchemaGenerationTest/TestIndexObject.php +++ b/tests/php/ORM/DataObjectSchemaGenerationTest/TestIndexObject.php @@ -8,7 +8,7 @@ class TestIndexObject extends TestObject implements TestOnly { private static $table_name = 'DataObjectSchemaGenerationTest_IndexDO'; private static $db = [ - 'Title' => 'Varchar(255)', + 'Title' => 'Varchar(192)', 'Content' => 'Text', ]; From eba92d77df1c9fa678dab97e548bb9ba65dcb696 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 10 Nov 2018 10:04:17 +0200 Subject: [PATCH 076/175] Rename CheckboxFieldReadonlyTest for future PSR-2 compatibility --- ...kboxField_ReadonlyTest.php => CheckboxFieldReadonlyTest.php} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename tests/php/Forms/{CheckboxField_ReadonlyTest.php => CheckboxFieldReadonlyTest.php} (88%) diff --git a/tests/php/Forms/CheckboxField_ReadonlyTest.php b/tests/php/Forms/CheckboxFieldReadonlyTest.php similarity index 88% rename from tests/php/Forms/CheckboxField_ReadonlyTest.php rename to tests/php/Forms/CheckboxFieldReadonlyTest.php index 4996deda8..e82156325 100644 --- a/tests/php/Forms/CheckboxField_ReadonlyTest.php +++ b/tests/php/Forms/CheckboxFieldReadonlyTest.php @@ -5,7 +5,7 @@ namespace SilverStripe\Forms\Tests; use SilverStripe\Dev\SapphireTest; use SilverStripe\Forms\CheckboxField_Readonly; -class CheckboxField_ReadonlyTest extends SapphireTest +class CheckboxFieldReadonlyTest extends SapphireTest { public function testPerformReadonlyTransformation() { From bab84f31dc50c3ec251fa108793edad4dd9b78b6 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 10 Nov 2018 14:55:11 +0200 Subject: [PATCH 077/175] Remove underscores from variable test class names --- ...encyField_DisabledTest.php => CurrencyFieldDisabledTest.php} | 2 +- ...encyField_ReadonlyTest.php => CurrencyFieldReadonlyTest.php} | 2 +- .../{DateField_DisabledTest.php => DateFieldDisabledTest.php} | 2 +- ...ion_TabSetTest.php => PrintableTransformationTabSetTest.php} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename tests/php/Forms/{CurrencyField_DisabledTest.php => CurrencyFieldDisabledTest.php} (95%) rename tests/php/Forms/{CurrencyField_ReadonlyTest.php => CurrencyFieldReadonlyTest.php} (97%) rename tests/php/Forms/{DateField_DisabledTest.php => DateFieldDisabledTest.php} (98%) rename tests/php/Forms/{PrintableTransformation_TabSetTest.php => PrintableTransformationTabSetTest.php} (93%) diff --git a/tests/php/Forms/CurrencyField_DisabledTest.php b/tests/php/Forms/CurrencyFieldDisabledTest.php similarity index 95% rename from tests/php/Forms/CurrencyField_DisabledTest.php rename to tests/php/Forms/CurrencyFieldDisabledTest.php index ed832521c..a36efec58 100644 --- a/tests/php/Forms/CurrencyField_DisabledTest.php +++ b/tests/php/Forms/CurrencyFieldDisabledTest.php @@ -6,7 +6,7 @@ use SilverStripe\Dev\SapphireTest; use SilverStripe\Forms\CurrencyField_Disabled; use SilverStripe\ORM\FieldType\DBCurrency; -class CurrencyField_DisabledTest extends SapphireTest +class CurrencyFieldDisabledTest extends SapphireTest { public function testFieldWithValue() { diff --git a/tests/php/Forms/CurrencyField_ReadonlyTest.php b/tests/php/Forms/CurrencyFieldReadonlyTest.php similarity index 97% rename from tests/php/Forms/CurrencyField_ReadonlyTest.php rename to tests/php/Forms/CurrencyFieldReadonlyTest.php index 289327cd1..d403126e7 100644 --- a/tests/php/Forms/CurrencyField_ReadonlyTest.php +++ b/tests/php/Forms/CurrencyFieldReadonlyTest.php @@ -6,7 +6,7 @@ use SilverStripe\Dev\SapphireTest; use SilverStripe\Forms\CurrencyField_Readonly; use SilverStripe\ORM\FieldType\DBCurrency; -class CurrencyField_ReadonlyTest extends SapphireTest +class CurrencyFieldReadonlyTest extends SapphireTest { public function testPerformReadonlyTransformation() { diff --git a/tests/php/Forms/DateField_DisabledTest.php b/tests/php/Forms/DateFieldDisabledTest.php similarity index 98% rename from tests/php/Forms/DateField_DisabledTest.php rename to tests/php/Forms/DateFieldDisabledTest.php index 0108b751d..6fffdcd13 100644 --- a/tests/php/Forms/DateField_DisabledTest.php +++ b/tests/php/Forms/DateFieldDisabledTest.php @@ -10,7 +10,7 @@ use SilverStripe\ORM\FieldType\DBDatetime; /** * @skipUpgrade */ -class DateField_DisabledTest extends SapphireTest +class DateFieldDisabledTest extends SapphireTest { protected function setUp() { diff --git a/tests/php/Forms/PrintableTransformation_TabSetTest.php b/tests/php/Forms/PrintableTransformationTabSetTest.php similarity index 93% rename from tests/php/Forms/PrintableTransformation_TabSetTest.php rename to tests/php/Forms/PrintableTransformationTabSetTest.php index 11ca4efd8..12691ddde 100644 --- a/tests/php/Forms/PrintableTransformation_TabSetTest.php +++ b/tests/php/Forms/PrintableTransformationTabSetTest.php @@ -7,7 +7,7 @@ use SilverStripe\Forms\PrintableTransformation_TabSet; use SilverStripe\Forms\Tab; use SilverStripe\Forms\TabSet; -class PrintableTransformation_TabSetTest extends SapphireTest +class PrintableTransformationTabSetTest extends SapphireTest { public function testFieldHolder() { From bda7653ae330dc70c943c4a55386d9d29794d3ec Mon Sep 17 00:00:00 2001 From: Thor Chen Date: Mon, 12 Nov 2018 18:24:37 +1300 Subject: [PATCH 078/175] DOC: Fix outdated information and make enhancements for --- .../How_Tos/Extend_CMS_Interface.md | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md index 5f1efab02..826b09991 100644 --- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md +++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md @@ -24,10 +24,10 @@ the common `Page` object (a new PHP class `MyPage` will look for a `MyPage.ss` t We can use this to create a different base template with `LeftAndMain.ss` (which corresponds to the `LeftAndMain` PHP controller class). -Copy the template markup of the base implementation at `templates/SilverStripe/Admin/Includes/LeftAndMain_Menu.ss` +Copy the template markup of the base implementation at `templates/SilverStripe/Admin/Includes/LeftAndMain_MenuList.ss` from the `silverstripe/admin` module -into `app/templates/Includes/LeftAndMain_Menu.ss`. It will automatically be picked up by -the CMS logic. Add a new section into the `
    ` +into `app/templates/SilverStripe/Admin/Includes/LeftAndMain_MenuList.ss`. It will automatically be picked up by +the CMS logic. Add a new section into the `
      ` ```ss @@ -69,26 +69,42 @@ SilverStripe\Admin\LeftAndMain: - app/css/BookmarkedPages.css ``` +In order to let the frontend have the access to our `css` files, we need to `expose` them in the `composer.json`: + +```javascript + "extra": { + ... + "expose": [ + "app/css" + ] + }, +``` + +Then run `composer vendor-expose`. This command will publish all the `css` files under the `app/css` folder to their public-facing paths. + +> Note: don't forget to `flush`. + ## Create a "bookmark" flag on pages Now we'll define which pages are actually bookmarked, a flag that is stored in the database. For this we need to decorate the page record with a -`DataExtension`. Create a new file called `app/code/BookmarkedPageExtension.php` +`DataExtension`. Create a new file called `app/src/BookmarkedPageExtension.php` and insert the following code. ```php use SilverStripe\Forms\CheckboxField; +use SilverStripe\Forms\FieldList; use SilverStripe\ORM\DataExtension; -class BookmarkedPageExtension extends DataExtension +class BookmarkedPageExtension extends DataExtension { private static $db = [ 'IsBookmarked' => 'Boolean' ]; - public function updateCMSFields(FieldList $fields) + public function updateCMSFields(FieldList $fields) { $fields->addFieldToTab('Root.Main', new CheckboxField('IsBookmarked', "Show in CMS bookmarks?") @@ -117,7 +133,7 @@ pages from the database into the template we've already created (with hardcoded links)? Again, we extend a core class: The main CMS controller called `LeftAndMain`. -Add the following code to a new file `app/code/BookmarkedLeftAndMainExtension.php`; +Add the following code to a new file `app/src/BookmarkedLeftAndMainExtension.php`; ```php @@ -143,12 +159,12 @@ SilverStripe\Admin\LeftAndMain: ``` As the last step, replace the hardcoded links with our list from the database. -Find the `
        ` you created earlier in `app/admin/templates/LeftAndMain.ss` +Find the `
          ` you created earlier in `app/templates/SilverStripe/Admin/Includes/LeftAndMain_MenuList.ss` and replace it with the following: ```ss -
            +
              <% loop $BookmarkedPages %>
            • @@ -168,7 +184,7 @@ The following conventions apply: * New actions can be added by redefining `getCMSActions`, or adding an extension with `updateCMSActions`. -* It is required the actions are contained in a `FieldSet` (`getCMSActions` +* It is required the actions are contained in a `FieldList` (`getCMSActions` returns this already). * Standalone buttons are created by adding a top-level `FormAction` (no such button is added by default). From 15aaf9db9fe1679cf8b01b74fce3eee841278495 Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Tue, 13 Nov 2018 10:20:49 +1300 Subject: [PATCH 079/175] Fix a code style typo --- src/Forms/TreeMultiselectField.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Forms/TreeMultiselectField.php b/src/Forms/TreeMultiselectField.php index 1c0166f64..422b5739a 100644 --- a/src/Forms/TreeMultiselectField.php +++ b/src/Forms/TreeMultiselectField.php @@ -265,7 +265,7 @@ class TreeMultiselectField extends TreeDropdownField /** * {@inheritdoc} * - * @deprecated 4.0..5.0 + * @internal To be removed in 5.0 */ protected function objectForKey($key) { @@ -281,7 +281,7 @@ class TreeMultiselectField extends TreeDropdownField * This fix is not ideal, but supposed to keep backward compatibility for SS4. * Since SS5 this method should be removed and NULL should be used instead of 'unchanged'. */ - if ($this->getKeyField() ==='ID' && $key === 'unchanged') { + if ($this->getKeyField() === 'ID' && $key === 'unchanged') { $key = null; } From af8d268cc7d0a170a34539e1517e1ec4928d5de0 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 13 Nov 2018 10:55:26 +0200 Subject: [PATCH 080/175] DOCS Update documentation for password validation rule configuration --- .../09_Security/04_Secure_Coding.md | 51 ++++++++++++++----- 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md b/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md index 76a03518a..791318d8a 100644 --- a/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md +++ b/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md @@ -549,23 +549,50 @@ salt values generated with the strongest entropy generators available on the pla (see [RandomGenerator](api:SilverStripe\Security\RandomGenerator)). This prevents brute force attacks with [Rainbow tables](http://en.wikipedia.org/wiki/Rainbow_table). -Strong passwords are a crucial part of any system security. -So in addition to storing the password in a secure fashion, -you can also enforce specific password policies by configuring -a [PasswordValidator](api:SilverStripe\Security\PasswordValidator): +Strong passwords are a crucial part of any system security. So in addition to storing the password in a secure fashion, +you can also enforce specific password policies by configuring a +[PasswordValidator](api:SilverStripe\Security\PasswordValidator). This can be done through a `_config.php` file +at runtime, or via YAML configuration. +From SilverStripe 4.3 onwards, the default password validation rules are configured in the framework's `passwords.yml` +file. You will need to ensure that your config file is processed after it. For SilverStripe <4.3 you will need to +use a `_config.php` file to modify the class's config at runtime (see `_config.php` installed in your mysite/app folder +if you're using silverstripe/recipe-core). -```php -use SilverStripe\Security\Member; -use SilverStripe\Security\PasswordValidator; +```yaml +--- +Name: mypasswords +After: '#corepasswords' +--- +SilverStripe\Core\Injector\Injector: + SilverStripe\Security\PasswordValidator: + properties: + MinLength: 7 + HistoricCount: 6 + MinTestScore: 3 -$validator = new PasswordValidator(); -$validator->minLength(7); -$validator->checkHistoricalPasswords(6); -$validator->characterStrength(3, ["lowercase", "uppercase", "digits", "punctuation"]); -Member::set_password_validator($validator); +# In the case someone uses `new PasswordValidator` instead of Injector, provide some safe defaults through config. +SilverStripe\Security\PasswordValidator: + min_length: 7 + historic_count: 6 + min_test_score: 3 ``` +### Configuring custom password validator tests + +The default password validation character strength tests can be seen in the `PasswordValidator.character_strength_tests` +configuration property. You can add your own with YAML config, by providing a name for it and a regex pattern to match: + +```yaml +SilverStripe\Security\PasswordValidator: + character_strength_tests: + contains_secret_word: '/1337pw/' +``` + +This will ensure that a password contains `1337pw` somewhere in the string before validation will succeed. + +### Other options + In addition, you can tighten password security with the following configuration settings: * `Member.password_expiry_days`: Set the number of days that a password should be valid for. From 0bb94b018b55e28eef627af4a9854d4f0babac62 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 13 Nov 2018 14:08:28 +0200 Subject: [PATCH 081/175] FIX Remove default password validation rules before running unit tests --- tests/php/Security/PasswordValidatorTest.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/php/Security/PasswordValidatorTest.php b/tests/php/Security/PasswordValidatorTest.php index 4fd99ed08..7fa5637ab 100644 --- a/tests/php/Security/PasswordValidatorTest.php +++ b/tests/php/Security/PasswordValidatorTest.php @@ -2,9 +2,9 @@ namespace SilverStripe\Security\Tests; -use SilverStripe\Security\PasswordValidator; -use SilverStripe\Security\Member; use SilverStripe\Dev\SapphireTest; +use SilverStripe\Security\Member; +use SilverStripe\Security\PasswordValidator; class PasswordValidatorTest extends SapphireTest { @@ -14,6 +14,16 @@ class PasswordValidatorTest extends SapphireTest */ protected $usesDatabase = true; + protected function setUp() + { + parent::setUp(); + + // Unset framework default values + PasswordValidator::config() + ->remove('min_length') + ->remove('historic_count'); + } + public function testValidate() { $v = new PasswordValidator(); From 7d1d6d0f7b228b862807e7c2d67d55220e6d90b8 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 14 Nov 2018 11:54:17 +0200 Subject: [PATCH 082/175] FIX Ensure that tests setting passwords have stubbed configuration --- tests/php/Forms/ConfirmedPasswordFieldTest.php | 9 +++++++++ tests/php/Security/MemberTest.php | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/php/Forms/ConfirmedPasswordFieldTest.php b/tests/php/Forms/ConfirmedPasswordFieldTest.php index c034ef0cb..0df22d4a8 100644 --- a/tests/php/Forms/ConfirmedPasswordFieldTest.php +++ b/tests/php/Forms/ConfirmedPasswordFieldTest.php @@ -9,9 +9,18 @@ use SilverStripe\Forms\FieldList; use SilverStripe\Forms\Form; use SilverStripe\Forms\RequiredFields; use SilverStripe\Security\Member; +use SilverStripe\Security\PasswordValidator; class ConfirmedPasswordFieldTest extends SapphireTest { + protected $usesDatabase = true; + + protected function setUp() + { + parent::setUp(); + + PasswordValidator::singleton()->setMinLength(0); + } public function testSetValue() { diff --git a/tests/php/Security/MemberTest.php b/tests/php/Security/MemberTest.php index bdf664c1f..6817246f8 100644 --- a/tests/php/Security/MemberTest.php +++ b/tests/php/Security/MemberTest.php @@ -22,6 +22,7 @@ use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator; use SilverStripe\Security\MemberAuthenticator\SessionAuthenticationHandler; use SilverStripe\Security\MemberPassword; use SilverStripe\Security\PasswordEncryptor_Blowfish; +use SilverStripe\Security\PasswordValidator; use SilverStripe\Security\Permission; use SilverStripe\Security\RememberLoginHash; use SilverStripe\Security\Security; @@ -55,7 +56,8 @@ class MemberTest extends FunctionalTest parent::setUp(); Member::config()->set('unique_identifier_field', 'Email'); - Member::set_password_validator(null); + + PasswordValidator::singleton()->setMinLength(0); i18n::set_locale('en_US'); } From 70897495d6db77ad6ccd1e2e52ed34923a159f9d Mon Sep 17 00:00:00 2001 From: Scott Hutchinson Date: Wed, 14 Nov 2018 23:06:17 +1300 Subject: [PATCH 083/175] Add new core committers --- docs/en/05_Contributing/09_Core_committers.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/en/05_Contributing/09_Core_committers.md b/docs/en/05_Contributing/09_Core_committers.md index a9cb9a163..272c154b4 100644 --- a/docs/en/05_Contributing/09_Core_committers.md +++ b/docs/en/05_Contributing/09_Core_committers.md @@ -7,8 +7,10 @@ The Core Committers team is reviewed approximately annually, new members are add * [Chris Joe](https://github.com/flamerohr/) * [Damian Mooyman](https://github.com/tractorcow/) * [Daniel Hensby](https://github.com/dhensby) +* [Guy Marriott](https://github.com/ScopeyNZ) * [Ingo Schommer](https://github.com/chillu) * [Loz Calver](https://github.com/kinglozzer) +* [Maxime Rainville](https://github.com/maxime-rainville) * [Paul Clarke](https://github.com/clarkepaul) * [Robbie Averill](https://github.com/robbieaverill) * [Sam Minnée](https://github.com/sminnee) From 71eeaa090e480c6a1a6e4ccaed8a4f08006105bf Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 14 Nov 2018 14:05:29 +0200 Subject: [PATCH 084/175] DOCS Add documentation for configuring a HistoryViewerField for custom DataObjects [ci skip] --- .../00_Model/10_Versioning.md | 418 ++++++++++++++++++ docs/en/04_Changelogs/4.3.0.md | 7 +- 2 files changed, 424 insertions(+), 1 deletion(-) diff --git a/docs/en/02_Developer_Guides/00_Model/10_Versioning.md b/docs/en/02_Developer_Guides/00_Model/10_Versioning.md index 40538951d..aef5ca40a 100644 --- a/docs/en/02_Developer_Guides/00_Model/10_Versioning.md +++ b/docs/en/02_Developer_Guides/00_Model/10_Versioning.md @@ -838,7 +838,425 @@ $obj = MyRecord::getComplexObjectRetrieval(); // returns 'Stage' records Versioned::set_reading_mode($origMode); // reset current mode ``` +## Using the history viewer + +Since SilverStripe 4.3 you can use the React and GraphQL driven history viewer UI to display historic changes and +comparisons for a versioned DataObject. This is automatically enabled for SiteTree objects and content blocks in +[dnadesign/silverstripe-elemental](https://github.com/dnadesign/silverstripe-elemental). + +If you want to enable the history viewer for a custom versioned DataObject, you will need to: + +* Expose GraphQL scaffolding +* Add the necessary GraphQL queries and mutations to your module +* Register your GraphQL queries and mutations with Injector +* Add a HistoryViewerField to the DataObject's `getCMSFields` + +**Please note:** these examples are given in the context of project-level customisation. You may need to adjust +the webpack configuration slightly for use in a module. They are also designed to be used on SilverStripe 4.3 or +later. + +For these examples, you can use this simple DataObject and create a ModelAdmin for it: + +```php +use SilverStripe\ORM\DataObject; +use SilverStripe\Versioned\Versioned; + +class MyVersionedObject extends DataObject +{ + private static $db = [ + 'Title' => 'Varchar', + ]; + + private static $extensions = [ + Versioned::class, + ]; +} +``` + +### Configure frontend asset building + +If you haven't already configured frontend asset building for your project, you will need to configure some basic +packages to be built via webpack in order to enable history viewer functionality. If you have this configured for +your project already, ensure you have the `react-apollo` and `graphql-tag` libraries in your `package.json` +requirements, and skip this section. + +You can configure your directory structure like so: + +**package.json** + +```json +{ + "name": "my-project", + "scripts": { + "build": "yarn && NODE_ENV=production webpack -p --bail --progress", + "watch": "yarn && NODE_ENV=development webpack --watch --progress" + }, + "dependencies": { + "react-apollo": "^0.7.1", + "graphql-tag": "^0.1.17" + }, + "devDependencies": { + "@silverstripe/webpack-config": "^0.4.1", + "webpack": "^2.6.1" + }, + "jest": { + "roots": [ + "client/src" + ], + "moduleDirectories": [ + "app/client/src", + "node_modules", + "node_modules/@silverstripe/webpack-config/node_modules", + "vendor/silverstripe/admin/client/src", + "vendor/silverstripe/admin/node_modules" + ] + }, + "babel": { + "presets": [ + "env", + "react" + ], + "plugins": [ + "transform-object-rest-spread" + ] + }, + "engines": { + "node": "^6.x" + } +} +``` + +**webpack.config.js** + +```json +const Path = require('path'); +// Import the core config +const webpackConfig = require('@silverstripe/webpack-config'); +const { + resolveJS, + externalJS, + moduleJS, + pluginJS, +} = webpackConfig; + +const ENV = process.env.NODE_ENV; +const PATHS = { + MODULES: 'node_modules', + FILES_PATH: '../', + ROOT: Path.resolve(), + SRC: Path.resolve('app/client/src'), + DIST: Path.resolve('app/client/dist'), +}; + +const config = [ + { + name: 'js', + entry: { + bundle: `${PATHS.SRC}/boot/index.js`, + }, + output: { + path: PATHS.DIST, + filename: 'js/[name].js', + }, + devtool: (ENV !== 'production') ? 'source-map' : '', + resolve: resolveJS(ENV, PATHS), + externals: externalJS(ENV, PATHS), + module: moduleJS(ENV, PATHS), + plugins: pluginJS(ENV, PATHS), + } +]; + +// Use WEBPACK_CHILD=js or WEBPACK_CHILD=css env var to run a single config +module.exports = (process.env.WEBPACK_CHILD) + ? config.find((entry) => entry.name === process.env.WEBPACK_CHILD) + : module.exports = config; +``` + +**composer.json** + +```json +"extra": { + "expose": [ + "app/client/dist" + ] +} +``` + +**app/client/src/boot/index.js** + +```js +console.log('Hello world'); +``` + +**.eslintrc.js** + +```js +module.exports = require('@silverstripe/webpack-config/.eslintrc'); +``` + +At this stage, running `yarn build` should show you a linting warning for the console statement, and correctly build +`app/client/dist/js/bundle.js`. + +### Expose GraphQL scaffolding + +Only a minimal amount of data is required to be exposed via GraphQL scaffolding, and only to the "admin" GraphQL +schema. For more information, see [ReactJS, Redux and GraphQL](../../customising_the_admin_interface/react_redux_and_graphql). + +**app/_config/graphql.yml** + +```yaml +SilverStripe\GraphQL\Manager: + schemas: + admin: + scaffolding: + types: + MyVersionedObject: + fields: [ID, LastEdited] + operations: + copyToStage: true + readOne: true + SilverStripe\Security\Member: + fields: [ID, FirstName, Surname] + operations: + readOne: true +``` + +Once configured, flush your cache and explore the new GraphQL schema to ensure it loads correctly. You can use a GraphQL +application such as GraphiQL, or [silverstripe-graphql-devtools](https://github.com/silverstripe/silverstripe-graphql-devtools) +for a browser solution: + +``` +composer require --dev silverstripe/graphql-devtools dev-master +``` + +### Configure the necessary GraphQL queries and mutations + +The history viewer interface uses two main operations: + +* Read a list of versions for a DataObject +* Revert to an older version of a DataObject + +For this we need one query and one mutation: + +**app/client/src/state/readOneMyVersionedObjectQuery.js** + +```js +import { graphql } from 'react-apollo'; +import gql from 'graphql-tag'; + +// GraphQL query for retrieving the version history of a specific object. The results of +// the query must be set to the "versions" prop on the component that this HOC is +// applied to for binding implementation. +const query = gql` +query ReadHistoryViewerMyVersionedObject ($id: ID!, $limit: Int!, $offset: Int!) { + readOneMyVersionedObject( + Versioning: { + Mode: LATEST + }, + ID: $id + ) { + ID + Versions (limit: $limit, offset: $offset) { + pageInfo { + totalCount + } + edges { + node { + Version + Author { + FirstName + Surname + } + Publisher { + FirstName + Surname + } + Published + LiveVersion + LatestDraftVersion + LastEdited + } + } + } + } +} +`; + +const config = { + options({recordId, limit, page}) { + return { + variables: { + limit, + offset: ((page || 1) - 1) * limit, + block_id: recordId, + } + }; + }, + props( + { + data: { + error, + refetch, + readOneMyVersionedObject, + loading: networkLoading, + }, + ownProps: { + actions = { + versions: {} + }, + limit, + recordId, + }, + } + ) { + const versions = readOneMyVersionedObject || null; + + const errors = error && error.graphQLErrors && + error.graphQLErrors.map((graphQLError) => graphQLError.message); + + return { + loading: networkLoading || !versions, + versions, + graphQLErrors: errors, + actions: { + ...actions, + versions: { + ...versions, + goToPage(page) { + refetch({ + offset: ((page || 1) - 1) * limit, + limit, + block_id: recordId, + }); + } + }, + }, + }; + }, +}; + +export { query, config }; + +export default graphql(query, config); +``` + +**app/client/src/state/revertToMyVersionedObjectVersionMutation.js** + +```js +import { graphql } from 'react-apollo'; +import gql from 'graphql-tag'; + +const mutation = gql` +mutation revertMyVersionedObjectToVersion($id:ID!, $fromStage:VersionedStage!, $toStage:VersionedStage!, $fromVersion:Int!) { + copyMyVersionedObjectToStage(Input: { + ID: $id + FromVersion: $fromVersion + FromStage: $fromStage + ToStage: $toStage + }) { + ID + } +} +`; + +const config = { + props: ({ mutate, ownProps: { actions } }) => { + const revertToVersion = (id, fromVersion, fromStage, toStage) => mutate({ + variables: { + id, + fromVersion, + fromStage, + toStage, + }, + }); + + return { + actions: { + ...actions, + revertToVersion, + }, + }; + }, + options: { + // Refetch versions after mutation is completed + refetchQueries: ['ReadHistoryViewerMyVersionedObject'] + } +}; + +export { mutation, config }; + +export default graphql(mutation, config); +```` + +### Register your GraphQL query and mutation with Injector + +Once your GraphQL query and mutation are created, you will need to tell the JavaScript Injector about them. +This does two things: + +* Allow them to be loaded by core components. +* Allow Injector to provide them in certain contexts. They should be available for `MyVersionedObject` history viewer + instances, but not for CMS pages for example. + +**app/client/src/boot/index.js** + +```js +/* global window */ +import Injector from 'lib/Injector'; +import readOneMyVersionedObjectQuery from 'state/readOneMyVersionedObjectQuery'; +import revertToMyVersionedObjectVersionMutation from 'state/revertToMyVersionedObjectVersionMutation'; + +window.document.addEventListener('DOMContentLoaded', () => { + // Register GraphQL operations with Injector as transformations + Injector.transform( + 'myversionedobject-history', (updater) => { + updater.component( + 'HistoryViewer.Form_ItemEditForm', + readOneMyVersionedObjectQuery, 'ElementHistoryViewer'); + } + ); + + Injector.transform( + 'myversionedobject-history-revert', (updater) => { + updater.component( + 'HistoryViewerToolbar.VersionedAdmin.HistoryViewer.MyVersionedObject.HistoryViewerVersionDetail', + revertToMyVersionedObjectVersionMutation, + 'MyVersionedObjectRevertMutation' + ); + } + ); +}); +``` + +For more information, see [ReactJS, Redux and GraphQL](../../customising_the_admin_interface/react_redux_and_graphql). + +### Adding the HistoryViewerField + +You can add the [HistoryViewerField](api:SilverStripe\VersionedAdmin\Forms\HistoryViewerField) to your object's CMS +fields in the same way as any other form field: + +```php +use SilverStripe\VersionedAdmin\Forms\HistoryViewerField; +use SilverStripe\View\Requirements; + +public function getCMSFields() +{ + $fields = parent::getCMSFields(); + + Requirements::javascript('app/client/dist/js/bundle.js'); + $fields->addFieldToTab('Root.History', HistoryViewerField::create('MyObjectHistory')); + + return $fields; +} +``` + +### Previewable DataObjects + +History viewer will automatically detect and render a side-by-side preview panel for DataObjects that implement +[CMSPreviewable](api:SilverStripe\ORM\CMSPreviewable). Please note that if you are adding this functionality, you +will also need to expose the `AbsoluteLink` field in your GraphQL read scaffolding, and add it to the fields in +`readOneMyVersionedObjectQuery`. ## API Documentation * [Versioned](api:SilverStripe\Versioned\Versioned) +* [HistoryViewerField](api:SilverStripe\VersionedAdmin\Forms\HistoryViewerField) diff --git a/docs/en/04_Changelogs/4.3.0.md b/docs/en/04_Changelogs/4.3.0.md index 3965ad378..f89db9640 100644 --- a/docs/en/04_Changelogs/4.3.0.md +++ b/docs/en/04_Changelogs/4.3.0.md @@ -67,4 +67,9 @@ SilverStripe\Core\Injector\Injector: App\MySite\MyCustomControllerFactory ``` -[Implementing a _Factory_ with the Injector](/developer_guides/extending/injector/#factories) +[Implementing a _Factory_ with the Injector](/developer_guides/extending/injector/#factories). + +### Using the history viewer for custom DataObjects + +For information on how to implement the history viewer UI in your own versioned DataObjects, please refer to +[the Versioning documentation](../developer_guides/model/versioning). From c186c8ea685debe3a1dcbbb311e59ccf4695d4bd Mon Sep 17 00:00:00 2001 From: Christopher Darling Date: Wed, 14 Nov 2018 21:56:57 +0000 Subject: [PATCH 085/175] DOCS fix link to XHProf article --- docs/en/02_Developer_Guides/08_Performance/03_Profiling.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/02_Developer_Guides/08_Performance/03_Profiling.md b/docs/en/02_Developer_Guides/08_Performance/03_Profiling.md index be25f1298..157665ae9 100644 --- a/docs/en/02_Developer_Guides/08_Performance/03_Profiling.md +++ b/docs/en/02_Developer_Guides/08_Performance/03_Profiling.md @@ -9,5 +9,5 @@ optimization. SilverStripe does not include any profiling tools out of the box, but we recommend the use of existing tools such as [XHProf](https://github.com/facebook/xhprof/) and [XDebug](http://xdebug.org/). -* [Profiling with XHProf](http://techportal.inviqa.com/2009/12/01/profiling-with-xhprof/) -* [Profiling PHP Applications With xdebug](http://devzone.zend.com/1139/profiling-php-applications-with-xdebug/) \ No newline at end of file +* [Profiling with XHProf](https://inviqa.com/blog/profiling-xhprof) +* [Profiling PHP Applications With xdebug](http://devzone.zend.com/1139/profiling-php-applications-with-xdebug/) From b5bae137bd341eeda3f4886f45fc8f8d657a9c4c Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Thu, 15 Nov 2018 10:18:54 +0000 Subject: [PATCH 086/175] FIX: Redirect loop with multiple confirmation tokens present (fixes #8607) --- src/Core/Startup/ConfirmationTokenChain.php | 5 +++-- .../php/Core/Startup/ConfirmationTokenChainTest.php | 12 +++++++----- .../Core/Startup/ErrorControlChainMiddlewareTest.php | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/Core/Startup/ConfirmationTokenChain.php b/src/Core/Startup/ConfirmationTokenChain.php index a47f2c4c0..e042bb6cb 100644 --- a/src/Core/Startup/ConfirmationTokenChain.php +++ b/src/Core/Startup/ConfirmationTokenChain.php @@ -139,9 +139,10 @@ class ConfirmationTokenChain */ public function getRedirectUrlParams() { - $params = []; + $params = $_GET; + unset($params['url']); // CLIRequestBuilder may add this foreach ($this->filteredTokens() as $token) { - $params = array_merge($params, $token->getRedirectUrlParams()); + $params = array_merge($params, $token->params()); } return $params; diff --git a/tests/php/Core/Startup/ConfirmationTokenChainTest.php b/tests/php/Core/Startup/ConfirmationTokenChainTest.php index adb8fba36..33c843279 100644 --- a/tests/php/Core/Startup/ConfirmationTokenChainTest.php +++ b/tests/php/Core/Startup/ConfirmationTokenChainTest.php @@ -167,19 +167,21 @@ class ConfirmationTokenChainTest extends SapphireTest public function testGetRedirectUrlParams() { - $mockToken = $this->getTokenRequiringReload(true, ['getRedirectUrlParams']); + $mockToken = $this->getTokenRequiringReload(true, ['params']); $mockToken->expects($this->once()) - ->method('getRedirectUrlParams') + ->method('params') ->will($this->returnValue(['mockTokenParam' => '1'])); - $secondMockToken = $this->getTokenRequiringReload(true, ['getRedirectUrlParams']); + $secondMockToken = $this->getTokenRequiringReload(true, ['params']); $secondMockToken->expects($this->once()) - ->method('getRedirectUrlParams') + ->method('params') ->will($this->returnValue(['secondMockTokenParam' => '2'])); $chain = new ConfirmationTokenChain(); $chain->pushToken($mockToken); $chain->pushToken($secondMockToken); - $this->assertEquals(['mockTokenParam' => '1', 'secondMockTokenParam' => '2'], $chain->getRedirectUrlParams()); + $params = $chain->getRedirectUrlParams(); + $this->assertEquals('1', $params['mockTokenParam']); + $this->assertEquals('2', $params['secondMockTokenParam']); } } diff --git a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php index 7cf793c2f..63b47b8d7 100644 --- a/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php +++ b/tests/php/Core/Startup/ErrorControlChainMiddlewareTest.php @@ -49,7 +49,7 @@ class ErrorControlChainMiddlewareTest extends SapphireTest $this->assertInstanceOf(HTTPResponse::class, $result); $location = $result->getHeader('Location'); - $this->assertContains('?flush=1&flushtoken=', $location); + $this->assertContains('flush=1&flushtoken=', $location); $this->assertNotContains('Security/login', $location); } @@ -96,7 +96,7 @@ class ErrorControlChainMiddlewareTest extends SapphireTest $this->assertInstanceOf(HTTPResponse::class, $result); $location = $result->getHeader('Location'); $this->assertContains('/dev/build', $location); - $this->assertContains('?devbuildtoken=', $location); + $this->assertContains('devbuildtoken=', $location); $this->assertNotContains('Security/login', $location); } From cc712892a95b74c8bcdea5f2c1469286e298203e Mon Sep 17 00:00:00 2001 From: Andre Kiste Date: Mon, 19 Nov 2018 11:06:47 +1300 Subject: [PATCH 087/175] NEW Port betterbuttons to framework (#8569) * MINOR: Add `Previous`, `Next` and `Create New` actions in edit form If the form is opened via a grid field, the filters will be retained so the previous/next record opened will be correct * MINOR: Add ability to customise the visibility of the `Previous`, `Next` and `Add` buttons at a `GridField` level * Fix invalid action when pressing the `New` button in an edit form unless `betterbuttons` module was installed * - Merge `showPrevious` and `showNext` to `showPagination` for grid fields - Update documentation - Improve performance for next/previous buttons by not fetching all list records - Refactoring * Refactor to fail gracefully on GridFieldPaginator --- _config/buttons.yml | 7 + .../How_Tos/Customise_CMS_Menu.md | 21 +++ .../GridFieldConfig_RecordEditor.php | 6 +- src/Forms/GridField/GridFieldDetailForm.php | 91 ++++++++++- .../GridFieldDetailForm_ItemRequest.php | 151 ++++++++++++++++++ src/Forms/GridField/GridFieldEditButton.php | 7 +- src/Forms/GridField/GridFieldPaginator.php | 1 + 7 files changed, 275 insertions(+), 9 deletions(-) create mode 100644 _config/buttons.yml diff --git a/_config/buttons.yml b/_config/buttons.yml new file mode 100644 index 000000000..df80742db --- /dev/null +++ b/_config/buttons.yml @@ -0,0 +1,7 @@ +--- +Name: buttons +--- +SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest: + formActions: + showPagination: true + showAdd: true diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md index 9b36c52c4..848f07033 100644 --- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md +++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md @@ -124,6 +124,27 @@ SilverStripe\Admin\LeftAndMain: 'Feedback': '' ``` +## Customising the CMS form actions + +The `Previous`, `Next` and `Add` actions on the edit form are visible by default but can be hidden globally by adding the following `.yml` config: + +```yml +SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest: + formActions: + showPagination: false + showAdd: false +``` + +You can also override this for a specific `GridField` instance when using the `GridFieldConfig_RecordEditor` constructor: + +```php +$grid = new GridField( + "pages", + "All Pages", + SiteTree::get(), + GridFieldConfig_RecordEditor::create(null, false, false)); +``` + ## Related * [How to extend the CMS interface](extend_cms_interface) diff --git a/src/Forms/GridField/GridFieldConfig_RecordEditor.php b/src/Forms/GridField/GridFieldConfig_RecordEditor.php index 5a831e106..28d7b6749 100644 --- a/src/Forms/GridField/GridFieldConfig_RecordEditor.php +++ b/src/Forms/GridField/GridFieldConfig_RecordEditor.php @@ -10,8 +10,10 @@ class GridFieldConfig_RecordEditor extends GridFieldConfig /** * * @param int $itemsPerPage - How many items per page should show up + * @param bool $showPagination Whether the `Previous` and `Next` buttons should display or not, leave as null to use default + * @param bool $showAdd Whether the `Add` button should display or not, leave as null to use default */ - public function __construct($itemsPerPage = null) + public function __construct($itemsPerPage = null, $showPagination = null, $showAdd = null) { parent::__construct(); @@ -26,7 +28,7 @@ class GridFieldConfig_RecordEditor extends GridFieldConfig $this->addComponent(new GridField_ActionMenu()); $this->addComponent(new GridFieldPageCount('toolbar-header-right')); $this->addComponent($pagination = new GridFieldPaginator($itemsPerPage)); - $this->addComponent(new GridFieldDetailForm()); + $this->addComponent(new GridFieldDetailForm(null, $showPagination, $showAdd)); $sort->setThrowExceptionOnBadDataType(false); $filter->setThrowExceptionOnBadDataType(false); diff --git a/src/Forms/GridField/GridFieldDetailForm.php b/src/Forms/GridField/GridFieldDetailForm.php index e32d42370..215ff04c1 100644 --- a/src/Forms/GridField/GridFieldDetailForm.php +++ b/src/Forms/GridField/GridFieldDetailForm.php @@ -38,11 +38,20 @@ class GridFieldDetailForm implements GridField_URLHandler protected $template = null; /** - * * @var string */ protected $name; + /** + * @var bool + */ + protected $showPagination; + + /** + * @var bool + */ + protected $showAdd; + /** * @var Validator The form validator used for both add and edit fields. */ @@ -79,10 +88,14 @@ class GridFieldDetailForm implements GridField_URLHandler * controller who wants to display the getCMSFields * * @param string $name The name of the edit form to place into the pop-up form + * @param bool $showPagination Whether the `Previous` and `Next` buttons should display or not, leave as null to use default + * @param bool $showAdd Whether the `Add` button should display or not, leave as null to use default */ - public function __construct($name = 'DetailForm') + public function __construct($name = null, $showPagination = null, $showAdd = null) { - $this->name = $name; + $this->setName($name ?: 'DetailForm'); + $this->setShowPagination($showPagination); + $this->setShowAdd($showAdd); } /** @@ -93,6 +106,10 @@ class GridFieldDetailForm implements GridField_URLHandler */ public function handleItem($gridField, $request) { + if ($gridStateStr = $request->getVar('gridState')) { + $gridField->getState(false)->setValue($gridStateStr); + } + // Our getController could either give us a true Controller, if this is the top-level GridField. // It could also give us a RequestHandler in the form of GridFieldDetailForm_ItemRequest if this is a // nested GridField. @@ -102,7 +119,7 @@ class GridFieldDetailForm implements GridField_URLHandler if (is_numeric($request->param('ID'))) { /** @var Filterable $dataList */ $dataList = $gridField->getList(); - $record = $dataList->byID($request->param("ID")); + $record = $dataList->byID($request->param('ID')); } else { $record = Injector::inst()->create($gridField->getModelClass()); } @@ -179,6 +196,68 @@ class GridFieldDetailForm implements GridField_URLHandler return $this->name; } + /** + * @return bool + */ + protected function getDefaultShowPagination() + { + $formActionsConfig = GridFieldDetailForm_ItemRequest::config()->get('formActions'); + return isset($formActionsConfig['showPagination']) ? (boolean) $formActionsConfig['showPagination'] : false; + } + + /** + * @return bool + */ + public function getShowPagination() + { + if ($this->showPagination === null) { + return $this->getDefaultShowPagination(); + } + + return (boolean) $this->showPagination; + } + + /** + * @param bool|null $showPagination + * @return GridFieldDetailForm + */ + public function setShowPagination($showPagination) + { + $this->showPagination = $showPagination; + return $this; + } + + /** + * @return bool + */ + protected function getDefaultShowAdd() + { + $formActionsConfig = GridFieldDetailForm_ItemRequest::config()->get('formActions'); + return isset($formActionsConfig['showAdd']) ? (boolean) $formActionsConfig['showAdd'] : false; + } + + /** + * @return bool + */ + public function getShowAdd() + { + if ($this->showAdd === null) { + return $this->getDefaultShowAdd(); + } + + return (boolean) $this->showAdd; + } + + /** + * @param bool|null $showAdd + * @return GridFieldDetailForm + */ + public function setShowAdd($showAdd) + { + $this->showAdd = $showAdd; + return $this; + } + /** * @param Validator $validator * @return $this @@ -232,8 +311,8 @@ class GridFieldDetailForm implements GridField_URLHandler { if ($this->itemRequestClass) { return $this->itemRequestClass; - } elseif (ClassInfo::exists(static::class . "_ItemRequest")) { - return static::class . "_ItemRequest"; + } elseif (ClassInfo::exists(static::class . '_ItemRequest')) { + return static::class . '_ItemRequest'; } else { return GridFieldDetailForm_ItemRequest::class; } diff --git a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php index 5667ee371..2d6cae3d1 100644 --- a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php +++ b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php @@ -7,9 +7,12 @@ use SilverStripe\Control\Controller; use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPResponse; use SilverStripe\Control\RequestHandler; +use SilverStripe\Core\Config\Config; +use SilverStripe\Forms\CompositeField; use SilverStripe\Forms\FieldList; use SilverStripe\Forms\Form; use SilverStripe\Forms\FormAction; +use SilverStripe\Forms\HiddenField; use SilverStripe\Forms\LiteralField; use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\DataObject; @@ -278,6 +281,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler $canEdit = $this->record->canEdit(); $canDelete = $this->record->canDelete(); $actions = new FieldList(); + if ($this->record->ID !== 0) { if ($canEdit) { $actions->push(FormAction::create('doSave', _t('SilverStripe\\Forms\\GridField\\GridFieldDetailForm.Save', 'Save')) @@ -290,6 +294,45 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler ->setUseButtonTag(true) ->addExtraClass('btn-outline-danger btn-hide-outline font-icon-trash-bin action--delete')); } + + $gridStateStr = $this->getRequest()->requestVar('gridState'); + + $this->gridField->getState(false)->setValue($gridStateStr); + $actions->push(HiddenField::create('gridState', null, $gridStateStr)); + + $rightGroup = CompositeField::create()->setName('RightGroup'); + $rightGroup->addExtraClass('right'); + $rightGroup->setFieldHolderTemplate(get_class($rightGroup) . '_holder_buttongroup'); + + $previousAndNextGroup = CompositeField::create()->setName('PreviousAndNextGroup'); + $previousAndNextGroup->addExtraClass('rounded'); + $previousAndNextGroup->setFieldHolderTemplate(get_class($previousAndNextGroup) . '_holder_buttongroup'); + + + $component = $this->gridField->getConfig()->getComponentByType(GridFieldDetailForm::class); + + if ($component->getShowPagination()) { + $previousAndNextGroup->push(FormAction::create('doPrevious') + ->setUseButtonTag(true) + ->setAttribute('data-grid-state', $gridStateStr) + ->setDisabled(!$this->getPreviousRecordID()) + ->addExtraClass('btn btn-secondary font-icon-left-open action--previous discard-confirmation')); + + $previousAndNextGroup->push(FormAction::create('doNext') + ->setUseButtonTag(true) + ->setAttribute('data-grid-state', $gridStateStr) + ->setDisabled(!$this->getNextRecordID()) + ->addExtraClass('btn btn-secondary font-icon-right-open action--next discard-confirmation')); + } + + $rightGroup->push($previousAndNextGroup); + + if ($component->getShowAdd()) { + $rightGroup->push(FormAction::create('doNew') + ->setUseButtonTag(true) + ->setAttribute('data-grid-state', $this->getRequest()->getVar('gridState')) + ->addExtraClass('btn btn-primary font-icon-plus rounded action--new discard-confirmation')); + } } else { // adding new record //Change the Save label to 'Create' $actions->push(FormAction::create('doSave', _t('SilverStripe\\Forms\\GridField\\GridFieldDetailForm.Create', 'Create')) @@ -309,7 +352,13 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler $actions->push(new LiteralField('cancelbutton', $text)); } } + $this->extend('updateFormActions', $actions); + + if (isset($rightGroup)) { + $actions->push($rightGroup); + } + return $actions; } @@ -410,6 +459,108 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler return $this->redirectAfterSave($isNewRecord); } + /** + * Goes to the previous record + * @param array $data The form data + * @param Form $form The Form object + * @return HTTPResponse + */ + public function doPrevious($data, $form) + { + $this->getToplevelController()->getResponse()->addHeader('X-Pjax', 'Content'); + $link = $this->getEditLink($this->getPreviousRecordID()); + return $this->redirect($link); + } + + /** + * Goes to the next record + * @param array $data The form data + * @param Form $form The Form object + * @return HTTPResponse + */ + public function doNext($data, $form) + { + $this->getToplevelController()->getResponse()->addHeader('X-Pjax', 'Content'); + $link = $this->getEditLink($this->getNextRecordID()); + return $this->redirect($link); + } + + /** + * Creates a new record. If you're already creating a new record, + * this forces the URL to change. + * + * @param array $data The form data + * @param Form $form The Form object + * @return HTTPResponse + */ + public function doNew($data, $form) + { + return $this->redirect(Controller::join_links($this->gridField->Link('item'), 'new')); + } + + /** + * Gets the edit link for a record + * + * @param int $id The ID of the record in the GridField + * @return string + */ + public function getEditLink($id) + { + return Controller::join_links( + $this->gridField->Link(), + 'item', + $id, + '?gridState=' . urlencode($this->gridField->getState(false)->Value()) + ); + } + + /** + * @param int $offset The offset from the current record + * @return int|bool + */ + private function getAdjacentRecordID($offset) + { + $gridField = $this->getGridField(); + $gridStateStr = $this->getRequest()->requestVar('gridState'); + $state = $gridField->getState(false); + $state->setValue($gridStateStr); + $data = $state->getData(); + $paginator = $data->getData('GridFieldPaginator'); + if (!$paginator) { + return false; + } + + $currentPage = $data->getData('GridFieldPaginator')->getData('currentPage'); + $itemsPerPage = $data->getData('GridFieldPaginator')->getData('itemsPerPage'); + + $limit = $itemsPerPage + 2; + $limitOffset = max(0, $itemsPerPage * ($currentPage-1) -1); + + $map = $gridField->getManipulatedList()->limit($limit, $limitOffset)->column('ID'); + $index = array_search($this->record->ID, $map); + return isset($map[$index+$offset]) ? $map[$index+$offset] : false; + } + + /** + * Gets the ID of the previous record in the list. + * + * @return int + */ + public function getPreviousRecordID() + { + return $this->getAdjacentRecordID(-1); + } + + /** + * Gets the ID of the next record in the list. + * + * @return int + */ + public function getNextRecordID() + { + return $this->getAdjacentRecordID(1); + } + /** * Response object for this request after a successful save * diff --git a/src/Forms/GridField/GridFieldEditButton.php b/src/Forms/GridField/GridFieldEditButton.php index e56ed330f..b12a47bca 100644 --- a/src/Forms/GridField/GridFieldEditButton.php +++ b/src/Forms/GridField/GridFieldEditButton.php @@ -62,7 +62,12 @@ class GridFieldEditButton implements GridField_ColumnProvider, GridField_ActionP */ public function getUrl($gridField, $record, $columnName) { - return Controller::join_links($gridField->Link('item'), $record->ID, 'edit'); + return Controller::join_links( + $gridField->Link('item'), + $record->ID, + 'edit', + '?gridState=' . urlencode($gridField->getState(false)->Value()) + ); } /** diff --git a/src/Forms/GridField/GridFieldPaginator.php b/src/Forms/GridField/GridFieldPaginator.php index f9aa43add..4fd7662a6 100755 --- a/src/Forms/GridField/GridFieldPaginator.php +++ b/src/Forms/GridField/GridFieldPaginator.php @@ -144,6 +144,7 @@ class GridFieldPaginator implements GridField_HTMLProvider, GridField_DataManipu // Force the state to the initial page if none is set $state->currentPage(1); + $state->itemsPerPage($this->getItemsPerPage()); return $state; } From d19c7f2a2d214ecb88c3f103c388f332167cabae Mon Sep 17 00:00:00 2001 From: Guy Marriott Date: Mon, 19 Nov 2018 14:04:12 +1300 Subject: [PATCH 088/175] DOCS Updating HistoryViewer documentation to specify the rollback mutation instead of copyToStage --- .../00_Model/10_Versioning.md | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/docs/en/02_Developer_Guides/00_Model/10_Versioning.md b/docs/en/02_Developer_Guides/00_Model/10_Versioning.md index aef5ca40a..6ffecad81 100644 --- a/docs/en/02_Developer_Guides/00_Model/10_Versioning.md +++ b/docs/en/02_Developer_Guides/00_Model/10_Versioning.md @@ -1013,7 +1013,6 @@ SilverStripe\GraphQL\Manager: MyVersionedObject: fields: [ID, LastEdited] operations: - copyToStage: true readOne: true SilverStripe\Security\Member: fields: [ID, FirstName, Surname] @@ -1147,13 +1146,11 @@ import { graphql } from 'react-apollo'; import gql from 'graphql-tag'; const mutation = gql` -mutation revertMyVersionedObjectToVersion($id:ID!, $fromStage:VersionedStage!, $toStage:VersionedStage!, $fromVersion:Int!) { - copyMyVersionedObjectToStage(Input: { +mutation revertMyVersionedObjectToVersion($id:ID!, $toVersion:Int!) { + rollbackMyVersionedObject( ID: $id - FromVersion: $fromVersion - FromStage: $fromStage - ToStage: $toStage - }) { + ToVersion: $toVersion + ) { ID } } @@ -1161,12 +1158,10 @@ mutation revertMyVersionedObjectToVersion($id:ID!, $fromStage:VersionedStage!, $ const config = { props: ({ mutate, ownProps: { actions } }) => { - const revertToVersion = (id, fromVersion, fromStage, toStage) => mutate({ + const revertToVersion = (id, toVersion) => mutate({ variables: { id, - fromVersion, - fromStage, - toStage, + toVersion, }, }); From 80885fc23111e1ebee9bc1540cabc30c7398555e Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Tue, 20 Nov 2018 14:04:12 +1300 Subject: [PATCH 089/175] ADD php test TreeMultiselectField::testEmptyChoiceReadonly --- tests/php/Forms/TreeMultiselectFieldTest.php | 33 ++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/tests/php/Forms/TreeMultiselectFieldTest.php b/tests/php/Forms/TreeMultiselectFieldTest.php index cbb540c6d..ffff5491f 100644 --- a/tests/php/Forms/TreeMultiselectFieldTest.php +++ b/tests/php/Forms/TreeMultiselectFieldTest.php @@ -10,14 +10,43 @@ class TreeMultiselectFieldTest extends SapphireTest { protected static $fixture_file = 'TreeDropdownFieldTest.yml'; + public function testEmptyChoiceReadonly() + { + $field = new TreeMultiselectField('TestTree', 'Test tree', File::class); + + $asdf = $this->objFromFixture(File::class, 'asdf'); + $subfolderfile1 = $this->objFromFixture(File::class, 'subfolderfile1'); + + $schemaStateDefaults = $field->getSchemaStateDefaults(); + $this->assertArraySubset(['id' => 'TestTree', 'name' => 'TestTree', 'value' => 'unchanged'], $schemaStateDefaults, $strict = true); + + $html = $field->performReadonlyTransformation()->Field(); + + $this->assertEquals( + <<<"HTML" + + ('none') + +HTML + , + $html + ); + } + public function testReadonly() { $field = new TreeMultiselectField('TestTree', 'Test tree', File::class); + $asdf = $this->objFromFixture(File::class, 'asdf'); $subfolderfile1 = $this->objFromFixture(File::class, 'subfolderfile1'); + $field->setValue(implode(',', [$asdf->ID, $subfolderfile1->ID])); - $readonlyField = $field->performReadonlyTransformation(); + $schemaStateDefaults = $field->getSchemaStateDefaults(); + $this->assertArraySubset(['id' => 'TestTree', 'name' => 'TestTree', 'value' => [$asdf->ID, $subfolderfile1->ID]], $schemaStateDefaults, $strict = true); + + $html = (string)$field->performReadonlyTransformation()->Field(); + $this->assertEquals( <<<"HTML" @@ -25,7 +54,7 @@ class TreeMultiselectFieldTest extends SapphireTest HTML , - (string)$readonlyField->Field() + $html ); } } From d74af1c17e0b72ae119abc00fd7ef0aca6dd4498 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Wed, 21 Nov 2018 11:43:21 +1300 Subject: [PATCH 090/175] FIX Explicity mark nodes when searching nodes in TreeDropdownField #8621 --- src/Forms/TreeDropdownField.php | 11 +++++++ tests/php/Forms/TreeDropdownFieldTest.php | 37 ++++++++++++++++++++++ tests/php/Forms/TreeDropdownFieldTest.yml | 38 +++++++++++++++++++++++ 3 files changed, 86 insertions(+) diff --git a/src/Forms/TreeDropdownField.php b/src/Forms/TreeDropdownField.php index ca4e11ea9..b5a1cfe84 100644 --- a/src/Forms/TreeDropdownField.php +++ b/src/Forms/TreeDropdownField.php @@ -499,6 +499,17 @@ class TreeDropdownField extends FormField // Begin marking $markingSet->markPartialTree(); + // Explicitely mark our search results if necessary + foreach ($this->searchIds as $id => $marked) { + if ($marked) { + $object = $this->objectForKey($id); + if (!$object) { + continue; + } + $markingSet->markToExpose($object); + } + } + // Allow to pass values to be selected within the ajax request $value = $request->requestVar('forceValue') ?: $this->value; if ($value && ($values = preg_split('/,\s*/', $value))) { diff --git a/tests/php/Forms/TreeDropdownFieldTest.php b/tests/php/Forms/TreeDropdownFieldTest.php index 5b5e22fd1..9af392f4b 100644 --- a/tests/php/Forms/TreeDropdownFieldTest.php +++ b/tests/php/Forms/TreeDropdownFieldTest.php @@ -9,12 +9,17 @@ use SilverStripe\Dev\CSSContentParser; use SilverStripe\Dev\SapphireTest; use SilverStripe\Control\HTTPRequest; use SilverStripe\Forms\TreeDropdownField; +use SilverStripe\ORM\Tests\HierarchyTest\TestObject; class TreeDropdownFieldTest extends SapphireTest { protected static $fixture_file = 'TreeDropdownFieldTest.yml'; + protected static $extra_dataobjects = [ + TestObject::class + ]; + public function testSchemaStateDefaults() { $field = new TreeDropdownField('TestTree', 'Test tree', Folder::class); @@ -97,6 +102,38 @@ class TreeDropdownFieldTest extends SapphireTest ); } + public function testTreeSearchJsonFlatlistWithLowNodeThreshold() + { + // Initialise our TreeDropDownField + $field = new TreeDropdownField('TestTree', 'Test tree', TestObject::class); + $field->config()->set('node_threshold_total', 2); + + // Search for all Test object matching our criteria + $request = new HTTPRequest( + 'GET', + 'url', + ['search' => 'MatchSearchCriteria', 'format' => 'json', 'flatList' => '1'] + ); + $request->setSession(new Session([])); + $response = $field->tree($request); + $tree = json_decode($response->getBody(), true); + $actualNodeIDs = array_column($tree['children'], 'id'); + + + // Get the list of expected node IDs from the YML Fixture + $expectedNodeIDs = array_map( + function ($key) { + return $this->objFromFixture(TestObject::class, $key)->ID; + }, + ['zero', 'oneA', 'twoAi', 'three'] // Those are the identifiers of the object we expect our search to find + ); + + sort($actualNodeIDs); + sort($expectedNodeIDs); + + $this->assertEquals($expectedNodeIDs, $actualNodeIDs); + } + public function testTreeSearch() { $field = new TreeDropdownField('TestTree', 'Test tree', Folder::class); diff --git a/tests/php/Forms/TreeDropdownFieldTest.yml b/tests/php/Forms/TreeDropdownFieldTest.yml index 7546885b3..2207cc300 100644 --- a/tests/php/Forms/TreeDropdownFieldTest.yml +++ b/tests/php/Forms/TreeDropdownFieldTest.yml @@ -8,6 +8,7 @@ SilverStripe\Assets\Folder: folder1-subfolder1: Name: FileTest-folder1-subfolder1 ParentID: =>SilverStripe\Assets\Folder.folder1 + SilverStripe\Assets\File: asdf: Filename: assets/FileTest.txt @@ -24,3 +25,40 @@ SilverStripe\Assets\File: Filename: assets/FileTest-folder1/File1.txt Name: File1.txt ParentID: =>SilverStripe\Assets\Folder.folder1 + +SilverStripe\ORM\Tests\HierarchyTest\TestObject: + zero: + Title: Zero MatchSearchCriteria + zeroA: + Title: Child A of Zero + ParentID: =>SilverStripe\ORM\Tests\HierarchyTest\TestObject.zero + zeroB: + Title: Child B of Zero + ParentID: =>SilverStripe\ORM\Tests\HierarchyTest\TestObject.zero + zeroC: + Title: Child C of Zero + ParentID: =>SilverStripe\ORM\Tests\HierarchyTest\TestObject.zero + one: + Title: One + oneA: + Title: Child A of One MatchSearchCriteria + ParentID: =>SilverStripe\ORM\Tests\HierarchyTest\TestObject.one + oneB: + Title: Child B of One + ParentID: =>SilverStripe\ORM\Tests\HierarchyTest\TestObject.one + oneC: + Title: Child C of One + ParentID: =>SilverStripe\ORM\Tests\HierarchyTest\TestObject.one + oneD: + Title: Child C of One + ParentID: =>SilverStripe\ORM\Tests\HierarchyTest\TestObject.one + two: + Title: Two + twoA: + Title: Child A of Two + ParentID: =>SilverStripe\ORM\Tests\HierarchyTest\TestObject.two + twoAi: + Title: Grandchild i of Child A of Two MatchSearchCriteria + ParentID: =>SilverStripe\ORM\Tests\HierarchyTest\TestObject.twoA + three: + Title: Three MatchSearchCriteria From ff1a0dd6fc11b7d6505120ec5d3fceed2cb4d9df Mon Sep 17 00:00:00 2001 From: Aled Brown Date: Wed, 21 Nov 2018 15:28:12 +0000 Subject: [PATCH 091/175] renderWith Namespace for Template Loading Just calling MyCustomTemplate does not work in SS 4.2.X. Adding the full Namespace as a path is now required. --- .../01_Templates/How_Tos/03_Disable_Anchor_Links.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/02_Developer_Guides/01_Templates/How_Tos/03_Disable_Anchor_Links.md b/docs/en/02_Developer_Guides/01_Templates/How_Tos/03_Disable_Anchor_Links.md index b4c515965..10d2310d1 100644 --- a/docs/en/02_Developer_Guides/01_Templates/How_Tos/03_Disable_Anchor_Links.md +++ b/docs/en/02_Developer_Guides/01_Templates/How_Tos/03_Disable_Anchor_Links.md @@ -45,7 +45,7 @@ use SilverStripe\View\SSViewer; public function RenderCustomTemplate() { SSViewer::setRewriteHashLinks(false); - $html = $this->renderWith('MyCustomTemplate'); + $html = $this->renderWith('My/Namespace/MyCustomTemplate'); SSViewer::setRewriteHashLinks(true); return $html; From 9ce6d91b76e525a6fc81e02023e9e53cdf82e047 Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Thu, 22 Nov 2018 12:11:18 +1300 Subject: [PATCH 092/175] FIX / TreeMultiselectField::objectForKey handles list of IDs correctly --- src/Forms/TreeMultiselectField.php | 6 +++++- tests/php/Forms/TreeMultiselectFieldTest.php | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Forms/TreeMultiselectField.php b/src/Forms/TreeMultiselectField.php index 422b5739a..372890f6b 100644 --- a/src/Forms/TreeMultiselectField.php +++ b/src/Forms/TreeMultiselectField.php @@ -279,10 +279,14 @@ class TreeMultiselectField extends TreeDropdownField * of numeric types with string values, issuing a database error. * * This fix is not ideal, but supposed to keep backward compatibility for SS4. - * Since SS5 this method should be removed and NULL should be used instead of 'unchanged'. + * + * In 5.0 this method to be removed and NULL should be used instead of 'unchanged' (or an empty array. to be decided). + * In 5.0 this class to be refactored so that $this->value is always an array of values (or null) */ if ($this->getKeyField() === 'ID' && $key === 'unchanged') { $key = null; + } elseif (is_string($key)) { + $key = preg_split('/\s*,\s*/', trim($key)); } return parent::objectForKey($key); diff --git a/tests/php/Forms/TreeMultiselectFieldTest.php b/tests/php/Forms/TreeMultiselectFieldTest.php index ffff5491f..2686b71a2 100644 --- a/tests/php/Forms/TreeMultiselectFieldTest.php +++ b/tests/php/Forms/TreeMultiselectFieldTest.php @@ -20,6 +20,9 @@ class TreeMultiselectFieldTest extends SapphireTest $schemaStateDefaults = $field->getSchemaStateDefaults(); $this->assertArraySubset(['id' => 'TestTree', 'name' => 'TestTree', 'value' => 'unchanged'], $schemaStateDefaults, $strict = true); + $items = $field->getItems(); + $this->assertCount(0, $items, $message = 'there must be no items selected'); + $html = $field->performReadonlyTransformation()->Field(); $this->assertEquals( @@ -45,6 +48,9 @@ HTML $schemaStateDefaults = $field->getSchemaStateDefaults(); $this->assertArraySubset(['id' => 'TestTree', 'name' => 'TestTree', 'value' => [$asdf->ID, $subfolderfile1->ID]], $schemaStateDefaults, $strict = true); + $items = $field->getItems(); + $this->assertCount(2, $items, $message = 'there must be exactly 2 items selected'); + $html = (string)$field->performReadonlyTransformation()->Field(); $this->assertEquals( From f1710f0bfd8e40078188432e1549817bbac71028 Mon Sep 17 00:00:00 2001 From: micmania1 Date: Fri, 16 Nov 2018 11:03:48 +1300 Subject: [PATCH 093/175] DOCS add step to upgrade existing database class references --- docs/en/03_Upgrading/index.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/docs/en/03_Upgrading/index.md b/docs/en/03_Upgrading/index.md index 92562fc20..cdef87793 100644 --- a/docs/en/03_Upgrading/index.md +++ b/docs/en/03_Upgrading/index.md @@ -1126,7 +1126,22 @@ All your assets should be loading properly now. This is a good point to commit your changes to your source control system before moving on to the next step. -## Step 10 - Running your upgraded site for the first time {#step10} +## Step 10 - Update database class references {#step10} + +If you've updated your class names to use namespaces you will need to reflect those changes in any existing database fields. For example, if you've renamed your `HomePage` class to `App\HomePage` then the database `ClassName` column needs to be updated to point to the `App\HomePage` class, otherwise the CMS will tell you that the page is obsolete. This also applies to polymorphic relationships. + +There is no automated way to do this, but you can use the list generated in .upgrade.yml and copy it to `app/_config/legacy.yml`, removing any classes that don't extend DataObject. + +``` +SilverStripe\ORM\DatabaseAdmin: + classname_value_remapping: + HomePage: App\HomePage +``` + +This will automatically update affected columns when you first build the database. + + +## Step 11 - Running your upgraded site for the first time {#step11} You're almost across the finish line. From 1d9e40ba264aa6752037bbcb364646e6947fd891 Mon Sep 17 00:00:00 2001 From: Andre Kiste Date: Fri, 23 Nov 2018 12:40:18 +1300 Subject: [PATCH 094/175] Use new plus icon (#8619) * Use new plus icon and refactor * MINOR: Add ability to customise the visibility of the `Previous`, `Next` and `Add` buttons at a `GridField` level * - Merge `showPrevious` and `showNext` to `showPagination` for grid fields - Update documentation - Improve performance for next/previous buttons by not fetching all list records - Refactoring * Refactor to fail gracefully on GridFieldPaginator * Fix merge --- src/Forms/GridField/GridFieldDetailForm.php | 11 +-- .../GridFieldDetailForm_ItemRequest.php | 96 ++++++++++--------- 2 files changed, 56 insertions(+), 51 deletions(-) diff --git a/src/Forms/GridField/GridFieldDetailForm.php b/src/Forms/GridField/GridFieldDetailForm.php index 215ff04c1..20752b276 100644 --- a/src/Forms/GridField/GridFieldDetailForm.php +++ b/src/Forms/GridField/GridFieldDetailForm.php @@ -202,7 +202,7 @@ class GridFieldDetailForm implements GridField_URLHandler protected function getDefaultShowPagination() { $formActionsConfig = GridFieldDetailForm_ItemRequest::config()->get('formActions'); - return isset($formActionsConfig['showPagination']) ? (boolean) $formActionsConfig['showPagination'] : false; + return isset($formActionsConfig['showPagination']) ? (bool) $formActionsConfig['showPagination'] : false; } /** @@ -214,7 +214,7 @@ class GridFieldDetailForm implements GridField_URLHandler return $this->getDefaultShowPagination(); } - return (boolean) $this->showPagination; + return (bool) $this->showPagination; } /** @@ -233,7 +233,7 @@ class GridFieldDetailForm implements GridField_URLHandler protected function getDefaultShowAdd() { $formActionsConfig = GridFieldDetailForm_ItemRequest::config()->get('formActions'); - return isset($formActionsConfig['showAdd']) ? (boolean) $formActionsConfig['showAdd'] : false; + return isset($formActionsConfig['showAdd']) ? (bool) $formActionsConfig['showAdd'] : false; } /** @@ -245,7 +245,7 @@ class GridFieldDetailForm implements GridField_URLHandler return $this->getDefaultShowAdd(); } - return (boolean) $this->showAdd; + return (bool) $this->showAdd; } /** @@ -313,9 +313,8 @@ class GridFieldDetailForm implements GridField_URLHandler return $this->itemRequestClass; } elseif (ClassInfo::exists(static::class . '_ItemRequest')) { return static::class . '_ItemRequest'; - } else { - return GridFieldDetailForm_ItemRequest::class; } + return GridFieldDetailForm_ItemRequest::class; } /** diff --git a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php index 2d6cae3d1..f83442288 100644 --- a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php +++ b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php @@ -271,6 +271,47 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler return $form; } + /** + * @return CompositeField Returns the right aligned toolbar group field along with its FormAction's + */ + private function getRightGroupField() + { + $rightGroup = CompositeField::create()->setName('RightGroup'); + $rightGroup->addExtraClass('ml-auto'); + $rightGroup->setFieldHolderTemplate(get_class($rightGroup) . '_holder_buttongroup'); + + $previousAndNextGroup = CompositeField::create()->setName('PreviousAndNextGroup'); + $previousAndNextGroup->addExtraClass('circular-group mr-2'); + $previousAndNextGroup->setFieldHolderTemplate(get_class($previousAndNextGroup) . '_holder_buttongroup'); + + $component = $this->gridField->getConfig()->getComponentByType(GridFieldDetailForm::class); + $gridState = $this->getRequest()->requestVar('gridState'); + if ($component->getShowPagination()) { + $previousAndNextGroup->push(FormAction::create('doPrevious') + ->setUseButtonTag(true) + ->setAttribute('data-grid-state', $gridState) + ->setDisabled(!$this->getPreviousRecordID()) + ->addExtraClass('btn btn-secondary font-icon-left-open action--previous discard-confirmation')); + + $previousAndNextGroup->push(FormAction::create('doNext') + ->setUseButtonTag(true) + ->setAttribute('data-grid-state', $gridState) + ->setDisabled(!$this->getNextRecordID()) + ->addExtraClass('btn btn-secondary font-icon-right-open action--next discard-confirmation')); + } + + $rightGroup->push($previousAndNextGroup); + + if ($component->getShowAdd()) { + $rightGroup->push(FormAction::create('doNew') + ->setUseButtonTag(true) + ->setAttribute('data-grid-state', $this->getRequest()->getVar('gridState')) + ->addExtraClass('btn btn-primary font-icon-plus-thin circular action--new discard-confirmation')); + } + + return $rightGroup; + } + /** * Build the set of form field actions for this DataObject * @@ -278,66 +319,31 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler */ protected function getFormActions() { - $canEdit = $this->record->canEdit(); - $canDelete = $this->record->canDelete(); $actions = new FieldList(); - if ($this->record->ID !== 0) { - if ($canEdit) { + if ($this->record->ID !== 0) { // existing record + if ($this->record->canEdit()) { $actions->push(FormAction::create('doSave', _t('SilverStripe\\Forms\\GridField\\GridFieldDetailForm.Save', 'Save')) ->setUseButtonTag(true) ->addExtraClass('btn-primary font-icon-save')); } - if ($canDelete) { + if ($this->record->canDelete()) { $actions->push(FormAction::create('doDelete', _t('SilverStripe\\Forms\\GridField\\GridFieldDetailForm.Delete', 'Delete')) ->setUseButtonTag(true) ->addExtraClass('btn-outline-danger btn-hide-outline font-icon-trash-bin action--delete')); } - $gridStateStr = $this->getRequest()->requestVar('gridState'); + $gridState = $this->getRequest()->requestVar('gridState'); + $this->gridField->getState(false)->setValue($gridState); + $actions->push(HiddenField::create('gridState', null, $gridState)); - $this->gridField->getState(false)->setValue($gridStateStr); - $actions->push(HiddenField::create('gridState', null, $gridStateStr)); - - $rightGroup = CompositeField::create()->setName('RightGroup'); - $rightGroup->addExtraClass('right'); - $rightGroup->setFieldHolderTemplate(get_class($rightGroup) . '_holder_buttongroup'); - - $previousAndNextGroup = CompositeField::create()->setName('PreviousAndNextGroup'); - $previousAndNextGroup->addExtraClass('rounded'); - $previousAndNextGroup->setFieldHolderTemplate(get_class($previousAndNextGroup) . '_holder_buttongroup'); - - - $component = $this->gridField->getConfig()->getComponentByType(GridFieldDetailForm::class); - - if ($component->getShowPagination()) { - $previousAndNextGroup->push(FormAction::create('doPrevious') - ->setUseButtonTag(true) - ->setAttribute('data-grid-state', $gridStateStr) - ->setDisabled(!$this->getPreviousRecordID()) - ->addExtraClass('btn btn-secondary font-icon-left-open action--previous discard-confirmation')); - - $previousAndNextGroup->push(FormAction::create('doNext') - ->setUseButtonTag(true) - ->setAttribute('data-grid-state', $gridStateStr) - ->setDisabled(!$this->getNextRecordID()) - ->addExtraClass('btn btn-secondary font-icon-right-open action--next discard-confirmation')); - } - - $rightGroup->push($previousAndNextGroup); - - if ($component->getShowAdd()) { - $rightGroup->push(FormAction::create('doNew') - ->setUseButtonTag(true) - ->setAttribute('data-grid-state', $this->getRequest()->getVar('gridState')) - ->addExtraClass('btn btn-primary font-icon-plus rounded action--new discard-confirmation')); - } + $actions->push($this->getRightGroupField()); } else { // adding new record //Change the Save label to 'Create' $actions->push(FormAction::create('doSave', _t('SilverStripe\\Forms\\GridField\\GridFieldDetailForm.Create', 'Create')) ->setUseButtonTag(true) - ->addExtraClass('btn-primary font-icon-plus')); + ->addExtraClass('btn-primary font-icon-plus-thin')); // Add a Cancel link which is a button-like link and link back to one level up. $crumbs = $this->Breadcrumbs(); @@ -530,8 +536,8 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler return false; } - $currentPage = $data->getData('GridFieldPaginator')->getData('currentPage'); - $itemsPerPage = $data->getData('GridFieldPaginator')->getData('itemsPerPage'); + $currentPage = $paginator->getData('currentPage'); + $itemsPerPage = $paginator->getData('itemsPerPage'); $limit = $itemsPerPage + 2; $limitOffset = max(0, $itemsPerPage * ($currentPage-1) -1); From f526c794fcb5f1ba71ab5c047030735ffc3bc49d Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Fri, 23 Nov 2018 15:17:17 +1300 Subject: [PATCH 095/175] Minor / Refactor php tests for TreeMultiselectField --- tests/php/Forms/TreeMultiselectFieldTest.php | 265 ++++++++++++++++--- 1 file changed, 231 insertions(+), 34 deletions(-) diff --git a/tests/php/Forms/TreeMultiselectFieldTest.php b/tests/php/Forms/TreeMultiselectFieldTest.php index 2686b71a2..1eabcb220 100644 --- a/tests/php/Forms/TreeMultiselectFieldTest.php +++ b/tests/php/Forms/TreeMultiselectFieldTest.php @@ -4,63 +4,260 @@ namespace SilverStripe\Forms\Tests; use SilverStripe\Assets\File; use SilverStripe\Dev\SapphireTest; +use SilverStripe\Forms\Form; +use SilverStripe\Forms\FormTemplateHelper; use SilverStripe\Forms\TreeMultiselectField; class TreeMultiselectFieldTest extends SapphireTest { protected static $fixture_file = 'TreeDropdownFieldTest.yml'; - public function testEmptyChoiceReadonly() + protected $formId = 'TheFormID'; + protected $fieldName = 'TestTree'; + + /** + * {@inheritdoc} + */ + public function setUp() { - $field = new TreeMultiselectField('TestTree', 'Test tree', File::class); + parent::setUp(); - $asdf = $this->objFromFixture(File::class, 'asdf'); - $subfolderfile1 = $this->objFromFixture(File::class, 'subfolderfile1'); + $this->form = $this->buildFormMock(); + $this->field = $this->buildField($this->form); + $this->folders = $this->loadFolders(); - $schemaStateDefaults = $field->getSchemaStateDefaults(); - $this->assertArraySubset(['id' => 'TestTree', 'name' => 'TestTree', 'value' => 'unchanged'], $schemaStateDefaults, $strict = true); - - $items = $field->getItems(); - $this->assertCount(0, $items, $message = 'there must be no items selected'); - - $html = $field->performReadonlyTransformation()->Field(); - - $this->assertEquals( - <<<"HTML" - - ('none') - -HTML - , - $html + $this->folderIds = array_map( + static function ($f) { + return $f->ID; + }, + $this->folders ); + $this->fieldValue = implode(',', $this->folderIds); } - public function testReadonly() + /** + * Build a new mock object of a Form + * + * @return Form + */ + protected function buildFormMock() { - $field = new TreeMultiselectField('TestTree', 'Test tree', File::class); + $form = $this->createMock(Form::class); + $form->method('getTemplateHelper') + ->willReturn(FormTemplateHelper::singleton()); + + $form->method('getHTMLID') + ->willReturn($this->formId); + + return $form; + } + + /** + * Build a new instance of TreeMultiselectField + * + * @param Form $form The field form + * + * @return TreeMultiselectField + */ + protected function buildField(Form $form) + { + $field = new TreeMultiselectField($this->fieldName, 'Test tree', File::class); + $field->setForm($form); + + return $field; + } + + /** + * Load several files from the fixtures and return them in an array + * + * @return File[] + */ + protected function loadFolders() + { $asdf = $this->objFromFixture(File::class, 'asdf'); $subfolderfile1 = $this->objFromFixture(File::class, 'subfolderfile1'); - $field->setValue(implode(',', [$asdf->ID, $subfolderfile1->ID])); + return [$asdf, $subfolderfile1]; + } + + /** + * Test the TreeMultiselectField behaviour with no selected values + */ + public function testEmpty() + { + $field = $this->field; + + $fieldId = $field->ID(); + $this->assertEquals($fieldId, sprintf('%s_%s', $this->formId, $this->fieldName)); $schemaStateDefaults = $field->getSchemaStateDefaults(); - $this->assertArraySubset(['id' => 'TestTree', 'name' => 'TestTree', 'value' => [$asdf->ID, $subfolderfile1->ID]], $schemaStateDefaults, $strict = true); + $this->assertArraySubset( + [ + 'id' => $fieldId, + 'name' => $this->fieldName, + 'value' => 'unchanged' + ], + $schemaStateDefaults, + true + ); + + $schemaDataDefaults = $field->getSchemaDataDefaults(); + $this->assertArraySubset( + [ + 'id' => $fieldId, + 'name' => $this->fieldName, + 'type' => 'text', + 'schemaType' => 'SingleSelect', + 'component' => 'TreeDropdownField', + 'holderId' => sprintf('%s_Holder', $fieldId), + 'title' => 'Test tree', + 'extraClass' => 'treemultiselect multiple searchable', + 'data' => [ + 'urlTree' => 'field/TestTree/tree', + 'showSearch' => true, + 'emptyString' => '(Choose File)', + 'hasEmptyDefault' => false, + 'multiple' => true + ] + ], + $schemaDataDefaults, + true + ); $items = $field->getItems(); - $this->assertCount(2, $items, $message = 'there must be exactly 2 items selected'); + $this->assertCount(0, $items, 'there must be no items selected'); - $html = (string)$field->performReadonlyTransformation()->Field(); + $html = $field->Field(); + $this->assertContains($field->ID(), $html); + $this->assertContains('unchanged', $html); + } - $this->assertEquals( - <<<"HTML" - - <Special & characters>, TestFile1InSubfolder - -HTML - , - $html + + /** + * Test the field with some values set + */ + public function testChanged() + { + $field = $this->field; + + $field->setValue($this->fieldValue); + + $schemaStateDefaults = $field->getSchemaStateDefaults(); + $this->assertArraySubset( + [ + 'id' => $field->ID(), + 'name' => 'TestTree', + 'value' => $this->folderIds + ], + $schemaStateDefaults, + true ); + + $items = $field->getItems(); + $this->assertCount(2, $items, 'there must be exactly 2 items selected'); + + $html = $field->Field(); + $this->assertContains($field->ID(), $html); + $this->assertContains($this->fieldValue, $html); + } + + /** + * Test empty field in readonly mode + */ + public function testEmptyReadonly() + { + $field = $this->field->performReadonlyTransformation(); + + $schemaStateDefaults = $field->getSchemaStateDefaults(); + $this->assertArraySubset( + [ + 'id' => $field->ID(), + 'name' => 'TestTree', + 'value' => 'unchanged' + ], + $schemaStateDefaults, + true + ); + + $schemaDataDefaults = $field->getSchemaDataDefaults(); + $this->assertArraySubset( + [ + 'id' => $field->ID(), + 'name' => $this->fieldName, + 'type' => 'text', + 'schemaType' => 'SingleSelect', + 'component' => 'TreeDropdownField', + 'holderId' => sprintf('%s_Holder', $field->ID()), + 'title' => 'Test tree', + 'extraClass' => 'treemultiselectfield_readonly multiple searchable', + 'data' => [ + 'urlTree' => 'field/TestTree/tree', + 'showSearch' => true, + 'emptyString' => '(Choose File)', + 'hasEmptyDefault' => false, + 'multiple' => true + ] + ], + $schemaDataDefaults, + true + ); + + $items = $field->getItems(); + $this->assertCount(0, $items, 'there must be 0 selected items'); + + $html = $field->Field(); + $this->assertContains($field->ID(), $html); + } + + /** + * Test changed field in readonly mode + */ + public function testChangedReadonly() + { + $field = $this->field; + $field->setValue($this->fieldValue); + $field = $field->performReadonlyTransformation(); + + $schemaStateDefaults = $field->getSchemaStateDefaults(); + $this->assertArraySubset( + [ + 'id' => $field->ID(), + 'name' => 'TestTree', + 'value' => $this->folderIds + ], + $schemaStateDefaults, + true + ); + + $schemaDataDefaults = $field->getSchemaDataDefaults(); + $this->assertArraySubset( + [ + 'id' => $field->ID(), + 'name' => $this->fieldName, + 'type' => 'text', + 'schemaType' => 'SingleSelect', + 'component' => 'TreeDropdownField', + 'holderId' => sprintf('%s_Holder', $field->ID()), + 'title' => 'Test tree', + 'extraClass' => 'treemultiselectfield_readonly multiple searchable', + 'data' => [ + 'urlTree' => 'field/TestTree/tree', + 'showSearch' => true, + 'emptyString' => '(Choose File)', + 'hasEmptyDefault' => false, + 'multiple' => true + ] + ], + $schemaDataDefaults, + true + ); + + $items = $field->getItems(); + $this->assertCount(2, $items, 'there must be exactly 2 selected items'); + + $html = $field->Field(); + $this->assertContains($field->ID(), $html); + $this->assertContains($this->fieldValue, $html); } } From 0353b29652c3ab8280bd4d2fb259eeaef9f405c1 Mon Sep 17 00:00:00 2001 From: Jan Alfred Richter Date: Mon, 26 Nov 2018 08:42:10 +1300 Subject: [PATCH 096/175] Referencing env vars in configs As mentioned here: https://stackoverflow.com/a/53459699/2111274 --- .../00_Getting_Started/03_Environment_Management.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/en/00_Getting_Started/03_Environment_Management.md b/docs/en/00_Getting_Started/03_Environment_Management.md index b3df1e67f..f5dead273 100644 --- a/docs/en/00_Getting_Started/03_Environment_Management.md +++ b/docs/en/00_Getting_Started/03_Environment_Management.md @@ -48,6 +48,17 @@ use SilverStripe\Core\Environment; Environment::setEnv('API_KEY', 'AABBCCDDEEFF012345'); ``` +### Using environment variables in config + +To use environment variables in `.yaml` configs you can reference them using backticks. + +```yaml +SilverStripe\Core\Injector\Injector: + MyServiceClass: + properties: + MyProperty: '`ENV_VAR_HERE`' +``` + ## Including an extra `.env` file Sometimes it may be useful to include an extra `.env` file - on a shared local development environment where all From 34373dad9989042a2c2bb6549b560786d3e96400 Mon Sep 17 00:00:00 2001 From: Jan Alfred Richter Date: Mon, 26 Nov 2018 09:17:48 +1300 Subject: [PATCH 097/175] Update 03_Environment_Management.md Info: You can't use them outside of Injector config (as of 4.2). --- docs/en/00_Getting_Started/03_Environment_Management.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/en/00_Getting_Started/03_Environment_Management.md b/docs/en/00_Getting_Started/03_Environment_Management.md index f5dead273..960e9364b 100644 --- a/docs/en/00_Getting_Started/03_Environment_Management.md +++ b/docs/en/00_Getting_Started/03_Environment_Management.md @@ -59,6 +59,11 @@ SilverStripe\Core\Injector\Injector: MyProperty: '`ENV_VAR_HERE`' ``` +
              +

              Environment variables cannot be used outside of Injector config as of version 4.2.

              +
              + + ## Including an extra `.env` file Sometimes it may be useful to include an extra `.env` file - on a shared local development environment where all From 41dc9229bf6823262bbc4c25edf0da61cb08b260 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 26 Nov 2018 00:00:02 +0100 Subject: [PATCH 098/175] FIX Reverting ExtensionTestState and Extensible extra methods modifications to prevent PHP 5.6 segfault (#8581) * API Revert addition of Extensible::flush_extra_methods_cache() and change to ExtensionTestState This reverts the changes from #8465 and #8505 that relate to ExtensionTestState and the tracking of extra methods between unit tests. The existing test from #8465 testing overloaded Extensions after extra_methods are populated has been updated to show that you must re-add the extension to flush the extra_methods cache if you need this behaviour. * Revert change to InjectorTest::testExtendedExtensions * Revert "Add failing test to show that overloaded extensions are broken in Extensible" This reverts commit 55e79ffdfdd7101825e20fb4585e98ab554bd006. * DOCS Add docs for extending extensions, and upgrade guide note to 4.3 to avoid using PHP config to do so --- .../05_Extending/01_Extensions.md | 50 ++++++++++++++++--- docs/en/04_Changelogs/4.3.0.md | 11 +++- src/Core/Extensible.php | 9 ---- src/Dev/State/ExtensionTestState.php | 40 ++++++++++++++- tests/php/Core/Injector/InjectorTest.php | 25 +--------- .../InjectorTest/SomeCustomisedExtension.php | 13 ----- .../Injector/InjectorTest/SomeExtension.php | 14 ------ 7 files changed, 93 insertions(+), 69 deletions(-) delete mode 100644 tests/php/Core/Injector/InjectorTest/SomeCustomisedExtension.php delete mode 100644 tests/php/Core/Injector/InjectorTest/SomeExtension.php diff --git a/docs/en/02_Developer_Guides/05_Extending/01_Extensions.md b/docs/en/02_Developer_Guides/05_Extending/01_Extensions.md index cc00ecf0b..70e9a5063 100644 --- a/docs/en/02_Developer_Guides/05_Extending/01_Extensions.md +++ b/docs/en/02_Developer_Guides/05_Extending/01_Extensions.md @@ -56,7 +56,7 @@ Alternatively, we can add extensions through PHP code (in the `_config.php` file ```php -SilverStripe\Security\Member::add_extension('MyMemberExtension'); +SilverStripe\Security\Member::add_extension(MyMemberExtension::class); ``` This class now defines a `MyMemberExtension` that applies to all `Member` instances on the website. It will have @@ -256,7 +256,7 @@ $member = Security::getCurrentUser(); print_r($member->getExtensionInstances()); -if($member->hasExtension('MyCustomMemberExtension')) { +if ($member->hasExtension(MyCustomMemberExtension::class)) { // .. } ``` @@ -282,7 +282,7 @@ if not specified in `self::$defaults`, but before extensions have been called: public function __construct() { $this->beforeExtending('populateDefaults', function() { - if(empty($this->MyField)) { + if (empty($this->MyField)) { $this->MyField = 'Value we want as a default if not specified in $defaults, but set before extensions'; } }); @@ -301,9 +301,9 @@ This method is preferred to disabling, enabling, and calling field extensions ma ```php public function getCMSFields() { - $this->beforeUpdateCMSFields(function($fields) { + $this->beforeUpdateCMSFields(function ($fields) { // Include field which must be present when updateCMSFields is called on extensions - $fields->addFieldToTab("Root.Main", new TextField('Detail', 'Details', null, 255)); + $fields->addFieldToTab('Root.Main', new TextField('Detail', 'Details', null, 255)); }); $fields = parent::getCMSFields(); @@ -312,9 +312,45 @@ public function getCMSFields() } ``` -## Related Lessons -* [DataExtensions and SiteConfig](https://www.silverstripe.org/learn/lessons/v4/data-extensions-and-siteconfig-1) +## Extending extensions {#extendingextensions} +Extension classes can be overloaded using the Injector, if you want to modify the way that an extension in one of +your modules works: + +```yaml +SilverStripe\Core\Injector\Injector: + Company\Vendor\SomeExtension: + class: App\Project\CustomisedSomeExtension +``` + +**app/src/CustomisedSomeExtension.php** + +```php +namespace App\Project; + +use Company\Vendor\SomeExtension; + +class CustomisedSomeExtension extends SomeExtension +{ + public function someMethod() + { + $result = parent::someMethod(); + // modify result; + return $result; + } +} +``` + +
              +Please note that modifications such as this should be done in YAML configuration only. It is not recommended +to use `Config::modify()->set()` to adjust the implementation class name of an extension after the configuration +manifest has been loaded, and may not work consistently due to the "extra methods" cache having already been +populated. +
              + +## Related Lessons + +* [DataExtensions and SiteConfig](https://www.silverstripe.org/learn/lessons/v4/data-extensions-and-siteconfig-1) ## Related Documentaion diff --git a/docs/en/04_Changelogs/4.3.0.md b/docs/en/04_Changelogs/4.3.0.md index f89db9640..ab31d003e 100644 --- a/docs/en/04_Changelogs/4.3.0.md +++ b/docs/en/04_Changelogs/4.3.0.md @@ -26,7 +26,7 @@ To enable the legacy search API on a `GridFieldFilterHeader`, you can either: * set the `useLegacyFilterHeader` property to `true`, * or pass `true` to the first argument of its constructor. -To force the legacy search API on all instances of `GridFieldFilterHeader`, you can set it in your [configuration file](../../configuration): +To force the legacy search API on all instances of `GridFieldFilterHeader`, you can set it in your [configuration file](../developer_guides/configuration): ```yml SilverStripe\Forms\GridField\GridFieldFilterHeader: force_legacy: true @@ -73,3 +73,12 @@ SilverStripe\Core\Injector\Injector: For information on how to implement the history viewer UI in your own versioned DataObjects, please refer to [the Versioning documentation](../developer_guides/model/versioning). + +### Tests with dynamic extension customisations + +In SilverStripe 4.2, some unit tests that modify an extension class with PHP configuration manifest customisations +may have passed and may now fail in SilverStripe 4.3. This behaviour is inconsistent, is not a recommended approach +to customising extensions and should be avoided in all SilverStripe 4.x releases. + +For information on how to customise extensions, see +["Extending Extensions"](../developer_guides/extending/extensions#extendingextensions). diff --git a/src/Core/Extensible.php b/src/Core/Extensible.php index b29dda32e..79fe536b6 100644 --- a/src/Core/Extensible.php +++ b/src/Core/Extensible.php @@ -215,15 +215,6 @@ trait Extensible return true; } - /** - * Clears all cached extra_methods cache data - */ - public static function flush_extra_methods_cache() - { - self::$extra_methods = []; - } - - /** * Remove an extension from a class. * Note: This will not remove extensions from parent classes, and must be called diff --git a/src/Dev/State/ExtensionTestState.php b/src/Dev/State/ExtensionTestState.php index 2cfedddbd..29c4dd09c 100644 --- a/src/Dev/State/ExtensionTestState.php +++ b/src/Dev/State/ExtensionTestState.php @@ -13,6 +13,16 @@ use SilverStripe\ORM\DataObject; */ class ExtensionTestState implements TestState { + /** + * @var array + */ + protected $extensionsToReapply = []; + + /** + * @var array + */ + protected $extensionsToRemove = []; + /** * Called on setup * @@ -20,7 +30,6 @@ class ExtensionTestState implements TestState */ public function setUp(SapphireTest $test) { - DataObject::flush_extra_methods_cache(); } public function tearDown(SapphireTest $test) @@ -31,6 +40,8 @@ class ExtensionTestState implements TestState { // May be altered by another class $isAltered = false; + $this->extensionsToReapply = []; + $this->extensionsToRemove = []; /** @var string|SapphireTest $class */ /** @var string|DataObject $dataClass */ @@ -46,6 +57,10 @@ class ExtensionTestState implements TestState if (!class_exists($extension) || !$dataClass::has_extension($extension)) { continue; } + if (!isset($this->extensionsToReapply[$dataClass])) { + $this->extensionsToReapply[$dataClass] = []; + } + $this->extensionsToReapply[$dataClass][] = $extension; $dataClass::remove_extension($extension); $isAltered = true; } @@ -62,6 +77,10 @@ class ExtensionTestState implements TestState throw new LogicException("Test {$class} requires extension {$extension} which doesn't exist"); } if (!$dataClass::has_extension($extension)) { + if (!isset($this->extensionsToRemove[$dataClass])) { + $this->extensionsToRemove[$dataClass] = []; + } + $this->extensionsToRemove[$dataClass][] = $extension; $dataClass::add_extension($extension); $isAltered = true; } @@ -85,6 +104,23 @@ class ExtensionTestState implements TestState public function tearDownOnce($class) { - DataObject::flush_extra_methods_cache(); + // @todo: This isn't strictly necessary to restore extensions, but only to ensure that + // Object::$extra_methods is properly flushed. This should be replaced with a simple + // flush mechanism for each $class. + /** @var string|DataObject $dataClass */ + + // Remove extensions added for testing + foreach ($this->extensionsToRemove as $dataClass => $extensions) { + foreach ($extensions as $extension) { + $dataClass::remove_extension($extension); + } + } + + // Reapply ones removed + foreach ($this->extensionsToReapply as $dataClass => $extensions) { + foreach ($extensions as $extension) { + $dataClass::add_extension($extension); + } + } } } diff --git a/tests/php/Core/Injector/InjectorTest.php b/tests/php/Core/Injector/InjectorTest.php index b1dee54db..1e54cc1de 100644 --- a/tests/php/Core/Injector/InjectorTest.php +++ b/tests/php/Core/Injector/InjectorTest.php @@ -21,13 +21,12 @@ use SilverStripe\Core\Tests\Injector\InjectorTest\NeedsBothCirculars; use SilverStripe\Core\Tests\Injector\InjectorTest\NewRequirementsBackend; use SilverStripe\Core\Tests\Injector\InjectorTest\OriginalRequirementsBackend; use SilverStripe\Core\Tests\Injector\InjectorTest\OtherTestObject; -use SilverStripe\Core\Tests\Injector\InjectorTest\SomeCustomisedExtension; -use SilverStripe\Core\Tests\Injector\InjectorTest\SomeExtension; use SilverStripe\Core\Tests\Injector\InjectorTest\TestObject; use SilverStripe\Core\Tests\Injector\InjectorTest\TestSetterInjections; use SilverStripe\Core\Tests\Injector\InjectorTest\TestStaticInjections; use SilverStripe\Dev\SapphireTest; -use SilverStripe\Security\Member; +use SilverStripe\Dev\TestOnly; +use stdClass; define('TEST_SERVICES', __DIR__ . '/AopProxyServiceTest'); @@ -1048,24 +1047,4 @@ class InjectorTest extends SapphireTest Injector::unnest(); $this->nestingLevel--; } - - /** - * Tests that overloaded extensions work, see {@link Extensible::getExtensionInstance()} - */ - public function testExtendedExtensions() - { - Config::modify() - ->set(Injector::class, SomeExtension::class, [ - 'class' => SomeCustomisedExtension::class, - ]) - ->merge(Member::class, 'extensions', [ - SomeExtension::class, - ]); - - /** @var Member|SomeExtension $member */ - $member = new Member(); - $this->assertTrue($member->hasExtension(SomeExtension::class)); - $this->assertTrue($member->hasMethod('someMethod')); - $this->assertSame('bar', $member->someMethod()); - } } diff --git a/tests/php/Core/Injector/InjectorTest/SomeCustomisedExtension.php b/tests/php/Core/Injector/InjectorTest/SomeCustomisedExtension.php deleted file mode 100644 index 9641d7df1..000000000 --- a/tests/php/Core/Injector/InjectorTest/SomeCustomisedExtension.php +++ /dev/null @@ -1,13 +0,0 @@ - Date: Mon, 26 Nov 2018 12:42:47 +0100 Subject: [PATCH 099/175] FIX Remove redundant "rightGroup" logic and increase getRightGroupField to protected --- src/Forms/GridField/GridFieldDetailForm_ItemRequest.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php index f83442288..c4a715863 100644 --- a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php +++ b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php @@ -274,7 +274,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler /** * @return CompositeField Returns the right aligned toolbar group field along with its FormAction's */ - private function getRightGroupField() + protected function getRightGroupField() { $rightGroup = CompositeField::create()->setName('RightGroup'); $rightGroup->addExtraClass('ml-auto'); @@ -361,10 +361,6 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler $this->extend('updateFormActions', $actions); - if (isset($rightGroup)) { - $actions->push($rightGroup); - } - return $actions; } From f22a4b980bff59a425c3bd30d0af4bed2b77ff2f Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 26 Nov 2018 16:01:46 +0100 Subject: [PATCH 100/175] FIX getComponentByType can return null - prevent null pointer errors --- src/Forms/GridField/GridFieldDetailForm_ItemRequest.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php index f83442288..a5724dcf6 100644 --- a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php +++ b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php @@ -284,9 +284,10 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler $previousAndNextGroup->addExtraClass('circular-group mr-2'); $previousAndNextGroup->setFieldHolderTemplate(get_class($previousAndNextGroup) . '_holder_buttongroup'); + /** @var GridFieldDetailForm $component */ $component = $this->gridField->getConfig()->getComponentByType(GridFieldDetailForm::class); $gridState = $this->getRequest()->requestVar('gridState'); - if ($component->getShowPagination()) { + if ($component && $component->getShowPagination()) { $previousAndNextGroup->push(FormAction::create('doPrevious') ->setUseButtonTag(true) ->setAttribute('data-grid-state', $gridState) @@ -302,7 +303,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler $rightGroup->push($previousAndNextGroup); - if ($component->getShowAdd()) { + if ($component && $component->getShowAdd()) { $rightGroup->push(FormAction::create('doNew') ->setUseButtonTag(true) ->setAttribute('data-grid-state', $this->getRequest()->getVar('gridState')) From fa26ead0f6814dfa7dd9989da3c9f77c057be08f Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 26 Nov 2018 17:15:17 +0100 Subject: [PATCH 101/175] DOCS Add namespaces to PHP i18n examples, and reference __CLASS__ and self::class as options --- docs/en/02_Developer_Guides/13_i18n/index.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/en/02_Developer_Guides/13_i18n/index.md b/docs/en/02_Developer_Guides/13_i18n/index.md index 524c19fed..93e87dd5e 100644 --- a/docs/en/02_Developer_Guides/13_i18n/index.md +++ b/docs/en/02_Developer_Guides/13_i18n/index.md @@ -254,16 +254,20 @@ Please ensure that any required plurals are exposed via provideI18nEntities. ```php // Simple string translation -_t('LeftAndMain.FILESIMAGES','Files & Images'); +_t('SilverStripe\\Admin\\LeftAndMain.FILESIMAGES','Files & Images'); // Using injection to add variables into the translated strings. -_t('CMSMain.RESTORED', +_t('SilverStripe\\CMS\\Controllers\\CMSMain.RESTORED', "Restored {value} successfully", ['value' => $itemRestored] ); // Plurals are invoked via a `|` pipe-delimeter with a {count} argument _t('MyObject.PLURALS', 'An object|{count} objects', [ 'count' => $count ]); + +// You can use __CLASS__ or self::class to reference the current (early bound) class name +_t(self::class . '.GREETING', 'Welcome!'); +_t(__CLASS__ . '.GREETING', 'Welcome!'); ``` #### Usage in Template Files From 5d15d20f0f8df06cc3f4edcd980eeb2191142085 Mon Sep 17 00:00:00 2001 From: Aled Brown Date: Wed, 28 Nov 2018 17:23:37 +0000 Subject: [PATCH 102/175] ModelAdmin Menu Icon Class Documentation Added + Namespace Permissions (#8646) --- .../01_ModelAdmin.md | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/01_ModelAdmin.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/01_ModelAdmin.md index 222532985..9c48321f6 100644 --- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/01_ModelAdmin.md +++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/01_ModelAdmin.md @@ -114,25 +114,37 @@ class Category extends DataObject { public function canView($member = null) { - return Permission::check('CMS_ACCESS_MyAdmin', 'any', $member); + return Permission::check('CMS_ACCESS_Company\Website\MyAdmin', 'any', $member); } public function canEdit($member = null) { - return Permission::check('CMS_ACCESS_MyAdmin', 'any', $member); + return Permission::check('CMS_ACCESS_Company\Website\MyAdmin', 'any', $member); } public function canDelete($member = null) { - return Permission::check('CMS_ACCESS_MyAdmin', 'any', $member); + return Permission::check('CMS_ACCESS_Company\Website\MyAdmin', 'any', $member); } public function canCreate($member = null) { - return Permission::check('CMS_ACCESS_MyAdmin', 'any', $member); + return Permission::check('CMS_ACCESS_Company\Website\MyAdmin', 'any', $member); } } ``` +## Custom ModelAdmin CSS menu icons using built in icon font + +An extended ModelAdmin class supports adding a custom menu icon to the CMS. + +``` +class NewsAdmin extends ModelAdmin +{ + ... + private static $menu_icon_class = 'font-icon-news'; +} +``` +A complete list of supported font icons is available to view in the [SilverStripe Design System Manager](https://projects.invisionapp.com/dsm/silver-stripe/silver-stripe/section/icons/5a8b972d656c91001150f8b6) ## Searching Records From 38f8217f019576c341426e155588a39d30854548 Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Thu, 29 Nov 2018 09:55:28 +1300 Subject: [PATCH 103/175] TreeMultiselectFieldTest / setUp is protected in PHPUnit5 --- tests/php/Forms/TreeMultiselectFieldTest.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/php/Forms/TreeMultiselectFieldTest.php b/tests/php/Forms/TreeMultiselectFieldTest.php index 1eabcb220..a6a431f2b 100644 --- a/tests/php/Forms/TreeMultiselectFieldTest.php +++ b/tests/php/Forms/TreeMultiselectFieldTest.php @@ -15,10 +15,7 @@ class TreeMultiselectFieldTest extends SapphireTest protected $formId = 'TheFormID'; protected $fieldName = 'TestTree'; - /** - * {@inheritdoc} - */ - public function setUp() + protected function setUp() { parent::setUp(); From 4ee63eb4e7e379b35c7ed6570eb3e438d08ae7cb Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Thu, 29 Nov 2018 12:13:56 +1300 Subject: [PATCH 104/175] TreeMultiselectFieldTest / make scrutinizer happy --- tests/php/Forms/TreeMultiselectFieldTest.php | 35 ++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tests/php/Forms/TreeMultiselectFieldTest.php b/tests/php/Forms/TreeMultiselectFieldTest.php index a6a431f2b..5b2f14a65 100644 --- a/tests/php/Forms/TreeMultiselectFieldTest.php +++ b/tests/php/Forms/TreeMultiselectFieldTest.php @@ -15,6 +15,41 @@ class TreeMultiselectFieldTest extends SapphireTest protected $formId = 'TheFormID'; protected $fieldName = 'TestTree'; + /** + * Mock object of a generic form + * + * @var Form + */ + protected $form; + + /** + * Instance of the TreeMultiselectField + * + * @var TreeMultiselectField + */ + protected $field; + + /** + * The File objects of folders loaded from the fixture + * + * @var File[] + */ + protected $folders; + + /** + * The array of folder ids + * + * @var int[] + */ + protected $folderIds; + + /** + * Concatenated folder ids for use as a value for the field + * + * @var string + */ + protected $fieldValue; + protected function setUp() { parent::setUp(); From 0c17ffc944a156937732238c9d8b6f1e0049e5ea Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Fri, 30 Nov 2018 13:51:04 +1300 Subject: [PATCH 105/175] FIX: Manifest should ignore vendor folders within packages contained in vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this change vendor/silverstripe/framework/vendor/silverstripe/config will be pick up by the manifest, which is inappropriate. Although this doesn’t happen often, it can occur if you have run “composer install” within vendor/silverstripe/framework, which can be done either accidentally or (in my case) as part of running the framework tests isolated from the rest of your project (which is closer to the execution model on Travis) Note that the presence of the ‘nestedvendor.txt’ file tests that this works without any explicit changes to the PHP of the tests, since it’s merely confirming that such a file is *not* picked up. --- src/Core/Manifest/ManifestFileFinder.php | 5 +++++ .../vendor/myvendor/thismodule/vendor/nestedvendor.txt | 1 + 2 files changed, 6 insertions(+) create mode 100644 tests/php/Core/Manifest/fixtures/manifestfilefinder/vendor/myvendor/thismodule/vendor/nestedvendor.txt diff --git a/src/Core/Manifest/ManifestFileFinder.php b/src/Core/Manifest/ManifestFileFinder.php index 995f944aa..697f9fd51 100644 --- a/src/Core/Manifest/ManifestFileFinder.php +++ b/src/Core/Manifest/ManifestFileFinder.php @@ -41,6 +41,11 @@ class ManifestFileFinder extends FileFinder // Keep searching inside vendor $inVendor = $this->isInsideVendor($basename, $pathname, $depth); if ($inVendor) { + // Skip nested vendor folders (e.g. vendor/silverstripe/framework/vendor) + if ($depth == 4 && basename($pathname) === self::VENDOR_DIR) { + return false; + } + // Keep searching if we could have a subdir module if ($depth < 3) { return true; diff --git a/tests/php/Core/Manifest/fixtures/manifestfilefinder/vendor/myvendor/thismodule/vendor/nestedvendor.txt b/tests/php/Core/Manifest/fixtures/manifestfilefinder/vendor/myvendor/thismodule/vendor/nestedvendor.txt new file mode 100644 index 000000000..e4fa5b54b --- /dev/null +++ b/tests/php/Core/Manifest/fixtures/manifestfilefinder/vendor/myvendor/thismodule/vendor/nestedvendor.txt @@ -0,0 +1 @@ +nestedvendor.txt From b4c8f699eb4dd75089100c1b180cd0df25146206 Mon Sep 17 00:00:00 2001 From: Guy Marriott Date: Wed, 21 Nov 2018 16:55:57 +1300 Subject: [PATCH 106/175] FIX Provide alternatives to session for storing GridField_FormAction state --- _config/gridfield.yml | 6 +++ .../GridField/FormAction/AttributeStore.php | 51 +++++++++++++++++++ .../GridField/FormAction/SessionStore.php | 50 ++++++++++++++++++ src/Forms/GridField/FormAction/StateStore.php | 30 +++++++++++ src/Forms/GridField/GridField.php | 10 +++- src/Forms/GridField/GridField_FormAction.php | 43 +++++++++++----- 6 files changed, 176 insertions(+), 14 deletions(-) create mode 100644 _config/gridfield.yml create mode 100644 src/Forms/GridField/FormAction/AttributeStore.php create mode 100644 src/Forms/GridField/FormAction/SessionStore.php create mode 100644 src/Forms/GridField/FormAction/StateStore.php diff --git a/_config/gridfield.yml b/_config/gridfield.yml new file mode 100644 index 000000000..a47da229f --- /dev/null +++ b/_config/gridfield.yml @@ -0,0 +1,6 @@ +--- +Name: gridfieldconfig +--- +SilverStripe\Core\Injector\Injector: + SilverStripe\Forms\GridField\FormAction\StateStore: + class: SilverStripe\Forms\GridField\FormAction\SessionStore diff --git a/src/Forms/GridField/FormAction/AttributeStore.php b/src/Forms/GridField/FormAction/AttributeStore.php new file mode 100644 index 000000000..60f736d74 --- /dev/null +++ b/src/Forms/GridField/FormAction/AttributeStore.php @@ -0,0 +1,51 @@ +request = $request; + } + + /** + * Save the given state against the given ID returning an associative array to be added as attributes on the form + * action + * + * @param string $id + * @param array $state + * @return array + */ + public function save($id, array $state) + { + // Just save the state in the attributes of the action + return [ + 'data-action-state' => json_encode($state), + ]; + } + + /** + * Load state for a given ID + * + * @param string $id + * @return mixed + */ + public function load($id) + { + // Check the request + return json_decode($this->request->requestVar('ActionState'), true); + } +} diff --git a/src/Forms/GridField/FormAction/SessionStore.php b/src/Forms/GridField/FormAction/SessionStore.php new file mode 100644 index 000000000..35f2337b8 --- /dev/null +++ b/src/Forms/GridField/FormAction/SessionStore.php @@ -0,0 +1,50 @@ +request = $request; + } + + /** + * Save the given state against the given ID returning an associative array to be added as attributes on the form + * action + * + * @param string $id + * @param array $state + * @return array + */ + public function save($id, array $state) + { + $this->request->getSession()->set($id, $state); + + // This adapter does not require any additional attributes... + return []; + } + + /** + * Load state for a given ID + * + * @param string $id + * @return mixed + */ + public function load($id) + { + return $this->request->getSession()->get($id); + } +} diff --git a/src/Forms/GridField/FormAction/StateStore.php b/src/Forms/GridField/FormAction/StateStore.php new file mode 100644 index 000000000..e415a518b --- /dev/null +++ b/src/Forms/GridField/FormAction/StateStore.php @@ -0,0 +1,30 @@ +setValue($fieldData['GridState']); } + // Fetch the store for the "state" of actions (not the GridField) + /** @var StateStore $store */ + $store = Injector::inst()->create(StateStore::class . '.' . $this->getName(), $request); + foreach ($data as $dataKey => $dataValue) { if (preg_match('/^action_gridFieldAlterAction\?StateID=(.*)/', $dataKey, $matches)) { - $stateChange = $request->getSession()->get($matches[1]); + $stateChange = $store->load($matches[1]); + $actionName = $stateChange['actionName']; $arguments = array(); diff --git a/src/Forms/GridField/GridField_FormAction.php b/src/Forms/GridField/GridField_FormAction.php index 10dc772bc..a253d8b3b 100644 --- a/src/Forms/GridField/GridField_FormAction.php +++ b/src/Forms/GridField/GridField_FormAction.php @@ -3,8 +3,10 @@ namespace SilverStripe\Forms\GridField; use SilverStripe\Control\Controller; +use SilverStripe\Core\Injector\Injector; use SilverStripe\Forms\Form; use SilverStripe\Forms\FormAction; +use SilverStripe\Forms\GridField\FormAction\StateStore; /** * This class is the base class when you want to have an action that alters the state of the @@ -12,6 +14,11 @@ use SilverStripe\Forms\FormAction; */ class GridField_FormAction extends FormAction { + /** + * A common string prefix for keys generated to store form action "state" against + */ + const STATE_KEY_PREFIX = 'gf_'; + /** * @var GridField */ @@ -80,29 +87,39 @@ class GridField_FormAction extends FormAction */ public function getAttributes() { - // Store state in session, and pass ID to client side. + // Determine the state that goes with this action $state = array( 'grid' => $this->getNameFromParent(), 'actionName' => $this->actionName, 'args' => $this->args, ); - // Ensure $id doesn't contain only numeric characters - $id = 'gf_' . substr(md5(serialize($state)), 0, 8); + // Generate a key and attach it to the action name + $key = static::STATE_KEY_PREFIX . substr(md5(serialize($state)), 0, 8); + // Note: This field needs to be less than 65 chars, otherwise Suhosin security patch will strip it + $name = 'action_gridFieldAlterAction?StateID=' . $key; - $session = Controller::curr()->getRequest()->getSession(); - $session->set($id, $state); - $actionData['StateID'] = $id; + // Define attributes + $attributes = array( + 'name' => $name, + 'data-url' => $this->gridField->Link(), + 'type' => "button", + ); + // Create a "store" for the "state" of this action + /** @var StateStore $store */ + $store = Injector::inst()->create( + StateStore::class . '.' . $this->gridField->getName(), + // For some reason `getRequest` on GridField_FormAction does not return the correct request + Controller::curr()->getRequest() + ); + // Store the state and update attributes as required + $attributes += $store->save($key, $state); + + // Return attributes return array_merge( parent::getAttributes(), - array( - // Note: This field needs to be less than 65 chars, otherwise Suhosin security patch - // will strip it from the requests - 'name' => 'action_gridFieldAlterAction' . '?' . http_build_query($actionData), - 'data-url' => $this->gridField->Link(), - 'type' => "button", - ) + $attributes ); } From ddaa22986f86c634d5e0c849f727c6eb4c4f2509 Mon Sep 17 00:00:00 2001 From: Guy Marriott Date: Thu, 22 Nov 2018 13:05:43 +1300 Subject: [PATCH 107/175] Updating StateStore interface not to define a constructor & fixing GridFieldFilterHeader to add required attributes --- .../FormAction/AbstractRequestAwareStore.php | 34 +++++++++++++++++++ .../GridField/FormAction/AttributeStore.php | 19 ++--------- .../GridField/FormAction/SessionStore.php | 21 +++--------- src/Forms/GridField/FormAction/StateStore.php | 9 +---- src/Forms/GridField/GridField.php | 2 +- src/Forms/GridField/GridFieldFilterHeader.php | 8 +++-- src/Forms/GridField/GridField_FormAction.php | 6 +--- 7 files changed, 50 insertions(+), 49 deletions(-) create mode 100644 src/Forms/GridField/FormAction/AbstractRequestAwareStore.php diff --git a/src/Forms/GridField/FormAction/AbstractRequestAwareStore.php b/src/Forms/GridField/FormAction/AbstractRequestAwareStore.php new file mode 100644 index 000000000..57c11e519 --- /dev/null +++ b/src/Forms/GridField/FormAction/AbstractRequestAwareStore.php @@ -0,0 +1,34 @@ + '%$' . HTTPRequest::class, + ]; + + /** + * @var HTTPRequest + */ + protected $request; + + /** + * @return HTTPRequest + */ + public function getRequest() + { + return $this->request; + } + + /** + * @param HTTPRequest $request + * @return $this + */ + public function setRequest($request) + { + $this->request = $request; + return $this; + } +} diff --git a/src/Forms/GridField/FormAction/AttributeStore.php b/src/Forms/GridField/FormAction/AttributeStore.php index 60f736d74..b04d7c21e 100644 --- a/src/Forms/GridField/FormAction/AttributeStore.php +++ b/src/Forms/GridField/FormAction/AttributeStore.php @@ -6,21 +6,8 @@ use SilverStripe\Control\HTTPRequest; /** * Stores GridField action state on an attribute on the action and then analyses request parameters to load it back */ -class AttributeStore implements StateStore +class AttributeStore extends AbstractRequestAwareStore implements StateStore { - /** - * @var HTTPRequest - */ - protected $request; - - /** - * @param HTTPRequest $request - */ - public function __construct(HTTPRequest $request) - { - $this->request = $request; - } - /** * Save the given state against the given ID returning an associative array to be added as attributes on the form * action @@ -41,11 +28,11 @@ class AttributeStore implements StateStore * Load state for a given ID * * @param string $id - * @return mixed + * @return array */ public function load($id) { // Check the request - return json_decode($this->request->requestVar('ActionState'), true); + return (array) json_decode((string) $this->getRequest()->requestVar('ActionState'), true); } } diff --git a/src/Forms/GridField/FormAction/SessionStore.php b/src/Forms/GridField/FormAction/SessionStore.php index 35f2337b8..0798d0c6a 100644 --- a/src/Forms/GridField/FormAction/SessionStore.php +++ b/src/Forms/GridField/FormAction/SessionStore.php @@ -6,21 +6,8 @@ use SilverStripe\Control\HTTPRequest; /** * Stores GridField action state in the session in exactly the same way it has in the past */ -class SessionStore implements StateStore +class SessionStore extends AbstractRequestAwareStore implements StateStore { - /** - * @var HTTPRequest - */ - protected $request; - - /** - * @param HTTPRequest $request - */ - public function __construct(HTTPRequest $request) - { - $this->request = $request; - } - /** * Save the given state against the given ID returning an associative array to be added as attributes on the form * action @@ -31,7 +18,7 @@ class SessionStore implements StateStore */ public function save($id, array $state) { - $this->request->getSession()->set($id, $state); + $this->getRequest()->getSession()->set($id, $state); // This adapter does not require any additional attributes... return []; @@ -41,10 +28,10 @@ class SessionStore implements StateStore * Load state for a given ID * * @param string $id - * @return mixed + * @return array */ public function load($id) { - return $this->request->getSession()->get($id); + return (array) $this->getRequest()->getSession()->get($id); } } diff --git a/src/Forms/GridField/FormAction/StateStore.php b/src/Forms/GridField/FormAction/StateStore.php index e415a518b..3a0b89c70 100644 --- a/src/Forms/GridField/FormAction/StateStore.php +++ b/src/Forms/GridField/FormAction/StateStore.php @@ -1,15 +1,8 @@ create(StateStore::class . '.' . $this->getName(), $request); + $store = Injector::inst()->create(StateStore::class . '.' . $this->getName()); foreach ($data as $dataKey => $dataValue) { if (preg_match('/^action_gridFieldAlterAction\?StateID=(.*)/', $dataKey, $matches)) { diff --git a/src/Forms/GridField/GridFieldFilterHeader.php b/src/Forms/GridField/GridFieldFilterHeader.php index 2d2440877..d51ea5023 100755 --- a/src/Forms/GridField/GridFieldFilterHeader.php +++ b/src/Forms/GridField/GridFieldFilterHeader.php @@ -289,14 +289,18 @@ class GridFieldFilterHeader implements GridField_URLHandler, GridField_HTMLProvi }, array_keys($filters)), $filters); } + $searchAction = GridField_FormAction::create($gridField, 'filter', false, 'filter', null); + $clearAction = GridField_FormAction::create($gridField, 'reset', false, 'reset', null); $schema = [ 'formSchemaUrl' => $schemaUrl, 'name' => $searchField, 'placeholder' => _t(__CLASS__ . '.Search', 'Search "{name}"', ['name' => $name]), 'filters' => $filters ?: new \stdClass, // stdClass maps to empty json object '{}' 'gridfield' => $gridField->getName(), - 'searchAction' => GridField_FormAction::create($gridField, 'filter', false, 'filter', null)->getAttribute('name'), - 'clearAction' => GridField_FormAction::create($gridField, 'reset', false, 'reset', null)->getAttribute('name') + 'searchAction' => $searchAction->getAttribute('name'), + 'searchActionState' => $searchAction->getAttribute('data-action-state'), + 'clearAction' => $clearAction->getAttribute('name'), + 'clearActionState' => $clearAction->getAttribute('data-action-state'), ]; return Convert::raw2json($schema); diff --git a/src/Forms/GridField/GridField_FormAction.php b/src/Forms/GridField/GridField_FormAction.php index a253d8b3b..7e791410d 100644 --- a/src/Forms/GridField/GridField_FormAction.php +++ b/src/Forms/GridField/GridField_FormAction.php @@ -108,11 +108,7 @@ class GridField_FormAction extends FormAction // Create a "store" for the "state" of this action /** @var StateStore $store */ - $store = Injector::inst()->create( - StateStore::class . '.' . $this->gridField->getName(), - // For some reason `getRequest` on GridField_FormAction does not return the correct request - Controller::curr()->getRequest() - ); + $store = Injector::inst()->create(StateStore::class . '.' . $this->gridField->getName()); // Store the state and update attributes as required $attributes += $store->save($key, $state); From aace1da1f04af84b339eae4aeb89abe3c96d3257 Mon Sep 17 00:00:00 2001 From: Guy Marriott Date: Thu, 22 Nov 2018 13:17:09 +1300 Subject: [PATCH 108/175] DOCS Adding notes on configuring the storage method for GridField_FormActions --- .../03_Forms/Field_types/04_GridField.md | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md b/docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md index 3750c0761..43ce4ac95 100644 --- a/docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md +++ b/docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md @@ -472,11 +472,29 @@ functionality. See [How to Create a GridFieldComponent](../how_tos/create_a_grid ## Saving the GridField State -`GridState` is a class that is used to contain the current state and actions on the `GridField`. It's transfered +`GridState` is a class that is used to contain the current state and actions on the `GridField`. It's transferred between page requests by being inserted as a hidden field in the form. The `GridState_Component` sets and gets data from the `GridState`. +## Saving GridField_FormAction state + +By default state used for performing form actions is saved in the session and tagged with a key like `gf_abcd1234`. In +some cases session may not be an appropriate storage method. The storage method can be configured: + +```yaml +Name: mysitegridfieldconfig +After: gridfieldconfig +--- +SilverStripe\Core\Injector\Injector: + SilverStripe\Forms\GridField\FormAction\StateStore: + class: SilverStripe\Forms\GridField\FormAction\AttributeStore +``` + +The `AttributeStore` class configures action state to be stored in the DOM and sent back on the request that performs +the action. Custom storage methods can be created and used by implementing the `StateStore` interface and configuring +`Injector` in a similar fasion. + ## API Documentation * [GridField](api:SilverStripe\Forms\GridField\GridField) From 32d096d9e5daa221ae6a2d03a46c19d1c280989f Mon Sep 17 00:00:00 2001 From: Guy Marriott Date: Wed, 28 Nov 2018 14:58:51 +1300 Subject: [PATCH 109/175] DOCS Moving interface subscription to the abstract and adding a changelog entry --- .../02_Developer_Guides/03_Forms/Field_types/04_GridField.md | 2 +- docs/en/04_Changelogs/4.3.0.md | 1 + src/Forms/GridField/FormAction/AbstractRequestAwareStore.php | 2 +- src/Forms/GridField/FormAction/AttributeStore.php | 4 +--- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md b/docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md index 43ce4ac95..9461ae801 100644 --- a/docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md +++ b/docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md @@ -493,7 +493,7 @@ SilverStripe\Core\Injector\Injector: The `AttributeStore` class configures action state to be stored in the DOM and sent back on the request that performs the action. Custom storage methods can be created and used by implementing the `StateStore` interface and configuring -`Injector` in a similar fasion. +`Injector` in a similar fashion. ## API Documentation diff --git a/docs/en/04_Changelogs/4.3.0.md b/docs/en/04_Changelogs/4.3.0.md index ab31d003e..ffa49c558 100644 --- a/docs/en/04_Changelogs/4.3.0.md +++ b/docs/en/04_Changelogs/4.3.0.md @@ -8,6 +8,7 @@ - New React-based search UI for the CMS, Asset-Admin, GridFields and ModelAdmins. - A new `GridFieldLazyLoader` component can be added to `GridField`. This will delay the fetching of data until the user access the container Tab of the GridField. - `SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController` is now the default CMS history controller and `SilverStripe\CMS\Controllers\CMSPageHistoryController` has been deprecated. + - It's now possible to avoid storing GridField data in session. See [the documentation on GridField](../developer_guides/forms/field_types/gridfield/#saving-the-gridfield-state). ## Upgrading {#upgrading} diff --git a/src/Forms/GridField/FormAction/AbstractRequestAwareStore.php b/src/Forms/GridField/FormAction/AbstractRequestAwareStore.php index 57c11e519..c1069aa3f 100644 --- a/src/Forms/GridField/FormAction/AbstractRequestAwareStore.php +++ b/src/Forms/GridField/FormAction/AbstractRequestAwareStore.php @@ -3,7 +3,7 @@ namespace SilverStripe\Forms\GridField\FormAction; use SilverStripe\Control\HTTPRequest; -abstract class AbstractRequestAwareStore +abstract class AbstractRequestAwareStore implements StateStore { private static $dependencies = [ 'request' => '%$' . HTTPRequest::class, diff --git a/src/Forms/GridField/FormAction/AttributeStore.php b/src/Forms/GridField/FormAction/AttributeStore.php index b04d7c21e..1f84fb768 100644 --- a/src/Forms/GridField/FormAction/AttributeStore.php +++ b/src/Forms/GridField/FormAction/AttributeStore.php @@ -1,12 +1,10 @@ Date: Wed, 28 Nov 2018 16:00:51 +1300 Subject: [PATCH 110/175] FIX Switching to use Controller::curr as it was using previously --- .../FormAction/AbstractRequestAwareStore.php | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/src/Forms/GridField/FormAction/AbstractRequestAwareStore.php b/src/Forms/GridField/FormAction/AbstractRequestAwareStore.php index c1069aa3f..84f683292 100644 --- a/src/Forms/GridField/FormAction/AbstractRequestAwareStore.php +++ b/src/Forms/GridField/FormAction/AbstractRequestAwareStore.php @@ -1,34 +1,17 @@ '%$' . HTTPRequest::class, - ]; - - /** - * @var HTTPRequest - */ - protected $request; - /** * @return HTTPRequest */ public function getRequest() { - return $this->request; - } - - /** - * @param HTTPRequest $request - * @return $this - */ - public function setRequest($request) - { - $this->request = $request; - return $this; + // Replicating existing functionality from GridField_FormAction + return Controller::curr()->getRequest(); } } From cc7aa7b68bf7c1ee739279d2a869f884955d5d0d Mon Sep 17 00:00:00 2001 From: Ed Linklater Date: Sat, 1 Dec 2018 07:53:21 +1300 Subject: [PATCH 111/175] FIX incorrect composer module type Was silverstripe/vendormodule, should be silverstripe-vendormodule --- .../05_Extending/How_Tos/01_Publish_a_Module.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/02_Developer_Guides/05_Extending/How_Tos/01_Publish_a_Module.md b/docs/en/02_Developer_Guides/05_Extending/How_Tos/01_Publish_a_Module.md index ac9373d4b..3b60286a1 100644 --- a/docs/en/02_Developer_Guides/05_Extending/How_Tos/01_Publish_a_Module.md +++ b/docs/en/02_Developer_Guides/05_Extending/How_Tos/01_Publish_a_Module.md @@ -57,7 +57,7 @@ up by [addons.silverstripe.org](http://addons.silverstripe.org/) website due to Note that SilverStripe modules have the following distinct characteristics: - - SilverStripe can hook in to the composer installation process by declaring `type: silverstripe/vendormodule`. + - SilverStripe can hook in to the composer installation process by declaring `type: silverstripe-vendormodule`. - Any folder which should be exposed to the public webroot must be declared in the `extra.expose` config. These paths will be automatically rewritten to public urls which don't directly serve files from the `vendor` folder. For instance, `vendor/my-vendor/my-module/client` will be rewritten to From f9cd6d9a155b284abd52d8cfd8e6a883f4210b7c Mon Sep 17 00:00:00 2001 From: Hans Philip Eide Date: Sat, 1 Dec 2018 13:36:52 +0100 Subject: [PATCH 112/175] Update 02_Images.md If the default is that resampling is off, shouldn't the example be that force_resample is set to true to enable resample? --- docs/en/02_Developer_Guides/14_Files/02_Images.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/02_Developer_Guides/14_Files/02_Images.md b/docs/en/02_Developer_Guides/14_Files/02_Images.md index e2c09e7ec..4c5fa88b1 100644 --- a/docs/en/02_Developer_Guides/14_Files/02_Images.md +++ b/docs/en/02_Developer_Guides/14_Files/02_Images.md @@ -180,9 +180,9 @@ You can turn this on with the below config: Name: resamplefiles --- SilverStripe\Assets\File: - force_resample: false + force_resample: true SilverStripe\Assets\Storage\DBFile: - force_resample: false + force_resample: true ``` #### Resampled image quality From 1ac36611a6cfac8ed08e183068fc89fc5ec34f44 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sun, 2 Dec 2018 23:04:34 +0000 Subject: [PATCH 113/175] Update tests to pass in CWP kitchen sink context --- .../php/Forms/ConfirmedPasswordFieldTest.php | 4 +++- .../php/Security/MemberAuthenticatorTest.php | 5 +++++ .../php/Security/MemberCsvBulkLoaderTest.php | 10 ++++++++++ tests/php/Security/MemberTest.php | 4 +++- tests/php/Security/PasswordValidatorTest.php | 4 ++-- tests/php/Security/SecurityTest.php | 20 +++++++++++++------ 6 files changed, 37 insertions(+), 10 deletions(-) diff --git a/tests/php/Forms/ConfirmedPasswordFieldTest.php b/tests/php/Forms/ConfirmedPasswordFieldTest.php index 0df22d4a8..55389ce1d 100644 --- a/tests/php/Forms/ConfirmedPasswordFieldTest.php +++ b/tests/php/Forms/ConfirmedPasswordFieldTest.php @@ -19,7 +19,9 @@ class ConfirmedPasswordFieldTest extends SapphireTest { parent::setUp(); - PasswordValidator::singleton()->setMinLength(0); + PasswordValidator::singleton() + ->setMinLength(0) + ->setTestNames([]); } public function testSetValue() diff --git a/tests/php/Security/MemberAuthenticatorTest.php b/tests/php/Security/MemberAuthenticatorTest.php index 4314cf558..b8758140c 100644 --- a/tests/php/Security/MemberAuthenticatorTest.php +++ b/tests/php/Security/MemberAuthenticatorTest.php @@ -18,6 +18,7 @@ use SilverStripe\Security\MemberAuthenticator\CMSMemberAuthenticator; use SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm; use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator; use SilverStripe\Security\MemberAuthenticator\MemberLoginForm; +use SilverStripe\Security\PasswordValidator; use SilverStripe\Security\Security; /** @@ -44,6 +45,10 @@ class MemberAuthenticatorTest extends SapphireTest $this->defaultPassword = null; } DefaultAdminService::setDefaultAdmin('admin', 'password'); + + PasswordValidator::singleton() + ->setMinLength(0) + ->setTestNames([]); } protected function tearDown() diff --git a/tests/php/Security/MemberCsvBulkLoaderTest.php b/tests/php/Security/MemberCsvBulkLoaderTest.php index 03c50c9a3..75f62c732 100644 --- a/tests/php/Security/MemberCsvBulkLoaderTest.php +++ b/tests/php/Security/MemberCsvBulkLoaderTest.php @@ -6,6 +6,7 @@ use SilverStripe\ORM\DataObject; use SilverStripe\Security\Group; use SilverStripe\Security\MemberCsvBulkLoader; use SilverStripe\Security\Member; +use SilverStripe\Security\PasswordValidator; use SilverStripe\Security\Security; use SilverStripe\Dev\SapphireTest; @@ -13,6 +14,15 @@ class MemberCsvBulkLoaderTest extends SapphireTest { protected static $fixture_file = 'MemberCsvBulkLoaderTest.yml'; + protected function setUp() + { + parent::setUp(); + + PasswordValidator::singleton() + ->setMinLength(0) + ->setTestNames([]); + } + public function testNewImport() { $loader = new MemberCsvBulkLoader(); diff --git a/tests/php/Security/MemberTest.php b/tests/php/Security/MemberTest.php index 6817246f8..9cd7e67b1 100644 --- a/tests/php/Security/MemberTest.php +++ b/tests/php/Security/MemberTest.php @@ -57,7 +57,9 @@ class MemberTest extends FunctionalTest Member::config()->set('unique_identifier_field', 'Email'); - PasswordValidator::singleton()->setMinLength(0); + PasswordValidator::singleton() + ->setMinLength(0) + ->setTestNames([]); i18n::set_locale('en_US'); } diff --git a/tests/php/Security/PasswordValidatorTest.php b/tests/php/Security/PasswordValidatorTest.php index 7fa5637ab..071e50760 100644 --- a/tests/php/Security/PasswordValidatorTest.php +++ b/tests/php/Security/PasswordValidatorTest.php @@ -18,10 +18,10 @@ class PasswordValidatorTest extends SapphireTest { parent::setUp(); - // Unset framework default values PasswordValidator::config() ->remove('min_length') - ->remove('historic_count'); + ->remove('historic_count') + ->set('min_test_score', 0); } public function testValidate() diff --git a/tests/php/Security/SecurityTest.php b/tests/php/Security/SecurityTest.php index 9ac158758..b75be724c 100644 --- a/tests/php/Security/SecurityTest.php +++ b/tests/php/Security/SecurityTest.php @@ -21,6 +21,7 @@ use SilverStripe\ORM\ValidationResult; use SilverStripe\Security\LoginAttempt; use SilverStripe\Security\Member; use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator; +use SilverStripe\Security\PasswordValidator; use SilverStripe\Security\Security; use SilverStripe\Security\SecurityToken; @@ -51,6 +52,13 @@ class SecurityTest extends FunctionalTest */ Member::config()->set('unique_identifier_field', 'Email'); + PasswordValidator::config() + ->remove('min_length') + ->remove('historic_count') + ->remove('min_test_score'); + + Member::set_password_validator(null); + parent::setUp(); Director::config()->set('alternate_base_url', '/'); @@ -388,7 +396,7 @@ class SecurityTest extends FunctionalTest // Test external redirection on ChangePasswordForm $this->get('Security/changepassword?BackURL=http://myspoofedhost.com'); - $changedResponse = $this->doTestChangepasswordForm('1nitialPassword', 'changedPassword'); + $changedResponse = $this->doTestChangepasswordForm('1nitialPassword', 'changedPassword#123'); $this->assertNotRegExp( '/^' . preg_quote('http://myspoofedhost.com', '/') . '/', (string)$changedResponse->getHeader('Location'), @@ -435,7 +443,7 @@ class SecurityTest extends FunctionalTest // Make sure it redirects correctly after the password has been changed $this->mainSession->followRedirection(); - $changedResponse = $this->doTestChangepasswordForm('1nitialPassword', 'changedPassword'); + $changedResponse = $this->doTestChangepasswordForm('1nitialPassword', 'changedPassword#123'); $this->assertEquals(302, $changedResponse->getStatusCode()); $this->assertEquals( Controller::join_links(Director::absoluteBaseURL(), 'test/link'), @@ -449,7 +457,7 @@ class SecurityTest extends FunctionalTest // Change the password $this->get('Security/changepassword?BackURL=test/back'); - $changedResponse = $this->doTestChangepasswordForm('1nitialPassword', 'changedPassword'); + $changedResponse = $this->doTestChangepasswordForm('1nitialPassword', 'changedPassword#123'); $this->assertEquals(302, $changedResponse->getStatusCode()); $this->assertEquals( Controller::join_links(Director::absoluteBaseURL(), 'test/back'), @@ -459,7 +467,7 @@ class SecurityTest extends FunctionalTest // Check if we can login with the new password $this->logOut(); - $goodResponse = $this->doTestLoginForm('testuser@example.com', 'changedPassword'); + $goodResponse = $this->doTestLoginForm('testuser@example.com', 'changedPassword#123'); $this->assertEquals(302, $goodResponse->getStatusCode()); $this->assertEquals( Controller::join_links(Director::absoluteBaseURL(), 'test/link'), @@ -501,12 +509,12 @@ class SecurityTest extends FunctionalTest // Follow redirection to form without hash in GET parameter $this->get('Security/changepassword'); - $this->doTestChangepasswordForm('1nitialPassword', 'changedPassword'); + $this->doTestChangepasswordForm('1nitialPassword', 'changedPassword#123'); $this->assertEquals($this->idFromFixture(Member::class, 'test'), $this->session()->get('loggedInAs')); // Check if we can login with the new password $this->logOut(); - $goodResponse = $this->doTestLoginForm('testuser@example.com', 'changedPassword'); + $goodResponse = $this->doTestLoginForm('testuser@example.com', 'changedPassword#123'); $this->assertEquals(302, $goodResponse->getStatusCode()); $this->assertEquals($this->idFromFixture(Member::class, 'test'), $this->session()->get('loggedInAs')); From 466e7cf1423c44213b5e7055e82cd9b83c1e4e37 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 6 Dec 2018 12:21:08 +0000 Subject: [PATCH 114/175] DOCS Fix FCQN in CsvBulkLoader example code [ci skip] --- docs/en/02_Developer_Guides/11_Integration/00_CSV_Import.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/en/02_Developer_Guides/11_Integration/00_CSV_Import.md b/docs/en/02_Developer_Guides/11_Integration/00_CSV_Import.md index 02476dc0e..774d2dc2b 100644 --- a/docs/en/02_Developer_Guides/11_Integration/00_CSV_Import.md +++ b/docs/en/02_Developer_Guides/11_Integration/00_CSV_Import.md @@ -53,14 +53,15 @@ The simplest way to use [CsvBulkLoader](api:SilverStripe\Dev\CsvBulkLoader) is t ```php use SilverStripe\Admin\ModelAdmin; +use SilverStripe\Dev\CsvBulkLoader; class PlayerAdmin extends ModelAdmin { private static $managed_models = [ - 'Player' + Player::class ]; private static $model_importers = [ - 'Player' => 'CsvBulkLoader', + 'Player' => CsvBulkLoader::class, ]; private static $url_segment = 'players'; } From f7846fc34c4c04bfa3ae57a552345f6a536856c5 Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Mon, 10 Dec 2018 16:49:57 +1300 Subject: [PATCH 115/175] FIX behat CmsUiContext waits for cms-loading-container after step --- tests/behat/src/CmsUiContext.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/behat/src/CmsUiContext.php b/tests/behat/src/CmsUiContext.php index 209835615..6797dc65f 100644 --- a/tests/behat/src/CmsUiContext.php +++ b/tests/behat/src/CmsUiContext.php @@ -58,7 +58,10 @@ class CmsUiContext implements Context $timeoutMs = $this->getMainContext()->getAjaxTimeout(); $this->getSession()->wait( $timeoutMs, - "document.getElementsByClassName('cms-content-loading-overlay').length == 0" + "(". + "document.getElementsByClassName('cms-content-loading-overlay').length +". + "document.getElementsByClassName('cms-loading-container').length". + ") == 0" ); } From 48bd335648188df9dae72be1e5f9c808f3fe1e77 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 7 Nov 2018 12:12:44 +0200 Subject: [PATCH 116/175] [SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection --- src/ORM/DataObjectSchema.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ORM/DataObjectSchema.php b/src/ORM/DataObjectSchema.php index 6ad3cfe34..e2b371995 100644 --- a/src/ORM/DataObjectSchema.php +++ b/src/ORM/DataObjectSchema.php @@ -8,6 +8,7 @@ use LogicException; use SilverStripe\Core\ClassInfo; use SilverStripe\Core\Config\Config; use SilverStripe\Core\Config\Configurable; +use SilverStripe\Core\Convert; use SilverStripe\Core\Injector\Injectable; use SilverStripe\Core\Injector\Injector; use SilverStripe\Dev\TestOnly; @@ -125,7 +126,7 @@ class DataObjectSchema $tables = $this->getTableNames(); $class = ClassInfo::class_name($class); if (isset($tables[$class])) { - return $tables[$class]; + return Convert::raw2sql($tables[$class]); } return null; } From fecedc2d98eeaaff6424fb59dc70ef6bdc6dc92d Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 7 Nov 2018 12:12:44 +0200 Subject: [PATCH 117/175] [SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection --- src/ORM/DataObjectSchema.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ORM/DataObjectSchema.php b/src/ORM/DataObjectSchema.php index 8251c8477..c80925603 100644 --- a/src/ORM/DataObjectSchema.php +++ b/src/ORM/DataObjectSchema.php @@ -8,6 +8,7 @@ use LogicException; use SilverStripe\Core\ClassInfo; use SilverStripe\Core\Config\Config; use SilverStripe\Core\Config\Configurable; +use SilverStripe\Core\Convert; use SilverStripe\Core\Injector\Injectable; use SilverStripe\Core\Injector\Injector; use SilverStripe\Dev\TestOnly; @@ -125,7 +126,7 @@ class DataObjectSchema $tables = $this->getTableNames(); $class = ClassInfo::class_name($class); if (isset($tables[$class])) { - return $tables[$class]; + return Convert::raw2sql($tables[$class]); } return null; } From 8bd747d12a06949bda8d7443f2e9de6f4c6c9fef Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 7 Nov 2018 12:12:44 +0200 Subject: [PATCH 118/175] [SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection --- src/ORM/DataObjectSchema.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ORM/DataObjectSchema.php b/src/ORM/DataObjectSchema.php index e14821615..ab694f28e 100644 --- a/src/ORM/DataObjectSchema.php +++ b/src/ORM/DataObjectSchema.php @@ -8,6 +8,7 @@ use LogicException; use SilverStripe\Core\ClassInfo; use SilverStripe\Core\Config\Config; use SilverStripe\Core\Config\Configurable; +use SilverStripe\Core\Convert; use SilverStripe\Core\Injector\Injectable; use SilverStripe\Core\Injector\Injector; use SilverStripe\Dev\TestOnly; @@ -127,7 +128,7 @@ class DataObjectSchema $tables = $this->getTableNames(); $class = ClassInfo::class_name($class); if (isset($tables[$class])) { - return $tables[$class]; + return Convert::raw2sql($tables[$class]); } return null; } From 74698af402e0d8a4efe90d2db3591fb20b5ecf03 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 7 Nov 2018 12:12:44 +0200 Subject: [PATCH 119/175] [SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection --- src/ORM/DataObjectSchema.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ORM/DataObjectSchema.php b/src/ORM/DataObjectSchema.php index e14821615..ab694f28e 100644 --- a/src/ORM/DataObjectSchema.php +++ b/src/ORM/DataObjectSchema.php @@ -8,6 +8,7 @@ use LogicException; use SilverStripe\Core\ClassInfo; use SilverStripe\Core\Config\Config; use SilverStripe\Core\Config\Configurable; +use SilverStripe\Core\Convert; use SilverStripe\Core\Injector\Injectable; use SilverStripe\Core\Injector\Injector; use SilverStripe\Dev\TestOnly; @@ -127,7 +128,7 @@ class DataObjectSchema $tables = $this->getTableNames(); $class = ClassInfo::class_name($class); if (isset($tables[$class])) { - return $tables[$class]; + return Convert::raw2sql($tables[$class]); } return null; } From fed9afb04667cd4b12d40fd43349164cb5f3a342 Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Wed, 12 Dec 2018 12:21:17 +1300 Subject: [PATCH 120/175] Update translations --- lang/da.yml | 15 +++++++++++++++ lang/de_DE.yml | 6 ------ lang/eo.yml | 15 +++++++++++++++ lang/nl.yml | 15 +++++++++++++++ 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/lang/da.yml b/lang/da.yml index e203c1876..4fc3ade6f 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -84,6 +84,7 @@ da: RelationSearch: Relationssøgning ResetFilter: Nulstil SilverStripe\Forms\GridField\GridFieldDeleteAction: + DELETE_DESCRIPTION: Slet Delete: Slet DeletePermissionsFailure: 'Ingen slette rettigheder' EditPermissionsFailure: 'Ingen rettighed til at fjerne emnet' @@ -95,12 +96,23 @@ da: DeletePermissionsFailure: 'Ingen slette rettigheder' Deleted: 'Slet {type} {name}' Save: Gem + SilverStripe\Forms\GridField\GridFieldEditButton_ss: + EDIT: Rediger SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Kan ikke fjerne dig selv fra denne gruppe, du vil miste administrator rettigheder' SilverStripe\Forms\GridField\GridFieldPaginator: OF: af Page: Side View: Vis + SilverStripe\Forms\GridField\GridFieldVersionedState: + ADDEDTODRAFTHELP: 'Elementet er endnu ikke udgivet' + ADDEDTODRAFTSHORT: Kladde + ARCHIVEDPAGEHELP: 'Elementet er fjernet fra kladde og udgivet version' + ARCHIVEDPAGESHORT: Arkiveret + MODIFIEDONDRAFTHELP: 'Elementet har ikke udgivne ændringer' + MODIFIEDONDRAFTSHORT: Ændret + ONLIVEONLYSHORT: 'Kun på udgivet version' + ONLIVEONLYSHORTHELP: 'Elementet er udgivet, men er slette fra kladde' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Beløb FIELDLABELCURRENCY: Valuta @@ -319,4 +331,7 @@ da: LOGOUT: 'Log ud' LOSTPASSWORDHEADER: 'Glemt kodeord' NOTEPAGESECURED: 'Denne side er beskyttet. Indtast dine loginoplysninger herunder for at få adgang.' + NOTERESETLINKINVALID: '

              Kodeordets nulstillingslink er ugyldigt eller udløbet.

              Du kan anmode om et nyt link her eller skifte dit kodeord efter du er logget ind.

              ' NOTERESETPASSWORD: 'Indtast din email adresse, så sender vi dig et link som du kan nulstille dit kodeord med' + PASSWORDSENTHEADER: 'Link til nulstilling af kodeord er sendt til ''{email}''' + PASSWORDSENTTEXT: 'Tak for det! Et link til at nulstille kodeordet er sendt til ''{email}'', forudsat at en konto eksisterer med denne email adresse.' diff --git a/lang/de_DE.yml b/lang/de_DE.yml index e1bea0c6e..995c45ad0 100644 --- a/lang/de_DE.yml +++ b/lang/de_DE.yml @@ -27,8 +27,6 @@ de_DE: ATLEAST: 'Passwörter müssen mindestens {min} Zeichen lang sein.' BETWEEN: 'Passwörter müssen {min} bis {max} Zeichen lang sein.' SHOWONCLICKTITLE: 'Passwort ändern' - SilverStripe\Forms\DateField: - TODAY: heute SilverStripe\Forms\DropdownField: CHOOSE: (Auswählen) CHOOSE_MODEL: '({name} auswählen)' @@ -45,10 +43,6 @@ de_DE: SilverStripe\Forms\GridField\GridFieldDetailForm: CancelBtn: Abbrechen Save: Speichern - SilverStripe\Forms\GridField\GridFieldEditButton: - EDIT: Bearbeiten - SilverStripe\Forms\GridField\GridFieldFilterHeader: - Search: 'Suche "{name}"' SilverStripe\Forms\GridField\GridFieldPaginator: Page: Seite SilverStripe\Forms\MoneyField: diff --git a/lang/eo.yml b/lang/eo.yml index cc792bab4..206dffc1d 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -84,6 +84,7 @@ eo: RelationSearch: 'Serĉi rilatojn' ResetFilter: Restartigi SilverStripe\Forms\GridField\GridFieldDeleteAction: + DELETE_DESCRIPTION: Forigi Delete: Forigi DeletePermissionsFailure: 'Mankas permeso forigi' EditPermissionsFailure: 'Mankas permeso malligi rikordon' @@ -95,12 +96,23 @@ eo: DeletePermissionsFailure: 'Mankas permeso forigi' Deleted: 'Forigita {type} {name}' Save: Konservi + SilverStripe\Forms\GridField\GridFieldEditButton_ss: + EDIT: Redakti SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Ne povas forigi vin el ĉi tiu grupo; vi perdus administrajn rajtojn' SilverStripe\Forms\GridField\GridFieldPaginator: OF: de Page: Paĝo View: Vido + SilverStripe\Forms\GridField\GridFieldVersionedState: + ADDEDTODRAFTHELP: 'Ero ankoraŭ estas ne publikigita' + ADDEDTODRAFTSHORT: Malneto + ARCHIVEDPAGEHELP: 'Ero estas forigita el malneta kaj publika' + ARCHIVEDPAGESHORT: Enarkivigita + MODIFIEDONDRAFTHELP: 'Ero enhavas nepublikigitajn ŝanĝojn' + MODIFIEDONDRAFTSHORT: Ŝanĝita + ONLIVEONLYSHORT: 'Nur ĉe publika' + ONLIVEONLYSHORTHELP: 'Ero estas publikigita, sed ĝi estas forigita el malneto' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Kvanto FIELDLABELCURRENCY: Kurzo @@ -319,4 +331,7 @@ eo: LOGOUT: Elsaluti LOSTPASSWORDHEADER: 'Perdis pasvorton' NOTEPAGESECURED: 'Tiu paĝo estas sekurigita. Enigu viajn akreditaĵojn sube kaj vi aliros pluen.' + NOTERESETLINKINVALID: '

              La pasvorta reagorda ligilo estas malvalida aŭ finiĝis.

              Vi povas peti novan ĉi tie aŭ ŝanĝi vian pasvorton post vi ensalutis.

              ' NOTERESETPASSWORD: 'Enigu vian retpoŝtan adreson kaj ni sendos al vi ligilon per kiu vi povas reagordi vian pasvorton' + PASSWORDSENTHEADER: 'Pasvorta reagorda ligilo sendiĝis al ''{email}''' + PASSWORDSENTTEXT: 'Dankon! Reagordita ligilo sendiĝis al ''{email}'', kondiĉe ke konto ekzistas por tiu retadreso.' diff --git a/lang/nl.yml b/lang/nl.yml index f4e35af66..eae378c9d 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -84,6 +84,7 @@ nl: RelationSearch: 'Zoek relatie' ResetFilter: Resetten SilverStripe\Forms\GridField\GridFieldDeleteAction: + DELETE_DESCRIPTION: Verwijder Delete: Verwijder DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen' EditPermissionsFailure: 'Geen toelating om te ontkoppelen' @@ -95,12 +96,23 @@ nl: DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen' Deleted: '{type} {name} verwijderd' Save: Opslaan + SilverStripe\Forms\GridField\GridFieldEditButton_ss: + EDIT: Edit SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'U kunt uzelf niet verwijderen van deze groep, omdat u dan geen admin-rechten meer heeft.' SilverStripe\Forms\GridField\GridFieldPaginator: OF: van Page: Pagina View: Bekijk + SilverStripe\Forms\GridField\GridFieldVersionedState: + ADDEDTODRAFTHELP: 'Item is nog niet gepubliceerd' + ADDEDTODRAFTSHORT: Concept + ARCHIVEDPAGEHELP: 'Het item is verwijderd van de concept- en de live site' + ARCHIVEDPAGESHORT: Gearchiveerd + MODIFIEDONDRAFTHELP: 'Item heeft wijzigingen die nog niet gepubliceerd zijn' + MODIFIEDONDRAFTSHORT: Aangepast + ONLIVEONLYSHORT: 'Alleen op de live site' + ONLIVEONLYSHORTHELP: 'Item is gepubliceerd, maar verwijderd van de concept site' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Aantal FIELDLABELCURRENCY: Munteenheid @@ -319,4 +331,7 @@ nl: LOGOUT: Uitloggen LOSTPASSWORDHEADER: 'Wachtwoord vergeten' NOTEPAGESECURED: 'Deze pagina is beveiligd. Voer uw gegevens in en u wordt automatisch doorgestuurd.' + NOTERESETLINKINVALID: '

              De link om uw wachtwoord te kunnen wijzigen is niet meer geldig.

              U kunt een nieuwe link aanvragen of uw wachtwoord aanpassen door in te loggen.

              ' NOTERESETPASSWORD: 'Voer uw e-mailadres in en we sturen een link waarmee u een nieuw wachtwoord kunt instellen.' + PASSWORDSENTHEADER: 'Wachtwoord herstel link verzonden naar {email}' + PASSWORDSENTTEXT: 'Bedankt! Er is een link verstuurd naar {email} om uw wachtwoord opnieuw in te stellen, in de veronderstelling dat er een account bestaat voor dit e-mailadres.' From 90a50649ddd8284e9a7f668f53d4cab8b50d681d Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Wed, 12 Dec 2018 12:34:51 +1300 Subject: [PATCH 121/175] Update translations --- lang/da.yml | 19 ++++++++++++++----- lang/de_DE.yml | 6 ------ lang/en.yml | 9 +++++++++ lang/eo.yml | 19 ++++++++++++++----- lang/fi.yml | 6 ------ lang/it.yml | 6 ------ lang/nl.yml | 22 +++++++++++++++------- lang/sv.yml | 6 ------ 8 files changed, 52 insertions(+), 41 deletions(-) diff --git a/lang/da.yml b/lang/da.yml index 3fe62969a..4fc3ade6f 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -84,6 +84,7 @@ da: RelationSearch: Relationssøgning ResetFilter: Nulstil SilverStripe\Forms\GridField\GridFieldDeleteAction: + DELETE_DESCRIPTION: Slet Delete: Slet DeletePermissionsFailure: 'Ingen slette rettigheder' EditPermissionsFailure: 'Ingen rettighed til at fjerne emnet' @@ -95,7 +96,7 @@ da: DeletePermissionsFailure: 'Ingen slette rettigheder' Deleted: 'Slet {type} {name}' Save: Gem - SilverStripe\Forms\GridField\GridFieldEditButton: + SilverStripe\Forms\GridField\GridFieldEditButton_ss: EDIT: Rediger SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Kan ikke fjerne dig selv fra denne gruppe, du vil miste administrator rettigheder' @@ -103,6 +104,15 @@ da: OF: af Page: Side View: Vis + SilverStripe\Forms\GridField\GridFieldVersionedState: + ADDEDTODRAFTHELP: 'Elementet er endnu ikke udgivet' + ADDEDTODRAFTSHORT: Kladde + ARCHIVEDPAGEHELP: 'Elementet er fjernet fra kladde og udgivet version' + ARCHIVEDPAGESHORT: Arkiveret + MODIFIEDONDRAFTHELP: 'Elementet har ikke udgivne ændringer' + MODIFIEDONDRAFTSHORT: Ændret + ONLIVEONLYSHORT: 'Kun på udgivet version' + ONLIVEONLYSHORTHELP: 'Elementet er udgivet, men er slette fra kladde' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Beløb FIELDLABELCURRENCY: Valuta @@ -149,8 +159,6 @@ da: other: '{count} år' SilverStripe\ORM\FieldType\DBEnum: ANY: Enhver - SilverStripe\ORM\FieldType\DBForeignKey: - DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'For mange relaterede objekter; fallback felt i brug' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'For mange underelementer ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -323,6 +331,7 @@ da: LOGOUT: 'Log ud' LOSTPASSWORDHEADER: 'Glemt kodeord' NOTEPAGESECURED: 'Denne side er beskyttet. Indtast dine loginoplysninger herunder for at få adgang.' + NOTERESETLINKINVALID: '

              Kodeordets nulstillingslink er ugyldigt eller udløbet.

              Du kan anmode om et nyt link her eller skifte dit kodeord efter du er logget ind.

              ' NOTERESETPASSWORD: 'Indtast din email adresse, så sender vi dig et link som du kan nulstille dit kodeord med' - PASSWORDRESETSENTHEADER: 'link til at nulstille kodeord afsendt' - PASSWORDRESETSENTTEXT: 'Tak for det. Et link til at nulstille dit kodeord er afsendt, hvis der findes en bruger med denne email adresse.' + PASSWORDSENTHEADER: 'Link til nulstilling af kodeord er sendt til ''{email}''' + PASSWORDSENTTEXT: 'Tak for det! Et link til at nulstille kodeordet er sendt til ''{email}'', forudsat at en konto eksisterer med denne email adresse.' diff --git a/lang/de_DE.yml b/lang/de_DE.yml index e1bea0c6e..995c45ad0 100644 --- a/lang/de_DE.yml +++ b/lang/de_DE.yml @@ -27,8 +27,6 @@ de_DE: ATLEAST: 'Passwörter müssen mindestens {min} Zeichen lang sein.' BETWEEN: 'Passwörter müssen {min} bis {max} Zeichen lang sein.' SHOWONCLICKTITLE: 'Passwort ändern' - SilverStripe\Forms\DateField: - TODAY: heute SilverStripe\Forms\DropdownField: CHOOSE: (Auswählen) CHOOSE_MODEL: '({name} auswählen)' @@ -45,10 +43,6 @@ de_DE: SilverStripe\Forms\GridField\GridFieldDetailForm: CancelBtn: Abbrechen Save: Speichern - SilverStripe\Forms\GridField\GridFieldEditButton: - EDIT: Bearbeiten - SilverStripe\Forms\GridField\GridFieldFilterHeader: - Search: 'Suche "{name}"' SilverStripe\Forms\GridField\GridFieldPaginator: Page: Seite SilverStripe\Forms\MoneyField: diff --git a/lang/en.yml b/lang/en.yml index 37da731e4..2a6fa6c18 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -104,6 +104,15 @@ en: OF: of Page: Page View: View + SilverStripe\Forms\GridField\GridFieldVersionedState: + ADDEDTODRAFTHELP: 'Item has not been published yet' + ADDEDTODRAFTSHORT: Draft + ARCHIVEDPAGEHELP: 'Item is removed from draft and live' + ARCHIVEDPAGESHORT: Archived + MODIFIEDONDRAFTHELP: 'Item has unpublished changes' + MODIFIEDONDRAFTSHORT: Modified + ONLIVEONLYSHORT: 'On live only' + ONLIVEONLYSHORTHELP: 'Item is published, but has been deleted from draft' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Amount FIELDLABELCURRENCY: Currency diff --git a/lang/eo.yml b/lang/eo.yml index fb6b74ca9..206dffc1d 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -84,6 +84,7 @@ eo: RelationSearch: 'Serĉi rilatojn' ResetFilter: Restartigi SilverStripe\Forms\GridField\GridFieldDeleteAction: + DELETE_DESCRIPTION: Forigi Delete: Forigi DeletePermissionsFailure: 'Mankas permeso forigi' EditPermissionsFailure: 'Mankas permeso malligi rikordon' @@ -95,7 +96,7 @@ eo: DeletePermissionsFailure: 'Mankas permeso forigi' Deleted: 'Forigita {type} {name}' Save: Konservi - SilverStripe\Forms\GridField\GridFieldEditButton: + SilverStripe\Forms\GridField\GridFieldEditButton_ss: EDIT: Redakti SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Ne povas forigi vin el ĉi tiu grupo; vi perdus administrajn rajtojn' @@ -103,6 +104,15 @@ eo: OF: de Page: Paĝo View: Vido + SilverStripe\Forms\GridField\GridFieldVersionedState: + ADDEDTODRAFTHELP: 'Ero ankoraŭ estas ne publikigita' + ADDEDTODRAFTSHORT: Malneto + ARCHIVEDPAGEHELP: 'Ero estas forigita el malneta kaj publika' + ARCHIVEDPAGESHORT: Enarkivigita + MODIFIEDONDRAFTHELP: 'Ero enhavas nepublikigitajn ŝanĝojn' + MODIFIEDONDRAFTSHORT: Ŝanĝita + ONLIVEONLYSHORT: 'Nur ĉe publika' + ONLIVEONLYSHORTHELP: 'Ero estas publikigita, sed ĝi estas forigita el malneto' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Kvanto FIELDLABELCURRENCY: Kurzo @@ -149,8 +159,6 @@ eo: other: '{count} jaroj' SilverStripe\ORM\FieldType\DBEnum: ANY: Ajna - SilverStripe\ORM\FieldType\DBForeignKey: - DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Tro multaj objektoj; retropaŝa kampo uzata' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Tro da idoj ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -323,6 +331,7 @@ eo: LOGOUT: Elsaluti LOSTPASSWORDHEADER: 'Perdis pasvorton' NOTEPAGESECURED: 'Tiu paĝo estas sekurigita. Enigu viajn akreditaĵojn sube kaj vi aliros pluen.' + NOTERESETLINKINVALID: '

              La pasvorta reagorda ligilo estas malvalida aŭ finiĝis.

              Vi povas peti novan ĉi tie aŭ ŝanĝi vian pasvorton post vi ensalutis.

              ' NOTERESETPASSWORD: 'Enigu vian retpoŝtan adreson kaj ni sendos al vi ligilon per kiu vi povas reagordi vian pasvorton' - PASSWORDRESETSENTHEADER: 'Pasvorta reagorda ligilo sendiĝis' - PASSWORDRESETSENTTEXT: 'Dankon. Reagorda ligilo sendiĝis, kondiĉe ke konto ekzistas por ĉi tiu retadreso.' + PASSWORDSENTHEADER: 'Pasvorta reagorda ligilo sendiĝis al ''{email}''' + PASSWORDSENTTEXT: 'Dankon! Reagordita ligilo sendiĝis al ''{email}'', kondiĉe ke konto ekzistas por tiu retadreso.' diff --git a/lang/fi.yml b/lang/fi.yml index 956e69a83..01899f2af 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -95,8 +95,6 @@ fi: DeletePermissionsFailure: 'Ei oikeuksia poistamiseen' Deleted: 'Poistettiin {type} {name}' Save: Tallenna - SilverStripe\Forms\GridField\GridFieldEditButton: - EDIT: Muokkaa SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Et voi siirtää itseäsi pois tästä ryhmästä: menettäisit pääkäyttäjän oikeudet' SilverStripe\Forms\GridField\GridFieldPaginator: @@ -149,8 +147,6 @@ fi: other: '{count} vuotta' SilverStripe\ORM\FieldType\DBEnum: ANY: Yhtään - SilverStripe\ORM\FieldType\DBForeignKey: - DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Liian monta samaan liittyvää objektia: oletuskenttä käytössä' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Liian monta lapsiobjektia ({count}}' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -324,5 +320,3 @@ fi: LOSTPASSWORDHEADER: 'Unohtunut salasana' NOTEPAGESECURED: 'Tämä sivu on suojattu. Syötä tunnistetietosi alle niin pääset eteenpäin.' NOTERESETPASSWORD: 'Syötä sähköpostiosoitteesi ja lähetämme sinulle linkin, jonka avulla saat palautettua salasanasi' - PASSWORDRESETSENTHEADER: 'Salasanan palautuslinkki lähetetty' - PASSWORDRESETSENTTEXT: 'Kiitos, palautuslinkki on lähetetty käyttäjätilille asetettuun sähköpostiosoitteeseen.' diff --git a/lang/it.yml b/lang/it.yml index 4089faf9b..adbdeb0fd 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -95,8 +95,6 @@ it: DeletePermissionsFailure: 'Non hai i permessi per eliminare' Deleted: 'Eliminato {type} {name}' Save: Salva - SilverStripe\Forms\GridField\GridFieldEditButton: - EDIT: Modifica SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Non è possibile rimuovere te stesso da questo gruppo, perderesti i diritti di admin' SilverStripe\Forms\GridField\GridFieldPaginator: @@ -149,8 +147,6 @@ it: other: '{count} anni' SilverStripe\ORM\FieldType\DBEnum: ANY: Qualsiasi - SilverStripe\ORM\FieldType\DBForeignKey: - DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Troppi oggetti correlati; campo di fallback in uso' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Troppi figli ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -324,5 +320,3 @@ it: LOSTPASSWORDHEADER: 'Password smarrita' NOTEPAGESECURED: 'La pagina è protetta. Inserisci le credenziali qui sotto per poter andare avanti.' NOTERESETPASSWORD: 'Inserisci il tuo indirizzo e-mail e ti verrà inviato un link per poter azzerare la tua password.' - PASSWORDRESETSENTHEADER: 'Link di azzeramento password inviato' - PASSWORDRESETSENTTEXT: 'Grazie! Un link di azzeramento è stato inviato, supponendo un account esista a quell''indirizzo e-mail.' diff --git a/lang/nl.yml b/lang/nl.yml index 242eccc45..eae378c9d 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -84,6 +84,7 @@ nl: RelationSearch: 'Zoek relatie' ResetFilter: Resetten SilverStripe\Forms\GridField\GridFieldDeleteAction: + DELETE_DESCRIPTION: Verwijder Delete: Verwijder DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen' EditPermissionsFailure: 'Geen toelating om te ontkoppelen' @@ -95,14 +96,23 @@ nl: DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen' Deleted: '{type} {name} verwijderd' Save: Opslaan - SilverStripe\Forms\GridField\GridFieldEditButton: - EDIT: Bewerken + SilverStripe\Forms\GridField\GridFieldEditButton_ss: + EDIT: Edit SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'U kunt uzelf niet verwijderen van deze groep, omdat u dan geen admin-rechten meer heeft.' SilverStripe\Forms\GridField\GridFieldPaginator: OF: van Page: Pagina View: Bekijk + SilverStripe\Forms\GridField\GridFieldVersionedState: + ADDEDTODRAFTHELP: 'Item is nog niet gepubliceerd' + ADDEDTODRAFTSHORT: Concept + ARCHIVEDPAGEHELP: 'Het item is verwijderd van de concept- en de live site' + ARCHIVEDPAGESHORT: Gearchiveerd + MODIFIEDONDRAFTHELP: 'Item heeft wijzigingen die nog niet gepubliceerd zijn' + MODIFIEDONDRAFTSHORT: Aangepast + ONLIVEONLYSHORT: 'Alleen op de live site' + ONLIVEONLYSHORTHELP: 'Item is gepubliceerd, maar verwijderd van de concept site' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Aantal FIELDLABELCURRENCY: Munteenheid @@ -149,8 +159,6 @@ nl: other: '{count} jaren' SilverStripe\ORM\FieldType\DBEnum: ANY: Elke - SilverStripe\ORM\FieldType\DBForeignKey: - DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Teveel keuzes in de lijst; een alternatief veld wordt getoond.' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Teveel onderliggende items ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -323,7 +331,7 @@ nl: LOGOUT: Uitloggen LOSTPASSWORDHEADER: 'Wachtwoord vergeten' NOTEPAGESECURED: 'Deze pagina is beveiligd. Voer uw gegevens in en u wordt automatisch doorgestuurd.' - NOTERESETLINKINVALID: '

              De reset link is ongeldig of komen te vervallen.

              Je kan hier een nieuwe link aanvragen of het wachtwoord veranderen nadat je bent ingelogd.

              ' + NOTERESETLINKINVALID: '

              De link om uw wachtwoord te kunnen wijzigen is niet meer geldig.

              U kunt een nieuwe link aanvragen of uw wachtwoord aanpassen door in te loggen.

              ' NOTERESETPASSWORD: 'Voer uw e-mailadres in en we sturen een link waarmee u een nieuw wachtwoord kunt instellen.' - PASSWORDRESETSENTHEADER: 'link om uw wachtwoord opnieuw aan te maken' - PASSWORDRESETSENTTEXT: 'Bedankt! Er is een link verstuurd om uw wachtwoord opnieuw in te stellen (mits het mailadres reeds bekend is bij ons).' + PASSWORDSENTHEADER: 'Wachtwoord herstel link verzonden naar {email}' + PASSWORDSENTTEXT: 'Bedankt! Er is een link verstuurd naar {email} om uw wachtwoord opnieuw in te stellen, in de veronderstelling dat er een account bestaat voor dit e-mailadres.' diff --git a/lang/sv.yml b/lang/sv.yml index f2a18d659..88a3b3959 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -93,8 +93,6 @@ sv: DeletePermissionsFailure: 'Rättighet för att radera saknas' Deleted: 'Raderade {type} {name}' Save: Spara - SilverStripe\Forms\GridField\GridFieldEditButton: - EDIT: Ändra SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Du kan inte radera dig själv från den här gruppen, då du då kommer att förlora dina admin-rättigheter' SilverStripe\Forms\GridField\GridFieldPaginator: @@ -147,8 +145,6 @@ sv: other: '{count} år' SilverStripe\ORM\FieldType\DBEnum: ANY: 'Vilken som helst' - SilverStripe\ORM\FieldType\DBForeignKey: - DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'För många relaterade objekt; använder fallback-fält' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'För många barn ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -303,5 +299,3 @@ sv: LOSTPASSWORDHEADER: 'Bortglömt lösenord' NOTEPAGESECURED: 'Den här sidan är låst. Fyll i dina uppgifter nedan så skickar vi dig vidare.' NOTERESETPASSWORD: 'Ange din e-postadress så skickar vi en länk med vilken du kan återställa ditt lösenord' - PASSWORDRESETSENTHEADER: 'Återställningslänk för lösenord skickad' - PASSWORDRESETSENTTEXT: 'Tack. En återställningslänk har skickats, förutsatt att ett konto med denna adress existerar.' From 9939719ae39006632768567a752a05a8d50333c4 Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Wed, 12 Dec 2018 12:50:47 +1300 Subject: [PATCH 122/175] Update translations --- lang/da.yml | 19 ++++++++++++++----- lang/de_DE.yml | 6 ------ lang/en.yml | 20 ++++++++++++++------ lang/eo.yml | 19 ++++++++++++++----- lang/fi.yml | 12 ------------ lang/it.yml | 6 ------ lang/nl.yml | 28 +++++++++++++++------------- lang/sv.yml | 6 ------ 8 files changed, 57 insertions(+), 59 deletions(-) diff --git a/lang/da.yml b/lang/da.yml index 3fe62969a..4fc3ade6f 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -84,6 +84,7 @@ da: RelationSearch: Relationssøgning ResetFilter: Nulstil SilverStripe\Forms\GridField\GridFieldDeleteAction: + DELETE_DESCRIPTION: Slet Delete: Slet DeletePermissionsFailure: 'Ingen slette rettigheder' EditPermissionsFailure: 'Ingen rettighed til at fjerne emnet' @@ -95,7 +96,7 @@ da: DeletePermissionsFailure: 'Ingen slette rettigheder' Deleted: 'Slet {type} {name}' Save: Gem - SilverStripe\Forms\GridField\GridFieldEditButton: + SilverStripe\Forms\GridField\GridFieldEditButton_ss: EDIT: Rediger SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Kan ikke fjerne dig selv fra denne gruppe, du vil miste administrator rettigheder' @@ -103,6 +104,15 @@ da: OF: af Page: Side View: Vis + SilverStripe\Forms\GridField\GridFieldVersionedState: + ADDEDTODRAFTHELP: 'Elementet er endnu ikke udgivet' + ADDEDTODRAFTSHORT: Kladde + ARCHIVEDPAGEHELP: 'Elementet er fjernet fra kladde og udgivet version' + ARCHIVEDPAGESHORT: Arkiveret + MODIFIEDONDRAFTHELP: 'Elementet har ikke udgivne ændringer' + MODIFIEDONDRAFTSHORT: Ændret + ONLIVEONLYSHORT: 'Kun på udgivet version' + ONLIVEONLYSHORTHELP: 'Elementet er udgivet, men er slette fra kladde' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Beløb FIELDLABELCURRENCY: Valuta @@ -149,8 +159,6 @@ da: other: '{count} år' SilverStripe\ORM\FieldType\DBEnum: ANY: Enhver - SilverStripe\ORM\FieldType\DBForeignKey: - DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'For mange relaterede objekter; fallback felt i brug' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'For mange underelementer ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -323,6 +331,7 @@ da: LOGOUT: 'Log ud' LOSTPASSWORDHEADER: 'Glemt kodeord' NOTEPAGESECURED: 'Denne side er beskyttet. Indtast dine loginoplysninger herunder for at få adgang.' + NOTERESETLINKINVALID: '

              Kodeordets nulstillingslink er ugyldigt eller udløbet.

              Du kan anmode om et nyt link her eller skifte dit kodeord efter du er logget ind.

              ' NOTERESETPASSWORD: 'Indtast din email adresse, så sender vi dig et link som du kan nulstille dit kodeord med' - PASSWORDRESETSENTHEADER: 'link til at nulstille kodeord afsendt' - PASSWORDRESETSENTTEXT: 'Tak for det. Et link til at nulstille dit kodeord er afsendt, hvis der findes en bruger med denne email adresse.' + PASSWORDSENTHEADER: 'Link til nulstilling af kodeord er sendt til ''{email}''' + PASSWORDSENTTEXT: 'Tak for det! Et link til at nulstille kodeordet er sendt til ''{email}'', forudsat at en konto eksisterer med denne email adresse.' diff --git a/lang/de_DE.yml b/lang/de_DE.yml index e1bea0c6e..995c45ad0 100644 --- a/lang/de_DE.yml +++ b/lang/de_DE.yml @@ -27,8 +27,6 @@ de_DE: ATLEAST: 'Passwörter müssen mindestens {min} Zeichen lang sein.' BETWEEN: 'Passwörter müssen {min} bis {max} Zeichen lang sein.' SHOWONCLICKTITLE: 'Passwort ändern' - SilverStripe\Forms\DateField: - TODAY: heute SilverStripe\Forms\DropdownField: CHOOSE: (Auswählen) CHOOSE_MODEL: '({name} auswählen)' @@ -45,10 +43,6 @@ de_DE: SilverStripe\Forms\GridField\GridFieldDetailForm: CancelBtn: Abbrechen Save: Speichern - SilverStripe\Forms\GridField\GridFieldEditButton: - EDIT: Bearbeiten - SilverStripe\Forms\GridField\GridFieldFilterHeader: - Search: 'Suche "{name}"' SilverStripe\Forms\GridField\GridFieldPaginator: Page: Seite SilverStripe\Forms\MoneyField: diff --git a/lang/en.yml b/lang/en.yml index 18c2f4fe1..2a6fa6c18 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -84,6 +84,7 @@ en: RelationSearch: 'Relation search' ResetFilter: Reset SilverStripe\Forms\GridField\GridFieldDeleteAction: + DELETE_DESCRIPTION: Delete Delete: Delete DeletePermissionsFailure: 'No delete permissions' EditPermissionsFailure: 'No permission to unlink record' @@ -95,7 +96,7 @@ en: DeletePermissionsFailure: 'No delete permissions' Deleted: 'Deleted {type} {name}' Save: Save - SilverStripe\Forms\GridField\GridFieldEditButton: + SilverStripe\Forms\GridField\GridFieldEditButton_ss: EDIT: Edit SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Cannot remove yourself from this group, you will lose admin rights' @@ -103,6 +104,15 @@ en: OF: of Page: Page View: View + SilverStripe\Forms\GridField\GridFieldVersionedState: + ADDEDTODRAFTHELP: 'Item has not been published yet' + ADDEDTODRAFTSHORT: Draft + ARCHIVEDPAGEHELP: 'Item is removed from draft and live' + ARCHIVEDPAGESHORT: Archived + MODIFIEDONDRAFTHELP: 'Item has unpublished changes' + MODIFIEDONDRAFTSHORT: Modified + ONLIVEONLYSHORT: 'On live only' + ONLIVEONLYSHORTHELP: 'Item is published, but has been deleted from draft' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Amount FIELDLABELCURRENCY: Currency @@ -149,8 +159,6 @@ en: other: '{count} years' SilverStripe\ORM\FieldType\DBEnum: ANY: Any - SilverStripe\ORM\FieldType\DBForeignKey: - DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Too many related objects; fallback field in use' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Too many children ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -323,7 +331,7 @@ en: LOGOUT: 'Log out' LOSTPASSWORDHEADER: 'Lost Password' NOTEPAGESECURED: 'That page is secured. Enter your credentials below and we will send you right along.' - NOTERESETLINKINVALID: '

              The password reset link is invalid or expired.

              You can request a new one here or change your password after you log in.

              ' + NOTERESETLINKINVALID: '

              The password reset link is invalid or expired.

              You can request a new one here or change your password after you logged in.

              ' NOTERESETPASSWORD: 'Enter your e-mail address and we will send you a link with which you can reset your password' - PASSWORDRESETSENTHEADER: 'Password reset link sent' - PASSWORDRESETSENTTEXT: 'Thank you. A reset link has been sent, provided an account exists for this email address.' + PASSWORDSENTHEADER: 'Password reset link sent to ''{email}''' + PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.' diff --git a/lang/eo.yml b/lang/eo.yml index fb6b74ca9..206dffc1d 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -84,6 +84,7 @@ eo: RelationSearch: 'Serĉi rilatojn' ResetFilter: Restartigi SilverStripe\Forms\GridField\GridFieldDeleteAction: + DELETE_DESCRIPTION: Forigi Delete: Forigi DeletePermissionsFailure: 'Mankas permeso forigi' EditPermissionsFailure: 'Mankas permeso malligi rikordon' @@ -95,7 +96,7 @@ eo: DeletePermissionsFailure: 'Mankas permeso forigi' Deleted: 'Forigita {type} {name}' Save: Konservi - SilverStripe\Forms\GridField\GridFieldEditButton: + SilverStripe\Forms\GridField\GridFieldEditButton_ss: EDIT: Redakti SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Ne povas forigi vin el ĉi tiu grupo; vi perdus administrajn rajtojn' @@ -103,6 +104,15 @@ eo: OF: de Page: Paĝo View: Vido + SilverStripe\Forms\GridField\GridFieldVersionedState: + ADDEDTODRAFTHELP: 'Ero ankoraŭ estas ne publikigita' + ADDEDTODRAFTSHORT: Malneto + ARCHIVEDPAGEHELP: 'Ero estas forigita el malneta kaj publika' + ARCHIVEDPAGESHORT: Enarkivigita + MODIFIEDONDRAFTHELP: 'Ero enhavas nepublikigitajn ŝanĝojn' + MODIFIEDONDRAFTSHORT: Ŝanĝita + ONLIVEONLYSHORT: 'Nur ĉe publika' + ONLIVEONLYSHORTHELP: 'Ero estas publikigita, sed ĝi estas forigita el malneto' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Kvanto FIELDLABELCURRENCY: Kurzo @@ -149,8 +159,6 @@ eo: other: '{count} jaroj' SilverStripe\ORM\FieldType\DBEnum: ANY: Ajna - SilverStripe\ORM\FieldType\DBForeignKey: - DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Tro multaj objektoj; retropaŝa kampo uzata' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Tro da idoj ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -323,6 +331,7 @@ eo: LOGOUT: Elsaluti LOSTPASSWORDHEADER: 'Perdis pasvorton' NOTEPAGESECURED: 'Tiu paĝo estas sekurigita. Enigu viajn akreditaĵojn sube kaj vi aliros pluen.' + NOTERESETLINKINVALID: '

              La pasvorta reagorda ligilo estas malvalida aŭ finiĝis.

              Vi povas peti novan ĉi tie aŭ ŝanĝi vian pasvorton post vi ensalutis.

              ' NOTERESETPASSWORD: 'Enigu vian retpoŝtan adreson kaj ni sendos al vi ligilon per kiu vi povas reagordi vian pasvorton' - PASSWORDRESETSENTHEADER: 'Pasvorta reagorda ligilo sendiĝis' - PASSWORDRESETSENTTEXT: 'Dankon. Reagorda ligilo sendiĝis, kondiĉe ke konto ekzistas por ĉi tiu retadreso.' + PASSWORDSENTHEADER: 'Pasvorta reagorda ligilo sendiĝis al ''{email}''' + PASSWORDSENTTEXT: 'Dankon! Reagordita ligilo sendiĝis al ''{email}'', kondiĉe ke konto ekzistas por tiu retadreso.' diff --git a/lang/fi.yml b/lang/fi.yml index 1efe8bbd3..01899f2af 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -76,7 +76,6 @@ fi: LinkExisting: 'Linkitä olemassaoleva' NewRecord: 'Uusi {type}' NoItemsFound: 'Ei kohteita' - OpenFilter: 'Avaa haku ja suodatus' PRINTEDAT: Tulostettu PRINTEDBY: Tulostaja PlaceHolder: 'Etsi {type}' @@ -96,19 +95,12 @@ fi: DeletePermissionsFailure: 'Ei oikeuksia poistamiseen' Deleted: 'Poistettiin {type} {name}' Save: Tallenna - SilverStripe\Forms\GridField\GridFieldEditButton: - EDIT: Muokkaa - SilverStripe\Forms\GridField\GridFieldFilterHeader: - Search: 'Haku "{name}"' - SearchFormFaliure: 'Hakulomaketta ei pystytty luomaan.' SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Et voi siirtää itseäsi pois tästä ryhmästä: menettäisit pääkäyttäjän oikeudet' SilverStripe\Forms\GridField\GridFieldPaginator: OF: / Page: Sivu View: Näytä - SilverStripe\Forms\GridField\GridFieldViewButton: - VIEW: Avaa SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Määrä FIELDLABELCURRENCY: Valuutta @@ -155,8 +147,6 @@ fi: other: '{count} vuotta' SilverStripe\ORM\FieldType\DBEnum: ANY: Yhtään - SilverStripe\ORM\FieldType\DBForeignKey: - DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Liian monta samaan liittyvää objektia: oletuskenttä käytössä' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Liian monta lapsiobjektia ({count}}' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -330,5 +320,3 @@ fi: LOSTPASSWORDHEADER: 'Unohtunut salasana' NOTEPAGESECURED: 'Tämä sivu on suojattu. Syötä tunnistetietosi alle niin pääset eteenpäin.' NOTERESETPASSWORD: 'Syötä sähköpostiosoitteesi ja lähetämme sinulle linkin, jonka avulla saat palautettua salasanasi' - PASSWORDRESETSENTHEADER: 'Salasanan palautuslinkki lähetetty' - PASSWORDRESETSENTTEXT: 'Kiitos, palautuslinkki on lähetetty käyttäjätilille asetettuun sähköpostiosoitteeseen.' diff --git a/lang/it.yml b/lang/it.yml index 4089faf9b..adbdeb0fd 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -95,8 +95,6 @@ it: DeletePermissionsFailure: 'Non hai i permessi per eliminare' Deleted: 'Eliminato {type} {name}' Save: Salva - SilverStripe\Forms\GridField\GridFieldEditButton: - EDIT: Modifica SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Non è possibile rimuovere te stesso da questo gruppo, perderesti i diritti di admin' SilverStripe\Forms\GridField\GridFieldPaginator: @@ -149,8 +147,6 @@ it: other: '{count} anni' SilverStripe\ORM\FieldType\DBEnum: ANY: Qualsiasi - SilverStripe\ORM\FieldType\DBForeignKey: - DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Troppi oggetti correlati; campo di fallback in uso' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Troppi figli ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -324,5 +320,3 @@ it: LOSTPASSWORDHEADER: 'Password smarrita' NOTEPAGESECURED: 'La pagina è protetta. Inserisci le credenziali qui sotto per poter andare avanti.' NOTERESETPASSWORD: 'Inserisci il tuo indirizzo e-mail e ti verrà inviato un link per poter azzerare la tua password.' - PASSWORDRESETSENTHEADER: 'Link di azzeramento password inviato' - PASSWORDRESETSENTTEXT: 'Grazie! Un link di azzeramento è stato inviato, supponendo un account esista a quell''indirizzo e-mail.' diff --git a/lang/nl.yml b/lang/nl.yml index f6de04299..eae378c9d 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -76,7 +76,6 @@ nl: LinkExisting: 'Koppel een bestaand item' NewRecord: 'Nieuw {type}' NoItemsFound: 'Geen items gevonden.' - OpenFilter: 'Zoeken en filteren openen' PRINTEDAT: 'Geprint op' PRINTEDBY: 'Geprint door' PlaceHolder: 'Zoek {type}' @@ -85,6 +84,7 @@ nl: RelationSearch: 'Zoek relatie' ResetFilter: Resetten SilverStripe\Forms\GridField\GridFieldDeleteAction: + DELETE_DESCRIPTION: Verwijder Delete: Verwijder DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen' EditPermissionsFailure: 'Geen toelating om te ontkoppelen' @@ -96,19 +96,23 @@ nl: DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen' Deleted: '{type} {name} verwijderd' Save: Opslaan - SilverStripe\Forms\GridField\GridFieldEditButton: - EDIT: Bewerken - SilverStripe\Forms\GridField\GridFieldFilterHeader: - Search: 'Zoek naar "{name}"' - SearchFormFaliure: 'Er kon geen zoekformulier worden aangemaakt' + SilverStripe\Forms\GridField\GridFieldEditButton_ss: + EDIT: Edit SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'U kunt uzelf niet verwijderen van deze groep, omdat u dan geen admin-rechten meer heeft.' SilverStripe\Forms\GridField\GridFieldPaginator: OF: van Page: Pagina View: Bekijk - SilverStripe\Forms\GridField\GridFieldViewButton: - VIEW: Bekijk + SilverStripe\Forms\GridField\GridFieldVersionedState: + ADDEDTODRAFTHELP: 'Item is nog niet gepubliceerd' + ADDEDTODRAFTSHORT: Concept + ARCHIVEDPAGEHELP: 'Het item is verwijderd van de concept- en de live site' + ARCHIVEDPAGESHORT: Gearchiveerd + MODIFIEDONDRAFTHELP: 'Item heeft wijzigingen die nog niet gepubliceerd zijn' + MODIFIEDONDRAFTSHORT: Aangepast + ONLIVEONLYSHORT: 'Alleen op de live site' + ONLIVEONLYSHORTHELP: 'Item is gepubliceerd, maar verwijderd van de concept site' SilverStripe\Forms\MoneyField: FIELDLABELAMOUNT: Aantal FIELDLABELCURRENCY: Munteenheid @@ -155,8 +159,6 @@ nl: other: '{count} jaren' SilverStripe\ORM\FieldType\DBEnum: ANY: Elke - SilverStripe\ORM\FieldType\DBForeignKey: - DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'Teveel keuzes in de lijst; een alternatief veld wordt getoond.' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'Teveel onderliggende items ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -329,7 +331,7 @@ nl: LOGOUT: Uitloggen LOSTPASSWORDHEADER: 'Wachtwoord vergeten' NOTEPAGESECURED: 'Deze pagina is beveiligd. Voer uw gegevens in en u wordt automatisch doorgestuurd.' - NOTERESETLINKINVALID: '

              De reset link is ongeldig of komen te vervallen.

              Je kan hier een nieuwe link aanvragen of het wachtwoord veranderen nadat je bent ingelogd.

              ' + NOTERESETLINKINVALID: '

              De link om uw wachtwoord te kunnen wijzigen is niet meer geldig.

              U kunt een nieuwe link aanvragen of uw wachtwoord aanpassen door in te loggen.

              ' NOTERESETPASSWORD: 'Voer uw e-mailadres in en we sturen een link waarmee u een nieuw wachtwoord kunt instellen.' - PASSWORDRESETSENTHEADER: 'link om uw wachtwoord opnieuw aan te maken' - PASSWORDRESETSENTTEXT: 'Bedankt! Er is een link verstuurd om uw wachtwoord opnieuw in te stellen (mits het mailadres reeds bekend is bij ons).' + PASSWORDSENTHEADER: 'Wachtwoord herstel link verzonden naar {email}' + PASSWORDSENTTEXT: 'Bedankt! Er is een link verstuurd naar {email} om uw wachtwoord opnieuw in te stellen, in de veronderstelling dat er een account bestaat voor dit e-mailadres.' diff --git a/lang/sv.yml b/lang/sv.yml index f2a18d659..88a3b3959 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -93,8 +93,6 @@ sv: DeletePermissionsFailure: 'Rättighet för att radera saknas' Deleted: 'Raderade {type} {name}' Save: Spara - SilverStripe\Forms\GridField\GridFieldEditButton: - EDIT: Ändra SilverStripe\Forms\GridField\GridFieldGroupDeleteAction: UnlinkSelfFailure: 'Du kan inte radera dig själv från den här gruppen, då du då kommer att förlora dina admin-rättigheter' SilverStripe\Forms\GridField\GridFieldPaginator: @@ -147,8 +145,6 @@ sv: other: '{count} år' SilverStripe\ORM\FieldType\DBEnum: ANY: 'Vilken som helst' - SilverStripe\ORM\FieldType\DBForeignKey: - DROPDOWN_THRESHOLD_FALLBACK_MESSAGE: 'För många relaterade objekt; använder fallback-fält' SilverStripe\ORM\Hierarchy: LIMITED_TITLE: 'För många barn ({count})' SilverStripe\ORM\Hierarchy\Hierarchy: @@ -303,5 +299,3 @@ sv: LOSTPASSWORDHEADER: 'Bortglömt lösenord' NOTEPAGESECURED: 'Den här sidan är låst. Fyll i dina uppgifter nedan så skickar vi dig vidare.' NOTERESETPASSWORD: 'Ange din e-postadress så skickar vi en länk med vilken du kan återställa ditt lösenord' - PASSWORDRESETSENTHEADER: 'Återställningslänk för lösenord skickad' - PASSWORDRESETSENTTEXT: 'Tack. En återställningslänk har skickats, förutsatt att ett konto med denna adress existerar.' From 00e996f164d312202ffe1d54a91ff56dc1bec9a9 Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Wed, 12 Dec 2018 13:47:17 +1300 Subject: [PATCH 123/175] Add changelog --- docs/en/04_Changelogs/4.0.6.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 docs/en/04_Changelogs/4.0.6.md diff --git a/docs/en/04_Changelogs/4.0.6.md b/docs/en/04_Changelogs/4.0.6.md new file mode 100644 index 000000000..b2e22e263 --- /dev/null +++ b/docs/en/04_Changelogs/4.0.6.md @@ -0,0 +1,19 @@ +# 4.0.6 + + + +## Change Log + +### Security + + * 2018-12-10 [0e841aa](https://github.com/silverstripe/silverstripe-graphql/commit/0e841aabb7372d9fa78108e4819e151608ddec0f) Apply CSRF middlware API + * 2018-11-07 [48bd33564](https://github.com/silverstripe/silverstripe-framework/commit/48bd335648188df9dae72be1e5f9c808f3fe1e77) Ensure that table names are escaped to prevent possible SQL injection (Robbie Averill) - See [ss-2018-020](https://www.silverstripe.org/download/security-releases/ss-2018-020) + +### Bugfixes + + * 2018-11-29 [59221e8](https://github.com/silverstripe/silverstripe-assets/commit/59221e8d74ac5e07b86a741e2709e0676130f7b4) Cache key cannot contain : chars, will happen when viewing from archive (Robbie Averill) + * 2018-11-21 [9ce6d91b7](https://github.com/silverstripe/silverstripe-framework/commit/9ce6d91b76e525a6fc81e02023e9e53cdf82e047) / TreeMultiselectField::objectForKey handles list of IDs correctly (Serge Latyntcev) + * 2018-11-16 [35c3a8c6](https://github.com/silverstripe/silverstripe-cms/commit/35c3a8c68db2660838dcd2ae5abd2bd1c3214af4) 'Search' text in default search form should be a placeholder (Robbie Averill) + * 2018-11-15 [b5bae137b](https://github.com/silverstripe/silverstripe-framework/commit/b5bae137bd341eeda3f4886f45fc8f8d657a9c4c) Redirect loop with multiple confirmation tokens present (fixes #8607) (Loz Calver) + * 2018-11-12 [15aaf9db9](https://github.com/silverstripe/silverstripe-framework/commit/15aaf9db9fe1679cf8b01b74fce3eee841278495) Fix a code style typo (Serge Latyntcev) + * 2018-11-08 [4b4fbabed](https://github.com/silverstripe/silverstripe-framework/commit/4b4fbabed5d70bf577e4b0d6fdbc9dab9da80451) TreeMultiselectField passes value 'unchanged' as null to ORM for 'ID' column key (Serge Latyntcev) From 2f9dae2c7136acca60bf9ea1158704abc11a49dd Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Wed, 12 Dec 2018 14:10:59 +1300 Subject: [PATCH 124/175] Add changelog --- docs/en/04_Changelogs/4.1.4.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 docs/en/04_Changelogs/4.1.4.md diff --git a/docs/en/04_Changelogs/4.1.4.md b/docs/en/04_Changelogs/4.1.4.md new file mode 100644 index 000000000..d6e2fb3e5 --- /dev/null +++ b/docs/en/04_Changelogs/4.1.4.md @@ -0,0 +1,20 @@ +# 4.1.4 + + + +## Change Log + +### Security + + * 2018-12-10 [6f8dc77](https://github.com/silverstripe/silverstripe-graphql/commit/6f8dc779f39aebf79acbc0e2f3363705833b583b) Apply CSRF middlware API + * 2018-11-07 [fecedc2d9](https://github.com/silverstripe/silverstripe-framework/commit/fecedc2d98eeaaff6424fb59dc70ef6bdc6dc92d) Ensure that table names are escaped to prevent possible SQL injection (Robbie Averill) - See [ss-2018-020](https://www.silverstripe.org/download/security-releases/ss-2018-020) + +### Bugfixes + + * 2018-11-29 [59221e8](https://github.com/silverstripe/silverstripe-assets/commit/59221e8d74ac5e07b86a741e2709e0676130f7b4) Cache key cannot contain : chars, will happen when viewing from archive (Robbie Averill) + * 2018-11-21 [9ce6d91b7](https://github.com/silverstripe/silverstripe-framework/commit/9ce6d91b76e525a6fc81e02023e9e53cdf82e047) / TreeMultiselectField::objectForKey handles list of IDs correctly (Serge Latyntcev) + * 2018-11-16 [35c3a8c6](https://github.com/silverstripe/silverstripe-cms/commit/35c3a8c68db2660838dcd2ae5abd2bd1c3214af4) 'Search' text in default search form should be a placeholder (Robbie Averill) + * 2018-11-15 [b5bae137b](https://github.com/silverstripe/silverstripe-framework/commit/b5bae137bd341eeda3f4886f45fc8f8d657a9c4c) Redirect loop with multiple confirmation tokens present (fixes #8607) (Loz Calver) + * 2018-11-12 [15aaf9db9](https://github.com/silverstripe/silverstripe-framework/commit/15aaf9db9fe1679cf8b01b74fce3eee841278495) Fix a code style typo (Serge Latyntcev) + * 2018-11-08 [4b4fbabed](https://github.com/silverstripe/silverstripe-framework/commit/4b4fbabed5d70bf577e4b0d6fdbc9dab9da80451) TreeMultiselectField passes value 'unchanged' as null to ORM for 'ID' column key (Serge Latyntcev) + * 2018-10-15 [6de0fa0](https://github.com/silverstripe/silverstripe-versioned/commit/6de0fa087fe581b69a5978db82058490c44923b4) Fix codesniffer runs in Travis (Robbie Averill) From 4ff891fc8796f9dd112e03a74f4459d351a80f64 Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Wed, 12 Dec 2018 14:21:23 +1300 Subject: [PATCH 125/175] Add changelog --- docs/en/04_Changelogs/4.2.3.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 docs/en/04_Changelogs/4.2.3.md diff --git a/docs/en/04_Changelogs/4.2.3.md b/docs/en/04_Changelogs/4.2.3.md new file mode 100644 index 000000000..93ea4679c --- /dev/null +++ b/docs/en/04_Changelogs/4.2.3.md @@ -0,0 +1,28 @@ +# 4.2.3 + + + +## Change Log + +### Security + + * 2018-12-10 [b59ba39](https://github.com/silverstripe/silverstripe-graphql/commit/b59ba397ff42d8934bd2d9c932514f898c327f64) Add CSRF middlware + +## Features and Enhancements + + * 2018-07-16 [9270206c](https://github.com/silverstripe/silverstripe-reports/commit/9270206c3bd2fe35bb263ad43ad3a5d87360873a) Use Injector to create new class instances and pass $params (Robbie Averill) + +### Bugfixes + + * 2018-12-10 [9fce4b2](https://github.com/silverstripe/silverstripe-graphql/commit/9fce4b2408dd82d303925eee3b6cf393da371e85) Ensure httpMethod context is applied to all controller actions (#194) (Aaron Carlino) + * 2018-11-29 [59221e8](https://github.com/silverstripe/silverstripe-assets/commit/59221e8d74ac5e07b86a741e2709e0676130f7b4) Cache key cannot contain : chars, will happen when viewing from archive (Robbie Averill) + * 2018-11-21 [9ce6d91b7](https://github.com/silverstripe/silverstripe-framework/commit/9ce6d91b76e525a6fc81e02023e9e53cdf82e047) / TreeMultiselectField::objectForKey handles list of IDs correctly (Serge Latyntcev) + * 2018-11-16 [35c3a8c6](https://github.com/silverstripe/silverstripe-cms/commit/35c3a8c68db2660838dcd2ae5abd2bd1c3214af4) 'Search' text in default search form should be a placeholder (Robbie Averill) + * 2018-11-15 [b5bae137b](https://github.com/silverstripe/silverstripe-framework/commit/b5bae137bd341eeda3f4886f45fc8f8d657a9c4c) Redirect loop with multiple confirmation tokens present (fixes #8607) (Loz Calver) + * 2018-11-12 [15aaf9db9](https://github.com/silverstripe/silverstripe-framework/commit/15aaf9db9fe1679cf8b01b74fce3eee841278495) Fix a code style typo (Serge Latyntcev) + * 2018-11-08 [4b4fbabed](https://github.com/silverstripe/silverstripe-framework/commit/4b4fbabed5d70bf577e4b0d6fdbc9dab9da80451) TreeMultiselectField passes value 'unchanged' as null to ORM for 'ID' column key (Serge Latyntcev) + * 2018-10-15 [6de0fa0](https://github.com/silverstripe/silverstripe-versioned/commit/6de0fa087fe581b69a5978db82058490c44923b4) Fix codesniffer runs in Travis (Robbie Averill) + * 2018-10-06 [c498aa03](https://github.com/silverstripe/silverstripe-cms/commit/c498aa03379ca883803dda853e64c411ed7454dc) Fixing wrong Live-Preview-Link in SilverStripeNavigatorItem_LiveLink (fixes #865). (Stephan Bauer) + * 2018-09-13 [7189653b](https://github.com/silverstripe/silverstripe-cms/commit/7189653b1f9a744b9ee2393a8ef3fb8597c89b1b) SiteTree Title field should have rounded corners before Update URL button is shown (Robbie Averill) + * 2018-07-27 [bc70b877](https://github.com/silverstripe/silverstripe-reports/commit/bc70b87721c8278111e39e0af69db1052af7333f) Apply missing class to report header. (Maxime Rainville) + * 2018-07-01 [bc8bb13](https://github.com/silverstripe/silverstripe-campaign-admin/commit/bc8bb13c93c75e718872315a60f0eb8213bd8e69) Button outline secondary class is now correct in disabled "Publish campaign" button (Robbie Averill) From 8e8a8cae9f1fb24f33a015fcdf249cd5611e2479 Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Wed, 12 Dec 2018 14:54:31 +1300 Subject: [PATCH 126/175] Update changelog --- docs/en/04_Changelogs/4.3.0.md | 227 +++++++++++++++++++++++++++++++-- 1 file changed, 215 insertions(+), 12 deletions(-) diff --git a/docs/en/04_Changelogs/4.3.0.md b/docs/en/04_Changelogs/4.3.0.md index ffa49c558..9ab7760ee 100644 --- a/docs/en/04_Changelogs/4.3.0.md +++ b/docs/en/04_Changelogs/4.3.0.md @@ -8,7 +8,6 @@ - New React-based search UI for the CMS, Asset-Admin, GridFields and ModelAdmins. - A new `GridFieldLazyLoader` component can be added to `GridField`. This will delay the fetching of data until the user access the container Tab of the GridField. - `SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController` is now the default CMS history controller and `SilverStripe\CMS\Controllers\CMSPageHistoryController` has been deprecated. - - It's now possible to avoid storing GridField data in session. See [the documentation on GridField](../developer_guides/forms/field_types/gridfield/#saving-the-gridfield-state). ## Upgrading {#upgrading} @@ -27,7 +26,7 @@ To enable the legacy search API on a `GridFieldFilterHeader`, you can either: * set the `useLegacyFilterHeader` property to `true`, * or pass `true` to the first argument of its constructor. -To force the legacy search API on all instances of `GridFieldFilterHeader`, you can set it in your [configuration file](../developer_guides/configuration): +To force the legacy search API on all instances of `GridFieldFilterHeader`, you can set it in your [configuration file](../../configuration): ```yml SilverStripe\Forms\GridField\GridFieldFilterHeader: force_legacy: true @@ -68,18 +67,222 @@ SilverStripe\Core\Injector\Injector: App\MySite\MyCustomControllerFactory ``` -[Implementing a _Factory_ with the Injector](/developer_guides/extending/injector/#factories). +[Implementing a _Factory_ with the Injector](/developer_guides/extending/injector/#factories) -### Using the history viewer for custom DataObjects + -For information on how to implement the history viewer UI in your own versioned DataObjects, please refer to -[the Versioning documentation](../developer_guides/model/versioning). +## Change Log -### Tests with dynamic extension customisations +### Security -In SilverStripe 4.2, some unit tests that modify an extension class with PHP configuration manifest customisations -may have passed and may now fail in SilverStripe 4.3. This behaviour is inconsistent, is not a recommended approach -to customising extensions and should be avoided in all SilverStripe 4.x releases. + * 2018-12-11 [4f68e4b](https://github.com/silverstripe/silverstripe-admin/commit/4f68e4b759c104b2690050af034a41d370d2e6e4) Add CSRF middleware implementation (Aaron Carlino) - See [ss-2018-007](https://www.silverstripe.org/download/security-releases/ss-2018-007) + * 2018-11-07 [e18549beb](https://github.com/silverstripe/silverstripe-framework/commit/e18549beb08b47f63c87df3f1d727313e380bb95) Ensure that table names are escaped to prevent possible SQL injection (Robbie Averill) - See [ss-2018-020](https://www.silverstripe.org/download/security-releases/ss-2018-020) + * 2018-10-24 [88391f2](https://github.com/silverstripe/silverstripe-graphql/commit/88391f27463cac553360d7d94b0760e797247855) CSRF protection (Aaron Carlino) - See [ss-2018-007](https://www.silverstripe.org/download/security-releases/ss-2018-007) + * 2018-08-21 [3dbb10625](https://github.com/silverstripe/silverstripe-framework/commit/3dbb10625c6918094a18cd9a29f1f9daca8129c5) Add confirmation token to dev/build (Loz Calver) - See [ss-2018-019](https://www.silverstripe.org/download/security-releases/ss-2018-019) + * 2018-08-12 [3424431](https://github.com/silverstripe/silverstripe-admin/commit/3424431a5ed52fc9aae97423268aea5eba7334a2) Add CSRF to Apollo (Aaron Carlino) - See [ss-2018-007](https://www.silverstripe.org/download/security-releases/ss-2018-007) + * 2018-07-29 [637b4225c](https://github.com/silverstripe/silverstripe-framework/commit/637b4225c6a85bfa0d59e516a8c602203cc980d9) Ignore arguments in mysqli::real_connect backtrace calls (Robbie Averill) - See [ss-2018-018](https://www.silverstripe.org/download/security-releases/ss-2018-018) -For information on how to customise extensions, see -["Extending Extensions"](../developer_guides/extending/extensions#extendingextensions). +### API Changes + + * 2018-10-05 [5276b6cbb](https://github.com/silverstripe/silverstripe-framework/commit/5276b6cbb1ebd49d704734d940b0467c51b0d064) Add FieldList::getContainerField (Maxime Rainville) + * 2018-10-04 [dba237e](https://github.com/silverstripe/silverstripe-admin/commit/dba237e5d6ab13a7a5f8cbc9a9e594d98478c566) Allow Gridfield to be lazy loadable. (Maxime Rainville) + * 2018-10-04 [bdb53979a](https://github.com/silverstripe/silverstripe-framework/commit/bdb53979aaed743f278b299e3dab7b13e321fbe7) Create a new GridFieldLazyLoader GridField component (Maxime Rainville) + * 2018-09-28 [cb2b9498f](https://github.com/silverstripe/silverstripe-framework/commit/cb2b9498fb33bd57a19ba6a7ceed6d3fbc976d70) Deprecate updateSearchContextCallback and updateSearchFormCallback (Robbie Averill) + * 2018-09-03 [f48ab77](https://github.com/silverstripe/silverstripe-assets/commit/f48ab777c2845d7b414ebae0ff7903c6bb423340) Add `show_file_link_tracking` config to `FileLinkTracking` extension to control visibility of the File Tracking tab (bergice) + * 2018-08-31 [01db5c9e9](https://github.com/silverstripe/silverstripe-framework/commit/01db5c9e98f5406e8d6b0f1f4ea660edb24b199f) Add Link Tracking section to Relations developer guide and describe `show_sitetree_link_tracking`, `show_file_link_tracking`. (bergice) + * 2018-08-31 [115ed92e](https://github.com/silverstripe/silverstripe-cms/commit/115ed92e0aed63df1620700955afd6248fa97fae) Add `show_sitetree_link_tracking` config to `SiteTreeLinkTracking` extension to control visibility of the Link Tracking tab (bergice) + * 2018-08-05 [02be4cc](https://github.com/silverstripe/silverstripe-graphql/commit/02be4cc3e1cab7c1ed8e8f9d6dde6ee102364fa6) Multi-schema support (#169) (Aaron Carlino) + * 2018-07-12 [0343203](https://github.com/silverstripe/silverstripe-versioned/commit/03432030e99a496c6cd81f4bec780164851aa955) Add new RestoreAction and canRestoreToDraft method (#168) (Luke Edwards) + +### Features and Enhancements + + * 2018-11-01 [2f2fb2b](https://github.com/silverstripe/silverstripe-admin/commit/2f2fb2bfdcd88b54ac9426f172bec77a3c210172) Improve loading screen and indicator (#582) (Luke Edwards) + * 2018-10-29 [e51be58](https://github.com/silverstripe/silverstripe-asset-admin/commit/e51be58685527b512bf20e7542d506aef14f4ed8) Move Remove button into preview-image message (#859) (Sacha Judd) + * 2018-10-29 [2440432](https://github.com/silverstripe/silverstripe-asset-admin/commit/24404324790a26b0c19f68f862bb2679618199ee) Move the replace file into the more options action set (#848) (Sacha Judd) + * 2018-10-29 [952f37a](https://github.com/silverstripe/silverstripe-admin/commit/952f37abdc78d9f87da20461537c88cf570d7cba) Adding an HOC to provide DragDropContext for consumers of ReactDND (#711) (Guy Marriott) + * 2018-10-26 [2c3665d](https://github.com/silverstripe/silverstripe-admin/commit/2c3665d83375364249adf02c2eef6382d73e7c43) Adding a component for a generic popover filled with buttons (#684) (Guy Marriott) + * 2018-10-19 [e88b8e7](https://github.com/silverstripe/silverstripe-admin/commit/e88b8e7b2fa4c47e62d737ea3a3ccee8c7ff8794) Expose TabsActions (#703) (Raissa North) + * 2018-10-18 [761a6f7](https://github.com/silverstripe/silverstripe-admin/commit/761a6f7f6f809c36f21dd804ce1d6325909b5d1c) Reverse argument signature of methods using path (#698) (Aaron Carlino) + * 2018-10-17 [902fec0](https://github.com/silverstripe/silverstripe-asset-admin/commit/902fec0f89bb49783b2dc5f64b4d0c24c33531fb) Extensible readFiles query (#847) (Aaron Carlino) + * 2018-10-17 [437e53f2f](https://github.com/silverstripe/silverstripe-framework/commit/437e53f2fec17bc778cc7bba39de322d43214441) Some minor refactoring of the PDO and MySQLi connectors (Robbie Averill) + * 2018-10-15 [3e2ce31](https://github.com/silverstripe/silverstripe-admin/commit/3e2ce3138d88674fc27aa465dc9be9ea4533c830) Add nested fields, args, distribute args to fields (#683) (Aaron Carlino) + * 2018-10-08 [2775895d0](https://github.com/silverstripe/silverstripe-framework/commit/2775895d03af93d207079637a8eb6afdfad5ab01) Adding a helper to find a form field by label content (Guy Marriott) + * 2018-10-05 [6e66c48](https://github.com/silverstripe/silverstripe-admin/commit/6e66c48d65b52d568fbd34f8a7c630b4a829c2c9) Add CMS community help menu to cms-menu (#615) (Sacha Judd) + * 2018-10-04 [9ea7b58a8](https://github.com/silverstripe/silverstripe-framework/commit/9ea7b58a8f26ca8856211da30eed5751706d0c4b) Add memory cache to ThemeResourceLoader::findTemplate() (Robbie Averill) + * 2018-10-03 [90afb2037](https://github.com/silverstripe/silverstripe-framework/commit/90afb2037a6d2d9be3f605aad9ddfbda0bbab2e7) TabSet react component is no longer structural (Raissa North) + * 2018-10-03 [0be4a9a](https://github.com/silverstripe/silverstripe-admin/commit/0be4a9abfa4482deb2753c50c47dbf0192581a12) Adding an extension point to FormBuilderLoader after redux form is initialised (Raissa North) + * 2018-10-02 [cba5d30](https://github.com/silverstripe/silverstripe-admin/commit/cba5d307f499471b88f77fd201df2a4baacf0038) Connect Tabs component to redux-form to handle activeTab state (Raissa North) + * 2018-10-02 [e1f2f89d3](https://github.com/silverstripe/silverstripe-framework/commit/e1f2f89d37e44c706d350d02774733dd867ccdc7) Add test for PHP 7.3 support (SS4 version) (Sam Minnee) + * 2018-09-28 [bd37b90a](https://github.com/silverstripe/silverstripe-cms/commit/bd37b90a3a5811555248ef616698efbe24466b11) Add CMSMain.enable_archive_warning_message config (Sam Minnee) + * 2018-09-27 [4b155b9](https://github.com/silverstripe/silverstripe-graphql/commit/4b155b982ca6fd737aa70e281ce679bb43404060) Add getSortableFields to return sortable fields for query (#185) (Robbie Averill) + * 2018-09-27 [25759ffc5](https://github.com/silverstripe/silverstripe-framework/commit/25759ffc5fe532a239b1487ca6b025140d2e144f) Show file path on PHP parser exceptions (Ingo Schommer) + * 2018-09-25 [5b7a84141](https://github.com/silverstripe/silverstripe-framework/commit/5b7a84141b0fbef66a9f3f52a9ccee12e02ef1e0) Add Hierarchy::prepopulate_numchildren_cache() (#8380) (Sam Minnée) + * 2018-09-21 [e2701a4](https://github.com/silverstripe/silverstripe-admin/commit/e2701a4cd00ffc2136b935038d8422a25acfa2dd) TinyMCE inline toolbar for images and embeds (Luke Edwards) + * 2018-09-20 [c928e83](https://github.com/silverstripe/silverstripe-versioned/commit/c928e830825ec8ae5336d254835f754a11bac350) Backport of DataList for list of versions, for SS 4.3.x (Robbie Averill) + * 2018-09-19 [d9a6c10](https://github.com/silverstripe/silverstripe-admin/commit/d9a6c10a157d6c1fd17351b0097ce9d8c5336ecf) Form state & schema persists across form remounting (Guy Marriott) + * 2018-09-19 [40dde226f](https://github.com/silverstripe/silverstripe-framework/commit/40dde226fd1b8997308ef0f5718763a298295cdf) Add ?showqueries=backtrace (Sam Minnee) + * 2018-09-19 [6de12e1](https://github.com/silverstripe/silverstripe-asset-admin/commit/6de12e1375d146d61052f1a6dd001aa3a6c437bc) TinyMCE inline toolbar for images and embeds (Luke Edwards) + * 2018-09-17 [588bf83e1](https://github.com/silverstripe/silverstripe-framework/commit/588bf83e1238a79793da4bc4145b7597ae2626be) Add hideNav flag to schema defaults (Raissa North) + * 2018-09-17 [a800ce7](https://github.com/silverstripe/silverstripe-admin/commit/a800ce714a99a631b8a7401322df0653e2ee476c) Add hideNav flag to allow hiding of navigation in Tabs (Raissa North) + * 2018-09-12 [d8bf873](https://github.com/silverstripe/silverstripe-admin/commit/d8bf873e1236ff5cb634cce0a47c992366ae6139) Use bootstrap modal footer, use our icon font for close icon (Luke Edwards) + * 2018-09-12 [c03c685](https://github.com/silverstripe/silverstripe-asset-admin/commit/c03c685da247b8baa6d4180816bda35bc29fcf2d) Use bootstrap modal footer, use our icon font for close icon (Luke Edwards) + * 2018-09-03 [2394194](https://github.com/silverstripe/silverstripe-admin/commit/239419424ee001200830bc8b77dfef3ce7a05d7e) HtmlEditorField component for react rich text (Dylan Wagstaff) + * 2018-08-22 [a257c1c](https://github.com/silverstripe/silverstripe-admin/commit/a257c1cea84ebcdd27df5043c3690bdcb09f43da) Add toggleCallback function (Raissa North) + * 2018-08-22 [8153d12](https://github.com/silverstripe/silverstripe-admin/commit/8153d12537b53bd208ddb28675aa82bd84da2a16) Add dropdownToggleClassName prop to ActionMenu (Raissa North) + * 2018-08-20 [26262ea](https://github.com/silverstripe/silverstripe-admin/commit/26262ea3a9d64e4172ed277845a53e58c48772ef) Insert link shortcut for HTMLEditorField (#599) (Luke Edwards) + * 2018-08-12 [8d3b022](https://github.com/silverstripe/silverstripe-assets/commit/8d3b02259167ce08fd30742475a29219d64df0c8) Support setting quality on a per-image basis (#153) (Loz Calver) + * 2018-08-05 [9d0ae97](https://github.com/silverstripe/silverstripe-admin/commit/9d0ae970e5cdf2ec8710b471884d75b5485b9309) ViewModeToggle states are now stored in constants (Robbie Averill) + * 2018-08-01 [4213eeb](https://github.com/silverstripe/silverstripe-asset-admin/commit/4213eeb1513662ef2dd177065310c2062532a424) Use the new general purpose search component. (#812) (Maxime Rainville) + * 2018-08-01 [5a00d84](https://github.com/silverstripe/silverstripe-admin/commit/5a00d8462ec2806c640f1214971f4747f276d398) General purpose search form component (#572) (Maxime Rainville) + * 2018-07-30 [163ca65](https://github.com/silverstripe/silverstripe-graphql/commit/163ca65a1f2e858c7d47d4b15775153ea0451d5b) DataObjectScaffolder instantiation is now handled through Injector (Robbie Averill) + * 2018-07-30 [24d3023](https://github.com/silverstripe/silverstripe-graphql/commit/24d3023b0d361fee66b4e68aca1814b7dfdbcac2) Allow non-internal input types passed as args (#168) (Aaron Carlino) + * 2018-07-25 [79a5ea3](https://github.com/silverstripe/recipe-cms/commit/79a5ea3dace336558ef4d5be4a86cc1a0e84badc) Add versioned-admin (Luke Edwards) + * 2018-07-17 [337da78](https://github.com/silverstripe/silverstripe-campaign-admin/commit/337da782bd520beebdb734542b5403b69257d058) Update webpack-config constraint (Raissa North) + * 2018-07-16 [786446fb](https://github.com/silverstripe/silverstripe-reports/commit/786446fb670905832b6bfe49775b9c2eaff262cc) Use Injector to create new class instances and pass $params (Robbie Averill) + * 2018-07-12 [f2ebdb7f](https://github.com/silverstripe/silverstripe-cms/commit/f2ebdb7f5ec894e8c0c8f29b9aac984aef4ca8ed) add SiteTree::updateAnchorsOnPage() for user defining additional page anchors (Will Rossiter) + * 2018-07-12 [114b0a5ea](https://github.com/silverstripe/silverstripe-framework/commit/114b0a5ea7ea6b8f33b8c9b8d1611e5ee6619a1c) Option for secure "remember me" cookie (Ingo Schommer) + * 2018-07-12 [3292a8b77](https://github.com/silverstripe/silverstripe-framework/commit/3292a8b773c5b29a69b72718f996a36f3daead1d) Add `columnUnique` API SS_List classes. (Al Twohill) + * 2018-07-06 [6c1a34c](https://github.com/silverstripe/silverstripe-campaign-admin/commit/6c1a34cc2c9bfbc3bca471c7ca77976bac194918) Make use of ViewModeToggle component. (Raissa North) + * 2018-04-15 [5108734](https://github.com/silverstripe/silverstripe-admin/commit/5108734b19edbe9d6404b747e25059a586b009fe) Add ViewModeToggle component (Raissa North) + * 2018-01-30 [1857f00](https://github.com/silverstripe/silverstripe-admin/commit/1857f00bd2b172acb933064d3d454e91bc855200) Add tests for Form component (Robbie Averill) + * 2018-01-30 [cc945f0](https://github.com/silverstripe/silverstripe-admin/commit/cc945f09aac38dea25ec57538c51e6089ddac124) Add tests for CompositeField (Robbie Averill) + +### Bugfixes + + * 2018-12-10 [11970d5](https://github.com/silverstripe/silverstripe-graphql/commit/11970d56f3e57f370359cf9edab4c27e9f766c3c) Ensure httpMethod context is applied to all controller actions (#194) (Aaron Carlino) + * 2018-12-04 [a0bb79b](https://github.com/silverstripe/silverstripe-admin/commit/a0bb79b62bc5e907adf8ff93acd0d3fd0f9046f6) Ensure the container exists before unmounting React/removing it (Guy Marriott) + * 2018-12-02 [c28f5ad4](https://github.com/silverstripe/silverstripe-cms/commit/c28f5ad45fb7010b9ad71c3594161d0de15aa763) CMSPageHistoryControllerTest now uses a stub controller to avoid URL conflicts with versioned-admin (Robbie Averill) + * 2018-11-30 [7567488](https://github.com/silverstripe/silverstripe-admin/commit/7567488458daa16d20e6a95d1b33895f7293c69f) Fix new page form clearing when selecting a `Under another page` option (bergice) + * 2018-11-19 [1946aca](https://github.com/silverstripe/silverstripe-admin/commit/1946acab5ab70af8ac61cb419b5ca82336569e4b) Correct the entwine match for the loading animation (Maxime Rainville) + * 2018-11-13 [fa14ecd](https://github.com/silverstripe/recipe-core/commit/fa14ecdad5169cb3ab03ecdddb523f723ded1b27) Ensure that the PasswordValidator is registered with Injector (Robbie Averill) + * 2018-11-08 [2f896b1](https://github.com/silverstripe/recipe-core/commit/2f896b11530cb55acab9bc43d33ce867faafbf3c) Move password complexity requirements into framework (Robbie Averill) + * 2018-11-05 [7fd4a4e](https://github.com/silverstripe/silverstripe-admin/commit/7fd4a4ef76733968ed3babbc14564b2d0f7417b3) Fix duplicate plugins on HTML editor fields (#721) (Luke Edwards) + * 2018-11-05 [4a65d59](https://github.com/silverstripe/silverstripe-admin/commit/4a65d59dc340719f67df1d2c1998ea2645d58473) Fix form changes triggered, GridField add existing (#743) (Luke Edwards) + * 2018-11-02 [97180c261](https://github.com/silverstripe/silverstripe-framework/commit/97180c261258861b5b2b91609a71d044456625d7) Fix readonly grid state always being truthy (#8562) (Luke Edwards) + * 2018-11-02 [12e2cc3](https://github.com/silverstripe/silverstripe-asset-admin/commit/12e2cc37a7a2806310ac7ffd2ad704fb7ad37fe0) Fix duplicate plugins on HTML editor fields (#861) (Luke Edwards) + * 2018-11-02 [d9b1721a](https://github.com/silverstripe/silverstripe-cms/commit/d9b1721ac32829a33f54a9e628680cb3894191b3) Fix duplicate plugins on HTML editor fields (#2307) (Luke Edwards) + * 2018-11-01 [8866e7674](https://github.com/silverstripe/silverstripe-framework/commit/8866e7674a1a9c2be48c8e9532cfcaa667cdf7b5) Fix duplicate plugins on HTML editor fields (#8559) (Luke Edwards) + * 2018-11-01 [55f95b7bc](https://github.com/silverstripe/silverstripe-framework/commit/55f95b7bc8f91384df459bd70c87cacf92225f68) many many through not sorting by join table (#8534) (Michael Strong) + * 2018-10-31 [af7086a](https://github.com/silverstripe/silverstripe-asset-admin/commit/af7086a3adf86b06b6c6b6f938acabf2cfa3352b) Remove outdated CSS Safari hack interfering with the search panel and submit button (Serge Latyntcev) + * 2018-10-31 [2ef7bd29](https://github.com/silverstripe/silverstripe-cms/commit/2ef7bd29754f84fa6eafce08c00d6e1e794713af) IE11+Edge17 Pages tree List View button (Serge Latyntcev) + * 2018-10-30 [3f4d5ae0](https://github.com/silverstripe/silverstripe-cms/commit/3f4d5ae03e9fee10c54f3e628a194d03c07b5c3a) Bypass cached versions to prevent stale state (Aaron Carlino) + * 2018-10-30 [4b0e69a](https://github.com/silverstripe/silverstripe-admin/commit/4b0e69a084028eb60c9d3da90e648acd87946d73) Add aria-expanded to help menu toggle for screenreader accessibility (Sacha Judd) + * 2018-10-30 [2900ac6](https://github.com/silverstripe/silverstripe-admin/commit/2900ac6481b5cca1df1b6708522a60d8a946b790) Remove text-align start with IE supported left (Raissa North) + * 2018-10-29 [f2467d3](https://github.com/silverstripe/silverstripe-admin/commit/f2467d37241ca08b0cc4a112d1dc9054adf891a8) Fix search filtering and clearing (#687) (Luke Edwards) + * 2018-10-26 [3284bf48d](https://github.com/silverstripe/silverstripe-framework/commit/3284bf48d6e3da8b2b1a7831e2d7fe4b401e2fd6) Fix search filtering relations and clear filters (#8477) (Luke Edwards) + * 2018-10-22 [df86335](https://github.com/silverstripe/silverstripe-admin/commit/df863357b1413508f985f6f12a48f5d414a6d75f) Fix decimal search filter not showing up (bergice) + * 2018-10-20 [7f6f5c9ec](https://github.com/silverstripe/silverstripe-framework/commit/7f6f5c9ec9352172f37f8980d823e85c1c39062a) Flush extra methods cache on DataObjects after each unit test class has finished (Robbie Averill) + * 2018-10-19 [311fd62d9](https://github.com/silverstripe/silverstripe-framework/commit/311fd62d9527a47586d90a6f4e2c80922d15d44f) getExtensionInstance can return null, add a case to handle that (Robbie Averill) + * 2018-10-19 [a6855ec](https://github.com/silverstripe/silverstripe-admin/commit/a6855ecf02d41378b1ad03729a103d193aecd853) Remove deprecated help_link definition in testGetHelpLinks (Robbie Averill) + * 2018-10-19 [a28e2e183](https://github.com/silverstripe/silverstripe-framework/commit/a28e2e183e1d0684dd32bc7bcf72d4a9c573a8f4) Fix enum filter in Search component from adding `Any` as a filter (bergice) + * 2018-10-18 [e3d0bcb](https://github.com/silverstripe/silverstripe-admin/commit/e3d0bcb051e45d3e7b90dcdf6554e97d173ef6ce) Change one tab not all tabs (Raissa North) + * 2018-10-17 [87a5d07](https://github.com/silverstripe/silverstripe-admin/commit/87a5d07b9f22b894dd9f4397ff50868e662b79b2) Fix body overflow causing scroll bars (Loz Calver) + * 2018-10-16 [a3d611f](https://github.com/silverstripe/silverstripe-admin/commit/a3d611f0b7f6cd024783a7037245364237329375) Fix `ENTER` not triggering form save button (bergice) + * 2018-10-16 [c35e18110](https://github.com/silverstripe/silverstripe-framework/commit/c35e18110baa72756f2a5378b7e7d4d7803c7c33) Gridfield pagination detected as form change (Luke Edwards) + * 2018-10-16 [5d626fa](https://github.com/silverstripe/silverstripe-admin/commit/5d626fa53b6c67e586d6c6d4d19471709175e8f4) Don’t track gridstate changes as form edits (Luke Edwards) + * 2018-10-16 [3d3c407](https://github.com/silverstripe/silverstripe-admin/commit/3d3c407caf099831af0e7b3a6320cad61e5801b0) Fix long gridfield actions overflowing (Luke Edwards) + * 2018-10-15 [ab259af](https://github.com/silverstripe/silverstripe-errorpage/commit/ab259af0707518f94561909c989617e155fd3b1b) Move phpcs to composer dependency, update Travis for it, add 7.2 to Travis (Robbie Averill) + * 2018-10-15 [ab0d7d9](https://github.com/silverstripe/silverstripe-versioned/commit/ab0d7d9e8c18b0e5ae6ee3e352317bbe0c70de53) Fix codesniffer runs in Travis (Robbie Averill) + * 2018-10-11 [0aa2d66](https://github.com/silverstripe/silverstripe-admin/commit/0aa2d6615b7f207791716b6e8654d16940597be4) Use correct lazy loadable class names for GridFieldLazyLoader (Robbie Averill) + * 2018-10-11 [ee21c4201](https://github.com/silverstripe/silverstripe-framework/commit/ee21c42011fd40b2065bb2acb868a427e2232d0a) Re-instate missing SS_DATABASE_SUFFIX functionality (fixes #7966) (Loz Calver) + * 2018-10-11 [4702a22](https://github.com/silverstripe/silverstripe-admin/commit/4702a223ed2c85cd8a55501351526648a70c41b7) Defensively programming some possible failure points (Guy Marriott) + * 2018-10-11 [0db2f84ad](https://github.com/silverstripe/silverstripe-framework/commit/0db2f84ade9b1e8e2811cd7c32bf5f3510544c74) Persist TinyMCE updates when writing with Behat (Guy Marriott) + * 2018-10-10 [e941a56](https://github.com/silverstripe/silverstripe-admin/commit/e941a56b9e918908f16712f2e7be1b43d5810062) Changing the value of a TinyMCE field will correctly trigger a change in the React component (Guy Marriott) + * 2018-10-09 [56d562193](https://github.com/silverstripe/silverstripe-framework/commit/56d56219345b4a8ba318261af98bcd62f3ce060d) Flush extra_methods statics between test runs (Robbie Averill) + * 2018-10-09 [d1281a571](https://github.com/silverstripe/silverstripe-framework/commit/d1281a571a56dca9d40b59a7baf31d32b09a37f5) Escape HTML in PHPDoc to fix API docs from rendering incorrectly (Robbie Averill) + * 2018-10-09 [522b288](https://github.com/silverstripe/silverstripe-admin/commit/522b28890e6b11b3a324a38c65199f96f86c4b2f) ModelAdmin pagination with a filter (Luke Edwards) + * 2018-10-08 [4766cae](https://github.com/silverstripe/silverstripe-admin/commit/4766cae7918e75c3b47d69487fecdb69b2993077) Retain polyfill for display block style in .collapse.show with Bootstrap 4.1.x (Robbie Averill) + * 2018-10-08 [6e649b57](https://github.com/silverstripe/silverstripe-cms/commit/6e649b570d70d83729527ea8fbbc069426f11338) CMSMain::duplicate() now checks canCreate() but not canEdit() (Robbie Averill) + * 2018-10-08 [c4788803e](https://github.com/silverstripe/silverstripe-framework/commit/c4788803ee7b903bc45541ccc0ef8446cf99922f) Remove unused cacheData prop from #8451 (Robbie Averill) + * 2018-10-08 [884a12c](https://github.com/silverstripe/silverstripe-admin/commit/884a12c864dd856a4beb8e636eb56c46be2dfa2e) Add fix for potential tabnabbing on community help links (Sacha Judd) + * 2018-10-08 [979dd38](https://github.com/silverstripe/silverstripe-assets/commit/979dd385947900b9df48928ad7ba4c2eb7a1361f) Fix migrating files with an incorrect class (Luke Edwards) + * 2018-10-08 [fdb53311b](https://github.com/silverstripe/silverstripe-framework/commit/fdb53311bac68bcee5f6b026c0f526c98ea1da65) Fix linting issue. (Maxime Rainville) + * 2018-10-08 [e06bb05](https://github.com/silverstripe/silverstripe-admin/commit/e06bb051d29c9aceb0d6863637bf038ae0715777) Ensure TinyMCE field changes are persisted before updating redux state (Guy Marriott) + * 2018-10-06 [8c7459a70](https://github.com/silverstripe/silverstripe-framework/commit/8c7459a7082ab3880202a3541bd11ed183465ef1) Fix CompositeField test that relied on a DropdownField bug (Sam Minnee) + * 2018-10-05 [e5d3b28a4](https://github.com/silverstripe/silverstripe-framework/commit/e5d3b28a4d10cb4d960897d37071246532ab8ebc) Don’t break validation on selects without a source. (Sam Minnee) + * 2018-10-05 [98568262f](https://github.com/silverstripe/silverstripe-framework/commit/98568262f2c5d7cc9a9cd39af158d5df7dce12a7) Fixed phpcs violations (Robbie Averill) + * 2018-10-04 [fafd9dad6](https://github.com/silverstripe/silverstripe-framework/commit/fafd9dad6d60731c0ed6695a2df5535ea433632e) fixing name of constant ASSETS_PATH (Philipp Staender) + * 2018-10-04 [0fc06e51e](https://github.com/silverstripe/silverstripe-framework/commit/0fc06e51e5020b8959310682bade02f97653dc73) Drop seconds from DBDatetime::Nice() to restore SS3 behaviour. (Sam Minnee) + * 2018-10-03 [19af1ac](https://github.com/silverstripe/silverstripe-graphql/commit/19af1ac6d77089a5365ed9f1892306fdd943a2ca) Add codesniffer as a dev dependency and use it in Travis (Robbie Averill) + * 2018-10-03 [4668fab](https://github.com/silverstripe/silverstripe-assets/commit/4668fabc3a02d996a0a9be13245cf3ab3fba1079) Shortcode provider does not always request a protected asset grant, add tests for FlysystemAssetStore (Robbie Averill) + * 2018-10-03 [ce9496d](https://github.com/silverstripe/silverstripe-admin/commit/ce9496d2b9bcda50a4e74c386d31bac7c4dc0939) Quote injector alias references, deprecated and removed support for in Symfony 4 (Robbie Averill) + * 2018-10-03 [d535e71](https://github.com/silverstripe/silverstripe-graphql/commit/d535e71ef81165ac6e02c8b27b1e577b3a291b65) Quote injector alias references, deprecated and removed support for in Symfony 4 (Robbie Averill) + * 2018-10-03 [4740346ed](https://github.com/silverstripe/silverstripe-framework/commit/4740346ed8766549f0f948a4396954227f2494bb) Make ArrayList::limit() consistent with DataList::limit() (Sam Minnee) + * 2018-10-03 [0cc72c91a](https://github.com/silverstripe/silverstripe-framework/commit/0cc72c91ada58d6927dab6e93bfe785b623f3e7a) Use DELETE FROM instead of TRUNCATE for clearTable (Sam Minnee) + * 2018-10-02 [5970fc241](https://github.com/silverstripe/silverstripe-framework/commit/5970fc2417bcd29cfc85c209117b7ed6625141ad) Moving test to correct director (Guy Marriott) + * 2018-10-02 [79c2b5ad4](https://github.com/silverstripe/silverstripe-framework/commit/79c2b5ad427f4e95c8fb51b46c4ba31cdf2997c1) Use DELETE FROM instead of TRUNCATE for clearTable (Sam Minnee) + * 2018-10-01 [f2cbc1dfb](https://github.com/silverstripe/silverstripe-framework/commit/f2cbc1dfbb8b1972eeb72d230f7b5cc2ebad26ee) Don’t use USE_FRM in MySQL repair. Fixes #6300. (Sam Minnee) + * 2018-10-01 [638e6ec28](https://github.com/silverstripe/silverstripe-framework/commit/638e6ec2814b4b4cbabd0adc0e166c4812b94740) Throw deprecation notice on limit=0 (Sam Minnee) + * 2018-10-01 [ad87890b2](https://github.com/silverstripe/silverstripe-framework/commit/ad87890b2e92f3f4092bbf9a70ab0d439d40ce31) Don’t change state in ArrayList::getIterator() (Sam Minnee) + * 2018-10-01 [63cabc7](https://github.com/silverstripe/silverstripe-assets/commit/63cabc7fc84f295a95e88f2ce37f940b61b97223) Keep folder Name and Title in sync on update (Luke Edwards) + * 2018-10-01 [5c7b0da](https://github.com/silverstripe/silverstripe-admin/commit/5c7b0da18d894d32f3884fcd2f4e18e8ccd7b629) Searching now allows + symbols, use own method over jQuery serialisation (Robbie Averill) + * 2018-10-01 [71dad5f68](https://github.com/silverstripe/silverstripe-framework/commit/71dad5f68518b9052b657c8dc70d4581fb771e98) Append any fields that don’t match name in insertBefore/insertAfter (Sam Minnee) + * 2018-10-01 [b0c4c5a1](https://github.com/silverstripe/silverstripe-cms/commit/b0c4c5a1775c95e1abd878f233e78b009f5d01ec) Updating SiteTree search fields to work with new search namespacing (Guy Marriott) + * 2018-10-01 [81292c5](https://github.com/silverstripe/silverstripe-asset-admin/commit/81292c52f04690349ea8d3634398faeda2190f8d) Fix outdated data in Apollo GraphQL cache when deleting/moving files (bergice) + * 2018-09-28 [ac1fe5e9d](https://github.com/silverstripe/silverstripe-framework/commit/ac1fe5e9d5de92dbdd7c03c187471fe6b5d8d7c0) joinClass's default_sort is used when nothing else has been set already (Robbie Averill) + * 2018-09-27 [fa4e031](https://github.com/silverstripe/silverstripe-admin/commit/fa4e031ef961215653e315ea441059c6945e5e3b) Update field names in Behat tests for new namespaces (Robbie Averill) + * 2018-09-27 [44b92c90](https://github.com/silverstripe/silverstripe-cms/commit/44b92c90bc18e629a73584a2a2eb0db8a02d740a) Update field names in Behat tests for new search form namespacing (Robbie Averill) + * 2018-09-27 [c54e7317d](https://github.com/silverstripe/silverstripe-framework/commit/c54e7317d2016727b1e2083996fc925fe862e9ab) Avoid having search fields with the same names as form elements (Guy Marriott) + * 2018-09-27 [2e41ea8](https://github.com/silverstripe/silverstripe-admin/commit/2e41ea83b95509ba1f68cf895c49fd846ec15841) Avoid having search fields with the same name as form elements (Guy Marriott) + * 2018-09-25 [dc59bd8](https://github.com/silverstripe/silverstripe-versioned/commit/dc59bd8e5613442b214f951ca16ec376e1ee1cda) Published GraphQL field now correctly indicates whether the record's version is published (Robbie Averill) + * 2018-09-25 [05b372c](https://github.com/silverstripe/silverstripe-versioned/commit/05b372c85f6720c931ac5dceba5fd05a84c74482) Use Hierarchy::prepopulateTreeDataCache() in CMS. (#183) (Sam Minnée) + * 2018-09-25 [5bfc37ff](https://github.com/silverstripe/silverstripe-cms/commit/5bfc37ff4bd22e8bbc02dc4f6dae59d25a4d5e67) Use Hierarchy::prepopulateTreeDataCache() in CMS (#2266) (Sam Minnée) + * 2018-09-24 [0276f6c08](https://github.com/silverstripe/silverstripe-framework/commit/0276f6c089ff5557a36eaf7367c8fc75fc6af20c) Revert semver break in adding GridField type hint to method signature (Robbie Averill) + * 2018-09-24 [f76fb26](https://github.com/silverstripe/silverstripe-asset-admin/commit/f76fb269b3450077623045ce84726dfd60f92894) fix psr (Thomas Portelange) + * 2018-09-24 [5e069ec](https://github.com/silverstripe/silverstripe-versioned/commit/5e069ec85c3b3cb74054b5cc18012531cfe22ce6) fix inferReciprocalComponent called on unsaved (Thomas Portelange) + * 2018-09-24 [9b5425d](https://github.com/silverstripe/silverstripe-graphql/commit/9b5425d5ba8a25eb799743e62733c57eb2837175) Incorrect parameter order of (Guy Marriott) + * 2018-09-24 [a2bb70c46](https://github.com/silverstripe/silverstripe-framework/commit/a2bb70c46dec00a6c9164bcc134e3fdc64a452e9) Don't flush manifests in tests by default (Ingo Schommer) + * 2018-09-20 [9a89aad](https://github.com/silverstripe/silverstripe-admin/commit/9a89aad5df0d5c67a5575a7e20d723cf9d6c4d95) Whitelist nonce parameters from JS resources to be loaded. (Luke Edwards) + * 2018-09-20 [16b3d18](https://github.com/silverstripe/silverstripe-assets/commit/16b3d18ebdf8896ed216faf2a33daa729c6b2c09) FlysystemAssetStore::getAsURL() only grant for protected filesystems (Christopher Darling) + * 2018-09-20 [a9b2443](https://github.com/silverstripe/silverstripe-admin/commit/a9b244349435028c7b55b30475a9fe4d50207fc1) Revert changes to default dropdownToggleClassNames on ActionMenu (Sacha Judd) + * 2018-09-19 [b98c87a6c](https://github.com/silverstripe/silverstripe-framework/commit/b98c87a6c51baa6696ef9f077775f633c4c5ecd4) Ensure existing session can be accessed if headers_sent() (Sam Minnee) + * 2018-09-17 [d597166](https://github.com/silverstripe/silverstripe-versioned/commit/d5971661cec5fdf12dbfe895fad08ce6bbb05e25) Performance optimisation for draft pages in treeview (Sam Minnee) + * 2018-09-12 [41c0b8fb](https://github.com/silverstripe/silverstripe-cms/commit/41c0b8fb85b7ac11f18eb1813f9e063e13cbafa2) Fix 'Insert links into a page' test (Luke Edwards) + * 2018-09-10 [fb0d81d](https://github.com/silverstripe/silverstripe-admin/commit/fb0d81d6c02bff292e69a0dcd42e3e01be728c01) Remove action menu toggle styles (Sacha Judd) + * 2018-09-04 [fbd8843](https://github.com/silverstripe/silverstripe-assets/commit/fbd88434cfc89eac7d75e34cdcc48f97821198ff) Remove unnecessary UploadTest\Validator (Sam Minnee) + * 2018-09-04 [40c7a0a](https://github.com/silverstripe/silverstripe-assets/commit/40c7a0aac6390237515cd30d9b23de8e7ad0f5ba) Better error message for invalid upload (Sam Minnee) + * 2018-09-03 [641208dc](https://github.com/silverstripe/silverstripe-siteconfig/commit/641208dcd29a7afaf70c3100a1b02a0bd149b667) Text collector translations now compile without errors (Robbie Averill) + * 2018-09-03 [225445931](https://github.com/silverstripe/silverstripe-framework/commit/22544593101ce670a809f3b354f5ff850840006b) Text collector translations now compile without errors (Robbie Averill) + * 2018-08-31 [f5869a5](https://github.com/silverstripe/silverstripe-campaign-admin/commit/f5869a56ba1c34568d424a2cf71000abfa0ef206) Do not render view mode toggle on campaign toolbar if the campaign is empty (bergice) + * 2018-08-30 [5488b31](https://github.com/silverstripe/silverstripe-admin/commit/5488b31f84f47a18d40cf34d7da53d498b169496) Add explicit `0` z-index to `cms-content` so the menu toggle can render above it (#620) (Andre Kiste) + * 2018-08-30 [463fdef](https://github.com/silverstripe/silverstripe-admin/commit/463fdefde0f827d783f9a519f261d1e4d35c01ab) Remove "more" action icon size, add btn-sm and fix icon alignment in gridfield (Sacha Judd) + * 2018-08-28 [dbfc25302](https://github.com/silverstripe/silverstripe-framework/commit/dbfc253021bce3997af0934b9015215047bbac7b) Fix incorrect version number in 4.3.0 changelog (Loz Calver) + * 2018-08-28 [d1951c94](https://github.com/silverstripe/silverstripe-cms/commit/d1951c946fe143e79ea6a7e1ee55ae90586c8a33) Sort history viewer versions in descending order (Robbie Averill) + * 2018-08-28 [10ef38f](https://github.com/silverstripe/silverstripe-campaign-admin/commit/10ef38f039fa4bf29be764ffd99196b0f9b62554) Hide 1px left border in preview component if we are in 'Preview Only' mode (bergice) + * 2018-08-27 [2ab622f](https://github.com/silverstripe/silverstripe-admin/commit/2ab622f88a5a179a7186b46699055cf761d3b749) Fix Add mock store to the loadComponent AppolloProvider (Maxime Rainville) + * 2018-08-24 [e196475](https://github.com/silverstripe/silverstripe-assets/commit/e196475220e1b97cc61f8e026b55984d2e240e0d) Graceful validation of image shortcode (Aaron Carlino) + * 2018-08-24 [2b16e2a](https://github.com/silverstripe/silverstripe-admin/commit/2b16e2afbaa322ef4ab2fce6c2add9b8f5596ba4) GridField delete button to offer archive action if possible (#602) (Luke Edwards) + * 2018-08-24 [6164d01d6](https://github.com/silverstripe/silverstripe-framework/commit/6164d01d65648ce6b25a7ef82fabaa10b81565d0) GridField delete button to offer archive action if possible (#8325) (Luke Edwards) + * 2018-08-22 [1b67bb08c](https://github.com/silverstripe/silverstripe-framework/commit/1b67bb08c8b61ad7e5324ef07eaea2834772b818) Fix failing HTML button test step (Luke Edwards) + * 2018-08-17 [160d595e2](https://github.com/silverstripe/silverstripe-framework/commit/160d595e226edcbaa64a47a0be74193a8b8058cc) fix trailing whitespace (maks) + * 2018-08-17 [16217f365](https://github.com/silverstripe/silverstripe-framework/commit/16217f3655c28ddcf6a721bca82d45d65b91e3ed) fix accidentaly deleted comma (maks) + * 2018-08-16 [61c046c](https://github.com/silverstripe/silverstripe-versioned/commit/61c046c9cd6ce97456b6123a05438c7cd05d07cc) If archive's possible switch GridField delete button with archive (Luke Edwards) + * 2018-08-15 [d9154bffb](https://github.com/silverstripe/silverstripe-framework/commit/d9154bffbf7b0031e5bd3ed1f68db3fae6ab5959) text/json is not a valid mimetype (Daniel Hensby) + * 2018-08-15 [d18b5ee](https://github.com/silverstripe/silverstripe-campaign-admin/commit/d18b5eed63e081a4cbcbb30edcf51839a2ae3461) text/json is not a valid mimetype (Daniel Hensby) + * 2018-08-15 [41a2a0c](https://github.com/silverstripe/silverstripe-admin/commit/41a2a0c38c073d82b96fd4fa2fa09bea3b556aa5) text/json is not a mimetype (Daniel Hensby) + * 2018-08-14 [fcaa9ba](https://github.com/silverstripe/silverstripe-versioned/commit/fcaa9ba7a68a839d84ff23d32275c510d0f9890e) Restore and archive action improvements (Luke Edwards) + * 2018-08-14 [fc7f712](https://github.com/silverstripe/silverstripe-admin/commit/fc7f7120a67ce95b03f13b4c8fb90b36f810f7b1) Modal response animation appearing outside the modal (#601) (Luke Edwards) + * 2018-08-07 [c2b54c7](https://github.com/silverstripe/silverstripe-admin/commit/c2b54c72a990df9d453bedc307f613f23107bfad) graphql route getting overwritten (Aaron Carlino) + * 2018-08-06 [e7cb0156](https://github.com/silverstripe/silverstripe-cms/commit/e7cb0156c69a3701b248dbbae4e72f8c0b372efd) Use LatestDraftVersion in GraphQL query to determine latest draft version (Robbie Averill) + * 2018-08-06 [13372f9a3](https://github.com/silverstripe/silverstripe-framework/commit/13372f9a37d1cb19f658404c79c2be6fbfa557b1) Installer redirect to home/ (without domain) (Michael Strong) + * 2018-08-02 [24927c5](https://github.com/silverstripe/silverstripe-campaign-admin/commit/24927c5aa18f9adc8ef79f0adf879f6bcd5c130c) Ensure only toolbar buttons that are immediate descendants of toolbars are given margins (Robbie Averill) + * 2018-08-01 [a981584](https://github.com/silverstripe/silverstripe-admin/commit/a9815845c0e923587fa81bdbac77be43f6d4dd1a) Remove rogue CSS margin on toolbar buttons. Implemented in campaign-admin preview instead. (Robbie Averill) + * 2018-08-01 [405d8a3](https://github.com/silverstripe/silverstripe-campaign-admin/commit/405d8a3213852f4a35e7cf8101df72c206d1b2f9) Toolbar button margins are constrained to campaign previews, and update ViewModeActions name (Robbie Averill) + * 2018-08-01 [6889a1a](https://github.com/silverstripe/silverstripe-admin/commit/6889a1adf0005e91288c4e2ddc6a2f3ea1b6b593) ViewModeToggle now uses BEM class naming convention (Robbie Averill) + * 2018-07-30 [420c3f8](https://github.com/silverstripe/silverstripe-asset-admin/commit/420c3f807d7426af2c76d778faa4ef26ab5dda11) Editor should ignore drag-and-drop files (#814) (Luke Edwards) + * 2018-07-30 [fde7b9ddc](https://github.com/silverstripe/silverstripe-framework/commit/fde7b9ddc5da697395897249819b3c52530692b6) Specify minimum composer version (Maxime Rainville) + * 2018-07-27 [67254da1](https://github.com/silverstripe/silverstripe-reports/commit/67254da18599f0fe86921098524ec3303d9de41e) Apply missing class to report header. (Maxime Rainville) + * 2018-07-26 [900ca9c8d](https://github.com/silverstripe/silverstripe-framework/commit/900ca9c8d75b70b13b425365022ec3f1f0ebe461) Recommend install of upgrader with PHAR exec. (Maxime Rainville) + * 2018-07-25 [0035f4a90](https://github.com/silverstripe/silverstripe-framework/commit/0035f4a90728d9e109b12585b32491a2afeaa916) Fix backtick in changelog breaking sentence formatting (Michal Kleiner) + * 2018-07-13 [d1024ee](https://github.com/silverstripe/silverstripe-assets/commit/d1024ee00b12c3a212fe12d168f4521e2188274b) Add HTMLFragment casting to $Tag (#148) (Jake Bentvelzen) + * 2018-07-12 [a8e5616](https://github.com/silverstripe/silverstripe-admin/commit/a8e56166f01ef0fb8ecd46edb4eddde30447cdb0) Update GridField.js so it works with new Archive View (#559) (Luke Edwards) + * 2018-07-12 [599a4420b](https://github.com/silverstripe/silverstripe-framework/commit/599a4420bf0d982343faa6145afaf6592566bb40) Improve GridFieldViewButton to work with new Archive Admin (#8240) (Luke Edwards) + * 2018-07-11 [c2347310](https://github.com/silverstripe/silverstripe-cms/commit/c23473103e4f93b82d60f1260923c9e413d02c41) URLSegment field styling fixes #2193 (Maxime Rainville) + * 2018-07-05 [91068c23b](https://github.com/silverstripe/silverstripe-framework/commit/91068c23b5cb448fe63ae9f40875a8f0818dbe1f) Make column query not distinct (Al Twohill) + * 2018-07-05 [730fc42](https://github.com/silverstripe/silverstripe-admin/commit/730fc42ef3e6d25345516f1583d05bf968bf762c) Fix test for password recovery (Ingo Schommer) + * 2018-07-01 [3262665b2](https://github.com/silverstripe/silverstripe-framework/commit/3262665b2d6bb6d56186be2e2e370b853f13c6b5) Fix link and turn of phrase. (Maxime Rainville) + * 2018-06-29 [cc9b36e01](https://github.com/silverstripe/silverstripe-framework/commit/cc9b36e01124349ea7ccbd0902d1b01c764f82f7) fix link (Lukas) + * 2018-06-22 [f9de357](https://github.com/silverstripe/silverstripe-admin/commit/f9de35724c4fb75c8a6d38e4f5b9185531fc961c) - Grid field headers misaligned (Petar Simic) + * 2018-06-18 [2f1c2992f](https://github.com/silverstripe/silverstripe-framework/commit/2f1c2992f8f61b4a87a0a363db289a19ac5a821b) Default cache state should be `no-cache` (Daniel Hensby) + * 2018-06-17 [25b0a18](https://github.com/silverstripe/silverstripe-admin/commit/25b0a18a743e81951a2d2df387b6e5442d0253c3) Fix display of GridField link existing button (Luke Edwards) + * 2018-06-15 [5e4ad34](https://github.com/silverstripe/silverstripe-installer/commit/5e4ad341622565cc998bd8537ad3ec7a6a6a7913) Fix incorrect base recipe dependency (Damian Mooyman) From 6e214e2e8b99370daf32828d9b3c31ecb276ed9c Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Thu, 13 Dec 2018 11:02:24 +1300 Subject: [PATCH 127/175] DOCS Updating Session doc to reflect that you need to operation on an instance. --- .upgrade.yml | 4 ++++ src/Control/Session.php | 39 +++++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.upgrade.yml b/.upgrade.yml index 8e06b802c..ffc5812cd 100644 --- a/.upgrade.yml +++ b/.upgrade.yml @@ -1284,6 +1284,10 @@ warnings: message: 'Removed SilverStripe\ORM\FieldType\DBDate->day_before()' 'days_between()': message: 'Removed SilverStripe\ORM\FieldType\DBDate->days_between()' + 'SilverStripe\Control\Session::get_all()': + message: 'Session can not be access statically and `get_all()` is now called `getAll()' + 'SilverStripe\Control\Session::clear_all()': + message: 'Session can not be access statically and `clear_all()` is now called `clearAll()' props: 'class': message: '$this->class access has been removed' diff --git a/src/Control/Session.php b/src/Control/Session.php index 917fea78c..31f48f3ea 100644 --- a/src/Control/Session.php +++ b/src/Control/Session.php @@ -9,46 +9,43 @@ use SilverStripe\Dev\Deprecation; /** * Handles all manipulation of the session. * - * The static methods are used to manipulate the currently active controller's session. - * The instance methods are used to manipulate a particular session. There can be more than one of these created. + * An instance of `Session` object can be retrieve via an `HTTPRequest` by calling the `getSession()` method. * * In order to support things like testing, the session is associated with a particular Controller. In normal usage, * this is loaded from and saved to the regular PHP session, but for things like static-page-generation and * unit-testing, you can create multiple Controllers, each with their own session. * - * The instance object is basically just a way of manipulating a set of nested maps, and isn't specific to session - * data. - * * Saving Data * - * You can write a value to a users session from your PHP code using the static function {@link Session::set()}. You - * can add this line in any function or file you wish to save the value. + * Once you've retrieved a session instance, you can write a value to a users session using the function {@link Session::set()}. * * - * Session::set('MyValue', 6); + * $request->getSession()->set('MyValue', 6); * * * Saves the value of "6" to the MyValue session data. You can also save arrays or serialized objects in session (but * note there may be size restrictions as to how much you can save) * * + * + * $session = $request->getSession(); + * * // save a variable * $var = 1; - * Session::set('MyVar', $var); + * $session->set('MyVar', $var); * * // saves an array - * Session::set('MyArrayOfValues', array('1', '2', '3')); + * $session->set('MyArrayOfValues', array('1', '2', '3')); * * // saves an object (you'll have to unserialize it back) * $object = new Object(); * - * Session::set('MyObject', serialize($object)); + * $session->set('MyObject', serialize($object)); * * * Accessing Data * * Once you have saved a value to the Session you can access it by using the {@link Session::get()} function. - * Like the {@link Session::set()} function you can use this anywhere in your PHP files. * Note that session data isn't persisted in PHP's own session store (via $_SESSION) * until {@link Session::save()} is called, which happens automatically at the end of a standard request * through {@link SilverStripe\Control\Middleware\SessionMiddleware}. @@ -57,17 +54,18 @@ use SilverStripe\Dev\Deprecation; * * * public function bar() { - * $value = Session::get('MyValue'); // $value = 6 - * $var = Session::get('MyVar'); // $var = 1 - * $array = Session::get('MyArrayOfValues'); // $array = array(1,2,3) - * $object = Session::get('MyObject', unserialize($object)); // $object = Object() + * $session = $this->getRequest()->getSession(); + * $value = $session->get('MyValue'); // $value = 6 + * $var = $session->get('MyVar'); // $var = 1 + * $array = $session->get('MyArrayOfValues'); // $array = array(1,2,3) + * $object = $session->get('MyObject', unserialize($object)); // $object = Object() * } * * * You can also get all the values in the session at once. This is useful for debugging. * * - * Session::get_all(); // returns an array of all the session values. + * $session::getAll(); // returns an array of all the session values. * * * Clearing Data @@ -76,17 +74,18 @@ use SilverStripe\Dev\Deprecation; * to specifically remove it. To clear a value you can either delete 1 session value by the name that you saved it * * - * Session::clear('MyValue'); // MyValue is no longer 6. + * $session->clear('MyValue'); // MyValue is no longer 6. * * * Or you can clear every single value in the session at once. Note SilverStripe stores some of its own session data - * including form and page comment information. None of this is vital but clear_all will clear everything. + * including form and page comment information. None of this is vital but `clearAll()` will clear everything. * * - * Session::clear_all(); + * $session->clearAll(); * * * @see Cookie + * @see HTTPRequest */ class Session { From 87b74b9cc10cc0129f56e16bd6cf9c896be208a1 Mon Sep 17 00:00:00 2001 From: Guy Marriott Date: Thu, 13 Dec 2018 13:50:35 +1300 Subject: [PATCH 128/175] Correcting Max's eggrigious typos Co-Authored-By: maxime-rainville --- .upgrade.yml | 4 ++-- src/Control/Session.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.upgrade.yml b/.upgrade.yml index ffc5812cd..6cd73bcf5 100644 --- a/.upgrade.yml +++ b/.upgrade.yml @@ -1285,9 +1285,9 @@ warnings: 'days_between()': message: 'Removed SilverStripe\ORM\FieldType\DBDate->days_between()' 'SilverStripe\Control\Session::get_all()': - message: 'Session can not be access statically and `get_all()` is now called `getAll()' + message: 'Session can not be accessed statically and `get_all()` is now called `getAll()' 'SilverStripe\Control\Session::clear_all()': - message: 'Session can not be access statically and `clear_all()` is now called `clearAll()' + message: 'Session can not be accessed statically and `clear_all()` is now called `clearAll()' props: 'class': message: '$this->class access has been removed' diff --git a/src/Control/Session.php b/src/Control/Session.php index 31f48f3ea..ff143dc83 100644 --- a/src/Control/Session.php +++ b/src/Control/Session.php @@ -9,7 +9,7 @@ use SilverStripe\Dev\Deprecation; /** * Handles all manipulation of the session. * - * An instance of `Session` object can be retrieve via an `HTTPRequest` by calling the `getSession()` method. + * An instance of a `Session` object can be retrieved via an `HTTPRequest` by calling the `getSession()` method. * * In order to support things like testing, the session is associated with a particular Controller. In normal usage, * this is loaded from and saved to the regular PHP session, but for things like static-page-generation and From 22314de559ce3d70b5769109eec47676f3441ba1 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 13 Dec 2018 15:50:50 +1300 Subject: [PATCH 129/175] DOCS Update security release docs / satis instructions (#7681) * DOCS Update security release docs / satis instructions * Update based on testing --- .../05_Making_A_SilverStripe_Core_Release.md | 161 ++++++++++++++---- 1 file changed, 127 insertions(+), 34 deletions(-) diff --git a/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md b/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md index 9dd42c2c1..31c85a71b 100644 --- a/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md +++ b/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md @@ -1,5 +1,5 @@ title: Making a SilverStripe core release -summary: Development guide for core contributors to build and publish a new release +summary: Development guide for core contributors to build and publish a new release # Making a SilverStripe core release @@ -12,7 +12,7 @@ The artifacts for this process are typically: * A downloadable tar / zip on silverstripe.org * A published announcement * A new composer installable stable tag for silverstripe/installer - + While this document is not normally applicable to normal silverstripe contributors, it is still useful to have it available in a public location so that these users are aware of these processes. @@ -29,7 +29,10 @@ As a core contributor it is necessary to have installed the following set of too be installed in a global location via the below command. Please see the installation docs on the cow repo for more setup details. `composer global require silverstripe/cow dev-master` -* [transifex client](http://docs.transifex.com/client/). +* [satis repository tool](https://github.com/composer/satis). This should be installed + globally for minimum maintenance. + `composer global require composer/satis ^1@dev` (or `^1@alpha` for php 5) +* [transifex client](http://docs.transifex.com/client/). `pip install transifex-client` If you're on OSX 10.10+, the standard Python installer is locked down. Use `brew install python; sudo easy_install pip` instead @@ -94,7 +97,7 @@ When doing a security release, typically one or more (or sometimes all) of the b steps will need to be performed manually. As such, this guide should not be followed exactly the same for these. -Standard practice is to produce a pre-release for any patched modules on the security +Standard practice is to produce a pre-release for any patched modules on the security forks for cms and framework (see [silverstripe-security](https://github.com/silverstripe-security)).
              @@ -118,14 +121,18 @@ Producing a security fix follows this general process: release date of the final stable is not known, then it's ok to give an estimated release schedule. * Push the current upstream target branches (e.g. 3.2) to the corresponding security fork - to a new branch named for the target release (e.g. 3.2.4). Security fixes should be - applied to this branch only. Once a fix (or fixes) have been applied to this branch, then - a tag can be applied, and a private release can then be developed in order - to test this release. + to the equivalent branch on [silverstripe-security](https://github.com/silverstripe-security). + Security fixes should be applied to the branch on this private repository only. + Once a fix (or fixes) have been applied to this branch, then a tag can be applied, + and a private release can then be developed in order to test this release. +* Once upstream branches are all pushed to the security forks, make sure to merge all + security fixes into those branches prior to running cow. +* Setup a temporary [satis](https://github.com/composer/satis) repository which points to all relevant repositories + containing security fixes. See below for setting up a temporary satis repository. * Once release testing is completed and the release is ready for stabilisation, then these fixes can then be pushed to the upstream module fork, and the release completed as per normal. Make sure to publish any draft security pages at the same time as the release is published (same day). -* After the final release has been published, close related JIRA issues +* After the final release has been published, close related JIRA issues at [open source security jira](https://silverstripe.atlassian.net/secure/RapidBoard.jspa?rapidView=198&view=detail)
              @@ -134,9 +141,62 @@ a public stable, not an RC or dev-branch. Security warnings that do not require can be published as soon as a workaround or usable resolution exists.
              +### Setting up satis for hosting private security releases + +When installing a project from protected repositories, it's necessary prior to creating your project +to override the public repository URLs with the private repositories containing undisclosed fixes. For +this we use [satis](https://github.com/composer/satis). + +To setup a Satis project for a release: + +* Ensure Satis is installed globally: `composer global require composer/satis ^1@dev` (or `^1@alpha` if you + are running php 5) +* `cd ~/Sites/` (or whereever your web-root is located) +* `mkdir satis-security && cd satis-security` (or some directory specific to your release) +* Create a config file (e.g. config.json) of the given format (add only those repositories necessary). + +Note: +- The homepage path should match the eventual location of the package content +- You should add the root repository (silverstripe/installer) to ensure + `create-project` works (even if not a private security fork). +- You should add some package version constraints to prevent having to parse + all legacy tags and all branches. + +```json +{ + "name": "SilverStripe Security Repository", + "homepage": "http://localhost/satis-security/public", + "repositories": { + "installer": { + "type": "vcs", + "url": "https://github.com/silverstripe/silverstripe-installer.git" + }, + "framework": { + "type": "vcs", + "url": "https://github.com/silverstripe-security/silverstripe-framework.git" + } + }, + "require": { + "silverstripe/installer": "^3.5 || ^4", + "silverstripe/framework": "^3.5 || ^4" + }, + "require-all": true +} +``` + +* Build the repository: + `satis build config.json ./public` +* Test you can view the satis home page at `http://localhost/satis-security/public/` +* When performing the release ensure you use `--repository=http://localhost/satis-security/public` (below) + +
              +It's important that you re-run `satis build` step after EVERY change that is pushed upstream; E.g. between +each release, if making multiple releases. +
              + ## Standard release process -The release process, at a high level, involves creating a release, publishing it, and +The release process, at a high level, involves creating a release, publishing it, and reviewing the need for either another pre-release or a final stable tag within a short period (normally within 3-5 business days). @@ -157,9 +217,9 @@ cross-posted to other relevant channels such as Twitter and Facebook. Sending an email to [marketing@silverstripe.com](mailto:marketing@silverstripe.com) with an overview of the release and a rough release timeline. -Check all tickets ([framework](https://github.com/silverstripe/silverstripe-framework/milestones), -[cms](https://github.com/silverstripe/silverstripe-cms/milestones), -[installer](https://github.com/silverstripe/silverstripe-installer/milestones)) assigned to that milestone are +Check all tickets ([framework](https://github.com/silverstripe/silverstripe-framework/milestones), +[cms](https://github.com/silverstripe/silverstripe-cms/milestones), +[installer](https://github.com/silverstripe/silverstripe-installer/milestones)) assigned to that milestone are either closed or reassigned to another milestone. Merge up from other older supported release branches (e.g. merge `3.1`->`3.2`, `3.2`->`3.3`, `3.3`->`3`, `3`->`master`). @@ -170,13 +230,29 @@ any mistakes migrating their way into the public sphere). Invoked by running `cow release` in the format as below: -``` -cow release -vvv -``` +`cow release -vvv` -This command has the following parameters: +E.g. -* `` The version that is to be released. E.g. 3.2.4 or 4.0.0-alpha4 +`cow release 4.0.1 -vvv` + +* `` is mandatory and must be the exact tag name to release including rc/alpha/beta if applicable. + +This command has these options (note that --repository option is critical for security releases): + +* `-vvv` to ensure all underlying commands are echoed +* `--directory ` to specify the folder to create or look for this project in. If you don't specify this, +it will install to the path specified by `./release-` in the current directory. +* `--repository ` will allow a custom composer package url to be specified. E.g. `http://packages.cwp.govt.nz` + See the above section "Setting up satis for hosting private security releases" on how to prepare a custom + repository for a security release. +* `--branching ` will specify a branching strategy. This allows these options: + * `auto` - Default option, will branch to the minor version (e.g. 1.1) unless doing a non-stable tag (e.g. rc1) + * `major` - Branch all repos to the major version (e.g. 1) unless already on a more-specific minor version. + * `minor` - Branch all repos to the minor semver branch (e.g. 1.1) + * `none` - Release from the current branch and do no branching. +* `--skip-tests` to skip tests +* `--skip-i18n` to skip updating localisations This can take between 5-15 minutes, and will invoke the following steps, each of which can also be run in isolation (in case the process stalls @@ -189,14 +265,16 @@ and needs to be manually advanced): know to install dev-master, and installing 3.3.0 will install from 3.x-dev. If installing pre-release versions for stabilisation, it will use the correct temporary release branch. -* `release:branch` If release:create installed from a non-rc branch, it will - create the new temporary release branch (via `--branch-auto`). You can also customise this branch - with `--branch=`, but it's best to use the standard. +* `release:plan` The release plan will be auto-generated, and presented on the screen + for the user to modify or confirm. At this stage you can also modify the branching + behaviour to be performed in the next step. +* `release:branch` This will branch all released modules to the correct branch, if necessary. + E.g. branching 3.7 from 3 branch in order to create the new minor version. * `release:translate` All upstream transifex strings will be pulled into the - local master strings, and then the [i18nTextCollector](api:SilverStripe\i18n\TextCollection\i18nTextCollector) task will be invoked - and will merge these strings together, before pushing all new master strings - back up to transifex to make them available for translation. Changes to these - files will also be automatically committed to git. + local master strings, and then the [i18nTextCollector](api:SilverStripe\i18n\TextCollection\i18nTextCollector) + task will be invoked and will merge these strings together, before pushing all + new master strings back up to transifex to make them available for translation. + Changes to these files will also be automatically committed to git. * `release:test` Will run all unit tests on this release. Make sure that you setup your `.env` correctly (as above) so that this will work. * `release:changelog` Will compare the current branch head with `--from` parameter @@ -242,9 +320,24 @@ building an archive, and uploading to Invoked by running `cow release:publish` in the format as below: -``` -cow release:publish -vvv -``` +`cow release:publish -vvv` + +E.g. + +`cow release:publish 4.0.1` + +This command has these options: + +* `-vvv` to ensure all underlying commands are echoed +* `--directory ` to specify the folder to look for the project created in the prior step. As with + above, it will be guessed if omitted. You can run this command in the `./release-` directory and + omit this option. +* `--aws-profile ` to specify the AWS profile name for uploading releases to s3. Check with + damian@silverstripe.com if you don't have an AWS key setup. +* `--skip-archive-upload` to disable both "archive" and "upload". This is useful if doing a private release and + you don't want to upload this file to AWS. +* `--skip-upload` to disable the "upload" command (but not archive) + As with the `cow release` command, this step is broken down into the following subtasks which are invoked in sequence: @@ -257,7 +350,7 @@ subtasks which are invoked in sequence: If the tags generated in the prior step are not yet available on packagist (which can take a few minutes at times) then this task will cycle through a retry-cycle, which will re-attempt the archive creation periodically until these tags are available. -* `release:upload` This will invoke the AWS CLI command to upload these archives to the +* `release:upload` This will invoke the AWS CLI command to upload these archives to the s3 bucket `silverstripe-ssorg-releases`. If you have setup your AWS profile for silverstripe releases under a non-default name, you can specify this profile on the command line with the `--aws-profile=` command. @@ -271,9 +364,9 @@ aren't strictly able to be automated: source branch (e.g. merge 3.2.4 into 3.2), or sometimes create new branches if releasing a new minor version, and bumping up the branch-alias in composer.json. E.g. branching 3.3 from 3, and aliasing 3 as 3.4.x-dev. You can then delete - the temporary release branches. This will need to be done before updating the + the temporary release branches. This will need to be done before updating the release documentation in stage 3. -* Merging up the changes in this release to newer branches, following the +* Merging up the changes in this release to newer branches, following the SemVer pattern (e.g. 3.2.4 > 3.2 > 3.3 > 3 > master). The more often this is done the easier it is, but this can sometimes be left for when you have more free time. Branches not receiving regular stable versions anymore (e.g. @@ -282,7 +375,7 @@ aren't strictly able to be automated: minor versions. It may be necessary to re-assign any issues assigned to the prior milestones to these new ones. * Make sure that the [releases page](https://github.com/silverstripe/silverstripe-installer/releases) - on github shows the new tag. + on github shows the new tag. *Updating non-patch versions* @@ -329,7 +422,7 @@ Running either of these tasks may time out when requested, but will continue to only the search index rebuild takes a long period of time. Note that markdown is automatically updated daily, and this should only be done if an immediate refresh is necessary. - + ### Stage 3: Let the world know Once a release has been published there are a few places where user documentation @@ -337,7 +430,7 @@ will need to be regularly updated. * Make sure that the [download page](http://www.silverstripe.org/download) on silverstripe.org has the release available. If it's a stable, it will appear - at the top of the page. If it's a pre-release, it will be available under the + at the top of the page. If it's a pre-release, it will be available under the [development builds](http://www.silverstripe.org/download#download-releases) section. If it's not available, you might need to check that the release was properly uploaded to aws s3, or that you aren't viewing a cached version of From 1644765a9f6aaf5187c97c2ea8172de75a91298f Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Thu, 13 Dec 2018 03:49:12 +0000 Subject: [PATCH 130/175] Rebase against satis changes (#8298) --- .../05_Making_A_SilverStripe_Core_Release.md | 48 ++++++++----------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md b/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md index 31c85a71b..0ebc76154 100644 --- a/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md +++ b/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md @@ -28,10 +28,10 @@ As a core contributor it is necessary to have installed the following set of too * [cow release tool](https://github.com/silverstripe/cow#install). This should typically be installed in a global location via the below command. Please see the installation docs on the cow repo for more setup details. - `composer global require silverstripe/cow dev-master` + `composer global require silverstripe/cow ^2` * [satis repository tool](https://github.com/composer/satis). This should be installed globally for minimum maintenance. - `composer global require composer/satis ^1@dev` (or `^1@alpha` for php 5) + `composer global require composer/satis ^1` * [transifex client](http://docs.transifex.com/client/). `pip install transifex-client` If you're on OSX 10.10+, the standard Python installer is locked down. @@ -149,9 +149,8 @@ this we use [satis](https://github.com/composer/satis). To setup a Satis project for a release: -* Ensure Satis is installed globally: `composer global require composer/satis ^1@dev` (or `^1@alpha` if you - are running php 5) -* `cd ~/Sites/` (or whereever your web-root is located) +* Ensure Satis is installed globally: `composer global require composer/satis ^1` +* `cd ~/Sites/` (or wherever your web-root is located) * `mkdir satis-security && cd satis-security` (or some directory specific to your release) * Create a config file (e.g. config.json) of the given format (add only those repositories necessary). @@ -200,11 +199,6 @@ The release process, at a high level, involves creating a release, publishing it reviewing the need for either another pre-release or a final stable tag within a short period (normally within 3-5 business days). -During the pre-release cycle a temporary branch is created, and should only receive -absolutely critical fixes during the cycle. Any changes to this branch should -result in the requirement for a new release, thus a higher level of scrutiny is typically -placed on any pull request to these branches. - When creating a new pre-release or stable, the following process is broken down into two main sets of commands: @@ -222,7 +216,7 @@ Check all tickets ([framework](https://github.com/silverstripe/silverstripe-fram [installer](https://github.com/silverstripe/silverstripe-installer/milestones)) assigned to that milestone are either closed or reassigned to another milestone. -Merge up from other older supported release branches (e.g. merge `3.1`->`3.2`, `3.2`->`3.3`, `3.3`->`3`, `3`->`master`). +Merge up from other older supported release branches (e.g. merge `4.0`->`4.1`, `4.1`->`4.2`, `4.2`->`4`, `4`->`master`). This is the part of the release that prepares and tests everything locally, but doe not make any upstream changes (so it's safe to run without worrying about @@ -230,13 +224,14 @@ any mistakes migrating their way into the public sphere). Invoked by running `cow release` in the format as below: -`cow release -vvv` +`cow release [recipe] -vvv` E.g. `cow release 4.0.1 -vvv` -* `` is mandatory and must be the exact tag name to release including rc/alpha/beta if applicable. +* `` The version that is to be released. E.g. `4.1.4` or `4.3.0-rc1` +* `` `Optional: the recipe that is being released (default: "silverstripe/installer") This command has these options (note that --repository option is critical for security releases): @@ -265,11 +260,12 @@ and needs to be manually advanced): know to install dev-master, and installing 3.3.0 will install from 3.x-dev. If installing pre-release versions for stabilisation, it will use the correct temporary release branch. -* `release:plan` The release plan will be auto-generated, and presented on the screen - for the user to modify or confirm. At this stage you can also modify the branching - behaviour to be performed in the next step. -* `release:branch` This will branch all released modules to the correct branch, if necessary. - E.g. branching 3.7 from 3 branch in order to create the new minor version. +* `release:plan` The release planning will take place, this reads the various dependencies of the recipe being released + and determines what new versions of those dependencies need to be tagged to create the final release. The conclusion + of the planning step is output to the screen and requires user confirmation. +* `release:branch` If release:create installed from a non-rc branch, it will + create the new temporary release branch (via `--branch-auto`). You can also customise this branch + with `--branch=`, but it's best to use the standard. * `release:translate` All upstream transifex strings will be pulled into the local master strings, and then the [i18nTextCollector](api:SilverStripe\i18n\TextCollection\i18nTextCollector) task will be invoked and will merge these strings together, before pushing all @@ -298,9 +294,7 @@ for the various modules (e.g. [framework](https://travis-ci.org/silverstripe/sil and [cms](https://travis-ci.org/silverstripe/silverstripe-cms)). It's also ideal to eyeball the git changes generated by the release tool, making sure -that no translation strings were unintentionally lost, no malicious changes were -introduced in the (community contributed) translations, and that the changelog -was generated correctly. +that no translation strings were unintentionally lost, and that the changelog was generated correctly. In particular, double check that all necessary information is included in the release notes, including: @@ -320,11 +314,11 @@ building an archive, and uploading to Invoked by running `cow release:publish` in the format as below: -`cow release:publish -vvv` +`cow release:publish [] -vvv` E.g. -`cow release:publish 4.0.1` +`cow release:publish 4.0.1 silverstripe/installer` This command has these options: @@ -341,8 +335,8 @@ This command has these options: As with the `cow release` command, this step is broken down into the following subtasks which are invoked in sequence: -* `release:tag` Each module will have the appropriate tag applied (except the theme). -* `release:push` The temporary release branches and all tags are pushed up to origin on github. +* `release:tag` Each module will have the appropriate tag applied (except the theme). All tags are pushed up to origin + on github. * `release:archive` This will generate a new tar.gz and zip archive, each for cms and framework-only installations. These will be copied to the root folder of the release directory, although the actual build will be created in temporary @@ -359,7 +353,7 @@ subtasks which are invoked in sequence: Once all of these commands have completed there are a couple of final tasks left that aren't strictly able to be automated: -* If this is a stable release, it will be necessary to perform a post-release merge +* It will be necessary to perform a post-release merge on open source. This normally will require you to merge the temporary release branch into the source branch (e.g. merge 3.2.4 into 3.2), or sometimes create new branches if releasing a new minor version, and bumping up the branch-alias in composer.json. @@ -370,7 +364,7 @@ aren't strictly able to be automated: SemVer pattern (e.g. 3.2.4 > 3.2 > 3.3 > 3 > master). The more often this is done the easier it is, but this can sometimes be left for when you have more free time. Branches not receiving regular stable versions anymore (e.g. - 3.0 or 3.1) should usually be omitted. + 3.0 or 3.1) can be omitted. * Set the github milestones to completed, and create placeholders for the next minor versions. It may be necessary to re-assign any issues assigned to the prior milestones to these new ones. From 7f6b80f87d8e360e5bb8269fbd81e9ea692826d6 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Fri, 14 Dec 2018 13:01:22 +1300 Subject: [PATCH 131/175] Correct session doc typo --- src/Control/Session.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Control/Session.php b/src/Control/Session.php index ff143dc83..b79bc2c58 100644 --- a/src/Control/Session.php +++ b/src/Control/Session.php @@ -65,7 +65,7 @@ use SilverStripe\Dev\Deprecation; * You can also get all the values in the session at once. This is useful for debugging. * * - * $session::getAll(); // returns an array of all the session values. + * $session->getAll(); // returns an array of all the session values. * * * Clearing Data From bbaba60199ed7e2064cb01fbe3ffa7caebae37b3 Mon Sep 17 00:00:00 2001 From: Katja Durrani Date: Mon, 17 Dec 2018 23:56:36 +0000 Subject: [PATCH 132/175] Update link to first theme tutorial to link to first project (link was broken) --- docs/en/00_Getting_Started/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/00_Getting_Started/index.md b/docs/en/00_Getting_Started/index.md index 7e93fa4f8..686d0dbf5 100644 --- a/docs/en/00_Getting_Started/index.md +++ b/docs/en/00_Getting_Started/index.md @@ -67,7 +67,7 @@ check our [community help options](https://www.silverstripe.org/community/). ## Related Lessons * [Up and running](https://www.silverstripe.org/learn/lessons/v4/up-and-running-setting-up-a-local-silverstripe-dev-environment-1) -* [Creating your first theme](https://www.silverstripe.org/learn/lessons/v4/creating-your-first-theme-1) +* [Creating your first project](https://www.silverstripe.org/learn/lessons/v4/creating-your-first-project) * [Migrating static templates into your theme](https://www.silverstripe.org/learn/lessons/v4/migrating-static-templates-into-your-theme-1) * [Working with multiple templates](https://www.silverstripe.org/learn/lessons/v4/working-with-multiple-templates-1) From 783b1040393f45721c150879d90f2f3c6e10b220 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 18 Dec 2018 16:19:36 +1300 Subject: [PATCH 133/175] DOC Clarify testing cache behaviour changes in 4.3 --- .../02_Developer_Guides/06_Testing/index.md | 10 ++++++++ docs/en/04_Changelogs/4.3.0.md | 23 +++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/docs/en/02_Developer_Guides/06_Testing/index.md b/docs/en/02_Developer_Guides/06_Testing/index.md index e00266f07..c2bdb461d 100644 --- a/docs/en/02_Developer_Guides/06_Testing/index.md +++ b/docs/en/02_Developer_Guides/06_Testing/index.md @@ -38,6 +38,16 @@ Check the PHPUnit manual for all available [command line arguments](http://www.p On Linux or OSX, you can avoid typing the full path on every invocation by adding `vendor/bin` to your `$PATH` definition in the shell profile (usually `~/.profile`): `PATH=./vendor/bin:$PATH` +## Caching + +Just like on web requests, SilverStripe caches metadata about the execution context. +This cache can get stale, e.g. when you change YAML configuration or add certain types of PHP code. +In order to flush the cache, use the `flush=1` CLI parameter: + +``` +vendor/bin/phpunit vendor/silverstripe/framework/tests '' flush=1 +``` + ## Generating a Coverage Report PHPUnit can generate a code coverage report ([docs](http://www.phpunit.de/manual/current/en/code-coverage-analysis.html)) diff --git a/docs/en/04_Changelogs/4.3.0.md b/docs/en/04_Changelogs/4.3.0.md index 9ab7760ee..ed6f321da 100644 --- a/docs/en/04_Changelogs/4.3.0.md +++ b/docs/en/04_Changelogs/4.3.0.md @@ -8,6 +8,7 @@ - New React-based search UI for the CMS, Asset-Admin, GridFields and ModelAdmins. - A new `GridFieldLazyLoader` component can be added to `GridField`. This will delay the fetching of data until the user access the container Tab of the GridField. - `SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController` is now the default CMS history controller and `SilverStripe\CMS\Controllers\CMSPageHistoryController` has been deprecated. + - PHPUnit tests no longer auto-flush, requiring manual flush parameters when changing YAML config or certain PHP code ## Upgrading {#upgrading} @@ -69,6 +70,28 @@ SilverStripe\Core\Injector\Injector: [Implementing a _Factory_ with the Injector](/developer_guides/extending/injector/#factories) +### PHPUnit tests no longer auto-flush + +SilverStripe caches certain metadata in manifests, for example YAML configuration +and certain PHP class structures (e.g. `ClassInfo::implementorsOf()`). +This is also the case for CLI executions such as PHPUnit. + +Starting with SilverStripe 4.0, PHPUnit executions flushed the cache automatically. +While this meant less work for developers in manually flushing caches, +it significantly increased the time to run each test (from sub-second to multi-second). +In order to allow for efficient test execution and Test Driven Development (TDD), +we have decided to treat this as a performance regression. + +In order to flush manifests on test execution, please use the following command +(note the empty quoted string): + +``` +vendor/bin/phpunit vendor/silverstripe/framework/tests '' flush=1 +``` + +See our [testing guide](https://docs.silverstripe.org/en/4/developer_guides/testing/) +for more details. + ## Change Log From cc51ffea687a23a16512b1735b176a4f6f8c372d Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 18 Dec 2018 16:39:32 +1300 Subject: [PATCH 134/175] DOCS Minor wording changes on release process docs --- docs/en/05_Contributing/04_Release_Process.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/en/05_Contributing/04_Release_Process.md b/docs/en/05_Contributing/04_Release_Process.md index a47ae538f..18167c4ed 100644 --- a/docs/en/05_Contributing/04_Release_Process.md +++ b/docs/en/05_Contributing/04_Release_Process.md @@ -179,7 +179,7 @@ Follow these instructions in sequence as much as possible: * Before release (or release candidate) * Merge back from [http://github.com/silverstripe-security](http://github.com/silverstripe-security) repos shortly at the release (minimise early disclosure through source code) * Merge up to newer minor release branches (see [Supported Versions](#supported-versions)) - * Send out a note on the pre-announce list with a highlevel description of the issue and impact (usually a copy of the yet unpublished security release page on silverstripe.org) + * Send out a note on the pre-announcement mailing list with a highlevel description of the issue and impact (usually a copy of the yet unpublished security release page on silverstripe.org) * Link to silverstripe.org security release page in the changelog. * Move the issue to "Awaiting Release" in the [project board](https://github.com/silverstripe-security/security-issues/projects/1) * Perform release @@ -189,20 +189,20 @@ Follow these instructions in sequence as much as possible: * Respond to issue reporter with reference to the release on the same discussion thread (cc security@silverstripe.org) * Move the issue to "Done" in the [project board](https://github.com/silverstripe-security/security-issues/projects/1) -### Pre-announce Mailinglist +### Pre-announcement mailing list In addition to our public disclosure process, we maintain a private mailinglist -where upcoming security releases will be pre-announced. Members in this list will receive a security +where upcoming security releases are pre-announced. Members of this list will receive a security pre-announcement as soon as it has been sufficiently researched, -alongside a timeline for the upcoming release. This will happen a few days before +with a timeline for the upcoming release. This will happen a few days before the announcement goes public alongside new release, and most likely before a patch has been developed. -Since we’ll distribute sensitive info on unpatched vulnerabilities in this list, +Since we’ll distribute sensitive information on unpatched vulnerabilities in this list, the selection criteria for joining naturally has to be strict. Applicants should provide references within the community, -as well as a demonstrated need for this level of information (e.g. a large website with sensitive customer data). +as well as a demonstrated need for this level of information (e.g. involvement with a large website with sensitive customer data). You don’t need to be a client of SilverStripe Ltd to get on board, -but we will need to perform some low-touch background checks to ensure identity. +but we will need to perform some low-touch background checks to verify your identity. Please contact security@silverstripe.org for details. ## Quality Assurance and Testing From 8b601b8eccf63c812c7cf56d69afd25af790b096 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 19 Dec 2018 09:41:44 +1300 Subject: [PATCH 135/175] DOCS Further wording changes to pre announce release docs --- docs/en/05_Contributing/04_Release_Process.md | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/docs/en/05_Contributing/04_Release_Process.md b/docs/en/05_Contributing/04_Release_Process.md index 18167c4ed..9b24b9ef2 100644 --- a/docs/en/05_Contributing/04_Release_Process.md +++ b/docs/en/05_Contributing/04_Release_Process.md @@ -191,20 +191,22 @@ Follow these instructions in sequence as much as possible: ### Pre-announcement mailing list -In addition to our public disclosure process, we maintain a private mailinglist -where upcoming security releases are pre-announced. Members of this list will receive a security -pre-announcement as soon as it has been sufficiently researched, -with a timeline for the upcoming release. This will happen a few days before -the announcement goes public alongside new release, and most likely before a patch has been developed. +In addition to our public disclosure process, we maintain a private mailing list where upcoming security releases +are pre-announced. Members of this list will receive a security pre-announcement, as soon as it has been +sufficiently researched, with a timeline for the upcoming release. +This will happen a few days before the announcement goes public alongside a new release, +and most likely before a patch has been developed. -Since we’ll distribute sensitive information on unpatched vulnerabilities in this list, -the selection criteria for joining naturally has to be strict. -Applicants should provide references within the community, -as well as a demonstrated need for this level of information (e.g. involvement with a large website with sensitive customer data). +Since we’ll distribute sensitive information on unpatched vulnerabilities in this list, +the selection criteria for joining naturally has to be strict. +Applicants should provide references within the community, +as well as a demonstrated need for this level of information +(e.g. involvement with a large website with sensitive customer data). You don’t need to be a client of SilverStripe Ltd to get on board, -but we will need to perform some low-touch background checks to verify your identity. +but we will need to perform some low-touch background checks to verify your identity. Please contact security@silverstripe.org for details. + ## Quality Assurance and Testing The quality of our software is important to us, and we continously test it for regressions From 9bdd5fb162d8ec42d356c702dba9a818f99ac1cd Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 19 Dec 2018 10:20:46 +1300 Subject: [PATCH 136/175] DOCS Replaced references to core mailinglist with forum --- docs/en/05_Contributing/00_Issues_and_Bugs.md | 3 +-- docs/en/05_Contributing/01_Code.md | 4 ++-- docs/en/05_Contributing/04_Release_Process.md | 2 +- docs/en/05_Contributing/07_Translations.md | 2 +- docs/en/05_Contributing/index.md | 2 +- docs/en/index.md | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/en/05_Contributing/00_Issues_and_Bugs.md b/docs/en/05_Contributing/00_Issues_and_Bugs.md index 2a51906f8..b45905b0a 100644 --- a/docs/en/05_Contributing/00_Issues_and_Bugs.md +++ b/docs/en/05_Contributing/00_Issues_and_Bugs.md @@ -57,6 +57,5 @@ read our guide on [how to write secure code](/developer_guides/security/secure_c ## Sharing your Opinion -* [silverstripe.org/forums](http://www.silverstripe.org/community/forums/): Forums on silverstripe.org -* [silverstripe-dev](http://groups.google.com/group/silverstripe-dev/): Core development mailinglist +* [forum.silverstripe.org](http://forum.silverstripe.org): Forums on silverstripe.org * [All issues across modules](https://www.silverstripe.org/community/contributing-to-silverstripe/github-all-core-issues) diff --git a/docs/en/05_Contributing/01_Code.md b/docs/en/05_Contributing/01_Code.md index e6956cc78..fc825ed5f 100644 --- a/docs/en/05_Contributing/01_Code.md +++ b/docs/en/05_Contributing/01_Code.md @@ -93,7 +93,7 @@ Once your pull request is issued, it's not the end of the road. A [core committe If you've been naughty and not adhered to the [coding conventions](coding_conventions), expect a few requests to make changes so your code is in-line. -If your change is particularly significant, it may be referred to the [mailing list](https://groups.google.com/forum/#!forum/silverstripe-dev) for further community discussion. +If your change is particularly significant, it may be referred to the [forum](https://forum.silverstripe.org) for further community discussion. A core committer will also "label" your PR using the labels defined in GitHub, these are to correctly classify and help find your work at a later date. @@ -165,7 +165,7 @@ After you have edited the file, GitHub will offer to create a pull request for y [API documentation](https://api.silverstripe.org/) for good examples. * Check and update documentation on [docs.silverstripe.org](https://docs.silverstripe.org). Check for any references to functionality deprecated or extended through your patch. Documentation changes should be included in the patch. * When introducing something "noteworthy" (new feature, API change), [update the release changelog](/changelogs) for the next release this commit will be included in. -* If you get stuck, please post to the [forum](https://www.silverstripe.org/community/forums) or for deeper core problems, to the [core mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev) +* If you get stuck, please post to the [forum](https://www.silverstripe.org/community/forums) * When working with the CMS, please read the ["CMS Architecture Guide"](/developer_guides/customising_the_admin_interface/cms_architecture) first ## Commit Messages diff --git a/docs/en/05_Contributing/04_Release_Process.md b/docs/en/05_Contributing/04_Release_Process.md index 9b24b9ef2..04f427756 100644 --- a/docs/en/05_Contributing/04_Release_Process.md +++ b/docs/en/05_Contributing/04_Release_Process.md @@ -136,7 +136,7 @@ timeline and ask the reporter to keep the issue confidential until we announce i Additionally, [CVE](http://cve.mitre.org) numbers are accepted. * Halt all other development as long as is needed to develop a fix, including patches against the current and one previous major release (if applicable). -* Pre-announce the upcoming security release to a private mailing list of important stakeholders (see below). +* Pre-announce the upcoming security release to aprivate pre-announcement mailing list of important stakeholders (see below). * We will inform you about resolution and [announce](https://forum.silverstripe.org/c/releases) a [new release](http://silverstripe.org/security-releases/) publically. diff --git a/docs/en/05_Contributing/07_Translations.md b/docs/en/05_Contributing/07_Translations.md index 8d2f13066..a0936cb96 100644 --- a/docs/en/05_Contributing/07_Translations.md +++ b/docs/en/05_Contributing/07_Translations.md @@ -134,7 +134,7 @@ This also applies for any modules staying compatible with SilverStripe 2.x. ## Contact -Translators have their own [mailinglist](https://groups.google.com/forum/#!forum/silverstripe-translators), but you can +Translators have their own [mailing list](https://groups.google.com/forum/#!forum/silverstripe-translators), but you can also reach a core member on [IRC](https://irc.silverstripe.org). The transifex.com interface has a built-in discussion board if you have specific comments on a translation. diff --git a/docs/en/05_Contributing/index.md b/docs/en/05_Contributing/index.md index 1ff09d388..687d569be 100644 --- a/docs/en/05_Contributing/index.md +++ b/docs/en/05_Contributing/index.md @@ -3,7 +3,7 @@ introduction: Any open source product is only as good as the community behind it ## House rules for everybody contributing to SilverStripe * Read over the SilverStripe Community [Code of Conduct](code_of_conduct) - * Ask questions on the [forum](http://silverstripe.org/community/forums), and stick to more high-level discussions on the [core mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev) + * Ask questions on the [forum](http://silverstripe.org/community/forums) * Make sure you know how to [raise good bug reports](issues_and_bugs) * Everybody can contribute to SilverStripe! If you do, ensure you can [submit solid pull requests](code) diff --git a/docs/en/index.md b/docs/en/index.md index 89e4064b9..d2aa1808a 100644 --- a/docs/en/index.md +++ b/docs/en/index.md @@ -15,13 +15,13 @@ and play with the interactive [demo website](http://demo.silverstripe.org/). SilverStripe has an wide range of options for getting support: +* Join our [forum](https://forum.silverstripe.org) * Ask technical questions on [Stack Overflow](https://stackoverflow.com/questions/tagged/silverstripe) * Get help on our [Slack channel](https://www.silverstripe.org/community/slack-signup/) * Read the technical reference in our [API Documentation](http://api.silverstripe.org/) * Get a user-focused overview of the CMS features in our [User Help](http://userhelp.silverstripe.com) * Discuss new features, API changes and the development [roadmap](http://www.silverstripe.org/software/roadmap/) on [UserVoice](http://silverstripe.uservoice.com/forums/251266-new-features) -* Join our [core mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev) ## Building your first SilverStripe Web application From 2deb8f4176193486356fbda9061c6c62463d76fe Mon Sep 17 00:00:00 2001 From: Simon Gow Date: Tue, 27 Nov 2018 16:40:15 +1300 Subject: [PATCH 137/175] Resolve Duplicate Headers Ensure only a single Set-Cookie header is returned from Session once we have data to save. Include backwards compatibility for PHP56 --- src/Control/Session.php | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/Control/Session.php b/src/Control/Session.php index 917fea78c..7f00c7bd4 100644 --- a/src/Control/Session.php +++ b/src/Control/Session.php @@ -300,6 +300,7 @@ class Session // If the session cookie is already set, then the session can be read even if headers_sent() = true // This helps with edge-case such as debugging. + $data = []; if (!session_id() && (!headers_sent() || !empty($_COOKIE[ini_get('session.name')]))) { if (!headers_sent()) { session_set_cookie_params($timeout, $path, $domain ?: null, $secure, true); @@ -319,36 +320,38 @@ class Session session_save_path($session_path); } - // If we want a secure cookie for HTTPS, use a seperate session name. This lets us have a - // seperate (less secure) session for non-HTTPS requests. Note that if this causes problems + // If we want a secure cookie for HTTPS, use a separate session name. This lets us have a + // separate (less secure) session for non-HTTPS requests // if headers_sent() is true then it's best to throw the resulting error rather than risk // a security hole. if ($secure) { session_name($this->config()->get('cookie_name_secure')); } - session_start(); + $sessionParameters = [ + "cookie_path" => $path, + "cookie_domain" => $domain ?: "", + "cookie_secure" => $secure, + "cookie_httponly" => true + ]; + + if ($timeout) { + $sessionParameters["cookie_lifetime"] = $timeout; + } + + session_start($sessionParameters); if (isset($_SESSION)) { // Initialise data from session store if present $data = $_SESSION; + // Merge in existing in-memory data, taking priority over session store data $this->recursivelyApply((array)$this->data, $data); - } else { - // Use in-memory data if the session is lazy started - $data = $this->data; } - $this->data = $data ?: []; - } else { - $this->data = []; } - // Modify the timeout behaviour so it's the *inactive* time before the session expires. - // By default it's the total session lifetime - if ($timeout && !headers_sent()) { - Cookie::set(session_name(), session_id(), $timeout/86400, $path, $domain ? $domain - : null, $secure, true); - } + // Save any modified session data back to the session store if present, otherwise initialise it to an array. + $this->data = $data; $this->started = true; } From 4eb6669c08aa096fc46679d80a3d4424bf93f06e Mon Sep 17 00:00:00 2001 From: Simon Gow Date: Mon, 3 Dec 2018 10:08:50 +1300 Subject: [PATCH 138/175] #8543 Resolve Duplicate Headers Put cookie_lifetime back into the session parameters. --- src/Control/Session.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Control/Session.php b/src/Control/Session.php index 7f00c7bd4..cd543109c 100644 --- a/src/Control/Session.php +++ b/src/Control/Session.php @@ -331,14 +331,11 @@ class Session $sessionParameters = [ "cookie_path" => $path, "cookie_domain" => $domain ?: "", + "cookie_lifetime" => $timeout ?: 0, "cookie_secure" => $secure, "cookie_httponly" => true ]; - if ($timeout) { - $sessionParameters["cookie_lifetime"] = $timeout; - } - session_start($sessionParameters); if (isset($_SESSION)) { From 1edfa4d956925dc02590a1eec404181ac4b6eef9 Mon Sep 17 00:00:00 2001 From: Simon Gow Date: Mon, 3 Dec 2018 12:28:21 +1300 Subject: [PATCH 139/175] #8543 Resolve Duplicate Headers - Replace session name lookup with function to also check secure cookies - Added timeout which defaults to 0 (same as PHP) - Removed php7 style of session_start from PR - moved session_start into headers sent block to prevent warnings. --- src/Control/Session.php | 44 +++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/src/Control/Session.php b/src/Control/Session.php index cd543109c..5b8f25c28 100644 --- a/src/Control/Session.php +++ b/src/Control/Session.php @@ -301,43 +301,35 @@ class Session // If the session cookie is already set, then the session can be read even if headers_sent() = true // This helps with edge-case such as debugging. $data = []; - if (!session_id() && (!headers_sent() || !empty($_COOKIE[ini_get('session.name')]))) { + if (!session_id() && (!headers_sent() || $this->requestContainsSessionId($request))) { if (!headers_sent()) { - session_set_cookie_params($timeout, $path, $domain ?: null, $secure, true); + session_set_cookie_params($timeout ?: 0, $path, $domain ?: null, $secure, true); $limiter = $this->config()->get('sessionCacheLimiter'); if (isset($limiter)) { session_cache_limiter($limiter); } - // If headers are sent then we can't have a session_cache_limiter otherwise we'll get a warning + // Allow storing the session in a non standard location + if ($session_path) { + session_save_path($session_path); + } + + // If we want a secure cookie for HTTPS, use a separate session name. This lets us have a + // separate (less secure) session for non-HTTPS requests + // if headers_sent() is true then it's best to throw the resulting error rather than risk + // a security hole. + if ($secure) { + session_name($this->config()->get('cookie_name_secure')); + } + + session_start(); + } else { + // If headers are sent then we can't have a session_cache_limiter otherwise we'll get a warning session_cache_limiter(null); } - // Allow storing the session in a non standard location - if ($session_path) { - session_save_path($session_path); - } - - // If we want a secure cookie for HTTPS, use a separate session name. This lets us have a - // separate (less secure) session for non-HTTPS requests - // if headers_sent() is true then it's best to throw the resulting error rather than risk - // a security hole. - if ($secure) { - session_name($this->config()->get('cookie_name_secure')); - } - - $sessionParameters = [ - "cookie_path" => $path, - "cookie_domain" => $domain ?: "", - "cookie_lifetime" => $timeout ?: 0, - "cookie_secure" => $secure, - "cookie_httponly" => true - ]; - - session_start($sessionParameters); - if (isset($_SESSION)) { // Initialise data from session store if present $data = $_SESSION; From d01585cc98cd84bf45c0a9ac0dc24422d114077f Mon Sep 17 00:00:00 2001 From: Simon Gow Date: Fri, 7 Dec 2018 14:45:41 +1300 Subject: [PATCH 140/175] #8543 Resolve Duplicate Headers - fix linting --- src/Control/Session.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Control/Session.php b/src/Control/Session.php index 5b8f25c28..e2591d2c5 100644 --- a/src/Control/Session.php +++ b/src/Control/Session.php @@ -324,7 +324,6 @@ class Session } session_start(); - } else { // If headers are sent then we can't have a session_cache_limiter otherwise we'll get a warning session_cache_limiter(null); @@ -430,7 +429,7 @@ class Session } $var[] = $val; - $diffVar[sizeof($var)-1] = $val; + $diffVar[sizeof($var) - 1] = $val; } /** From 0397c54b5a2add7117d1f56618af8a1cb086adf7 Mon Sep 17 00:00:00 2001 From: Russell Michell Date: Tue, 18 Dec 2018 21:45:08 +1300 Subject: [PATCH 141/175] FIX: Fixes #8459 - Missing conditionals for optional constructor args - Missing calls to FieldList::setForm() - Missing guards around naive calls to Form::Fields()->foo() --- src/Forms/Form.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Forms/Form.php b/src/Forms/Form.php index 3f5f95771..ca8b3a828 100644 --- a/src/Forms/Form.php +++ b/src/Forms/Form.php @@ -286,6 +286,9 @@ class Form extends ViewableData implements HasRequestHandler ) { parent::__construct(); + $fields = $fields ? $fields : FieldList::create(); + $actions = $actions ? $actions : FieldList::create(); + $fields->setForm($this); $actions->setForm($this); @@ -484,11 +487,13 @@ class Form extends ViewableData implements HasRequestHandler // Set message on either a field or the parent form foreach ($result->getMessages() as $message) { $fieldName = $message['fieldName']; + if ($fieldName) { $owner = $this->fields->dataFieldByName($fieldName) ?: $this; } else { $owner = $this; } + $owner->setMessage($message['message'], $message['messageType'], $message['messageCast']); } return $this; @@ -772,7 +777,9 @@ class Form extends ViewableData implements HasRequestHandler */ public function setFields($fields) { + $fields->setForm($this); $this->fields = $fields; + return $this; } @@ -794,7 +801,9 @@ class Form extends ViewableData implements HasRequestHandler */ public function setActions($actions) { + $actions->setForm($this); $this->actions = $actions; + return $this; } @@ -1405,8 +1414,9 @@ class Form extends ViewableData implements HasRequestHandler $submitted = true; } - // dont include fields without data + // Don't include fields without data $dataFields = $this->Fields()->dataFields(); + if (!$dataFields) { return $this; } From 1667af8f5e987609bb974882d771d0bd10e45fd0 Mon Sep 17 00:00:00 2001 From: Kong Jin Jie Date: Mon, 31 Dec 2018 17:25:11 +0800 Subject: [PATCH 142/175] Add $disabledItems to check for disabled items instead of checking against $defaultItems Fixes #8688 --- src/Forms/CheckboxSetField.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Forms/CheckboxSetField.php b/src/Forms/CheckboxSetField.php index 764e3659e..1d8f94709 100644 --- a/src/Forms/CheckboxSetField.php +++ b/src/Forms/CheckboxSetField.php @@ -72,6 +72,7 @@ class CheckboxSetField extends MultiSelectField { $selectedValues = $this->getValueArray(); $defaultItems = $this->getDefaultItems(); + $disabledItems = $this->getDisabledItems(); // Generate list of options to display $odd = false; @@ -84,7 +85,7 @@ class CheckboxSetField extends MultiSelectField $extraClass .= ' val' . preg_replace('/[^a-zA-Z0-9\-\_]/', '_', $itemValue); $itemChecked = in_array($itemValue, $selectedValues) || in_array($itemValue, $defaultItems); - $itemDisabled = $this->isDisabled() || in_array($itemValue, $defaultItems); + $itemDisabled = $this->isDisabled() || in_array($itemValue, $disabledItems); $options->push(new ArrayData(array( 'ID' => $itemID, From a765ce26a037c05bc4858f5818350aad2575a34e Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Sun, 6 Jan 2019 21:24:33 +1300 Subject: [PATCH 143/175] DOCS Add a reference to new cwp-constraint upograder flag. --- docs/en/03_Upgrading/index.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/en/03_Upgrading/index.md b/docs/en/03_Upgrading/index.md index cdef87793..f64a92015 100644 --- a/docs/en/03_Upgrading/index.md +++ b/docs/en/03_Upgrading/index.md @@ -143,6 +143,7 @@ upgrade-code all --namespace="App\\Web" --psr4 ``` * `--recipe-core-constraint` defines your SilverStripe release version (optional, will default to the most recent stable release). +* `--cwp-constraint` can be used instead `--recipe-core-constraint` when upgrading a CWP project. * `--namespace` allows you to specify how your project will be namespaced (optional). * `--psr4` allows you to specify that your project structure respect the PSR-4 standard and to use sub-namespaces. * `--skip-add-namespace` allows you to skip the `add-namespace` command. @@ -187,7 +188,9 @@ You can upgrade the `composer.json` file with this command: upgrade-code recompose --write ``` -You can add a `--recipe-core-constraint` flag to target a specific version of `silverstripe/recipe-core`. By default, the project will be upgraded to the latest stable version. You can use the `--strict` option if you want to use more conservative version constraints. Omit the `--write` flag to preview your changes. +You can add a `--recipe-core-constraint` flag to target a specific version of `silverstripe/recipe-core`. By default, the project will be upgraded to the latest stable version. If you are upgrading a CWP project, you can use `--cwp-constraint` instead to target a specific version of `cwp/cwp-core`. + +You can use the `--strict` option if you want to use more conservative version constraints. Omit the `--write` flag to preview your changes. Your upgraded `composer.json` file will look like this. ```json From 9f463236ab4acb811960eabd75a972eb2f557792 Mon Sep 17 00:00:00 2001 From: Guy Marriott Date: Mon, 7 Jan 2019 13:06:59 +1300 Subject: [PATCH 144/175] Update README to fix issue reporting guidelines link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 01b1181b5..32f4cb41b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ and [installation from source](https://doc.silverstripe.org/framework/en/install ## Bugtracker ## Bugs are tracked on [github.com](https://github.com/silverstripe/silverstripe-framework/issues). -Please read our [issue reporting guidelines](https://doc.silverstripe.org/framework/en/misc/contributing/issues). +Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/4/contributing/issues_and_bugs/). ## Development and Contribution ## From 394dd4765c5d08f574a737bbd7ece1b2cb5258de Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 7 Jan 2019 17:26:14 +0100 Subject: [PATCH 145/175] NEW Scaffolded field labels now only have an uppercased first word --- src/Forms/FormField.php | 22 +++++++++++++++++----- tests/php/Forms/FieldListTest.php | 10 +++++----- tests/php/Forms/FormFieldTest.php | 27 +++++++++++++++++++++++++++ tests/php/Forms/FormTest.php | 4 ++-- tests/php/i18n/i18nTest.php | 2 +- 5 files changed, 52 insertions(+), 13 deletions(-) diff --git a/src/Forms/FormField.php b/src/Forms/FormField.php index 5a9b65bef..c0920fa7b 100644 --- a/src/Forms/FormField.php +++ b/src/Forms/FormField.php @@ -295,8 +295,8 @@ class FormField extends RequestHandler * * Examples: * - * - 'TotalAmount' will return 'Total Amount' - * - 'Organisation.ZipCode' will return 'Organisation Zip Code' + * - 'TotalAmount' will return 'Total amount' + * - 'Organisation.ZipCode' will return 'Organisation zip code' * * @param string $fieldName * @@ -304,15 +304,27 @@ class FormField extends RequestHandler */ public static function name_to_label($fieldName) { + // Handle dot delimiters if (strpos($fieldName, '.') !== false) { $parts = explode('.', $fieldName); - - $label = $parts[count($parts) - 2] . ' ' . $parts[count($parts) - 1]; + // Ensure that any letter following a dot is uppercased, so that the regex below can break it up + // into words + $label = implode(array_map('ucfirst', $parts)); } else { $label = $fieldName; } - return preg_replace('/([a-z]+)([A-Z])/', '$1 $2', $label); + // Replace any capital letter that is followed by a lowercase letter with a space, the lowercased + // version of itself then the remaining lowercase letters. + $labelWithSpaces = preg_replace_callback('/([A-Z])([a-z]+)/', function ($matches) { + return ' ' . strtolower($matches[1]) . $matches[2]; + }, $label); + + // Add a space before any capital letter block that is at the end of the string + $labelWithSpaces = preg_replace('/([a-z])([A-Z]+)$/', '$1 $2', $labelWithSpaces); + + // The first letter should be uppercase + return ucfirst(trim($labelWithSpaces)); } /** diff --git a/tests/php/Forms/FieldListTest.php b/tests/php/Forms/FieldListTest.php index 5309e88f1..37a6e1498 100644 --- a/tests/php/Forms/FieldListTest.php +++ b/tests/php/Forms/FieldListTest.php @@ -482,29 +482,29 @@ class FieldListTest extends SapphireTest ); $this->assertEquals( - $tabSetWithTitle->Title(), 'My TabSet Title', - 'Automatic conversion of tab identifiers through findOrMakeTab() with FormField::name_to_label()' + $tabSetWithTitle->Title(), + 'Existing field title should be used' ); $tabWithoutTitle = $set->findOrMakeTab('Root.TabWithoutTitle'); $this->assertEquals( + 'Tab without title', $tabWithoutTitle->Title(), - 'Tab Without Title', 'Automatic conversion of tab identifiers through findOrMakeTab() with FormField::name_to_label()' ); $tabWithTitle = $set->findOrMakeTab('Root.TabWithTitle', 'My Tab with Title'); $this->assertEquals( - $tabWithTitle->Title(), 'My Tab with Title', + $tabWithTitle->Title(), 'Setting of simple tab titles through findOrMakeTab()' ); $childTabWithTitle = $set->findOrMakeTab('Root.TabSetWithoutTitle.NewChildTab', 'My Child Tab Title'); $this->assertEquals( - $childTabWithTitle->Title(), 'My Child Tab Title', + $childTabWithTitle->Title(), 'Setting of nested tab titles through findOrMakeTab() works on last child tab' ); } diff --git a/tests/php/Forms/FormFieldTest.php b/tests/php/Forms/FormFieldTest.php index b63cbec76..208b06e3f 100644 --- a/tests/php/Forms/FormFieldTest.php +++ b/tests/php/Forms/FormFieldTest.php @@ -402,4 +402,31 @@ class FormFieldTest extends SapphireTest $field = new FormField('Test'); $field->Link('bar'); } + + /** + * @param string $name + * @param string $expected + * @dataProvider nameToLabelProvider + */ + public function testNameToLabel($name, $expected) + { + $this->assertSame($expected, FormField::name_to_label($name)); + } + + /** + * @return array[] + */ + public function nameToLabelProvider() + { + return [ + ['TotalAmount', 'Total amount'], + ['Organisation.ZipCode', 'Organisation zip code'], + ['Organisation.zipCode', 'Organisation zip code'], + ['FooBarBaz', 'Foo bar baz'], + ['URLSegment', 'URL segment'], + ['ONLYCAPS', 'ONLYCAPS'], + ['onlylower', 'Onlylower'], + ['SpecialURL', 'Special URL'], + ]; + } } diff --git a/tests/php/Forms/FormTest.php b/tests/php/Forms/FormTest.php index 3322eb1b5..87336ddc8 100644 --- a/tests/php/Forms/FormTest.php +++ b/tests/php/Forms/FormTest.php @@ -415,7 +415,7 @@ class FormTest extends FunctionalTest // Firstly, assert that required fields still work when not using an exempt action $this->assertPartialMatchBySelector( '#Form_Form_SomeRequiredField_Holder .required', - array('"Some Required Field" is required'), + array('"Some required field" is required'), 'Required fields show a notification on field when left blank' ); @@ -487,7 +487,7 @@ class FormTest extends FunctionalTest $this->assertPartialMatchBySelector( '#Form_Form_SomeRequiredField_Holder span.required', array( - '"Some Required Field" is required' + '"Some required field" is required' ), 'Required fields show a notification on field when left blank' ); diff --git a/tests/php/i18n/i18nTest.php b/tests/php/i18n/i18nTest.php index be0e85f7d..34237e72a 100644 --- a/tests/php/i18n/i18nTest.php +++ b/tests/php/i18n/i18nTest.php @@ -102,7 +102,7 @@ class i18nTest extends SapphireTest $obj->fieldLabel('MyProperty') ); $this->assertEquals( - 'My Untranslated Property', + 'My untranslated property', $obj->fieldLabel('MyUntranslatedProperty') ); } From 4adac7d591b9f5ac3e3879b15aeffb9cdec30c4a Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 8 Jan 2019 10:47:41 +0100 Subject: [PATCH 146/175] Update Travis to use PHP 7.3 stable --- .travis.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3150dc345..6ac472251 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,19 +47,11 @@ matrix: - DB=MYSQL - PHPUNIT_TEST=cms - - php: 7.3.0RC1 + - php: 7.3 env: - DB=MYSQL - PDO=1 - PHPUNIT_TEST=framework - sudo: required - dist: xenial - addons: - apt: - packages: - - libzip4 - services: - - mysql before_script: # Extra $PATH From f80e16adde9089d7ac70e202c96f06028c24ec5b Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 8 Jan 2019 14:15:22 +1300 Subject: [PATCH 147/175] DOCS clarified release EOL process --- .../05_Making_A_SilverStripe_Core_Release.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md b/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md index 9f1d5b8b7..89c17ead2 100644 --- a/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md +++ b/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md @@ -344,13 +344,11 @@ will need to be regularly updated. you can run the [CoreReleaseUpdateTask](http://www.silverstripe.org/dev/tasks/CoreReleaseUpdateTask) to synchronise with packagist. * Ensure that [docs.silverstripe.org](http://docs.silverstripe.org) has the - updated documentation by running the build task in the root folder. If - you do not have ssh access to this server, then contact a SilverStripe staff member - to update this for you. Make sure that the download link below links to the - correct changelog page. E.g. - [https://docs.silverstripe.org/en/3.2/changelogs/3.2.1/](https://docs.silverstripe.org/en/3.2/changelogs/3.2.1/) -* Post a release announcement on the [silverstripe release announcement](https://groups.google.com/forum/#!forum/silverstripe-announce) - google group. + updated documentation and the changelog link in your announcement works. +* Announce the release on the ["Releases" forum](https://forum.silverstripe.org/c/releases). + Needs to happen on every minor release for previous releases, see [supported versions](https://docs.silverstripe.org/en/4/contributing/release_process/#supported-versions) +* Announce any new EOLs for minor versions on the ["Releases" forum](https://forum.silverstripe.org/c/releases). +* Update the [roadmap](https://www.silverstripe.org/roadmap) with new dates for EOL versions ([CMS edit link](https://www.silverstripe.org/admin/pages/edit/EditForm/3103/field/TableComponentItems/item/670/edit)) * Update the [Slack](https://www.silverstripe.org/community/slack-signup/) topic to include the new release version. * For major or minor releases: Work with SilverStripe marketing to get a blog post out. They might choose to announce the release on social media as well. From afceccb9a601be621b7cd73c0658d38717a506cb Mon Sep 17 00:00:00 2001 From: Joe Chenevey Date: Tue, 8 Jan 2019 15:14:23 -0500 Subject: [PATCH 148/175] CustomMethods->removeMethodsFrom Warnings Check to ensure `self::$extra_methods[$class][$method]` exists before trying to retrieve its value. Silences warnings generated by updating a controller's failover. --- src/Core/CustomMethods.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Core/CustomMethods.php b/src/Core/CustomMethods.php index 91b3038ea..6cff20f92 100644 --- a/src/Core/CustomMethods.php +++ b/src/Core/CustomMethods.php @@ -279,10 +279,12 @@ trait CustomMethods $methods = $this->findMethodsFromExtension($extension); if ($methods) { foreach ($methods as $method) { - $methodInfo = self::$extra_methods[$class][$method]; + if (isset(self::$extra_methods[$class][$method])) { + $methodInfo = self::$extra_methods[$class][$method]; - if ($methodInfo['property'] === $property && $methodInfo['index'] === $index) { - unset(self::$extra_methods[$class][$method]); + if ($methodInfo['property'] === $property && $methodInfo['index'] === $index) { + unset(self::$extra_methods[$class][$method]); + } } } From 3730d84d1882bdfcc31fe029513bf9b17983c806 Mon Sep 17 00:00:00 2001 From: Joe Chenevey Date: Tue, 8 Jan 2019 15:24:21 -0500 Subject: [PATCH 149/175] Update CustomMethods.php Switch to an early `continue` rather than wrapping contents of `foreach` in an `if` and indenting. --- src/Core/CustomMethods.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Core/CustomMethods.php b/src/Core/CustomMethods.php index 6cff20f92..1b6fd1677 100644 --- a/src/Core/CustomMethods.php +++ b/src/Core/CustomMethods.php @@ -279,12 +279,12 @@ trait CustomMethods $methods = $this->findMethodsFromExtension($extension); if ($methods) { foreach ($methods as $method) { - if (isset(self::$extra_methods[$class][$method])) { - $methodInfo = self::$extra_methods[$class][$method]; + if (!isset(self::$extra_methods[$class][$method])) continue; + + $methodInfo = self::$extra_methods[$class][$method]; - if ($methodInfo['property'] === $property && $methodInfo['index'] === $index) { - unset(self::$extra_methods[$class][$method]); - } + if ($methodInfo['property'] === $property && $methodInfo['index'] === $index) { + unset(self::$extra_methods[$class][$method]); } } From 068c240d3856bae5e0fef5b3819edc0fa3fcdb74 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 8 Jan 2019 15:27:38 -0500 Subject: [PATCH 150/175] Update src/Core/CustomMethods.php Co-Authored-By: jchenevey --- src/Core/CustomMethods.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Core/CustomMethods.php b/src/Core/CustomMethods.php index 1b6fd1677..1f166dd8b 100644 --- a/src/Core/CustomMethods.php +++ b/src/Core/CustomMethods.php @@ -279,7 +279,9 @@ trait CustomMethods $methods = $this->findMethodsFromExtension($extension); if ($methods) { foreach ($methods as $method) { - if (!isset(self::$extra_methods[$class][$method])) continue; + if (!isset(self::$extra_methods[$class][$method])) { + continue; + } $methodInfo = self::$extra_methods[$class][$method]; From 1e01deea39f54ef69cadbad8fc6d8a211fcb5ba4 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Wed, 9 Jan 2019 15:35:45 +1300 Subject: [PATCH 151/175] NEW Make resources dir configurable (#8519) * NEW Make resources dir configurable. * Removing reference to old `resources` and updating doc #8519 * Rrtarget to 4.4 release. * DOC Reference SS_RESOURCES_DIR in Environment doc. * API Add a Resources method to SilverStripe\Core\Manifest\Module to read the resources-dir from composer.json * Clean up reference to SS_RESOURCES_DIR env var * Set default resources-dir * Update test to use RESOURCES_DIR const in expected resource url method * Correcting typos Co-Authored-By: maxime-rainville * MINOR Correctubg minor typos * DOCS Document the intricacies of exposing static assets. --- .upgrade.yml | 4 ++ composer.json | 2 +- .../04_Directory_Structure.md | 2 +- .../01_Templates/03_Requirements.md | 64 ++++++++++++++++++- .../How_Tos/01_Publish_a_Module.md | 2 +- docs/en/03_Upgrading/index.md | 4 +- docs/en/04_Changelogs/4.4.0.md | 23 ++++++- src/Control/SimpleResourceURLGenerator.php | 22 +++---- src/Core/Manifest/ManifestFileFinder.php | 8 ++- src/Core/Manifest/Module.php | 18 ++++++ src/Core/Manifest/ModuleResource.php | 6 +- src/Dev/Install/Installer.php | 6 +- src/Dev/Install/install5.php | 6 +- src/includes/constants.php | 16 +++++ .../SimpleResourceURLGeneratorTest.php | 8 +-- .../php/Core/Manifest/ModuleResourceTest.php | 6 +- tests/php/Core/Manifest/ModuleTest.php | 24 +++++++ .../withCustomResourcesDir/composer.json | 29 +++++++++ .../withoutCustomResourcesDir/composer.json | 28 ++++++++ 19 files changed, 241 insertions(+), 37 deletions(-) create mode 100644 tests/php/Core/Manifest/ModuleTest.php create mode 100644 tests/php/Core/Manifest/fixtures/ss-projects/withCustomResourcesDir/composer.json create mode 100644 tests/php/Core/Manifest/fixtures/ss-projects/withoutCustomResourcesDir/composer.json diff --git a/.upgrade.yml b/.upgrade.yml index 6cd73bcf5..fd909ca0a 100644 --- a/.upgrade.yml +++ b/.upgrade.yml @@ -1372,3 +1372,7 @@ warnings: 'THIRDPARTY_DIR': message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs' url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths' + 'SilverStripe\Core\Manifest\ManifestFileFinder::RESOURCES_DIR': + message: 'Use global const RESOURCES_DIR' + url: 'https://docs.silverstripe.org/en/4/changelogs/4.4.0#resources-dir' + replacement: 'RESOURCES_DIR' diff --git a/composer.json b/composer.json index 35b89c987..9185afbbd 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "psr/container-implementation": "1.0.0", "silverstripe/config": "^1@dev", "silverstripe/assets": "^1@dev", - "silverstripe/vendor-plugin": "^1.0", + "silverstripe/vendor-plugin": "^1.4", "swiftmailer/swiftmailer": "~5.4", "symfony/cache": "^3.3@dev", "symfony/config": "^3.2", diff --git a/docs/en/00_Getting_Started/04_Directory_Structure.md b/docs/en/00_Getting_Started/04_Directory_Structure.md index 765368f2c..2f5b2d1fc 100644 --- a/docs/en/00_Getting_Started/04_Directory_Structure.md +++ b/docs/en/00_Getting_Started/04_Directory_Structure.md @@ -11,7 +11,7 @@ Directory | Description --------- | ----------- `public/` | Webserver public webroot `public/assets/` | Images and other files uploaded via the SilverStripe CMS. You can also place your own content inside it, and link to it from within the content area of the CMS. -`public/resources/` | Exposed public files added from modules. Folders within this parent will match that of the source root location. +`public/_resources/` | Exposed public files added from modules. Folders within this parent will match that of the source root location (this can be altered by configuration). `vendor/` | SilverStripe modules and other supporting libraries (the framework is in `vendor/silverstripe/framework`) `themes/` | Standard theme installation location diff --git a/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md b/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md index 9e989450e..2628c571d 100644 --- a/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md +++ b/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md @@ -11,6 +11,68 @@ The examples below are using certain folder naming conventions (CSS files in `cs SilverStripe core modules like `cms` use a different naming convention (CSS and JavaScript files in `client/src/`). The `Requirements` class can work with arbitrary file paths. +## Exposing static assets + +Before requiring a static assets file in PHP code or in a template, those assets need to be "exposed". This process allows SilverStripe projects and SilverStripe modules to make static asset files available via the web server without directly exposing PHP files. + +### Configuring your project "exposed" folders + +Exposed assets are made available in your web root in a dedicated "resources" directory. Prior to SilverStripe 4.4, the name of this directory was hardcoded to `resources`. In SilverStripe 4.4 and above, the name of the resources directory can be configured by defining the `extra.resources-dir` key in your `composer.json`. SilverStripe projects created from `silverstripe/installer` 4.4 and above will automatically be configured to use `_resources` as their resource directory. + +Each folder that needs to be exposed must be entered under the `extra.expose` key in your `composer.json` file. Module developers should use a path relative to the root of their module (don't include the "vendor/package-developer/package-name" path). + +This is a sample `composer.json` configured to expose some assets. + +```json +{ + "name": "app/myproject", + "type": "silverstripe-project", + "require": { + "silverstripe/recipe-cms": "4.4.x-dev" + }, + "extra": { + "resources-dir": "_resources", + "expose": [ + "app/client/dist", + "app/images" + ] + } +} +``` + +Files contained inside the `app/client/dist` and `app/images` will be made publicly available under the `_resources` directory. + +SilverStripe projects should not track the "resources" directory in their source control system. + +### Exposing assets in the web root + +SilverStripe projects ship with `silverstripe/vendor-plugin`. This composer plugin automatically tries to expose assets of modules after installation or after an update. + +Developers can explicitly expose static assets by calling `composer vendor-expose`. This is necessary after updating your `resources-dir` or `expose` configuration in your `composer.json` file. + +`composer vendor-expose` accepts an optional `method` argument (e.g.: `composer vendor-expose auto`). This controls how the files are exposed in the "resources" directory: +* `none` disables all symlink / copy, +* `copy` copy the exposed files, +* `symlink` create symlinks to the exposed folder, +* `junction` uses a junction (windows only), +* `auto` performs symlink (or junction on windows), but fail over to copy. + +### Referencing exposed assets + +When referencing exposed assets, you should not use their web server path. e.g.: +```php +// When referencing project files, use the same path defined in your `composer.json` file. +Requirements::javascript('app/client/dist/bundle.js'); + +// When referencing theme files, use a path relative to the root of your project +Requirements::javascript('themes/simple/javascript/script.js'); + +// When referencing files from a module, you need to prefix the path with the module name. +Requirements::javascript('silverstripe/admin:client/dist/js/bundle.js'); +``` + +When rendered in HTML code, these URLs will be rewritten to their matching path inside the "resources" directory. + ## Template Requirements API **/templates/SomeTemplate.ss** @@ -179,7 +241,7 @@ is not appropriate. Normally a single backend is used for all site assets, so a replaced. For instance, the below will set a new set of dependencies to write to `app/javascript/combined` -```yaml +```yml --- Name: myrequirements --- diff --git a/docs/en/02_Developer_Guides/05_Extending/How_Tos/01_Publish_a_Module.md b/docs/en/02_Developer_Guides/05_Extending/How_Tos/01_Publish_a_Module.md index 3b60286a1..a03db9d03 100644 --- a/docs/en/02_Developer_Guides/05_Extending/How_Tos/01_Publish_a_Module.md +++ b/docs/en/02_Developer_Guides/05_Extending/How_Tos/01_Publish_a_Module.md @@ -61,7 +61,7 @@ Note that SilverStripe modules have the following distinct characteristics: - Any folder which should be exposed to the public webroot must be declared in the `extra.expose` config. These paths will be automatically rewritten to public urls which don't directly serve files from the `vendor` folder. For instance, `vendor/my-vendor/my-module/client` will be rewritten to - `resources/my-vendor/my-module/client`. + `_resources/my-vendor/my-module/client`. - Any module which uses the folder expose feature must require `silverstripe/vendor-plugin` in order to support automatic rewriting and linking. For more information on this plugin you can see the [silverstripe/vendor-plugin github page](https://github.com/silverstripe/vendor-plugin). diff --git a/docs/en/03_Upgrading/index.md b/docs/en/03_Upgrading/index.md index cdef87793..b36bb9f88 100644 --- a/docs/en/03_Upgrading/index.md +++ b/docs/en/03_Upgrading/index.md @@ -1022,14 +1022,14 @@ If you are using a modified `index.php`, `.htaccess`, or `web.config`, you will * `assets` * Any `favicon` files * Other common files that should be accssible in your project webroot (example: `robots.txt`) -* Delete the root `resources` directory if present. +* Delete the root `resources` or `_resources` directories if present. * Run the following command `composer vendor-expose` to make static assets files accessible via the `public` directory. If you are upgrading from SilverStripe 4.0 to SilverStripe 4.1 (or above), you'll need to update `index.php` before moving it to the public folder. You can get a copy of the generic `index.php` file from `vendor/silverstripe/recipe-core/public`. If you've made modifications to your `index.php` file, you'll need to replicate those into the new `public/index.php` file. ### Finalising the web root migration You'll need to update your server configuration to point to the public directory rather than the root of your project. -Update your `.gitignore` file so `assets` and `resources` are still ignored when located under the `public` folder. +Update your `.gitignore` file so `assets` and `_resources` (or `resources` if using a pre SilverStripe 4.4 release) are still ignored when located under the `public` folder. Your project should still be functional, although you may now be missing some static assets. This is a good point to commit your changes to your source control system before moving on to the next step. diff --git a/docs/en/04_Changelogs/4.4.0.md b/docs/en/04_Changelogs/4.4.0.md index 1b761129b..3f8ef4042 100644 --- a/docs/en/04_Changelogs/4.4.0.md +++ b/docs/en/04_Changelogs/4.4.0.md @@ -3,12 +3,31 @@ ## Overview {#overview} - [Correct PHP types are now returned from database queries](/developer_guides/model/sql_select#data-types) - + - The name of the directory where vendor module resources are exposed can now be configured by defining a `extra.resources-dir` key in your `composer.json` file. If the key is not set, it will automatically default to `resources`. New projects will be preset to `_resources`. This will avoid potential conflict with SiteTree URL Segments. + - dev/build is now non-destructive for all Enums, not just ClassNames. This means your data won't be lost if you're switching between versions, but watch out for code that breaks when it sees an unrecognised value! + ## Upgrading {#upgrading} - - dev/build is now non-destructive for all Enums, not just ClassNames. This means your data won't be lost if you're switching between versions, but watch out for code that breaks when it sees an unrecognised value! +### Adopting to new `_resources` directory + +1. Update your `.gitignore` file to ignore the new `_resources` directory. This file is typically located in the root of your project or in the `public` folder. +2. Add a new `extra.resources-dir` key to your composer file. +```js +{ + // ... + "extra": { + // ... + "resources-dir": "_resources" + } +} +``` +3. Expose your vendor assets by running `composer vendor-expose`. +4. Remove the old `resources` folder. This folder will be located in the `public` folder if you have adopted the public web root, or in the root of your project if you haven't. + +You may also need to update your server configuration if you have applied special conditions to the `resources` path. ## Changes to internal APIs - `PDOQuery::__construct()` now has a 2nd argument. If you have subclassed PDOQuery and overridden __construct() you may see an E_STRICT error + - The name of the directory where vendor module resources are exposed can now be configured by adding a `extra.resources-dir` key to your composer file. The new default in `silverstripe/installer` has been changed to `_resources` rather than `resources`. This allows you to use `resources` as a URL segment or a route. \ No newline at end of file diff --git a/src/Control/SimpleResourceURLGenerator.php b/src/Control/SimpleResourceURLGenerator.php index 620effa3d..bcf981b1b 100644 --- a/src/Control/SimpleResourceURLGenerator.php +++ b/src/Control/SimpleResourceURLGenerator.php @@ -133,15 +133,15 @@ class SimpleResourceURLGenerator implements ResourceURLGenerator $exists = $resource->exists(); $absolutePath = $resource->getPath(); - // Rewrite to resources with public directory + // Rewrite to _resources with public directory if (Director::publicDir()) { - // All resources mapped directly to resources/ - $relativePath = Path::join(ManifestFileFinder::RESOURCES_DIR, $relativePath); + // All resources mapped directly to _resources/ + $relativePath = Path::join(RESOURCES_DIR, $relativePath); } elseif (stripos($relativePath, ManifestFileFinder::VENDOR_DIR . DIRECTORY_SEPARATOR) === 0) { // @todo Non-public dir support will be removed in 5.0, so remove this block there - // If there is no public folder, map to resources/ but trim leading vendor/ too (4.0 compat) + // If there is no public folder, map to _resources/ but trim leading vendor/ too (4.0 compat) $relativePath = Path::join( - ManifestFileFinder::RESOURCES_DIR, + RESOURCES_DIR, substr($relativePath, strlen(ManifestFileFinder::VENDOR_DIR)) ); } @@ -167,10 +167,10 @@ class SimpleResourceURLGenerator implements ResourceURLGenerator $absolutePath = Path::join(Director::baseFolder(), $relativePath); $exists = file_exists($absolutePath); - // Rewrite vendor/ to resources/ folder + // Rewrite vendor/ to _resources/ folder if (stripos($relativePath, ManifestFileFinder::VENDOR_DIR . DIRECTORY_SEPARATOR) === 0) { $relativePath = Path::join( - ManifestFileFinder::RESOURCES_DIR, + RESOURCES_DIR, substr($relativePath, strlen(ManifestFileFinder::VENDOR_DIR)) ); } @@ -200,7 +200,7 @@ class SimpleResourceURLGenerator implements ResourceURLGenerator /** * Resolve a resource that may either exist in a public/ folder, or be exposed from the base path to - * public/resources/ + * public/_resources/ * * @param string $relativePath * @return array List of [$exists, $absolutePath, $relativePath] @@ -217,11 +217,11 @@ class SimpleResourceURLGenerator implements ResourceURLGenerator return [true, $publicPath, $relativePath]; } - // Fall back to private path (and assume expose will make this available to resources/) + // Fall back to private path (and assume expose will make this available to _resources/) $privatePath = Path::join(Director::baseFolder(), $relativePath); if (!$publicOnly && file_exists($privatePath)) { - // String is private but exposed to resources/, so rewrite to the symlinked base - $relativePath = Path::join(ManifestFileFinder::RESOURCES_DIR, $relativePath); + // String is private but exposed to _resources/, so rewrite to the symlinked base + $relativePath = Path::join(RESOURCES_DIR, $relativePath); return [true, $privatePath, $relativePath]; } diff --git a/src/Core/Manifest/ManifestFileFinder.php b/src/Core/Manifest/ManifestFileFinder.php index 697f9fd51..1706d6dd2 100644 --- a/src/Core/Manifest/ManifestFileFinder.php +++ b/src/Core/Manifest/ManifestFileFinder.php @@ -22,7 +22,11 @@ class ManifestFileFinder extends FileFinder const LANG_DIR = 'lang'; const TESTS_DIR = 'tests'; const VENDOR_DIR = 'vendor'; - const RESOURCES_DIR = 'resources'; + + /** + * @deprecated 4.4.0:5.0.0 Use global `RESOURCES_DIR` instead. + */ + const RESOURCES_DIR = RESOURCES_DIR; protected static $default_options = array( 'include_themes' => false, @@ -241,7 +245,7 @@ class ManifestFileFinder extends FileFinder } // Ignore these dirs in the root only - if ($depth === 1 && in_array($basename, [ASSETS_DIR, self::RESOURCES_DIR])) { + if ($depth === 1 && in_array($basename, [ASSETS_DIR, RESOURCES_DIR])) { return true; } diff --git a/src/Core/Manifest/Module.php b/src/Core/Manifest/Module.php index c689037cc..f06faae1e 100644 --- a/src/Core/Manifest/Module.php +++ b/src/Core/Manifest/Module.php @@ -8,6 +8,10 @@ use Serializable; use SilverStripe\Core\Path; use SilverStripe\Dev\Deprecation; +/** + * Abstraction of a PHP Package. Can be used to retrieve information about SilverStripe modules, and other packages + * managed via composer, by reading their `composer.json` file. + */ class Module implements Serializable { /** @@ -124,6 +128,20 @@ class Module implements Serializable return basename($this->path); } + /** + * Name of the resource directory where vendor resources should be exposed as defined by the `extra.resources-dir` + * key in the composer file. A blank string will will be returned if the key is undefined. + * + * Only applicable when reading the composer file for the main project. + * @return string + */ + public function getResourcesDir() + { + return isset($this->composerData['extra']['resources-dir']) + ? $this->composerData['extra']['resources-dir'] + : ''; + } + /** * Get base path for this module * diff --git a/src/Core/Manifest/ModuleResource.php b/src/Core/Manifest/ModuleResource.php index 22003d944..16e794845 100644 --- a/src/Core/Manifest/ModuleResource.php +++ b/src/Core/Manifest/ModuleResource.php @@ -49,7 +49,7 @@ class ModuleResource /** * Return the full filesystem path to this resource. * - * Note: In the case that this resource is mapped to the `resources` folder, this will + * Note: In the case that this resource is mapped to the `_resources` folder, this will * return the original rather than the copy / symlink. * * @return string Path with no trailing slash E.g. /var/www/module @@ -62,7 +62,7 @@ class ModuleResource /** * Get the path of this resource relative to the base path. * - * Note: In the case that this resource is mapped to the `resources` folder, this will + * Note: In the case that this resource is mapped to the `_resources` folder, this will * return the original rather than the copy / symlink. * * @return string Relative path (no leading /) @@ -81,7 +81,7 @@ class ModuleResource * Public URL to this resource. * Note: May be either absolute url, or root-relative url * - * In the case that this resource is mapped to the `resources` folder this + * In the case that this resource is mapped to the `_resources` folder this * will be the mapped url rather than the original path. * * @return string diff --git a/src/Dev/Install/Installer.php b/src/Dev/Install/Installer.php index dbcf39080..560a73805 100644 --- a/src/Dev/Install/Installer.php +++ b/src/Dev/Install/Installer.php @@ -54,9 +54,9 @@ class Installer protected function installHeader() { - $clientPath = PUBLIC_DIR - ? 'resources/vendor/silverstripe/framework/src/Dev/Install/client' - : 'resources/silverstripe/framework/src/Dev/Install/client'; + $clientPath = RESOURCES_DIR . (PUBLIC_DIR + ? '/vendor/silverstripe/framework/src/Dev/Install/client' + : '/silverstripe/framework/src/Dev/Install/client'); ?> diff --git a/src/Dev/Install/install5.php b/src/Dev/Install/install5.php index 5b5bb2692..f7dd384ad 100755 --- a/src/Dev/Install/install5.php +++ b/src/Dev/Install/install5.php @@ -106,9 +106,9 @@ if ($installFromCli && ($req->hasErrors() || $dbReq->hasErrors())) { // Path to client resources (copied through silverstripe/vendor-plugin) $base = rtrim(BASE_URL, '/') . '/'; -$clientPath = PUBLIC_DIR - ? 'resources/vendor/silverstripe/framework/src/Dev/Install/client' - : 'resources/silverstripe/framework/src/Dev/Install/client'; +$clientPath = RESOURCES_DIR . (PUBLIC_DIR + ? '/vendor/silverstripe/framework/src/Dev/Install/client' + : '/silverstripe/framework/src/Dev/Install/client'); // If already installed, ensure the user clicked "reinstall" $expectedArg = $alreadyInstalled ? 'reinstall' : 'go'; diff --git a/src/includes/constants.php b/src/includes/constants.php index a619db5f2..0fc891b1e 100644 --- a/src/includes/constants.php +++ b/src/includes/constants.php @@ -27,6 +27,7 @@ use SilverStripe\Core\TempFolder; * - PUBLIC_PATH: Absolute path to webroot, e.g. "/var/www/project/public" * - THIRDPARTY_DIR: Path relative to webroot, e.g. "framework/thirdparty" * - THIRDPARTY_PATH: Absolute filepath, e.g. "/var/www/my-webroot/framework/thirdparty" + * - RESOURCES_DIR: Name of the directory where vendor assets will be exposed, e.g. "_ressources" */ require_once __DIR__ . '/functions.php'; @@ -198,3 +199,18 @@ if (!defined('TEMP_PATH')) { if (!defined('TEMP_FOLDER')) { define('TEMP_FOLDER', TEMP_PATH); } + +// Define the Ressource Dir constant that will be use to exposed vendor assets +if (!defined('RESOURCES_DIR')) { + $project = new SilverStripe\Core\Manifest\Module(BASE_PATH, BASE_PATH); + $resourcesDir = $project->getResourcesDir() ?: 'resources'; + if (preg_match('/^[_\-a-z0-9]+$/i', $resourcesDir)) { + define('RESOURCES_DIR', $resourcesDir); + } else { + throw new LogicException(sprintf( + 'Resources dir error: "%s" is not a valid resources directory name. Update the ' . + '`extra.resources-dir` key in your composer.json file', + $resourcesDir + )); + } +} diff --git a/tests/php/Control/SimpleResourceURLGeneratorTest.php b/tests/php/Control/SimpleResourceURLGeneratorTest.php index f1d07e269..8f270fc42 100644 --- a/tests/php/Control/SimpleResourceURLGeneratorTest.php +++ b/tests/php/Control/SimpleResourceURLGeneratorTest.php @@ -36,7 +36,7 @@ class SimpleResourceURLGeneratorTest extends SapphireTest __DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/basemodule/client/file.js' ); $this->assertEquals( - '/resources/basemodule/client/file.js?m=' . $mtime, + '/'. RESOURCES_DIR . '/basemodule/client/file.js?m=' . $mtime, $generator->urlForResource('basemodule/client/file.js') ); } @@ -49,7 +49,7 @@ class SimpleResourceURLGeneratorTest extends SapphireTest __DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/vendor/silverstripe/mymodule/client/style.css' ); $this->assertEquals( - '/resources/vendor/silverstripe/mymodule/client/style.css?m=' . $mtime, + '/'. RESOURCES_DIR . '/vendor/silverstripe/mymodule/client/style.css?m=' . $mtime, $generator->urlForResource('vendor/silverstripe/mymodule/client/style.css') ); } @@ -72,7 +72,7 @@ class SimpleResourceURLGeneratorTest extends SapphireTest ); $this->assertEquals( - '/resources/basemodule/client/file.js?m=' . $mtime, + '/'. RESOURCES_DIR . '/basemodule/client/file.js?m=' . $mtime, $generator->urlForResource('basemodule/client/file.js') ); } @@ -89,7 +89,7 @@ class SimpleResourceURLGeneratorTest extends SapphireTest __DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/vendor/silverstripe/mymodule/client/style.css' ); $this->assertEquals( - '/resources/vendor/silverstripe/mymodule/client/style.css?m=' . $mtime, + '/'. RESOURCES_DIR . '/vendor/silverstripe/mymodule/client/style.css?m=' . $mtime, $generator->urlForResource($module->getResource('client/style.css')) ); } diff --git a/tests/php/Core/Manifest/ModuleResourceTest.php b/tests/php/Core/Manifest/ModuleResourceTest.php index 74b241a69..119e93966 100644 --- a/tests/php/Core/Manifest/ModuleResourceTest.php +++ b/tests/php/Core/Manifest/ModuleResourceTest.php @@ -42,7 +42,7 @@ class ModuleResourceTest extends SapphireTest $resource->getPath() ); $this->assertStringStartsWith( - '/basefolder/resources/module/client/script.js?m=', + '/basefolder/'. RESOURCES_DIR . '/module/client/script.js?m=', $resource->getURL() ); } @@ -60,7 +60,7 @@ class ModuleResourceTest extends SapphireTest $resource->getPath() ); $this->assertStringStartsWith( - '/basefolder/resources/vendor/silverstripe/modulec/client/script.js?m=', + '/basefolder/'. RESOURCES_DIR . '/vendor/silverstripe/modulec/client/script.js?m=', $resource->getURL() ); } @@ -80,7 +80,7 @@ class ModuleResourceTest extends SapphireTest $resource->getPath() ); $this->assertStringStartsWith( - '/basefolder/resources/vendor/silverstripe/modulec/client/script.js?m=', + '/basefolder/'. RESOURCES_DIR . '/vendor/silverstripe/modulec/client/script.js?m=', $resource->getURL() ); } diff --git a/tests/php/Core/Manifest/ModuleTest.php b/tests/php/Core/Manifest/ModuleTest.php new file mode 100644 index 000000000..b62a28941 --- /dev/null +++ b/tests/php/Core/Manifest/ModuleTest.php @@ -0,0 +1,24 @@ +assertEquals('', $module->getResourcesDir()); + } + + public function testResourcesDir() + { + $path = __DIR__ . '/fixtures/ss-projects/withCustomResourcesDir'; + $module = new Module($path, $path); + $this->assertEquals('customised-resources-dir', $module->getResourcesDir()); + } +} diff --git a/tests/php/Core/Manifest/fixtures/ss-projects/withCustomResourcesDir/composer.json b/tests/php/Core/Manifest/fixtures/ss-projects/withCustomResourcesDir/composer.json new file mode 100644 index 000000000..ee9e3ac5f --- /dev/null +++ b/tests/php/Core/Manifest/fixtures/ss-projects/withCustomResourcesDir/composer.json @@ -0,0 +1,29 @@ +{ + "name": "silverstripe/ss44", + "type": "silverstripe-project", + "description": "Fake project using SS 4.4", + "homepage": "https://www.silverstripe.org", + "license": "BSD-3-Clause", + "require": { + "silverstripe/recipe-cms": "4.4.x-dev as 4.4.0" + }, + "extra": { + "project-files-installed": [ + "app/.htaccess", + "app/_config.php", + "app/_config/mysite.yml", + "app/src/Page.php", + "app/src/PageController.php" + ], + "public-files-installed": [ + ".htaccess", + "index.php", + "install-frameworkmissing.html", + "install.php", + "web.config" + ], + "resources-dir": "customised-resources-dir" + }, + "prefer-stable": true, + "minimum-stability": "dev" +} diff --git a/tests/php/Core/Manifest/fixtures/ss-projects/withoutCustomResourcesDir/composer.json b/tests/php/Core/Manifest/fixtures/ss-projects/withoutCustomResourcesDir/composer.json new file mode 100644 index 000000000..7f9bd60a8 --- /dev/null +++ b/tests/php/Core/Manifest/fixtures/ss-projects/withoutCustomResourcesDir/composer.json @@ -0,0 +1,28 @@ +{ + "name": "silverstripe/ss44", + "type": "silverstripe-project", + "description": "Fake project using SS 4.4", + "homepage": "https://www.silverstripe.org", + "license": "BSD-3-Clause", + "require": { + "silverstripe/recipe-cms": "4.4.x-dev as 4.4.0" + }, + "extra": { + "project-files-installed": [ + "app/.htaccess", + "app/_config.php", + "app/_config/mysite.yml", + "app/src/Page.php", + "app/src/PageController.php" + ], + "public-files-installed": [ + ".htaccess", + "index.php", + "install-frameworkmissing.html", + "install.php", + "web.config" + ] + }, + "prefer-stable": true, + "minimum-stability": "dev" +} From 728c982de2e62adfa560fd7435679782cdd9aecd Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Wed, 9 Jan 2019 16:28:40 +1300 Subject: [PATCH 152/175] DOCS Retroactively apply proposed change to vendor-expose doc --- .../01_Templates/03_Requirements.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md b/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md index 2628c571d..551c454e4 100644 --- a/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md +++ b/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md @@ -13,7 +13,7 @@ The `Requirements` class can work with arbitrary file paths. ## Exposing static assets -Before requiring a static assets file in PHP code or in a template, those assets need to be "exposed". This process allows SilverStripe projects and SilverStripe modules to make static asset files available via the web server without directly exposing PHP files. +Before requiring static asset files in PHP code or in a template, those assets need to be "exposed". This process allows SilverStripe projects and SilverStripe modules to make static asset files available via the web server from locations that would otherwise be blocked from web server access, such as the `vendor` folder. ### Configuring your project "exposed" folders @@ -21,7 +21,7 @@ Exposed assets are made available in your web root in a dedicated "resources" di Each folder that needs to be exposed must be entered under the `extra.expose` key in your `composer.json` file. Module developers should use a path relative to the root of their module (don't include the "vendor/package-developer/package-name" path). -This is a sample `composer.json` configured to expose some assets. +This is a sample SilverStripe project `composer.json` file configured to expose some assets. ```json { @@ -46,20 +46,21 @@ SilverStripe projects should not track the "resources" directory in their source ### Exposing assets in the web root -SilverStripe projects ship with `silverstripe/vendor-plugin`. This composer plugin automatically tries to expose assets of modules after installation or after an update. +SilverStripe projects ship with `silverstripe/vendor-plugin`. This Composer plugin automatically tries to expose assets from your project and installed modules after installation, or after an update. Developers can explicitly expose static assets by calling `composer vendor-expose`. This is necessary after updating your `resources-dir` or `expose` configuration in your `composer.json` file. `composer vendor-expose` accepts an optional `method` argument (e.g.: `composer vendor-expose auto`). This controls how the files are exposed in the "resources" directory: -* `none` disables all symlink / copy, -* `copy` copy the exposed files, -* `symlink` create symlinks to the exposed folder, -* `junction` uses a junction (windows only), -* `auto` performs symlink (or junction on windows), but fail over to copy. +* `none` disables all symlink / copy +* `copy` copies the exposed files +* `symlink` create symbolic links to the exposed folder +* `junction` uses a junction (Windows only) +* `auto` creates symbolic links (or junctions on Windows), but fails over to copy. ### Referencing exposed assets -When referencing exposed assets, you should not use their web server path. e.g.: +When referencing exposed static assets, use either the project file path (relative to the project root folder) or a module name and relative file path to that module's root folder. E.g.: + ```php // When referencing project files, use the same path defined in your `composer.json` file. Requirements::javascript('app/client/dist/bundle.js'); From a3f7aca8512feb091515ee773288b163032e6b89 Mon Sep 17 00:00:00 2001 From: Kong Jin Jie Date: Thu, 10 Jan 2019 13:16:18 +0800 Subject: [PATCH 153/175] Add documentation for additional file types --- .../14_Files/01_File_Management.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/en/02_Developer_Guides/14_Files/01_File_Management.md b/docs/en/02_Developer_Guides/14_Files/01_File_Management.md index 37b99c9af..e3b41dfba 100644 --- a/docs/en/02_Developer_Guides/14_Files/01_File_Management.md +++ b/docs/en/02_Developer_Guides/14_Files/01_File_Management.md @@ -120,6 +120,20 @@ As with storage, there are also different ways of loading the content (or proper | `File::getAbsoluteURL` | Gets the absolute URL to this resource | | `File::getMimeType` | Get the mime type of this file | | `File::getMetaData` | Gets other metadata from the file as an array | +| `File::getFileType` | Return the type of file for the given extension | + +### Additional file types + +There may be some file extensions not recognised by the framework, which will return "unknown" on `File::getFileType`. + +You can add your own file extensions and it's description with the following configuration. + +```yml +SilverStripe\Assets\File: + file_types: + ai: 'Adobe Illustrator' + psd: 'Adobe Photoshop File' +``` ## Modifying files From 7d23928fde6bd9589b727a04630697bcf452d412 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Thu, 10 Jan 2019 14:10:02 +0800 Subject: [PATCH 154/175] Update docs/en/02_Developer_Guides/14_Files/01_File_Management.md Co-Authored-By: jinjie --- docs/en/02_Developer_Guides/14_Files/01_File_Management.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/02_Developer_Guides/14_Files/01_File_Management.md b/docs/en/02_Developer_Guides/14_Files/01_File_Management.md index e3b41dfba..0025bcfa9 100644 --- a/docs/en/02_Developer_Guides/14_Files/01_File_Management.md +++ b/docs/en/02_Developer_Guides/14_Files/01_File_Management.md @@ -124,7 +124,7 @@ As with storage, there are also different ways of loading the content (or proper ### Additional file types -There may be some file extensions not recognised by the framework, which will return "unknown" on `File::getFileType`. +SilverStripe has a pre-defined list of common file types. `File::getFileType` will return "unknown" for files outside that list. You can add your own file extensions and it's description with the following configuration. From f34f1ec7eecc6d809c25753ec7ab2ae0541fa817 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Thu, 10 Jan 2019 14:10:07 +0800 Subject: [PATCH 155/175] Update docs/en/02_Developer_Guides/14_Files/01_File_Management.md Co-Authored-By: jinjie --- docs/en/02_Developer_Guides/14_Files/01_File_Management.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/02_Developer_Guides/14_Files/01_File_Management.md b/docs/en/02_Developer_Guides/14_Files/01_File_Management.md index 0025bcfa9..31c1393f0 100644 --- a/docs/en/02_Developer_Guides/14_Files/01_File_Management.md +++ b/docs/en/02_Developer_Guides/14_Files/01_File_Management.md @@ -126,7 +126,7 @@ As with storage, there are also different ways of loading the content (or proper SilverStripe has a pre-defined list of common file types. `File::getFileType` will return "unknown" for files outside that list. -You can add your own file extensions and it's description with the following configuration. +You can add your own file extensions and its description with the following configuration. ```yml SilverStripe\Assets\File: From 797b749098b4fba84ce2a24d66e1e97a4b5de420 Mon Sep 17 00:00:00 2001 From: James Cocker Date: Mon, 14 Jan 2019 14:35:11 +0000 Subject: [PATCH 156/175] Corrected `legacy_paths` to `legacy_filenames` --- docs/en/04_Changelogs/4.0.0.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/04_Changelogs/4.0.0.md b/docs/en/04_Changelogs/4.0.0.md index 9cc84429a..73c5aa919 100644 --- a/docs/en/04_Changelogs/4.0.0.md +++ b/docs/en/04_Changelogs/4.0.0.md @@ -746,13 +746,13 @@ Because the filesystem now uses the sha1 of file contents in order to version mu filename, the default storage paths in 4.0 will not be the same as in 3. In order to retain existing file paths in line with framework version 3 you should set the -`\SilverStripe\Filesystem\Flysystem\FlysystemAssetStore.legacy_paths` config to true. +`\SilverStripe\Filesystem\Flysystem\FlysystemAssetStore.legacy_filenames` config to true. Note that this will not allow you to utilise certain file versioning features in 4.0. ```yml SilverStripe\Filesystem\Flysystem\FlysystemAssetStore: - legacy_paths: true + legacy_filenames: true ``` From c6214b855f3c6880e03b356124519c40fbecc3ac Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Tue, 15 Jan 2019 15:04:39 +1300 Subject: [PATCH 157/175] MINOR Update add_i18n_javascript to load lowercase-dash language files --- src/View/Requirements_Backend.php | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/View/Requirements_Backend.php b/src/View/Requirements_Backend.php index 5286ed1f4..272a61988 100644 --- a/src/View/Requirements_Backend.php +++ b/src/View/Requirements_Backend.php @@ -18,6 +18,7 @@ use SilverStripe\Core\Path; use SilverStripe\Dev\Debug; use SilverStripe\Dev\Deprecation; use SilverStripe\i18n\i18n; +use SilverStripe\ORM\FieldType\DBField; class Requirements_Backend { @@ -1004,13 +1005,21 @@ class Requirements_Backend $files = array(); $candidates = array( - 'en.js', - 'en_US.js', - i18n::getData()->langFromLocale(i18n::config()->get('default_locale')) . '.js', - i18n::config()->get('default_locale') . '.js', - i18n::getData()->langFromLocale(i18n::get_locale()) . '.js', - i18n::get_locale() . '.js', + 'en', + 'en_US', + i18n::getData()->langFromLocale(i18n::config()->get('default_locale')), + i18n::config()->get('default_locale'), + i18n::getData()->langFromLocale(i18n::get_locale()), + i18n::get_locale(), + strtolower(DBField::create_field('Locale', i18n::get_locale())->RFC1766()), + strtolower(DBField::create_field('Locale', i18n::config()->get('default_locale'))->RFC1766()) ); + + $candidates = array_map( + function ($candiate) { return $candiate . '.js'; }, + $candidates + ); + foreach ($candidates as $candidate) { $relativePath = Path::join($langDir, $candidate); $absolutePath = Director::getAbsFile($relativePath); From 87cc52f3e0fca70b5e8f0f1d7cfb1ec1bc4098ce Mon Sep 17 00:00:00 2001 From: Joe Chenevey Date: Tue, 15 Jan 2019 10:50:37 -0500 Subject: [PATCH 158/175] Update 04_Data_Types_and_Casting.md Fixed missing closing single-quote in Car class example. --- .../02_Developer_Guides/00_Model/04_Data_Types_and_Casting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/02_Developer_Guides/00_Model/04_Data_Types_and_Casting.md b/docs/en/02_Developer_Guides/00_Model/04_Data_Types_and_Casting.md index 96e8e105c..45bef4cc3 100644 --- a/docs/en/02_Developer_Guides/00_Model/04_Data_Types_and_Casting.md +++ b/docs/en/02_Developer_Guides/00_Model/04_Data_Types_and_Casting.md @@ -91,7 +91,7 @@ class Car extends DataObject private static $db = [ 'Wheels' => 'Int(4)', 'Condition' => 'Enum(array("New","Fair","Junk"), "New")', - 'Make' => 'Varchar(["default" => "Honda"]), + 'Make' => 'Varchar(["default" => "Honda"])', ); } ``` From 13486ca80ea1fe3aa7c3564e4be67c4273d00323 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Wed, 16 Jan 2019 10:36:53 +1300 Subject: [PATCH 159/175] MINOR Add unit test for Requirements::add_i18n_javascript() --- src/View/Requirements_Backend.php | 4 +- tests/php/View/RequirementsTest.php | 74 +++++++++++++++++++++++ tests/php/View/SSViewerTest/i18n/en-gb.js | 0 tests/php/View/SSViewerTest/i18n/en-us.js | 0 tests/php/View/SSViewerTest/i18n/en.js | 0 tests/php/View/SSViewerTest/i18n/en_GB.js | 0 tests/php/View/SSViewerTest/i18n/en_US.js | 0 tests/php/View/SSViewerTest/i18n/fr-ca.js | 0 tests/php/View/SSViewerTest/i18n/fr.js | 0 tests/php/View/SSViewerTest/i18n/fr_CA.js | 0 tests/php/View/SSViewerTest/i18n/mi.js | 0 11 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 tests/php/View/SSViewerTest/i18n/en-gb.js create mode 100644 tests/php/View/SSViewerTest/i18n/en-us.js create mode 100644 tests/php/View/SSViewerTest/i18n/en.js create mode 100644 tests/php/View/SSViewerTest/i18n/en_GB.js create mode 100644 tests/php/View/SSViewerTest/i18n/en_US.js create mode 100644 tests/php/View/SSViewerTest/i18n/fr-ca.js create mode 100644 tests/php/View/SSViewerTest/i18n/fr.js create mode 100644 tests/php/View/SSViewerTest/i18n/fr_CA.js create mode 100644 tests/php/View/SSViewerTest/i18n/mi.js diff --git a/src/View/Requirements_Backend.php b/src/View/Requirements_Backend.php index 272a61988..70bdba384 100644 --- a/src/View/Requirements_Backend.php +++ b/src/View/Requirements_Backend.php @@ -1016,7 +1016,9 @@ class Requirements_Backend ); $candidates = array_map( - function ($candiate) { return $candiate . '.js'; }, + function ($candidate) { + return $candidate . '.js'; + }, $candidates ); diff --git a/tests/php/View/RequirementsTest.php b/tests/php/View/RequirementsTest.php index db4b534fa..f2ccd5902 100644 --- a/tests/php/View/RequirementsTest.php +++ b/tests/php/View/RequirementsTest.php @@ -6,6 +6,7 @@ use InvalidArgumentException; use SilverStripe\Control\Director; use SilverStripe\Core\Injector\Injector; use SilverStripe\Dev\SapphireTest; +use SilverStripe\i18n\i18n; use SilverStripe\View\Requirements; use SilverStripe\View\ArrayData; use Silverstripe\Assets\Dev\TestAssetStore; @@ -1109,4 +1110,77 @@ EOS } return array(); } + + public function testAddI18nJavascript() + { + /** @var Requirements_Backend $backend */ + $backend = Injector::inst()->create(Requirements_Backend::class); + $this->setupRequirements($backend); + $backend->add_i18n_javascript('i18n'); + + $actual = $backend->getJavascript(); + + // English and English US should always be loaded no matter what + $this->assertArrayHasKey('i18n/en.js', $actual); + $this->assertArrayHasKey('i18n/en_US.js', $actual); + $this->assertArrayHasKey('i18n/en-us.js', $actual); + } + + public function testAddI18nJavascriptWithDefaultLocale() + { + i18n::config()->set('default_locale', 'fr_CA'); + + /** @var Requirements_Backend $backend */ + $backend = Injector::inst()->create(Requirements_Backend::class); + $this->setupRequirements($backend); + $backend->add_i18n_javascript('i18n'); + + $actual = $backend->getJavascript(); + + + $this->assertArrayHasKey('i18n/en.js', $actual); + $this->assertArrayHasKey('i18n/en_US.js', $actual); + $this->assertArrayHasKey('i18n/en-us.js', $actual); + // Default locale should be loaded + $this->assertArrayHasKey('i18n/fr.js', $actual); + $this->assertArrayHasKey('i18n/fr_CA.js', $actual); + $this->assertArrayHasKey('i18n/fr-ca.js', $actual); + } + + public function testAddI18nJavascriptWithMemberLocale() + { + i18n::set_locale('en_GB'); + + /** @var Requirements_Backend $backend */ + $backend = Injector::inst()->create(Requirements_Backend::class); + $this->setupRequirements($backend); + $backend->add_i18n_javascript('i18n'); + + $actual = $backend->getJavascript(); + + // The current member's Locale as defined by i18n::get_locale should be loaded + $this->assertArrayHasKey('i18n/en.js', $actual); + $this->assertArrayHasKey('i18n/en_US.js', $actual); + $this->assertArrayHasKey('i18n/en-us.js', $actual); + $this->assertArrayHasKey('i18n/en-gb.js', $actual); + $this->assertArrayHasKey('i18n/en_GB.js', $actual); + } + + public function testAddI18nJavascriptWithMissingLocale() + { + i18n::set_locale('fr_BE'); + + /** @var Requirements_Backend $backend */ + $backend = Injector::inst()->create(Requirements_Backend::class); + $this->setupRequirements($backend); + $backend->add_i18n_javascript('i18n'); + + $actual = $backend->getJavascript(); + + // We don't have a file for French Belgium. Regular french should be loaded anyway. + $this->assertArrayHasKey('i18n/en.js', $actual); + $this->assertArrayHasKey('i18n/en_US.js', $actual); + $this->assertArrayHasKey('i18n/en-us.js', $actual); + $this->assertArrayHasKey('i18n/fr.js', $actual); + } } diff --git a/tests/php/View/SSViewerTest/i18n/en-gb.js b/tests/php/View/SSViewerTest/i18n/en-gb.js new file mode 100644 index 000000000..e69de29bb diff --git a/tests/php/View/SSViewerTest/i18n/en-us.js b/tests/php/View/SSViewerTest/i18n/en-us.js new file mode 100644 index 000000000..e69de29bb diff --git a/tests/php/View/SSViewerTest/i18n/en.js b/tests/php/View/SSViewerTest/i18n/en.js new file mode 100644 index 000000000..e69de29bb diff --git a/tests/php/View/SSViewerTest/i18n/en_GB.js b/tests/php/View/SSViewerTest/i18n/en_GB.js new file mode 100644 index 000000000..e69de29bb diff --git a/tests/php/View/SSViewerTest/i18n/en_US.js b/tests/php/View/SSViewerTest/i18n/en_US.js new file mode 100644 index 000000000..e69de29bb diff --git a/tests/php/View/SSViewerTest/i18n/fr-ca.js b/tests/php/View/SSViewerTest/i18n/fr-ca.js new file mode 100644 index 000000000..e69de29bb diff --git a/tests/php/View/SSViewerTest/i18n/fr.js b/tests/php/View/SSViewerTest/i18n/fr.js new file mode 100644 index 000000000..e69de29bb diff --git a/tests/php/View/SSViewerTest/i18n/fr_CA.js b/tests/php/View/SSViewerTest/i18n/fr_CA.js new file mode 100644 index 000000000..e69de29bb diff --git a/tests/php/View/SSViewerTest/i18n/mi.js b/tests/php/View/SSViewerTest/i18n/mi.js new file mode 100644 index 000000000..e69de29bb From 7ea218aa1cb635434f939ba033abcf711f871665 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 16 Jan 2019 16:24:45 +1300 Subject: [PATCH 160/175] Ensure document is not falsey before attempting to clone it --- src/View/Parsers/HTMLValue.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/View/Parsers/HTMLValue.php b/src/View/Parsers/HTMLValue.php index d41ef3708..aa6a3f535 100644 --- a/src/View/Parsers/HTMLValue.php +++ b/src/View/Parsers/HTMLValue.php @@ -35,7 +35,11 @@ abstract class HTMLValue extends ViewableData */ public function getContent() { - $doc = clone $this->getDocument(); + $document = $this->getDocument(); + if (!$document) { + return ''; + } + $doc = clone $document; $xp = new DOMXPath($doc); // If there's no body, the content is empty string From 95c6ba67df49eb400d5daa04566fb47c72a78c47 Mon Sep 17 00:00:00 2001 From: Sacha Judd Date: Wed, 16 Jan 2019 17:04:30 +1300 Subject: [PATCH 161/175] DOCS Add how to customise page icons in the site tree [ci skip] --- .../How_Tos/Customise_CMS_Tree.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md index 534f900b5..486a17dc9 100644 --- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md +++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md @@ -89,3 +89,22 @@ __'Scheduled To Publish'__ status. The look of the page node will be changed from ![Normal Page Node](../../../_images/page_node_normal.png) to ![Scheduled Page Node](../../../_images/page_node_scheduled.png). The getStatusFlags has an `updateStatusFlags()` extension point, so the flags can be modified through `DataExtension` rather than inheritance as well. Deleting existing flags works by simply unsetting the array key. + +## Customising page icons + +The page tree in the CMS is a central element to manage page hierarchies, hence its display of pages can be customised as well. You can specify a custom page icon to make it easier for CMS authors to identify pages of this type, when navigating the tree or adding a new page: + +```php +class HomePage extends Page +{ + private static $icon_class = 'font-icon-p-home'; +} +``` + +The CMS uses an icon set from [Fontastic](http://fontastic.me/). New icons may be [requested](https://github.com/silverstripe/silverstripe-admin/issues/new) and added to the [core icon set](https://silverstripe.github.io/silverstripe-admin/?selectedKind=Admin%2FIcons&selectedStory=Icon%20reference&full=0&addons=1&stories=1&panelRight=0&addonPanel=storybook%2Factions%2Factions-panel). The benefit of having icons added to the core set is that you can use icons more consistently across different modules allowing every module to use a different icon with the same style. + +You can also add your own icon by specifying an image path to override the Fontastic icon set: + +```php + private static $icon = 'app/images/homepage-icon.svg'; +``` From b6e3ff85c72a0acf88f60db8009e9909337890e3 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Thu, 17 Jan 2019 16:20:14 +1300 Subject: [PATCH 162/175] DOCS Add some extra info about the --strict flag for the upgrader --- docs/en/03_Upgrading/index.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/en/03_Upgrading/index.md b/docs/en/03_Upgrading/index.md index f64a92015..366139d48 100644 --- a/docs/en/03_Upgrading/index.md +++ b/docs/en/03_Upgrading/index.md @@ -190,7 +190,9 @@ upgrade-code recompose --write You can add a `--recipe-core-constraint` flag to target a specific version of `silverstripe/recipe-core`. By default, the project will be upgraded to the latest stable version. If you are upgrading a CWP project, you can use `--cwp-constraint` instead to target a specific version of `cwp/cwp-core`. -You can use the `--strict` option if you want to use more conservative version constraints. Omit the `--write` flag to preview your changes. +The upgrader uses [carret version constraint](https://getcomposer.org/doc/articles/versions.md#caret-version-range-) by default. This will cause composer to install compatible minor releases. You can use the `--strict` option if you want to use the more conservative [tilde version constraints](https://getcomposer.org/doc/articles/versions.md#tilde-version-range-). + +Omit the `--write` flag to preview your changes. Your upgraded `composer.json` file will look like this. ```json From af08328e8efff8ae7c5d39cfbdde15a7954525c1 Mon Sep 17 00:00:00 2001 From: Simon Gow Date: Mon, 14 Jan 2019 14:35:58 +1300 Subject: [PATCH 163/175] Existing sessions need to set a new cookie on each request, if the session exists, otherwise our expiry is never updated and sessions can't roll on every request. --- src/Control/Session.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Control/Session.php b/src/Control/Session.php index e2591d2c5..1b226c021 100644 --- a/src/Control/Session.php +++ b/src/Control/Session.php @@ -324,6 +324,12 @@ class Session } session_start(); + + // Session start emits a cookie, but only if there's no existing session. If there is a session tied to + // this request, make sure the session is held for the entire timeout by refreshing the cookie age. + if ($this->requestContainsSessionId($request)) { + Cookie::set(session_name(), session_id(), $timeout / 86400, $path, $domain ?: null, $secure, true); + } } else { // If headers are sent then we can't have a session_cache_limiter otherwise we'll get a warning session_cache_limiter(null); From c28670ebedd8d8ebe83421209790c50b3b1dd673 Mon Sep 17 00:00:00 2001 From: Simon Gow Date: Fri, 18 Jan 2019 10:07:53 +1300 Subject: [PATCH 164/175] #8724 - Session timeout regression Only emit the session refresh cookie if the session timeout is set. --- src/Control/Session.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Control/Session.php b/src/Control/Session.php index 1b226c021..f0ad80545 100644 --- a/src/Control/Session.php +++ b/src/Control/Session.php @@ -325,9 +325,9 @@ class Session session_start(); - // Session start emits a cookie, but only if there's no existing session. If there is a session tied to - // this request, make sure the session is held for the entire timeout by refreshing the cookie age. - if ($this->requestContainsSessionId($request)) { + // Session start emits a cookie, but only if there's no existing session. If there is a session timeout + // tied to this request, make sure the session is held for the entire timeout by refreshing the cookie age. + if ($timeout && $this->requestContainsSessionId($request)) { Cookie::set(session_name(), session_id(), $timeout / 86400, $path, $domain ?: null, $secure, true); } } else { From a975ec023c8001755a01a0c44d2f105c79760e2b Mon Sep 17 00:00:00 2001 From: bergice Date: Tue, 22 Jan 2019 16:02:44 +1300 Subject: [PATCH 165/175] Add documentation on using `renameWarnings` in the upgrader --- docs/en/03_Upgrading/index.md | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/docs/en/03_Upgrading/index.md b/docs/en/03_Upgrading/index.md index b36bb9f88..b5d70a48d 100644 --- a/docs/en/03_Upgrading/index.md +++ b/docs/en/03_Upgrading/index.md @@ -598,17 +598,36 @@ Execute the upgrade command with this command. upgrade-code upgrade ./mysite/ --write ``` -If you omit the `--write` flag you will get a preview of what change the upgrader will apply to your codebase. This can be helpful if you if you are tweaking your `.upgrade.yml` or if you are trying to identify areas where you should add a `@skipUpgrade` statement, +If you omit the `--write` flag you will get a preview of what change the upgrader will apply to your codebase. This can be helpful if you are tweaking your `.upgrade.yml` or if you are trying to identify areas where you should add a `@skipUpgrade` statement, You can also tweak which rules to apply with the `--rule` flag: `code`, `config`, and `lang`. For example, the following command will only upgrade `lang` and `config` files: ```bash upgrade-code upgrade ./mysite/ --rule=config --rule=lang ``` -The `upgrade` command can alter big chunks of your codebase. While it works reasonably well in most use case, you should not trust it blindly. You should take time to review all changes applied by the `upgrade` command and confirm you are happy with them. +The `upgrade` command can alter big chunks of your codebase. While it works reasonably well in most use cases, you should not trust it blindly. You should take time to review all changes applied by the `upgrade` command and confirm you are happy with them. [Continue to "Finalising namespace updates"](#namespace-finalise) +#### Rename Warnings + +You can also show extra warnings for potentially ambiguous mappings with the `renameWarnings` property: + +```yaml +renameWarnings: + - File + - Image +``` + +An example of an ambiguous rename would be: +```PHP +private static $has_one = [ + 'Image' => 'Image', +]; +``` + +Add the `--prompt` flag to manually approve ambiguous class renames. + ### Manually update namespaced references If you decide to update your namespace references by hand, you'll need to go through the entire code base and update them all from the old non-namespaced SilverStripe classes to the new namespaced equivalent. If you are referencing classes from third party modules that have been namespaced, you'll need to update those as well. From 39297b8640d95891c1a65c4a6857ef127610c268 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Wed, 23 Jan 2019 18:40:15 +1300 Subject: [PATCH 166/175] MINOR Add message to inform user that the task can be run again without issue --- src/Dev/Tasks/MigrateFileTask.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Dev/Tasks/MigrateFileTask.php b/src/Dev/Tasks/MigrateFileTask.php index 4b026b876..a7ca519f5 100644 --- a/src/Dev/Tasks/MigrateFileTask.php +++ b/src/Dev/Tasks/MigrateFileTask.php @@ -17,8 +17,9 @@ class MigrateFileTask extends BuildTask protected $title = 'Migrate File dataobjects from 3.x'; - protected $description - = 'Imports all files referenced by File dataobjects into the new Asset Persistence Layer introduced in 4.0'; + protected $description = + 'Imports all files referenced by File dataobjects into the new Asset Persistence Layer introduced in 4.0. ' . + 'If the task fails or times out, run it again and it will start where it left off.'; public function run($request) { @@ -27,6 +28,11 @@ class MigrateFileTask extends BuildTask return; } + DB::alteration_message( + 'If the task fails or times out, run it again and it will start where it left off.', + "info" + ); + $migrated = FileMigrationHelper::singleton()->run(); if ($migrated) { DB::alteration_message("{$migrated} File DataObjects upgraded", "changed"); @@ -38,7 +44,6 @@ class MigrateFileTask extends BuildTask DB::alteration_message("No image thumbnail helper detected", "notice"); return; } - ImageThumbnailHelper::singleton()->run(); } } From 8ae9c7c07c0a23f26048d31eba922b9f67a24f1e Mon Sep 17 00:00:00 2001 From: DorsetDigital Date: Thu, 24 Jan 2019 10:27:38 +0000 Subject: [PATCH 167/175] Update 03_Form_Templates.md Add default location of default form template to help people who wish to copy it. --- docs/en/02_Developer_Guides/03_Forms/03_Form_Templates.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/en/02_Developer_Guides/03_Forms/03_Form_Templates.md b/docs/en/02_Developer_Guides/03_Forms/03_Form_Templates.md index 0b1576921..cbcbea220 100644 --- a/docs/en/02_Developer_Guides/03_Forms/03_Form_Templates.md +++ b/docs/en/02_Developer_Guides/03_Forms/03_Form_Templates.md @@ -22,6 +22,8 @@ Both `MyCustomTemplate.ss` and `MyCustomTextField.ss` should be located in **app It's recommended to copy the contents of the template you're going to replace and use that as a start. For instance, if you want to create a `MyCustomFormTemplate` copy the contents of `Form.ss` to a `MyCustomFormTemplate.ss` file and modify as you need. + +*The default Form.ss can be found in `/vendor/silverstripe/framework/templates/SilverStripe/Forms/Includes/`*
              By default, Form and Fields follow the SilverStripe Template convention and are rendered into templates of the same From 17b55fea5e055e58531a1d32a31e6dfd6a29c1db Mon Sep 17 00:00:00 2001 From: DorsetDigital Date: Thu, 24 Jan 2019 13:55:52 +0100 Subject: [PATCH 168/175] Update 03_Form_Templates.md - form template locations (#8751) Update guidance on form template location. They don't necessarily have to be placed in /app/templates and will work in the theme directory too. The current text also seems to suggest that they can be placed in the core directory - something which I don't believe should be advised, --- docs/en/02_Developer_Guides/03_Forms/03_Form_Templates.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/02_Developer_Guides/03_Forms/03_Form_Templates.md b/docs/en/02_Developer_Guides/03_Forms/03_Form_Templates.md index cbcbea220..7abe0332f 100644 --- a/docs/en/02_Developer_Guides/03_Forms/03_Form_Templates.md +++ b/docs/en/02_Developer_Guides/03_Forms/03_Form_Templates.md @@ -16,7 +16,7 @@ $field = new TextField(..); $field->setTemplate('MyCustomTextField'); ``` -Both `MyCustomTemplate.ss` and `MyCustomTextField.ss` should be located in **app/templates/** or the same directory as the core. +To override the template for CMS forms, the custom templates should be located in **/app/templates**. Front-end form templates can be located in **/app/templates** or in the active theme's **/templates** directory.
              It's recommended to copy the contents of the template you're going to replace and use that as a start. For instance, if From e087e564e13d7c30b62850a271131684a619789e Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 24 Jan 2019 16:45:38 +0200 Subject: [PATCH 169/175] Fix tests not loading fixtures and loading themes in CWP recipe kitchen sink --- tests/php/Forms/TreeMultiselectFieldTest.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/php/Forms/TreeMultiselectFieldTest.php b/tests/php/Forms/TreeMultiselectFieldTest.php index 5b2f14a65..e2cc56741 100644 --- a/tests/php/Forms/TreeMultiselectFieldTest.php +++ b/tests/php/Forms/TreeMultiselectFieldTest.php @@ -7,11 +7,17 @@ use SilverStripe\Dev\SapphireTest; use SilverStripe\Forms\Form; use SilverStripe\Forms\FormTemplateHelper; use SilverStripe\Forms\TreeMultiselectField; +use SilverStripe\ORM\Tests\HierarchyTest\TestObject; +use SilverStripe\View\SSViewer; class TreeMultiselectFieldTest extends SapphireTest { protected static $fixture_file = 'TreeDropdownFieldTest.yml'; + protected static $extra_dataobjects = [ + TestObject::class, + ]; + protected $formId = 'TheFormID'; protected $fieldName = 'TestTree'; @@ -54,6 +60,9 @@ class TreeMultiselectFieldTest extends SapphireTest { parent::setUp(); + // Don't let other themes interfere with these tests + SSViewer::set_themes([]); + $this->form = $this->buildFormMock(); $this->field = $this->buildField($this->form); $this->folders = $this->loadFolders(); From db466fb0131d1c091662f08b738cb02306ee67ac Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Fri, 25 Jan 2019 13:34:36 +1300 Subject: [PATCH 170/175] MINOR Always cast formfield display value as a string to avoid 0 being blank --- src/Forms/DropdownField.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Forms/DropdownField.php b/src/Forms/DropdownField.php index a18fc878c..53a354fc0 100644 --- a/src/Forms/DropdownField.php +++ b/src/Forms/DropdownField.php @@ -106,7 +106,7 @@ class DropdownField extends SingleSelectField } return new ArrayData(array( - 'Title' => $title, + 'Title' => (string)$title, 'Value' => $value, 'Selected' => $selected, 'Disabled' => $disabled, From d28552915d816036cf1bc80642776e58744f44a4 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Fri, 25 Jan 2019 15:55:03 +1300 Subject: [PATCH 171/175] Add unit test for an invalid HTMLValue --- tests/php/View/Parsers/HTML4ValueTest.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/php/View/Parsers/HTML4ValueTest.php b/tests/php/View/Parsers/HTML4ValueTest.php index 5e6f9ed28..018f7b08d 100644 --- a/tests/php/View/Parsers/HTML4ValueTest.php +++ b/tests/php/View/Parsers/HTML4ValueTest.php @@ -80,4 +80,19 @@ class HTML4ValueTest extends SapphireTest $value->setContent(''); $this->assertEquals('', $value->getContent(), "'\"' character is escaped"); } + + public function testGetContent() + { + $value = new HTML4Value(); + + $value->setContent('

              This is valid

              '); + $this->assertEquals('

              This is valid

              ', $value->getContent(), "Valid content is returned"); + + $value->setContent('valid is false + // for instance if a content editor saves something really weird in a LiteralField + // we can manually get to this state via ->setInvalid() + $value->setInvalid(); + $this->assertEquals('', $value->getContent(), "Blank string is returned when invalid"); + } } From 785e9f123ffe3ac814001d1e63b43b2ec6effc06 Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Mon, 28 Jan 2019 14:51:34 +0000 Subject: [PATCH 172/175] Replace self:: with static:: for shortcode methods --- src/View/Shortcodes/EmbedShortcodeProvider.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/View/Shortcodes/EmbedShortcodeProvider.php b/src/View/Shortcodes/EmbedShortcodeProvider.php index 62f23fec2..8dec5b8b3 100644 --- a/src/View/Shortcodes/EmbedShortcodeProvider.php +++ b/src/View/Shortcodes/EmbedShortcodeProvider.php @@ -114,11 +114,11 @@ class EmbedShortcodeProvider implements ShortcodeHandler if (empty($arguments['width']) && $embed->getWidth()) { $arguments['width'] = $embed->getWidth(); } - return self::videoEmbed($arguments, $embed->getCode()); + return static::videoEmbed($arguments, $embed->getCode()); case 'link': - return self::linkEmbed($arguments, $embed->getUrl(), $embed->getTitle()); + return static::linkEmbed($arguments, $embed->getUrl(), $embed->getTitle()); case 'photo': - return self::photoEmbed($arguments, $embed->getUrl()); + return static::photoEmbed($arguments, $embed->getUrl()); default: return null; } From c4bf06f6008e4619fb88075e6dc779d7acf595fd Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Tue, 29 Jan 2019 17:28:16 +1300 Subject: [PATCH 173/175] NEW Add new execmetric debug URL parameter to print out exection time and peak memory usage --- _config/config.yml | 8 +++ .../07_Debugging/02_URL_Variable_Tools.md | 3 +- .../Middleware/ExecMetricMiddleware.php | 67 +++++++++++++++++++ 3 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 src/Control/Middleware/ExecMetricMiddleware.php diff --git a/_config/config.yml b/_config/config.yml index 4f1e04983..0240fe8c2 100644 --- a/_config/config.yml +++ b/_config/config.yml @@ -8,8 +8,16 @@ SilverStripe\Core\Manifest\VersionProvider: Name: httpconfig-dev Only: environment: dev +After: + - 'requestprocessors' --- # Set dev level to disabled with a higher forcing level SilverStripe\Control\Middleware\HTTPCacheControlMiddleware: defaultState: 'disabled' defaultForcingLevel: 3 + +SilverStripe\Core\Injector\Injector: + SilverStripe\Control\Director: + properties: + Middlewares: + ExecMetricMiddleware: '%$SilverStripe\Control\Middleware\ExecMetricMiddleware' \ No newline at end of file diff --git a/docs/en/02_Developer_Guides/07_Debugging/02_URL_Variable_Tools.md b/docs/en/02_Developer_Guides/07_Debugging/02_URL_Variable_Tools.md index 3217c114d..d1519a11a 100644 --- a/docs/en/02_Developer_Guides/07_Debugging/02_URL_Variable_Tools.md +++ b/docs/en/02_Developer_Guides/07_Debugging/02_URL_Variable_Tools.md @@ -28,7 +28,8 @@ session variables, used templates and much more. | isDev | | 1 | | Put the site into [development mode](../), enabling debugging messages to the browser on a live server. For security, you'll be asked to log in with an administrator log-in. Will persist for the current browser session. | | isTest | | 1 | | See above. | | debug | | 1 | | Show a collection of debugging information about the director / controller operation | - | debug_request | | 1 | | Show all steps of the request from initial [HTTPRequest](api:SilverStripe\Control\HTTPRequest) to [Controller](api:SilverStripe\Control\Controller) to Template Rendering | + | debug_request | | 1 | | Show all steps of the request from initial [HTTPRequest](api:SilverStripe\Control\HTTPRequest) to [Controller](api:SilverStripe\Control\Controller) to Template Rendering | + | execmetric | | 1 | | Display the execution time and peak memory usage for the request | ## Classes and Objects diff --git a/src/Control/Middleware/ExecMetricMiddleware.php b/src/Control/Middleware/ExecMetricMiddleware.php new file mode 100644 index 000000000..7a9da23bc --- /dev/null +++ b/src/Control/Middleware/ExecMetricMiddleware.php @@ -0,0 +1,67 @@ +showMetric($request)) { + return $delegate($request); + } + + $start = microtime(true); + try { + return $delegate($request); + } finally { + $end = microtime(true); + Debug::message( + sprintf( + "Execution time: %s, Peak memory usage: %s\n", + $this->formatExecutionTime($start, $end), + $this->formatPeakMemoryUsage() + ), + false + ); + } + } + + private function showMetric(HTTPRequest $request) + { + return Director::isDev() && array_key_exists('execmetric', $request->getVars()); + } + + /** + * Convert the provided start and end time to a interval in secs. + * @param float $start + * @param float $end + * @return string + */ + private function formatExecutionTime($start, $end) + { + $diff = round($end - $start, 4); + return $diff . ' seconds'; + } + + /** + * Get the peak memory usage formatted has a string and a meaningful unit. + * @return string + */ + private function formatPeakMemoryUsage() + { + $bytes = memory_get_peak_usage(true); + return File::format_size($bytes); + } +} From 4f6cc24eeda5824195480814292b731e123b37dc Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Tue, 29 Jan 2019 17:54:04 +1300 Subject: [PATCH 174/175] MINOR Add an ambiguous renaming warning for Form when using the upgrader --- .upgrade.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.upgrade.yml b/.upgrade.yml index fd909ca0a..3bbece19b 100644 --- a/.upgrade.yml +++ b/.upgrade.yml @@ -1376,3 +1376,5 @@ warnings: message: 'Use global const RESOURCES_DIR' url: 'https://docs.silverstripe.org/en/4/changelogs/4.4.0#resources-dir' replacement: 'RESOURCES_DIR' +renameWarnings: + - Form \ No newline at end of file From 2d257ae3dfcd623fa943efe784a40739b5340a68 Mon Sep 17 00:00:00 2001 From: wernerkrauss Date: Tue, 29 Jan 2019 08:00:04 +0100 Subject: [PATCH 175/175] explain resource url usage for add_i18n_javascript (#8761) see #8748 --- docs/en/02_Developer_Guides/13_i18n/index.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/en/02_Developer_Guides/13_i18n/index.md b/docs/en/02_Developer_Guides/13_i18n/index.md index 93e87dd5e..0523be133 100644 --- a/docs/en/02_Developer_Guides/13_i18n/index.md +++ b/docs/en/02_Developer_Guides/13_i18n/index.md @@ -414,6 +414,11 @@ Requirements::javascript('silverstripe/admin:client/dist/js/i18n.js'); Requirements::add_i18n_javascript('/javascript/lang'); ``` +You can also include the language files from the public resources folder with the resource syntax: +```php +Requirements::add_i18n_javascript('vendor/module:path/to/lang'); +``` + ### Translation Tables in JavaScript Translation tables are automatically included as required, depending on the configured locale in `i18n::get_locale()`.