dylangrech92 / seotoolbox

code/logic/GridFieldExportAllAutomatedLinksButton.php

Indentation +32 added lines, -32 removed lines

@@ -1,6 +1,6 @@ 
 <?php 
 if (!class_exists('GridFieldExportAllAutomatedLinksButton')) {
-	class GridFieldExportAllAutomatedLinksButton extends GridFieldExportButton {
+    class GridFieldExportAllAutomatedLinksButton extends GridFieldExportButton {
 /** 
 * Generate export fields for CSV. 
 * 
@@ -14,44 +14,44 @@ 
 * 
 */ 
 public function generateExportFileData($gridField) { 
-	$separator = $this->csvSeparator; 
-	$csvColumns =$gridField->getColumns();
-	$fileData = ''; 
-	$columnData = array(); 
-	$fieldItems = new ArrayList();
-	if($this->csvHasHeader) {
-		$headers = array();
+    $separator = $this->csvSeparator; 
+    $csvColumns =$gridField->getColumns();
+    $fileData = ''; 
+    $columnData = array(); 
+    $fieldItems = new ArrayList();
+    if($this->csvHasHeader) {
+        $headers = array();
 // determine the CSV headers. If a field is callable (e.g. anonymous function) then use the 
 // source name as the header instead 
-		foreach($csvColumns as $columnSource => $columnHeader) {
-			$headers[] = (!is_string($columnHeader) && is_callable($columnHeader)) ? $columnSource : $columnHeader; 
-		}
-		$fileData .= "\"" . implode("\"{$separator}\"", array_values($headers)) . "\""; 
-		$fileData .= "\n";
-	}
+        foreach($csvColumns as $columnSource => $columnHeader) {
+            $headers[] = (!is_string($columnHeader) && is_callable($columnHeader)) ? $columnSource : $columnHeader; 
+        }
+        $fileData .= "\"" . implode("\"{$separator}\"", array_values($headers)) . "\""; 
+        $fileData .= "\n";
+    }
 // ----------------------- 
 //$items = $gridField->getManipulatedList(); 
 
-	$items = $gridField->getList(); 
+    $items = $gridField->getList(); 
 // -----------------------
 // @todo should GridFieldComponents change behaviour based on whether others are available in the config? 
-	foreach($gridField->getConfig()->getComponents() as $component){ 
-		if($component instanceof GridFieldFilterHeader || $component instanceof GridFieldSortableHeader) { 
-			$items = $component->getManipulatedData($gridField, $items); 
-		} 
-	}
-	foreach($items->limit(null) as $item) { 
-		$columnData = array();
-		foreach($csvColumns as $columnSource => $columnHeader) { 
-			$value = ( $item->hasMethod( $columnHeader ) ) ? $item->$columnHeader() : $item->$columnHeader;
-			$value = str_replace(array("\r", "\n"), "\n", $value); 
-			$columnData[] = '"' . str_replace('"', '\"', $value) . '"'; 
-		}
-		$fileData .= implode($separator, $columnData); 
-		$fileData .= "\n";
-		$item->destroy(); 
-	}
-	return $fileData; 
+    foreach($gridField->getConfig()->getComponents() as $component){ 
+        if($component instanceof GridFieldFilterHeader || $component instanceof GridFieldSortableHeader) { 
+            $items = $component->getManipulatedData($gridField, $items); 
+        } 
+    }
+    foreach($items->limit(null) as $item) { 
+        $columnData = array();
+        foreach($csvColumns as $columnSource => $columnHeader) { 
+            $value = ( $item->hasMethod( $columnHeader ) ) ? $item->$columnHeader() : $item->$columnHeader;
+            $value = str_replace(array("\r", "\n"), "\n", $value); 
+            $columnData[] = '"' . str_replace('"', '\"', $value) . '"'; 
+        }
+        $fileData .= implode($separator, $columnData); 
+        $fileData .= "\n";
+        $item->destroy(); 
+    }
+    return $fileData; 
 }
 } // end class GridFieldExportAllButton
 } 

code/logic/GridFieldPrintAllAutomatedLinksButton.php

Indentation +34 added lines, -34 removed lines

@@ -1,6 +1,6 @@ 
 <?php 
 if (!class_exists('GridFieldPrintAllAutomatedLinksButton')) {
-	class GridFieldPrintAllAutomatedLinksButton extends GridFieldPrintButton {
+    class GridFieldPrintAllAutomatedLinksButton extends GridFieldPrintButton {
 /** 
 * Export core. 
 * 
@@ -13,42 +13,42 @@ 
 * 
 */ 
 public function generatePrintData(GridField $gridField) { 
-	$printColumns = $this->getPrintColumnsForGridField($gridField);
-	$header = null;
-	if($this->printHasHeader) { 
-		$header = new ArrayList();
-		foreach($printColumns as $field => $label){ 
-			$header->push(new ArrayData(array( 
-				"CellString" => $label, 
-				))); 
-		} 
-	}
+    $printColumns = $this->getPrintColumnsForGridField($gridField);
+    $header = null;
+    if($this->printHasHeader) { 
+        $header = new ArrayList();
+        foreach($printColumns as $field => $label){ 
+            $header->push(new ArrayData(array( 
+                "CellString" => $label, 
+                ))); 
+        } 
+    }
 // ----------------------- 
 //$items = $gridField->getManipulatedList(); 
-	$items = $gridField->getList(); 
+    $items = $gridField->getList(); 
 // -----------------------
-	$itemRows = new ArrayList();
-	foreach($items as $item) { 
-		$itemRow = new ArrayList();
-		foreach($printColumns as $field => $label) { 
-			$value = $gridField->getDataFieldValue($item, $field);
-			$itemRow->push(new ArrayData(array( 
-				"CellString" => $value, 
-				))); 
-		}
-		$itemRows->push(new ArrayData(array( 
-			"ItemRow" => $itemRow 
-			)));
-		$item->destroy(); 
-	}
-	$ret = new ArrayData(array( 
-		"Title" => $this->getTitle($gridField), 
-		"Header" => $header, 
-		"ItemRows" => $itemRows, 
-		"Datetime" => SS_Datetime::now(), 
-		"Member" => Member::currentUser(), 
-		));
-	return $ret;
+    $itemRows = new ArrayList();
+    foreach($items as $item) { 
+        $itemRow = new ArrayList();
+        foreach($printColumns as $field => $label) { 
+            $value = $gridField->getDataFieldValue($item, $field);
+            $itemRow->push(new ArrayData(array( 
+                "CellString" => $value, 
+                ))); 
+        }
+        $itemRows->push(new ArrayData(array( 
+            "ItemRow" => $itemRow 
+            )));
+        $item->destroy(); 
+    }
+    $ret = new ArrayData(array( 
+        "Title" => $this->getTitle($gridField), 
+        "Header" => $header, 
+        "ItemRows" => $itemRows, 
+        "Datetime" => SS_Datetime::now(), 
+        "Member" => Member::currentUser(), 
+        ));
+    return $ret;
 } 
 } // end class GridFieldPrintAllButton
 }

code/dataobjects/AutomatedLinkPageResult.php

Braces +6 added lines, -2 removed lines

@@ -52,7 +52,9 @@ 
      */
     public static function add_or_update( SiteTree $page ){
         $obj = self::get()->find( 'PageID', $page->ID );
-        if( !$obj ) $obj = self::create( array( 'PageID' => $page->ID ) );
+        if( !$obj ) {
+            $obj = self::create( array( 'PageID' => $page->ID ) );
+        }
 
         $obj->OriginalLinkCount = $page->OriginalLinkCount;
         $obj->LinksCreatedCount = $page->LinkCount;
@@ -68,6 +70,8 @@ 
      * @return void
      */
     public static function remove_old_data(){
-        foreach( self::get() as $obj ) if( !SiteTree::get()->byID( $obj->PageID ) ) $obj->delete();
+        foreach( self::get() as $obj ) {
+            if( !SiteTree::get()->byID( $obj->PageID ) ) $obj->delete();
+        }
     }
 }

code/dataobjects/GlobalAutoLinkSettings.php

Indentation +18 added lines, -18 removed lines

@@ -11,20 +11,20 @@ 
  */
 class GlobalAutoLinkSettings extends DataObject{
 	
-	public static $enabled  = true;
+    public static $enabled  = true;
     public static $encoding = 'UTF-8';
 	
-	private static $db = array(
-		'MaxLinksPerPage' => 'INT',
-		'ExcludeTags'	  => 'VARCHAR(255)',
-		'IncludeIn'		  => 'Text',
-		'AddTo'           => 'Text',
+    private static $db = array(
+        'MaxLinksPerPage' => 'INT',
+        'ExcludeTags'	  => 'VARCHAR(255)',
+        'IncludeIn'		  => 'Text',
+        'AddTo'           => 'Text',
         'CrawlID'         => 'VARCHAR(15)'
-	);
+    );
 	
-	private static $defaults = array(
-		'IncludeIn' => 'Content'
-	);
+    private static $defaults = array(
+        'IncludeIn' => 'Content'
+    );
 
     public static $default_create_config = array(
         'MaxLinksPerPage' => 0,
@@ -32,13 +32,13 @@ 
         'IncludeIn'		  => 'Content'
     );
 	
-	public function ExcludeTags(){
-		return array_unique( explode( ',', str_replace( ' ', '', $this->ExcludeTags ).',a,img,iframe,video,object' ) );
-	}
+    public function ExcludeTags(){
+        return array_unique( explode( ',', str_replace( ' ', '', $this->ExcludeTags ).',a,img,iframe,video,object' ) );
+    }
 	
-	public function IncludeInFields(){
-		return explode( ',', str_replace( ' ', '', $this->IncludeIn ) );
-	}
+    public function IncludeInFields(){
+        return explode( ',', str_replace( ' ', '', $this->IncludeIn ) );
+    }
 
     public function requireDefaultRecords() {
         $hasData = self::get()->first();
@@ -76,7 +76,7 @@ 
      * 
      * @return array
      */
-     public function AllowedIn(){
+        public function AllowedIn(){
         $classes = array_values( ClassInfo::subclassesFor( 'SiteTree' ) );
         if( !$this->AddTo ) return $classes;
         
@@ -97,7 +97,7 @@ 
         }
         
         return (array) $sanitized;
-     }
+        }
 
     /**
      * Gets the current config

Braces +10 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
             $obj->CrawlID = $this->createCrawlID();
             $obj->write();
             DB::alteration_message("Added default records to $className table","created");
-        }else{
+        } else{
             if(!$hasData->CrawlID){
                 $hasData->CrawlID = $this->createCrawlID();
                 $hasData->write();
@@ -62,8 +62,9 @@ 
         $alpha = 'abcdefghijklm[)0123456789(]nopqrstuvwxyz';
         $alpha_len = strlen($alpha);
 
-        while( strlen($ret) < 14)
-            $ret .= ( rand(0,1) == 0 ) ? strtoupper($alpha[rand(0, $alpha_len-1)]) : $alpha[rand(0, $alpha_len-1)];
+        while( strlen($ret) < 14) {
+                    $ret .= ( rand(0,1) == 0 ) ? strtoupper($alpha[rand(0, $alpha_len-1)]) : $alpha[rand(0, $alpha_len-1)];
+        }
 
         return $ret;
     }
@@ -78,7 +79,9 @@ 
      */
      public function AllowedIn(){
         $classes = array_values( ClassInfo::subclassesFor( 'SiteTree' ) );
-        if( !$this->AddTo ) return $classes;
+        if( !$this->AddTo ) {
+            return $classes;
+        }
         
         $sanitized = explode( ',', str_replace( ' ', '', strtolower( $this->AddTo ) ) );
         
@@ -93,7 +96,9 @@ 
                 }
             }
             
-            if( !$found ) unset( $sanitized[$x] );
+            if( !$found ) {
+                unset( $sanitized[$x] );
+            }
         }
         
         return (array) $sanitized;

code/dataobjects/AutomatedLink.php

Indentation +132 added lines, -132 removed lines

@@ -10,45 +10,45 @@ 
  */
 class AutomatedLink extends DataObject implements PermissionProvider{
 	
-	private static $db = array(
-		'Phrase'     	  => 'VARCHAR(255)',
-		'TitleTag'   	  => 'VARCHAR(255)',
-		'AnchorTag' 	  => 'VARCHAR(255)',
-		'NewWindow'  	  => 'Boolean',
-		'NoFollow'   	  => 'Boolean',
-		'SelfLinking'     => 'Boolean',
-		'CaseSensitive'   => 'Boolean',
-		'MaxLinksPerPage' => 'INT',
-		'Priority'		  => 'Int'
-	);
+    private static $db = array(
+        'Phrase'     	  => 'VARCHAR(255)',
+        'TitleTag'   	  => 'VARCHAR(255)',
+        'AnchorTag' 	  => 'VARCHAR(255)',
+        'NewWindow'  	  => 'Boolean',
+        'NoFollow'   	  => 'Boolean',
+        'SelfLinking'     => 'Boolean',
+        'CaseSensitive'   => 'Boolean',
+        'MaxLinksPerPage' => 'INT',
+        'Priority'		  => 'Int'
+    );
 	
-	private static $defaults = array(
-		'MaxLinksPerPage' => 10
-	);
+    private static $defaults = array(
+        'MaxLinksPerPage' => 10
+    );
 	
-	private static $default_sort = 'Priority';
+    private static $default_sort = 'Priority';
 	
-	private static $has_one = array(
-		'Page' => 'SiteTree'
-	);
+    private static $has_one = array(
+        'Page' => 'SiteTree'
+    );
 	
-	private static $summary_fields    = array( 'Phrase', 'PointsTo' );
-	private static $searchable_fields = array( 'Phrase' );
-	private static $singular_name	  = 'Automated Link';
-	private static $plural_name	      = 'Automated Links';
+    private static $summary_fields    = array( 'Phrase', 'PointsTo' );
+    private static $searchable_fields = array( 'Phrase' );
+    private static $singular_name	  = 'Automated Link';
+    private static $plural_name	      = 'Automated Links';
     private static $parsableFields    = array();
 
     public function PointsTo(){
         return $this->Page()->Link();
     }
 
-	public function Title(){
-		return $this->Phrase;
-	}
+    public function Title(){
+        return $this->Phrase;
+    }
 	
-	public function forTemplate(){
-		return $this->getHTML();
-	}
+    public function forTemplate(){
+        return $this->getHTML();
+    }
     
     function canView( $member = false ){
         return Permission::check('AUTOMATEDLINK_VIEW');
@@ -67,129 +67,129 @@ 
     }
     
     function providePermissions() {
-       return array(
-         'AUTOMATEDLINK_VIEW'   => 'View Automated Links',
-         'AUTOMATEDLINK_EDIT'   => 'Edit Automated Links',
-         'AUTOMATEDLINK_DELETE' => 'Delete Automated Links',
-         'AUTOMATEDLINK_CREATE' => 'Create Automated Links',
-       );
-     }
+        return array(
+            'AUTOMATEDLINK_VIEW'   => 'View Automated Links',
+            'AUTOMATEDLINK_EDIT'   => 'Edit Automated Links',
+            'AUTOMATEDLINK_DELETE' => 'Delete Automated Links',
+            'AUTOMATEDLINK_CREATE' => 'Create Automated Links',
+        );
+        }
 	
-	public function requireDefaultRecords(){
-		parent::requireDefaultRecords();
+    public function requireDefaultRecords(){
+        parent::requireDefaultRecords();
 		
-		// Update all links to redirector pages during dev/build
-		foreach( self::get() as $link ) $link->CheckAndUpdateDestination( true );
-	}
+        // Update all links to redirector pages during dev/build
+        foreach( self::get() as $link ) $link->CheckAndUpdateDestination( true );
+    }
 	
-	/**
-	 * Returns the HTML Representation of this object
-	 * 
+    /**
+     * Returns the HTML Representation of this object
+     * 
      * @param  String $originalPhrase
-	 * @return String
-	 */
-	public function getHTML( $originalPhrase = NULL ){
-		$link     = ( $this->PageID )     ? $this->Page()->Link() 	    : '#';
-		$title    = ( $this->TitleTag )   ? "title='{$this->TitleTag}'" : '';
-		$nofollow = ( $this->NoFollow )   ? 'rel="nofollow"' 		    : '';
-		$newtab   = ( $this->NewWindow )  ? 'target="_blank"' 		    : '';
+     * @return String
+     */
+    public function getHTML( $originalPhrase = NULL ){
+        $link     = ( $this->PageID )     ? $this->Page()->Link() 	    : '#';
+        $title    = ( $this->TitleTag )   ? "title='{$this->TitleTag}'" : '';
+        $nofollow = ( $this->NoFollow )   ? 'rel="nofollow"' 		    : '';
+        $newtab   = ( $this->NewWindow )  ? 'target="_blank"' 		    : '';
         $anchor   = ( $originalPhrase )   ? $originalPhrase             : $this->Phrase;
-		$link     = ( $this->AnchorTag )  ? rtrim( $link, '#' ).'#'.$this->AnchorTag : $link;
-		return "<a href=\"$link\" $title $nofollow $newtab data-id=\"{$this->ID}\">{$anchor}</a>";
-	}
+        $link     = ( $this->AnchorTag )  ? rtrim( $link, '#' ).'#'.$this->AnchorTag : $link;
+        return "<a href=\"$link\" $title $nofollow $newtab data-id=\"{$this->ID}\">{$anchor}</a>";
+    }
 	
-	public function getCMSFields(){
-		$fields = FieldList::create( TabSet::create( 'Root' ) );
+    public function getCMSFields(){
+        $fields = FieldList::create( TabSet::create( 'Root' ) );
 				
-		$fields->addFieldsToTab( 'Root.LinkSettings', array(
-			TextField::create( 'Phrase', 'Phrase to search for', $this->Phrase, 255 ),
-			TextField::create( 'TitleTag', 'Title Tag', $this->TitleTag, 255 ),
-			TextField::create( 'AnchorTag', 'Anchor Tag(#)', $this->AnchorTag, 255 ),
-			FieldGroup::create(
-				CheckboxField::create( 'NoFollow' ),
-				CheckboxField::create( 'NewWindow' ),
-				CheckboxField::create( 'SelfLinking', 'Allow page to link to itself' ),
-				CheckboxField::create( 'CaseSensitive', 'Match the case of the phrase' )
-			),
-			NumericField::create( 'MaxLinksPerPage', 'Maximum amount of this link to be created on a single page( 0 = unlimited )' ),
-			TreeDropdownField::create( 'PageID', 'Page to link to', 'SiteTree' )
-		) );
+        $fields->addFieldsToTab( 'Root.LinkSettings', array(
+            TextField::create( 'Phrase', 'Phrase to search for', $this->Phrase, 255 ),
+            TextField::create( 'TitleTag', 'Title Tag', $this->TitleTag, 255 ),
+            TextField::create( 'AnchorTag', 'Anchor Tag(#)', $this->AnchorTag, 255 ),
+            FieldGroup::create(
+                CheckboxField::create( 'NoFollow' ),
+                CheckboxField::create( 'NewWindow' ),
+                CheckboxField::create( 'SelfLinking', 'Allow page to link to itself' ),
+                CheckboxField::create( 'CaseSensitive', 'Match the case of the phrase' )
+            ),
+            NumericField::create( 'MaxLinksPerPage', 'Maximum amount of this link to be created on a single page( 0 = unlimited )' ),
+            TreeDropdownField::create( 'PageID', 'Page to link to', 'SiteTree' )
+        ) );
 		
-		$settings = GlobalAutoLinkSettings::get_current();
-		if( $settings ){
-			$fields->addFieldsToTab( 'Root.Global', array(
-				NumericField::create( 
-					'Global_MaxLinksPerPage', 
-					'Maximum amount of links a single page can have ( 0 = unlimited )', 
-					$settings->MaxLinksPerPage 
-				),
-				TextField::create(
-					'Global_ExcludeTags',
-					'Do not include links into these HTML Tags ( comma seperated )',
-					$settings->ExcludeTags
-				),
-				TextField::create( 
-				    'Global_AddTo', 
-				    'Page types where links should be created in ( leave blank for all page types )',
-				    $settings->AddTo ),
-				TextField::create(
-					'Global_IncludeIn',
-					'Include Links into these fields ( comma seperated & field must support html injection )',
-					$settings->IncludeIn
-				)
-			) );
-		}
+        $settings = GlobalAutoLinkSettings::get_current();
+        if( $settings ){
+            $fields->addFieldsToTab( 'Root.Global', array(
+                NumericField::create( 
+                    'Global_MaxLinksPerPage', 
+                    'Maximum amount of links a single page can have ( 0 = unlimited )', 
+                    $settings->MaxLinksPerPage 
+                ),
+                TextField::create(
+                    'Global_ExcludeTags',
+                    'Do not include links into these HTML Tags ( comma seperated )',
+                    $settings->ExcludeTags
+                ),
+                TextField::create( 
+                    'Global_AddTo', 
+                    'Page types where links should be created in ( leave blank for all page types )',
+                    $settings->AddTo ),
+                TextField::create(
+                    'Global_IncludeIn',
+                    'Include Links into these fields ( comma seperated & field must support html injection )',
+                    $settings->IncludeIn
+                )
+            ) );
+        }
 		
-		return $fields;
-	}
+        return $fields;
+    }
 
     public function getCMSValidator(){
         return new RequiredFields( array( 'Phrase', 'PageID' ) );
     }
 	
-	/**
-	 * Save the Global Settings into the 
-	 * Global Auto Link Settings Object
-	 * 
-	 * @return void
-	 */
-	public function onBeforeWrite(){
-		parent::onBeforeWrite();
+    /**
+     * Save the Global Settings into the 
+     * Global Auto Link Settings Object
+     * 
+     * @return void
+     */
+    public function onBeforeWrite(){
+        parent::onBeforeWrite();
 		
-		$settings = GlobalAutoLinkSettings::get_current();
-		if( $settings ){
+        $settings = GlobalAutoLinkSettings::get_current();
+        if( $settings ){
 			
-			foreach( $this->getChangedFields() as $field => $value ){
-				if( strpos( $field, 'Global_' ) === 0 && isset( $value['after'] ) ){
-					$field = str_replace( 'Global_', '', $field );
-					$settings->$field = $value['after'];
-				}
-			}
+            foreach( $this->getChangedFields() as $field => $value ){
+                if( strpos( $field, 'Global_' ) === 0 && isset( $value['after'] ) ){
+                    $field = str_replace( 'Global_', '', $field );
+                    $settings->$field = $value['after'];
+                }
+            }
 
-			$settings->write();
-		}
+            $settings->write();
+        }
 		
-		$this->CheckAndUpdateDestination();
-	}
+        $this->CheckAndUpdateDestination();
+    }
     
-	/**
-	 * Checks if the destination is a redirector page if so
-	 * it updates it to the destination of the redirector page
-	 * 
-	 * @Boolean $write - Write the changes if any
-	 * @return void
-	 */
-	public function CheckAndUpdateDestination( $write = false ){
-		$this->extend('beforeCheckAndUpdateDestination', $write);
+    /**
+     * Checks if the destination is a redirector page if so
+     * it updates it to the destination of the redirector page
+     * 
+     * @Boolean $write - Write the changes if any
+     * @return void
+     */
+    public function CheckAndUpdateDestination( $write = false ){
+        $this->extend('beforeCheckAndUpdateDestination', $write);
 		
-		if( $this->PageID && $this->Page() && 
-			$this->Page()->ClassName == 'RedirectorPage' && 
-			$this->Page()->LinkToID && $this->Page()->RedirectionType == 'Internal' )
-		{
-			$this->PageID = $this->Page()->LinkToID;
-			if( $write ) $this->write();
-		}
-	}
+        if( $this->PageID && $this->Page() && 
+            $this->Page()->ClassName == 'RedirectorPage' && 
+            $this->Page()->LinkToID && $this->Page()->RedirectionType == 'Internal' )
+        {
+            $this->PageID = $this->Page()->LinkToID;
+            if( $write ) $this->write();
+        }
+    }
 	
     /**
      * Checks if the field is parable
@@ -221,7 +221,7 @@ 
      *
      * @return Boolean
      */
-	public function canBeAdded( ContentController $controller ){
+    public function canBeAdded( ContentController $controller ){
         return ( $this->SelfLinking || $controller->ID != $this->PageID );
     }
 }

Braces +9 added lines, -4 removed lines

@@ -79,7 +79,9 @@ 
 		parent::requireDefaultRecords();
 		
 		// Update all links to redirector pages during dev/build
-		foreach( self::get() as $link ) $link->CheckAndUpdateDestination( true );
+		foreach( self::get() as $link ) {
+		    $link->CheckAndUpdateDestination( true );
+		}
 	}
 	
 	/**
@@ -187,7 +189,9 @@ 
 			$this->Page()->LinkToID && $this->Page()->RedirectionType == 'Internal' )
 		{
 			$this->PageID = $this->Page()->LinkToID;
-			if( $write ) $this->write();
+			if( $write ) {
+			    $this->write();
+			}
 		}
 	}
 	
@@ -203,8 +207,9 @@ 
         if( !isset( self::$parsableFields[$page->ID] ) || !isset( self::$parsableFields[$page->ID][$field] ) ){
             $fields = array();
             
-            foreach( ClassInfo::ancestry( $page->ClassName, true ) as $class )
-                $fields = array_merge( $fields, (array) DataObject::database_fields( $class ) );
+            foreach( ClassInfo::ancestry( $page->ClassName, true ) as $class ) {
+                            $fields = array_merge( $fields, (array) DataObject::database_fields( $class ) );
+            }
             
             self::$parsableFields[$page->ID][$field] = 
                 (Boolean) array_key_exists( $field, $fields ) && strtolower( $fields[$field] ) === 'htmltext' && $page->$field;

code/admin/SEOToolboxAdmin.php

Indentation +10 added lines, -10 removed lines

@@ -11,18 +11,18 @@
  */
 class SEOToolboxAdmin extends ModelAdmin{
 	
-	private static $menu_title      = 'SEO Tool box';
-	private static $url_segment     = 'seo-tool-box';
-	private static $managed_models  = array( 'AutomatedLink' );
+    private static $menu_title      = 'SEO Tool box';
+    private static $url_segment     = 'seo-tool-box';
+    private static $managed_models  = array( 'AutomatedLink' );
     private static $menu_priority   = 10;
 
 
-	public function getEditForm($id = null, $fields = null) {
-		$form = parent::getEditForm( $id, $fields );
-		$class = $this->sanitiseClassName($this->modelClass);
-		$grid   = $form->Fields()->fieldByName($class);
-		$grid->getConfig()->addComponent( new GridFieldSortableRows( 'Priority' ) );
+    public function getEditForm($id = null, $fields = null) {
+        $form = parent::getEditForm( $id, $fields );
+        $class = $this->sanitiseClassName($this->modelClass);
+        $grid   = $form->Fields()->fieldByName($class);
+        $grid->getConfig()->addComponent( new GridFieldSortableRows( 'Priority' ) );
 		
-		return $form;
-	}
+        return $form;
+    }
 }

