mambax7 / extcal

blocks/category_events.php

Spacing +10 added lines, -10 removed lines

@@ -17,7 +17,7 @@ 
  * @author       XOOPS Development Team,
  */
 
-require_once __DIR__ . '/../include/constantes.php';
+require_once __DIR__.'/../include/constantes.php';
 
 /******************************************************/
 /* Ajour JJD - Evenements par categries               */
@@ -31,7 +31,7 @@ 
 {
     global $xoopsUser, $extcalConfig;
 
-    require_once __DIR__ . '/../class/config.php';
+    require_once __DIR__.'/../class/config.php';
 
     // Retriving module config
     //     $extcalConfig = ExtcalConfig::getHandler();
@@ -88,22 +88,22 @@ 
 
     $cats = $catHandler->getAllCat($xoopsUser, 'extcal_cat_view');
 
-    $form = _MB_EXTCAL_DISPLAY . " \n";
-    $form .= '<input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text">&nbsp;' . _MB_EXTCAL_EVENT . '<br>';
-    $form .= _MB_EXTCAL_TITLE_LENGTH . ' : <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text"><br>';
+    $form = _MB_EXTCAL_DISPLAY."&nbsp;\n";
+    $form .= '<input name="options[0]" size="5" maxlength="255" value="'.$options[0].'" type="text">&nbsp;'._MB_EXTCAL_EVENT.'<br>';
+    $form .= _MB_EXTCAL_TITLE_LENGTH.' : <input name="options[1]" size="5" maxlength="255" value="'.$options[1].'" type="text"><br>';
     array_shift($options);
     array_shift($options);
-    $form .= _MB_EXTCAL_CAT_TO_USE . '<br><select name="options[]" multiple="multiple" size="5">';
+    $form .= _MB_EXTCAL_CAT_TO_USE.'<br><select name="options[]" multiple="multiple" size="5">';
     if (array_search(0, $options) === false) {
-        $form .= '<option value="0">' . _MB_EXTCAL_ALL_CAT . '</option>';
+        $form .= '<option value="0">'._MB_EXTCAL_ALL_CAT.'</option>';
     } else {
-        $form .= '<option value="0" selected="selected">' . _MB_EXTCAL_ALL_CAT . '</option>';
+        $form .= '<option value="0" selected="selected">'._MB_EXTCAL_ALL_CAT.'</option>';
     }
     foreach ($cats as $cat) {
         if (array_search($cat->getVar('cat_id'), $options) === false) {
-            $form .= '<option value="' . $cat->getVar('cat_id') . '">' . $cat->getVar('cat_name') . '</option>';
+            $form .= '<option value="'.$cat->getVar('cat_id').'">'.$cat->getVar('cat_name').'</option>';
         } else {
-            $form .= '<option value="' . $cat->getVar('cat_id') . '" selected="selected">' . $cat->getVar('cat_name') . '</option>';
+            $form .= '<option value="'.$cat->getVar('cat_id').'" selected="selected">'.$cat->getVar('cat_name').'</option>';
         }
     }
     $form .= '</select>';

blocks/random_events.php

Spacing +10 added lines, -10 removed lines

@@ -17,7 +17,7 @@ 
  * @author       XOOPS Development Team,
  */
 
-require_once __DIR__ . '/../include/constantes.php';
+require_once __DIR__.'/../include/constantes.php';
 
 /**
  * @param $options
@@ -26,7 +26,7 @@ 
  */
 function bExtcalRandomShow($options)
 {
-    require_once __DIR__ . '/../class/config.php';
+    require_once __DIR__.'/../class/config.php';
 
     // Retriving module config
     $extcalConfig      = ExtcalConfig::getHandler();
@@ -64,22 +64,22 @@ 
 
     $cats = $catHandler->getAllCat($xoopsUser, 'extcal_cat_view');
 
-    $form = _MB_EXTCAL_DISPLAY . " \n";
-    $form .= '<input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text">&nbsp;' . _MB_EXTCAL_EVENT . '<br>';
-    $form .= _MB_EXTCAL_TITLE_LENGTH . ' : <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text"><br>';
+    $form = _MB_EXTCAL_DISPLAY."&nbsp;\n";
+    $form .= '<input name="options[0]" size="5" maxlength="255" value="'.$options[0].'" type="text">&nbsp;'._MB_EXTCAL_EVENT.'<br>';
+    $form .= _MB_EXTCAL_TITLE_LENGTH.' : <input name="options[1]" size="5" maxlength="255" value="'.$options[1].'" type="text"><br>';
     array_shift($options);
     array_shift($options);
-    $form .= _MB_EXTCAL_CAT_TO_USE . '<br><select name="options[]" multiple="multiple" size="5">';
+    $form .= _MB_EXTCAL_CAT_TO_USE.'<br><select name="options[]" multiple="multiple" size="5">';
     if (array_search(0, $options) === false) {
-        $form .= '<option value="0">' . _MB_EXTCAL_ALL_CAT . '</option>';
+        $form .= '<option value="0">'._MB_EXTCAL_ALL_CAT.'</option>';
     } else {
-        $form .= '<option value="0" selected="selected">' . _MB_EXTCAL_ALL_CAT . '</option>';
+        $form .= '<option value="0" selected="selected">'._MB_EXTCAL_ALL_CAT.'</option>';
     }
     foreach ($cats as $cat) {
         if (array_search($cat->getVar('cat_id'), $options) === false) {
-            $form .= '<option value="' . $cat->getVar('cat_id') . '">' . $cat->getVar('cat_name') . '</option>';
+            $form .= '<option value="'.$cat->getVar('cat_id').'">'.$cat->getVar('cat_name').'</option>';
         } else {
-            $form .= '<option value="' . $cat->getVar('cat_id') . '" selected="selected">' . $cat->getVar('cat_name') . '</option>';
+            $form .= '<option value="'.$cat->getVar('cat_id').'" selected="selected">'.$cat->getVar('cat_name').'</option>';
         }
     }
     $form .= '</select>';

blocks/upcoming.php

Spacing +16 added lines, -16 removed lines

@@ -17,7 +17,7 @@ 
  * @author       XOOPS Development Team,
  */
 
-require_once __DIR__ . '/../include/constantes.php';
+require_once __DIR__.'/../include/constantes.php';
 
 /**
  * @param $options
@@ -26,7 +26,7 @@ 
  */
 function bExtcalUpcomingShow($options)
 {
-    require_once __DIR__ . '/../class/config.php';
+    require_once __DIR__.'/../class/config.php';
 
     // Retriving module config
     $extcalConfig      = ExtcalConfig::getHandler();
@@ -51,10 +51,10 @@ 
     //mb $events = $eventHandler->objectToArray($eventHandler->getUpcommingEvent($nbEvent, $options));
 
     /* ========================================================================== */
-    $year  = isset($_GET['year']) ? (int)$_GET['year'] : date('Y');
-    $month = isset($_GET['month']) ? (int)$_GET['month'] : date('n');
-    $day   = isset($_GET['day']) ? (int)$_GET['day'] : date('j');
-    $cat   = isset($_GET['cat']) ? (int)$_GET['cat'] : 0;
+    $year  = isset($_GET['year']) ? (int) $_GET['year'] : date('Y');
+    $month = isset($_GET['month']) ? (int) $_GET['month'] : date('n');
+    $day   = isset($_GET['day']) ? (int) $_GET['day'] : date('j');
+    $cat   = isset($_GET['cat']) ? (int) $_GET['cat'] : 0;
     /* ========================================================================== */
 
     // Validate the date (day, month and year)
@@ -87,7 +87,7 @@ 
         'nbEvent'      => $nbEvent,
         'nbDays'       => $nbDays,
     );
-    $events   = $eventHandler->getEventsOnPeriode($criteres);
+    $events = $eventHandler->getEventsOnPeriode($criteres);
 
     //----------------------------
 
@@ -114,27 +114,27 @@ 
 
     $cats = $catHandler->getAllCat($xoopsUser, 'extcal_cat_view');
 
-    $form = _MB_EXTCAL_DISPLAY . " \n";
-    $form .= '<input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text">&nbsp;' . _MB_EXTCAL_EVENT . '<br>';
-    $form .= _MB_EXTCAL_TITLE_LENGTH . ' : <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text"><br>';
+    $form = _MB_EXTCAL_DISPLAY."&nbsp;\n";
+    $form .= '<input name="options[0]" size="5" maxlength="255" value="'.$options[0].'" type="text">&nbsp;'._MB_EXTCAL_EVENT.'<br>';
+    $form .= _MB_EXTCAL_TITLE_LENGTH.' : <input name="options[1]" size="5" maxlength="255" value="'.$options[1].'" type="text"><br>';
 
-    $form .= _MB_EXTCAL_UPCOMING_DAYS . ' : <input name="options[2]" size="5" maxlength="255" value="' . $options[2] . '" type="text"><br>';
+    $form .= _MB_EXTCAL_UPCOMING_DAYS.' : <input name="options[2]" size="5" maxlength="255" value="'.$options[2].'" type="text"><br>';
 
     array_shift($options);
     array_shift($options);
     array_shift($options);
 
-    $form .= _MB_EXTCAL_CAT_TO_USE . '<br><select name="options[]" multiple="multiple" size="5">';
+    $form .= _MB_EXTCAL_CAT_TO_USE.'<br><select name="options[]" multiple="multiple" size="5">';
     if (array_search(0, $options) === false) {
-        $form .= '<option value="0">' . _MB_EXTCAL_ALL_CAT . '</option>';
+        $form .= '<option value="0">'._MB_EXTCAL_ALL_CAT.'</option>';
     } else {
-        $form .= '<option value="0" selected="selected">' . _MB_EXTCAL_ALL_CAT . '</option>';
+        $form .= '<option value="0" selected="selected">'._MB_EXTCAL_ALL_CAT.'</option>';
     }
     foreach ($cats as $cat) {
         if (array_search($cat->getVar('cat_id'), $options) === false) {
-            $form .= '<option value="' . $cat->getVar('cat_id') . '">' . $cat->getVar('cat_name') . '</option>';
+            $form .= '<option value="'.$cat->getVar('cat_id').'">'.$cat->getVar('cat_name').'</option>';
         } else {
-            $form .= '<option value="' . $cat->getVar('cat_id') . '" selected="selected">' . $cat->getVar('cat_name') . '</option>';
+            $form .= '<option value="'.$cat->getVar('cat_id').'" selected="selected">'.$cat->getVar('cat_name').'</option>';
         }
     }
     $form .= '</select>';

blocks/new_events.php

Spacing +10 added lines, -10 removed lines

@@ -17,7 +17,7 @@ 
  * @author       XOOPS Development Team,
  */
 
-require_once __DIR__ . '/../include/constantes.php';
+require_once __DIR__.'/../include/constantes.php';
 
 /**
  * @param $options
@@ -26,7 +26,7 @@ 
  */
 function bExtcalNewShow($options)
 {
-    require_once __DIR__ . '/../class/config.php';
+    require_once __DIR__.'/../class/config.php';
 
     // Retriving module config
     $extcalConfig      = ExtcalConfig::getHandler();
@@ -64,22 +64,22 @@ 
 
     $cats = $catHandler->getAllCat($xoopsUser, 'extcal_cat_view');
 
-    $form = _MB_EXTCAL_DISPLAY . " \n";
-    $form .= '<input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text">&nbsp;' . _MB_EXTCAL_EVENT . '<br>';
-    $form .= _MB_EXTCAL_TITLE_LENGTH . ' : <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text"><br>';
+    $form = _MB_EXTCAL_DISPLAY."&nbsp;\n";
+    $form .= '<input name="options[0]" size="5" maxlength="255" value="'.$options[0].'" type="text">&nbsp;'._MB_EXTCAL_EVENT.'<br>';
+    $form .= _MB_EXTCAL_TITLE_LENGTH.' : <input name="options[1]" size="5" maxlength="255" value="'.$options[1].'" type="text"><br>';
     array_shift($options);
     array_shift($options);
-    $form .= _MB_EXTCAL_CAT_TO_USE . '<br><select name="options[]" multiple="multiple" size="5">';
+    $form .= _MB_EXTCAL_CAT_TO_USE.'<br><select name="options[]" multiple="multiple" size="5">';
     if (array_search(0, $options) === false) {
-        $form .= '<option value="0">' . _MB_EXTCAL_ALL_CAT . '</option>';
+        $form .= '<option value="0">'._MB_EXTCAL_ALL_CAT.'</option>';
     } else {
-        $form .= '<option value="0" selected="selected">' . _MB_EXTCAL_ALL_CAT . '</option>';
+        $form .= '<option value="0" selected="selected">'._MB_EXTCAL_ALL_CAT.'</option>';
     }
     foreach ($cats as $cat) {
         if (array_search($cat->getVar('cat_id'), $options) === false) {
-            $form .= '<option value="' . $cat->getVar('cat_id') . '">' . $cat->getVar('cat_name') . '</option>';
+            $form .= '<option value="'.$cat->getVar('cat_id').'">'.$cat->getVar('cat_name').'</option>';
         } else {
-            $form .= '<option value="' . $cat->getVar('cat_id') . '" selected="selected">' . $cat->getVar('cat_name') . '</option>';
+            $form .= '<option value="'.$cat->getVar('cat_id').'" selected="selected">'.$cat->getVar('cat_name').'</option>';
         }
     }
     $form .= '</select>';

blocks/day_events.php

Spacing +10 added lines, -10 removed lines

@@ -17,7 +17,7 @@ 
  * @author       XOOPS Development Team,
  */
 
-require_once __DIR__ . '/../include/constantes.php';
+require_once __DIR__.'/../include/constantes.php';
 
 /**
  * @param $options
@@ -26,7 +26,7 @@ 
  */
 function bExtcalDayShow($options)
 {
-    require_once __DIR__ . '/../class/config.php';
+    require_once __DIR__.'/../class/config.php';
 
     // Retriving module config
     $extcalConfig      = ExtcalConfig::getHandler();
@@ -64,22 +64,22 @@ 
 
     $cats = $catHandler->getAllCat($xoopsUser, 'extcal_cat_view');
 
-    $form = _MB_EXTCAL_DISPLAY . " \n";
-    $form .= '<input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text">&nbsp;' . _MB_EXTCAL_EVENT . '<br>';
-    $form .= _MB_EXTCAL_TITLE_LENGTH . ' : <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text"><br>';
+    $form = _MB_EXTCAL_DISPLAY."&nbsp;\n";
+    $form .= '<input name="options[0]" size="5" maxlength="255" value="'.$options[0].'" type="text">&nbsp;'._MB_EXTCAL_EVENT.'<br>';
+    $form .= _MB_EXTCAL_TITLE_LENGTH.' : <input name="options[1]" size="5" maxlength="255" value="'.$options[1].'" type="text"><br>';
     array_shift($options);
     array_shift($options);
-    $form .= _MB_EXTCAL_CAT_TO_USE . '<br><select name="options[]" multiple="multiple" size="5">';
+    $form .= _MB_EXTCAL_CAT_TO_USE.'<br><select name="options[]" multiple="multiple" size="5">';
     if (array_search(0, $options) === false) {
-        $form .= '<option value="0">' . _MB_EXTCAL_ALL_CAT . '</option>';
+        $form .= '<option value="0">'._MB_EXTCAL_ALL_CAT.'</option>';
     } else {
-        $form .= '<option value="0" selected="selected">' . _MB_EXTCAL_ALL_CAT . '</option>';
+        $form .= '<option value="0" selected="selected">'._MB_EXTCAL_ALL_CAT.'</option>';
     }
     foreach ($cats as $cat) {
         if (array_search($cat->getVar('cat_id'), $options) === false) {
-            $form .= '<option value="' . $cat->getVar('cat_id') . '">' . $cat->getVar('cat_name') . '</option>';
+            $form .= '<option value="'.$cat->getVar('cat_id').'">'.$cat->getVar('cat_name').'</option>';
         } else {
-            $form .= '<option value="' . $cat->getVar('cat_id') . '" selected="selected">' . $cat->getVar('cat_name') . '</option>';
+            $form .= '<option value="'.$cat->getVar('cat_id').'" selected="selected">'.$cat->getVar('cat_name').'</option>';
         }
     }
     $form .= '</select>';

view_month.php

Spacing +12 added lines, -12 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $params                                  = array('view' => _EXTCAL_NAV_MONTH, 'file' => _EXTCAL_FILE_MONTH);
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 /* ========================================================================== */
-$year  = isset($_GET['year']) ? (int)$_GET['year'] : date('Y');
-$month = isset($_GET['month']) ? (int)$_GET['month'] : date('n');
-$cat   = isset($_GET['cat']) ? (int)$_GET['cat'] : 0;
+$year  = isset($_GET['year']) ? (int) $_GET['year'] : date('Y');
+$month = isset($_GET['month']) ? (int) $_GET['month'] : date('n');
+$cat   = isset($_GET['cat']) ? (int) $_GET['cat'] : 0;
 /* ========================================================================== */
 
 $form = new XoopsSimpleForm('', 'navigSelectBox', $params['file'], 'get');
@@ -31,7 +31,7 @@ 
     'cat'          => $cat,
     'externalKeys' => 'cat_id',
 );
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 $eventsArray = $events;
 
@@ -88,21 +88,21 @@ 
 $nMonthCalObj = $monthCalObj->nextMonth('object');
 $navig        = array(
     'prev' => array(
-        'uri'  => 'year=' . $pMonthCalObj->thisYear() . '&amp;month=' . $pMonthCalObj->thisMonth(),
+        'uri'  => 'year='.$pMonthCalObj->thisYear().'&amp;month='.$pMonthCalObj->thisMonth(),
         'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $pMonthCalObj->getTimestamp()),
     ),
     'this' => array(
-        'uri'  => 'year=' . $monthCalObj->thisYear() . '&amp;month=' . $monthCalObj->thisMonth(),
+        'uri'  => 'year='.$monthCalObj->thisYear().'&amp;month='.$monthCalObj->thisMonth(),
         'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $monthCalObj->getTimestamp()),
     ),
     'next' => array(
-        'uri'  => 'year=' . $nMonthCalObj->thisYear() . '&amp;month=' . $nMonthCalObj->thisMonth(),
+        'uri'  => 'year='.$nMonthCalObj->thisYear().'&amp;month='.$nMonthCalObj->thisMonth(),
         'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $nMonthCalObj->getTimestamp()),
     ),
 );
 
 // Title of the page
-$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']);
+$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']);
 
 // Assigning navig data to the template
 $xoopsTpl->assign('navig', $navig);
@@ -159,4 +159,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'month');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

new_event.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
-require_once __DIR__ . '/header.php';
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
+require_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);
 }

