mambax7 / extcal

edit_event.php

Spacing +9 added lines, -9 removed lines

@@ -17,12 +17,12 @@ 
  * @author       XOOPS Development Team,
  */
 
-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';
-require_once __DIR__ . '/include/constantes.php';
+include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+include __DIR__.'/class/form/extcalform.php';
+include __DIR__.'/class/perm.php';
+require_once __DIR__.'/include/constantes.php';
 
 $permHandler = ExtcalPerm::getHandler();
 $xoopsUser   = $xoopsUser ?: null;
@@ -34,7 +34,7 @@ 
 
 $params                                  = ['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
@@ -45,7 +45,7 @@ 
 if (!isset($_GET['event'])) {
     $eventId = 0;
 } else {
-    $eventId = (int)$_GET['event'];
+    $eventId = (int) $_GET['event'];
 }
 if (!isset($_GET['action'])) {
     $action = 'edit';
@@ -56,7 +56,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);
@@ -65,4 +65,4 @@ 
 $form = $eventHandler->getEventForm('user', $action, ['event_id' => $eventId]);
 $form->display();
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

view_week.php

Spacing +13 added lines, -13 removed lines

@@ -17,17 +17,17 @@ 
  * @author       XOOPS Development Team,
  */
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $params                                  = ['view' => _EXTCAL_NAV_WEEK, 'file' => _EXTCAL_FILE_WEEK];
 $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');
-$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)
@@ -62,7 +62,7 @@ 
     'cat'          => $cat,
     'externalKeys' => 'cat_id',
 ];
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 $eventsArray = $events;
 // Formating date
