gordonbanderson / weboftalent-adverts

code/AdvertSiteTreeExtension.php

Indentation +14 added lines, -14 removed lines

@@ -16,23 +16,23 @@ 
         'IsCached' => 'Boolean',
     );
 
-  /*
+    /*
   Add a Location tab containing the map
   */
-  public function updateCMSFields(FieldList $fields)
-  {
-      $categoryfield = new DropdownField('AdvertCategoryID', 'Category', AdvertCategory::get()->sort('Title')->map('ID', 'Title'));
-      $categoryfield->setEmptyString('(Select one)');
-      $fields->addFieldToTab('Root.AdvertCategory', $categoryfield);
-  }
+    public function updateCMSFields(FieldList $fields)
+    {
+        $categoryfield = new DropdownField('AdvertCategoryID', 'Category', AdvertCategory::get()->sort('Title')->map('ID', 'Title'));
+        $categoryfield->setEmptyString('(Select one)');
+        $fields->addFieldToTab('Root.AdvertCategory', $categoryfield);
+    }
 
-  /*
+    /*
     Prior to an item being saved, check for the category having being changed.  If so we need to clear the category cache
     for all items in the database, and cache this one.
   */
-  public function onBeforeWrite()
-  {
-      $savedpage = SiteTree::get()->byID($this->owner->ID);
+    public function onBeforeWrite()
+    {
+        $savedpage = SiteTree::get()->byID($this->owner->ID);
     //error_log("Formerly saved category id = ".$savedpage->AdvertCategory()->Title);
     //error_log("Category before save for page ".$this->owner->ID." is :".$this->owner->AdvertCategory()->Title);
     if ($savedpage->AdvertCategoryID != $this->owner->AdvertCategoryID) {
@@ -44,10 +44,10 @@ 
     } else {
         //error_log("CACHE CAN KEEP GOING");
     }
-      parent::onBeforeWrite();
-  }
+        parent::onBeforeWrite();
+    }
 
-  /*
+    /*
     Get the advert category.  Either use the cached advert category, or traverse the tree towards the root looking for it
   */
     public function CalculateAdvertCategoryID()

code/AdvertLayoutType.php

