silverstripe / cwp

src/Extensions/CwpWorkflowDefinitionExtension.php

Indentation +29 added lines, -29 removed lines

@@ -12,37 +12,37 @@
  */
 class CwpWorkflowDefinitionExtension extends DataExtension
 {
-    /**
-     * Create the default 'Two-step Workflow' when this extension is loaded
-     *
-     * @config
-     * @var boolean
-     */
-    private static $create_default_workflow = true;
+	/**
+	 * Create the default 'Two-step Workflow' when this extension is loaded
+	 *
+	 * @config
+	 * @var boolean
+	 */
+	private static $create_default_workflow = true;
 
-    public function requireDefaultRecords()
-    {
-        if (Config::inst()->get(CwpWorkflowDefinitionExtension::class, 'create_default_workflow')) {
-            // Only proceed if a definition using this template has not been created yet
-            $definition = WorkflowDefinition::get()->filter("Template", "Review and Approve")->First();
-            if ($definition && $definition->exists()) {
-                return;
-            }
+	public function requireDefaultRecords()
+	{
+		if (Config::inst()->get(CwpWorkflowDefinitionExtension::class, 'create_default_workflow')) {
+			// Only proceed if a definition using this template has not been created yet
+			$definition = WorkflowDefinition::get()->filter("Template", "Review and Approve")->First();
+			if ($definition && $definition->exists()) {
+				return;
+			}
 
-            //generate from the template, which happens after we write the definition
-            $definition = WorkflowDefinition::create();
-            $definition->Template = "Review and Approve";
-            $definition->write();
+			//generate from the template, which happens after we write the definition
+			$definition = WorkflowDefinition::create();
+			$definition->Template = "Review and Approve";
+			$definition->write();
 
-            //change the title, description, and reminder days
-            $definition->update(array(
-                'Title' => "Two-step Workflow",
-                'Description' => "Content Authors can write content and Content Publishers can approve/reject.",
-                'RemindDays' => 3,
-            ));
-            $definition->write();
+			//change the title, description, and reminder days
+			$definition->update(array(
+				'Title' => "Two-step Workflow",
+				'Description' => "Content Authors can write content and Content Publishers can approve/reject.",
+				'RemindDays' => 3,
+			));
+			$definition->write();
 
-            DB::alteration_message("Added default workflow definition to WorkflowDefinition table", "created");
-        }
-    }
+			DB::alteration_message("Added default workflow definition to WorkflowDefinition table", "created");
+		}
+	}
 }

tests/PageTypes/BasePageTest.php

Indentation +38 added lines, -38 removed lines

