salted-herring / silverstripe-block

code/ExtendedBlocks/DualColumnBlock.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 class DualColumnBlock extends Block {
-	protected static $db = array (
+	protected static $db = array(
 		'LeftColumn'		=>	'HTMLText',
 		'RightColumn'	=>	'HTMLText'
 	);

Indentation +5 added lines, -5 removed lines

@@ -1,9 +1,9 @@
 <?php
 
 class DualColumnBlock extends Block {
-	protected static $singular_name = 'Dual-column Block';
-	protected static $db = array (
-		'LeftColumn'		=>	'HTMLText',
-		'RightColumn'	=>	'HTMLText'
-	);
+    protected static $singular_name = 'Dual-column Block';
+    protected static $db = array (
+        'LeftColumn'		=>	'HTMLText',
+        'RightColumn'	=>	'HTMLText'
+    );
 }
\ No newline at end of file

code/ExtendedBlocks/SingleColumnBlock.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 class SingleColumnBlock extends Block {
-	protected static $db = array (
+	protected static $db = array(
 		'Content'	=>	'HTMLText'
 	);
 }
\ No newline at end of file

Indentation +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@
 <?php
 
 class SingleColumnBlock extends SHBlock {
-	protected static $singular_name = 'Single-column Block';
-	protected static $db = array (
-		'Content'	=>	'HTMLText'
-	);
+    protected static $singular_name = 'Single-column Block';
+    protected static $db = array (
+        'Content'	=>	'HTMLText'
+    );
 }
\ No newline at end of file

code/ExtendedBlocks/TriColumnBlock.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 class DualColumnBlock extends Block {
-	protected static $db = array (
+	protected static $db = array(
 		'LeftColumn'		=>	'HTMLText',
 		'RightColumn'	=>	'HTMLText'
 	);

Indentation +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@
 <?php
 
 class TriColumnBlock extends SHBlock {
-	protected static $singular_name = 'Triple-column Block';
-	protected static $db = array (
-		'LeftColumn'		=>	'HTMLText',
-		'MiddleColumn'	=>	'HTMLText',
-		'RightColumn'	=>	'HTMLText'
-	);
+    protected static $singular_name = 'Triple-column Block';
+    protected static $db = array (
+        'LeftColumn'		=>	'HTMLText',
+        'MiddleColumn'	=>	'HTMLText',
+        'RightColumn'	=>	'HTMLText'
+    );
 }
\ No newline at end of file

code/Extensions/BlockinPage.php

Spacing +5 added lines, -5 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 class BlockinPage extends Extension {
-	protected static $belongs_many_many = array (
+	protected static $belongs_many_many = array(
 		'Blocks'			=>	'Block'
 	);
 	
-	public function updateCMSFields( FieldList $fields ) {
+	public function updateCMSFields(FieldList $fields) {
 		$ancestry = ClassInfo::ancestry($this->owner->ClassName);
 		if (!in_array('RedirectorPage', $ancestry) && !in_array('VirtualPage', $ancestry)) {
 			$blocks = $this->owner->Blocks();
-			$blocks_grid = $this->gridBuilder('Blocks', $blocks, '', true,'GridFieldConfig_RelationEditor');
+			$blocks_grid = $this->gridBuilder('Blocks', $blocks, '', true, 'GridFieldConfig_RelationEditor');
 			$docked_grid = $this->gridBuilder('DockedBlocks', $this->dockedBlocks(), '');
 			
 			$fields->addFieldToTab('Root.MyBlocks', $blocks_grid);
@@ -27,7 +27,7 @@ 
 		$grid = new GridField($name, $label, $source);
 		$config = $gridHeaderType::create();
 		$config->removeComponentsByType('GridFieldAddNewButton');
-		if ( $canAdd ) {
+		if ($canAdd) {
 			$config->addComponents(
 				$multiClass = new GridFieldAddNewMultiClass(),
 				$sortable = new GridFieldOrderableRows('SortOrder')
@@ -51,7 +51,7 @@ 
 				$IDs[] = $BlockID;
 			}
 		}
-		$blocks = Block::get()->filter('ID', $IDs)->sort('SortOrder','ASC');
+		$blocks = Block::get()->filter('ID', $IDs)->sort('SortOrder', 'ASC');
 		return $blocks;
 	}
 }
\ No newline at end of file

Indentation +44 added lines, -44 removed lines

@@ -1,57 +1,57 @@
 <?php
 
 class BlockinPage extends Extension {
-	protected static $belongs_many_many = array (
-		'Blocks'			=>	'Block'
-	);
+    protected static $belongs_many_many = array (
+        'Blocks'			=>	'Block'
+    );
 	
-	public function updateCMSFields( FieldList $fields ) {
-		$ancestry = ClassInfo::ancestry($this->owner->ClassName);
-		if (!in_array('RedirectorPage', $ancestry) && !in_array('VirtualPage', $ancestry)) {
-			$blocks = $this->owner->Blocks();
-			$blocks_grid = $this->gridBuilder('Blocks', $blocks, '', true,'GridFieldConfig_RelationEditor');
-			$docked_grid = $this->gridBuilder('DockedBlocks', $this->dockedBlocks(), '');
+    public function updateCMSFields( FieldList $fields ) {
+        $ancestry = ClassInfo::ancestry($this->owner->ClassName);
+        if (!in_array('RedirectorPage', $ancestry) && !in_array('VirtualPage', $ancestry)) {
+            $blocks = $this->owner->Blocks();
+            $blocks_grid = $this->gridBuilder('Blocks', $blocks, '', true,'GridFieldConfig_RelationEditor');
+            $docked_grid = $this->gridBuilder('DockedBlocks', $this->dockedBlocks(), '');
 			
-			$fields->addFieldToTab('Root.MyBlocks', $blocks_grid);
-			$fields->addFieldToTab('Root.DockedBlocks', $docked_grid);
-		}
-	}
+            $fields->addFieldToTab('Root.MyBlocks', $blocks_grid);
+            $fields->addFieldToTab('Root.DockedBlocks', $docked_grid);
+        }
+    }
 	
-	private function gridBuilder($name, $source, $label = '', $canAdd = false, $gridHeaderType = 'GridFieldConfig_RecordEditor') {
-		/*
+    private function gridBuilder($name, $source, $label = '', $canAdd = false, $gridHeaderType = 'GridFieldConfig_RecordEditor') {
+        /*
 		GridFieldConfig_Base
 		GridFieldConfig_RecordViewer
 		GridFieldConfig_RecordEditor
 		GridFieldConfig_RelationEditor
 		*/
-		if ($label == '') { $label = $name; }
-		$grid = new GridField($name, $label, $source);
-		$config = $gridHeaderType::create();
-		$config->removeComponentsByType('GridFieldAddNewButton');
-		if ( $canAdd ) {
-			$config->addComponents(
-				$multiClass = new MultiClassSelector(),
-				$sortable = new GridFieldOrderableRows('SortOrder')
-			);
-			$subBlocks = BlocksAdmin::getAvaiableTypes();
-			$multiClass->setClasses($subBlocks);
-		}
-		$grid->setConfig($config);
-		return $grid;
-	}
+        if ($label == '') { $label = $name; }
+        $grid = new GridField($name, $label, $source);
+        $config = $gridHeaderType::create();
+        $config->removeComponentsByType('GridFieldAddNewButton');
+        if ( $canAdd ) {
+            $config->addComponents(
+                $multiClass = new MultiClassSelector(),
+                $sortable = new GridFieldOrderableRows('SortOrder')
+            );
+            $subBlocks = BlocksAdmin::getAvaiableTypes();
+            $multiClass->setClasses($subBlocks);
+        }
+        $grid->setConfig($config);
+        return $grid;
+    }
 		
-	private function dockedBlocks() {
-		$blocks = Block::get();
-		$IDs = array();
-		$ClassName = $this->owner->ClassName;
-		$Classes = $blocks->map('ID', 'shownInClass');
-		foreach ($Classes as $BlockID => $Class) {
-			$listedClasses = explode(',', $Class);
-			if (in_array($ClassName, $listedClasses)) {
-				$IDs[] = $BlockID;
-			}
-		}
-		$blocks = Block::get()->filter('ID', $IDs)->sort('SortOrder','ASC');
-		return $blocks;
-	}
+    private function dockedBlocks() {
+        $blocks = Block::get();
+        $IDs = array();
+        $ClassName = $this->owner->ClassName;
+        $Classes = $blocks->map('ID', 'shownInClass');
+        foreach ($Classes as $BlockID => $Class) {
+            $listedClasses = explode(',', $Class);
+            if (in_array($ClassName, $listedClasses)) {
+                $IDs[] = $BlockID;
+            }
+        }
+        $blocks = Block::get()->filter('ID', $IDs)->sort('SortOrder','ASC');
+        return $blocks;
+    }
 }
\ No newline at end of file

code/Block.php

Braces +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
 	public function VisibleTo() {

 		if (strlen(trim($this->MemberVisibility)) > 0) {

 			$lists = 'Group: ' . str_replace(',','<br />Group: ', $this->MemberVisibility);

-		}else{

+		} else{

 			$lists = '<em>&lt;All&gt;</em>';

 		}

 		

@@ -56,13 +56,13 @@ 
 		if ($this->showBlockbyClass) {

 			if (strlen(trim($this->shownInClass)) > 0) {

 				$lists = 'Type: ' . str_replace(',','<br />Type: ', $this->shownInClass);

-			}else{

+			} else{

 				$lists = '<em>&lt;not assigned&gt;</em>';

 			}

-		}else{

+		} else{

 			if ($this->Pages()->count() > 0) {

 				$lists = 'Page: ' . implode('<br />Page: ', $this->Pages()->column('Title'));

-			}else{

+			} else{

 				$lists = '<em>&lt;not assigned&gt;</em>';

 			}

 		}

Spacing +13 added lines, -13 removed lines

@@ -1,7 +1,7 @@ 
 <?php

 

 class Block extends DataObject {

-	protected static $db = array (

+	protected static $db = array(

 		'SortOrder'			=>	'Int',

 		'Title'				=>	'Varchar(64)',

 		'TitleWrapper'		=>	'Enum("h2,h3,h4,h5,h6")',

@@ -14,7 +14,7 @@ 
 		'addMarginBottom'	=>	'Boolean'

 	);

 	

-	protected static $many_many = array (

+	protected static $many_many = array(

 		'Pages'				=>	'Page'

 	);

 		

@@ -22,7 +22,7 @@ 
 		'MySQLDatabase'		=> 'ENGINE=MyISAM'

     );

 	

-	protected static $extensions = array (

+	protected static $extensions = array(

 		'StandardPermissions'

 	);

 	

@@ -42,12 +42,12 @@ 
 	

 	public function VisibleTo() {

 		if (strlen(trim($this->MemberVisibility)) > 0) {

-			$lists = 'Group: ' . str_replace(',','<br />Group: ', $this->MemberVisibility);

-		}else{

+			$lists = 'Group: '.str_replace(',', '<br />Group: ', $this->MemberVisibility);

+		} else {

 			$lists = '<em>&lt;All&gt;</em>';

 		}

 		

-		return new LiteralField('VisibleTo',$lists);

+		return new LiteralField('VisibleTo', $lists);

 	}

 	

 	public function BlockType() {

@@ -57,18 +57,18 @@ 
 	public function shownOn() {

 		if ($this->showBlockbyClass) {

 			if (strlen(trim($this->shownInClass)) > 0) {

-				$lists = 'Type: ' . str_replace(',','<br />Type: ', $this->shownInClass);

-			}else{

+				$lists = 'Type: '.str_replace(',', '<br />Type: ', $this->shownInClass);

+			} else {

 				$lists = '<em>&lt;not assigned&gt;</em>';

 			}

-		}else{

+		} else {

 			if ($this->Pages()->count() > 0) {

-				$lists = 'Page: ' . implode('<br />Page: ', $this->Pages()->column('Title'));

-			}else{

+				$lists = 'Page: '.implode('<br />Page: ', $this->Pages()->column('Title'));

+			} else {

 				$lists = '<em>&lt;not assigned&gt;</em>';

 			}

 		}

-		return new LiteralField('shownOn',$lists);

+		return new LiteralField('shownOn', $lists);

 	}

 	

 	public function getCMSFields() {

@@ -122,7 +122,7 @@ 
 		$pageSelector = new CheckboxSetField(

 			$name = "Pages",

 			$title = "Show on Page(s)",

-			$availablePages->map('ID','Title')

+			$availablePages->map('ID', 'Title')

 		);

 		

 		

Indentation +186 added lines, -186 removed lines

@@ -1,209 +1,209 @@
 <?php

 

 class Block extends DataObject {

-	protected static $db = array (

-		'SortOrder'			=>	'Int',

-		'Title'				=>	'Varchar(64)',

-		'TitleWrapper'		=>	'Enum("h2,h3,h4,h5,h6")',

-		'hideTitle'			=>	'Boolean',

-		'showBlockbyClass'	=>	'Boolean',

-		'Description'		=>	'Varchar(128)',

-		'MemberVisibility'	=>	'Varchar(255)',

-		'shownInClass'		=>	'Text',

-		'addMarginTop'		=>	'Boolean',

-		'addMarginBottom'	=>	'Boolean'

-	);

+    protected static $db = array (

+        'SortOrder'			=>	'Int',

+        'Title'				=>	'Varchar(64)',

+        'TitleWrapper'		=>	'Enum("h2,h3,h4,h5,h6")',

+        'hideTitle'			=>	'Boolean',

+        'showBlockbyClass'	=>	'Boolean',

+        'Description'		=>	'Varchar(128)',

+        'MemberVisibility'	=>	'Varchar(255)',

+        'shownInClass'		=>	'Text',

+        'addMarginTop'		=>	'Boolean',

+        'addMarginBottom'	=>	'Boolean'

+    );

 	

-	protected static $many_many = array (

-		'Pages'				=>	'Page'

-	);

+    protected static $many_many = array (

+        'Pages'				=>	'Page'

+    );

 	

-	protected static $default_sort = array(

-		'SortOrder'			=>	'ASC',

-		'ID'				=>	'DESC'

-	);

+    protected static $default_sort = array(

+        'SortOrder'			=>	'ASC',

+        'ID'				=>	'DESC'

+    );

 		

-	protected static $create_table_options = array(

-		'MySQLDatabase'		=> 'ENGINE=MyISAM'

+    protected static $create_table_options = array(

+        'MySQLDatabase'		=> 'ENGINE=MyISAM'

     );

 	

-	protected static $extensions = array (

-		'StandardPermissions'

-	);

+    protected static $extensions = array (

+        'StandardPermissions'

+    );

 	

-	protected static $summary_fields = array(

-		'BlockType',

-		'Title', 

-		'Description',

-		'shownOn',

-		'VisibleTo'

-	);

+    protected static $summary_fields = array(

+        'BlockType',

+        'Title', 

+        'Description',

+        'shownOn',

+        'VisibleTo'

+    );

 	

-	protected static $field_labels = array(

-		'BlockType'			=>	'Block type',

-		'shownOn'			=>	'is shown on',

-		'VisibleTo'			=>	'Visible to'

-	);

+    protected static $field_labels = array(

+        'BlockType'			=>	'Block type',

+        'shownOn'			=>	'is shown on',

+        'VisibleTo'			=>	'Visible to'

+    );

 	

-	public function VisibleTo() {

-		if (strlen(trim($this->MemberVisibility)) > 0) {

-			$lists = 'Group: ' . str_replace(',','<br />Group: ', $this->MemberVisibility);

-		}else{

-			$lists = '<em>&lt;All&gt;</em>';

-		}

-		

-		return new LiteralField('VisibleTo',$lists);

-	}

+    public function VisibleTo() {

+        if (strlen(trim($this->MemberVisibility)) > 0) {

+            $lists = 'Group: ' . str_replace(',','<br />Group: ', $this->MemberVisibility);

+        }else{

+            $lists = '<em>&lt;All&gt;</em>';

+        }

+		

+        return new LiteralField('VisibleTo',$lists);

+    }

 	

-	public function BlockType() {

-		return $this->singular_name();

-	}

+    public function BlockType() {

+        return $this->singular_name();

+    }

 	

-	public function shownOn() {

-		if ($this->showBlockbyClass) {

-			if (strlen(trim($this->shownInClass)) > 0) {

-				$lists = 'Type: ' . str_replace(',','<br />Type: ', $this->shownInClass);

-			}else{

-				$lists = '<em>&lt;not assigned&gt;</em>';

-			}

-		}else{

-			if ($this->Pages()->count() > 0) {

-				$lists = 'Page: ' . implode('<br />Page: ', $this->Pages()->column('Title'));

-			}else{

-				$lists = '<em>&lt;not assigned&gt;</em>';

-			}

-		}

-		return new LiteralField('shownOn',$lists);

-	}

+    public function shownOn() {

+        if ($this->showBlockbyClass) {

+            if (strlen(trim($this->shownInClass)) > 0) {

+                $lists = 'Type: ' . str_replace(',','<br />Type: ', $this->shownInClass);

+            }else{

+                $lists = '<em>&lt;not assigned&gt;</em>';

+            }

+        }else{

+            if ($this->Pages()->count() > 0) {

+                $lists = 'Page: ' . implode('<br />Page: ', $this->Pages()->column('Title'));

+            }else{

+                $lists = '<em>&lt;not assigned&gt;</em>';

+            }

+        }

+        return new LiteralField('shownOn',$lists);

+    }

 	

-	public function getCMSFields() {

-		$fields = parent::getCMSFields();

-		$fields->removeFieldFromTab('Root', 'Pages');

-		$fields->removeFieldsFromTab('Root.Main', array(

-			'SortOrder',

-			'showBlockbyClass',

-			'shownInClass',

-			'MemberVisibility'

-		));

-		

-		$memberGroups = Group::get();

-		$sourcemap = $memberGroups->map('Code', 'Title');

-		$source = array(

-			'anonymous'		=>	'Anonymous visitors'

-		);

-		foreach ($sourcemap as $mapping => $key) {

-			$source[$mapping] = $key;

-		}

-		

-		$memberVisibility = new CheckboxSetField(

-			$name = "MemberVisibility",

-			$title = "Show block for specific groups",

-			$source

-		);

-		

-		$memberVisibility->setDescription('Show this block only for the selected group(s). If you select no groups, the block will be visible to all members.');

-		

-		$availabelClasses = $this->availableClasses();

-		$inClass = new CheckboxSetField(

-			$name = "shownInClass",

-			$title = "Show block for specific content types",

-			$availabelClasses

-		);

-		

-		$filterSelector = OptionsetField::create(

-			'showBlockbyClass',

-			'Choose filter set',

-			array(

-				'0'			=>	'by page',

-				'1'			=>	'by page/data type'

-			)

-		)->setDescription('<p><br /><strong>by page</strong>: block will be displayed in the selected page(s)<br /><strong>by page/data type</strong>: block will be displayed on the pages created with the particular page/data type. e.g. is <strong>"InternalPage"</strong> is picked, the block will be displayed, and will ONLY be displayed on all <strong>Internal Pages</strong></p>');

-		

-		$availablePages = Page::get()->exclude('ClassName', array(

-			'ErrorPage',

-			'RedirectorPage',

-			'VirtualPage'

-		));

-		$pageSelector = new CheckboxSetField(

-			$name = "Pages",

-			$title = "Show on Page(s)",

-			$availablePages->map('ID','Title')

-		);

-		

-		

-		if ($this->canConfigPageAndType(Member::currentUser())) {

-			$fields->addFieldsToTab('Root.VisibilitySettings', array(

-				$filterSelector,

-				$pageSelector,

-				$inClass

-			));

-		}

-		

-		if ($this->canConfigMemberVisibility(Member::currentUser())) {

-			$fields->addFieldToTab('Root.VisibilitySettings', $memberVisibility);

-		}

-		

-		if (!$fields->fieldByName('Options')) {

-			$fields->insertBefore($right = RightSidebar::create('Options'), 'Root');

-	    }

+    public function getCMSFields() {

+        $fields = parent::getCMSFields();

+        $fields->removeFieldFromTab('Root', 'Pages');

+        $fields->removeFieldsFromTab('Root.Main', array(

+            'SortOrder',

+            'showBlockbyClass',

+            'shownInClass',

+            'MemberVisibility'

+        ));

+		

+        $memberGroups = Group::get();

+        $sourcemap = $memberGroups->map('Code', 'Title');

+        $source = array(

+            'anonymous'		=>	'Anonymous visitors'

+        );

+        foreach ($sourcemap as $mapping => $key) {

+            $source[$mapping] = $key;

+        }

+		

+        $memberVisibility = new CheckboxSetField(

+            $name = "MemberVisibility",

+            $title = "Show block for specific groups",

+            $source

+        );

+		

+        $memberVisibility->setDescription('Show this block only for the selected group(s). If you select no groups, the block will be visible to all members.');

+		

+        $availabelClasses = $this->availableClasses();

+        $inClass = new CheckboxSetField(

+            $name = "shownInClass",

+            $title = "Show block for specific content types",

+            $availabelClasses

+        );

+		

+        $filterSelector = OptionsetField::create(

+            'showBlockbyClass',

+            'Choose filter set',

+            array(

+                '0'			=>	'by page',

+                '1'			=>	'by page/data type'

+            )

+        )->setDescription('<p><br /><strong>by page</strong>: block will be displayed in the selected page(s)<br /><strong>by page/data type</strong>: block will be displayed on the pages created with the particular page/data type. e.g. is <strong>"InternalPage"</strong> is picked, the block will be displayed, and will ONLY be displayed on all <strong>Internal Pages</strong></p>');

+		

+        $availablePages = Page::get()->exclude('ClassName', array(

+            'ErrorPage',

+            'RedirectorPage',

+            'VirtualPage'

+        ));

+        $pageSelector = new CheckboxSetField(

+            $name = "Pages",

+            $title = "Show on Page(s)",

+            $availablePages->map('ID','Title')

+        );

+		

+		

+        if ($this->canConfigPageAndType(Member::currentUser())) {

+            $fields->addFieldsToTab('Root.VisibilitySettings', array(

+                $filterSelector,

+                $pageSelector,

+                $inClass

+            ));

+        }

+		

+        if ($this->canConfigMemberVisibility(Member::currentUser())) {

+            $fields->addFieldToTab('Root.VisibilitySettings', $memberVisibility);

+        }

+		

+        if (!$fields->fieldByName('Options')) {

+            $fields->insertBefore($right = RightSidebar::create('Options'), 'Root');

+        }

 	

-	    $fields->addFieldsToTab('Options', array(

-			CheckboxField::create('addMarginTop', 'add "margin-top" class to block wrapper'),

-			CheckboxField::create('addMarginBottom', 'add "margin-bottom" class to block wrapper')

-	    ));

+        $fields->addFieldsToTab('Options', array(

+            CheckboxField::create('addMarginTop', 'add "margin-top" class to block wrapper'),

+            CheckboxField::create('addMarginBottom', 'add "margin-bottom" class to block wrapper')

+        ));

 

-		return $fields;

-	}

+        return $fields;

+    }

 	

-	public function availableClasses() {

-		$Classes = array_diff(

-			ClassInfo::subclassesFor('Page'),

-			ClassInfo::subclassesFor('RedirectorPage'),

-			ClassInfo::subclassesFor('VirtualPage')

-		);

-		return $Classes;

-	}

+    public function availableClasses() {

+        $Classes = array_diff(

+            ClassInfo::subclassesFor('Page'),

+            ClassInfo::subclassesFor('RedirectorPage'),

+            ClassInfo::subclassesFor('VirtualPage')

+        );

+        return $Classes;

+    }

 	

-	public function forTemplate() {

-		if ($this->canDisplayMemberCheck()) {

-			return $this->renderWith(array($this->getClassName(), 'BaseBlock'));

-		}

+    public function forTemplate() {

+        if ($this->canDisplayMemberCheck()) {

+            return $this->renderWith(array($this->getClassName(), 'BaseBlock'));

+        }

 		

-		return false;

-	}

+        return false;

+    }

 	

-	public function canDisplayMemberCheck() {

-		$rawVisibility = $this->MemberVisibility;

-		

-		if (empty($rawVisibility)) {

-			return true;

-		}

-		

-		$visibility = explode(',', $rawVisibility);

-		$member = Member::currentUser();

-		

-		if (!$member && in_array('anonymous', $visibility)) {

-			return true;

-		}

-		

-		if ($member) {

-			$memberGroups = $member->Groups()->column('Code');

-			foreach ($memberGroups as $memberGroup) {

-				if (in_array($memberGroup, $visibility)) {

-					return true;

-				}

-			}

-		}

-		

-		return false;

-	}

+    public function canDisplayMemberCheck() {

+        $rawVisibility = $this->MemberVisibility;

+		

+        if (empty($rawVisibility)) {

+            return true;

+        }

+		

+        $visibility = explode(',', $rawVisibility);

+        $member = Member::currentUser();

+		

+        if (!$member && in_array('anonymous', $visibility)) {

+            return true;

+        }

+		

+        if ($member) {

+            $memberGroups = $member->Groups()->column('Code');

+            foreach ($memberGroups as $memberGroup) {

+                if (in_array($memberGroup, $visibility)) {

+                    return true;

+                }

+            }

+        }

+		

+        return false;

+    }

 	

-	public function frontendEditable() {

-		$member = Member::currentUser();		

-		return $this->canEdit($member);

-	}

+    public function frontendEditable() {

+        $member = Member::currentUser();		

+        return $this->canEdit($member);

+    }

 	

-	public function Type2Class() {

-		return strtolower(str_replace(' ', '-', $this->singular_name()));

-	}

+    public function Type2Class() {

+        return strtolower(str_replace(' ', '-', $this->singular_name()));

+    }

 }
\ No newline at end of file

code/Extensions/CustomBlockPermissions.php

Indentation +30 added lines, -30 removed lines

@@ -1,37 +1,37 @@
 <?php 
 
 class CustomBlockPermission extends DataExtension implements PermissionProvider {
-	public function canConfigPageAndType($member = false) {
-		return Permission::check(get_class($this->owner) . '_config_page_and_type');
-	}
+    public function canConfigPageAndType($member = false) {
+        return Permission::check(get_class($this->owner) . '_config_page_and_type');
+    }
 	
-	public function canConfigMemberVisibility($member = false) {
-		return Permission::check(get_class($this->owner) . '_config_member_visibility');
-	}
+    public function canConfigMemberVisibility($member = false) {
+        return Permission::check(get_class($this->owner) . '_config_member_visibility');
+    }
 	
-	public function providePermissions() {
-		$permissions = array();
-		foreach ($this->getClassList() as $class) {
-			foreach (array(
-				'config_page_and_type',
-				'config_member_visibility'
-			) as $name) {
-				$permissions[$class . '_' . $name] = $class . '_' . $name;
-			}
-		}
-		return $permissions;
-	}
+    public function providePermissions() {
+        $permissions = array();
+        foreach ($this->getClassList() as $class) {
+            foreach (array(
+                'config_page_and_type',
+                'config_member_visibility'
+            ) as $name) {
+                $permissions[$class . '_' . $name] = $class . '_' . $name;
+            }
+        }
+        return $permissions;
+    }
 	
-	private function getClassList() {
-		$classes = array();
-		foreach (ClassInfo::subclassesFor('DataObject') as $class => $file) {
-			$extensions = Config::inst()->get($class, 'extensions');
-			if (!is_null($extensions)) {
-				if (in_array(get_class($this), $extensions)) {
-					$classes[] = $class;
-				}
-			}
-		}
-		return $classes;
-	}
+    private function getClassList() {
+        $classes = array();
+        foreach (ClassInfo::subclassesFor('DataObject') as $class => $file) {
+            $extensions = Config::inst()->get($class, 'extensions');
+            if (!is_null($extensions)) {
+                if (in_array(get_class($this), $extensions)) {
+                    $classes[] = $class;
+                }
+            }
+        }
+        return $classes;
+    }
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -2,11 +2,11 @@ 
 
 class CustomBlockPermission extends DataExtension implements PermissionProvider {
 	public function canConfigPageAndType($member = false) {
-		return Permission::check(get_class($this->owner) . '_config_page_and_type');
+		return Permission::check(get_class($this->owner).'_config_page_and_type');
 	}
 	
 	public function canConfigMemberVisibility($member = false) {
-		return Permission::check(get_class($this->owner) . '_config_member_visibility');
+		return Permission::check(get_class($this->owner).'_config_member_visibility');
 	}
 	
 	public function providePermissions() {
@@ -16,7 +16,7 @@ 
 				'config_page_and_type',
 				'config_member_visibility'
 			) as $name) {
-				$permissions[$class . '_' . $name] = $class . '_' . $name;
+				$permissions[$class.'_'.$name] = $class.'_'.$name;
 			}
 		}
 		return $permissions;

code/MultiClassSelector.php

Indentation +30 added lines, -30 removed lines

@@ -1,46 +1,46 @@
 <?php
 
 class MultiClassSelector extends GridFieldAddNewMultiClass {
-	private static $allowed_actions = array(
-		'handleAdd'
-	);
+    private static $allowed_actions = array(
+        'handleAdd'
+    );
 
-	// Should we add an empty string to the add class dropdown?
-	private static $showEmptyString = true;
+    // Should we add an empty string to the add class dropdown?
+    private static $showEmptyString = true;
 
-	private $fragment;
+    private $fragment;
 
-	private $title;
+    private $title;
 
-	private $classes;
+    private $classes;
 
-	private $defaultClass;
+    private $defaultClass;
 
 
-	public function getHTMLFragments($grid) {
-		$classes = $this->getClasses($grid);
+    public function getHTMLFragments($grid) {
+        $classes = $this->getClasses($grid);
 
-		if(!count($classes)) {
-			return array();
-		}
+        if(!count($classes)) {
+            return array();
+        }
 
-		GridFieldExtensions::include_requirements();
+        GridFieldExtensions::include_requirements();
 
-		$field = new DropdownField(sprintf('%s[ClassName]', __CLASS__), '', $classes, $this->defaultClass);
-		$field->setAttribute('id', uniqid());
-		if (Config::inst()->get('GridFieldAddNewMultiClass', 'showEmptyString')) {
-			$field->setEmptyString(_t('GridFieldExtensions.SELECTTYPETOCREATE', '(Select type to create)'));
-		}
-		$field->addExtraClass('no-change-track');
+        $field = new DropdownField(sprintf('%s[ClassName]', __CLASS__), '', $classes, $this->defaultClass);
+        $field->setAttribute('id', uniqid());
+        if (Config::inst()->get('GridFieldAddNewMultiClass', 'showEmptyString')) {
+            $field->setEmptyString(_t('GridFieldExtensions.SELECTTYPETOCREATE', '(Select type to create)'));
+        }
+        $field->addExtraClass('no-change-track');
 
-		$data = new ArrayData(array(
-			'Title'      => $this->getTitle(),
-			'Link'       => Controller::join_links($grid->Link(), 'add-multi-class', '{class}'),
-			'ClassField' => $field
-		));
+        $data = new ArrayData(array(
+            'Title'      => $this->getTitle(),
+            'Link'       => Controller::join_links($grid->Link(), 'add-multi-class', '{class}'),
+            'ClassField' => $field
+        ));
 
-		return array(
-			$this->getFragment() => $data->renderWith('GridFieldAddNewMultiClass')
-		);
-	}
+        return array(
+            $this->getFragment() => $data->renderWith('GridFieldAddNewMultiClass')
+        );
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	public function getHTMLFragments($grid) {
 		$classes = $this->getClasses($grid);
 
-		if(!count($classes)) {
+		if (!count($classes)) {
 			return array();
 		}
 

code/Extensions/PrintBlocks.php

Indentation +20 added lines, -20 removed lines

@@ -1,27 +1,27 @@
 <?php
 class PrintBlocks extends Extension {
 	
-	public function getAllBlocks() {
-		$blocks = new ArrayList();
-		$blocks->merge($this->getMyBlocks());
-		$blocks->merge($this->getDockedBlocks());
-		return $blocks;
-	}
+    public function getAllBlocks() {
+        $blocks = new ArrayList();
+        $blocks->merge($this->getMyBlocks());
+        $blocks->merge($this->getDockedBlocks());
+        return $blocks;
+    }
 		
-	public function getMyBlocks() {
-		return $this->owner->Blocks()->sort(array('SortOrder' => 'ASC', 'ID' => 'ASC'));
-	}
+    public function getMyBlocks() {
+        return $this->owner->Blocks()->sort(array('SortOrder' => 'ASC', 'ID' => 'ASC'));
+    }
 	
-	public function getDockedBlocks() {
-		$blocks = Block::get()->filter('showBlockbyClass', true);
-		$blocks_map = $blocks->map('ID', 'shownInClass');
-		foreach ($blocks_map as $blockID => $Classes) {
-			$Classes = explode(',', $Classes);
-			if (!in_array($this->owner->ClassName, $Classes)) {
-				$blocks = $blocks->exclude('ID', $blockID);
-			}
-		}
+    public function getDockedBlocks() {
+        $blocks = Block::get()->filter('showBlockbyClass', true);
+        $blocks_map = $blocks->map('ID', 'shownInClass');
+        foreach ($blocks_map as $blockID => $Classes) {
+            $Classes = explode(',', $Classes);
+            if (!in_array($this->owner->ClassName, $Classes)) {
+                $blocks = $blocks->exclude('ID', $blockID);
+            }
+        }
 		
-		return $blocks->sort('SortOrder', 'ASC');
-	}
+        return $blocks->sort('SortOrder', 'ASC');
+    }
 }
\ No newline at end of file

code/BlocksAdmin.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
 		$subBlocks = ClassInfo::subclassesFor('Block');
 		if (is_null($subBlocks)) {
 			$subBlocks = array('Block');
-		}else{
-			$disabledTypes = Config::inst()->get('Block','DisabledBlocks');
+		} else {
+			$disabledTypes = Config::inst()->get('Block', 'DisabledBlocks');
 			Debugger::inspect($disabledTypes);
 			if (!empty($disabledTypes)) {
 				foreach ($disabledTypes as $disabledType) {

Braces +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 		$subBlocks = ClassInfo::subclassesFor('Block');
 		if (is_null($subBlocks)) {
 			$subBlocks = array('Block');
-		}else{
+		} else{
 			$disabledTypes = Config::inst()->get('Block','DisabledBlocks');
 			Debugger::inspect($disabledTypes);
 			if (!empty($disabledTypes)) {

Indentation +40 added lines, -40 removed lines

@@ -5,51 +5,51 @@
  * Left-hand-side tab : Admin Blocks
  * */
 class BlocksAdmin extends ModelAdmin {
-	private static $managed_models = array('Block');
-	private static $url_segment = 'blocks';
-	private static $menu_title = 'Blocks';
-	private static $menu_priority = 10;
-	private static $menu_icon = 'silverstripe-block/images/icon-block.png';
+    private static $managed_models = array('Block');
+    private static $url_segment = 'blocks';
+    private static $menu_title = 'Blocks';
+    private static $menu_priority = 10;
+    private static $menu_icon = 'silverstripe-block/images/icon-block.png';
 		
-	public function getEditForm($id = null, $fields = null) {
-		$form = parent::getEditForm($id, $fields);
+    public function getEditForm($id = null, $fields = null) {
+        $form = parent::getEditForm($id, $fields);
 		
-		$grid = $form->Fields()->fieldByName($this->sanitiseClassName($this->modelClass));
+        $grid = $form->Fields()->fieldByName($this->sanitiseClassName($this->modelClass));
 		
 		
-		$grid->getConfig()
-			->removeComponentsByType('GridFieldPaginator')
-			->removeComponentsByType('GridFieldAddNewButton')
-			->removeComponentsByType('GridFieldPrintButton')
-			->removeComponentsByType('GridFieldExportButton')
-			->addComponents(
-				new GridFieldPaginatorWithShowAll(30),
-				$multiClass = new MultiClassSelector(),
-				$sortable = new GridFieldOrderableRows('SortOrder')
-			);
+        $grid->getConfig()
+            ->removeComponentsByType('GridFieldPaginator')
+            ->removeComponentsByType('GridFieldAddNewButton')
+            ->removeComponentsByType('GridFieldPrintButton')
+            ->removeComponentsByType('GridFieldExportButton')
+            ->addComponents(
+                new GridFieldPaginatorWithShowAll(30),
+                $multiClass = new MultiClassSelector(),
+                $sortable = new GridFieldOrderableRows('SortOrder')
+            );
 			
-		$subBlocks = self::getAvaiableTypes();
-		$multiClass->setClasses($subBlocks);
-		$grid->setTitle('All Blcoks');
-		return $form;
-	}
+        $subBlocks = self::getAvaiableTypes();
+        $multiClass->setClasses($subBlocks);
+        $grid->setTitle('All Blcoks');
+        return $form;
+    }
 	
-	public static function getAvaiableTypes() {
-		$subBlocks = ClassInfo::subclassesFor('Block');
-		if (is_null($subBlocks)) {
-			$subBlocks = array('Block');
-		}else{
-			$disabledTypes = Config::inst()->get('Block','DisabledBlocks');
-			if (!empty($disabledTypes)) {
-				foreach ($disabledTypes as $disabledType) {
-					unset($subBlocks[$disabledType]);
-				}
-			}
-			foreach ($subBlocks as $key => &$value) {
-				$value = empty($key::$singular_name) ? ucwords(trim(strtolower(preg_replace('/_?([A-Z])/', ' $1', $value)))) : $key::$singular_name;
-			}
-		}
+    public static function getAvaiableTypes() {
+        $subBlocks = ClassInfo::subclassesFor('Block');
+        if (is_null($subBlocks)) {
+            $subBlocks = array('Block');
+        }else{
+            $disabledTypes = Config::inst()->get('Block','DisabledBlocks');
+            if (!empty($disabledTypes)) {
+                foreach ($disabledTypes as $disabledType) {
+                    unset($subBlocks[$disabledType]);
+                }
+            }
+            foreach ($subBlocks as $key => &$value) {
+                $value = empty($key::$singular_name) ? ucwords(trim(strtolower(preg_replace('/_?([A-Z])/', ' $1', $value)))) : $key::$singular_name;
+            }
+        }
 		
-		return $subBlocks;
-	}
+        return $subBlocks;
+    }
 }