Inspection of "users may now again to add 'margin-top' and 'margi..." - salted-herring/silverstripe-block - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( dda370...269587 )

by Leo

created 2016-06-28 09:36 UTC

Status

Braces +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -41,7 +41,7 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 		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>';
 			}
 		}

Please login to merge, or discard this patch.

Indentation +182 added lines, -182 removed lines patch added patch discarded remove patch

@@ -1,204 +1,204 @@
 block discarded – undo
 <?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 $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

Please login to merge, or discard this patch.

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 		'addMarginBottom'	=>	'Boolean'
 	);
 	
-	protected static $many_many = array (
+	protected static $many_many = array(
 		'Pages'				=>	'Page'
 	);
 		
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 		'MySQLDatabase'		=> 'ENGINE=MyISAM'
     );
 	
-	protected static $extensions = array (
+	protected static $extensions = array(
 		'StandardPermissions'
 	);
 	
@@ -42,12 +42,12 @@  discard block
 block discarded – undo
 	
 	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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 		$pageSelector = new CheckboxSetField(
 			$name = "Pages",
 			$title = "Show on Page(s)",
-			$availablePages->map('ID','Title')
+			$availablePages->map('ID', 'Title')
 		);
 		
 		

Please login to merge, or discard this patch.

		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	public function VisibleTo() {
42	42	if (strlen(trim($this->MemberVisibility)) > 0) {
43	43	$lists = 'Group: ' . str_replace(',','<br />Group: ', $this->MemberVisibility);
44		- }else{
	44	+ } else{
45	45	$lists = '<em><All></em>';
46	46	}
47	47
		@@ -56,13 +56,13 @@ discard block
		block discarded – undo
56	56	if ($this->showBlockbyClass) {
57	57	if (strlen(trim($this->shownInClass)) > 0) {
58	58	$lists = 'Type: ' . str_replace(',','<br />Type: ', $this->shownInClass);
59		- }else{
	59	+ } else{
60	60	$lists = '<em><not assigned></em>';
61	61	}
62		- }else{
	62	+ } else{
63	63	if ($this->Pages()->count() > 0) {
64	64	$lists = 'Page: ' . implode('<br />Page: ', $this->Pages()->column('Title'));
65		- }else{
	65	+ } else{
66	66	$lists = '<em><not assigned></em>';
67	67	}
68	68	}

		@@ -1,204 +1,204 @@
		block discarded – undo
1	1	<?php
2	2
3	3	class Block extends DataObject {
4		- protected static $db = array (
5		- 'SortOrder' => 'Int',
6		- 'Title' => 'Varchar(64)',
7		- 'TitleWrapper' => 'Enum("h2,h3,h4,h5,h6")',
8		- 'hideTitle' => 'Boolean',
9		- 'showBlockbyClass' => 'Boolean',
10		- 'Description' => 'Varchar(128)',
11		- 'MemberVisibility' => 'Varchar(255)',
12		- 'shownInClass' => 'Text',
13		- 'addMarginTop' => 'Boolean',
14		- 'addMarginBottom' => 'Boolean'
15		- );
	4	+ protected static $db = array (
	5	+ 'SortOrder' => 'Int',
	6	+ 'Title' => 'Varchar(64)',
	7	+ 'TitleWrapper' => 'Enum("h2,h3,h4,h5,h6")',
	8	+ 'hideTitle' => 'Boolean',
	9	+ 'showBlockbyClass' => 'Boolean',
	10	+ 'Description' => 'Varchar(128)',
	11	+ 'MemberVisibility' => 'Varchar(255)',
	12	+ 'shownInClass' => 'Text',
	13	+ 'addMarginTop' => 'Boolean',
	14	+ 'addMarginBottom' => 'Boolean'
	15	+ );
16	16
17		- protected static $many_many = array (
18		- 'Pages' => 'Page'
19		- );
	17	+ protected static $many_many = array (
	18	+ 'Pages' => 'Page'
	19	+ );
20	20
21		- protected static $create_table_options = array(
22		- 'MySQLDatabase' => 'ENGINE=MyISAM'
	21	+ protected static $create_table_options = array(
	22	+ 'MySQLDatabase' => 'ENGINE=MyISAM'
23	23	);
24	24
25		- protected static $extensions = array (
26		- 'StandardPermissions'
27		- );
	25	+ protected static $extensions = array (
	26	+ 'StandardPermissions'
	27	+ );
28	28
29		- protected static $summary_fields = array(
30		- 'BlockType',
31		- 'Title',
32		- 'Description',
33		- 'shownOn',
34		- 'VisibleTo'
35		- );
	29	+ protected static $summary_fields = array(
	30	+ 'BlockType',
	31	+ 'Title',
	32	+ 'Description',
	33	+ 'shownOn',
	34	+ 'VisibleTo'
	35	+ );
36	36
37		- protected static $field_labels = array(
38		- 'BlockType' => 'Block type',
39		- 'shownOn' => 'is shown on',
40		- 'VisibleTo' => 'Visible to'
41		- );
	37	+ protected static $field_labels = array(
	38	+ 'BlockType' => 'Block type',
	39	+ 'shownOn' => 'is shown on',
	40	+ 'VisibleTo' => 'Visible to'
	41	+ );
42	42
43		- public function VisibleTo() {
44		- if (strlen(trim($this->MemberVisibility)) > 0) {
45		- $lists = 'Group: ' . str_replace(',','<br />Group: ', $this->MemberVisibility);
46		- }else{
47		- $lists = '<em><All></em>';
48		- }
49		-
50		- return new LiteralField('VisibleTo',$lists);
51		- }
	43	+ public function VisibleTo() {
	44	+ if (strlen(trim($this->MemberVisibility)) > 0) {
	45	+ $lists = 'Group: ' . str_replace(',','<br />Group: ', $this->MemberVisibility);
	46	+ }else{
	47	+ $lists = '<em><All></em>';
	48	+ }
	49	+
	50	+ return new LiteralField('VisibleTo',$lists);
	51	+ }
52	52
53		- public function BlockType() {
54		- return $this->singular_name();
55		- }
	53	+ public function BlockType() {
	54	+ return $this->singular_name();
	55	+ }
56	56
57		- public function shownOn() {
58		- if ($this->showBlockbyClass) {
59		- if (strlen(trim($this->shownInClass)) > 0) {
60		- $lists = 'Type: ' . str_replace(',','<br />Type: ', $this->shownInClass);
61		- }else{
62		- $lists = '<em><not assigned></em>';
63		- }
64		- }else{
65		- if ($this->Pages()->count() > 0) {
66		- $lists = 'Page: ' . implode('<br />Page: ', $this->Pages()->column('Title'));
67		- }else{
68		- $lists = '<em><not assigned></em>';
69		- }
70		- }
71		- return new LiteralField('shownOn',$lists);
72		- }
	57	+ public function shownOn() {
	58	+ if ($this->showBlockbyClass) {
	59	+ if (strlen(trim($this->shownInClass)) > 0) {
	60	+ $lists = 'Type: ' . str_replace(',','<br />Type: ', $this->shownInClass);
	61	+ }else{
	62	+ $lists = '<em><not assigned></em>';
	63	+ }
	64	+ }else{
	65	+ if ($this->Pages()->count() > 0) {
	66	+ $lists = 'Page: ' . implode('<br />Page: ', $this->Pages()->column('Title'));
	67	+ }else{
	68	+ $lists = '<em><not assigned></em>';
	69	+ }
	70	+ }
	71	+ return new LiteralField('shownOn',$lists);
	72	+ }
73	73
74		- public function getCMSFields() {
75		- $fields = parent::getCMSFields();
76		- $fields->removeFieldFromTab('Root', 'Pages');
77		- $fields->removeFieldsFromTab('Root.Main', array(
78		- 'SortOrder',
79		- 'showBlockbyClass',
80		- 'shownInClass',
81		- 'MemberVisibility'
82		- ));
83		-
84		- $memberGroups = Group::get();
85		- $sourcemap = $memberGroups->map('Code', 'Title');
86		- $source = array(
87		- 'anonymous' => 'Anonymous visitors'
88		- );
89		- foreach ($sourcemap as $mapping => $key) {
90		- $source[$mapping] = $key;
91		- }
92		-
93		- $memberVisibility = new CheckboxSetField(
94		- $name = "MemberVisibility",
95		- $title = "Show block for specific groups",
96		- $source
97		- );
98		-
99		- $memberVisibility->setDescription('Show this block only for the selected group(s). If you select no groups, the block will be visible to all members.');
100		-
101		- $availabelClasses = $this->availableClasses();
102		- $inClass = new CheckboxSetField(
103		- $name = "shownInClass",
104		- $title = "Show block for specific content types",
105		- $availabelClasses
106		- );
107		-
108		- $filterSelector = OptionsetField::create(
109		- 'showBlockbyClass',
110		- 'Choose filter set',
111		- array(
112		- '0' => 'by page',
113		- '1' => 'by page/data type'
114		- )
115		- )->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>');
116		-
117		- $availablePages = Page::get()->exclude('ClassName', array(
118		- 'ErrorPage',
119		- 'RedirectorPage',
120		- 'VirtualPage'
121		- ));
122		- $pageSelector = new CheckboxSetField(
123		- $name = "Pages",
124		- $title = "Show on Page(s)",
125		- $availablePages->map('ID','Title')
126		- );
127		-
128		-
129		- if ($this->canConfigPageAndType(Member::currentUser())) {
130		- $fields->addFieldsToTab('Root.VisibilitySettings', array(
131		- $filterSelector,
132		- $pageSelector,
133		- $inClass
134		- ));
135		- }
136		-
137		- if ($this->canConfigMemberVisibility(Member::currentUser())) {
138		- $fields->addFieldToTab('Root.VisibilitySettings', $memberVisibility);
139		- }
140		-
141		- if (!$fields->fieldByName('Options')) {
142		- $fields->insertBefore($right = RightSidebar::create('Options'), 'Root');
143		- }
	74	+ public function getCMSFields() {
	75	+ $fields = parent::getCMSFields();
	76	+ $fields->removeFieldFromTab('Root', 'Pages');
	77	+ $fields->removeFieldsFromTab('Root.Main', array(
	78	+ 'SortOrder',
	79	+ 'showBlockbyClass',
	80	+ 'shownInClass',
	81	+ 'MemberVisibility'
	82	+ ));
	83	+
	84	+ $memberGroups = Group::get();
	85	+ $sourcemap = $memberGroups->map('Code', 'Title');
	86	+ $source = array(
	87	+ 'anonymous' => 'Anonymous visitors'
	88	+ );
	89	+ foreach ($sourcemap as $mapping => $key) {
	90	+ $source[$mapping] = $key;
	91	+ }
	92	+
	93	+ $memberVisibility = new CheckboxSetField(
	94	+ $name = "MemberVisibility",
	95	+ $title = "Show block for specific groups",
	96	+ $source
	97	+ );
	98	+
	99	+ $memberVisibility->setDescription('Show this block only for the selected group(s). If you select no groups, the block will be visible to all members.');
	100	+
	101	+ $availabelClasses = $this->availableClasses();
	102	+ $inClass = new CheckboxSetField(
	103	+ $name = "shownInClass",
	104	+ $title = "Show block for specific content types",
	105	+ $availabelClasses
	106	+ );
	107	+
	108	+ $filterSelector = OptionsetField::create(
	109	+ 'showBlockbyClass',
	110	+ 'Choose filter set',
	111	+ array(
	112	+ '0' => 'by page',
	113	+ '1' => 'by page/data type'
	114	+ )
	115	+ )->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>');
	116	+
	117	+ $availablePages = Page::get()->exclude('ClassName', array(
	118	+ 'ErrorPage',
	119	+ 'RedirectorPage',
	120	+ 'VirtualPage'
	121	+ ));
	122	+ $pageSelector = new CheckboxSetField(
	123	+ $name = "Pages",
	124	+ $title = "Show on Page(s)",
	125	+ $availablePages->map('ID','Title')
	126	+ );
	127	+
	128	+
	129	+ if ($this->canConfigPageAndType(Member::currentUser())) {
	130	+ $fields->addFieldsToTab('Root.VisibilitySettings', array(
	131	+ $filterSelector,
	132	+ $pageSelector,
	133	+ $inClass
	134	+ ));
	135	+ }
	136	+
	137	+ if ($this->canConfigMemberVisibility(Member::currentUser())) {
	138	+ $fields->addFieldToTab('Root.VisibilitySettings', $memberVisibility);
	139	+ }
	140	+
	141	+ if (!$fields->fieldByName('Options')) {
	142	+ $fields->insertBefore($right = RightSidebar::create('Options'), 'Root');
	143	+ }
144	144
145		- $fields->addFieldsToTab('Options', array(
146		- CheckboxField::create('addMarginTop', 'add "margin-top" class to block wrapper'),
147		- CheckboxField::create('addMarginBottom', 'add "margin-bottom" class to block wrapper')
148		- ));
	145	+ $fields->addFieldsToTab('Options', array(
	146	+ CheckboxField::create('addMarginTop', 'add "margin-top" class to block wrapper'),
	147	+ CheckboxField::create('addMarginBottom', 'add "margin-bottom" class to block wrapper')
	148	+ ));
149	149
150		- return $fields;
151		- }
	150	+ return $fields;
	151	+ }
152	152
153		- public function availableClasses() {
154		- $Classes = array_diff(
155		- ClassInfo::subclassesFor('Page'),
156		- ClassInfo::subclassesFor('RedirectorPage'),
157		- ClassInfo::subclassesFor('VirtualPage')
158		- );
159		- return $Classes;
160		- }
	153	+ public function availableClasses() {
	154	+ $Classes = array_diff(
	155	+ ClassInfo::subclassesFor('Page'),
	156	+ ClassInfo::subclassesFor('RedirectorPage'),
	157	+ ClassInfo::subclassesFor('VirtualPage')
	158	+ );
	159	+ return $Classes;
	160	+ }
161	161
162		- public function forTemplate() {
163		- if ($this->canDisplayMemberCheck()) {
164		- return $this->renderWith(array($this->getClassName(), 'BaseBlock'));
165		- }
	162	+ public function forTemplate() {
	163	+ if ($this->canDisplayMemberCheck()) {
	164	+ return $this->renderWith(array($this->getClassName(), 'BaseBlock'));
	165	+ }
166	166
167		- return false;
168		- }
	167	+ return false;
	168	+ }
169	169
170		- public function canDisplayMemberCheck() {
171		- $rawVisibility = $this->MemberVisibility;
172		-
173		- if (empty($rawVisibility)) {
174		- return true;
175		- }
176		-
177		- $visibility = explode(',', $rawVisibility);
178		- $member = Member::currentUser();
179		-
180		- if (!$member && in_array('anonymous', $visibility)) {
181		- return true;
182		- }
183		-
184		- if ($member) {
185		- $memberGroups = $member->Groups()->column('Code');
186		- foreach ($memberGroups as $memberGroup) {
187		- if (in_array($memberGroup, $visibility)) {
188		- return true;
189		- }
190		- }
191		- }
192		-
193		- return false;
194		- }
	170	+ public function canDisplayMemberCheck() {
	171	+ $rawVisibility = $this->MemberVisibility;
	172	+
	173	+ if (empty($rawVisibility)) {
	174	+ return true;
	175	+ }
	176	+
	177	+ $visibility = explode(',', $rawVisibility);
	178	+ $member = Member::currentUser();
	179	+
	180	+ if (!$member && in_array('anonymous', $visibility)) {
	181	+ return true;
	182	+ }
	183	+
	184	+ if ($member) {
	185	+ $memberGroups = $member->Groups()->column('Code');
	186	+ foreach ($memberGroups as $memberGroup) {
	187	+ if (in_array($memberGroup, $visibility)) {
	188	+ return true;
	189	+ }
	190	+ }
	191	+ }
	192	+
	193	+ return false;
	194	+ }
195	195
196		- public function frontendEditable() {
197		- $member = Member::currentUser();
198		- return $this->canEdit($member);
199		- }
	196	+ public function frontendEditable() {
	197	+ $member = Member::currentUser();
	198	+ return $this->canEdit($member);
	199	+ }
200	200
201		- public function Type2Class() {
202		- return strtolower(str_replace(' ', '-', $this->singular_name()));
203		- }
	201	+ public function Type2Class() {
	202	+ return strtolower(str_replace(' ', '-', $this->singular_name()));
	203	+ }
204	204	}
205	205	\ No newline at end of file

		@@ -1,7 +1,7 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3	3	class Block extends DataObject {
4		- protected static $db = array (
	4	+ protected static $db = array(
5	5	'SortOrder' => 'Int',
6	6	'Title' => 'Varchar(64)',
7	7	'TitleWrapper' => 'Enum("h2,h3,h4,h5,h6")',
		@@ -14,7 +14,7 @@ discard block
		block discarded – undo
14	14	'addMarginBottom' => 'Boolean'
15	15	);
16	16
17		- protected static $many_many = array (
	17	+ protected static $many_many = array(
18	18	'Pages' => 'Page'
19	19	);
20	20
		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	'MySQLDatabase' => 'ENGINE=MyISAM'
23	23	);
24	24
25		- protected static $extensions = array (
	25	+ protected static $extensions = array(
26	26	'StandardPermissions'
27	27	);
28	28
		@@ -42,12 +42,12 @@ discard block
		block discarded – undo
42	42
43	43	public function VisibleTo() {
44	44	if (strlen(trim($this->MemberVisibility)) > 0) {
45		- $lists = 'Group: ' . str_replace(',','<br />Group: ', $this->MemberVisibility);
46		- }else{
	45	+ $lists = 'Group: '.str_replace(',', '<br />Group: ', $this->MemberVisibility);
	46	+ } else {
47	47	$lists = '<em><All></em>';
48	48	}
49	49
50		- return new LiteralField('VisibleTo',$lists);
	50	+ return new LiteralField('VisibleTo', $lists);
51	51	}
52	52
53	53	public function BlockType() {
		@@ -57,18 +57,18 @@ discard block
		block discarded – undo
57	57	public function shownOn() {
58	58	if ($this->showBlockbyClass) {
59	59	if (strlen(trim($this->shownInClass)) > 0) {
60		- $lists = 'Type: ' . str_replace(',','<br />Type: ', $this->shownInClass);
61		- }else{
	60	+ $lists = 'Type: '.str_replace(',', '<br />Type: ', $this->shownInClass);
	61	+ } else {
62	62	$lists = '<em><not assigned></em>';
63	63	}
64		- }else{
	64	+ } else {
65	65	if ($this->Pages()->count() > 0) {
66		- $lists = 'Page: ' . implode('<br />Page: ', $this->Pages()->column('Title'));
67		- }else{
	66	+ $lists = 'Page: '.implode('<br />Page: ', $this->Pages()->column('Title'));
	67	+ } else {
68	68	$lists = '<em><not assigned></em>';
69	69	}
70	70	}
71		- return new LiteralField('shownOn',$lists);
	71	+ return new LiteralField('shownOn', $lists);
72	72	}
73	73
74	74	public function getCMSFields() {
		@@ -122,7 +122,7 @@ discard block
		block discarded – undo
122	122	$pageSelector = new CheckboxSetField(
123	123	$name = "Pages",
124	124	$title = "Show on Page(s)",
125		- $availablePages->map('ID','Title')
	125	+ $availablePages->map('ID', 'Title')
126	126	);
127	127
128	128

salted-herring / silverstripe-block

Push — master ( dda370...269587 )

Status

Category

Braces +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +182 added lines, -182 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch