mambax7 / extcal

class/utilities.php

Doc Comments +2 added lines, -2 removed lines

@@ -463,8 +463,8 @@
     /**************************************************************************/
     /**
      * @param $color
-     * @param $plancher
-     * @param $plafond
+     * @param integer $plancher
+     * @param integer $plafond
      *
      * @return string
      */

Indentation +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
             $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='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 +31 added lines, -31 removed lines

@@ -15,7 +15,7 @@ 
  * L'utilisation de ce formulaire d'adminitration suppose
  * que la classe correspondante de la table a été générées avec classGenerator
  **/
-include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+include_once XOOPS_ROOT_PATH.'/class/uploader.php';
 
 /**
  * Class ExtcalUtilities.
@@ -48,12 +48,12 @@ 
     public static 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, array(
                     'image/gif',
@@ -76,15 +76,15 @@ 
                             $event_picture2 = $upload->getSavedFileName();
                         }
                     }
-                } elseif (!empty($REQUEST['file' . $j])) {
+                } elseif (!empty($REQUEST['file'.$j])) {
                     if ($j == 1) {
-                        $event_picture1 = $REQUEST['file' . $j];
+                        $event_picture1 = $REQUEST['file'.$j];
                     } elseif ($j == 2) {
-                        $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 ($j == 1) {
                     $event_picture1 = '';
                 } elseif ($j == 2) {
@@ -149,8 +149,8 @@ 
             $name      = $catList->getVar('cat_name');
             $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>';
+            $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>';
 
             $t[] = $cat;
         }
@@ -176,17 +176,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;
     }
@@ -300,7 +300,7 @@ 
     public static 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>';
         }
     }
 
@@ -316,7 +316,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>";
     }
 
     /*****************************************************************/
@@ -329,7 +329,7 @@ 
         if ($msg != '') {
             echo "<hr>{$msg}<hr>";
         }
-        echo $line . '<br>';
+        echo $line.'<br>';
     }
 
     /*****************************************************************/
@@ -356,7 +356,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>';
     }
 
     /*****************************************************************/
@@ -470,7 +470,7 @@ 
      */
     public static function getLighterColor($color, $plancher, $plafond)
     {
-        include_once __DIR__ . '/colorTools.php';
+        include_once __DIR__.'/colorTools.php';
 
         //$ct = new ColorTools();
         //return $ct->eclaircir($color,$plancher,$plafond);
@@ -492,7 +492,7 @@ 
                 if (!mkdir($folder) && !is_dir($folder)) {
                     throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
                 } else {
-                    file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+                    file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
                 }
             }
         } catch (Exception $e) {
@@ -530,10 +530,10 @@ 
         //    @mkdir($dst);
         while (false !== ($file = readdir($dir))) {
             if (($file !== '.') && ($file !== '..')) {
-                if (is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+                if (is_dir($src.'/'.$file)) {
+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                 } else {
-                    copy($src . '/' . $file, $dst . '/' . $file);
+                    copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -554,7 +554,7 @@ 
         //check for minimum XOOPS version
         $currentVer  = substr(XOOPS_VERSION, 6); // get the numeric part of string
         $currArray   = explode('.', $currentVer);
-        $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+        $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         $reqArray    = explode('.', $requiredVer);
         $success     = true;
         foreach ($reqArray as $k => $v) {
@@ -568,7 +568,7 @@ 
                     break;
                 }
             } else {
-                if ((int)$v > 0) { // handles things like x.x.x.0_RC2
+                if ((int) $v > 0) { // handles things like x.x.x.0_RC2
                     $success = false;
                     break;
                 }
@@ -596,7 +596,7 @@ 
         // check for minimum PHP version
         $success = true;
         $verNum  = phpversion();
-        $reqVer  =& $module->getInfo('min_php');
+        $reqVer  = & $module->getInfo('min_php');
         if (false !== $reqVer && '' !== $reqVer) {
             if (version_compare($verNum, $reqVer, '<')) {
                 $module->setErrors(sprintf(_AM_TAG_ERROR_BAD_PHP, $reqVer, $verNum));

class/tableForm.php

Doc Comments +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
      *
      * @internal param bool $encode To sanitizer the text?
      *
-     * @return array array of name/value pairs assigned to form elements
+     * @return boolean|string array of name/value pairs assigned to form elements
      */
     public function getAddBaliseTable()
     {

Spacing +12 added lines, -12 removed lines

@@ -55,13 +55,13 @@ 
      */
     public function insertBreak($extra = '', $class = '')
     {
-        $class = ($class != '') ? " class='" . preg_replace('/[^A-Za-z0-9\s\s_-]/i', '', $class) . "'" : '';
+        $class = ($class != '') ? " class='".preg_replace('/[^A-Za-z0-9\s\s_-]/i', '', $class)."'" : '';
         // Fix for $extra tag not showing
         if ($extra) {
-            $extra = '<tr><td colspan="2" ' . $class . '>' . $extra . '</td></tr>';
+            $extra = '<tr><td colspan="2" '.$class.'>'.$extra.'</td></tr>';
             $this->addElement($extra);
         } else {
-            $extra = '<tr><td colspan="2" ' . $class . '>&nbsp;</td></tr>';
+            $extra = '<tr><td colspan="2" '.$class.'>&nbsp;</td></tr>';
             $this->addElement($extra);
         }
     }
@@ -90,7 +90,7 @@ 
         }
 
         if ($title != '') {
-            $ret .= '<tr><th colspan="2">' . $title . '</th></tr>';
+            $ret .= '<tr><th colspan="2">'.$title.'</th></tr>';
         }
 
         $hidden = '';
@@ -102,24 +102,24 @@ 
                 if (!$ele->getNocolspan()) {
                     $ret .= '<tr valign="top" align="left"><td class="head">';
                     if (($caption = $ele->getCaption()) != '') {
-                        $ret .= '<div class="xoops-form-element-caption' . ($ele->isRequired() ? '-required' : '') . '">';
-                        $ret .= '<span class="caption-text">' . $caption . '</span>';
+                        $ret .= '<div class="xoops-form-element-caption'.($ele->isRequired() ? '-required' : '').'">';
+                        $ret .= '<span class="caption-text">'.$caption.'</span>';
                         $ret .= '<span class="caption-marker">*</span>';
                         $ret .= '</div>';
                     }
                     if (($desc = $ele->getDescription()) != '') {
-                        $ret .= '<div class="xoops-form-element-help">' . $desc . '</div>';
+                        $ret .= '<div class="xoops-form-element-help">'.$desc.'</div>';
                     }
-                    $ret .= '</td><td class="' . $class . '">' . $ele->render() . '</td></tr>' . NWLINE;
+                    $ret .= '</td><td class="'.$class.'">'.$ele->render().'</td></tr>'.NWLINE;
                 } else {
                     $ret .= '<tr valign="top" align="left"><td class="head" colspan="2">';
                     if (($caption = $ele->getCaption()) != '') {
-                        $ret .= '<div class="xoops-form-element-caption' . ($ele->isRequired() ? '-required' : '') . '">';
-                        $ret .= '<span class="caption-text">' . $caption . '</span>';
+                        $ret .= '<div class="xoops-form-element-caption'.($ele->isRequired() ? '-required' : '').'">';
+                        $ret .= '<span class="caption-text">'.$caption.'</span>';
                         $ret .= '<span class="caption-marker">*</span>';
                         $ret .= '</div>';
                     }
-                    $ret .= '</td></tr><tr valign="top" align="left"><td class="' . $class . '" colspan="2">' . $ele->render() . '</td></tr>';
+                    $ret .= '</td></tr><tr valign="top" align="left"><td class="'.$class.'" colspan="2">'.$ele->render().'</td></tr>';
                 }
             } else {
                 $hidden .= $ele->render();
@@ -130,7 +130,7 @@ 
             $ret .= '</table>';
         }
 
-        $ret .= NWLINE . ' ' . $hidden . NWLINE;
+        $ret .= NWLINE.' '.$hidden.NWLINE;
 
         return $ret;
     }

language/english/modinfo.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/../../include/constantes.php';
+include_once __DIR__.'/../../include/constantes.php';
 define('_MI_EXTCAL_NAME', 'eXtCal');
 define('_MI_EXTCAL_ABOUT', 'About');
 define('_MI_EXTCAL_AFTER', 'After');
@@ -135,7 +135,7 @@ 
 define('_MI_EXTCAL_START_PAGE', 'Module home page');
 define('_MI_EXTCAL_SUBMIT_EVENT', 'Submit Event');
 define('_MI_EXTCAL_TABS_WEIGHT', 'Order of the Tabs');
-define('_MI_EXTCAL_TABS_WEIGHT_DESC', 'Set the tab order <br>Be careful to respect tab names:<br>' . "<span style='color:#0000FF;'>" . _EXTCAL_NAV_LIST . '</span>' . ' <br>Separator: new line');
+define('_MI_EXTCAL_TABS_WEIGHT_DESC', 'Set the tab order <br>Be careful to respect tab names:<br>'."<span style='color:#0000FF;'>"._EXTCAL_NAV_LIST.'</span>'.' <br>Separator: new line');
 define('_MI_EXTCAL_VISIBLE_TAB_DESC', 'Define the visible view.');
 define('_MI_EXTCAL_VISIBLE_TABS', 'Visible tab');
 define('_MI_EXTCAL_WEEK_START_DAY', 'Week start Day');

header.php

Spacing +11 added lines, -11 removed lines

@@ -1,23 +1,23 @@
 <?php
 
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
-include_once __DIR__ . '/include/agenda_fnc.php';
-include_once __DIR__ . '/class/utilities.php';
+include_once __DIR__.'/include/agenda_fnc.php';
+include_once __DIR__.'/class/utilities.php';
 
-include_once __DIR__ . '/class/perm.php';
-include_once __DIR__ . '/class/form/extcalform.php';
+include_once __DIR__.'/class/perm.php';
+include_once __DIR__.'/class/form/extcalform.php';
 
 xoops_loadLanguage('modinfo', _EXTCAL_MODULE);
 
 //------------------------------------------------------
-require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Util/Textual.php';
-require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Month/Weeks.php';
-require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Month/Weekdays.php';
-require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Week.php';
-require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Day.php';
+require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Util/Textual.php';
+require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Month/Weeks.php';
+require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Month/Weekdays.php';
+require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Week.php';
+require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Day.php';
 
 //------------------------------------------------------
 // Getting eXtCal object's handler

include/constantes.php

Indentation +2 added lines, -2 removed lines

@@ -102,8 +102,8 @@
 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');

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

include/onupdate.php

Indentation +2 added lines, -2 removed lines

@@ -166,8 +166,8 @@
 
         //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%'";
+                                                                                                            'n')
+                . "' AND `tpl_file` LIKE '%.html%'";
         $xoopsDB->queryF($sql);
 
         // Load class XoopsFile ====================

Spacing +15 added lines, -15 removed lines

@@ -19,7 +19,7 @@ 
 if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof XoopsUser)
     || !$GLOBALS['xoopsUser']->IsAdmin()
 ) {
-    exit('Restricted access' . PHP_EOL);
+    exit('Restricted access'.PHP_EOL);
 }
 
 /**
@@ -44,7 +44,7 @@ 
 function xoops_module_pre_update_extcal(XoopsModule $module)
 {
     $moduleDirName  = basename(dirname(__DIR__));
-    $classUtilities = ucfirst($moduleDirName) . 'Utilities';
+    $classUtilities = ucfirst($moduleDirName).'Utilities';
     if (!class_exists($classUtilities)) {
         xoops_load('utilities', $moduleDirName);
     }
@@ -82,7 +82,7 @@ 
     }
 
 
-    $fld = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/versions/';
+    $fld = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/versions/';
     $cls = 'extcal_%1$s';
 
     $version = array(
@@ -100,7 +100,7 @@ 
     while (list($key, $val) = each($version)) {
         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>";
@@ -115,8 +115,8 @@ 
     if ($previousVersion < 240) {
 
 
-        $configurator = include __DIR__ . '/config.php';
-        $classUtilities = ucfirst($moduleDirName) . 'Utilities';
+        $configurator = include __DIR__.'/config.php';
+        $classUtilities = ucfirst($moduleDirName).'Utilities';
         if (!class_exists($classUtilities)) {
             xoops_load('utilities', $moduleDirName);
         }
@@ -125,14 +125,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), array('..', '.'));
                     foreach ($templateList as $k => $v) {
-                        $fileInfo = new SplFileInfo($templateFolder . $v);
+                        $fileInfo = new SplFileInfo($templateFolder.$v);
                         if ($fileInfo->getExtension() === 'html' && $fileInfo->getFilename() !== 'index.html') {
-                            if (file_exists($templateFolder . $v)) {
-                                unlink($templateFolder . $v);
+                            if (file_exists($templateFolder.$v)) {
+                                unlink($templateFolder.$v);
                             }
                         }
                     }
@@ -144,9 +144,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';
                 $classUtilities::copyFile($file, $dest);
             }
         }
@@ -155,7 +155,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);
                 }
@@ -165,7 +165,7 @@ 
         //---------------------
 
         //delete .html entries from the tpl table
-        $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname',
+        $sql = 'DELETE FROM '.$xoopsDB->prefix('tplfile')." WHERE `tpl_module` = '".$module->getVar('dirname',
                                                                                                           'n')
                . "' AND `tpl_file` LIKE '%.html%'";
         $xoopsDB->queryF($sql);
@@ -174,7 +174,7 @@ 
         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/oninstall.php

Spacing +12 added lines, -12 removed lines

@@ -25,7 +25,7 @@ 
 function xoops_module_pre_install_extcal(XoopsModule $module)
 {
     $moduleDirName = basename(dirname(__DIR__));
-    $className     = ucfirst($moduleDirName) . 'Utilities';
+    $className     = ucfirst($moduleDirName).'Utilities';
     if (!class_exists($className)) {
         xoops_load('utilities', $moduleDirName);
     }
@@ -39,9 +39,9 @@ 
         return false;
     }
 
-    $mod_tables =& $module->getInfo('tables');
+    $mod_tables = & $module->getInfo('tables');
     foreach ($mod_tables as $table) {
-        $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+        $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');
     }
 
     return true;
@@ -70,20 +70,20 @@ 
      */
 
     // Access right
-    $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 1, XOOPS_GROUP_USERS, $moduleId);
-    $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
+    $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 1, XOOPS_GROUP_USERS, $moduleId);
+    $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
 
     // Can submit
-    $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 2, XOOPS_GROUP_ADMIN, $moduleId);
+    $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 2, XOOPS_GROUP_ADMIN, $moduleId);
 
     // Auto approve
-    $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 4, XOOPS_GROUP_ADMIN, $moduleId);
+    $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 4, XOOPS_GROUP_ADMIN, $moduleId);
 
     //    $moduleDirName = $xoopsModule->getVar('dirname');
-    $configurator = include $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/config.php');
+    $configurator = include $GLOBALS['xoops']->path('modules/'.$moduleDirName.'/include/config.php');
 
-    $classUtilities = ucfirst($moduleDirName) . 'Utilities';
+    $classUtilities = ucfirst($moduleDirName).'Utilities';
     if (!class_exists($classUtilities)) {
         xoops_load('utilities', $moduleDirName);
     }
@@ -95,9 +95,9 @@ 
         }
     }
     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';
             $classUtilities::copyFile($file, $dest);
         }
     }

xoops_version.php

Spacing +10 added lines, -10 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
 // defined('XOOPS_ROOT_PATH') || die('XOOPS Root Path not defined');
-include_once __DIR__ . '/include/constantes.php';
-include_once __DIR__ . '/include/agenda_fnc.php';
-include_once __DIR__ . '/class/config.php';
+include_once __DIR__.'/include/constantes.php';
+include_once __DIR__.'/include/agenda_fnc.php';
+include_once __DIR__.'/class/config.php';
 //$loc_de = setlocale (LC_ALL, 'french');
 
 //echo "local :" .  setlocale(LC_TIME, $xoopsConfig['language'])."</ br>";