@@ -103,21 +103,21 @@ 
 $nWeekCalObj = $weekCalObj->nextWeek('object');
 $navig       = [
     'prev' => [
-        'uri'  => 'year=' . $pWeekCalObj->thisYear() . '&month=' . $pWeekCalObj->thisMonth() . '&day=' . $pWeekCalObj->thisDay(),
+        'uri'  => 'year='.$pWeekCalObj->thisYear().'&month='.$pWeekCalObj->thisMonth().'&day='.$pWeekCalObj->thisDay(),
         'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $pWeekCalObj->getTimestamp()),
     ],
     'this' => [
-        'uri'  => 'year=' . $weekCalObj->thisYear() . '&month=' . $weekCalObj->thisMonth() . '&day=' . $weekCalObj->thisDay(),
+        'uri'  => 'year='.$weekCalObj->thisYear().'&month='.$weekCalObj->thisMonth().'&day='.$weekCalObj->thisDay(),
         'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $weekCalObj->getTimestamp()),
     ],
     'next' => [
-        'uri'  => 'year=' . $nWeekCalObj->thisYear() . '&month=' . $nWeekCalObj->thisMonth() . '&day=' . $nWeekCalObj->thisDay(),
+        'uri'  => 'year='.$nWeekCalObj->thisYear().'&month='.$nWeekCalObj->thisMonth().'&day='.$nWeekCalObj->thisDay(),
         'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $nWeekCalObj->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);
@@ -177,4 +177,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'week');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

print.php

Spacing +80 added lines, -80 removed lines

@@ -17,15 +17,15 @@ 
  * @author       XOOPS Development Team,
  */
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 
-require_once XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/calendar.php';
+require_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/calendar.php';
 
 if (!isset($_GET['event'])) {
     $eventId = 0;
 } else {
-    $eventId = (int)$_GET['event'];
+    $eventId = (int) $_GET['event'];
 }
 $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
 $event        = $eventHandler->objectToArray($eventHandler->getEvent($eventId), ['cat_id']);
@@ -40,136 +40,136 @@ 
 // Adding formated date for start and end event
 $eventHandler->formatEventDate($event, $xoopsModuleConfig['event_date_event']);
 
-echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' . "\n";
-echo '<html xmlns="http://www.w3.org/1999/xhtml">' . "\n";
-echo '<head>' . "\n";
-echo '<meta http-equiv="content-type" content="text/html; charset=' . _CHARSET . '">' . "\n";
-echo '<title>' . $event['cat']['cat_name'] . ' - ' . $event['event_title'] . '</title>' . "\n";
-echo '</head>' . "\n";
-echo '<body onload="window.print()">' . "\n";
-echo '<table style="border:1px solid black; width:640px;" cellspacing="0" cellspadding="0">' . "\n";
-echo '<tr>' . "\n";
-echo '<td colspan="2" style="font-size:1.2em; border:1px solid black;">' . "\n";
-echo $event['event_title'] . "\n";
-echo '</td>' . "\n";
-echo '</tr>' . "\n";
-echo '<tr>' . "\n";
-echo '<td style="width:50%; border:1px solid black;">' . "\n";
-echo '<b>' . $event['cat']['cat_name'] . '</b><br>' . "\n";
-echo '<span style="font-weight:normal;">' . $event['cat']['cat_desc'] . '</span>' . "\n";
-echo '</td>' . "\n";
-echo '<td style="border:1px solid black;">' . "\n";
+echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n";
+echo '<html xmlns="http://www.w3.org/1999/xhtml">'."\n";
+echo '<head>'."\n";
+echo '<meta http-equiv="content-type" content="text/html; charset='._CHARSET.'">'."\n";
+echo '<title>'.$event['cat']['cat_name'].' - '.$event['event_title'].'</title>'."\n";
+echo '</head>'."\n";
+echo '<body onload="window.print()">'."\n";
+echo '<table style="border:1px solid black; width:640px;" cellspacing="0" cellspadding="0">'."\n";
+echo '<tr>'."\n";
+echo '<td colspan="2" style="font-size:1.2em; border:1px solid black;">'."\n";
+echo $event['event_title']."\n";
+echo '</td>'."\n";
+echo '</tr>'."\n";
+echo '<tr>'."\n";
+echo '<td style="width:50%; border:1px solid black;">'."\n";
+echo '<b>'.$event['cat']['cat_name'].'</b><br>'."\n";
+echo '<span style="font-weight:normal;">'.$event['cat']['cat_desc'].'</span>'."\n";
+echo '</td>'."\n";
+echo '<td style="border:1px solid black;">'."\n";
 if (!$event['event_isrecur']) {
-    echo '<b>' . _MD_EXTCAL_START . ' :</b> <span style="font-weight:normal;">' . $event['formated_event_start'] . '</span><br>' . "\n";
-    echo '<b>' . _MD_EXTCAL_END . ' :</b> <span style="font-weight:normal;">' . $event['formated_event_end'] . '</span>' . "\n";
+    echo '<b>'._MD_EXTCAL_START.' :</b> <span style="font-weight:normal;">'.$event['formated_event_start'].'</span><br>'."\n";
+    echo '<b>'._MD_EXTCAL_END.' :</b> <span style="font-weight:normal;">'.$event['formated_event_end'].'</span>'."\n";
 } else {
-    echo '<b>' . _MD_EXTCAL_RECCUR_RULE . ' :</b> <span style="font-weight:normal;">' . $event['formated_reccur_rule'] . '</span>' . "\n";
+    echo '<b>'._MD_EXTCAL_RECCUR_RULE.' :</b> <span style="font-weight:normal;">'.$event['formated_reccur_rule'].'</span>'."\n";
 }
-echo '</td>' . "\n";
-echo '</tr>' . "\n";
+echo '</td>'."\n";
+echo '</tr>'."\n";
 
-echo '<tr>' . "\n";
+echo '<tr>'."\n";
 if ($event['event_desc'] != '') {
-    echo '<td style="border:1px solid black;">' . $event['event_desc'] . '</td>' . "\n";
+    echo '<td style="border:1px solid black;">'.$event['event_desc'].'</td>'."\n";
 }
 if ($event['event_price'] != '') {
-    echo '<td style="border:1px solid black;">' . _MD_EXTCAL_ETABLISSEMENT_PRICE . $event['event_price'] . ' ' . _MD_EXTCAL_DEVISE2 . '</td>' . "\n";
+    echo '<td style="border:1px solid black;">'._MD_EXTCAL_ETABLISSEMENT_PRICE.$event['event_price'].' '._MD_EXTCAL_DEVISE2.'</td>'."\n";
 }
-echo '</tr>' . "\n";
+echo '</tr>'."\n";
 
 //show contact info
 if ($event['event_contact'] != '') {
-    echo '<tr>' . "\n";
-    echo '<td style="border:1px solid black;">' . "\n";
-    echo '<b>' . _MD_EXTCAL_CONTACT_INFO . '</b><br>' . "\n";
-    echo '<span style="font-weight:normal;">' . $event['event_organisateur'] . '<br>' . "\n";
-    echo '<span style="font-weight:normal;">' . $event['event_contact'] . '<br>' . "\n";
-    echo $event['event_address'] . '</span>' . "\n";
-    echo '</td>' . "\n";
-    echo '<td style="border:1px solid black;">' . "\n";
-    echo '<b>' . _MD_EXTCAL_EMAIL . ' :</b> <a href="mailto:' . $event['event_email'] . '">' . $event['event_email'] . '</a><br>' . "\n";
-    echo '<b>' . _MD_EXTCAL_URL . ' :</b> <a href="' . $event['event_url'] . '">' . $event['event_url'] . '</a>' . "\n";
-    echo '</td>' . "\n";
-    echo '</tr>' . "\n";
+    echo '<tr>'."\n";
+    echo '<td style="border:1px solid black;">'."\n";
+    echo '<b>'._MD_EXTCAL_CONTACT_INFO.'</b><br>'."\n";
+    echo '<span style="font-weight:normal;">'.$event['event_organisateur'].'<br>'."\n";
+    echo '<span style="font-weight:normal;">'.$event['event_contact'].'<br>'."\n";
+    echo $event['event_address'].'</span>'."\n";
+    echo '</td>'."\n";
+    echo '<td style="border:1px solid black;">'."\n";
+    echo '<b>'._MD_EXTCAL_EMAIL.' :</b> <a href="mailto:'.$event['event_email'].'">'.$event['event_email'].'</a><br>'."\n";
+    echo '<b>'._MD_EXTCAL_URL.' :</b> <a href="'.$event['event_url'].'">'.$event['event_url'].'</a>'."\n";
+    echo '</td>'."\n";
+    echo '</tr>'."\n";
 }
 
 //show location
 if ($event['event_etablissement'] = 0) {
-    echo '<tr>' . "\n";
+    echo '<tr>'."\n";
 
     //    echo($location['nom']);
     //    var_dump($location);
     //    var_dump($event);
 
-    echo '<td style="border:1px solid black;">' . "\n";
-    echo '<b>' . _MD_EXTCAL_ETABLISSEMENT . '</b>' . "\n";
+    echo '<td style="border:1px solid black;">'."\n";
+    echo '<b>'._MD_EXTCAL_ETABLISSEMENT.'</b>'."\n";
     if ($location['categorie'] != '') {
-        echo '<span style="font-weight:normal;"> (' . $location['categorie'] . ') <br>' . "\n";
+        echo '<span style="font-weight:normal;"> ('.$location['categorie'].') <br>'."\n";
     }
     if ($location['logo'] != '') {
-        echo '<img align=right style="border:1px solid #FFFFFF;margin-right:6px" src=' . XOOPS_URL . '/uploads/extcal/etablissement/' . $location['logo'] . ' height="75px">' . '' . "\n";
+        echo '<img align=right style="border:1px solid #FFFFFF;margin-right:6px" src='.XOOPS_URL.'/uploads/extcal/etablissement/'.$location['logo'].' height="75px">'.''."\n";
     }
 
-    echo '<span style="font-weight:normal;">' . $location['nom'] . '<br>' . "\n";
-    echo $location['description'] . '<br>' . "\n";
-    echo $location['adresse'] . '</span> <br>' . "\n";
+    echo '<span style="font-weight:normal;">'.$location['nom'].'<br>'."\n";
+    echo $location['description'].'<br>'."\n";
+    echo $location['adresse'].'</span> <br>'."\n";
     if ($location['adresse2'] != '') {
-        echo $location['adresse2'] . '</span> <br>' . "\n";
+        echo $location['adresse2'].'</span> <br>'."\n";
     }
-    echo $location['ville'] . "\n";
-    echo $location['cp'] . '<br>' . "\n";
+    echo $location['ville']."\n";
+    echo $location['cp'].'<br>'."\n";
 
     if ($location['horaires'] != '') {
-        echo $location['horaires'] . '</span> <br>' . "\n";
+        echo $location['horaires'].'</span> <br>'."\n";
     }
 
     if ($location['divers'] != '') {
-        echo $location['divers'] . '</span> <br>' . "\n";
+        echo $location['divers'].'</span> <br>'."\n";
     }
 
     if ($location['tarifs'] != '') {
-        echo $location['tarifs'] . '</span> ' . _MD_EXTCAL_DEVISE2 . "\n";
+        echo $location['tarifs'].'</span> '._MD_EXTCAL_DEVISE2."\n";
     }
 
-    echo '</td>' . "\n";
-    echo '<td style="border:1px solid black;">' . "\n";
+    echo '</td>'."\n";
+    echo '<td style="border:1px solid black;">'."\n";
 
     if ($location['tel_fixe'] != '') {
-        echo '<b>' . _MD_EXTCAL_ETABLISSEMENT_TEL_FIXE . ' :</b>' . $location['tel_fixe'] . '<br>' . "\n";
+        echo '<b>'._MD_EXTCAL_ETABLISSEMENT_TEL_FIXE.' :</b>'.$location['tel_fixe'].'<br>'."\n";
     }
     if ($location['tel_portable'] != '') {
-        echo '<b>' . _MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE . ' :</b>' . $location['tel_portable'] . '<br>' . "\n";
+        echo '<b>'._MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE.' :</b>'.$location['tel_portable'].'<br>'."\n";
     }
 
-    echo '<b>' . _MD_EXTCAL_EMAIL . ' :</b> <a href="mailto:' . $location['mail'] . '">' . $location['mail'] . '</a><br>' . "\n";
-    echo '<b>' . _MD_EXTCAL_URL . ' :</b> <a href="' . $location['site'] . '">' . $location['site'] . '</a>' . '<br>' . "\n";
-    echo '<b>' . _MD_EXTCAL_ETABLISSEMENT_MAP . ' :</b> <a href="' . $location['map'] . '">' . _MD_EXTCAL_ETABLISSEMENT_MAP2 . '</a>' . "\n";
+    echo '<b>'._MD_EXTCAL_EMAIL.' :</b> <a href="mailto:'.$location['mail'].'">'.$location['mail'].'</a><br>'."\n";
+    echo '<b>'._MD_EXTCAL_URL.' :</b> <a href="'.$location['site'].'">'.$location['site'].'</a>'.'<br>'."\n";
+    echo '<b>'._MD_EXTCAL_ETABLISSEMENT_MAP.' :</b> <a href="'.$location['map'].'">'._MD_EXTCAL_ETABLISSEMENT_MAP2.'</a>'."\n";
 
-    echo '</td>' . "\n";
-    echo '</tr>' . "\n";
+    echo '</td>'."\n";
+    echo '</tr>'."\n";
 }
 //show images
 
 if (($event['event_picture1'] != '') || ($event['event_picture2'] != '')) {
-    echo '<tr>' . "\n";
+    echo '<tr>'."\n";
     if ($event['event_picture1'] != '') {
-        echo '<td style="border:1px solid black;">' . "\n";
-        echo '<img align=left style="border:1px solid #FFFFFF;margin-right:6px" src=' . XOOPS_URL . '/uploads/extcal/' . $event['event_picture1'] . ' height="100px">' . '' . "\n";
-        echo '</td>' . "\n";
+        echo '<td style="border:1px solid black;">'."\n";
+        echo '<img align=left style="border:1px solid #FFFFFF;margin-right:6px" src='.XOOPS_URL.'/uploads/extcal/'.$event['event_picture1'].' height="100px">'.''."\n";
+        echo '</td>'."\n";
     }
     if ($event['event_picture2'] != '') {
-        echo '<td style="border:1px solid black;">' . "\n";
-        echo '<img align=left style="border:1px solid #FFFFFF;margin-right:6px" src=' . XOOPS_URL . '/uploads/extcal/' . $event['event_picture2'] . ' height="100px">' . '' . "\n";
-        echo '</td>' . "\n";
+        echo '<td style="border:1px solid black;">'."\n";
+        echo '<img align=left style="border:1px solid #FFFFFF;margin-right:6px" src='.XOOPS_URL.'/uploads/extcal/'.$event['event_picture2'].' height="100px">'.''."\n";
+        echo '</td>'."\n";
     }
-    echo '</tr>' . "\n";
+    echo '</tr>'."\n";
 }
 //--------------------
 
-echo '</table><br>' . "\n";
+echo '</table><br>'."\n";
 echo '<div style="text-align:center; width:640px;">';
-echo $xoopsConfig['sitename'] . ' - ' . $xoopsConfig['slogan'] . '<br>';
-echo '<a href="' . XOOPS_URL . '/modules/extcal/event.php?event=' . $event['event_id'] . '">' . XOOPS_URL . '/modules/extcal/event.php?event=' . $event['event_id'] . '</a>';
+echo $xoopsConfig['sitename'].' - '.$xoopsConfig['slogan'].'<br>';
+echo '<a href="'.XOOPS_URL.'/modules/extcal/event.php?event='.$event['event_id'].'">'.XOOPS_URL.'/modules/extcal/event.php?event='.$event['event_id'].'</a>';
 echo '</div>';
-echo '</body>' . "\n";
-echo '</html>' . "\n";
+echo '</body>'."\n";
+echo '</html>'."\n";

admin/index.php

Spacing +4 added lines, -4 removed lines

@@ -17,16 +17,16 @@ 
  * @author       XOOPS Development Team,
  */
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 // Display Admin header
 xoops_cp_header();
 /** @var ExtcalUtility $utilityClass */
-$utilityClass = ucfirst($moduleDirName) . 'Utility';
+$utilityClass = ucfirst($moduleDirName).'Utility';
 if (!class_exists($utilityClass)) {
     xoops_load('utility', $moduleDirName);
 }
 
-$configurator = include __DIR__ . '/../include/config.php';
+$configurator = include __DIR__.'/../include/config.php';
 
 foreach (array_keys($configurator['uploadFolders']) as $i) {
     $utilityClass::createFolder($configurator['uploadFolders'][$i]);
@@ -37,4 +37,4 @@ 
 $adminObject->displayNavigation(basename(__FILE__));
 $adminObject->displayIndex();
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/event.php

Switch Indentation +302 added lines, -302 removed lines

@@ -70,176 +70,194 @@ 
 
 switch ($op) {
 
-    case 'enreg':
-
-        $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-        $fileHandler  = xoops_getModuleHandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
-        // $t = print_r($_POST,true);
-        // echo "<pre>{$t}</pre><br>";
-        // exit;
-        // If the date format is wrong
-        //        if (
-        //            !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_start']['date'])
-        //                || !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_end']['date'])
-        //        ) {
-        //            redirect_header(
-        //                'event.php', 3, _MD_EXTCAL_WRONG_DATE_FORMAT . "<br>"
-        //                . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors())
-        //            );
-        //            exit;
-        //        }
-
-        //exit;
-        ///////////////////////////////////////////////////////////////////////////////
-        ExtcalUtility::extcal_loadImg($_REQUEST, $event_picture1, $event_picture2);
-        ///////////////////////////////////////////////////////////////////////////////
-        $data = [
-            'event_title'         => $_POST['event_title'],
-            'cat_id'              => $_POST['cat_id'],
-            'event_desc'          => $_POST['event_desc'],
-            'event_nbmember'      => $_POST['event_nbmember'],
-            'event_organisateur'  => $_POST['event_organisateur'],
-            'event_contact'       => $_POST['event_contact'],
-            'event_url'           => $_POST['event_url'],
-            'event_email'         => $_POST['event_email'],
-            'event_address'       => $_POST['event_address'],
-            'event_approved'      => 1,
-            'event_start'         => $_POST['event_start'],
-            'have_end'            => $_POST['have_end'],
-            'event_end'           => $_POST['event_end'],
-            'event_picture1'      => @$event_picture1,
-            'event_picture2'      => @$event_picture2,
-            'event_price'         => @$_POST['event_price'],
-            'event_etablissement' => $_POST['event_etablissement'],
-            'dohtml'              => $extcalConfig['allow_html'],
-            'event_icone'         => $_POST['event_icone'],
-        ];
-
-        // Event edited
-        if (isset($_POST['event_id'])) {
-            if (!$eventHandler->modifyEvent($_POST['event_id'], $data)) {
-                redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDIT_FAILED, false);
+        case 'enreg':
+
+            $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+            $fileHandler  = xoops_getModuleHandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
+            // $t = print_r($_POST,true);
+            // echo "<pre>{$t}</pre><br>";
+            // exit;
+            // If the date format is wrong
+            //        if (
+            //            !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_start']['date'])
+            //                || !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_end']['date'])
+            //        ) {
+            //            redirect_header(
+            //                'event.php', 3, _MD_EXTCAL_WRONG_DATE_FORMAT . "<br>"
+            //                . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors())
+            //            );
+            //            exit;
+            //        }
+
+            //exit;
+            ///////////////////////////////////////////////////////////////////////////////
+            ExtcalUtility::extcal_loadImg($_REQUEST, $event_picture1, $event_picture2);
+            ///////////////////////////////////////////////////////////////////////////////
+            $data = [
+                'event_title'         => $_POST['event_title'],
+                'cat_id'              => $_POST['cat_id'],
+                'event_desc'          => $_POST['event_desc'],
+                'event_nbmember'      => $_POST['event_nbmember'],
+                'event_organisateur'  => $_POST['event_organisateur'],
+                'event_contact'       => $_POST['event_contact'],
+                'event_url'           => $_POST['event_url'],
+                'event_email'         => $_POST['event_email'],
+                'event_address'       => $_POST['event_address'],
+                'event_approved'      => 1,
+                'event_start'         => $_POST['event_start'],
+                'have_end'            => $_POST['have_end'],
+                'event_end'           => $_POST['event_end'],
+                'event_picture1'      => @$event_picture1,
+                'event_picture2'      => @$event_picture2,
+                'event_price'         => @$_POST['event_price'],
+                'event_etablissement' => $_POST['event_etablissement'],
+                'dohtml'              => $extcalConfig['allow_html'],
+                'event_icone'         => $_POST['event_icone'],
+            ];
+
+            // Event edited
+            if (isset($_POST['event_id'])) {
+                if (!$eventHandler->modifyEvent($_POST['event_id'], $data)) {
+                    redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDIT_FAILED, false);
+                } else {
+                    $fileHandler->createFile((int)$_POST['event_id']);
+                    redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDITED, false);
+                }
+
+                // New event
             } else {
-                $fileHandler->createFile((int)$_POST['event_id']);
-                redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDITED, false);
+                $notificationHandler = xoops_getHandler('notification');
+                /** @var ExtcalCatHandler $catHandler */
+                $catHandler = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+
+                $data['event_submitter']  = $xoopsUser ? $xoopsUser->getVar('uid') : 0;
+                $data['event_submitdate'] = time();
+
+                if ($eventHandler->createEvent($data, $_POST)) {
+                    $fileHandler->createFile($eventHandler->getInsertId());
+                    $cat = $catHandler->getCat($_POST['cat_id'], $xoopsUser, 'all');
+                    $notificationHandler->triggerEvent('global', 0, 'new_event', ['EVENT_TITLE' => $_POST['event_title']]);
+                    $notificationHandler->triggerEvent('cat', $_POST['cat_id'], 'new_event_cat', [
+                        'EVENT_TITLE' => $_POST['event_title'],
+                        'CAT_NAME'    => $cat->getVar('cat_name'),
+                    ]);
+                    redirect_header('event.php', 3, _AM_EXTCAL_EVENT_CREATED, false);
+                } else {
+                    redirect_header('event.php', 3, _AM_EXTCAL_EVENT_CREATE_FAILED, false);
+                }
             }
+            break;
 
-            // New event
-        } else {
-            $notificationHandler = xoops_getHandler('notification');
-            /** @var ExtcalCatHandler $catHandler */
-            $catHandler = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
-
-            $data['event_submitter']  = $xoopsUser ? $xoopsUser->getVar('uid') : 0;
-            $data['event_submitdate'] = time();
-
-            if ($eventHandler->createEvent($data, $_POST)) {
-                $fileHandler->createFile($eventHandler->getInsertId());
-                $cat = $catHandler->getCat($_POST['cat_id'], $xoopsUser, 'all');
-                $notificationHandler->triggerEvent('global', 0, 'new_event', ['EVENT_TITLE' => $_POST['event_title']]);
-                $notificationHandler->triggerEvent('cat', $_POST['cat_id'], 'new_event_cat', [
-                    'EVENT_TITLE' => $_POST['event_title'],
-                    'CAT_NAME'    => $cat->getVar('cat_name'),
-                ]);
-                redirect_header('event.php', 3, _AM_EXTCAL_EVENT_CREATED, false);
-            } else {
-                redirect_header('event.php', 3, _AM_EXTCAL_EVENT_CREATE_FAILED, false);
+        case 'clone': /* sur validation du formulaire */
+        case 'modify':
+            $action = (($op === 'clone') ? 'clone' : 'edit');
+            xoops_cp_header();
+            //================================================
+            // require_once (XOOPS_ROOT_PATH . '/class/xoopsform/tc_calendar/formtccalendar.php');
+            //
+            //        // Call the calendar constructor - use the desired form and format, according to the instructions/samples provided on triconsole.com
+            //        $dateBirthday = new XoopsTcCalendar("datez1", true, false);
+            //        //$dateBirthday->setIcon("/images/iconCalendar.gif");
+            //        $dateBirthday->setIcon("/class/xoopsform/tc_calendar/images/iconCalendar.gif");
+            //        //$dateBirthday->rtl=false;
+            //        $dateBirthday->setAutoHide(false);
+            //
+            //       //$myCalendar->setDate(date('d'), date('m'), date('Y'));
+            //       //$dateBirthday->setDate($p['date1_day'], $p['date1_month'], $p['date1_year']);
+            //        $dateBirthday->setDate(date('d'), date('m'), date('Y'));
+            //
+            //        $dateBirthday->setPath(XOOPS_URL . "/class/xoopsform/tc_calendar/");
+            //        $dateBirthday->zindex = 150; //default 1
+            //        $dateBirthday->setYearInterval(1995, date('Y'));
+            //        $dateBirthday->dateAllow('1960-03-01', date('Y-m-d'));
+            //        //$dateBirthday->autoSubmit(true, "calendar");
+            //        $dateBirthday->disabledDay("sat");
+            //        $dateBirthday->disabledDay("sun");
+            //        $dateBirthday->setSpecificDate(array("2011-04-14", "2010-12-25"), 0, 'month');
+            //        $dateBirthday->setSpecificDate(array("2011-04-01"), 0, 'year');
+            //        $dateBirthday->setAlignment('right', 'bottom'); //optional
+            // echo "<table><tr><td>zzzzz</td><td></td><td>";
+            // echo $dateBirthday->render();
+            // echo "</td></tr></table>";
+            //echo $dateBirthday->render();
+            //================================================
+            // @author      Gregory Mage (Aka Mage)
+            //***************************************************************************************
+            //         require_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
+            $adminObject = \Xmf\Module\Admin::getInstance();
+            $adminObject->displayNavigation(basename(__FILE__));
+            //***************************************************************************************
+
+            $eventId      = $_GET['event_id'];
+            $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+
+            echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _MD_EXTCAL_EDIT_EVENT . '</legend>';
+
+            if ($form = $eventHandler->getEventForm('admin', $action, ['event_id' => $eventId])) {
+                $form->display();
             }
-        }
-        break;
-
-    case 'clone': /* sur validation du formulaire */
-    case 'modify':
-        $action = (($op === 'clone') ? 'clone' : 'edit');
-        xoops_cp_header();
-        //================================================
-        // require_once (XOOPS_ROOT_PATH . '/class/xoopsform/tc_calendar/formtccalendar.php');
-        //
-        //        // Call the calendar constructor - use the desired form and format, according to the instructions/samples provided on triconsole.com
-        //        $dateBirthday = new XoopsTcCalendar("datez1", true, false);
-        //        //$dateBirthday->setIcon("/images/iconCalendar.gif");
-        //        $dateBirthday->setIcon("/class/xoopsform/tc_calendar/images/iconCalendar.gif");
-        //        //$dateBirthday->rtl=false;
-        //        $dateBirthday->setAutoHide(false);
-        //
-        //       //$myCalendar->setDate(date('d'), date('m'), date('Y'));
-        //       //$dateBirthday->setDate($p['date1_day'], $p['date1_month'], $p['date1_year']);
-        //        $dateBirthday->setDate(date('d'), date('m'), date('Y'));
-        //
-        //        $dateBirthday->setPath(XOOPS_URL . "/class/xoopsform/tc_calendar/");
-        //        $dateBirthday->zindex = 150; //default 1
-        //        $dateBirthday->setYearInterval(1995, date('Y'));
-        //        $dateBirthday->dateAllow('1960-03-01', date('Y-m-d'));
-        //        //$dateBirthday->autoSubmit(true, "calendar");
-        //        $dateBirthday->disabledDay("sat");
-        //        $dateBirthday->disabledDay("sun");
-        //        $dateBirthday->setSpecificDate(array("2011-04-14", "2010-12-25"), 0, 'month');
-        //        $dateBirthday->setSpecificDate(array("2011-04-01"), 0, 'year');
-        //        $dateBirthday->setAlignment('right', 'bottom'); //optional
-        // echo "<table><tr><td>zzzzz</td><td></td><td>";
-        // echo $dateBirthday->render();
-        // echo "</td></tr></table>";
-        //echo $dateBirthday->render();
-        //================================================
-        // @author      Gregory Mage (Aka Mage)
-        //***************************************************************************************
-        //         require_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        //***************************************************************************************
-
-        $eventId      = $_GET['event_id'];
-        $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _MD_EXTCAL_EDIT_EVENT . '</legend>';
-
-        if ($form = $eventHandler->getEventForm('admin', $action, ['event_id' => $eventId])) {
-            $form->display();
-        }
 
-        echo '</fieldset><br>';
+            echo '</fieldset><br>';
 
-        xoops_cp_footer();
+            xoops_cp_footer();
 
-        break;
+            break;
 
-    case 'clone2': /* sur clique de l'icone du formulaire*/
+        case 'clone2': /* sur clique de l'icone du formulaire*/
 
-        //$newEventId = 1;
-        $eventId      = $_GET['event_id'];
-        $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-        $event        = $eventHandler->getEvent($eventId);
-        $t            = $event->getVars();
-        $data         = [];
-        //        while (list($key, $val) = each($t)) {
-        foreach ($t as $key => $val) {
-            $data[$key] = $val['value'];
-        }
+            //$newEventId = 1;
+            $eventId      = $_GET['event_id'];
+            $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+            $event        = $eventHandler->getEvent($eventId);
+            $t            = $event->getVars();
+            $data         = [];
+            //        while (list($key, $val) = each($t)) {
+            foreach ($t as $key => $val) {
+                $data[$key] = $val['value'];
+            }
 
-        $data['event_id']    = 0;
-        $data['event_title'] .= ' (' . _AM_EXTCAL_CLONE_OF . $eventId . ')';
+            $data['event_id']    = 0;
+            $data['event_title'] .= ' (' . _AM_EXTCAL_CLONE_OF . $eventId . ')';
 
-        $newEvent = $eventHandler->create();
-        $newEvent->setVars($data);
-        $t = $eventHandler->insert($newEvent, true);
+            $newEvent = $eventHandler->create();
+            $newEvent->setVars($data);
+            $t = $eventHandler->insert($newEvent, true);
 
-        $newEventId = $newEvent->getVar('event_id');
-        $ts         = print_r($newEventId, true);
+            $newEventId = $newEvent->getVar('event_id');
+            $ts         = print_r($newEventId, true);
 
-        redirect_header("event.php?op=modify&event_id={$newEventId}", 3, _AM_EXTCAL_EVENT_DELETED, false);
-        break;
+            redirect_header("event.php?op=modify&event_id={$newEventId}", 3, _AM_EXTCAL_EVENT_DELETED, false);
+            break;
 
-    case 'delete':
+        case 'delete':
 
-        if (isset($_POST['confirm'])) {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            if (isset($_POST['confirm'])) {
+                if (!$GLOBALS['xoopsSecurity']->check()) {
+                    redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+                }
+                //             $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+                //             $eventHandler->deleteEvent($_POST['event_id']);
+                deleteEvents($_POST['event_id']);
+                redirect_header('event.php', 3, _AM_EXTCAL_EVENT_DELETED, false);
+            } else {
+                xoops_cp_header();
+                // @author      Gregory Mage (Aka Mage)
+                //***************************************************************************************
+                //require_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
+                $adminObject = \Xmf\Module\Admin::getInstance();
+                $adminObject->displayNavigation(basename(__FILE__));
+                //***************************************************************************************
+
+                $hiddens = ['event_id' => $_GET['event_id'], 'form_delete' => '', 'confirm' => 1];
+                xoops_confirm($hiddens, 'event.php?op=delete', _AM_EXTCAL_CONFIRM_DELETE_EVENT, _DELETE, 'event.php');
+
+                xoops_cp_footer();
             }
-            //             $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-            //             $eventHandler->deleteEvent($_POST['event_id']);
-            deleteEvents($_POST['event_id']);
-            redirect_header('event.php', 3, _AM_EXTCAL_EVENT_DELETED, false);
-        } else {
+
+            break;
+
+        case 'deleteSelection':
+
             xoops_cp_header();
             // @author      Gregory Mage (Aka Mage)
             //***************************************************************************************
@@ -247,185 +265,167 @@ 
             $adminObject = \Xmf\Module\Admin::getInstance();
             $adminObject->displayNavigation(basename(__FILE__));
             //***************************************************************************************
+            if (isset($_POST['deleteSelection'][0])) {
+                $msg = _AM_EXTCAL_CONFIRM_DELETE_ALL;
+                $ids = array_keys($_POST['deleteAllEvents']);
+            } else {
+                $msg = _AM_EXTCAL_CONFIRM_DELETE_SELECTION;
+                $ids = array_keys($_POST['deleteEvents']);
+            }
 
-            $hiddens = ['event_id' => $_GET['event_id'], 'form_delete' => '', 'confirm' => 1];
-            xoops_confirm($hiddens, 'event.php?op=delete', _AM_EXTCAL_CONFIRM_DELETE_EVENT, _DELETE, 'event.php');
+            //           $msg = ((isset($_POST['deleteSelection'][0])) ? _AM_EXTCAL_CONFIRM_DELETE_ALL : _AM_EXTCAL_CONFIRM_DELETE_SELECTION);
+            //           $ids = array_keys($_POST['deleteEvents']);
+            $ids = implode(',', $ids);
+            //echo $ids.'<br>';
+            $hiddens = ['event_ids' => $ids, 'form_delete' => '', 'confirm' => 1];
+            //$hiddens = array('event_ids' => $_POST['deleteEvents'], 'form_delete' => '', 'confirm' => 1);
+            xoops_confirm($hiddens, 'event.php?op=deleteSelectionOK', $msg, _DELETE, 'event.php');
 
             xoops_cp_footer();
-        }
 
-        break;
-
-    case 'deleteSelection':
-
-        xoops_cp_header();
-        // @author      Gregory Mage (Aka Mage)
-        //***************************************************************************************
-        //require_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        //***************************************************************************************
-        if (isset($_POST['deleteSelection'][0])) {
-            $msg = _AM_EXTCAL_CONFIRM_DELETE_ALL;
-            $ids = array_keys($_POST['deleteAllEvents']);
-        } else {
-            $msg = _AM_EXTCAL_CONFIRM_DELETE_SELECTION;
-            $ids = array_keys($_POST['deleteEvents']);
-        }
+            break;
 
-        //           $msg = ((isset($_POST['deleteSelection'][0])) ? _AM_EXTCAL_CONFIRM_DELETE_ALL : _AM_EXTCAL_CONFIRM_DELETE_SELECTION);
-        //           $ids = array_keys($_POST['deleteEvents']);
-        $ids = implode(',', $ids);
-        //echo $ids.'<br>';
-        $hiddens = ['event_ids' => $ids, 'form_delete' => '', 'confirm' => 1];
-        //$hiddens = array('event_ids' => $_POST['deleteEvents'], 'form_delete' => '', 'confirm' => 1);
-        xoops_confirm($hiddens, 'event.php?op=deleteSelectionOK', $msg, _DELETE, 'event.php');
-
-        xoops_cp_footer();
-
-        break;
-
-    case 'deleteSelectionOK':
-        //-----------------------------------------
-        // $t = print_r($_GET,true);
-        // echo "<hr><pre>{$t}</pre><hr>";
-        //
-        // $t = print_r($_POST,true);
-        // echo "<hr><pre>{$t}</pre><hr>";
-        // exit;
-        //-----------------------------------------
-
-        if (isset($_POST['deleteSelection'][0])) {
-        } else {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-            }
+        case 'deleteSelectionOK':
+            //-----------------------------------------
+            // $t = print_r($_GET,true);
+            // echo "<hr><pre>{$t}</pre><hr>";
+            //
+            // $t = print_r($_POST,true);
+            // echo "<hr><pre>{$t}</pre><hr>";
+            // exit;
+            //-----------------------------------------
 
-            deleteEvents($_POST['event_ids']);
+            if (isset($_POST['deleteSelection'][0])) {
+            } else {
+                if (!$GLOBALS['xoopsSecurity']->check()) {
+                    redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+                }
 
-            redirect_header('event.php', 3, _AM_EXTCAL_EVENTS_DELETED, false);
-        }
+                deleteEvents($_POST['event_ids']);
 
-        break;
+                redirect_header('event.php', 3, _AM_EXTCAL_EVENTS_DELETED, false);
+            }
 
