gordonbanderson / weboftalent-adverts

code/SecureFileController.php

Indentation +228 added lines, -228 removed lines

@@ -9,238 +9,238 @@
  */
 class SecureFileController extends Controller implements PermissionProvider {
 	
-	/**
-	 * @var array Disallow all public actions on this controller
-	 */
-	public static $allowed_actions = array();
-	
-	/**
-	 * @var string htaccess file as set by apache config
-	 */
-	protected static $htaccess_file = ".htaccess";
-	
-	/**
-	 * @var integer Size of output chunks in kb while in PHP fread mode.
-	 */
-	protected static $chunck_size_kb = 32;
-	
-	/**
-	 * @var boolean Flag use X-Sendfile header mode instead of PHP fread mode.
-	 */
-	protected static $use_x_sendfile = false;
-	
-	/**
-	 * @var boolean Flag use SilverStripe send file method.
-	 */
-	protected static $use_ss_sendfile = false;
-	
-	/**
-	 * @var array i18n data for not authorized message as passed to _t
-	 */
-	protected static $i18n_not_authorized = array('SecureFiles.NOTAUTHORIZED', 'Not Authorized');
-	
-	/**
-	 * @var array i18n data for not found message as passed to _t
-	 */
-	protected static $i18n_not_found = array('SecureFiles.NOTFOUND', 'Not Found');
-	
-	/**
-	 * Use X-Sendfile headers to send files to the browser.
-	 * This is quicker than pushing files through PHP but
-	 * requires either Lighttpd or mod_xsendfile for Apache
-	 * @link http://tn123.ath.cx/mod_xsendfile/ 
-	 */
-	static function use_x_sendfile_method() {
-		self::use_default_sendfile_method();
-		self::$use_x_sendfile = true;
-	}
-	
-	/**
-	 * Use internal SilverStripe to send files to the browser.
-	 * This is the least efficient method but is useful for 
-	 * testing. Not recommend for production
-	 * environments.
-	 */
-	static function use_ss_sendfile_method() {
-		self::use_default_sendfile_method();
-		self::$use_ss_sendfile = true;
-	}
-	
-	/**
-	 * Use the default chuncked file method to send files to the browser.
-	 * This is the default method.
-	 */
-	static function use_default_sendfile_method() {
-		self::$use_ss_sendfile = false;
-		self::$use_x_sendfile = false;
-	}
-	
-	/**
-	 * Set the size of upload chunk in bytes.
-	 * @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);
-		self::$chunck_size_kb = $kilobytes;
-	}
-	
-	/**
-	 * Set the Apache access file name (.htaccess by default)
-	 * as determined by the AccessFileName Apache directive.
-	 * @param string $filename
-	 */
-	static function set_access_filename($filename) {
-		self::$htaccess_file = $filename;
-	}
-	
-	/**
-	 * Get the Apache access file name
-	 * @return string
-	 */
-	static function get_access_filename() {
-		return self::$htaccess_file;
-	}
-	
-	/**
-	 * Set a 'not authorized' message to replace the standard string
-	 * @param $message HTML body of 401 Not Authorized response
-	 * @param $i18n Reference to i18n path
-	 */
-	static function set_not_authorized_text($message = "Not Authorized", $i18n = "SecureFiles.NOTAUTHORIZED") {
-		self::$i18n_not_authorized = array($i18n, $message);
-	}
-	
-	/**
-	 * Set a 'not found' message to replace the standard string
-	 * @param $message HTML body of 404 Not Found response
-	 * @param $i18n Reference to i18n path
-	 */
-	static function set_not_found_text($message = "Not Found", $i18n = "SecureFiles.NOTFOUND") {
-		self::$i18n_not_found = array($i18n, $message);
-	}
-	
-	/**
-	 * Process incoming requests passed to this controller
-	 * 
-	 * @return HTTPResponse
-	 */
-	function handleAction() {
-		$url = array_key_exists('url', $_GET) ? $_GET['url'] : $_SERVER['REQUEST_URI'];
-		$file_path = Director::makeRelative($url);
-		$file = File::find($file_path);
+    /**
+     * @var array Disallow all public actions on this controller
+     */
+    public static $allowed_actions = array();
+	
+    /**
+     * @var string htaccess file as set by apache config
+     */
+    protected static $htaccess_file = ".htaccess";
+	
+    /**
+     * @var integer Size of output chunks in kb while in PHP fread mode.
+     */
+    protected static $chunck_size_kb = 32;
+	
+    /**
+     * @var boolean Flag use X-Sendfile header mode instead of PHP fread mode.
+     */
+    protected static $use_x_sendfile = false;
+	
+    /**
+     * @var boolean Flag use SilverStripe send file method.
+     */
+    protected static $use_ss_sendfile = false;
+	
+    /**
+     * @var array i18n data for not authorized message as passed to _t
+     */
+    protected static $i18n_not_authorized = array('SecureFiles.NOTAUTHORIZED', 'Not Authorized');
+	
+    /**
+     * @var array i18n data for not found message as passed to _t
+     */
+    protected static $i18n_not_found = array('SecureFiles.NOTFOUND', 'Not Found');
+	
+    /**
+     * Use X-Sendfile headers to send files to the browser.
+     * This is quicker than pushing files through PHP but
+     * requires either Lighttpd or mod_xsendfile for Apache
+     * @link http://tn123.ath.cx/mod_xsendfile/ 
+     */
+    static function use_x_sendfile_method() {
+        self::use_default_sendfile_method();
+        self::$use_x_sendfile = true;
+    }
+	
+    /**
+     * Use internal SilverStripe to send files to the browser.
+     * This is the least efficient method but is useful for 
+     * testing. Not recommend for production
+     * environments.
+     */
+    static function use_ss_sendfile_method() {
+        self::use_default_sendfile_method();
+        self::$use_ss_sendfile = true;
+    }
+	
+    /**
+     * Use the default chuncked file method to send files to the browser.
+     * This is the default method.
+     */
+    static function use_default_sendfile_method() {
+        self::$use_ss_sendfile = false;
+        self::$use_x_sendfile = false;
+    }
+	
+    /**
+     * Set the size of upload chunk in bytes.
+     * @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);
+        self::$chunck_size_kb = $kilobytes;
+    }
+	
+    /**
+     * Set the Apache access file name (.htaccess by default)
+     * as determined by the AccessFileName Apache directive.
+     * @param string $filename
+     */
+    static function set_access_filename($filename) {
+        self::$htaccess_file = $filename;
+    }
+	
+    /**
+     * Get the Apache access file name
+     * @return string
+     */
+    static function get_access_filename() {
+        return self::$htaccess_file;
+    }
+	
+    /**
+     * Set a 'not authorized' message to replace the standard string
+     * @param $message HTML body of 401 Not Authorized response
+     * @param $i18n Reference to i18n path
+     */
+    static function set_not_authorized_text($message = "Not Authorized", $i18n = "SecureFiles.NOTAUTHORIZED") {
+        self::$i18n_not_authorized = array($i18n, $message);
+    }
+	
+    /**
+     * Set a 'not found' message to replace the standard string
+     * @param $message HTML body of 404 Not Found response
+     * @param $i18n Reference to i18n path
+     */
+    static function set_not_found_text($message = "Not Found", $i18n = "SecureFiles.NOTFOUND") {
+        self::$i18n_not_found = array($i18n, $message);
+    }
+	
+    /**
+     * Process incoming requests passed to this controller
+     * 
+     * @return HTTPResponse
+     */
+    function handleAction() {
+        $url = array_key_exists('url', $_GET) ? $_GET['url'] : $_SERVER['REQUEST_URI'];
+        $file_path = Director::makeRelative($url);
+        $file = File::find($file_path);
 		
-		if($file instanceof File) {
-			if ($file->canView()) {
-				$file->extend('onAccessGranted');
-				return $this->fileFound($file, $file_path);
-			} else {
-				$file->extend('onAccessDenied');
-				return $this->fileNotAuthorized(call_user_func_array('_t', self::$i18n_not_authorized));
-			}
-		} else {
-			return $this->fileNotFound(call_user_func_array('_t', self::$i18n_not_found));
-		}
-	}
-	
-	/**
-	 * File Not Found response
-	 * 
-	 * @param $body Optional message body
-	 * @return HTTPResponse
-	 */
-	function fileNotFound($body = "") {
-		if(ClassInfo::exists('SS_HTTPResponse')) {
-			return new SS_HTTPResponse($body, 404);
-		} else {
-			return new HTTPResponse($body, 404);
-		}
-	}
-	
-	/**
-	 * File not authorized response
-	 * 
-	 * @param $body Optional message body
-	 * @return HTTPResponse
-	 */
-	function fileNotAuthorized($body = "") {
-		Security::permissionFailure($this, $body);
-	}
-	
-	/**
-	 * File found response
-	 *
-	 * @param $file File to send
-	 * @param $alternate_path string If supplied, return the file from this path instead, for
-	 * example, resampled images.
-	 */
-	function fileFound(File $file, $alternate_path = null) {
+        if($file instanceof File) {
+            if ($file->canView()) {
+                $file->extend('onAccessGranted');
+                return $this->fileFound($file, $file_path);
+            } else {
+                $file->extend('onAccessDenied');
+                return $this->fileNotAuthorized(call_user_func_array('_t', self::$i18n_not_authorized));
+            }
+        } else {
+            return $this->fileNotFound(call_user_func_array('_t', self::$i18n_not_found));
+        }
+    }
+	
+    /**
+     * File Not Found response
+     * 
+     * @param $body Optional message body
+     * @return HTTPResponse
+     */
+    function fileNotFound($body = "") {
+        if(ClassInfo::exists('SS_HTTPResponse')) {
+            return new SS_HTTPResponse($body, 404);
+        } else {
+            return new HTTPResponse($body, 404);
+        }
+    }
+	
+    /**
+     * File not authorized response
+     * 
+     * @param $body Optional message body
+     * @return HTTPResponse
+     */
+    function fileNotAuthorized($body = "") {
+        Security::permissionFailure($this, $body);
+    }
+	
+    /**
+     * File found response
+     *
+     * @param $file File to send
+     * @param $alternate_path string If supplied, return the file from this path instead, for
+     * example, resampled images.
+     */
+    function fileFound(File $file, $alternate_path = null) {
 		
-		// File properties
-		$file_name = $file->Name;
-		$file_path = Director::getAbsFile($alternate_path ? $alternate_path : $file->FullPath);
-		$file_size = filesize($file_path);
+        // File properties
+        $file_name = $file->Name;
+        $file_path = Director::getAbsFile($alternate_path ? $alternate_path : $file->FullPath);
+        $file_size = filesize($file_path);
 		
-		// Testing mode - return an HTTPResponse
-		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);
-			}
-		}
+        // Testing mode - return an HTTPResponse
+        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);
+            }
+        }
 		
