@@ -2367,7 +2367,7 @@ |
||
2367 | 2367 | $tCat = $xoopsDB->prefix('extcal_cat').' AS tc'; |
2368 | 2368 | |
2369 | 2369 | $sql = 'SELECT te.*, tc.cat_name , tc.cat_color, '.'year(FROM_UNIXTIME(event_start)) AS year,'.'month(FROM_UNIXTIME(event_start)) AS month,'.'day(FROM_UNIXTIME(event_start)) AS day' |
2370 | - ." FROM {$tEvent}, {$tCat}"; |
|
2370 | + ." FROM {$tEvent}, {$tCat}"; |
|
2371 | 2371 | //--------------------------------------------------- |
2372 | 2372 | $tw = array(); |
2373 | 2373 | $tw[] = 'te.cat_id = tc.cat_id'; |
@@ -150,7 +150,7 @@ |
||
150 | 150 | $cat_color = $catList->getVar('cat_color'); |
151 | 151 | $checked = in_array($cat_id, $cat) ? 'checked' : ''; |
152 | 152 | $cat = ''."<div style='float:left; margin-left:5px;'>"."<input type='checkbox' name='{$name}[{$cat_id}]' value='1' {$checked}>" |
153 | - ."<div style='absolute:left;height:12px; width:6px; background-color:#{$cat_color}; border:1px solid black; float:left; margin-right:5px;' ></div>"." {$name}".'</div>'; |
|
153 | + ."<div style='absolute:left;height:12px; width:6px; background-color:#{$cat_color}; border:1px solid black; float:left; margin-right:5px;' ></div>"." {$name}".'</div>'; |
|
154 | 154 | |
155 | 155 | $t[] = $cat; |
156 | 156 | } |
@@ -65,8 +65,8 @@ |
||
65 | 65 | // Flag current day |
66 | 66 | $selectedDays = array( |
67 | 67 | new Calendar_Day(date('Y', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($xoopsUser))), |
68 | - date('n', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($xoopsUser))), |
|
69 | - date('j', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($xoopsUser)))), |
|
68 | + date('n', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($xoopsUser))), |
|
69 | + date('j', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($xoopsUser)))), |
|
70 | 70 | ); |
71 | 71 | |
72 | 72 | // Build calendar object |
@@ -39,32 +39,32 @@ |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | switch (@$_GET['view']) { |
42 | - default: |
|
43 | - $_GET['view'] = 'calendar_year'; |
|
44 | - case 'calendar_year': |
|
45 | - require_once CALENDAR_ROOT.'Year.php'; |
|
46 | - $c = new Calendar_Year($_GET['y']); |
|
47 | - break; |
|
48 | - case 'calendar_month': |
|
49 | - require_once CALENDAR_ROOT.'Month.php'; |
|
50 | - $c = new Calendar_Month($_GET['y'], $_GET['m']); |
|
51 | - break; |
|
52 | - case 'calendar_day': |
|
53 | - require_once CALENDAR_ROOT.'Day.php'; |
|
54 | - $c = new Calendar_Day($_GET['y'], $_GET['m'], $_GET['d']); |
|
55 | - break; |
|
56 | - case 'calendar_hour': |
|
57 | - require_once CALENDAR_ROOT.'Hour.php'; |
|
58 | - $c = new Calendar_Hour($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h']); |
|
59 | - break; |
|
60 | - case 'calendar_minute': |
|
61 | - require_once CALENDAR_ROOT.'Minute.php'; |
|
62 | - $c = new Calendar_Minute($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i']); |
|
63 | - break; |
|
64 | - case 'calendar_second': |
|
65 | - require_once CALENDAR_ROOT.'Second.php'; |
|
66 | - $c = new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']); |
|
67 | - break; |
|
42 | + default: |
|
43 | + $_GET['view'] = 'calendar_year'; |
|
44 | + case 'calendar_year': |
|
45 | + require_once CALENDAR_ROOT.'Year.php'; |
|
46 | + $c = new Calendar_Year($_GET['y']); |
|
47 | + break; |
|
48 | + case 'calendar_month': |
|
49 | + require_once CALENDAR_ROOT.'Month.php'; |
|
50 | + $c = new Calendar_Month($_GET['y'], $_GET['m']); |
|
51 | + break; |
|
52 | + case 'calendar_day': |
|
53 | + require_once CALENDAR_ROOT.'Day.php'; |
|
54 | + $c = new Calendar_Day($_GET['y'], $_GET['m'], $_GET['d']); |
|
55 | + break; |
|
56 | + case 'calendar_hour': |
|
57 | + require_once CALENDAR_ROOT.'Hour.php'; |
|
58 | + $c = new Calendar_Hour($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h']); |
|
59 | + break; |
|
60 | + case 'calendar_minute': |
|
61 | + require_once CALENDAR_ROOT.'Minute.php'; |
|
62 | + $c = new Calendar_Minute($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i']); |
|
63 | + break; |
|
64 | + case 'calendar_second': |
|
65 | + require_once CALENDAR_ROOT.'Second.php'; |
|
66 | + $c = new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']); |
|
67 | + break; |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | // Convert timestamp to human readable date |
@@ -27,13 +27,13 @@ |
||
27 | 27 | public function testPrevDay_Array() |
28 | 28 | { |
29 | 29 | $this->assertEqual(array( |
30 | - 'year' => 2003, |
|
31 | - 'month' => 10, |
|
32 | - 'day' => 24, |
|
33 | - 'hour' => 0, |
|
34 | - 'minute' => 0, |
|
35 | - 'second' => 0, |
|
36 | - ), $this->cal->prevDay('array')); |
|
30 | + 'year' => 2003, |
|
31 | + 'month' => 10, |
|
32 | + 'day' => 24, |
|
33 | + 'hour' => 0, |
|
34 | + 'minute' => 0, |
|
35 | + 'second' => 0, |
|
36 | + ), $this->cal->prevDay('array')); |
|
37 | 37 | } |
38 | 38 | } |
39 | 39 |
@@ -27,13 +27,13 @@ |
||
27 | 27 | public function testPrevDay_Array() |
28 | 28 | { |
29 | 29 | $this->assertEqual(array( |
30 | - 'year' => 2003, |
|
31 | - 'month' => 10, |
|
32 | - 'day' => 24, |
|
33 | - 'hour' => 0, |
|
34 | - 'minute' => 0, |
|
35 | - 'second' => 0, |
|
36 | - ), $this->cal->prevDay('array')); |
|
30 | + 'year' => 2003, |
|
31 | + 'month' => 10, |
|
32 | + 'day' => 24, |
|
33 | + 'hour' => 0, |
|
34 | + 'minute' => 0, |
|
35 | + 'second' => 0, |
|
36 | + ), $this->cal->prevDay('array')); |
|
37 | 37 | } |
38 | 38 | } |
39 | 39 |
@@ -32,13 +32,13 @@ |
||
32 | 32 | public function testPrevDay_Array() |
33 | 33 | { |
34 | 34 | $this->assertEqual(array( |
35 | - 'year' => 2003, |
|
36 | - 'month' => 9, |
|
37 | - 'day' => 30, |
|
38 | - 'hour' => 0, |
|
39 | - 'minute' => 0, |
|
40 | - 'second' => 0, |
|
41 | - ), $this->cal->prevDay('array')); |
|
35 | + 'year' => 2003, |
|
36 | + 'month' => 9, |
|
37 | + 'day' => 30, |
|
38 | + 'hour' => 0, |
|
39 | + 'minute' => 0, |
|
40 | + 'second' => 0, |
|
41 | + ), $this->cal->prevDay('array')); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | public function testThisDay() |
@@ -32,13 +32,13 @@ |
||
32 | 32 | public function testPrevDay_Array() |
33 | 33 | { |
34 | 34 | $this->assertEqual(array( |
35 | - 'year' => 2003, |
|
36 | - 'month' => 9, |
|
37 | - 'day' => 30, |
|
38 | - 'hour' => 0, |
|
39 | - 'minute' => 0, |
|
40 | - 'second' => 0, |
|
41 | - ), $this->cal->prevDay('array')); |
|
35 | + 'year' => 2003, |
|
36 | + 'month' => 9, |
|
37 | + 'day' => 30, |
|
38 | + 'hour' => 0, |
|
39 | + 'minute' => 0, |
|
40 | + 'second' => 0, |
|
41 | + ), $this->cal->prevDay('array')); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | public function testThisDay() |
@@ -27,13 +27,13 @@ |
||
27 | 27 | public function testPrevDay_Array() |
28 | 28 | { |
29 | 29 | $this->assertEqual(array( |
30 | - 'year' => 2003, |
|
31 | - 'month' => 10, |
|
32 | - 'day' => 24, |
|
33 | - 'hour' => 0, |
|
34 | - 'minute' => 0, |
|
35 | - 'second' => 0, |
|
36 | - ), $this->cal->prevDay('array')); |
|
30 | + 'year' => 2003, |
|
31 | + 'month' => 10, |
|
32 | + 'day' => 24, |
|
33 | + 'hour' => 0, |
|
34 | + 'minute' => 0, |
|
35 | + 'second' => 0, |
|
36 | + ), $this->cal->prevDay('array')); |
|
37 | 37 | } |
38 | 38 | } |
39 | 39 |