@@ -8,42 +8,42 @@
 
 class BasePageTest extends SapphireTest
 {
-    protected static $fixture_file = 'BasePageTest.yml';
-
-    protected function setUp()
-    {
-        parent::setUp();
-
-        Config::modify()->set(BasePage::class, 'pdf_export', true);
-        Config::modify()->set(BasePage::class, 'generated_pdf_path', 'assets/_generated_pdfs');
-    }
-
-    public function testPdfFilename()
-    {
-        $page = $this->objFromFixture(BasePage::class, 'test-page-one');
-        $this->assertContains(
-            'assets/_generated_pdfs/test-page-one-1.pdf',
-            $page->getPdfFilename(),
-            'Generated filename for PDF'
-        );
-    }
-
-    public function testPdfLink()
-    {
-        $page = $this->objFromFixture(BasePage::class, 'test-page-one');
-        $this->assertContains('test-page-one/downloadpdf', $page->PdfLink(), 'Link to download PDF');
-    }
-
-    public function testHomePagePdfLink()
-    {
-        $page = $this->objFromFixture(BasePage::class, 'home-page');
-        $this->assertContains('home/downloadpdf', $page->PdfLink(), 'Link to download PDF');
-    }
-
-    public function testPdfLinkDisabled()
-    {
-        Config::modify()->set(BasePage::class, 'pdf_export', false);
-        $page = $this->objFromFixture(BasePage::class, 'test-page-one');
-        $this->assertFalse($page->PdfLink(), 'No PDF link as the functionality is disabled');
-    }
+	protected static $fixture_file = 'BasePageTest.yml';
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		Config::modify()->set(BasePage::class, 'pdf_export', true);
+		Config::modify()->set(BasePage::class, 'generated_pdf_path', 'assets/_generated_pdfs');
+	}
+
+	public function testPdfFilename()
+	{
+		$page = $this->objFromFixture(BasePage::class, 'test-page-one');
+		$this->assertContains(
+			'assets/_generated_pdfs/test-page-one-1.pdf',
+			$page->getPdfFilename(),
+			'Generated filename for PDF'
+		);
+	}
+
+	public function testPdfLink()
+	{
+		$page = $this->objFromFixture(BasePage::class, 'test-page-one');
+		$this->assertContains('test-page-one/downloadpdf', $page->PdfLink(), 'Link to download PDF');
+	}
+
+	public function testHomePagePdfLink()
+	{
+		$page = $this->objFromFixture(BasePage::class, 'home-page');
+		$this->assertContains('home/downloadpdf', $page->PdfLink(), 'Link to download PDF');
+	}
+
+	public function testPdfLinkDisabled()
+	{
+		Config::modify()->set(BasePage::class, 'pdf_export', false);
+		$page = $this->objFromFixture(BasePage::class, 'test-page-one');
+		$this->assertFalse($page->PdfLink(), 'No PDF link as the functionality is disabled');
+	}
 }

tests/PageTypes/EventHolderTest.php

Indentation +68 added lines, -68 removed lines

@@ -8,94 +8,94 @@
 
 class EventHolderTest extends SapphireTest
 {
-    protected static $fixture_file = 'EventHolderTest.yml';
+	protected static $fixture_file = 'EventHolderTest.yml';
 
-    public function testEventTags()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testEventTags()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $tags = $holder->UpdateTags();
-        $this->assertNotNull($tags->find('Name', 'Future'), 'Finds present terms.');
-        $this->assertNull($tags->find('Name', 'Event types', 'Does not find top level taxonomy.'));
-        $this->assertNull($tags->find('Name', 'Carrot'), 'Does not find terms that are not applied.');
-    }
+		$tags = $holder->UpdateTags();
+		$this->assertNotNull($tags->find('Name', 'Future'), 'Finds present terms.');
+		$this->assertNull($tags->find('Name', 'Event types', 'Does not find top level taxonomy.'));
+		$this->assertNull($tags->find('Name', 'Carrot'), 'Does not find terms that are not applied.');
+	}
 
-    public function testEventWithParentFilter()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder2');
+	public function testEventWithParentFilter()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder2');
 
-        $items = $holder->Updates();
+		$items = $holder->Updates();
 
-        $this->assertNotNull($items->find('URLSegment', 'other-holder'), 'Event from the holder is shown.');
-        $this->assertNull($items->find('URLSegment', 'future-event-1'), 'Events from other holders are not shown.');
-    }
+		$this->assertNotNull($items->find('URLSegment', 'other-holder'), 'Event from the holder is shown.');
+		$this->assertNull($items->find('URLSegment', 'future-event-1'), 'Events from other holders are not shown.');
+	}
 
-    public function testEventsWithTagFilter()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testEventsWithTagFilter()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        //Get the "Future" tag.
-        $tag = $this->objFromFixture(TaxonomyTerm::class, 'TaxonomyTerm1');
+		//Get the "Future" tag.
+		$tag = $this->objFromFixture(TaxonomyTerm::class, 'TaxonomyTerm1');
 
-        $items = $holder->Updates($tag->ID);
+		$items = $holder->Updates($tag->ID);
 