-		// Normal operation:
-		$mimeType = HTTP::getMimeType($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: ");
+        // Normal operation:
+        $mimeType = HTTP::getMimeType($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);
-			exit();
-		} 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()) {
-				print(fread($filePointer, 1024 * self::$chunck_size_kb));
-				$this->flush();
-			}
-			fclose($filePointer);
-			exit();
-		} else {
-			// Edge case - either not found anymore or can't read
-			return $this->fileNotFound();
-		}
-	}
-	
-	/**
-	 * Flush the output buffer to the server (if possible).
-	 * @see http://nz.php.net/manual/en/function.flush.php#93531
-	 */
-	function flush() {
-		if(ob_get_length()) {
-			@ob_flush();
-			@flush();
-			@ob_end_flush();
-		}
-		@ob_start();
-	}
-	
-	/**
-	 * Permission provider for access to secure files
-	 * 
-	 * @return array
-	 */
-	function providePermissions() {
-		return array(
-			'SECURE_FILE_ACCESS' => _t('SecureFiles.SECUREFILEACCESS', 'Access to Secured Files'),
-			'SECURE_FILE_SETTINGS' => _t('SecureFiles.SECUREFILESETTINGS', 'Manage File Security Settings')
-		);
-	}
+        if(self::$use_x_sendfile) {
+            session_write_close();
+            header('X-Sendfile: '.$file_path);
+            exit();
+        } 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()) {
+                print(fread($filePointer, 1024 * self::$chunck_size_kb));
+                $this->flush();
+            }
+            fclose($filePointer);
+            exit();
+        } else {
+            // Edge case - either not found anymore or can't read
+            return $this->fileNotFound();
+        }
+    }
+	
+    /**
+     * Flush the output buffer to the server (if possible).
+     * @see http://nz.php.net/manual/en/function.flush.php#93531
+     */
+    function flush() {
+        if(ob_get_length()) {
+            @ob_flush();
+            @flush();
+            @ob_end_flush();
+        }
+        @ob_start();
+    }
+	
+    /**
+     * Permission provider for access to secure files
+     * 
+     * @return array
+     */
+    function providePermissions() {
+        return array(
+            'SECURE_FILE_ACCESS' => _t('SecureFiles.SECUREFILEACCESS', 'Access to Secured Files'),
+            'SECURE_FILE_SETTINGS' => _t('SecureFiles.SECUREFILESETTINGS', 'Manage File Security Settings')
+        );
+    }
 
 }
