mambax7 / extcal

new_event.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-include_once __DIR__ . '/include/constantes.php';
-include_once __DIR__ . '/header.php';
+include __DIR__.'/../../mainfile.php';
+include_once __DIR__.'/include/constantes.php';
+include_once __DIR__.'/header.php';
 
 // Getting eXtCal object's handler
 $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
@@ -10,7 +10,7 @@ 
 $permHandler = ExtcalPerm::getHandler();
 $xoopsUser   = $xoopsUser ?: null;
 if (count($permHandler->getAuthorizedCat($xoopsUser, 'extcal_cat_submit')) > 0) {
-    include XOOPS_ROOT_PATH . '/header.php';
+    include XOOPS_ROOT_PATH.'/header.php';
 
     // Title of the page
     $xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
@@ -20,7 +20,7 @@ 
 
     //$form->display();
 
-    include XOOPS_ROOT_PATH . '/footer.php';
+    include XOOPS_ROOT_PATH.'/footer.php';
 } else {
     redirect_header('index.php', 3);
 }

etablissement.php

Spacing +11 added lines, -11 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
-include_once __DIR__ . '/../../mainfile.php';
-include_once __DIR__ . '/include/constantes.php';
+include_once __DIR__.'/../../mainfile.php';
+include_once __DIR__.'/include/constantes.php';
 $GLOBALS['xoopsOption']['template_main'] = 'extcal_etablissement.tpl';
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 //include_once XOOPS_ROOT_PATH."/modules/extcal/class/etablissement.php";
 $etablissementHandler = xoops_getModuleHandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE);
@@ -19,7 +19,7 @@ 
 $etablissement_exist = $etablissementHandler->getCount($criteria);
 
 if ($etablissement_exist == 0) {
-    redirect_header(XOOPS_URL . '/modules/extcal/index.php', 3, _NOPERM);
+    redirect_header(XOOPS_URL.'/modules/extcal/index.php', 3, _NOPERM);
 }
 
 $view_etablissement = $etablissementHandler->getEtablissement($etablissement_id, true);
@@ -33,13 +33,13 @@ 
 /* todo a deplacer dans le template JJD */
 $uid = $xoopsUser ? $xoopsUser->getVar('uid') : 0;
 global $xoopsModule;
-$pathIcon16 =& $xoopsModule->getInfo('icons16');
+$pathIcon16 = & $xoopsModule->getInfo('icons16');
 
 $edit_delete = '';
 if (is_object($xoopsUser) && $isAdmin) {
-    $edit_delete = '<a href="' . XOOPS_URL . '/modules/extcal/admin/etablissement.php?op=edit_etablissement&etablissement_id=' . $etablissement_id . '"><img src="' . $pathIcon16 . '/edit.png" width="16px" height="16px" border="0" title="'
-                   . _MD_EXTCAL_ETABLISSEMENT_EDIT . '"/></a><a href="' . XOOPS_URL . '/modules/extcal/admin/etablissement.php?op=delete_etablissement&etablissement_id=' . $etablissement_id . '"><img src="' . $pathIcon16
-                   . '/delete.png" width="16px" height="16px" border="0" title="' . _MD_EXTCAL_ETABLISSEMENT_DELETE . '"/></a>';
+    $edit_delete = '<a href="'.XOOPS_URL.'/modules/extcal/admin/etablissement.php?op=edit_etablissement&etablissement_id='.$etablissement_id.'"><img src="'.$pathIcon16.'/edit.png" width="16px" height="16px" border="0" title="'
+                   . _MD_EXTCAL_ETABLISSEMENT_EDIT.'"/></a><a href="'.XOOPS_URL.'/modules/extcal/admin/etablissement.php?op=delete_etablissement&etablissement_id='.$etablissement_id.'"><img src="'.$pathIcon16
+                   . '/delete.png" width="16px" height="16px" border="0" title="'._MD_EXTCAL_ETABLISSEMENT_DELETE.'"/></a>';
 }
 $xoopsTpl->assign('edit_delete', $edit_delete);
 