-        $this->assertNotNull($items->find('URLSegment', 'future-event-1'), 'Finds the tagged page.');
-        $this->assertNull($items->find('URLSegment', 'past-event-1'), 'Does not find pages that are not tagged.');
-    }
+		$this->assertNotNull($items->find('URLSegment', 'future-event-1'), 'Finds the tagged page.');
+		$this->assertNull($items->find('URLSegment', 'past-event-1'), 'Does not find pages that are not tagged.');
+	}
 
-    public function testEventsWithMonthFilter()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testEventsWithMonthFilter()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $items = $holder->Updates(null, null, null, 2013, 7);
+		$items = $holder->Updates(null, null, null, 2013, 7);
 
-        $this->assertNotNull($items->find('URLSegment', 'future-event-1'), 'Finds the event in 2013-07.');
-        $this->assertNull($items->find('URLSegment', 'past-event-1'), 'Does not find events at other dates.');
-    }
+		$this->assertNotNull($items->find('URLSegment', 'future-event-1'), 'Finds the event in 2013-07.');
+		$this->assertNull($items->find('URLSegment', 'past-event-1'), 'Does not find events at other dates.');
+	}
 
-    public function testEventsWithDateRangeFilter()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testEventsWithDateRangeFilter()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $items = $holder->Updates(null, '2013-01-19', null);
-        $this->assertNotNull($items->find('URLSegment', 'past-event-2'), 'Finds the event at the date');
-        $this->assertNull($items->find('URLSegment', 'future-event-1'), 'Does not find the event at another date');
+		$items = $holder->Updates(null, '2013-01-19', null);
+		$this->assertNotNull($items->find('URLSegment', 'past-event-2'), 'Finds the event at the date');
+		$this->assertNull($items->find('URLSegment', 'future-event-1'), 'Does not find the event at another date');
 
-        $items = $holder->Updates(null, '2013-01-01', '2013-01-19');
-        $this->assertNotNull($items->find('URLSegment', 'past-event-2'), 'Finds events in the date range');
-        $this->assertNull($items->find('URLSegment', 'future-event-1'), 'Does not find event out of range');
-    }
+		$items = $holder->Updates(null, '2013-01-01', '2013-01-19');
+		$this->assertNotNull($items->find('URLSegment', 'past-event-2'), 'Finds events in the date range');
+		$this->assertNull($items->find('URLSegment', 'future-event-1'), 'Does not find event out of range');
+	}
 
-    public function testExtractMonths()
-    {
-        $holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
+	public function testExtractMonths()
+	{
+		$holder = $this->objFromFixture(EventHolder::class, 'EventHolder1');
 
-        $months = EventHolder::ExtractMonths(
-            $holder->Updates(),
-            'http://mybase.org/?tag=12&start=10&from=2010-10-10&to=2010-10-11', // Used for link generation
-            2013, // Currently selected
-            1 // Currently selected
-        );
+		$months = EventHolder::ExtractMonths(
+			$holder->Updates(),
+			'http://mybase.org/?tag=12&start=10&from=2010-10-10&to=2010-10-11', // Used for link generation
+			2013, // Currently selected
+			1 // Currently selected
+		);
 
-        // Check which years are generated.
-        $this->assertNotNull($months->find('YearName', 2013), 'Generates existing year');
-        $this->assertNull($months->find('YearName', 1990), 'Does not generate non-present year');
+		// Check which years are generated.
+		$this->assertNotNull($months->find('YearName', 2013), 'Generates existing year');
+		$this->assertNull($months->find('YearName', 1990), 'Does not generate non-present year');
 
-        $year = $months->find('YearName', 2013);
+		$year = $months->find('YearName', 2013);
 
-        // Check which months come up in 2013
-        $this->assertNotNull($year['Months']->find('MonthNumber', 7), 'Generates existing month');
-        $this->assertNull($year['Months']->find('MonthNumber', 12), 'Does not generate non-present month');
+		// Check which months come up in 2013
+		$this->assertNotNull($year['Months']->find('MonthNumber', 7), 'Generates existing month');
+		$this->assertNull($year['Months']->find('MonthNumber', 12), 'Does not generate non-present month');
 
-        $month = $year['Months']->find('MonthNumber', 7);
-        $this->assertEquals(
-            $month['MonthLink'],
-            'http://mybase.org/?tag=12&from=2010-10-10&to=2010-10-11&month=7&year=2013',
-            'Selection link is built properly - start is removed, and tag, from and to retained.'
-        );
+		$month = $year['Months']->find('MonthNumber', 7);
+		$this->assertEquals(
+			$month['MonthLink'],
+			'http://mybase.org/?tag=12&from=2010-10-10&to=2010-10-11&month=7&year=2013',
+			'Selection link is built properly - start is removed, and tag, from and to retained.'
+		);
 
-        // Check if these months are marked properly.
-        $month = $year['Months']->find('MonthNumber', 1);
-        $this->assertEquals($month['Active'], true, 'Correctly marks active link');
-    }
+		// Check if these months are marked properly.
+		$month = $year['Months']->find('MonthNumber', 1);
+		$this->assertEquals($month['Active'], true, 'Correctly marks active link');
+	}
 }