code/controllers/AutomatedLinkReportTask.php

Braces +43 added lines, -19 removed lines

@@ -8,7 +8,9 @@ 
     private static $exclude_classes = array( 'RedirectorPage', 'VirtualPage' );
 
     public function index(){
-        if( !Director::is_cli() ) return 'Please run this controller in CLI';
+        if( !Director::is_cli() ) {
+            return 'Please run this controller in CLI';
+        }
 
         libxml_use_internal_errors(true);
         set_time_limit(600);
@@ -44,15 +46,23 @@ 
         $exclude = Config::inst()->get( $this->class, 'exclude_classes' );
         $exclude = ( $exclude ) ? "'".implode( "','", $exclude )."'" : '';
         foreach( SiteTree::get()->where( "ClassName NOT IN($exclude)" ) as $page ){
-            if( !$this->checkForPossibleLinks( $page, $includeInFields ) ) continue;
+            if( !$this->checkForPossibleLinks( $page, $includeInFields ) ) {
+                continue;
+            }
             $page = $this->getLinkData( $page, $includeInFields );
-            if( !$page ) continue;
+            if( !$page ) {
+                continue;
+            }
 
-            if( !$run_in_realtime ) AutomatedLinkPageResult::add_or_update( $page );
+            if( !$run_in_realtime ) {
+                AutomatedLinkPageResult::add_or_update( $page );
+            }
             $data->push( $page );
         }
 
-        if( !$run_in_realtime ) AutomatedLinkPageResult::remove_old_data();
+        if( !$run_in_realtime ) {
+            AutomatedLinkPageResult::remove_old_data();
+        }
 
         return $data;
     }
