mambax7 / extcal

blocks/minical.php

Doc Comments +4 added lines, -4 removed lines

@@ -457,12 +457,12 @@
 /**
  * @param array      $event
  * @param array      $eventsArray
- * @param Time $timeHandler
- * @param            $startMonth
- * @param            $endMonth
+ * @param Extcal\Time $timeHandler
+ * @param            integer $startMonth
+ * @param            integer $endMonth
  * @param            $cats
  *
- * @return bool
+ * @return false|null
  */
 function bExtcalMinicalAddEventToArray($event, &$eventsArray, $timeHandler, $startMonth, $endMonth, $cats)
 {

Spacing +21 added lines, -21 removed lines

@@ -20,7 +20,7 @@ 
 use XoopsModules\Extcal;
 
 global $extcalConfig, $xoopsUser;
-require_once __DIR__ . '/../include/constantes.php';
+require_once __DIR__.'/../include/constantes.php';
 //require_once __DIR__ . '/../class/Utility.php';
 //require_once __DIR__ . '/../class/tableForm.php';
 //---------------------------------------------------------------------------
@@ -37,16 +37,16 @@ 
 
 //    require_once __DIR__ . '/../class/config.php';
 
-    require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Util/Textual.php';
-    require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Month/Weeks.php';
-    require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Day.php';
+    require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Util/Textual.php';
+    require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Month/Weeks.php';
+    require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Day.php';
     //     require_once CALENDAR_ROOT . 'Month/Weeks.php';
     //     require_once CALENDAR_ROOT . 'Day.php';
 
     // Retriving Image for block if enabled
     if (1 == $options[0]) {
         $imageHandler = xoops_getHandler('image');
-        $criteria     =  new \Criteria('imgcat_id', $options[1]);
+        $criteria     = new \Criteria('imgcat_id', $options[1]);
         $criteria->setSort('RAND()');
         $criteria->setLimit($options[6]);
         $images         = $imageHandler->getObjects($criteria);
@@ -84,13 +84,13 @@ 
     //----------------------------------------------------
     // Getting eXtCal object's handler
 //    $catHandler = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
-    $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+    $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
 
-    $cats       = $catHandler->getAllCatById($xoopsUser);
+    $cats = $catHandler->getAllCatById($xoopsUser);
     // $t = print_r($cats,true);
     // echo "zzz<pre>{$t}</pre>";
 
-    $eventHandler      = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
+    $eventHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
     $timeHandler = Extcal\Time::getHandler();
 
     // Retriving month and year value according to block options
@@ -128,7 +128,7 @@ 
             'category'          => $tCatSelected,
             'externalKeys' => 'cat_id',
         ];
-        $events   = $eventHandler->getEventsOnPeriode($criteres);
+        $events = $eventHandler->getEventsOnPeriode($criteres);
     } else {
         $events = [];
     }
@@ -193,7 +193,7 @@ 
                 'number'     => $dayCalObj->thisDay(),
                 'isSelected' => $dayCalObj->isSelected(),
             ];
-            $day                                = $dayCalObj->thisDay();
+            $day = $dayCalObj->thisDay();
             if (isset($eventsArray[$day]) && !$dayCalObj->isEmpty()) {
                 $tableRows[$rowId]['week'][$cellId]['haveEvents'] = true;
                 $tableRows[$rowId]['week'][$cellId]['color']      = $eventsArray[$day]['color'];
@@ -223,15 +223,15 @@ 
     // Making navig data
     $navig = [
         'page' => $extcalConfig['start_page'],
-        'uri'  => 'year=' . $monthCalObj->thisYear() . '&amp;month=' . $monthCalObj->thisMonth(),
+        'uri'  => 'year='.$monthCalObj->thisYear().'&amp;month='.$monthCalObj->thisMonth(),
         'name' => $timeHandler->getFormatedDate($extcalConfig['nav_date_month'], $monthCalObj->getTimestamp()),
     ];
 
     $horloge             = [];
     $horloge['display']  = ('' != trim($options[11]));
-    $horloge['fullName'] = XOOPS_URL . _EXTCAL_PATH_HORLOGES . $options[11];
-    $horloge['width']    = $options[12] . 'px';
-    $horloge['height']   = $options[13] . 'px';
+    $horloge['fullName'] = XOOPS_URL._EXTCAL_PATH_HORLOGES.$options[11];
+    $horloge['width']    = $options[12].'px';
+    $horloge['height']   = $options[13].'px';
 
     $ret = [
         'imageParam'   => $imageParam,
@@ -273,12 +273,12 @@ 
 
     //============================================================
 
-    $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+    $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
     $cats            = $catHandler->getAllCat($xoopsUser, 'extcal_cat_view');
     $imageCatHandler = xoops_getHandler('imagecategory');
 
     //=====================================================================
-    $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_OPT_SLIDE_SHOW . '</div>', 'head');
+    $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_OPT_SLIDE_SHOW.'</div>', 'head');
 
     $k           = 0;
     $xfValue[$k] = new \XoopsFormRadio(_MB_EXTCAL_DISPLAY_IMG, "options[{$k}]", $options[$k]);
@@ -319,7 +319,7 @@ 
     $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 = '');
     $form->addElement($xfValue[$k], false);
     //=====================================================================
-    $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_OPT_SHOW . '</div>', 'head');
+    $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_OPT_SHOW.'</div>', 'head');
 
     $t = [
         -1 => _MB_EXTCAL_PREVIEW,
@@ -358,9 +358,9 @@ 
     $form->addElement($xfValue[$k], false);
 
     //=====================================================================
-    $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_HORLOGE_OPT . '</div>', 'head');
+    $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_HORLOGE_OPT.'</div>', 'head');
     //---------------------------------------------------------------------
-    $t = \XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH . _EXTCAL_PATH_HORLOGES);
+    $t = \XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH._EXTCAL_PATH_HORLOGES);
     $t = array_merge([' ' => _NONE], $t);
 
     $k           = 11;
@@ -445,12 +445,12 @@ 
         // $src   = $doc->createElement('src');
         $src   = clone $tempSrc;
         $src   = $photo->appendChild($src);
-        $value = $doc->createTextNode(XOOPS_URL . '/uploads/' . $images->getVar('image_name'));
+        $value = $doc->createTextNode(XOOPS_URL.'/uploads/'.$images->getVar('image_name'));
         $src->appendChild($value);
     }
 
     // get completed xml document
-    $xml_string = $doc->save(XOOPS_ROOT_PATH . '/cache/extcalSlideShowParam.xml');
+    $xml_string = $doc->save(XOOPS_ROOT_PATH.'/cache/extcalSlideShowParam.xml');
 }
 
 /**************************************************************************/

class/EventHandler.php

Doc Comments +5 added lines, -5 removed lines

@@ -577,7 +577,7 @@ 
      * @param     $cat
      * @param int $nbDays
      *
