mambax7 / extcal

event_notmember.php

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);
     }

include/functions0.php

Indentation +7 added lines, -7 removed lines

@@ -111,7 +111,7 @@ 
 {
     global $xoopsUser;
     // Category selectbox
-     $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+        $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
 
     $catsList  = $catHandler->getAllCat($xoopsUser);
     $catSelect = new \XoopsFormSelect('', $name, $cat);
@@ -139,7 +139,7 @@ 
     // Category selectbox
     //<option style="background-color:#00FFFF;">VARCHAR</option>
 
-     $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+        $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
     $catsList   = $catHandler->getAllCat($xoopsUser);
 
     $t = [];
@@ -149,11 +149,11 @@ 
         $cat_color = $catList->getVar('cat_color');
         $checked   = in_array($cat_id, $cat) ? 'checked' : '';
         $cat       = ''
-                     . "<div style='float:left; margin-left:5px;'>"
-                     . "<input type='checkbox' name='{$name}[{$cat_id}]' value='1' {$checked}>"
-                     . "<div style='absolute:left;height:12px; width:6px; background-color:#{$cat_color}; border:1px solid black; float:left; margin-right:5px;' ></div>"
-                     . " {$name}"
-                     . '</div>';
+                        . "<div style='float:left; margin-left:5px;'>"
+                        . "<input type='checkbox' name='{$name}[{$cat_id}]' value='1' {$checked}>"
+                        . "<div style='absolute:left;height:12px; width:6px; background-color:#{$cat_color}; border:1px solid black; float:left; margin-right:5px;' ></div>"
+                        . " {$name}"
+                        . '</div>';
 
         $t[] = $cat;
     }

Spacing +24 added lines, -24 removed lines

@@ -18,7 +18,7 @@ 
 
 use XoopsModules\Extcal;
 
-require_once XOOPS_ROOT_PATH . '/class/uploader.php';
+require_once XOOPS_ROOT_PATH.'/class/uploader.php';
 
 /**
  * @param $eventId
@@ -47,12 +47,12 @@ 
 function extcal_loadImg(&$REQUEST, &$event_picture1, &$event_picture2)
 {
     ///////////////////////////////////////////////////////////////////////////////
-    $uploaddir_event = XOOPS_ROOT_PATH . '/uploads/extcal/';
-    $uploadurl_event = XOOPS_URL . '/uploads/extcal/';
+    $uploaddir_event = XOOPS_ROOT_PATH.'/uploads/extcal/';
+    $uploadurl_event = XOOPS_URL.'/uploads/extcal/';
     //$picture = '';
     for ($j = 1; $j < 3; ++$j) {
-        $delimg = @$REQUEST['delimg_' . $j . ''];
-        $delimg = isset($delimg) ? (int)$delimg : 0;
+        $delimg = @$REQUEST['delimg_'.$j.''];
+        $delimg = isset($delimg) ? (int) $delimg : 0;
         if (0 == $delimg && !empty($REQUEST['xoops_upload_file'][$j])) {
             $upload = new \XoopsMediaUploader($uploaddir_event, [
                 'image/gif',
@@ -75,15 +75,15 @@ 
                         $event_picture2 = $upload->getSavedFileName();
                     }
                 }
-            } elseif (!empty($REQUEST['file' . $j])) {
+            } elseif (!empty($REQUEST['file'.$j])) {
                 if (1 == $j) {
-                    $event_picture1 = $REQUEST['file' . $j];
+                    $event_picture1 = $REQUEST['file'.$j];
                 } elseif (2 == $j) {
-                    $event_picture2 = $REQUEST['file' . $j];
+                    $event_picture2 = $REQUEST['file'.$j];
                 }
             }
         } else {
-            $url_event = XOOPS_ROOT_PATH . '/uploads/extcal/' . $REQUEST['file' . $j];
+            $url_event = XOOPS_ROOT_PATH.'/uploads/extcal/'.$REQUEST['file'.$j];
             if (1 == $j) {
                 $event_picture1 = '';
             } elseif (2 == $j) {
@@ -111,7 +111,7 @@ 
 {
     global $xoopsUser;
     // Category selectbox
-     $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+     $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
 
     $catsList  = $catHandler->getAllCat($xoopsUser);
     $catSelect = new \XoopsFormSelect('', $name, $cat);
@@ -139,8 +139,8 @@ 
     // Category selectbox
     //<option style="background-color:#00FFFF;">VARCHAR</option>
 
-     $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
-    $catsList   = $catHandler->getAllCat($xoopsUser);
+     $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+    $catsList = $catHandler->getAllCat($xoopsUser);
 
     $t = [];
     foreach ($catsList as $catList) {
@@ -179,17 +179,17 @@ 
         $select->addOption('', '');
     }
 
-    $select->addOption('year ASC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-    $select->addOption('year DESC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+    $select->addOption('year ASC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_ASC);
+    $select->addOption('year DESC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_DESC);
 
-    $select->addOption('month ASC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-    $select->addOption('month DESC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+    $select->addOption('month ASC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_ASC);
+    $select->addOption('month DESC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_DESC);
 
-    $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-    $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+    $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_ASC);
+    $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_DESC);
 
-    $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-    $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+    $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_ASC);
+    $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_DESC);
 
     return $select;
 }
@@ -303,7 +303,7 @@ 
 function echoDateArray($period)
 {
     foreach ($period as $dt) {
-        echo $dt->format("l Y-m-d H:i:s\n") . '<br>';
+        echo $dt->format("l Y-m-d H:i:s\n").'<br>';
     }
 }
 
@@ -319,7 +319,7 @@ 
     }
 
     $txt = print_r($t, true);
-    echo '<pre>Number of items: ' . count($t) . "<br>{$txt}</pre>";
+    echo '<pre>Number of items: '.count($t)."<br>{$txt}</pre>";
 }
 
 /*****************************************************************/