\ No newline at end of file

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();

Braces +3 added lines, -1 removed lines

@@ -81,7 +81,9 @@
 	 */
 	static function set_chunk_size($kilobytes) {
 		$kilobytes = max(0, (int)$kilobytes);
-		if(!$kilobytes) user_error("Invalid download chunk size", E_USER_ERROR);
+		if(!$kilobytes) {
+		    user_error("Invalid download chunk size", E_USER_ERROR);
+		}
 		self::$chunck_size_kb = $kilobytes;
 	}
 	

code/AdvertController.php

Indentation +162 added lines, -162 removed lines

@@ -1,23 +1,23 @@ 
 <?php
-	class Advert_Controller extends Controller {
+    class Advert_Controller extends Controller {
 
 
-		/**
-		 * @var integer Size of output chunks in kb while in PHP fread mode.
-		 */
-		protected static $chunck_size_kb = 32;
+        /**
+         * @var integer Size of output chunks in kb while in PHP fread mode.
+         */
+        protected static $chunck_size_kb = 32;
 		
-		/**
-		 * @var boolean Flag use X-Sendfile header mode instead of PHP fread mode.
-		 */
-		protected static $use_x_sendfile = false;
+        /**
+         * @var boolean Flag use X-Sendfile header mode instead of PHP fread mode.
+         */
+        protected static $use_x_sendfile = false;
 		
-		/**
-		 * @var boolean Flag use SilverStripe send file method.
-		 */
-		protected static $use_ss_sendfile = false;
+        /**
+         * @var boolean Flag use SilverStripe send file method.
+         */
+        protected static $use_ss_sendfile = false;
 
-		/*
+        /*
 		When a URL of the following form is clicked,
 		http://SERVER/advert/26b0c28f4566dc54cc66770bdda86017851bd3dbbd4ac5868c63e003903dc8dc9b88b209bba54f1b5e6f4c3cf1295e58298e7d5a58b6c8ff02df9130ffd4ac30
 		a search is made for the digital signature in the adverts (this is indexed in the database)
@@ -26,44 +26,44 @@ 
 
 		If a record is not found a 404 is returned
 		*/
-		public function click($args) {
-	    	$params = $args->allParams();
-	    	$digsig = $params['DigitalSignature'];
+        public function click($args) {
+            $params = $args->allParams();
+            $digsig = $params['DigitalSignature'];
 
-	    	$advert = Advert::get()->filter('DigitalSignature', $digsig)->first(); // should only be the one but make sure
+            $advert = Advert::get()->filter('DigitalSignature', $digsig)->first(); // should only be the one but make sure
 	    	
-	    	if (!$advert) {
-	    		$this->httpError(404, 'Advert "'.$digsig.'"" not found');
-	    	} else {
-	    		// record the click
-	    		$advert->Clickthroughs = $advert->Clickthroughs + 1;
-	    		$advert->write();
-	    		// documentation here states temporary directs are used, http://doc.silverstripe.org/framework/en/topics/controller
-	    		// this means the browser wont store the redirect and thus bypass the clickthrough recording
-	    		return $this->redirect($advert->WebsiteLink);
-	    	}
+            if (!$advert) {
+                $this->httpError(404, 'Advert "'.$digsig.'"" not found');
+            } else {
+                // record the click
+                $advert->Clickthroughs = $advert->Clickthroughs + 1;
+                $advert->write();
+                // documentation here states temporary directs are used, http://doc.silverstripe.org/framework/en/topics/controller
+                // this means the browser wont store the redirect and thus bypass the clickthrough recording
+                return $this->redirect($advert->WebsiteLink);
+            }
 
 	    	
-		}
-
-
-		public function image($args) {
-	    	$params = $args->allParams();
-	    	$digsig = $params['DigitalSignature'];
-
-	    	$advert = Advert::get()->filter('DigitalSignature', $digsig)->first(); // should only be the one but make sure
-	    	if (!$advert) {
-	    		$this->httpError(404, 'Advert "'.$digsig.'"" not found');
-	    	} else {
-	    		// record the click
-	    		$advert->Impressions = $advert->Impressions + 1;
-	    		$advert->write();
-	    		// documentation here states temporary directs are used, http://doc.silverstripe.org/framework/en/topics/controller
-	    		// this means the browser wont store the redirect and thus bypass the clickthrough recording
-
-	    		return $this->fileFound($advert->AdvertImage());
-	    	}
-		}
+        }
+
+
+        public function image($args) {
+            $params = $args->allParams();
+            $digsig = $params['DigitalSignature'];
+
+            $advert = Advert::get()->filter('DigitalSignature', $digsig)->first(); // should only be the one but make sure
+            if (!$advert) {
+                $this->httpError(404, 'Advert "'.$digsig.'"" not found');
+            } else {
+                // record the click
+                $advert->Impressions = $advert->Impressions + 1;
+                $advert->write();
+                // documentation here states temporary directs are used, http://doc.silverstripe.org/framework/en/topics/controller
+                // this means the browser wont store the redirect and thus bypass the clickthrough recording
+
+                return $this->fileFound($advert->AdvertImage());
+            }
+        }
 	
 
 
@@ -72,129 +72,129 @@ 
 
 
 
-	/**
-	 * Use X-Sendfile headers to send files to the browser.
-	 * This is quicker than pushing files through PHP but
-	 * requires either Lighttpd or mod_xsendfile for Apache
-	 * @link http://tn123.ath.cx/mod_xsendfile/ 
-	 */
-	static function use_x_sendfile_method() {
-		self::use_default_sendfile_method();
-		self::$use_x_sendfile = true;
-	}
+    /**
+     * Use X-Sendfile headers to send files to the browser.
+     * This is quicker than pushing files through PHP but
+     * requires either Lighttpd or mod_xsendfile for Apache
+     * @link http://tn123.ath.cx/mod_xsendfile/ 
+     */
+    static function use_x_sendfile_method() {
+        self::use_default_sendfile_method();
+        self::$use_x_sendfile = true;
+    }
 	
-	/**
-	 * Use internal SilverStripe to send files to the browser.
-	 * This is the least efficient method but is useful for 
-	 * testing. Not recommend for production
-	 * environments.
-	 */
-	static function use_ss_sendfile_method() {
-		self::use_default_sendfile_method();
-		self::$use_ss_sendfile = true;
-	}
+    /**
+     * Use internal SilverStripe to send files to the browser.
+     * This is the least efficient method but is useful for 
+     * testing. Not recommend for production
+     * environments.
+     */
+    static function use_ss_sendfile_method() {
+        self::use_default_sendfile_method();
+        self::$use_ss_sendfile = true;
+    }
 	
-	/**
-	 * Use the default chuncked file method to send files to the browser.
-	 * This is the default method.
-	 */
-	static function use_default_sendfile_method() {
-		self::$use_ss_sendfile = false;
-		self::$use_x_sendfile = false;
-	}
+    /**
+     * Use the default chuncked file method to send files to the browser.
+     * This is the default method.
+     */
+    static function use_default_sendfile_method() {
+        self::$use_ss_sendfile = false;
+        self::$use_x_sendfile = false;
+    }
 	
-	/**
-	 * Set the size of upload chunk in bytes.
-	 * @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);
-		self::$chunck_size_kb = $kilobytes;
-	}
+    /**
+     * Set the size of upload chunk in bytes.
+     * @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);
+        self::$chunck_size_kb = $kilobytes;
+    }
 	
-	/**
-	 * Set the Apache access file name (.htaccess by default)
-	 * as determined by the AccessFileName Apache directive.
-	 * @param string $filename
-	 */
-	static function set_access_filename($filename) {
-		self::$htaccess_file = $filename;
-	}
+    /**
+     * Set the Apache access file name (.htaccess by default)
+     * as determined by the AccessFileName Apache directive.
+     * @param string $filename
+     */
+    static function set_access_filename($filename) {
+        self::$htaccess_file = $filename;
+    }
 	
-	/**
-	 * Get the Apache access file name
-	 * @return string
-	 */
-	static function get_access_filename() {
-		return self::$htaccess_file;
-	}
-
-
-
-	/**
-	 * File found response
-	 *
-	 * @param $file File to send
-	 * @param $alternate_path string If supplied, return the file from this path instead, for
-	 * example, resampled images.
-	 */
-	function fileFound(File $file, $alternate_path = null) {
+    /**
+     * Get the Apache access file name
+     * @return string
+     */
+    static function get_access_filename() {
+        return self::$htaccess_file;
+    }
+
+
+
+    /**
+     * File found response
+     *
+     * @param $file File to send
+     * @param $alternate_path string If supplied, return the file from this path instead, for
+     * example, resampled images.
+     */
+    function fileFound(File $file, $alternate_path = null) {
 		
-		// File properties
-		$file_name = $file->Name;
-		$file_path = Director::getAbsFile($alternate_path ? $alternate_path : $file->FullPath);
-		$file_size = filesize($file_path);
+        // File properties
+        $file_name = $file->Name;
+        $file_path = Director::getAbsFile($alternate_path ? $alternate_path : $file->FullPath);
+        $file_size = filesize($file_path);
 		
-		// Testing mode - return an HTTPResponse
-		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);
-			}
-		}
+        // Testing mode - return an HTTPResponse
+        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);
+            }
+        }
 		