@@ -70,15 +80,18 @@ 
         // Set a list of all fields that can have autolinks created in them
         $page->AutomateableFields = ArrayList::create();
 
-        foreach( $this->getAllDatabaseFields( $page->class ) as $field => $type )
-            if( in_array( $field, $includeIn )                          &&
+        foreach( $this->getAllDatabaseFields( $page->class ) as $field => $type ) {
+                    if( in_array( $field, $includeIn )                          &&
                 !$page->AutomateableFields->find( 'DataField', $field ) &&
                 AutomatedLink::isFieldParsable( $page, $field )
             ) $page->AutomateableFields->push( DataObject::create( array( 'DataField' => $field ) ) );
+        }
 
         // Get data Pre-Automated Links creation
         $withLinks = $this->getPageDOM( $page, true );
-        if( !$withLinks ) return false;
+        if( !$withLinks ) {
+            return false;
+        }
 
         $links = $withLinks->getElementsByTagName('a');
 
@@ -88,10 +101,11 @@ 
 
         // List all automated links that were created in this $page
         $linksUsed = array();
-        foreach( $this->Links as $autolink )
-            foreach( $links as $link ){
+        foreach( $this->Links as $autolink ) {
+                    foreach( $links as $link ){
                 if( $link->getAttribute('data-id') == $autolink->ID ){
                     $linksUsed[$autolink->ID] = $autolink->Phrase;
+        }
                     $page->OriginalLinkCount--;
                     $page->LinkCount++;
                 }
@@ -99,7 +113,9 @@ 
 
         $page->Links = implode( ', ', $linksUsed );
 
-        if( $page->LinkCount < 1 ) return false;
+        if( $page->LinkCount < 1 ) {
+            return false;
+        }
 
         return $page;
     }
@@ -113,8 +129,9 @@ 
      */
     private function getAllDatabaseFields( $class ){
         $fields = array();
-        foreach( ClassInfo::ancestry( $class, true ) as $cls )
-            $fields = array_merge( $fields, (array) DataObject::database_fields( $cls ) );
+        foreach( ClassInfo::ancestry( $class, true ) as $cls ) {
+                    $fields = array_merge( $fields, (array) DataObject::database_fields( $cls ) );
+        }
 
         return $fields;
     }
@@ -130,8 +147,12 @@ 
      */
     private function getPageDOM( SiteTree $page ){
         $controllerClass = $page->class.'_Controller';
-        if( !class_exists( $controllerClass ) )  $controller = $page->class.'Controller';
-        if( !class_exists( $controllerClass  ) ) return false;
+        if( !class_exists( $controllerClass ) ) {
+            $controller = $page->class.'Controller';
+        }
+        if( !class_exists( $controllerClass  ) ) {
+            return false;
+        }
 
         $controller = $controllerClass::create( $page );
         $controller->invokeWithExtensions( 'addAutomatedLinks' );
@@ -150,11 +171,13 @@ 
             GlobalAutoLinkSettings::$encoding
         );
 
-        if( !$content ) return false;
+        if( !$content ) {
+            return false;
+        }
 
         if( class_exists( 'HTML5_Parser' ) ){
             $dom = HTML5_Parser::parse($content);
-        }else{
+        } else{
             $dom = new DOMDocument();
             $dom->loadHTML( $content );
         }
@@ -171,9 +194,10 @@ 
      * @return Boolean
      */
     private function checkForPossibleLinks( SiteTree $page, array $includeIn ){
-        foreach( $this->Links as $link )
-            foreach( $includeIn as $possibleField )
+        foreach( $this->Links as $link ) {
+                    foreach( $includeIn as $possibleField )
                 if( isset( $page->$possibleField ) && preg_match( "/\b{$link->Phrase}\b/i", $page->$possibleField ) ) return true;
+        }
 
         return false;
     }

code/controllers/SEOTestSiteTreeController.php

Braces +24 added lines, -9 removed lines

@@ -17,21 +17,29 @@ 
         parent::init();
 
         // Check user is logged in and has permission to access to SEO Toolbox Admin
-        if (!Member::currentUser()) return $this->redirect(Security::login_url() . '?BackURL=/seotest');
-        if (!Permission::check('CMS_ACCESS_SEOToolboxAdmin')) return $this->redirect(self::getPermissionDeniedPage()->Link());
+        if (!Member::currentUser()) {
+            return $this->redirect(Security::login_url() . '?BackURL=/seotest');
+        }
+        if (!Permission::check('CMS_ACCESS_SEOToolboxAdmin')) {
+            return $this->redirect(self::getPermissionDeniedPage()->Link());
+        }
 
         Requirements::clear();
 
         // Sprite Location needs to be dynamic as devs can install module in different locations
         $sprite_path = $this->config()->get('sprite_path');
-        if ($sprite_path === null) $sprite_path = SEOTOOLBOX_DIR . '/css/icons/icon_sprite.png';
+        if ($sprite_path === null) {
+            $sprite_path = SEOTOOLBOX_DIR . '/css/icons/icon_sprite.png';
+        }
         Requirements::customCSS(".icon{width:16px;height: 16px;cursor:pointer;background: url(/{$sprite_path});}");
 
         // CSS can be replaced by devs if they desire to change styling
         Requirements::css(SEOTOOLBOX_DIR.'/third-party/bootstrap/css/bootstrap.min.css');
         Requirements::css(SEOTOOLBOX_DIR.'/third-party/bootstrap/css/bootstrap-theme.min.css');
         $css = $this->config()->get('css');
-        if ($css === null) $css = array(SEOTOOLBOX_DIR . '/fonts/lato/lato.css', SEOTOOLBOX_DIR . '/css/seotest.css');
+        if ($css === null) {
+            $css = array(SEOTOOLBOX_DIR . '/fonts/lato/lato.css', SEOTOOLBOX_DIR . '/css/seotest.css');
+        }
         Requirements::combine_files('seotest.css', $css);
 
         Requirements::combine_files('seotest.js', array(
@@ -80,7 +88,9 @@ 
         );
         $html = str_replace(array("\n", "\r"), ' ', mb_strtolower($html));
 
-        if( $get_pure_word_count ) return strip_tags($html);
+        if( $get_pure_word_count ) {
+            return strip_tags($html);
+        }
 
         $phrases = array();
 
@@ -118,14 +128,17 @@ 
                 $phrases = array_merge($phrases, $matches[$commands['find_pos']]);
             }
 
-            if(isset($commands['replace']))
-                $html = preg_replace($commands['replace'], ' ', $html);
+            if(isset($commands['replace'])) {
+                            $html = preg_replace($commands['replace'], ' ', $html);
+            }
         }
 
         // Remove the empty elements
         $phrases = array_filter($phrases, function($phrase){return strlen(trim($phrase)) > 0;});
         $count = 0;
-        foreach( $phrases as $p ) $count += count(explode(' ', $p));
+        foreach( $phrases as $p ) {
+            $count += count(explode(' ', $p));
+        }
         return $phrases;
     }
 
