mambax7 / extcal

class/pear/Calendar/tests/day_test.php

Indentation +7 added lines, -7 removed lines

@@ -27,13 +27,13 @@
     public function testPrevDay_Array()
     {
         $this->assertEqual([
-                               'year'   => 2003,
-                               'month'  => 10,
-                               'day'    => 24,
-                               'hour'   => 0,
-                               'minute' => 0,
-                               'second' => 0,
-                           ], $this->cal->prevDay('array'));
+                                'year'   => 2003,
+                                'month'  => 10,
+                                'day'    => 24,
+                                'hour'   => 0,
+                                'minute' => 0,
+                                'second' => 0,
+                            ], $this->cal->prevDay('array'));
     }
 
     public function testPrevHour()

Spacing +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 //
 
-require_once __DIR__ . '/simple_include.php';
-require_once __DIR__ . '/calendar_include.php';
+require_once __DIR__.'/simple_include.php';
+require_once __DIR__.'/calendar_include.php';
 
-require_once __DIR__ . '/./calendar_test.php';
+require_once __DIR__.'/./calendar_test.php';
 
 /**
  * Class TestOfDay.
@@ -131,7 +131,7 @@ 
 
     public function testSelection()
     {
-        require_once CALENDAR_ROOT . 'Hour.php';
+        require_once CALENDAR_ROOT.'Hour.php';
         $selection = [new Calendar_Hour(2003, 10, 25, 13)];
         $this->cal->build($selection);
         $i = 0;

event_member.php

Indentation +3 added lines, -3 removed lines

@@ -58,9 +58,9 @@
                 $rediredtMessage = _MD_EXTCAL_MAX_MEMBER_REACHED;
             } else {
                 $eventMemberHandler->createEventmember([
-                                                           'event_id' => (int)$_POST['event'],
-                                                           'uid'      => $xoopsUser->getVar('uid'),
-                                                       ]);
+                                                            'event_id' => (int)$_POST['event'],
+                                                            'uid'      => $xoopsUser->getVar('uid'),
+                                                        ]);
                 sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_1, _MD_EXTCAL_MSG_1);
                 $rediredtMessage = _MD_EXTCAL_WHOS_GOING_ADDED_TO_EVENT;
             }

Spacing +10 added lines, -10 removed lines

@@ -2,10 +2,10 @@ 
 
 use XoopsModules\Extcal;
 
-include __DIR__ . '/../../mainfile.php';
+include __DIR__.'/../../mainfile.php';
 
-require_once __DIR__ . '/include/constantes.php';
-require_once __DIR__ . '/include/mail_fnc.php';
+require_once __DIR__.'/include/constantes.php';
+require_once __DIR__.'/include/mail_fnc.php';
 
 // $member_uid = 1;
 // $event_id = 393;
@@ -40,26 +40,26 @@ 
 //echo "<hr>";
 
 if (!$GLOBALS['xoopsSecurity']->check()) {
-    redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+    redirect_header('index.php', 3, _NOPERM.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
 }
 
 if ($xoopsUser && $xoopsModuleConfig['whos_going']) {
     // If param are right
-    if ((int)$_POST['event'] > 0 && ('add' === $_POST['mode'] || 'remove' === $_POST['mode'])) {
+    if ((int) $_POST['event'] > 0 && ('add' === $_POST['mode'] || 'remove' === $_POST['mode'])) {
         $eventHandler       = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
         $eventMemberHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_MEMBER);
 
         // If the user have to be added
         if ('add' === $_POST['mode']) {
-            $event = $eventHandler->getEvent((int)$_POST['event'], $xoopsUser);
+            $event = $eventHandler->getEvent((int) $_POST['event'], $xoopsUser);
 
             if ($event->getVar('event_nbmember') > 0
-                && $eventMemberHandler->getNbMember((int)$_POST['event']) >= $event->getVar('event_nbmember')) {
+                && $eventMemberHandler->getNbMember((int) $_POST['event']) >= $event->getVar('event_nbmember')) {
                 sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_0, _MD_EXTCAL_MSG_0);
                 $rediredtMessage = _MD_EXTCAL_MAX_MEMBER_REACHED;
             } else {
                 $eventMemberHandler->createEventmember([
-                                                           'event_id' => (int)$_POST['event'],
+                                                           'event_id' => (int) $_POST['event'],
                                                            'uid'      => $xoopsUser->getVar('uid'),
                                                        ]);
                 sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_1, _MD_EXTCAL_MSG_1);
@@ -68,12 +68,12 @@ 
             // If the user have to be remove
         } else {
             if ('remove' === $_POST['mode']) {
-                $eventMemberHandler->deleteEventmember([(int)$_POST['event'], $xoopsUser->getVar('uid')]);
+                $eventMemberHandler->deleteEventmember([(int) $_POST['event'], $xoopsUser->getVar('uid')]);
                 sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_2, _MD_EXTCAL_MSG_2);
                 $rediredtMessage = _MD_EXTCAL_WHOS_GOING_REMOVED_TO_EVENT;
             }
         }
-        redirect_header('event.php?event=' . $_POST['event'], 3, $rediredtMessage, false);
+        redirect_header('event.php?event='.$_POST['event'], 3, $rediredtMessage, false);
     } else {
         redirect_header('index.php', 3, _NOPERM, false);
     }

class/pear/Calendar/docs/examples/8.php

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
 $basePath = explode('/', $_SERVER['SCRIPT_NAME']);
 array_pop($basePath);
 $basePath = implode('/', $basePath);
-$url      = 'http://' . $_SERVER['SERVER_NAME'] . $basePath . '/7.php?wsdl';
+$url      = 'http://'.$_SERVER['SERVER_NAME'].$basePath.'/7.php?wsdl';
 
 if (!isset($_GET['y'])) {
     $_GET['y'] = date('Y');
@@ -26,11 +26,11 @@ 
 
 $wsdl = new SOAP_WSDL($url);
 
-echo '<pre>' . $wsdl->generateProxyCode() . '</pre>';
+echo '<pre>'.$wsdl->generateProxyCode().'</pre>';
 
 $calendarClient = $wsdl->getProxy();
 
-$month = $calendarClient->getMonth((int)$_GET['y'], (int)$_GET['m']);
+$month = $calendarClient->getMonth((int) $_GET['y'], (int) $_GET['m']);
 
 if (PEAR::isError($month)) {
     die($month->toString());
@@ -62,7 +62,7 @@ 
         if (1 === $day->isEmpty) {
             echo '<td></td>';
         } else {
-            echo '<td>' . $day->day . '</td>';
+            echo '<td>'.$day->day.'</td>';
         }
         if (1 === $day->isLast) {
             echo "</tr>\n";

class/pear/Calendar/Calendar.php

Spacing +13 added lines, -13 removed lines

@@ -97,7 +97,7 @@ 
         }
         if (!$engine) {
             if (!class_exists($class)) {
-                require_once CALENDAR_ROOT . 'Engine' . '/' . CALENDAR_ENGINE . '.php';
+                require_once CALENDAR_ROOT.'Engine'.'/'.CALENDAR_ENGINE.'.php';
             }
             $engine = new $class();
         }
@@ -209,13 +209,13 @@ 
         if (!isset($cE)) {
             $cE = Calendar_Engine_Factory::getEngine();
         }
-        $this->cE     =& $cE;
-        $this->year   = (int)$y;
-        $this->month  = (int)$m;
-        $this->day    = (int)$d;
-        $this->hour   = (int)$h;
-        $this->minute = (int)$i;
-        $this->second = (int)$s;
+        $this->cE     = & $cE;
+        $this->year   = (int) $y;
+        $this->month  = (int) $m;
+        $this->day    = (int) $d;
+        $this->hour   = (int) $h;
+        $this->minute = (int) $i;
+        $this->second = (int) $s;
     }
 
     /**
@@ -331,7 +331,7 @@ 
                 return $this->toArray($stamp);
                 break;
             case 'object':
-                require_once CALENDAR_ROOT . 'Factory.php';
+                require_once CALENDAR_ROOT.'Factory.php';
 
                 return Calendar_Factory::createByTimestamp($returnType, $stamp);
                 break;
@@ -353,7 +353,7 @@ 
      */
     public function build($sDates = [])
     {
-        require_once __DIR__ . '/PEAR.php';
+        require_once __DIR__.'/PEAR.php';
         PEAR::raiseError('Calendar::build is abstract', null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar::build()');
 
         return false;
@@ -369,7 +369,7 @@ 
      */
     public function setSelection($sDates)
     {
-        require_once __DIR__ . '/PEAR.php';
+        require_once __DIR__.'/PEAR.php';
         PEAR::raiseError('Calendar::setSelection is abstract', null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar::setSelection()');
 
         return false;
@@ -436,7 +436,7 @@ 
     public function &getValidator()
     {
         if (!isset($this->validator)) {
-            require_once CALENDAR_ROOT . 'Validator.php';
+            require_once CALENDAR_ROOT.'Validator.php';
             $this->validator = new Calendar_Validator($this);
         }
 
@@ -470,7 +470,7 @@ 
     {
         if (defined('CALENDAR_FIRST_DAY_OF_WEEK')) {
             if ((CALENDAR_FIRST_DAY_OF_WEEK != $firstDay) && !is_null($firstDay)) {
-                $msg = 'CALENDAR_FIRST_DAY_OF_WEEK constant already defined.' . ' The $firstDay parameter will be ignored.';
+                $msg = 'CALENDAR_FIRST_DAY_OF_WEEK constant already defined.'.' The $firstDay parameter will be ignored.';
                 trigger_error($msg, E_USER_WARNING);
             }
 

event_notmember.php

Indentation +3 added lines, -3 removed lines

@@ -34,9 +34,9 @@
         if ('add' === $_POST['mode']) {
             $event = $eventHandler->getEvent((int)$_POST['event'], $xoopsUser);
             $eventNotMemberHandler->createEventNotMember([
-                                                             'event_id' => (int)$_POST['event'],
-                                                             'uid'      => $xoopsUser->getVar('uid'),
-                                                         ]);
+                                                                'event_id' => (int)$_POST['event'],
+                                                                'uid'      => $xoopsUser->getVar('uid'),
+                                                            ]);
             sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_3, _MD_EXTCAL_MSG_3);
             $rediredtMessage = _MD_EXTCAL_WHOSNOT_GOING_ADDED_TO_EVENT;
 

Spacing +9 added lines, -9 removed lines

@@ -2,10 +2,10 @@ 
 
 use XoopsModules\Extcal;
 
-include __DIR__ . '/../../mainfile.php';
+include __DIR__.'/../../mainfile.php';
 
-require_once __DIR__ . '/include/constantes.php';
-require_once __DIR__ . '/include/mail_fnc.php';
+require_once __DIR__.'/include/constantes.php';
+require_once __DIR__.'/include/mail_fnc.php';
 
 
 /*
@@ -23,20 +23,20 @@ 
 $member_uid = $xoopsUser->getVar('uid');
 
 if (!$GLOBALS['xoopsSecurity']->check()) {
-    redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+    redirect_header('index.php', 3, _NOPERM.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
 }
 
 if ($xoopsUser && $xoopsModuleConfig['whosnot_going']) {
     // If param are right
-    if ((int)$_POST['event'] > 0 && ('add' === $_POST['mode'] || 'remove' === $_POST['mode'])) {
+    if ((int) $_POST['event'] > 0 && ('add' === $_POST['mode'] || 'remove' === $_POST['mode'])) {
         $eventHandler          = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
         $eventNotMemberHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_NOT_MEMBER);
 
         // If the user have to be added
         if ('add' === $_POST['mode']) {
-            $event = $eventHandler->getEvent((int)$_POST['event'], $xoopsUser);
+            $event = $eventHandler->getEvent((int) $_POST['event'], $xoopsUser);
             $eventNotMemberHandler->createEventNotMember([
-                                                             'event_id' => (int)$_POST['event'],
+                                                             'event_id' => (int) $_POST['event'],
                                                              'uid'      => $xoopsUser->getVar('uid'),
                                                          ]);
             sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_3, _MD_EXTCAL_MSG_3);
@@ -45,12 +45,12 @@ 
             // If the user have to be remove
         } else {
             if ('remove' === $_POST['mode']) {
-                $eventNotMemberHandler->deleteEventNotMember([(int)$_POST['event'], $xoopsUser->getVar('uid')]);
+                $eventNotMemberHandler->deleteEventNotMember([(int) $_POST['event'], $xoopsUser->getVar('uid')]);
                 sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_4, _MD_EXTCAL_MSG_4);
                 $rediredtMessage = _MD_EXTCAL_WHOSNOT_GOING_REMOVED_TO_EVENT;
             }
         }
-        redirect_header('event.php?event=' . $_POST['event'], 3, $rediredtMessage, false);
+        redirect_header('event.php?event='.$_POST['event'], 3, $rediredtMessage, false);
     } else {
         redirect_header('index.php', 3, _NOPERM, false);
     }

admin/upgrade.php

Spacing +20 added lines, -20 removed lines

@@ -5,8 +5,8 @@ 
     $step = $_POST['step'];
 }
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-include __DIR__ . '/function.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+include __DIR__.'/function.php';
 
 // Change this variable if you use a cloned version of eXtGallery
 $localModuleDir = 'extcal';
@@ -16,9 +16,9 @@ 
 $downloadServer = 'http://downloads.sourceforge.net/zoullou/';
 
 $lastVersion       = @file_get_contents($versionFile);
-$lastVersionString = substr($lastVersion, 0, 1) . '.' . substr($lastVersion, 1, 1) . '.' . substr($lastVersion, 2, 1);
-$moduleFileName    = $moduleName . '-' . $lastVersionString . '.tar.gz';
-$langFileName      = $moduleName . '-lang-' . $lastVersionString . '_' . $xoopsConfig['language'] . '.tar.gz';
+$lastVersionString = substr($lastVersion, 0, 1).'.'.substr($lastVersion, 1, 1).'.'.substr($lastVersion, 2, 1);
+$moduleFileName    = $moduleName.'-'.$lastVersionString.'.tar.gz';
+$langFileName      = $moduleName.'-lang-'.$lastVersionString.'_'.$xoopsConfig['language'].'.tar.gz';
 
 switch ($step) {
     case 'download':
@@ -30,12 +30,12 @@ 
             break;
         }
 
-        if (!$handle = @fopen($downloadServer . $moduleFileName, 'r')) {
+        if (!$handle = @fopen($downloadServer.$moduleFileName, 'r')) {
             printf(_AM_EXTCAL_MD_FILE_DONT_EXIST, $downloadServer, $moduleFileName);
             xoops_cp_footer();
             break;
         }
-        $localHandle = @fopen(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName, 'w+');
+        $localHandle = @fopen(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName, 'w+');
 
         // Downlad module archive
         if ($handle) {
@@ -49,10 +49,10 @@ 
 
         // English file are included on module package
         if ('english' !== $xoopsConfig['language']) {
-            if (!$handle = @fopen($downloadServer . $langFileName, 'r')) {
+            if (!$handle = @fopen($downloadServer.$langFileName, 'r')) {
                 printf(_AM_EXTCAL_LG_FILE_DONT_EXIST, $downloadServer, $langFileName);
             } else {
-                $localHandle = @fopen(XOOPS_ROOT_PATH . '/uploads/' . $langFileName, 'w+');
+                $localHandle = @fopen(XOOPS_ROOT_PATH.'/uploads/'.$langFileName, 'w+');
                 // Download language archive
                 if ($handle) {
                     while (!feof($handle)) {
@@ -75,35 +75,35 @@ 
         xoops_cp_header();
         adminMenu();
 
-        if (!file_exists(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName)) {
+        if (!file_exists(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName)) {
             echo _AM_EXTCAL_MD_FILE_DONT_EXIST_SHORT;
             xoops_cp_footer();
 
             break;
         }
 
-        $gPcltarLibDir = XOOPS_ROOT_PATH . '/modules/' . $localModuleDir . '/class';
-        include __DIR__ . '/../class/pcltar.lib.php';
+        $gPcltarLibDir = XOOPS_ROOT_PATH.'/modules/'.$localModuleDir.'/class';
+        include __DIR__.'/../class/pcltar.lib.php';
 
         //TrOn(5);
 
         // Extract module files
-        PclTarExtract(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName, XOOPS_ROOT_PATH . '/modules/' . $localModuleDir . '/', 'modules/' . $moduleName . '/');
+        PclTarExtract(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName, XOOPS_ROOT_PATH.'/modules/'.$localModuleDir.'/', 'modules/'.$moduleName.'/');
         // Delete downloaded module's files
-        unlink(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName);
+        unlink(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName);
 
-        if (file_exists(XOOPS_ROOT_PATH . '/uploads/' . $langFileName)) {
+        if (file_exists(XOOPS_ROOT_PATH.'/uploads/'.$langFileName)) {
             // Extract language files
-            PclTarExtract(XOOPS_ROOT_PATH . '/uploads/' . $langFileName, XOOPS_ROOT_PATH . '/modules/' . $localModuleDir . '/', 'modules/' . $moduleName . '/');
+            PclTarExtract(XOOPS_ROOT_PATH.'/uploads/'.$langFileName, XOOPS_ROOT_PATH.'/modules/'.$localModuleDir.'/', 'modules/'.$moduleName.'/');
             // Delete downloaded module's files
-            unlink(XOOPS_ROOT_PATH . '/uploads/' . $langFileName);
+            unlink(XOOPS_ROOT_PATH.'/uploads/'.$langFileName);
         }
 
         // Delete template_c file
-        if ($handle = opendir(XOOPS_ROOT_PATH . '/templates_c')) {
+        if ($handle = opendir(XOOPS_ROOT_PATH.'/templates_c')) {
             while (false !== ($file = readdir($handle))) {
                 if ('.' !== $file && '..' !== $file && 'index.html' !== $file) {
-                    unlink(XOOPS_ROOT_PATH . '/templates_c/' . $file);
+                    unlink(XOOPS_ROOT_PATH.'/templates_c/'.$file);
                 }
             }
 
@@ -111,7 +111,7 @@ 
         }
         //TrDisplay();
 
-        xoops_confirm(['dirname' => $localModuleDir, 'op' => 'update_ok', 'fct' => 'modulesadmin'], XOOPS_URL . '/modules/system/admin.php', _AM_EXTCAL_INSTALL_DONE, _AM_EXTCAL_UPDATE);
+        xoops_confirm(['dirname' => $localModuleDir, 'op' => 'update_ok', 'fct' => 'modulesadmin'], XOOPS_URL.'/modules/system/admin.php', _AM_EXTCAL_INSTALL_DONE, _AM_EXTCAL_UPDATE);
 
         xoops_cp_footer();
 

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)
 {

Indentation +1 added lines, -1 removed lines

@@ -168,7 +168,7 @@
         new Calendar_Day(
             date('Y', xoops_getUserTimestamp(time(), $timeHandler->_getUserTimeZone($GLOBALS['xoopsUser']))),
             date('n', xoops_getUserTimestamp(time(), $timeHandler->_getUserTimeZone($GLOBALS['xoopsUser']))),
-                         date('j', xoops_getUserTimestamp(time(), $timeHandler->_getUserTimeZone($GLOBALS['xoopsUser'])))
+                            date('j', xoops_getUserTimestamp(time(), $timeHandler->_getUserTimeZone($GLOBALS['xoopsUser'])))
         ),
     ];
 

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/ColorTools.php

Doc Comments +4 added lines

@@ -255,6 +255,10 @@
      * @param $max
      * @return mixed
      */
+
+    /**
+     * @param integer $min
+     */
     public static function bornerValeur($val, $min, $max)
     {
         if ($val < $min) {

Spacing +3 added lines, -3 removed lines

@@ -170,9 +170,9 @@
         $tHex = ['', '', '', ''];
 
         $tHex[0] = $aColors[0];
-        $tHex[1] = substr('00' . dechex($aColors[1]), -2);
-        $tHex[2] = substr('00' . dechex($aColors[2]), -2);
-        $tHex[3] = substr('00' . dechex($aColors[3]), -2);
+        $tHex[1] = substr('00'.dechex($aColors[1]), -2);
+        $tHex[2] = substr('00'.dechex($aColors[2]), -2);
+        $tHex[3] = substr('00'.dechex($aColors[3]), -2);
 
         $colorHexa = implode('', $tHex);
 

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

Unused Use Statements -1 removed lines

@@ -17,7 +17,6 @@
  * @author       XOOPS Development Team,
  */
 
-use Punic\Exception;
 use XoopsModules\Extcal;
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');

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'];