mambax7 / extcal

include/onupdate.php

Spacing +15 added lines, -15 removed lines

@@ -20,7 +20,7 @@ 
 
 if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof XoopsUser)
     || !$GLOBALS['xoopsUser']->IsAdmin()) {
-    exit('Restricted access' . PHP_EOL);
+    exit('Restricted access'.PHP_EOL);
 }
 
 /**
@@ -45,7 +45,7 @@ 
 function xoops_module_pre_update_extcal(XoopsModule $xoopsModule)
 {
     $moduleDirName = basename(dirname(__DIR__));
-    $classUtility  = ucfirst($moduleDirName) . 'Utility';
+    $classUtility  = ucfirst($moduleDirName).'Utility';
     if (!class_exists($classUtility)) {
         xoops_load('utility', $moduleDirName);
     }
@@ -81,7 +81,7 @@ 
         return true;
     }
 
-    $fld = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/versions/';
+    $fld = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/versions/';
     $cls = 'extcal_%1$s';
 
     $version = array(
@@ -100,7 +100,7 @@ 
     foreach ($version as $key => $val) {
         if ($previousVersion < $val) {
             $name = sprintf($cls, $key);
-            $f    = $fld . $name . '.php';
+            $f    = $fld.$name.'.php';
             //ext_echo ("<hr>{$f}<hr>");
             if (is_readable($f)) {
                 echo "mise à jour version : {$key} = {$val}<br>";
@@ -111,8 +111,8 @@ 
     }
 
     if ($previousVersion < 240) {
-        $configurator = include __DIR__ . '/config.php';
-        $classUtility = ucfirst($moduleDirName) . 'Utility';
+        $configurator = include __DIR__.'/config.php';
+        $classUtility = ucfirst($moduleDirName).'Utility';
         if (!class_exists($classUtility)) {
             xoops_load('utility', $moduleDirName);
         }
@@ -120,14 +120,14 @@ 
         //delete old HTML templates
         if (count($configurator['templateFolders']) > 0) {
             foreach ($configurator['templateFolders'] as $folder) {
-                $templateFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $folder);
+                $templateFolder = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$folder);
                 if (is_dir($templateFolder)) {
                     $templateList = array_diff(scandir($templateFolder, SCANDIR_SORT_NONE), array('..', '.'));
                     foreach ($templateList as $k => $v) {
-                        $fileInfo = new SplFileInfo($templateFolder . $v);
+                        $fileInfo = new SplFileInfo($templateFolder.$v);
                         if ($fileInfo->getExtension() === 'html' && $fileInfo->getFilename() !== 'index.html') {
-                            if (file_exists($templateFolder . $v)) {
-                                unlink($templateFolder . $v);
+                            if (file_exists($templateFolder.$v)) {
+                                unlink($templateFolder.$v);
                             }
                         }
                     }
@@ -137,9 +137,9 @@ 
 
         //  ---  COPY blank.png FILES ---------------
         if (count($configurator['copyFiles']) > 0) {
-            $file = __DIR__ . '/../assets/images/blank.png';
+            $file = __DIR__.'/../assets/images/blank.png';
             foreach (array_keys($configurator['copyFiles']) as $i) {
-                $dest = $configurator['copyFiles'][$i] . '/blank.png';
+                $dest = $configurator['copyFiles'][$i].'/blank.png';
                 $classUtility::copyFile($file, $dest);
             }
         }
@@ -148,7 +148,7 @@ 
         if (count($configurator['oldFiles']) > 0) {
             //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
             foreach (array_keys($configurator['oldFiles']) as $i) {
-                $tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator['oldFiles'][$i]);
+                $tempFile = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$configurator['oldFiles'][$i]);
                 if (is_file($tempFile)) {
                     unlink($tempFile);
                 }
@@ -158,14 +158,14 @@ 
         //---------------------
 
         //delete .html entries from the tpl table
-        $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+        $sql = 'DELETE FROM '.$xoopsDB->prefix('tplfile')." WHERE `tpl_module` = '".$xoopsModule->getVar('dirname', 'n')."' AND `tpl_file` LIKE '%.html%'";
         $xoopsDB->queryF($sql);
 
         // Load class XoopsFile ====================
         xoops_load('XoopsFile');
 
         //delete /images directory ============
-        $imagesDirectory = $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/images/');
+        $imagesDirectory = $GLOBALS['xoops']->path('modules/'.$xoopsModule->getVar('dirname', 'n').'/images/');
         $folderHandler   = XoopsFile::getHandler('folder', $imagesDirectory);
         $folderHandler->delete($imagesDirectory);
     }

view_calendar-week.php

Spacing +14 added lines, -14 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $params                                  = array('view' => _EXTCAL_NAV_CALWEEK, 'file' => _EXTCAL_FILE_CALWEEK);
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 /* ========================================================================== */
-$year  = isset($_GET['year']) ? (int)$_GET['year'] : date('Y');
-$month = isset($_GET['month']) ? (int)$_GET['month'] : date('n');
-$day   = isset($_GET['day']) ? (int)$_GET['day'] : date('j');
-$cat   = isset($_GET['cat']) ? (int)$_GET['cat'] : 0;
+$year  = isset($_GET['year']) ? (int) $_GET['year'] : date('Y');
+$month = isset($_GET['month']) ? (int) $_GET['month'] : date('n');
+$day   = isset($_GET['day']) ? (int) $_GET['day'] : date('j');
+$cat   = isset($_GET['cat']) ? (int) $_GET['cat'] : 0;
 /* ========================================================================== */
 
 // Validate the date (day, month and year)
 $dayTS = mktime(0, 0, 0, $month, $day, $year);
 //$offset = date('w', $dayTS) - $xoopsModuleConfig['week_start_day'];
 $offset = date('w', $dayTS) + 7 - $xoopsModuleConfig['week_start_day'] < 7 ? date('w', $dayTS) + 7 - $xoopsModuleConfig['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);
@@ -47,7 +47,7 @@ 
     'cat'          => $cat,
     'externalKeys' => 'cat_id',
 );
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 //$eventsArray = $events;
 