@@ -178,7 +191,9 @@ 
 
         curl_close( $ch );
 
-        if( !strpos( $header, ' 200 ' ) )return array( 'headers' => false, 'body' => false );
+        if( !strpos( $header, ' 200 ' ) ) {
+            return array( 'headers' => false, 'body' => false );
+        }
 
         $field_data = $this->getHTMLFieldsData($body);
         $body = str_replace($field_data[0], $field_data[2], $body);

code/extenstions/SEOToolboxControllerExtension.php

Indentation +61 added lines, -61 removed lines

@@ -25,29 +25,29 @@ 
         // Do something here
     }
 
-	private $maxLinksPerPage;
+    private $maxLinksPerPage;
     private $settings       = null;
-	private $linkCount      = 0;
+    private $linkCount      = 0;
     private $addLinks       = true;
     private $excludeTags    = array();
     private $maxLinks       = 0;
 
-	public function index(){
+    public function index(){
         $this->addAutomatedLinks();
 
-	    // If we have a crawl request check the CrawlID so we're sure we didn't hit another SS site running our module
-	    if( $crawl_id = $this->owner->request->getHeader('X-Crawl-Id') ){
-	        return( $crawl_id == GlobalAutoLinkSettings::get_current()->CrawlID )
+        // If we have a crawl request check the CrawlID so we're sure we didn't hit another SS site running our module
+        if( $crawl_id = $this->owner->request->getHeader('X-Crawl-Id') ){
+            return( $crawl_id == GlobalAutoLinkSettings::get_current()->CrawlID )
                 ? $this->crawl_response()
                 : $this->owner->redirect(SEOTestSiteTreeController::getPermissionDeniedPage()->Link());
         }
 
-		return array();
-	}
+        return array();
+    }
 
-	private function crawl_response(){
+    private function crawl_response(){
         // Encoded version to detect which fields are being used
-	    $customize = array();
+        $customize = array();
         foreach( Config::inst()->get($this->owner->ClassName, 'db') as $field => $type ){
             if( strtolower( $type ) == 'htmltext' ){
                 $data = ($this->owner->hasMethod($field)) ? $this->owner->$field() : $this->owner->$field;
@@ -72,7 +72,7 @@ 
                 '/<!--(.*?)-->/im',
             ), '', $this->owner->customise($customize)->render())
         );
-	}
+    }
 
     /**
      * Get the global settings and check if we should be adding
@@ -94,13 +94,13 @@ 
         return $this->settings;
     }
 
-	/**
-	 * Goes through all the automated link settings and adds
-	 * the links where necessary
-	 *
-	 * @return void
-	 */
-	public function addAutomatedLinks(){
+    /**
+     * Goes through all the automated link settings and adds
+     * the links where necessary
+     *
+     * @return void
+     */
+    public function addAutomatedLinks(){
         if( GlobalAutoLinkSettings::$enabled && $this->owner->class != 'RedirectorPage' ) {
             $this->getSettings();
             if( !$this->addLinks ) return;
@@ -132,60 +132,60 @@ 
                 }
             }
         }
