salted-herring / silverstripe-block

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

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

code/Admin/VersionedForm.php

Unused Use Statements -2 removed lines

@@ -1,7 +1,5 @@
 <?php
 
-use SaltedHerring\Debugger as Debugger;
-
 class VersionedForm extends GridFieldDetailForm {
 	
 }

Indentation +39 added lines, -39 removed lines

@@ -7,47 +7,47 @@
 }
 
 class VersionedForm_ItemRequest extends GridFieldDetailForm_ItemRequest {
-	private static $allowed_actions = array(
-		'edit',
-		'view',
-		'ItemEditForm',
-		'doPublish',
-		'doUnpublish'
-	);
+    private static $allowed_actions = array(
+        'edit',
+        'view',
+        'ItemEditForm',
+        'doPublish',
+        'doUnpublish'
+    );
 		
-	public function ItemEditForm() {
-		$form = parent::ItemEditForm();
-		if ($form instanceof Form) {
-			$actions = $form->Actions();
-			$record = $this->record;
-			$actions->insertBefore('action_doDelete', $btnPublish = FormAction::create('doPublish','Save & Publish'));
-			$btnPublish->addExtraClass('ss-ui-action-constructive');
-			if (!empty($record->ID)) {
-				if ($record->isPublished()) {
-					$actions->removeByName('action_doDelete');
-					$actions->push(FormAction::create('doUnpublish', 'Unpublish')->addExtraClass('ss-ui-action-destructive'));
-				}
-			}
+    public function ItemEditForm() {
+        $form = parent::ItemEditForm();
+        if ($form instanceof Form) {
+            $actions = $form->Actions();
+            $record = $this->record;
+            $actions->insertBefore('action_doDelete', $btnPublish = FormAction::create('doPublish','Save & Publish'));
+            $btnPublish->addExtraClass('ss-ui-action-constructive');
+            if (!empty($record->ID)) {
+                if ($record->isPublished()) {
+                    $actions->removeByName('action_doDelete');
+                    $actions->push(FormAction::create('doUnpublish', 'Unpublish')->addExtraClass('ss-ui-action-destructive'));
+                }
+            }
 			
-			$form->setActions($actions);
-		}
-		return $form;
-	}
+            $form->setActions($actions);
+        }
+        return $form;
+    }
 	
-	public function doUnpublish($data, $form) {
-		$this->record->deleteFromStage('Live');
-		$controller = Controller::curr();
-		$form->sessionMessage('Block unpublished', 'good', false);
-		return $this->edit($controller->getRequest());
-	}
+    public function doUnpublish($data, $form) {
+        $this->record->deleteFromStage('Live');
+        $controller = Controller::curr();
+        $form->sessionMessage('Block unpublished', 'good', false);
+        return $this->edit($controller->getRequest());
+    }
 	
-	public function doPublish($data, $form) {
-		$form->saveInto($this->record);
-		$this->record->write();
-		$this->record->byPass = true;
-		$this->record->doPublish();
-		$form->sessionMessage('Block published', 'good', false);
-		$controller = Controller::curr();
-		return $this->edit($controller->getRequest());
-	}
+    public function doPublish($data, $form) {
+        $form->saveInto($this->record);
+        $this->record->write();
+        $this->record->byPass = true;
+        $this->record->doPublish();
+        $form->sessionMessage('Block published', 'good', false);
+        $controller = Controller::curr();
+        return $this->edit($controller->getRequest());
+    }
 }
\ No newline at end of file