Indentation +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 {
     public static $searchable_fields = array(
     'Title',
-  );
+    );
 
     public static $db = array(
     // name of the layout type, e.g. 'main banner' or 'skyscraper'
@@ -17,17 +17,17 @@ 
     // whether or not ads are enabled
     'Width' => 'Int',
     'Height' => 'Int',
-  );
+    );
 
     public static $summary_fields = array(
     'Title' => 'Title',
     'Width' => 'Width',
     'Height' => 'Height',
-  );
+    );
 
     public static $has_many = array(
     'Adverts' => 'Advert',
-  );
+    );
 
     public function getCMSFields()
     {

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     $fields->push(new TabSet('Root', $mainTab = new Tab('Main')));
         $mainTab->setTitle(_t('SiteTree.TABMAIN', 'Main'));
 
-        $fields->addFieldToTab('Root.Main',  new TextField('Title', 'The name of the category'));
+        $fields->addFieldToTab('Root.Main', new TextField('Title', 'The name of the category'));
         $fields->addFieldToTab('Root.Main', new NumericField('Width', 'The width of the advert in pixels'));
         $fields->addFieldToTab('Root.Main', new NumericField('Height', 'The height of the advert in pixels'));
 

code/AdvertCategory.php

Indentation +4 added lines, -4 removed lines

@@ -8,11 +8,11 @@ 
 {
     public static $searchable_fields = array(
     'Title',
-  );
+    );
 
     public static $has_many = array(
     'Adverts' => 'Advert',
-  );
+    );
 
     public static $db = array(
     // name of the category
@@ -21,12 +21,12 @@ 
     // whether or not ads are enabled
     'Enabled' => 'Boolean',
 
-  );
+    );
 
     public static $summary_fields = array(
     'Title' => 'Title',
     'Enabled' => 'Enabled',
-  );
+    );
 
     public function getCMSFields()
     {

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     $fields->push(new TabSet('Root', $mainTab = new Tab('Main')));
         $mainTab->setTitle(_t('SiteTree.TABMAIN', 'Main'));
 
-        $fields->addFieldToTab('Root.Main',  new TextField('Title', 'The name of the category'));
+        $fields->addFieldToTab('Root.Main', new TextField('Title', 'The name of the category'));
         $fields->addFieldToTab('Root.Main', new CheckboxField('Enabled', 'Are adverts for this category enabled?'));
 
         return $fields;

code/AdvertController.php

Spacing +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
             $advert = Advert::get()->filter('DigitalSignature', $digsig)->first(); // should only be the one but make sure
 
             if (!$advert) {
-                $this->httpError(404, 'Advert "'.$digsig.'"" not found');
+                $this->httpError(404, 'Advert "' . $digsig . '"" not found');
             } else {
                 // record the click
                 $advert->Clickthroughs = $advert->Clickthroughs + 1;
@@ -51,7 +51,7 @@ 
 
             $advert = Advert::get()->filter('DigitalSignature', $digsig)->first(); // should only be the one but make sure
             if (!$advert) {
-                $this->httpError(404, 'Advert "'.$digsig.'"" not found');
+                $this->httpError(404, 'Advert "' . $digsig . '"" not found');
             } else {
                 // record the click
                 $advert->Impressions = $advert->Impressions + 1;
@@ -159,15 +159,15 @@ 
 
         // Normal operation:
         $mimeType = HTTP::get_mime_type($file_name);
-        header("Content-Type: {$mimeType}; name=\"".addslashes($file_name).'"');
-        header('Content-Disposition: attachment; filename='.addslashes($file_name));
+        header("Content-Type: {$mimeType}; name=\"" . addslashes($file_name) . '"');
+        header('Content-Disposition: attachment; filename=' . addslashes($file_name));
         header('Cache-Control: max-age=1, private');
         header("Content-Length: {$file_size}");
         header('Pragma: ');
 
         if (self::$use_x_sendfile) {
             session_write_close();
-            header('X-Sendfile: '.$file_path);
+            header('X-Sendfile: ' . $file_path);
             exit();
         } elseif ($filePointer = @fopen($file_path, 'rb')) {
             session_write_close();

code/AdvertSiteConfig.php

Indentation +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
     public static $db = array(
         'MpuAboveFoldPosition' => 'Int',
         'MpuBelowFoldPosition' => 'Int',
-      );
+        );
 
     public static $defaults = array(
         'MpuAboveFoldPosition' => '4',

code/AdvertAdmin.php

Indentation +3 added lines, -3 removed lines

@@ -3,9 +3,9 @@
 class AdvertAdmin extends ModelAdmin
 {
     public static $managed_models = array(   //since 2.3.2
-      'Advert', 'AdvertCategory', 'AdvertLayoutType',
-   );
+        'Advert', 'AdvertCategory', 'AdvertLayoutType',
+    );
 
     public static $url_segment = 'adverts'; // will be linked as /admin/adverts
-  public static $menu_title = 'Adverts';
+    public static $menu_title = 'Adverts';
 }

code/Advert.php

Indentation +14 added lines, -14 removed lines

@@ -7,7 +7,7 @@ 
 {
     public static $searchable_fields = array(
     'WebsiteLink',
- );
+    );
 
     public static $db = array(
     // title to show in model admin
@@ -33,13 +33,13 @@ 
     // stats
     'Impressions' => 'Int',
     'Clickthroughs' => 'Int',
- );
+    );
 
     public static $has_one = array(
     'AdvertImage' => 'Image',
     'AdvertCategory' => 'AdvertCategory',
     'AdvertLayoutType' => 'AdvertLayoutType',
- );
+    );
 
     public static $summary_fields = array(
     'Title' => 'Title',
@@ -47,9 +47,9 @@ 
     'AdvertLayoutType.Title',
     'StartDate' => 'StartDate',
     'FinishDate' => 'FinishDate',
- );
+    );
 
-  // add an index in the db for the digital signature and date ranges
+    // add an index in the db for the digital signature and date ranges
     public static $indexes = array(
         'DigitalSignature' => true,
         'StartDate' => '(StartDate)',
@@ -61,7 +61,7 @@ 
     {
         Requirements::javascript('weboftalent-adverts/javascript/advertedit.js');
 
-     // throw away the scaffolding and start afresh
+        // throw away the scaffolding and start afresh
     $fields = new FieldList();
 
     // add a main tab
@@ -75,7 +75,7 @@ 
     // a Javascript toggle on this field displays either the adbroker text field, or an image with URL
     $fields->addFieldToTab('Root.Main', new DropdownField('AdvertSource', 'The type of advert',
         singleton('Advert')->dbObject('AdvertSource')->enumValues()
-   ));
+    ));
 
         if ($this->ID == 0) {
             $html = '<div class="field text">An image can be uploaded after the advert is saved for the first time</div>';
@@ -119,21 +119,21 @@ 
     parent::onBeforeWrite();
     }
 
-  /*
+    /*
     Calculate a digital signature from several of the fields
   */