-	}
+    }
 
-	/**
-	 * Parse the provided field and add the necessary links
-	 *
-	 * @param DOMDocument $html
+    /**
+     * Parse the provided field and add the necessary links
+     *
+     * @param DOMDocument $html
      * @param String $field
-	 * @return string
-	 */
-	private function parseField( DOMDocument $html, $field ){
-		$this->owner->extend( 'beforeParseField', $html, $field );
-
-		// Remove Tags from Content we wown't be using
-		$excluded = array();
-		foreach( $this->excludeTags as $eTag ){
-		    while( $tags = $html->getElementsByTagName( $eTag ) ){
-		        if( !$tags->length ) break 1;
-		        $tag	= $tags->item(0);
+     * @return string
+     */
+    private function parseField( DOMDocument $html, $field ){
+        $this->owner->extend( 'beforeParseField', $html, $field );
+
+        // Remove Tags from Content we wown't be using
+        $excluded = array();
+        foreach( $this->excludeTags as $eTag ){
+            while( $tags = $html->getElementsByTagName( $eTag ) ){
+                if( !$tags->length ) break 1;
+                $tag	= $tags->item(0);
                 $value  = $html->saveHTML( $tag );
                 $key    = (string) crc32( $value );
 
-				// Convert back children nodes of this node if they were already hashed
-				$excluded[$key] = str_replace( array_keys( $excluded ), array_values( $excluded ), $value );
+                // Convert back children nodes of this node if they were already hashed
+                $excluded[$key] = str_replace( array_keys( $excluded ), array_values( $excluded ), $value );
 
                 $tag->parentNode->replaceChild( $html->createTextNode( $key ), $tag );
-		    }
-		}
+            }
+        }
 
         $body    = (string)$html->saveHTML( $html->getElementsByTagName('body')->item(0) );
         $content = preg_replace( array( '/\<body\>/is', '/\<\/body\>/is' ), '', $body, 1 );
 
-		// Create the links
-		$links = AutomatedLink::get()->sort('Priority');
-		foreach( $links as $link ){
-			// Check if self-linking is allowed and if current pagetype is allowed
-			if( !$link->canBeAdded( $this->owner, $field ) ) continue;
+        // Create the links
+        $links = AutomatedLink::get()->sort('Priority');
+        foreach( $links as $link ){
+            // Check if self-linking is allowed and if current pagetype is allowed
+            if( !$link->canBeAdded( $this->owner, $field ) ) continue;
 
-			$max    = (int) ( $link->MaxLinksPerPage > 0 ) ? $link->MaxLinksPerPage : PHP_INT_MAX;
+            $max    = (int) ( $link->MaxLinksPerPage > 0 ) ? $link->MaxLinksPerPage : PHP_INT_MAX;
             $escape = (string) preg_quote( $link->Phrase, '/' );
-			$regex  = (string) ( $link->CaseSensitive ) ? "/(\b{$escape}\b)/" : "/(\b{$escape}\b)/i";
+            $regex  = (string) ( $link->CaseSensitive ) ? "/(\b{$escape}\b)/" : "/(\b{$escape}\b)/i";
 
             // Count the matches
             preg_match_all( $regex, $content, $count );
             $count = ( is_array( $count ) && isset( $count[0] ) ) ? count( $count[0] ) : 0;
             if( $count < 1 ) continue;
 
-			if( isset( $this->maxLinksPerPage[ $link->ID ] ) )
-				$max -= $this->maxLinksPerPage[ $link->ID ];
-			else
-				$this->maxLinksPerPage[ $link->ID ] = 0;
+            if( isset( $this->maxLinksPerPage[ $link->ID ] ) )
+                $max -= $this->maxLinksPerPage[ $link->ID ];
+            else
+                $this->maxLinksPerPage[ $link->ID ] = 0;
 
-			for( $x = 0; $x < $count; $x++ ){
-				// Stop adding links if we reached the link or page limit
-				if( $x >= $max || $this->linkCount >= $this->maxLinks ) break;
+            for( $x = 0; $x < $count; $x++ ){
+                // Stop adding links if we reached the link or page limit
+                if( $x >= $max || $this->linkCount >= $this->maxLinks ) break;
 
                 // Check if there is anything else to replace else stop
                 preg_match( $regex, $content, $match );
@@ -195,18 +195,18 @@ 
                 $key              = (string) crc32( $html );
                 $excluded[ $key ] = (string) $html;
 
-				$content = preg_replace( $regex, $key, $content, 1 );
-				$this->linkCount++;
+                $content = preg_replace( $regex, $key, $content, 1 );
+                $this->linkCount++;
                 $this->maxLinksPerPage[ $link->ID ]++;
             }
 
-			// Stop Adding links if we reached the page limit
-			if( $this->linkCount >= $this->maxLinks ) break;
-		}
+            // Stop Adding links if we reached the page limit
+            if( $this->linkCount >= $this->maxLinks ) break;
+        }
 
-		// Re-add the excluded Tags
-		$content = str_replace( array_keys( $excluded ), array_values( $excluded ), $content );
+        // Re-add the excluded Tags
+        $content = str_replace( array_keys( $excluded ), array_values( $excluded ), $content );
 
-		return $content;
-	}
+        return $content;
+    }
 }

