Merge branch '4.4' into 4

src/Control/Email/Email.php

@@ -49,9 +49,10 @@ class Email extends ViewableData
 
     /**
      * This will be set in the config on a site-by-site basis
+     * @see https://docs.silverstripe.org/en/4/developer_guides/email/#administrator-emails
      *
      * @config
-     * @var string The default administrator email address.
+     * @var string|array The default administrator email address or array of [email => name]
      */
     private static $admin_email = null;
 

src/Core/CustomMethods.php

@@ -285,7 +285,12 @@ trait CustomMethods
 
                 $methodInfo = self::$extra_methods[$class][$method];
 
-                if ($methodInfo['property'] === $property && $methodInfo['index'] === $index) {
+                if (
+                    // always check for property
+                    (isset($methodInfo['property']) && $methodInfo['property'] === $property) &&
+                    // check for index only if provided
+                    (!$index || ($index && isset($methodInfo['index']) && $methodInfo['index'] === $index))
+                ) {
                     unset(self::$extra_methods[$class][$method]);
                 }
             }

src/Forms/GridField/GridFieldDetailForm_ItemRequest.php

@@ -18,6 +18,7 @@ use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBHTMLText;
 use SilverStripe\ORM\HasManyList;
 use SilverStripe\ORM\ManyManyList;
+use SilverStripe\ORM\RelationList;
 use SilverStripe\ORM\SS_List;
 use SilverStripe\ORM\ValidationException;
 use SilverStripe\ORM\ValidationResult;
@@ -178,20 +179,6 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
             return $controller->redirect($noActionURL, 302);
         }
 
-        $canView = $this->record->canView();
-        $canEdit = $this->record->canEdit();
-        $canDelete = $this->record->canDelete();
-        $canCreate = $this->record->canCreate();
-
-        if (!$canView) {
-            $controller = $this->getToplevelController();
-            // TODO More friendly error
-            return $controller->httpError(403);
-        }
-
-        // Build actions
-        $actions = $this->getFormActions();
-
         // If we are creating a new record in a has-many list, then
         // pre-populate the record's foreign key.
         if ($list instanceof HasManyList && !$this->record->isInDB()) {
@@ -200,6 +187,12 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
             $this->record->$key = $id;
         }
 
+        if (!$this->record->canView()) {
+            $controller = $this->getToplevelController();
+            // TODO More friendly error
+            return $controller->httpError(403);
+        }
+
         $fields = $this->component->getFields();
         if (!$fields) {
             $fields = $this->record->getCMSFields();
@@ -219,20 +212,22 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
             $this,
             'ItemEditForm',
             $fields,
-            $actions,
+            $this->getFormActions(),
             $this->component->getValidator()
         );
 
         $form->loadDataFrom($this->record, $this->record->ID == 0 ? Form::MERGE_IGNORE_FALSEISH : Form::MERGE_DEFAULT);
 
-        if ($this->record->ID && !$canEdit) {
+        if ($this->record->ID && !$this->record->canEdit()) {
             // Restrict editing of existing records
             $form->makeReadonly();
             // Hack to re-enable delete button if user can delete
-            if ($canDelete) {
+            if ($this->record->canDelete()) {
                 $form->Actions()->fieldByName('action_doDelete')->setReadonly(false);
             }
-        } elseif (!$this->record->ID && !$canCreate) {
+        } elseif (!$this->record->ID
+            && !$this->record->canCreate(null, $this->getCreateContext())
+        ) {
             // Restrict creation of new records
             $form->makeReadonly();
         }
@@ -272,6 +267,25 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
         return $form;
     }
 
+    /**
+     * Build context for verifying canCreate
+     * @see GridFieldAddNewButton::getHTMLFragments()
+     *
+     * @return array
+     */
+    protected function getCreateContext()
+    {
+        $gridField = $this->gridField;
+        $context = [];
+        if ($gridField->getList() instanceof RelationList) {
+            $record = $gridField->getForm()->getRecord();
+            if ($record && $record instanceof DataObject) {
+                $context['Parent'] = $record;
+            }
+        }
+        return $context;
+    }
+
     /**
      * @return CompositeField Returns the right aligned toolbar group field along with its FormAction's
      */

src/Logging/DebugViewFriendlyErrorFormatter.php

@@ -2,6 +2,7 @@
 
 namespace SilverStripe\Logging;
 
+use SilverStripe\Core\Convert;
 use SilverStripe\Dev\Debug;
 use SilverStripe\Control\Director;
 use SilverStripe\Control\Email\Email;
@@ -133,13 +134,36 @@ class DebugViewFriendlyErrorFormatter implements FormatterInterface
         $output = $renderer->renderHeader();
         $output .= $renderer->renderInfo("Website Error", $this->getTitle(), $this->getBody());
 
-        $adminEmail = Email::config()->get('admin_email');
+        if (!is_null($contactInfo = $this->addContactAdministratorInfo())) {
-        if ($adminEmail) {
+            $output .= $renderer->renderParagraph($contactInfo);
-            $mailto = Email::obfuscate($adminEmail);
-            $output .= $renderer->renderParagraph('Contact an administrator: ' . $mailto . '');
         }
 
         $output .= $renderer->renderFooter();
         return $output;
     }
+
+    /**
+     * Generate the line with admin contact info
+     *
+     * @return string|null
+     */
+    private function addContactAdministratorInfo()
+    {
+        if (!$adminEmail = Email::config()->admin_email) {
+            return null;
+        }
+
+        if (is_string($adminEmail)) {
+            return 'Contact an administrator: ' . Email::obfuscate($adminEmail);
+        }
+
+        if (!is_array($adminEmail) || !count($adminEmail)) {
+            return null;
+        }
+
+        $email = array_keys($adminEmail)[0];
+        $name = array_values($adminEmail)[0];
+
+        return sprintf('Contact %s: %s', Convert::raw2xml($name), Email::obfuscate($email));
+    }
 }

tests/php/Logging/DebugViewFriendlyErrorFormatterTest.php

@@ -92,4 +92,27 @@ TEXT
 
         $this->assertSame('The Diary of Anne Frank', $formatter->output(200));
     }
+
+    public function testAdminEmailWithName()
+    {
+        Email::config()->set('admin_email', ['testy@mctest.face' => 'The ad&min']);
+
+        $formatter = new DebugViewFriendlyErrorFormatter();
+        $formatter->setTitle("There has been an error");
+        $formatter->setBody("The website server has not been able to respond to your request");
+
+        $expected = <<<TEXT
+WEBSITE ERROR
+There has been an error
+-----------------------
+The website server has not been able to respond to your request
+
+Contact The ad&amp;min: testy [at] mctest [dot] face
+
+
+TEXT
+        ;
+
+        $this->assertEquals($expected, $formatter->output(404));
+    }
 }