mambax7 / extcal

include/oninstall.php

Spacing +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
 function xoops_module_pre_install_extcal(\XoopsModule $module)
 {
     $moduleDirName = basename(dirname(__DIR__));
-    $utility     = new Extcal\Utility();
+    $utility = new Extcal\Utility();
 
     //check for minimum XOOPS version
     if (!$utility::checkVerXoops($module)) {
@@ -44,7 +44,7 @@ 
 
     $mod_tables = $module->getInfo('tables');
     foreach ($mod_tables as $table) {
-        $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+        $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');
     }
 
     return true;
@@ -73,18 +73,18 @@ 
      */
 
     // Access right
-    $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 1, XOOPS_GROUP_USERS, $moduleId);
-    $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
+    $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 1, XOOPS_GROUP_USERS, $moduleId);
+    $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
 
     // Can submit
-    $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 2, XOOPS_GROUP_ADMIN, $moduleId);
+    $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 2, XOOPS_GROUP_ADMIN, $moduleId);
 
     // Auto approve
-    $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 4, XOOPS_GROUP_ADMIN, $moduleId);
+    $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 4, XOOPS_GROUP_ADMIN, $moduleId);
 
     //    $moduleDirName = $xoopsModule->getVar('dirname');
-    $configurator = require_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/config.php');
+    $configurator = require_once $GLOBALS['xoops']->path('modules/'.$moduleDirName.'/include/config.php');
 
     /** @var Extcal\Utility $utility */
     $utility = new \XoopsModules\Extcal\Utility();
@@ -96,9 +96,9 @@ 
         }
     }
     if (count($configurator['copyFiles']) > 0) {
-        $file =  dirname(__DIR__) . '/assets/images/blank.png';
+        $file = dirname(__DIR__).'/assets/images/blank.png';
         foreach (array_keys($configurator['copyFiles']) as $i) {
-            $dest = $configurator['copyFiles'][$i] . '/blank.png';
+            $dest = $configurator['copyFiles'][$i].'/blank.png';
             $utility::copyFile($file, $dest);
         }
     }

view_year.php

Spacing +9 added lines, -9 removed lines

@@ -19,11 +19,11 @@ 
 
 use XoopsModules\Extcal;
 
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+require_once dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $params                                  = ['view' => _EXTCAL_NAV_YEAR, 'file' => _EXTCAL_FILE_YEAR];
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 /** @var Extcal\Helper $helper */
 $helper = Extcal\Helper::getInstance();
@@ -59,7 +59,7 @@ 
     'cat'          => $cat,
     'externalKeys' => 'cat_id',
 ];
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 $eventsArray = $events;
 // Formating date
@@ -103,21 +103,21 @@ 
 // Making navig data
 $navig = [
     'prev' => [
-        'uri'  => 'year=' . $prevYear,
+        'uri'  => 'year='.$prevYear,
         'name' => $prevYear,
     ],
     'this' => [
-        'uri'  => 'year=' . $year,
+        'uri'  => 'year='.$year,
         'name' => $year,
     ],
     'next' => [
-        'uri'  => 'year=' . $nexYear,
+        'uri'  => 'year='.$nexYear,
         'name' => $nexYear,
     ],
 ];
 
 // Title of the page
-$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']);
+$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']);
 
 // Assigning navig data to the template
 $xoopsTpl->assign('navig', $navig);
@@ -171,4 +171,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'year');
 
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

view_agenda-week.php

Spacing +11 added lines, -11 removed lines

@@ -2,11 +2,11 @@ 
 
 use XoopsModules\Extcal;
 
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+require_once dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $params                                  = ['view' => _EXTCAL_NAV_AGENDA_WEEK, 'file' => _EXTCAL_FILE_AGENDA_WEEK];
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 /** @var Extcal\Helper $helper */
 $helper = Extcal\Helper::getInstance();
 
@@ -20,7 +20,7 @@ 
 $dayTS = mktime(0, 0, 0, $month, $day, $year);
 //$offset = date('w', $dayTS) - $helper->getConfig('week_start_day');
 $offset = date('w', $dayTS) + 7 - $helper->getConfig('week_start_day') < 7 ? date('w', $dayTS) + 7 - $helper->getConfig('week_start_day') : 0;