-     * @return CriteriaCompo
+     * @return null|\CriteriaElement
      */
     public function _getEventWeekCriteria($day, $month, $year, $cat=0, $nbDays = 7)
     {
@@ -599,7 +599,7 @@ 
      * @param $year
      * @param $cat
      *
-     * @return CriteriaCompo
+     * @return null|\CriteriaElement
      */
     public function _getEventMonthCriteria($month, $year, $cat=0)
     {
@@ -620,7 +620,7 @@ 
      * @param     $year
      * @param int $cat
      *
-     * @return CriteriaCompo
+     * @return null|\CriteriaElement
      */
     public function _getEventYearCriteria($year, $cat = 0)
     {
@@ -890,7 +890,7 @@ 
 
     /**
      * @param $criteria
-     * @param $cats
+     * @param integer $cats
      */
     public function _addCatSelectCriteria(&$criteria, $cats=null)
     {
@@ -1693,7 +1693,7 @@ 
 
     /**
      * @param $month
-     * @param $year
+     * @param string $year
      * @param $dayCode
      *
      * @return int

Spacing +112 added lines, -112 removed lines

@@ -23,7 +23,7 @@ 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
 
-require_once __DIR__ . '/../include/constantes.php';
+require_once __DIR__.'/../include/constantes.php';
 
 
 
@@ -154,9 +154,9 @@ 
     {
         $user = $GLOBALS['xoopsUser'];
 
-        $criteriaCompo =  new \CriteriaCompo();
-        $criteriaCompo->add( new \Criteria('event_id', $eventId));
-        $criteriaCompo->add( new \Criteria('event_approved', 1));
+        $criteriaCompo = new \CriteriaCompo();
+        $criteriaCompo->add(new \Criteria('event_id', $eventId));
+        $criteriaCompo->add(new \Criteria('event_approved', 1));
         if (!$skipPerm) {
             $this->_addCatPermCriteria($criteriaCompo, $user);
         }
@@ -180,8 +180,8 @@ 
     {
         $user = $GLOBALS['xoopsUser'];
 
-        $criteriaCompo =  new \CriteriaCompo();
-        $criteriaCompo->add( new \Criteria('event_id', $eventId));
+        $criteriaCompo = new \CriteriaCompo();
+        $criteriaCompo->add(new \Criteria('event_id', $eventId));
         if (!$skipPerm) {
             $this->_addCatPermCriteria($criteriaCompo, $user);
         }
@@ -338,7 +338,7 @@ 
 
         //        while (list($k, $v) = each($events)) {
         foreach ($events as $k => $v) {
-            $ordre[] = (int)$v['event_start'];
+            $ordre[] = (int) $v['event_start'];
             $this->formatEventDate($v, $extcalConfig['event_date_week']);
             //$v['cat']['cat_light_color'] = $v['cat']['cat_color'];
             $v['cat']['cat_light_color'] = Extcal\Utility::getLighterColor($v['cat']['cat_color'], _EXTCAL_INFOBULLE_RGB_MIN, _EXTCAL_INFOBULLE_RGB_MAX);
@@ -382,7 +382,7 @@ 
             case _EXTCAL_EVENTS_CALENDAR_WEEK:
                 $criteriaCompo = $this->_getEventWeekCriteria($day, $month, $year, $cat, $nbDays);
                 if (!$extcalConfig['diplay_past_event_cal']) {
-                    $criteriaCompo->add( new \Criteria('event_end', time(), '>'));
+                    $criteriaCompo->add(new \Criteria('event_end', time(), '>'));
                 }
                 break;
 
@@ -390,7 +390,7 @@ 
             case _EXTCAL_EVENTS_AGENDA_WEEK:
                 $criteriaCompo = $this->_getEventWeekCriteria($day, $month, $year, $cat, $nbDays);
                 if (!$extcalConfig['diplay_past_event_list']) {
-                    $criteriaCompo->add( new \Criteria('event_end', time(), '>'));
+                    $criteriaCompo->add(new \Criteria('event_end', time(), '>'));
                 }
                 break;
 
@@ -398,7 +398,7 @@ 
                 $criteriaCompo = $this->_getEventMonthCriteria($month, $year, $cat);
 
                 if (!$extcalConfig['diplay_past_event_cal']) {
-                    $criteriaCompo->add( new \Criteria('event_end', time(), '>'));
+                    $criteriaCompo->add(new \Criteria('event_end', time(), '>'));
                 }
                 break;
 
@@ -406,7 +406,7 @@ 
                 $criteriaCompo = $this->_getEventMonthCriteria($month, $year, $cat);
 
                 if (!$extcalConfig['diplay_past_event_list']) {
-                    $criteriaCompo->add( new \Criteria('event_end', time(), '>'));
+                    $criteriaCompo->add(new \Criteria('event_end', time(), '>'));
                 }
                 break;
 
@@ -425,7 +425,7 @@ 
 
         }
         //--------------------------------------------------------------------------
-        $criteriaCompo->add( new \Criteria('event_isrecur', 0, '='));
+        $criteriaCompo->add(new \Criteria('event_isrecur', 0, '='));
         $criteriaCompo->setOrder($sens);
 
         $result = $this->getObjects($criteriaCompo);
@@ -462,7 +462,7 @@ 
         $user = $GLOBALS['xoopsUser'];
         //------------------------------------------------------
 
-        $criteriaCompo =  new \CriteriaCompo();
+        $criteriaCompo = new \CriteriaCompo();
 
         switch ($periode) {
             case _EXTCAL_EVENTS_WEEK:
@@ -480,7 +480,7 @@ 
                 $start = userTimeToServerTime(mktime(0, 0, 0, $month, 1, $year), $this->_extcalTime->_getUserTimeZone($user));
                 $end   = userTimeToServerTime(mktime(23, 59, 59, $month + 1, 1, $year) - _EXTCAL_TS_DAY, $this->_extcalTime->_getUserTimeZone($user));
 
-                $criteriaCompo->add( new \Criteria('event_start', $end, '<='));
+                $criteriaCompo->add(new \Criteria('event_start', $end, '<='));
                 //$criteriaCompo->add( new \Criteria('event_end', $start, '>='));
 
                 break;
@@ -500,7 +500,7 @@ 
         }
         $formatDate = $extcalConfig['event_date_week'];
         //--------------------------------------------------------------------------
-        $criteriaCompo->add( new \Criteria('event_isrecur', 1, '='));
+        $criteriaCompo->add(new \Criteria('event_isrecur', 1, '='));
         $criteriaCompo->setOrder($sens);
 
         $result = $this->getObjects($criteriaCompo);
@@ -543,7 +543,7 @@ 
 
         reset($period);
         foreach ($period as $dt) {
-            echo $dt->format("l d-m-Y H:i:s\n") . '<br>';
+            echo $dt->format("l d-m-Y H:i:s\n").'<br>';
         }
     }
 
@@ -579,7 +579,7 @@ 
      *
      * @return CriteriaCompo
      */
-    public function _getEventWeekCriteria($day, $month, $year, $cat=0, $nbDays = 7)
+    public function _getEventWeekCriteria($day, $month, $year, $cat = 0, $nbDays = 7)
     {
         $user = $GLOBALS['xoopsUser'];
 
@@ -601,7 +601,7 @@ 
      *
      * @return CriteriaCompo
      */
-    public function _getEventMonthCriteria($month, $year, $cat=0)
+    public function _getEventMonthCriteria($month, $year, $cat = 0)
     {
         $user = $GLOBALS['xoopsUser'];
 
@@ -653,26 +653,26 @@ 
      * @return \CriteriaCompo
      */
 
-    public function _getCriteriaCompo($start, $end, $cat=0, &$user)
+    public function _getCriteriaCompo($start, $end, $cat = 0, &$user)
     {
-        $criteriaNoRecur =  new \CriteriaCompo();
-        $criteriaNoRecur->add( new \Criteria('event_start', $end, '<='));
-        $criteriaNoRecur->add( new \Criteria('event_end', $start, '>='));
-        $criteriaNoRecur->add( new \Criteria('event_isrecur', 0));
+        $criteriaNoRecur = new \CriteriaCompo();
+        $criteriaNoRecur->add(new \Criteria('event_start', $end, '<='));
+        $criteriaNoRecur->add(new \Criteria('event_end', $start, '>='));
+        $criteriaNoRecur->add(new \Criteria('event_isrecur', 0));
 
-        $criteriaRecur =  new \CriteriaCompo();
-        $criteriaRecur->add( new \Criteria('event_recur_start', $end, '<='));
-        $criteriaRecur->add( new \Criteria('event_recur_end', $start, '>='));
-        $criteriaRecur->add( new \Criteria('event_isrecur', 1));
+        $criteriaRecur = new \CriteriaCompo();
+        $criteriaRecur->add(new \Criteria('event_recur_start', $end, '<='));
+        $criteriaRecur->add(new \Criteria('event_recur_end', $start, '>='));
+        $criteriaRecur->add(new \Criteria('event_isrecur', 1));
 
-        $criteriaCompoDate =  new \CriteriaCompo();
+        $criteriaCompoDate = new \CriteriaCompo();
         $criteriaCompoDate->add($criteriaNoRecur, 'OR');
         $criteriaCompoDate->add($criteriaRecur, 'OR');
 
-        $criteriaCompo =  new \CriteriaCompo();
+        $criteriaCompo = new \CriteriaCompo();
         $criteriaCompo->add($criteriaCompoDate);
 
-        $criteriaCompo->add( new \Criteria('event_approved', 1));
+        $criteriaCompo->add(new \Criteria('event_approved', 1));
         $this->_addCatSelectCriteria($criteriaCompo, $cat);
         $this->_addCatPermCriteria($criteriaCompo, $user);
         $criteriaCompo->setSort('event_start');
@@ -688,13 +688,13 @@ 
      *
      * @return CriteriaCompo
      */
-    public function _getCalendarCriteriaCompo($start, $end, $cat=0, &$user)
+    public function _getCalendarCriteriaCompo($start, $end, $cat = 0, &$user)
     {
         global $extcalConfig;
         $criteriaCompo = $this->_getCriteriaCompo($start, $end, $cat, $user);
         //if (!$this->_extcalConfig['diplay_past_event_cal']) {
         if (!$extcalConfig['diplay_past_event_cal']) {
-            $criteriaCompo->add( new \Criteria('event_end', time(), '>'));
+            $criteriaCompo->add(new \Criteria('event_end', time(), '>'));
         }
 
         return $criteriaCompo;
@@ -708,13 +708,13 @@ 
      *
      * @return CriteriaCompo
      */
-    public function _getListCriteriaCompo($start, $end, $cat=0, &$user)
+    public function _getListCriteriaCompo($start, $end, $cat = 0, &$user)
     {
         global $extcalConfig;
         $criteriaCompo = $this->_getCriteriaCompo($start, $end, $cat, $user);
         // if (!$this->_extcalConfig['diplay_past_event_list']) {
         if (!$extcalConfig['diplay_past_event_list']) {
-            $criteriaCompo->add( new \Criteria('event_end', time(), '>'));
+            $criteriaCompo->add(new \Criteria('event_end', time(), '>'));
         }
 
         return $criteriaCompo;
@@ -732,22 +732,22 @@ 
     {
         $now = time();
 
-        $criteriaNoRecur =  new \CriteriaCompo();
-        $criteriaNoRecur->add( new \Criteria('event_start', $now, '>='));
-        $criteriaNoRecur->add( new \Criteria('event_isrecur', 0));
+        $criteriaNoRecur = new \CriteriaCompo();
+        $criteriaNoRecur->add(new \Criteria('event_start', $now, '>='));
+        $criteriaNoRecur->add(new \Criteria('event_isrecur', 0));
 
-        $criteriaRecur =  new \CriteriaCompo();
-        $criteriaRecur->add( new \Criteria('event_recur_start', $now, '>='));
-        $criteriaRecur->add( new \Criteria('event_isrecur', 1));
+        $criteriaRecur = new \CriteriaCompo();
+        $criteriaRecur->add(new \Criteria('event_recur_start', $now, '>='));
+        $criteriaRecur->add(new \Criteria('event_isrecur', 1));
 
-        $criteriaCompoDate =  new \CriteriaCompo();
+        $criteriaCompoDate = new \CriteriaCompo();
         $criteriaCompoDate->add($criteriaNoRecur, 'OR');
         $criteriaCompoDate->add($criteriaRecur, 'OR');
 
-        $criteriaCompo =  new \CriteriaCompo();
+        $criteriaCompo = new \CriteriaCompo();
         $criteriaCompo->add($criteriaCompoDate);
 
-        $criteriaCompo->add( new \Criteria('event_approved', 1));
+        $criteriaCompo->add(new \Criteria('event_approved', 1));
         $this->_addCatSelectCriteria($criteriaCompo, $cat);
         $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
 
@@ -783,12 +783,12 @@ 
         $dayStart = mktime(0, 0, 0, $month, $day, $year);
         $dayEnd   = mktime(0, 0, 0, $month, $day + 1, $year);
 
-        $criteriaCompo =  new \CriteriaCompo();
+        $criteriaCompo = new \CriteriaCompo();
         $this->_addCatSelectCriteria($criteriaCompo, $cat);
         $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
-        $criteriaCompo->add( new \Criteria('event_end', $dayStart, '>='));
-        $criteriaCompo->add( new \Criteria('event_start', $dayEnd, '<'));
-        $criteriaCompo->add( new \Criteria('event_approved', 1));
+        $criteriaCompo->add(new \Criteria('event_end', $dayStart, '>='));
+        $criteriaCompo->add(new \Criteria('event_start', $dayEnd, '<'));
+        $criteriaCompo->add(new \Criteria('event_approved', 1));
         $criteriaCompo->setSort('event_start');
         $criteriaCompo->setLimit($nbEvent);
 
@@ -807,12 +807,12 @@ 
      */
     public function getNewEvent($start, $limit, $cat = 0, $skipPerm = false)
     {
-        $criteriaCompo =  new \CriteriaCompo();
+        $criteriaCompo = new \CriteriaCompo();
         $this->_addCatSelectCriteria($criteriaCompo, $cat);
         if (!$skipPerm) {
             $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
         }
-        $criteriaCompo->add( new \Criteria('event_approved', 1));
+        $criteriaCompo->add(new \Criteria('event_approved', 1));
         $criteriaCompo->setSort('event_id');
         $criteriaCompo->setOrder('DESC');
         $criteriaCompo->setStart($start);
@@ -826,9 +826,9 @@ 
      */
     public function getCountNewEvent()
     {
-        $criteriaCompo =  new \CriteriaCompo();
+        $criteriaCompo = new \CriteriaCompo();
         $this->_addCatSelectCriteria($criteriaCompo, 0);
-        $criteriaCompo->add( new \Criteria('event_approved', 1));
+        $criteriaCompo->add(new \Criteria('event_approved', 1));
         $criteriaCompo->setSort('event_id');
 
         return $this->getCount($criteriaCompo);
@@ -844,11 +844,11 @@ 
      */
     public function getRandomEvent($nbEvent, $cat = 0)
     {
-        $criteriaCompo =  new \CriteriaCompo();
+        $criteriaCompo = new \CriteriaCompo();
         $this->_addCatSelectCriteria($criteriaCompo, $cat);
         $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
-        $criteriaCompo->add( new \Criteria('event_start', time(), '>='));
-        $criteriaCompo->add( new \Criteria('event_approved', 1));
+        $criteriaCompo->add(new \Criteria('event_start', time(), '>='));
+        $criteriaCompo->add(new \Criteria('event_approved', 1));
         $criteriaCompo->setSort('RAND()');
         $criteriaCompo->setLimit($nbEvent);
 
@@ -860,8 +860,8 @@ 
      */
     public function getPendingEvent()
     {
-        $criteriaCompo =  new \CriteriaCompo();
-        $criteriaCompo->add( new \Criteria('event_approved', 0));
+        $criteriaCompo = new \CriteriaCompo();
+        $criteriaCompo->add(new \Criteria('event_approved', 0));
         $criteriaCompo->setSort('event_start');
 
         return $this->getObjects($criteriaCompo);
@@ -876,15 +876,15 @@ 
         $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
         $count                = count($authorizedAccessCats);
         if ($count > 0) {
-            $in = '(' . $authorizedAccessCats[0];
+            $in = '('.$authorizedAccessCats[0];
             array_shift($authorizedAccessCats);
             foreach ($authorizedAccessCats as $authorizedAccessCat) {
-                $in .= ',' . $authorizedAccessCat;
+                $in .= ','.$authorizedAccessCat;
             }
             $in .= ')';
-            $criteria->add( new \Criteria('cat_id', $in, 'IN'));
+            $criteria->add(new \Criteria('cat_id', $in, 'IN'));
         } else {
-            $criteria->add( new \Criteria('cat_id', '(0)', 'IN'));
+            $criteria->add(new \Criteria('cat_id', '(0)', 'IN'));
         }
     }
 
@@ -892,20 +892,20 @@ 
      * @param $criteria
      * @param $cats
      */
-    public function _addCatSelectCriteria(&$criteria, $cats=null)
+    public function _addCatSelectCriteria(&$criteria, $cats = null)
     {
         if (!is_array($cats) && $cats > 0) {
-            $criteria->add( new \Criteria('cat_id', $cats));
+            $criteria->add(new \Criteria('cat_id', $cats));
         }
         if (is_array($cats)) {
             if (false === array_search(0, $cats)) {
-                $in = '(' . current($cats);
+                $in = '('.current($cats);
                 array_shift($cats);
                 foreach ($cats as $cat) {
-                    $in .= ',' . $cat;
+                    $in .= ','.$cat;
                 }
                 $in .= ')';
-                $criteria->add( new \Criteria('cat_id', $in, 'IN'));
+                $criteria->add(new \Criteria('cat_id', $in, 'IN'));
             }
         }
     }
@@ -921,7 +921,7 @@ 
     public function getEventForm($siteSide = 'user', $mode = 'new', $data = null)
     {
         global $xoopsModuleConfig;
-        $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+        $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
         $fileHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_FILE);
 
         /***************************************************/
@@ -943,7 +943,7 @@ 
             if ('clone' === $mode) {
                 $data['event_id'] = 0;
                 $event->setVar('event_id', 0);
-                $newTitle = $event->getVar('event_title') . ' (' . _MD_EXTCAL_CLONE_OF . $data['event_id'] . ')';
+                $newTitle = $event->getVar('event_title').' ('._MD_EXTCAL_CLONE_OF.$data['event_id'].')';
                 $event->setVar('event_title', $newTitle);
             }
 
@@ -1117,7 +1117,7 @@ 
 
         //-----------------------------------------------
         // Title
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_TITLE, 'event_title', 80, 255, $title), true);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_TITLE, 'event_title', 80, 255, $title), true);
         //-----------------------------------------------
         // Category select
         $catSelect = new \XoopsFormSelect(_MD_EXTCAL_CATEGORY, 'cat_id', $cat);
@@ -1127,7 +1127,7 @@ 
         $form->addElement($catSelect, true);
         //-----------------------------------------------------------
 
-        $file_path = __DIR__ . '/../assets/css/images';
+        $file_path = __DIR__.'/../assets/css/images';
         $tf        = \XoopsLists::getImgListAsArray($file_path);
         array_unshift($tf, _MD_EXTCAL_NONE);
         $xfIcones = new \XoopsFormSelect(_MD_EXTCAL_ICONE, 'event_icone', $event_icone, '');
@@ -1137,7 +1137,7 @@ 
         //etablissement
         $etablissementHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_ETABLISSEMENT);
         $etablissement_select = new \XoopsFormSelect(_MD_EXTCAL_ETABLISSEMENT, 'event_etablissement', $event_etablissement);
-        $criteria             =  new \CriteriaCompo();
+        $criteria             = new \CriteriaCompo();
         $criteria->setSort('nom');
         $criteria->setOrder('ASC');
 
@@ -1191,19 +1191,19 @@ 
         //Price and monnaie
         $monnaie_price = new \XoopsFormElementTray(_MD_EXTCAL_PRICE, '');
         //price
-        $monnaie_price->addElement( new \XoopsFormText('', 'event_price', 20, 255, $event_price));
+        $monnaie_price->addElement(new \XoopsFormText('', 'event_price', 20, 255, $event_price));
         //monnaie
         $monnaie = new \XoopsFormLabel(_MD_EXTCAL_DEVISE2, '');
         $monnaie_price->addElement($monnaie);
         $form->addElement($monnaie_price);
         //----------------------------------------------------------------
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_ORGANISATEUR, 'event_organisateur', 80, 255, $organisateur), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ORGANISATEUR, 'event_organisateur', 80, 255, $organisateur), false);
         // Contact
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_CONTACT, 'event_contact', 80, 255, $contact), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_CONTACT, 'event_contact', 80, 255, $contact), false);
         // Url
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_URL, 'event_url', 80, 255, $url), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_URL, 'event_url', 80, 255, $url), false);
         // Email
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_EMAIL, 'event_email', 80, 255, $email), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_EMAIL, 'event_email', 80, 255, $email), false);
 
         // Address
         if (class_exists('XoopsFormEditor')) {
@@ -1232,23 +1232,23 @@ 
         if (count($files) > 0) {
             $eventFiles = new Extcal\Form\FormFileCheckBox('', 'filetokeep');
             foreach ($files as $file) {
-                $name = $file['file_nicename'] . ' (<i>' . $file['file_mimetype'] . '</i>) ' . $file['formated_file_size'];
+                $name = $file['file_nicename'].' (<i>'.$file['file_mimetype'].'</i>) '.$file['formated_file_size'];
                 $eventFiles->addOption($file['file_id'], $name);
             }
             $fileElmtTray->addElement($eventFiles);
         }
-        $fileElmtTray->addElement( new \XoopsFormFile(_MD_EXTCAL_FILE_ATTACHEMENT, 'event_file', 3145728));
+        $fileElmtTray->addElement(new \XoopsFormFile(_MD_EXTCAL_FILE_ATTACHEMENT, 'event_file', 3145728));
         $form->addElement($fileElmtTray);
 
         if (isset($data['event_id'])) {
-            $form->addElement( new \XoopsFormHidden('event_id', $data['event_id']), false);
+            $form->addElement(new \XoopsFormHidden('event_id', $data['event_id']), false);
         }
         //Hack Kraven0
         ///////////////////////////////////////////////////////////////////////////////
         //Picture1
         $file_tray = new \XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 1), '');
         if (!empty($event_picture1)) {
-            $file_tray->addElement( new \XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/' . $event_picture1 . "' name='image' id='image' alt=''><br><br>"));
+            $file_tray->addElement(new \XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/'.$event_picture1."' name='image' id='image' alt=''><br><br>"));
             $check_del_img = new \XoopsFormCheckBox('', 'delimg_1');
             $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG);
             $file_tray->addElement($check_del_img);
@@ -1259,16 +1259,16 @@ 
         }
         $file_img->setExtra("size ='40'");
         $file_tray->addElement($file_img);
-        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(400728 / 1000), 500, 500);
-        $file_label = new \XoopsFormLabel('', '<br>' . $msg);
+        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (400728 / 1000), 500, 500);
+        $file_label = new \XoopsFormLabel('', '<br>'.$msg);
         $file_tray->addElement($file_label);
         $form->addElement($file_tray);
