@@ -1,15 +1,15 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include __DIR__ . '/../../mainfile.php'; |
|
4 | -include_once __DIR__ . '/include/constantes.php'; |
|
3 | +include __DIR__.'/../../mainfile.php'; |
|
4 | +include_once __DIR__.'/include/constantes.php'; |
|
5 | 5 | $params = array('view' => _EXTCAL_NAV_CALMONTH, 'file' => _EXTCAL_FILE_CALMONTH); |
6 | 6 | $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl"; |
7 | -include_once __DIR__ . '/header.php'; |
|
7 | +include_once __DIR__.'/header.php'; |
|
8 | 8 | |
9 | 9 | /* ========================================================================== */ |
10 | -$year = isset($_GET['year']) ? (int)$_GET['year'] : date('Y'); |
|
11 | -$month = isset($_GET['month']) ? (int)$_GET['month'] : date('n'); |
|
12 | -$cat = isset($_GET['cat']) ? (int)$_GET['cat'] : 0; |
|
10 | +$year = isset($_GET['year']) ? (int) $_GET['year'] : date('Y'); |
|
11 | +$month = isset($_GET['month']) ? (int) $_GET['month'] : date('n'); |
|
12 | +$cat = isset($_GET['cat']) ? (int) $_GET['cat'] : 0; |
|
13 | 13 | /* ========================================================================== */ |
14 | 14 | |
15 | 15 | $form = new XoopsSimpleForm('', 'navigSelectBox', $params['file'], 'get'); |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | 'cat' => $cat, |
32 | 32 | 'externalKeys' => 'cat_id', |
33 | 33 | ); |
34 | -$events = $eventHandler->getEventsOnPeriode($criteres); |
|
34 | +$events = $eventHandler->getEventsOnPeriode($criteres); |
|
35 | 35 | /**********************************************************************/ |
36 | 36 | |
37 | 37 | // Calculating timestamp for the begin and the end of the month |
@@ -128,21 +128,21 @@ discard block |
||
128 | 128 | // Making navig data |
129 | 129 | $navig = array( |
130 | 130 | 'prev' => array( |
131 | - 'uri' => 'year=' . $pMonthCalObj->thisYear() . '&month=' . $pMonthCalObj->thisMonth(), |
|
131 | + 'uri' => 'year='.$pMonthCalObj->thisYear().'&month='.$pMonthCalObj->thisMonth(), |
|
132 | 132 | 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $pMonthCalObj->getTimestamp()), |
133 | 133 | ), |
134 | 134 | 'this' => array( |
135 | - 'uri' => 'year=' . $monthCalObj->thisYear() . '&month=' . $monthCalObj->thisMonth(), |
|
135 | + 'uri' => 'year='.$monthCalObj->thisYear().'&month='.$monthCalObj->thisMonth(), |
|
136 | 136 | 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $monthCalObj->getTimestamp()), |
137 | 137 | ), |
138 | 138 | 'next' => array( |
139 | - 'uri' => 'year=' . $nMonthCalObj->thisYear() . '&month=' . $nMonthCalObj->thisMonth(), |
|
139 | + 'uri' => 'year='.$nMonthCalObj->thisYear().'&month='.$nMonthCalObj->thisMonth(), |
|
140 | 140 | 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $nMonthCalObj->getTimestamp()), |
141 | 141 | ), |
142 | 142 | ); |
143 | 143 | |
144 | 144 | // Title of the page |
145 | -$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']); |
|
145 | +$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']); |
|
146 | 146 | |
147 | 147 | // Assigning navig data to the template |
148 | 148 | $xoopsTpl->assign('navig', $navig); |
@@ -182,4 +182,4 @@ discard block |
||
182 | 182 | $xoopsTpl->assign('lang', $lang); |
183 | 183 | $xoopsTpl->assign('view', 'calmonth'); |
184 | 184 | |
185 | -include XOOPS_ROOT_PATH . '/footer.php'; |
|
185 | +include XOOPS_ROOT_PATH.'/footer.php'; |
@@ -1,17 +1,17 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include __DIR__ . '/../../mainfile.php'; |
|
4 | -include_once __DIR__ . '/include/constantes.php'; |
|
3 | +include __DIR__.'/../../mainfile.php'; |
|
4 | +include_once __DIR__.'/include/constantes.php'; |
|
5 | 5 | $params = array('view' => _EXTCAL_NAV_AGENDA_DAY, 'file' => _EXTCAL_FILE_AGENDA_DAY); |
6 | 6 | $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl"; |
7 | -include_once __DIR__ . '/header.php'; |
|
7 | +include_once __DIR__.'/header.php'; |
|
8 | 8 | |
9 | 9 | /* ========================================================================== */ |
10 | 10 | //recupe des variables get |
11 | -$year = isset($_GET['year']) ? (int)$_GET['year'] : date('Y'); |
|
12 | -$month = isset($_GET['month']) ? (int)$_GET['month'] : date('n'); |
|
13 | -$day = isset($_GET['day']) ? (int)$_GET['day'] : date('j'); |
|
14 | -$cat = isset($_GET['cat']) ? (int)$_GET['cat'] : 0; |
|
11 | +$year = isset($_GET['year']) ? (int) $_GET['year'] : date('Y'); |
|
12 | +$month = isset($_GET['month']) ? (int) $_GET['month'] : date('n'); |
|
13 | +$day = isset($_GET['day']) ? (int) $_GET['day'] : date('j'); |
|
14 | +$cat = isset($_GET['cat']) ? (int) $_GET['cat'] : 0; |
|
15 | 15 | /* ========================================================================== */ |
16 | 16 | |
17 | 17 | //echo "{$params['view']}-{$year}-{$month}-{$day}<hr>extcal_{$params['view']}.html<br>"; |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | 'nbJours' => $nbJours, |
45 | 45 | 'externalKeys' => 'cat_id', |
46 | 46 | ); |
47 | -$events = $eventHandler->getEventsOnPeriode($criteres); |
|
47 | +$events = $eventHandler->getEventsOnPeriode($criteres); |
|
48 | 48 | /**********************************************************************/ |
49 | 49 | $eventsArray = $events; |
50 | 50 | $startDay = mktime(0, 0, 0, $month, $day, $year); |
@@ -99,21 +99,21 @@ discard block |
||
99 | 99 | |
100 | 100 | $navig = array( |
101 | 101 | 'prev' => array( |
102 | - 'uri' => 'year=' . $pDayCalObj->thisYear() . '&month=' . $pDayCalObj->thisMonth() . '&day=' . $pDayCalObj->thisDay(), |
|
102 | + 'uri' => 'year='.$pDayCalObj->thisYear().'&month='.$pDayCalObj->thisMonth().'&day='.$pDayCalObj->thisDay(), |
|
103 | 103 | 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_day'], $pDayCalObj->getTimestamp()), |
104 | 104 | ), |
105 | 105 | 'this' => array( |
106 | - 'uri' => 'year=' . $dayCalObj->thisYear() . '&month=' . $dayCalObj->thisMonth() . '&day=' . $dayCalObj->thisDay(), |
|
106 | + 'uri' => 'year='.$dayCalObj->thisYear().'&month='.$dayCalObj->thisMonth().'&day='.$dayCalObj->thisDay(), |
|
107 | 107 | 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_day'], $dayCalObj->getTimestamp()), |
108 | 108 | ), |
109 | 109 | 'next' => array( |
110 | - 'uri' => 'year=' . $nDayCalObj->thisYear() . '&month=' . $nDayCalObj->thisMonth() . '&day=' . $nDayCalObj->thisDay(), |
|
110 | + 'uri' => 'year='.$nDayCalObj->thisYear().'&month='.$nDayCalObj->thisMonth().'&day='.$nDayCalObj->thisDay(), |
|
111 | 111 | 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_day'], $nDayCalObj->getTimestamp()), |
112 | 112 | ), |
113 | 113 | ); |
114 | 114 | |
115 | 115 | // Title of the page |
116 | -$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']); |
|
116 | +$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']); |
|
117 | 117 | |
118 | 118 | // Assigning navig data to the template |
119 | 119 | $xoopsTpl->assign('navig', $navig); |
@@ -154,4 +154,4 @@ discard block |
||
154 | 154 | $xoopsTpl->assign('lang', $lang); |
155 | 155 | $xoopsTpl->assign('view', 'agendaday'); |
156 | 156 | |
157 | -include XOOPS_ROOT_PATH . '/footer.php'; |
|
157 | +include XOOPS_ROOT_PATH.'/footer.php'; |
@@ -1,16 +1,16 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include __DIR__ . '/../../mainfile.php'; |
|
4 | -include_once __DIR__ . '/include/constantes.php'; |
|
3 | +include __DIR__.'/../../mainfile.php'; |
|
4 | +include_once __DIR__.'/include/constantes.php'; |
|
5 | 5 | $params = array('view' => _EXTCAL_NAV_WEEK, 'file' => _EXTCAL_FILE_WEEK); |
6 | 6 | $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl"; |
7 | -include_once __DIR__ . '/header.php'; |
|
7 | +include_once __DIR__.'/header.php'; |
|
8 | 8 | |
9 | 9 | /* ========================================================================== */ |
10 | -$year = isset($_GET['year']) ? (int)$_GET['year'] : date('Y'); |
|
11 | -$month = isset($_GET['month']) ? (int)$_GET['month'] : date('n'); |
|
12 | -$day = isset($_GET['day']) ? (int)$_GET['day'] : date('j'); |
|
13 | -$cat = isset($_GET['cat']) ? (int)$_GET['cat'] : 0; |
|
10 | +$year = isset($_GET['year']) ? (int) $_GET['year'] : date('Y'); |
|
11 | +$month = isset($_GET['month']) ? (int) $_GET['month'] : date('n'); |
|
12 | +$day = isset($_GET['day']) ? (int) $_GET['day'] : date('j'); |
|
13 | +$cat = isset($_GET['cat']) ? (int) $_GET['cat'] : 0; |
|
14 | 14 | /* ========================================================================== */ |
15 | 15 | |
16 | 16 | // Validate the date (day, month and year) |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | 'cat' => $cat, |
46 | 46 | 'externalKeys' => 'cat_id', |
47 | 47 | ); |
48 | -$events = $eventHandler->getEventsOnPeriode($criteres); |
|
48 | +$events = $eventHandler->getEventsOnPeriode($criteres); |
|
49 | 49 | /**********************************************************************/ |
50 | 50 | $eventsArray = $events; |
51 | 51 | // Formating date |
@@ -86,21 +86,21 @@ discard block |
||
86 | 86 | $nWeekCalObj = $weekCalObj->nextWeek('object'); |
87 | 87 | $navig = array( |
88 | 88 | 'prev' => array( |
89 | - 'uri' => 'year=' . $pWeekCalObj->thisYear() . '&month=' . $pWeekCalObj->thisMonth() . '&day=' . $pWeekCalObj->thisDay(), |
|
89 | + 'uri' => 'year='.$pWeekCalObj->thisYear().'&month='.$pWeekCalObj->thisMonth().'&day='.$pWeekCalObj->thisDay(), |
|
90 | 90 | 'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $pWeekCalObj->getTimestamp()), |
91 | 91 | ), |
92 | 92 | 'this' => array( |
93 | - 'uri' => 'year=' . $weekCalObj->thisYear() . '&month=' . $weekCalObj->thisMonth() . '&day=' . $weekCalObj->thisDay(), |
|
93 | + 'uri' => 'year='.$weekCalObj->thisYear().'&month='.$weekCalObj->thisMonth().'&day='.$weekCalObj->thisDay(), |
|
94 | 94 | 'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $weekCalObj->getTimestamp()), |
95 | 95 | ), |
96 | 96 | 'next' => array( |
97 | - 'uri' => 'year=' . $nWeekCalObj->thisYear() . '&month=' . $nWeekCalObj->thisMonth() . '&day=' . $nWeekCalObj->thisDay(), |
|
97 | + 'uri' => 'year='.$nWeekCalObj->thisYear().'&month='.$nWeekCalObj->thisMonth().'&day='.$nWeekCalObj->thisDay(), |
|
98 | 98 | 'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $nWeekCalObj->getTimestamp()), |
99 | 99 | ), |
100 | 100 | ); |
101 | 101 | |
102 | 102 | // Title of the page |
103 | -$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']); |
|
103 | +$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']); |
|
104 | 104 | |
105 | 105 | // Assigning navig data to the template |
106 | 106 | $xoopsTpl->assign('navig', $navig); |
@@ -160,4 +160,4 @@ discard block |
||
160 | 160 | $xoopsTpl->assign('lang', $lang); |
161 | 161 | $xoopsTpl->assign('view', 'week'); |
162 | 162 | |
163 | -include XOOPS_ROOT_PATH . '/footer.php'; |
|
163 | +include XOOPS_ROOT_PATH.'/footer.php'; |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined'); |
4 | 4 | |
5 | -include_once XOOPS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/calendar.php'; |
|
5 | +include_once XOOPS_ROOT_PATH.'/language/'.$GLOBALS['xoopsConfig']['language'].'/calendar.php'; |
|
6 | 6 | |
7 | 7 | $moduleDirName = basename(dirname(__DIR__)); |
8 | 8 | xoops_loadLanguage('main', $moduleDirName); |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | */ |
91 | 91 | public function getFormatedDate($format, $timestamp) |
92 | 92 | { |
93 | - $patterns = array( |
|
93 | + $patterns = array( |
|
94 | 94 | '/January/', |
95 | 95 | '/February/', |
96 | 96 | '/March/', |
@@ -143,18 +143,18 @@ discard block |
||
143 | 143 | _CAL_OCTOBER, |
144 | 144 | _CAL_NOVEMBER, |
145 | 145 | _CAL_DECEMBER, |
146 | - substr(_CAL_JANUARY, 0, 3) . ' ', |
|
147 | - substr(_CAL_FEBRUARY, 0, 3) . ' ', |
|
148 | - substr(_CAL_MARCH, 0, 3) . ' ', |
|
149 | - substr(_CAL_APRIL, 0, 3) . ' ', |
|
150 | - substr(_CAL_MAY, 0, 3) . ' ', |
|
151 | - substr(_CAL_JUNE, 0, 3) . ' ', |
|
152 | - substr(_CAL_JULY, 0, 3) . ' ', |
|
153 | - substr(_CAL_AUGUST, 0, 3) . ' ', |
|
154 | - substr(_CAL_SEPTEMBER, 0, 3) . ' ', |
|
155 | - substr(_CAL_OCTOBER, 0, 3) . ' ', |
|
156 | - substr(_CAL_NOVEMBER, 0, 3) . ' ', |
|
157 | - substr(_CAL_DECEMBER, 0, 3) . ' ', |
|
146 | + substr(_CAL_JANUARY, 0, 3).' ', |
|
147 | + substr(_CAL_FEBRUARY, 0, 3).' ', |
|
148 | + substr(_CAL_MARCH, 0, 3).' ', |
|
149 | + substr(_CAL_APRIL, 0, 3).' ', |
|
150 | + substr(_CAL_MAY, 0, 3).' ', |
|
151 | + substr(_CAL_JUNE, 0, 3).' ', |
|
152 | + substr(_CAL_JULY, 0, 3).' ', |
|
153 | + substr(_CAL_AUGUST, 0, 3).' ', |
|
154 | + substr(_CAL_SEPTEMBER, 0, 3).' ', |
|
155 | + substr(_CAL_OCTOBER, 0, 3).' ', |
|
156 | + substr(_CAL_NOVEMBER, 0, 3).' ', |
|
157 | + substr(_CAL_DECEMBER, 0, 3).' ', |
|
158 | 158 | _CAL_SUNDAY, |
159 | 159 | _CAL_MONDAY, |
160 | 160 | _CAL_TUESDAY, |
@@ -162,13 +162,13 @@ discard block |
||
162 | 162 | _CAL_THURSDAY, |
163 | 163 | _CAL_FRIDAY, |
164 | 164 | _CAL_SATURDAY, |
165 | - substr(_CAL_SUNDAY, 0, 3) . ' ', |
|
166 | - substr(_CAL_MONDAY, 0, 3) . ' ', |
|
167 | - substr(_CAL_TUESDAY, 0, 3) . ' ', |
|
168 | - substr(_CAL_WEDNESDAY, 0, 3) . ' ', |
|
169 | - substr(_CAL_THURSDAY, 0, 3) . ' ', |
|
170 | - substr(_CAL_FRIDAY, 0, 3) . ' ', |
|
171 | - substr(_CAL_SATURDAY, 0, 3) . ' ', |
|
165 | + substr(_CAL_SUNDAY, 0, 3).' ', |
|
166 | + substr(_CAL_MONDAY, 0, 3).' ', |
|
167 | + substr(_CAL_TUESDAY, 0, 3).' ', |
|
168 | + substr(_CAL_WEDNESDAY, 0, 3).' ', |
|
169 | + substr(_CAL_THURSDAY, 0, 3).' ', |
|
170 | + substr(_CAL_FRIDAY, 0, 3).' ', |
|
171 | + substr(_CAL_SATURDAY, 0, 3).' ', |
|
172 | 172 | ); |
173 | 173 | |
174 | 174 | return preg_replace($patterns, $replacements, date($format, $timestamp)); |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | array_shift($eventOptions); |
211 | 211 | $day = ''; |
212 | 212 | foreach ($eventOptions as $option) { |
213 | - $day .= ' ' . $daysName[$option] . ', '; |
|
213 | + $day .= ' '.$daysName[$option].', '; |
|
214 | 214 | } |
215 | 215 | $ret = sprintf(_MD_EXTCAL_RR_WEEKLY, $day, $interval); |
216 | 216 | |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | array_shift($eventOptions); |
330 | 330 | $month = ''; |
331 | 331 | foreach ($eventOptions as $option) { |
332 | - $month .= ' ' . $monthName[$option] . ', '; |
|
332 | + $month .= ' '.$monthName[$option].', '; |
|
333 | 333 | } |
334 | 334 | $dayString = $day; |
335 | 335 | if (array_key_exists($day, $monthDays)) { |