@@ -332,7 +332,7 @@ 
     if ('' != $msg) {
         echo "<hr>{$msg}<hr>";
     }
-    echo $line . '<br>';
+    echo $line.'<br>';
 }
 
 /*****************************************************************/
@@ -359,7 +359,7 @@ 
         echo "<hr>{$msg}<hr>";
     }
 
-    echo 'date --->' . $tsName . ' = ' . $ts . ' - ' . date('d-m-Y H:m:s', $ts) . '<br>';
+    echo 'date --->'.$tsName.' = '.$ts.' - '.date('d-m-Y H:m:s', $ts).'<br>';
 }
 
 /*****************************************************************/

include/agenda_fnc.php

Indentation +1 added lines, -1 removed lines

@@ -435,7 +435,7 @@
 
     $user = isset($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser'] : null;
     /** @var CategoryHandler $catHandler */
-     $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+        $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
     if ($catHandler->haveSubmitRight($user)) {
         $view = _EXTCAL_NAV_NEW_EVENT;
         if (in_array($view, $visibleTabs)) {

Spacing +8 added lines, -8 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;
 }
@@ -435,7 +435,7 @@ 
 
     $user = isset($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser'] : null;
     /** @var CategoryHandler $catHandler */
-     $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+     $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
     if ($catHandler->haveSubmitRight($user)) {
         $view = _EXTCAL_NAV_NEW_EVENT;
         if (in_array($view, $visibleTabs)) {
@@ -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/mail_fnc.php

Spacing +7 added lines, -7 removed lines

@@ -20,11 +20,11 @@ 
  * que la classe correspondante de la table a été générées avec classGenerator
  **/
 
-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';
 
 /********************************************************************
  *
@@ -138,7 +138,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';
@@ -180,7 +180,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 = '|');
 
@@ -313,7 +313,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/onupdate.php

Spacing +13 added lines, -13 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);
 }
 
 /**
@@ -74,7 +74,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 = [
@@ -93,7 +93,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>";
@@ -103,7 +103,7 @@ 
         }
     }
 
-    $capsDirName   = strtoupper($moduleDirName);
+    $capsDirName = strtoupper($moduleDirName);
 
     /** @var Extcal\Helper $helper */
     /** @var Extcal\Utility $utility */
@@ -117,14 +117,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);
                             }
                         }
                     }
@@ -134,9 +134,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);
             }
         }
@@ -145,7 +145,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);
                 }
@@ -155,14 +155,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);
     }

include/common.php

Spacing +29 added lines, -29 removed lines

