dylangrech92 / seotoolbox

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 +52 added lines, -52 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,15 +31,15 @@ 
         return array();
     }
 
-    private function crawl_response(){
+    private function crawl_response() {
         // Encoded version to detect which fields are being used
         $customize = array();
         $dbFields  = Config::inst()->get($this->owner->ClassName, 'db');
-        if(is_array($dbFields)) {
-            foreach ( $dbFields as $field => $type) {
+        if (is_array($dbFields)) {
+            foreach ($dbFields as $field => $type) {
                 if (strtolower($type) == 'htmltext') {
                     $data = ($this->owner->hasMethod($field)) ? $this->owner->$field() : $this->owner->$field;
-                    if($data){
+                    if ($data) {
                         $tmp = new HTMLText('tmp');
                         $tmp->setValue($data);
                         $data = base64_encode($tmp->forTemplate());
@@ -90,31 +90,31 @@ 
      *
      * @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);
                     $dom = AutomatedLink::constructDOMDocument($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;
                 }
@@ -129,71 +129,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/controllers/AutomatedLinkReportTask.php

Braces +39 added lines, -17 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;
     }
@@ -129,8 +146,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');
@@ -161,9 +182,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/dataobjects/AutomatedLink.php

Spacing +27 added lines, -27 removed lines

@@ -33,9 +33,9 @@ 
         '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();
 
@@ -44,7 +44,7 @@ 
      *
      * @return string
      */
-    public function PointsTo(){
+    public function PointsTo() {
         return $this->Page()->Link();
     }
 
@@ -53,7 +53,7 @@ 
      *
      * @return string
      */
-    public function Title(){
+    public function Title() {
         return $this->Phrase;
     }
 
@@ -62,23 +62,23 @@ 
      *
      * @return String
      */
-    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');
     }
 
@@ -91,12 +91,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);
 		}
 	}
 
@@ -197,15 +197,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();
 			}
 		}
@@ -239,8 +239,8 @@ 
      * @param ContentController $controller
      * @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);
     }
 
     /**
@@ -249,20 +249,20 @@ 
      * @param string $html
      * @return DOMDocument
      */
-    public static function constructDOMDocument($html){
-        if( class_exists( 'HTML5_Parser' ) ){
-            $html5 = HTML5_Parser::parse( $html );
-            if($html5 instanceof DOMNodeList){
+    public static function constructDOMDocument($html) {
+        if (class_exists('HTML5_Parser')) {
+            $html5 = HTML5_Parser::parse($html);
+            if ($html5 instanceof DOMNodeList) {
                 $dom = new DOMDocument();
-                while($html5->length > 0) {
+                while ($html5->length > 0) {
                     $dom->appendChild($html5->item(0));
                 }
-            }else{
+            }else {
                 $dom = $html5;
             }
-        } else{
+        }else {
             $dom = new DOMDocument();
-            $dom->loadHTML( $html );
+            $dom->loadHTML($html);
         }
 
         return $dom;

Braces +4 added lines, -3 removed lines

@@ -222,8 +222,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;
@@ -257,7 +258,7 @@ 
                 while($html5->length > 0) {
                     $dom->appendChild($html5->item(0));
                 }
-            }else{
+            } else{
                 $dom = $html5;
             }
         } else{