-    case 'default':
-    default:
+            break;
 
-        //global $extcalConfig;
-        $extcalConfig      = ExtcalConfig::getHandler();
-        $xoopsModuleConfig = $extcalConfig->getModuleConfig();
+        case 'default':
+        default:
 
-        $start          = isset($_GET['start']) ? $_GET['start'] : 0;
-        $nbEventsByPage = $xoopsModuleConfig['nbEventsByPage'];
+            //global $extcalConfig;
+            $extcalConfig      = ExtcalConfig::getHandler();
+            $xoopsModuleConfig = $extcalConfig->getModuleConfig();
 
-        xoops_cp_header();
-        // @author      Gregory Mage (Aka Mage)
-        //***************************************************************************************
+            $start          = isset($_GET['start']) ? $_GET['start'] : 0;
+            $nbEventsByPage = $xoopsModuleConfig['nbEventsByPage'];
 
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        //***************************************************************************************
+            xoops_cp_header();
+            // @author      Gregory Mage (Aka Mage)
+            //***************************************************************************************
 
-        $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-        $events       = $eventHandler->objectToArray($eventHandler->getNewEvent($start, $nbEventsByPage, 0, true), ['cat_id']);
-        $eventHandler->formatEventsDate($events, _SHORTDATESTRING);
+            $adminObject = \Xmf\Module\Admin::getInstance();
+            $adminObject->displayNavigation(basename(__FILE__));
+            //***************************************************************************************
 
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
-        //echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/assets/images/action/edit.png' .' '.'style=vertical-align:middle;>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT . '<br>';
-        //echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/assets/images/action/delete.png'. ' '."style=vertical-align:middle;>&nbsp;&nbsp;". _AM_EXTCAL_INFO_DELETE;
+            $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+            $events       = $eventHandler->objectToArray($eventHandler->getNewEvent($start, $nbEventsByPage, 0, true), ['cat_id']);
+            $eventHandler->formatEventsDate($events, _SHORTDATESTRING);
 
