Completed
Branch master (55a138)
by Michael
03:21
created
blocks/minical.php 3 patches
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -457,12 +457,12 @@
 block discarded – undo
457 457
 /**
458 458
  * @param array      $event
459 459
  * @param array      $eventsArray
460
- * @param Time $timeHandler
461
- * @param            $startMonth
462
- * @param            $endMonth
460
+ * @param Extcal\Time $timeHandler
461
+ * @param            integer $startMonth
462
+ * @param            integer $endMonth
463 463
  * @param            $cats
464 464
  *
465
- * @return bool
465
+ * @return false|null
466 466
  */
467 467
 function bExtcalMinicalAddEventToArray($event, &$eventsArray, $timeHandler, $startMonth, $endMonth, $cats)
468 468
 {
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@
 block discarded – undo
168 168
         new Calendar_Day(
169 169
             date('Y', xoops_getUserTimestamp(time(), $timeHandler->_getUserTimeZone($GLOBALS['xoopsUser']))),
170 170
             date('n', xoops_getUserTimestamp(time(), $timeHandler->_getUserTimeZone($GLOBALS['xoopsUser']))),
171
-                         date('j', xoops_getUserTimestamp(time(), $timeHandler->_getUserTimeZone($GLOBALS['xoopsUser'])))
171
+                            date('j', xoops_getUserTimestamp(time(), $timeHandler->_getUserTimeZone($GLOBALS['xoopsUser'])))
172 172
         ),
173 173
     ];
174 174
 
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 use XoopsModules\Extcal;
21 21
 
22 22
 global $extcalConfig, $xoopsUser;
23
-require_once __DIR__ . '/../include/constantes.php';
23
+require_once __DIR__.'/../include/constantes.php';
24 24
 //require_once __DIR__ . '/../class/Utility.php';
25 25
 //require_once __DIR__ . '/../class/tableForm.php';
26 26
 //---------------------------------------------------------------------------
@@ -37,16 +37,16 @@  discard block
 block discarded – undo
37 37
 
38 38
 //    require_once __DIR__ . '/../class/config.php';
39 39
 
40
-    require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Util/Textual.php';
41
-    require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Month/Weeks.php';
42
-    require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Day.php';
40
+    require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Util/Textual.php';
41
+    require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Month/Weeks.php';
42
+    require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Day.php';
43 43
     //     require_once CALENDAR_ROOT . 'Month/Weeks.php';
44 44
     //     require_once CALENDAR_ROOT . 'Day.php';
45 45
 
46 46
     // Retriving Image for block if enabled
47 47
     if (1 == $options[0]) {
48 48
         $imageHandler = xoops_getHandler('image');
49
-        $criteria     =  new \Criteria('imgcat_id', $options[1]);
49
+        $criteria     = new \Criteria('imgcat_id', $options[1]);
50 50
         $criteria->setSort('RAND()');
51 51
         $criteria->setLimit($options[6]);
52 52
         $images         = $imageHandler->getObjects($criteria);
@@ -84,13 +84,13 @@  discard block
 block discarded – undo
84 84
     //----------------------------------------------------
85 85
     // Getting eXtCal object's handler
86 86
 //    $catHandler = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
87
-    $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
87
+    $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
88 88
 
89
-    $cats       = $catHandler->getAllCatById($xoopsUser);
89
+    $cats = $catHandler->getAllCatById($xoopsUser);
90 90
     // $t = print_r($cats,true);
91 91
     // echo "zzz<pre>{$t}</pre>";
92 92
 
93
-    $eventHandler      = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
93
+    $eventHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
94 94
     $timeHandler = Extcal\Time::getHandler();
95 95
 
96 96
     // Retriving month and year value according to block options
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
             'category'          => $tCatSelected,
129 129
             'externalKeys' => 'cat_id',
130 130
         ];
131
-        $events   = $eventHandler->getEventsOnPeriode($criteres);
131
+        $events = $eventHandler->getEventsOnPeriode($criteres);
132 132
     } else {
133 133
         $events = [];
134 134
     }
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
                 'number'     => $dayCalObj->thisDay(),
194 194
                 'isSelected' => $dayCalObj->isSelected(),
195 195
             ];
196
-            $day                                = $dayCalObj->thisDay();
196
+            $day = $dayCalObj->thisDay();
197 197
             if (isset($eventsArray[$day]) && !$dayCalObj->isEmpty()) {
198 198
                 $tableRows[$rowId]['week'][$cellId]['haveEvents'] = true;
199 199
                 $tableRows[$rowId]['week'][$cellId]['color']      = $eventsArray[$day]['color'];
@@ -223,15 +223,15 @@  discard block
 block discarded – undo
223 223
     // Making navig data
224 224
     $navig = [
225 225
         'page' => $extcalConfig['start_page'],
226
-        'uri'  => 'year=' . $monthCalObj->thisYear() . '&amp;month=' . $monthCalObj->thisMonth(),
226
+        'uri'  => 'year='.$monthCalObj->thisYear().'&amp;month='.$monthCalObj->thisMonth(),
227 227
         'name' => $timeHandler->getFormatedDate($extcalConfig['nav_date_month'], $monthCalObj->getTimestamp()),
228 228
     ];
229 229
 
230 230
     $horloge             = [];
231 231
     $horloge['display']  = ('' != trim($options[11]));
232
-    $horloge['fullName'] = XOOPS_URL . _EXTCAL_PATH_HORLOGES . $options[11];
233
-    $horloge['width']    = $options[12] . 'px';
234
-    $horloge['height']   = $options[13] . 'px';
232
+    $horloge['fullName'] = XOOPS_URL._EXTCAL_PATH_HORLOGES.$options[11];
233
+    $horloge['width']    = $options[12].'px';
234
+    $horloge['height']   = $options[13].'px';
235 235
 
236 236
     $ret = [
237 237
         'imageParam'   => $imageParam,
@@ -273,12 +273,12 @@  discard block
 block discarded – undo
273 273
 
274 274
     //============================================================
275 275
 
276
-    $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
276
+    $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
277 277
     $cats            = $catHandler->getAllCat($xoopsUser, 'extcal_cat_view');
278 278
     $imageCatHandler = xoops_getHandler('imagecategory');
279 279
 
280 280
     //=====================================================================
281
-    $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_OPT_SLIDE_SHOW . '</div>', 'head');
281
+    $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_OPT_SLIDE_SHOW.'</div>', 'head');
282 282
 
283 283
     $k           = 0;
284 284
     $xfValue[$k] = new \XoopsFormRadio(_MB_EXTCAL_DISPLAY_IMG, "options[{$k}]", $options[$k]);
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
     $xfValue[$k] = new Extcal\Form\Spin\FormSpin(_MB_EXTCAL_SS_NB_PHOTOS, "options[{$k}]", $options[$k], 0, 50, 1, 0, 8, _MB_EXTCAL_PX, $imgFolder = '');
320 320
     $form->addElement($xfValue[$k], false);
321 321
     //=====================================================================
322
-    $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_OPT_SHOW . '</div>', 'head');
322
+    $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_OPT_SHOW.'</div>', 'head');
323 323
 
324 324
     $t = [
325 325
         -1 => _MB_EXTCAL_PREVIEW,
@@ -358,9 +358,9 @@  discard block
 block discarded – undo
358 358
     $form->addElement($xfValue[$k], false);
359 359
 
360 360
     //=====================================================================
361
-    $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_HORLOGE_OPT . '</div>', 'head');
361
+    $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_HORLOGE_OPT.'</div>', 'head');
362 362
     //---------------------------------------------------------------------
363
-    $t = \XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH . _EXTCAL_PATH_HORLOGES);
363
+    $t = \XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH._EXTCAL_PATH_HORLOGES);
364 364
     $t = array_merge([' ' => _NONE], $t);
365 365
 
366 366
     $k           = 11;
@@ -445,12 +445,12 @@  discard block
 block discarded – undo
445 445
         // $src   = $doc->createElement('src');
446 446
         $src   = clone $tempSrc;
447 447
         $src   = $photo->appendChild($src);
448
-        $value = $doc->createTextNode(XOOPS_URL . '/uploads/' . $images->getVar('image_name'));
448
+        $value = $doc->createTextNode(XOOPS_URL.'/uploads/'.$images->getVar('image_name'));
449 449
         $src->appendChild($value);
450 450
     }
451 451
 
452 452
     // get completed xml document
453
-    $xml_string = $doc->save(XOOPS_ROOT_PATH . '/cache/extcalSlideShowParam.xml');
453
+    $xml_string = $doc->save(XOOPS_ROOT_PATH.'/cache/extcalSlideShowParam.xml');
454 454
 }
455 455
 
456 456
 /**************************************************************************/
Please login to merge, or discard this patch.
class/EventHandler.php 3 patches
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
      * @param     $cat
578 578
      * @param int $nbDays
579 579
      *
580
-     * @return CriteriaCompo
580
+     * @return null|\CriteriaElement
581 581
      */
582 582
     public function _getEventWeekCriteria($day, $month, $year, $cat=0, $nbDays = 7)
