mambax7 / extcal

include/functions0.php

Indentation +5 added lines, -5 removed lines

@@ -149,11 +149,11 @@
         $cat_color = $catList->getVar('cat_color');
         $checked   = in_array($cat_id, $cat) ? 'checked' : '';
         $cat       = ''
-                     . "<div style='float:left; margin-left:5px;'>"
-                     . "<input type='checkbox' name='{$name}[{$cat_id}]' value='1' {$checked}>"
-                     . "<div style='absolute:left;height:12px; width:6px; background-color:#{$cat_color}; border:1px solid black; float:left; margin-right:5px;' ></div>"
-                     . " {$name}"
-                     . '</div>';
+                        . "<div style='float:left; margin-left:5px;'>"
+                        . "<input type='checkbox' name='{$name}[{$cat_id}]' value='1' {$checked}>"
+                        . "<div style='absolute:left;height:12px; width:6px; background-color:#{$cat_color}; border:1px solid black; float:left; margin-right:5px;' ></div>"
+                        . " {$name}"
+                        . '</div>';
 
         $t[] = $cat;
     }

Spacing +21 added lines, -21 removed lines

@@ -18,7 +18,7 @@ 
 
 use XoopsModules\Extcal;
 
-require_once XOOPS_ROOT_PATH . '/class/uploader.php';
+require_once XOOPS_ROOT_PATH.'/class/uploader.php';
 
 /**
  * @param $eventId
@@ -47,12 +47,12 @@ 
 function extcal_loadImg(&$REQUEST, &$event_picture1, &$event_picture2)
 {
     ///////////////////////////////////////////////////////////////////////////////
-    $uploaddir_event = XOOPS_ROOT_PATH . '/uploads/extcal/';
-    $uploadurl_event = XOOPS_URL . '/uploads/extcal/';
+    $uploaddir_event = XOOPS_ROOT_PATH.'/uploads/extcal/';
+    $uploadurl_event = XOOPS_URL.'/uploads/extcal/';
     //$picture = '';
     for ($j = 1; $j < 3; ++$j) {
-        $delimg = @$REQUEST['delimg_' . $j . ''];
-        $delimg = isset($delimg) ? (int)$delimg : 0;
+        $delimg = @$REQUEST['delimg_'.$j.''];
+        $delimg = isset($delimg) ? (int) $delimg : 0;
         if (0 == $delimg && !empty($REQUEST['xoops_upload_file'][$j])) {
             $upload = new \XoopsMediaUploader($uploaddir_event, [
                 'image/gif',
@@ -75,15 +75,15 @@ 
                         $event_picture2 = $upload->getSavedFileName();
                     }
                 }
-            } elseif (!empty($REQUEST['file' . $j])) {
+            } elseif (!empty($REQUEST['file'.$j])) {
                 if (1 == $j) {
-                    $event_picture1 = $REQUEST['file' . $j];
+                    $event_picture1 = $REQUEST['file'.$j];
                 } elseif (2 == $j) {
-                    $event_picture2 = $REQUEST['file' . $j];
+                    $event_picture2 = $REQUEST['file'.$j];
                 }
             }
         } else {
-            $url_event = XOOPS_ROOT_PATH . '/uploads/extcal/' . $REQUEST['file' . $j];
+            $url_event = XOOPS_ROOT_PATH.'/uploads/extcal/'.$REQUEST['file'.$j];
             if (1 == $j) {
                 $event_picture1 = '';
             } elseif (2 == $j) {
@@ -179,17 +179,17 @@ 
         $select->addOption('', '');
     }
 
-    $select->addOption('year ASC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-    $select->addOption('year DESC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+    $select->addOption('year ASC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_ASC);
+    $select->addOption('year DESC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_DESC);
 
-    $select->addOption('month ASC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-    $select->addOption('month DESC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+    $select->addOption('month ASC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_ASC);
+    $select->addOption('month DESC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_DESC);
 
-    $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-    $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+    $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_ASC);
+    $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_DESC);
 
-    $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-    $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+    $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_ASC);
+    $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_DESC);
 
     return $select;
 }
@@ -303,7 +303,7 @@ 
 function echoDateArray($period)
 {
     foreach ($period as $dt) {
-        echo $dt->format("l Y-m-d H:i:s\n") . '<br>';
+        echo $dt->format("l Y-m-d H:i:s\n").'<br>';
     }
 }
 
@@ -319,7 +319,7 @@ 
     }
 
     $txt = print_r($t, true);
-    echo '<pre>Number of items: ' . count($t) . "<br>{$txt}</pre>";
+    echo '<pre>Number of items: '.count($t)."<br>{$txt}</pre>";
 }
 
 /*****************************************************************/