@@ -135,21 +135,21 @@ 
 // Making navig data
 $navig = array(
     'prev' => array(
-        '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' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_week'], $pWeekCalObj->getTimestamp()),
     ),
     'this' => array(
-        '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' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_week'], $weekCalObj->getTimestamp()),
     ),
     'next' => array(
-        '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' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['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);
@@ -189,4 +189,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'calweek');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

class/form/extcalform.php

Spacing +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 
-include __DIR__ . '/formdatetime.php';
-include __DIR__ . '/formrecurrules.php';
-include __DIR__ . '/formfilecheckbox.php';
-include __DIR__ . '/formrrulecheckbox.php';
+include __DIR__.'/formdatetime.php';
+include __DIR__.'/formrecurrules.php';
+include __DIR__.'/formfilecheckbox.php';
+include __DIR__.'/formrrulecheckbox.php';
 
 /**
  * Class ExtcalThemeForm.

class/form/formrecurrules.php

Spacing +18 added lines, -18 removed lines

@@ -66,45 +66,45 @@ 
         $formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
         $formObject->addOption('none', _MD_EXTCAL_NO_RECCUR_EVENT);
         $ret .= $formObject->render();
-        $ret .= '<br><br><fieldset><legend>' . _MD_EXTCAL_RECCUR_POLICY . '</legend><fieldset><legend>';
+        $ret .= '<br><br><fieldset><legend>'._MD_EXTCAL_RECCUR_POLICY.'</legend><fieldset><legend>';
 
         $formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
         $formObject->addOption('daily', _MD_EXTCAL_DAILY);
         $ret .= $formObject->render();
-        $ret .= '</legend>' . _MD_EXTCAL_DURING . ' ';
+        $ret .= '</legend>'._MD_EXTCAL_DURING.' ';
 
         $formObject = new XoopsFormText('', 'rrule_daily_interval', 3, 2, $this->_rrule_daily_interval);
         $ret        .= $formObject->render();
-        $ret        .= ' ' . _MD_EXTCAL_DAYS . '</fieldset><br><fieldset><legend>';
+        $ret        .= ' '._MD_EXTCAL_DAYS.'</fieldset><br><fieldset><legend>';
 
         $formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
         $formObject->addOption('weekly', _MD_EXTCAL_WEEKLY);
         $ret .= $formObject->render();
-        $ret .= '</legend>' . _MD_EXTCAL_DURING . ' ';
+        $ret .= '</legend>'._MD_EXTCAL_DURING.' ';
 
         $formObject = new XoopsFormText('', 'rrule_weekly_interval', 3, 2, $this->_rrule_weekly_interval);
         $ret        .= $formObject->render();
-        $ret        .= ' ' . _MD_EXTCAL_WEEKS . '<br>';
+        $ret        .= ' '._MD_EXTCAL_WEEKS.'<br>';
 
         $formObject = new XoopsFormCheckBox('', 'rrule_weekly_bydays', $this->_rrule_weekly_bydays);
-        $formObject->addOption('MO', _MD_EXTCAL_MO2 . '&nbsp;');
-        $formObject->addOption('TU', _MD_EXTCAL_TU2 . '&nbsp;');
-        $formObject->addOption('WE', _MD_EXTCAL_WE2 . '&nbsp;');
-        $formObject->addOption('TH', _MD_EXTCAL_TH2 . '&nbsp;');
-        $formObject->addOption('FR', _MD_EXTCAL_FR2 . '&nbsp;');
-        $formObject->addOption('SA', _MD_EXTCAL_SA2 . '&nbsp;');
-        $formObject->addOption('SU', _MD_EXTCAL_SU2 . '&nbsp;');
+        $formObject->addOption('MO', _MD_EXTCAL_MO2.'&nbsp;');
+        $formObject->addOption('TU', _MD_EXTCAL_TU2.'&nbsp;');
+        $formObject->addOption('WE', _MD_EXTCAL_WE2.'&nbsp;');
+        $formObject->addOption('TH', _MD_EXTCAL_TH2.'&nbsp;');
+        $formObject->addOption('FR', _MD_EXTCAL_FR2.'&nbsp;');
+        $formObject->addOption('SA', _MD_EXTCAL_SA2.'&nbsp;');
+        $formObject->addOption('SU', _MD_EXTCAL_SU2.'&nbsp;');
         $ret .= $formObject->render();
         $ret .= '</fieldset><br><fieldset><legend>';
 
         $formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
         $formObject->addOption('monthly', _MD_EXTCAL_MONTHLY);
         $ret .= $formObject->render();
-        $ret .= '</legend>' . _MD_EXTCAL_DURING . ' ';
+        $ret .= '</legend>'._MD_EXTCAL_DURING.' ';
 
         $formObject = new XoopsFormText('', 'rrule_monthly_interval', 3, 2, $this->_rrule_monthly_interval);
         $ret        .= $formObject->render();
-        $ret        .= ' ' . _MD_EXTCAL_MONTH . ', ' . _MD_EXTCAL_ON . ' ';
+        $ret        .= ' '._MD_EXTCAL_MONTH.', '._MD_EXTCAL_ON.' ';
 
         $formObject = new XoopsFormSelect('', 'rrule_monthly_byday', $this->_rrule_monthly_byday);
         $formObject->addOption('', '&nbsp;');
@@ -144,20 +144,20 @@ 
         $formObject->addOption('-1SA', _MD_EXTCAL_LAST_SA);
         $formObject->addOption('-1SU', _MD_EXTCAL_LAST_SU);
         $ret .= $formObject->render();
-        $ret .= ' ' . _MD_EXTCAL_OR_THE . ' ';
+        $ret .= ' '._MD_EXTCAL_OR_THE.' ';
 
         $formObject = new XoopsFormText('', 'rrule_bymonthday', 3, 2, $this->_rrule_bymonthday);
         $ret        .= $formObject->render();
-        $ret        .= ' ' . _MD_EXTCAL_DAY_NUM_MONTH . '</fieldset><br><fieldset><legend>';
+        $ret        .= ' '._MD_EXTCAL_DAY_NUM_MONTH.'</fieldset><br><fieldset><legend>';
 
         $formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
         $formObject->addOption('yearly', _MD_EXTCAL_YEARLY);
         $ret .= $formObject->render();
-        $ret .= '</legend>' . _MD_EXTCAL_DURING . ' ';
+        $ret .= '</legend>'._MD_EXTCAL_DURING.' ';
 
         $formObject = new XoopsFormText('', 'rrule_yearly_interval', 3, 2, $this->_rrule_yearly_interval);
         $ret        .= $formObject->render();
-        $ret        .= ' ' . _MD_EXTCAL_YEARS . '<br>';
+        $ret        .= ' '._MD_EXTCAL_YEARS.'<br>';
 
         $formObject = new ExtcalFormRRuleCheckBox('', 'rrule_yearly_bymonths', $this->_rrule_yearly_bymonths);
         $formObject->addOption('1', _MD_EXTCAL_JAN);

class/pclerror.lib.php

Spacing +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
         global $g_pcl_error_string;
         global $g_pcl_error_code;
 
-        return $g_pcl_error_string . " [code $g_pcl_error_code]";
+        return $g_pcl_error_string." [code $g_pcl_error_code]";
     }
 
     // --------------------------------------------------------------------------------

class/pear/Calendar/Month/Weekdays.php

Spacing +3 added lines, -3 removed lines

@@ -49,12 +49,12 @@ 
 /**
  * Load Calendar base class.
  */
-require_once CALENDAR_ROOT . 'Calendar.php';
+require_once CALENDAR_ROOT.'Calendar.php';
 
 /**
  * Load base month.
  */
-require_once CALENDAR_ROOT . 'Month.php';
+require_once CALENDAR_ROOT.'Month.php';
 
 /**
  * Represents a Month and builds Days in tabular form<br>
@@ -129,7 +129,7 @@ 
      */
     public function build($sDates = array())
     {
-        require_once CALENDAR_ROOT . 'Table/Helper.php';
+        require_once CALENDAR_ROOT.'Table/Helper.php';
         $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
         Calendar_Month::build($sDates);
         $this->buildEmptyDaysBefore();

class/pear/Calendar/Day.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
 /**
  * Load Calendar base class.
  */
-require_once CALENDAR_ROOT . 'Calendar.php';
+require_once CALENDAR_ROOT.'Calendar.php';
 
 /**
  * Represents a Day and builds Hours.
@@ -113,7 +113,7 @@ 
      */
     public function build($sDates = array())
     {
-        require_once CALENDAR_ROOT . 'Hour.php';
+        require_once CALENDAR_ROOT.'Hour.php';
 
         $hID = $this->cE->getHoursInDay($this->year, $this->month, $this->day);
         for ($i = 0; $i < $hID; ++$i) {
@@ -137,7 +137,7 @@ 
         foreach ($sDates as $sDate) {
             if ($this->year == $sDate->thisYear() && $this->month == $sDate->thisMonth()
                 && $this->day == $sDate->thisDay()) {
-                $key = (int)$sDate->thisHour();
+                $key = (int) $sDate->thisHour();
                 if (isset($this->children[$key])) {
                     $sDate->setSelected();
                     $this->children[$key] = $sDate;

class/pear/Calendar/Factory.php

Spacing +12 added lines, -12 removed lines

@@ -50,7 +50,7 @@ 
 /**
  * Load Calendar base class.
  */
-require_once CALENDAR_ROOT . 'Calendar.php';
+require_once CALENDAR_ROOT.'Calendar.php';
 
 /**
  * Contains a factory method to return a Singleton instance of a class
@@ -97,7 +97,7 @@ 
         $firstDay = defined('CALENDAR_FIRST_DAY_OF_WEEK') ? CALENDAR_FIRST_DAY_OF_WEEK : 1;
         switch ($type) {
             case 'Day':
-                require_once CALENDAR_ROOT . 'Day.php';
+                require_once CALENDAR_ROOT.'Day.php';
 
                 return new Calendar_Day($y, $m, $d);
             case 'Month':
@@ -107,44 +107,44 @@ 
                 }
                 switch (CALENDAR_MONTH_STATE) {
                     case CALENDAR_USE_MONTH_WEEKDAYS:
-                        require_once CALENDAR_ROOT . 'Month/Weekdays.php';
+                        require_once CALENDAR_ROOT.'Month/Weekdays.php';
                         $class = 'Calendar_Month_Weekdays';
                         break;
                     case CALENDAR_USE_MONTH_WEEKS:
-                        require_once CALENDAR_ROOT . 'Month/Weeks.php';
+                        require_once CALENDAR_ROOT.'Month/Weeks.php';
                         $class = 'Calendar_Month_Weeks';
                         break;
                     case CALENDAR_USE_MONTH:
                     default:
-                        require_once CALENDAR_ROOT . 'Month.php';
+                        require_once CALENDAR_ROOT.'Month.php';
                         $class = 'Calendar_Month';
                         break;
                 }
 
                 return new $class($y, $m, $firstDay);
             case 'Week':
-                require_once CALENDAR_ROOT . 'Week.php';
+                require_once CALENDAR_ROOT.'Week.php';
 
                 return new Calendar_Week($y, $m, $d, $firstDay);
             case 'Hour':
-                require_once CALENDAR_ROOT . 'Hour.php';
+                require_once CALENDAR_ROOT.'Hour.php';
 
                 return new Calendar_Hour($y, $m, $d, $h);
             case 'Minute':
-                require_once CALENDAR_ROOT . 'Minute.php';
+                require_once CALENDAR_ROOT.'Minute.php';
 
                 return new Calendar_Minute($y, $m, $d, $h, $i);
             case 'Second':
-                require_once CALENDAR_ROOT . 'Second.php';
+                require_once CALENDAR_ROOT.'Second.php';
 
                 return new Calendar_Second($y, $m, $d, $h, $i, $s);
             case 'Year':
-                require_once CALENDAR_ROOT . 'Year.php';
+                require_once CALENDAR_ROOT.'Year.php';
 
                 return new Calendar_Year($y);
             default:
-                require_once __DIR__ . '/PEAR.php';
-                PEAR::raiseError('Calendar_Factory::create() unrecognised type: ' . $type, null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()');
+                require_once __DIR__.'/PEAR.php';
+                PEAR::raiseError('Calendar_Factory::create() unrecognised type: '.$type, null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()');
 
                 return false;
         }

class/pear/Calendar/Engine/UnixTS.php

Spacing +7 added lines, -7 removed lines

@@ -95,7 +95,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date[0];
+        return (int) $date[0];
     }
 
     /**
@@ -109,7 +109,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date[1];
+        return (int) $date[1];
     }
 
     /**
@@ -123,7 +123,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date[2];
+        return (int) $date[2];
     }
 
     /**
@@ -137,7 +137,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date[3];
+        return (int) $date[3];
     }
 
     /**
@@ -151,7 +151,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date[4];
+        return (int) $date[4];
     }
 
     /**
@@ -165,7 +165,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date[5];
+        return (int) $date[5];
     }
 
     /**
@@ -336,7 +336,7 @@ 
         }
         $daysInTheFirstWeek %= $this->getDaysInWeek();
 
-        return (int)(ceil(($this->getDaysInMonth($y, $m) - $daysInTheFirstWeek) / $this->getDaysInWeek()) + $weeks);
+        return (int) (ceil(($this->getDaysInMonth($y, $m) - $daysInTheFirstWeek) / $this->getDaysInWeek()) + $weeks);
     }
 
     /**