@@ -78,12 +78,12 @@ 
 
 // Tables created by sql file (without prefix!)
 $modversion['tables'] = array(
-    $moduleDirName . '_' . 'cat',
-    $moduleDirName . '_' . 'event',
-    $moduleDirName . '_' . 'eventmember',
-    $moduleDirName . '_' . 'eventnotmember',
-    $moduleDirName . '_' . 'file',
-    $moduleDirName . '_' . 'etablissement'
+    $moduleDirName.'_'.'cat',
+    $moduleDirName.'_'.'event',
+    $moduleDirName.'_'.'eventmember',
+    $moduleDirName.'_'.'eventnotmember',
+    $moduleDirName.'_'.'file',
+    $moduleDirName.'_'.'etablissement'
 );
 
 // SQL
@@ -496,7 +496,7 @@ 
 $modversion['config'][$i]['default']     = 5;
 
 ++$i;
-$modversion['config'][$i]['name']        = 'break' . $i;
+$modversion['config'][$i]['name']        = 'break'.$i;
 $modversion['config'][$i]['title']       = '_MI_EXTCAL_SHOW_OTHEROPTIONS';
 $modversion['config'][$i]['description'] = '';
 $modversion['config'][$i]['formtype']    = 'line_break';

blocks/minical.php

Indentation +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
     // Flag current day
     $selectedDays = array(
         new Calendar_Day(date('Y', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($GLOBALS['xoopsUser']))), date('n', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($GLOBALS['xoopsUser']))),