@@ -332,7 +332,7 @@ 
     if ('' != $msg) {
         echo "<hr>{$msg}<hr>";
     }
-    echo $line . '<br>';
+    echo $line.'<br>';
 }
 
 /*****************************************************************/
@@ -359,7 +359,7 @@ 
         echo "<hr>{$msg}<hr>";
     }
 
-    echo 'date --->' . $tsName . ' = ' . $ts . ' - ' . date('d-m-Y H:m:s', $ts) . '<br>';
+    echo 'date --->'.$tsName.' = '.$ts.' - '.date('d-m-Y H:m:s', $ts).'<br>';
 }
 
 /*****************************************************************/

include/onupdate.php

Spacing +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
 
 if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof XoopsUser)
     || !$GLOBALS['xoopsUser']->IsAdmin()) {
-    exit('Restricted access' . PHP_EOL);
+    exit('Restricted access'.PHP_EOL);
 }
 
 /**
@@ -75,7 +75,7 @@ 
         return true;
     }
 
-    $fld = XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname') . '/versions/';
+    $fld = XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname').'/versions/';
     $cls = 'Extcal_%1$s';
 
     $version = [
@@ -94,7 +94,7 @@ 
     foreach ($version as $key => $val) {
         if ($previousVersion < $val) {
             $name = sprintf($cls, $key);
-            $f    = $fld . $name . '.php';
+            $f    = $fld.$name.'.php';
             //ext_echo ("<hr>{$f}<hr>");
             if (is_readable($f)) {
                 echo "mise à jour version : {$key} = {$val}<br>";
@@ -118,14 +118,14 @@ 
         //delete old HTML templates
         if (count($configurator['templateFolders']) > 0) {
             foreach ($configurator['templateFolders'] as $folder) {
-                $templateFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $folder);
+                $templateFolder = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$folder);
                 if (is_dir($templateFolder)) {
                     $templateList = array_diff(scandir($templateFolder, SCANDIR_SORT_NONE), ['..', '.']);
                     foreach ($templateList as $k => $v) {
-                        $fileInfo = new SplFileInfo($templateFolder . $v);
+                        $fileInfo = new SplFileInfo($templateFolder.$v);
                         if ('html' === $fileInfo->getExtension() && 'index.html' !== $fileInfo->getFilename()) {
-                            if (file_exists($templateFolder . $v)) {
-                                unlink($templateFolder . $v);
+                            if (file_exists($templateFolder.$v)) {
+                                unlink($templateFolder.$v);
                             }
                         }
                     }
@@ -135,9 +135,9 @@ 
 
         //  ---  COPY blank.png FILES ---------------
         if (count($configurator['copyFiles']) > 0) {
-            $file = __DIR__ . '/../assets/images/blank.png';
+            $file = __DIR__.'/../assets/images/blank.png';
             foreach (array_keys($configurator['copyFiles']) as $i) {
-                $dest = $configurator['copyFiles'][$i] . '/blank.png';
+                $dest = $configurator['copyFiles'][$i].'/blank.png';
                 $utilityClass::copyFile($file, $dest);
             }
         }
@@ -146,7 +146,7 @@ 
         if (count($configurator['oldFiles']) > 0) {
             //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
             foreach (array_keys($configurator['oldFiles']) as $i) {
-                $tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator['oldFiles'][$i]);
+                $tempFile = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$configurator['oldFiles'][$i]);
                 if (is_file($tempFile)) {
                     unlink($tempFile);
                 }
@@ -156,14 +156,14 @@ 
         //---------------------
 
         //delete .html entries from the tpl table
-        $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+        $sql = 'DELETE FROM '.$xoopsDB->prefix('tplfile')." WHERE `tpl_module` = '".$module->getVar('dirname', 'n')."' AND `tpl_file` LIKE '%.html%'";
         $xoopsDB->queryF($sql);
 
         // Load class XoopsFile ====================
         xoops_load('XoopsFile');
 
         //delete /images directory ============
-        $imagesDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/images/');
+        $imagesDirectory = $GLOBALS['xoops']->path('modules/'.$module->getVar('dirname', 'n').'/images/');
         $folderHandler   = \XoopsFile::getHandler('folder', $imagesDirectory);
         $folderHandler->delete($imagesDirectory);
     }

include/agenda_fnc.php

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
 define('_EXTCAL_FORMAT_AGENDA_KEYD', 'Y-m-d');
 define('_EXTCAL_FORMAT_AGENDA_KEYT', 'H:i');
 
-require_once __DIR__ . '/constantes.php';
+require_once __DIR__.'/constantes.php';
 //require_once __DIR__ . '/../class/Utility.php';
 
 $moduleDirName = basename(dirname(__DIR__));
@@ -74,7 +74,7 @@ 
         $tj[$kj]['dayWeek'] = date('w', $tsj);
         $tj[$kj]['jour']    = $jName[$tj[$kj]['dayWeek']]; //date('l', $tsj);
         if (0 == $tj[$kj]['dayWeek']) {
-            $tj[$kj]['bg'] = "background='" . XOOPS_URL . "/modules/extcal/assets/images/trame.png'";
+            $tj[$kj]['bg'] = "background='".XOOPS_URL."/modules/extcal/assets/images/trame.png'";
         } else {
             $tj[$kj]['bg'] = '';
         }
@@ -154,16 +154,16 @@ 
         $kd     = date(_EXTCAL_FORMAT_AGENDA_KEYD, $ts);
         $hour   = date('H', $ts);
         $minute = date('i', $ts);
-        $m      = (int)($minute / $mPlage) * $mPlage;
+        $m      = (int) ($minute / $mPlage) * $mPlage;
         //      echo "--->{$minute} / {$mPlage} = {$m}<br>";
-        $sMinute = (($m < 10) ? '0' . $m : $m);
+        $sMinute = (($m < 10) ? '0'.$m : $m);
         //$kt = date(_EXTCAL_FORMAT_AGENDA_KEYT, $ts);
         if ($hour < $hStart) {
             $kt = $tk0;
         } elseif ($hour >= ($hEnd + 1)) {
             $kt = $tk1;
         } else {
-            $kt = $hour . ':' . $sMinute;
+            $kt = $hour.':'.$sMinute;
         }
 
         $tAgenda[$kt]['jours'][$kd]['events'][] = $e;
@@ -312,7 +312,7 @@ 
             return false;
     }
 
-    $file   = XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/' . $f;
+    $file   = XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/'.$f;
     $prefix = (defined($name) ? '_MI' : '_MD');
     require_once $file;
 }
@@ -452,7 +452,7 @@ 
     //    while (list($k, $v) = each($tNavBar)) {
     foreach ($tNavBar as $k => $v) {
         if (isset($tWeight[$k])) {
-            $ordre[] = (int)$tWeight[$k]; //ordre defini dans les option du module
+            $ordre[] = (int) $tWeight[$k]; //ordre defini dans les option du module
         } else {
             $ordre[] = $v['weight']; // ordre par defaut ddefini dans le tableau $tNavBar
         }

include/common.php

Spacing +29 added lines, -29 removed lines

@@ -19,7 +19,7 @@ 
 
 use XoopsModules\Extcal;
 
-include __DIR__ . '/../preloads/autoloader.php';
+include __DIR__.'/../preloads/autoloader.php';
 
 $moduleDirName      = basename(dirname(__DIR__));
 $moduleDirNameUpper = strtoupper($moduleDirName);
@@ -39,23 +39,23 @@ 
 ///** @var \XoopsPersistableObjectHandler $extcal_brokenHandler */
 //$extcal_brokenHandler  = new Extcal\Extcal_brokenHandler($db);
 