-        $form->addElement( new \XoopsFormHidden('file1', $event_picture1));
+        $form->addElement(new \XoopsFormHidden('file1', $event_picture1));
         unset($file_img, $file_tray);
         //Picture2
         $file_tray = new \XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 2), '');
         if (!empty($event_picture2)) {
-            $file_tray->addElement( new \XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/' . $event_picture2 . "' name='image' id='image' alt=''><br><br>"));
+            $file_tray->addElement(new \XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/'.$event_picture2."' name='image' id='image' alt=''><br><br>"));
             $check_del_img = new \XoopsFormCheckBox('', 'delimg_2');
             $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG);
             $file_tray->addElement($check_del_img);
@@ -1279,18 +1279,18 @@ 
         }
         $file_img->setExtra("size ='40'");
         $file_tray->addElement($file_img);
-        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(400728 / 1000), 500, 500);
-        $file_label = new \XoopsFormLabel('', '<br>' . $msg);
+        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (400728 / 1000), 500, 500);
+        $file_label = new \XoopsFormLabel('', '<br>'.$msg);
         $file_tray->addElement($file_label);
         $form->addElement($file_tray);
-        $form->addElement( new \XoopsFormHidden('file2', $event_picture2));
+        $form->addElement(new \XoopsFormHidden('file2', $event_picture2));
         unset($file_img, $file_tray);
         ///////////////////////////////////////////////////////////////////////////////
 
         $buttonElmtTray = new \XoopsFormElementTray('', '&nbsp;');
