Inspection of "updates" - mambax7/extcal - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( f62223...75b16c )

by Michael

created 2018-09-22 02:29 UTC

Status

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -156,10 +156,10 @@
 block discarded – undo
             }
         } else {
             xoops_confirm([
-                              'ok'               => 1,
-                              'location_id' => $_REQUEST['location_id'],
-                              'op'               => 'delete_location',
-                          ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_LOCATION_SURDEL . '<br>');
+                                'ok'               => 1,
+                                'location_id' => $_REQUEST['location_id'],
+                                'op'               => 'delete_location',
+                            ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_LOCATION_SURDEL . '<br>');
         }
         break;
 

Please login to merge, or discard this patch.

Spacing +36 added lines, -36 removed lines patch added patch discarded remove patch

@@ -20,18 +20,18 @@  discard block
 block discarded – undo
 use XoopsModules\Extcal;
 
 // Include xoops admin header
-require_once  dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 // require_once  dirname(__DIR__) . '/class/ExtcalPersistableObjectHandler.php';
-require_once  dirname(dirname(dirname(__DIR__))) . '/kernel/module.php';
-require_once  dirname(dirname(dirname(__DIR__))) . '/class/xoopsformloader.php';
-require_once  dirname(dirname(dirname(__DIR__))) . '/class/tree.php';
-require_once  dirname(dirname(dirname(__DIR__))) . '/class/xoopslists.php';
-require_once  dirname(dirname(dirname(__DIR__))) . '/class/pagenav.php';
-require_once  dirname(dirname(dirname(__DIR__))) . '/class/xoopsform/grouppermform.php';
-require_once  dirname(dirname(dirname(__DIR__))) . '/class/uploader.php';
-require_once  dirname(__DIR__) . '/include/constantes.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/kernel/module.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/class/xoopsformloader.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/class/tree.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/class/xoopslists.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/class/pagenav.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/class/xoopsform/grouppermform.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/class/uploader.php';
+require_once  dirname(__DIR__).'/include/constantes.php';
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 //require("functions.php");
 //require("../include/functions.php");
@@ -39,10 +39,10 @@  discard block
 block discarded – undo
 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
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
         $criteria->setSort('nom');
         $criteria->setOrder('ASC');
         $location_arr = $locationHandler->getObjects($criteria);
-        $numrows           = $locationHandler->getCount($criteria);
+        $numrows = $locationHandler->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 = '';
@@ -108,35 +108,35 @@  discard block
 block discarded – undo
         if ($numrows > 0) {
             echo '<table width="100%" cellspacing="1" class="outer">';
             echo '<tr>';
-            echo '<th align="center">' . _AM_EXTCAL_LOCATION_FORM_NOM . '</th>';
-            echo '<th align="center" width="20%">' . _AM_EXTCAL_LOCATION_FORM_ADRESSE . '</th>';
-            echo '<th align="center" width="20%">' . _AM_EXTCAL_LOCATION_FORM_CITY . '</th>';
-            echo '<th align="center" width="15%">' . _AM_EXTCAL_LOCATION_FORM_TELEPHONE . '</th>';
-            echo '<th align="center" width="15%">' . _AM_EXTCAL_LOCATION_FORM_ACTION . '</th>';
+            echo '<th align="center">'._AM_EXTCAL_LOCATION_FORM_NOM.'</th>';
+            echo '<th align="center" width="20%">'._AM_EXTCAL_LOCATION_FORM_ADRESSE.'</th>';
+            echo '<th align="center" width="20%">'._AM_EXTCAL_LOCATION_FORM_CITY.'</th>';
+            echo '<th align="center" width="15%">'._AM_EXTCAL_LOCATION_FORM_TELEPHONE.'</th>';
+            echo '<th align="center" width="15%">'._AM_EXTCAL_LOCATION_FORM_ACTION.'</th>';
             echo '</tr>';
             $class = 'odd';
             foreach (array_keys($location_arr) as $i) {
-                $class                   = ('even' === $class) ? 'odd' : 'even';
+                $class = ('even' === $class) ? 'odd' : 'even';
                 $location_id        = $location_arr[$i]->getVar('id');
                 $location_nom       = $location_arr[$i]->getVar('nom');
                 $location_adresse   = $location_arr[$i]->getVar('adresse');
                 $location_city      = $location_arr[$i]->getVar('ville');
                 $location_telephone = $location_arr[$i]->getVar('tel_fixe');
-                echo '<tr class="' . $class . '">';
-                echo '<td align="left">' . '<a href="Location.php?op=edit_location&location_id=' . $location_id . '">' . $location_nom . '</a>' . '</td>';
+                echo '<tr class="'.$class.'">';
+                echo '<td align="left">'.'<a href="Location.php?op=edit_location&location_id='.$location_id.'">'.$location_nom.'</a>'.'</td>';
 
-                echo '<td align="center"><b>' . $location_adresse . '</td>';
-                echo '<td align="center"><b>' . $location_city . '</td>';
-                echo '<td align="center"><b>' . $location_telephone . '</td>';
+                echo '<td align="center"><b>'.$location_adresse.'</td>';
+                echo '<td align="center"><b>'.$location_city.'</td>';
+                echo '<td align="center"><b>'.$location_telephone.'</td>';
                 echo '<td align="center" width="15%">';
-                echo '<a href="Location.php?op=edit_location&location_id=' . $location_id . '"><img src=' . $pathIcon16 . '/edit.png alt="' . _AM_EXTCAL_LOCATION_FORM_EDIT . '" title="' . _AM_EXTCAL_LOCATION_FORM_EDIT . '"></a> ';
-                echo '<a href="Location.php?op=delete_location&location_id=' . $location_id . '"><img src=' . $pathIcon16 . '/delete.png alt="' . _AM_EXTCAL_LOCATION_FORM_DELETE . '" title="' . _AM_EXTCAL_LOCATION_FORM_DELETE . '"></a> ';
+                echo '<a href="Location.php?op=edit_location&location_id='.$location_id.'"><img src='.$pathIcon16.'/edit.png alt="'._AM_EXTCAL_LOCATION_FORM_EDIT.'" title="'._AM_EXTCAL_LOCATION_FORM_EDIT.'"></a> ';
+                echo '<a href="Location.php?op=delete_location&location_id='.$location_id.'"><img src='.$pathIcon16.'/delete.png alt="'._AM_EXTCAL_LOCATION_FORM_DELETE.'" title="'._AM_EXTCAL_LOCATION_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_LOCATION . '</div>';
+            echo '<div class="errorMsg" style="text-align: center;">'._AM_EXTCAL_ERREUR_NO_LOCATION.'</div>';
         }
 
         // Affichage du formulaire
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
                               'ok'               => 1,
                               'location_id' => $_REQUEST['location_id'],
                               'op'               => 'delete_location',
-                          ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_LOCATION_SURDEL . '<br>');
+                          ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_LOCATION_SURDEL.'<br>');
         }
         break;
 
@@ -201,11 +201,11 @@  discard block
 block discarded – undo
         $obj->setVar('map', $_REQUEST['map']);
 
         //Logo
-        $uploaddir_location = XOOPS_ROOT_PATH . '/uploads/extcal/location/';
-        $uploadurl_location = XOOPS_URL . '/uploads/extcal/location/';
+        $uploaddir_location = XOOPS_ROOT_PATH.'/uploads/extcal/location/';
+        $uploadurl_location = XOOPS_URL.'/uploads/extcal/location/';
 
         $delimg = @$_REQUEST['delimg'];
