silverstripe / deploynaut

code/SS_Datetimezone.php

Indentation +16 added lines, -16 removed lines

@@ -6,20 +6,20 @@
  */
 class SS_Datetimezone extends SS_Datetime
 {
-    /**
-    * Returns the date in the raw SQL-format specific to a given timezone passed from the Member class, e.g. “2006-01-18 16:32:04”
-    */
-    public function Nice() {
-        if($timestamp = $this){
-            //instantiate new DateTime object based off received timestamp in the default timezone
-            $timestamp = new DateTime($timestamp, new DateTimeZone(date_default_timezone_get()));
-            //if a user is logged in, has set a timezone that is in the allowed list and 
-            //that timezone is NOT the default one then convert the timestamp to use the selected timezone
-            if(Member::currentUserID() && isset(Member::CurrentUser()->Timezone) && in_array(Member::CurrentUser()->Timezone, timezone_identifiers_list()) && Member::CurrentUser()->Timezone != date_default_timezone_get()){
-                $timestamp->setTimezone(new DateTimeZone(Member::CurrentUser()->Timezone));    
-            }
-        }
-        //return timestamp in "Nice" format + the user's timezone
-        return $timestamp->Format('d/m/Y g:ia');
-    }
+	/**
+	 * Returns the date in the raw SQL-format specific to a given timezone passed from the Member class, e.g. “2006-01-18 16:32:04”
+	 */
+	public function Nice() {
+		if($timestamp = $this){
+			//instantiate new DateTime object based off received timestamp in the default timezone
+			$timestamp = new DateTime($timestamp, new DateTimeZone(date_default_timezone_get()));
+			//if a user is logged in, has set a timezone that is in the allowed list and 
+			//that timezone is NOT the default one then convert the timestamp to use the selected timezone
+			if(Member::currentUserID() && isset(Member::CurrentUser()->Timezone) && in_array(Member::CurrentUser()->Timezone, timezone_identifiers_list()) && Member::CurrentUser()->Timezone != date_default_timezone_get()){
+				$timestamp->setTimezone(new DateTimeZone(Member::CurrentUser()->Timezone));    
+			}
+		}
+		//return timestamp in "Nice" format + the user's timezone
+		return $timestamp->Format('d/m/Y g:ia');
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -10,12 +10,12 @@
     * Returns the date in the raw SQL-format specific to a given timezone passed from the Member class, e.g. “2006-01-18 16:32:04”
     */
     public function Nice() {
-        if($timestamp = $this){
+        if ($timestamp = $this) {
             //instantiate new DateTime object based off received timestamp in the default timezone
             $timestamp = new DateTime($timestamp, new DateTimeZone(date_default_timezone_get()));
             //if a user is logged in, has set a timezone that is in the allowed list and 
             //that timezone is NOT the default one then convert the timestamp to use the selected timezone
-            if(Member::currentUserID() && isset(Member::CurrentUser()->Timezone) && in_array(Member::CurrentUser()->Timezone, timezone_identifiers_list()) && Member::CurrentUser()->Timezone != date_default_timezone_get()){
+            if (Member::currentUserID() && isset(Member::CurrentUser()->Timezone) && in_array(Member::CurrentUser()->Timezone, timezone_identifiers_list()) && Member::CurrentUser()->Timezone != date_default_timezone_get()) {
                 $timestamp->setTimezone(new DateTimeZone(Member::CurrentUser()->Timezone));    
             }
         }

Braces +3 added lines, -4 removed lines

@@ -4,18 +4,17 @@
  *
  * Adds customisable timezones to the nice method on {@link SS_Datetime}.
  */
-class SS_Datetimezone extends SS_Datetime
-{
+class SS_Datetimezone extends SS_Datetime {
     /**
     * Returns the date in the raw SQL-format specific to a given timezone passed from the Member class, e.g. “2006-01-18 16:32:04”
     */
     public function Nice() {
-        if($timestamp = $this){
+        if($timestamp = $this) {
             //instantiate new DateTime object based off received timestamp in the default timezone
             $timestamp = new DateTime($timestamp, new DateTimeZone(date_default_timezone_get()));
             //if a user is logged in, has set a timezone that is in the allowed list and 
             //that timezone is NOT the default one then convert the timestamp to use the selected timezone
-            if(Member::currentUserID() && isset(Member::CurrentUser()->Timezone) && in_array(Member::CurrentUser()->Timezone, timezone_identifiers_list()) && Member::CurrentUser()->Timezone != date_default_timezone_get()){
+            if(Member::currentUserID() && isset(Member::CurrentUser()->Timezone) && in_array(Member::CurrentUser()->Timezone, timezone_identifiers_list()) && Member::CurrentUser()->Timezone != date_default_timezone_get()) {
                 $timestamp->setTimezone(new DateTimeZone(Member::CurrentUser()->Timezone));    
             }
         }

code/extensions/TimezoneMemberExtension.php

Indentation +17 added lines, -17 removed lines

@@ -6,24 +6,24 @@
  */
 class TimezoneMemberExtension extends DataExtension
 {
-    private static $db = [
-        'Timezone' => 'Varchar(255)',
-    ];
+	private static $db = [
+		'Timezone' => 'Varchar(255)',
+	];
 
-    public function getTimezones() {
-        $timezones = timezone_identifiers_list();
-        return array_combine($timezones, $timezones);
-    }
+	public function getTimezones() {
+		$timezones = timezone_identifiers_list();
+		return array_combine($timezones, $timezones);
+	}
 
-    public function updateCMSFields(FieldList $fields)
-    {   
-        $fields->removeFieldFromTab('Root', 'Timezone');
-        $field = DropdownField::create(
-          'Timezone',
-          'Timezone',
-          $this->getTimezones())->setEmptyString('For NZ, choose Pacific/Auckland');
-        $fields->addFieldToTab('Root.timezone', $field);
-        return $fields;
-    }
+	public function updateCMSFields(FieldList $fields)
+	{   
+		$fields->removeFieldFromTab('Root', 'Timezone');
+		$field = DropdownField::create(
+		  'Timezone',
+		  'Timezone',
+		  $this->getTimezones())->setEmptyString('For NZ, choose Pacific/Auckland');
+		$fields->addFieldToTab('Root.timezone', $field);
+		return $fields;
+	}
 
 }

Braces +2 added lines, -4 removed lines

@@ -4,8 +4,7 @@ 
  *
  * Adds all available timezones as an optional field to SilverStripe {@link Member}.
  */
-class TimezoneMemberExtension extends DataExtension
-{
+class TimezoneMemberExtension extends DataExtension {
     private static $db = [
         'Timezone' => 'Varchar(255)',
     ];
@@ -15,8 +14,7 @@ 
         return array_combine($timezones, $timezones);
     }
 
-    public function updateCMSFields(FieldList $fields)
-    {   
+    public function updateCMSFields(FieldList $fields) {
         $fields->removeFieldFromTab('Root', 'Timezone');
         $field = DropdownField::create(
           'Timezone',