-        $buttonElmtTray->addElement( new \XoopsFormButton('', 'form_submit', _SUBMIT, 'submit'), false);
+        $buttonElmtTray->addElement(new \XoopsFormButton('', 'form_submit', _SUBMIT, 'submit'), false);
         if ('user' === $siteSide) {
-            $buttonElmtTray->addElement( new \XoopsFormButton('', 'form_preview', _MD_EXTCAL_PREVIEW, 'submit'), false);
+            $buttonElmtTray->addElement(new \XoopsFormButton('', 'form_preview', _MD_EXTCAL_PREVIEW, 'submit'), false);
         }
         $form->addElement($buttonElmtTray);
 
@@ -1347,7 +1347,7 @@ 
                 $recurRules = 'weekly|';
                 $recurRules .= $parm['rrule_weekly_interval'];
                 foreach ($parm['rrule_weekly_bydays'] as $day) {
-                    $recurRules .= '|' . $day;
+                    $recurRules .= '|'.$day;
                 }
 
                 break;
@@ -1357,11 +1357,11 @@ 
                     $parm['rrule_monthly_interval'] = 0;
                 }
                 $recurRules = 'monthly|';
-                $recurRules .= $parm['rrule_monthly_interval'] . '|';
+                $recurRules .= $parm['rrule_monthly_interval'].'|';
                 if ('' != $parm['rrule_monthly_byday']) {
                     $recurRules .= $parm['rrule_monthly_byday'];
                 } else {
-                    $recurRules .= 'MD' . $parm['rrule_bymonthday'];
+                    $recurRules .= 'MD'.$parm['rrule_bymonthday'];
                 }
 
                 break;