tests/PageTypes/SitemapPageTest.php

Indentation +18 added lines, -18 removed lines

@@ -9,26 +9,26 @@
 
 class SitemapPageTest extends FunctionalTest
 {
-    protected static $fixture_file = 'SitemapPageTest.yml';
+	protected static $fixture_file = 'SitemapPageTest.yml';
 
-    protected static $use_draft_site = true;
+	protected static $use_draft_site = true;
 
-    protected function setUp()
-    {
-        parent::setUp();
+	protected function setUp()
+	{
+		parent::setUp();
 
-        Config::inst()->update(SSViewer::class, 'theme', 'starter');
-    }
+		Config::inst()->update(SSViewer::class, 'theme', 'starter');
+	}
 
-    /**
-     * Note: this test depends on the "starter" theme being installed and configured as default
-     */
-    public function testSitemapShowsNavigationTitleNotNormalTitle()
-    {
-        $response = $this->get('sitemap');
-        $parser = new CSSContentParser($response->getBody());
-        $elements = $parser->getBySelector('.sitemap li.first .sitemap-link');
-        $this->assertNotEmpty($elements);
-        $this->assertEquals('Top page nav 1', (string) $elements[0]);
-    }
+	/**
+	 * Note: this test depends on the "starter" theme being installed and configured as default
+	 */
+	public function testSitemapShowsNavigationTitleNotNormalTitle()
+	{
+		$response = $this->get('sitemap');
+		$parser = new CSSContentParser($response->getBody());
+		$elements = $parser->getBySelector('.sitemap li.first .sitemap-link');
+		$this->assertNotEmpty($elements);
+		$this->assertEquals('Top page nav 1', (string) $elements[0]);
+	}
 }

tests/Extensions/WorkflowDefinitionExtensionTest.php

Indentation +27 added lines, -27 removed lines

@@ -15,34 +15,34 @@
 class WorkflowDefinitionExtensionTest extends FunctionalTest
 {
 
-    /**
-     * @var Boolean If set to TRUE, this will force a test database to be generated
-     * in {@link setUp()}. Note that this flag is overruled by the presence of a
-     * {@link $fixture_file}, which always forces a database build.
-     */
-    protected $usesDatabase = true;
+	/**
+	 * @var Boolean If set to TRUE, this will force a test database to be generated
+	 * in {@link setUp()}. Note that this flag is overruled by the presence of a
+	 * {@link $fixture_file}, which always forces a database build.
+	 */
+	protected $usesDatabase = true;
 
-    /**
-     * Tests the config option that controls the creation of a default workflow definition
-     *
-     * @return void
-     */
-    public function testCreateDefaultWorkflowTest()
-    {
-        DB::quiet();
+	/**
+	 * Tests the config option that controls the creation of a default workflow definition
+	 *
+	 * @return void
+	 */
+	public function testCreateDefaultWorkflowTest()
+	{
+		DB::quiet();
 
-        // test disabling the default workflow definition
-        Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', false);
-        $workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
-        $workflowExtn->requireDefaultRecords();
-        $definition = WorkflowDefinition::get()->first();
-        $this->assertNull($definition);
+		// test disabling the default workflow definition
+		Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', false);
+		$workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
+		$workflowExtn->requireDefaultRecords();
+		$definition = WorkflowDefinition::get()->first();
+		$this->assertNull($definition);
 
-        // test enabling the default workflow definition
-        Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', true);
-        $workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
-        $workflowExtn->requireDefaultRecords();
-        $definition = WorkflowDefinition::get()->first();
-        $this->assertNotNull($definition);
-    }
+		// test enabling the default workflow definition
+		Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', true);
+		$workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
+		$workflowExtn->requireDefaultRecords();
+		$definition = WorkflowDefinition::get()->first();
+		$this->assertNotNull($definition);
+	}
 }

