dylangrech92 / seotoolbox

code/controllers/SEOTestSiteTreeController.php

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/logic/GridFieldExportAllAutomatedLinksButton.php

Spacing +10 added lines, -10 removed lines

@@ -3,29 +3,29 @@
     class GridFieldExportAllAutomatedLinksButton extends GridFieldExportButton {
         public function generateExportFileData($gridField) {
             $separator = $this->csvSeparator;
-            $csvColumns =$gridField->getColumns();
+            $csvColumns = $gridField->getColumns();
             $fileData = '';
-            if($this->csvHasHeader) {
+            if ($this->csvHasHeader) {
                 $headers = array();
-                foreach($csvColumns as $columnSource => $columnHeader) {
+                foreach ($csvColumns as $columnSource => $columnHeader) {
                     $headers[] = (!is_string($columnHeader) && is_callable($columnHeader)) ? $columnSource : $columnHeader;
                 }
-                $fileData .= "\"" . implode("\"{$separator}\"", array_values($headers)) . "\"";
+                $fileData .= "\"".implode("\"{$separator}\"", array_values($headers))."\"";
                 $fileData .= "\n";
             }
             $items = $gridField->getList();
 
-            foreach($gridField->getConfig()->getComponents() as $component){
-                if($component instanceof GridFieldFilterHeader || $component instanceof GridFieldSortableHeader) {
+            foreach ($gridField->getConfig()->getComponents() as $component) {
+                if ($component instanceof GridFieldFilterHeader || $component instanceof GridFieldSortableHeader) {
                     $items = $component->getManipulatedData($gridField, $items);
                 }
             }
-            foreach($items->limit(null) as $item) {
+            foreach ($items->limit(null) as $item) {
                 $columnData = array();
-                foreach($csvColumns as $columnSource => $columnHeader) {
-                    $value = ( $item->hasMethod( $columnHeader ) ) ? $item->$columnHeader() : $item->$columnHeader;
+                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) . '"';
+                    $columnData[] = '"'.str_replace('"', '\"', $value).'"';
                 }
                 $fileData .= implode($separator, $columnData);
                 $fileData .= "\n";

code/logic/GridFieldPrintAllAutomatedLinksButton.php

Spacing +4 added lines, -4 removed lines

@@ -4,9 +4,9 @@ 
         public function generatePrintData(GridField $gridField) {
             $printColumns = $this->getPrintColumnsForGridField($gridField);
             $header = null;
-            if($this->printHasHeader) {
+            if ($this->printHasHeader) {
                 $header = new ArrayList();
-                foreach($printColumns as $field => $label){
+                foreach ($printColumns as $field => $label) {
                     $header->push(new ArrayData(array(
                         "CellString" => $label,
                         )));
@@ -15,9 +15,9 @@ 
 
             $items = $gridField->getList();
             $itemRows = new ArrayList();
-            foreach($items as $item) {
+            foreach ($items as $item) {
                 $itemRow = new ArrayList();
-                foreach($printColumns as $field => $label) {
+                foreach ($printColumns as $field => $label) {
                     $value = $gridField->getDataFieldValue($item, $field);
                     $itemRow->push(new ArrayData(array(
                         "CellString" => $value,

code/extenstions/SEOToolboxControllerExtension.php

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/GlobalAutoLinkSettings.php

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;