-        $delimg = isset($delimg) ? (int)$delimg : 0;
+        $delimg = isset($delimg) ? (int) $delimg : 0;
         if (0 == $delimg && !empty($_REQUEST['xoops_upload_file'][0])) {
             $upload = new \XoopsMediaUploader($uploaddir_location, [
                 'image/gif',
@@ -227,8 +227,8 @@  discard block
 block discarded – undo
                 $logo = $_REQUEST['file'];
             }
         } else {
-            $logo              = '';
-            $url_location = XOOPS_ROOT_PATH . '/uploads/extcal/location/' . $_REQUEST['file'];
+            $logo = '';
+            $url_location = XOOPS_ROOT_PATH.'/uploads/extcal/location/'.$_REQUEST['file'];
             if (is_file($url_location)) {
                 chmod($url_location, 0777);
                 unlink($url_location);
@@ -248,4 +248,4 @@  discard block
 block discarded – undo
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

Please login to merge, or discard this patch.

admin/cat.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -20,11 +20,11 @@  discard block
 block discarded – undo
 use Xmf\Request;
 use XoopsModules\Extcal;
 
-require_once  dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-require_once dirname(dirname(dirname(__DIR__))) . '/class/xoopsformloader.php';
-require_once __DIR__ . '/admin_header.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/class/xoopsformloader.php';
+require_once __DIR__.'/admin_header.php';
 // require_once  dirname(__DIR__) . '/class/Utility.php';
-require_once  dirname(__DIR__) . '/include/constantes.php';
+require_once  dirname(__DIR__).'/include/constantes.php';
 
 //$gepeto = array_merge($_GET, $_POST);
 //while (list($key, $value) = each($gepeto)) {
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
         $form->addElement(new \XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, 0), false);
         $form->addElement(new \XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#FF0000'));
 
-        $file_path =  dirname(__DIR__) . '/assets/css/images';
+        $file_path = dirname(__DIR__).'/assets/css/images';
         $tf        = \XoopsLists::getImgListAsArray($file_path);
         array_unshift($tf, _MD_EXTCAL_NONE);
         //$xfIcones = new \XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), '');
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
 
         $form->display();
 
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 
     case 'edit':
@@ -120,15 +120,15 @@  discard block
 block discarded – undo
             //            $cat = $catHandler->getCat($cat_id, true);
         }
 
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_EDIT_CATEGORY . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_EDIT_CATEGORY.'</legend>';
 
         $form = new \XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true);
         $form->addElement(new \XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255, $cat->getVar('cat_name')), true);
         $form->addElement(new \XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', $cat->getVar('cat_desc')), false);
         $form->addElement(new \XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, $cat->getVar('cat_weight')), false);