-        echo '<img src=' . $pathIcon16 . '/edit.png' . ' ' . 'style=vertical-align:middle;>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT . '<br>';
-        echo '<img src=' . $pathIcon16 . '/delete.png' . ' ' . 'style=vertical-align:middle;>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_DELETE . '<br>';
+            echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
+            echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+            //echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/assets/images/action/edit.png' .' '.'style=vertical-align:middle;>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT . '<br>';
+            //echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/assets/images/action/delete.png'. ' '."style=vertical-align:middle;>&nbsp;&nbsp;". _AM_EXTCAL_INFO_DELETE;
 
-        echo '</fieldset><br>';
+            echo '<img src=' . $pathIcon16 . '/edit.png' . ' ' . 'style=vertical-align:middle;>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT . '<br>';
+            echo '<img src=' . $pathIcon16 . '/delete.png' . ' ' . 'style=vertical-align:middle;>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_DELETE . '<br>';
 
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _MD_EXTCAL_SUBMITED_EVENT . '</legend>';
+            echo '</fieldset><br>';
 
-        echo '<form method="POST" action="event.php">';
-        echo '<input type="hidden" name="op" value="deleteSelection">';
+            echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _MD_EXTCAL_SUBMITED_EVENT . '</legend>';
 
-        echo '<table class="outer" style="width:100%;">';
-        echo '<tr style="text-align:center;">';
-        echo '<th>' . _AM_EXTCAL_DELETE . '</th>';
-        echo '<th>#</th>';
-        echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
-        echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
-        echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
-        echo '<th>' . _AM_EXTCAL_END_DATE . '</th>';
-        echo '<th>' . _AM_EXTCAL_RECURRENT . '</th>';
-        echo '<th>' . _AM_EXTCAL_START_RULES . '</th>';
-        echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
+            echo '<form method="POST" action="event.php">';
+            echo '<input type="hidden" name="op" value="deleteSelection">';
 