src/PageTypes/NewsHolderController.php

Indentation +24 added lines, -24 removed lines

@@ -7,30 +7,30 @@
 
 class NewsHolderController extends DatedUpdateHolderController
 {
-    private static $allowed_actions = [
-        'rss',
-        'atom',
-    ];
+	private static $allowed_actions = [
+		'rss',
+		'atom',
+	];
 
-    public function rss()
-    {
-        $rss = RSSFeed::create(
-            $this->Updates()->sort('Created DESC')->limit(20),
-            $this->Link('rss'),
-            $this->getSubscriptionTitle()
-        );
-        $rss->setTemplate('CWP\\CWP\\PageTypes\\NewsHolder_rss');
-        return $rss->outputToBrowser();
-    }
+	public function rss()
+	{
+		$rss = RSSFeed::create(
+			$this->Updates()->sort('Created DESC')->limit(20),
+			$this->Link('rss'),
+			$this->getSubscriptionTitle()
+		);
+		$rss->setTemplate('CWP\\CWP\\PageTypes\\NewsHolder_rss');
+		return $rss->outputToBrowser();
+	}
 
-    public function atom()
-    {
-        $atom = CwpAtomFeed::create(
-            $this->Updates()->sort('Created DESC')->limit(20),
-            $this->Link('atom'),
-            $this->getSubscriptionTitle()
-        );
-        $atom->setTemplate('CWP\\CWP\\PageTypes\\NewsHolder_atom');
-        return $atom->outputToBrowser();
-    }
+	public function atom()
+	{
+		$atom = CwpAtomFeed::create(
+			$this->Updates()->sort('Created DESC')->limit(20),
+			$this->Link('atom'),
+			$this->getSubscriptionTitle()
+		);
+		$atom->setTemplate('CWP\\CWP\\PageTypes\\NewsHolder_atom');
+		return $atom->outputToBrowser();
+	}
 }

src/Model/QuickLink.php

Indentation +116 added lines, -116 removed lines

