| @@ -223,7 +223,7 @@ discard block | ||
| 223 | 223 | $this->thisDay() | 
| 224 | 224 | ); | 
| 225 | 225 | |
| 226 | -        for ($i=1; $i <= $end; $i++) { | |
| 226 | +        for ($i = 1; $i <= $end; $i++) { | |
| 227 | 227 | $stamp = $this->cE->dateToStamp($year, $month, $day++); | 
| 228 | 228 | $this->children[$i] = new Day( | 
| 229 | 229 | $this->cE->stampToYear($stamp), | 
| @@ -235,13 +235,13 @@ discard block | ||
| 235 | 235 | //set empty days (@see Calendar_Month_Weeks::build()) | 
| 236 | 236 |          if ($this->firstWeek) { | 
| 237 | 237 | $eBefore = $this->tableHelper->getEmptyDaysBefore(); | 
| 238 | -            for ($i=1; $i <= $eBefore; $i++) { | |
| 238 | +            for ($i = 1; $i <= $eBefore; $i++) { | |
| 239 | 239 | $this->children[$i]->setEmpty(); | 
| 240 | 240 | } | 
| 241 | 241 | } | 
| 242 | 242 |          if ($this->lastWeek) { | 
| 243 | 243 | $eAfter = $this->tableHelper->getEmptyDaysAfterOffset(); | 
| 244 | -            for ($i = $eAfter+1; $i <= $end; $i++) { | |
| 244 | +            for ($i = $eAfter + 1; $i <= $end; $i++) { | |
| 245 | 245 | $this->children[$i]->setEmpty(); | 
| 246 | 246 | } | 
| 247 | 247 | } | 
| @@ -348,7 +348,7 @@ discard block | ||
| 348 | 348 |          switch (strtolower($format)) { | 
| 349 | 349 | case 'int': | 
| 350 | 350 | case 'n_in_month': | 
| 351 | -            return ($this->firstWeek) ? null : $this->thisWeek('n_in_month') -1; | |
| 351 | +            return ($this->firstWeek) ? null : $this->thisWeek('n_in_month') - 1; | |
| 352 | 352 | case 'n_in_year': | 
| 353 | 353 | return $this->cE->getWeekNInYear( | 
| 354 | 354 | $this->cE->stampToYear($this->prevWeek), | 
| @@ -421,7 +421,7 @@ discard block | ||
| 421 | 421 |          switch (strtolower($format)) { | 
| 422 | 422 | case 'int': | 
| 423 | 423 | case 'n_in_month': | 
| 424 | -            return ($this->lastWeek) ? null : $this->thisWeek('n_in_month') +1; | |
| 424 | +            return ($this->lastWeek) ? null : $this->thisWeek('n_in_month') + 1; | |
| 425 | 425 | case 'n_in_year': | 
| 426 | 426 | return $this->cE->getWeekNInYear( | 
| 427 | 427 | $this->cE->stampToYear($this->nextWeek), | 
| @@ -99,7 +99,7 @@ | ||
| 99 | 99 | include_once CALENDAR_ROOT.'Minute.php'; | 
| 100 | 100 | $mIH = $this->cE->getMinutesInHour($this->year, $this->month, $this->day, | 
| 101 | 101 | $this->hour); | 
| 102 | -        for ($i=0; $i < $mIH; $i++) { | |
| 102 | +        for ($i = 0; $i < $mIH; $i++) { | |
| 103 | 103 | $this->children[$i] = | 
| 104 | 104 | new Minute($this->year, $this->month, $this->day, | 
| 105 | 105 | $this->hour, $i); | 
| @@ -77,7 +77,7 @@ discard block | ||
| 77 | 77 | function stampCollection($stamp) | 
| 78 | 78 |      { | 
| 79 | 79 | static $stamps = array(); | 
| 80 | -        if ( !isset($stamps[$stamp]) ) { | |
| 80 | +        if (!isset($stamps[$stamp])) { | |
| 81 | 81 |              $date = @date('Y n j H i s t W w', $stamp); | 
| 82 | 82 | $stamps[$stamp] = sscanf($date, "%d %d %d %d %d %d %d %d %d"); | 
| 83 | 83 | } | 
| @@ -181,7 +181,7 @@ discard block | ||
| 181 | 181 | * @return int Unix timestamp | 
| 182 | 182 | * @access protected | 
| 183 | 183 | */ | 
| 184 | - function dateToStamp($y, $m, $d, $h=0, $i=0, $s=0) | |
| 184 | + function dateToStamp($y, $m, $d, $h = 0, $i = 0, $s = 0) | |
| 185 | 185 |      { | 
| 186 | 186 | static $dates = array(); | 
| 187 | 187 |          if (!isset($dates[$y][$m][$d][$h][$i][$s])) { | 
| @@ -220,7 +220,7 @@ discard block | ||
| 220 | 220 | * @return int (12) | 
| 221 | 221 | * @access protected | 
| 222 | 222 | */ | 
| 223 | - function getMonthsInYear($y=null) | |
| 223 | + function getMonthsInYear($y = null) | |
| 224 | 224 |      { | 
| 225 | 225 | return 12; | 
| 226 | 226 | } | 
| @@ -268,7 +268,7 @@ discard block | ||
| 268 | 268 | * @return int (7) | 
| 269 | 269 | * @access protected | 
| 270 | 270 | */ | 
| 271 | - function getDaysInWeek($y=null, $m=null, $d=null) | |
| 271 | + function getDaysInWeek($y = null, $m = null, $d = null) | |
| 272 | 272 |      { | 
| 273 | 273 | return 7; | 
| 274 | 274 | } | 
| @@ -301,9 +301,9 @@ discard block | ||
| 301 | 301 | * @return int week number | 
| 302 | 302 | * @access protected | 
| 303 | 303 | */ | 
| 304 | - function getWeekNInMonth($y, $m, $d, $firstDay=1) | |
| 304 | + function getWeekNInMonth($y, $m, $d, $firstDay = 1) | |
| 305 | 305 |      { | 
| 306 | - $weekEnd = (0 == $firstDay) ? $this->getDaysInWeek()-1 : $firstDay-1; | |
| 306 | + $weekEnd = (0 == $firstDay) ? $this->getDaysInWeek() - 1 : $firstDay - 1; | |
| 307 | 307 | $end_of_week = 1; | 
| 308 | 308 |          while (@date('w', @mktime(0, 0, 0, $m, $end_of_week, $y)) != $weekEnd) { | 
| 309 | 309 | ++$end_of_week; //find first weekend of the month | 
| @@ -371,7 +371,7 @@ discard block | ||
| 371 | 371 | * @return array (0,1,2,3,4,5,6) 1 = Monday | 
| 372 | 372 | * @access protected | 
| 373 | 373 | */ | 
| 374 | - function getWeekDays($y=null, $m=null, $d=null) | |
| 374 | + function getWeekDays($y = null, $m = null, $d = null) | |
| 375 | 375 |      { | 
| 376 | 376 | return array(0, 1, 2, 3, 4, 5, 6); | 
| 377 | 377 | } | 
| @@ -386,7 +386,7 @@ discard block | ||
| 386 | 386 | * @return int (default 1 = Monday) | 
| 387 | 387 | * @access protected | 
| 388 | 388 | */ | 
| 389 | - function getFirstDayOfWeek($y=null, $m=null, $d=null) | |
| 389 | + function getFirstDayOfWeek($y = null, $m = null, $d = null) | |
| 390 | 390 |      { | 
| 391 | 391 | return 1; | 
| 392 | 392 | } | 
| @@ -401,7 +401,7 @@ discard block | ||
| 401 | 401 | * @return int (24) | 
| 402 | 402 | * @access protected | 
| 403 | 403 | */ | 
| 404 | - function getHoursInDay($y=null, $m=null, $d=null) | |
| 404 | + function getHoursInDay($y = null, $m = null, $d = null) | |
| 405 | 405 |      { | 
| 406 | 406 | return 24; | 
| 407 | 407 | } | 
| @@ -417,7 +417,7 @@ discard block | ||
| 417 | 417 | * @return int (60) | 
| 418 | 418 | * @access protected | 
| 419 | 419 | */ | 
| 420 | - function getMinutesInHour($y=null, $m=null, $d=null, $h=null) | |
| 420 | + function getMinutesInHour($y = null, $m = null, $d = null, $h = null) | |
| 421 | 421 |      { | 
| 422 | 422 | return 60; | 
| 423 | 423 | } | 
| @@ -434,7 +434,7 @@ discard block | ||
| 434 | 434 | * @return int (60) | 
| 435 | 435 | * @access protected | 
| 436 | 436 | */ | 
| 437 | - function getSecondsInMinute($y=null, $m=null, $d=null, $h=null, $i=null) | |
| 437 | + function getSecondsInMinute($y = null, $m = null, $d = null, $h = null, $i = null) | |
| 438 | 438 |      { | 
| 439 | 439 | return 60; | 
| 440 | 440 | } | 
| @@ -455,7 +455,7 @@ discard block | ||
| 455 | 455 | $today = sscanf($today_date, '%d %d %d'); | 
| 456 | 456 | } | 
| 457 | 457 | $date = UnixTS::stampCollection($stamp); | 
| 458 | - return ( $date[2] == $today[2] | |
| 458 | + return ($date[2] == $today[2] | |
| 459 | 459 | && $date[1] == $today[1] | 
| 460 | 460 | && $date[0] == $today[0] | 
| 461 | 461 | ); | 
| @@ -167,7 +167,7 @@ discard block | ||
| 167 | 167 | * @return string iso-8601 datetime | 
| 168 | 168 | * @access protected | 
| 169 | 169 | */ | 
| 170 | - function dateToStamp($y, $m, $d, $h=0, $i=0, $s=0) | |
| 170 | + function dateToStamp($y, $m, $d, $h = 0, $i = 0, $s = 0) | |
| 171 | 171 |      { | 
| 172 | 172 | $r = array(); | 
| 173 | 173 | PearDate::adjustDate($y, $m, $d, $h, $i, $s); | 
| @@ -218,8 +218,8 @@ discard block | ||
| 218 | 218 | $d += floor($h / 24); | 
| 219 | 219 | $h %= 24; | 
| 220 | 220 | } | 
| 221 | - for(; $m < 1; $y--, $m+=12); | |
| 222 | - for(; $m > 12; $y++, $m-=12); | |
| 221 | + for (; $m < 1; $y--, $m += 12); | |
| 222 | + for (; $m > 12; $y++, $m -= 12); | |
| 223 | 223 | |
| 224 | 224 |          while ($d < 1) { | 
| 225 | 225 |              if ($m > 1) { | 
| @@ -230,7 +230,7 @@ discard block | ||
| 230 | 230 | } | 
| 231 | 231 | $d += Date_Calc::daysInMonth($m, $y); | 
| 232 | 232 | } | 
| 233 | -        for ($max_days = Date_Calc::daysInMonth($m, $y); $d > $max_days; ) { | |
| 233 | +        for ($max_days = Date_Calc::daysInMonth($m, $y); $d > $max_days;) { | |
| 234 | 234 | $d -= $max_days; | 
| 235 | 235 |              if ($m < 12) { | 
| 236 | 236 | $m++; | 
| @@ -271,7 +271,7 @@ discard block | ||
| 271 | 271 | * @return int (12) | 
| 272 | 272 | * @access protected | 
| 273 | 273 | */ | 
| 274 | - function getMonthsInYear($y=null) | |
| 274 | + function getMonthsInYear($y = null) | |
| 275 | 275 |      { | 
| 276 | 276 | return 12; | 
| 277 | 277 | } | 
| @@ -315,7 +315,7 @@ discard block | ||
| 315 | 315 | * @return int (7) | 
| 316 | 316 | * @access protected | 
| 317 | 317 | */ | 
| 318 | - function getDaysInWeek($y=null, $m=null, $d=null) | |
| 318 | + function getDaysInWeek($y = null, $m = null, $d = null) | |
| 319 | 319 |      { | 
| 320 | 320 | return 7; | 
| 321 | 321 | } | 
| @@ -348,9 +348,9 @@ discard block | ||
| 348 | 348 | * @return int week number | 
| 349 | 349 | * @access protected | 
| 350 | 350 | */ | 
| 351 | - function getWeekNInMonth($y, $m, $d, $firstDay=1) | |
| 351 | + function getWeekNInMonth($y, $m, $d, $firstDay = 1) | |
| 352 | 352 |      { | 
| 353 | - $weekEnd = ($firstDay == 0) ? $this->getDaysInWeek()-1 : $firstDay-1; | |
| 353 | + $weekEnd = ($firstDay == 0) ? $this->getDaysInWeek() - 1 : $firstDay - 1; | |
| 354 | 354 | $end_of_week = (int)Date_Calc::nextDayOfWeek($weekEnd, 1, $m, $y, '%e', true); | 
| 355 | 355 | $w = 1; | 
| 356 | 356 |          while ($d > $end_of_week) { | 
| @@ -370,7 +370,7 @@ discard block | ||
| 370 | 370 | * @return int weeks number | 
| 371 | 371 | * @access protected | 
| 372 | 372 | */ | 
| 373 | - function getWeeksInMonth($y, $m, $firstDay=1) | |
| 373 | + function getWeeksInMonth($y, $m, $firstDay = 1) | |
| 374 | 374 |      { | 
| 375 | 375 | $FDOM = Date_Calc::firstOfMonthWeekday($m, $y); | 
| 376 | 376 |          if ($FDOM == 0) { | 
| @@ -413,7 +413,7 @@ discard block | ||
| 413 | 413 | * @return array (0, 1, 2, 3, 4, 5, 6) 1 = Monday | 
| 414 | 414 | * @access protected | 
| 415 | 415 | */ | 
| 416 | - function getWeekDays($y=null, $m=null, $d=null) | |
| 416 | + function getWeekDays($y = null, $m = null, $d = null) | |
| 417 | 417 |      { | 
| 418 | 418 | return array(0, 1, 2, 3, 4, 5, 6); | 
| 419 | 419 | } | 
| @@ -428,7 +428,7 @@ discard block | ||
| 428 | 428 | * @return int (default 1 = Monday) | 
| 429 | 429 | * @access protected | 
| 430 | 430 | */ | 
| 431 | - function getFirstDayOfWeek($y=null, $m=null, $d=null) | |
| 431 | + function getFirstDayOfWeek($y = null, $m = null, $d = null) | |
| 432 | 432 |      { | 
| 433 | 433 | return 1; | 
| 434 | 434 | } | 
| @@ -443,7 +443,7 @@ discard block | ||
| 443 | 443 | * @return int (24) | 
| 444 | 444 | * @access protected | 
| 445 | 445 | */ | 
| 446 | - function getHoursInDay($y=null,$m=null,$d=null) | |
| 446 | + function getHoursInDay($y = null, $m = null, $d = null) | |
| 447 | 447 |      { | 
| 448 | 448 | return 24; | 
| 449 | 449 | } | 
| @@ -459,7 +459,7 @@ discard block | ||
| 459 | 459 | * @return int (60) | 
| 460 | 460 | * @access protected | 
| 461 | 461 | */ | 
| 462 | - function getMinutesInHour($y=null,$m=null,$d=null,$h=null) | |
| 462 | + function getMinutesInHour($y = null, $m = null, $d = null, $h = null) | |
| 463 | 463 |      { | 
| 464 | 464 | return 60; | 
| 465 | 465 | } | 
| @@ -476,7 +476,7 @@ discard block | ||
| 476 | 476 | * @return int (60) | 
| 477 | 477 | * @access protected | 
| 478 | 478 | */ | 
| 479 | - function getSecondsInMinute($y=null,$m=null,$d=null,$h=null,$i=null) | |
| 479 | + function getSecondsInMinute($y = null, $m = null, $d = null, $h = null, $i = null) | |
| 480 | 480 |      { | 
| 481 | 481 | return 60; | 
| 482 | 482 | } | 
| @@ -496,7 +496,7 @@ discard block | ||
| 496 | 496 | $today = new Date(); | 
| 497 | 497 | } | 
| 498 | 498 | $date = PearDate::stampCollection($stamp); | 
| 499 | - return ( $date->day == $today->getDay() | |
| 499 | + return ($date->day == $today->getDay() | |
| 500 | 500 | && $date->month == $today->getMonth() | 
| 501 | 501 | && $date->year == $today->getYear() | 
| 502 | 502 | ); | 
| @@ -100,7 +100,7 @@ | ||
| 100 | 100 | include_once CALENDAR_ROOT.'Second.php'; | 
| 101 | 101 | $sIM = $this->cE->getSecondsInMinute($this->year, $this->month, | 
| 102 | 102 | $this->day, $this->hour, $this->minute); | 
| 103 | -        for ($i=0; $i < $sIM; $i++) { | |
| 103 | +        for ($i = 0; $i < $sIM; $i++) { | |
| 104 | 104 | $this->children[$i] = new Second($this->year, $this->month, | 
| 105 | 105 | $this->day, $this->hour, $this->minute, $i); | 
| 106 | 106 | } | 
| @@ -80,7 +80,7 @@ discard block | ||
| 80 | 80 | * | 
| 81 | 81 | * @access public | 
| 82 | 82 | */ | 
| 83 | - function __construct($y, $m, $firstDay=null) | |
| 83 | + function __construct($y, $m, $firstDay = null) | |
| 84 | 84 |      { | 
| 85 | 85 | parent::__construct($y, $m); | 
| 86 | 86 | $this->firstDay = $this->defineFirstDayOfWeek($firstDay); | 
| @@ -99,7 +99,7 @@ discard block | ||
| 99 | 99 |      { | 
| 100 | 100 | include_once CALENDAR_ROOT.'Day.php'; | 
| 101 | 101 | $daysInMonth = $this->cE->getDaysInMonth($this->year, $this->month); | 
| 102 | -        for ($i=1; $i<=$daysInMonth; $i++) { | |
| 102 | +        for ($i = 1; $i <= $daysInMonth; $i++) { | |
| 103 | 103 | $this->children[$i] = new Day($this->year, $this->month, $i); | 
| 104 | 104 | } | 
| 105 | 105 |          if (count($sDates) > 0) { | 
| @@ -80,10 +80,10 @@ discard block | ||
| 80 | 80 | $format = 'long'; | 
| 81 | 81 | } | 
| 82 | 82 | $months = array(); | 
| 83 | -        for ($i=1; $i<=12; $i++) { | |
| 83 | +        for ($i = 1; $i <= 12; $i++) { | |
| 84 | 84 | $stamp = mktime(0, 0, 0, $i, 1, 2003); | 
| 85 | 85 | $month = strftime($formats[$format], $stamp); | 
| 86 | -            switch($format) { | |
| 86 | +            switch ($format) { | |
| 87 | 87 | case 'one': | 
| 88 | 88 | $month = substr($month, 0, 1); | 
| 89 | 89 | break; | 
| @@ -117,10 +117,10 @@ discard block | ||
| 117 | 117 | $format = 'long'; | 
| 118 | 118 | } | 
| 119 | 119 | $days = array(); | 
| 120 | -        for ($i=0; $i<=6; $i++) { | |
| 121 | - $stamp = mktime(0, 0, 0, 11, $i+2, 2003); | |
| 120 | +        for ($i = 0; $i <= 6; $i++) { | |
| 121 | + $stamp = mktime(0, 0, 0, 11, $i + 2, 2003); | |
| 122 | 122 | $day = strftime($formats[$format], $stamp); | 
| 123 | -            switch($format) { | |
| 123 | +            switch ($format) { | |
| 124 | 124 | case 'one': | 
| 125 | 125 | $day = substr($day, 0, 1); | 
| 126 | 126 | break; | 
| @@ -212,7 +212,7 @@ discard block | ||
| 212 | 212 | * @access public | 
| 213 | 213 | * @static | 
| 214 | 214 | */ | 
| 215 | - function thisDayName($Calendar, $format='long') | |
| 215 | + function thisDayName($Calendar, $format = 'long') | |
| 216 | 216 |      { | 
| 217 | 217 | $days = Textual::weekdayNames($format); | 
| 218 | 218 |          $stamp = $Calendar->thisDay('timestamp'); | 
| @@ -231,7 +231,7 @@ discard block | ||
| 231 | 231 | * @access public | 
| 232 | 232 | * @static | 
| 233 | 233 | */ | 
| 234 | - function nextDayName($Calendar, $format='long') | |
| 234 | + function nextDayName($Calendar, $format = 'long') | |
| 235 | 235 |      { | 
| 236 | 236 | $days = Textual::weekdayNames($format); | 
| 237 | 237 |          $stamp = $Calendar->nextDay('timestamp'); | 
| @@ -264,7 +264,7 @@ discard block | ||
| 264 | 264 | //check if defined / set | 
| 265 | 265 |              if (defined('CALENDAR_FIRST_DAY_OF_WEEK')) { | 
| 266 | 266 | $firstDay = CALENDAR_FIRST_DAY_OF_WEEK; | 
| 267 | -            } elseif(isset($Calendar->firstDay)) { | |
| 267 | +            } elseif (isset($Calendar->firstDay)) { | |
| 268 | 268 | $firstDay = $Calendar->firstDay; | 
| 269 | 269 | } | 
| 270 | 270 | $ordereddays = array(); | 
| @@ -113,7 +113,7 @@ discard block | ||
| 113 | 113 | * | 
| 114 | 114 | * @access public | 
| 115 | 115 | */ | 
| 116 | - function __construct($y, $m, $firstDay=null) | |
| 116 | + function __construct($y, $m, $firstDay = null) | |
| 117 | 117 |      { | 
| 118 | 118 | parent::__construct($y, $m, $firstDay); | 
| 119 | 119 | } | 
| @@ -151,7 +151,7 @@ discard block | ||
| 151 | 151 | function buildEmptyDaysBefore() | 
| 152 | 152 |      { | 
| 153 | 153 | $eBefore = $this->tableHelper->getEmptyDaysBefore(); | 
| 154 | -        for ($i=0; $i < $eBefore; $i++) { | |
| 154 | +        for ($i = 0; $i < $eBefore; $i++) { | |
| 155 | 155 | $stamp = $this->cE->dateToStamp($this->year, $this->month, -$i); | 
| 156 | 156 | $Day = new Day( | 
| 157 | 157 | $this->cE->stampToYear($stamp), | 
| @@ -187,8 +187,8 @@ discard block | ||
| 187 | 187 |      { | 
| 188 | 188 | $eAfter = $this->tableHelper->getEmptyDaysAfter(); | 
| 189 | 189 | $sDOM = $this->tableHelper->getNumTableDaysInMonth(); | 
| 190 | -        for ($i=1; $i <= $sDOM-$eAfter; $i++) { | |
| 191 | - $Day = new Day($this->year, $this->month+1, $i); | |
| 190 | +        for ($i = 1; $i <= $sDOM - $eAfter; $i++) { | |
| 191 | + $Day = new Day($this->year, $this->month + 1, $i); | |
| 192 | 192 | $Day->setEmpty(); | 
| 193 | 193 | $Day->adjust(); | 
| 194 | 194 | array_push($this->children, $Day); | 
| @@ -210,9 +210,9 @@ discard block | ||
| 210 | 210 | $this->thisDay() | 
| 211 | 211 | ); | 
| 212 | 212 | $sDOM = $this->tableHelper->getNumTableDaysInMonth(); | 
| 213 | -        for ($i=1; $i <= $sDOM; $i+= $dIW) { | |
| 213 | +        for ($i = 1; $i <= $sDOM; $i += $dIW) { | |
| 214 | 214 | $this->children[$i]->setFirst(); | 
| 215 | - $this->children[$i+($dIW-1)]->setLast(); | |
| 215 | + $this->children[$i + ($dIW - 1)]->setLast(); | |
| 216 | 216 | } | 
| 217 | 217 | } | 
| 218 | 218 | } | 
| @@ -105,7 +105,7 @@ discard block | ||
| 105 | 105 | * | 
| 106 | 106 | * @access public | 
| 107 | 107 | */ | 
| 108 | - function __construct($y, $m, $firstDay=null) | |
| 108 | + function __construct($y, $m, $firstDay = null) | |
| 109 | 109 |      { | 
| 110 | 110 | parent::__construct($y, $m, $firstDay); | 
| 111 | 111 | } | 
| @@ -124,8 +124,8 @@ discard block | ||
| 124 | 124 | $this->tableHelper = new Helper($this, $this->firstDay); | 
| 125 | 125 | include_once CALENDAR_ROOT.'Week.php'; | 
| 126 | 126 | $numWeeks = $this->tableHelper->getNumWeeks(); | 
| 127 | - for ($i=1, $d=1; $i<=$numWeeks; $i++, | |
| 128 | - $d+=$this->cE->getDaysInWeek( | |
| 127 | + for ($i = 1, $d = 1; $i <= $numWeeks; $i++, | |
| 128 | + $d += $this->cE->getDaysInWeek( | |
| 129 | 129 | $this->thisYear(), | 
| 130 | 130 | $this->thisMonth(), | 
| 131 | 131 | $this->thisDay() |