silverstripe / silverstripe-siteconfig

code/SiteConfig.php

Doc Comments +4 added lines, -1 removed lines

@@ -277,7 +277,7 @@ 
      * Can a user view this SiteConfig instance?
      *
      * @param Member $member
-     * @return boolean
+     * @return boolean|string
      */
     public function canView($member = null)
     {
@@ -372,6 +372,9 @@ 
         return false;
     }
 
+    /**
+     * @param Member $member
+     */
     public function canEdit($member = null)
     {
         if (!$member) {

Indentation +449 added lines, -449 removed lines

@@ -37,453 +37,453 @@
  */
 class SiteConfig extends DataObject implements PermissionProvider, TemplateGlobalProvider
 {
-    private static $db = [
-        "Title" => "Varchar(255)",
-        "Tagline" => "Varchar(255)",
-        "CanViewType" => "Enum('Anyone, LoggedInUsers, OnlyTheseUsers', 'Anyone')",
-        "CanEditType" => "Enum('LoggedInUsers, OnlyTheseUsers', 'LoggedInUsers')",
-        "CanCreateTopLevelType" => "Enum('LoggedInUsers, OnlyTheseUsers', 'LoggedInUsers')",
-    ];
-
-    private static $many_many = [
-        "ViewerGroups" => Group::class,
-        "EditorGroups" => Group::class,
-        "CreateTopLevelGroups" => Group::class,
-    ];
-
-    private static $defaults = [
-        "CanViewType" => "Anyone",
-        "CanEditType" => "LoggedInUsers",
-        "CanCreateTopLevelType" => "LoggedInUsers",
-    ];
-
-    private static $table_name = 'SiteConfig';
-
-    /**
-     * Default permission to check for 'LoggedInUsers' to create or edit pages
-     *
-     * @var array
-     * @config
-     */
-    private static $required_permission = [
-        'CMS_ACCESS_CMSMain',
-        'CMS_ACCESS_LeftAndMain'
-    ];
-
-    public function populateDefaults()
-    {
-        $this->Title = _t(self::class . '.SITENAMEDEFAULT', "Your Site Name");
-        $this->Tagline = _t(self::class . '.TAGLINEDEFAULT', "your tagline here");
-
-        // Allow these defaults to be overridden
-        parent::populateDefaults();
-    }
-
-    /**
-     * Get the fields that are sent to the CMS.
-     *
-     * In your extensions: updateCMSFields($fields).
-     *
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $mapFn = function ($groups = []) {
-            $map = [];
-            foreach ($groups as $group) {
-                // Listboxfield values are escaped, use ASCII char instead of »
-                $map[$group->ID] = $group->getBreadcrumbs(' > ');
-            }
-            asort($map);
-            return $map;
-        };
-        $groupsMap = $mapFn(Group::get());
-        $viewAllGroupsMap = $mapFn(Permission::get_groups_by_permission(['SITETREE_VIEW_ALL', 'ADMIN']));
-        $editAllGroupsMap = $mapFn(Permission::get_groups_by_permission(['SITETREE_EDIT_ALL', 'ADMIN']));
-
-        $fields = new FieldList(
-            new TabSet(
-                "Root",
-                $tabMain = new Tab(
-                    'Main',
-                    $titleField = new TextField("Title", _t(self::class . '.SITETITLE', "Site title")),
-                    $taglineField = new TextField("Tagline", _t(self::class . '.SITETAGLINE', "Site Tagline/Slogan"))
-                ),
-                $tabAccess = new Tab(
-                    'Access',
-                    $viewersOptionsField = new OptionsetField(
-                        "CanViewType",
-                        _t(self::class . '.VIEWHEADER', "Who can view pages on this site?")
-                    ),
-                    $viewerGroupsField = ListboxField::create(
-                        "ViewerGroups",
-                        _t(SiteTree::class . '.VIEWERGROUPS', "Viewer Groups")
-                    )
-                        ->setSource($groupsMap)
-                        ->setAttribute(
-                            'data-placeholder',
-                            _t(SiteTree::class . '.GroupPlaceholder', 'Click to select group')
-                        ),
-                    $editorsOptionsField = new OptionsetField(
-                        "CanEditType",
-                        _t(self::class . '.EDITHEADER', "Who can edit pages on this site?")
-                    ),
-                    $editorGroupsField = ListboxField::create(
-                        "EditorGroups",
-                        _t(SiteTree::class . '.EDITORGROUPS', "Editor Groups")
-                    )
-                        ->setSource($groupsMap)
-                        ->setAttribute(
-                            'data-placeholder',
-                            _t(SiteTree::class . '.GroupPlaceholder', 'Click to select group')
-                        ),
-                    $topLevelCreatorsOptionsField = new OptionsetField(
-                        "CanCreateTopLevelType",
-                        _t(self::class . '.TOPLEVELCREATE', "Who can create pages in the root of the site?")
-                    ),
-                    $topLevelCreatorsGroupsField = ListboxField::create(
-                        "CreateTopLevelGroups",
-                        _t(self::class . '.TOPLEVELCREATORGROUPS', "Top level creators")
-                    )
-                        ->setSource($groupsMap)
-                        ->setAttribute(
-                            'data-placeholder',
-                            _t(SiteTree::class . '.GroupPlaceholder', 'Click to select group')
-                        )
-                )
-            ),
-            new HiddenField('ID')
-        );
-
-        $viewersOptionsSource = [];
-        $viewersOptionsSource["Anyone"] = _t(SiteTree::class . '.ACCESSANYONE', "Anyone");
-        $viewersOptionsSource["LoggedInUsers"] = _t(
-            SiteTree::class . '.ACCESSLOGGEDIN',
-            "Logged-in users"
-        );
-        $viewersOptionsSource["OnlyTheseUsers"] = _t(
-            SiteTree::class . '.ACCESSONLYTHESE',
-            "Only these groups (choose from list)"
-        );
-        $viewersOptionsField->setSource($viewersOptionsSource);
-
-        if ($viewAllGroupsMap) {
-            $viewerGroupsField->setDescription(_t(
-                SiteTree::class . '.VIEWER_GROUPS_FIELD_DESC',
-                'Groups with global view permissions: {groupList}',
-                ['groupList' => implode(', ', array_values($viewAllGroupsMap))]
-            ));
-        }
-
-        if ($editAllGroupsMap) {
-            $editorGroupsField->setDescription(_t(
-                SiteTree::class . '.EDITOR_GROUPS_FIELD_DESC',
-                'Groups with global edit permissions: {groupList}',
-                ['groupList' => implode(', ', array_values($editAllGroupsMap))]
-            ));
-        }
-
-        $editorsOptionsSource = [];
-        $editorsOptionsSource["LoggedInUsers"] = _t(
-            SiteTree::class . '.EDITANYONE',
-            "Anyone who can log-in to the CMS"
-        );
-        $editorsOptionsSource["OnlyTheseUsers"] = _t(
-            SiteTree::class . '.EDITONLYTHESE',
-            "Only these groups (choose from list)"
-        );
-        $editorsOptionsField->setSource($editorsOptionsSource);
-
-        $topLevelCreatorsOptionsField->setSource($editorsOptionsSource);
-
-        if (!Permission::check('EDIT_SITECONFIG')) {
-            $fields->makeFieldReadonly($viewersOptionsField);
-            $fields->makeFieldReadonly($viewerGroupsField);
-            $fields->makeFieldReadonly($editorsOptionsField);
-            $fields->makeFieldReadonly($editorGroupsField);
-            $fields->makeFieldReadonly($topLevelCreatorsOptionsField);
-            $fields->makeFieldReadonly($topLevelCreatorsGroupsField);
-            $fields->makeFieldReadonly($taglineField);
-            $fields->makeFieldReadonly($titleField);
-        }
-
-        if (file_exists(BASE_PATH . '/install.php')) {
-            $fields->addFieldToTab(
-                "Root.Main",
-                new LiteralField(
-                    "InstallWarningHeader",
-                    "<p class=\"message warning\">" . _t(
-                        SiteTree::class . 'REMOVE_INSTALL_WARNING',
-                        'Warning: You should remove install.php from this SilverStripe install for security reasons.'
-                    ) . "</p>"
-                ),
-                "Title"
-            );
-        }
-
-        $tabMain->setTitle(_t(self::class . '.TABMAIN', "Main"));
-        $tabAccess->setTitle(_t(self::class . '.TABACCESS', "Access"));
-        $this->extend('updateCMSFields', $fields);
-
-        return $fields;
-    }
-
-    /**
-     * Get the actions that are sent to the CMS.
-     *
-     * In your extensions: updateEditFormActions($actions)
-     *
-     * @return FieldList
-     */
-    public function getCMSActions()
-    {
-        if (Permission::check('ADMIN') || Permission::check('EDIT_SITECONFIG')) {
-            $actions = new FieldList(
-                FormAction::create(
-                    'save_siteconfig',
-                    _t(CMSMain::class . '.SAVE', 'Save')
-                )->addExtraClass('btn-primary font-icon-save')
-            );
-        } else {
-            $actions = new FieldList();
-        }
-
-        $this->extend('updateCMSActions', $actions);
-
-        return $actions;
-    }
-
-    /**
-     * @return string
-     */
-    public function CMSEditLink()
-    {
-        return SiteConfigLeftAndMain::singleton()->Link();
-    }
-
-    /**
-     * Get the current sites SiteConfig, and creates a new one through
-     * {@link make_site_config()} if none is found.
-     *
-     * @return SiteConfig
-     */
-    public static function current_site_config()
-    {
-        /** @var SiteConfig $siteConfig */
-        $siteConfig = DataObject::get_one(SiteConfig::class);
-        if ($siteConfig) {
-            return $siteConfig;
-        }
-
-        return self::make_site_config();
-    }
-
-    /**
-     * Setup a default SiteConfig record if none exists.
-     */
-    public function requireDefaultRecords()
-    {
-        parent::requireDefaultRecords();
-
-        $config = DataObject::get_one(SiteConfig::class);
-
-        if (!$config) {
-            self::make_site_config();
-
-            DB::alteration_message("Added default site config", "created");
-        }
-    }
-
-    /**
-     * Create SiteConfig with defaults from language file.
-     *
-     * @return SiteConfig
-     */
-    public static function make_site_config()
-    {
-        $config = SiteConfig::create();
-        $config->write();
-
-        return $config;
-    }
-
-    /**
-     * Can a user view this SiteConfig instance?
-     *
-     * @param Member $member
-     * @return boolean
-     */
-    public function canView($member = null)
-    {
-        if (!$member) {
-            $member = Security::getCurrentUser();
-        }
-
-        $extended = $this->extendedCan('canView', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
-
-        // Assuming all that can edit this object can also view it
-        return $this->canEdit($member);
-    }
-
-    /**
-     * Can a user view pages on this site? This method is only
-     * called if a page is set to Inherit, but there is nothing
-     * to inherit from.
-     *
-     * @param Member $member
-     * @return boolean
-     */
-    public function canViewPages($member = null)
-    {
-        if (!$member) {
-            $member = Security::getCurrentUser();
-        }
-
-        if ($member && Permission::checkMember($member, "ADMIN")) {
-            return true;
-        }
-
-        $extended = $this->extendedCan('canViewPages', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
-
-        if (!$this->CanViewType || $this->CanViewType == 'Anyone') {
-            return true;
-        }
-
-        // check for any logged-in users
-        if ($this->CanViewType === 'LoggedInUsers' && $member) {
-            return true;
-        }
-
-        // check for specific groups
-        if ($this->CanViewType === 'OnlyTheseUsers' && $member && $member->inGroups($this->ViewerGroups())) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Can a user edit pages on this site? This method is only
-     * called if a page is set to Inherit, but there is nothing
-     * to inherit from, or on new records without a parent.
-     *
-     * @param Member $member
-     * @return boolean
-     */
-    public function canEditPages($member = null)
-    {
-        if (!$member) {
-            $member = Security::getCurrentUser();
-        }
-
-        if ($member && Permission::checkMember($member, "ADMIN")) {
-            return true;
-        }
-
-        $extended = $this->extendedCan('canEditPages', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
-
-        // check for any logged-in users with CMS access
-        if ($this->CanEditType === 'LoggedInUsers'
-            && Permission::checkMember($member, $this->config()->get('required_permission'))
-        ) {
-            return true;
-        }
-
-            // check for specific groups
-        if ($this->CanEditType === 'OnlyTheseUsers' && $member && $member->inGroups($this->EditorGroups())) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function canEdit($member = null)
-    {
-        if (!$member) {
-            $member = Security::getCurrentUser();
-        }
-
-        $extended = $this->extendedCan('canEdit', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
-
-        return Permission::checkMember($member, "EDIT_SITECONFIG");
-    }
-
-    /**
-     * @return array
-     */
-    public function providePermissions()
-    {
-        return [
-            'EDIT_SITECONFIG' => [
-                'name' => _t(self::class . '.EDIT_PERMISSION', 'Manage site configuration'),
-                'category' => _t(Permission::class . '.PERMISSIONS_CATEGORY', 'Roles and access permissions'),
-                'help' => _t(
-                    self::class . '.EDIT_PERMISSION_HELP',
-                    'Ability to edit global access settings/top-level page permissions.'
-                ),
-                'sort' => 400
-            ]
-        ];
-    }
-
-    /**
-     * Can a user create pages in the root of this site?
-     *
-     * @param Member $member
-     * @return boolean
-     */
-    public function canCreateTopLevel($member = null)
-    {
-        if (!$member) {
-            $member = Security::getCurrentUser();
-        }
-
-        if ($member && Permission::checkMember($member, "ADMIN")) {
-            return true;
-        }
-
-        $extended = $this->extendedCan('canCreateTopLevel', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
-
-        // check for any logged-in users with CMS permission
-        if ($this->CanCreateTopLevelType === 'LoggedInUsers'
-            && Permission::checkMember($member, $this->config()->get('required_permission'))
-        ) {
-            return true;
-        }
-
-        // check for specific groups
-        if ($this->CanCreateTopLevelType === 'OnlyTheseUsers'
-            && $member
-            && $member->inGroups($this->CreateTopLevelGroups())
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Add $SiteConfig to all SSViewers
-     */
-    public static function get_template_global_variables()
-    {
-        return [
-            'SiteConfig' => 'current_site_config',
-        ];
-    }
+	private static $db = [
+		"Title" => "Varchar(255)",
+		"Tagline" => "Varchar(255)",
+		"CanViewType" => "Enum('Anyone, LoggedInUsers, OnlyTheseUsers', 'Anyone')",
+		"CanEditType" => "Enum('LoggedInUsers, OnlyTheseUsers', 'LoggedInUsers')",
+		"CanCreateTopLevelType" => "Enum('LoggedInUsers, OnlyTheseUsers', 'LoggedInUsers')",
+	];
+
+	private static $many_many = [
+		"ViewerGroups" => Group::class,
+		"EditorGroups" => Group::class,
+		"CreateTopLevelGroups" => Group::class,
+	];
+
+	private static $defaults = [
+		"CanViewType" => "Anyone",
+		"CanEditType" => "LoggedInUsers",
+		"CanCreateTopLevelType" => "LoggedInUsers",
+	];
+
+	private static $table_name = 'SiteConfig';
+
+	/**
+	 * Default permission to check for 'LoggedInUsers' to create or edit pages
+	 *
+	 * @var array
+	 * @config
+	 */
+	private static $required_permission = [
+		'CMS_ACCESS_CMSMain',
+		'CMS_ACCESS_LeftAndMain'
+	];
+
+	public function populateDefaults()
+	{
+		$this->Title = _t(self::class . '.SITENAMEDEFAULT', "Your Site Name");
+		$this->Tagline = _t(self::class . '.TAGLINEDEFAULT', "your tagline here");
+
+		// Allow these defaults to be overridden
+		parent::populateDefaults();
+	}
+
+	/**
+	 * Get the fields that are sent to the CMS.
+	 *
+	 * In your extensions: updateCMSFields($fields).
+	 *
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$mapFn = function ($groups = []) {
+			$map = [];
+			foreach ($groups as $group) {
+				// Listboxfield values are escaped, use ASCII char instead of &raquo;
+				$map[$group->ID] = $group->getBreadcrumbs(' > ');
+			}
+			asort($map);
+			return $map;
+		};
+		$groupsMap = $mapFn(Group::get());
+		$viewAllGroupsMap = $mapFn(Permission::get_groups_by_permission(['SITETREE_VIEW_ALL', 'ADMIN']));
+		$editAllGroupsMap = $mapFn(Permission::get_groups_by_permission(['SITETREE_EDIT_ALL', 'ADMIN']));
+
+		$fields = new FieldList(
+			new TabSet(
+				"Root",
+				$tabMain = new Tab(
+					'Main',
+					$titleField = new TextField("Title", _t(self::class . '.SITETITLE', "Site title")),
+					$taglineField = new TextField("Tagline", _t(self::class . '.SITETAGLINE', "Site Tagline/Slogan"))
+				),
+				$tabAccess = new Tab(
+					'Access',
+					$viewersOptionsField = new OptionsetField(
+						"CanViewType",
+						_t(self::class . '.VIEWHEADER', "Who can view pages on this site?")
+					),
+					$viewerGroupsField = ListboxField::create(
+						"ViewerGroups",
+						_t(SiteTree::class . '.VIEWERGROUPS', "Viewer Groups")
+					)
+						->setSource($groupsMap)
+						->setAttribute(
+							'data-placeholder',
+							_t(SiteTree::class . '.GroupPlaceholder', 'Click to select group')
+						),
+					$editorsOptionsField = new OptionsetField(
+						"CanEditType",
+						_t(self::class . '.EDITHEADER', "Who can edit pages on this site?")
+					),
+					$editorGroupsField = ListboxField::create(
+						"EditorGroups",
+						_t(SiteTree::class . '.EDITORGROUPS', "Editor Groups")
+					)
+						->setSource($groupsMap)
+						->setAttribute(
+							'data-placeholder',
+							_t(SiteTree::class . '.GroupPlaceholder', 'Click to select group')
+						),
+					$topLevelCreatorsOptionsField = new OptionsetField(
+						"CanCreateTopLevelType",
+						_t(self::class . '.TOPLEVELCREATE', "Who can create pages in the root of the site?")
+					),
+					$topLevelCreatorsGroupsField = ListboxField::create(
+						"CreateTopLevelGroups",
+						_t(self::class . '.TOPLEVELCREATORGROUPS', "Top level creators")
+					)
+						->setSource($groupsMap)
+						->setAttribute(
+							'data-placeholder',
+							_t(SiteTree::class . '.GroupPlaceholder', 'Click to select group')
+						)
+				)
+			),
+			new HiddenField('ID')
+		);
+
+		$viewersOptionsSource = [];
+		$viewersOptionsSource["Anyone"] = _t(SiteTree::class . '.ACCESSANYONE', "Anyone");
+		$viewersOptionsSource["LoggedInUsers"] = _t(
+			SiteTree::class . '.ACCESSLOGGEDIN',
+			"Logged-in users"
+		);
+		$viewersOptionsSource["OnlyTheseUsers"] = _t(
+			SiteTree::class . '.ACCESSONLYTHESE',
+			"Only these groups (choose from list)"
+		);
+		$viewersOptionsField->setSource($viewersOptionsSource);
+
+		if ($viewAllGroupsMap) {
+			$viewerGroupsField->setDescription(_t(
+				SiteTree::class . '.VIEWER_GROUPS_FIELD_DESC',
+				'Groups with global view permissions: {groupList}',
+				['groupList' => implode(', ', array_values($viewAllGroupsMap))]
+			));
+		}
+
+		if ($editAllGroupsMap) {
+			$editorGroupsField->setDescription(_t(
+				SiteTree::class . '.EDITOR_GROUPS_FIELD_DESC',
+				'Groups with global edit permissions: {groupList}',
+				['groupList' => implode(', ', array_values($editAllGroupsMap))]
+			));
+		}
+
+		$editorsOptionsSource = [];
+		$editorsOptionsSource["LoggedInUsers"] = _t(
+			SiteTree::class . '.EDITANYONE',
+			"Anyone who can log-in to the CMS"
+		);
+		$editorsOptionsSource["OnlyTheseUsers"] = _t(
+			SiteTree::class . '.EDITONLYTHESE',
+			"Only these groups (choose from list)"
+		);
+		$editorsOptionsField->setSource($editorsOptionsSource);
+
+		$topLevelCreatorsOptionsField->setSource($editorsOptionsSource);
+
+		if (!Permission::check('EDIT_SITECONFIG')) {
+			$fields->makeFieldReadonly($viewersOptionsField);
+			$fields->makeFieldReadonly($viewerGroupsField);
+			$fields->makeFieldReadonly($editorsOptionsField);
+			$fields->makeFieldReadonly($editorGroupsField);
+			$fields->makeFieldReadonly($topLevelCreatorsOptionsField);
+			$fields->makeFieldReadonly($topLevelCreatorsGroupsField);
+			$fields->makeFieldReadonly($taglineField);
+			$fields->makeFieldReadonly($titleField);
+		}
+
+		if (file_exists(BASE_PATH . '/install.php')) {
+			$fields->addFieldToTab(
+				"Root.Main",
+				new LiteralField(
+					"InstallWarningHeader",
+					"<p class=\"message warning\">" . _t(
+						SiteTree::class . 'REMOVE_INSTALL_WARNING',
+						'Warning: You should remove install.php from this SilverStripe install for security reasons.'
+					) . "</p>"
+				),
+				"Title"
+			);
+		}
+
+		$tabMain->setTitle(_t(self::class . '.TABMAIN', "Main"));
+		$tabAccess->setTitle(_t(self::class . '.TABACCESS', "Access"));
+		$this->extend('updateCMSFields', $fields);
+
+		return $fields;
+	}
+
+	/**
+	 * Get the actions that are sent to the CMS.
+	 *
+	 * In your extensions: updateEditFormActions($actions)
+	 *
+	 * @return FieldList
+	 */
+	public function getCMSActions()
+	{
+		if (Permission::check('ADMIN') || Permission::check('EDIT_SITECONFIG')) {
+			$actions = new FieldList(
+				FormAction::create(
+					'save_siteconfig',
+					_t(CMSMain::class . '.SAVE', 'Save')
+				)->addExtraClass('btn-primary font-icon-save')
+			);
+		} else {
+			$actions = new FieldList();
+		}
+
+		$this->extend('updateCMSActions', $actions);
+
+		return $actions;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function CMSEditLink()
+	{
+		return SiteConfigLeftAndMain::singleton()->Link();
+	}
+
+	/**
+	 * Get the current sites SiteConfig, and creates a new one through
+	 * {@link make_site_config()} if none is found.
+	 *
+	 * @return SiteConfig
+	 */
+	public static function current_site_config()
+	{
+		/** @var SiteConfig $siteConfig */
+		$siteConfig = DataObject::get_one(SiteConfig::class);
+		if ($siteConfig) {
+			return $siteConfig;
+		}
+
+		return self::make_site_config();
+	}
+
+	/**
+	 * Setup a default SiteConfig record if none exists.
+	 */
+	public function requireDefaultRecords()
+	{
+		parent::requireDefaultRecords();
+
+		$config = DataObject::get_one(SiteConfig::class);
+
+		if (!$config) {
+			self::make_site_config();
+
+			DB::alteration_message("Added default site config", "created");
+		}
+	}
+
+	/**
+	 * Create SiteConfig with defaults from language file.
+	 *
+	 * @return SiteConfig
+	 */
+	public static function make_site_config()
+	{
+		$config = SiteConfig::create();
+		$config->write();
+
+		return $config;
+	}
+
+	/**
+	 * Can a user view this SiteConfig instance?
+	 *
+	 * @param Member $member
+	 * @return boolean
+	 */
+	public function canView($member = null)
+	{
+		if (!$member) {
+			$member = Security::getCurrentUser();
+		}
+
+		$extended = $this->extendedCan('canView', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
+
+		// Assuming all that can edit this object can also view it
+		return $this->canEdit($member);
+	}
+
+	/**
+	 * Can a user view pages on this site? This method is only
+	 * called if a page is set to Inherit, but there is nothing
+	 * to inherit from.
+	 *
+	 * @param Member $member
+	 * @return boolean
+	 */
+	public function canViewPages($member = null)
+	{
+		if (!$member) {
+			$member = Security::getCurrentUser();
+		}
+
+		if ($member && Permission::checkMember($member, "ADMIN")) {
+			return true;
+		}
+
+		$extended = $this->extendedCan('canViewPages', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
+
+		if (!$this->CanViewType || $this->CanViewType == 'Anyone') {
+			return true;
+		}
+
+		// check for any logged-in users
+		if ($this->CanViewType === 'LoggedInUsers' && $member) {
+			return true;
+		}
+
+		// check for specific groups
+		if ($this->CanViewType === 'OnlyTheseUsers' && $member && $member->inGroups($this->ViewerGroups())) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Can a user edit pages on this site? This method is only
+	 * called if a page is set to Inherit, but there is nothing
+	 * to inherit from, or on new records without a parent.
+	 *
+	 * @param Member $member
+	 * @return boolean
+	 */
+	public function canEditPages($member = null)
+	{
+		if (!$member) {
+			$member = Security::getCurrentUser();
+		}
+
+		if ($member && Permission::checkMember($member, "ADMIN")) {
+			return true;
+		}
+
+		$extended = $this->extendedCan('canEditPages', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
+
+		// check for any logged-in users with CMS access
+		if ($this->CanEditType === 'LoggedInUsers'
+			&& Permission::checkMember($member, $this->config()->get('required_permission'))
+		) {
+			return true;
+		}
+
+			// check for specific groups
+		if ($this->CanEditType === 'OnlyTheseUsers' && $member && $member->inGroups($this->EditorGroups())) {
+			return true;
+		}
+
+		return false;
+	}
+
+	public function canEdit($member = null)
+	{
+		if (!$member) {
+			$member = Security::getCurrentUser();
+		}
+
+		$extended = $this->extendedCan('canEdit', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
+
+		return Permission::checkMember($member, "EDIT_SITECONFIG");
+	}
+
+	/**
+	 * @return array
+	 */
+	public function providePermissions()
+	{
+		return [
+			'EDIT_SITECONFIG' => [
+				'name' => _t(self::class . '.EDIT_PERMISSION', 'Manage site configuration'),
+				'category' => _t(Permission::class . '.PERMISSIONS_CATEGORY', 'Roles and access permissions'),
+				'help' => _t(
+					self::class . '.EDIT_PERMISSION_HELP',
+					'Ability to edit global access settings/top-level page permissions.'
+				),
+				'sort' => 400
+			]
+		];
+	}
+
+	/**
+	 * Can a user create pages in the root of this site?
+	 *
+	 * @param Member $member
+	 * @return boolean
+	 */
+	public function canCreateTopLevel($member = null)
+	{
+		if (!$member) {
+			$member = Security::getCurrentUser();
+		}
+
+		if ($member && Permission::checkMember($member, "ADMIN")) {
+			return true;
+		}
+
+		$extended = $this->extendedCan('canCreateTopLevel', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
+
+		// check for any logged-in users with CMS permission
+		if ($this->CanCreateTopLevelType === 'LoggedInUsers'
+			&& Permission::checkMember($member, $this->config()->get('required_permission'))
+		) {
+			return true;
+		}
+
+		// check for specific groups
+		if ($this->CanCreateTopLevelType === 'OnlyTheseUsers'
+			&& $member
+			&& $member->inGroups($this->CreateTopLevelGroups())
+		) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Add $SiteConfig to all SSViewers
+	 */
+	public static function get_template_global_variables()
+	{
+		return [
+			'SiteConfig' => 'current_site_config',
+		];
+	}
 }

Spacing +31 added lines, -31 removed lines

@@ -72,8 +72,8 @@ 
 
     public function populateDefaults()
     {
-        $this->Title = _t(self::class . '.SITENAMEDEFAULT', "Your Site Name");
-        $this->Tagline = _t(self::class . '.TAGLINEDEFAULT', "your tagline here");
+        $this->Title = _t(self::class.'.SITENAMEDEFAULT', "Your Site Name");
+        $this->Tagline = _t(self::class.'.TAGLINEDEFAULT', "your tagline here");
 
         // Allow these defaults to be overridden
         parent::populateDefaults();
@@ -88,7 +88,7 @@ 
      */
     public function getCMSFields()
     {
-        $mapFn = function ($groups = []) {
+        $mapFn = function($groups = []) {
             $map = [];
             foreach ($groups as $group) {
                 // Listboxfield values are escaped, use ASCII char instead of »
@@ -106,49 +106,49 @@ 
                 "Root",
                 $tabMain = new Tab(
                     'Main',
-                    $titleField = new TextField("Title", _t(self::class . '.SITETITLE', "Site title")),
-                    $taglineField = new TextField("Tagline", _t(self::class . '.SITETAGLINE', "Site Tagline/Slogan"))
+                    $titleField = new TextField("Title", _t(self::class.'.SITETITLE', "Site title")),
+                    $taglineField = new TextField("Tagline", _t(self::class.'.SITETAGLINE', "Site Tagline/Slogan"))
                 ),
                 $tabAccess = new Tab(
                     'Access',
                     $viewersOptionsField = new OptionsetField(
                         "CanViewType",
-                        _t(self::class . '.VIEWHEADER', "Who can view pages on this site?")
+                        _t(self::class.'.VIEWHEADER', "Who can view pages on this site?")
                     ),
                     $viewerGroupsField = ListboxField::create(
                         "ViewerGroups",
-                        _t(SiteTree::class . '.VIEWERGROUPS', "Viewer Groups")
+                        _t(SiteTree::class.'.VIEWERGROUPS', "Viewer Groups")
                     )
                         ->setSource($groupsMap)
                         ->setAttribute(
                             'data-placeholder',
-                            _t(SiteTree::class . '.GroupPlaceholder', 'Click to select group')
+                            _t(SiteTree::class.'.GroupPlaceholder', 'Click to select group')
                         ),
                     $editorsOptionsField = new OptionsetField(
                         "CanEditType",
-                        _t(self::class . '.EDITHEADER', "Who can edit pages on this site?")
+                        _t(self::class.'.EDITHEADER', "Who can edit pages on this site?")
                     ),
                     $editorGroupsField = ListboxField::create(
                         "EditorGroups",
-                        _t(SiteTree::class . '.EDITORGROUPS', "Editor Groups")
+                        _t(SiteTree::class.'.EDITORGROUPS', "Editor Groups")
                     )
                         ->setSource($groupsMap)
                         ->setAttribute(
                             'data-placeholder',
-                            _t(SiteTree::class . '.GroupPlaceholder', 'Click to select group')
+                            _t(SiteTree::class.'.GroupPlaceholder', 'Click to select group')
                         ),
                     $topLevelCreatorsOptionsField = new OptionsetField(
                         "CanCreateTopLevelType",
-                        _t(self::class . '.TOPLEVELCREATE', "Who can create pages in the root of the site?")
+                        _t(self::class.'.TOPLEVELCREATE', "Who can create pages in the root of the site?")
                     ),
                     $topLevelCreatorsGroupsField = ListboxField::create(
                         "CreateTopLevelGroups",
-                        _t(self::class . '.TOPLEVELCREATORGROUPS', "Top level creators")
+                        _t(self::class.'.TOPLEVELCREATORGROUPS', "Top level creators")
                     )
                         ->setSource($groupsMap)
                         ->setAttribute(
                             'data-placeholder',
-                            _t(SiteTree::class . '.GroupPlaceholder', 'Click to select group')
+                            _t(SiteTree::class.'.GroupPlaceholder', 'Click to select group')
                         )
                 )
             ),
@@ -156,20 +156,20 @@ 
         );
 
         $viewersOptionsSource = [];
-        $viewersOptionsSource["Anyone"] = _t(SiteTree::class . '.ACCESSANYONE', "Anyone");
+        $viewersOptionsSource["Anyone"] = _t(SiteTree::class.'.ACCESSANYONE', "Anyone");
         $viewersOptionsSource["LoggedInUsers"] = _t(
-            SiteTree::class . '.ACCESSLOGGEDIN',
+            SiteTree::class.'.ACCESSLOGGEDIN',
             "Logged-in users"
         );
         $viewersOptionsSource["OnlyTheseUsers"] = _t(
-            SiteTree::class . '.ACCESSONLYTHESE',
+            SiteTree::class.'.ACCESSONLYTHESE',
             "Only these groups (choose from list)"
         );
         $viewersOptionsField->setSource($viewersOptionsSource);
 
         if ($viewAllGroupsMap) {
             $viewerGroupsField->setDescription(_t(
-                SiteTree::class . '.VIEWER_GROUPS_FIELD_DESC',
+                SiteTree::class.'.VIEWER_GROUPS_FIELD_DESC',
                 'Groups with global view permissions: {groupList}',
                 ['groupList' => implode(', ', array_values($viewAllGroupsMap))]
             ));
@@ -177,7 +177,7 @@ 
 
         if ($editAllGroupsMap) {
             $editorGroupsField->setDescription(_t(
-                SiteTree::class . '.EDITOR_GROUPS_FIELD_DESC',
+                SiteTree::class.'.EDITOR_GROUPS_FIELD_DESC',
                 'Groups with global edit permissions: {groupList}',
                 ['groupList' => implode(', ', array_values($editAllGroupsMap))]
             ));
@@ -185,11 +185,11 @@ 
 
         $editorsOptionsSource = [];
         $editorsOptionsSource["LoggedInUsers"] = _t(
-            SiteTree::class . '.EDITANYONE',
+            SiteTree::class.'.EDITANYONE',
             "Anyone who can log-in to the CMS"
         );
         $editorsOptionsSource["OnlyTheseUsers"] = _t(
-            SiteTree::class . '.EDITONLYTHESE',
+            SiteTree::class.'.EDITONLYTHESE',
             "Only these groups (choose from list)"
         );
         $editorsOptionsField->setSource($editorsOptionsSource);
@@ -207,22 +207,22 @@ 
             $fields->makeFieldReadonly($titleField);
         }
 
-        if (file_exists(BASE_PATH . '/install.php')) {
+        if (file_exists(BASE_PATH.'/install.php')) {
             $fields->addFieldToTab(
                 "Root.Main",
                 new LiteralField(
                     "InstallWarningHeader",
-                    "<p class=\"message warning\">" . _t(
-                        SiteTree::class . 'REMOVE_INSTALL_WARNING',
+                    "<p class=\"message warning\">"._t(
+                        SiteTree::class.'REMOVE_INSTALL_WARNING',
                         'Warning: You should remove install.php from this SilverStripe install for security reasons.'
-                    ) . "</p>"
+                    )."</p>"
                 ),
                 "Title"
             );
         }
 
-        $tabMain->setTitle(_t(self::class . '.TABMAIN', "Main"));
-        $tabAccess->setTitle(_t(self::class . '.TABACCESS', "Access"));
+        $tabMain->setTitle(_t(self::class.'.TABMAIN', "Main"));
+        $tabAccess->setTitle(_t(self::class.'.TABACCESS', "Access"));
         $this->extend('updateCMSFields', $fields);
 
         return $fields;
@@ -241,7 +241,7 @@ 
             $actions = new FieldList(
                 FormAction::create(
                     'save_siteconfig',
-                    _t(CMSMain::class . '.SAVE', 'Save')
+                    _t(CMSMain::class.'.SAVE', 'Save')
                 )->addExtraClass('btn-primary font-icon-save')
             );
         } else {
@@ -427,10 +427,10 @@ 
     {
         return [
             'EDIT_SITECONFIG' => [
-                'name' => _t(self::class . '.EDIT_PERMISSION', 'Manage site configuration'),
-                'category' => _t(Permission::class . '.PERMISSIONS_CATEGORY', 'Roles and access permissions'),
+                'name' => _t(self::class.'.EDIT_PERMISSION', 'Manage site configuration'),
+                'category' => _t(Permission::class.'.PERMISSIONS_CATEGORY', 'Roles and access permissions'),
                 'help' => _t(
-                    self::class . '.EDIT_PERMISSION_HELP',
+                    self::class.'.EDIT_PERMISSION_HELP',
                     'Ability to edit global access settings/top-level page permissions.'
                 ),
                 'sort' => 400

code/SiteConfigLeftAndMain.php

Doc Comments +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
      *
      * @param array $data
      * @param Form $form
-     * @return String
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText
      */
     public function save_siteconfig($data, $form)
     {

Indentation +145 added lines, -145 removed lines

@@ -17,149 +17,149 @@
 
 class SiteConfigLeftAndMain extends LeftAndMain
 {
-    /**
-     * @var string
-     */
-    private static $url_segment = 'settings';
-
-    /**
-     * @var string
-     */
-    private static $url_rule = '/$Action/$ID/$OtherID';
-
-    /**
-     * @var int
-     */
-    private static $menu_priority = -1;
-
-    /**
-     * @var string
-     */
-    private static $menu_title = 'Settings';
-
-    /**
-     * @var string
-     */
-    private static $menu_icon_class = 'font-icon-cog';
-
-    /**
-     * @var string
-     */
-    private static $tree_class = SiteConfig::class;
-
-    /**
-     * @var array
-     */
-    private static $required_permission_codes = array('EDIT_SITECONFIG');
-
-    /**
-     * Initialises the {@link SiteConfig} controller.
-     */
-    public function init()
-    {
-        parent::init();
-        if (class_exists(SiteTree::class)) {
-            Requirements::javascript('silverstripe/cms: client/dist/js/bundle.js');
-        }
-    }
-
-    /**
-     * @param null $id Not used.
-     * @param null $fields Not used.
-     *
-     * @return Form
-     */
-    public function getEditForm($id = null, $fields = null)
-    {
-        $siteConfig = SiteConfig::current_site_config();
-        $fields = $siteConfig->getCMSFields();
-
-        // Tell the CMS what URL the preview should show
-        $home = Director::absoluteBaseURL();
-        $fields->push(new HiddenField('PreviewURL', 'Preview URL', $home));
-
-        // Added in-line to the form, but plucked into different view by LeftAndMain.Preview.js upon load
-        /** @skipUpgrade */
-        $fields->push($navField = new LiteralField('SilverStripeNavigator', $this->getSilverStripeNavigator()));
-        $navField->setAllowHTML(true);
-
-        // Retrieve validator, if one has been setup (e.g. via data extensions).
-        if ($siteConfig->hasMethod("getCMSValidator")) {
-            $validator = $siteConfig->getCMSValidator();
-        } else {
-            $validator = null;
-        }
-
-        $actions = $siteConfig->getCMSActions();
-        $negotiator = $this->getResponseNegotiator();
-        /** @var Form $form */
-        $form = Form::create(
-            $this,
-            'EditForm',
-            $fields,
-            $actions,
-            $validator
-        )->setHTMLID('Form_EditForm');
-        $form->setValidationResponseCallback(function (ValidationResult $errors) use ($negotiator, $form) {
-            $request = $this->getRequest();
-            if ($request->isAjax() && $negotiator) {
-                $result = $form->forTemplate();
-                return $negotiator->respond($request, array(
-                    'CurrentForm' => function () use ($result) {
-                        return $result;
-                    }
-                ));
-            }
-        });
-        $form->addExtraClass('flexbox-area-grow fill-height cms-content cms-edit-form');
-        $form->setAttribute('data-pjax-fragment', 'CurrentForm');
-
-        if ($form->Fields()->hasTabSet()) {
-            $form->Fields()->findOrMakeTab('Root')->setTemplate('SilverStripe\\Forms\\CMSTabSet');
-        }
-        $form->setHTMLID('Form_EditForm');
-        $form->loadDataFrom($siteConfig);
-        $form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
-
-        // Use <button> to allow full jQuery UI styling
-        $actions = $actions->dataFields();
-        if ($actions) {
-            /** @var FormAction $action */
-            foreach ($actions as $action) {
-                $action->setUseButtonTag(true);
-            }
-        }
-
-        $this->extend('updateEditForm', $form);
-
-        return $form;
-    }
-
-    /**
-     * Save the current sites {@link SiteConfig} into the database.
-     *
-     * @param array $data
-     * @param Form $form
-     * @return String
-     */
-    public function save_siteconfig($data, $form)
-    {
-        $data = $form->getData();
-        $siteConfig = DataObject::get_one(SiteConfig::class, ['ID' => $data['ID']]);
-        $form->saveInto($siteConfig);
-        $siteConfig->write();
-        $this->response->addHeader('X-Status', rawurlencode(_t(LeftAndMain::class . '.SAVEDUP', 'Saved.')));
-        return $form->forTemplate();
-    }
-
-
-    public function Breadcrumbs($unlinked = false)
-    {
-        return new ArrayList(array(
-            new ArrayData(array(
-                'Title' => static::menu_title(),
-                'Link' => $this->Link()
-            ))
-        ));
-    }
+	/**
+	 * @var string
+	 */
+	private static $url_segment = 'settings';
+
+	/**
+	 * @var string
+	 */
+	private static $url_rule = '/$Action/$ID/$OtherID';
+
+	/**
+	 * @var int
+	 */
+	private static $menu_priority = -1;
+
+	/**
+	 * @var string
+	 */
+	private static $menu_title = 'Settings';
+
+	/**
+	 * @var string
+	 */
+	private static $menu_icon_class = 'font-icon-cog';
+
+	/**
+	 * @var string
+	 */
+	private static $tree_class = SiteConfig::class;
+
+	/**
+	 * @var array
+	 */
+	private static $required_permission_codes = array('EDIT_SITECONFIG');
+
+	/**
+	 * Initialises the {@link SiteConfig} controller.
+	 */
+	public function init()
+	{
+		parent::init();
+		if (class_exists(SiteTree::class)) {
+			Requirements::javascript('silverstripe/cms: client/dist/js/bundle.js');
+		}
+	}
+
+	/**
+	 * @param null $id Not used.
+	 * @param null $fields Not used.
+	 *
+	 * @return Form
+	 */
+	public function getEditForm($id = null, $fields = null)
+	{
+		$siteConfig = SiteConfig::current_site_config();
+		$fields = $siteConfig->getCMSFields();
+
+		// Tell the CMS what URL the preview should show
+		$home = Director::absoluteBaseURL();
+		$fields->push(new HiddenField('PreviewURL', 'Preview URL', $home));
+
+		// Added in-line to the form, but plucked into different view by LeftAndMain.Preview.js upon load
+		/** @skipUpgrade */
+		$fields->push($navField = new LiteralField('SilverStripeNavigator', $this->getSilverStripeNavigator()));
+		$navField->setAllowHTML(true);
+
+		// Retrieve validator, if one has been setup (e.g. via data extensions).
+		if ($siteConfig->hasMethod("getCMSValidator")) {
+			$validator = $siteConfig->getCMSValidator();
+		} else {
+			$validator = null;
+		}
+
+		$actions = $siteConfig->getCMSActions();
+		$negotiator = $this->getResponseNegotiator();
+		/** @var Form $form */
+		$form = Form::create(
+			$this,
+			'EditForm',
+			$fields,
+			$actions,
+			$validator
+		)->setHTMLID('Form_EditForm');
+		$form->setValidationResponseCallback(function (ValidationResult $errors) use ($negotiator, $form) {
+			$request = $this->getRequest();
+			if ($request->isAjax() && $negotiator) {
+				$result = $form->forTemplate();
+				return $negotiator->respond($request, array(
+					'CurrentForm' => function () use ($result) {
+						return $result;
+					}
+				));
+			}
+		});
+		$form->addExtraClass('flexbox-area-grow fill-height cms-content cms-edit-form');
+		$form->setAttribute('data-pjax-fragment', 'CurrentForm');
+
+		if ($form->Fields()->hasTabSet()) {
+			$form->Fields()->findOrMakeTab('Root')->setTemplate('SilverStripe\\Forms\\CMSTabSet');
+		}
+		$form->setHTMLID('Form_EditForm');
+		$form->loadDataFrom($siteConfig);
+		$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
+
+		// Use <button> to allow full jQuery UI styling
+		$actions = $actions->dataFields();
+		if ($actions) {
+			/** @var FormAction $action */
+			foreach ($actions as $action) {
+				$action->setUseButtonTag(true);
+			}
+		}
+
+		$this->extend('updateEditForm', $form);
+
+		return $form;
+	}
+
+	/**
+	 * Save the current sites {@link SiteConfig} into the database.
+	 *
+	 * @param array $data
+	 * @param Form $form
+	 * @return String
+	 */
+	public function save_siteconfig($data, $form)
+	{
+		$data = $form->getData();
+		$siteConfig = DataObject::get_one(SiteConfig::class, ['ID' => $data['ID']]);
+		$form->saveInto($siteConfig);
+		$siteConfig->write();
+		$this->response->addHeader('X-Status', rawurlencode(_t(LeftAndMain::class . '.SAVEDUP', 'Saved.')));
+		return $form->forTemplate();
+	}
+
+
+	public function Breadcrumbs($unlinked = false)
+	{
+		return new ArrayList(array(
+			new ArrayData(array(
+				'Title' => static::menu_title(),
+				'Link' => $this->Link()
+			))
+		));
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -100,12 +100,12 @@ 
             $actions,
             $validator
         )->setHTMLID('Form_EditForm');
-        $form->setValidationResponseCallback(function (ValidationResult $errors) use ($negotiator, $form) {
+        $form->setValidationResponseCallback(function(ValidationResult $errors) use ($negotiator, $form) {
             $request = $this->getRequest();
             if ($request->isAjax() && $negotiator) {
                 $result = $form->forTemplate();
                 return $negotiator->respond($request, array(
-                    'CurrentForm' => function () use ($result) {
+                    'CurrentForm' => function() use ($result) {
                         return $result;
                     }
                 ));
@@ -148,7 +148,7 @@ 
         $siteConfig = DataObject::get_one(SiteConfig::class, ['ID' => $data['ID']]);
         $form->saveInto($siteConfig);
         $siteConfig->write();
-        $this->response->addHeader('X-Status', rawurlencode(_t(LeftAndMain::class . '.SAVEDUP', 'Saved.')));
+        $this->response->addHeader('X-Status', rawurlencode(_t(LeftAndMain::class.'.SAVEDUP', 'Saved.')));
         return $form->forTemplate();
     }
 

code/SiteConfigPagePermissions.php

Indentation +41 added lines, -41 removed lines

@@ -10,48 +10,48 @@
  */
 class SiteConfigPagePermissions implements DefaultPermissionChecker
 {
-    /**
-     * Can root be edited?
-     *
-     * @param Member $member
-     * @return bool
-     */
-    public function canEdit(Member $member = null)
-    {
-        return SiteConfig::current_site_config()->canEditPages($member);
-    }
+	/**
+	 * Can root be edited?
+	 *
+	 * @param Member $member
+	 * @return bool
+	 */
+	public function canEdit(Member $member = null)
+	{
+		return SiteConfig::current_site_config()->canEditPages($member);
+	}
 
-    /**
-     * Can root be viewed?
-     *
-     * @param Member $member
-     * @return bool
-     */
-    public function canView(Member $member = null)
-    {
-        return SiteConfig::current_site_config()->canViewPages($member);
-    }
+	/**
+	 * Can root be viewed?
+	 *
+	 * @param Member $member
+	 * @return bool
+	 */
+	public function canView(Member $member = null)
+	{
+		return SiteConfig::current_site_config()->canViewPages($member);
+	}
 
-    /**
-     * Can root be deleted?
-     *
-     * @param Member $member
-     * @return bool
-     */
-    public function canDelete(Member $member = null)
-    {
-        // Same as canEdit
-        return $this->canEdit($member);
-    }
+	/**
+	 * Can root be deleted?
+	 *
+	 * @param Member $member
+	 * @return bool
+	 */
+	public function canDelete(Member $member = null)
+	{
+		// Same as canEdit
+		return $this->canEdit($member);
+	}
 
-    /**
-     * Can root objects be created?
-     *
-     * @param Member $member
-     * @return bool
-     */
-    public function canCreate(Member $member = null)
-    {
-        return SiteConfig::current_site_config()->canCreateTopLevel();
-    }
+	/**
+	 * Can root objects be created?
+	 *
+	 * @param Member $member
+	 * @return bool
+	 */
+	public function canCreate(Member $member = null)
+	{
+		return SiteConfig::current_site_config()->canCreateTopLevel();
+	}
 }

tests/bootstrap/mysite.php

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 if (!defined('BASE_PATH')) {
-    define('BASE_PATH', getcwd());
+	define('BASE_PATH', getcwd());
 }
 
 require_once BASE_PATH . '/cms/tests/bootstrap/mysite.php';

Spacing +2 added lines, -2 removed lines

@@ -4,6 +4,6 @@
     define('BASE_PATH', getcwd());
 }
 
-require_once BASE_PATH . '/cms/tests/bootstrap/mysite.php';
+require_once BASE_PATH.'/cms/tests/bootstrap/mysite.php';
 
-copy(__DIR__ . '/fixtures/theme.yml.fixture', $projectPath . '/_config/dummytheme.yml');
+copy(__DIR__.'/fixtures/theme.yml.fixture', $projectPath.'/_config/dummytheme.yml');

tests/php/SiteConfigTest.php

Indentation +116 added lines, -116 removed lines

@@ -13,120 +13,120 @@
  */
 class SiteConfigTest extends SapphireTest
 {
-    protected static $fixture_file = 'SiteConfigTest.yml';
-
-    protected static $illegal_extensions = array(
-        SiteTree::class => ['SiteTreeSubsites'],
-    );
-
-    public function testCanCreateRootPages()
-    {
-        /** @var SiteConfig $config */
-        $config = $this->objFromFixture(SiteConfig::class, 'default');
-
-        // Admin trumps all
-        $this->actWithPermission('ADMIN', function () use ($config) {
-            $this->assertTrue($config->canCreateTopLevel());
-        });
-
-        // Log in without pages admin access
-        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
-            $this->assertFalse($config->canCreateTopLevel());
-        });
-
-        // Login with necessary edit permission
-        $perms = SiteConfig::config()->get('required_permission');
-        $this->actWithPermission(reset($perms), function () use ($config) {
-            $this->assertTrue($config->canCreateTopLevel());
-        });
-
-        // "OnlyTheseUsers" restricts to the correct groups
-        $config->CanCreateTopLevelType = 'OnlyTheseUsers';
-        $this->actWithPermission('ADMIN', function () use ($config) {
-            $this->assertTrue($config->canCreateTopLevel());
-        });
-        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
-            $this->assertFalse($config->canCreateTopLevel());
-            $config->CreateTopLevelGroups()->add(Security::getCurrentUser()->Groups()->First());
-            $this->assertTrue($config->canCreateTopLevel());
-        });
-    }
-
-    public function testCanViewPages()
-    {
-        /** @var SiteConfig $config */
-        $config = $this->objFromFixture(SiteConfig::class, 'default');
-
-        // "Anyone" can view
-        $this->actWithPermission('ADMIN', function () use ($config) {
-            $this->assertTrue($config->canViewPages());
-        });
-        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
-            $this->assertTrue($config->canViewPages());
-        });
-
-        // "LoggedInUsers" can view
-        $config->CanViewType = 'LoggedInUsers';
-        $this->logOut();
-        $this->assertFalse($config->canViewPages());
-
-        // "OnlyTheseUsers" restricts to the correct groups
-        $config->CanViewType = 'OnlyTheseUsers';
-        $this->actWithPermission('ADMIN', function () use ($config) {
-            $this->assertTrue($config->canViewPages());
-        });
-        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
-            $this->assertFalse($config->canViewPages());
-            $config->ViewerGroups()->add(Security::getCurrentUser()->Groups()->First());
-            $this->assertTrue($config->canViewPages());
-        });
-    }
-
-    public function testCanEdit()
-    {
-        $config = $this->objFromFixture(SiteConfig::class, 'default');
-
-        // Unrelated permissions don't allow siteconfig
-        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
-            $this->assertFalse($config->canEdit());
-        });
-
-        // Only those with edit permission can do this
-        $this->actWithPermission('EDIT_SITECONFIG', function () use ($config) {
-            $this->assertTrue($config->canEdit());
-        });
-    }
-
-    public function testCanEditPages()
-    {
-        /** @var SiteConfig $config */
-        $config = $this->objFromFixture(SiteConfig::class, 'default');
-
-        // Admin can always edit
-        $this->actWithPermission('ADMIN', function () use ($config) {
-            $this->assertTrue($config->canEditPages());
-        });
-
-        // Log in without pages admin access
-        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
-            $this->assertFalse($config->canEditPages());
-        });
-
-        // Login with necessary edit permission
-        $perms = SiteConfig::config()->get('required_permission');
-        $this->actWithPermission(reset($perms), function () use ($config) {
-            $this->assertTrue($config->canEditPages());
-        });
-
-        // "OnlyTheseUsers" restricts to the correct groups
-        $config->CanEditType = 'OnlyTheseUsers';
-        $this->actWithPermission('ADMIN', function () use ($config) {
-            $this->assertTrue($config->canEditPages());
-        });
-        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
-            $this->assertFalse($config->canEditPages());
-            $config->EditorGroups()->add(Security::getCurrentUser()->Groups()->First());
-            $this->assertTrue($config->canEditPages());
-        });
-    }
+	protected static $fixture_file = 'SiteConfigTest.yml';
+
+	protected static $illegal_extensions = array(
+		SiteTree::class => ['SiteTreeSubsites'],
+	);
+
+	public function testCanCreateRootPages()
+	{
+		/** @var SiteConfig $config */
+		$config = $this->objFromFixture(SiteConfig::class, 'default');
+
+		// Admin trumps all
+		$this->actWithPermission('ADMIN', function () use ($config) {
+			$this->assertTrue($config->canCreateTopLevel());
+		});
+
+		// Log in without pages admin access
+		$this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
+			$this->assertFalse($config->canCreateTopLevel());
+		});
+
+		// Login with necessary edit permission
+		$perms = SiteConfig::config()->get('required_permission');
+		$this->actWithPermission(reset($perms), function () use ($config) {
+			$this->assertTrue($config->canCreateTopLevel());
+		});
+
+		// "OnlyTheseUsers" restricts to the correct groups
+		$config->CanCreateTopLevelType = 'OnlyTheseUsers';
+		$this->actWithPermission('ADMIN', function () use ($config) {
+			$this->assertTrue($config->canCreateTopLevel());
+		});
+		$this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
+			$this->assertFalse($config->canCreateTopLevel());
+			$config->CreateTopLevelGroups()->add(Security::getCurrentUser()->Groups()->First());
+			$this->assertTrue($config->canCreateTopLevel());
+		});
+	}
+
+	public function testCanViewPages()
+	{
+		/** @var SiteConfig $config */
+		$config = $this->objFromFixture(SiteConfig::class, 'default');
+
+		// "Anyone" can view
+		$this->actWithPermission('ADMIN', function () use ($config) {
+			$this->assertTrue($config->canViewPages());
+		});
+		$this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
+			$this->assertTrue($config->canViewPages());
+		});
+
+		// "LoggedInUsers" can view
+		$config->CanViewType = 'LoggedInUsers';
+		$this->logOut();
+		$this->assertFalse($config->canViewPages());
+
+		// "OnlyTheseUsers" restricts to the correct groups
+		$config->CanViewType = 'OnlyTheseUsers';
+		$this->actWithPermission('ADMIN', function () use ($config) {
+			$this->assertTrue($config->canViewPages());
+		});
+		$this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
+			$this->assertFalse($config->canViewPages());
+			$config->ViewerGroups()->add(Security::getCurrentUser()->Groups()->First());
+			$this->assertTrue($config->canViewPages());
+		});
+	}
+
+	public function testCanEdit()
+	{
+		$config = $this->objFromFixture(SiteConfig::class, 'default');
+
+		// Unrelated permissions don't allow siteconfig
+		$this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
+			$this->assertFalse($config->canEdit());
+		});
+
+		// Only those with edit permission can do this
+		$this->actWithPermission('EDIT_SITECONFIG', function () use ($config) {
+			$this->assertTrue($config->canEdit());
+		});
+	}
+
+	public function testCanEditPages()
+	{
+		/** @var SiteConfig $config */
+		$config = $this->objFromFixture(SiteConfig::class, 'default');
+
+		// Admin can always edit
+		$this->actWithPermission('ADMIN', function () use ($config) {
+			$this->assertTrue($config->canEditPages());
+		});
+
+		// Log in without pages admin access
+		$this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
+			$this->assertFalse($config->canEditPages());
+		});
+
+		// Login with necessary edit permission
+		$perms = SiteConfig::config()->get('required_permission');
+		$this->actWithPermission(reset($perms), function () use ($config) {
+			$this->assertTrue($config->canEditPages());
+		});
+
+		// "OnlyTheseUsers" restricts to the correct groups
+		$config->CanEditType = 'OnlyTheseUsers';
+		$this->actWithPermission('ADMIN', function () use ($config) {
+			$this->assertTrue($config->canEditPages());
+		});
+		$this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
+			$this->assertFalse($config->canEditPages());
+			$config->EditorGroups()->add(Security::getCurrentUser()->Groups()->First());
+			$this->assertTrue($config->canEditPages());
+		});
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -25,27 +25,27 @@ 
         $config = $this->objFromFixture(SiteConfig::class, 'default');
 
         // Admin trumps all
-        $this->actWithPermission('ADMIN', function () use ($config) {
+        $this->actWithPermission('ADMIN', function() use ($config) {
             $this->assertTrue($config->canCreateTopLevel());
         });
 
         // Log in without pages admin access
-        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
+        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function() use ($config) {
             $this->assertFalse($config->canCreateTopLevel());
         });
 
         // Login with necessary edit permission
         $perms = SiteConfig::config()->get('required_permission');
-        $this->actWithPermission(reset($perms), function () use ($config) {
+        $this->actWithPermission(reset($perms), function() use ($config) {
             $this->assertTrue($config->canCreateTopLevel());
         });
 
         // "OnlyTheseUsers" restricts to the correct groups
         $config->CanCreateTopLevelType = 'OnlyTheseUsers';
-        $this->actWithPermission('ADMIN', function () use ($config) {
+        $this->actWithPermission('ADMIN', function() use ($config) {
             $this->assertTrue($config->canCreateTopLevel());
         });
-        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
+        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function() use ($config) {
             $this->assertFalse($config->canCreateTopLevel());
             $config->CreateTopLevelGroups()->add(Security::getCurrentUser()->Groups()->First());
             $this->assertTrue($config->canCreateTopLevel());
@@ -58,10 +58,10 @@ 
         $config = $this->objFromFixture(SiteConfig::class, 'default');
 
         // "Anyone" can view
-        $this->actWithPermission('ADMIN', function () use ($config) {
+        $this->actWithPermission('ADMIN', function() use ($config) {
             $this->assertTrue($config->canViewPages());
         });
-        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
+        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function() use ($config) {
             $this->assertTrue($config->canViewPages());
         });
 
@@ -72,10 +72,10 @@ 
 
         // "OnlyTheseUsers" restricts to the correct groups
         $config->CanViewType = 'OnlyTheseUsers';
-        $this->actWithPermission('ADMIN', function () use ($config) {
+        $this->actWithPermission('ADMIN', function() use ($config) {
             $this->assertTrue($config->canViewPages());
         });
-        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
+        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function() use ($config) {
             $this->assertFalse($config->canViewPages());
             $config->ViewerGroups()->add(Security::getCurrentUser()->Groups()->First());
             $this->assertTrue($config->canViewPages());
@@ -87,12 +87,12 @@ 
         $config = $this->objFromFixture(SiteConfig::class, 'default');
 
         // Unrelated permissions don't allow siteconfig
-        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
+        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function() use ($config) {
             $this->assertFalse($config->canEdit());
         });
 
         // Only those with edit permission can do this
-        $this->actWithPermission('EDIT_SITECONFIG', function () use ($config) {
+        $this->actWithPermission('EDIT_SITECONFIG', function() use ($config) {
             $this->assertTrue($config->canEdit());
         });
     }
@@ -103,27 +103,27 @@ 
         $config = $this->objFromFixture(SiteConfig::class, 'default');
 
         // Admin can always edit
-        $this->actWithPermission('ADMIN', function () use ($config) {
+        $this->actWithPermission('ADMIN', function() use ($config) {
             $this->assertTrue($config->canEditPages());
         });
 
         // Log in without pages admin access
-        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
+        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function() use ($config) {
             $this->assertFalse($config->canEditPages());
         });
 
         // Login with necessary edit permission
         $perms = SiteConfig::config()->get('required_permission');
-        $this->actWithPermission(reset($perms), function () use ($config) {
+        $this->actWithPermission(reset($perms), function() use ($config) {
             $this->assertTrue($config->canEditPages());
         });
 
         // "OnlyTheseUsers" restricts to the correct groups
         $config->CanEditType = 'OnlyTheseUsers';
-        $this->actWithPermission('ADMIN', function () use ($config) {
+        $this->actWithPermission('ADMIN', function() use ($config) {
             $this->assertTrue($config->canEditPages());
         });
-        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function () use ($config) {
+        $this->actWithPermission('CMS_ACCESS_AssetAdmin', function() use ($config) {
             $this->assertFalse($config->canEditPages());
             $config->EditorGroups()->add(Security::getCurrentUser()->Groups()->First());
             $this->assertTrue($config->canEditPages());