@@ -11,120 +11,120 @@
 
 class Quicklink extends DataObject
 {
-    private static $db = [
-        'Name' => 'Varchar(255)',
-        'ExternalLink' => 'Varchar(255)',
-        'SortOrder' => 'Int',
-    ];
-
-    private static $has_one = [
-        'Parent' => BaseHomePage::class,
-        'InternalLink' => SiteTree::class,
-    ];
-
-    private static $summary_fields = [
-        'Name' => 'Name',
-        'InternalLink.Title' => 'Internal Link',
-        'ExternalLink' => 'External Link',
-    ];
-
-    private static $table_name = 'Quicklink';
-
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['Name'] = _t(__CLASS__ . '.NameLabel', 'Name');
-        $labels['ExternalLink'] = _t(__CLASS__ . '.ExternalLinkLabel', 'External Link');
-        $labels['SortOrder'] = _t(__CLASS__ . '.SortOrderLabel', 'Sort Order');
-        $labels['ParentID'] = _t(__CLASS__ . '.ParentRelationLabel', 'Parent');
-        $labels['InternalLinkID'] = _t(__CLASS__ . '.InternalLinkLabel', 'Internal Link');
-
-        return $labels;
-    }
-
-    public function getLink()
-    {
-        if ($this->ExternalLink) {
-            $url = parse_url($this->ExternalLink);
-
-            // if no scheme set in the link, default to http
-            if (!isset($url['scheme'])) {
-                return 'http://' . $this->ExternalLink;
-            }
-
-            return $this->ExternalLink;
-        } elseif ($this->InternalLinkID) {
-            return $this->InternalLink()->Link();
-        }
-    }
-
-    public function canCreate($member = null, $context = [])
-    {
-        return $this->Parent()->canCreate($member, $context);
-    }
-
-    public function canEdit($member = null)
-    {
-        return $this->Parent()->canEdit($member);
-    }
-
-    public function canDelete($member = null)
-    {
-        return $this->Parent()->canDelete($member);
-    }
-
-    public function canView($member = null)
-    {
-        return $this->Parent()->canView($member);
-    }
-
-    public function getCMSFields()
-    {
-        $fields = parent::getCMSFields();
-
-        $fields->removeByName('ParentID');
-
-        $externalLinkField = $fields->fieldByName('Root.Main.ExternalLink');
-
-        $fields->removeByName('ExternalLink');
-        $fields->removeByName('InternalLinkID');
-        $fields->removeByName('SortOrder');
-        $externalLinkField->addExtraClass('noBorder');
-
-        $fields->addFieldToTab('Root.Main', CompositeField::create(
-            array(
-                TreeDropdownField::create(
-                    'InternalLinkID',
-                    $this->fieldLabel('InternalLinkID'),
-                    SiteTree::class
-                ),
-                $externalLinkField,
-                $wrap = CompositeField::create(
-                    $extraLabel = LiteralField::create(
-                        'NoteOverride',
-                        _t(
-                            __CLASS__ . '.Note',
-                            // @todo remove the HTML from this translation
-                            '<div class="message good notice">Note:  If you specify an External Link, '
-                            . 'the Internal Link will be ignored.</div>'
-                        )
-                    )
-                )
-            )
-        ));
-        $fields->insertBefore(
-            'Name',
-            LiteralField::create(
-                'Note',
-                _t(
-                    __CLASS__ . '.Note2',
-                    // @todo remove the HTML from this translation
-                    '<p>Use this to specify a link to a page either on this site '
-                    . '(Internal Link) or another site (External Link).</p>'
-                )
-            )
-        );
-
-        return $fields;
-    }
+	private static $db = [
+		'Name' => 'Varchar(255)',
+		'ExternalLink' => 'Varchar(255)',
+		'SortOrder' => 'Int',
+	];
+
+	private static $has_one = [
+		'Parent' => BaseHomePage::class,
+		'InternalLink' => SiteTree::class,
+	];
+
+	private static $summary_fields = [
+		'Name' => 'Name',
+		'InternalLink.Title' => 'Internal Link',
+		'ExternalLink' => 'External Link',
+	];
+
+	private static $table_name = 'Quicklink';
+
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['Name'] = _t(__CLASS__ . '.NameLabel', 'Name');
+		$labels['ExternalLink'] = _t(__CLASS__ . '.ExternalLinkLabel', 'External Link');
+		$labels['SortOrder'] = _t(__CLASS__ . '.SortOrderLabel', 'Sort Order');
+		$labels['ParentID'] = _t(__CLASS__ . '.ParentRelationLabel', 'Parent');
+		$labels['InternalLinkID'] = _t(__CLASS__ . '.InternalLinkLabel', 'Internal Link');
+
+		return $labels;
+	}
+
+	public function getLink()
+	{
+		if ($this->ExternalLink) {
+			$url = parse_url($this->ExternalLink);
+
+			// if no scheme set in the link, default to http
+			if (!isset($url['scheme'])) {
+				return 'http://' . $this->ExternalLink;
+			}
+
+			return $this->ExternalLink;
+		} elseif ($this->InternalLinkID) {
+			return $this->InternalLink()->Link();
+		}
+	}
+
+	public function canCreate($member = null, $context = [])
+	{
+		return $this->Parent()->canCreate($member, $context);
+	}
+
+	public function canEdit($member = null)
+	{
+		return $this->Parent()->canEdit($member);
+	}
+
+	public function canDelete($member = null)
+	{
+		return $this->Parent()->canDelete($member);
+	}
+
+	public function canView($member = null)
+	{
+		return $this->Parent()->canView($member);
+	}
+
+	public function getCMSFields()
+	{
+		$fields = parent::getCMSFields();
+
+		$fields->removeByName('ParentID');
+
+		$externalLinkField = $fields->fieldByName('Root.Main.ExternalLink');
+
+		$fields->removeByName('ExternalLink');
+		$fields->removeByName('InternalLinkID');
+		$fields->removeByName('SortOrder');
+		$externalLinkField->addExtraClass('noBorder');
+
+		$fields->addFieldToTab('Root.Main', CompositeField::create(
+			array(
+				TreeDropdownField::create(
+					'InternalLinkID',
+					$this->fieldLabel('InternalLinkID'),
+					SiteTree::class
+				),
+				$externalLinkField,
+				$wrap = CompositeField::create(
+					$extraLabel = LiteralField::create(
+						'NoteOverride',
+						_t(
+							__CLASS__ . '.Note',
+							// @todo remove the HTML from this translation
+							'<div class="message good notice">Note:  If you specify an External Link, '
+							. 'the Internal Link will be ignored.</div>'
+						)
+					)
+				)
+			)
+		));
+		$fields->insertBefore(
+			'Name',
+			LiteralField::create(
+				'Note',
+				_t(
+					__CLASS__ . '.Note2',
+					// @todo remove the HTML from this translation
+					'<p>Use this to specify a link to a page either on this site '
+					. '(Internal Link) or another site (External Link).</p>'
+				)
+			)
+		);
+
+		return $fields;
+	}
 }

