dylangrech92 / seotoolbox

code/forms/SEOToolboxAnalyzerField.php

Spacing +3 added lines, -3 removed lines

@@ -1,13 +1,13 @@
 <?php
 
-class SEOToolboxAnalyzerField extends LiteralField{
+class SEOToolboxAnalyzerField extends LiteralField {
 
-    public function __construct($name, $url){
+    public function __construct($name, $url) {
         $content = $this->createBaseHTML($name, $url);
         parent::__construct($name, $content);
     }
 
-    private function createBaseHTML($name, $url){
+    private function createBaseHTML($name, $url) {
         $div    = "<div id='seotoolbox_con_{$name}'><div class='clearfix result_cont'></div></div>";
         $script = "<script type='text/javascript'>
                     (function(\$){new PageAnalyzer(\$('#seotoolbox_con_{$name} .result_cont'),'{$url}')}(jQuery))

code/logic/GridFieldExportAllAutomatedLinksButton.php

Spacing +10 added lines, -10 removed lines

@@ -15,18 +15,18 @@ 
 */ 
 public function generateExportFileData($gridField) { 
 	$separator = $this->csvSeparator; 
-	$csvColumns =$gridField->getColumns();
+	$csvColumns = $gridField->getColumns();
 	$fileData = ''; 
 	$columnData = array(); 
 	$fieldItems = new ArrayList();
-	if($this->csvHasHeader) {
+	if ($this->csvHasHeader) {
 		$headers = array();
 // determine the CSV headers. If a field is callable (e.g. anonymous function) then use the 
 // source name as the header instead 
-		foreach($csvColumns as $columnSource => $columnHeader) {
+		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";
 	}
 // ----------------------- 
@@ -35,17 +35,17 @@ 
 	$items = $gridField->getList(); 
 // -----------------------
 // @todo should GridFieldComponents change behaviour based on whether others are available in the config? 
-	foreach($gridField->getConfig()->getComponents() as $component){ 
-		if($component instanceof GridFieldFilterHeader || $component instanceof GridFieldSortableHeader) { 
+	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

@@ -15,9 +15,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, 
 				))); 
@@ -28,9 +28,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/dataobjects/AutomatedLinkPageResult.php

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class AutomatedLinkPageResult extends DataObject{
+class AutomatedLinkPageResult extends DataObject {
 
     private static $db = array(
         'OriginalLinkCount' => 'INT',
@@ -22,25 +22,25 @@ 
     );
 
     // Disable all permissions to this object no one needs to touch it except the code itself
-    public function canView($member = null){return true;}
-    public function canEdit($member = null){return false;}
-    public function canDelete($member = null){return false;}
-    public function canCreate($member = null){return false;}
+    public function canView($member = null) {return true; }
+    public function canEdit($member = null) {return false; }
+    public function canDelete($member = null) {return false; }
+    public function canCreate($member = null) {return false; }
 
-    public function Title(){
+    public function Title() {
         return $this->Page()->Title;
     }
 
-    public function URLSegment(){
+    public function URLSegment() {
         return $this->Page()->Link();
     }
 
-    public function LinkCount(){
+    public function LinkCount() {
         return $this->LinksCreatedCount;
     }
 
-    public function TotalLinks(){
-        return $this->OriginalLinkCount + $this->LinksCreatedCount;
+    public function TotalLinks() {
+        return $this->OriginalLinkCount+$this->LinksCreatedCount;
     }
 
     /**
@@ -50,9 +50,9 @@ 
      * @param SiteTree $page
      * @return void
      */
-    public static function add_or_update( SiteTree $page ){
-        $obj = self::get()->find( 'PageID', $page->ID );
-        if( !$obj ) $obj = self::create( array( 'PageID' => $page->ID ) );
+    public static function add_or_update(SiteTree $page) {
+        $obj = self::get()->find('PageID', $page->ID);
+        if (!$obj) $obj = self::create(array('PageID' => $page->ID));
 
         $obj->OriginalLinkCount = $page->OriginalLinkCount;
         $obj->LinksCreatedCount = $page->LinkCount;
@@ -67,7 +67,7 @@ 
      *
      * @return void
      */
-    public static function remove_old_data(){
-        foreach( self::get() as $obj ) if( !SiteTree::get()->byID( $obj->PageID ) ) $obj->delete();
+    public static function remove_old_data() {
+        foreach (self::get() as $obj) if (!SiteTree::get()->byID($obj->PageID)) $obj->delete();
     }
 }

code/dataobjects/GlobalAutoLinkSettings.php

Spacing +23 added lines, -23 removed lines

@@ -9,9 +9,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(
@@ -32,23 +32,23 @@ 
         '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();
-        if(!$hasData) {
+        if (!$hasData) {
             $obj = self::create(self::$default_create_config);
             $obj->CrawlID = $this->createCrawlID();
             $obj->write();
-            DB::alteration_message("Added default records to $className table","created");
-        }else{
-            if(!$hasData->CrawlID){
+            DB::alteration_message("Added default records to $className table", "created");
+        }else {
+            if (!$hasData->CrawlID) {
                 $hasData->CrawlID = $this->createCrawlID();
                 $hasData->write();
             }
@@ -57,13 +57,13 @@ 
         parent::requireDefaultRecords();
     }
 
-    private function createCrawlID(){
+    private function createCrawlID() {
         $ret   = '';
         $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;
     }
@@ -76,24 +76,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;
@@ -106,9 +106,9 @@ 
      * @throws \ValidationException
      * @throws null
      */
-    public static function get_current(){
+    public static function get_current() {
         $obj = self::get()->first();
-        if( !$obj ){
+        if (!$obj) {
             self::create(self::$default_create_config)->write();
             self::flush_and_destroy_cache();
         }

code/admin/SEOToolboxAdmin.php

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

code/controllers/AutomatedLinkReportTask.php

Spacing +49 added lines, -49 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
-class AutomatedLinkReportTask extends Controller{
+class AutomatedLinkReportTask extends Controller {
 
     private   $GlobalSettings;
     private   $Links;
 
-    private static $exclude_classes = array( 'RedirectorPage', 'VirtualPage' );
+    private static $exclude_classes = array('RedirectorPage', 'VirtualPage');
 
-    public function index(){
-        if( !Director::is_cli() ) return 'Please run this controller in CLI';
+    public function index() {
+        if (!Director::is_cli()) return 'Please run this controller in CLI';
 
         libxml_use_internal_errors(true);
         set_time_limit(600);
@@ -25,34 +25,34 @@ 
      * @see AutomatedLinkPageResult
      * @return ArrayList
      */
-    public function checkLinks(){
+    public function checkLinks() {
         $data = ArrayList::create();
 
-        $run_in_realtime = Config::inst()->get( 'AutomatedLinkReport', 'run_in_realtime' );
+        $run_in_realtime = Config::inst()->get('AutomatedLinkReport', 'run_in_realtime');
 
         // Enable this since we will need to render the pages for the report
         Config::inst()->update('SSViewer', 'theme_enabled', true);
         
         $this->GlobalSettings = GlobalAutoLinkSettings::get_current();
-        $this->Links          = AutomatedLink::get()->sort( 'Priority' );
+        $this->Links          = AutomatedLink::get()->sort('Priority');
         $includeInFields      = $this->GlobalSettings->IncludeInFields();
-        if( !$this->GlobalSettings ){
-            user_error( 'Run dev/build before starting to use SEOToolbox' );
+        if (!$this->GlobalSettings) {
+            user_error('Run dev/build before starting to use SEOToolbox');
             return $data;
         }
 
-        $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;
-            $page = $this->getLinkData( $page, $includeInFields );
-            if( !$page ) continue;
+        $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;
+            $page = $this->getLinkData($page, $includeInFields);
+            if (!$page) continue;
 
-            if( !$run_in_realtime ) AutomatedLinkPageResult::add_or_update( $page );
-            $data->push( $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;
     }
@@ -66,19 +66,19 @@ 
      *
      * @return SiteTree $page
      */
-    private function getLinkData( SiteTree $page, array $includeIn ){
+    private function getLinkData(SiteTree $page, array $includeIn) {
         // 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 )                          &&
-                !$page->AutomateableFields->find( 'DataField', $field ) &&
-                AutomatedLink::isFieldParsable( $page, $field )
-            ) $page->AutomateableFields->push( DataObject::create( array( 'DataField' => $field ) ) );
+        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;
+        $withLinks = $this->getPageDOM($page, true);
+        if (!$withLinks) return false;
 
         $links = $withLinks->getElementsByTagName('a');
 
@@ -88,18 +88,18 @@ 
 
         // List all automated links that were created in this $page
         $linksUsed = array();
-        foreach( $this->Links as $autolink )
-            foreach( $links as $link ){
-                if( $link->getAttribute('data-id') == $autolink->ID ){
+        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++;
                 }
             }
 
-        $page->Links = implode( ', ', $linksUsed );
+        $page->Links = implode(', ', $linksUsed);
 
-        if( $page->LinkCount < 1 ) return false;
+        if ($page->LinkCount < 1) return false;
 
         return $page;
     }
@@ -111,10 +111,10 @@ 
      * @param String $class
      * @return array
      */
-    private function getAllDatabaseFields( $class ){
+    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;
     }
@@ -128,35 +128,35 @@ 
      *
      * @return DOMDocument | false
      */
-    private function getPageDOM( SiteTree $page ){
+    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' );
+        $controller = $controllerClass::create($page);
+        $controller->invokeWithExtensions('addAutomatedLinks');
 
         // Set the fields with possible links into a single variable that
         // will be dumped in the link checker template
         $page->AutomateableText = '';
-        foreach( $page->AutomateableFields as $field ){
+        foreach ($page->AutomateableFields as $field) {
             $field = $field->DataField;
             $page->AutomateableText .= $page->$field;
         }
 
         $content = mb_convert_encoding(
-            $controller->renderWith( 'LinkCheckerTemplate' ),
+            $controller->renderWith('LinkCheckerTemplate'),
             'html-entities',
             GlobalAutoLinkSettings::$encoding
         );
 
-        if( !$content ) return false;
+        if (!$content) return false;
 
-        if( class_exists( 'HTML5_Parser' ) ){
+        if (class_exists('HTML5_Parser')) {
             $dom = HTML5_Parser::parse($content);
-        }else{
+        }else {
             $dom = new DOMDocument();
-            $dom->loadHTML( $content );
+            $dom->loadHTML($content);
         }
 
         return $dom;
@@ -170,10 +170,10 @@ 
      *
      * @return Boolean
      */
-    private function checkForPossibleLinks( SiteTree $page, array $includeIn ){
-        foreach( $this->Links as $link )
-            foreach( $includeIn as $possibleField )
-                if( isset( $page->$possibleField ) && preg_match( "/\b{$link->Phrase}\b/i", $page->$possibleField ) ) return true;
+    private function checkForPossibleLinks(SiteTree $page, array $includeIn) {
+        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

Spacing +55 added lines, -55 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class SEOTestSiteTreeController extends Controller{
+class SEOTestSiteTreeController extends Controller {
 
     private static $sprite_path = null;
     private static $css         = null;
@@ -11,34 +11,34 @@ 
     // Array of regex that will be used by the crawler. If the url we're going to crawl matches any filter in here, it will be ignored
     private static $ignore_paths = array();
 
-    private static $allowed_actions = array( 'urlsAndSettings', 'getPageData' );
+    private static $allowed_actions = array('urlsAndSettings', 'getPageData');
 
-    public function init(){
+    public function init() {
         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 (!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(
-            SEOTOOLBOX_DIR . '/third-party/jquery-1.12.0.js',
-            SEOTOOLBOX_DIR . '/js/crawler.js',
-            SEOTOOLBOX_DIR . '/js/default_tests.js',
-            SEOTOOLBOX_DIR . '/js/crawler_init.js'
+            SEOTOOLBOX_DIR.'/third-party/jquery-1.12.0.js',
+            SEOTOOLBOX_DIR.'/js/crawler.js',
+            SEOTOOLBOX_DIR.'/js/default_tests.js',
+            SEOTOOLBOX_DIR.'/js/crawler_init.js'
         ));
     }
 
@@ -59,28 +59,28 @@ 
      * @param SS_HTTPRequest $request
      * @return String
      */
-    public function getPageData(SS_HTTPRequest $request){
-        $agent  = ( $request->getVar('agent') == 'mobile' )
+    public function getPageData(SS_HTTPRequest $request) {
+        $agent = ($request->getVar('agent') == 'mobile')
             ? $this->config()->get('mobile_user_agent')
             : $this->config()->get('desktop_user_agent');
 
-        $curl   = $this->loadPage($request->getVar('u'), $agent);
+        $curl = $this->loadPage($request->getVar('u'), $agent);
         $curl['phrases'] = $this->extractWords($curl['body']);
 
         Requirements::clear();
         return json_encode($curl);
     }
 
-    private function extractWords($html, $get_pure_word_count=false){
+    private function extractWords($html, $get_pure_word_count = false) {
         mb_internal_encoding('UTF-8');
         $html = preg_replace_callback(
             "/(&#[0-9]+;)/",
-            function($m){return mb_convert_encoding($m[1], "UTF-8", "HTML-ENTITIES");},
+            function($m) {return mb_convert_encoding($m[1], "UTF-8", "HTML-ENTITIES"); },
             $html
         );
         $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();
 
@@ -105,12 +105,12 @@ 
             )
         );
 
-        foreach( $regex_find_replace as $commands ){
-            if(isset($commands['find'])){
-                preg_match_all( $commands['find'], $html, $matches );
-                array_walk($matches[$commands['find_pos']], function(&$phrase){
+        foreach ($regex_find_replace as $commands) {
+            if (isset($commands['find'])) {
+                preg_match_all($commands['find'], $html, $matches);
+                array_walk($matches[$commands['find_pos']], function(&$phrase) {
                     $words = explode(' ', strip_tags($phrase));
-                    array_walk($words, function(&$w){
+                    array_walk($words, function(&$w) {
                         $w = trim(preg_replace('/\s+/', ' ', strip_tags($w)));
                     });
                     $phrase = preg_replace('/\s+/', ' ', implode(' ', $words));
@@ -118,24 +118,24 @@ 
                 $phrases = array_merge($phrases, $matches[$commands['find_pos']]);
             }
 
-            if(isset($commands['replace']))
+            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;});
+        $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;
     }
 
-    public function urlsAndSettings( SS_HTTPRequest $request ){
+    public function urlsAndSettings(SS_HTTPRequest $request) {
         Requirements::clear();
         return json_encode(array(
             'urls' => Versioned::get_by_stage('SiteTree', 'Live')
-                ->exclude( 'ClassName', 'RedirectorPage' )
-                ->exclude( 'ClassName', 'ErrorPage' )
-                ->map( 'ID', 'AbsoluteLink' )
+                ->exclude('ClassName', 'RedirectorPage')
+                ->exclude('ClassName', 'ErrorPage')
+                ->map('ID', 'AbsoluteLink')
                 ->toArray(),
 
             'settings' => array(
@@ -145,45 +145,45 @@ 
         ));
     }
 
-    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);
     }
 
     /**
@@ -192,13 +192,13 @@ 
      *
      * @return ErrorPage
      */
-    public static function getPermissionDeniedPage(){
-        $page = ErrorPage::get()->find( 'ErrorCode', 503 );
-        if( !$page ){
-            $page = ErrorPage::create( array(
+    public static function getPermissionDeniedPage() {
+        $page = ErrorPage::get()->find('ErrorCode', 503);
+        if (!$page) {
+            $page = ErrorPage::create(array(
                 'ErrorCode' => 503,
                 'Title'		=> 'Permission Denied'
-            ) );
+            ));
             $page->write();
         }
 

code/extenstions/SEOToolboxSiteTreeExtension.php

Spacing +7 added lines, -7 removed lines

@@ -1,19 +1,19 @@ 
 <?php
 
-class SEOToolboxSiteTreeExtension extends DataExtension{
+class SEOToolboxSiteTreeExtension extends DataExtension {
 
     private static $db = array(
         'MetaTitle' => 'VARCHAR(255)'
     );
 
-    public function MetaTags($tags){
-        $tags = preg_replace('/<title(.*?)<\/title>/im','', $tags);
-        $title = ( $this->owner->MetaTitle ) ? $this->owner->MetaTitle : $this->owner->Title;
+    public function MetaTags($tags) {
+        $tags = preg_replace('/<title(.*?)<\/title>/im', '', $tags);
+        $title = ($this->owner->MetaTitle) ? $this->owner->MetaTitle : $this->owner->Title;
         $tags .= "<title>{$title}</title>";
         return $tags;
     }
 
-    public function updateCMSFields(FieldList $fields){
+    public function updateCMSFields(FieldList $fields) {
         $fields->removeByName('Metadata');
         $fields->addFieldsToTab('Root.SEO', array(
             TextField::create("MetaTitle",
@@ -29,13 +29,13 @@ 
                         "Search engines use this content for displaying search results 
                         (although it will not influence their ranking).")
                 )->addExtraClass('help'),
-            TextareaField::create("ExtraMeta",$this->owner->fieldLabel('ExtraMeta'))
+            TextareaField::create("ExtraMeta", $this->owner->fieldLabel('ExtraMeta'))
                 ->setRightTitle(
                     _t('SEOToolbox.METAEXTRAHELP',
                         "HTML tags for additional meta information. For example &lt;meta name=\"customName\" 
                         content=\"your custom content here\" /&gt;")
                 )->addExtraClass('help'),
-            SEOToolboxAnalyzerField::create('Analyzer', $this->owner->URLSegment ),
+            SEOToolboxAnalyzerField::create('Analyzer', $this->owner->URLSegment),
         ));
     }