@@ -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 __DIR__ . '/../../mainfile.php'; |
|
28 | -include XOOPS_ROOT_PATH . '/include/comment_edit.php'; |
|
27 | +include __DIR__.'/../../mainfile.php'; |
|
28 | +include XOOPS_ROOT_PATH.'/include/comment_edit.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)) { |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
41 | - * @param $id |
|
41 | + * @param integer $id |
|
42 | 42 | * |
43 | 43 | * @return mixed |
44 | 44 | */ |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | * @param $format |
87 | 87 | * @param $timestamp |
88 | 88 | * |
89 | - * @return mixed |
|
89 | + * @return string |
|
90 | 90 | */ |
91 | 91 | public function getFormatedDate($format, $timestamp) |
92 | 92 | { |
@@ -2,13 +2,13 @@ discard block |
||
2 | 2 | |
3 | 3 | // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined'); |
4 | 4 | |
5 | -include_once __DIR__ . '/ExtcalPersistableObjectHandler.php'; |
|
6 | -include_once __DIR__ . '/perm.php'; |
|
7 | -include_once __DIR__ . '/time.php'; |
|
8 | -include_once __DIR__ . '/config.php'; |
|
9 | -include_once __DIR__ . '/extDateTime.php'; |
|
10 | -include_once __DIR__ . '/utilities.php'; |
|
11 | -include_once __DIR__ . '/../include/constantes.php'; |
|
5 | +include_once __DIR__.'/ExtcalPersistableObjectHandler.php'; |
|
6 | +include_once __DIR__.'/perm.php'; |
|
7 | +include_once __DIR__.'/time.php'; |
|
8 | +include_once __DIR__.'/config.php'; |
|
9 | +include_once __DIR__.'/extDateTime.php'; |
|
10 | +include_once __DIR__.'/utilities.php'; |
|
11 | +include_once __DIR__.'/../include/constantes.php'; |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * Class ExtcalEvent. |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $this->initVar('event_etablissement', XOBJ_DTYPE_INT, 5, false); |
50 | 50 | $this->initVar('event_icone', XOBJ_DTYPE_TXTBOX, '', false); |
51 | 51 | |
52 | - $this->externalKey['cat_id'] = array( |
|
52 | + $this->externalKey['cat_id'] = array( |
|
53 | 53 | 'className' => 'cat', |
54 | 54 | 'getMethodeName' => 'getCat', |
55 | 55 | 'keyName' => 'cat', |
@@ -382,7 +382,7 @@ discard block |
||
382 | 382 | $eventArray = array(); |
383 | 383 | |
384 | 384 | while (list($k, $v) = each($events)) { |
385 | - $ordre[] = (int)$v['event_start']; |
|
385 | + $ordre[] = (int) $v['event_start']; |
|
386 | 386 | $this->formatEventDate($v, $extcalConfig['event_date_week']); |
387 | 387 | //$v['cat']['cat_light_color'] = $v['cat']['cat_color']; |
388 | 388 | $v['cat']['cat_light_color'] = ExtcalUtilities::getLighterColor($v['cat']['cat_color'], _EXTCAL_INFOBULLE_RGB_MIN, _EXTCAL_INFOBULLE_RGB_MAX); |
@@ -583,7 +583,7 @@ discard block |
||
583 | 583 | |
584 | 584 | reset($period); |
585 | 585 | foreach ($period as $dt) { |
586 | - echo $dt->format("l d-m-Y H:i:s\n") . '<br>'; |
|
586 | + echo $dt->format("l d-m-Y H:i:s\n").'<br>'; |
|
587 | 587 | } |
588 | 588 | } |
589 | 589 | |
@@ -909,10 +909,10 @@ discard block |
||
909 | 909 | $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view'); |
910 | 910 | $count = count($authorizedAccessCats); |
911 | 911 | if ($count > 0) { |
912 | - $in = '(' . $authorizedAccessCats[0]; |
|
912 | + $in = '('.$authorizedAccessCats[0]; |
|
913 | 913 | array_shift($authorizedAccessCats); |
914 | 914 | foreach ($authorizedAccessCats as $authorizedAccessCat) { |
915 | - $in .= ',' . $authorizedAccessCat; |
|
915 | + $in .= ','.$authorizedAccessCat; |
|
916 | 916 | } |
917 | 917 | $in .= ')'; |
918 | 918 | $criteria->add(new Criteria('cat_id', $in, 'IN')); |
@@ -932,10 +932,10 @@ discard block |
||
932 | 932 | } |
933 | 933 | if (is_array($cats)) { |
934 | 934 | if (array_search(0, $cats) === false) { |
935 | - $in = '(' . current($cats); |
|
935 | + $in = '('.current($cats); |
|
936 | 936 | array_shift($cats); |
937 | 937 | foreach ($cats as $cat) { |
938 | - $in .= ',' . $cat; |
|
938 | + $in .= ','.$cat; |
|
939 | 939 | } |
940 | 940 | $in .= ')'; |
941 | 941 | $criteria->add(new Criteria('cat_id', $in, 'IN')); |
@@ -958,7 +958,7 @@ discard block |
||
958 | 958 | $fileHandler = xoops_getModuleHandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE); |
959 | 959 | |
960 | 960 | /***************************************************/ |
961 | - include_once __DIR__ . '/etablissement.php'; |
|
961 | + include_once __DIR__.'/etablissement.php'; |
|
962 | 962 | if ($siteSide === 'admin') { |
963 | 963 | $action = 'event.php?op=enreg'; |
964 | 964 | $cats = $catHandler->getAllCat($GLOBALS['xoopsUser'], 'all'); |
@@ -976,7 +976,7 @@ discard block |
||
976 | 976 | if ($mode === 'clone') { |
977 | 977 | $data['event_id'] = 0; |
978 | 978 | $event->setVar('event_id', 0); |
979 | - $newTitle = $event->getVar('event_title') . ' (' . _MD_EXTCAL_CLONE_OF . $data['event_id'] . ')'; |
|
979 | + $newTitle = $event->getVar('event_title').' ('._MD_EXTCAL_CLONE_OF.$data['event_id'].')'; |
|
980 | 980 | $event->setVar('event_title', $newTitle); |
981 | 981 | } |
982 | 982 | |
@@ -1160,7 +1160,7 @@ discard block |
||
1160 | 1160 | $form->addElement($catSelect, true); |
1161 | 1161 | //----------------------------------------------------------- |
1162 | 1162 | |
1163 | - $file_path = __DIR__ . '/../assets/css/images'; |
|
1163 | + $file_path = __DIR__.'/../assets/css/images'; |
|
1164 | 1164 | $tf = XoopsLists::getImgListAsArray($file_path); |
1165 | 1165 | array_unshift($tf, _MD_EXTCAL_NONE); |
1166 | 1166 | $xfIcones = new XoopsFormSelect(_MD_EXTCAL_ICONE, 'event_icone', $event_icone, ''); |
@@ -1265,7 +1265,7 @@ discard block |
||
1265 | 1265 | if (count($files) > 0) { |
1266 | 1266 | $eventFiles = new ExtcalFormFileCheckBox('', 'filetokeep'); |
1267 | 1267 | foreach ($files as $file) { |
1268 | - $name = $file['file_nicename'] . ' (<i>' . $file['file_mimetype'] . '</i>) ' . $file['formated_file_size']; |
|
1268 | + $name = $file['file_nicename'].' (<i>'.$file['file_mimetype'].'</i>) '.$file['formated_file_size']; |
|
1269 | 1269 | $eventFiles->addOption($file['file_id'], $name); |
1270 | 1270 | } |
1271 | 1271 | $fileElmtTray->addElement($eventFiles); |
@@ -1281,7 +1281,7 @@ discard block |
||
1281 | 1281 | //Picture1 |
1282 | 1282 | $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 1), ''); |
1283 | 1283 | if (!empty($event_picture1)) { |
1284 | - $file_tray->addElement(new XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/' . $event_picture1 . "' name='image' id='image' alt=''/><br><br>")); |
|
1284 | + $file_tray->addElement(new XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/'.$event_picture1."' name='image' id='image' alt=''/><br><br>")); |
|
1285 | 1285 | $check_del_img = new XoopsFormCheckBox('', 'delimg_1'); |
1286 | 1286 | $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG); |
1287 | 1287 | $file_tray->addElement($check_del_img); |
@@ -1292,8 +1292,8 @@ discard block |
||
1292 | 1292 | } |
1293 | 1293 | $file_img->setExtra("size ='40'"); |
1294 | 1294 | $file_tray->addElement($file_img); |
1295 | - $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(400728 / 1000), 500, 500); |
|
1296 | - $file_label = new XoopsFormLabel('', '<br>' . $msg); |
|
1295 | + $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (400728 / 1000), 500, 500); |
|
1296 | + $file_label = new XoopsFormLabel('', '<br>'.$msg); |
|
1297 | 1297 | $file_tray->addElement($file_label); |
1298 | 1298 | $form->addElement($file_tray); |
1299 | 1299 | $form->addElement(new XoopsFormHidden('file1', $event_picture1)); |
@@ -1301,7 +1301,7 @@ discard block |
||
1301 | 1301 | //Picture2 |
1302 | 1302 | $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 2), ''); |
1303 | 1303 | if (!empty($event_picture2)) { |
1304 | - $file_tray->addElement(new XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/' . $event_picture2 . "' name='image' id='image' alt=''/><br><br>")); |
|
1304 | + $file_tray->addElement(new XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/'.$event_picture2."' name='image' id='image' alt=''/><br><br>")); |
|
1305 | 1305 | $check_del_img = new XoopsFormCheckBox('', 'delimg_2'); |
1306 | 1306 | $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG); |
1307 | 1307 | $file_tray->addElement($check_del_img); |
@@ -1312,8 +1312,8 @@ discard block |
||
1312 | 1312 | } |
1313 | 1313 | $file_img->setExtra("size ='40'"); |
1314 | 1314 | $file_tray->addElement($file_img); |
1315 | - $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(400728 / 1000), 500, 500); |
|
1316 | - $file_label = new XoopsFormLabel('', '<br>' . $msg); |
|
1315 | + $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (400728 / 1000), 500, 500); |
|
1316 | + $file_label = new XoopsFormLabel('', '<br>'.$msg); |
|
1317 | 1317 | $file_tray->addElement($file_label); |
1318 | 1318 | $form->addElement($file_tray); |
1319 | 1319 | $form->addElement(new XoopsFormHidden('file2', $event_picture2)); |
@@ -1380,7 +1380,7 @@ discard block |
||
1380 | 1380 | $recurRules = 'weekly|'; |
1381 | 1381 | $recurRules .= $parm['rrule_weekly_interval']; |
1382 | 1382 | foreach ($parm['rrule_weekly_bydays'] as $day) { |
1383 | - $recurRules .= '|' . $day; |
|
1383 | + $recurRules .= '|'.$day; |
|
1384 | 1384 | } |
1385 | 1385 | |
1386 | 1386 | break; |
@@ -1390,11 +1390,11 @@ discard block |
||
1390 | 1390 | $parm['rrule_monthly_interval'] = 0; |
1391 | 1391 | } |
1392 | 1392 | $recurRules = 'monthly|'; |
1393 | - $recurRules .= $parm['rrule_monthly_interval'] . '|'; |
|
1393 | + $recurRules .= $parm['rrule_monthly_interval'].'|'; |
|
1394 | 1394 | if ($parm['rrule_monthly_byday'] != '') { |
1395 | 1395 | $recurRules .= $parm['rrule_monthly_byday']; |
1396 | 1396 | } else { |
1397 | - $recurRules .= 'MD' . $parm['rrule_bymonthday']; |
|
1397 | + $recurRules .= 'MD'.$parm['rrule_bymonthday']; |
|
1398 | 1398 | } |
1399 | 1399 | |
1400 | 1400 | break; |
@@ -1428,9 +1428,9 @@ discard block |
||
1428 | 1428 | |
1429 | 1429 | $recurRules = 'yearly|'; |
1430 | 1430 | $recurRules .= $parm['rrule_yearly_interval']; |
1431 | - $recurRules .= '|' . $parm['rrule_yearly_byday']; |
|
1431 | + $recurRules .= '|'.$parm['rrule_yearly_byday']; |
|
1432 | 1432 | foreach ($parm['rrule_yearly_bymonths'] as $month) { |
1433 | - $recurRules .= '|' . $month; |
|
1433 | + $recurRules .= '|'.$month; |
|
1434 | 1434 | } |
1435 | 1435 | |
1436 | 1436 | break; |
@@ -2363,10 +2363,10 @@ discard block |
||
2363 | 2363 | global $xoopsDB; |
2364 | 2364 | |
2365 | 2365 | //echo "<hr>{$andor}-{$limit}-{$offset}-{$userId}-{$user}<br>{$criteresPlus}"; |
2366 | - $tEvent = $xoopsDB->prefix('extcal_event') . ' AS te'; |
|
2367 | - $tCat = $xoopsDB->prefix('extcal_cat') . ' AS tc'; |
|
2366 | + $tEvent = $xoopsDB->prefix('extcal_event').' AS te'; |
|
2367 | + $tCat = $xoopsDB->prefix('extcal_cat').' AS tc'; |
|
2368 | 2368 | |
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' . " FROM {$tEvent}, {$tCat}"; |
|
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'." FROM {$tEvent}, {$tCat}"; |
|
2370 | 2370 | //--------------------------------------------------- |
2371 | 2371 | $tw = array(); |
2372 | 2372 | $tw[] = 'te.cat_id = tc.cat_id'; |
@@ -2375,7 +2375,7 @@ discard block |
||
2375 | 2375 | $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view'); |
2376 | 2376 | $inCat = 'te.cat_id IN (0)'; |
2377 | 2377 | if (count($authorizedAccessCats) > 0) { |
2378 | - $inCat = 'te.cat_id IN (' . implode(',', $authorizedAccessCats) . ')'; |
|
2378 | + $inCat = 'te.cat_id IN ('.implode(',', $authorizedAccessCats).')'; |
|
2379 | 2379 | } |
2380 | 2380 | //echo $tw[count($tw)-1]; |
2381 | 2381 | |
@@ -2411,12 +2411,12 @@ discard block |
||
2411 | 2411 | 'te.event_address', |
2412 | 2412 | 'tc.cat_name', |
2413 | 2413 | ); |
2414 | - $t = array(); |
|
2414 | + $t = array(); |
|
2415 | 2415 | for ($i = 0, $count = count($queryarray); $i < $count; ++$i) { |
2416 | 2416 | $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' "; |
2417 | 2417 | } |
2418 | 2418 | |
2419 | - $flt = '(' . implode(" {$andor} ", $t1) . ')'; |
|
2419 | + $flt = '('.implode(" {$andor} ", $t1).')'; |
|
2420 | 2420 | |
2421 | 2421 | $t = array(); |
2422 | 2422 | for ($h = 0, $count = count($tFields); $h < $count; ++$h) { |
@@ -2425,10 +2425,10 @@ discard block |
||
2425 | 2425 | |
2426 | 2426 | $filtre = implode(' OR ', $t); |
2427 | 2427 | $filtre = str_replace('#', '%', $filtre); |
2428 | - $tw[] = '(' . $filtre . ')'; |
|
2428 | + $tw[] = '('.$filtre.')'; |
|
2429 | 2429 | } |
2430 | 2430 | |
2431 | - $sql .= ' WHERE ' . implode(' AND ', $tw); |
|
2431 | + $sql .= ' WHERE '.implode(' AND ', $tw); |
|
2432 | 2432 | //------------------------------------------------------------ |
2433 | 2433 | if (count($orderBy) > 0) { |
2434 | 2434 | $t = array(); |
@@ -2438,7 +2438,7 @@ discard block |
||
2438 | 2438 | } |
2439 | 2439 | } |
2440 | 2440 | if (count($t) > 0) { |
2441 | - $sql .= ' ORDER BY ' . implode(',', $t); |
|
2441 | + $sql .= ' ORDER BY '.implode(',', $t); |
|
2442 | 2442 | } |
2443 | 2443 | } |
2444 | 2444 | |
@@ -2471,7 +2471,7 @@ discard block |
||
2471 | 2471 | $i = 0; |
2472 | 2472 | while ($myrow = $xoopsDB->fetchArray($result)) { |
2473 | 2473 | $ret[$i]['image'] = 'assets/images/icons/extcal.gif'; |
2474 | - $ret[$i]['link'] = 'event.php?event=' . $myrow['event_id']; |
|
2474 | + $ret[$i]['link'] = 'event.php?event='.$myrow['event_id']; |
|
2475 | 2475 | $ret[$i]['title'] = $myrow['event_title']; |
2476 | 2476 | $ret[$i]['time'] = $myrow['event_submitdate']; |
2477 | 2477 | $ret[$i]['uid'] = $myrow['event_submitter']; |
@@ -2511,23 +2511,23 @@ discard block |
||
2511 | 2511 | // } |
2512 | 2512 | $tEvent = $xoopsDB->prefix('extcal_event'); |
2513 | 2513 | $tCat = $xoopsDB->prefix('extcal_cat'); |
2514 | - $sql = "SELECT {$tEvent}.*, {$tCat}.cat_name AS categorie, {$tCat}.cat_color " . " FROM {$tEvent}, {$tCat}" . " WHERE {$tEvent}.cat_id = {$tCat}.cat_id AND event_approved = '1'"; |
|
2514 | + $sql = "SELECT {$tEvent}.*, {$tCat}.cat_name AS categorie, {$tCat}.cat_color "." FROM {$tEvent}, {$tCat}"." WHERE {$tEvent}.cat_id = {$tCat}.cat_id AND event_approved = '1'"; |
|
2515 | 2515 | |
2516 | 2516 | $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view'); |
2517 | 2517 | $count = count($authorizedAccessCats); |
2518 | 2518 | if ($count > 0) { |
2519 | - $in = '(' . $authorizedAccessCats[0]; |
|
2519 | + $in = '('.$authorizedAccessCats[0]; |
|
2520 | 2520 | array_shift($authorizedAccessCats); |
2521 | 2521 | foreach ($authorizedAccessCats as $authorizedAccessCat) { |
2522 | - $in .= ',' . $authorizedAccessCat; |
|
2522 | + $in .= ','.$authorizedAccessCat; |
|
2523 | 2523 | } |
2524 | 2524 | $in .= ')'; |
2525 | 2525 | } else { |
2526 | 2526 | $in = '(0)'; |
2527 | 2527 | } |
2528 | - $sql .= " AND {$tEvent}.cat_id IN " . $in . ''; |
|
2528 | + $sql .= " AND {$tEvent}.cat_id IN ".$in.''; |
|
2529 | 2529 | if ($userId != 0) { |
2530 | - $sql .= " AND event_submitter = '" . $userId . "'"; |
|
2530 | + $sql .= " AND event_submitter = '".$userId."'"; |
|
2531 | 2531 | } |
2532 | 2532 | |
2533 | 2533 | //echoArray($queryarray,false); |
@@ -2547,7 +2547,7 @@ discard block |
||
2547 | 2547 | $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' "; |
2548 | 2548 | } |
2549 | 2549 | |
2550 | - $flt = '(' . implode(" {$andor} ", $t1) . ')'; |
|
2550 | + $flt = '('.implode(" {$andor} ", $t1).')'; |
|
2551 | 2551 | |
2552 | 2552 | $t = array(); |
2553 | 2553 | for ($h = 0, $count = count($tFields); $h < $count; ++$h) { |
@@ -2560,7 +2560,7 @@ discard block |
||
2560 | 2560 | } |
2561 | 2561 | |
2562 | 2562 | if ($criteresPlus != '') { |
2563 | - $sql .= ' AND ' . $criteresPlus; |
|
2563 | + $sql .= ' AND '.$criteresPlus; |
|
2564 | 2564 | } |
2565 | 2565 | $sql .= ' ORDER BY event_id DESC'; |
2566 | 2566 | |
@@ -2570,7 +2570,7 @@ discard block |
||
2570 | 2570 | if ($xoopsSearch) { |
2571 | 2571 | while ($myrow = $xoopsDB->fetchArray($result)) { |
2572 | 2572 | $ret[$i]['image'] = 'assets/images/icons/extcal.gif'; |
2573 | - $ret[$i]['link'] = 'event.php?event=' . $myrow['event_id']; |
|
2573 | + $ret[$i]['link'] = 'event.php?event='.$myrow['event_id']; |
|
2574 | 2574 | $ret[$i]['title'] = $myrow['event_title']; |
2575 | 2575 | $ret[$i]['time'] = $myrow['event_submitdate']; |
2576 | 2576 | $ret[$i]['uid'] = $myrow['event_submitter']; |
@@ -616,7 +616,7 @@ discard block |
||
616 | 616 | * @param $cat |
617 | 617 | * @param int $nbDays |
618 | 618 | * |
619 | - * @return CriteriaCompo |
|
619 | + * @return null|CriteriaElement |
|
620 | 620 | */ |
621 | 621 | public function _getEventWeekCriteria($day, $month, $year, $cat, $nbDays = 7) |
622 | 622 | { |
@@ -637,7 +637,7 @@ discard block |
||
637 | 637 | * @param $year |
638 | 638 | * @param $cat |
639 | 639 | * |
640 | - * @return CriteriaCompo |
|
640 | + * @return null|CriteriaElement |
|
641 | 641 | */ |
642 | 642 | public function _getEventMonthCriteria($month, $year, $cat) |
643 | 643 | { |
@@ -657,7 +657,7 @@ discard block |
||
657 | 657 | * @param $year |
658 | 658 | * @param int $cat |
659 | 659 | * |
660 | - * @return CriteriaCompo |
|
660 | + * @return null|CriteriaElement |
|
661 | 661 | */ |
662 | 662 | public function _getEventYearCriteria($year, $cat = 0) |
663 | 663 | { |
@@ -740,7 +740,7 @@ discard block |
||
740 | 740 | /** |
741 | 741 | * @param $start |
742 | 742 | * @param $end |
743 | - * @param $cat |
|
743 | + * @param integer $cat |
|
744 | 744 | * @param $user |
745 | 745 | * |
746 | 746 | * @return CriteriaCompo |
@@ -1730,7 +1730,7 @@ discard block |
||
1730 | 1730 | |
1731 | 1731 | /** |
1732 | 1732 | * @param $month |
1733 | - * @param $year |
|
1733 | + * @param string $year |
|
1734 | 1734 | * @param $dayCode |
1735 | 1735 | * |
1736 | 1736 | * @return int |
@@ -6,8 +6,8 @@ |
||
6 | 6 | class ExtcalFormFileCheckBox extends XoopsFormCheckBox |
7 | 7 | { |
8 | 8 | /** |
9 | - * @param $caption |
|
10 | - * @param $name |
|
9 | + * @param string $caption |
|
10 | + * @param string $name |
|
11 | 11 | * @param null $value |
12 | 12 | * |
13 | 13 | * @return ExtcalFormFileCheckBox |
@@ -6,9 +6,9 @@ |
||
6 | 6 | class ExtcalFormRRuleCheckBox extends XoopsFormCheckBox |
7 | 7 | { |
8 | 8 | /** |
9 | - * @param $caption |
|
10 | - * @param $name |
|
11 | - * @param null $value |
|
9 | + * @param string $caption |
|
10 | + * @param string $name |
|
11 | + * @param string $value |
|
12 | 12 | */ |
13 | 13 | public function __construct($caption, $name, $value = null) |
14 | 14 | { |
@@ -146,9 +146,9 @@ discard block |
||
146 | 146 | // $p_level : Level of trace required. |
147 | 147 | // -------------------------------------------------------------------------------- |
148 | 148 | /** |
149 | - * @param $p_file |
|
150 | - * @param $p_line |
|
151 | - * @param $p_name |
|
149 | + * @param string $p_file |
|
150 | + * @param integer $p_line |
|
151 | + * @param string $p_name |
|
152 | 152 | * @param string $p_param |
153 | 153 | * @param string $p_message |
154 | 154 | */ |
@@ -213,8 +213,8 @@ discard block |
||
213 | 213 | // $p_level : Level of trace required. |
214 | 214 | // -------------------------------------------------------------------------------- |
215 | 215 | /** |
216 | - * @param $p_file |
|
217 | - * @param $p_line |
|
216 | + * @param string $p_file |
|
217 | + * @param integer $p_line |
|
218 | 218 | * @param int $p_return |
219 | 219 | * @param string $p_message |
220 | 220 | */ |
@@ -279,9 +279,9 @@ discard block |
||
279 | 279 | // Parameters : |
280 | 280 | // -------------------------------------------------------------------------------- |
281 | 281 | /** |
282 | - * @param $p_file |
|
283 | - * @param $p_line |
|
284 | - * @param $p_level |
|
282 | + * @param string $p_file |
|
283 | + * @param integer $p_line |
|
284 | + * @param integer $p_level |
|
285 | 285 | * @param string $p_message |
286 | 286 | */ |
287 | 287 | function TrFctMessage($p_file, $p_line, $p_level, $p_message = '') |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | if (!isset($g_pcl_trace_name)) { |
171 | 171 | $g_pcl_trace_name = $p_name; |
172 | 172 | } else { |
173 | - $g_pcl_trace_name .= ',' . $p_name; |
|
173 | + $g_pcl_trace_name .= ','.$p_name; |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | // ----- Update the function entry |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | echo '<tr>'; |
399 | 399 | echo '<td><table width=100% border=0 cellspacing=0 cellpadding=0><tr>'; |
400 | 400 | $n = ($g_pcl_trace_entries[$i]['index'] + 1) * 10; |
401 | - echo '<td width=' . $n . '><table width=100% border=0 cellspacing=0 cellpadding=0><tr>'; |
|
401 | + echo '<td width='.$n.'><table width=100% border=0 cellspacing=0 cellpadding=0><tr>'; |
|
402 | 402 | |
403 | 403 | for ($j = 0; $j <= $g_pcl_trace_entries[$i]['index']; ++$j) { |
404 | 404 | if ($j == $g_pcl_trace_entries[$i]['index']) { |
@@ -415,25 +415,25 @@ discard block |
||
415 | 415 | echo '<td width=2></td>'; |
416 | 416 | switch ($g_pcl_trace_entries[$i]['type']) { |
417 | 417 | case 1: |
418 | - echo "<td><span style='font-size: x-small; font-family: $v_font; '>" . $g_pcl_trace_entries[$i]['name'] . '(' . $g_pcl_trace_entries[$i]['param'] . ')</span></td>'; |
|
418 | + echo "<td><span style='font-size: x-small; font-family: $v_font; '>".$g_pcl_trace_entries[$i]['name'].'('.$g_pcl_trace_entries[$i]['param'].')</span></td>'; |
|
419 | 419 | break; |
420 | 420 | case 2: |
421 | - echo "<td><span style='font-size: x-small; font-family: $v_font; '>" . $g_pcl_trace_entries[$i]['name'] . '()=' . $g_pcl_trace_entries[$i]['param'] . '</span></td>'; |
|
421 | + echo "<td><span style='font-size: x-small; font-family: $v_font; '>".$g_pcl_trace_entries[$i]['name'].'()='.$g_pcl_trace_entries[$i]['param'].'</span></td>'; |
|
422 | 422 | break; |
423 | 423 | case 3: |
424 | 424 | case 4: |
425 | 425 | echo '<td><table width=100% border=0 cellspacing=0 cellpadding=0><td width=20></td><td>'; |
426 | - echo "<span style='font-size: x-small; font-family: $v_font; '>" . $g_pcl_trace_entries[$i]['message'] . '</span>'; |
|
426 | + echo "<span style='font-size: x-small; font-family: $v_font; '>".$g_pcl_trace_entries[$i]['message'].'</span>'; |
|
427 | 427 | echo '</td></table></td>'; |
428 | 428 | break; |
429 | 429 | default: |
430 | - echo "<td><span style='font-size: x-small; font-family: $v_font; '>" . $g_pcl_trace_entries[$i]['name'] . '(' . $g_pcl_trace_entries[$i]['param'] . ')</span></td>'; |
|
430 | + echo "<td><span style='font-size: x-small; font-family: $v_font; '>".$g_pcl_trace_entries[$i]['name'].'('.$g_pcl_trace_entries[$i]['param'].')</span></td>'; |
|
431 | 431 | } |
432 | 432 | echo '</tr></table></td>'; |
433 | 433 | echo '<td width=5></td>'; |
434 | - echo '<td><span style="font-size: xx-small; font-family: $v_font; ">' . basename($g_pcl_trace_entries[$i]['file']) . '</span></td>'; |
|
434 | + echo '<td><span style="font-size: xx-small; font-family: $v_font; ">'.basename($g_pcl_trace_entries[$i]['file']).'</span></td>'; |
|
435 | 435 | echo '<td width=5></td>'; |
436 | - echo '<td><span style="font-size: xx-small; font-family: $v_font; ">' . $g_pcl_trace_entries[$i]['line'] . '</span></td>'; |
|
436 | + echo '<td><span style="font-size: xx-small; font-family: $v_font; ">'.$g_pcl_trace_entries[$i]['line'].'</span></td>'; |
|
437 | 437 | echo '</tr>'; |
438 | 438 | } |
439 | 439 | |
@@ -477,12 +477,12 @@ discard block |
||
477 | 477 | echo '---'; |
478 | 478 | } |
479 | 479 | if ($p_entry['type'] == 1) { |
480 | - echo '<b>' . $p_entry['name'] . '</b>(' . $p_entry['param'] . ') : ' . $p_entry['message'] . ' [' . $p_entry['file'] . ', ' . $p_entry['line'] . ']<br>'; |
|
480 | + echo '<b>'.$p_entry['name'].'</b>('.$p_entry['param'].') : '.$p_entry['message'].' ['.$p_entry['file'].', '.$p_entry['line'].']<br>'; |
|
481 | 481 | } else { |
482 | 482 | if ($p_entry['type'] == 2) { |
483 | - echo '<b>' . $p_entry['name'] . '</b>()=' . $p_entry['param'] . ' : ' . $p_entry['message'] . ' [' . $p_entry['file'] . ', ' . $p_entry['line'] . ']<br>'; |
|
483 | + echo '<b>'.$p_entry['name'].'</b>()='.$p_entry['param'].' : '.$p_entry['message'].' ['.$p_entry['file'].', '.$p_entry['line'].']<br>'; |
|
484 | 484 | } else { |
485 | - echo $p_entry['message'] . ' [' . $p_entry['file'] . ', ' . $p_entry['line'] . ']<br>'; |
|
485 | + echo $p_entry['message'].' ['.$p_entry['file'].', '.$p_entry['line'].']<br>'; |
|
486 | 486 | } |
487 | 487 | } |
488 | 488 | } |
@@ -24,7 +24,7 @@ |
||
24 | 24 | public $entries = array(); |
25 | 25 | |
26 | 26 | /** |
27 | - * @param $calendar |
|
27 | + * @param Calendar_Day $calendar |
|
28 | 28 | */ |
29 | 29 | public function __construct($calendar) |
30 | 30 | { |
@@ -192,6 +192,9 @@ discard block |
||
192 | 192 | * @param int &$h hour (13) |
193 | 193 | * @param int &$i minute (34) |
194 | 194 | * @param int &$s second (53) |
195 | + * @param integer $y |
|
196 | + * @param integer $m |
|
197 | + * @param integer $d |
|
195 | 198 | */ |
196 | 199 | public function adjustDate(&$y, &$m, &$d, &$h, &$i, &$s) |
197 | 200 | { |
@@ -407,7 +410,7 @@ discard block |
||
407 | 410 | * @param int $m month (9) |
408 | 411 | * @param int $d day (4) |
409 | 412 | * |
410 | - * @return array (0, 1, 2, 3, 4, 5, 6) 1 = Monday |
|
413 | + * @return integer[] (0, 1, 2, 3, 4, 5, 6) 1 = Monday |
|
411 | 414 | */ |
412 | 415 | public function getWeekDays($y = null, $m = null, $d = null) |
413 | 416 | { |
@@ -476,7 +479,7 @@ discard block |
||
476 | 479 | /** |
477 | 480 | * Checks if the given day is the current day. |
478 | 481 | * |
479 | - * @param mixed $stamp Any timestamp format recognized by Pear::Date |
|
482 | + * @param string $stamp Any timestamp format recognized by Pear::Date |
|
480 | 483 | * |
481 | 484 | * @return bool |
482 | 485 | */ |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | * @param int $m month (9) |
364 | 364 | * @param int $d day (4) |
365 | 365 | * |
366 | - * @return array (0,1,2,3,4,5,6) 1 = Monday |
|
366 | + * @return integer[] (0,1,2,3,4,5,6) 1 = Monday |
|
367 | 367 | */ |
368 | 368 | public function getWeekDays($y = null, $m = null, $d = null) |
369 | 369 | { |
@@ -432,7 +432,7 @@ discard block |
||
432 | 432 | /** |
433 | 433 | * Checks if the given day is the current day. |
434 | 434 | * |
435 | - * @param mixed $stamp Any timestamp format recognized by Pear::Date |
|
435 | + * @param integer $stamp Any timestamp format recognized by Pear::Date |
|
436 | 436 | * |
437 | 437 | * @return bool |
438 | 438 | */ |