src/Extensions/CustomSiteConfig.php

Indentation +46 added lines, -46 removed lines

@@ -11,55 +11,55 @@
  */
 class CustomSiteConfig extends DataExtension
 {
-    private static $db = array(
-        'GACode' => 'Varchar(16)',
-        'FacebookURL' => 'Varchar(256)', // multitude of ways to link to Facebook accounts, best to leave it open.
-        'TwitterUsername' => 'Varchar(16)', // max length of Twitter username 15
-    );
+	private static $db = array(
+		'GACode' => 'Varchar(16)',
+		'FacebookURL' => 'Varchar(256)', // multitude of ways to link to Facebook accounts, best to leave it open.
+		'TwitterUsername' => 'Varchar(16)', // max length of Twitter username 15
+	);
 
-    public function updateCMSFields(FieldList $fields)
-    {
-        $fields->addFieldToTab(
-            'Root.Main',
-            $gaCode = TextField::create(
-                'GACode',
-                _t(__CLASS__ . '.GaField', 'Google Analytics account')
-            )
-        );
+	public function updateCMSFields(FieldList $fields)
+	{
+		$fields->addFieldToTab(
+			'Root.Main',
+			$gaCode = TextField::create(
+				'GACode',
+				_t(__CLASS__ . '.GaField', 'Google Analytics account')
+			)
+		);
 
-        $gaCode->setRightTitle(
-            _t(
-                __CLASS__ . '.GaFieldDesc',
-                'Account number to be used all across the site (in the format <strong>UA-XXXXX-X</strong>)'
-            )
-        );
+		$gaCode->setRightTitle(
+			_t(
+				__CLASS__ . '.GaFieldDesc',
+				'Account number to be used all across the site (in the format <strong>UA-XXXXX-X</strong>)'
+			)
+		);
 
-        $fields->findOrMakeTab('Root.SocialMedia', _t(__CLASS__ . '.SocialMediaTab', 'Social Media'));
+		$fields->findOrMakeTab('Root.SocialMedia', _t(__CLASS__ . '.SocialMediaTab', 'Social Media'));
 
-        $fields->addFieldToTab(
-            'Root.SocialMedia',
-            $facebookURL = TextField::create(
-                'FacebookURL',
-                _t(__CLASS__ . '.FbField', 'Facebook UID or username')
-            )
-        );
-        $facebookURL->setRightTitle(
-            _t(
-                __CLASS__ . '.FbFieldDesc',
-                'Facebook link (everything after the "http://facebook.com/", eg http://facebook.com/'
-                . '<strong>username</strong> or http://facebook.com/<strong>pages/108510539573</strong>)'
-            )
-        );
+		$fields->addFieldToTab(
+			'Root.SocialMedia',
+			$facebookURL = TextField::create(
+				'FacebookURL',
+				_t(__CLASS__ . '.FbField', 'Facebook UID or username')
+			)
+		);
+		$facebookURL->setRightTitle(
+			_t(
+				__CLASS__ . '.FbFieldDesc',
+				'Facebook link (everything after the "http://facebook.com/", eg http://facebook.com/'
+				. '<strong>username</strong> or http://facebook.com/<strong>pages/108510539573</strong>)'
+			)
+		);
 
-        $fields->addFieldToTab(
-            'Root.SocialMedia',
-            $twitterUsername = TextField::create(
-                'TwitterUsername',
-                _t(__CLASS__ . '.TwitterField', 'Twitter username')
-            )
-        );
-        $twitterUsername->setRightTitle(
-            _t(__CLASS__ . '.TwitterFieldDesc', 'Twitter username (eg, http://twitter.com/<strong>username</strong>)')
-        );
-    }
+		$fields->addFieldToTab(
+			'Root.SocialMedia',
+			$twitterUsername = TextField::create(
+				'TwitterUsername',
+				_t(__CLASS__ . '.TwitterField', 'Twitter username')
+			)
+		);
+		$twitterUsername->setRightTitle(
+			_t(__CLASS__ . '.TwitterFieldDesc', 'Twitter username (eg, http://twitter.com/<strong>username</strong>)')
+		);
+	}
 }