-$dayTS  -= ($offset * _EXTCAL_TS_DAY);
+$dayTS -= ($offset * _EXTCAL_TS_DAY);
 $year   = date('Y', $dayTS);
 $month  = date('n', $dayTS);
 $day    = date('j', $dayTS);
@@ -53,7 +53,7 @@ 
     'nbJours'      => $nbJours,
     'externalKeys' => 'cat_id',
 ];
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 $eventsArray = $events;
 // Formating date
@@ -85,7 +85,7 @@ 
 //-------------------------------------------------------------------
 
 //$params['colJourWidth'] = (int)((((500-50)/$nbJours)/500*100)+.5);
-$params['colJourWidth'] = (int)((((500 - 50) / $nbJours) / 500 * 100) + .6);
+$params['colJourWidth'] = (int) ((((500 - 50) / $nbJours) / 500 * 100) + .6);
 //  echo "agenda_week : {$dayTS}<br>";
 $tAgenda = agenda_getEvents($eventsArray, $dayTS, $hStart, $hEnd, $mTranche, $nbJours);
 //$exp = print_r($eventsArray, true);
@@ -107,21 +107,21 @@ 
 
 $navig = [
     'prev' => [
-        'uri'  => 'year=' . $pWeekCalObj->thisYear() . '&amp;month=' . $pWeekCalObj->thisMonth() . '&amp;day=' . $pWeekCalObj->thisDay(),
+        'uri'  => 'year='.$pWeekCalObj->thisYear().'&amp;month='.$pWeekCalObj->thisMonth().'&amp;day='.$pWeekCalObj->thisDay(),
         'name' => $timeHandler->getFormatedDate($helper->getConfig('nav_date_week'), $pWeekCalObj->getTimestamp()),
     ],
     'this' => [
-        'uri'  => 'year=' . $weekCalObj->thisYear() . '&amp;month=' . $weekCalObj->thisMonth() . '&amp;day=' . $weekCalObj->thisDay(),
+        'uri'  => 'year='.$weekCalObj->thisYear().'&amp;month='.$weekCalObj->thisMonth().'&amp;day='.$weekCalObj->thisDay(),
         'name' => $timeHandler->getFormatedDate($helper->getConfig('nav_date_week'), $weekCalObj->getTimestamp()),
     ],
     'next' => [
-        'uri'  => 'year=' . $nWeekCalObj->thisYear() . '&amp;month=' . $nWeekCalObj->thisMonth() . '&amp;day=' . $nWeekCalObj->thisDay(),
+        'uri'  => 'year='.$nWeekCalObj->thisYear().'&amp;month='.$nWeekCalObj->thisMonth().'&amp;day='.$nWeekCalObj->thisDay(),
         'name' => $timeHandler->getFormatedDate($helper->getConfig('nav_date_week'), $nWeekCalObj->getTimestamp()),
     ],
 ];
 
 // Title of the page
-$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']);
+$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']);
 
 // Assigning navig data to the template
 $xoopsTpl->assign('navig', $navig);
@@ -162,4 +162,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'agendaweek');
 
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

view_calendar-month.php

Spacing +9 added lines, -9 removed lines

@@ -2,8 +2,8 @@ 
 
 use XoopsModules\Extcal;
 
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+require_once dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 
 /** @var Extcal\Helper $helper */
 $helper = Extcal\Helper::getInstance();
@@ -15,7 +15,7 @@ 
 //require_once __DIR__   . '/preloads/autoloader.php';
 //$catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 /* ========================================================================== */
 $year  = \Xmf\Request::getInt('year', date('Y'), 'GET');
@@ -42,7 +42,7 @@ 
     'cat'          => $cat,
     'externalKeys' => 'cat_id',
 ];
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 
 // Calculating timestamp for the begin and the end of the month
