gordonbanderson / weboftalent-adverts

code/SecureFileController.php

Spacing +11 added lines, -11 removed lines

@@ -80,8 +80,8 @@ 
 	 * @param int $kilobytes
 	 */
 	static function set_chunk_size($kilobytes) {
-		$kilobytes = max(0, (int)$kilobytes);
-		if(!$kilobytes) user_error("Invalid download chunk size", E_USER_ERROR);
+		$kilobytes = max(0, (int) $kilobytes);
+		if (!$kilobytes) user_error("Invalid download chunk size", E_USER_ERROR);
 		self::$chunck_size_kb = $kilobytes;
 	}
 	
@@ -130,7 +130,7 @@ 
 		$file_path = Director::makeRelative($url);
 		$file = File::find($file_path);
 		
-		if($file instanceof File) {
+		if ($file instanceof File) {
 			if ($file->canView()) {
 				$file->extend('onAccessGranted');
 				return $this->fileFound($file, $file_path);
@@ -150,7 +150,7 @@ 
 	 * @return HTTPResponse
 	 */
 	function fileNotFound($body = "") {
-		if(ClassInfo::exists('SS_HTTPResponse')) {
+		if (ClassInfo::exists('SS_HTTPResponse')) {
 			return new SS_HTTPResponse($body, 404);
 		} else {
 			return new HTTPResponse($body, 404);
@@ -182,8 +182,8 @@ 
 		$file_size = filesize($file_path);
 		
 		// Testing mode - return an HTTPResponse
-		if(self::$use_ss_sendfile) {
-			if(ClassInfo::exists('SS_HTTPRequest')) {
+		if (self::$use_ss_sendfile) {
+			if (ClassInfo::exists('SS_HTTPRequest')) {
 				return SS_HTTPRequest::send_file(file_get_contents($file_path), $file_name);
 			} else {
 				return HTTPRequest::send_file(file_get_contents($file_path), $file_name);
@@ -198,15 +198,15 @@ 
 		header("Content-Length: {$file_size}");
 		header("Pragma: ");
 		
-		if(self::$use_x_sendfile) {
+		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')) {
+		} elseif ($filePointer = @fopen($file_path, 'rb')) {
 			session_write_close();
 			$this->flush();
 			// Push the file while not EOF and connection exists
-			while(!feof($filePointer) && !connection_aborted()) {
+			while (!feof($filePointer) && !connection_aborted()) {
 				print(fread($filePointer, 1024 * self::$chunck_size_kb));
 				$this->flush();
 			}
@@ -223,7 +223,7 @@ 
 	 * @see http://nz.php.net/manual/en/function.flush.php#93531
 	 */
 	function flush() {
-		if(ob_get_length()) {
+		if (ob_get_length()) {
 			@ob_flush();
 			@flush();
 			@ob_end_flush();

code/AdvertController.php

Spacing +11 added lines, -11 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;
@@ -53,7 +53,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;
@@ -108,8 +108,8 @@ 
 	 * @param int $kilobytes
 	 */
 	static function set_chunk_size($kilobytes) {
-		$kilobytes = max(0, (int)$kilobytes);
-		if(!$kilobytes) user_error("Invalid download chunk size", E_USER_ERROR);
+		$kilobytes = max(0, (int) $kilobytes);
+		if (!$kilobytes) user_error("Invalid download chunk size", E_USER_ERROR);
 		self::$chunck_size_kb = $kilobytes;
 	}
 	
@@ -147,8 +147,8 @@ 
 		$file_size = filesize($file_path);
 		
 		// Testing mode - return an HTTPResponse
-		if(self::$use_ss_sendfile) {
-			if(ClassInfo::exists('SS_HTTPRequest')) {
+		if (self::$use_ss_sendfile) {
+			if (ClassInfo::exists('SS_HTTPRequest')) {
 				return SS_HTTPRequest::send_file(file_get_contents($file_path), $file_name);
 			} else {
 				return HTTPRequest::send_file(file_get_contents($file_path), $file_name);
@@ -163,15 +163,15 @@ 
 		header("Content-Length: {$file_size}");
 		header("Pragma: ");
 		
-		if(self::$use_x_sendfile) {
+		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')) {
+		} elseif ($filePointer = @fopen($file_path, 'rb')) {
 			session_write_close();
 			$this->flush();
 			// Push the file while not EOF and connection exists
-			while(!feof($filePointer) && !connection_aborted()) {
+			while (!feof($filePointer) && !connection_aborted()) {
 				//error_log("Sending $chunck_size_kb kb");
 				print(fread($filePointer, 1024 * self::$chunck_size_kb));
 				$this->flush();
@@ -189,7 +189,7 @@ 
 	 * @see http://nz.php.net/manual/en/function.flush.php#93531
 	 */
 	function flush() {
-		if(ob_get_length()) {
+		if (ob_get_length()) {
 			@ob_flush();
 			@flush();
 			@ob_end_flush();

code/Advert.php

Spacing +5 added lines, -5 removed lines

@@ -85,7 +85,7 @@ 
 
 
     // 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
@@ -107,10 +107,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'));
@@ -150,8 +150,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/AdvertReport.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     }
  
     public function sourceRecords($params = null) {
-        return DataList::create('Advert');//->limit(10);
+        return DataList::create('Advert'); //->limit(10);
     }
 
 

code/AdvertLayoutType.php

Spacing +5 added lines, -5 removed lines

@@ -43,13 +43,13 @@
     $fields = new FieldList();
 
     // add a tab
-    $fields->push( new TabSet( "Root", $mainTab = new Tab( "Main" ) ) );
-    $mainTab->setTitle( _t( 'SiteTree.TABMAIN', "Main" ) );
+    $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 NumericField( 'Width', 'The width of the advert in pixels' )  );
-    $fields->addFieldToTab( 'Root.Main', new NumericField( 'Height', 'The height of the advert in pixels' )  );
+    $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'));
 
     return $fields;
   }

code/AdvertAdmin.php

Spacing +1 added lines, -1 removed lines

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

code/AdvertControllerExtension.php

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
 	@param $numberofads - the number of adverts to search for.  Normally 1 but skyscraper needs 2
 	@param $showonajax - set this to false to hide adverts on ajax
 	*/
-	function RenderAdvert($cachekey,$adverttype,$template='InlineAdvert', $numberofads = 1, $showonajax = true) {
+	function RenderAdvert($cachekey, $adverttype, $template = 'InlineAdvert', $numberofads = 1, $showonajax = true) {
 			// If we are using ajax and showonajax is set to false, return no ad
 		if (Director::is_ajax()) {
 			if ($showonajax !== true) {
@@ -36,7 +36,7 @@ 
 		if (isset($cachedcategories[$advertcategoryid])) {
 			$advertcategory = $cachedcategories[$advertcategoryid];
 		}
-		if (!isset($advertcategory) ){
+		if (!isset($advertcategory)) {
 			$advertcategory = AdvertCategory::get()->byID($advertcategoryid);
 			$cachedcategories[$advertcategoryid] = $advertcategory;
 		}
@@ -46,7 +46,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/AdvertSiteTreeExtension.php

Spacing +3 added lines, -3 removed lines

@@ -19,10 +19,10 @@ 
   /*
   Add a Location tab containing the map
   */
-  public function updateCMSFields( FieldList $fields ) {
+  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);
+    $fields->addFieldToTab("Root.AdvertCategory", $categoryfield);
   }
 
   /*
@@ -56,7 +56,7 @@ 
 
 		// if the record is not marked as cached, see if it has a category
 		if (!$this->owner->IsCached) {
-			if($this->owner->AdvertCategoryID > 0) {
+			if ($this->owner->AdvertCategoryID > 0) {
 				$this->owner->CachedAdvertCategoryID = $this->owner->AdvertCategoryID;
 				$this->owner->IsCached = true;
 				$this->owner->write;

code/AdvertCategory.php

Spacing +4 added lines, -4 removed lines

@@ -43,12 +43,12 @@
     $fields = new FieldList();
 
     // add a tab
-    $fields->push( new TabSet( "Root", $mainTab = new Tab( "Main" ) ) );
-    $mainTab->setTitle( _t( 'SiteTree.TABMAIN', "Main" ) );
+    $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 CheckboxField( 'Enabled', 'Are adverts for this category enabled?' )  );
+    $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;
   }