@@ -47,12 +47,12 @@ 
 
 $date = mktime(0, 0, 0, date('m'), date('d'), date('y'));
 
-$requete = $xoopsDB->query('SELECT event_id, event_title, event_desc, event_picture1, event_start FROM ' . $xoopsDB->prefix('extcal_event') . " WHERE event_etablissement='" . $etablissement_id . "' AND event_start >='" . $date . "'");
+$requete = $xoopsDB->query('SELECT event_id, event_title, event_desc, event_picture1, event_start FROM '.$xoopsDB->prefix('extcal_event')." WHERE event_etablissement='".$etablissement_id."' AND event_start >='".$date."'");
 while ($donnees = $xoopsDB->fetchArray($requete)) {
     if ($donnees['event_desc'] > 210) {
         $event_desc = $donnees['event_desc'];
     } else {
-        $event_desc = substr($donnees['event_desc'], 0, 210) . '...';
+        $event_desc = substr($donnees['event_desc'], 0, 210).'...';
     }
     $xoopsTpl->append('events', array(
         'event_picture1' => $donnees['event_picture1'],
@@ -64,4 +64,4 @@ 
 }
 $xoTheme->addScript('browse.php?modules/extcal/assets/js/highslide.js');
 $xoTheme->addStylesheet('browse.php?modules/extcal/assets/js/highslide.css');
-include_once XOOPS_ROOT_PATH . '/footer.php';
+include_once XOOPS_ROOT_PATH.'/footer.php';

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

class/time.php

Spacing +23 added lines, -23 removed lines

@@ -2,7 +2,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once XOOPS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/calendar.php';
+include_once XOOPS_ROOT_PATH.'/language/'.$GLOBALS['xoopsConfig']['language'].'/calendar.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 xoops_loadLanguage('main', $moduleDirName);
@@ -90,7 +90,7 @@ 
      */
     public function getFormatedDate($format, $timestamp)
     {
-        $patterns     = array(
+        $patterns = array(
             '/January/',
             '/February/',
             '/March/',
@@ -143,18 +143,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,
@@ -162,13 +162,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));
@@ -210,7 +210,7 @@ 
                 array_shift($eventOptions);
                 $day = '';
                 foreach ($eventOptions as $option) {
-                    $day .= ' ' . $daysName[$option] . ', ';
+                    $day .= ' '.$daysName[$option].', ';
                 }
                 $ret = sprintf(_MD_EXTCAL_RR_WEEKLY, $day, $interval);
 
@@ -329,7 +329,7 @@ 
                 array_shift($eventOptions);
                 $month = '';
                 foreach ($eventOptions as $option) {
-                    $month .= ' ' . $monthName[$option] . ', ';
+                    $month .= ' '.$monthName[$option].', ';
                 }
                 $dayString = $day;
                 if (array_key_exists($day, $monthDays)) {

class/event.php

Spacing +47 added lines, -47 removed lines

@@ -2,13 +2,13 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once __DIR__ . '/ExtcalPersistableObjectHandler.php';
-include_once __DIR__ . '/perm.php';
-include_once __DIR__ . '/time.php';
-include_once __DIR__ . '/config.php';
-include_once __DIR__ . '/extDateTime.php';
-include_once __DIR__ . '/utilities.php';
-include_once __DIR__ . '/../include/constantes.php';
+include_once __DIR__.'/ExtcalPersistableObjectHandler.php';
+include_once __DIR__.'/perm.php';
+include_once __DIR__.'/time.php';
+include_once __DIR__.'/config.php';
+include_once __DIR__.'/extDateTime.php';
+include_once __DIR__.'/utilities.php';
+include_once __DIR__.'/../include/constantes.php';
 
 /**
  * Class ExtcalEvent.
@@ -49,7 +49,7 @@ 
         $this->initVar('event_etablissement', XOBJ_DTYPE_INT, 5, false);
         $this->initVar('event_icone', XOBJ_DTYPE_TXTBOX, '', false);
 
-        $this->externalKey['cat_id']          = array(
+        $this->externalKey['cat_id'] = array(
             'className'      => 'cat',
             'getMethodeName' => 'getCat',
             'keyName'        => 'cat',
@@ -382,7 +382,7 @@ 
         $eventArray = array();
 
         while (list($k, $v) = each($events)) {
-            $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'] = ExtcalUtilities::getLighterColor($v['cat']['cat_color'], _EXTCAL_INFOBULLE_RGB_MIN, _EXTCAL_INFOBULLE_RGB_MAX);
@@ -583,7 +583,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>';
         }
     }
 
@@ -909,10 +909,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'));
@@ -932,10 +932,10 @@ 
         }
         if (is_array($cats)) {
             if (array_search(0, $cats) === false) {
-                $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'));
@@ -958,7 +958,7 @@ 
         $fileHandler = xoops_getModuleHandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
 
         /***************************************************/
-        include_once __DIR__ . '/etablissement.php';
+        include_once __DIR__.'/etablissement.php';
         if ($siteSide === 'admin') {
             $action = 'event.php?op=enreg';
             $cats   = $catHandler->getAllCat($GLOBALS['xoopsUser'], 'all');
@@ -976,7 +976,7 @@ 
             if ($mode === 'clone') {
                 $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);
             }
 
@@ -1160,7 +1160,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, '');
@@ -1265,7 +1265,7 @@ 
         if (count($files) > 0) {
             $eventFiles = new ExtcalFormFileCheckBox('', '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);
@@ -1281,7 +1281,7 @@ 
         //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);
@@ -1292,8 +1292,8 @@ 
         }
         $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));
@@ -1301,7 +1301,7 @@ 
         //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);
@@ -1312,8 +1312,8 @@ 
         }
         $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));