@@ -1395,9 +1395,9 @@ 
 
                 $recurRules = 'yearly|';
                 $recurRules .= $parm['rrule_yearly_interval'];
-                $recurRules .= '|' . $parm['rrule_yearly_byday'];
+                $recurRules .= '|'.$parm['rrule_yearly_byday'];
                 foreach ($parm['rrule_yearly_bymonths'] as $month) {
-                    $recurRules .= '|' . $month;
+                    $recurRules .= '|'.$month;
                 }
 
                 break;
@@ -2327,10 +2327,10 @@ 
         global $xoopsDB;
 
         //echo "<hr>{$andor}-{$limit}-{$offset}-{$userId}-{$user}<br>{$criteresPlus}";
-        $tEvent = $xoopsDB->prefix('extcal_event') . ' AS te';
-        $tCat   = $xoopsDB->prefix('extcal_cat') . ' AS tc';
+        $tEvent = $xoopsDB->prefix('extcal_event').' AS te';
+        $tCat   = $xoopsDB->prefix('extcal_cat').' AS tc';
 
-        $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}";
+        $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}";
         //---------------------------------------------------
         $tw   = [];
         $tw[] = 'te.cat_id = tc.cat_id';
@@ -2339,7 +2339,7 @@ 
         $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
         $inCat                = 'te.cat_id IN (0)';
         if (count($authorizedAccessCats) > 0) {
-            $inCat = 'te.cat_id IN (' . implode(',', $authorizedAccessCats) . ')';
+            $inCat = 'te.cat_id IN ('.implode(',', $authorizedAccessCats).')';
         }
         //echo $tw[count($tw)-1];
 
@@ -2375,12 +2375,12 @@ 
                 'te.event_address',
                 'tc.cat_name',
             ];
-            $t       = [];
+            $t = [];
             for ($i = 0, $count = count($queryarray); $i < $count; ++$i) {
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
             }
 
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
+            $flt = '('.implode(" {$andor} ", $t1).')';
 
             $t = [];
             for ($h = 0, $count = count($tFields); $h < $count; ++$h) {
@@ -2389,10 +2389,10 @@ 
 
             $filtre = implode(' OR ', $t);
             $filtre = str_replace('#', '%', $filtre);
-            $tw[]   = '(' . $filtre . ')';
+            $tw[]   = '('.$filtre.')';
         }
 
-        $sql .= ' WHERE ' . implode(' AND ', $tw);
+        $sql .= ' WHERE '.implode(' AND ', $tw);
         //------------------------------------------------------------
         if (count($orderBy) > 0) {
             $t = [];
@@ -2402,7 +2402,7 @@ 
                 }
             }
             if (count($t) > 0) {
-                $sql .= ' ORDER BY ' . implode(',', $t);
+                $sql .= ' ORDER BY '.implode(',', $t);
             }
         }
 
@@ -2435,7 +2435,7 @@ 
         $i = 0;
         while ($myrow = $xoopsDB->fetchArray($result)) {
             $ret[$i]['image'] = 'assets/images/icons/extcal.gif';
-            $ret[$i]['link']  = 'event.php?event=' . $myrow['event_id'];
+            $ret[$i]['link']  = 'event.php?event='.$myrow['event_id'];
             $ret[$i]['title'] = $myrow['event_title'];
             $ret[$i]['time']  = $myrow['event_submitdate'];
             $ret[$i]['uid']   = $myrow['event_submitter'];
@@ -2475,23 +2475,23 @@ 
         //        }
         $tEvent = $xoopsDB->prefix('extcal_event');
         $tCat   = $xoopsDB->prefix('extcal_cat');
-        $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'";
+        $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'";
 
         $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
         $count                = count($authorizedAccessCats);
         if ($count > 0) {
-            $in = '(' . $authorizedAccessCats[0];
+            $in = '('.$authorizedAccessCats[0];
             array_shift($authorizedAccessCats);
             foreach ($authorizedAccessCats as $authorizedAccessCat) {
-                $in .= ',' . $authorizedAccessCat;
+                $in .= ','.$authorizedAccessCat;
             }
             $in .= ')';
         } else {
             $in = '(0)';
         }
-        $sql .= " AND {$tEvent}.cat_id IN " . $in . '';
+        $sql .= " AND {$tEvent}.cat_id IN ".$in.'';
         if (0 != $userId) {
-            $sql .= " AND event_submitter = '" . $userId . "'";
+            $sql .= " AND event_submitter = '".$userId."'";
         }
 
         //echoArray($queryarray,false);
@@ -2511,7 +2511,7 @@ 
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
             }
 
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
+            $flt = '('.implode(" {$andor} ", $t1).')';
 
             $t = [];
             for ($h = 0, $count = count($tFields); $h < $count; ++$h) {
@@ -2520,11 +2520,11 @@ 
 
             $filtre = implode(' OR ', $t);
             $filtre = str_replace('#', '%', $filtre);
-            $sql    .= " AND ($filtre)";
+            $sql .= " AND ($filtre)";
         }
 
         if ('' != $criteresPlus) {
-            $sql .= ' AND ' . $criteresPlus;
+            $sql .= ' AND '.$criteresPlus;
         }
         $sql .= ' ORDER BY event_id DESC';
 