@@ -138,21 +138,21 @@ 
 // Making navig data
 $navig = [
     'prev' => [
-        'uri'  => 'year=' . $pMonthCalObj->thisYear() . '&month=' . $pMonthCalObj->thisMonth(),
+        'uri'  => 'year='.$pMonthCalObj->thisYear().'&month='.$pMonthCalObj->thisMonth(),
         'name' => $timeHandler->getFormatedDate($helper->getConfig('nav_date_month'), $pMonthCalObj->getTimestamp()),
     ],
     'this' => [
-        'uri'  => 'year=' . $monthCalObj->thisYear() . '&month=' . $monthCalObj->thisMonth(),
+        'uri'  => 'year='.$monthCalObj->thisYear().'&month='.$monthCalObj->thisMonth(),
         'name' => $timeHandler->getFormatedDate($helper->getConfig('nav_date_month'), $monthCalObj->getTimestamp()),
     ],
     'next' => [
-        'uri'  => 'year=' . $nMonthCalObj->thisYear() . '&month=' . $nMonthCalObj->thisMonth(),
+        'uri'  => 'year='.$nMonthCalObj->thisYear().'&month='.$nMonthCalObj->thisMonth(),
         'name' => $timeHandler->getFormatedDate($helper->getConfig('nav_date_month'), $nMonthCalObj->getTimestamp()),
     ],
 ];
 
 // Title of the page
-$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']);
+$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']);
 
 // Assigning navig data to the template
 $xoopsTpl->assign('navig', $navig);
@@ -192,4 +192,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'calmonth');
 
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

comment_edit.php

Spacing +2 added lines, -2 removed lines

@@ -17,5 +17,5 @@
  * @author       XOOPS Development Team,
  */
 
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once XOOPS_ROOT_PATH . '/include/comment_edit.php';
+require_once dirname(dirname(__DIR__)).'/mainfile.php';
+require_once XOOPS_ROOT_PATH.'/include/comment_edit.php';

class/Location.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
 //Kraven 30
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once XOOPS_ROOT_PATH . '/kernel/object.php';
+require_once XOOPS_ROOT_PATH.'/kernel/object.php';
 
 //class Event extends \XoopsObject
 //class extcal_location extends \XoopsObject
@@ -71,7 +71,7 @@ 
 
         $title = $this->isNew() ? sprintf(_MD_EXTCAL_LOCATION_ADD) : sprintf(_MD_EXTCAL_LOCATION_EDIT);
 
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
         $form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
         $form->setExtra('enctype="multipart/form-data"');
@@ -90,7 +90,7 @@ 
         $form->addElement(new \XoopsFormTextArea(_MD_EXTCAL_LOCATION_HORAIRES, 'horaires', $this->getVar('horaires'), 3, 40));
         $form->addElement(new \XoopsFormTextArea(_MD_EXTCAL_LOCATION_DIVERS, 'divers', $this->getVar('divers'), 5, 40));
         //$form->addElement( new \XoopsFormTextArea(_MD_EXTCAL_LOCATION_TARIFS, 'tarifs', $this->getVar("tarifs"), 5, 40));
-        $form->addElement(new \XoopsFormText(_MD_EXTCAL_LOCATION_TARIFS . ' ( ' . _MD_EXTCAL_DEVISE2 . ' )', 'tarifs', 20, 20, $this->getVar('tarifs')), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_LOCATION_TARIFS.' ( '._MD_EXTCAL_DEVISE2.' )', 'tarifs', 20, 20, $this->getVar('tarifs')), false);
 
         //$form->addElement( new \XoopsFormTextArea(_MD_EXTCAL_LOCATION_MAP, 'map', $this->getVar("map"), 5, 40));
         $form->addElement(new \XoopsFormText(_MD_EXTCAL_LOCATION_MAP, 'map', 150, 255, $this->getVar('map')), false);
@@ -98,7 +98,7 @@ 
         //Logo
         $file_tray = new \XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 2), '');
         if ('' != $this->getVar('logo')) {
-            $file_tray->addElement(new \XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/location/' . $this->getVar('logo') . "' name='image' id='image' alt=''><br><br>"));
+            $file_tray->addElement(new \XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/location/'.$this->getVar('logo')."' name='image' id='image' alt=''><br><br>"));
             $check_del_img = new \XoopsFormCheckBox('', 'delimg');
             $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG);
             $file_tray->addElement($check_del_img);
@@ -109,8 +109,8 @@ 
         }
         $file_img->setExtra("size ='40'");
         $file_tray->addElement($file_img);
-        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(3145728 / 1000), 500, 500);
-        $file_label = new \XoopsFormLabel('', '<br>' . $msg);
+        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (3145728 / 1000), 500, 500);
+        $file_label = new \XoopsFormLabel('', '<br>'.$msg);
         $file_tray->addElement($file_label);
         $form->addElement($file_tray);
         $form->addElement(new \XoopsFormHidden('file', $this->getVar('logo')));

