opencafe / datium

src/Config.php

Spacing +11 added lines, -11 removed lines

@@ -53,7 +53,7 @@ 
        'Ordibehesht',
        'Khordad',
        'Tir',
-       'Mordad' ,
+       'Mordad',
        'Shahrivar',
        'Mehr',
        'Aban',
@@ -78,7 +78,7 @@ 
      ),
 
   'islamic' =>
-    array(  1 => 'Muharram',
+    array(1 => 'Muharram',
             2 => 'Safar',
             3 => 'Rabi I',
             4 => 'Rabi II',
@@ -92,7 +92,7 @@ 
             12 => 'Dhu al_Hijjah'
             ) ),
 
-  'week_days_name' => array( 'persian' => array(
+  'week_days_name' => array('persian' => array(
                                           'Yekshanbe',
                                           'Doshanbe',
                                           'Seshanbe',
@@ -123,7 +123,7 @@ 
                                           )
 
                       ),
-  'shamsi_month_days' => array(      1 => 31,
+  'shamsi_month_days' => array(1 => 31,
                                      2 => 31,
                                      3 => 31,
                                      4 => 31,
@@ -134,10 +134,10 @@ 
                                      9 => 30,
                                      10 => 30,
                                      11 => 30,
-                                     12 => 29 ),
+                                     12 => 29),
 
 
-  'gregorian_month_days' => array(   1 => 31,
+  'gregorian_month_days' => array(1 => 31,
                                      2 => 28,
                                      3 => 31,
                                      4 => 30,
@@ -148,9 +148,9 @@ 
                                      9 => 30,
                                      10 => 31,
                                      11 => 30,
-                                     12 => 30 ),
+                                     12 => 30),
 
-  'islamic_month_days' => array(     1 => 30,
+  'islamic_month_days' => array(1 => 30,
                                      2 => 29,
                                      3 => 30,
                                      4 => 30,
@@ -161,13 +161,13 @@ 
                                      9 => 30,
                                      10 => 29,
                                      11 => 30,
-                                     12 => 30 ),
+                                     12 => 30),
 
 
-    'date_interval' => array( 'D', 'M', 'Y', 'H', 'm', 'S' ),
+    'date_interval' => array('D', 'M', 'Y', 'H', 'm', 'S'),
 
 
-    'date_simple' => array( 'day', ' month', ' year', ' hour', ' minute', ' second' ),
+    'date_simple' => array('day', ' month', ' year', ' hour', ' minute', ' second'),
 
  );
 

src/Datium.php

Switch Indentation +6 added lines, -6 removed lines

@@ -337,17 +337,17 @@
 
 switch ( $type  ) {
 
-  case 'ir':
+    case 'ir':
 
-        $this->date_time = $this->convert_calendar->shamsiToGhamari( $this->date_time );
+          $this->date_time = $this->convert_calendar->shamsiToGhamari( $this->date_time );
 
-    break;
+      break;
 
-  case 'gr':
+    case 'gr':
 
-    $this->date_time = $this->convert_calendar->gregorianToGhamari( $this->date_time );
+      $this->date_time = $this->convert_calendar->gregorianToGhamari( $this->date_time );
 
-    break;
+      break;
 
 }
 

Spacing +54 added lines, -54 removed lines

@@ -60,15 +60,15 @@ 
 
     $this->config = include('Config.php');
 
-    $this->calendar_type = $this->config[ 'default_calendar' ];
+    $this->calendar_type = $this->config['default_calendar'];
 
-    date_default_timezone_set( $this->config['timezone'] );
+    date_default_timezone_set($this->config['timezone']);
 
-    switch( Datium::$call_type ) {
+    switch (Datium::$call_type) {
 
       case 'now':
 
-        $this->date_time = new DateTime( 'now' );
+        $this->date_time = new DateTime('now');
 
         $this->gregorian_DayofWeek = $this->date_time->format('w');
 
@@ -78,11 +78,11 @@ 
 
       case 'make':
 
-        $this->date_time = new DateTime( 'now' );
+        $this->date_time = new DateTime('now');
 
-        $this->date_time->setDate( self::$array_date['year'], self::$array_date['month'], self::$array_date['day'] );
+        $this->date_time->setDate(self::$array_date['year'], self::$array_date['month'], self::$array_date['day']);
 
-        $this->date_time->setTime( self::$array_date['hour'], self::$array_date['minute'], self::$array_date['second'] );
+        $this->date_time->setTime(self::$array_date['hour'], self::$array_date['minute'], self::$array_date['second']);
 
         $this->gregorian_DayofWeek = $this->date_time->format('w');
 
@@ -116,17 +116,17 @@ 
 
     return (object) array(
 
-      'second' => $this->date_time->format( 's' ),
+      'second' => $this->date_time->format('s'),
 
-      'minute' => $this->date_time->format( 'm' ),
+      'minute' => $this->date_time->format('m'),
 
-      'hour' => $this->date_time->format( 'H' ),
+      'hour' => $this->date_time->format('H'),
 
-      'day' => $this->date_time->format( 'd' ),
+      'day' => $this->date_time->format('d'),
 
-      'month' => $this->date_time->format( 'm' ),
+      'month' => $this->date_time->format('m'),
 
-      'year' => $this->date_time->format( 'Y' )
+      'year' => $this->date_time->format('Y')
 
     );
 
@@ -155,12 +155,12 @@ 
    * @param $second integer
    * @return object
    */
-  public static function create( $year = 2000, $month = 1, $day = 1, $hour = 0, $minute = 0, $second = 0 ) {
+  public static function create($year = 2000, $month = 1, $day = 1, $hour = 0, $minute = 0, $second = 0) {
 
       /**
        * When we want to set a Datetime object to Datium
        */
-      if( func_num_args() === 1 ) {
+      if (func_num_args() === 1) {
 
         self::$static_date_time = func_get_arg(0);
 
@@ -168,7 +168,7 @@ 
 
       } else {
 
-        self::$array_date = array( 'year' => $year, 'month' => $month, 'day' => $day, 'hour' => $hour, 'minute' => $minute, 'second' => $second );
+        self::$array_date = array('year' => $year, 'month' => $month, 'day' => $day, 'hour' => $hour, 'minute' => $minute, 'second' => $second);
 
         self::$call_type = 'make';
 
@@ -178,7 +178,7 @@ 
 
   }
 
-  public static function between( $date_start, $date_end ) {
+  public static function between($date_start, $date_end) {
 
     self::$date_start = $date_start;
 
@@ -190,11 +190,11 @@ 
 
   }
 
-  public function to( $calendar ) {
+  public function to($calendar) {
 
-    $this->convert = new Convert( $this->date_time );
+    $this->convert = new Convert($this->date_time);
 
-    $this->date_time = $this->convert->to( $calendar );
+    $this->date_time = $this->convert->to($calendar);
 
     return $this;
 
@@ -206,9 +206,9 @@ 
    * @param $start datetime
    * @param $end datetime
    */
-  public static function diff( $start, $end ) {
+  public static function diff($start, $end) {
 
-    return date_diff( $start, $end );
+    return date_diff($start, $end);
 
   }
 
@@ -217,13 +217,13 @@ 
    * @param $value string
    * @return object
    */
-  public function add( $value ) {
+  public function add($value) {
 
-    $this->date_interval_expression = str_replace( $this->config['date_simple'], $this->config['date_interval'], $value );
+    $this->date_interval_expression = str_replace($this->config['date_simple'], $this->config['date_interval'], $value);
 
-    $this->date_interval_expression = str_replace( ' ', '', 'P' . $this->date_interval_expression );
+    $this->date_interval_expression = str_replace(' ', '', 'P'.$this->date_interval_expression);
 
-    $this->date_time->add( new DateInterval( $this->date_interval_expression ) );
+    $this->date_time->add(new DateInterval($this->date_interval_expression));
 
     return $this;
 
@@ -234,13 +234,13 @@ 
    * @param $value
    * @return obejct
    */
-  public function sub( $value ) {
+  public function sub($value) {
 
-    $this->date_interval_expression = str_replace( $this->config['date_simple'], $this->config['date_interval'], $value );
+    $this->date_interval_expression = str_replace($this->config['date_simple'], $this->config['date_interval'], $value);
 
-    $this->date_interval_expression = str_replace( ' ', '', 'P' . $this->date_interval_expression );
+    $this->date_interval_expression = str_replace(' ', '', 'P'.$this->date_interval_expression);
 
-    $this->date_time->sub( new DateInterval( $this->date_interval_expression ) );
+    $this->date_time->sub(new DateInterval($this->date_interval_expression));
 
     return $this;
 
@@ -250,9 +250,9 @@ 
    * Check if current year is leap or not
    * @return boolean
    */
-  public function leap( $type = 'gr') {
+  public function leap($type = 'gr') {
 
-    $this->leap = new Leap( $this->date_time->format( 'Y' ), $type );
+    $this->leap = new Leap($this->date_time->format('Y'), $type);
 
     return $this->leap;
 
@@ -263,7 +263,7 @@ 
    */
   public function dayOf() {
 
-    $this->day_of = new DayOf( $this->date_time, $this->calendar_type );
+    $this->day_of = new DayOf($this->date_time, $this->calendar_type);
 
     return $this->day_of;
 
@@ -274,13 +274,13 @@ 
    */
   public function events() {
 
-    if ( Datium::$call_type == 'between' ) {
+    if (Datium::$call_type == 'between') {
 
-      $this->events = new Events( Datium::$date_start, Datium::$date_end );
+      $this->events = new Events(Datium::$date_start, Datium::$date_end);
 
     } else {
 
-      $this->events = new Events( $this->date_time );
+      $this->events = new Events($this->date_time);
 
     }
 
@@ -288,9 +288,9 @@ 
 
   }
 
-  public function translate( $calendar, $format ) {
+  public function translate($calendar, $format) {
 
-    $this->date_time = new Translate( $this->date_time, $calendar, $format, $this->gregorian_DayofWeek );
+    $this->date_time = new Translate($this->date_time, $calendar, $format, $this->gregorian_DayofWeek);
 
     return $this->date_time;
 
@@ -337,19 +337,19 @@ 
   //
   // }
 
-  public function toShamsi( $type = 'gr' ) {
+  public function toShamsi($type = 'gr') {
 
-    switch ( $type ) {
+    switch ($type) {
 
       case 'gr':
 
-           $this->date_time = $this->convert_calendar->gregorianToShamsi( $this->date_time );
+           $this->date_time = $this->convert_calendar->gregorianToShamsi($this->date_time);
 
         break;
 
       case 'gh':
 
-            $this->date_time = $this->convert_calendar->ghamariToShamsi( $this->date_time );
+            $this->date_time = $this->convert_calendar->ghamariToShamsi($this->date_time);
 
         break;
     }
@@ -360,19 +360,19 @@ 
 
   }
 
-  public function toGhamari( $type = 'gr') {
+  public function toGhamari($type = 'gr') {
 
-switch ( $type  ) {
+switch ($type) {
 
   case 'ir':
 
-        $this->date_time = $this->convert_calendar->shamsiToGhamari( $this->date_time );
+        $this->date_time = $this->convert_calendar->shamsiToGhamari($this->date_time);
 
     break;
 
   case 'gr':
 
-    $this->date_time = $this->convert_calendar->gregorianToGhamari( $this->date_time );
+    $this->date_time = $this->convert_calendar->gregorianToGhamari($this->date_time);
 
     break;
 
@@ -384,19 +384,19 @@ 
 
   }
 
-  public function toGregorian( $type = 'gr' ) {
+  public function toGregorian($type = 'gr') {
 
-    switch ( $type ) {
+    switch ($type) {
 
       case 'ir':
 
-        $this->date_time = $this->convert_calendar->shamsiToGregorian( $this->date_time );
+        $this->date_time = $this->convert_calendar->shamsiToGregorian($this->date_time);
 
         break;
 
       case 'gh':
 
-        $this->date_time = $this->convert_calendar->ghamariToGregorian( $this->date_time );
+        $this->date_time = $this->convert_calendar->ghamariToGregorian($this->date_time);
 
       case 'gr':
 
@@ -421,7 +421,7 @@ 
    *
    *\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
    */
-  public function object(){
+  public function object() {
 
     return $this->date_time;
 
@@ -433,11 +433,11 @@ 
    * @param $calendar string
    * @param $format string
    */
-  public function get( $format = 'Y-m-d H:i:s' ) {
+  public function get($format = 'Y-m-d H:i:s') {
 
-    if( in_array( $this->calendar_type, $this->config[ 'calendar' ] ) ){
+    if (in_array($this->calendar_type, $this->config['calendar'])) {
 
-        return $this->translate( $this->calendar_type, $format )->get();
+        return $this->translate($this->calendar_type, $format)->get();
 
     }
 

src/DayOf.php

Spacing +16 added lines, -16 removed lines

@@ -19,9 +19,9 @@ 
 
   protected $geregorian_DayofWeek;
 
-  public function __construct( $date_time, $calendar_type = 'ir' ) {
+  public function __construct($date_time, $calendar_type = 'ir') {
 
-    $this->config = include( 'Config.php' );
+    $this->config = include('Config.php');
 
     $this->date_time = $date_time;
 
@@ -42,7 +42,7 @@ 
    */
   public function year() {
 
-    switch ( $this->calendar_type ) {
+    switch ($this->calendar_type) {
 
       case 'ir':
 
@@ -58,7 +58,7 @@ 
 
       case 'gr':
 
-      $this->result = date( 'z', strtotime( $this->date_time->format('Y-m-d H:i:s') ) ) + 1;
+      $this->result = date('z', strtotime($this->date_time->format('Y-m-d H:i:s'))) + 1;
 
        break;
     }
@@ -78,9 +78,9 @@ 
 
     $this->day = $this->date_time->format('d');
 
-    foreach( $this->config['shamsi_month_days'] as $month => $value ) {
+    foreach ($this->config['shamsi_month_days'] as $month => $value) {
 
-      if ( $month < $this->month ) $this->result += $value;
+      if ($month < $this->month) $this->result += $value;
 
     }
 
@@ -101,9 +101,9 @@ 
 
     $this->day = $this->date_time->format('d');
 
-    foreach( $this->config['islamic_month_days'] as $month => $value ) {
+    foreach ($this->config['islamic_month_days'] as $month => $value) {
 
-      if ( $month < $this->month ) $this->result += $value;
+      if ($month < $this->month) $this->result += $value;
 
     }
 
@@ -120,7 +120,7 @@ 
    */
   public function week() {
 
-    switch ( $this->calendar_type ) {
+    switch ($this->calendar_type) {
 
       case 'ir':
 
@@ -136,7 +136,7 @@ 
 
       case 'gr':
 
-      $this->result = date( 'w', strtotime( $this->date_time->format('Y-m-d H:i:s') ) ) + 1;
+      $this->result = date('w', strtotime($this->date_time->format('Y-m-d H:i:s'))) + 1;
 
        break;
     }
@@ -151,11 +151,11 @@ 
    */
   protected function persian_day_of_week() {
 
-    $this->day = str_replace( $this->config['week_days_name']['english'], $this->config['week_days_name']['persian'], $this->day);
+    $this->day = str_replace($this->config['week_days_name']['english'], $this->config['week_days_name']['persian'], $this->day);
 
-    foreach ( $this->config['week_days_name']['persian'] as $key => $value ) {
+    foreach ($this->config['week_days_name']['persian'] as $key => $value) {
 
-      if( $value == $this->day ) return $key += 1;
+      if ($value == $this->day) return $key += 1;
 
     }
 
@@ -167,11 +167,11 @@ 
    */
   protected function islamic_day_of_week() {
 
-    $this->day = str_replace( $this->config['week_days_name']['english'], $this->config['week_days_name']['islamic'][$this->geregorian_DayofWeek], $this->day);
+    $this->day = str_replace($this->config['week_days_name']['english'], $this->config['week_days_name']['islamic'][$this->geregorian_DayofWeek], $this->day);
 
-    foreach ( $this->config['week_days_name']['islamic'] as $key => $value ) {
+    foreach ($this->config['week_days_name']['islamic'] as $key => $value) {
 
-      if( $value == $this->day ) return $key += 1;
+      if ($value == $this->day) return $key += 1;
 
     }
 

src/Events/Events.php

Spacing +25 added lines, -25 removed lines

@@ -26,9 +26,9 @@ 
 
 	private static $date_end;
 
-	public function __construct( $date_time, $date_end = NULL ) {
+	public function __construct($date_time, $date_end = NULL) {
 
-		if( $date_end !== NULL ) {
+		if ($date_end !== NULL) {
 
 			Events::$date_start = $date_time;
 
@@ -56,19 +56,19 @@ 
 	 *
 	 *\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/
 	 */
-	private function fetch( $path ) {
+	private function fetch($path) {
 
-		$this->events = include( $path );
+		$this->events = include($path);
 
 		$this->interval = DateInterval::createFromDateString('1 day');
 
-		$this->period = new DatePeriod( Events::$date_start, $this->interval, Events::$date_end );
+		$this->period = new DatePeriod(Events::$date_start, $this->interval, Events::$date_end);
 
-		foreach ( $this->period as $dt ) {
+		foreach ($this->period as $dt) {
 
-			if ( isset( $this->events[ 'events' ][ intval( $dt->format('m') ) ][ intval( $dt->format('d') ) ] ) ) {
+			if (isset($this->events['events'][intval($dt->format('m'))][intval($dt->format('d'))])) {
 
-				$this->result[ $dt->format( 'Y-m-d' ) ][] = $this->events[ 'events' ][ intval( $dt->format('m') ) ][ intval( $dt->format('d') ) ];
+				$this->result[$dt->format('Y-m-d')][] = $this->events['events'][intval($dt->format('m'))][intval($dt->format('d'))];
 
 			}
 
@@ -87,13 +87,13 @@ 
 	 */
 	public function get() {
 
-		if( ! empty( $this->result ) ) {
+		if ( ! empty($this->result)) {
 
-			foreach( $this->result as $key => $day ) {
+			foreach ($this->result as $key => $day) {
 
-				if ( ! ( $key > Events::$date_start->format( 'Y-m-d' ) && $key < Events::$date_end->format( 'Y-m-d' ) ) ) {
+				if ( ! ($key > Events::$date_start->format('Y-m-d') && $key < Events::$date_end->format('Y-m-d'))) {
 
-					unset( $this->result[ $key ] );
+					unset($this->result[$key]);
 
 				}
 
@@ -118,49 +118,49 @@ 
 		 *
 		 *\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
 		 */
-		public function local( $country_code = "ir" ) {
+		public function local($country_code = "ir") {
 
 				/*
 				 * Capitalize the first character of $country_code according the file
 				 * structure.
 				 */
-				$country_code = strtolower( $country_code = 'ir' ) ;
+				$country_code = strtolower($country_code = 'ir');
 
-				$this->local = include( 'Localization/' . $country_code . '.php' );
+				$this->local = include('Localization/'.$country_code.'.php');
 
-				foreach( $this->local[ 'events' ] as $month => $events ) {
+				foreach ($this->local['events'] as $month => $events) {
 
-					foreach( $events as $day => $event ){
+					foreach ($events as $day => $event) {
 
 						$this->date_time = new DateTime();
 
-						$this->date_time->setDate( Events::$date_start->format( 'Y' ), $month, $day );
+						$this->date_time->setDate(Events::$date_start->format('Y'), $month, $day);
 
-						switch ( $this->local[ 'default_calendar' ] ) {
+						switch ($this->local['default_calendar']) {
 
 							case 'shamsi':
 
-							$this->date_time->setDate( 1394, $month, $day );
+							$this->date_time->setDate(1394, $month, $day);
 
-							$this->date_time = $this->convert->shamsiToGregorian( $this->date_time );
+							$this->date_time = $this->convert->shamsiToGregorian($this->date_time);
 
 							break;
 
 							case 'ghamari':
 
-								$this->date_time = $this->convert->ghamariToGregorian( $this->date_time );
+								$this->date_time = $this->convert->ghamariToGregorian($this->date_time);
 
 							break;
 
 						}
 
-						$this->result[ $this->date_time->format( 'Y-m-d' ) ][] =  $event;
+						$this->result[$this->date_time->format('Y-m-d')][] = $event;
 
 					}
 
 				}
 
-				ksort( $this->result );
+				ksort($this->result);
 
 		return $this;
 
@@ -180,7 +180,7 @@ 
 
 	public function international() {
 
-		$this->fetch( 'Global/global.php' );
+		$this->fetch('Global/global.php');
 
 		return $this;
 

src/Events/Global/global.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      * @link http://www.un.org/en/sections/observances/international-days/
      */
     'events' => array(
-      1 => array( 27 => 'International Day of Commemoration in Memory of the Victims of the Holocaust' ),
+      1 => array(27 => 'International Day of Commemoration in Memory of the Victims of the Holocaust'),
       2 => array(
         4 => 'World Cancer Day',
         6 => 'International Day of Zero Tolerance to Female Genital Mutilation',

src/Events/Localization/ir.php

Spacing +3 added lines, -3 removed lines

@@ -12,9 +12,9 @@
      * as a arraye value
      */
     'events' => array(
-      1 => array( 1 => 'nowruz', 2 => 'nowruz', 3 => 'nowruz', 5 => 'nowruz' ),
-      10 => array( 22 => 'Iran revelution day' ),
-      12 => array( 29 => 'Iran oil national day' )
+      1 => array(1 => 'nowruz', 2 => 'nowruz', 3 => 'nowruz', 5 => 'nowruz'),
+      10 => array(22 => 'Iran revelution day'),
+      12 => array(29 => 'Iran oil national day')
     ),
 
 );

src/Events/Localization/us.php

Spacing +2 added lines, -2 removed lines

@@ -9,9 +9,9 @@
 
   'events' => array(
 
-    4  => array( 22 => 'Earth day' ),
+    4  => array(22 => 'Earth day'),
 
-    12 => array( 25 => 'Christmas' )
+    12 => array(25 => 'Christmas')
 
   )
 

src/Lang.php

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
      *
      *\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
      */
-    public static function get( $text ) {
+    public static function get($text) {
 
       /**
        * Fetch translated file to config attribute
@@ -43,11 +43,11 @@ 
       /**
        * Fetch translated expression to langTable attribute
        */
-      self::$langTable = include('lang/' . self::$config['language'] . '/general.php');
+      self::$langTable = include('lang/'.self::$config['language'].'/general.php');
 
-      foreach( self::$langTable as $key => $translate ){
+      foreach (self::$langTable as $key => $translate) {
 
-        if( $key == $text ) {
+        if ($key == $text) {
 
           return $translate;
 

src/Leap.php

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
    * @param $year integer
    * @since Aug, 21 2015
    */
-	public function __construct( $year, $type = 'gr' ) {
+	public function __construct($year, $type = 'gr') {
 
 			$this->year = $year;
 
@@ -43,7 +43,7 @@ 
    */
   public function gregorinLeapYear() {
 
-  return ( ( ( $this->year % 4 ) == 0 ) && ( ( ( $this->year % 100 ) != 0 ) || ( ( $this->year % 400 ) == 0 ) ) );
+  return ((($this->year % 4) == 0) && ((($this->year % 100) != 0) || (($this->year % 400) == 0)));
 
   }
 
@@ -56,7 +56,7 @@ 
 
 		$shamsi_years = 0;
 
-    while ( $shamsi_years < ( $this->year - 128 ) ) {
+    while ($shamsi_years < ($this->year - 128)) {
 
       $shamsi_years += 128;
 
@@ -67,13 +67,13 @@ 
 
     $this->result -= $shamsi_years;
 
-    if ( $this->result >= 33 ) {
+    if ($this->result >= 33) {
 
     $this->result = $this->result % 33;
 
    }
 
-    if ( ( $this->result == 28 ) || ( $this->result == 27 ) ) {
+    if (($this->result == 28) || ($this->result == 27)) {
 
       return $this->result;
 
@@ -84,13 +84,13 @@ 
 
     $this->result -= $shamsi_years;
 
-    if ( $this->result >= 33 ) {
+    if ($this->result >= 33) {
 
     $this->result = $this->result % 33;
 
    }
 
-    if ( ( ( $this->result % 4 ) == 0 ) && ( $this->result != 28 ) ) {
+    if ((($this->result % 4) == 0) && ($this->result != 28)) {
 
       return $this->result;
 
@@ -106,7 +106,7 @@ 
 
     $this->result = $this->year % 30;
 
-    if ( ( 2 == $this->result ) || ( 5 == $this->result ) || ( 7 == $this->result ) || ( 10 == $this->result ) || ( 13 == $this->result ) || ( 16 == $this->result ) || ( 18 == $this->result ) || ( 21 == $this->result ) || ( 24 == $this->year ) || ( 26 == $this->result ) || ( 29 == $this->result ) ) {
+    if ((2 == $this->result) || (5 == $this->result) || (7 == $this->result) || (10 == $this->result) || (13 == $this->result) || (16 == $this->result) || (18 == $this->result) || (21 == $this->result) || (24 == $this->year) || (26 == $this->result) || (29 == $this->result)) {
 
       return $this->result;
 
@@ -121,7 +121,7 @@ 
    */
   public function get() {
 
-    switch ( $this->type ) {
+    switch ($this->type) {
 
       case 'gr':