@@ -2534,7 +2534,7 @@ 
         if ($xoopsSearch) {
             while ($myrow = $xoopsDB->fetchArray($result)) {
                 $ret[$i]['image'] = 'assets/images/icons/extcal.gif';
-                $ret[$i]['link']  = 'event.php?event=' . $myrow['event_id'];
+                $ret[$i]['link']  = 'event.php?event='.$myrow['event_id'];
                 $ret[$i]['title'] = $myrow['event_title'];
                 $ret[$i]['time']  = $myrow['event_submitdate'];
                 $ret[$i]['uid']   = $myrow['event_submitter'];

class/ExtcalPersistableObjectHandler.php

Doc Comments +3 added lines, -3 removed lines

@@ -512,7 +512,7 @@ 
 
     /**
      * @param        $objects
-     * @param array  $externalKeys
+     * @param string[]  $externalKeys
      * @param string $format
      *
      * @return array
@@ -619,7 +619,7 @@ 
     }
 
     /**
-     * @param null|CriteriaElement $criteria
+     * @param null|\CriteriaElement $criteria
      * @param string               $sum
      *
      * @return array|string
@@ -660,7 +660,7 @@ 
     }
 
     /**
-     * @param null|CriteriaElement $criteria
+     * @param null|\CriteriaElement $criteria
      * @param string               $max
      *
      * @return array|string

Spacing +46 added lines, -46 removed lines

@@ -100,12 +100,12 @@ 
     public function get($id = null, $fields = null, $as_object = true) //get($id, $as_object = true)
     {
         if (is_array($this->keyName)) {
-            $criteria =  new \CriteriaCompo();
+            $criteria = new \CriteriaCompo();
             for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
-                $criteria->add( new \Criteria($this->keyName[$i], (int)$id[$i]));
+                $criteria->add(new \Criteria($this->keyName[$i], (int) $id[$i]));
             }
         } else {
-            $criteria =  new \Criteria($this->keyName, (int)$id);
+            $criteria = new \Criteria($this->keyName, (int) $id);
         }
         $criteria->setLimit(1);
         $objectArray = $this->getObjects($criteria, false, true);
@@ -129,11 +129,11 @@ 
     {
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->table;
+        $sql   = 'SELECT * FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' != $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -168,7 +168,7 @@ 
                     $ret[] = $obj;
                 } else {
                     $row  = [];
-                    $vars =& $obj->getVars();
+                    $vars = & $obj->getVars();
                     foreach (array_keys($vars) as $i) {
                         $row[$i] = $obj->getVar($i);
                     }
@@ -179,7 +179,7 @@ 
                     $ret[$myrow[$this->keyName]] = $obj;
                 } else {
                     $row  = [];
-                    $vars =& $obj->getVars();
+                    $vars = & $obj->getVars();
                     foreach (array_keys($vars) as $i) {
                         $row[$i] = $obj->getVar($i);
                     }
@@ -205,22 +205,22 @@ 
     {
         $ret = [];
         if (null === $criteria) {
-            $criteria =  new \CriteriaCompo();
+            $criteria = new \CriteriaCompo();
         }
 
         if ('' == $criteria->getSort()) {
             $criteria->setSort($this->identifierName);
         }
 
-        $sql = 'SELECT ' . $this->keyName;
+        $sql = 'SELECT '.$this->keyName;
         if (!empty($this->identifierName)) {
-            $sql .= ', ' . $this->identifierName;
+            $sql .= ', '.$this->identifierName;
         }
-        $sql .= ' FROM ' . $this->table;
+        $sql .= ' FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' != $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -253,12 +253,12 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
             if ('' != $criteria->groupby) {
                 $groupby = true;
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
             }
         }
-        $sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table;
+        $sql = 'SELECT '.$field.'COUNT(*) FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' != $criteria->groupby) {
                 $sql .= $criteria->getGroupby();
             }
@@ -294,13 +294,13 @@ 
         if (is_array($this->keyName)) {
             $clause = [];
             for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
-                $clause[] = $this->keyName[$i] . ' = ' . $id[$i];
+                $clause[] = $this->keyName[$i].' = '.$id[$i];
             }
             $whereclause = implode(' AND ', $clause);
         } else {
-            $whereclause = $this->keyName . ' = ' . $id;
+            $whereclause = $this->keyName.' = '.$id;
         }
-        $sql = 'DELETE FROM ' . $this->table . ' WHERE ' . $whereclause;
+        $sql = 'DELETE FROM '.$this->table.' WHERE '.$whereclause;
         if (false !== $force) {
             $result = $this->db->queryF($sql);
         } else {
@@ -331,7 +331,7 @@ 
             }
 
             if (!($obj instanceof $this->className && class_exists($this->className))) {
-                $obj->setErrors(get_class($obj) . ' Differs from ' . $this->className);
+                $obj->setErrors(get_class($obj).' Differs from '.$this->className);
 
                 return false;
             }
@@ -342,7 +342,7 @@ 
 
         foreach ($obj->cleanVars as $k => $v) {
             if (XOBJ_DTYPE_INT == $obj->vars[$k]['data_type']) {
-                $cleanvars[$k] = (int)$v;
+                $cleanvars[$k] = (int) $v;
             } elseif (is_array($v)) {
                 $cleanvars[$k] = $this->db->quoteString(implode(',', $v));
             } else {
@@ -352,12 +352,12 @@ 
         if ($obj->isNew()) {
             if (!is_array($this->keyName)) {
                 if ($cleanvars[$this->keyName] < 1) {
-                    $cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq');
+                    $cleanvars[$this->keyName] = $this->db->genId($this->table.'_'.$this->keyName.'_seq');
                 }
             }
-            $sql = 'INSERT INTO ' . $this->table . ' (' . implode(',', array_keys($cleanvars)) . ') VALUES (' . implode(',', array_values($cleanvars)) . ')';
+            $sql = 'INSERT INTO '.$this->table.' ('.implode(',', array_keys($cleanvars)).') VALUES ('.implode(',', array_values($cleanvars)).')';
         } else {
-            $sql = 'UPDATE ' . $this->table . ' SET';
+            $sql = 'UPDATE '.$this->table.' SET';
             foreach ($cleanvars as $key => $value) {
                 if ((!is_array($this->keyName) && $key == $this->keyName)
                     || (is_array($this->keyName)
@@ -367,7 +367,7 @@ 
                 if (isset($notfirst)) {
                     $sql .= ',';
                 }
-                $sql      .= ' ' . $key . ' = ' . $value;
+                $sql .= ' '.$key.' = '.$value;
                 $notfirst = true;
             }
             if (is_array($this->keyName)) {
@@ -376,12 +376,12 @@ 
                     if ($i > 0) {
                         $whereclause .= ' AND ';
                     }
-                    $whereclause .= $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
+                    $whereclause .= $this->keyName[$i].' = '.$obj->getVar($this->keyName[$i]);
                 }
             } else {
-                $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
+                $whereclause = $this->keyName.' = '.$obj->getVar($this->keyName);
             }
-            $sql .= ' WHERE ' . $whereclause;
+            $sql .= ' WHERE '.$whereclause;
         }
         if (false !== $force) {
             $result = $this->db->queryF($sql);
@@ -410,7 +410,7 @@ 
      */
     public function updateAll($fieldname, $fieldvalue, \CriteriaElement $criteria = null, $force = false)
     {
-        $setClause = $fieldname . ' = ';
+        $setClause = $fieldname.' = ';
         if (is_numeric($fieldvalue)) {
             $setClause .= $fieldvalue;
         } elseif (is_array($fieldvalue)) {
@@ -418,9 +418,9 @@ 
         } else {
             $setClause .= $this->db->quoteString($fieldvalue);
         }
-        $sql = 'UPDATE ' . $this->table . ' SET ' . $setClause;
+        $sql = 'UPDATE '.$this->table.' SET '.$setClause;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (false !== $force) {
             $result = $this->db->queryF($sql);
@@ -444,9 +444,9 @@ 
      */
     public function updateFieldValue($fieldname, $fieldvalue, $criteria = null, $force = true)
     {
-        $sql = 'UPDATE ' . $this->table . ' SET ' . $fieldname . ' = ' . $fieldvalue;
+        $sql = 'UPDATE '.$this->table.' SET '.$fieldname.' = '.$fieldvalue;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (false !== $force) {
             $result = $this->db->queryF($sql);
@@ -473,8 +473,8 @@ 
     public function deleteAll(\CriteriaElement $criteria = null, $force = true, $asObject = false)
     {
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql = 'DELETE FROM ' . $this->table;
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql = 'DELETE FROM '.$this->table;
+            $sql .= ' '.$criteria->renderWhere();
             if (!$this->db->query($sql)) {
                 return false;
             }
@@ -608,8 +608,8 @@ 
      */
     public function updateCounter($fieldname, $criteria, $op = '+')
     {
-        $sql    = 'UPDATE ' . $this->table . ' SET ' . $fieldname . ' = ' . $fieldname . $op . '1';
-        $sql    .= ' ' . $criteria->renderWhere();
+        $sql    = 'UPDATE '.$this->table.' SET '.$fieldname.' = '.$fieldname.$op.'1';
+        $sql .= ' '.$criteria->renderWhere();
         $result = $this->db->queryF($sql);
         if (!$result) {
             return false;
@@ -631,12 +631,12 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
             if ('' != $criteria->groupby) {
                 $groupby = true;
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
             }
         }
-        $sql = 'SELECT ' . $field . "SUM($sum) FROM " . $this->table;
+        $sql = 'SELECT '.$field."SUM($sum) FROM ".$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' != $criteria->groupby) {
                 $sql .= $criteria->getGroupby();
             }
@@ -672,12 +672,12 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
             if ('' != $criteria->groupby) {
                 $groupby = true;
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
             }
         }
-        $sql = 'SELECT ' . $field . "MAX($max) FROM " . $this->table;
+        $sql = 'SELECT '.$field."MAX($max) FROM ".$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' != $criteria->groupby) {
                 $sql .= $criteria->getGroupby();
             }
@@ -710,9 +710,9 @@ 
     {
         $field = '';
 
-        $sql = 'SELECT ' . $field . "AVG($avg) FROM " . $this->table;
+        $sql = 'SELECT '.$field."AVG($avg) FROM ".$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $result = $this->db->query($sql);
         if (!$result) {

class/Form/FormFileCheckBox.php

Doc Comments +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 class FormFileCheckBox extends \XoopsFormCheckBox
 {
     /**
-     * @param      $caption
-     * @param      $name
+     * @param      string $caption
+     * @param      string $name
      * @param null $value
      *
      * @return FormFileCheckBox

class/Form/FormRRuleCheckBox.php

Doc Comments +3 added lines, -3 removed lines

@@ -24,9 +24,9 @@
 class FormRRuleCheckBox extends \XoopsFormCheckBox
 {
     /**
-     * @param      $caption
-     * @param      $name
-     * @param null $value
+     * @param      string $caption
+     * @param      string $name
+     * @param string $value
      */
     public function __construct($caption, $name, $value = null)
     {

view_search.php

Spacing +14 added lines, -14 removed lines

@@ -2,14 +2,14 @@ 
 
 use XoopsModules\Extcal;
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
-$params                                  = [
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
+$params = [
     'view' => _EXTCAL_NAV_SEARCH,
     'file' => _EXTCAL_FILE_SEARCH,
 ];
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $recurEventsArray = [];
 //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 @@ 
 /***************************************************************/
 $searchExp = isset($_POST['searchExp']) ? $_POST['searchExp'] : '';
 $andor     = isset($_POST['andor']) ? $_POST['andor'] : '';
-$year      = isset($_POST['year']) ? (int)$_POST['year'] : date('Y');
-$month     = isset($_POST['month']) ? (int)$_POST['month'] : date('n');
-$day       = isset($_POST['day']) ? (int)$_POST['day'] : 0;
-$cat       = isset($_POST['cat']) ? (int)$_POST['cat'] : 0;
+$year      = isset($_POST['year']) ? (int) $_POST['year'] : date('Y');
+$month     = isset($_POST['month']) ? (int) $_POST['month'] : date('n');
+$day       = isset($_POST['day']) ? (int) $_POST['day'] : 0;
+$cat       = isset($_POST['cat']) ? (int) $_POST['cat'] : 0;
 $orderby1  = isset($_POST['orderby1']) ? $_POST['orderby1'] : 'cat_name ASC';
 $orderby2  = isset($_POST['orderby2']) ? $_POST['orderby2'] : 'event_title ASC';
 $orderby3  = isset($_POST['orderby3']) ? $_POST['orderby3'] : '';
@@ -108,18 +108,18 @@ 
     }
 }
 
-$criteria =  new \CriteriaCompo();
-$criteria->add( new \Criteria('event_isrecur', 1));
+$criteria = new \CriteriaCompo();
+$criteria->add(new \Criteria('event_isrecur', 1));
 
 if ($cat > 0) {
-    $criteria->add( new \Criteria('cat_id', $cat));
+    $criteria->add(new \Criteria('cat_id', $cat));
 }
 
 //$criteria =  new \Criteria('event_isrecur', 1);
 
 $recurrents = $eventHandler->getAllEvents($criteria, false);
 //$catHandler = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
-$catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+$catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
 
 //=========================================
 for ($h = 0, $count = count($recurrents); $h < $count; ++$h) {
@@ -146,7 +146,7 @@ 
     }
 }
 
-$eventsArray = array_merge((array)$eventsArray, (array)$recurEventsArray);
+$eventsArray = array_merge((array) $eventsArray, (array) $recurEventsArray);
 
 // Sort event array by event start
 //usort($eventsArray, "orderEvents");
@@ -237,4 +237,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'search');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

download_attachement.php

Spacing +6 added lines, -6 removed lines

@@ -2,20 +2,20 @@
 
 use XoopsModules\Extcal;
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 
 if (!isset($_GET['file'])) {
     $fileId = 0;
 } else {
-    $fileId = (int)$_GET['file'];
+    $fileId = (int) $_GET['file'];
 }
 /** @var FileHandler $fileHandler */
 $fileHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_FILE);
 
 $file = $fileHandler->getFile($fileId);
 
-header('Content-Type: ' . $file->getVar('file_mimetype') . '');
-header('Content-Disposition: attachment; filename="' . $file->getVar('file_nicename') . '"');
+header('Content-Type: '.$file->getVar('file_mimetype').'');
+header('Content-Disposition: attachment; filename="'.$file->getVar('file_nicename').'"');
 
-readfile(XOOPS_ROOT_PATH . '/uploads/extcal/' . $file->getVar('file_name'));
+readfile(XOOPS_ROOT_PATH.'/uploads/extcal/'.$file->getVar('file_name'));

post.php

Spacing +21 added lines, -21 removed lines

@@ -19,20 +19,20 @@ 
 
 use XoopsModules\Extcal;
 
-include __DIR__ . '/../../mainfile.php';
+include __DIR__.'/../../mainfile.php';
 $GLOBALS['xoopsOption']['template_main'] = 'extcal_post.tpl';
 
-include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 //include __DIR__ . '/class/form/extcalform.php';
 //include __DIR__ . '/class/perm.php';
 
-require_once __DIR__ . '/class/Utility.php';
-require_once __DIR__ . '/include/constantes.php';
+require_once __DIR__.'/class/Utility.php';
+require_once __DIR__.'/include/constantes.php';
 
 $permHandler = Extcal\Perm::getHandler();
 $xoopsUser   = $xoopsUser ?: null;
 
-if (!$permHandler->isAllowed($xoopsUser, 'extcal_cat_submit', (int)$_POST['cat_id'])) {
+if (!$permHandler->isAllowed($xoopsUser, 'extcal_cat_submit', (int) $_POST['cat_id'])) {
     redirect_header('index.php', 3);
 }
 
@@ -40,16 +40,16 @@ 
 $eventHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
 
 if (isset($_POST['form_preview'])) {
-    include XOOPS_ROOT_PATH . '/header.php';
+    include XOOPS_ROOT_PATH.'/header.php';
 
     // Title of the page
     $xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
 
     $data = [
         'event_title'        => $_POST['event_title'],
-        'cat_id'             => (int)$_POST['cat_id'],
+        'cat_id'             => (int) $_POST['cat_id'],
         'event_desc'         => $_POST['event_desc'],
-        'event_nbmember'     => (int)$_POST['event_nbmember'],
+        'event_nbmember'     => (int) $_POST['event_nbmember'],
         'event_contact'      => $_POST['event_contact'],
         'event_url'          => $_POST['event_url'],
         'event_email'        => $_POST['event_email'],
@@ -58,14 +58,14 @@ 
         'event_start'        => $_POST['event_start'],
         'have_end'           => $_POST['have_end'],
         'event_end'          => $_POST['event_end'],
-        'dohtml'             => (int)$xoopsModuleConfig['allow_html'],
+        'dohtml'             => (int) $xoopsModuleConfig['allow_html'],
         'event_price'        => $_POST['event_price'],
         'event_organisateur' => $_POST['event_organisateur'],
         'event_icone'        => $_POST['event_icone'],
     ];
 
     if (isset($_POST['event_id'])) {
-        $data['event_id'] = (int)$_POST['event_id'];
+        $data['event_id'] = (int) $_POST['event_id'];
     }
 
     // Creating tempory event object to apply Object data filtering
@@ -84,7 +84,7 @@ 
     //     // Assigning language data to the template
     //     $xoopsTpl->assign('lang', $lang);
 
-    $event['cat_id']   = (int)$_POST['cat_id'];
+    $event['cat_id']   = (int) $_POST['cat_id'];
     $event['have_end'] = $_POST['have_end'];
 
     // Display the submit form
@@ -93,7 +93,7 @@ 
     $xoopsTpl->assign('preview', true);
     $xoopsTpl->assign('formBody', $formBody);
 
-    include XOOPS_ROOT_PATH . '/footer.php';
+    include XOOPS_ROOT_PATH.'/footer.php';
 } elseif (isset($_POST['form_submit'])) {
     if (!isset($_POST['rrule_weekly_interval'])) {
         $_POST['rrule_weekly_interval'] = 0;
@@ -117,11 +117,11 @@ 
     Extcal\Utility::extcal_loadImg($_REQUEST, $event_picture1, $event_picture2);
     ///////////////////////////////////////////////////////////////////////////////
 
-    require_once __DIR__ . '/class/perm.php';
+    require_once __DIR__.'/class/perm.php';
 
     $fileHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_FILE);
     $permHandler = Extcal\Perm::getHandler();
-    $approve     = $permHandler->isAllowed($xoopsUser, 'extcal_cat_autoapprove', (int)$_POST['cat_id']);
+    $approve     = $permHandler->isAllowed($xoopsUser, 'extcal_cat_autoapprove', (int) $_POST['cat_id']);
 
     $data = [
         'event_title'         => $_POST['event_title'],
@@ -147,11 +147,11 @@ 
     ];
 
     if (isset($_POST['event_id'])) {
-        $eventHandler->modifyEvent((int)$_POST['event_id'], $data);
-        $fileHandler->updateEventFile((int)$_POST['event_id']);
-        $fileHandler->createFile((int)$_POST['event_id']);
+        $eventHandler->modifyEvent((int) $_POST['event_id'], $data);
+        $fileHandler->updateEventFile((int) $_POST['event_id']);
+        $fileHandler->createFile((int) $_POST['event_id']);
 
-        redirect_header('event.php?event=' . $_POST['event_id'], 3, _MD_EXTCAL_EVENT_UPDATED, false);
+        redirect_header('event.php?event='.$_POST['event_id'], 3, _MD_EXTCAL_EVENT_UPDATED, false);
     } else {
         $data['event_submitter']  = $xoopsUser ? $xoopsUser->getVar('uid') : 0;
         $data['event_submitdate'] = time();
@@ -168,9 +168,9 @@ 
         $notificationHandler->triggerEvent('global', 0, $notifyEvent, ['EVENT_TITLE' => $_POST['event_title']]);
         if (1 == $approve) {
 //            $catHandler = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
-            $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
-            $cat        = $catHandler->getCat((int)$_POST['cat_id'], $xoopsUser, 'all');
-            $notificationHandler->triggerEvent('cat', (int)$_POST['cat_id'], 'new_event_cat', [
+            $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+            $cat = $catHandler->getCat((int) $_POST['cat_id'], $xoopsUser, 'all');
+            $notificationHandler->triggerEvent('cat', (int) $_POST['cat_id'], 'new_event_cat', [
                 'EVENT_TITLE' => $_POST['event_title'],
                 'CAT_NAME'    => $cat->getVar('cat_name'),
             ]);

blocks/day_events.php

Spacing +10 added lines, -10 removed lines

@@ -19,7 +19,7 @@ 
 
 use XoopsModules\Extcal;
 
-require_once __DIR__ . '/../include/constantes.php';
+require_once __DIR__.'/../include/constantes.php';
 
 /**
  * @param $options
@@ -63,26 +63,26 @@ 
     global $xoopsUser;
 
 //    $catHandler = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
-    $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+    $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
 
     $cats = $catHandler->getAllCat($xoopsUser, 'extcal_cat_view');
 
-    $form = _MB_EXTCAL_DISPLAY . " \n";
-    $form .= '<input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text">&nbsp;' . _MB_EXTCAL_EVENT . '<br>';
-    $form .= _MB_EXTCAL_TITLE_LENGTH . ' : <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text"><br>';
+    $form = _MB_EXTCAL_DISPLAY."&nbsp;\n";
+    $form .= '<input name="options[0]" size="5" maxlength="255" value="'.$options[0].'" type="text">&nbsp;'._MB_EXTCAL_EVENT.'<br>';
+    $form .= _MB_EXTCAL_TITLE_LENGTH.' : <input name="options[1]" size="5" maxlength="255" value="'.$options[1].'" type="text"><br>';
     array_shift($options);
     array_shift($options);
-    $form .= _MB_EXTCAL_CAT_TO_USE . '<br><select name="options[]" multiple="multiple" size="5">';
+    $form .= _MB_EXTCAL_CAT_TO_USE.'<br><select name="options[]" multiple="multiple" size="5">';
     if (false === array_search(0, $options)) {
-        $form .= '<option value="0">' . _MB_EXTCAL_ALL_CAT . '</option>';
+        $form .= '<option value="0">'._MB_EXTCAL_ALL_CAT.'</option>';
     } else {
-        $form .= '<option value="0" selected="selected">' . _MB_EXTCAL_ALL_CAT . '</option>';
+        $form .= '<option value="0" selected="selected">'._MB_EXTCAL_ALL_CAT.'</option>';
     }
     foreach ($cats as $cat) {
         if (false === array_search($cat->getVar('cat_id'), $options)) {
-            $form .= '<option value="' . $cat->getVar('cat_id') . '">' . $cat->getVar('cat_name') . '</option>';
+            $form .= '<option value="'.$cat->getVar('cat_id').'">'.$cat->getVar('cat_name').'</option>';
         } else {
-            $form .= '<option value="' . $cat->getVar('cat_id') . '" selected="selected">' . $cat->getVar('cat_name') . '</option>';
+            $form .= '<option value="'.$cat->getVar('cat_id').'" selected="selected">'.$cat->getVar('cat_name').'</option>';
         }
     }
     $form .= '</select>';