-		// 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("Cache-Control: max-age=1, private");
-		header("Content-Length: {$file_size}");
-		header("Pragma: ");
+        // 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("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);
-			exit();
-		} 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()) {
-				//error_log("Sending $chunck_size_kb kb");
-				print(fread($filePointer, 1024 * self::$chunck_size_kb));
-				$this->flush();
-			}
-			fclose($filePointer);
-			exit();
-		} else {
-			// Edge case - either not found anymore or can't read
-			return $this->fileNotFound();
-		}
-	}
+        if(self::$use_x_sendfile) {
+            session_write_close();
+            header('X-Sendfile: '.$file_path);
+            exit();
+        } 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()) {
+                //error_log("Sending $chunck_size_kb kb");
+                print(fread($filePointer, 1024 * self::$chunck_size_kb));
+                $this->flush();
+            }
+            fclose($filePointer);
+            exit();
+        } else {
+            // Edge case - either not found anymore or can't read
+            return $this->fileNotFound();
+        }
+    }
 	
-	/**
-	 * Flush the output buffer to the server (if possible).
-	 * @see http://nz.php.net/manual/en/function.flush.php#93531
-	 */
-	function flush() {
-		if(ob_get_length()) {
-			@ob_flush();
-			@flush();
-			@ob_end_flush();
-		}
-		@ob_start();
-	}
+    /**
+     * Flush the output buffer to the server (if possible).
+     * @see http://nz.php.net/manual/en/function.flush.php#93531
+     */
+    function flush() {
+        if(ob_get_length()) {
+            @ob_flush();
+            @flush();
+            @ob_end_flush();
+        }
+        @ob_start();
+    }
 
 }