-                         date('j', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($GLOBALS['xoopsUser'])))),
+                            date('j', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($GLOBALS['xoopsUser'])))),
     );
 
     // Build calendar object

Spacing +20 added lines, -20 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
 global $extcalConfig, $xoopsUser;
-include_once __DIR__ . '/../include/constantes.php';
-include_once __DIR__ . '/../class/utilities.php';
-include_once __DIR__ . '/../class/tableForm.php';
+include_once __DIR__.'/../include/constantes.php';
+include_once __DIR__.'/../class/utilities.php';
+include_once __DIR__.'/../class/tableForm.php';
 //---------------------------------------------------------------------------
 /**
  * @param $options
@@ -16,11 +16,11 @@ 
 
     extcal_getDefautminicalOption($options);
 
-    include_once __DIR__ . '/../class/config.php';
+    include_once __DIR__.'/../class/config.php';
 
-    require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Util/Textual.php';
-    require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Month/Weeks.php';
-    require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Day.php';
+    require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Util/Textual.php';
+    require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Month/Weeks.php';
+    require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Day.php';
     //     require_once CALENDAR_ROOT . 'Month/Weeks.php';
     //     require_once CALENDAR_ROOT . 'Day.php';
 
@@ -106,7 +106,7 @@ 
             'cat'          => $tCatSelected,
             'externalKeys' => 'cat_id',
         );
-        $events   = $eventHandler->getEventsOnPeriode($criteres);
+        $events = $eventHandler->getEventsOnPeriode($criteres);
     } else {
         $events = array();
     }
@@ -168,7 +168,7 @@ 
                 'number'     => $dayCalObj->thisDay(),
                 'isSelected' => $dayCalObj->isSelected(),
             );
-            $day                                = $dayCalObj->thisDay();
+            $day = $dayCalObj->thisDay();
             if (isset($eventsArray[$day]) && !$dayCalObj->isEmpty()) {
                 $tableRows[$rowId]['week'][$cellId]['haveEvents'] = true;
                 $tableRows[$rowId]['week'][$cellId]['color']      = $eventsArray[$day]['color'];
@@ -198,15 +198,15 @@ 
     // Making navig data
     $navig = array(
         'page' => $extcalConfig['start_page'],
-        'uri'  => 'year=' . $monthCalObj->thisYear() . '&amp;month=' . $monthCalObj->thisMonth(),
+        'uri'  => 'year='.$monthCalObj->thisYear().'&amp;month='.$monthCalObj->thisMonth(),
         'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_month'], $monthCalObj->getTimestamp()),
     );
 
     $horloge             = array();
     $horloge['display']  = (trim($options[11]) != '');
-    $horloge['fullName'] = XOOPS_URL . _EXTCAL_PATH_HORLOGES . $options[11];
-    $horloge['width']    = $options[12] . 'px';
-    $horloge['height']   = $options[13] . 'px';
+    $horloge['fullName'] = XOOPS_URL._EXTCAL_PATH_HORLOGES.$options[11];
+    $horloge['width']    = $options[12].'px';
+    $horloge['height']   = $options[13].'px';
 
     $ret = array(
         'imageParam'   => $imageParam,
@@ -232,7 +232,7 @@ 
  */
 function bExtcalMinicalEdit($options)
 {
-    include_once __DIR__ . '/../class/form/spin/formspin.php';
+    include_once __DIR__.'/../class/form/spin/formspin.php';
     global $xoopsUser;
 
     //  $t = print_r(get_defined_vars(),true);
@@ -253,7 +253,7 @@ 
     $imageCatHandler = xoops_getHandler('imagecategory');
 
     //=====================================================================
-    $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_OPT_SLIDE_SHOW . '</div>', 'head');
+    $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_OPT_SLIDE_SHOW.'</div>', 'head');
 
     $k           = 0;
     $xfValue[$k] = new XoopsFormRadio(_MB_EXTCAL_DISPLAY_IMG, "options[{$k}]", $options[$k]);