583 583
     {
@@ -599,7 +599,7 @@  discard block
 block discarded – undo
599 599
      * @param $year
600 600
      * @param $cat
601 601
      *
602
-     * @return CriteriaCompo
602
+     * @return null|\CriteriaElement
603 603
      */
604 604
     public function _getEventMonthCriteria($month, $year, $cat=0)
605 605
     {
@@ -620,7 +620,7 @@  discard block
 block discarded – undo
620 620
      * @param     $year
621 621
      * @param int $cat
622 622
      *
623
-     * @return CriteriaCompo
623
+     * @return null|\CriteriaElement
624 624
      */
625 625
     public function _getEventYearCriteria($year, $cat = 0)
626 626
     {
@@ -890,7 +890,7 @@  discard block
 block discarded – undo
890 890
 
891 891
     /**
892 892
      * @param $criteria
893
-     * @param $cats
893
+     * @param integer $cats
894 894
      */
895 895
     public function _addCatSelectCriteria(&$criteria, $cats=null)
896 896
     {
@@ -1693,7 +1693,7 @@  discard block
 block discarded – undo
1693 1693
 
1694 1694
     /**
1695 1695
      * @param $month
1696
-     * @param $year
1696
+     * @param string $year
1697 1697
      * @param $dayCode
1698 1698
      *
1699 1699
      * @return int
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,6 @@
 block discarded – undo
17 17
  * @author       XOOPS Development Team,
18 18
  */
19 19
 
20
-use Punic\Exception;
21 20
 use XoopsModules\Extcal;
22 21
 
23 22
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
Please login to merge, or discard this patch.
Spacing   +112 added lines, -112 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
24 24
 
25 25
 
26
-require_once __DIR__ . '/../include/constantes.php';
26
+require_once __DIR__.'/../include/constantes.php';
27 27
 
28 28
 
29 29
 
@@ -154,9 +154,9 @@  discard block
 block discarded – undo
154 154
     {
155 155
         $user = $GLOBALS['xoopsUser'];
156 156
 
157
-        $criteriaCompo =  new \CriteriaCompo();
158
-        $criteriaCompo->add( new \Criteria('event_id', $eventId));
159
-        $criteriaCompo->add( new \Criteria('event_approved', 1));
157
+        $criteriaCompo = new \CriteriaCompo();
158
+        $criteriaCompo->add(new \Criteria('event_id', $eventId));
159
+        $criteriaCompo->add(new \Criteria('event_approved', 1));
160 160
         if (!$skipPerm) {
161 161
             $this->_addCatPermCriteria($criteriaCompo, $user);
162 162
         }
@@ -180,8 +180,8 @@  discard block
 block discarded – undo
180 180
     {
181 181
         $user = $GLOBALS['xoopsUser'];
182 182
 
183
-        $criteriaCompo =  new \CriteriaCompo();
184
-        $criteriaCompo->add( new \Criteria('event_id', $eventId));
183
+        $criteriaCompo = new \CriteriaCompo();
184
+        $criteriaCompo->add(new \Criteria('event_id', $eventId));
185 185
         if (!$skipPerm) {
186 186
             $this->_addCatPermCriteria($criteriaCompo, $user);
187 187
         }
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
 
339 339
         //        while (list($k, $v) = each($events)) {
340 340
         foreach ($events as $k => $v) {
341
-            $ordre[] = (int)$v['event_start'];
341
+            $ordre[] = (int) $v['event_start'];
342 342
             $this->formatEventDate($v, $extcalConfig['event_date_week']);
343 343
             //$v['cat']['cat_light_color'] = $v['cat']['cat_color'];
344 344
             $v['cat']['cat_light_color'] = Extcal\Utility::getLighterColor($v['cat']['cat_color'], _EXTCAL_INFOBULLE_RGB_MIN, _EXTCAL_INFOBULLE_RGB_MAX);
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
             case _EXTCAL_EVENTS_CALENDAR_WEEK:
383 383
                 $criteriaCompo = $this->_getEventWeekCriteria($day, $month, $year, $cat, $nbDays);
384 384
                 if (!$extcalConfig['diplay_past_event_cal']) {
385
-                    $criteriaCompo->add( new \Criteria('event_end', time(), '>'));
385
+                    $criteriaCompo->add(new \Criteria('event_end', time(), '>'));
386 386
                 }
387 387
                 break;
388 388
 
@@ -390,7 +390,7 @@  discard block
 block discarded – undo
390 390
             case _EXTCAL_EVENTS_AGENDA_WEEK:
391 391
                 $criteriaCompo = $this->_getEventWeekCriteria($day, $month, $year, $cat, $nbDays);
392 392
                 if (!$extcalConfig['diplay_past_event_list']) {
393
-                    $criteriaCompo->add( new \Criteria('event_end', time(), '>'));
393
+                    $criteriaCompo->add(new \Criteria('event_end', time(), '>'));
394 394
                 }
395 395
                 break;
396 396
 
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
398 398
                 $criteriaCompo = $this->_getEventMonthCriteria($month, $year, $cat);
399 399
 
400 400
                 if (!$extcalConfig['diplay_past_event_cal']) {
401
-                    $criteriaCompo->add( new \Criteria('event_end', time(), '>'));
401
+                    $criteriaCompo->add(new \Criteria('event_end', time(), '>'));
402 402
                 }
403 403
                 break;
404 404
 
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
                 $criteriaCompo = $this->_getEventMonthCriteria($month, $year, $cat);
407 407
 
408 408
                 if (!$extcalConfig['diplay_past_event_list']) {
409
-                    $criteriaCompo->add( new \Criteria('event_end', time(), '>'));
409
+                    $criteriaCompo->add(new \Criteria('event_end', time(), '>'));
410 410
                 }
411 411
                 break;
412 412
 
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
 
426 426
         }
427 427
         //--------------------------------------------------------------------------
428
-        $criteriaCompo->add( new \Criteria('event_isrecur', 0, '='));
428
+        $criteriaCompo->add(new \Criteria('event_isrecur', 0, '='));
429 429
         $criteriaCompo->setOrder($sens);
430 430
 
431 431
         $result = $this->getObjects($criteriaCompo);
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
462 462
         $user = $GLOBALS['xoopsUser'];
463 463
         //------------------------------------------------------
464 464
 
465
-        $criteriaCompo =  new \CriteriaCompo();
465
+        $criteriaCompo = new \CriteriaCompo();
466 466
 
467 467
         switch ($periode) {
468 468
             case _EXTCAL_EVENTS_WEEK:
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
                 $start = userTimeToServerTime(mktime(0, 0, 0, $month, 1, $year), $this->_extcalTime->_getUserTimeZone($user));
481 481
                 $end   = userTimeToServerTime(mktime(23, 59, 59, $month + 1, 1, $year) - _EXTCAL_TS_DAY, $this->_extcalTime->_getUserTimeZone($user));
482 482
 
483
-                $criteriaCompo->add( new \Criteria('event_start', $end, '<='));
483
+                $criteriaCompo->add(new \Criteria('event_start', $end, '<='));
484 484
                 //$criteriaCompo->add( new \Criteria('event_end', $start, '>='));
485 485
 
486 486
                 break;
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
500 500
         }
501 501
         $formatDate = $extcalConfig['event_date_week'];
502 502
         //--------------------------------------------------------------------------
503
-        $criteriaCompo->add( new \Criteria('event_isrecur', 1, '='));
503
+        $criteriaCompo->add(new \Criteria('event_isrecur', 1, '='));
504 504
         $criteriaCompo->setOrder($sens);
505 505
 
506 506
         $result = $this->getObjects($criteriaCompo);
@@ -543,7 +543,7 @@  discard block
 block discarded – undo
543 543
 
544 544
         reset($period);
545 545
         foreach ($period as $dt) {
546
-            echo $dt->format("l d-m-Y H:i:s\n") . '<br>';
546
+            echo $dt->format("l d-m-Y H:i:s\n").'<br>';
547 547
         }
548 548
     }
549 549
 
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
579 579
      *
580 580
      * @return CriteriaCompo
581 581
      */
582
-    public function _getEventWeekCriteria($day, $month, $year, $cat=0, $nbDays = 7)
582
+    public function _getEventWeekCriteria($day, $month, $year, $cat = 0, $nbDays = 7)
583 583
     {
584 584
         $user = $GLOBALS['xoopsUser'];
585 585
 
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
      *
602 602
      * @return CriteriaCompo
603 603
      */
604
-    public function _getEventMonthCriteria($month, $year, $cat=0)
604
+    public function _getEventMonthCriteria($month, $year, $cat = 0)
605 605
     {
606 606
         $user = $GLOBALS['xoopsUser'];
607 607
 
@@ -653,26 +653,26 @@  discard block
 block discarded – undo
653 653
      * @return \CriteriaCompo
654 654
      */
655 655
 
656
-    public function _getCriteriaCompo($start, $end, $cat=0, &$user)
656
+    public function _getCriteriaCompo($start, $end, $cat = 0, &$user)
657 657
     {
658
-        $criteriaNoRecur =  new \CriteriaCompo();
659
-        $criteriaNoRecur->add( new \Criteria('event_start', $end, '<='));
660
-        $criteriaNoRecur->add( new \Criteria('event_end', $start, '>='));
661
-        $criteriaNoRecur->add( new \Criteria('event_isrecur', 0));
658
+        $criteriaNoRecur = new \CriteriaCompo();
659
+        $criteriaNoRecur->add(new \Criteria('event_start', $end, '<='));
660
+        $criteriaNoRecur->add(new \Criteria('event_end', $start, '>='));
661
+        $criteriaNoRecur->add(new \Criteria('event_isrecur', 0));
662 662
 
663
-        $criteriaRecur =  new \CriteriaCompo();
664
-        $criteriaRecur->add( new \Criteria('event_recur_start', $end, '<='));
665
-        $criteriaRecur->add( new \Criteria('event_recur_end', $start, '>='));
666
-        $criteriaRecur->add( new \Criteria('event_isrecur', 1));
663
+        $criteriaRecur = new \CriteriaCompo();
664
+        $criteriaRecur->add(new \Criteria('event_recur_start', $end, '<='));
665
+        $criteriaRecur->add(new \Criteria('event_recur_end', $start, '>='));
666
+        $criteriaRecur->add(new \Criteria('event_isrecur', 1));
667 667
 
668
-        $criteriaCompoDate =  new \CriteriaCompo();
668
+        $criteriaCompoDate = new \CriteriaCompo();
669 669
         $criteriaCompoDate->add($criteriaNoRecur, 'OR');
670 670
         $criteriaCompoDate->add($criteriaRecur, 'OR');
671 671
 
672
-        $criteriaCompo =  new \CriteriaCompo();
672
+        $criteriaCompo = new \CriteriaCompo();
673 673
         $criteriaCompo->add($criteriaCompoDate);
674 674
 
675
-        $criteriaCompo->add( new \Criteria('event_approved', 1));
675
+        $criteriaCompo->add(new \Criteria('event_approved', 1));
676 676
         $this->_addCatSelectCriteria($criteriaCompo, $cat);
677 677
         $this->_addCatPermCriteria($criteriaCompo, $user);
678 678
         $criteriaCompo->setSort('event_start');
@@ -688,13 +688,13 @@  discard block
 block discarded – undo
688 688
      *
689 689
      * @return CriteriaCompo
690 690
      */
691
-    public function _getCalendarCriteriaCompo($start, $end, $cat=0, &$user)
691
+    public function _getCalendarCriteriaCompo($start, $end, $cat = 0, &$user)
692 692
     {
693 693
         global $extcalConfig;
694 694
         $criteriaCompo = $this->_getCriteriaCompo($start, $end, $cat, $user);
695 695
         //if (!$this->_extcalConfig['diplay_past_event_cal']) {
696 696
         if (!$extcalConfig['diplay_past_event_cal']) {
697
-            $criteriaCompo->add( new \Criteria('event_end', time(), '>'));
697
+            $criteriaCompo->add(new \Criteria('event_end', time(), '>'));
698 698
         }
699 699
 
700 700
         return $criteriaCompo;
@@ -708,13 +708,13 @@  discard block
 block discarded – undo
708 708
      *
709 709
      * @return CriteriaCompo
710 710
      */
711
-    public function _getListCriteriaCompo($start, $end, $cat=0, &$user)
711
+    public function _getListCriteriaCompo($start, $end, $cat = 0, &$user)
712 712
     {
713 713
         global $extcalConfig;
714 714
         $criteriaCompo = $this->_getCriteriaCompo($start, $end, $cat, $user);
715 715
         // if (!$this->_extcalConfig['diplay_past_event_list']) {
716 716
         if (!$extcalConfig['diplay_past_event_list']) {
717
-            $criteriaCompo->add( new \Criteria('event_end', time(), '>'));
717
+            $criteriaCompo->add(new \Criteria('event_end', time(), '>'));
718 718
         }
719 719
 
720 720
         return $criteriaCompo;
@@ -732,22 +732,22 @@  discard block
 block discarded – undo
732 732
     {
733 733
         $now = time();
734 734
 
735
-        $criteriaNoRecur =  new \CriteriaCompo();
736
-        $criteriaNoRecur->add( new \Criteria('event_start', $now, '>='));
737
-        $criteriaNoRecur->add( new \Criteria('event_isrecur', 0));
735
+        $criteriaNoRecur = new \CriteriaCompo();
736
+        $criteriaNoRecur->add(new \Criteria('event_start', $now, '>='));
737
+        $criteriaNoRecur->add(new \Criteria('event_isrecur', 0));
738 738
 
739
-        $criteriaRecur =  new \CriteriaCompo();
740
-        $criteriaRecur->add( new \Criteria('event_recur_start', $now, '>='));
741
-        $criteriaRecur->add( new \Criteria('event_isrecur', 1));
739
+        $criteriaRecur = new \CriteriaCompo();
740
+        $criteriaRecur->add(new \Criteria('event_recur_start', $now, '>='));
741
+        $criteriaRecur->add(new \Criteria('event_isrecur', 1));
742 742
 
743
-        $criteriaCompoDate =  new \CriteriaCompo();
743
+        $criteriaCompoDate = new \CriteriaCompo();
744 744
         $criteriaCompoDate->add($criteriaNoRecur, 'OR');
745 745
         $criteriaCompoDate->add($criteriaRecur, 'OR');
746 746
 
747
-        $criteriaCompo =  new \CriteriaCompo();
747
+        $criteriaCompo = new \CriteriaCompo();
748 748
         $criteriaCompo->add($criteriaCompoDate);
749 749
 
750
-        $criteriaCompo->add( new \Criteria('event_approved', 1));
750
+        $criteriaCompo->add(new \Criteria('event_approved', 1));
751 751
         $this->_addCatSelectCriteria($criteriaCompo, $cat);
752 752
         $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
753 753
 
@@ -783,12 +783,12 @@  discard block
 block discarded – undo
783 783
         $dayStart = mktime(0, 0, 0, $month, $day, $year);
784 784
         $dayEnd   = mktime(0, 0, 0, $month, $day + 1, $year);
785 785
 
786
-        $criteriaCompo =  new \CriteriaCompo();
786
+        $criteriaCompo = new \CriteriaCompo();
787 787
         $this->_addCatSelectCriteria($criteriaCompo, $cat);
788 788
         $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
789
-        $criteriaCompo->add( new \Criteria('event_end', $dayStart, '>='));
790
-        $criteriaCompo->add( new \Criteria('event_start', $dayEnd, '<'));
791
-        $criteriaCompo->add( new \Criteria('event_approved', 1));
789
+        $criteriaCompo->add(new \Criteria('event_end', $dayStart, '>='));
790
+        $criteriaCompo->add(new \Criteria('event_start', $dayEnd, '<'));
791
+        $criteriaCompo->add(new \Criteria('event_approved', 1));
792 792
         $criteriaCompo->setSort('event_start');
793 793
         $criteriaCompo->setLimit($nbEvent);
794 794
 
@@ -807,12 +807,12 @@  discard block
 block discarded – undo
807 807
      */
808 808
     public function getNewEvent($start, $limit, $cat = 0, $skipPerm = false)
809 809
     {
810
-        $criteriaCompo =  new \CriteriaCompo();
810
+        $criteriaCompo = new \CriteriaCompo();
811 811
         $this->_addCatSelectCriteria($criteriaCompo, $cat);
812 812
         if (!$skipPerm) {
813 813
             $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
814 814
         }
815
-        $criteriaCompo->add( new \Criteria('event_approved', 1));
815
+        $criteriaCompo->add(new \Criteria('event_approved', 1));
816 816
         $criteriaCompo->setSort('event_id');
817 817
         $criteriaCompo->setOrder('DESC');
818 818
         $criteriaCompo->setStart($start);
@@ -826,9 +826,9 @@  discard block
 block discarded – undo
826 826
      */
827 827
     public function getCountNewEvent()
828 828
     {
829
-        $criteriaCompo =  new \CriteriaCompo();
829
+        $criteriaCompo = new \CriteriaCompo();
830 830
         $this->_addCatSelectCriteria($criteriaCompo, 0);
831
-        $criteriaCompo->add( new \Criteria('event_approved', 1));
831
+        $criteriaCompo->add(new \Criteria('event_approved', 1));
832 832
         $criteriaCompo->setSort('event_id');
833 833
 
834 834
         return $this->getCount($criteriaCompo);
@@ -844,11 +844,11 @@  discard block
 block discarded – undo
844 844
      */
845 845
     public function getRandomEvent($nbEvent, $cat = 0)
846 846
     {
847
-        $criteriaCompo =  new \CriteriaCompo();
847
+        $criteriaCompo = new \CriteriaCompo();
848 848
         $this->_addCatSelectCriteria($criteriaCompo, $cat);
849 849
         $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
850
-        $criteriaCompo->add( new \Criteria('event_start', time(), '>='));
851
-        $criteriaCompo->add( new \Criteria('event_approved', 1));
850
+        $criteriaCompo->add(new \Criteria('event_start', time(), '>='));
851
+        $criteriaCompo->add(new \Criteria('event_approved', 1));
852 852
         $criteriaCompo->setSort('RAND()');
853 853
         $criteriaCompo->setLimit($nbEvent);
854 854
 
@@ -860,8 +860,8 @@  discard block
 block discarded – undo
860 860
      */
861 861
     public function getPendingEvent()
862 862
     {
863
-        $criteriaCompo =  new \CriteriaCompo();
864
-        $criteriaCompo->add( new \Criteria('event_approved', 0));
863
+        $criteriaCompo = new \CriteriaCompo();
864
+        $criteriaCompo->add(new \Criteria('event_approved', 0));
865 865
         $criteriaCompo->setSort('event_start');
866 866
 
867 867
         return $this->getObjects($criteriaCompo);
@@ -876,15 +876,15 @@  discard block
 block discarded – undo
876 876
         $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
877 877
         $count                = count($authorizedAccessCats);
878 878
         if ($count > 0) {
879
-            $in = '(' . $authorizedAccessCats[0];
879
+            $in = '('.$authorizedAccessCats[0];
880 880
             array_shift($authorizedAccessCats);
881 881
             foreach ($authorizedAccessCats as $authorizedAccessCat) {
882
-                $in .= ',' . $authorizedAccessCat;
882
+                $in .= ','.$authorizedAccessCat;
883 883
             }
884 884
             $in .= ')';
885
-            $criteria->add( new \Criteria('cat_id', $in, 'IN'));
885
+            $criteria->add(new \Criteria('cat_id', $in, 'IN'));
886 886
         } else {
887
-            $criteria->add( new \Criteria('cat_id', '(0)', 'IN'));
887
+            $criteria->add(new \Criteria('cat_id', '(0)', 'IN'));
888 888
         }
889 889
     }
890 890
 
@@ -892,20 +892,20 @@  discard block
 block discarded – undo
892 892
      * @param $criteria
893 893
      * @param $cats
894 894
      */
895
-    public function _addCatSelectCriteria(&$criteria, $cats=null)
895
+    public function _addCatSelectCriteria(&$criteria, $cats = null)
896 896
     {
897 897
         if (!is_array($cats) && $cats > 0) {
898
-            $criteria->add( new \Criteria('cat_id', $cats));
898
+            $criteria->add(new \Criteria('cat_id', $cats));
899 899
         }
900 900
         if (is_array($cats)) {
901 901
             if (false === array_search(0, $cats)) {
902
-                $in = '(' . current($cats);
902
+                $in = '('.current($cats);
903 903
                 array_shift($cats);
904 904
                 foreach ($cats as $cat) {
905
-                    $in .= ',' . $cat;
905
+                    $in .= ','.$cat;
906 906
                 }
907 907
                 $in .= ')';
908
-                $criteria->add( new \Criteria('cat_id', $in, 'IN'));
908
+                $criteria->add(new \Criteria('cat_id', $in, 'IN'));
909 909
             }
910 910
         }
911 911
     }
@@ -921,7 +921,7 @@  discard block
 block discarded – undo
921 921
     public function getEventForm($siteSide = 'user', $mode = 'new', $data = null)
922 922
     {
923 923
         global $xoopsModuleConfig;
924
-        $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
924
+        $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
925 925
         $fileHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_FILE);
926 926
 
927 927
         /***************************************************/
@@ -943,7 +943,7 @@  discard block
 block discarded – undo
943 943
             if ('clone' === $mode) {
944 944
                 $data['event_id'] = 0;
945 945
                 $event->setVar('event_id', 0);
946
-                $newTitle = $event->getVar('event_title') . ' (' . _MD_EXTCAL_CLONE_OF . $data['event_id'] . ')';
946
+                $newTitle = $event->getVar('event_title').' ('._MD_EXTCAL_CLONE_OF.$data['event_id'].')';
947 947
                 $event->setVar('event_title', $newTitle);
948 948
             }
949 949
 
@@ -1117,7 +1117,7 @@  discard block
 block discarded – undo
1117 1117
 
1118 1118
         //-----------------------------------------------
1119 1119
         // Title
1120
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_TITLE, 'event_title', 80, 255, $title), true);
1120
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_TITLE, 'event_title', 80, 255, $title), true);
1121 1121
         //-----------------------------------------------
1122 1122
         // Category select
1123 1123
         $catSelect = new \XoopsFormSelect(_MD_EXTCAL_CATEGORY, 'cat_id', $cat);
@@ -1127,7 +1127,7 @@  discard block
 block discarded – undo
1127 1127
         $form->addElement($catSelect, true);
1128 1128
         //-----------------------------------------------------------
1129 1129
 
1130
-        $file_path = __DIR__ . '/../assets/css/images';
1130
+        $file_path = __DIR__.'/../assets/css/images';
1131 1131
         $tf        = \XoopsLists::getImgListAsArray($file_path);
1132 1132
         array_unshift($tf, _MD_EXTCAL_NONE);
1133 1133
         $xfIcones = new \XoopsFormSelect(_MD_EXTCAL_ICONE, 'event_icone', $event_icone, '');
@@ -1137,7 +1137,7 @@  discard block
 block discarded – undo
1137 1137
         //etablissement
1138 1138
         $etablissementHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_ETABLISSEMENT);
1139 1139
         $etablissement_select = new \XoopsFormSelect(_MD_EXTCAL_ETABLISSEMENT, 'event_etablissement', $event_etablissement);
1140
-        $criteria             =  new \CriteriaCompo();
1140
+        $criteria             = new \CriteriaCompo();
1141 1141
         $criteria->setSort('nom');
1142 1142
         $criteria->setOrder('ASC');
1143 1143
 
@@ -1191,19 +1191,19 @@  discard block
 block discarded – undo
1191 1191
         //Price and monnaie
1192 1192
         $monnaie_price = new \XoopsFormElementTray(_MD_EXTCAL_PRICE, '');
1193 1193
         //price
1194
-        $monnaie_price->addElement( new \XoopsFormText('', 'event_price', 20, 255, $event_price));
1194
+        $monnaie_price->addElement(new \XoopsFormText('', 'event_price', 20, 255, $event_price));
1195 1195
         //monnaie
1196 1196
         $monnaie = new \XoopsFormLabel(_MD_EXTCAL_DEVISE2, '');
1197 1197
         $monnaie_price->addElement($monnaie);
1198 1198
         $form->addElement($monnaie_price);
1199 1199
         //----------------------------------------------------------------
1200
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_ORGANISATEUR, 'event_organisateur', 80, 255, $organisateur), false);
1200
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ORGANISATEUR, 'event_organisateur', 80, 255, $organisateur), false);
1201 1201
         // Contact
1202
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_CONTACT, 'event_contact', 80, 255, $contact), false);
1202
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_CONTACT, 'event_contact', 80, 255, $contact), false);
1203 1203
         // Url
1204
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_URL, 'event_url', 80, 255, $url), false);
1204
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_URL, 'event_url', 80, 255, $url), false);
1205 1205
         // Email