Braces +42 added lines, -17 removed lines

@@ -51,7 +51,9 @@ 
         foreach( Config::inst()->get($this->owner->ClassName, 'db') as $field => $type ){
             if( strtolower( $type ) == 'htmltext' ){
                 $data = ($this->owner->hasMethod($field)) ? $this->owner->$field() : $this->owner->$field;
-                if( !$data ) continue;
+                if( !$data ) {
+                    continue;
+                }
                 $tmp = new HTMLText('tmp');
                 $tmp->setValue($data);
                 $data = base64_encode($tmp->forTemplate());
@@ -83,12 +85,16 @@ 
     private function getSettings(){
         if( $this->settings === null ) {
             $this->settings = GlobalAutoLinkSettings::get_current();
-            if (!$this->settings) return $this->addLinks = false;
+            if (!$this->settings) {
+                return $this->addLinks = false;
+            }
 
             $this->excludeTags = (array)$this->settings->ExcludeTags();
             $this->maxLinks = (int)($this->settings->MaxLinksPerPage) ? $this->settings->MaxLinksPerPage : PHP_INT_MAX;
 
-            if (!in_array($this->owner->ClassName, $this->settings->AllowedIn())) $this->addLinks = false;
+            if (!in_array($this->owner->ClassName, $this->settings->AllowedIn())) {
+                $this->addLinks = false;
+            }
         }
 
         return $this->settings;
@@ -103,7 +109,9 @@ 
 	public function addAutomatedLinks(){
         if( GlobalAutoLinkSettings::$enabled && $this->owner->class != 'RedirectorPage' ) {
             $this->getSettings();
-            if( !$this->addLinks ) return;
+            if( !$this->addLinks ) {
+                return;
+            }
 
             foreach( $this->getSettings()->IncludeInFields() as $field ){
                 // Check that the field provided by user exists in this object, is of type HTMLText and has content
@@ -117,14 +125,16 @@ 
 
                     if( class_exists( 'HTML5_Parser' ) ){
                         $dom = HTML5_Parser::parse( $content );
-                    }else{
+                    } else{
                         $dom = new DOMDocument();
                         $dom->loadHTML( $content );
                     }
 
                     // Check current link count and if it's already exceeded do nothing
                     $this->linkCount += (int) $dom->getElementsByTagName( 'a' )->length;
-                    if( $this->linkCount >= $this->maxLinks ) return;
+                    if( $this->linkCount >= $this->maxLinks ) {
+                        return;
+                    }
 
                     $parsed = $this->parseField( $dom, $field );
                     $this->owner->data()->$field = $parsed;
@@ -148,7 +158,9 @@ 
 		$excluded = array();
 		foreach( $this->excludeTags as $eTag ){
 		    while( $tags = $html->getElementsByTagName( $eTag ) ){
-		        if( !$tags->length ) break 1;
+		        if( !$tags->length ) {
+		            break 1;
+		        }
 		        $tag	= $tags->item(0);
                 $value  = $html->saveHTML( $tag );
                 $key    = (string) crc32( $value );
@@ -167,7 +179,9 @@ 
 		$links = AutomatedLink::get()->sort('Priority');
 		foreach( $links as $link ){
 			// Check if self-linking is allowed and if current pagetype is allowed
-			if( !$link->canBeAdded( $this->owner, $field ) ) continue;
+			if( !$link->canBeAdded( $this->owner, $field ) ) {
+			    continue;
+			}
 
 			$max    = (int) ( $link->MaxLinksPerPage > 0 ) ? $link->MaxLinksPerPage : PHP_INT_MAX;
             $escape = (string) preg_quote( $link->Phrase, '/' );
@@ -176,22 +190,31 @@ 
             // Count the matches
             preg_match_all( $regex, $content, $count );
             $count = ( is_array( $count ) && isset( $count[0] ) ) ? count( $count[0] ) : 0;
-            if( $count < 1 ) continue;
+            if( $count < 1 ) {
+                continue;
+            }
 
-			if( isset( $this->maxLinksPerPage[ $link->ID ] ) )
-				$max -= $this->maxLinksPerPage[ $link->ID ];
-			else
-				$this->maxLinksPerPage[ $link->ID ] = 0;
+			if( isset( $this->maxLinksPerPage[ $link->ID ] ) ) {
+							$max -= $this->maxLinksPerPage[ $link->ID ];
+			} else {
+							$this->maxLinksPerPage[ $link->ID ] = 0;
+			}
 
 			for( $x = 0; $x < $count; $x++ ){
 				// Stop adding links if we reached the link or page limit
-				if( $x >= $max || $this->linkCount >= $this->maxLinks ) break;
+				if( $x >= $max || $this->linkCount >= $this->maxLinks ) {
+				    break;
+				}
 
                 // Check if there is anything else to replace else stop
                 preg_match( $regex, $content, $match );
-                if( !is_array( $match ) || !count( $match ) ) break;
+                if( !is_array( $match ) || !count( $match ) ) {
+                    break;
+                }
 
-                if( !$html = (string) $link->getHTML( $match[0] ) ) continue;
+                if( !$html = (string) $link->getHTML( $match[0] ) ) {
+                    continue;
+                }
                 $key              = (string) crc32( $html );
                 $excluded[ $key ] = (string) $html;
 
@@ -201,7 +224,9 @@ 
             }
 
 			// Stop Adding links if we reached the page limit
-			if( $this->linkCount >= $this->maxLinks ) break;
+			if( $this->linkCount >= $this->maxLinks ) {
+			    break;
+			}
 		}
 
 		// Re-add the excluded Tags