@@ -1380,7 +1380,7 @@ 
                 $recurRules = 'weekly|';
                 $recurRules .= $parm['rrule_weekly_interval'];
                 foreach ($parm['rrule_weekly_bydays'] as $day) {
-                    $recurRules .= '|' . $day;
+                    $recurRules .= '|'.$day;
                 }
 
                 break;
@@ -1390,11 +1390,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;
@@ -1428,9 +1428,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;
@@ -2363,10 +2363,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   = array();
         $tw[] = 'te.cat_id = tc.cat_id';
@@ -2375,7 +2375,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];
 
@@ -2411,12 +2411,12 @@ 
                 'te.event_address',
                 'tc.cat_name',
             );
-            $t       = array();
+            $t = array();
             for ($i = 0, $count = count($queryarray); $i < $count; ++$i) {
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
             }
 
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
+            $flt = '('.implode(" {$andor} ", $t1).')';
 
             $t = array();
             for ($h = 0, $count = count($tFields); $h < $count; ++$h) {
@@ -2425,10 +2425,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 = array();
@@ -2438,7 +2438,7 @@ 
                 }
             }
             if (count($t) > 0) {
-                $sql .= ' ORDER BY ' . implode(',', $t);
+                $sql .= ' ORDER BY '.implode(',', $t);
             }
         }
 
@@ -2471,7 +2471,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'];
@@ -2511,23 +2511,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 ($userId != 0) {
-            $sql .= " AND event_submitter = '" . $userId . "'";
+            $sql .= " AND event_submitter = '".$userId."'";
         }
 
         //echoArray($queryarray,false);
@@ -2547,7 +2547,7 @@ 
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
             }
 
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
+            $flt = '('.implode(" {$andor} ", $t1).')';
 
             $t = array();
             for ($h = 0, $count = count($tFields); $h < $count; ++$h) {
@@ -2560,7 +2560,7 @@ 
         }
 
         if ($criteresPlus != '') {
-            $sql .= ' AND ' . $criteresPlus;
+            $sql .= ' AND '.$criteresPlus;
         }
         $sql .= ' ORDER BY event_id DESC';
 
@@ -2570,7 +2570,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'];