code/BlocksAdmin.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php use SaltedHerring\Debugger as Debugger;
+<?php 
 /**
  * @file BlocksAdmin.php
  *

Indentation +45 added lines, -45 removed lines

@@ -5,60 +5,60 @@
  * 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')
-			->removeComponentsByType('GridFieldDetailForm')
-			->addComponents(
-				new VersionedForm(),
-				new GridFieldPaginatorWithShowAll(30),
-				$multiClass = new MultiClassSelector(),
-				$sortable = new GridFieldOrderableRows('SortOrder')
-			);
+        $grid->getConfig()
+            ->removeComponentsByType('GridFieldPaginator')
+            ->removeComponentsByType('GridFieldAddNewButton')
+            ->removeComponentsByType('GridFieldPrintButton')
+            ->removeComponentsByType('GridFieldExportButton')
+            ->removeComponentsByType('GridFieldDetailForm')
+            ->addComponents(
+                new VersionedForm(),
+                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 function getList() {
-		$list = Versioned::get_by_stage('Block', 'Stage');
+    public function getList() {
+        $list = Versioned::get_by_stage('Block', 'Stage');
 		
-		return $list;
+        return $list;
     }
 	
-	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;
+    }
 	
 	
 }

code/Extensions/PrintBlocks.php

Indentation +33 added lines, -33 removed lines

@@ -1,41 +1,41 @@
 <?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() {
-		$blocks = $this->owner->Blocks()->sort(array('SortOrder' => 'ASC', 'ID' => 'DESC'));
-		$published_blocks = new ArrayList();
-		foreach ($blocks as $block) {
-			if ($block->isPublished()) {
-				$published_blocks->push($block);
-			}
-		}
+    public function getMyBlocks() {
+        $blocks = $this->owner->Blocks()->sort(array('SortOrder' => 'ASC', 'ID' => 'DESC'));
+        $published_blocks = new ArrayList();
+        foreach ($blocks as $block) {
+            if ($block->isPublished()) {
+                $published_blocks->push($block);
+            }
+        }
 		
-		return $published_blocks;
-	}
+        return $published_blocks;
+    }
 	
-	public function getDockedBlocks() {
-		$blocks = Block::get()->filter(array('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);
-			}
-		}
-		$published_blocks = new ArrayList();
-		foreach ($blocks as $block) {
-			if ($block->isPublished()) {
-				$published_blocks->push($block);
-			}
-		}
+    public function getDockedBlocks() {
+        $blocks = Block::get()->filter(array('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);
+            }
+        }
+        $published_blocks = new ArrayList();
+        foreach ($blocks as $block) {
+            if ($block->isPublished()) {
+                $published_blocks->push($block);
+            }
+        }
 		
-		return $published_blocks->sort('SortOrder', 'ASC');
-	}
+        return $published_blocks->sort('SortOrder', 'ASC');
+    }
 }
\ No newline at end of file

code/OrderableBlocks.php

Indentation +23 added lines, -23 removed lines

@@ -1,29 +1,29 @@
 <?php
 
 class OrderableBlocks extends GridFieldOrderableRows {
-	protected function reorderItems($list, array $values, array $order) {
-		$pool = array_values($values);
-		sort($pool);
+    protected function reorderItems($list, array $values, array $order) {
+        $pool = array_values($values);
+        sort($pool);
 
-		foreach(array_values($order) as $pos => $id) {
-			if($values[$id] != $pool[$pos]) {
-				DB::query(sprintf(
-					'UPDATE "%s" SET "%s" = %d WHERE %s',
-					$this->getSortTable($list),
-					$this->getSortField(),
-					$pool[$pos],
-					$this->getSortTableClauseForIds($list, $id)
-				));
-				DB::query(sprintf(
-					'UPDATE "%s_Live" SET "%s" = %d WHERE %s',
-					$this->getSortTable($list),
-					$this->getSortField(),
-					$pool[$pos],
-					$this->getSortTableClauseForIds($list, $id)
-				));
-			}
-		}
+        foreach(array_values($order) as $pos => $id) {
+            if($values[$id] != $pool[$pos]) {
+                DB::query(sprintf(
+                    'UPDATE "%s" SET "%s" = %d WHERE %s',
+                    $this->getSortTable($list),
+                    $this->getSortField(),
+                    $pool[$pos],
+                    $this->getSortTableClauseForIds($list, $id)
+                ));
+                DB::query(sprintf(
+                    'UPDATE "%s_Live" SET "%s" = %d WHERE %s',
+                    $this->getSortTable($list),
+                    $this->getSortField(),
+                    $pool[$pos],
+                    $this->getSortTableClauseForIds($list, $id)
+                ));
+            }
+        }
 
-		$this->extend('onAfterReorderItems', $list);
-	}
+        $this->extend('onAfterReorderItems', $list);
+    }
 }
\ No newline at end of file

code/Extensions/BlockinPage.php

Indentation +49 added lines, -49 removed lines

@@ -1,62 +1,62 @@
 <?php
 
 class BlockinPage extends Extension {
-	private static $belongs_many_many = array (
-		'Blocks'			=>	'Block'
-	);
+    private 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
-			->removeComponentsByType('GridFieldPaginator')
-			->removeComponentsByType('GridFieldDetailForm')
-			->addComponents(
-				new VersionedForm(),
-				new GridFieldPaginatorWithShowAll(30),
-				$multiClass = new MultiClassSelector(),
-				$sortable = new OrderableBlocks('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
+            ->removeComponentsByType('GridFieldPaginator')
+            ->removeComponentsByType('GridFieldDetailForm')
+            ->addComponents(
+                new VersionedForm(),
+                new GridFieldPaginatorWithShowAll(30),
+                $multiClass = new MultiClassSelector(),
+                $sortable = new OrderableBlocks('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/ExtendedBlocks/DualColumnBlock.php

Indentation +5 added lines, -5 removed lines

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

code/ExtendedBlocks/SingleColumnBlock.php

Indentation +4 added lines, -4 removed lines

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