dylangrech92 / seotoolbox

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

Spacing +6 added lines, -6 removed lines

@@ -9,19 +9,19 @@
  * all the automated links and automated link global settings
  * for this site
  */
-class SEOToolboxAdmin extends ModelAdmin{
+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_priority   = 10;
+	private static $managed_models  = array('AutomatedLink');
+    private static $menu_priority = 10;
 
 
 	public function getEditForm($id = null, $fields = null) {
-		$form = parent::getEditForm( $id, $fields );
+		$form = parent::getEditForm($id, $fields);
 		$class = $this->sanitiseClassName($this->modelClass);
-		$grid   = $form->Fields()->fieldByName($class);
-		$grid->getConfig()->addComponent( new GridFieldSortableRows( 'Priority' ) );
+		$grid = $form->Fields()->fieldByName($class);
+		$grid->getConfig()->addComponent(new GridFieldSortableRows('Priority'));
 		
 		return $form;
 	}

_config.php

Spacing +3 added lines, -3 removed lines

@@ -33,11 +33,11 @@
  * to view this report.
  */
 
-define( 'SEOTOOLBOX_DIR', str_replace( Director::baseFolder().'/', '', __DIR__ ) );
+define('SEOTOOLBOX_DIR', str_replace(Director::baseFolder().'/', '', __DIR__));
 
 Config::inst()->update('SEOToolboxAdmin', 'menu_icon', SEOTOOLBOX_DIR.'/code/admin/icon/seotoolbox-icon.png');
-Config::inst()->update('LeftAndMain','extra_requirements_javascript', array(SEOTOOLBOX_DIR.'/js/seo_page_analyzer.js'));
-Config::inst()->update('LeftAndMain','extra_requirements_css', array(SEOTOOLBOX_DIR.'/css/seo_page_analyzer.css'));
+Config::inst()->update('LeftAndMain', 'extra_requirements_javascript', array(SEOTOOLBOX_DIR.'/js/seo_page_analyzer.js'));
+Config::inst()->update('LeftAndMain', 'extra_requirements_css', array(SEOTOOLBOX_DIR.'/css/seo_page_analyzer.css'));
 
 CMSMenu::add_link('seotest', 'Run Crawler', '/seotest', 9, array('target' => '_blank'));
 Requirements::customCSS('.icon.icon-16.icon-seotest{background:url('.SEOTOOLBOX_DIR.'/code/admin/icon/crawl-icon.png)}');

code/extenstions/SEOToolboxControllerExtension.php

Braces +32 added lines, -13 removed lines

@@ -84,12 +84,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;
@@ -153,7 +157,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 );
@@ -172,7 +178,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, '/' );
@@ -181,22 +189,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;
 
@@ -206,7 +223,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

Spacing +56 added lines, -56 removed lines

@@ -18,12 +18,12 @@ 
     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 ($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());
         }
@@ -31,13 +31,13 @@ 
         return array();
     }
 