1206
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_EMAIL, 'event_email', 80, 255, $email), false);
1206
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_EMAIL, 'event_email', 80, 255, $email), false);
1207 1207
 
1208 1208
         // Address
1209 1209
         if (class_exists('XoopsFormEditor')) {
@@ -1232,23 +1232,23 @@  discard block
 block discarded – undo
1232 1232
         if (count($files) > 0) {
1233 1233
             $eventFiles = new Extcal\Form\FormFileCheckBox('', 'filetokeep');
1234 1234
             foreach ($files as $file) {
1235
-                $name = $file['file_nicename'] . ' (<i>' . $file['file_mimetype'] . '</i>) ' . $file['formated_file_size'];
1235
+                $name = $file['file_nicename'].' (<i>'.$file['file_mimetype'].'</i>) '.$file['formated_file_size'];
1236 1236
                 $eventFiles->addOption($file['file_id'], $name);
1237 1237
             }
1238 1238
             $fileElmtTray->addElement($eventFiles);
1239 1239
         }
1240
-        $fileElmtTray->addElement( new \XoopsFormFile(_MD_EXTCAL_FILE_ATTACHEMENT, 'event_file', 3145728));
1240
+        $fileElmtTray->addElement(new \XoopsFormFile(_MD_EXTCAL_FILE_ATTACHEMENT, 'event_file', 3145728));
1241 1241
         $form->addElement($fileElmtTray);
1242 1242
 
1243 1243
         if (isset($data['event_id'])) {
1244
-            $form->addElement( new \XoopsFormHidden('event_id', $data['event_id']), false);
1244
+            $form->addElement(new \XoopsFormHidden('event_id', $data['event_id']), false);
1245 1245
         }
1246 1246
         //Hack Kraven0
1247 1247
         ///////////////////////////////////////////////////////////////////////////////
1248 1248
         //Picture1
1249 1249
         $file_tray = new \XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 1), '');
