gordonbanderson / weboftalent-contact-page

code/ContactPage.php

Spacing +52 added lines, -52 removed lines

@@ -39,9 +39,9 @@ 
 		} else {
 			$map = $this->owner->RenderMap();
 			// $map->setDelayLoadMapFunction( true );
-			$map->setZoom( 10 );
-			$map->setAdditionalCSSClasses( 'fullWidthMap' );
-			$map->setShowInlineMapDivStyle( true );
+			$map->setZoom(10);
+			$map->setAdditionalCSSClasses('fullWidthMap');
+			$map->setShowInlineMapDivStyle(true);
 			$map->setClusterer(false);
 			//$map->addKML('http://assets.tripodtravel.co.nz/cycling/meuang-nont-to-bang-sue-loop.kml');
 			return $map;
@@ -58,25 +58,25 @@ 
 
 		$fields->addFieldToTab('Root.Main', new CheckboxField('ShowOnMap', 'Tick this box to show a map'));
 
-		$fields->addFieldToTab( "Root.OnSubmission",
-			new TextField( 'Mailto', _t( 'ContactPage.EMAIL_SUBMISSIONS_TO', 'Email submissions to' )
-			) );
+		$fields->addFieldToTab("Root.OnSubmission",
+			new TextField('Mailto', _t('ContactPage.EMAIL_SUBMISSIONS_TO', 'Email submissions to')
+			));
 
-		$fields->addFieldToTab( "Root.OnSubmission",
-			new HTMLEditorField( 'SubmitText', _t( 'ContactPage.TEXT_SHOWN_AFTER_SUBMISSION', 'Text on Submission' ) ) );
+		$fields->addFieldToTab("Root.OnSubmission",
+			new HTMLEditorField('SubmitText', _t('ContactPage.TEXT_SHOWN_AFTER_SUBMISSION', 'Text on Submission')));
 
-		$fields->addFieldToTab( $addresstabname, new TextAreaField( 'ContactAddress', _t( 'ContactPage.ADDRESS', 'Address' ) ) );
-		$fields->addFieldToTab( $addresstabname, new TextField( 'ContactTelephoneNumber',
-				_t( 'ContactPage.CONTACT_TELEPHONE_NUMBER', 'Contact Tel. Number' ) ) );
-		$fields->addFieldToTab( $addresstabname, new TextField( 'ContactFaxNumber',
-				_t( 'ContactPage.CONTACT_FAX_NUMBER', 'Contact Fax Number' ) ) );
-		$fields->addFieldToTab( $addresstabname, new TextField( 'ContactEmailAddress',
-				_t( 'ContactPage.CONTACT_EMAIL_ADDRESS_ADMIN', '(TH) Contact Email Address' ) ) );
+		$fields->addFieldToTab($addresstabname, new TextAreaField('ContactAddress', _t('ContactPage.ADDRESS', 'Address')));
+		$fields->addFieldToTab($addresstabname, new TextField('ContactTelephoneNumber',
+				_t('ContactPage.CONTACT_TELEPHONE_NUMBER', 'Contact Tel. Number')));
+		$fields->addFieldToTab($addresstabname, new TextField('ContactFaxNumber',
+				_t('ContactPage.CONTACT_FAX_NUMBER', 'Contact Fax Number')));
+		$fields->addFieldToTab($addresstabname, new TextField('ContactEmailAddress',
+				_t('ContactPage.CONTACT_EMAIL_ADDRESS_ADMIN', '(TH) Contact Email Address')));
 
-		$fields->addFieldToTab( $socialmediatabname, new TextField( 'Facebook',
-				_t( 'ContactPage.FACEBOOK_URL', 'Facebook URL' ) ) );
-		$fields->addFieldToTab( $socialmediatabname, new TextField( 'Twitter',
-				_t( 'ContactPage.TWITTER_USERNAME', 'Twitter Username' ) ) );
+		$fields->addFieldToTab($socialmediatabname, new TextField('Facebook',
+				_t('ContactPage.FACEBOOK_URL', 'Facebook URL')));
+		$fields->addFieldToTab($socialmediatabname, new TextField('Twitter',
+				_t('ContactPage.TWITTER_USERNAME', 'Twitter Username')));
 
 		$this->extend('updateContactPageForm', $fields);
 
@@ -107,8 +107,8 @@ 
 
 	function init() {
 		//add a javascript library for easy interaction with the server
-		Requirements::javascript( 'mysite/javascript/jQuery.js' );
-		if ( Director::is_ajax() ) {
+		Requirements::javascript('mysite/javascript/jQuery.js');
+		if (Director::is_ajax()) {
 			$this->isAjax = true;
 		}
 		else {
@@ -119,11 +119,11 @@ 
 
 
 	function index() {
-		error_log( "Contact page index" );
-		error_log( "AJAX? ".$this->isAjax );
+		error_log("Contact page index");
+		error_log("AJAX? ".$this->isAjax);
 
-		if ( $this->isAjax ) {
-			return $this->renderWith( "ContactPageModal" );
+		if ($this->isAjax) {
+			return $this->renderWith("ContactPageModal");
 		}
 		else {
 			return array();
@@ -134,21 +134,21 @@ 
 
 	//The function which generates our form
 	function ContactForm() {
-		error_log( "Render form" );
-		$name = _t( 'ContactPage.NAME', 'Name' );
-		$email = _t( 'ContactPage.EMAIL', 'Email' );
-		$comments = _t( 'ContactPage.COMMENTS', 'Comments' );
-		$send = _t( 'ContactPage.SEND', 'Send' );
+		error_log("Render form");
+		$name = _t('ContactPage.NAME', 'Name');
+		$email = _t('ContactPage.EMAIL', 'Email');
+		$comments = _t('ContactPage.COMMENTS', 'Comments');
+		$send = _t('ContactPage.SEND', 'Send');
 
 		// Create fields
-		$tf = new TextField( 'Name', $name );
-		$tf->addExtraClass( 'span11' );
+		$tf = new TextField('Name', $name);
+		$tf->addExtraClass('span11');
 
-		$ef = new EmailField( 'Email', $email );
-		$ef->addExtraClass( 'span11' );
+		$ef = new EmailField('Email', $email);
+		$ef->addExtraClass('span11');
 
-		$taf = new TextareaField( 'Comments', $comments );
-		$taf->addExtraClass( 'span11' );
+		$taf = new TextareaField('Comments', $comments);
+		$taf->addExtraClass('span11');
 
 		$fields = new FieldList(
 			$tf,
@@ -157,24 +157,24 @@ 
 		);
 
 		// Create action
-		$fa = new FormAction( 'SendContactForm', $send );
+		$fa = new FormAction('SendContactForm', $send);
 
 		// for bootstrap
 		$fa->useButtonTag = true;
-		$fa->addExtraClass( 'btn btn-primary buttonright' );
+		$fa->addExtraClass('btn btn-primary buttonright');
 
 		$actions = new FieldList(
 			$fa
 		);
 
 		// Create action
-		$validator = new RequiredFields( 'Name', 'Email', 'Comments' );
+		$validator = new RequiredFields('Name', 'Email', 'Comments');
 
-		$form = new Form( $this, 'ContactForm', $fields, $actions, $validator );
-		$form->setTemplate( 'VerticalForm' );
-		$form->addExtraClass( 'well' );
+		$form = new Form($this, 'ContactForm', $fields, $actions, $validator);
+		$form->setTemplate('VerticalForm');
+		$form->addExtraClass('well');
 
-		if(class_exists('SpamProtectorManager')) {
+		if (class_exists('SpamProtectorManager')) {
 			$form->enableSpamProtection();
 		}
 
@@ -183,7 +183,7 @@ 
 
 
 	//The function that handles our form submission
-	function SendContactForm( $data, $form ) {
+	function SendContactForm($data, $form) {
 		// saving data before sending contact form
 		$cpm = new ContactPageMessage();
 		$cpm->Email = $data['Email'];
@@ -198,35 +198,35 @@ 
 		$To = $this->Mailto;
 		$Subject = $this->SiteConfig()->Title.' - ';
 		$Subject .= "Website Contact message";
-		$email = new Email( $From, $To, $Subject );
+		$email = new Email($From, $To, $Subject);
 		//set template
-		$email->setTemplate( 'ContactEmail' );
+		$email->setTemplate('ContactEmail');
 		//populate template
-		$email->populateTemplate( $data );
+		$email->populateTemplate($data);
 		//send mail
 		$email->send();
 
-		if ( $this->isAjax ) {
+		if ($this->isAjax) {
 			$result = array();
 			$result['message'] = $this->SubmitText;
 			$result['success'] = 1;
-			echo json_encode( $result );
+			echo json_encode($result);
 			die;
 		}
 		else {
-			Controller::redirect( Director::baseURL(). $this->URLSegment . "/?success=1" );
+			Controller::redirect(Director::baseURL().$this->URLSegment."/?success=1");
 		}
 	}
 
 
 	//The function to test whether to display the Submit Text or not
 	public function Success() {
-		return isset( $_REQUEST['success'] ) && $_REQUEST['success'] == "1";
+		return isset($_REQUEST['success']) && $_REQUEST['success'] == "1";
 	}
 
 
 	public function HasGeo() {
-		return (($this->Latitude !=0) && ($this->Longitude != 0));
+		return (($this->Latitude != 0) && ($this->Longitude != 0));
 	}
 
 

Braces +3 added lines, -6 removed lines

@@ -110,8 +110,7 @@ 
 		Requirements::javascript( 'mysite/javascript/jQuery.js' );
 		if ( Director::is_ajax() ) {
 			$this->isAjax = true;
-		}
-		else {
+		} else {
 			$this->isAjax = false;
 		}
 		parent::init();
@@ -124,8 +123,7 @@ 
 
 		if ( $this->isAjax ) {
 			return $this->renderWith( "ContactPageModal" );
-		}
-		else {
+		} else {
 			return array();
 		}
 
@@ -212,8 +210,7 @@ 
 			$result['success'] = 1;
 			echo json_encode( $result );
 			die;
-		}
-		else {
+		} else {
 			Controller::redirect( Director::baseURL(). $this->URLSegment . "/?success=1" );
 		}
 	}