@@ -18,7 +18,7 @@ 
  */
 
 use XoopsModules\Extcal;
-include __DIR__ . '/../preloads/autoloader.php';
+include __DIR__.'/../preloads/autoloader.php';
 
 
 $moduleDirName = basename(dirname(__DIR__));
@@ -40,23 +40,23 @@ 
 ///** @var \XoopsPersistableObjectHandler $extcal_brokenHandler */
 //$extcal_brokenHandler  = new Extcal\Extcal_brokenHandler($db);
 
-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGES_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGES_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images/');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CAT_IMAGES_URL', XOOPS_UPLOAD_URL . ' / ' . constant($moduleDirNameUpper . '_DIRNAME') . '/images/category');
-    define($moduleDirNameUpper . '_CAT_IMAGES_PATH', XOOPS_UPLOAD_PATH . '/' . constant($moduleDirNameUpper . '_DIRNAME') . ' / images / category');
-    define($moduleDirNameUpper . '_CACHE_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {
+    define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));
+    define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_IMAGES_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');
+    define($moduleDirNameUpper.'_IMAGES_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images/');
+    define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');
+    define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png');
+    define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_CAT_IMAGES_URL', XOOPS_UPLOAD_URL.' / '.constant($moduleDirNameUpper.'_DIRNAME').'/images/category');
+    define($moduleDirNameUpper.'_CAT_IMAGES_PATH', XOOPS_UPLOAD_PATH.'/'.constant($moduleDirNameUpper.'_DIRNAME').' / images / category');
+    define($moduleDirNameUpper.'_CACHE_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);
 }
 
 
@@ -66,15 +66,15 @@ 
 //$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+    'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
+    'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
+    'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
+    'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
+    'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
+    'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
+    'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
+    '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
+    '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
 ];
 
 $debug = false;
@@ -87,12 +87,12 @@ 
     $GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
-$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName);
+$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL.'/modules/'.$moduleDirName);
 // Local icons path
 if (is_object($helper->getModule())) {
     $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);
     $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }

include/constantes.php

Spacing +21 added lines, -21 removed lines

@@ -41,7 +41,7 @@ 
 define('_EXTCAL_CLN_EVENT', 'Event');
 
 //-------------------------------------------------------------------
-define('_EXTCAL_PEAR_ROOT_DEFAULT', __DIR__ . '/../class/pear');
+define('_EXTCAL_PEAR_ROOT_DEFAULT', __DIR__.'/../class/pear');
 //define('_EXTCAL_PEAR_ROOT', 'F:/wamp/www/xfr254b/xoops_lib/Frameworks/pear' );
 
 $pear_path = _EXTCAL_PEAR_ROOT_DEFAULT;
@@ -76,22 +76,22 @@ 
 //}
 define('_EXTCAL_PEAR_ROOT', $pear_path);
 
-define('_EXTCAL_PEAR_CALENDAR_ROOT', _EXTCAL_PEAR_ROOT . '/Calendar');
-define('CALENDAR_ROOT', _EXTCAL_PEAR_CALENDAR_ROOT . '/');
+define('_EXTCAL_PEAR_CALENDAR_ROOT', _EXTCAL_PEAR_ROOT.'/Calendar');
+define('CALENDAR_ROOT', _EXTCAL_PEAR_CALENDAR_ROOT.'/');
 
 //-------------------------------------------------------------------
 define('_EXTCAL_SHOW_NO_PICTURE', false);
 
 define('_EXTCAL_PATH_HORLOGES', '/modules/extcal/assets/images/horloges/');
-define('_EXTCAL_PATH_ICONS16', XOOPS_URL . '/Frameworks/moduleclasses/icons/16/');
-define('_EXTCAL_PATH_ICONS32', XOOPS_URL . '/Frameworks/moduleclasses/icons/32/');
-define('_EXTCAL_PATH_FO', XOOPS_URL . '/modules/extcal/');
-define('_EXTCAL_PATH_BO', _EXTCAL_PATH_FO . 'admin/');
-define('_EXTCAL_PATH_LG', XOOPS_URL . '/modules/extcal/languages/');
+define('_EXTCAL_PATH_ICONS16', XOOPS_URL.'/Frameworks/moduleclasses/icons/16/');
+define('_EXTCAL_PATH_ICONS32', XOOPS_URL.'/Frameworks/moduleclasses/icons/32/');
+define('_EXTCAL_PATH_FO', XOOPS_URL.'/modules/extcal/');
+define('_EXTCAL_PATH_BO', _EXTCAL_PATH_FO.'admin/');
+define('_EXTCAL_PATH_LG', XOOPS_URL.'/modules/extcal/languages/');
 
 define('_EXTCAL_IMG_INTERVAL', 'interval04.png');