-        echo '</tr>';
+            echo '<table class="outer" style="width:100%;">';
+            echo '<tr style="text-align:center;">';
+            echo '<th>' . _AM_EXTCAL_DELETE . '</th>';
+            echo '<th>#</th>';
+            echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
+            echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
+            echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
+            echo '<th>' . _AM_EXTCAL_END_DATE . '</th>';
+            echo '<th>' . _AM_EXTCAL_RECURRENT . '</th>';
+            echo '<th>' . _AM_EXTCAL_START_RULES . '</th>';
+            echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
 
-        if (count($events) > 0) {
-            $i = 0;
-            foreach ($events as $event) {
-                $class = (++$i % 2 == 0) ? 'even' : 'odd';
-                echo '<tr style="text-align:left;" class="' . $class . '">';
-                echo "<td width='10%' align='center'>";
-                echo "<input type='checkbox' name='deleteEvents[{$event['event_id']}]' value='1' >";
-                echo "<input type='hidden' name='deleteAllEvents[{$event['event_id']}]' value='1'>";
-                echo '</td>';
-                echo "<td align = 'center' width='5%'>" . $event['event_id'] . '</td>';
-                echo "<td  width='10%'>" . '<a href=cat.php?op=modify&amp;cat_id=' . $event['cat']['cat_id'] . '&form_modify' . '>' . $event['cat']['cat_name'] . '</a>' . '</td>';
-
-                echo '<td>' . '<a href=event.php?op=modify&amp;event_id=' . $event['event_id'] . '>' . $event['event_title'] . '</a>' . '</td>';
-
-                //                 if ($event['event_isrecur']) {
-                //                     echo '<td>' . $event['formated_reccur_rule'] . '</td>';
-                //                 } else {
-                //                     echo '<td>' . $event['formated_event_start'] . '</td>';
-                //                 }
-
-                echo "<td align = 'center' width='10%'>" . $event['formated_event_start'] . '</td>';
-                echo "<td align = 'center' width='10%'>" . $event['formated_event_end'] . '</td>';
-                echo '<td align="center">' . (($event['event_isrecur'] == 1) ? _YES : _NO) . '</td>';
-                if (!isset($event['formated_reccur_rule'])) {
-                    $event['formated_reccur_rule'] = '';
+            echo '</tr>';
+
+            if (count($events) > 0) {
+                $i = 0;
+                foreach ($events as $event) {
+                    $class = (++$i % 2 == 0) ? 'even' : 'odd';
+                    echo '<tr style="text-align:left;" class="' . $class . '">';
+                    echo "<td width='10%' align='center'>";
+                    echo "<input type='checkbox' name='deleteEvents[{$event['event_id']}]' value='1' >";
+                    echo "<input type='hidden' name='deleteAllEvents[{$event['event_id']}]' value='1'>";
+                    echo '</td>';
+                    echo "<td align = 'center' width='5%'>" . $event['event_id'] . '</td>';
+                    echo "<td  width='10%'>" . '<a href=cat.php?op=modify&amp;cat_id=' . $event['cat']['cat_id'] . '&form_modify' . '>' . $event['cat']['cat_name'] . '</a>' . '</td>';
+
+                    echo '<td>' . '<a href=event.php?op=modify&amp;event_id=' . $event['event_id'] . '>' . $event['event_title'] . '</a>' . '</td>';
+
+                    //                 if ($event['event_isrecur']) {
+                    //                     echo '<td>' . $event['formated_reccur_rule'] . '</td>';
+                    //                 } else {
+                    //                     echo '<td>' . $event['formated_event_start'] . '</td>';
+                    //                 }
+
+                    echo "<td align = 'center' width='10%'>" . $event['formated_event_start'] . '</td>';
+                    echo "<td align = 'center' width='10%'>" . $event['formated_event_end'] . '</td>';
+                    echo '<td align="center">' . (($event['event_isrecur'] == 1) ? _YES : _NO) . '</td>';
+                    if (!isset($event['formated_reccur_rule'])) {
+                        $event['formated_reccur_rule'] = '';
+                    }
+                    echo '<td>' . $event['formated_reccur_rule'] . '</td>';
+
+                    echo '<td style="width:10%; text-align:center;">';
+                    echo '<a href=event.php?op=modify&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/edit.png' title='" . _AM_EXTCAL_ICONE_EDIT . "'></a>&nbsp;&nbsp;";
+                    echo '<a href=event.php?op=delete&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/delete.png' title='" . _AM_EXTCAL_ICONE_DELETE . "'></a>&nbsp;&nbsp;";
+                    echo '<a href=event.php?op=clone&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/editcopy.png' title='" . _AM_EXTCAL_ICONE_CLONE . "'></a>";
+                    echo '</td>';
+
+                    echo '</tr>';
                 }
-                echo '<td>' . $event['formated_reccur_rule'] . '</td>';
+                //---------------------------------------------------------
+                $pageNav = new XoopsPageNav($eventHandler->getCountNewEvent(), $nbEventsByPage, $start);
 
-                echo '<td style="width:10%; text-align:center;">';
-                echo '<a href=event.php?op=modify&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/edit.png' title='" . _AM_EXTCAL_ICONE_EDIT . "'></a>&nbsp;&nbsp;";
-                echo '<a href=event.php?op=delete&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/delete.png' title='" . _AM_EXTCAL_ICONE_DELETE . "'></a>&nbsp;&nbsp;";
-                echo '<a href=event.php?op=clone&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/editcopy.png' title='" . _AM_EXTCAL_ICONE_CLONE . "'></a>";
+                echo '<tr><td colspan="2" style="text-align: right;">';
+                echo $pageNav->renderNav(2);
                 echo '</td>';
 
-                echo '</tr>';
-            }
-            //---------------------------------------------------------
-            $pageNav = new XoopsPageNav($eventHandler->getCountNewEvent(), $nbEventsByPage, $start);
+                echo '<td colspan="2" style="text-align: right;">';
 
-            echo '<tr><td colspan="2" style="text-align: right;">';
-            echo $pageNav->renderNav(2);
-            echo '</td>';
+                echo '<input type="submit" value="' . _AM_EXTCAL_DELETE_ALL . '" name="deleteSelection[0]">';
+                echo '<input type="submit" value="' . _AM_EXTCAL_DELETE_SELECTION . '" name="deleteSelection[1]">';
 
-            echo '<td colspan="2" style="text-align: right;">';
-
-            echo '<input type="submit" value="' . _AM_EXTCAL_DELETE_ALL . '" name="deleteSelection[0]">';
-            echo '<input type="submit" value="' . _AM_EXTCAL_DELETE_SELECTION . '" name="deleteSelection[1]">';
-
-            echo '</td>';
-            echo '</tr>';
-        } else {
-            echo '<tr><td colspan="5">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
-        }
-        echo '</table>';
-        echo '</form>';
+                echo '</td>';
+                echo '</tr>';
+            } else {
+                echo '<tr><td colspan="5">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
+            }
+            echo '</table>';
+            echo '</form>';
 
-        echo '</fieldset>';
-        echo '</fieldset><br><br>';
-        //Fin de la liste des evennement -------------------------------------
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _MD_EXTCAL_SUBMIT_EVENT . '</legend>';
+            echo '</fieldset>';
+            echo '</fieldset><br><br>';
+            //Fin de la liste des evennement -------------------------------------
+            echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _MD_EXTCAL_SUBMIT_EVENT . '</legend>';
 
-        $form = $eventHandler->getEventForm('admin');
-        $form->display();
+            $form = $eventHandler->getEventForm('admin');
+            $form->display();
 
-        echo '</fieldset>';
+            echo '</fieldset>';
 
-        require_once __DIR__ . '/admin_footer.php';
+            require_once __DIR__ . '/admin_footer.php';
 
-        break;
+            break;
 }

