dylangrech92 / seotoolbox

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

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

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/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

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