@@ -19,17 +19,17 @@ discard block |
||
19 | 19 | * @author XOOPS Development Team, |
20 | 20 | */ |
21 | 21 | |
22 | -include __DIR__ . '/../../mainfile.php'; |
|
23 | -require_once __DIR__ . '/include/constantes.php'; |
|
22 | +include __DIR__.'/../../mainfile.php'; |
|
23 | +require_once __DIR__.'/include/constantes.php'; |
|
24 | 24 | $params = ['view' => _EXTCAL_NAV_DAY, 'file' => _EXTCAL_FILE_DAY]; |
25 | 25 | $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl"; |
26 | -require_once __DIR__ . '/header.php'; |
|
26 | +require_once __DIR__.'/header.php'; |
|
27 | 27 | |
28 | 28 | /* ========================================================================== */ |
29 | -$year = isset($_GET['year']) ? (int)$_GET['year'] : date('Y'); |
|
30 | -$month = isset($_GET['month']) ? (int)$_GET['month'] : date('n'); |
|
31 | -$day = isset($_GET['day']) ? (int)$_GET['day'] : date('j'); |
|
32 | -$cat = isset($_GET['cat']) ? (int)$_GET['cat'] : 0; |
|
29 | +$year = isset($_GET['year']) ? (int) $_GET['year'] : date('Y'); |
|
30 | +$month = isset($_GET['month']) ? (int) $_GET['month'] : date('n'); |
|
31 | +$day = isset($_GET['day']) ? (int) $_GET['day'] : date('j'); |
|
32 | +$cat = isset($_GET['cat']) ? (int) $_GET['cat'] : 0; |
|
33 | 33 | /* ========================================================================== */ |
34 | 34 | |
35 | 35 | $form = new \XoopsSimpleForm('', 'navigSelectBox', $params['file'], 'get'); |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | 'cat' => $cat, |
54 | 54 | 'externalKeys' => 'cat_id', |
55 | 55 | ]; |
56 | -$events = $eventHandler->getEventsOnPeriode($criteres); |
|
56 | +$events = $eventHandler->getEventsOnPeriode($criteres); |
|
57 | 57 | /**********************************************************************/ |
58 | 58 | $eventsArray = $events; |
59 | 59 | |
@@ -99,21 +99,21 @@ discard block |
||
99 | 99 | |
100 | 100 | $navig = [ |
101 | 101 | 'prev' => [ |
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' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_day'], $pDayCalObj->getTimestamp()), |
104 | 104 | ], |
105 | 105 | 'this' => [ |
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' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_day'], $dayCalObj->getTimestamp()), |
108 | 108 | ], |
109 | 109 | 'next' => [ |
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' => $timeHandler->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); |
@@ -172,4 +172,4 @@ discard block |
||
172 | 172 | $xoopsTpl->assign('lang', $lang); |
173 | 173 | $xoopsTpl->assign('view', 'day'); |
174 | 174 | |
175 | -include XOOPS_ROOT_PATH . '/footer.php'; |
|
175 | +include XOOPS_ROOT_PATH.'/footer.php'; |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | |
19 | 19 | use XoopsModules\Extcal; |
20 | 20 | |
21 | -require_once XOOPS_ROOT_PATH . '/class/uploader.php'; |
|
21 | +require_once XOOPS_ROOT_PATH.'/class/uploader.php'; |
|
22 | 22 | |
23 | 23 | /** |
24 | 24 | * @param $eventId |
@@ -47,12 +47,12 @@ discard block |
||
47 | 47 | function extcal_loadImg(&$REQUEST, &$event_picture1, &$event_picture2) |
48 | 48 | { |
49 | 49 | /////////////////////////////////////////////////////////////////////////////// |
50 | - $uploaddir_event = XOOPS_ROOT_PATH . '/uploads/extcal/'; |
|
51 | - $uploadurl_event = XOOPS_URL . '/uploads/extcal/'; |
|
50 | + $uploaddir_event = XOOPS_ROOT_PATH.'/uploads/extcal/'; |
|
51 | + $uploadurl_event = XOOPS_URL.'/uploads/extcal/'; |
|
52 | 52 | //$picture = ''; |
53 | 53 | for ($j = 1; $j < 3; ++$j) { |
54 | - $delimg = @$REQUEST['delimg_' . $j . '']; |
|
55 | - $delimg = isset($delimg) ? (int)$delimg : 0; |
|
54 | + $delimg = @$REQUEST['delimg_'.$j.'']; |
|
55 | + $delimg = isset($delimg) ? (int) $delimg : 0; |
|
56 | 56 | if (0 == $delimg && !empty($REQUEST['xoops_upload_file'][$j])) { |
57 | 57 | $upload = new \XoopsMediaUploader($uploaddir_event, [ |
58 | 58 | 'image/gif', |
@@ -75,15 +75,15 @@ discard block |
||
75 | 75 | $event_picture2 = $upload->getSavedFileName(); |
76 | 76 | } |
77 | 77 | } |
78 | - } elseif (!empty($REQUEST['file' . $j])) { |
|
78 | + } elseif (!empty($REQUEST['file'.$j])) { |
|
79 | 79 | if (1 == $j) { |
80 | - $event_picture1 = $REQUEST['file' . $j]; |
|
80 | + $event_picture1 = $REQUEST['file'.$j]; |
|
81 | 81 | } elseif (2 == $j) { |
82 | - $event_picture2 = $REQUEST['file' . $j]; |
|
82 | + $event_picture2 = $REQUEST['file'.$j]; |
|
83 | 83 | } |
84 | 84 | } |
85 | 85 | } else { |
86 | - $url_event = XOOPS_ROOT_PATH . '/uploads/extcal/' . $REQUEST['file' . $j]; |
|
86 | + $url_event = XOOPS_ROOT_PATH.'/uploads/extcal/'.$REQUEST['file'.$j]; |
|
87 | 87 | if (1 == $j) { |
88 | 88 | $event_picture1 = ''; |
89 | 89 | } elseif (2 == $j) { |
@@ -179,17 +179,17 @@ discard block |
||
179 | 179 | $select->addOption('', ''); |
180 | 180 | } |
181 | 181 | |
182 | - $select->addOption('year ASC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
183 | - $select->addOption('year DESC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
182 | + $select->addOption('year ASC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
183 | + $select->addOption('year DESC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
184 | 184 | |
185 | - $select->addOption('month ASC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
186 | - $select->addOption('month DESC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
185 | + $select->addOption('month ASC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
186 | + $select->addOption('month DESC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
187 | 187 | |
188 | - $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
189 | - $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
188 | + $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
189 | + $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
190 | 190 | |
191 | - $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
192 | - $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
191 | + $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
192 | + $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
193 | 193 | |
194 | 194 | return $select; |
195 | 195 | } |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | function echoDateArray($period) |
304 | 304 | { |
305 | 305 | foreach ($period as $dt) { |
306 | - echo $dt->format("l Y-m-d H:i:s\n") . '<br>'; |
|
306 | + echo $dt->format("l Y-m-d H:i:s\n").'<br>'; |
|
307 | 307 | } |
308 | 308 | } |
309 | 309 | |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | } |
320 | 320 | |
321 | 321 | $txt = print_r($t, true); |
322 | - echo '<pre>Number of items: ' . count($t) . "<br>{$txt}</pre>"; |
|
322 | + echo '<pre>Number of items: '.count($t)."<br>{$txt}</pre>"; |
|
323 | 323 | } |
324 | 324 | |
325 | 325 | /*****************************************************************/ |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | if ('' != $msg) { |
333 | 333 | echo "<hr>{$msg}<hr>"; |
334 | 334 | } |
335 | - echo $line . '<br>'; |
|
335 | + echo $line.'<br>'; |
|
336 | 336 | } |
337 | 337 | |
338 | 338 | /*****************************************************************/ |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | echo "<hr>{$msg}<hr>"; |
360 | 360 | } |
361 | 361 | |
362 | - echo 'date --->' . $tsName . ' = ' . $ts . ' - ' . date('d-m-Y H:m:s', $ts) . '<br>'; |
|
362 | + echo 'date --->'.$tsName.' = '.$ts.' - '.date('d-m-Y H:m:s', $ts).'<br>'; |
|
363 | 363 | } |
364 | 364 | |
365 | 365 | /*****************************************************************/ |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | |
20 | 20 | use XoopsModules\Extcal; |
21 | 21 | |
22 | -include __DIR__ . '/../preloads/autoloader.php'; |
|
22 | +include __DIR__.'/../preloads/autoloader.php'; |
|
23 | 23 | |
24 | 24 | $moduleDirName = basename(dirname(__DIR__)); |
25 | 25 | $moduleDirNameUpper = strtoupper($moduleDirName); |
@@ -39,23 +39,23 @@ discard block |
||
39 | 39 | ///** @var \XoopsPersistableObjectHandler $extcal_brokenHandler */ |
40 | 40 | //$extcal_brokenHandler = new Extcal\Extcal_brokenHandler($db); |
41 | 41 | |
42 | -if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) { |
|
43 | - define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__))); |
|
44 | - define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/'); |
|
45 | - define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/'); |
|
46 | - define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/'); |
|
47 | - define($moduleDirNameUpper . '_IMAGES_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/'); |
|
48 | - define($moduleDirNameUpper . '_IMAGES_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images/'); |
|
49 | - define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/'); |
|
50 | - define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/'); |
|
51 | - define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php'); |
|
52 | - define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png'); |
|
53 | - define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash |
|
54 | - define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash |
|
55 | - define($moduleDirNameUpper . '_CAT_IMAGES_URL', XOOPS_UPLOAD_URL . ' / ' . constant($moduleDirNameUpper . '_DIRNAME') . '/images/category'); |
|
56 | - define($moduleDirNameUpper . '_CAT_IMAGES_PATH', XOOPS_UPLOAD_PATH . '/' . constant($moduleDirNameUpper . '_DIRNAME') . ' / images / category'); |
|
57 | - define($moduleDirNameUpper . '_CACHE_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/'); |
|
58 | - define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1); |
|
42 | +if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) { |
|
43 | + define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__))); |
|
44 | + define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/'); |
|
45 | + define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/'); |
|
46 | + define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/'); |
|
47 | + define($moduleDirNameUpper.'_IMAGES_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/'); |
|
48 | + define($moduleDirNameUpper.'_IMAGES_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images/'); |
|
49 | + define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/'); |
|
50 | + define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/'); |
|
51 | + define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php'); |
|
52 | + define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png'); |
|
53 | + define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash |
|
54 | + define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash |
|
55 | + define($moduleDirNameUpper.'_CAT_IMAGES_URL', XOOPS_UPLOAD_URL.' / '.constant($moduleDirNameUpper.'_DIRNAME').'/images/category'); |
|
56 | + define($moduleDirNameUpper.'_CAT_IMAGES_PATH', XOOPS_UPLOAD_PATH.'/'.constant($moduleDirNameUpper.'_DIRNAME').' / images / category'); |
|
57 | + define($moduleDirNameUpper.'_CACHE_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/'); |
|
58 | + define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | $pathIcon16 = Xmf\Module\Admin::iconUrl('', 16); |
@@ -64,15 +64,15 @@ discard block |
||
64 | 64 | //$pathModIcon32 = $helper->getModule()->getInfo('modicons32'); |
65 | 65 | |
66 | 66 | $icons = [ |
67 | - 'edit' => "<img src='" . $pathIcon16 . "/edit.png' alt=" . _EDIT . "' align='middle'>", |
|
68 | - 'delete' => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>", |
|
69 | - 'clone' => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>", |
|
70 | - 'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>", |
|
71 | - 'print' => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>", |
|
72 | - 'pdf' => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>", |
|
73 | - 'add' => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>", |
|
74 | - '0' => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>", |
|
75 | - '1' => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>", |
|
67 | + 'edit' => "<img src='".$pathIcon16."/edit.png' alt="._EDIT."' align='middle'>", |
|
68 | + 'delete' => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>", |
|
69 | + 'clone' => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>", |
|
70 | + 'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>", |
|
71 | + 'print' => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>", |
|
72 | + 'pdf' => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>", |
|
73 | + 'add' => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>", |
|
74 | + '0' => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>", |
|
75 | + '1' => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>", |
|
76 | 76 | ]; |
77 | 77 | |
78 | 78 | $debug = false; |
@@ -85,12 +85,12 @@ discard block |
||
85 | 85 | $GLOBALS['xoopsTpl'] = new \XoopsTpl(); |
86 | 86 | } |
87 | 87 | |
88 | -$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName); |
|
88 | +$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL.'/modules/'.$moduleDirName); |
|
89 | 89 | // Local icons path |
90 | 90 | if (is_object($helper->getModule())) { |
91 | 91 | $pathModIcon16 = $helper->getModule()->getInfo('modicons16'); |
92 | 92 | $pathModIcon32 = $helper->getModule()->getInfo('modicons32'); |
93 | 93 | |
94 | - $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16); |
|
94 | + $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16); |
|
95 | 95 | $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32); |
96 | 96 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | define('_EXTCAL_CLN_EVENT', 'Event'); |
42 | 42 | |
43 | 43 | //------------------------------------------------------------------- |
44 | -define('_EXTCAL_PEAR_ROOT_DEFAULT', __DIR__ . '/../class/pear'); |
|
44 | +define('_EXTCAL_PEAR_ROOT_DEFAULT', __DIR__.'/../class/pear'); |
|
45 | 45 | //define('_EXTCAL_PEAR_ROOT', 'F:/wamp/www/xfr254b/xoops_lib/Frameworks/pear' ); |
46 | 46 | |
47 | 47 | $pear_path = _EXTCAL_PEAR_ROOT_DEFAULT; |
@@ -78,22 +78,22 @@ discard block |
||
78 | 78 | //} |
79 | 79 | define('_EXTCAL_PEAR_ROOT', $pear_path); |
80 | 80 | |
81 | -define('_EXTCAL_PEAR_CALENDAR_ROOT', _EXTCAL_PEAR_ROOT . '/Calendar'); |
|
82 | -define('CALENDAR_ROOT', _EXTCAL_PEAR_CALENDAR_ROOT . '/'); |
|
81 | +define('_EXTCAL_PEAR_CALENDAR_ROOT', _EXTCAL_PEAR_ROOT.'/Calendar'); |
|
82 | +define('CALENDAR_ROOT', _EXTCAL_PEAR_CALENDAR_ROOT.'/'); |
|
83 | 83 | |
84 | 84 | //------------------------------------------------------------------- |
85 | 85 | define('_EXTCAL_SHOW_NO_PICTURE', false); |
86 | 86 | |
87 | 87 | define('_EXTCAL_PATH_HORLOGES', '/modules/extcal/assets/images/horloges/'); |
88 | -define('_EXTCAL_PATH_ICONS16', XOOPS_URL . '/Frameworks/moduleclasses/icons/16/'); |
|
89 | -define('_EXTCAL_PATH_ICONS32', XOOPS_URL . '/Frameworks/moduleclasses/icons/32/'); |
|
90 | -define('_EXTCAL_PATH_FO', XOOPS_URL . '/modules/extcal/'); |
|
91 | -define('_EXTCAL_PATH_BO', _EXTCAL_PATH_FO . 'admin/'); |
|
92 | -define('_EXTCAL_PATH_LG', XOOPS_URL . '/modules/extcal/languages/'); |
|
88 | +define('_EXTCAL_PATH_ICONS16', XOOPS_URL.'/Frameworks/moduleclasses/icons/16/'); |
|
89 | +define('_EXTCAL_PATH_ICONS32', XOOPS_URL.'/Frameworks/moduleclasses/icons/32/'); |
|
90 | +define('_EXTCAL_PATH_FO', XOOPS_URL.'/modules/extcal/'); |
|
91 | +define('_EXTCAL_PATH_BO', _EXTCAL_PATH_FO.'admin/'); |
|
92 | +define('_EXTCAL_PATH_LG', XOOPS_URL.'/modules/extcal/languages/'); |
|
93 | 93 | |
94 | 94 | define('_EXTCAL_IMG_INTERVAL', 'interval04.png'); |
95 | -define('_EXTCAL_IMG_INTERVAL16', _EXTCAL_PATH_ICONS16 . _EXTCAL_IMG_INTERVAL); |
|
96 | -define('_EXTCAL_IMG_INTERVAL32', _EXTCAL_PATH_ICONS32 . _EXTCAL_IMG_INTERVAL); |
|
95 | +define('_EXTCAL_IMG_INTERVAL16', _EXTCAL_PATH_ICONS16._EXTCAL_IMG_INTERVAL); |
|
96 | +define('_EXTCAL_IMG_INTERVAL32', _EXTCAL_PATH_ICONS32._EXTCAL_IMG_INTERVAL); |
|
97 | 97 | |
98 | 98 | //define('_EXTCAL_DIRNAME', $xoopsModule->getVar('dirname')); |
99 | 99 | |
@@ -109,21 +109,21 @@ discard block |
||
109 | 109 | define('_EXTCAL_NAV_NEW_EVENT', 'new-event'); |
110 | 110 | |
111 | 111 | define('_EXTCAL_NAV_LIST', |
112 | - _EXTCAL_NAV_CALMONTH . "\n" . _EXTCAL_NAV_CALWEEK . "\n" . _EXTCAL_NAV_YEAR . "\n" . _EXTCAL_NAV_MONTH . "\n" . _EXTCAL_NAV_WEEK . "\n" . _EXTCAL_NAV_DAY . "\n" . _EXTCAL_NAV_AGENDA_WEEK . "\n" . _EXTCAL_NAV_AGENDA_DAY . "\n" . _EXTCAL_NAV_SEARCH . "\n" . _EXTCAL_NAV_NEW_EVENT); |
|
112 | + _EXTCAL_NAV_CALMONTH."\n"._EXTCAL_NAV_CALWEEK."\n"._EXTCAL_NAV_YEAR."\n"._EXTCAL_NAV_MONTH."\n"._EXTCAL_NAV_WEEK."\n"._EXTCAL_NAV_DAY."\n"._EXTCAL_NAV_AGENDA_WEEK."\n"._EXTCAL_NAV_AGENDA_DAY."\n"._EXTCAL_NAV_SEARCH."\n"._EXTCAL_NAV_NEW_EVENT); |
|
113 | 113 | |
114 | 114 | define('_EXTCAL_PREFIX_VIEW', 'view_'); |
115 | 115 | define('_EXTCAL_SUFFIX_VIEW', '.php'); |
116 | 116 | |
117 | -define('_EXTCAL_FILE_CALMONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALMONTH . _EXTCAL_SUFFIX_VIEW); |
|
118 | -define('_EXTCAL_FILE_CALWEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALWEEK . _EXTCAL_SUFFIX_VIEW); |
|
119 | -define('_EXTCAL_FILE_YEAR', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_YEAR . _EXTCAL_SUFFIX_VIEW); |
|
120 | -define('_EXTCAL_FILE_MONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_MONTH . _EXTCAL_SUFFIX_VIEW); |
|
121 | -define('_EXTCAL_FILE_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_WEEK . _EXTCAL_SUFFIX_VIEW); |
|
122 | -define('_EXTCAL_FILE_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_DAY . _EXTCAL_SUFFIX_VIEW); |
|
123 | -define('_EXTCAL_FILE_AGENDA_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_WEEK . _EXTCAL_SUFFIX_VIEW); |
|
124 | -define('_EXTCAL_FILE_AGENDA_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_DAY . _EXTCAL_SUFFIX_VIEW); |
|
125 | -define('_EXTCAL_FILE_SEARCH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_SEARCH . _EXTCAL_SUFFIX_VIEW); |
|
126 | -define('_EXTCAL_FILE_NEW_EVENT', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_NEW_EVENT . _EXTCAL_SUFFIX_VIEW); |
|
117 | +define('_EXTCAL_FILE_CALMONTH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_CALMONTH._EXTCAL_SUFFIX_VIEW); |
|
118 | +define('_EXTCAL_FILE_CALWEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_CALWEEK._EXTCAL_SUFFIX_VIEW); |
|
119 | +define('_EXTCAL_FILE_YEAR', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_YEAR._EXTCAL_SUFFIX_VIEW); |
|
120 | +define('_EXTCAL_FILE_MONTH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_MONTH._EXTCAL_SUFFIX_VIEW); |
|
121 | +define('_EXTCAL_FILE_WEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_WEEK._EXTCAL_SUFFIX_VIEW); |
|
122 | +define('_EXTCAL_FILE_DAY', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_DAY._EXTCAL_SUFFIX_VIEW); |
|
123 | +define('_EXTCAL_FILE_AGENDA_WEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_AGENDA_WEEK._EXTCAL_SUFFIX_VIEW); |
|
124 | +define('_EXTCAL_FILE_AGENDA_DAY', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_AGENDA_DAY._EXTCAL_SUFFIX_VIEW); |
|
125 | +define('_EXTCAL_FILE_SEARCH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_SEARCH._EXTCAL_SUFFIX_VIEW); |
|
126 | +define('_EXTCAL_FILE_NEW_EVENT', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_NEW_EVENT._EXTCAL_SUFFIX_VIEW); |
|
127 | 127 | |
128 | 128 | define('_EXTCAL_MULTILOADER', '/class/xoopsform/multiuploads/formmultiuploads.php'); |
129 | 129 |
@@ -1,10 +1,10 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include __DIR__ . '/../../mainfile.php'; |
|
4 | -require_once __DIR__ . '/include/constantes.php'; |
|
3 | +include __DIR__.'/../../mainfile.php'; |
|
4 | +require_once __DIR__.'/include/constantes.php'; |
|
5 | 5 | $params = ['view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT]; |
6 | 6 | $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl"; |
7 | -require_once __DIR__ . '/header.php'; |
|
7 | +require_once __DIR__.'/header.php'; |
|
8 | 8 | |
9 | 9 | /* ========================================================================== */ |
10 | 10 | //Extcal\Utility::echoArray($_GET); |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | //exit; |
18 | 18 | if (count($permHandler->getAuthorizedCat($xoopsUser, 'extcal_cat_submit')) > 0) { |
19 | - include XOOPS_ROOT_PATH . '/header.php'; |
|
19 | + include XOOPS_ROOT_PATH.'/header.php'; |
|
20 | 20 | |
21 | 21 | // Title of the page |
22 | 22 | $xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $xoopsTpl->assign('lang', $lang); |
59 | 59 | $xoopsTpl->assign('view', 'newevent'); |
60 | 60 | |
61 | - include XOOPS_ROOT_PATH . '/footer.php'; |
|
61 | + include XOOPS_ROOT_PATH.'/footer.php'; |
|
62 | 62 | } else { |
63 | 63 | redirect_header('index.php', 3); |
64 | 64 | } |
@@ -2,9 +2,9 @@ discard block |
||
2 | 2 | |
3 | 3 | use XoopsModules\Extcal; |
4 | 4 | |
5 | -require_once __DIR__ . '/../../../include/cp_header.php'; |
|
6 | -include __DIR__ . '/../../../class/xoopsformloader.php'; |
|
7 | -require_once __DIR__ . '/admin_header.php'; |
|
5 | +require_once __DIR__.'/../../../include/cp_header.php'; |
|
6 | +include __DIR__.'/../../../class/xoopsformloader.php'; |
|
7 | +require_once __DIR__.'/admin_header.php'; |
|
8 | 8 | |
9 | 9 | function extgalleryLastVersion() |
10 | 10 | { |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | switch ($fct) { |
40 | 40 | case 'send': |
41 | 41 | if (!$GLOBALS['xoopsSecurity']->check()) { |
42 | - redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors())); |
|
42 | + redirect_header('index.php', 3, _NOPERM.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors())); |
|
43 | 43 | } |
44 | 44 | xoops_cp_header(); |
45 | 45 | adminMenu(1); |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | 'EV_TITLE' => $event->getVar('event_title'), |
73 | 73 | 'EV_START' => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_start')), |
74 | 74 | 'EV_END' => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_end')), |
75 | - 'EV_LINK' => XOOPS_URL . '/modules/extcal/event.php?event=' . $event->getVar('event_id'), |
|
75 | + 'EV_LINK' => XOOPS_URL.'/modules/extcal/event.php?event='.$event->getVar('event_id'), |
|
76 | 76 | ]; |
77 | 77 | $xoopsMailer->assign($tag); |
78 | 78 | $xoopsMailer->send(true); |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | default: |
88 | 88 | xoops_cp_header(); |
89 | 89 | $fromemail = !empty($xoopsConfig['adminmail']) ? $xoopsConfig['adminmail'] : $xoopsUser->getVar('email', 'E'); |
90 | - $subjectCaption = _AM_EXTCAL_SUBJECT . "<br><br><span style='font-size:x-small;font-weight:bold;'>" . _AM_EXTCAL_USEFUL_TAGS . "</span><br><span style='font-size:x-small;font-weight:normal;'>" . _AM_EXTCAL_MAILTAGS6 . '<br>' . _AM_EXTCAL_MAILTAGS2 . '</span> '; |
|
90 | + $subjectCaption = _AM_EXTCAL_SUBJECT."<br><br><span style='font-size:x-small;font-weight:bold;'>"._AM_EXTCAL_USEFUL_TAGS."</span><br><span style='font-size:x-small;font-weight:normal;'>"._AM_EXTCAL_MAILTAGS6.'<br>'._AM_EXTCAL_MAILTAGS2.'</span> '; |
|
91 | 91 | $bodyCaption = _AM_EXTCAL_BODY |
92 | 92 | . "<br><br><span style='font-size:x-small;font-weight:bold;'>" |
93 | 93 | . _AM_EXTCAL_USEFUL_TAGS |
@@ -110,12 +110,12 @@ discard block |
||
110 | 110 | . '<br>' |
111 | 111 | . _AM_EXTCAL_MAILTAGS9 |
112 | 112 | . '</span> '; |
113 | - $toCheckBbox = new \XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, 'mail_send_to', 'mail'); |
|
113 | + $toCheckBbox = new \XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, 'mail_send_to', 'mail'); |
|
114 | 114 | $toCheckBox->addOption('mail', _AM_EXTCAL_EMAIL); |
115 | 115 | $toCheckBox->addOption('pm', _AM_EXTCAL_PM); |
116 | 116 | |
117 | - echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_APPROVED_EVENT . '</legend>'; |
|
118 | - echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>'; |
|
117 | + echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_APPROVED_EVENT.'</legend>'; |
|
118 | + echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>'; |
|
119 | 119 | echo _AM_EXTCAL_INFO_SEND_NOTIF; |
120 | 120 | echo '</fieldset><br>'; |
121 | 121 | $form = new \XoopsThemeForm(_AM_EXTCAL_SEND_NOTIFICATION, 'mailusers', 'index.php?op=notification&fct=send', 'post', true); |
@@ -145,13 +145,13 @@ discard block |
||
145 | 145 | // $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE); |
146 | 146 | $adminObject = \Xmf\Module\Admin::getInstance(); |
147 | 147 | $adminObject->addInfoBox(_MI_EXTCAL_DASHBOARD); |
148 | - $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount()), '', 'Green'); |
|
149 | - $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new \Criteria('event_approved', 1))), '', 'Green'); |
|
150 | - $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_PENDING . '</infolabel>', $eventHandler->getCount(new \Criteria('event_approved', 0))), '', 'Red'); |
|
148 | + $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_EXTCAL_INDEX_CATEGORIES.'</infolabel>', $catHandler->getCount()), '', 'Green'); |
|
149 | + $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_EXTCAL_INDEX_EVENT.'</infolabel>', $eventHandler->getCount(new \Criteria('event_approved', 1))), '', 'Green'); |
|
150 | + $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_EXTCAL_INDEX_PENDING.'</infolabel>', $eventHandler->getCount(new \Criteria('event_approved', 0))), '', 'Red'); |
|
151 | 151 | $criteriaCompo = new \CriteriaCompo(); |
152 | 152 | $criteriaCompo->add(new \Criteria('event_approved', 1)); |
153 | 153 | $criteriaCompo->add(new \Criteria('event_start', time(), '>=')); |
154 | - $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_APPROVED . '</infolabel><infotext>', $eventHandler->getCount($criteriaCompo) . '</infotext>'), '', 'Green'); |
|
154 | + $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_EXTCAL_INDEX_APPROVED.'</infolabel><infotext>', $eventHandler->getCount($criteriaCompo).'</infotext>'), '', 'Green'); |
|
155 | 155 | |
156 | 156 | $adminObject->addConfigBoxLine(); |
157 | 157 | $adminObject->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH); |
@@ -168,42 +168,42 @@ discard block |
||
168 | 168 | $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), ['cat_id']); |
169 | 169 | $eventHandler->formatEventsDate($pendingEvent, 'd/m/Y'); |
170 | 170 | |
171 | - echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_PENDING_EVENT . '</legend>'; |
|
172 | - echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>'; |
|
171 | + echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_PENDING_EVENT.'</legend>'; |
|
172 | + echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>'; |
|
173 | 173 | // echo '<img src="../assets/images/icons/on.png" > '._AM_EXTCAL_INFO_APPROVE_PENDING_EVENT.'<br>'; |
174 | - echo '<img src=' . $pathIcon16 . '/edit.png> ' . _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br>'; |
|
175 | - echo '<img src=' . $pathIcon16 . '/delete.png> ' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br>'; |
|
174 | + echo '<img src='.$pathIcon16.'/edit.png> '._AM_EXTCAL_INFO_EDIT_PENDING_EVENT.'<br>'; |
|
175 | + echo '<img src='.$pathIcon16.'/delete.png> '._AM_EXTCAL_INFO_DELETE_PENDING_EVENT.'<br>'; |
|
176 | 176 | echo '</fieldset><br>'; |
177 | 177 | |
178 | 178 | echo '<table class="outer" style="width:100%;">'; |
179 | 179 | echo '<tr style="text-align:center;">'; |
180 | - echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>'; |
|
181 | - echo '<th>' . _AM_EXTCAL_TITLE . '</th>'; |
|
182 | - echo '<th>' . _AM_EXTCAL_START_DATE . '</th>'; |
|
183 | - echo '<th>' . _AM_EXTCAL_ACTION . '</th>'; |
|
180 | + echo '<th>'._AM_EXTCAL_CATEGORY.'</th>'; |
|
181 | + echo '<th>'._AM_EXTCAL_TITLE.'</th>'; |
|
182 | + echo '<th>'._AM_EXTCAL_START_DATE.'</th>'; |
|
183 | + echo '<th>'._AM_EXTCAL_ACTION.'</th>'; |
|
184 | 184 | echo '</tr>'; |
185 | 185 | |
186 | 186 | if (count($pendingEvent) > 0) { |
187 | 187 | $i = 0; |
188 | 188 | foreach ($pendingEvent as $event) { |
189 | 189 | $class = (0 == ++$i % 2) ? 'even' : 'odd'; |
190 | - echo '<tr style="text-align:center;" class="' . $class . '">'; |
|
191 | - echo '<td>' . $event['Category']['cat_name'] . '</td>'; |
|
192 | - echo '<td>' . $event['event_title'] . '</td>'; |
|
193 | - echo '<td>' . $event['formated_event_start'] . '</td>'; |
|
190 | + echo '<tr style="text-align:center;" class="'.$class.'">'; |
|
191 | + echo '<td>'.$event['Category']['cat_name'].'</td>'; |
|
192 | + echo '<td>'.$event['event_title'].'</td>'; |
|
193 | + echo '<td>'.$event['formated_event_start'].'</td>'; |
|
194 | 194 | echo '<td style="width:10%; text-align:center;">'; |
195 | - echo '<a href="event.php?op=modify&event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/edit.png></a> '; |
|
196 | - echo '<a href="event.php?op=delete&event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/delete.png></a>'; |
|
195 | + echo '<a href="event.php?op=modify&event_id='.$event['event_id'].'"><img src='.$pathIcon16.'/edit.png></a> '; |
|
196 | + echo '<a href="event.php?op=delete&event_id='.$event['event_id'].'"><img src='.$pathIcon16.'/delete.png></a>'; |
|
197 | 197 | echo '</td>'; |
198 | 198 | echo '</tr>'; |
199 | 199 | } |
200 | 200 | } else { |
201 | - echo '<tr><td colspan="4">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>'; |
|
201 | + echo '<tr><td colspan="4">'._AM_EXTCAL_NO_PENDING_EVENT.'</td></tr>'; |
|
202 | 202 | } |
203 | 203 | |
204 | 204 | echo '</table></fieldset><br>'; |
205 | 205 | |
206 | - require_once __DIR__ . '/admin_footer.php'; |
|
206 | + require_once __DIR__.'/admin_footer.php'; |
|
207 | 207 | |
208 | 208 | break; |
209 | 209 | } |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | use XoopsModules\Extcal; |
21 | 21 | use XoopsModules\Extcal\Common; |
22 | 22 | |
23 | -require_once __DIR__ . '/admin_header.php'; |
|
23 | +require_once __DIR__.'/admin_header.php'; |
|
24 | 24 | // Display Admin header |
25 | 25 | xoops_cp_header(); |
26 | 26 | /** @var Extcal\Utility $utilityClass */ |
@@ -39,12 +39,12 @@ discard block |
||
39 | 39 | |
40 | 40 | if ($helper->getConfig('displaySampleButton')) { |
41 | 41 | xoops_loadLanguage('admin/modulesadmin', 'system'); |
42 | - require_once __DIR__ . '/../testdata/index.php'; |
|
42 | + require_once __DIR__.'/../testdata/index.php'; |
|
43 | 43 | $adminObject->addItemButton(_AM_SYSTEM_MODULES_INSTALL_TESTDATA, '__DIR__ . /../../testdata/index.php?op=load', 'add'); |
44 | 44 | $adminObject->displayButton('left', ''); |
45 | 45 | } |
46 | 46 | |
47 | -require_once __DIR__ . '/../testdata/index.php'; |
|
47 | +require_once __DIR__.'/../testdata/index.php'; |
|
48 | 48 | $adminObject->addItemButton(AM_EXTCAL_ADD_SAMPLEDATA, '__DIR__ . /../../testdata/index.php?op=load', 'add'); |
49 | 49 | $adminObject->displayButton('left', ''); |
50 | 50 | |
@@ -55,4 +55,4 @@ discard block |
||
55 | 55 | echo $utility::getServerStats(); |
56 | 56 | |
57 | 57 | //codeDump(__FILE__); |
58 | -require_once __DIR__ . '/admin_footer.php'; |
|
58 | +require_once __DIR__.'/admin_footer.php'; |
@@ -2,18 +2,18 @@ discard block |
||
2 | 2 | |
3 | 3 | use XoopsModules\Extcal; |
4 | 4 | |
5 | -include __DIR__ . '/../../mainfile.php'; |
|
6 | -require_once __DIR__ . '/include/constantes.php'; |
|
5 | +include __DIR__.'/../../mainfile.php'; |
|
6 | +require_once __DIR__.'/include/constantes.php'; |
|
7 | 7 | $params = ['view' => _EXTCAL_NAV_AGENDA_DAY, 'file' => _EXTCAL_FILE_AGENDA_DAY]; |
8 | 8 | $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl"; |
9 | -require_once __DIR__ . '/header.php'; |
|
9 | +require_once __DIR__.'/header.php'; |
|
10 | 10 | |
11 | 11 | /* ========================================================================== */ |
12 | 12 | //recupe des variables get |
13 | -$year = isset($_GET['year']) ? (int)$_GET['year'] : date('Y'); |
|
14 | -$month = isset($_GET['month']) ? (int)$_GET['month'] : date('n'); |
|
15 | -$day = isset($_GET['day']) ? (int)$_GET['day'] : date('j'); |
|
16 | -$cat = isset($_GET['cat']) ? (int)$_GET['cat'] : 0; |
|
13 | +$year = isset($_GET['year']) ? (int) $_GET['year'] : date('Y'); |
|
14 | +$month = isset($_GET['month']) ? (int) $_GET['month'] : date('n'); |
|
15 | +$day = isset($_GET['day']) ? (int) $_GET['day'] : date('j'); |
|
16 | +$cat = isset($_GET['cat']) ? (int) $_GET['cat'] : 0; |
|
17 | 17 | /* ========================================================================== */ |
18 | 18 | |
19 | 19 | //echo "{$params['view']}-{$year}-{$month}-{$day}<hr>extcal_{$params['view']}.html<br>"; |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | 'nbJours' => $nbJours, |
47 | 47 | 'externalKeys' => 'cat_id', |
48 | 48 | ]; |
49 | -$events = $eventHandler->getEventsOnPeriode($criteres); |
|
49 | +$events = $eventHandler->getEventsOnPeriode($criteres); |
|
50 | 50 | /**********************************************************************/ |
51 | 51 | $eventsArray = $events; |
52 | 52 | $startDay = mktime(0, 0, 0, $month, $day, $year); |
@@ -101,21 +101,21 @@ discard block |
||
101 | 101 | |
102 | 102 | $navig = [ |
103 | 103 | 'prev' => [ |
104 | - 'uri' => 'year=' . $pDayCalObj->thisYear() . '&month=' . $pDayCalObj->thisMonth() . '&day=' . $pDayCalObj->thisDay(), |
|
104 | + 'uri' => 'year='.$pDayCalObj->thisYear().'&month='.$pDayCalObj->thisMonth().'&day='.$pDayCalObj->thisDay(), |
|
105 | 105 | 'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_day'], $pDayCalObj->getTimestamp()), |
106 | 106 | ], |
107 | 107 | 'this' => [ |
108 | - 'uri' => 'year=' . $dayCalObj->thisYear() . '&month=' . $dayCalObj->thisMonth() . '&day=' . $dayCalObj->thisDay(), |
|
108 | + 'uri' => 'year='.$dayCalObj->thisYear().'&month='.$dayCalObj->thisMonth().'&day='.$dayCalObj->thisDay(), |
|
109 | 109 | 'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_day'], $dayCalObj->getTimestamp()), |
110 | 110 | ], |
111 | 111 | 'next' => [ |
112 | - 'uri' => 'year=' . $nDayCalObj->thisYear() . '&month=' . $nDayCalObj->thisMonth() . '&day=' . $nDayCalObj->thisDay(), |
|
112 | + 'uri' => 'year='.$nDayCalObj->thisYear().'&month='.$nDayCalObj->thisMonth().'&day='.$nDayCalObj->thisDay(), |
|
113 | 113 | 'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_day'], $nDayCalObj->getTimestamp()), |
114 | 114 | ], |
115 | 115 | ]; |
116 | 116 | |
117 | 117 | // Title of the page |
118 | -$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']); |
|
118 | +$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']); |
|
119 | 119 | |
120 | 120 | // Assigning navig data to the template |
121 | 121 | $xoopsTpl->assign('navig', $navig); |
@@ -156,4 +156,4 @@ discard block |
||
156 | 156 | $xoopsTpl->assign('lang', $lang); |
157 | 157 | $xoopsTpl->assign('view', 'agendaday'); |
158 | 158 | |
159 | -include XOOPS_ROOT_PATH . '/footer.php'; |
|
159 | +include XOOPS_ROOT_PATH.'/footer.php'; |
@@ -2,24 +2,24 @@ discard block |
||
2 | 2 | |
3 | 3 | use XoopsModules\Extcal; |
4 | 4 | |
5 | -include __DIR__ . '/../../mainfile.php'; |
|
6 | -require_once __DIR__ . '/include/constantes.php'; |
|
5 | +include __DIR__.'/../../mainfile.php'; |
|
6 | +require_once __DIR__.'/include/constantes.php'; |
|
7 | 7 | $params = ['view' => _EXTCAL_NAV_CALWEEK, 'file' => _EXTCAL_FILE_CALWEEK]; |
8 | 8 | $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl"; |
9 | -require_once __DIR__ . '/header.php'; |
|
9 | +require_once __DIR__.'/header.php'; |
|
10 | 10 | |
11 | 11 | /* ========================================================================== */ |
12 | -$year = isset($_GET['year']) ? (int)$_GET['year'] : date('Y'); |
|
13 | -$month = isset($_GET['month']) ? (int)$_GET['month'] : date('n'); |
|
14 | -$day = isset($_GET['day']) ? (int)$_GET['day'] : date('j'); |
|
15 | -$cat = isset($_GET['cat']) ? (int)$_GET['cat'] : 0; |
|
12 | +$year = isset($_GET['year']) ? (int) $_GET['year'] : date('Y'); |
|
13 | +$month = isset($_GET['month']) ? (int) $_GET['month'] : date('n'); |
|
14 | +$day = isset($_GET['day']) ? (int) $_GET['day'] : date('j'); |
|
15 | +$cat = isset($_GET['cat']) ? (int) $_GET['cat'] : 0; |
|
16 | 16 | /* ========================================================================== */ |
17 | 17 | |
18 | 18 | // Validate the date (day, month and year) |
19 | 19 | $dayTS = mktime(0, 0, 0, $month, $day, $year); |
20 | 20 | //$offset = date('w', $dayTS) - $xoopsModuleConfig['week_start_day']; |
21 | 21 | $offset = date('w', $dayTS) + 7 - $xoopsModuleConfig['week_start_day'] < 7 ? date('w', $dayTS) + 7 - $xoopsModuleConfig['week_start_day'] : 0; |
22 | -$dayTS -= ($offset * _EXTCAL_TS_DAY); |
|
22 | +$dayTS -= ($offset * _EXTCAL_TS_DAY); |
|
23 | 23 | $year = date('Y', $dayTS); |
24 | 24 | $month = date('n', $dayTS); |
25 | 25 | $day = date('j', $dayTS); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | 'cat' => $cat, |
50 | 50 | 'externalKeys' => 'cat_id', |
51 | 51 | ]; |
52 | -$events = $eventHandler->getEventsOnPeriode($criteres); |
|
52 | +$events = $eventHandler->getEventsOnPeriode($criteres); |
|
53 | 53 | /**********************************************************************/ |
54 | 54 | //$eventsArray = $events; |
55 | 55 | |
@@ -138,21 +138,21 @@ discard block |
||
138 | 138 | // Making navig data |
139 | 139 | $navig = [ |
140 | 140 | 'prev' => [ |
141 | - 'uri' => 'year=' . $pWeekCalObj->thisYear() . '&month=' . $pWeekCalObj->thisMonth() . '&day=' . $pWeekCalObj->thisDay(), |
|
141 | + 'uri' => 'year='.$pWeekCalObj->thisYear().'&month='.$pWeekCalObj->thisMonth().'&day='.$pWeekCalObj->thisDay(), |
|
142 | 142 | 'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_week'], $pWeekCalObj->getTimestamp()), |
143 | 143 | ], |
144 | 144 | 'this' => [ |
145 | - 'uri' => 'year=' . $weekCalObj->thisYear() . '&month=' . $weekCalObj->thisMonth() . '&day=' . $weekCalObj->thisDay(), |
|
145 | + 'uri' => 'year='.$weekCalObj->thisYear().'&month='.$weekCalObj->thisMonth().'&day='.$weekCalObj->thisDay(), |
|
146 | 146 | 'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_week'], $weekCalObj->getTimestamp()), |
147 | 147 | ], |
148 | 148 | 'next' => [ |
149 | - 'uri' => 'year=' . $nWeekCalObj->thisYear() . '&month=' . $nWeekCalObj->thisMonth() . '&day=' . $nWeekCalObj->thisDay(), |
|
149 | + 'uri' => 'year='.$nWeekCalObj->thisYear().'&month='.$nWeekCalObj->thisMonth().'&day='.$nWeekCalObj->thisDay(), |
|
150 | 150 | 'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_week'], $nWeekCalObj->getTimestamp()), |
151 | 151 | ], |
152 | 152 | ]; |
153 | 153 | |
154 | 154 | // Title of the page |
155 | -$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']); |
|
155 | +$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']); |
|
156 | 156 | |
157 | 157 | // Assigning navig data to the template |
158 | 158 | $xoopsTpl->assign('navig', $navig); |
@@ -192,4 +192,4 @@ discard block |
||
192 | 192 | $xoopsTpl->assign('lang', $lang); |
193 | 193 | $xoopsTpl->assign('view', 'calweek'); |
194 | 194 | |
195 | -include XOOPS_ROOT_PATH . '/footer.php'; |
|
195 | +include XOOPS_ROOT_PATH.'/footer.php'; |