class/FileHandler.php

Spacing +10 added lines, -10 removed lines

@@ -21,7 +21,7 @@ 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 // // require_once __DIR__ . '/ExtcalPersistableObjectHandler.php';
-require_once XOOPS_ROOT_PATH . '/class/uploader.php';
+require_once XOOPS_ROOT_PATH.'/class/uploader.php';
 
 /**
  * Class FileHandler.
@@ -46,13 +46,13 @@ 
         $userId = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
 
         $allowedMimeType = [];
-        $mimeType        = require_once XOOPS_ROOT_PATH . '/include/mimetypes.inc.php';
+        $mimeType        = require_once XOOPS_ROOT_PATH.'/include/mimetypes.inc.php';
         foreach ($GLOBALS['xoopsModuleConfig']['allowed_file_extention'] as $fileExt) {
             $allowedMimeType[] = $mimeType[$fileExt];
         }
 
-        $uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH . '/uploads/extcal', $allowedMimeType, 3145728);
-        $uploader->setPrefix($userId . '-' . $eventId . '_');
+        $uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH.'/uploads/extcal', $allowedMimeType, 3145728);
+        $uploader->setPrefix($userId.'-'.$eventId.'_');
         if ($uploader->fetchMedia('event_file')) {
             if (!$uploader->upload()) {
                 return false;
@@ -113,14 +113,14 @@ 
         if (\Xmf\Request::hasVar('filetokeep', 'POST')) {
             if (is_array($_POST['filetokeep'])) {
                 $count = count($_POST['filetokeep']);
-                $in    = '(' . $_POST['filetokeep'][0];
+                $in    = '('.$_POST['filetokeep'][0];
                 array_shift($_POST['filetokeep']);
                 foreach ($_POST['filetokeep'] as $elmt) {
-                    $in .= ',' . $elmt;
+                    $in .= ','.$elmt;
                 }
                 $in .= ')';
             } else {
-                $in = '(' . $_POST['filetokeep'] . ')';
+                $in = '('.$_POST['filetokeep'].')';
             }
             $criteria->add(new \Criteria('file_id', $in, 'NOT IN'));
         }
@@ -157,7 +157,7 @@ 
     public function formatFileSize(&$file)
     {
         if ($file['file_size'] > 1000) {
-            $file['formated_file_size'] = round($file['file_size'] / 1000) . 'kb';
+            $file['formated_file_size'] = round($file['file_size'] / 1000).'kb';
         } else {
             $file['formated_file_size'] = '1kb';
         }
@@ -168,8 +168,8 @@ 
      */
     public function _deleteFile(&$file)
     {
-        if (file_exists(XOOPS_ROOT_PATH . '/uploads/extcal/' . $file->getVar('file_name'))) {
-            unlink(XOOPS_ROOT_PATH . '/uploads/extcal/' . $file->getVar('file_name'));
+        if (file_exists(XOOPS_ROOT_PATH.'/uploads/extcal/'.$file->getVar('file_name'))) {
+            unlink(XOOPS_ROOT_PATH.'/uploads/extcal/'.$file->getVar('file_name'));
         }
     }
 }

class/EventHandler.php

Spacing +43 added lines, -43 removed lines

