mambax7 / extcal

class/EtablissementHandler.php

Spacing +3 added lines, -3 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 EtablissementHandler.
@@ -52,7 +52,7 @@ 
         if (!$skipPerm) {
             $this->addCatPermCriteria($criteriaCompo, $user);
         }
-        $ret =& $this->getObjects($criteriaCompo);
+        $ret = & $this->getObjects($criteriaCompo);
         if (isset($ret[0])) {
             return $ret[0];
         } else {
@@ -74,7 +74,7 @@ 
         $asObject = true,
         $id_as_key = true) //getAll($criteria = null, $asObject = false)
     {
-        $rst =& $this->getObjects($criteria, $asObject);
+        $rst = & $this->getObjects($criteria, $asObject);
         if ($asObject) {
             return $rst;
         } else {

class/Time.php

Spacing +23 added lines, -23 removed lines

@@ -4,7 +4,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once XOOPS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/calendar.php';
+require_once XOOPS_ROOT_PATH.'/language/'.$GLOBALS['xoopsConfig']['language'].'/calendar.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 Extcal\Helper::getInstance()->loadLanguage('main');
@@ -92,7 +92,7 @@ 
      */
     public function getFormatedDate($format, $timestamp)
     {
-        $patterns     = [
+        $patterns = [
             '/January/',
             '/February/',
             '/March/',
@@ -145,18 +145,18 @@ 
             _CAL_OCTOBER,
             _CAL_NOVEMBER,
             _CAL_DECEMBER,
-            substr(_CAL_JANUARY, 0, 3) . ' ',
-            substr(_CAL_FEBRUARY, 0, 3) . ' ',
-            substr(_CAL_MARCH, 0, 3) . ' ',
-            substr(_CAL_APRIL, 0, 3) . ' ',
-            substr(_CAL_MAY, 0, 3) . ' ',
-            substr(_CAL_JUNE, 0, 3) . ' ',
-            substr(_CAL_JULY, 0, 3) . ' ',
-            substr(_CAL_AUGUST, 0, 3) . ' ',
-            substr(_CAL_SEPTEMBER, 0, 3) . ' ',
-            substr(_CAL_OCTOBER, 0, 3) . ' ',
-            substr(_CAL_NOVEMBER, 0, 3) . ' ',
-            substr(_CAL_DECEMBER, 0, 3) . ' ',
+            substr(_CAL_JANUARY, 0, 3).' ',
+            substr(_CAL_FEBRUARY, 0, 3).' ',
+            substr(_CAL_MARCH, 0, 3).' ',
+            substr(_CAL_APRIL, 0, 3).' ',
+            substr(_CAL_MAY, 0, 3).' ',
+            substr(_CAL_JUNE, 0, 3).' ',
+            substr(_CAL_JULY, 0, 3).' ',
+            substr(_CAL_AUGUST, 0, 3).' ',
+            substr(_CAL_SEPTEMBER, 0, 3).' ',
+            substr(_CAL_OCTOBER, 0, 3).' ',
+            substr(_CAL_NOVEMBER, 0, 3).' ',
+            substr(_CAL_DECEMBER, 0, 3).' ',
             _CAL_SUNDAY,
             _CAL_MONDAY,
             _CAL_TUESDAY,
@@ -164,13 +164,13 @@ 
             _CAL_THURSDAY,
             _CAL_FRIDAY,
             _CAL_SATURDAY,
-            substr(_CAL_SUNDAY, 0, 3) . ' ',
-            substr(_CAL_MONDAY, 0, 3) . ' ',
-            substr(_CAL_TUESDAY, 0, 3) . ' ',
-            substr(_CAL_WEDNESDAY, 0, 3) . ' ',
-            substr(_CAL_THURSDAY, 0, 3) . ' ',
-            substr(_CAL_FRIDAY, 0, 3) . ' ',
-            substr(_CAL_SATURDAY, 0, 3) . ' ',
+            substr(_CAL_SUNDAY, 0, 3).' ',
+            substr(_CAL_MONDAY, 0, 3).' ',
+            substr(_CAL_TUESDAY, 0, 3).' ',
+            substr(_CAL_WEDNESDAY, 0, 3).' ',
+            substr(_CAL_THURSDAY, 0, 3).' ',
+            substr(_CAL_FRIDAY, 0, 3).' ',
+            substr(_CAL_SATURDAY, 0, 3).' ',
         ];
 
         return preg_replace($patterns, $replacements, date($format, $timestamp));
@@ -212,7 +212,7 @@ 
                 array_shift($eventOptions);
                 $day = '';
                 foreach ($eventOptions as $option) {
-                    $day .= ' ' . $daysName[$option] . ', ';
+                    $day .= ' '.$daysName[$option].', ';
                 }
                 $ret = sprintf(_MD_EXTCAL_RR_WEEKLY, $day, $interval);
 
@@ -331,7 +331,7 @@ 
                 array_shift($eventOptions);
                 $month = '';
                 foreach ($eventOptions as $option) {
-                    $month .= ' ' . $monthName[$option] . ', ';
+                    $month .= ' '.$monthName[$option].', ';
                 }
                 $dayString = $day;
                 if (array_key_exists($day, $monthDays)) {

class/CategoryHandler.php

Spacing +3 added lines, -3 removed lines

@@ -129,7 +129,7 @@ 
         if (!$skipPerm) {
             $this->addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
         }
-        $ret =& $this->getObjects($criteriaCompo);
+        $ret = & $this->getObjects($criteriaCompo);
         if (isset($ret[0])) {
             return $ret[0];
         } else {
@@ -186,10 +186,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'));

class/Etablissement.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_etablissement extends \XoopsObject
@@ -71,7 +71,7 @@ 
 
         $title = $this->isNew() ? sprintf(_MD_EXTCAL_ETABLISSEMENT_ADD) : sprintf(_MD_EXTCAL_ETABLISSEMENT_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_ETABLISSEMENT_HORAIRES, 'horaires', $this->getVar('horaires'), 3, 40));
         $form->addElement(new \XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_DIVERS, 'divers', $this->getVar('divers'), 5, 40));
         //$form->addElement( new \XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_TARIFS, 'tarifs', $this->getVar("tarifs"), 5, 40));
-        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TARIFS . ' ( ' . _MD_EXTCAL_DEVISE2 . ' )', 'tarifs', 20, 20, $this->getVar('tarifs')), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TARIFS.' ( '._MD_EXTCAL_DEVISE2.' )', 'tarifs', 20, 20, $this->getVar('tarifs')), false);
 
         //$form->addElement( new \XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_MAP, 'map', $this->getVar("map"), 5, 40));
         $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_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/etablissement/' . $this->getVar('logo') . "' name='image' id='image' alt=''><br><br>"));
+            $file_tray->addElement(new \XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/etablissement/'.$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/Category.php

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 // require_once __DIR__ . '/ExtcalPersistableObjectHandler.php';
-require_once __DIR__ . '/perm.php';
-require_once __DIR__ . '/time.php';
+require_once __DIR__.'/perm.php';
+require_once __DIR__.'/time.php';
 
 /**
  * Class Category.

include/mail_fnc.php

Spacing +7 added lines, -7 removed lines

@@ -22,11 +22,11 @@ 
 
 use XoopsModules\Extcal;
 
-require_once __DIR__ . '/../../../class/uploader.php';
-require_once __DIR__ . '/../../../class/mail/phpmailer/class.phpmailer.php'; // First we require the PHPMailer libary in our script
+require_once __DIR__.'/../../../class/uploader.php';
+require_once __DIR__.'/../../../class/mail/phpmailer/class.phpmailer.php'; // First we require the PHPMailer libary in our script
 // require_once __DIR__ . '/../class/Utility.php';
-require_once __DIR__ . '/constantes.php';
-require_once __DIR__ . '/../../../class/template.php';
+require_once __DIR__.'/constantes.php';
+require_once __DIR__.'/../../../class/template.php';
 
 /********************************************************************
  *
@@ -140,7 +140,7 @@ 
     $action  = ''; //a voir   JJD
     $message = sprintf($tplMessage, $acteur['name']);
     //$subject .= ' (' . rand(1, 100) . ')';
-    $subject .= ' - ' . $acteur['name'];
+    $subject .= ' - '.$acteur['name'];
     //--------------------------------------------------------------
     //Chargement du template dans le dossier de langue
     //$f = _EXTCAL_PATH_LG . $xoopsConfig['language'] . '\mail_inscription.html';
@@ -182,7 +182,7 @@ 
     if (_EXTCAL_HEADER_HTML == $mode) {
         $template = 'extcal_mail_member_html.tpl';
     }
-    $mail_body = $tpl->fetch('db:' . $template);
+    $mail_body = $tpl->fetch('db:'.$template);
 
     extcal_SendMail($destinataires, $mail_fromName, $mail_fromemail, $mail_subject, $mail_body, $bEcho = false, $mode = 0, $sep = '|');
 
@@ -315,7 +315,7 @@ 
     $header   = [];
     $header[] = "From: {$emailSender}";
     $header[] = "Reply-To: {$emailSender}";
-    $header[] = 'X-Mailer: PHP/' . PHP_VERSION;
+    $header[] = 'X-Mailer: PHP/'.PHP_VERSION;
 
     if (_EXTCAL_HEADER_HTML == $mode) {
         $header[] = 'MIME-Version: 1.0';

include/config.php

Spacing +17 added lines, -17 removed lines

@@ -22,34 +22,34 @@ 
 
 function getConfig()
 {
-    return (object)[
-        'name'           => strtoupper($moduleDirName) . ' Module Configurator',
+    return (object) [
+        'name'           => strtoupper($moduleDirName).' Module Configurator',
         'paths'          => [
             'dirname'    => $moduleDirName,
-            'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-            'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-            'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+            'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+            'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+            'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+            'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+            'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
         ],
         'uploadFolders'  => [
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/thumbnails'
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images',
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/thumbnails'
         ],
         'copyBlankFiles' => [
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/thumbnails'
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images',
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/thumbnails'
         ],
 
         'copyTestFolders' => [
             [
-                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/images',
-                XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
+                XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/images',
+                XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images',
             ],
             [
-                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
-                XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/thumbs',
+                XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/thumbs',
+                XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/thumbs',
             ]
         ],
 
@@ -71,7 +71,7 @@ 
             '/images',
         ],
         'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . XOOPS_URL . '/modules/' . $moduleDirName . '_AUTHOR_LOGOIMG' . '\' alt=\'XOOPS Project\' /></a>',
+                     <img src='" . XOOPS_URL.'/modules/'.$moduleDirName.'_AUTHOR_LOGOIMG'.'\' alt=\'XOOPS Project\' /></a>',
 
     ];
 }

include/agenda_fnc.php

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
 define('_EXTCAL_FORMAT_AGENDA_KEYD', 'Y-m-d');
 define('_EXTCAL_FORMAT_AGENDA_KEYT', 'H:i');
 
-require_once __DIR__ . '/constantes.php';
+require_once __DIR__.'/constantes.php';
 // require_once __DIR__ . '/../class/Utility.php';
 
 $moduleDirName = basename(dirname(__DIR__));
@@ -74,7 +74,7 @@ 
         $tj[$kj]['dayWeek'] = date('w', $tsj);
         $tj[$kj]['jour']    = $jName[$tj[$kj]['dayWeek']]; //date('l', $tsj);
         if (0 == $tj[$kj]['dayWeek']) {
-            $tj[$kj]['bg'] = "background='" . XOOPS_URL . "/modules/extcal/assets/images/trame.png'";
+            $tj[$kj]['bg'] = "background='".XOOPS_URL."/modules/extcal/assets/images/trame.png'";
         } else {
             $tj[$kj]['bg'] = '';
         }
@@ -154,16 +154,16 @@ 
         $kd     = date(_EXTCAL_FORMAT_AGENDA_KEYD, $ts);
         $hour   = date('H', $ts);
         $minute = date('i', $ts);
-        $m      = (int)($minute / $mPlage) * $mPlage;
+        $m      = (int) ($minute / $mPlage) * $mPlage;
         //      echo "--->{$minute} / {$mPlage} = {$m}<br>";
-        $sMinute = (($m < 10) ? '0' . $m : $m);
+        $sMinute = (($m < 10) ? '0'.$m : $m);
         //$kt = date(_EXTCAL_FORMAT_AGENDA_KEYT, $ts);
         if ($hour < $hStart) {
             $kt = $tk0;
         } elseif ($hour >= ($hEnd + 1)) {
             $kt = $tk1;
         } else {
-            $kt = $hour . ':' . $sMinute;
+            $kt = $hour.':'.$sMinute;
         }
 
         $tAgenda[$kt]['jours'][$kd]['events'][] = $e;
@@ -312,7 +312,7 @@ 
             return false;
     }
 
-    $file   = XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/' . $f;
+    $file   = XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/'.$f;
     $prefix = (defined($name) ? '_MI' : '_MD');
     require_once $file;
 }
@@ -452,7 +452,7 @@ 
     //    while (list($k, $v) = each($tNavBar)) {
     foreach ($tNavBar as $k => $v) {
         if (isset($tWeight[$k])) {
-            $ordre[] = (int)$tWeight[$k]; //ordre defini dans les option du module
+            $ordre[] = (int) $tWeight[$k]; //ordre defini dans les option du module
         } else {
             $ordre[] = $v['weight']; // ordre par defaut ddefini dans le tableau $tNavBar
         }

include/onupdate.php

Spacing +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
 
 if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof \XoopsUser)
     || !$GLOBALS['xoopsUser']->IsAdmin()) {
-    exit('Restricted access' . PHP_EOL);
+    exit('Restricted access'.PHP_EOL);
 }
 
 /**
@@ -75,7 +75,7 @@ 
         return true;
     }
 
-    $fld = XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname') . '/versions/';
+    $fld = XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname').'/versions/';
     $cls = 'Extcal_%1$s';
 
     $version = [
@@ -94,7 +94,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>";
@@ -118,14 +118,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), ['..', '.']);
                     foreach ($templateList as $k => $v) {
-                        $fileInfo = new \SplFileInfo($templateFolder . $v);
+                        $fileInfo = new \SplFileInfo($templateFolder.$v);
                         if ('html' === $fileInfo->getExtension() && 'index.html' !== $fileInfo->getFilename()) {
-                            if (file_exists($templateFolder . $v)) {
-                                unlink($templateFolder . $v);
+                            if (file_exists($templateFolder.$v)) {
+                                unlink($templateFolder.$v);
                             }
                         }
                     }
@@ -135,9 +135,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';
                 $utilityClass::copyFile($file, $dest);
             }
         }
@@ -146,7 +146,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);
                 }
@@ -156,14 +156,14 @@ 
         //---------------------
 
         //delete .html entries from the tpl table
-        $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+        $sql = 'DELETE FROM '.$xoopsDB->prefix('tplfile')." WHERE `tpl_module` = '".$module->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/' . $module->getVar('dirname', 'n') . '/images/');
+        $imagesDirectory = $GLOBALS['xoops']->path('modules/'.$module->getVar('dirname', 'n').'/images/');
         $folderHandler   = \XoopsFile::getHandler('folder', $imagesDirectory);
         $folderHandler->delete($imagesDirectory);
     }