@@ -21,9 +21,15 @@ |
||
| 21 | 21 | require_once CALENDAR_ROOT.'Day.php'; |
| 22 | 22 | |
| 23 | 23 | // Initialize GET variables if not set |
| 24 | -if (!isset($_GET['y'])) $_GET['y'] = date('Y'); |
|
| 25 | -if (!isset($_GET['m'])) $_GET['m'] = date('m'); |
|
| 26 | -if (!isset($_GET['d'])) $_GET['d'] = date('d'); |
|
| 24 | +if (!isset($_GET['y'])) { |
|
| 25 | + $_GET['y'] = date('Y'); |
|
| 26 | +} |
|
| 27 | +if (!isset($_GET['m'])) { |
|
| 28 | + $_GET['m'] = date('m'); |
|
| 29 | +} |
|
| 30 | +if (!isset($_GET['d'])) { |
|
| 31 | + $_GET['d'] = date('d'); |
|
| 32 | +} |
|
| 27 | 33 | |
| 28 | 34 | // Build a month object |
| 29 | 35 | $Month = new Calendar_Month_Weeks($_GET['y'], $_GET['m']); |
@@ -18,9 +18,15 @@ |
||
| 18 | 18 | require_once CALENDAR_ROOT.'Month/Weekdays.php'; |
| 19 | 19 | require_once CALENDAR_ROOT.'Day.php'; |
| 20 | 20 | |
| 21 | -if (!isset($_GET['y'])) $_GET['y'] = date('Y'); |
|
| 22 | -if (!isset($_GET['m'])) $_GET['m'] = date('n'); |
|
| 23 | -if (!isset($_GET['d'])) $_GET['d'] = date('j'); |
|
| 21 | +if (!isset($_GET['y'])) { |
|
| 22 | + $_GET['y'] = date('Y'); |
|
| 23 | +} |
|
| 24 | +if (!isset($_GET['m'])) { |
|
| 25 | + $_GET['m'] = date('n'); |
|
| 26 | +} |
|
| 27 | +if (!isset($_GET['d'])) { |
|
| 28 | + $_GET['d'] = date('j'); |
|
| 29 | +} |
|
| 24 | 30 | |
| 25 | 31 | $Month = new Calendar_Month_Weekdays($_GET['y'],$_GET['m']); |
| 26 | 32 | $Day = new Calendar_Day($_GET['y'],$_GET['m'],$_GET['d']); |
@@ -15,9 +15,15 @@ |
||
| 15 | 15 | } |
| 16 | 16 | require_once CALENDAR_ROOT.'Week.php'; |
| 17 | 17 | |
| 18 | -if (!isset($_GET['y'])) $_GET['y'] = date('Y'); |
|
| 19 | -if (!isset($_GET['m'])) $_GET['m'] = date('m'); |
|
| 20 | -if (!isset($_GET['d'])) $_GET['d'] = 1; |
|
| 18 | +if (!isset($_GET['y'])) { |
|
| 19 | + $_GET['y'] = date('Y'); |
|
| 20 | +} |
|
| 21 | +if (!isset($_GET['m'])) { |
|
| 22 | + $_GET['m'] = date('m'); |
|
| 23 | +} |
|
| 24 | +if (!isset($_GET['d'])) { |
|
| 25 | + $_GET['d'] = 1; |
|
| 26 | +} |
|
| 21 | 27 | |
| 22 | 28 | // Build the month |
| 23 | 29 | $Week = new Calendar_Week($_GET['y'], $_GET['m'], $_GET['d']); |
@@ -118,12 +118,24 @@ |
||
| 118 | 118 | */ |
| 119 | 119 | function setFragments($y, $m=null, $d=null, $h=null, $i=null, $s=null) |
| 120 | 120 | { |
| 121 | - if (!is_null($y)) $this->uris['Year'] = $y; |
|
| 122 | - if (!is_null($m)) $this->uris['Month'] = $m; |
|
| 123 | - if (!is_null($d)) $this->uris['Day'] = $d; |
|
| 124 | - if (!is_null($h)) $this->uris['Hour'] = $h; |
|
| 125 | - if (!is_null($i)) $this->uris['Minute'] = $i; |
|
| 126 | - if (!is_null($s)) $this->uris['Second'] = $s; |
|
| 121 | + if (!is_null($y)) { |
|
| 122 | + $this->uris['Year'] = $y; |
|
| 123 | + } |
|
| 124 | + if (!is_null($m)) { |
|
| 125 | + $this->uris['Month'] = $m; |
|
| 126 | + } |
|
| 127 | + if (!is_null($d)) { |
|
| 128 | + $this->uris['Day'] = $d; |
|
| 129 | + } |
|
| 130 | + if (!is_null($h)) { |
|
| 131 | + $this->uris['Hour'] = $h; |
|
| 132 | + } |
|
| 133 | + if (!is_null($i)) { |
|
| 134 | + $this->uris['Minute'] = $i; |
|
| 135 | + } |
|
| 136 | + if (!is_null($s)) { |
|
| 137 | + $this->uris['Second'] = $s; |
|
| 138 | + } |
|
| 127 | 139 | } |
| 128 | 140 | |
| 129 | 141 | /** |