@@ -23,7 +23,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once  dirname(__DIR__) . '/include/constantes.php';
+require_once  dirname(__DIR__).'/include/constantes.php';
 
 /**
  * Class EventHandler.
@@ -335,7 +335,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, Extcal\Helper::getInstance()->getConfig('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);
@@ -361,7 +361,7 @@ 
         $cat = 0;
         //        while (list($k, $v) = each($criteres)) {
         foreach ($criteres as $k => $v) {
-            ${$k} =$v;
+            ${$k} = $v;
         }
         if (!isset($nbDays)) {
             $nbDays = 7;
@@ -442,7 +442,7 @@ 
     {
         //        while (list($k, $v) = each($criteres)) {
         foreach ($criteres as $k => $v) {
-            ${$k} =$v;
+            ${$k} = $v;
         }
         if (!isset($nbDays)) {
             $nbDays = 7;
@@ -537,7 +537,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>';
         }
     }
 
@@ -866,10 +866,10 @@ 
         $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'));
@@ -889,10 +889,10 @@ 
         }
         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'));
@@ -933,7 +933,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 @@ 
         $form->addElement($catSelect, true);
         //-----------------------------------------------------------
 
-        $file_path =  dirname(__DIR__) . '/assets/css/images';
+        $file_path = dirname(__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, '');
@@ -1127,7 +1127,7 @@ 
         //location
         $locationHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_LOCATION);
         $location_select = new \XoopsFormSelect(_MD_EXTCAL_LOCATION, 'event_location', $event_location);
-        $criteria             = new \CriteriaCompo();
+        $criteria = new \CriteriaCompo();
         $criteria->setSort('nom');
         $criteria->setOrder('ASC');
 
@@ -1222,7 +1222,7 @@ 
         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);
@@ -1238,7 +1238,7 @@ 
         //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);
@@ -1249,8 +1249,8 @@ 
         }
         $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));
@@ -1258,7 +1258,7 @@ 
         //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);
@@ -1269,8 +1269,8 @@ 
         }
         $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));
@@ -1337,7 +1337,7 @@ 
                 $recurRules = 'weekly|';
                 $recurRules .= $parm['rrule_weekly_interval'];
                 foreach ($parm['rrule_weekly_bydays'] as $day) {
-                    $recurRules .= '|' . $day;
+                    $recurRules .= '|'.$day;
                 }
 
                 break;
@@ -1347,11 +1347,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;
@@ -1385,9 +1385,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;
@@ -2312,10 +2312,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';
@@ -2324,7 +2324,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];
 
@@ -2360,12 +2360,12 @@ 
                 'te.event_address',
                 'tc.cat_name',
             ];
-            $t       = [];
+            $t = [];
             foreach ($queryarray as $i => $iValue) {
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
             }
 
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
+            $flt = '('.implode(" {$andor} ", $t1).')';
 
             $t = [];
             foreach ($tFields as $h => $hValue) {
@@ -2374,10 +2374,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 = [];
@@ -2387,7 +2387,7 @@ 
                 }
             }
             if (count($t) > 0) {
-                $sql .= ' ORDER BY ' . implode(',', $t);
+                $sql .= ' ORDER BY '.implode(',', $t);
             }
         }
 
@@ -2420,7 +2420,7 @@ 
         $i = 0;
         while (false !== ($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'];
@@ -2460,23 +2460,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);
@@ -2496,7 +2496,7 @@ 
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
             }
 
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
+            $flt = '('.implode(" {$andor} ", $t1).')';
 
             $t = [];
             foreach ($tFields as $h => $hValue) {
@@ -2505,11 +2505,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';
 
@@ -2519,7 +2519,7 @@ 
         if ($xoopsSearch) {
             while (false !== ($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/Helper.php

Indentation +2 added lines, -2 removed lines

@@ -34,8 +34,8 @@
     public function __construct($debug = false)
     {
         $this->debug   = $debug;
-       $moduleDirName = basename(dirname(__DIR__));
-       parent::__construct($moduleDirName);
+        $moduleDirName = basename(dirname(__DIR__));
+        parent::__construct($moduleDirName);
     }
 
     /**

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
      */
     public function __construct($debug = false)
     {
-        $this->debug   = $debug;
+        $this->debug = $debug;
        $moduleDirName = basename(dirname(__DIR__));
        parent::__construct($moduleDirName);
     }
@@ -72,7 +72,7 @@ 
     {
         $ret   = false;
         $db    = \XoopsDatabaseFactory::getDatabaseConnection();
-        $class = '\\XoopsModules\\' . ucfirst(strtolower(basename(dirname(__DIR__)))) . '\\' . $name . 'Handler';
+        $class = '\\XoopsModules\\'.ucfirst(strtolower(basename(dirname(__DIR__)))).'\\'.$name.'Handler';
         $ret   = new $class($db);
         return $ret;
     }