-        $form->addElement(new \XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#' . $cat->getVar('cat_color')));
+        $form->addElement(new \XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#'.$cat->getVar('cat_color')));
 
-        $file_path =  dirname(__DIR__) . '/assets/css/images';
+        $file_path = dirname(__DIR__).'/assets/css/images';
         $tf        = \XoopsLists::getImgListAsArray($file_path);
         array_unshift($tf, _MD_EXTCAL_NONE);
         $xfIcones = new \XoopsFormSelect(_AM_EXTCAL_ICONE, 'cat_icone', $cat->getVar('cat_icone'), '');
@@ -284,6 +284,6 @@  discard block
 block discarded – undo
         //$xoopsTpl->assign("module_dirname",    $xoopsModule->getVar("dirname") );
 
         $xoopsTpl->display('db:admin/extcal_admin_cat_list.tpl');
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 }

Please login to merge, or discard this patch.

admin/admin_header.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -19,11 +19,11 @@  discard block
 block discarded – undo
 
 use XoopsModules\Extcal;
 
-require_once  dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 require_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
-require_once  dirname(__DIR__) . '/include/constantes.php';
+require_once  dirname(__DIR__).'/include/constantes.php';
 
-require_once dirname(__DIR__) . '/preloads/autoloader.php';
+require_once dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
 $utility     = new Extcal\Utility();
 
 // require_once  dirname(__DIR__) . '/class/Utility.php';
-require_once  dirname(__DIR__) . '/include/common.php';
+require_once  dirname(__DIR__).'/include/common.php';
 
 $adminObject = \Xmf\Module\Admin::getInstance();
 

Please login to merge, or discard this patch.

admin/index.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -20,7 +20,7 @@  discard block
 block discarded – undo
 use XoopsModules\Extcal;
 use XoopsModules\Extcal\Common;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 // Display Admin header
 xoops_cp_header();
 /** @var Extcal\Utility $utility */
@@ -39,11 +39,11 @@  discard block
 block discarded – undo
 
 if ($helper->getConfig('displaySampleButton')) {
     xoops_loadLanguage('admin/modulesadmin', 'system');
-    require_once  dirname(__DIR__) . '/testdata/index.php';
+    require_once  dirname(__DIR__).'/testdata/index.php';
 
-    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
+    $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
 
-    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
+    $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
 
     //    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), '__DIR__ . /../../testdata/index.php?op=exportschema', 'add');
 
@@ -57,4 +57,4 @@  discard block
 block discarded – undo
 echo $utility::getServerStats();
 
 //codeDump(__FILE__);
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

Please login to merge, or discard this patch.

admin/menu.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -22,11 +22,11 @@  discard block
 block discarded – undo
 // require_once  dirname(__DIR__) . '/class/Helper.php';
 //require_once  dirname(__DIR__) . '/include/common.php';
 
-require_once dirname(__DIR__) . '/preloads/autoloader.php';
+require_once dirname(__DIR__).'/preloads/autoloader.php';
 
 $helper = Extcal\Helper::getInstance();
 
-$pathIcon32    = \Xmf\Module\Admin::menuIconPath('');
+$pathIcon32 = \Xmf\Module\Admin::menuIconPath('');
 if (is_object($helper->getModule())) {
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 }
@@ -34,33 +34,33 @@  discard block
 block discarded – undo
 $adminmenu[] = [
     'title' => _MI_EXTCAL_INDEX,
     '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_LOCATIONS,
     'link'  => 'admin/location.php',
-    'icon'  => $pathModIcon32 . '/location.png'
+    'icon'  => $pathModIcon32.'/location.png'
 ];
 $adminmenu[] = [
     'title' => _MI_EXTCAL_PERMISSIONS,
     'link'  => 'admin/permissions.php',
-    'icon'  => $pathIcon32 . '/permissions.png'
+    'icon'  => $pathIcon32.'/permissions.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_EXTCAL_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png'
+    'icon'  => $pathIcon32.'/about.png'
 ];

Please login to merge, or discard this patch.

admin/event.php 2 patches

Switch Indentation +303 added lines, -303 removed lines patch added patch discarded remove patch

@@ -75,178 +75,196 @@  discard block
 block discarded – undo
 
 switch ($op) {
 
-    case 'enreg':
-
-        $eventHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
-        $fileHandler  = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_FILE);
-        // $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;
-        ///////////////////////////////////////////////////////////////////////////////
-        Extcal\Utility::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_location' => $_POST['event_location'],
-            'dohtml'              => $extcalConfig['allow_html'],
-            'event_icone'         => $_POST['event_icone'],
-        ];
-
-        // Event edited
-        if (\Xmf\Request::hasVar('event_id', 'POST')) {
-            if (!$eventHandler->modifyEvent($_POST['event_id'], $data)) {
-                redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDIT_FAILED, false);
+        case 'enreg':
+
+            $eventHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
+            $fileHandler  = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_FILE);
+            // $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;
+            ///////////////////////////////////////////////////////////////////////////////
+            Extcal\Utility::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_location' => $_POST['event_location'],
+                'dohtml'              => $extcalConfig['allow_html'],
+                'event_icone'         => $_POST['event_icone'],
+            ];
+
+            // Event edited
+            if (\Xmf\Request::hasVar('event_id', 'POST')) {
+                if (!$eventHandler->modifyEvent($_POST['event_id'], $data)) {
+                    redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDIT_FAILED, false);
+                } else {
+                    $fileHandler->createFile(\Xmf\Request::getInt('event_id', 0, 'POST'));
+                    redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDITED, false);
+                }
+
+                // New event
             } else {
-                $fileHandler->createFile(\Xmf\Request::getInt('event_id', 0, 'POST'));
-                redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDITED, false);
+                /** @var \XoopsNotificationHandler $notificationHandler */
+                $notificationHandler = xoops_getHandler('notification');
+                /** @var Extcal\CategoryHandler $catHandler */
+                //            $catHandler = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+                $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+
+                $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('category', $_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 {
-            /** @var \XoopsNotificationHandler $notificationHandler */
-            $notificationHandler = xoops_getHandler('notification');
-            /** @var Extcal\CategoryHandler $catHandler */
-            //            $catHandler = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
-            $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
-
-            $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('category', $_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 = (('clone' === $op) ? '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 = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
+
+            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 = (('clone' === $op) ? '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 = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
-
-        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 = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
-        $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 = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
+            $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 (\Xmf\Request::hasVar('confirm', 'POST')) {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            if (\Xmf\Request::hasVar('confirm', 'POST')) {
+                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)
             //***************************************************************************************
@@ -254,184 +272,166 @@  discard block
 block discarded – undo
             $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      = Extcal\Config::getHandler();
+        case 'default':
+        default:
 
-        $start          = \Xmf\Request::getInt('start', 0, 'GET');
-        $nbEventsByPage = $helper->getConfig('nbEventsByPage');
+            //global $extcalConfig;
+            $extcalConfig      = Extcal\Config::getHandler();
 
-        xoops_cp_header();
-        // @author      Gregory Mage (Aka Mage)
-        //***************************************************************************************
+            $start          = \Xmf\Request::getInt('start', 0, 'GET');
+            $nbEventsByPage = $helper->getConfig('nbEventsByPage');
 
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        //***************************************************************************************
+            xoops_cp_header();
+            // @author      Gregory Mage (Aka Mage)
+            //***************************************************************************************
 
-        $eventHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
-        $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 = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
+            $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 = (0 == ++$i % 2) ? '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">' . ((1 == $event['event_isrecur']) ? _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 = (0 == ++$i % 2) ? '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">' . ((1 == $event['event_isrecur']) ? _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;
 }

Please login to merge, or discard this patch.

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch

@@ -19,11 +19,11 @@  discard block
 block discarded – undo
 
 use XoopsModules\Extcal;
 
-require_once  dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
 // require_once  dirname(__DIR__) . '/class/form/extcalform.php';
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 // require_once  dirname(__DIR__) . '/class/Utility.php';
 
 /** @var Extcal\Helper $helper */
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
 $gepeto = array_merge($_GET, $_POST);
 //while (list($k, $v) = each($gepeto)) {
 foreach ($gepeto as $k => $v) {
-    ${$k} =$v;
+    ${$k} = $v;
 }
 if (!isset($op)) {
     $op = '';
@@ -55,15 +55,15 @@  discard block
 block discarded – undo
     //    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>';
         }
     }
 
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
         $eventId      = $_GET['event_id'];
         $eventHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
 
-        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();
@@ -223,8 +223,8 @@  discard block
 block discarded – undo
             $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);
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
 
         if (\Xmf\Request::hasVar('confirm', 'POST')) {
             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']);
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
         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']);
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
     default:
 
         //global $extcalConfig;
-        $extcalConfig      = Extcal\Config::getHandler();
+        $extcalConfig = Extcal\Config::getHandler();
 
         $start          = \Xmf\Request::getInt('start', 0, 'GET');
         $nbEventsByPage = $helper->getConfig('nbEventsByPage');
@@ -336,32 +336,32 @@  discard block
 block discarded – undo
         $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>';
 
@@ -369,15 +369,15 @@  discard block
 block discarded – undo
             $i = 0;
             foreach ($events as $event) {
                 $class = (0 == ++$i % 2) ? '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>';
@@ -385,18 +385,18 @@  discard block
 block discarded – undo
                 //                     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">' . ((1 == $event['event_isrecur']) ? _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">'.((1 == $event['event_isrecur']) ? _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>';
@@ -410,13 +410,13 @@  discard block
 block discarded – undo
 
             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>';
@@ -424,14 +424,14 @@  discard block
 block discarded – undo
         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;
 }

Please login to merge, or discard this patch.

print.php 1 patch

Spacing +79 added lines, -79 removed lines patch added patch discarded remove patch

@@ -19,10 +19,10 @@  discard block
 block discarded – undo
 
 use XoopsModules\Extcal;
 
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+require_once dirname(dirname(__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';
 
 /** @var Extcal\Helper $helper */
 $helper = Extcal\Helper::getInstance();
@@ -43,136 +43,136 @@  discard block
 block discarded – undo
 // Adding formated date for start and end event
 $eventHandler->formatEventDate($event, $helper->getConfig('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_LOCATION_PRICE . $event['event_price'] . ' ' . _MD_EXTCAL_DEVISE2 . '</td>' . "\n";
+    echo '<td style="border:1px solid black;">'._MD_EXTCAL_LOCATION_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_location'] = 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_LOCATION . '</b>' . "\n";
+    echo '<td style="border:1px solid black;">'."\n";
+    echo '<b>'._MD_EXTCAL_LOCATION.'</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/location/' . $location['logo'] . ' height="75px">' . '' . "\n";
+        echo '<img align=right style="border:1px solid #FFFFFF;margin-right:6px" src='.XOOPS_URL.'/uploads/extcal/location/'.$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_LOCATION_TEL_FIXE . ' :</b>' . $location['tel_fixe'] . '<br>' . "\n";
+        echo '<b>'._MD_EXTCAL_LOCATION_TEL_FIXE.' :</b>'.$location['tel_fixe'].'<br>'."\n";
     }
     if ('' != $location['tel_portable']) {
-        echo '<b>' . _MD_EXTCAL_LOCATION_TEL_PORTABLE . ' :</b>' . $location['tel_portable'] . '<br>' . "\n";
+        echo '<b>'._MD_EXTCAL_LOCATION_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_LOCATION_MAP . ' :</b> <a href="' . $location['map'] . '">' . _MD_EXTCAL_LOCATION_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_LOCATION_MAP.' :</b> <a href="'.$location['map'].'">'._MD_EXTCAL_LOCATION_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";

Please login to merge, or discard this patch.

download_attachement.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -2,8 +2,8 @@  discard block
 block discarded – undo
 
 use XoopsModules\Extcal;
 
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+require_once dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 
 $fileId = \Xmf\Request::getInt('file', 0, 'GET');
 
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
 
 $file = $fileHandler->getFile($fileId);
 
-header('Content-Type: ' . $file->getVar('file_mimetype') . '');
-header('Content-Disposition: attachment; filename="' . $file->getVar('file_nicename') . '"');
+header('Content-Type: '.$file->getVar('file_mimetype').'');
+header('Content-Disposition: attachment; filename="'.$file->getVar('file_nicename').'"');
 
-readfile(XOOPS_ROOT_PATH . '/uploads/extcal/' . $file->getVar('file_name'));
+readfile(XOOPS_ROOT_PATH.'/uploads/extcal/'.$file->getVar('file_name'));

Please login to merge, or discard this patch.

index.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -2,10 +2,10 @@
 block discarded – undo
 
 use XoopsModules\Extcal;
 
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
+require_once dirname(dirname(__DIR__)).'/mainfile.php';
 
 //modif JJD
-require_once __DIR__ . '/include/constantes.php';
+require_once __DIR__.'/include/constantes.php';
 
 /** @var Extcal\Helper $helper */
 $helper = Extcal\Helper::getInstance();

Please login to merge, or discard this patch.

		@@ -156,10 +156,10 @@
		block discarded – undo
156	156	}
157	157	} else {
158	158	xoops_confirm([
159		- 'ok' => 1,
160		- 'location_id' => $_REQUEST['location_id'],
161		- 'op' => 'delete_location',
162		- ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_LOCATION_SURDEL . '<br>');
	159	+ 'ok' => 1,
	160	+ 'location_id' => $_REQUEST['location_id'],
	161	+ 'op' => 'delete_location',
	162	+ ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_LOCATION_SURDEL . '<br>');
163	163	}
164	164	break;
165	165

		@@ -20,18 +20,18 @@ discard block
		block discarded – undo
20	20	use XoopsModules\Extcal;
21	21
22	22	// Include xoops admin header
23		-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
	23	+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
24	24	// require_once dirname(__DIR__) . '/class/ExtcalPersistableObjectHandler.php';
25		-require_once dirname(dirname(dirname(__DIR__))) . '/kernel/module.php';
26		-require_once dirname(dirname(dirname(__DIR__))) . '/class/xoopsformloader.php';
27		-require_once dirname(dirname(dirname(__DIR__))) . '/class/tree.php';
28		-require_once dirname(dirname(dirname(__DIR__))) . '/class/xoopslists.php';
29		-require_once dirname(dirname(dirname(__DIR__))) . '/class/pagenav.php';
30		-require_once dirname(dirname(dirname(__DIR__))) . '/class/xoopsform/grouppermform.php';
31		-require_once dirname(dirname(dirname(__DIR__))) . '/class/uploader.php';
32		-require_once dirname(__DIR__) . '/include/constantes.php';
	25	+require_once dirname(dirname(dirname(__DIR__))).'/kernel/module.php';
	26	+require_once dirname(dirname(dirname(__DIR__))).'/class/xoopsformloader.php';
	27	+require_once dirname(dirname(dirname(__DIR__))).'/class/tree.php';
	28	+require_once dirname(dirname(dirname(__DIR__))).'/class/xoopslists.php';
	29	+require_once dirname(dirname(dirname(__DIR__))).'/class/pagenav.php';
	30	+require_once dirname(dirname(dirname(__DIR__))).'/class/xoopsform/grouppermform.php';
	31	+require_once dirname(dirname(dirname(__DIR__))).'/class/uploader.php';
	32	+require_once dirname(__DIR__).'/include/constantes.php';
33	33
34		-require_once __DIR__ . '/admin_header.php';
	34	+require_once __DIR__.'/admin_header.php';
35	35
36	36	//require("functions.php");
37	37	//require("../include/functions.php");
		@@ -39,10 +39,10 @@ discard block
		block discarded – undo
39	39	if ($xoopsUser) {
40	40	$xoopsModule = \XoopsModule::getByDirname('extcal');
41	41	if (!$xoopsUser->isAdmin($xoopsModule->mid())) {
42		- redirect_header(XOOPS_URL . '/', 3, _NOPERM);
	42	+ redirect_header(XOOPS_URL.'/', 3, _NOPERM);
43	43	}
44	44	} else {
45		- redirect_header(XOOPS_URL . '/', 3, _NOPERM);
	45	+ redirect_header(XOOPS_URL.'/', 3, _NOPERM);
46	46	}
47	47
48	48	// Include language file
		@@ -97,9 +97,9 @@ discard block
		block discarded – undo
97	97	$criteria->setSort('nom');
98	98	$criteria->setOrder('ASC');
99	99	$location_arr = $locationHandler->getObjects($criteria);
100		- $numrows = $locationHandler->getCount($criteria);
	100	+ $numrows = $locationHandler->getCount($criteria);
101	101	if ($numrows > $limit) {
102		- $pagenav = new \XoopsPageNav($numrows, $limit, $start, 'start', 'op=liste&limit=' . $limit);
	102	+ $pagenav = new \XoopsPageNav($numrows, $limit, $start, 'start', 'op=liste&limit='.$limit);
103	103	$pagenav = $pagenav->renderNav(4);
104	104	} else {
105	105	$pagenav = '';
		@@ -108,35 +108,35 @@ discard block
		block discarded – undo
108	108	if ($numrows > 0) {
109	109	echo '<table width="100%" cellspacing="1" class="outer">';
110	110	echo '<tr>';
111		- echo '<th align="center">' . _AM_EXTCAL_LOCATION_FORM_NOM . '</th>';
112		- echo '<th align="center" width="20%">' . _AM_EXTCAL_LOCATION_FORM_ADRESSE . '</th>';
113		- echo '<th align="center" width="20%">' . _AM_EXTCAL_LOCATION_FORM_CITY . '</th>';
114		- echo '<th align="center" width="15%">' . _AM_EXTCAL_LOCATION_FORM_TELEPHONE . '</th>';
115		- echo '<th align="center" width="15%">' . _AM_EXTCAL_LOCATION_FORM_ACTION . '</th>';
	111	+ echo '<th align="center">'._AM_EXTCAL_LOCATION_FORM_NOM.'</th>';
	112	+ echo '<th align="center" width="20%">'._AM_EXTCAL_LOCATION_FORM_ADRESSE.'</th>';
	113	+ echo '<th align="center" width="20%">'._AM_EXTCAL_LOCATION_FORM_CITY.'</th>';
	114	+ echo '<th align="center" width="15%">'._AM_EXTCAL_LOCATION_FORM_TELEPHONE.'</th>';
	115	+ echo '<th align="center" width="15%">'._AM_EXTCAL_LOCATION_FORM_ACTION.'</th>';
116	116	echo '</tr>';
117	117	$class = 'odd';
118	118	foreach (array_keys($location_arr) as $i) {
119		- $class = ('even' === $class) ? 'odd' : 'even';
	119	+ $class = ('even' === $class) ? 'odd' : 'even';
120	120	$location_id = $location_arr[$i]->getVar('id');
121	121	$location_nom = $location_arr[$i]->getVar('nom');
122	122	$location_adresse = $location_arr[$i]->getVar('adresse');
123	123	$location_city = $location_arr[$i]->getVar('ville');
124	124	$location_telephone = $location_arr[$i]->getVar('tel_fixe');
125		- echo '<tr class="' . $class . '">';
126		- echo '<td align="left">' . '<a href="Location.php?op=edit_location&location_id=' . $location_id . '">' . $location_nom . '</a>' . '</td>';
	125	+ echo '<tr class="'.$class.'">';
	126	+ echo '<td align="left">'.'<a href="Location.php?op=edit_location&location_id='.$location_id.'">'.$location_nom.'</a>'.'</td>';
127	127
128		- echo '<td align="center"><b>' . $location_adresse . '</td>';
129		- echo '<td align="center"><b>' . $location_city . '</td>';
130		- echo '<td align="center"><b>' . $location_telephone . '</td>';
	128	+ echo '<td align="center"><b>'.$location_adresse.'</td>';
	129	+ echo '<td align="center"><b>'.$location_city.'</td>';
	130	+ echo '<td align="center"><b>'.$location_telephone.'</td>';
131	131	echo '<td align="center" width="15%">';
132		- echo '<a href="Location.php?op=edit_location&location_id=' . $location_id . '"><img src=' . $pathIcon16 . '/edit.png alt="' . _AM_EXTCAL_LOCATION_FORM_EDIT . '" title="' . _AM_EXTCAL_LOCATION_FORM_EDIT . '"></a> ';
133		- echo '<a href="Location.php?op=delete_location&location_id=' . $location_id . '"><img src=' . $pathIcon16 . '/delete.png alt="' . _AM_EXTCAL_LOCATION_FORM_DELETE . '" title="' . _AM_EXTCAL_LOCATION_FORM_DELETE . '"></a> ';
	132	+ echo '<a href="Location.php?op=edit_location&location_id='.$location_id.'"><img src='.$pathIcon16.'/edit.png alt="'._AM_EXTCAL_LOCATION_FORM_EDIT.'" title="'._AM_EXTCAL_LOCATION_FORM_EDIT.'"></a> ';
	133	+ echo '<a href="Location.php?op=delete_location&location_id='.$location_id.'"><img src='.$pathIcon16.'/delete.png alt="'._AM_EXTCAL_LOCATION_FORM_DELETE.'" title="'._AM_EXTCAL_LOCATION_FORM_DELETE.'"></a> ';
134	134	echo '</td>';
135	135	}
136	136	echo '</table><br>';
137		- echo '<br><div align=right>' . $pagenav . '</div><br>';
	137	+ echo '<br><div align=right>'.$pagenav.'</div><br>';
138	138	} else {
139		- echo '<div class="errorMsg" style="text-align: center;">' . _AM_EXTCAL_ERREUR_NO_LOCATION . '</div>';
	139	+ echo '<div class="errorMsg" style="text-align: center;">'._AM_EXTCAL_ERREUR_NO_LOCATION.'</div>';
140	140	}
141	141
142	142	// Affichage du formulaire
		@@ -159,7 +159,7 @@ discard block
		block discarded – undo
159	159	'ok' => 1,
160	160	'location_id' => $_REQUEST['location_id'],
161	161	'op' => 'delete_location',
162		- ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_LOCATION_SURDEL . '<br>');
	162	+ ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_LOCATION_SURDEL.'<br>');
163	163	}
164	164	break;
165	165
		@@ -201,11 +201,11 @@ discard block
		block discarded – undo
201	201	$obj->setVar('map', $_REQUEST['map']);
202	202
203	203	//Logo
204		- $uploaddir_location = XOOPS_ROOT_PATH . '/uploads/extcal/location/';
205		- $uploadurl_location = XOOPS_URL . '/uploads/extcal/location/';
	204	+ $uploaddir_location = XOOPS_ROOT_PATH.'/uploads/extcal/location/';
	205	+ $uploadurl_location = XOOPS_URL.'/uploads/extcal/location/';
206	206
207	207	$delimg = @$_REQUEST['delimg'];
208		- $delimg = isset($delimg) ? (int)$delimg : 0;
	208	+ $delimg = isset($delimg) ? (int) $delimg : 0;
209	209	if (0 == $delimg && !empty($_REQUEST['xoops_upload_file'][0])) {
210	210	$upload = new \XoopsMediaUploader($uploaddir_location, [
211	211	'image/gif',
		@@ -227,8 +227,8 @@ discard block
		block discarded – undo
227	227	$logo = $_REQUEST['file'];
228	228	}
229	229	} else {
230		- $logo = '';
231		- $url_location = XOOPS_ROOT_PATH . '/uploads/extcal/location/' . $_REQUEST['file'];
	230	+ $logo = '';
	231	+ $url_location = XOOPS_ROOT_PATH.'/uploads/extcal/location/'.$_REQUEST['file'];
232	232	if (is_file($url_location)) {
233	233	chmod($url_location, 0777);
234	234	unlink($url_location);
		@@ -248,4 +248,4 @@ discard block
		block discarded – undo
248	248	break;
249	249	}
250	250
251		-require_once __DIR__ . '/admin_footer.php';
	251	+require_once __DIR__.'/admin_footer.php';

		@@ -20,11 +20,11 @@ discard block
		block discarded – undo
20	20	use Xmf\Request;
21	21	use XoopsModules\Extcal;
22	22
23		-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
24		-require_once dirname(dirname(dirname(__DIR__))) . '/class/xoopsformloader.php';
25		-require_once __DIR__ . '/admin_header.php';
	23	+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
	24	+require_once dirname(dirname(dirname(__DIR__))).'/class/xoopsformloader.php';
	25	+require_once __DIR__.'/admin_header.php';
26	26	// require_once dirname(__DIR__) . '/class/Utility.php';
27		-require_once dirname(__DIR__) . '/include/constantes.php';
	27	+require_once dirname(__DIR__).'/include/constantes.php';
28	28
29	29	//$gepeto = array_merge($_GET, $_POST);
30	30	//while (list($key, $value) = each($gepeto)) {
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	$form->addElement(new \XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, 0), false);
96	96	$form->addElement(new \XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#FF0000'));
97	97
98		- $file_path = dirname(__DIR__) . '/assets/css/images';
	98	+ $file_path = dirname(__DIR__).'/assets/css/images';
99	99	$tf = \XoopsLists::getImgListAsArray($file_path);
100	100	array_unshift($tf, _MD_EXTCAL_NONE);
101	101	//$xfIcones = new \XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), '');
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107
108	108	$form->display();
109	109
110		- require_once __DIR__ . '/admin_footer.php';
	110	+ require_once __DIR__.'/admin_footer.php';
111	111	break;
112	112
113	113	case 'edit':
		@@ -120,15 +120,15 @@ discard block
		block discarded – undo
120	120	// $cat = $catHandler->getCat($cat_id, true);
121	121	}
122	122
123		- echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_EDIT_CATEGORY . '</legend>';
	123	+ echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_EDIT_CATEGORY.'</legend>';
124	124
125	125	$form = new \XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true);
126	126	$form->addElement(new \XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255, $cat->getVar('cat_name')), true);
127	127	$form->addElement(new \XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', $cat->getVar('cat_desc')), false);
128	128	$form->addElement(new \XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, $cat->getVar('cat_weight')), false);
129		- $form->addElement(new \XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#' . $cat->getVar('cat_color')));
	129	+ $form->addElement(new \XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#'.$cat->getVar('cat_color')));
130	130
131		- $file_path = dirname(__DIR__) . '/assets/css/images';
	131	+ $file_path = dirname(__DIR__).'/assets/css/images';
132	132	$tf = \XoopsLists::getImgListAsArray($file_path);
133	133	array_unshift($tf, _MD_EXTCAL_NONE);
134	134	$xfIcones = new \XoopsFormSelect(_AM_EXTCAL_ICONE, 'cat_icone', $cat->getVar('cat_icone'), '');
		@@ -284,6 +284,6 @@ discard block
		block discarded – undo
284	284	//$xoopsTpl->assign("module_dirname", $xoopsModule->getVar("dirname") );
285	285
286	286	$xoopsTpl->display('db:admin/extcal_admin_cat_list.tpl');
287		- require_once __DIR__ . '/admin_footer.php';
	287	+ require_once __DIR__.'/admin_footer.php';
288	288	break;
289	289	}

		@@ -19,11 +19,11 @@ discard block
		block discarded – undo
19	19
20	20	use XoopsModules\Extcal;
21	21
22		-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
	22	+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
23	23	require_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
24		-require_once dirname(__DIR__) . '/include/constantes.php';
	24	+require_once dirname(__DIR__).'/include/constantes.php';
25	25
26		-require_once dirname(__DIR__) . '/preloads/autoloader.php';
	26	+require_once dirname(__DIR__).'/preloads/autoloader.php';
27	27
28	28	$moduleDirName = basename(dirname(__DIR__));
29	29
		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	$utility = new Extcal\Utility();
35	35
36	36	// require_once dirname(__DIR__) . '/class/Utility.php';
37		-require_once dirname(__DIR__) . '/include/common.php';
	37	+require_once dirname(__DIR__).'/include/common.php';
38	38
39	39	$adminObject = \Xmf\Module\Admin::getInstance();
40	40

		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	use XoopsModules\Extcal;
21	21	use XoopsModules\Extcal\Common;
22	22
23		-require_once __DIR__ . '/admin_header.php';
	23	+require_once __DIR__.'/admin_header.php';
24	24	// Display Admin header
25	25	xoops_cp_header();
26	26	/** @var Extcal\Utility $utility */
		@@ -39,11 +39,11 @@ discard block
		block discarded – undo
39	39
40	40	if ($helper->getConfig('displaySampleButton')) {
41	41	xoops_loadLanguage('admin/modulesadmin', 'system');
42		- require_once dirname(__DIR__) . '/testdata/index.php';
	42	+ require_once dirname(__DIR__).'/testdata/index.php';
43	43
44		- $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
	44	+ $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
45	45
46		- $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
	46	+ $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
47	47
48	48	// $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), '__DIR__ . /../../testdata/index.php?op=exportschema', 'add');
49	49
		@@ -57,4 +57,4 @@ discard block
		block discarded – undo
57	57	echo $utility::getServerStats();
58	58
59	59	//codeDump(__FILE__);
60		-require_once __DIR__ . '/admin_footer.php';
	60	+require_once __DIR__.'/admin_footer.php';

		@@ -22,11 +22,11 @@ discard block
		block discarded – undo
22	22	// require_once dirname(__DIR__) . '/class/Helper.php';
23	23	//require_once dirname(__DIR__) . '/include/common.php';
24	24
25		-require_once dirname(__DIR__) . '/preloads/autoloader.php';
	25	+require_once dirname(__DIR__).'/preloads/autoloader.php';
26	26
27	27	$helper = Extcal\Helper::getInstance();
28	28
29		-$pathIcon32 = \Xmf\Module\Admin::menuIconPath('');
	29	+$pathIcon32 = \Xmf\Module\Admin::menuIconPath('');
30	30	if (is_object($helper->getModule())) {
31	31	$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
32	32	}
		@@ -34,33 +34,33 @@ discard block
		block discarded – undo
34	34	$adminmenu[] = [
35	35	'title' => _MI_EXTCAL_INDEX,
36	36	'link' => 'admin/index.php',
37		- 'icon' => $pathIcon32 . '/home.png'
	37	+ 'icon' => $pathIcon32.'/home.png'
38	38	];
39	39
40	40	$adminmenu[] = [
41	41	'title' => _MI_EXTCAL_CATEGORY,
42	42	'link' => 'admin/cat.php',
43		- 'icon' => $pathIcon32 . '/category.png'
	43	+ 'icon' => $pathIcon32.'/category.png'
44	44	];
45	45
46	46	$adminmenu[] = [
47	47	'title' => _MI_EXTCAL_EVENT,
48	48	'link' => 'admin/event.php',
49		- 'icon' => $pathIcon32 . '/event.png'
	49	+ 'icon' => $pathIcon32.'/event.png'
50	50	];
51	51	$adminmenu[] = [
52	52	'title' => _MI_EXTCAL_LOCATIONS,
53	53	'link' => 'admin/location.php',
54		- 'icon' => $pathModIcon32 . '/location.png'
	54	+ 'icon' => $pathModIcon32.'/location.png'
55	55	];
56	56	$adminmenu[] = [
57	57	'title' => _MI_EXTCAL_PERMISSIONS,
58	58	'link' => 'admin/permissions.php',
59		- 'icon' => $pathIcon32 . '/permissions.png'
	59	+ 'icon' => $pathIcon32.'/permissions.png'
60	60	];
61	61
62	62	$adminmenu[] = [
63	63	'title' => _MI_EXTCAL_ABOUT,
64	64	'link' => 'admin/about.php',
65		- 'icon' => $pathIcon32 . '/about.png'
	65	+ 'icon' => $pathIcon32.'/about.png'
66	66	];

		@@ -19,10 +19,10 @@ discard block
		block discarded – undo
19	19
20	20	use XoopsModules\Extcal;
21	21
22		-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
23		-require_once __DIR__ . '/include/constantes.php';
	22	+require_once dirname(dirname(__DIR__)).'/mainfile.php';
	23	+require_once __DIR__.'/include/constantes.php';
24	24
25		-require_once XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/calendar.php';
	25	+require_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/calendar.php';
26	26
27	27	/** @var Extcal\Helper $helper */
28	28	$helper = Extcal\Helper::getInstance();
		@@ -43,136 +43,136 @@ discard block
		block discarded – undo
43	43	// Adding formated date for start and end event
44	44	$eventHandler->formatEventDate($event, $helper->getConfig('event_date_event'));
45	45
46		-echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' . "\n";
47		-echo '<html xmlns="http://www.w3.org/1999/xhtml">' . "\n";
48		-echo '<head>' . "\n";
49		-echo '<meta http-equiv="content-type" content="text/html; charset=' . _CHARSET . '">' . "\n";
50		-echo '<title>' . $event['cat']['cat_name'] . ' - ' . $event['event_title'] . '</title>' . "\n";
51		-echo '</head>' . "\n";
52		-echo '<body onload="window.print()">' . "\n";
53		-echo '<table style="border:1px solid black; width:640px;" cellspacing="0" cellspadding="0">' . "\n";
54		-echo '<tr>' . "\n";
55		-echo '<td colspan="2" style="font-size:1.2em; border:1px solid black;">' . "\n";
56		-echo $event['event_title'] . "\n";
57		-echo '</td>' . "\n";
58		-echo '</tr>' . "\n";
59		-echo '<tr>' . "\n";
60		-echo '<td style="width:50%; border:1px solid black;">' . "\n";
61		-echo '<b>' . $event['cat']['cat_name'] . '</b><br>' . "\n";
62		-echo '<span style="font-weight:normal;">' . $event['cat']['cat_desc'] . '</span>' . "\n";
63		-echo '</td>' . "\n";
64		-echo '<td style="border:1px solid black;">' . "\n";
	46	+echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n";
	47	+echo '<html xmlns="http://www.w3.org/1999/xhtml">'."\n";
	48	+echo '<head>'."\n";
	49	+echo '<meta http-equiv="content-type" content="text/html; charset='._CHARSET.'">'."\n";
	50	+echo '<title>'.$event['cat']['cat_name'].' - '.$event['event_title'].'</title>'."\n";
	51	+echo '</head>'."\n";
	52	+echo '<body onload="window.print()">'."\n";
	53	+echo '<table style="border:1px solid black; width:640px;" cellspacing="0" cellspadding="0">'."\n";
	54	+echo '<tr>'."\n";
	55	+echo '<td colspan="2" style="font-size:1.2em; border:1px solid black;">'."\n";
	56	+echo $event['event_title']."\n";
	57	+echo '</td>'."\n";
	58	+echo '</tr>'."\n";
	59	+echo '<tr>'."\n";
	60	+echo '<td style="width:50%; border:1px solid black;">'."\n";
	61	+echo '<b>'.$event['cat']['cat_name'].'</b><br>'."\n";
	62	+echo '<span style="font-weight:normal;">'.$event['cat']['cat_desc'].'</span>'."\n";
	63	+echo '</td>'."\n";
	64	+echo '<td style="border:1px solid black;">'."\n";
65	65	if (!$event['event_isrecur']) {
66		- echo '<b>' . _MD_EXTCAL_START . ' :</b> <span style="font-weight:normal;">' . $event['formated_event_start'] . '</span><br>' . "\n";
67		- echo '<b>' . _MD_EXTCAL_END . ' :</b> <span style="font-weight:normal;">' . $event['formated_event_end'] . '</span>' . "\n";
	66	+ echo '<b>'._MD_EXTCAL_START.' :</b> <span style="font-weight:normal;">'.$event['formated_event_start'].'</span><br>'."\n";
	67	+ echo '<b>'._MD_EXTCAL_END.' :</b> <span style="font-weight:normal;">'.$event['formated_event_end'].'</span>'."\n";
68	68	} else {
69		- echo '<b>' . _MD_EXTCAL_RECCUR_RULE . ' :</b> <span style="font-weight:normal;">' . $event['formated_reccur_rule'] . '</span>' . "\n";
	69	+ echo '<b>'._MD_EXTCAL_RECCUR_RULE.' :</b> <span style="font-weight:normal;">'.$event['formated_reccur_rule'].'</span>'."\n";
70	70	}
71		-echo '</td>' . "\n";
72		-echo '</tr>' . "\n";
	71	+echo '</td>'."\n";
	72	+echo '</tr>'."\n";
73	73
74		-echo '<tr>' . "\n";
	74	+echo '<tr>'."\n";
75	75	if ('' != $event['event_desc']) {
76		- echo '<td style="border:1px solid black;">' . $event['event_desc'] . '</td>' . "\n";
	76	+ echo '<td style="border:1px solid black;">'.$event['event_desc'].'</td>'."\n";
77	77	}
78	78	if ('' != $event['event_price']) {
79		- echo '<td style="border:1px solid black;">' . _MD_EXTCAL_LOCATION_PRICE . $event['event_price'] . ' ' . _MD_EXTCAL_DEVISE2 . '</td>' . "\n";
	79	+ echo '<td style="border:1px solid black;">'._MD_EXTCAL_LOCATION_PRICE.$event['event_price'].' '._MD_EXTCAL_DEVISE2.'</td>'."\n";
80	80	}
81		-echo '</tr>' . "\n";
	81	+echo '</tr>'."\n";
82	82
83	83	//show contact info
84	84	if ('' != $event['event_contact']) {
85		- echo '<tr>' . "\n";
86		- echo '<td style="border:1px solid black;">' . "\n";
87		- echo '<b>' . _MD_EXTCAL_CONTACT_INFO . '</b><br>' . "\n";
88		- echo '<span style="font-weight:normal;">' . $event['event_organisateur'] . '<br>' . "\n";
89		- echo '<span style="font-weight:normal;">' . $event['event_contact'] . '<br>' . "\n";
90		- echo $event['event_address'] . '</span>' . "\n";
91		- echo '</td>' . "\n";
92		- echo '<td style="border:1px solid black;">' . "\n";
93		- echo '<b>' . _MD_EXTCAL_EMAIL . ' :</b> <a href="mailto:' . $event['event_email'] . '">' . $event['event_email'] . '</a><br>' . "\n";
94		- echo '<b>' . _MD_EXTCAL_URL . ' :</b> <a href="' . $event['event_url'] . '">' . $event['event_url'] . '</a>' . "\n";
95		- echo '</td>' . "\n";
96		- echo '</tr>' . "\n";
	85	+ echo '<tr>'."\n";
	86	+ echo '<td style="border:1px solid black;">'."\n";
	87	+ echo '<b>'._MD_EXTCAL_CONTACT_INFO.'</b><br>'."\n";
	88	+ echo '<span style="font-weight:normal;">'.$event['event_organisateur'].'<br>'."\n";
	89	+ echo '<span style="font-weight:normal;">'.$event['event_contact'].'<br>'."\n";
	90	+ echo $event['event_address'].'</span>'."\n";
	91	+ echo '</td>'."\n";
	92	+ echo '<td style="border:1px solid black;">'."\n";
	93	+ echo '<b>'._MD_EXTCAL_EMAIL.' :</b> <a href="mailto:'.$event['event_email'].'">'.$event['event_email'].'</a><br>'."\n";
	94	+ echo '<b>'._MD_EXTCAL_URL.' :</b> <a href="'.$event['event_url'].'">'.$event['event_url'].'</a>'."\n";
	95	+ echo '</td>'."\n";
	96	+ echo '</tr>'."\n";
97	97	}
98	98
99	99	//show location
100	100	if ($event['event_location'] = 0) {
101		- echo '<tr>' . "\n";
	101	+ echo '<tr>'."\n";
102	102
103	103	// echo($location['nom']);
104	104	// var_dump($location);
105	105	// var_dump($event);
106	106
107		- echo '<td style="border:1px solid black;">' . "\n";
108		- echo '<b>' . _MD_EXTCAL_LOCATION . '</b>' . "\n";
	107	+ echo '<td style="border:1px solid black;">'."\n";
	108	+ echo '<b>'._MD_EXTCAL_LOCATION.'</b>'."\n";
109	109	if ('' != $location['categorie']) {
110		- echo '<span style="font-weight:normal;"> (' . $location['categorie'] . ') <br>' . "\n";
	110	+ echo '<span style="font-weight:normal;"> ('.$location['categorie'].') <br>'."\n";
111	111	}
112	112	if ('' != $location['logo']) {
113		- echo '<img align=right style="border:1px solid #FFFFFF;margin-right:6px" src=' . XOOPS_URL . '/uploads/extcal/location/' . $location['logo'] . ' height="75px">' . '' . "\n";
	113	+ echo '<img align=right style="border:1px solid #FFFFFF;margin-right:6px" src='.XOOPS_URL.'/uploads/extcal/location/'.$location['logo'].' height="75px">'.''."\n";
114	114	}
115	115
116		- echo '<span style="font-weight:normal;">' . $location['nom'] . '<br>' . "\n";
117		- echo $location['description'] . '<br>' . "\n";
118		- echo $location['adresse'] . '</span> <br>' . "\n";
	116	+ echo '<span style="font-weight:normal;">'.$location['nom'].'<br>'."\n";
	117	+ echo $location['description'].'<br>'."\n";
	118	+ echo $location['adresse'].'</span> <br>'."\n";
119	119	if ('' != $location['adresse2']) {
120		- echo $location['adresse2'] . '</span> <br>' . "\n";
	120	+ echo $location['adresse2'].'</span> <br>'."\n";
121	121	}
122		- echo $location['ville'] . "\n";
123		- echo $location['cp'] . '<br>' . "\n";
	122	+ echo $location['ville']."\n";
	123	+ echo $location['cp'].'<br>'."\n";
124	124
125	125	if ('' != $location['horaires']) {
126		- echo $location['horaires'] . '</span> <br>' . "\n";
	126	+ echo $location['horaires'].'</span> <br>'."\n";
127	127	}
128	128
129	129	if ('' != $location['divers']) {
130		- echo $location['divers'] . '</span> <br>' . "\n";
	130	+ echo $location['divers'].'</span> <br>'."\n";
131	131	}
132	132
133	133	if ('' != $location['tarifs']) {
134		- echo $location['tarifs'] . '</span> ' . _MD_EXTCAL_DEVISE2 . "\n";
	134	+ echo $location['tarifs'].'</span> '._MD_EXTCAL_DEVISE2."\n";
135	135	}
136	136
137		- echo '</td>' . "\n";
138		- echo '<td style="border:1px solid black;">' . "\n";
	137	+ echo '</td>'."\n";
	138	+ echo '<td style="border:1px solid black;">'."\n";
139	139
140	140	if ('' != $location['tel_fixe']) {
141		- echo '<b>' . _MD_EXTCAL_LOCATION_TEL_FIXE . ' :</b>' . $location['tel_fixe'] . '<br>' . "\n";
	141	+ echo '<b>'._MD_EXTCAL_LOCATION_TEL_FIXE.' :</b>'.$location['tel_fixe'].'<br>'."\n";
142	142	}
143	143	if ('' != $location['tel_portable']) {
144		- echo '<b>' . _MD_EXTCAL_LOCATION_TEL_PORTABLE . ' :</b>' . $location['tel_portable'] . '<br>' . "\n";
	144	+ echo '<b>'._MD_EXTCAL_LOCATION_TEL_PORTABLE.' :</b>'.$location['tel_portable'].'<br>'."\n";
145	145	}
146	146
147		- echo '<b>' . _MD_EXTCAL_EMAIL . ' :</b> <a href="mailto:' . $location['mail'] . '">' . $location['mail'] . '</a><br>' . "\n";
148		- echo '<b>' . _MD_EXTCAL_URL . ' :</b> <a href="' . $location['site'] . '">' . $location['site'] . '</a>' . '<br>' . "\n";
149		- echo '<b>' . _MD_EXTCAL_LOCATION_MAP . ' :</b> <a href="' . $location['map'] . '">' . _MD_EXTCAL_LOCATION_MAP2 . '</a>' . "\n";
	147	+ echo '<b>'._MD_EXTCAL_EMAIL.' :</b> <a href="mailto:'.$location['mail'].'">'.$location['mail'].'</a><br>'."\n";
	148	+ echo '<b>'._MD_EXTCAL_URL.' :</b> <a href="'.$location['site'].'">'.$location['site'].'</a>'.'<br>'."\n";
	149	+ echo '<b>'._MD_EXTCAL_LOCATION_MAP.' :</b> <a href="'.$location['map'].'">'._MD_EXTCAL_LOCATION_MAP2.'</a>'."\n";
150	150
151		- echo '</td>' . "\n";
152		- echo '</tr>' . "\n";
	151	+ echo '</td>'."\n";
	152	+ echo '</tr>'."\n";
153	153	}
154	154	//show images
155	155
156	156	if (('' != $event['event_picture1']) \|\| ('' != $event['event_picture2'])) {
157		- echo '<tr>' . "\n";
	157	+ echo '<tr>'."\n";
158	158	if ('' != $event['event_picture1']) {
159		- echo '<td style="border:1px solid black;">' . "\n";
160		- echo '<img align=left style="border:1px solid #FFFFFF;margin-right:6px" src=' . XOOPS_URL . '/uploads/extcal/' . $event['event_picture1'] . ' height="100px">' . '' . "\n";
161		- echo '</td>' . "\n";
	159	+ echo '<td style="border:1px solid black;">'."\n";
	160	+ echo '<img align=left style="border:1px solid #FFFFFF;margin-right:6px" src='.XOOPS_URL.'/uploads/extcal/'.$event['event_picture1'].' height="100px">'.''."\n";
	161	+ echo '</td>'."\n";
162	162	}
163	163	if ('' != $event['event_picture2']) {
164		- echo '<td style="border:1px solid black;">' . "\n";
165		- echo '<img align=left style="border:1px solid #FFFFFF;margin-right:6px" src=' . XOOPS_URL . '/uploads/extcal/' . $event['event_picture2'] . ' height="100px">' . '' . "\n";
166		- echo '</td>' . "\n";
	164	+ echo '<td style="border:1px solid black;">'."\n";
	165	+ echo '<img align=left style="border:1px solid #FFFFFF;margin-right:6px" src='.XOOPS_URL.'/uploads/extcal/'.$event['event_picture2'].' height="100px">'.''."\n";
	166	+ echo '</td>'."\n";
167	167	}
168		- echo '</tr>' . "\n";
	168	+ echo '</tr>'."\n";
169	169	}
170	170	//--------------------
171	171
172		-echo '</table><br>' . "\n";
	172	+echo '</table><br>'."\n";
173	173	echo '<div style="text-align:center; width:640px;">';
174		-echo $xoopsConfig['sitename'] . ' - ' . $xoopsConfig['slogan'] . '<br>';
175		-echo '<a href="' . XOOPS_URL . '/modules/extcal/event.php?event=' . $event['event_id'] . '">' . XOOPS_URL . '/modules/extcal/event.php?event=' . $event['event_id'] . '</a>';
	174	+echo $xoopsConfig['sitename'].' - '.$xoopsConfig['slogan'].'<br>';
	175	+echo '<a href="'.XOOPS_URL.'/modules/extcal/event.php?event='.$event['event_id'].'">'.XOOPS_URL.'/modules/extcal/event.php?event='.$event['event_id'].'</a>';
176	176	echo '</div>';
177		-echo '</body>' . "\n";
178		-echo '</html>' . "\n";
	177	+echo '</body>'."\n";
	178	+echo '</html>'."\n";

		@@ -2,8 +2,8 @@ discard block
		block discarded – undo
2	2
3	3	use XoopsModules\Extcal;
4	4
5		-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
6		-require_once __DIR__ . '/include/constantes.php';
	5	+require_once dirname(dirname(__DIR__)).'/mainfile.php';
	6	+require_once __DIR__.'/include/constantes.php';
7	7
8	8	$fileId = \Xmf\Request::getInt('file', 0, 'GET');
9	9
		@@ -12,7 +12,7 @@ discard block
		block discarded – undo
12	12
13	13	$file = $fileHandler->getFile($fileId);
14	14
15		-header('Content-Type: ' . $file->getVar('file_mimetype') . '');
16		-header('Content-Disposition: attachment; filename="' . $file->getVar('file_nicename') . '"');
	15	+header('Content-Type: '.$file->getVar('file_mimetype').'');
	16	+header('Content-Disposition: attachment; filename="'.$file->getVar('file_nicename').'"');
17	17
18		-readfile(XOOPS_ROOT_PATH . '/uploads/extcal/' . $file->getVar('file_name'));
	18	+readfile(XOOPS_ROOT_PATH.'/uploads/extcal/'.$file->getVar('file_name'));

		@@ -2,10 +2,10 @@
		block discarded – undo
2	2
3	3	use XoopsModules\Extcal;
4	4
5		-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
	5	+require_once dirname(dirname(__DIR__)).'/mainfile.php';
6	6
7	7	//modif JJD
8		-require_once __DIR__ . '/include/constantes.php';
	8	+require_once __DIR__.'/include/constantes.php';
9	9
10	10	/** @var Extcal\Helper $helper */
11	11	$helper = Extcal\Helper::getInstance();

mambax7 / extcal

Push — master ( f62223...75b16c )

Status

Category

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +36 added lines, -36 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Switch Indentation +303 added lines, -303 removed lines patch added patch discarded remove patch

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch

Spacing +79 added lines, -79 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch