@@ -37,6 +37,9 @@ discard block |
||
37 | 37 | * @return array |
38 | 38 | */ |
39 | 39 | |
40 | +/** |
|
41 | + * @param string $formatDate |
|
42 | + */ |
|
40 | 43 | function agenda_getCanevas( |
41 | 44 | $ts, |
42 | 45 | $hStart, |
@@ -294,6 +297,9 @@ discard block |
||
294 | 297 | ****************************************************************** |
295 | 298 | * @param $name |
296 | 299 | */ |
300 | +/** |
|
301 | + * @param string $name |
|
302 | + */ |
|
297 | 303 | function ext_loadLanguage($name) |
298 | 304 | { |
299 | 305 | global $xoopsConfig; |
@@ -19,9 +19,9 @@ discard block |
||
19 | 19 | define('_EXTCAL_FORMAT_AGENDA_KEYD', 'Y-m-d'); |
20 | 20 | define('_EXTCAL_FORMAT_AGENDA_KEYT', 'H:i'); |
21 | 21 | |
22 | -include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php'); |
|
23 | -include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/functions.php'); |
|
24 | -include_once(XOOPS_ROOT_PATH . '/modules/extcal/language/' . $xoopsConfig['language'] . '/main.php'); |
|
22 | +include_once(XOOPS_ROOT_PATH.'/modules/extcal/include/constantes.php'); |
|
23 | +include_once(XOOPS_ROOT_PATH.'/modules/extcal/include/functions.php'); |
|
24 | +include_once(XOOPS_ROOT_PATH.'/modules/extcal/language/'.$xoopsConfig['language'].'/main.php'); |
|
25 | 25 | |
26 | 26 | /******************************************************************* |
27 | 27 | * |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $tj[$kj]['dayWeek'] = date('w', $tsj); |
63 | 63 | $tj[$kj]['jour'] = $jName[$tj[$kj]['dayWeek']]; //date('l', $tsj); |
64 | 64 | if ($tj[$kj]['dayWeek'] == 0) { |
65 | - $tj[$kj]['bg'] = "background='" . XOOPS_URL . "/modules/extcal/assets/images/trame.png'"; |
|
65 | + $tj[$kj]['bg'] = "background='".XOOPS_URL."/modules/extcal/assets/images/trame.png'"; |
|
66 | 66 | } else { |
67 | 67 | $tj[$kj]['bg'] = ''; |
68 | 68 | } |
@@ -134,16 +134,16 @@ discard block |
||
134 | 134 | $kd = date(_EXTCAL_FORMAT_AGENDA_KEYD, $ts); |
135 | 135 | $hour = date('H', $ts); |
136 | 136 | $minute = date('i', $ts); |
137 | - $m = (int)($minute / $mPlage) * $mPlage; |
|
137 | + $m = (int) ($minute / $mPlage) * $mPlage; |
|
138 | 138 | // echo "--->{$minute} / {$mPlage} = {$m}<br />"; |
139 | - $sMinute = (($m < 10) ? '0' . $m : $m); |
|
139 | + $sMinute = (($m < 10) ? '0'.$m : $m); |
|
140 | 140 | //$kt = date(_EXTCAL_FORMAT_AGENDA_KEYT, $ts); |
141 | 141 | if ($hour < $hStart) { |
142 | 142 | $kt = $tk0; |
143 | 143 | } elseif ($hour >= ($hEnd + 1)) { |
144 | 144 | $kt = $tk1; |
145 | 145 | } else { |
146 | - $kt = $hour . ':' . $sMinute; |
|
146 | + $kt = $hour.':'.$sMinute; |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | $tAgenda[$kt]['jours'][$kd]['events'][] = $e; |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | return false; |
293 | 293 | } |
294 | 294 | |
295 | - $file = XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/' . $f; |
|
295 | + $file = XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/'.$f; |
|
296 | 296 | $prefix = (defined($name) ? '_MI' : '_MD'); |
297 | 297 | include_once($file); |
298 | 298 | } |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | $ordre = array(); |
421 | 421 | while (list($k, $v) = each($tNavBar)) { |
422 | 422 | if (isset($tWeight[$k])) { |
423 | - $ordre[] = (int)$tWeight[$k]; //ordre defini dans les option du module |
|
423 | + $ordre[] = (int) $tWeight[$k]; //ordre defini dans les option du module |
|
424 | 424 | } else { |
425 | 425 | $ordre[] = $v['weight']; // ordre par defaut ddefini dans le tableau $tNavBar |
426 | 426 | } |
@@ -433,8 +433,8 @@ |
||
433 | 433 | /**************************************************************************/ |
434 | 434 | /** |
435 | 435 | * @param $color |
436 | - * @param $plancher |
|
437 | - * @param $plafond |
|
436 | + * @param integer $plancher |
|
437 | + * @param integer $plafond |
|
438 | 438 | * |
439 | 439 | * @return string |
440 | 440 | */ |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | * que la classe correspondante de la table a été générées avec classGenerator |
17 | 17 | **/ |
18 | 18 | |
19 | -include_once XOOPS_ROOT_PATH . '/class/uploader.php'; |
|
19 | +include_once XOOPS_ROOT_PATH.'/class/uploader.php'; |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * @param $eventId |
@@ -44,12 +44,12 @@ discard block |
||
44 | 44 | function extcal_loadImg(&$REQUEST, &$event_picture1, &$event_picture2) |
45 | 45 | { |
46 | 46 | /////////////////////////////////////////////////////////////////////////////// |
47 | - $uploaddir_event = XOOPS_ROOT_PATH . '/uploads/extcal/'; |
|
48 | - $uploadurl_event = XOOPS_URL . '/uploads/extcal/'; |
|
47 | + $uploaddir_event = XOOPS_ROOT_PATH.'/uploads/extcal/'; |
|
48 | + $uploadurl_event = XOOPS_URL.'/uploads/extcal/'; |
|
49 | 49 | //$picture = ''; |
50 | 50 | for ($j = 1; $j < 3; ++$j) { |
51 | - $delimg = @$REQUEST['delimg_' . $j . '']; |
|
52 | - $delimg = isset($delimg) ? (int)$delimg : 0; |
|
51 | + $delimg = @$REQUEST['delimg_'.$j.'']; |
|
52 | + $delimg = isset($delimg) ? (int) $delimg : 0; |
|
53 | 53 | if (0 == $delimg && !empty($REQUEST['xoops_upload_file'][$j])) { |
54 | 54 | $upload = new XoopsMediaUploader($uploaddir_event, array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png', 'image/jpg'), 3145728, null, null); |
55 | 55 | if ($upload->fetchMedia($REQUEST['xoops_upload_file'][$j])) { |
@@ -65,15 +65,15 @@ discard block |
||
65 | 65 | $event_picture2 = $upload->getSavedFileName(); |
66 | 66 | } |
67 | 67 | } |
68 | - } elseif (!empty($REQUEST['file' . $j])) { |
|
68 | + } elseif (!empty($REQUEST['file'.$j])) { |
|
69 | 69 | if ($j == 1) { |
70 | - $event_picture1 = $REQUEST['file' . $j]; |
|
70 | + $event_picture1 = $REQUEST['file'.$j]; |
|
71 | 71 | } elseif ($j == 2) { |
72 | - $event_picture2 = $REQUEST['file' . $j]; |
|
72 | + $event_picture2 = $REQUEST['file'.$j]; |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 | } else { |
76 | - $url_event = XOOPS_ROOT_PATH . '/uploads/extcal/' . $REQUEST['file' . $j]; |
|
76 | + $url_event = XOOPS_ROOT_PATH.'/uploads/extcal/'.$REQUEST['file'.$j]; |
|
77 | 77 | if ($j == 1) { |
78 | 78 | $event_picture1 = ''; |
79 | 79 | } elseif ($j == 2) { |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | $name = $catList->getVar('cat_name'); |
139 | 139 | $cat_color = $catList->getVar('cat_color'); |
140 | 140 | $checked = in_array($cat_id, $cat) ? 'checked' : ''; |
141 | - $cat = '' . "<div style='float:left; margin-left:5px;'>" . "<input type='checkbox' name='{$name}[{$cat_id}]' value='1' {$checked}>" . "<div style='absolute:left;height:12px; width:6px; background-color:#{$cat_color}; border:1px solid black; float:left; margin-right:5px;' ></div>" . " {$name}" . '</div>'; |
|
141 | + $cat = ''."<div style='float:left; margin-left:5px;'>"."<input type='checkbox' name='{$name}[{$cat_id}]' value='1' {$checked}>"."<div style='absolute:left;height:12px; width:6px; background-color:#{$cat_color}; border:1px solid black; float:left; margin-right:5px;' ></div>"." {$name}".'</div>'; |
|
142 | 142 | |
143 | 143 | $t[] = $cat; |
144 | 144 | } |
@@ -164,17 +164,17 @@ discard block |
||
164 | 164 | $select->addOption('', ''); |
165 | 165 | } |
166 | 166 | |
167 | - $select->addOption('year ASC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
168 | - $select->addOption('year DESC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
167 | + $select->addOption('year ASC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
168 | + $select->addOption('year DESC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
169 | 169 | |
170 | - $select->addOption('month ASC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
171 | - $select->addOption('month DESC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
170 | + $select->addOption('month ASC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
171 | + $select->addOption('month DESC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
172 | 172 | |
173 | - $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
174 | - $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
173 | + $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
174 | + $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
175 | 175 | |
176 | - $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
177 | - $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
176 | + $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
177 | + $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
178 | 178 | |
179 | 179 | return $select; |
180 | 180 | } |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | function echoDateArray($period) |
289 | 289 | { |
290 | 290 | foreach ($period as $dt) { |
291 | - echo $dt->format("l Y-m-d H:i:s\n") . '<br>'; |
|
291 | + echo $dt->format("l Y-m-d H:i:s\n").'<br>'; |
|
292 | 292 | } |
293 | 293 | } |
294 | 294 | |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | } |
305 | 305 | |
306 | 306 | $txt = print_r($t, true); |
307 | - echo '<pre>Number of items: ' . count($t) . "<br>{$txt}</pre>"; |
|
307 | + echo '<pre>Number of items: '.count($t)."<br>{$txt}</pre>"; |
|
308 | 308 | } |
309 | 309 | |
310 | 310 | /*****************************************************************/ |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | if ($msg != '') { |
318 | 318 | echo "<hr>{$msg}<hr>"; |
319 | 319 | } |
320 | - echo $line . '<br>'; |
|
320 | + echo $line.'<br>'; |
|
321 | 321 | } |
322 | 322 | |
323 | 323 | /*****************************************************************/ |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | echo "<hr>{$msg}<hr>"; |
345 | 345 | } |
346 | 346 | |
347 | - echo 'date --->' . $tsName . ' = ' . $ts . ' - ' . date('d-m-Y H:m:s', $ts) . '<br>'; |
|
347 | + echo 'date --->'.$tsName.' = '.$ts.' - '.date('d-m-Y H:m:s', $ts).'<br>'; |
|
348 | 348 | } |
349 | 349 | |
350 | 350 | /*****************************************************************/ |
@@ -458,7 +458,7 @@ discard block |
||
458 | 458 | */ |
459 | 459 | function eclaircirCouleur($color, $plancher, $plafond) |
460 | 460 | { |
461 | - include_once(XOOPS_ROOT_PATH . '/modules/extcal/class/colorTools.php'); |
|
461 | + include_once(XOOPS_ROOT_PATH.'/modules/extcal/class/colorTools.php'); |
|
462 | 462 | |
463 | 463 | //$ct = new ColorTools(); |
464 | 464 | //return $ct->eclaircir($color,$plancher,$plafond); |
@@ -211,6 +211,9 @@ discard block |
||
211 | 211 | * @param int $mode |
212 | 212 | * @param string $sep |
213 | 213 | */ |
214 | +/** |
|
215 | + * @param string $mail_subject |
|
216 | + */ |
|
214 | 217 | function extcal_SendMail( |
215 | 218 | $destinataires, |
216 | 219 | $mail_fromname, |
@@ -300,6 +303,9 @@ discard block |
||
300 | 303 | * |
301 | 304 | * @return string |
302 | 305 | */ |
306 | +/** |
|
307 | + * @param integer $mode |
|
308 | + */ |
|
303 | 309 | function extcal_getHeader($mode, $emailSender) |
304 | 310 | { |
305 | 311 | //mode = 0 pas d'entete |
@@ -16,11 +16,11 @@ discard block |
||
16 | 16 | * que la classe correspondante de la table a été générées avec classGenerator |
17 | 17 | **/ |
18 | 18 | |
19 | -include_once(XOOPS_ROOT_PATH . '/class/uploader.php'); |
|
20 | -require(XOOPS_ROOT_PATH . '/class/mail/phpmailer/class.phpmailer.php'); // First we require the PHPMailer libary in our script |
|
21 | -include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/functions.php'); |
|
22 | -include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php'); |
|
23 | -include_once(XOOPS_ROOT_PATH . '/class/template.php'); |
|
19 | +include_once(XOOPS_ROOT_PATH.'/class/uploader.php'); |
|
20 | +require(XOOPS_ROOT_PATH.'/class/mail/phpmailer/class.phpmailer.php'); // First we require the PHPMailer libary in our script |
|
21 | +include_once(XOOPS_ROOT_PATH.'/modules/extcal/include/functions.php'); |
|
22 | +include_once(XOOPS_ROOT_PATH.'/modules/extcal/include/constantes.php'); |
|
23 | +include_once(XOOPS_ROOT_PATH.'/class/template.php'); |
|
24 | 24 | |
25 | 25 | /******************************************************************** |
26 | 26 | * |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | $action = ''; //a voir JJD |
135 | 135 | $message = sprintf($tplMessage, $acteur['name']); |
136 | 136 | //$subject .= ' (' . rand(1, 100) . ')'; |
137 | - $subject .= ' - ' . $acteur['name']; |
|
137 | + $subject .= ' - '.$acteur['name']; |
|
138 | 138 | //-------------------------------------------------------------- |
139 | 139 | //Chargement du template dans le dossier de langue |
140 | 140 | //$f = _EXTCAL_PATH_LG . $xoopsConfig['language'] . '\mail_inscription.html'; |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | if ($mode == _EXTCAL_HEADER_HTML) { |
176 | 176 | $template = 'extcal_mail_member_html.tpl'; |
177 | 177 | } |
178 | - $mail_body = $tpl->fetch('db:' . $template); |
|
178 | + $mail_body = $tpl->fetch('db:'.$template); |
|
179 | 179 | |
180 | 180 | extcal_SendMail($destinataires, $mail_fromName, $mail_fromemail, $mail_subject, $mail_body, $bEcho = false, $mode = 0, $sep = '|'); |
181 | 181 | |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | $header = array(); |
300 | 300 | $header[] = "From: {$emailSender}"; |
301 | 301 | $header[] = "Reply-To: {$emailSender}"; |
302 | - $header[] = 'X-Mailer: PHP/' . phpversion(); |
|
302 | + $header[] = 'X-Mailer: PHP/'.phpversion(); |
|
303 | 303 | |
304 | 304 | if ($mode == _EXTCAL_HEADER_HTML) { |
305 | 305 | $header[] = 'MIME-Version: 1.0'; |
@@ -1,10 +1,10 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include dirname(dirname(__DIR__)) . '/mainfile.php'; |
|
4 | -include_once __DIR__ . '/include/constantes.php'; |
|
3 | +include dirname(dirname(__DIR__)).'/mainfile.php'; |
|
4 | +include_once __DIR__.'/include/constantes.php'; |
|
5 | 5 | $params = array('view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT); |
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 | //ext_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); |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | $xoopsTpl->assign('lang', $lang); |
58 | 58 | $xoopsTpl->assign('view', 'newevent'); |
59 | 59 | |
60 | - include XOOPS_ROOT_PATH . '/footer.php'; |
|
60 | + include XOOPS_ROOT_PATH.'/footer.php'; |
|
61 | 61 | } else { |
62 | 62 | redirect_header('index.php', 3); |
63 | 63 | } |
@@ -1,14 +1,14 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include dirname(dirname(__DIR__)) . '/mainfile.php'; |
|
4 | -include_once __DIR__ . '/include/constantes.php'; |
|
3 | +include dirname(dirname(__DIR__)).'/mainfile.php'; |
|
4 | +include_once __DIR__.'/include/constantes.php'; |
|
5 | 5 | |
6 | -include_once XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/calendar.php'; |
|
6 | +include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/calendar.php'; |
|
7 | 7 | |
8 | 8 | if (!isset($_GET['event'])) { |
9 | 9 | $eventId = 0; |
10 | 10 | } else { |
11 | - $eventId = (int)$_GET['event']; |
|
11 | + $eventId = (int) $_GET['event']; |
|
12 | 12 | } |
13 | 13 | $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE); |
14 | 14 | $event = $eventHandler->objectToArray($eventHandler->getEvent($eventId), array('cat_id')); |
@@ -22,136 +22,136 @@ discard block |
||
22 | 22 | // Adding formated date for start and end event |
23 | 23 | $eventHandler->formatEventDate($event, $xoopsModuleConfig['event_date_event']); |
24 | 24 | |
25 | -echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' . "\n"; |
|
26 | -echo '<html xmlns="http://www.w3.org/1999/xhtml">' . "\n"; |
|
27 | -echo '<head>' . "\n"; |
|
28 | -echo '<meta http-equiv="content-type" content="text/html; charset=' . _CHARSET . '" />' . "\n"; |
|
29 | -echo '<title>' . $event['cat']['cat_name'] . ' - ' . $event['event_title'] . '</title>' . "\n"; |
|
30 | -echo '</head>' . "\n"; |
|
31 | -echo '<body onload="window.print()">' . "\n"; |
|
32 | -echo '<table style="border:1px solid black; width:640px;" cellspacing="0" cellspadding="0">' . "\n"; |
|
33 | -echo '<tr>' . "\n"; |
|
34 | -echo '<td colspan="2" style="font-size:1.2em; border:1px solid black;">' . "\n"; |
|
35 | -echo $event['event_title'] . "\n"; |
|
36 | -echo '</td>' . "\n"; |
|
37 | -echo '</tr>' . "\n"; |
|
38 | -echo '<tr>' . "\n"; |
|
39 | -echo '<td style="width:50%; border:1px solid black;">' . "\n"; |
|
40 | -echo '<b>' . $event['cat']['cat_name'] . '</b><br />' . "\n"; |
|
41 | -echo '<span style="font-weight:normal;">' . $event['cat']['cat_desc'] . '</span>' . "\n"; |
|
42 | -echo '</td>' . "\n"; |
|
43 | -echo '<td style="border:1px solid black;">' . "\n"; |
|
25 | +echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n"; |
|
26 | +echo '<html xmlns="http://www.w3.org/1999/xhtml">'."\n"; |
|
27 | +echo '<head>'."\n"; |
|
28 | +echo '<meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" />'."\n"; |
|
29 | +echo '<title>'.$event['cat']['cat_name'].' - '.$event['event_title'].'</title>'."\n"; |
|
30 | +echo '</head>'."\n"; |
|
31 | +echo '<body onload="window.print()">'."\n"; |
|
32 | +echo '<table style="border:1px solid black; width:640px;" cellspacing="0" cellspadding="0">'."\n"; |
|
33 | +echo '<tr>'."\n"; |
|
34 | +echo '<td colspan="2" style="font-size:1.2em; border:1px solid black;">'."\n"; |
|
35 | +echo $event['event_title']."\n"; |
|
36 | +echo '</td>'."\n"; |
|
37 | +echo '</tr>'."\n"; |
|
38 | +echo '<tr>'."\n"; |
|
39 | +echo '<td style="width:50%; border:1px solid black;">'."\n"; |
|
40 | +echo '<b>'.$event['cat']['cat_name'].'</b><br />'."\n"; |
|
41 | +echo '<span style="font-weight:normal;">'.$event['cat']['cat_desc'].'</span>'."\n"; |
|
42 | +echo '</td>'."\n"; |
|
43 | +echo '<td style="border:1px solid black;">'."\n"; |
|
44 | 44 | if (!$event['event_isrecur']) { |
45 | - echo '<b>' . _MD_EXTCAL_START . ' :</b> <span style="font-weight:normal;">' . $event['formated_event_start'] . '</span><br />' . "\n"; |
|
46 | - echo '<b>' . _MD_EXTCAL_END . ' :</b> <span style="font-weight:normal;">' . $event['formated_event_end'] . '</span>' . "\n"; |
|
45 | + echo '<b>'._MD_EXTCAL_START.' :</b> <span style="font-weight:normal;">'.$event['formated_event_start'].'</span><br />'."\n"; |
|
46 | + echo '<b>'._MD_EXTCAL_END.' :</b> <span style="font-weight:normal;">'.$event['formated_event_end'].'</span>'."\n"; |
|
47 | 47 | } else { |
48 | - echo '<b>' . _MD_EXTCAL_RECCUR_RULE . ' :</b> <span style="font-weight:normal;">' . $event['formated_reccur_rule'] . '</span>' . "\n"; |
|
48 | + echo '<b>'._MD_EXTCAL_RECCUR_RULE.' :</b> <span style="font-weight:normal;">'.$event['formated_reccur_rule'].'</span>'."\n"; |
|
49 | 49 | } |
50 | -echo '</td>' . "\n"; |
|
51 | -echo '</tr>' . "\n"; |
|
50 | +echo '</td>'."\n"; |
|
51 | +echo '</tr>'."\n"; |
|
52 | 52 | |
53 | -echo '<tr>' . "\n"; |
|
53 | +echo '<tr>'."\n"; |
|
54 | 54 | if ($event['event_desc'] != '') { |
55 | - echo '<td style="border:1px solid black;">' . $event['event_desc'] . '</td>' . "\n"; |
|
55 | + echo '<td style="border:1px solid black;">'.$event['event_desc'].'</td>'."\n"; |
|
56 | 56 | } |
57 | 57 | if ($event['event_price'] != '') { |
58 | - echo '<td style="border:1px solid black;">' . _MD_EXTCAL_ETABLISSEMENT_PRICE . $event['event_price'] . ' ' . _MD_EXTCAL_DEVISE2 . '</td>' . "\n"; |
|
58 | + echo '<td style="border:1px solid black;">'._MD_EXTCAL_ETABLISSEMENT_PRICE.$event['event_price'].' '._MD_EXTCAL_DEVISE2.'</td>'."\n"; |
|
59 | 59 | } |
60 | -echo '</tr>' . "\n"; |
|
60 | +echo '</tr>'."\n"; |
|
61 | 61 | |
62 | 62 | //show contact info |
63 | 63 | if ($event['event_contact'] != '') { |
64 | - echo '<tr>' . "\n"; |
|
65 | - echo '<td style="border:1px solid black;">' . "\n"; |
|
66 | - echo '<b>' . _MD_EXTCAL_CONTACT_INFO . '</b><br />' . "\n"; |
|
67 | - echo '<span style="font-weight:normal;">' . $event['event_organisateur'] . '<br />' . "\n"; |
|
68 | - echo '<span style="font-weight:normal;">' . $event['event_contact'] . '<br />' . "\n"; |
|
69 | - echo $event['event_address'] . '</span>' . "\n"; |
|
70 | - echo '</td>' . "\n"; |
|
71 | - echo '<td style="border:1px solid black;">' . "\n"; |
|
72 | - echo '<b>' . _MD_EXTCAL_EMAIL . ' :</b> <a href="mailto:' . $event['event_email'] . '">' . $event['event_email'] . '</a><br />' . "\n"; |
|
73 | - echo '<b>' . _MD_EXTCAL_URL . ' :</b> <a href="' . $event['event_url'] . '">' . $event['event_url'] . '</a>' . "\n"; |
|
74 | - echo '</td>' . "\n"; |
|
75 | - echo '</tr>' . "\n"; |
|
64 | + echo '<tr>'."\n"; |
|
65 | + echo '<td style="border:1px solid black;">'."\n"; |
|
66 | + echo '<b>'._MD_EXTCAL_CONTACT_INFO.'</b><br />'."\n"; |
|
67 | + echo '<span style="font-weight:normal;">'.$event['event_organisateur'].'<br />'."\n"; |
|
68 | + echo '<span style="font-weight:normal;">'.$event['event_contact'].'<br />'."\n"; |
|
69 | + echo $event['event_address'].'</span>'."\n"; |
|
70 | + echo '</td>'."\n"; |
|
71 | + echo '<td style="border:1px solid black;">'."\n"; |
|
72 | + echo '<b>'._MD_EXTCAL_EMAIL.' :</b> <a href="mailto:'.$event['event_email'].'">'.$event['event_email'].'</a><br />'."\n"; |
|
73 | + echo '<b>'._MD_EXTCAL_URL.' :</b> <a href="'.$event['event_url'].'">'.$event['event_url'].'</a>'."\n"; |
|
74 | + echo '</td>'."\n"; |
|
75 | + echo '</tr>'."\n"; |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | //show location |
79 | 79 | if ($event['event_etablissement'] = 0) { |
80 | - echo '<tr>' . "\n"; |
|
80 | + echo '<tr>'."\n"; |
|
81 | 81 | |
82 | 82 | // echo($location['nom']); |
83 | 83 | // var_dump($location); |
84 | 84 | // var_dump($event); |
85 | 85 | |
86 | - echo '<td style="border:1px solid black;">' . "\n"; |
|
87 | - echo '<b>' . _MD_EXTCAL_ETABLISSEMENT . '</b>' . "\n"; |
|
86 | + echo '<td style="border:1px solid black;">'."\n"; |
|
87 | + echo '<b>'._MD_EXTCAL_ETABLISSEMENT.'</b>'."\n"; |
|
88 | 88 | if ($location['categorie'] != '') { |
89 | - echo '<span style="font-weight:normal;"> (' . $location['categorie'] . ') <br />' . "\n"; |
|
89 | + echo '<span style="font-weight:normal;"> ('.$location['categorie'].') <br />'."\n"; |
|
90 | 90 | } |
91 | 91 | if ($location['logo'] != '') { |
92 | - echo '<img align=right style="border:1px solid #FFFFFF;margin-right:6px" src=' . XOOPS_URL . '/uploads/extcal/etablissement/' . $location['logo'] . ' height="75px" />' . '' . "\n"; |
|
92 | + echo '<img align=right style="border:1px solid #FFFFFF;margin-right:6px" src='.XOOPS_URL.'/uploads/extcal/etablissement/'.$location['logo'].' height="75px" />'.''."\n"; |
|
93 | 93 | } |
94 | 94 | |
95 | - echo '<span style="font-weight:normal;">' . $location['nom'] . '<br />' . "\n"; |
|
96 | - echo $location['description'] . '<br />' . "\n"; |
|
97 | - echo $location['adresse'] . '</span> <br />' . "\n"; |
|
95 | + echo '<span style="font-weight:normal;">'.$location['nom'].'<br />'."\n"; |
|
96 | + echo $location['description'].'<br />'."\n"; |
|
97 | + echo $location['adresse'].'</span> <br />'."\n"; |
|
98 | 98 | if ($location['adresse2'] != '') { |
99 | - echo $location['adresse2'] . '</span> <br />' . "\n"; |
|
99 | + echo $location['adresse2'].'</span> <br />'."\n"; |
|
100 | 100 | } |
101 | - echo $location['ville'] . "\n"; |
|
102 | - echo $location['cp'] . '<br />' . "\n"; |
|
101 | + echo $location['ville']."\n"; |
|
102 | + echo $location['cp'].'<br />'."\n"; |
|
103 | 103 | |
104 | 104 | if ($location['horaires'] != '') { |
105 | - echo $location['horaires'] . '</span> <br />' . "\n"; |
|
105 | + echo $location['horaires'].'</span> <br />'."\n"; |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | if ($location['divers'] != '') { |
109 | - echo $location['divers'] . '</span> <br />' . "\n"; |
|
109 | + echo $location['divers'].'</span> <br />'."\n"; |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | if ($location['tarifs'] != '') { |
113 | - echo $location['tarifs'] . '</span> ' . _MD_EXTCAL_DEVISE2 . "\n"; |
|
113 | + echo $location['tarifs'].'</span> '._MD_EXTCAL_DEVISE2."\n"; |
|
114 | 114 | } |
115 | 115 | |
116 | - echo '</td>' . "\n"; |
|
117 | - echo '<td style="border:1px solid black;">' . "\n"; |
|
116 | + echo '</td>'."\n"; |
|
117 | + echo '<td style="border:1px solid black;">'."\n"; |
|
118 | 118 | |
119 | 119 | if ($location['tel_fixe'] != '') { |
120 | - echo '<b>' . _MD_EXTCAL_ETABLISSEMENT_TEL_FIXE . ' :</b>' . $location['tel_fixe'] . '<br />' . "\n"; |
|
120 | + echo '<b>'._MD_EXTCAL_ETABLISSEMENT_TEL_FIXE.' :</b>'.$location['tel_fixe'].'<br />'."\n"; |
|
121 | 121 | } |
122 | 122 | if ($location['tel_portable'] != '') { |
123 | - echo '<b>' . _MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE . ' :</b>' . $location['tel_portable'] . '<br />' . "\n"; |
|
123 | + echo '<b>'._MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE.' :</b>'.$location['tel_portable'].'<br />'."\n"; |
|
124 | 124 | } |
125 | 125 | |
126 | - echo '<b>' . _MD_EXTCAL_EMAIL . ' :</b> <a href="mailto:' . $location['mail'] . '">' . $location['mail'] . '</a><br />' . "\n"; |
|
127 | - echo '<b>' . _MD_EXTCAL_URL . ' :</b> <a href="' . $location['site'] . '">' . $location['site'] . '</a>' . '<br />' . "\n"; |
|
128 | - echo '<b>' . _MD_EXTCAL_ETABLISSEMENT_MAP . ' :</b> <a href="' . $location['map'] . '">' . _MD_EXTCAL_ETABLISSEMENT_MAP2 . '</a>' . "\n"; |
|
126 | + echo '<b>'._MD_EXTCAL_EMAIL.' :</b> <a href="mailto:'.$location['mail'].'">'.$location['mail'].'</a><br />'."\n"; |
|
127 | + echo '<b>'._MD_EXTCAL_URL.' :</b> <a href="'.$location['site'].'">'.$location['site'].'</a>'.'<br />'."\n"; |
|
128 | + echo '<b>'._MD_EXTCAL_ETABLISSEMENT_MAP.' :</b> <a href="'.$location['map'].'">'._MD_EXTCAL_ETABLISSEMENT_MAP2.'</a>'."\n"; |
|
129 | 129 | |
130 | - echo '</td>' . "\n"; |
|
131 | - echo '</tr>' . "\n"; |
|
130 | + echo '</td>'."\n"; |
|
131 | + echo '</tr>'."\n"; |
|
132 | 132 | } |
133 | 133 | //show images |
134 | 134 | |
135 | 135 | if (($event['event_picture1'] != '') || ($event['event_picture2'] != '')) { |
136 | - echo '<tr>' . "\n"; |
|
136 | + echo '<tr>'."\n"; |
|
137 | 137 | if ($event['event_picture1'] != '') { |
138 | - echo '<td style="border:1px solid black;">' . "\n"; |
|
139 | - echo '<img align=left style="border:1px solid #FFFFFF;margin-right:6px" src=' . XOOPS_URL . '/uploads/extcal/' . $event['event_picture1'] . ' height="100px" />' . '' . "\n"; |
|
140 | - echo '</td>' . "\n"; |
|
138 | + echo '<td style="border:1px solid black;">'."\n"; |
|
139 | + echo '<img align=left style="border:1px solid #FFFFFF;margin-right:6px" src='.XOOPS_URL.'/uploads/extcal/'.$event['event_picture1'].' height="100px" />'.''."\n"; |
|
140 | + echo '</td>'."\n"; |
|
141 | 141 | } |
142 | 142 | if ($event['event_picture2'] != '') { |
143 | - echo '<td style="border:1px solid black;">' . "\n"; |
|
144 | - echo '<img align=left style="border:1px solid #FFFFFF;margin-right:6px" src=' . XOOPS_URL . '/uploads/extcal/' . $event['event_picture2'] . ' height="100px" />' . '' . "\n"; |
|
145 | - echo '</td>' . "\n"; |
|
143 | + echo '<td style="border:1px solid black;">'."\n"; |
|
144 | + echo '<img align=left style="border:1px solid #FFFFFF;margin-right:6px" src='.XOOPS_URL.'/uploads/extcal/'.$event['event_picture2'].' height="100px" />'.''."\n"; |
|
145 | + echo '</td>'."\n"; |
|
146 | 146 | } |
147 | - echo '</tr>' . "\n"; |
|
147 | + echo '</tr>'."\n"; |
|
148 | 148 | } |
149 | 149 | //-------------------- |
150 | 150 | |
151 | -echo '</table><br />' . "\n"; |
|
151 | +echo '</table><br />'."\n"; |
|
152 | 152 | echo '<div style="text-align:center; width:640px;">'; |
153 | -echo $xoopsConfig['sitename'] . ' - ' . $xoopsConfig['slogan'] . '<br />'; |
|
154 | -echo '<a href="' . XOOPS_URL . '/modules/extcal/event.php?event=' . $event['event_id'] . '">' . XOOPS_URL . '/modules/extcal/event.php?event=' . $event['event_id'] . '</a>'; |
|
153 | +echo $xoopsConfig['sitename'].' - '.$xoopsConfig['slogan'].'<br />'; |
|
154 | +echo '<a href="'.XOOPS_URL.'/modules/extcal/event.php?event='.$event['event_id'].'">'.XOOPS_URL.'/modules/extcal/event.php?event='.$event['event_id'].'</a>'; |
|
155 | 155 | echo '</div>'; |
156 | -echo '</body>' . "\n"; |
|
157 | -echo '</html>' . "\n"; |
|
156 | +echo '</body>'."\n"; |
|
157 | +echo '</html>'."\n"; |
@@ -29,7 +29,7 @@ |
||
29 | 29 | { |
30 | 30 | global $xoopsDB; |
31 | 31 | |
32 | - $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . "` ADD `event_nbmember` tinyint(4) NOT NULL default '0' AFTER `event_submitdate` ;"; |
|
32 | + $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event')."` ADD `event_nbmember` tinyint(4) NOT NULL default '0' AFTER `event_submitdate` ;"; |
|
33 | 33 | $xoopsDB->query($sql); |
34 | 34 | } |
35 | 35 |
@@ -32,25 +32,25 @@ |
||
32 | 32 | //$xoopsDB = Database::getInstance(); |
33 | 33 | $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection(); |
34 | 34 | |
35 | - $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . "` CHANGE `event_approved` `event_approved` TINYINT( 1 ) NOT NULL DEFAULT '0' ;"; |
|
35 | + $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event')."` CHANGE `event_approved` `event_approved` TINYINT( 1 ) NOT NULL DEFAULT '0' ;"; |
|
36 | 36 | $xoopsDB->query($sql); |
37 | 37 | |
38 | - $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . '` ADD `event_isrecur` TINYINT( 1 ) NOT NULL AFTER `event_nbmember` ;'; |
|
38 | + $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event').'` ADD `event_isrecur` TINYINT( 1 ) NOT NULL AFTER `event_nbmember` ;'; |
|
39 | 39 | $xoopsDB->query($sql); |
40 | 40 | |
41 | - $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . '` ADD `event_recur_rules` VARCHAR( 255 ) NOT NULL AFTER `event_isrecur` '; |
|
41 | + $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event').'` ADD `event_recur_rules` VARCHAR( 255 ) NOT NULL AFTER `event_isrecur` '; |
|
42 | 42 | $xoopsDB->query($sql); |
43 | 43 | |
44 | - $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . '` ADD `event_recur_start` INT( 11 ) NOT NULL AFTER `event_recur_rules` ;'; |
|
44 | + $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event').'` ADD `event_recur_start` INT( 11 ) NOT NULL AFTER `event_recur_rules` ;'; |
|
45 | 45 | $xoopsDB->query($sql); |
46 | 46 | |
47 | - $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . '` ADD `event_recur_end` INT( 11 ) NOT NULL AFTER `event_recur_start` ;'; |
|
47 | + $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event').'` ADD `event_recur_end` INT( 11 ) NOT NULL AFTER `event_recur_start` ;'; |
|
48 | 48 | $xoopsDB->query($sql); |
49 | 49 | |
50 | - $sql = 'CREATE TABLE `' . $xoopsDB->prefix('extcal_event') . "` (`eventnotmember_id` int(11) NOT NULL auto_increment,`event_id` int(11) NOT NULL default '0',`uid` int(11) NOT NULL default '0',PRIMARY KEY (`eventnotmember_id`),UNIQUE KEY `eventnotmember` (`event_id`,`uid`)) COMMENT='eXtcal By Zoullou' ;"; |
|
50 | + $sql = 'CREATE TABLE `'.$xoopsDB->prefix('extcal_event')."` (`eventnotmember_id` int(11) NOT NULL auto_increment,`event_id` int(11) NOT NULL default '0',`uid` int(11) NOT NULL default '0',PRIMARY KEY (`eventnotmember_id`),UNIQUE KEY `eventnotmember` (`event_id`,`uid`)) COMMENT='eXtcal By Zoullou' ;"; |
|
51 | 51 | $xoopsDB->query($sql); |
52 | 52 | |
53 | - $sql = 'CREATE TABLE `' . $xoopsDB->prefix('extcal_file') . "` (`file_id` int(11) NOT NULL auto_increment,`file_name` varchar(255) NOT NULL,`file_nicename` varchar(255) NOT NULL,`file_mimetype` varchar(255) NOT NULL,`file_size` int(11) NOT NULL,`file_download` int(11) NOT NULL,`file_date` int(11) NOT NULL,`file_approved` tinyint(1) NOT NULL,`event_id` int(11) NOT NULL,`uid` int(11) NOT NULL,PRIMARY KEY (`file_id`)) COMMENT='eXtcal By Zoullou' ;"; |
|
53 | + $sql = 'CREATE TABLE `'.$xoopsDB->prefix('extcal_file')."` (`file_id` int(11) NOT NULL auto_increment,`file_name` varchar(255) NOT NULL,`file_nicename` varchar(255) NOT NULL,`file_mimetype` varchar(255) NOT NULL,`file_size` int(11) NOT NULL,`file_download` int(11) NOT NULL,`file_date` int(11) NOT NULL,`file_approved` tinyint(1) NOT NULL,`event_id` int(11) NOT NULL,`uid` int(11) NOT NULL,PRIMARY KEY (`file_id`)) COMMENT='eXtcal By Zoullou' ;"; |
|
54 | 54 | $xoopsDB->query($sql); |
55 | 55 | } |
56 | 56 |
@@ -30,17 +30,17 @@ |
||
30 | 30 | global $xoopsDB; |
31 | 31 | |
32 | 32 | // Create eXtcal upload directory if don't exist |
33 | - $dir = XOOPS_ROOT_PATH . '/uploads/extcal'; |
|
33 | + $dir = XOOPS_ROOT_PATH.'/uploads/extcal'; |
|
34 | 34 | if (!is_dir($dir)) { |
35 | 35 | mkdir($dir); |
36 | 36 | |
37 | 37 | // Copy index.html files on uploads folders |
38 | - $indexFile = XOOPS_ROOT_PATH . '/modules/extcal/include/index.html'; |
|
39 | - copy($indexFile, XOOPS_ROOT_PATH . '/uploads/extcal/index.html'); |
|
38 | + $indexFile = XOOPS_ROOT_PATH.'/modules/extcal/include/index.html'; |
|
39 | + copy($indexFile, XOOPS_ROOT_PATH.'/uploads/extcal/index.html'); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | // Create who's not going table to fix bug. If the table exist, the query will faile |
43 | - $sql = 'CREATE TABLE `' . $xoopsDB->prefix('extcal_eventnotmember') . "` (`eventnotmember_id` int(11) NOT NULL auto_increment,`event_id` int(11) NOT NULL default '0',`uid` int(11) NOT NULL default '0',PRIMARY KEY (`eventnotmember_id`),UNIQUE KEY `eventnotmember` (`event_id`,`uid`)) COMMENT='eXtcal By Zoullou' ;"; |
|
43 | + $sql = 'CREATE TABLE `'.$xoopsDB->prefix('extcal_eventnotmember')."` (`eventnotmember_id` int(11) NOT NULL auto_increment,`event_id` int(11) NOT NULL default '0',`uid` int(11) NOT NULL default '0',PRIMARY KEY (`eventnotmember_id`),UNIQUE KEY `eventnotmember` (`event_id`,`uid`)) COMMENT='eXtcal By Zoullou' ;"; |
|
44 | 44 | $xoopsDB->query($sql); |
45 | 45 | } |
46 | 46 |
@@ -24,5 +24,5 @@ |
||
24 | 24 | // along with this program; if not, write to the Free Software // |
25 | 25 | // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // |
26 | 26 | // ------------------------------------------------------------------------ // |
27 | -include dirname(dirname(__DIR__)) . '/mainfile.php'; |
|
28 | -include XOOPS_ROOT_PATH . '/include/comment_reply.php'; |
|
27 | +include dirname(dirname(__DIR__)).'/mainfile.php'; |
|
28 | +include XOOPS_ROOT_PATH.'/include/comment_reply.php'; |