-  public function CalculateDigitalSignature()
-  {
-      //error_log("Calculating dig sig");
+    public function CalculateDigitalSignature()
+    {
+        //error_log("Calculating dig sig");
     /* because we save the impression counter on every rendition this cannot include
     - number of impressions
     - last edited
     Otherwise the clickthrough will fail
     */
     $data = $this->ID.'_'.$this->AdvertCategory()->Title.'_'.$this->AdvertLayoutType()->Title.'_'.$this->AdbrokerJavascript;
-      $data .= '_'.$this->StartDate.'_'.$this->FinishDate.'_'.$this->ClickThroughs.'_advert';
-      $hashed = hash('sha512', $data);
+        $data .= '_'.$this->StartDate.'_'.$this->FinishDate.'_'.$this->ClickThroughs.'_advert';
+        $hashed = hash('sha512', $data);
     //error_log("HASH CREATED:".$hashed);
     return $hashed;
-  }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -69,7 +69,7 @@ 
         $mainTab->setTitle(_t('SiteTree.TABMAIN', 'Main'));
 
     // human readable title
-    $fields->addFieldToTab('Root.Main',  new TextField('Title',
+    $fields->addFieldToTab('Root.Main', new TextField('Title',
                                 'Human readable title for the advert'));
 
     // a Javascript toggle on this field displays either the adbroker text field, or an image with URL
@@ -89,10 +89,10 @@ 
         }
 
     // quick tags, faster than the grid editor - these are processed prior to save to create/assign tags
-    $fields->addFieldToTab('Root.Main',  new TextField('WebsiteLink',
+    $fields->addFieldToTab('Root.Main', new TextField('WebsiteLink',
                                 'The URL that will be shown when the advert image is clicked'));
 
-        $fields->addFieldToTab('Root.Main',  new TextareaField('AdbrokerJavascript',
+        $fields->addFieldToTab('Root.Main', new TextareaField('AdbrokerJavascript',
                                 'JavaScript provided by the adbroker'));
 
         $fields->addFieldToTab('Root.Main', $sdf = new DateField('StartDate', 'The date the advert becomes active'));
@@ -130,8 +130,8 @@ 
     - last edited
     Otherwise the clickthrough will fail
     */
-    $data = $this->ID.'_'.$this->AdvertCategory()->Title.'_'.$this->AdvertLayoutType()->Title.'_'.$this->AdbrokerJavascript;
-      $data .= '_'.$this->StartDate.'_'.$this->FinishDate.'_'.$this->ClickThroughs.'_advert';
+    $data = $this->ID . '_' . $this->AdvertCategory()->Title . '_' . $this->AdvertLayoutType()->Title . '_' . $this->AdbrokerJavascript;
+      $data .= '_' . $this->StartDate . '_' . $this->FinishDate . '_' . $this->ClickThroughs . '_advert';
       $hashed = hash('sha512', $data);
     //error_log("HASH CREATED:".$hashed);
     return $hashed;

code/AdvertControllerExtension.php

Indentation +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
                 'Adverts' => $adverts,
                 'Advert' => $firstad,
                 'CacheKey' => $cachekey,
-              ));
+                ));
 
             return $forTemplate->renderWith($template);
         } else {

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
             $where = "AdvertLayoutType.Title = '$adverttype'";
 
             if (isset($advertcategory)) {
-                $where .= ' AND Advert.AdvertCategoryID = '.$advertcategoryid;
+                $where .= ' AND Advert.AdvertCategoryID = ' . $advertcategoryid;
                 $where .= ' AND (StartDate IS NULL OR !StartDate OR StartDate < NOW()) AND (FinishDate IS NULL OR !FinishDate OR NOW() < FinishDate)';
 
                 if (count(self::$advertsalreadyserved) > 0) {

code/SecureFileController.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Handles requests for secure files by url.
- *
- * @author Hamish Campbell <hn.campbell@gmail.com>
- * @copyright copyright (c) 2010, Hamish Campbell 
- */
+     * Handles requests for secure files by url.
+     *
+     * @author Hamish Campbell <hn.campbell@gmail.com>
+     * @copyright copyright (c) 2010, Hamish Campbell 
+     */
 class SecureFileController extends Controller implements PermissionProvider
 {
     /**

Spacing +3 added lines, -3 removed lines

@@ -214,15 +214,15 @@
 
         // Normal operation:
         $mimeType = HTTP::getMimeType($file_name);
-        header("Content-Type: {$mimeType}; name=\"".addslashes($file_name).'"');
-        header('Content-Disposition: attachment; filename='.addslashes($file_name));
+        header("Content-Type: {$mimeType}; name=\"" . addslashes($file_name) . '"');
+        header('Content-Disposition: attachment; filename=' . addslashes($file_name));
         header('Cache-Control: max-age=1, private');
         header("Content-Length: {$file_size}");
         header('Pragma: ');
 
         if (self::$use_x_sendfile) {
             session_write_close();
-            header('X-Sendfile: '.$file_path);
+            header('X-Sendfile: ' . $file_path);
             exit();
         } elseif ($filePointer = @fopen($file_path, 'rb')) {
             session_write_close();