src/Extensions/CwpCommentingExtension.php

Indentation +14 added lines, -14 removed lines

@@ -13,20 +13,20 @@
  */
 class CwpCommentingExtension extends Extension
 {
-    public function alterCommentForm(Form $form)
-    {
-        $fields = $form->Fields();
+	public function alterCommentForm(Form $form)
+	{
+		$fields = $form->Fields();
 
-        if ($emailField = $fields->dataFieldByName(Email::class)) {
-            $emailField
-                ->setTitle(_t(__CLASS__ . '.EMAIL_TITLE', Email::class))
-                ->setDescription(_t(__CLASS__ . '.WILL_NOT_BE_PUBLISHED', 'Will not be published.'));
-        }
+		if ($emailField = $fields->dataFieldByName(Email::class)) {
+			$emailField
+				->setTitle(_t(__CLASS__ . '.EMAIL_TITLE', Email::class))
+				->setDescription(_t(__CLASS__ . '.WILL_NOT_BE_PUBLISHED', 'Will not be published.'));
+		}
 
-        if ($urlField = $fields->dataFieldByName('URL')) {
-            $urlField
-                ->setTitle(_t(__CLASS__ . '.WEBSITE_TITLE', 'Your website (optional)'))
-                ->setAttribute('placeholder', 'http://');
-        }
-    }
+		if ($urlField = $fields->dataFieldByName('URL')) {
+			$urlField
+				->setTitle(_t(__CLASS__ . '.WEBSITE_TITLE', 'Your website (optional)'))
+				->setAttribute('placeholder', 'http://');
+		}
+	}
 }