1250 1250
         if (!empty($event_picture1)) {
1251
-            $file_tray->addElement( new \XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/' . $event_picture1 . "' name='image' id='image' alt=''><br><br>"));
1251
+            $file_tray->addElement(new \XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/'.$event_picture1."' name='image' id='image' alt=''><br><br>"));
1252 1252
             $check_del_img = new \XoopsFormCheckBox('', 'delimg_1');
1253 1253
             $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG);
1254 1254
             $file_tray->addElement($check_del_img);
@@ -1259,16 +1259,16 @@  discard block
 block discarded – undo
1259 1259
         }
1260 1260
         $file_img->setExtra("size ='40'");
1261 1261
         $file_tray->addElement($file_img);
1262
-        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(400728 / 1000), 500, 500);
1263
-        $file_label = new \XoopsFormLabel('', '<br>' . $msg);
1262
+        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (400728 / 1000), 500, 500);
1263
+        $file_label = new \XoopsFormLabel('', '<br>'.$msg);
1264 1264
         $file_tray->addElement($file_label);
1265 1265
         $form->addElement($file_tray);
1266
-        $form->addElement( new \XoopsFormHidden('file1', $event_picture1));
1266
+        $form->addElement(new \XoopsFormHidden('file1', $event_picture1));
1267 1267
         unset($file_img, $file_tray);
1268 1268
         //Picture2
1269 1269
         $file_tray = new \XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 2), '');
1270 1270
         if (!empty($event_picture2)) {
1271
-            $file_tray->addElement( new \XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/' . $event_picture2 . "' name='image' id='image' alt=''><br><br>"));
1271
+            $file_tray->addElement(new \XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/'.$event_picture2."' name='image' id='image' alt=''><br><br>"));
1272 1272
             $check_del_img = new \XoopsFormCheckBox('', 'delimg_2');
1273 1273
             $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG);
1274 1274
             $file_tray->addElement($check_del_img);
@@ -1279,18 +1279,18 @@  discard block
 block discarded – undo
1279 1279
         }
1280 1280
         $file_img->setExtra("size ='40'");
1281 1281
         $file_tray->addElement($file_img);
1282
-        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(400728 / 1000), 500, 500);
1283
-        $file_label = new \XoopsFormLabel('', '<br>' . $msg);
1282
+        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (400728 / 1000), 500, 500);
1283
+        $file_label = new \XoopsFormLabel('', '<br>'.$msg);
1284 1284
         $file_tray->addElement($file_label);
1285 1285
         $form->addElement($file_tray);
1286
-        $form->addElement( new \XoopsFormHidden('file2', $event_picture2));
1286
+        $form->addElement(new \XoopsFormHidden('file2', $event_picture2));
1287 1287
         unset($file_img, $file_tray);
1288 1288
         ///////////////////////////////////////////////////////////////////////////////
1289 1289
 
1290 1290
         $buttonElmtTray = new \XoopsFormElementTray('', '&nbsp;');
1291
-        $buttonElmtTray->addElement( new \XoopsFormButton('', 'form_submit', _SUBMIT, 'submit'), false);
1291
+        $buttonElmtTray->addElement(new \XoopsFormButton('', 'form_submit', _SUBMIT, 'submit'), false);
1292 1292
         if ('user' === $siteSide) {
1293
-            $buttonElmtTray->addElement( new \XoopsFormButton('', 'form_preview', _MD_EXTCAL_PREVIEW, 'submit'), false);
1293
+            $buttonElmtTray->addElement(new \XoopsFormButton('', 'form_preview', _MD_EXTCAL_PREVIEW, 'submit'), false);
1294 1294
         }
1295 1295
         $form->addElement($buttonElmtTray);
1296 1296
 
@@ -1347,7 +1347,7 @@  discard block
 block discarded – undo
1347 1347
                 $recurRules = 'weekly|';
1348 1348
                 $recurRules .= $parm['rrule_weekly_interval'];
1349 1349
                 foreach ($parm['rrule_weekly_bydays'] as $day) {
1350
-                    $recurRules .= '|' . $day;
1350
+                    $recurRules .= '|'.$day;
1351 1351
                 }
1352 1352
 
1353 1353
                 break;
@@ -1357,11 +1357,11 @@  discard block
 block discarded – undo
1357 1357
                     $parm['rrule_monthly_interval'] = 0;
1358 1358
                 }
1359 1359
                 $recurRules = 'monthly|';
1360
-                $recurRules .= $parm['rrule_monthly_interval'] . '|';
1360
+                $recurRules .= $parm['rrule_monthly_interval'].'|';
1361 1361
                 if ('' != $parm['rrule_monthly_byday']) {
1362 1362
                     $recurRules .= $parm['rrule_monthly_byday'];
1363 1363
                 } else {
1364
-                    $recurRules .= 'MD' . $parm['rrule_bymonthday'];
1364
+                    $recurRules .= 'MD'.$parm['rrule_bymonthday'];
1365 1365
                 }
1366 1366
 
1367 1367
                 break;
@@ -1395,9 +1395,9 @@  discard block
 block discarded – undo
1395 1395
 
1396 1396
                 $recurRules = 'yearly|';
1397 1397
                 $recurRules .= $parm['rrule_yearly_interval'];
1398
-                $recurRules .= '|' . $parm['rrule_yearly_byday'];
1398
+                $recurRules .= '|'.$parm['rrule_yearly_byday'];
1399 1399
                 foreach ($parm['rrule_yearly_bymonths'] as $month) {
1400
-                    $recurRules .= '|' . $month;
1400
+                    $recurRules .= '|'.$month;
1401 1401
                 }