Spacing +45 added lines, -45 removed lines

@@ -17,12 +17,12 @@ 
  * @author       XOOPS Development Team,
  */
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-require_once __DIR__ . '/../class/form/extcalform.php';
-require_once __DIR__ . '/admin_header.php';
-require_once __DIR__ . '/../class/utility.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+require_once __DIR__.'/../class/form/extcalform.php';
+require_once __DIR__.'/admin_header.php';
+require_once __DIR__.'/../class/utility.php';
 
 $gepeto = array_merge($_GET, $_POST);
 //while (list($k, $v) = each($gepeto)) {
@@ -50,15 +50,15 @@ 
     //    while (list($k, $t) = each($rst)) {
     foreach ($rst as $k => $t) {
         if ($t['event_picture1'] != '') {
-            $f = XOOPS_ROOT_PATH . '/uploads/extcal/' . $t['event_picture1'];
+            $f = XOOPS_ROOT_PATH.'/uploads/extcal/'.$t['event_picture1'];
             unlink($f);
-            echo $f . '<br>';
+            echo $f.'<br>';
         }
 
         if ($t['event_picture2'] != '') {
-            $f = XOOPS_ROOT_PATH . '/uploads/extcal/' . $t['event_picture1'];
+            $f = XOOPS_ROOT_PATH.'/uploads/extcal/'.$t['event_picture1'];
             unlink($f);
-            echo $f . '<br>';
+            echo $f.'<br>';
         }
     }
 
@@ -120,7 +120,7 @@ 
             if (!$eventHandler->modifyEvent($_POST['event_id'], $data)) {
                 redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDIT_FAILED, false);
             } else {
-                $fileHandler->createFile((int)$_POST['event_id']);
+                $fileHandler->createFile((int) $_POST['event_id']);
                 redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDITED, false);
             }
 
@@ -191,7 +191,7 @@ 
         $eventId      = $_GET['event_id'];
         $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
 
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _MD_EXTCAL_EDIT_EVENT . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._MD_EXTCAL_EDIT_EVENT.'</legend>';
 
         if ($form = $eventHandler->getEventForm('admin', $action, ['event_id' => $eventId])) {
             $form->display();
@@ -216,8 +216,8 @@ 
             $data[$key] = $val['value'];
         }
 
-        $data['event_id']    = 0;
-        $data['event_title'] .= ' (' . _AM_EXTCAL_CLONE_OF . $eventId . ')';
+        $data['event_id'] = 0;
+        $data['event_title'] .= ' ('._AM_EXTCAL_CLONE_OF.$eventId.')';
 
         $newEvent = $eventHandler->create();
         $newEvent->setVars($data);
@@ -233,7 +233,7 @@ 
 
         if (isset($_POST['confirm'])) {
             if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+                redirect_header('index.php', 3, _NOPERM.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
             }
             //             $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
             //             $eventHandler->deleteEvent($_POST['event_id']);
@@ -298,7 +298,7 @@ 
         if (isset($_POST['deleteSelection'][0])) {
         } else {
             if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+                redirect_header('index.php', 3, _NOPERM.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
             }
 
             deleteEvents($_POST['event_ids']);
@@ -330,32 +330,32 @@ 
         $events       = $eventHandler->objectToArray($eventHandler->getNewEvent($start, $nbEventsByPage, 0, true), ['cat_id']);
         $eventHandler->formatEventsDate($events, _SHORTDATESTRING);
 
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_APPROVED_EVENT.'</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         //echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/assets/images/action/edit.png' .' '.'style=vertical-align:middle;>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT . '<br>';
         //echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/assets/images/action/delete.png'. ' '."style=vertical-align:middle;>&nbsp;&nbsp;". _AM_EXTCAL_INFO_DELETE;
 
-        echo '<img src=' . $pathIcon16 . '/edit.png' . ' ' . 'style=vertical-align:middle;>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT . '<br>';
-        echo '<img src=' . $pathIcon16 . '/delete.png' . ' ' . 'style=vertical-align:middle;>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_DELETE . '<br>';
+        echo '<img src='.$pathIcon16.'/edit.png'.' '.'style=vertical-align:middle;>&nbsp;&nbsp;'._AM_EXTCAL_INFO_EDIT.'<br>';
+        echo '<img src='.$pathIcon16.'/delete.png'.' '.'style=vertical-align:middle;>&nbsp;&nbsp;'._AM_EXTCAL_INFO_DELETE.'<br>';
 
         echo '</fieldset><br>';
 
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _MD_EXTCAL_SUBMITED_EVENT . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._MD_EXTCAL_SUBMITED_EVENT.'</legend>';
 
         echo '<form method="POST" action="event.php">';
         echo '<input type="hidden" name="op" value="deleteSelection">';
 
         echo '<table class="outer" style="width:100%;">';
         echo '<tr style="text-align:center;">';
-        echo '<th>' . _AM_EXTCAL_DELETE . '</th>';
+        echo '<th>'._AM_EXTCAL_DELETE.'</th>';
         echo '<th>#</th>';
-        echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
-        echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
-        echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
-        echo '<th>' . _AM_EXTCAL_END_DATE . '</th>';
-        echo '<th>' . _AM_EXTCAL_RECURRENT . '</th>';
-        echo '<th>' . _AM_EXTCAL_START_RULES . '</th>';
-        echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
+        echo '<th>'._AM_EXTCAL_CATEGORY.'</th>';
+        echo '<th>'._AM_EXTCAL_TITLE.'</th>';
+        echo '<th>'._AM_EXTCAL_START_DATE.'</th>';
+        echo '<th>'._AM_EXTCAL_END_DATE.'</th>';
+        echo '<th>'._AM_EXTCAL_RECURRENT.'</th>';
+        echo '<th>'._AM_EXTCAL_START_RULES.'</th>';
+        echo '<th>'._AM_EXTCAL_ACTION.'</th>';
 
         echo '</tr>';
 
@@ -363,15 +363,15 @@ 
             $i = 0;
             foreach ($events as $event) {
                 $class = (++$i % 2 == 0) ? 'even' : 'odd';
-                echo '<tr style="text-align:left;" class="' . $class . '">';
+                echo '<tr style="text-align:left;" class="'.$class.'">';
                 echo "<td width='10%' align='center'>";
                 echo "<input type='checkbox' name='deleteEvents[{$event['event_id']}]' value='1' >";
                 echo "<input type='hidden' name='deleteAllEvents[{$event['event_id']}]' value='1'>";
                 echo '</td>';
-                echo "<td align = 'center' width='5%'>" . $event['event_id'] . '</td>';
-                echo "<td  width='10%'>" . '<a href=cat.php?op=modify&amp;cat_id=' . $event['cat']['cat_id'] . '&form_modify' . '>' . $event['cat']['cat_name'] . '</a>' . '</td>';
+                echo "<td align = 'center' width='5%'>".$event['event_id'].'</td>';
+                echo "<td  width='10%'>".'<a href=cat.php?op=modify&amp;cat_id='.$event['cat']['cat_id'].'&form_modify'.'>'.$event['cat']['cat_name'].'</a>'.'</td>';
 
-                echo '<td>' . '<a href=event.php?op=modify&amp;event_id=' . $event['event_id'] . '>' . $event['event_title'] . '</a>' . '</td>';
+                echo '<td>'.'<a href=event.php?op=modify&amp;event_id='.$event['event_id'].'>'.$event['event_title'].'</a>'.'</td>';
 
                 //                 if ($event['event_isrecur']) {
                 //                     echo '<td>' . $event['formated_reccur_rule'] . '</td>';
@@ -379,18 +379,18 @@ 
                 //                     echo '<td>' . $event['formated_event_start'] . '</td>';
                 //                 }
 
-                echo "<td align = 'center' width='10%'>" . $event['formated_event_start'] . '</td>';
-                echo "<td align = 'center' width='10%'>" . $event['formated_event_end'] . '</td>';
-                echo '<td align="center">' . (($event['event_isrecur'] == 1) ? _YES : _NO) . '</td>';
+                echo "<td align = 'center' width='10%'>".$event['formated_event_start'].'</td>';
+                echo "<td align = 'center' width='10%'>".$event['formated_event_end'].'</td>';
+                echo '<td align="center">'.(($event['event_isrecur'] == 1) ? _YES : _NO).'</td>';
                 if (!isset($event['formated_reccur_rule'])) {
                     $event['formated_reccur_rule'] = '';
                 }
-                echo '<td>' . $event['formated_reccur_rule'] . '</td>';
+                echo '<td>'.$event['formated_reccur_rule'].'</td>';
 
                 echo '<td style="width:10%; text-align:center;">';
-                echo '<a href=event.php?op=modify&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/edit.png' title='" . _AM_EXTCAL_ICONE_EDIT . "'></a>&nbsp;&nbsp;";
-                echo '<a href=event.php?op=delete&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/delete.png' title='" . _AM_EXTCAL_ICONE_DELETE . "'></a>&nbsp;&nbsp;";
-                echo '<a href=event.php?op=clone&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/editcopy.png' title='" . _AM_EXTCAL_ICONE_CLONE . "'></a>";
+                echo '<a href=event.php?op=modify&amp;event_id='.$event['event_id']."><img src='".$pathIcon16."/edit.png' title='"._AM_EXTCAL_ICONE_EDIT."'></a>&nbsp;&nbsp;";
+                echo '<a href=event.php?op=delete&amp;event_id='.$event['event_id']."><img src='".$pathIcon16."/delete.png' title='"._AM_EXTCAL_ICONE_DELETE."'></a>&nbsp;&nbsp;";
+                echo '<a href=event.php?op=clone&amp;event_id='.$event['event_id']."><img src='".$pathIcon16."/editcopy.png' title='"._AM_EXTCAL_ICONE_CLONE."'></a>";
                 echo '</td>';
 
                 echo '</tr>';
@@ -404,13 +404,13 @@ 
 
             echo '<td colspan="2" style="text-align: right;">';
 
-            echo '<input type="submit" value="' . _AM_EXTCAL_DELETE_ALL . '" name="deleteSelection[0]">';
-            echo '<input type="submit" value="' . _AM_EXTCAL_DELETE_SELECTION . '" name="deleteSelection[1]">';
+            echo '<input type="submit" value="'._AM_EXTCAL_DELETE_ALL.'" name="deleteSelection[0]">';
+            echo '<input type="submit" value="'._AM_EXTCAL_DELETE_SELECTION.'" name="deleteSelection[1]">';
 
             echo '</td>';
             echo '</tr>';
         } else {
-            echo '<tr><td colspan="5">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
+            echo '<tr><td colspan="5">'._AM_EXTCAL_NO_PENDING_EVENT.'</td></tr>';
         }
         echo '</table>';
         echo '</form>';
@@ -418,14 +418,14 @@ 
         echo '</fieldset>';
         echo '</fieldset><br><br>';
         //Fin de la liste des evennement -------------------------------------
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _MD_EXTCAL_SUBMIT_EVENT . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._MD_EXTCAL_SUBMIT_EVENT.'</legend>';
 
         $form = $eventHandler->getEventForm('admin');
         $form->display();
 
         echo '</fieldset>';
 
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
 
         break;
 }

admin/menu.php

Spacing +6 added lines, -6 removed lines

@@ -35,33 +35,33 @@
 $adminmenu[] = [
     'title' => _AM_MODULEADMIN_HOME,
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png'
+    'icon'  => $pathIcon32.'/home.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_EXTCAL_CATEGORY,
     'link'  => 'admin/cat.php',
-    'icon'  => $pathIcon32 . '/category.png'
+    'icon'  => $pathIcon32.'/category.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_EXTCAL_EVENT,
     'link'  => 'admin/event.php',
-    'icon'  => $pathIcon32 . '/event.png'
+    'icon'  => $pathIcon32.'/event.png'
 ];
 $adminmenu[] = [
     'title' => _MI_EXTCAL_ETABLISSEMENTS,
     'link'  => 'admin/etablissement.php',
-    'icon'  => $pathModIcon32 . '/etablissement.png'
+    'icon'  => $pathModIcon32.'/etablissement.png'
 ];
 $adminmenu[] = [
     'title' => _MI_EXTCAL_PERMISSIONS,
     'link'  => 'admin/permissions.php',
-    'icon'  => $pathIcon32 . '/permissions.png'
+    'icon'  => $pathIcon32.'/permissions.png'
 ];
 
 $adminmenu[] = [
     'title' => _AM_MODULEADMIN_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png'
+    'icon'  => $pathIcon32.'/about.png'
 ];

admin/upgrade.php

Spacing +20 added lines, -20 removed lines

@@ -5,8 +5,8 @@ 
     $step = $_POST['step'];
 }
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-include __DIR__ . '/function.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+include __DIR__.'/function.php';
 
 // Change this variable if you use a cloned version of eXtGallery
 $localModuleDir = 'extcal';