\ No newline at end of file

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();

Braces +3 added lines, -1 removed lines

@@ -109,7 +109,9 @@
 	 */
 	static function set_chunk_size($kilobytes) {
 		$kilobytes = max(0, (int)$kilobytes);
-		if(!$kilobytes) user_error("Invalid download chunk size", E_USER_ERROR);
+		if(!$kilobytes) {
+		    user_error("Invalid download chunk size", E_USER_ERROR);
+		}
 		self::$chunck_size_kb = $kilobytes;
 	}
 	

code/Advert.php

Indentation +19 added lines, -19 removed lines

@@ -6,15 +6,15 @@ 
 class Advert extends DataObject {
 
 
-  static $searchable_fields = array(
+    static $searchable_fields = array(
     'WebsiteLink',
- );
+    );
 
 
  
 
 
-  static $db = array(
+    static $db = array(
     // title to show in model admin
     'Title' => 'Varchar(255)',
 
@@ -39,28 +39,28 @@ 
     // stats
     'Impressions' => 'Int',
     'Clickthroughs' => 'Int',
- );
+    );
 
 
 
 
-  static $has_one = array(
+    static $has_one = array(
     'AdvertImage' => 'Image',
     'AdvertCategory' => "AdvertCategory",
     "AdvertLayoutType" => "AdvertLayoutType"
- );
+    );
 
 
-  public static $summary_fields = array(
+    public static $summary_fields = array(
     'Title' => 'Title',
     'AdvertCategory.Title',
     '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
     static $indexes = array(
         'DigitalSignature' => true,
         'StartDate' => '(StartDate)',
@@ -72,11 +72,11 @@ 
 
 
 
-  function getCMSFields() {
+    function getCMSFields() {
 
     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
@@ -91,13 +91,13 @@ 
     // 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>';
         $fields->addFieldToTab('Root.Main', new LiteralField('ImageInfo', $html));
     } else {
-       $fields->addFieldToTab('Root.Main', $imageUploader = new UploadField('AdvertImage', 
+        $fields->addFieldToTab('Root.Main', $imageUploader = new UploadField('AdvertImage', 
         'Image that will be shown as the actual advert'));
         Folder::find_or_make('ads');
         $imageUploader->setFolderName('ads'
@@ -129,21 +129,21 @@ 
     $fields->addFieldToTab('Root.Main', $layoutfield);
 
     return $fields;
-  }
+    }
 
 
 
-  public function onBeforeWrite() {
+    public function onBeforeWrite() {
     $this->DigitalSignature = $this->CalculateDigitalSignature();
     //error_log("DIG SIG:".$this->DigitalSignature);
     parent::onBeforeWrite();
-  }
+    }
 
 
-  /*
+    /*
     Calculate a digital signature from several of the fields
   */
-  public function CalculateDigitalSignature() {
+    public function CalculateDigitalSignature() {
     //error_log("Calculating dig sig");
     /* because we save the impression counter on every rendition this cannot include
     - number of impressions
@@ -155,7 +155,7 @@ 
     $hashed = hash('sha512', $data);
     //error_log("HASH CREATED:".$hashed);
     return $hashed;
-  }
+    }
 
 
 

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

Indentation +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
             50
         );
 
-       // $df->setSize(100);
+        // $df->setSize(100);
         $params->push($df);
                  
         return $params;

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

Indentation +10 added lines, -10 removed lines

@@ -7,39 +7,39 @@ 
 class AdvertLayoutType extends DataObject {
 
 
-  static $searchable_fields = array(
+    static $searchable_fields = array(
     'Title',
-  );
+    );
 
 
  
 
 
-  static $db = array(
+    static $db = array(
     // name of the layout type, e.g. 'main banner' or 'skyscraper'
     'Title' => 'Varchar(255)',
 
     // whether or not ads are enabled
     'Width' => 'Int',
     'Height' => 'Int'
-  );
+    );
 
 
 
-  public static $summary_fields = array(
+    public static $summary_fields = array(
     'Title' => 'Title',
     'Width' => 'Width',
     'Height' => 'Height'
-  );
+    );
 
-  static $has_many = array(
+    static $has_many = array(
     'Adverts' => 'Advert'
-  );
+    );
 
 
 
 
-  function getCMSFields() {
+    function getCMSFields() {
     $fields = new FieldList();
 
     // add a tab
@@ -52,7 +52,7 @@ 
     $fields->addFieldToTab( 'Root.Main', new NumericField( 'Height', 'The height of the advert in pixels' )  );
 
     return $fields;
-  }
+    }
 
 }
 

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

Indentation +5 added lines, -5 removed lines

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

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

Indentation +12 added lines, -12 removed lines

@@ -3,22 +3,22 @@
 class AdvertSiteConfig extends DataExtension {     
 
 		
-	 public static $db = array(			
-		'MpuAboveFoldPosition' => 'Int',
-		'MpuBelowFoldPosition' => 'Int'				
-	  );
+        public static $db = array(			
+        'MpuAboveFoldPosition' => 'Int',
+        'MpuBelowFoldPosition' => 'Int'				
+        );
 
 
-	public static $defaults = array(
-		'MpuAboveFoldPosition' => '4',
-		'MpuBelowFoldPosition' => '11'	
-	);
+    public static $defaults = array(
+        'MpuAboveFoldPosition' => '4',
+        'MpuBelowFoldPosition' => '11'	
+    );
  
     public function updateCMSFields(FieldList $fields) {
-	   $fields->addFieldToTab("Root.Advert", new NumericField("MpuAboveFoldPosition", 
-	   									"Position the list for the MPU advert above the fold"));
-	   $fields->addFieldToTab("Root.Advert", new NumericField("MpuBelowFoldPosition", 
-	   									"Position the list for the MPU advert below the fold"));
+        $fields->addFieldToTab("Root.Advert", new NumericField("MpuAboveFoldPosition", 
+                                            "Position the list for the MPU advert above the fold"));
+        $fields->addFieldToTab("Root.Advert", new NumericField("MpuBelowFoldPosition", 
+                                            "Position the list for the MPU advert below the fold"));
 	  
     }
 }

code/AdvertControllerExtension.php

Indentation +69 added lines, -69 removed lines

@@ -2,19 +2,19 @@ 
 
 class AdvertControllerExtension extends DataExtension {
 
-	/*
+    /*
 	Store id to advert category to avoid multiple same queries
 	*/
-	private static $cachedcategories = array();
+    private static $cachedcategories = array();
 
-	/*
+    /*
 	In order to prevent duplicate image adverts, stores those already served this request/response cycle
 	*/
-	private static $advertsalreadyserved = array();
+    private static $advertsalreadyserved = array();
 
-	static $ctr = 1;
+    static $ctr = 1;
 
-	/*
+    /*
 	Work out the appropriate category and render a random advert from that category
 	@param #adverttype The type of advert, e.g. MPU or Skyscraper
 	@param $prefix HTML prefix to the advert, e.g an li wrapper
@@ -22,67 +22,67 @@ 
 	@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) {
-			// If we are using ajax and showonajax is set to false, return no ad
-		if (Director::is_ajax()) {
-			if ($showonajax !== true) {
-				return '';
-			}
-		}
-
-		// this is from the advert model extension so will be in place
-		$advertcategoryid = $this->owner->CalculateAdvertCategoryID();
-
-		if (isset($cachedcategories[$advertcategoryid])) {
-			$advertcategory = $cachedcategories[$advertcategoryid];
-		}
-		if (!isset($advertcategory) ){
-			$advertcategory = AdvertCategory::get()->byID($advertcategoryid);
-			$cachedcategories[$advertcategoryid] = $advertcategory;
-		}
-
-		// check if the category is enabled, if not return a blank
-		if (isset($advertcategory) && $advertcategory->Enabled) {
-			$where = "AdvertLayoutType.Title = '$adverttype'";
-
-			if (isset($advertcategory)) {
-				$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) {
-					$csv = implode(',', array_keys(self::$advertsalreadyserved));
-					$where .= " and Advert.ID not in ($csv)";
-				}
-			}
-
-			$adverts = Advert::get()->
-					innerJoin('AdvertLayoutType', 'Advert.AdvertLayoutTypeID = AdvertLayoutType.ID')
-					->innerJoin('AdvertCategory', 'Advert.AdvertCategoryID = AdvertCategory.ID')
-
-					// filter does not work here, use where instead
-					->where($where)
-					->sort('RAND()')->limit($numberofads);
-
-			$firstad = null;
-
-			// datalist->first() was sometimes producing the same answer twice - SS bug?					
-			foreach ($adverts->getIterator() as $advert) {
-				self::$advertsalreadyserved[$advert->ID] = $advert->ID;
-				if ($firstad === null) {
-					$firstad = $advert;
-				}
-			}
-
-			$forTemplate = new ArrayData(array(
-	        	'Adverts' => $adverts,
-	        	'Advert' => $firstad,
-	        	'CacheKey' => $cachekey
-	      	));
-	    	return $forTemplate->renderWith($template);
-		} else {
-			// return a blank if the cateogry is not enabled
-			return '';
-		}
-
-	}
+    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) {
+                return '';
+            }
+        }
+
+        // this is from the advert model extension so will be in place
+        $advertcategoryid = $this->owner->CalculateAdvertCategoryID();
+
+        if (isset($cachedcategories[$advertcategoryid])) {
+            $advertcategory = $cachedcategories[$advertcategoryid];
+        }
+        if (!isset($advertcategory) ){
+            $advertcategory = AdvertCategory::get()->byID($advertcategoryid);
+            $cachedcategories[$advertcategoryid] = $advertcategory;
+        }
+
+        // check if the category is enabled, if not return a blank
+        if (isset($advertcategory) && $advertcategory->Enabled) {
+            $where = "AdvertLayoutType.Title = '$adverttype'";
+
+            if (isset($advertcategory)) {
+                $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) {
+                    $csv = implode(',', array_keys(self::$advertsalreadyserved));
+                    $where .= " and Advert.ID not in ($csv)";
+                }
+            }
+
+            $adverts = Advert::get()->
+                    innerJoin('AdvertLayoutType', 'Advert.AdvertLayoutTypeID = AdvertLayoutType.ID')
+                    ->innerJoin('AdvertCategory', 'Advert.AdvertCategoryID = AdvertCategory.ID')
+
+                    // filter does not work here, use where instead
+                    ->where($where)
+                    ->sort('RAND()')->limit($numberofads);
+
+            $firstad = null;
+
+            // datalist->first() was sometimes producing the same answer twice - SS bug?					
+            foreach ($adverts->getIterator() as $advert) {
+                self::$advertsalreadyserved[$advert->ID] = $advert->ID;
+                if ($firstad === null) {
+                    $firstad = $advert;
+                }
+            }
+
+            $forTemplate = new ArrayData(array(
+                'Adverts' => $adverts,
+                'Advert' => $firstad,
+                'CacheKey' => $cachekey
+                ));
+            return $forTemplate->renderWith($template);
+        } else {
+            // return a blank if the cateogry is not enabled
+            return '';
+        }
+
+    }
 }
\ No newline at end of file

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

Indentation +62 added lines, -62 removed lines

@@ -2,91 +2,91 @@
 
 class AdvertSiteTreeExtension extends DataExtension {
 
-	/*
+    /*
 	Any page in the site tree can have an advert category.  This is used to determine the category
 	of adverts served in the tree of pages below it.  THe cached value is used to avoid having to
 	recalculate it by traversing the tree each time.
 	*/
-  	static $has_one = array(
-  		'AdvertCategory' => 'AdvertCategory',
-  		'CachedAdvertCategory' => 'AdvertCategory',
+        static $has_one = array(
+            'AdvertCategory' => 'AdvertCategory',
+            'CachedAdvertCategory' => 'AdvertCategory',
 
-  		// it is possible that a cached value may be null, so in order to avoid traversing the tree
-  		// each page load, use this flag first
-  		'IsCached' => 'Boolean'
-  	);
+            // it is possible that a cached value may be null, so in order to avoid traversing the tree
+            // each page load, use this flag first
+            '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'));
+    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);
-  	//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) {
-  		//error_log("RESET CACHE");
+    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) {
+            //error_log("RESET CACHE");
   		
-  		// clear caching for live and stage subtree
-  		DB::query('update SiteTree_Live set IsCachedID = false, CachedAdvertCategoryID = 0;');
-  		DB::query('update SiteTree set IsCachedID = false, CachedAdvertCategoryID = 0;');
-  	} else {
-  		//error_log("CACHE CAN KEEP GOING");
-  	}
-  	parent::onBeforeWrite();
+            // clear caching for live and stage subtree
+            DB::query('update SiteTree_Live set IsCachedID = false, CachedAdvertCategoryID = 0;');
+            DB::query('update SiteTree set IsCachedID = false, CachedAdvertCategoryID = 0;');
+        } else {
+            //error_log("CACHE CAN KEEP GOING");
+        }
+        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() {
-		// use the cached value
-		$result = $this->owner->CachedAdvertCategoryID;
+    public function CalculateAdvertCategoryID() {
+        // use the cached value
+        $result = $this->owner->CachedAdvertCategoryID;
 
-		// if the record is not marked as cached, see if it has a category
-		if (!$this->owner->IsCached) {
-			if($this->owner->AdvertCategoryID > 0) {
-				$this->owner->CachedAdvertCategoryID = $this->owner->AdvertCategoryID;
-				$this->owner->IsCached = true;
-				$this->owner->write;
-				$result = $this->owner->CachedAdvertCategoryID;
-			} else 
-				// otherwise traverse each parent in turn until reaching the root of the site, i.e. no parent
-			{
-				$parent = SiteTree::get()->byId($this->owner->ParentID);
-				if ($parent) { 
-					while (true) {
-						//error_log("TRAVERSING UP THE TREE LOOKING FOR CATEGORY");
-						if ($parent->IsCached) {
-							$this->owner->AdvertCategoryID = $parent->AdvertCategoryID;
-							$this->owner->IsCached = true;
-							$this->owner->write();
-							$result = $this->owner->AdvertCategoryID;
-							break;
-						}
+        // if the record is not marked as cached, see if it has a category
+        if (!$this->owner->IsCached) {
+            if($this->owner->AdvertCategoryID > 0) {
+                $this->owner->CachedAdvertCategoryID = $this->owner->AdvertCategoryID;
+                $this->owner->IsCached = true;
+                $this->owner->write;
+                $result = $this->owner->CachedAdvertCategoryID;
+            } else 
+                // otherwise traverse each parent in turn until reaching the root of the site, i.e. no parent
+            {
+                $parent = SiteTree::get()->byId($this->owner->ParentID);
+                if ($parent) { 
+                    while (true) {
+                        //error_log("TRAVERSING UP THE TREE LOOKING FOR CATEGORY");
+                        if ($parent->IsCached) {
+                            $this->owner->AdvertCategoryID = $parent->AdvertCategoryID;
+                            $this->owner->IsCached = true;
+                            $this->owner->write();
+                            $result = $this->owner->AdvertCategoryID;
+                            break;
+                        }
 
-						$parent = SiteTree::get()->byId($parent->ParentID);
-						if (!$parent) {
-							break;
-						}
-					}
-				}
-			}
+                        $parent = SiteTree::get()->byId($parent->ParentID);
+                        if (!$parent) {
+                            break;
+                        }
+                    }
+                }
+            }
 			
-		}
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
 }

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;