-    private function crawl_response(){
+    private function crawl_response() {
         // Encoded version to detect which fields are being used
         $customize = array();
-        foreach( Config::inst()->get($this->owner->ClassName, 'db') as $field => $type ){
-            if( strtolower( $type ) == 'htmltext' ){
+        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 ) {
+                if (!$data) {
                     continue;
                 }
                 $tmp = new HTMLText('tmp');
@@ -88,37 +88,37 @@ 
      *
      * @return void
      */
-    public function addAutomatedLinks(){
-        if( GlobalAutoLinkSettings::$enabled && $this->owner->class != 'RedirectorPage' ) {
+    public function addAutomatedLinks() {
+        if (GlobalAutoLinkSettings::$enabled && $this->owner->class != 'RedirectorPage') {
             $this->getSettings();
-            if( !$this->addLinks ) {
+            if (!$this->addLinks) {
                 return;
             }
 
-            foreach( $this->getSettings()->IncludeInFields() as $field ){
+            foreach ($this->getSettings()->IncludeInFields() as $field) {
                 // Check that the field provided by user exists in this object, is of type HTMLText and has content
-                if( AutomatedLink::isFieldParsable( $this->owner->data(), $field ) ){
+                if (AutomatedLink::isFieldParsable($this->owner->data(), $field)) {
 
                     // Create dummy object so we can parse the HTML
-                    $dummy = new HTMLText( $field );
-                    $dummy->setValue( $this->owner->$field );
+                    $dummy = new HTMLText($field);
+                    $dummy->setValue($this->owner->$field);
                     // Create DOMDocument Object
-                    $content = mb_convert_encoding( $dummy->forTemplate(), 'html-entities', GlobalAutoLinkSettings::$encoding );
+                    $content = mb_convert_encoding($dummy->forTemplate(), 'html-entities', GlobalAutoLinkSettings::$encoding);
 
-                    if( class_exists( 'HTML5_Parser' ) ){
-                        $dom = HTML5_Parser::parse( $content );
-                    } else{
+                    if (class_exists('HTML5_Parser')) {
+                        $dom = HTML5_Parser::parse($content);
+                    }else {
                         $dom = new DOMDocument();
-                        $dom->loadHTML( $content );
+                        $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 ) {
+                    $this->linkCount += (int) $dom->getElementsByTagName('a')->length;
+                    if ($this->linkCount >= $this->maxLinks) {
                         return;
                     }
 
-                    $parsed = $this->parseField( $dom, $field );
+                    $parsed = $this->parseField($dom, $field);
                     $this->owner->data()->$field = $parsed;
                     $this->owner->$field         = $parsed;
                 }
@@ -133,71 +133,71 @@ 
      * @param String $field
      * @return string
      */
-    private function parseField( DOMDocument $html, $field ){
-        $this->owner->extend( 'beforeParseField', $html, $field );
+    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 );
+        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 );
+                $excluded[$key] = str_replace(array_keys($excluded), array_values($excluded), $value);
 
-                $tag->parentNode->replaceChild( $html->createTextNode( $key ), $tag );
+                $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 );
+        $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 ){
+        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, '/' );
-            $regex  = (string) ( $link->CaseSensitive ) ? "/(\b{$escape}\b)/" : "/(\b{$escape}\b)/i";
+            $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";
 
             // Count the matches
-            preg_match_all( $regex, $content, $count );
-            $count = ( is_array( $count ) && isset( $count[0] ) ) ? count( $count[0] ) : 0;
-            if( $count < 1 ) continue;
+            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 ];
+            if (isset($this->maxLinksPerPage[$link->ID]))
+                $max -= $this->maxLinksPerPage[$link->ID];
             else
-                $this->maxLinksPerPage[ $link->ID ] = 0;
+                $this->maxLinksPerPage[$link->ID] = 0;
 
-            for( $x = 0; $x < $count; $x++ ){
+            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;
+                preg_match($regex, $content, $match);
+                if (!is_array($match) || !count($match)) break;
 
-                if( !$html = (string) $link->getHTML( $match[0] ) ) continue;
-                $key              = (string) crc32( $html );
-                $excluded[ $key ] = (string) $html;
+                if (!$html = (string) $link->getHTML($match[0])) continue;
+                $key              = (string) crc32($html);
+                $excluded[$key] = (string) $html;
 
-                $content = preg_replace( $regex, $key, $content, 1 );
+                $content = preg_replace($regex, $key, $content, 1);
                 $this->linkCount++;
-                $this->maxLinksPerPage[ $link->ID ]++;
+                $this->maxLinksPerPage[$link->ID]++;
             }
 
             // 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
-        $content = str_replace( array_keys( $excluded ), array_values( $excluded ), $content );
+        $content = str_replace(array_keys($excluded), array_values($excluded), $content);
 
         return $content;
     }

code/dataobjects/AutomatedLink.php

Indentation +120 added lines, -120 removed lines

@@ -66,133 +66,133 @@
     }
 
     function providePermissions() {
-       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();
-
-		// Update all links to redirector pages during dev/build
-		foreach( self::get() as $link ) {
-		    $link->CheckAndUpdateDestination( true );
-		}
-	}
-
-	/**
-	 * Returns the HTML Representation of this object
-	 *
+        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();
+
+        // Update all links to redirector pages during dev/build
+        foreach( self::get() as $link ) {
+            $link->CheckAndUpdateDestination( true );
+        }
+    }
+
+    /**
+     * 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>";
-	}
-
-	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')
-		));
-
-		$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;
-	}
+        $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'));
+
+        $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
+                )
+            ));
+        }
+
+        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();
-
-		$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'];
-				}
-			}
-
-			$settings->write();
-		}
-
-		$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);
-
-		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();
-			}
-		}
-	}
+    /**
+     * Save the Global Settings into the
+     * Global Auto Link Settings Object
+     *
+     * @return void
+     */
+    public function onBeforeWrite() {
+        parent::onBeforeWrite();
+
+        $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'];
+                }
+            }
+
+            $settings->write();
+        }
+
+        $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);
+
+        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

Spacing +19 added lines, -19 removed lines

@@ -31,37 +31,37 @@ 
         'Page' => 'SiteTree'
     );
 
-    private static $summary_fields    = array( 'Phrase', 'PointsTo' );
-    private static $searchable_fields = array( 'Phrase' );
-    private static $singular_name	  = 'Automated Link';
+    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(){
+    public function PointsTo() {
         return $this->Page()->Link();
     }
 
-    public function Title(){
+    public function Title() {
         return $this->Phrase;
     }
 
-    public function forTemplate(){
+    public function forTemplate() {
         return $this->getHTML();
     }
 
-    function canView( $member = false ){
+    function canView($member = false) {
         return Permission::check('AUTOMATEDLINK_VIEW');
     }
 
-    function canEdit( $member = false ){
+    function canEdit($member = false) {
         return Permission::check('AUTOMATEDLINK_EDIT');
     }
 
-    function canDelete( $member = false ){
+    function canDelete($member = false) {
         return Permission::check('AUTOMATEDLINK_DELETE');
     }
 
-    function canCreate( $member = false ){
+    function canCreate($member = false) {
         return Permission::check('AUTOMATEDLINK_CREATE');
     }
 
@@ -74,12 +74,12 @@ 
        );
      }
 
-	public function requireDefaultRecords(){
+	public function requireDefaultRecords() {
 		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);
 		}
 	}
 
@@ -180,15 +180,15 @@ 
 	 * @Boolean $write - Write the changes if any
 	 * @return void
 	 */
-	public function CheckAndUpdateDestination( $write = false ){
+	public function CheckAndUpdateDestination($write = false) {
 		$this->extend('beforeCheckAndUpdateDestination', $write);
 
-		if( $this->PageID && $this->Page() &&
+		if ($this->PageID && $this->Page() &&
 			$this->Page()->ClassName == 'RedirectorPage' &&
-			$this->Page()->LinkToID && $this->Page()->RedirectionType == 'Internal' )
+			$this->Page()->LinkToID && $this->Page()->RedirectionType == 'Internal')
 		{
 			$this->PageID = $this->Page()->LinkToID;
-			if( $write ) {
+			if ($write) {
 			    $this->write();
 			}
 		}
@@ -224,7 +224,7 @@ 
      *
      * @return Boolean
      */
-    public function canBeAdded( ContentController $controller ){
-        return ( $this->SelfLinking || $controller->ID != $this->PageID );
+    public function canBeAdded(ContentController $controller) {
+        return ($this->SelfLinking || $controller->ID != $this->PageID);
     }
 }

Braces +3 added lines, -2 removed lines

@@ -206,8 +206,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/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 +16 added lines, -16 removed lines

@@ -10,20 +10,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,
@@ -31,13 +31,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();

Braces +9 added lines, -4 removed lines

@@ -61,8 +61,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;
     }
@@ -77,7 +78,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 ) ) );
 
@@ -92,7 +95,9 @@ 
                 }
             }
 
-            if( !$found ) unset( $sanitized[$x] );
+            if( !$found ) {
+                unset( $sanitized[$x] );
+            }
         }
 
         return (array) $sanitized;

Spacing +18 added lines, -18 removed lines

@@ -8,9 +8,9 @@ 
  * on dev/build and contains all the global settings for the
  * automated links
  */
-class GlobalAutoLinkSettings extends DataObject{
+class GlobalAutoLinkSettings extends DataObject {
 
-	public static $enabled  = true;
+	public static $enabled = true;
     public static $encoding = 'UTF-8';
 
 	private static $db = array(
@@ -36,8 +36,8 @@ 
      *
      * @return array
      */
-	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'));
 	}
 
     /**
@@ -45,19 +45,19 @@ 
      *
      * @return array
      */
-	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();
-        if(!$hasData) {
+        if (!$hasData) {
             $obj = self::create(self::$default_create_config);
             $obj->CrawlID = $this->createCrawlID();
             $obj->write();
-            DB::alteration_message("Added default Global Auto Link Settings","created");
-        } else{
-            if(!$hasData->CrawlID){
+            DB::alteration_message("Added default Global Auto Link Settings", "created");
+        }else {
+            if (!$hasData->CrawlID) {
                 $hasData->CrawlID = $this->createCrawlID();
                 $hasData->write();
             }
@@ -90,24 +90,24 @@ 
      *
      * @return array
      */
-        public function AllowedIn(){
-        $classes = array_values( ClassInfo::subclassesFor( 'SiteTree' ) );
-        if( !$this->AddTo ) return $classes;
+        public function AllowedIn() {
+        $classes = array_values(ClassInfo::subclassesFor('SiteTree'));
+        if (!$this->AddTo) return $classes;
 
-        $sanitized = explode( ',', str_replace( ' ', '', strtolower( $this->AddTo ) ) );
+        $sanitized = explode(',', str_replace(' ', '', strtolower($this->AddTo)));
 
-        for( $x = 0; $x < count( $sanitized ); $x++ ){
+        for ($x = 0; $x < count($sanitized); $x++) {
             $found = false;
 
-            foreach( $classes as $class ){
-                if( strtolower( $class ) === $sanitized[$x] ){
+            foreach ($classes as $class) {
+                if (strtolower($class) === $sanitized[$x]) {
                     $sanitized[$x] = $class;
                     $found = true;
                     break 1;
                 }
             }
 
-            if( !$found ) unset( $sanitized[$x] );
+            if (!$found) unset($sanitized[$x]);
         }
 
         return (array) $sanitized;

code/reports/AutomatedLinkReport.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
  * Automated Link Report is a report that lists all automated
  * links and how they affect the website
  */
-class AutomatedLinkReport extends SS_Report{
+class AutomatedLinkReport extends SS_Report {
 
     protected $title       = 'Automated Link Report';
     protected $description = 'Shows a list of all automated links and how they affect the site';
@@ -33,8 +33,8 @@ 
         );
     }
 
-    public function sourceRecords( $params, $sort, $limit ){
-        if( !Config::inst()->get( $this->class, 'run_in_realtime' ) ) {
+    public function sourceRecords($params, $sort, $limit) {
+        if (!Config::inst()->get($this->class, 'run_in_realtime')) {
             return AutomatedLinkPageResult::get();
         }
 

code/controllers/SEOTestSiteTreeController.php

Spacing +23 added lines, -23 removed lines

@@ -148,47 +148,47 @@
     /**
      * @param string $data
      */
-    private function getHTMLFieldsData($data){
+    private function getHTMLFieldsData($data) {
         preg_match_all('/\[\*\*\[(.*?)\]\*\*\[(.*?)\]\*\*\]/im', $data, $matches);
-        foreach( $matches[2] as $key => $field_text ){
+        foreach ($matches[2] as $key => $field_text) {
             $matches[2][$key] = base64_decode($field_text);
             $matches[3][$key] = preg_replace('/[\s]+/mu', ' ', strip_tags($matches[2][$key]));
         }
         return $matches;
     }
 
-    public function loadPage($url, $agent=null){
+    public function loadPage($url, $agent = null) {
         $crawl_id = GlobalAutoLinkSettings::get_current()->CrawlID;
         $ch = curl_init();
-        curl_setopt( $ch, CURLOPT_URL, Director::absoluteBaseURL().'/'.$url );
-        curl_setopt( $ch, CURLOPT_HEADER, true );
-        curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
-        curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, true );
-        curl_setopt( $ch, CURLOPT_MAXREDIRS, 10 );
-        curl_setopt( $ch, CURLOPT_USERAGENT, $agent );
-        curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, 10 );
-        curl_setopt( $ch, CURLOPT_TIMEOUT, 30 );
-        curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
-        curl_setopt( $ch, CURLOPT_HTTPHEADER, array( 'X-Crawl-Id: '.$crawl_id ) );
-        $data = curl_exec( $ch );
+        curl_setopt($ch, CURLOPT_URL, Director::absoluteBaseURL().'/'.$url);
+        curl_setopt($ch, CURLOPT_HEADER, true);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+        curl_setopt($ch, CURLOPT_MAXREDIRS, 10);
+        curl_setopt($ch, CURLOPT_USERAGENT, $agent);
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, array('X-Crawl-Id: '.$crawl_id));
+        $data = curl_exec($ch);
 
         $fetched        = parse_url(curl_getinfo($ch, CURLINFO_EFFECTIVE_URL), PHP_URL_PATH);
-        $header_size    = curl_getinfo( $ch, CURLINFO_HEADER_SIZE );
-        $header 	    = explode( "\r\n\r\n", substr( $data, 0, $header_size ) );
-        array_pop( $header ); // Remove last element as it will always be empty
-        $header = array_pop( $header );
-        $body   = preg_replace('/[\s]+/mu', ' ', substr( $data, $header_size ));
+        $header_size    = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+        $header = explode("\r\n\r\n", substr($data, 0, $header_size));
+        array_pop($header); // Remove last element as it will always be empty
+        $header = array_pop($header);
+        $body   = preg_replace('/[\s]+/mu', ' ', substr($data, $header_size));
 
-        curl_close( $ch );
+        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);
 
-        return array( 'headers' => $header, 'body' => $body, 'field_data' => $field_data, 'url_fetched' => $fetched );
+        return array('headers' => $header, 'body' => $body, 'field_data' => $field_data, 'url_fetched' => $fetched);
     }
 
     /**

Braces +15 added lines, -6 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(
@@ -120,8 +128,9 @@ 
                 $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

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