@@ -294,7 +294,7 @@ 
     $xfValue[$k] = new ExtcalFormSpin(_MB_EXTCAL_SS_NB_PHOTOS, "options[{$k}]", $options[$k], 0, 50, 1, 0, 8, _MB_EXTCAL_PX, $imgFolder = '');
     $form->addElement($xfValue[$k], false);
     //=====================================================================
-    $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_OPT_SHOW . '</div>', 'head');
+    $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_OPT_SHOW.'</div>', 'head');
 
     $t = array(
         -1 => _MB_EXTCAL_PREVIEW,
@@ -333,9 +333,9 @@ 
     $form->addElement($xfValue[$k], false);
 
     //=====================================================================
-    $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_HORLOGE_OPT . '</div>', 'head');
+    $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_HORLOGE_OPT.'</div>', 'head');
     //---------------------------------------------------------------------
-    $t = XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH . _EXTCAL_PATH_HORLOGES);
+    $t = XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH._EXTCAL_PATH_HORLOGES);
     $t = array_merge(array(' ' => _NONE), $t);
 
     $k           = 11;
@@ -418,12 +418,12 @@ 
         // $src   = $doc->createElement('src');
         $src   = clone $tempSrc;
         $src   = $photo->appendChild($src);
-        $value = $doc->createTextNode(XOOPS_URL . '/uploads/' . $images->getVar('image_name'));
+        $value = $doc->createTextNode(XOOPS_URL.'/uploads/'.$images->getVar('image_name'));
         $src->appendChild($value);
     }
 
     // get completed xml document
-    $xml_string = $doc->save(XOOPS_ROOT_PATH . '/cache/extcalSlideShowParam.xml');
+    $xml_string = $doc->save(XOOPS_ROOT_PATH.'/cache/extcalSlideShowParam.xml');
 }
 
 /**************************************************************************/

Doc Comments +3 added lines, -3 removed lines

@@ -432,11 +432,11 @@
  * @param array $event
  * @param array $eventsArray
  * @param ExtcalTime $extcalTimeHandler
- * @param $startMonth
- * @param $endMonth
+ * @param integer $startMonth
+ * @param integer $endMonth
  * @param $cats
  *
- * @return bool
+ * @return false|null
  */
 function bExtcalMinicalAddEventToArray($event, &$eventsArray, $extcalTimeHandler, $startMonth, $endMonth, $cats)
 {