-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGES_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGES_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images/');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CAT_IMAGES_URL', XOOPS_UPLOAD_URL . ' / ' . constant($moduleDirNameUpper . '_DIRNAME') . '/images/category');
-    define($moduleDirNameUpper . '_CAT_IMAGES_PATH', XOOPS_UPLOAD_PATH . '/' . constant($moduleDirNameUpper . '_DIRNAME') . ' / images / category');
-    define($moduleDirNameUpper . '_CACHE_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {
+    define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));
+    define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_IMAGES_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');
+    define($moduleDirNameUpper.'_IMAGES_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images/');
+    define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');
+    define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png');
+    define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_CAT_IMAGES_URL', XOOPS_UPLOAD_URL.' / '.constant($moduleDirNameUpper.'_DIRNAME').'/images/category');
+    define($moduleDirNameUpper.'_CAT_IMAGES_PATH', XOOPS_UPLOAD_PATH.'/'.constant($moduleDirNameUpper.'_DIRNAME').' / images / category');
+    define($moduleDirNameUpper.'_CACHE_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);
 }
 
 $pathIcon16 = Xmf\Module\Admin::iconUrl('', 16);
@@ -64,15 +64,15 @@ 
 //$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+    'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
+    'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
+    'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
+    'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
+    'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
+    'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
+    'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
+    '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
+    '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
 ];
 
 $debug = false;