include/onupdate.php

Spacing +15 added lines, -15 removed lines

@@ -21,7 +21,7 @@ 
 if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof XoopsUser)
     || !$GLOBALS['xoopsUser']->IsAdmin()
 ) {
-    exit('Restricted access' . PHP_EOL);
+    exit('Restricted access'.PHP_EOL);
 }
 
 /**
@@ -46,7 +46,7 @@ 
 function xoops_module_pre_update_extcal(XoopsModule $module)
 {
     $moduleDirName = basename(dirname(__DIR__));
-    $classUtility  = ucfirst($moduleDirName) . 'Utility';
+    $classUtility  = ucfirst($moduleDirName).'Utility';
     if (!class_exists($classUtility)) {
         xoops_load('utility', $moduleDirName);
     }
@@ -83,7 +83,7 @@ 
         return true;
     }
 
-    $fld = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/versions/';
+    $fld = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/versions/';
     $cls = 'extcal_%1$s';
 
     $version = array(
@@ -102,7 +102,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>";
@@ -113,8 +113,8 @@ 
     }
 
     if ($previousVersion < 240) {
-        $configurator = include __DIR__ . '/config.php';
-        $classUtility = ucfirst($moduleDirName) . 'Utility';
+        $configurator = include __DIR__.'/config.php';
+        $classUtility = ucfirst($moduleDirName).'Utility';
         if (!class_exists($classUtility)) {
             xoops_load('utility', $moduleDirName);
         }
@@ -122,14 +122,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), 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);
                             }
                         }
                     }
@@ -139,9 +139,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';
                 $classUtility::copyFile($file, $dest);
             }
         }
@@ -150,7 +150,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);
                 }
@@ -160,14 +160,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/oninstall.php

Spacing +11 added lines, -11 removed lines

@@ -28,7 +28,7 @@ 
 function xoops_module_pre_install_extcal(XoopsModule $module)
 {
     $moduleDirName = basename(dirname(__DIR__));
-    $className     = ucfirst($moduleDirName) . 'Utility';
+    $className     = ucfirst($moduleDirName).'Utility';
     if (!class_exists($className)) {
         xoops_load('utility', $moduleDirName);
     }
@@ -44,7 +44,7 @@ 
 
     $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;
@@ -73,20 +73,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');
 
-    $classUtility = ucfirst($moduleDirName) . 'Utility';
+    $classUtility = ucfirst($moduleDirName).'Utility';
     if (!class_exists($classUtility)) {
         xoops_load('utility', $moduleDirName);
     }
@@ -98,9 +98,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';
             $classUtility::copyFile($file, $dest);
         }
     }