mambax7 / extcal

include/config.php

Spacing +10 added lines, -10 removed lines

@@ -17,18 +17,18 @@ 
  * @author       XOOPS Development Team
  */
 
-require_once __DIR__ . '/../../../mainfile.php';
+require_once __DIR__.'/../../../mainfile.php';
 $moduleDirName = basename(dirname(__DIR__));
 
 if (!defined('EXTCAL_DIRNAME')) {
     define('EXTCAL_DIRNAME', $moduleDirName);
-    define('EXTCAL_PATH', XOOPS_ROOT_PATH . '/modules/' . EXTCAL_DIRNAME);
-    define('EXTCAL_URL', XOOPS_URL . '/modules/' . EXTCAL_DIRNAME);
-    define('EXTCAL_ADMIN', EXTCAL_URL . '/admin/index.php');
-    define('EXTCAL_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . EXTCAL_DIRNAME);
-    define('EXTCAL_AUTHOR_LOGOIMG', EXTCAL_URL . '/assets/images/logoModule.png');
-    define('EXTCAL_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . EXTCAL_DIRNAME); // WITHOUT Trailing slash
-    define('EXTCAL_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . EXTCAL_DIRNAME); // WITHOUT Trailing slash
+    define('EXTCAL_PATH', XOOPS_ROOT_PATH.'/modules/'.EXTCAL_DIRNAME);
+    define('EXTCAL_URL', XOOPS_URL.'/modules/'.EXTCAL_DIRNAME);
+    define('EXTCAL_ADMIN', EXTCAL_URL.'/admin/index.php');
+    define('EXTCAL_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.EXTCAL_DIRNAME);
+    define('EXTCAL_AUTHOR_LOGOIMG', EXTCAL_URL.'/assets/images/logoModule.png');
+    define('EXTCAL_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.EXTCAL_DIRNAME); // WITHOUT Trailing slash
+    define('EXTCAL_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.EXTCAL_DIRNAME); // WITHOUT Trailing slash
 
 }
 
@@ -37,7 +37,7 @@ 
     'name'          => 'Module Configurator',
     'uploadFolders' => array(
         EXTCAL_UPLOAD_PATH,
-        EXTCAL_UPLOAD_PATH . '/etablissement'
+        EXTCAL_UPLOAD_PATH.'/etablissement'
     ),
 //    'copyFiles'     => array(
 //        EXTCAL_UPLOAD_PATH,
@@ -58,4 +58,4 @@ 
 
 // module information
 $mod_copyright = "<a href='http://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . EXTCAL_AUTHOR_LOGOIMG . "' alt='XOOPS Project' /></a>";
+                     <img src='" . EXTCAL_AUTHOR_LOGOIMG."' alt='XOOPS Project' /></a>";

include/constantes.php

Spacing +22 added lines, -22 removed lines

@@ -37,7 +37,7 @@ 
 define('_EXTCAL_CLN_EVENT', 'ExtcalEvent');
 
 //-------------------------------------------------------------------
-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;
@@ -72,22 +72,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'));
 
@@ -103,22 +103,22 @@ 
 define('_EXTCAL_NAV_NEW_EVENT', 'new-event');
 
 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');
 

edit_event.php

Spacing +9 added lines, -9 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
+include __DIR__.'/../../mainfile.php';
 
-include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-include __DIR__ . '/class/form/extcalform.php';
-include __DIR__ . '/class/perm.php';
-include_once __DIR__ . '/include/constantes.php';
+include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+include __DIR__.'/class/form/extcalform.php';
+include __DIR__.'/class/perm.php';
+include_once __DIR__.'/include/constantes.php';
 
 $permHandler = ExtcalPerm::getHandler();
 $xoopsUser   = $xoopsUser ?: null;
@@ -19,7 +19,7 @@ 
 
 $params                                  = array('view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT);
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 /* ========================================================================== */
 
 // Tooltips include
@@ -29,7 +29,7 @@ 
 if (!isset($_GET['event'])) {
     $eventId = 0;
 } else {
-    $eventId = (int)$_GET['event'];
+    $eventId = (int) $_GET['event'];
 }
 if (!isset($_GET['action'])) {
     $action = 'edit';
@@ -40,7 +40,7 @@ 
 // Getting eXtCal object's handler
 $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
 
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
 // Title of the page
 $xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
@@ -49,4 +49,4 @@ 
 $form = $eventHandler->getEventForm('user', $action, array('event_id' => $eventId));
 $form->display();
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

event.php

Spacing +8 added lines, -8 removed lines

@@ -1,27 +1,27 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-include_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+include_once __DIR__.'/include/constantes.php';
 $params                                  = array('view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT);
 $GLOBALS['xoopsOption']['template_main'] = 'extcal_event.tpl';
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 //exit;
 
-include XOOPS_ROOT_PATH . '/include/comment_view.php';
+include XOOPS_ROOT_PATH.'/include/comment_view.php';
 
 if (!isset($_GET['event'])) {
     $eventId = 0;
 } else {
-    $eventId = (int)$_GET['event'];
+    $eventId = (int) $_GET['event'];
 }
 $eventHandler          = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
 $fileHandler           = xoops_getModuleHandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
 $eventMemberHandler    = xoops_getModuleHandler(_EXTCAL_CLS_MEMBER, _EXTCAL_MODULE);
 $eventNotMemberHandler = xoops_getModuleHandler(_EXTCAL_CLS_NOT_MEMBER, _EXTCAL_MODULE);
 $permHandler           = ExtcalPerm::getHandler();
-include_once __DIR__ . '/class/etablissement.php';
-include_once __DIR__ . '/class/utilities.php';
+include_once __DIR__.'/class/etablissement.php';
+include_once __DIR__.'/class/utilities.php';
 $myts = MyTextSanitizer::getInstance(); // MyTextSanitizer object
 
 if (!function_exists('clear_unicodeslashes')) {
@@ -211,4 +211,4 @@ 
 
 //function XoopsFormDhtmlTextArea($caption, $name, $value = "", $rows = 5, $cols = 50, $hiddentext = "xoopsHiddenText", $options = array());
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

comment_edit.php

Spacing +2 added lines, -2 removed lines

@@ -24,5 +24,5 @@
 //  along with this program; if not, write to the Free Software              //
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 //  ------------------------------------------------------------------------ //
-include __DIR__ . '/../../mainfile.php';
-include XOOPS_ROOT_PATH . '/include/comment_edit.php';
+include __DIR__.'/../../mainfile.php';
+include XOOPS_ROOT_PATH.'/include/comment_edit.php';