-define('_EXTCAL_IMG_INTERVAL16', _EXTCAL_PATH_ICONS16 . _EXTCAL_IMG_INTERVAL);
-define('_EXTCAL_IMG_INTERVAL32', _EXTCAL_PATH_ICONS32 . _EXTCAL_IMG_INTERVAL);
+define('_EXTCAL_IMG_INTERVAL16', _EXTCAL_PATH_ICONS16._EXTCAL_IMG_INTERVAL);
+define('_EXTCAL_IMG_INTERVAL32', _EXTCAL_PATH_ICONS32._EXTCAL_IMG_INTERVAL);
 
 //define('_EXTCAL_DIRNAME',    $xoopsModule->getVar('dirname'));
 
@@ -108,22 +108,22 @@ 
 
 define(
     '_EXTCAL_NAV_LIST',
-       _EXTCAL_NAV_CALMONTH . "\n" . _EXTCAL_NAV_CALWEEK . "\n" . _EXTCAL_NAV_YEAR . "\n" . _EXTCAL_NAV_MONTH . "\n" . _EXTCAL_NAV_WEEK . "\n" . _EXTCAL_NAV_DAY . "\n" . _EXTCAL_NAV_AGENDA_WEEK . "\n" . _EXTCAL_NAV_AGENDA_DAY . "\n" . _EXTCAL_NAV_SEARCH . "\n" . _EXTCAL_NAV_NEW_EVENT
+       _EXTCAL_NAV_CALMONTH."\n"._EXTCAL_NAV_CALWEEK."\n"._EXTCAL_NAV_YEAR."\n"._EXTCAL_NAV_MONTH."\n"._EXTCAL_NAV_WEEK."\n"._EXTCAL_NAV_DAY."\n"._EXTCAL_NAV_AGENDA_WEEK."\n"._EXTCAL_NAV_AGENDA_DAY."\n"._EXTCAL_NAV_SEARCH."\n"._EXTCAL_NAV_NEW_EVENT
 );
 
 define('_EXTCAL_PREFIX_VIEW', 'view_');
 define('_EXTCAL_SUFFIX_VIEW', '.php');
 
-define('_EXTCAL_FILE_CALMONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALMONTH . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_CALWEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALWEEK . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_YEAR', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_YEAR . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_MONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_MONTH . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_WEEK . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_DAY . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_AGENDA_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_WEEK . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_AGENDA_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_DAY . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_SEARCH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_SEARCH . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_NEW_EVENT', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_NEW_EVENT . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_CALMONTH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_CALMONTH._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_CALWEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_CALWEEK._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_YEAR', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_YEAR._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_MONTH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_MONTH._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_WEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_WEEK._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_DAY', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_DAY._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_AGENDA_WEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_AGENDA_WEEK._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_AGENDA_DAY', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_AGENDA_DAY._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_SEARCH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_SEARCH._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_NEW_EVENT', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_NEW_EVENT._EXTCAL_SUFFIX_VIEW);
 
 define('_EXTCAL_MULTILOADER', '/class/xoopsform/multiuploads/formmultiuploads.php');
 

include/notification.inc.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         $eventHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
         $event        = $eventHandler->getEvent($itemId, 0, true);
         $item['name'] = $event->getVar('event_title');
-        $item['url']  = XOOPS_URL . '/modules/extcal/event.php?event=' . $event->getVar('event_id');
+        $item['url']  = XOOPS_URL.'/modules/extcal/event.php?event='.$event->getVar('event_id');
 
         return $item;
     }

include/config.php

Spacing +17 added lines, -17 removed lines

@@ -22,34 +22,34 @@ 
 
 
 //Configurator
-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,6 +71,6 @@ 
         '/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>',
 
 ];