@@ -85,12 +85,12 @@ 
     $GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
-$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName);
+$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL.'/modules/'.$moduleDirName);
 // Local icons path
 if (is_object($helper->getModule())) {
     $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);
     $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }

include/config.php

Spacing +17 added lines, -17 removed lines

@@ -21,34 +21,34 @@ 
 $moduleDirNameUpper = strtoupper($moduleDirName);
 
 //Configurator
-return (object)[
-    'name'           => strtoupper($moduleDirName) . ' Module Configurator',
+return (object) [
+    'name'           => strtoupper($moduleDirName).' Module Configurator',
     'paths'          => [
         'dirname'    => $moduleDirName,
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+        'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+        'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+        'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+        'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
     ],
     'uploadFolders'  => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/thumbnails'
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/thumbnails'
     ],
     'copyBlankFiles' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/thumbnails'
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/thumbnails'
     ],
 
     'copyTestFolders' => [
         [
-            XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/images',
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
+            XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/images',
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images',
         ],
         [
-            XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/thumbs',
+            XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/thumbs',
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/thumbs',
         ]
     ],
 
@@ -70,6 +70,6 @@ 
         '/images',
     ],
     'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . XOOPS_URL . '/modules/' . $moduleDirName . '_AUTHOR_LOGOIMG' . '\' alt=\'XOOPS Project\' /></a>',
+                     <img src='" . XOOPS_URL.'/modules/'.$moduleDirName.'_AUTHOR_LOGOIMG'.'\' alt=\'XOOPS Project\' /></a>',
 
 ];

view_new-event.php

Spacing +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $params                                  = ['view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT];
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 /* ========================================================================== */
 //Extcal\Utility::echoArray($_GET);
@@ -16,7 +16,7 @@ 
 
 //exit;
 if (count($permHandler->getAuthorizedCat($xoopsUser, 'extcal_cat_submit')) > 0) {
-    include XOOPS_ROOT_PATH . '/header.php';
+    include XOOPS_ROOT_PATH.'/header.php';
 
     // Title of the page
     $xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
@@ -58,7 +58,7 @@ 
     $xoopsTpl->assign('lang', $lang);
     $xoopsTpl->assign('view', 'newevent');
 
-    include XOOPS_ROOT_PATH . '/footer.php';
+    include XOOPS_ROOT_PATH.'/footer.php';
 } else {
     redirect_header('index.php', 3);
 }

etablissement.php

Spacing +7 added lines, -7 removed lines

@@ -19,10 +19,10 @@ 
 
 use XoopsModules\Extcal;
 
-require_once __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+require_once __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $GLOBALS['xoopsOption']['template_main'] = 'extcal_etablissement.tpl';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 //require_once XOOPS_ROOT_PATH."/modules/extcal/class/etablissement.php";
 $etablissementHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_ETABLISSEMENT);
@@ -38,7 +38,7 @@ 
 $etablissement_exist = $etablissementHandler->getCount($criteria);
 
 if (0 == $etablissement_exist) {
-    redirect_header(XOOPS_URL . '/modules/extcal/index.php', 3, _NOPERM);
+    redirect_header(XOOPS_URL.'/modules/extcal/index.php', 3, _NOPERM);
 }
 
 $view_etablissement = $etablissementHandler->getEtablissement($etablissement_id, true);
@@ -80,12 +80,12 @@ 
 
 $date = mktime(0, 0, 0, date('m'), date('d'), date('y'));
 
