salted-herring / silverstripe-block

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>';
 			}
 		}

Indentation +191 added lines, -191 removed lines

@@ -1,214 +1,214 @@
 <?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',
-		'WrapperClasses'	=>	'Varchar(255)',
-		'HeadingClasses'	=>	'Varchar(255)',
-		'addMarginTop'		=>	'Boolean',
-		'addMarginBottom'	=>	'Boolean',
-		'addPaddingTop'		=>	'Boolean',
-		'addPaddingBottom'	=>	'Boolean',
-		'SectionWrapper'	=>	'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',
+        'WrapperClasses'	=>	'Varchar(255)',
+        'HeadingClasses'	=>	'Varchar(255)',
+        'addMarginTop'		=>	'Boolean',
+        'addMarginBottom'	=>	'Boolean',
+        'addPaddingTop'		=>	'Boolean',
+        'addPaddingBottom'	=>	'Boolean',
+        'SectionWrapper'	=>	'Boolean'
+    );
 	
-	protected static $many_many = array (
-		'Pages'				=>	'Page'
-	);
+    protected static $many_many = array (
+        'Pages'				=>	'Page'
+    );
 		
-	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);
-		}
+    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');
-		}
+        if (!$fields->fieldByName('Options')) {
+                $fields->insertBefore($right = RightSidebar::create('Options'), 'Root');
+        }
 
-		$fields->addFieldsToTab('Options', array(
-			TextField::create('WrapperClasses', 'Additional block wrapper Class'),
-			TextField::create('HeadingClasses', 'Additional block title Class'),
-			CheckboxField::create('addMarginTop','Add Margin to top'),
-			CheckboxField::create('addMarginBottom','Add Margin to bottom'),
-			CheckboxField::create('addPaddingTop','Add Padding to top'),
-			CheckboxField::create('addPaddingBottom','Add Padding to bottom'),
-			CheckboxField::create('SectionWrapper', 'Use &lt;section /&gt; as block wrapper')
-		));
+        $fields->addFieldsToTab('Options', array(
+            TextField::create('WrapperClasses', 'Additional block wrapper Class'),
+            TextField::create('HeadingClasses', 'Additional block title Class'),
+            CheckboxField::create('addMarginTop','Add Margin to top'),
+            CheckboxField::create('addMarginBottom','Add Margin to bottom'),
+            CheckboxField::create('addPaddingTop','Add Padding to top'),
+            CheckboxField::create('addPaddingBottom','Add Padding to bottom'),
+            CheckboxField::create('SectionWrapper', 'Use &lt;section /&gt; as block wrapper')
+        ));
 
-		return $fields;
-	}
+        return $fields;
+    }
 	
-	private function availableClasses() {
-		$Classes = array_diff(
-			ClassInfo::subclassesFor('Page'),
-			ClassInfo::subclassesFor('RedirectorPage'),
-			ClassInfo::subclassesFor('VirtualPage')
-		);
-		return $Classes;
-	}
+    private 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;
+    }
 	
-	private 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;
-	}
+    private 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

Spacing +17 added lines, -17 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")',
@@ -19,7 +19,7 @@ 
 		'SectionWrapper'	=>	'Boolean'
 	);
 	
-	protected static $many_many = array (
+	protected static $many_many = array(
 		'Pages'				=>	'Page'
 	);
 		
@@ -27,7 +27,7 @@ 
 		'MySQLDatabase'		=> 'ENGINE=MyISAM'
     );
 	
-	protected static $extensions = array (
+	protected static $extensions = array(
 		'StandardPermissions'
 	);
 	
@@ -47,12 +47,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() {
@@ -62,18 +62,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() {
@@ -127,7 +127,7 @@ 
 		$pageSelector = new CheckboxSetField(
 			$name = "Pages",
 			$title = "Show on Page(s)",
-			$availablePages->map('ID','Title')
+			$availablePages->map('ID', 'Title')
 		);
 		
 		
@@ -150,10 +150,10 @@ 
 		$fields->addFieldsToTab('Options', array(
 			TextField::create('WrapperClasses', 'Additional block wrapper Class'),
 			TextField::create('HeadingClasses', 'Additional block title Class'),
-			CheckboxField::create('addMarginTop','Add Margin to top'),
-			CheckboxField::create('addMarginBottom','Add Margin to bottom'),
-			CheckboxField::create('addPaddingTop','Add Padding to top'),
-			CheckboxField::create('addPaddingBottom','Add Padding to bottom'),
+			CheckboxField::create('addMarginTop', 'Add Margin to top'),
+			CheckboxField::create('addMarginBottom', 'Add Margin to bottom'),
+			CheckboxField::create('addPaddingTop', 'Add Padding to top'),
+			CheckboxField::create('addPaddingBottom', 'Add Padding to bottom'),
 			CheckboxField::create('SectionWrapper', 'Use &lt;section /&gt; as block wrapper')
 		));