@@ -250,7 +250,9 @@ discard block |
||
| 250 | 250 | function setSmallIncrement($smallIncrement) |
| 251 | 251 | { |
| 252 | 252 | $this->_smallIncrement = intval($smallIncrement); |
| 253 | - if ($this->_smallIncrement == 0) $this->_smallIncrement =1; |
|
| 253 | + if ($this->_smallIncrement == 0) { |
|
| 254 | + $this->_smallIncrement =1; |
|
| 255 | + } |
|
| 254 | 256 | } |
| 255 | 257 | |
| 256 | 258 | /*-----------------------------------------------------------------*/ |
@@ -270,7 +272,9 @@ discard block |
||
| 270 | 272 | function setLargeIncrement($largeIncrement) |
| 271 | 273 | { |
| 272 | 274 | $this->_largeIncrement = intval($largeIncrement); |
| 273 | - if ($this->_largeIncrement == 0) $this->_largeIncrement = 10; |
|
| 275 | + if ($this->_largeIncrement == 0) { |
|
| 276 | + $this->_largeIncrement = 10; |
|
| 277 | + } |
|
| 274 | 278 | } |
| 275 | 279 | |
| 276 | 280 | /*-----------------------------------------------------------------*/ |
@@ -291,7 +295,9 @@ discard block |
||
| 291 | 295 | function setSize($size) |
| 292 | 296 | { |
| 293 | 297 | $this->_size = $size; |
| 294 | - if ($this->_size == 0) $this->_size = 2; |
|
| 298 | + if ($this->_size == 0) { |
|
| 299 | + $this->_size = 2; |
|
| 300 | + } |
|
| 295 | 301 | } |
| 296 | 302 | /*-----------------------------------------------------------------*/ |
| 297 | 303 | function getImgFolder() |
@@ -309,7 +315,9 @@ discard block |
||
| 309 | 315 | */ |
| 310 | 316 | function setImgFolder($folder) |
| 311 | 317 | { |
| 312 | - if ($folder <> '' ) $this->_imgFolder = $folder; |
|
| 318 | + if ($folder <> '' ) { |
|
| 319 | + $this->_imgFolder = $folder; |
|
| 320 | + } |
|
| 313 | 321 | } |
| 314 | 322 | /*-----------------------------------------------------------------*/ |
| 315 | 323 | /** |
@@ -345,7 +353,9 @@ discard block |
||
| 345 | 353 | */ |
| 346 | 354 | function setStyleText($style) |
| 347 | 355 | { |
| 348 | - if ($style <> '') $this->_styleText = $style; |
|
| 356 | + if ($style <> '') { |
|
| 357 | + $this->_styleText = $style; |
|
| 358 | + } |
|
| 349 | 359 | } |
| 350 | 360 | /*-----------------------------------------------------------------*/ |
| 351 | 361 | /** |
@@ -363,7 +373,9 @@ discard block |
||
| 363 | 373 | */ |
| 364 | 374 | function setStyleBordure($style) |
| 365 | 375 | { |
| 366 | - if ($style <> '') $this->_styleBordure = $style; |
|
| 376 | + if ($style <> '') { |
|
| 377 | + $this->_styleBordure = $style; |
|
| 378 | + } |
|
| 367 | 379 | } |
| 368 | 380 | /*-----------------------------------------------------------------*/ |
| 369 | 381 | /** |
@@ -493,7 +505,7 @@ discard block |
||
| 493 | 505 | if (substr($value,0,strlen($attribut)) <> $attribut){ |
| 494 | 506 | $r ="{$attribut}=\"{$value}\""; |
| 495 | 507 | } |
| 496 | - }else{ |
|
| 508 | + } else{ |
|
| 497 | 509 | $r = ''; |
| 498 | 510 | } |
| 499 | 511 | |
@@ -1691,9 +1691,11 @@ |
||
| 1691 | 1691 | if ($occurEventStart <= $periodEnd // Event start falls within search period |
| 1692 | 1692 | && $occurEventEnd >= $periodStart // Event end falls within search period |
| 1693 | 1693 | && in_array($dayArray[date('w', $occurEventStart)], $eventOptions) |
| 1694 | - ) // This week day is selected |
|
| 1694 | + ) { |
|
| 1695 | + // This week day is selected |
|
| 1695 | 1696 | { |
| 1696 | 1697 | $event['event_start'] = $occurEventStart; |
| 1698 | + } |
|
| 1697 | 1699 | $event['event_end'] = $occurEventEnd; |
| 1698 | 1700 | |
| 1699 | 1701 | $recuEvents[] = $event; |
@@ -95,58 +95,58 @@ |
||
| 95 | 95 | { |
| 96 | 96 | $firstDay = defined('CALENDAR_FIRST_DAY_OF_WEEK') ? CALENDAR_FIRST_DAY_OF_WEEK : 1; |
| 97 | 97 | switch ($type) { |
| 98 | - case 'Day': |
|
| 99 | - include_once CALENDAR_ROOT.'Day.php'; |
|
| 98 | + case 'Day': |
|
| 99 | + include_once CALENDAR_ROOT.'Day.php'; |
|
| 100 | 100 | |
| 101 | - return new Calendar_Day($y, $m, $d); |
|
| 102 | - case 'Month': |
|
| 103 | - // Set default state for which month type to build |
|
| 104 | - if (!defined('CALENDAR_MONTH_STATE')) { |
|
| 105 | - define('CALENDAR_MONTH_STATE', CALENDAR_USE_MONTH); |
|
| 106 | - } |
|
| 107 | - switch (CALENDAR_MONTH_STATE) { |
|
| 108 | - case CALENDAR_USE_MONTH_WEEKDAYS: |
|
| 109 | - include_once CALENDAR_ROOT.'Month/Weekdays.php'; |
|
| 110 | - $class = 'Calendar_Month_Weekdays'; |
|
| 111 | - break; |
|
| 112 | - case CALENDAR_USE_MONTH_WEEKS: |
|
| 113 | - include_once CALENDAR_ROOT.'Month/Weeks.php'; |
|
| 114 | - $class = 'Calendar_Month_Weeks'; |
|
| 115 | - break; |
|
| 116 | - case CALENDAR_USE_MONTH: |
|
| 117 | - default: |
|
| 118 | - include_once CALENDAR_ROOT.'Month.php'; |
|
| 119 | - $class = 'Calendar_Month'; |
|
| 120 | - break; |
|
| 121 | - } |
|
| 101 | + return new Calendar_Day($y, $m, $d); |
|
| 102 | + case 'Month': |
|
| 103 | + // Set default state for which month type to build |
|
| 104 | + if (!defined('CALENDAR_MONTH_STATE')) { |
|
| 105 | + define('CALENDAR_MONTH_STATE', CALENDAR_USE_MONTH); |
|
| 106 | + } |
|
| 107 | + switch (CALENDAR_MONTH_STATE) { |
|
| 108 | + case CALENDAR_USE_MONTH_WEEKDAYS: |
|
| 109 | + include_once CALENDAR_ROOT.'Month/Weekdays.php'; |
|
| 110 | + $class = 'Calendar_Month_Weekdays'; |
|
| 111 | + break; |
|
| 112 | + case CALENDAR_USE_MONTH_WEEKS: |
|
| 113 | + include_once CALENDAR_ROOT.'Month/Weeks.php'; |
|
| 114 | + $class = 'Calendar_Month_Weeks'; |
|
| 115 | + break; |
|
| 116 | + case CALENDAR_USE_MONTH: |
|
| 117 | + default: |
|
| 118 | + include_once CALENDAR_ROOT.'Month.php'; |
|
| 119 | + $class = 'Calendar_Month'; |
|
| 120 | + break; |
|
| 121 | + } |
|
| 122 | 122 | |
| 123 | 123 | return new $class($y, $m, $firstDay); |
| 124 | - case 'Week': |
|
| 125 | - include_once CALENDAR_ROOT.'Week.php'; |
|
| 124 | + case 'Week': |
|
| 125 | + include_once CALENDAR_ROOT.'Week.php'; |
|
| 126 | 126 | |
| 127 | - return new Calendar_Week($y, $m, $d, $firstDay); |
|
| 128 | - case 'Hour': |
|
| 129 | - include_once CALENDAR_ROOT.'Hour.php'; |
|
| 127 | + return new Calendar_Week($y, $m, $d, $firstDay); |
|
| 128 | + case 'Hour': |
|
| 129 | + include_once CALENDAR_ROOT.'Hour.php'; |
|
| 130 | 130 | |
| 131 | - return new Calendar_Hour($y, $m, $d, $h); |
|
| 132 | - case 'Minute': |
|
| 133 | - include_once CALENDAR_ROOT.'Minute.php'; |
|
| 131 | + return new Calendar_Hour($y, $m, $d, $h); |
|
| 132 | + case 'Minute': |
|
| 133 | + include_once CALENDAR_ROOT.'Minute.php'; |
|
| 134 | 134 | |
| 135 | - return new Calendar_Minute($y, $m, $d, $h, $i); |
|
| 136 | - case 'Second': |
|
| 137 | - include_once CALENDAR_ROOT.'Second.php'; |
|
| 135 | + return new Calendar_Minute($y, $m, $d, $h, $i); |
|
| 136 | + case 'Second': |
|
| 137 | + include_once CALENDAR_ROOT.'Second.php'; |
|
| 138 | 138 | |
| 139 | - return new Calendar_Second($y, $m, $d, $h, $i, $s); |
|
| 140 | - case 'Year': |
|
| 141 | - include_once CALENDAR_ROOT.'Year.php'; |
|
| 139 | + return new Calendar_Second($y, $m, $d, $h, $i, $s); |
|
| 140 | + case 'Year': |
|
| 141 | + include_once CALENDAR_ROOT.'Year.php'; |
|
| 142 | 142 | |
| 143 | - return new Calendar_Year($y); |
|
| 144 | - default: |
|
| 145 | - include_once 'PEAR.php'; |
|
| 146 | - PEAR::raiseError('Calendar_Factory::create() unrecognised type: '.$type, |
|
| 147 | - null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()'); |
|
| 143 | + return new Calendar_Year($y); |
|
| 144 | + default: |
|
| 145 | + include_once 'PEAR.php'; |
|
| 146 | + PEAR::raiseError('Calendar_Factory::create() unrecognised type: '.$type, |
|
| 147 | + null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()'); |
|
| 148 | 148 | |
| 149 | - return false; |
|
| 149 | + return false; |
|
| 150 | 150 | } |
| 151 | 151 | } |
| 152 | 152 | |
@@ -115,8 +115,9 @@ |
||
| 115 | 115 | $this->cal->build($selection); |
| 116 | 116 | $i = 0; |
| 117 | 117 | while ( $Child = $this->cal->fetch() ) { |
| 118 | - if ( $i == 13 ) |
|
| 119 | - break; |
|
| 118 | + if ( $i == 13 ) { |
|
| 119 | + break; |
|
| 120 | + } |
|
| 120 | 121 | ++$i; |
| 121 | 122 | } |
| 122 | 123 | $this->assertTrue($Child->isSelected()); |
@@ -131,8 +131,9 @@ |
||
| 131 | 131 | $this->cal->build($selection); |
| 132 | 132 | $i = 1; |
| 133 | 133 | while ( $Child = $this->cal->fetch() ) { |
| 134 | - if ( $i == 25 ) |
|
| 135 | - break; |
|
| 134 | + if ( $i == 25 ) { |
|
| 135 | + break; |
|
| 136 | + } |
|
| 136 | 137 | ++$i; |
| 137 | 138 | } |
| 138 | 139 | $this->assertTrue($Child->isSelected()); |
@@ -103,8 +103,9 @@ |
||
| 103 | 103 | $this->cal->build($selection); |
| 104 | 104 | $i = 0; |
| 105 | 105 | while ( $Child = $this->cal->fetch() ) { |
| 106 | - if ( $i == 43 ) |
|
| 107 | - break; |
|
| 106 | + if ( $i == 43 ) { |
|
| 107 | + break; |
|
| 108 | + } |
|
| 108 | 109 | ++$i; |
| 109 | 110 | } |
| 110 | 111 | $this->assertTrue($Child->isSelected()); |
@@ -159,8 +159,9 @@ |
||
| 159 | 159 | $this->cal->build($selection); |
| 160 | 160 | $i = 1; |
| 161 | 161 | while ( $Child = $this->cal->fetch() ) { |
| 162 | - if ( $i == 10 ) |
|
| 163 | - break; |
|
| 162 | + if ( $i == 10 ) { |
|
| 163 | + break; |
|
| 164 | + } |
|
| 164 | 165 | ++$i; |
| 165 | 166 | } |
| 166 | 167 | $this->assertTrue($Child->isSelected()); |
@@ -103,8 +103,9 @@ |
||
| 103 | 103 | $this->cal->build($selection); |
| 104 | 104 | $i = 0; |
| 105 | 105 | while ( $Child = $this->cal->fetch() ) { |
| 106 | - if ( $i == 32 ) |
|
| 107 | - break; |
|
| 106 | + if ( $i == 32 ) { |
|
| 107 | + break; |
|
| 108 | + } |
|
| 108 | 109 | ++$i; |
| 109 | 110 | } |
| 110 | 111 | $this->assertTrue($Child->isSelected()); |
@@ -17,8 +17,12 @@ discard block |
||
| 17 | 17 | $basePath = implode('/', $basePath); |
| 18 | 18 | $url = 'http://'.$_SERVER['SERVER_NAME'].$basePath.'/7.php?wsdl'; |
| 19 | 19 | |
| 20 | -if (!isset($_GET['y'])) $_GET['y'] = date('Y'); |
|
| 21 | -if (!isset($_GET['m'])) $_GET['m'] = date('n'); |
|
| 20 | +if (!isset($_GET['y'])) { |
|
| 21 | + $_GET['y'] = date('Y'); |
|
| 22 | +} |
|
| 23 | +if (!isset($_GET['m'])) { |
|
| 24 | + $_GET['m'] = date('n'); |
|
| 25 | +} |
|
| 22 | 26 | |
| 23 | 27 | $wsdl = new SOAP_WSDL ($url); |
| 24 | 28 | |
@@ -47,16 +51,18 @@ discard block |
||
| 47 | 51 | <?php |
| 48 | 52 | foreach ($month->days as $day) { |
| 49 | 53 | |
| 50 | - if ( $day->isFirst === 1 ) |
|
| 51 | - echo ( "<tr>\n" ); |
|
| 54 | + if ( $day->isFirst === 1 ) { |
|
| 55 | + echo ( "<tr>\n" ); |
|
| 56 | + } |
|
| 52 | 57 | if ($day->isEmpty === 1) { |
| 53 | 58 | echo ( "<td></td>" ); |
| 54 | 59 | } else { |
| 55 | 60 | echo ( "<td>".$day->day."</td>" ); |
| 56 | 61 | } |
| 57 | - if ( $day->isLast === 1 ) |
|
| 58 | - echo ( "</tr>\n" ); |
|
| 59 | -} |
|
| 62 | + if ( $day->isLast === 1 ) { |
|
| 63 | + echo ( "</tr>\n" ); |
|
| 64 | + } |
|
| 65 | + } |
|
| 60 | 66 | ?> |
| 61 | 67 | <tr> |
| 62 | 68 | </table> |