-$requete = $xoopsDB->query('SELECT event_id, event_title, event_desc, event_picture1, event_start FROM ' . $xoopsDB->prefix('extcal_event') . " WHERE event_etablissement='" . $etablissement_id . "' AND event_start >='" . $date . "'");
+$requete = $xoopsDB->query('SELECT event_id, event_title, event_desc, event_picture1, event_start FROM '.$xoopsDB->prefix('extcal_event')." WHERE event_etablissement='".$etablissement_id."' AND event_start >='".$date."'");
 while ($donnees = $xoopsDB->fetchArray($requete)) {
     if ($donnees['event_desc'] > 210) {
         $event_desc = $donnees['event_desc'];
     } else {
-        $event_desc = substr($donnees['event_desc'], 0, 210) . '...';
+        $event_desc = substr($donnees['event_desc'], 0, 210).'...';
     }
     $xoopsTpl->append('events', [
         'event_picture1' => $donnees['event_picture1'],
@@ -98,4 +98,4 @@ 
 /** @var xos_opal_Theme $xoTheme */
 $xoTheme->addScript('browse.php?modules/extcal/assets/js/highslide.js');
 $xoTheme->addStylesheet('browse.php?modules/extcal/assets/js/highslide.css');
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

admin/event.php

Switch Indentation +303 added lines, -303 removed lines

@@ -72,177 +72,195 @@ 
 
 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_etablissement' => $_POST['event_etablissement'],
-            'dohtml'              => $extcalConfig['allow_html'],
-            'event_icone'         => $_POST['event_icone'],
-        ];
-
-        // Event edited
-        if (isset($_POST['event_id'])) {
-            if (!$eventHandler->modifyEvent($_POST['event_id'], $data)) {
-                redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDIT_FAILED, false);
+        case 'enreg':
+
+            $eventHandler = 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_etablissement' => $_POST['event_etablissement'],
+                'dohtml'              => $extcalConfig['allow_html'],
+                'event_icone'         => $_POST['event_icone'],
+            ];
+
+            // Event edited
+            if (isset($_POST['event_id'])) {
+                if (!$eventHandler->modifyEvent($_POST['event_id'], $data)) {
+                    redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDIT_FAILED, false);
+                } else {
+                    $fileHandler->createFile((int)$_POST['event_id']);
+                    redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDITED, false);
+                }
+
+                // New event
             } else {
-                $fileHandler->createFile((int)$_POST['event_id']);
-                redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDITED, false);
+                $notificationHandler = xoops_getHandler('notification');
+                /** @var 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 {
-            $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 (isset($_POST['confirm'])) {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            if (isset($_POST['confirm'])) {
+                if (!$GLOBALS['xoopsSecurity']->check()) {
+                    redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+                }
+                //             $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+                //             $eventHandler->deleteEvent($_POST['event_id']);
+                deleteEvents($_POST['event_id']);
+                redirect_header('event.php', 3, _AM_EXTCAL_EVENT_DELETED, false);
+            } else {
+                xoops_cp_header();
+                // @author      Gregory Mage (Aka Mage)
+                //***************************************************************************************
+                //require_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
+                $adminObject = \Xmf\Module\Admin::getInstance();
+                $adminObject->displayNavigation(basename(__FILE__));
+                //***************************************************************************************
+
+                $hiddens = ['event_id' => $_GET['event_id'], 'form_delete' => '', 'confirm' => 1];
+                xoops_confirm($hiddens, 'event.php?op=delete', _AM_EXTCAL_CONFIRM_DELETE_EVENT, _DELETE, 'event.php');
+
+                xoops_cp_footer();
             }
-            //             $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-            //             $eventHandler->deleteEvent($_POST['event_id']);
-            deleteEvents($_POST['event_id']);
-            redirect_header('event.php', 3, _AM_EXTCAL_EVENT_DELETED, false);
-        } else {
+
+            break;
+
+        case 'deleteSelection':
+
             xoops_cp_header();
             // @author      Gregory Mage (Aka Mage)
             //***************************************************************************************
@@ -250,185 +268,167 @@ 
             $adminObject = \Xmf\Module\Admin::getInstance();
             $adminObject->displayNavigation(basename(__FILE__));
             //***************************************************************************************
+            if (isset($_POST['deleteSelection'][0])) {
+                $msg = _AM_EXTCAL_CONFIRM_DELETE_ALL;
+                $ids = array_keys($_POST['deleteAllEvents']);
+            } else {
+                $msg = _AM_EXTCAL_CONFIRM_DELETE_SELECTION;
+                $ids = array_keys($_POST['deleteEvents']);
+            }
 
-            $hiddens = ['event_id' => $_GET['event_id'], 'form_delete' => '', 'confirm' => 1];
-            xoops_confirm($hiddens, 'event.php?op=delete', _AM_EXTCAL_CONFIRM_DELETE_EVENT, _DELETE, 'event.php');
+            //           $msg = ((isset($_POST['deleteSelection'][0])) ? _AM_EXTCAL_CONFIRM_DELETE_ALL : _AM_EXTCAL_CONFIRM_DELETE_SELECTION);
+            //           $ids = array_keys($_POST['deleteEvents']);
+            $ids = implode(',', $ids);
+            //echo $ids.'<br>';
+            $hiddens = ['event_ids' => $ids, 'form_delete' => '', 'confirm' => 1];
+            //$hiddens = array('event_ids' => $_POST['deleteEvents'], 'form_delete' => '', 'confirm' => 1);
+            xoops_confirm($hiddens, 'event.php?op=deleteSelectionOK', $msg, _DELETE, 'event.php');
 
             xoops_cp_footer();
-        }
 
-        break;
-
-    case 'deleteSelection':
-
-        xoops_cp_header();
-        // @author      Gregory Mage (Aka Mage)
-        //***************************************************************************************
-        //require_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        //***************************************************************************************
-        if (isset($_POST['deleteSelection'][0])) {
-            $msg = _AM_EXTCAL_CONFIRM_DELETE_ALL;
-            $ids = array_keys($_POST['deleteAllEvents']);
-        } else {
-            $msg = _AM_EXTCAL_CONFIRM_DELETE_SELECTION;
-            $ids = array_keys($_POST['deleteEvents']);
-        }
+            break;
 
-        //           $msg = ((isset($_POST['deleteSelection'][0])) ? _AM_EXTCAL_CONFIRM_DELETE_ALL : _AM_EXTCAL_CONFIRM_DELETE_SELECTION);
-        //           $ids = array_keys($_POST['deleteEvents']);
-        $ids = implode(',', $ids);
-        //echo $ids.'<br>';
-        $hiddens = ['event_ids' => $ids, 'form_delete' => '', 'confirm' => 1];
-        //$hiddens = array('event_ids' => $_POST['deleteEvents'], 'form_delete' => '', 'confirm' => 1);
-        xoops_confirm($hiddens, 'event.php?op=deleteSelectionOK', $msg, _DELETE, 'event.php');
-
-        xoops_cp_footer();
-
-        break;
-
-    case 'deleteSelectionOK':
-        //-----------------------------------------
-        // $t = print_r($_GET,true);
-        // echo "<hr><pre>{$t}</pre><hr>";
-        //
-        // $t = print_r($_POST,true);
-        // echo "<hr><pre>{$t}</pre><hr>";
-        // exit;
-        //-----------------------------------------
-
-        if (isset($_POST['deleteSelection'][0])) {
-        } else {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-            }
+        case 'deleteSelectionOK':
+            //-----------------------------------------
+            // $t = print_r($_GET,true);
+            // echo "<hr><pre>{$t}</pre><hr>";
+            //
+            // $t = print_r($_POST,true);
+            // echo "<hr><pre>{$t}</pre><hr>";
+            // exit;
+            //-----------------------------------------
 
-            deleteEvents($_POST['event_ids']);
+            if (isset($_POST['deleteSelection'][0])) {
+            } else {
+                if (!$GLOBALS['xoopsSecurity']->check()) {
+                    redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+                }
 
-            redirect_header('event.php', 3, _AM_EXTCAL_EVENTS_DELETED, false);
-        }
+                deleteEvents($_POST['event_ids']);
 
-        break;
+                redirect_header('event.php', 3, _AM_EXTCAL_EVENTS_DELETED, false);
+            }
 
-    case 'default':
-    default:
+            break;
 
-        //global $extcalConfig;
-        $extcalConfig      = Extcal\Config::getHandler();
-        $xoopsModuleConfig = $extcalConfig->getModuleConfig();
+        case 'default':
+        default:
 
-        $start          = isset($_GET['start']) ? $_GET['start'] : 0;
-        $nbEventsByPage = $xoopsModuleConfig['nbEventsByPage'];
+            //global $extcalConfig;
+            $extcalConfig      = Extcal\Config::getHandler();
+            $xoopsModuleConfig = $extcalConfig->getModuleConfig();
 
-        xoops_cp_header();
-        // @author      Gregory Mage (Aka Mage)
-        //***************************************************************************************
+            $start          = isset($_GET['start']) ? $_GET['start'] : 0;
+            $nbEventsByPage = $xoopsModuleConfig['nbEventsByPage'];
 
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        //***************************************************************************************
+            xoops_cp_header();
+            // @author      Gregory Mage (Aka Mage)
+            //***************************************************************************************
 
-        $eventHandler = 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['Category']['cat_id'] . '&form_modify' . '>' . $event['Category']['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['Category']['cat_id'] . '&form_modify' . '>' . $event['Category']['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;
 }

Spacing +43 added lines, -43 removed lines

@@ -19,11 +19,11 @@ 
 
 use XoopsModules\Extcal;
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
 //require_once __DIR__ . '/../class/form/extcalform.php';
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 //require_once __DIR__ . '/../class/Utility.php';
 
 $gepeto = array_merge($_GET, $_POST);
@@ -52,15 +52,15 @@ 
     //    while (list($k, $t) = each($rst)) {
     foreach ($rst as $k => $t) {
         if ('' != $t['event_picture1']) {
-            $f = XOOPS_ROOT_PATH . '/uploads/extcal/' . $t['event_picture1'];
+            $f = XOOPS_ROOT_PATH.'/uploads/extcal/'.$t['event_picture1'];
             unlink($f);
-            echo $f . '<br>';
+            echo $f.'<br>';
         }
 
         if ('' != $t['event_picture2']) {
-            $f = XOOPS_ROOT_PATH . '/uploads/extcal/' . $t['event_picture1'];
+            $f = XOOPS_ROOT_PATH.'/uploads/extcal/'.$t['event_picture1'];
             unlink($f);
-            echo $f . '<br>';
+            echo $f.'<br>';
         }
     }
 
@@ -122,7 +122,7 @@ 
             if (!$eventHandler->modifyEvent($_POST['event_id'], $data)) {
                 redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDIT_FAILED, false);
             } else {
-                $fileHandler->createFile((int)$_POST['event_id']);
+                $fileHandler->createFile((int) $_POST['event_id']);
                 redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDITED, false);
             }
 
@@ -194,7 +194,7 @@ 
         $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();
@@ -219,8 +219,8 @@ 
             $data[$key] = $val['value'];
         }
 
-        $data['event_id']    = 0;
-        $data['event_title'] .= ' (' . _AM_EXTCAL_CLONE_OF . $eventId . ')';
+        $data['event_id'] = 0;
+        $data['event_title'] .= ' ('._AM_EXTCAL_CLONE_OF.$eventId.')';
 
         $newEvent = $eventHandler->create();
         $newEvent->setVars($data);
@@ -236,7 +236,7 @@ 
 
         if (isset($_POST['confirm'])) {
             if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+                redirect_header('index.php', 3, _NOPERM.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
             }
             //             $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
             //             $eventHandler->deleteEvent($_POST['event_id']);
@@ -301,7 +301,7 @@ 
         if (isset($_POST['deleteSelection'][0])) {
         } else {
             if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+                redirect_header('index.php', 3, _NOPERM.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
             }
 
             deleteEvents($_POST['event_ids']);
@@ -333,32 +333,32 @@ 
         $events       = $eventHandler->objectToArray($eventHandler->getNewEvent($start, $nbEventsByPage, 0, true), ['cat_id']);
         $eventHandler->formatEventsDate($events, _SHORTDATESTRING);
 
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_APPROVED_EVENT.'</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         //echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/assets/images/action/edit.png' .' '.'style=vertical-align:middle;>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT . '<br>';
         //echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/assets/images/action/delete.png'. ' '."style=vertical-align:middle;>&nbsp;&nbsp;". _AM_EXTCAL_INFO_DELETE;
 
-        echo '<img src=' . $pathIcon16 . '/edit.png' . ' ' . 'style=vertical-align:middle;>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT . '<br>';
-        echo '<img src=' . $pathIcon16 . '/delete.png' . ' ' . 'style=vertical-align:middle;>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_DELETE . '<br>';
+        echo '<img src='.$pathIcon16.'/edit.png'.' '.'style=vertical-align:middle;>&nbsp;&nbsp;'._AM_EXTCAL_INFO_EDIT.'<br>';
+        echo '<img src='.$pathIcon16.'/delete.png'.' '.'style=vertical-align:middle;>&nbsp;&nbsp;'._AM_EXTCAL_INFO_DELETE.'<br>';
 
         echo '</fieldset><br>';
 
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _MD_EXTCAL_SUBMITED_EVENT . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._MD_EXTCAL_SUBMITED_EVENT.'</legend>';
 
         echo '<form method="POST" action="event.php">';
         echo '<input type="hidden" name="op" value="deleteSelection">';
 
         echo '<table class="outer" style="width:100%;">';
         echo '<tr style="text-align:center;">';
-        echo '<th>' . _AM_EXTCAL_DELETE . '</th>';
+        echo '<th>'._AM_EXTCAL_DELETE.'</th>';
         echo '<th>#</th>';
-        echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
-        echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
-        echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
-        echo '<th>' . _AM_EXTCAL_END_DATE . '</th>';
-        echo '<th>' . _AM_EXTCAL_RECURRENT . '</th>';
-        echo '<th>' . _AM_EXTCAL_START_RULES . '</th>';
-        echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
+        echo '<th>'._AM_EXTCAL_CATEGORY.'</th>';
+        echo '<th>'._AM_EXTCAL_TITLE.'</th>';
+        echo '<th>'._AM_EXTCAL_START_DATE.'</th>';
+        echo '<th>'._AM_EXTCAL_END_DATE.'</th>';
+        echo '<th>'._AM_EXTCAL_RECURRENT.'</th>';
+        echo '<th>'._AM_EXTCAL_START_RULES.'</th>';
+        echo '<th>'._AM_EXTCAL_ACTION.'</th>';
 
         echo '</tr>';
 
@@ -366,15 +366,15 @@ 
             $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['Category']['cat_id'] . '&form_modify' . '>' . $event['Category']['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['Category']['cat_id'].'&form_modify'.'>'.$event['Category']['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>';
@@ -382,18 +382,18 @@ 
                 //                     echo '<td>' . $event['formated_event_start'] . '</td>';
                 //                 }
 
-                echo "<td align = 'center' width='10%'>" . $event['formated_event_start'] . '</td>';
-                echo "<td align = 'center' width='10%'>" . $event['formated_event_end'] . '</td>';
-                echo '<td align="center">' . ((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>';
@@ -407,13 +407,13 @@ 
 
             echo '<td colspan="2" style="text-align: right;">';
 
-            echo '<input type="submit" value="' . _AM_EXTCAL_DELETE_ALL . '" name="deleteSelection[0]">';
-            echo '<input type="submit" value="' . _AM_EXTCAL_DELETE_SELECTION . '" name="deleteSelection[1]">';
+            echo '<input type="submit" value="'._AM_EXTCAL_DELETE_ALL.'" name="deleteSelection[0]">';
+            echo '<input type="submit" value="'._AM_EXTCAL_DELETE_SELECTION.'" name="deleteSelection[1]">';
 
             echo '</td>';
             echo '</tr>';
         } else {
-            echo '<tr><td colspan="5">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
+            echo '<tr><td colspan="5">'._AM_EXTCAL_NO_PENDING_EVENT.'</td></tr>';
         }
         echo '</table>';
         echo '</form>';
@@ -421,14 +421,14 @@ 
         echo '</fieldset>';
         echo '</fieldset><br><br>';
         //Fin de la liste des evennement -------------------------------------
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _MD_EXTCAL_SUBMIT_EVENT . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._MD_EXTCAL_SUBMIT_EVENT.'</legend>';
 
         $form = $eventHandler->getEventForm('admin');
         $form->display();
 
         echo '</fieldset>';
 
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
 
         break;
 }

admin/etablissement.php

Spacing +33 added lines, -33 removed lines

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