1402 1402
 
1403 1403
                 break;
@@ -2327,10 +2327,10 @@  discard block
 block discarded – undo
2327 2327
         global $xoopsDB;
2328 2328
 
2329 2329
         //echo "<hr>{$andor}-{$limit}-{$offset}-{$userId}-{$user}<br>{$criteresPlus}";
2330
-        $tEvent = $xoopsDB->prefix('extcal_event') . ' AS te';
2331
-        $tCat   = $xoopsDB->prefix('extcal_cat') . ' AS tc';
2330
+        $tEvent = $xoopsDB->prefix('extcal_event').' AS te';
2331
+        $tCat   = $xoopsDB->prefix('extcal_cat').' AS tc';
2332 2332
 
2333
-        $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}";
2333
+        $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}";
2334 2334
         //---------------------------------------------------
2335 2335
         $tw   = [];
2336 2336
         $tw[] = 'te.cat_id = tc.cat_id';
@@ -2339,7 +2339,7 @@  discard block
 block discarded – undo
2339 2339
         $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
2340 2340
         $inCat                = 'te.cat_id IN (0)';
2341 2341
         if (count($authorizedAccessCats) > 0) {
2342
-            $inCat = 'te.cat_id IN (' . implode(',', $authorizedAccessCats) . ')';
2342
+            $inCat = 'te.cat_id IN ('.implode(',', $authorizedAccessCats).')';
2343 2343
         }
2344 2344
         //echo $tw[count($tw)-1];
2345 2345
 
@@ -2375,12 +2375,12 @@  discard block
 block discarded – undo
2375 2375
                 'te.event_address',
2376 2376
                 'tc.cat_name',
2377 2377
             ];
2378
-            $t       = [];
2378
+            $t = [];
2379 2379
             for ($i = 0, $count = count($queryarray); $i < $count; ++$i) {
2380 2380
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
2381 2381
             }
2382 2382
 
2383
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
2383
+            $flt = '('.implode(" {$andor} ", $t1).')';
2384 2384
 
2385 2385
             $t = [];
2386 2386
             for ($h = 0, $count = count($tFields); $h < $count; ++$h) {
@@ -2389,10 +2389,10 @@  discard block
 block discarded – undo
2389 2389
 
2390 2390
             $filtre = implode(' OR ', $t);
2391 2391
             $filtre = str_replace('#', '%', $filtre);
2392
-            $tw[]   = '(' . $filtre . ')';
2392
+            $tw[]   = '('.$filtre.')';
2393 2393
         }
2394 2394
 
2395
-        $sql .= ' WHERE ' . implode(' AND ', $tw);
2395
+        $sql .= ' WHERE '.implode(' AND ', $tw);
2396 2396
         //------------------------------------------------------------
2397 2397
         if (count($orderBy) > 0) {
2398 2398
             $t = [];
@@ -2402,7 +2402,7 @@  discard block
 block discarded – undo
2402 2402
                 }
2403 2403
             }
2404 2404
             if (count($t) > 0) {
2405
-                $sql .= ' ORDER BY ' . implode(',', $t);
2405
+                $sql .= ' ORDER BY '.implode(',', $t);
2406 2406
             }
2407 2407
         }
2408 2408
 
@@ -2435,7 +2435,7 @@  discard block
 block discarded – undo
2435 2435
         $i = 0;
2436 2436
         while ($myrow = $xoopsDB->fetchArray($result)) {
2437 2437
             $ret[$i]['image'] = 'assets/images/icons/extcal.gif';
2438
-            $ret[$i]['link']  = 'event.php?event=' . $myrow['event_id'];
2438
+            $ret[$i]['link']  = 'event.php?event='.$myrow['event_id'];
2439 2439
             $ret[$i]['title'] = $myrow['event_title'];
2440 2440
             $ret[$i]['time']  = $myrow['event_submitdate'];
2441 2441
             $ret[$i]['uid']   = $myrow['event_submitter'];
@@ -2475,23 +2475,23 @@  discard block
 block discarded – undo
2475 2475
         //        }
2476 2476
         $tEvent = $xoopsDB->prefix('extcal_event');
2477 2477
         $tCat   = $xoopsDB->prefix('extcal_cat');
2478
-        $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'";
2478
+        $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'";
2479 2479
 
2480 2480
         $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
2481 2481
         $count                = count($authorizedAccessCats);
2482 2482
         if ($count > 0) {
2483
-            $in = '(' . $authorizedAccessCats[0];
2483
+            $in = '('.$authorizedAccessCats[0];
2484 2484
             array_shift($authorizedAccessCats);
2485 2485
             foreach ($authorizedAccessCats as $authorizedAccessCat) {
2486
-                $in .= ',' . $authorizedAccessCat;
2486
+                $in .= ','.$authorizedAccessCat;
2487 2487
             }
2488 2488
             $in .= ')';
2489 2489
         } else {
2490 2490
             $in = '(0)';
2491 2491
         }
2492
-        $sql .= " AND {$tEvent}.cat_id IN " . $in . '';
2492
+        $sql .= " AND {$tEvent}.cat_id IN ".$in.'';
2493 2493
         if (0 != $userId) {
2494
-            $sql .= " AND event_submitter = '" . $userId . "'";
2494
+            $sql .= " AND event_submitter = '".$userId."'";
2495 2495
         }
2496 2496
 
2497 2497
         //echoArray($queryarray,false);
@@ -2511,7 +2511,7 @@  discard block
 block discarded – undo
2511 2511
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
2512 2512
             }
2513 2513
 
2514
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
2514
+            $flt = '('.implode(" {$andor} ", $t1).')';
2515 2515
 
2516 2516
             $t = [];
2517 2517
             for ($h = 0, $count = count($tFields); $h < $count; ++$h) {
@@ -2520,11 +2520,11 @@  discard block
 block discarded – undo
2520 2520
 
2521 2521
             $filtre = implode(' OR ', $t);
2522 2522
             $filtre = str_replace('#', '%', $filtre);
2523
-            $sql    .= " AND ($filtre)";
2523
+            $sql .= " AND ($filtre)";
2524 2524
         }
2525 2525
 
2526 2526
         if ('' != $criteresPlus) {
2527
-            $sql .= ' AND ' . $criteresPlus;
2527
+            $sql .= ' AND '.$criteresPlus;
2528 2528
         }
2529 2529
         $sql .= ' ORDER BY event_id DESC';
2530 2530
 
@@ -2534,7 +2534,7 @@  discard block
 block discarded – undo