@@ -16,9 +16,9 @@ 
 $downloadServer = 'http://downloads.sourceforge.net/zoullou/';
 
 $lastVersion       = @file_get_contents($versionFile);
-$lastVersionString = substr($lastVersion, 0, 1) . '.' . substr($lastVersion, 1, 1) . '.' . substr($lastVersion, 2, 1);
-$moduleFileName    = $moduleName . '-' . $lastVersionString . '.tar.gz';
-$langFileName      = $moduleName . '-lang-' . $lastVersionString . '_' . $xoopsConfig['language'] . '.tar.gz';
+$lastVersionString = substr($lastVersion, 0, 1).'.'.substr($lastVersion, 1, 1).'.'.substr($lastVersion, 2, 1);
+$moduleFileName    = $moduleName.'-'.$lastVersionString.'.tar.gz';
+$langFileName      = $moduleName.'-lang-'.$lastVersionString.'_'.$xoopsConfig['language'].'.tar.gz';
 
 switch ($step) {
     case 'download':
@@ -30,12 +30,12 @@ 
             break;
         }
 
-        if (!$handle = @fopen($downloadServer . $moduleFileName, 'r')) {
+        if (!$handle = @fopen($downloadServer.$moduleFileName, 'r')) {
             printf(_AM_EXTCAL_MD_FILE_DONT_EXIST, $downloadServer, $moduleFileName);
             xoops_cp_footer();
             break;
         }
-        $localHandle = @fopen(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName, 'w+');
+        $localHandle = @fopen(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName, 'w+');
 
         // Downlad module archive
         if ($handle) {
@@ -49,10 +49,10 @@ 
 
         // English file are included on module package
         if ($xoopsConfig['language'] !== 'english') {
-            if (!$handle = @fopen($downloadServer . $langFileName, 'r')) {
+            if (!$handle = @fopen($downloadServer.$langFileName, 'r')) {
                 printf(_AM_EXTCAL_LG_FILE_DONT_EXIST, $downloadServer, $langFileName);
             } else {
-                $localHandle = @fopen(XOOPS_ROOT_PATH . '/uploads/' . $langFileName, 'w+');
+                $localHandle = @fopen(XOOPS_ROOT_PATH.'/uploads/'.$langFileName, 'w+');
                 // Download language archive
                 if ($handle) {
                     while (!feof($handle)) {
@@ -75,35 +75,35 @@ 
         xoops_cp_header();
         adminMenu();
 
-        if (!file_exists(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName)) {
+        if (!file_exists(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName)) {
             echo _AM_EXTCAL_MD_FILE_DONT_EXIST_SHORT;
             xoops_cp_footer();
 
             break;
         }
 
-        $gPcltarLibDir = XOOPS_ROOT_PATH . '/modules/' . $localModuleDir . '/class';
-        include __DIR__ . '/../class/pcltar.lib.php';
+        $gPcltarLibDir = XOOPS_ROOT_PATH.'/modules/'.$localModuleDir.'/class';
+        include __DIR__.'/../class/pcltar.lib.php';
 
         //TrOn(5);
 
         // Extract module files
-        PclTarExtract(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName, XOOPS_ROOT_PATH . '/modules/' . $localModuleDir . '/', 'modules/' . $moduleName . '/');
+        PclTarExtract(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName, XOOPS_ROOT_PATH.'/modules/'.$localModuleDir.'/', 'modules/'.$moduleName.'/');
         // Delete downloaded module's files
-        unlink(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName);
+        unlink(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName);
 
-        if (file_exists(XOOPS_ROOT_PATH . '/uploads/' . $langFileName)) {
+        if (file_exists(XOOPS_ROOT_PATH.'/uploads/'.$langFileName)) {
             // Extract language files
-            PclTarExtract(XOOPS_ROOT_PATH . '/uploads/' . $langFileName, XOOPS_ROOT_PATH . '/modules/' . $localModuleDir . '/', 'modules/' . $moduleName . '/');
+            PclTarExtract(XOOPS_ROOT_PATH.'/uploads/'.$langFileName, XOOPS_ROOT_PATH.'/modules/'.$localModuleDir.'/', 'modules/'.$moduleName.'/');
             // Delete downloaded module's files
-            unlink(XOOPS_ROOT_PATH . '/uploads/' . $langFileName);
+            unlink(XOOPS_ROOT_PATH.'/uploads/'.$langFileName);
         }
 
         // Delete template_c file
-        if ($handle = opendir(XOOPS_ROOT_PATH . '/templates_c')) {
+        if ($handle = opendir(XOOPS_ROOT_PATH.'/templates_c')) {
             while (false !== ($file = readdir($handle))) {
                 if ($file !== '.' && $file !== '..' && $file !== 'index.html') {
-                    unlink(XOOPS_ROOT_PATH . '/templates_c/' . $file);
+                    unlink(XOOPS_ROOT_PATH.'/templates_c/'.$file);
                 }
             }
 
@@ -111,7 +111,7 @@ 
         }
         //TrDisplay();
 
-        xoops_confirm(['dirname' => $localModuleDir, 'op' => 'update_ok', 'fct' => 'modulesadmin'], XOOPS_URL . '/modules/system/admin.php', _AM_EXTCAL_INSTALL_DONE, _AM_EXTCAL_UPDATE);
+        xoops_confirm(['dirname' => $localModuleDir, 'op' => 'update_ok', 'fct' => 'modulesadmin'], XOOPS_URL.'/modules/system/admin.php', _AM_EXTCAL_INSTALL_DONE, _AM_EXTCAL_UPDATE);
 
         xoops_cp_footer();
 

admin/etablissement.php

Indentation +4 added lines, -4 removed lines

@@ -155,10 +155,10 @@
             }
         } else {
             xoops_confirm([
-                              'ok'               => 1,
-                              'etablissement_id' => $_REQUEST['etablissement_id'],
-                              'op'               => 'delete_etablissement',
-                          ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_ETABLISSEMENT_SURDEL . '<br>');
+                                'ok'               => 1,
+                                'etablissement_id' => $_REQUEST['etablissement_id'],
+                                'op'               => 'delete_etablissement',
+                            ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_ETABLISSEMENT_SURDEL . '<br>');
         }
         break;
 

Spacing +36 added lines, -36 removed lines

@@ -18,19 +18,19 @@ 
  */
 
 // Include xoops admin header
-require_once __DIR__ . '/../../../include/cp_header.php';
-require_once __DIR__ . '/../class/ExtcalPersistableObjectHandler.php';
-require_once __DIR__ . '/../../../kernel/module.php';
-require_once __DIR__ . '/../../../class/xoopsformloader.php';
-require_once __DIR__ . '/../../../class/tree.php';
-require_once __DIR__ . '/../../../class/xoopslists.php';
-require_once __DIR__ . '/../../../class/pagenav.php';
-require_once __DIR__ . '/../../../class/xoopsform/grouppermform.php';
-require_once __DIR__ . '/../../../class/uploader.php';
-require_once __DIR__ . '/../class/etablissement.php';
-require_once __DIR__ . '/../include/constantes.php';
-
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+require_once __DIR__.'/../class/ExtcalPersistableObjectHandler.php';
+require_once __DIR__.'/../../../kernel/module.php';
+require_once __DIR__.'/../../../class/xoopsformloader.php';
+require_once __DIR__.'/../../../class/tree.php';
+require_once __DIR__.'/../../../class/xoopslists.php';
+require_once __DIR__.'/../../../class/pagenav.php';
+require_once __DIR__.'/../../../class/xoopsform/grouppermform.php';
+require_once __DIR__.'/../../../class/uploader.php';
+require_once __DIR__.'/../class/etablissement.php';
+require_once __DIR__.'/../include/constantes.php';
+
+require_once __DIR__.'/admin_header.php';
 
 //include_once("functions.php");
 //include_once("../include/functions.php");
@@ -38,10 +38,10 @@ 
 if ($xoopsUser) {
     $xoopsModule = XoopsModule::getByDirname('extcal');
     if (!$xoopsUser->isAdmin($xoopsModule->mid())) {
-        redirect_header(XOOPS_URL . '/', 3, _NOPERM);
+        redirect_header(XOOPS_URL.'/', 3, _NOPERM);
     }
 } else {
-    redirect_header(XOOPS_URL . '/', 3, _NOPERM);
+    redirect_header(XOOPS_URL.'/', 3, _NOPERM);
 }
 
 // Include language file
@@ -98,7 +98,7 @@ 
         $etablissement_arr = $etablissementHandler->getObjects($criteria);
         $numrows           = $etablissementHandler->getCount($criteria);
         if ($numrows > $limit) {
-            $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=liste&limit=' . $limit);
+            $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=liste&limit='.$limit);
             $pagenav = $pagenav->renderNav(4);
         } else {
             $pagenav = '';
@@ -107,11 +107,11 @@ 
         if ($numrows > 0) {
             echo '<table width="100%" cellspacing="1" class="outer">';
             echo '<tr>';
-            echo '<th align="center">' . _AM_EXTCAL_ETABLISSEMENT_FORM_NOM . '</th>';
-            echo '<th align="center" width="20%">' . _AM_EXTCAL_ETABLISSEMENT_FORM_ADRESSE . '</th>';
-            echo '<th align="center" width="20%">' . _AM_EXTCAL_ETABLISSEMENT_FORM_CITY . '</th>';
-            echo '<th align="center" width="15%">' . _AM_EXTCAL_ETABLISSEMENT_FORM_TELEPHONE . '</th>';
-            echo '<th align="center" width="15%">' . _AM_EXTCAL_ETABLISSEMENT_FORM_ACTION . '</th>';
+            echo '<th align="center">'._AM_EXTCAL_ETABLISSEMENT_FORM_NOM.'</th>';
+            echo '<th align="center" width="20%">'._AM_EXTCAL_ETABLISSEMENT_FORM_ADRESSE.'</th>';
+            echo '<th align="center" width="20%">'._AM_EXTCAL_ETABLISSEMENT_FORM_CITY.'</th>';
+            echo '<th align="center" width="15%">'._AM_EXTCAL_ETABLISSEMENT_FORM_TELEPHONE.'</th>';
+            echo '<th align="center" width="15%">'._AM_EXTCAL_ETABLISSEMENT_FORM_ACTION.'</th>';
             echo '</tr>';
             $class = 'odd';
             foreach (array_keys($etablissement_arr) as $i) {
@@ -121,21 +121,21 @@ 
                 $etablissement_adresse   = $etablissement_arr[$i]->getVar('adresse');
                 $etablissement_city      = $etablissement_arr[$i]->getVar('ville');
                 $etablissement_telephone = $etablissement_arr[$i]->getVar('tel_fixe');
-                echo '<tr class="' . $class . '">';
-                echo '<td align="left">' . '<a href="etablissement.php?op=edit_etablissement&etablissement_id=' . $etablissement_id . '">' . $etablissement_nom . '</a>' . '</td>';
+                echo '<tr class="'.$class.'">';
+                echo '<td align="left">'.'<a href="etablissement.php?op=edit_etablissement&etablissement_id='.$etablissement_id.'">'.$etablissement_nom.'</a>'.'</td>';
 
-                echo '<td align="center"><b>' . $etablissement_adresse . '</td>';
-                echo '<td align="center"><b>' . $etablissement_city . '</td>';
-                echo '<td align="center"><b>' . $etablissement_telephone . '</td>';
+                echo '<td align="center"><b>'.$etablissement_adresse.'</td>';
+                echo '<td align="center"><b>'.$etablissement_city.'</td>';
+                echo '<td align="center"><b>'.$etablissement_telephone.'</td>';
                 echo '<td align="center" width="15%">';
-                echo '<a href="etablissement.php?op=edit_etablissement&etablissement_id=' . $etablissement_id . '"><img src=' . $pathIcon16 . '/edit.png alt="' . _AM_EXTCAL_ETABLISSEMENT_FORM_EDIT . '" title="' . _AM_EXTCAL_ETABLISSEMENT_FORM_EDIT . '"></a> ';
-                echo '<a href="etablissement.php?op=delete_etablissement&etablissement_id=' . $etablissement_id . '"><img src=' . $pathIcon16 . '/delete.png alt="' . _AM_EXTCAL_ETABLISSEMENT_FORM_DELETE . '" title="' . _AM_EXTCAL_ETABLISSEMENT_FORM_DELETE . '"></a> ';
+                echo '<a href="etablissement.php?op=edit_etablissement&etablissement_id='.$etablissement_id.'"><img src='.$pathIcon16.'/edit.png alt="'._AM_EXTCAL_ETABLISSEMENT_FORM_EDIT.'" title="'._AM_EXTCAL_ETABLISSEMENT_FORM_EDIT.'"></a> ';
+                echo '<a href="etablissement.php?op=delete_etablissement&etablissement_id='.$etablissement_id.'"><img src='.$pathIcon16.'/delete.png alt="'._AM_EXTCAL_ETABLISSEMENT_FORM_DELETE.'" title="'._AM_EXTCAL_ETABLISSEMENT_FORM_DELETE.'"></a> ';
                 echo '</td>';
             }
             echo '</table><br>';
-            echo '<br><div align=right>' . $pagenav . '</div><br>';
+            echo '<br><div align=right>'.$pagenav.'</div><br>';
         } else {
-            echo '<div class="errorMsg" style="text-align: center;">' . _AM_EXTCAL_ERREUR_NO_ETABLISSEMENT . '</div>';
+            echo '<div class="errorMsg" style="text-align: center;">'._AM_EXTCAL_ERREUR_NO_ETABLISSEMENT.'</div>';
         }
 
         // Affichage du formulaire
@@ -158,7 +158,7 @@ 
                               'ok'               => 1,
                               'etablissement_id' => $_REQUEST['etablissement_id'],
                               'op'               => 'delete_etablissement',
-                          ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_ETABLISSEMENT_SURDEL . '<br>');
+                          ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_ETABLISSEMENT_SURDEL.'<br>');
         }
         break;
 
@@ -200,11 +200,11 @@ 
         $obj->setVar('map', $_REQUEST['map']);
 
         //Logo
-        $uploaddir_etablissement = XOOPS_ROOT_PATH . '/uploads/extcal/etablissement/';
-        $uploadurl_etablissement = XOOPS_URL . '/uploads/extcal/etablissement/';
+        $uploaddir_etablissement = XOOPS_ROOT_PATH.'/uploads/extcal/etablissement/';
+        $uploadurl_etablissement = XOOPS_URL.'/uploads/extcal/etablissement/';
 
         $delimg = @$_REQUEST['delimg'];
-        $delimg = isset($delimg) ? (int)$delimg : 0;
+        $delimg = isset($delimg) ? (int) $delimg : 0;
         if ($delimg == 0 && !empty($_REQUEST['xoops_upload_file'][0])) {
             $upload = new XoopsMediaUploader($uploaddir_etablissement, [
                 'image/gif',
@@ -227,7 +227,7 @@ 
             }
         } else {
             $logo              = '';
-            $url_etablissement = XOOPS_ROOT_PATH . '/uploads/extcal/etablissement/' . $_REQUEST['file'];
+            $url_etablissement = XOOPS_ROOT_PATH.'/uploads/extcal/etablissement/'.$_REQUEST['file'];
             if (is_file($url_etablissement)) {
                 chmod($url_etablissement, 0777);
                 unlink($url_etablissement);
@@ -247,4 +247,4 @@ 
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

view_year.php

Spacing +11 added lines, -11 removed lines

@@ -17,15 +17,15 @@ 
  * @author       XOOPS Development Team,
  */
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $params                                  = ['view' => _EXTCAL_NAV_YEAR, 'file' => _EXTCAL_FILE_YEAR];
 $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');
-$cat  = isset($_GET['cat']) ? (int)$_GET['cat'] : 0;
+$year = isset($_GET['year']) ? (int) $_GET['year'] : date('Y');
+$cat  = isset($_GET['cat']) ? (int) $_GET['cat'] : 0;
 
 // Getting eXtCal object's handler
 $catHandler   = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
@@ -54,7 +54,7 @@ 
     'cat'          => $cat,
     'externalKeys' => 'cat_id',
 ];
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 $eventsArray = $events;
 // Formating date
@@ -98,21 +98,21 @@ 
 // Making navig data
 $navig = [
     'prev' => [
-        'uri'  => 'year=' . $prevYear,
+        'uri'  => 'year='.$prevYear,
         'name' => $prevYear,
     ],
     'this' => [
-        'uri'  => 'year=' . $year,
+        'uri'  => 'year='.$year,
         'name' => $year,
     ],
     'next' => [
-        'uri'  => 'year=' . $nexYear,
+        'uri'  => 'year='.$nexYear,
         'name' => $nexYear,
     ],
 ];
 
 // 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);
@@ -166,4 +166,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'year');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';