2534 2534
         if ($xoopsSearch) {
2535 2535
             while ($myrow = $xoopsDB->fetchArray($result)) {
2536 2536
                 $ret[$i]['image'] = 'assets/images/icons/extcal.gif';
2537
-                $ret[$i]['link']  = 'event.php?event=' . $myrow['event_id'];
2537
+                $ret[$i]['link']  = 'event.php?event='.$myrow['event_id'];
2538 2538
                 $ret[$i]['title'] = $myrow['event_title'];
2539 2539
                 $ret[$i]['time']  = $myrow['event_submitdate'];
2540 2540
                 $ret[$i]['uid']   = $myrow['event_submitter'];
Please login to merge, or discard this patch.
class/ExtcalPersistableObjectHandler.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
 
513 513
     /**
514 514
      * @param        $objects
515
-     * @param array  $externalKeys
515
+     * @param string[]  $externalKeys
516 516
      * @param string $format
517 517
      *
518 518
      * @return array
@@ -619,7 +619,7 @@  discard block
 block discarded – undo
619 619
     }
620 620
 
621 621
     /**
622
-     * @param null|CriteriaElement $criteria
622
+     * @param null|\CriteriaElement $criteria
623 623
      * @param string               $sum
624 624
      *
625 625
      * @return array|string
@@ -660,7 +660,7 @@  discard block
 block discarded – undo
660 660
     }
661 661
 
662 662
     /**
663
-     * @param null|CriteriaElement $criteria
663
+     * @param null|\CriteriaElement $criteria
664 664
      * @param string               $max
665 665
      *
666 666
      * @return array|string
Please login to merge, or discard this patch.
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -100,12 +100,12 @@  discard block
 block discarded – undo
100 100
     public function get($id = null, $fields = null, $as_object = true) //get($id, $as_object = true)
101 101
     {
102 102
         if (is_array($this->keyName)) {
103
-            $criteria =  new \CriteriaCompo();
103
+            $criteria = new \CriteriaCompo();
104 104
             for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
105
-                $criteria->add( new \Criteria($this->keyName[$i], (int)$id[$i]));
105
+                $criteria->add(new \Criteria($this->keyName[$i], (int) $id[$i]));
106 106
             }
107 107
         } else {
108
-            $criteria =  new \Criteria($this->keyName, (int)$id);
108
+            $criteria = new \Criteria($this->keyName, (int) $id);
109 109
         }
110 110
         $criteria->setLimit(1);
111 111
         $objectArray = $this->getObjects($criteria, false, true);
@@ -129,11 +129,11 @@  discard block
 block discarded – undo
129 129
     {
130 130
         $ret   = [];
131 131
         $limit = $start = 0;
132
-        $sql   = 'SELECT * FROM ' . $this->table;
132
+        $sql   = 'SELECT * FROM '.$this->table;
133 133
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
134
-            $sql .= ' ' . $criteria->renderWhere();
134
+            $sql .= ' '.$criteria->renderWhere();
135 135
             if ('' != $criteria->getSort()) {
136
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
136
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
137 137
             }
138 138
             $limit = $criteria->getLimit();
139 139
             $start = $criteria->getStart();
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
                     $ret[] = $obj;
169 169
                 } else {
170 170
                     $row  = [];
171
-                    $vars =& $obj->getVars();
171
+                    $vars = & $obj->getVars();
172 172
                     foreach (array_keys($vars) as $i) {
173 173
                         $row[$i] = $obj->getVar($i);
174 174
                     }
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
                     $ret[$myrow[$this->keyName]] = $obj;
180 180
                 } else {
181 181
                     $row  = [];
182
-                    $vars =& $obj->getVars();
182
+                    $vars = & $obj->getVars();
183 183
                     foreach (array_keys($vars) as $i) {
184 184
                         $row[$i] = $obj->getVar($i);
185 185
                     }
@@ -205,22 +205,22 @@  discard block
 block discarded – undo
205 205
     {
206 206
         $ret = [];
207 207
         if (null === $criteria) {
208
-            $criteria =  new \CriteriaCompo();
208
+            $criteria = new \CriteriaCompo();
209 209
         }
210 210
 
211 211
         if ('' == $criteria->getSort()) {
212 212
             $criteria->setSort($this->identifierName);
213 213
         }
214 214
 
215
-        $sql = 'SELECT ' . $this->keyName;
215
+        $sql = 'SELECT '.$this->keyName;
216 216
         if (!empty($this->identifierName)) {
217
-            $sql .= ', ' . $this->identifierName;
217
+            $sql .= ', '.$this->identifierName;
218 218
         }
219
-        $sql .= ' FROM ' . $this->table;
219
+        $sql .= ' FROM '.$this->table;
220 220
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
221
-            $sql .= ' ' . $criteria->renderWhere();
221
+            $sql .= ' '.$criteria->renderWhere();
222 222
             if ('' != $criteria->getSort()) {
223
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
223
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
224 224
             }
225 225
             $limit = $criteria->getLimit();
226 226
             $start = $criteria->getStart();
@@ -253,12 +253,12 @@  discard block
 block discarded – undo
253 253
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
254 254
             if ('' != $criteria->groupby) {
255 255
                 $groupby = true;
256
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
256
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
257 257
             }
258 258
         }
259
-        $sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table;
259
+        $sql = 'SELECT '.$field.'COUNT(*) FROM '.$this->table;
260 260
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
261
-            $sql .= ' ' . $criteria->renderWhere();
261
+            $sql .= ' '.$criteria->renderWhere();
262 262
             if ('' != $criteria->groupby) {
263 263
                 $sql .= $criteria->getGroupby();
264 264
             }
@@ -294,13 +294,13 @@  discard block
 block discarded – undo
294 294
         if (is_array($this->keyName)) {
295 295
             $clause = [];
296 296
             for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
297
-                $clause[] = $this->keyName[$i] . ' = ' . $id[$i];
297
+                $clause[] = $this->keyName[$i].' = '.$id[$i];
298 298
             }
299 299
             $whereclause = implode(' AND ', $clause);
300 300
         } else {
301
-            $whereclause = $this->keyName . ' = ' . $id;
301
+            $whereclause = $this->keyName.' = '.$id;
302 302
         }
303
-        $sql = 'DELETE FROM ' . $this->table . ' WHERE ' . $whereclause;
303
+        $sql = 'DELETE FROM '.$this->table.' WHERE '.$whereclause;
304 304
         if (false !== $force) {
305 305
             $result = $this->db->queryF($sql);
306 306
         } else {
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
             }
332 332
 
333 333
             if (!($obj instanceof $this->className && class_exists($this->className))) {
334
-                $obj->setErrors(get_class($obj) . ' Differs from ' . $this->className);
334
+                $obj->setErrors(get_class($obj).' Differs from '.$this->className);
335 335
 
336 336
                 return false;
337 337
             }
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 
343 343
         foreach ($obj->cleanVars as $k => $v) {
344 344
             if (XOBJ_DTYPE_INT == $obj->vars[$k]['data_type']) {
345
-                $cleanvars[$k] = (int)$v;
345
+                $cleanvars[$k] = (int) $v;
346 346
             } elseif (is_array($v)) {
347 347
                 $cleanvars[$k] = $this->db->quoteString(implode(',', $v));
348 348
             } else {
@@ -352,12 +352,12 @@  discard block
 block discarded – undo
352 352
         if ($obj->isNew()) {
353 353
             if (!is_array($this->keyName)) {
354 354
                 if ($cleanvars[$this->keyName] < 1) {
355
-                    $cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq');
355
+                    $cleanvars[$this->keyName] = $this->db->genId($this->table.'_'.$this->keyName.'_seq');
356 356
                 }
357 357
             }
358
-            $sql = 'INSERT INTO ' . $this->table . ' (' . implode(',', array_keys($cleanvars)) . ') VALUES (' . implode(',', array_values($cleanvars)) . ')';
358
+            $sql = 'INSERT INTO '.$this->table.' ('.implode(',', array_keys($cleanvars)).') VALUES ('.implode(',', array_values($cleanvars)).')';
359 359
         } else {
360
-            $sql = 'UPDATE ' . $this->table . ' SET';
360
+            $sql = 'UPDATE '.$this->table.' SET';
361 361
             foreach ($cleanvars as $key => $value) {
362 362
                 if ((!is_array($this->keyName) && $key == $this->keyName)
363 363
                     || (is_array($this->keyName)
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
                 if (isset($notfirst)) {
368 368
                     $sql .= ',';
369 369
                 }
370
-                $sql      .= ' ' . $key . ' = ' . $value;
370
+                $sql .= ' '.$key.' = '.$value;
371 371
                 $notfirst = true;
372 372
             }
373 373
             if (is_array($this->keyName)) {
@@ -376,12 +376,12 @@  discard block
 block discarded – undo
376 376
                     if ($i > 0) {
377 377
                         $whereclause .= ' AND ';
378 378
                     }
379
-                    $whereclause .= $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
379
+                    $whereclause .= $this->keyName[$i].' = '.$obj->getVar($this->keyName[$i]);
380 380
                 }
381 381
             } else {
382
-                $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
382
+                $whereclause = $this->keyName.' = '.$obj->getVar($this->keyName);
383 383
             }
384
-            $sql .= ' WHERE ' . $whereclause;
384
+            $sql .= ' WHERE '.$whereclause;
385 385
         }
386 386
         if (false !== $force) {
387 387
             $result = $this->db->queryF($sql);
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
      */
411 411
     public function updateAll($fieldname, $fieldvalue, \CriteriaElement $criteria = null, $force = false)
412 412
     {
413
-        $setClause = $fieldname . ' = ';
413
+        $setClause = $fieldname.' = ';
414 414
         if (is_numeric($fieldvalue)) {
415 415
             $setClause .= $fieldvalue;
416 416
         } elseif (is_array($fieldvalue)) {
@@ -418,9 +418,9 @@  discard block
 block discarded – undo
418 418
         } else {
419 419
             $setClause .= $this->db->quoteString($fieldvalue);
420 420
         }
421
-        $sql = 'UPDATE ' . $this->table . ' SET ' . $setClause;
421
+        $sql = 'UPDATE '.$this->table.' SET '.$setClause;
422 422
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
423
-            $sql .= ' ' . $criteria->renderWhere();
423
+            $sql .= ' '.$criteria->renderWhere();
424 424
         }
425 425
         if (false !== $force) {
426 426
             $result = $this->db->queryF($sql);
@@ -444,9 +444,9 @@  discard block
 block discarded – undo
444 444
      */
445 445
     public function updateFieldValue($fieldname, $fieldvalue, $criteria = null, $force = true)
446 446
     {
447
-        $sql = 'UPDATE ' . $this->table . ' SET ' . $fieldname . ' = ' . $fieldvalue;
447
+        $sql = 'UPDATE '.$this->table.' SET '.$fieldname.' = '.$fieldvalue;
448 448
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
449
-            $sql .= ' ' . $criteria->renderWhere();
449
+            $sql .= ' '.$criteria->renderWhere();
450 450
         }
451 451
         if (false !== $force) {
452 452
             $result = $this->db->queryF($sql);
@@ -473,8 +473,8 @@  discard block
 block discarded – undo
473 473
     public function deleteAll(\CriteriaElement $criteria = null, $force = true, $asObject = false)
474 474
     {
475 475
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
476
-            $sql = 'DELETE FROM ' . $this->table;
477
-            $sql .= ' ' . $criteria->renderWhere();
476
+            $sql = 'DELETE FROM '.$this->table;
477
+            $sql .= ' '.$criteria->renderWhere();
478 478
             if (!$this->db->query($sql)) {
479 479
                 return false;
480 480
             }
@@ -608,8 +608,8 @@  discard block
 block discarded – undo
608 608
      */
609 609
     public function updateCounter($fieldname, $criteria, $op = '+')
610 610
     {
611
-        $sql    = 'UPDATE ' . $this->table . ' SET ' . $fieldname . ' = ' . $fieldname . $op . '1';
612
-        $sql    .= ' ' . $criteria->renderWhere();
611
+        $sql    = 'UPDATE '.$this->table.' SET '.$fieldname.' = '.$fieldname.$op.'1';
612
+        $sql .= ' '.$criteria->renderWhere();
613 613
         $result = $this->db->queryF($sql);
614 614
         if (!$result) {
615 615
             return false;
@@ -631,12 +631,12 @@  discard block
 block discarded – undo
631 631
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
632 632
             if ('' != $criteria->groupby) {
633 633
                 $groupby = true;
634
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
634
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
635 635
             }
636 636
         }
637
-        $sql = 'SELECT ' . $field . "SUM($sum) FROM " . $this->table;
637
+        $sql = 'SELECT '.$field."SUM($sum) FROM ".$this->table;
638 638
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
639
-            $sql .= ' ' . $criteria->renderWhere();
639
+            $sql .= ' '.$criteria->renderWhere();
640 640
             if ('' != $criteria->groupby) {
641 641
                 $sql .= $criteria->getGroupby();
642 642
             }
@@ -672,12 +672,12 @@  discard block
 block discarded – undo
672 672
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
673 673
             if ('' != $criteria->groupby) {
674 674
                 $groupby = true;
675
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
675
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
676 676
             }
677 677
         }
678
-        $sql = 'SELECT ' . $field . "MAX($max) FROM " . $this->table;
678
+        $sql = 'SELECT '.$field."MAX($max) FROM ".$this->table;
679 679
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
680
-            $sql .= ' ' . $criteria->renderWhere();
680
+            $sql .= ' '.$criteria->renderWhere();
681 681
             if ('' != $criteria->groupby) {
682 682
                 $sql .= $criteria->getGroupby();
683 683
             }
@@ -710,9 +710,9 @@  discard block
 block discarded – undo
710 710
     {
711 711
         $field = '';
712 712
 
713
-        $sql = 'SELECT ' . $field . "AVG($avg) FROM " . $this->table;
713
+        $sql = 'SELECT '.$field."AVG($avg) FROM ".$this->table;
714 714
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
715
-            $sql .= ' ' . $criteria->renderWhere();
715
+            $sql .= ' '.$criteria->renderWhere();
716 716
         }
717 717
         $result = $this->db->query($sql);
718 718
         if (!$result) {
Please login to merge, or discard this patch.
class/Form/FormFileCheckBox.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,8 @@
 block discarded – undo
23 23
 class FormFileCheckBox extends \XoopsFormCheckBox
24 24
 {
25 25
     /**
26
-     * @param      $caption
27
-     * @param      $name
26
+     * @param      string $caption
27
+     * @param      string $name
28 28
      * @param null $value
29 29
      *
30 30
      * @return FormFileCheckBox
Please login to merge, or discard this patch.
class/Form/FormRRuleCheckBox.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,9 +24,9 @@
 block discarded – undo
24 24
 class FormRRuleCheckBox extends \XoopsFormCheckBox
25 25
 {
26 26
     /**
27
-     * @param      $caption
28
-     * @param      $name
29
-     * @param null $value
27
+     * @param      string $caption
28
+     * @param      string $name
29
+     * @param string $value
30 30
      */
31 31
     public function __construct($caption, $name, $value = null)
32 32
     {
Please login to merge, or discard this patch.
class/Utility.php 3 patches
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -17,9 +17,7 @@
 block discarded – undo
17 17
  **/
18 18
 require_once XOOPS_ROOT_PATH . '/class/uploader.php';
19 19
 
20
-use Xmf\Request;
21 20
 use XoopsModules\Extcal;
22
-use XoopsModules\Extcal\Common;
23 21
 
24 22
 /**
25 23
  * Class Utility
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
         // Category selectbox
153 153
         //<option style="background-color:#00FFFF;">VARCHAR</option>
154 154
 
155
-         $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
155
+            $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
156 156
         $catsList   = $catHandler->getAllCat($xoopsUser);
157 157
 
158 158
         $t = [];
@@ -162,11 +162,11 @@  discard block
 block discarded – undo
162 162
             $cat_color = $catList->getVar('cat_color');
163 163
             $checked   = in_array($cat_id, $cat) ? 'checked' : '';
164 164
             $cat       = ''
165
-                         . "<div style='float:left; margin-left:5px;'>"
166
-                         . "<input type='checkbox' name='{$name}[{$cat_id}]' value='1' {$checked}>"
167
-                         . "<div style='absolute:left;height:12px; width:6px; background-color:#{$cat_color}; border:1px solid black; float:left; margin-right:5px;' ></div>"
168
-                         . " {$name}"
169
-                         . '</div>';
165
+                            . "<div style='float:left; margin-left:5px;'>"
166
+                            . "<input type='checkbox' name='{$name}[{$cat_id}]' value='1' {$checked}>"
167
+                            . "<div style='absolute:left;height:12px; width:6px; background-color:#{$cat_color}; border:1px solid black; float:left; margin-right:5px;' ></div>"
168
+                            . " {$name}"
169
+                            . '</div>';
170 170
 
171 171
             $t[] = $cat;
172 172
         }
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
  * L'utilisation de ce formulaire d'adminitration suppose
16 16
  * que la classe correspondante de la table a été générées avec classGenerator
17 17
  **/
18
-require_once XOOPS_ROOT_PATH . '/class/uploader.php';
18
+require_once XOOPS_ROOT_PATH.'/class/uploader.php';
19 19
 
20 20
 use Xmf\Request;
21 21
 use XoopsModules\Extcal;
@@ -60,12 +60,12 @@  discard block
 block discarded – undo
60 60
     public static function extcal_loadImg(&$REQUEST, &$event_picture1, &$event_picture2)
61 61
     {
62 62
         ///////////////////////////////////////////////////////////////////////////////
63
-        $uploaddir_event = XOOPS_ROOT_PATH . '/uploads/extcal/';
64
-        $uploadurl_event = XOOPS_URL . '/uploads/extcal/';
63
+        $uploaddir_event = XOOPS_ROOT_PATH.'/uploads/extcal/';
64
+        $uploadurl_event = XOOPS_URL.'/uploads/extcal/';
65 65
         //$picture = '';
66 66
         for ($j = 1; $j < 3; ++$j) {
67
-            $delimg = @$REQUEST['delimg_' . $j . ''];
68
-            $delimg = isset($delimg) ? (int)$delimg : 0;
67
+            $delimg = @$REQUEST['delimg_'.$j.''];
68
+            $delimg = isset($delimg) ? (int) $delimg : 0;
69 69
             if (0 == $delimg && !empty($REQUEST['xoops_upload_file'][$j])) {
70 70
                 $upload = new \XoopsMediaUploader($uploaddir_event, [
71 71
                     'image/gif',
@@ -88,15 +88,15 @@  discard block
 block discarded – undo
88 88
                             $event_picture2 = $upload->getSavedFileName();
89 89
                         }
90 90
                     }
91
-                } elseif (!empty($REQUEST['file' . $j])) {
91
+                } elseif (!empty($REQUEST['file'.$j])) {
92 92
                     if (1 == $j) {
93
-                        $event_picture1 = $REQUEST['file' . $j];
93
+                        $event_picture1 = $REQUEST['file'.$j];
94 94
                     } elseif (2 == $j) {
95
-                        $event_picture2 = $REQUEST['file' . $j];
95
+                        $event_picture2 = $REQUEST['file'.$j];
96 96
                     }
97 97
                 }
98 98
             } else {
99
-                $url_event = XOOPS_ROOT_PATH . '/uploads/extcal/' . $REQUEST['file' . $j];
99
+                $url_event = XOOPS_ROOT_PATH.'/uploads/extcal/'.$REQUEST['file'.$j];
100 100
                 if (1 == $j) {
101 101
                     $event_picture1 = '';
102 102
                 } elseif (2 == $j) {
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
     {
125 125
         global $xoopsUser;
126 126
         // Category selectbox
127
-        $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
127
+        $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
128 128
 
129 129
         $catsList  = $catHandler->getAllCat($xoopsUser);
130 130
         $catSelect = new \XoopsFormSelect('', $name, $cat);
@@ -152,8 +152,8 @@  discard block
 block discarded – undo
152 152
         // Category selectbox
153 153
         //<option style="background-color:#00FFFF;">VARCHAR</option>
154 154
 
155
-         $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
156
-        $catsList   = $catHandler->getAllCat($xoopsUser);
155
+         $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
156
+        $catsList = $catHandler->getAllCat($xoopsUser);
157 157
 
158 158
         $t = [];
159 159
         foreach ($catsList as $catList) {
@@ -192,17 +192,17 @@  discard block
 block discarded – undo
192 192
             $select->addOption('', '');
193 193
         }
194 194
 
195
-        $select->addOption('year ASC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
196
-        $select->addOption('year DESC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
195
+        $select->addOption('year ASC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_ASC);
196
+        $select->addOption('year DESC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_DESC);
197 197
 
198
-        $select->addOption('month ASC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
199
-        $select->addOption('month DESC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
198
+        $select->addOption('month ASC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_ASC);
199
+        $select->addOption('month DESC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_DESC);
200 200
 
201
-        $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
202
-        $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
201
+        $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_ASC);
202
+        $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_DESC);
203 203
 
204
-        $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
205
-        $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
204
+        $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_ASC);
205
+        $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_DESC);
206 206
 
207 207
         return $select;
208 208
     }
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
     public static function echoDateArray($period)
317 317
     {
318 318
         foreach ($period as $dt) {
319
-            echo $dt->format("l Y-m-d H:i:s\n") . '<br>';
319
+            echo $dt->format("l Y-m-d H:i:s\n").'<br>';
320 320
         }
321 321
     }
322 322
 
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
         }
333 333
 
334 334
         $txt = print_r($t, true);
335
-        echo '<pre>Number of items: ' . count($t) . "<br>{$txt}</pre>";
335
+        echo '<pre>Number of items: '.count($t)."<br>{$txt}</pre>";
336 336
     }
337 337
 
338 338
     /*****************************************************************/
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
         if ('' != $msg) {
346 346
             echo "<hr>{$msg}<hr>";
347 347
         }
348
-        echo $line . '<br>';
348
+        echo $line.'<br>';
349 349
     }
350 350
 
351 351
     /*****************************************************************/
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
             echo "<hr>{$msg}<hr>";
373 373
         }
374 374
 
375
-        echo 'date --->' . $tsName . ' = ' . $ts . ' - ' . date('d-m-Y H:m:s', $ts) . '<br>';
375
+        echo 'date --->'.$tsName.' = '.$ts.' - '.date('d-m-Y H:m:s', $ts).'<br>';
376 376
     }
377 377
 
378 378
     /*****************************************************************/
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
486 486
      */
487 487
     public static function getLighterColor($color, $plancher, $plafond)
488 488
     {
489
-        require_once __DIR__ . '/ColorTools.php';
489
+        require_once __DIR__.'/ColorTools.php';
490 490
 
491 491
         //$ct = new ColorTools();
492 492
         //return $ct->eclaircir($color,$plancher,$plafond);
Please login to merge, or discard this patch.
view_search.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -2,14 +2,14 @@  discard block
 block discarded – undo
2 2
 
3 3
 use XoopsModules\Extcal;
4 4
 
5
-include __DIR__ . '/../../mainfile.php';
6
-require_once __DIR__ . '/include/constantes.php';
7
-$params                                  = [
5
+include __DIR__.'/../../mainfile.php';
6
+require_once __DIR__.'/include/constantes.php';
7
+$params = [
8 8
     'view' => _EXTCAL_NAV_SEARCH,
9 9
     'file' => _EXTCAL_FILE_SEARCH,
10 10
 ];
11 11
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
12
-require_once __DIR__ . '/header.php';
12
+require_once __DIR__.'/header.php';
13 13
 
14 14
 $recurEventsArray = [];
15 15
 //needed to save the state of the form, so we don't show on the first time the list of available events
@@ -21,10 +21,10 @@  discard block
 block discarded – undo
21 21
 /***************************************************************/
22 22
 $searchExp = isset($_POST['searchExp']) ? $_POST['searchExp'] : '';
23 23
 $andor     = isset($_POST['andor']) ? $_POST['andor'] : '';
24
-$year      = isset($_POST['year']) ? (int)$_POST['year'] : date('Y');
25
-$month     = isset($_POST['month']) ? (int)$_POST['month'] : date('n');
26
-$day       = isset($_POST['day']) ? (int)$_POST['day'] : 0;
27
-$cat       = isset($_POST['cat']) ? (int)$_POST['cat'] : 0;
24
+$year      = isset($_POST['year']) ? (int) $_POST['year'] : date('Y');
25
+$month     = isset($_POST['month']) ? (int) $_POST['month'] : date('n');
26
+$day       = isset($_POST['day']) ? (int) $_POST['day'] : 0;
27
+$cat       = isset($_POST['cat']) ? (int) $_POST['cat'] : 0;
28 28
 $orderby1  = isset($_POST['orderby1']) ? $_POST['orderby1'] : 'cat_name ASC';
29 29
 $orderby2  = isset($_POST['orderby2']) ? $_POST['orderby2'] : 'event_title ASC';
30 30
 $orderby3  = isset($_POST['orderby3']) ? $_POST['orderby3'] : '';
@@ -108,18 +108,18 @@  discard block
 block discarded – undo
108 108
     }
109 109
 }
110 110
 
111
-$criteria =  new \CriteriaCompo();
112
-$criteria->add( new \Criteria('event_isrecur', 1));
111
+$criteria = new \CriteriaCompo();
112
+$criteria->add(new \Criteria('event_isrecur', 1));
113 113
 
114 114
 if ($cat > 0) {
115
-    $criteria->add( new \Criteria('cat_id', $cat));
115
+    $criteria->add(new \Criteria('cat_id', $cat));
116 116
 }
117 117
 
118 118
 //$criteria =  new \Criteria('event_isrecur', 1);
119 119
 
120 120
 $recurrents = $eventHandler->getAllEvents($criteria, false);
121 121
 //$catHandler = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
122
-$catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
122
+$catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
123 123
 
124 124
 //=========================================
125 125
 for ($h = 0, $count = count($recurrents); $h < $count; ++$h) {
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
     }
147 147
 }
148 148
 
149
-$eventsArray = array_merge((array)$eventsArray, (array)$recurEventsArray);
149
+$eventsArray = array_merge((array) $eventsArray, (array) $recurEventsArray);
150 150
 
151 151
 // Sort event array by event start
152 152
 //usort($eventsArray, "orderEvents");
@@ -237,4 +237,4 @@  discard block
 block discarded – undo
237 237
 $xoopsTpl->assign('lang', $lang);
238 238
 $xoopsTpl->assign('view', 'search');
239 239
 
240
-include XOOPS_ROOT_PATH . '/footer.php';
240
+include XOOPS_ROOT_PATH.'/footer.php';
Please login to merge, or discard this patch.
download_attachement.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,20 +2,20 @@
 block discarded – undo
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
 
8 8
 if (!isset($_GET['file'])) {
9 9
     $fileId = 0;
10 10
 } else {
11
-    $fileId = (int)$_GET['file'];
11
+    $fileId = (int) $_GET['file'];
12 12
 }
13 13
 /** @var FileHandler $fileHandler */
14 14
 $fileHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_FILE);
15 15
 
16 16
 $file = $fileHandler->getFile($fileId);
17 17
 
18
-header('Content-Type: ' . $file->getVar('file_mimetype') . '');
19
-header('Content-Disposition: attachment; filename="' . $file->getVar('file_nicename') . '"');
18
+header('Content-Type: '.$file->getVar('file_mimetype').'');
19
+header('Content-Disposition: attachment; filename="'.$file->getVar('file_nicename').'"');
20 20
 
21
-readfile(XOOPS_ROOT_PATH . '/uploads/extcal/' . $file->getVar('file_name'));
21
+readfile(XOOPS_ROOT_PATH.'/uploads/extcal/'.$file->getVar('file_name'));
Please login to merge, or discard this patch.
post.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -19,20 +19,20 @@  discard block
 block discarded – undo
19 19
 
20 20
 use XoopsModules\Extcal;
21 21
 
22
-include __DIR__ . '/../../mainfile.php';
22
+include __DIR__.'/../../mainfile.php';
23 23
 $GLOBALS['xoopsOption']['template_main'] = 'extcal_post.tpl';
24 24
 
25
-include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
25
+include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
26 26
 //include __DIR__ . '/class/form/extcalform.php';
27 27
 //include __DIR__ . '/class/perm.php';
28 28
 
29
-require_once __DIR__ . '/class/Utility.php';
30
-require_once __DIR__ . '/include/constantes.php';
29
+require_once __DIR__.'/class/Utility.php';
30
+require_once __DIR__.'/include/constantes.php';
31 31
 
32 32
 $permHandler = Extcal\Perm::getHandler();
33 33
 $xoopsUser   = $xoopsUser ?: null;
34 34
 
35
-if (!$permHandler->isAllowed($xoopsUser, 'extcal_cat_submit', (int)$_POST['cat_id'])) {
35
+if (!$permHandler->isAllowed($xoopsUser, 'extcal_cat_submit', (int) $_POST['cat_id'])) {
36 36
     redirect_header('index.php', 3);
37 37
 }
38 38
 
@@ -40,16 +40,16 @@  discard block
 block discarded – undo
40 40
 $eventHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
41 41
 
42 42
 if (isset($_POST['form_preview'])) {
43
-    include XOOPS_ROOT_PATH . '/header.php';
43
+    include XOOPS_ROOT_PATH.'/header.php';
44 44
 
45 45
     // Title of the page
46 46
     $xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
47 47
 
48 48
     $data = [
49 49
         'event_title'        => $_POST['event_title'],
50
-        'cat_id'             => (int)$_POST['cat_id'],
50
+        'cat_id'             => (int) $_POST['cat_id'],
51 51
         'event_desc'         => $_POST['event_desc'],
52
-        'event_nbmember'     => (int)$_POST['event_nbmember'],
52
+        'event_nbmember'     => (int) $_POST['event_nbmember'],
53 53
         'event_contact'      => $_POST['event_contact'],
54 54
         'event_url'          => $_POST['event_url'],
55 55
         'event_email'        => $_POST['event_email'],
@@ -58,14 +58,14 @@  discard block
 block discarded – undo
58 58
         'event_start'        => $_POST['event_start'],
59 59
         'have_end'           => $_POST['have_end'],
60 60
         'event_end'          => $_POST['event_end'],
61
-        'dohtml'             => (int)$xoopsModuleConfig['allow_html'],
61
+        'dohtml'             => (int) $xoopsModuleConfig['allow_html'],
62 62
         'event_price'        => $_POST['event_price'],
63 63
         'event_organisateur' => $_POST['event_organisateur'],
64 64
         'event_icone'        => $_POST['event_icone'],
65 65
     ];
66 66
 
67 67
     if (isset($_POST['event_id'])) {
68
-        $data['event_id'] = (int)$_POST['event_id'];
68
+        $data['event_id'] = (int) $_POST['event_id'];
69 69
     }
70 70
 
71 71
     // Creating tempory event object to apply Object data filtering
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
     //     // Assigning language data to the template
85 85
     //     $xoopsTpl->assign('lang', $lang);
86 86
 
87
-    $event['cat_id']   = (int)$_POST['cat_id'];
87
+    $event['cat_id']   = (int) $_POST['cat_id'];
88 88
     $event['have_end'] = $_POST['have_end'];
89 89
 
90 90
     // Display the submit form
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     $xoopsTpl->assign('preview', true);
94 94
     $xoopsTpl->assign('formBody', $formBody);
95 95
 
96
-    include XOOPS_ROOT_PATH . '/footer.php';
96
+    include XOOPS_ROOT_PATH.'/footer.php';
97 97
 } elseif (isset($_POST['form_submit'])) {
98 98
     if (!isset($_POST['rrule_weekly_interval'])) {
99 99
         $_POST['rrule_weekly_interval'] = 0;
@@ -117,11 +117,11 @@  discard block
 block discarded – undo
117 117
     Extcal\Utility::extcal_loadImg($_REQUEST, $event_picture1, $event_picture2);
118 118
     ///////////////////////////////////////////////////////////////////////////////
119 119
 
120
-    require_once __DIR__ . '/class/perm.php';
120
+    require_once __DIR__.'/class/perm.php';
121 121
 
122 122
     $fileHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_FILE);
123 123
     $permHandler = Extcal\Perm::getHandler();
124
-    $approve     = $permHandler->isAllowed($xoopsUser, 'extcal_cat_autoapprove', (int)$_POST['cat_id']);
124
+    $approve     = $permHandler->isAllowed($xoopsUser, 'extcal_cat_autoapprove', (int) $_POST['cat_id']);
125 125
 
126 126
     $data = [
127 127
         'event_title'         => $_POST['event_title'],
@@ -147,11 +147,11 @@  discard block
 block discarded – undo
147 147
     ];
148 148
 
149 149
     if (isset($_POST['event_id'])) {
150
-        $eventHandler->modifyEvent((int)$_POST['event_id'], $data);
151
-        $fileHandler->updateEventFile((int)$_POST['event_id']);
152
-        $fileHandler->createFile((int)$_POST['event_id']);
150
+        $eventHandler->modifyEvent((int) $_POST['event_id'], $data);
151
+        $fileHandler->updateEventFile((int) $_POST['event_id']);
152
+        $fileHandler->createFile((int) $_POST['event_id']);
153 153
 
154
-        redirect_header('event.php?event=' . $_POST['event_id'], 3, _MD_EXTCAL_EVENT_UPDATED, false);
154
+        redirect_header('event.php?event='.$_POST['event_id'], 3, _MD_EXTCAL_EVENT_UPDATED, false);
155 155
     } else {
156 156
         $data['event_submitter']  = $xoopsUser ? $xoopsUser->getVar('uid') : 0;
157 157
         $data['event_submitdate'] = time();
@@ -168,9 +168,9 @@  discard block
 block discarded – undo
168 168
         $notificationHandler->triggerEvent('global', 0, $notifyEvent, ['EVENT_TITLE' => $_POST['event_title']]);
169 169
         if (1 == $approve) {
170 170
 //            $catHandler = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
171
-            $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
172
-            $cat        = $catHandler->getCat((int)$_POST['cat_id'], $xoopsUser, 'all');
173
-            $notificationHandler->triggerEvent('cat', (int)$_POST['cat_id'], 'new_event_cat', [
171
+            $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
172
+            $cat = $catHandler->getCat((int) $_POST['cat_id'], $xoopsUser, 'all');
173
+            $notificationHandler->triggerEvent('cat', (int) $_POST['cat_id'], 'new_event_cat', [
174 174
                 'EVENT_TITLE' => $_POST['event_title'],
175 175
                 'CAT_NAME'    => $cat->getVar('cat_name'),
176 176
             ]);
Please login to merge, or discard this patch.