mambax7 / extcal

admin/cat.php

Spacing +21 added lines, -21 removed lines

@@ -20,11 +20,11 @@ 
 use Xmf\Request;
 use XoopsModules\Extcal;
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-include __DIR__ . '/../../../class/xoopsformloader.php';
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+include __DIR__.'/../../../class/xoopsformloader.php';
+require_once __DIR__.'/admin_header.php';
 //require_once __DIR__ . '/../class/Utility.php';
-require_once __DIR__ . '/../include/constantes.php';
+require_once __DIR__.'/../include/constantes.php';
 
 //$gepeto = array_merge($_GET, $_POST);
 //while (list($key, $value) = each($gepeto)) {
@@ -36,7 +36,7 @@ 
 //    $op = '';
 //}
 $op = 'list';
-if(Request::hasVar('op', 'GET' )) {
+if (Request::hasVar('op', 'GET')) {
     $op = Request::getString('op', '');
     $cat_id = Request::getInt('cat_id', 0);
 }
@@ -91,12 +91,12 @@ 
         //$cat        = $catHandler->getCat($cat_id, true);
 
         $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), true);
-        $form->addElement( new \XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', ''), false);
-        $form->addElement( new \XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, 0), false);
-        $form->addElement( new \XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#FF0000'));
+        $form->addElement(new \XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255), true);
+        $form->addElement(new \XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', ''), false);
+        $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 = __DIR__ . '/../assets/css/images';
+        $file_path = __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'), '');
@@ -104,11 +104,11 @@ 
         $xfIcones->addOptionArray($tf);
         $form->addElement($xfIcones, false);
 
-        $form->addElement( new \XoopsFormButton('', 'form_submit', _SUBMIT, 'submit'), false);
+        $form->addElement(new \XoopsFormButton('', 'form_submit', _SUBMIT, 'submit'), false);
 
         $form->display();
 
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 
     case 'edit':
@@ -121,23 +121,23 @@ 
 //            $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 \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')));
 
-        $file_path = __DIR__ . '/../assets/css/images';
+        $file_path = __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'), '');
         $xfIcones->addOptionArray($tf);
         $form->addElement($xfIcones, false);
 
-        $form->addElement( new \XoopsFormHidden('cat_id', $cat->getVar('cat_id')), false);
-        $form->addElement( new \XoopsFormButton('', 'form_submit', _SUBMIT, 'submit'), false);
+        $form->addElement(new \XoopsFormHidden('cat_id', $cat->getVar('cat_id')), false);
+        $form->addElement(new \XoopsFormButton('', 'form_submit', _SUBMIT, 'submit'), false);
         $form->display();
 
         echo '</fieldset>';
@@ -285,6 +285,6 @@ 
         //$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;
 }

admin/etablissement.php

Spacing +34 added lines, -34 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
@@ -80,7 +80,7 @@ 
         $adminObject->displayNavigation(basename(__FILE__));
         //***************************************************************************************
 
-        $criteria =  new \CriteriaCompo();
+        $criteria = new \CriteriaCompo();
         if (isset($_REQUEST['limit'])) {
             $criteria->setLimit($_REQUEST['limit']);
             $limit = $_REQUEST['limit'];
@@ -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';

admin/event.php

Spacing +45 added lines, -45 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);
@@ -44,7 +44,7 @@ 
 {
     /** @var EventHandler $eventHandler */
     $eventHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
-    $criteria     =  new \Criteria('event_id', "($ids)", 'IN');
+    $criteria     = new \Criteria('event_id', "($ids)", 'IN');
 
     //Supression des images
     $rst = $eventHandler->getAllEvents($criteria);
@@ -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);
             }
 
@@ -131,7 +131,7 @@ 
             $notificationHandler = xoops_getHandler('notification');
             /** @var Extcal\CategoryHandler $catHandler */
 //            $catHandler = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
-            $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+            $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
 
             $data['event_submitter']  = $xoopsUser ? $xoopsUser->getVar('uid') : 0;
             $data['event_submitdate'] = time();
@@ -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/permissions.php

Spacing +28 added lines, -28 removed lines

@@ -17,9 +17,9 @@ 
  * @author       XOOPS Development Team,
  */
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php';
+require_once __DIR__.'/admin_header.php';
 
 $step = 'default';
 if (isset($_POST['step'])) {
@@ -35,9 +35,9 @@ 
         $groupPermissionHandler = xoops_getHandler('groupperm');
 
         // Delete old public mask
-        $criteria =  new \CriteriaCompo();
-        $criteria->add( new \Criteria('gperm_name', 'extcal_perm_mask'));
-        $criteria->add( new \Criteria('gperm_modid', $moduleId));
+        $criteria = new \CriteriaCompo();
+        $criteria->add(new \Criteria('gperm_name', 'extcal_perm_mask'));
+        $criteria->add(new \Criteria('gperm_modid', $moduleId));
         $groupPermissionHandler->deleteAll($criteria);
 
         foreach ($_POST['perms']['extcal_perm_mask']['group'] as $groupId => $perms) {
@@ -95,35 +95,35 @@ 
         echo '<fieldset id="defaultBookmark"><legend><a href="#defaultBookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\'default\'); toggleIcon(\'defaultIcon\');"><img id="defaultIcon" src="../assets/images/icons/minus.gif">&nbsp;'
              . _AM_EXTCAL_PUBLIC_PERM_MASK
              . '</a></legend><div id="default">';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         echo _AM_EXTCAL_PUBLIC_PERM_MASK_INFO;
         echo '</fieldset><br>';
         echo '<table class="outer" style="width:100%;">';
         echo '<form method="post" action="permissions.php">';
         echo '<tr>';
-        echo '<th colspan="8" style="text-align:center;">' . _AM_EXTCAL_PUBLIC_PERM_MASK . '</th>';
+        echo '<th colspan="8" style="text-align:center;">'._AM_EXTCAL_PUBLIC_PERM_MASK.'</th>';
         echo '</tr>';
         echo '<tr>';
-        echo '<td class="head" style="text-align:center;">' . _AM_EXTCAL_GROUP_NAME . '</td>';
-        echo '<td class="head" style="text-align:center;">' . _AM_EXTCAL_CAN_VIEW . '</td>';
-        echo '<td class="head" style="text-align:center;">' . _AM_EXTCAL_CAN_SUBMIT . '</td>';
-        echo '<td class="head" style="text-align:center;">' . _AM_EXTCAL_AUTO_APPROVE . '</td>';
-        echo '<td class="head" style="text-align:center;">' . _AM_EXTCAL_CAN_EDIT . '</td>';
+        echo '<td class="head" style="text-align:center;">'._AM_EXTCAL_GROUP_NAME.'</td>';
+        echo '<td class="head" style="text-align:center;">'._AM_EXTCAL_CAN_VIEW.'</td>';
+        echo '<td class="head" style="text-align:center;">'._AM_EXTCAL_CAN_SUBMIT.'</td>';
+        echo '<td class="head" style="text-align:center;">'._AM_EXTCAL_AUTO_APPROVE.'</td>';
+        echo '<td class="head" style="text-align:center;">'._AM_EXTCAL_CAN_EDIT.'</td>';
         echo '</tr>';
         $i = 0;
         foreach ($glist as $k => $v) {
             $style = (0 == ++$i % 2) ? 'odd' : 'even';
             echo '<tr>';
-            echo '<td class="' . $style . '">' . $v . '</td>';
-            echo '<td class="' . $style . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group][' . $k . '][1]" type="checkbox"' . getChecked($viewGroup, $k) . '></td>';
-            echo '<td class="' . $style . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group][' . $k . '][2]" type="checkbox"' . getChecked($submitGroup, $k) . '></td>';
-            echo '<td class="' . $style . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group][' . $k . '][4]" type="checkbox"' . getChecked($autoApproveGroup, $k) . '></td>';
-            echo '<td class="' . $style . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group][' . $k . '][8]" type="checkbox"' . getChecked($editGroup, $k) . '></td>';
+            echo '<td class="'.$style.'">'.$v.'</td>';
+            echo '<td class="'.$style.'" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['.$k.'][1]" type="checkbox"'.getChecked($viewGroup, $k).'></td>';
+            echo '<td class="'.$style.'" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['.$k.'][2]" type="checkbox"'.getChecked($submitGroup, $k).'></td>';
+            echo '<td class="'.$style.'" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['.$k.'][4]" type="checkbox"'.getChecked($autoApproveGroup, $k).'></td>';
+            echo '<td class="'.$style.'" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['.$k.'][8]" type="checkbox"'.getChecked($editGroup, $k).'></td>';
             echo '</tr>';
         }
         echo '<input type="hidden" name="type" value="public">';
         echo '<input type="hidden" name="step" value="enreg">';
-        echo '<tr><td colspan="8" style="text-align:center;" class="head"><input type="submit" value="' . _SUBMIT . '"></td></tr></form>';
+        echo '<tr><td colspan="8" style="text-align:center;" class="head"><input type="submit" value="'._SUBMIT.'"></td></tr></form>';
         echo '</table><br>';
 
         echo '</div></fieldset><br>';
@@ -158,12 +158,12 @@ 
              . '</a></legend><div id="'
              . $permName
              . '">';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         echo $permDesc;
         echo '</fieldset>';
 
         if ($catHandler->getCount()) {
-            echo $form->render() . '<br>';
+            echo $form->render().'<br>';
         } else {
             redirect_header('cat.php', 2, _AM_EXTCAL_NOPERMSSET, false);
         }
@@ -196,11 +196,11 @@ 
              . '</a></legend><div id="'
              . $permName
              . '">';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         echo $permDesc;
         echo '</fieldset>';
         if ($catHandler->getCount()) {
-            echo $form->render() . '<br>';
+            echo $form->render().'<br>';
         } else {
             redirect_header('cat.php', 2, _AM_EXTCAL_NOPERMSSET, false);
         }
@@ -233,11 +233,11 @@ 
              . '</a></legend><div id="'
              . $permName
              . '">';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         echo $permDesc;
         echo '</fieldset>';
         if ($catHandler->getCount()) {
-            echo $form->render() . '<br>';
+            echo $form->render().'<br>';
         } else {
             redirect_header('cat.php', 2, _AM_EXTCAL_NOPERMSSET, false);
         }
@@ -270,11 +270,11 @@ 
              . '</a></legend><div id="'
              . $permName
              . '">';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         echo $permDesc;
         echo '</fieldset>';
         if ($catHandler->getCount()) {
-            echo $form->render() . '<br>';
+            echo $form->render().'<br>';
         } else {
             redirect_header('cat.php', 2, _AM_EXTCAL_NOPERMSSET, false);
         }
@@ -291,7 +291,7 @@ 
         echo 'toggle(\'extcal_cat_edit\'); toggleIcon (\'extcal_cat_editIcon\');';
         echo '</script>';
 
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
 
         break;
 

admin/index.php

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 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 $utilityClass */
@@ -39,12 +39,12 @@ 
 
 if ($helper->getConfig('displaySampleButton')) {
     xoops_loadLanguage('admin/modulesadmin', 'system');
-    require_once __DIR__ . '/../testdata/index.php';
+    require_once __DIR__.'/../testdata/index.php';
     $adminObject->addItemButton(_AM_SYSTEM_MODULES_INSTALL_TESTDATA, '__DIR__ . /../../testdata/index.php?op=load', 'add');
     $adminObject->displayButton('left', '');
 }
 
-require_once __DIR__ . '/../testdata/index.php';
+require_once __DIR__.'/../testdata/index.php';
 $adminObject->addItemButton(AM_XOOPSTUBE_ADD_SAMPLEDATA, '__DIR__ . /../../testdata/index.php?op=load', 'add');
 $adminObject->displayButton('left', '');
 
@@ -55,4 +55,4 @@ 
 echo $utility::getServerStats();
 
 //codeDump(__FILE__);
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/menu.php

Spacing +6 added lines, -6 removed lines

@@ -29,33 +29,33 @@
 $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_ETABLISSEMENTS,
     'link'  => 'admin/etablissement.php',
-    'icon'  => $pathModIcon32 . '/etablissement.png'
+    'icon'  => $pathModIcon32.'/etablissement.png'
 ];
 $adminmenu[] = [
     'title' => _MI_EXTCAL_PERMISSIONS,
     'link'  => 'admin/permissions.php',
-    'icon'  => $pathIcon32 . '/permissions.png'
+    'icon'  => $pathIcon32.'/permissions.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_EXTCAL_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png'
+    'icon'  => $pathIcon32.'/about.png'
 ];

view_agenda-day.php

Spacing +14 added lines, -14 removed lines

@@ -2,18 +2,18 @@ 
 
 use XoopsModules\Extcal;
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $params                                  = ['view' => _EXTCAL_NAV_AGENDA_DAY, 'file' => _EXTCAL_FILE_AGENDA_DAY];
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 /* ========================================================================== */
 //recupe des variables get
-$year  = isset($_GET['year']) ? (int)$_GET['year'] : date('Y');
-$month = isset($_GET['month']) ? (int)$_GET['month'] : date('n');
-$day   = isset($_GET['day']) ? (int)$_GET['day'] : date('j');
-$cat   = isset($_GET['cat']) ? (int)$_GET['cat'] : 0;
+$year  = isset($_GET['year']) ? (int) $_GET['year'] : date('Y');
+$month = isset($_GET['month']) ? (int) $_GET['month'] : date('n');
+$day   = isset($_GET['day']) ? (int) $_GET['day'] : date('j');
+$cat   = isset($_GET['cat']) ? (int) $_GET['cat'] : 0;
 /* ========================================================================== */
 
 //echo "{$params['view']}-{$year}-{$month}-{$day}<hr>extcal_{$params['view']}.html<br>";
@@ -23,7 +23,7 @@ 
 $form->addElement(getListMonths($month));
 $form->addElement(getListDays($day));
 $form->addElement(Extcal\Utility::getListCategories($cat));
-$form->addElement( new \XoopsFormButton('', '', _SUBMIT, 'submit'));
+$form->addElement(new \XoopsFormButton('', '', _SUBMIT, 'submit'));
 
 //------------------------------------------------------
 // Assigning the form to the template
@@ -46,7 +46,7 @@ 
     'nbJours'      => $nbJours,
     'externalKeys' => 'cat_id',
 ];
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 $eventsArray = $events;
 $startDay    = mktime(0, 0, 0, $month, $day, $year);
@@ -101,21 +101,21 @@ 
 
 $navig = [
     'prev' => [
-        'uri'  => 'year=' . $pDayCalObj->thisYear() . '&amp;month=' . $pDayCalObj->thisMonth() . '&amp;day=' . $pDayCalObj->thisDay(),
+        'uri'  => 'year='.$pDayCalObj->thisYear().'&amp;month='.$pDayCalObj->thisMonth().'&amp;day='.$pDayCalObj->thisDay(),
         'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_day'], $pDayCalObj->getTimestamp()),
     ],
     'this' => [
-        'uri'  => 'year=' . $dayCalObj->thisYear() . '&amp;month=' . $dayCalObj->thisMonth() . '&amp;day=' . $dayCalObj->thisDay(),
+        'uri'  => 'year='.$dayCalObj->thisYear().'&amp;month='.$dayCalObj->thisMonth().'&amp;day='.$dayCalObj->thisDay(),
         'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_day'], $dayCalObj->getTimestamp()),
     ],
     'next' => [
-        'uri'  => 'year=' . $nDayCalObj->thisYear() . '&amp;month=' . $nDayCalObj->thisMonth() . '&amp;day=' . $nDayCalObj->thisDay(),
+        'uri'  => 'year='.$nDayCalObj->thisYear().'&amp;month='.$nDayCalObj->thisMonth().'&amp;day='.$nDayCalObj->thisDay(),
         'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_day'], $nDayCalObj->getTimestamp()),
     ],
 ];
 
 // Title of the page
-$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']);
+$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']);
 
 // Assigning navig data to the template
 $xoopsTpl->assign('navig', $navig);
@@ -156,4 +156,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'agendaday');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

print.php

Spacing +80 added lines, -80 removed lines

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

view_agenda-week.php

Spacing +16 added lines, -16 removed lines

@@ -2,23 +2,23 @@ 
 
 use XoopsModules\Extcal;
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $params                                  = ['view' => _EXTCAL_NAV_AGENDA_WEEK, 'file' => _EXTCAL_FILE_AGENDA_WEEK];
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 /* ========================================================================== */
-$year  = isset($_GET['year']) ? (int)$_GET['year'] : date('Y');
-$month = isset($_GET['month']) ? (int)$_GET['month'] : date('n');
-$day   = isset($_GET['day']) ? (int)$_GET['day'] : date('j');
-$cat   = isset($_GET['cat']) ? (int)$_GET['cat'] : 0;
+$year  = isset($_GET['year']) ? (int) $_GET['year'] : date('Y');
+$month = isset($_GET['month']) ? (int) $_GET['month'] : date('n');
+$day   = isset($_GET['day']) ? (int) $_GET['day'] : date('j');
+$cat   = isset($_GET['cat']) ? (int) $_GET['cat'] : 0;
 
 // Validate the date (day, month and year)
 $dayTS = mktime(0, 0, 0, $month, $day, $year);
 //$offset = date('w', $dayTS) - $xoopsModuleConfig['week_start_day'];
 $offset = date('w', $dayTS) + 7 - $xoopsModuleConfig['week_start_day'] < 7 ? date('w', $dayTS) + 7 - $xoopsModuleConfig['week_start_day'] : 0;
-$dayTS  -= ($offset * _EXTCAL_TS_DAY);
+$dayTS -= ($offset * _EXTCAL_TS_DAY);
 $year   = date('Y', $dayTS);
 $month  = date('n', $dayTS);
 $day    = date('j', $dayTS);
@@ -28,7 +28,7 @@ 
 $form->addElement(getListMonths($month));
 $form->addElement(getListDays($day));
 $form->addElement(Extcal\Utility::getListCategories($cat));
-$form->addElement( new \XoopsFormButton('', '', _SUBMIT, 'submit'));
+$form->addElement(new \XoopsFormButton('', '', _SUBMIT, 'submit'));
 
 // Assigning the form to the template
 $form->assign($xoopsTpl);
@@ -51,7 +51,7 @@ 
     'nbJours'      => $nbJours,
     'externalKeys' => 'cat_id',
 ];
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 $eventsArray = $events;
 // Formating date
@@ -83,7 +83,7 @@ 
 //-------------------------------------------------------------------
 
 //$params['colJourWidth'] = (int)((((500-50)/$nbJours)/500*100)+.5);
-$params['colJourWidth'] = (int)((((500 - 50) / $nbJours) / 500 * 100) + .6);
+$params['colJourWidth'] = (int) ((((500 - 50) / $nbJours) / 500 * 100) + .6);
 //  echo "agenda_week : {$dayTS}<br>";
 $tAgenda = agenda_getEvents($eventsArray, $dayTS, $hStart, $hEnd, $mTranche, $nbJours);
 //$exp = print_r($eventsArray, true);
@@ -105,21 +105,21 @@ 
 
 $navig = [
     'prev' => [
-        'uri'  => 'year=' . $pWeekCalObj->thisYear() . '&amp;month=' . $pWeekCalObj->thisMonth() . '&amp;day=' . $pWeekCalObj->thisDay(),
+        'uri'  => 'year='.$pWeekCalObj->thisYear().'&amp;month='.$pWeekCalObj->thisMonth().'&amp;day='.$pWeekCalObj->thisDay(),
         'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_week'], $pWeekCalObj->getTimestamp()),
     ],
     'this' => [
-        'uri'  => 'year=' . $weekCalObj->thisYear() . '&amp;month=' . $weekCalObj->thisMonth() . '&amp;day=' . $weekCalObj->thisDay(),
+        'uri'  => 'year='.$weekCalObj->thisYear().'&amp;month='.$weekCalObj->thisMonth().'&amp;day='.$weekCalObj->thisDay(),
         'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_week'], $weekCalObj->getTimestamp()),
     ],
     'next' => [
-        'uri'  => 'year=' . $nWeekCalObj->thisYear() . '&amp;month=' . $nWeekCalObj->thisMonth() . '&amp;day=' . $nWeekCalObj->thisDay(),
+        'uri'  => 'year='.$nWeekCalObj->thisYear().'&amp;month='.$nWeekCalObj->thisMonth().'&amp;day='.$nWeekCalObj->thisDay(),
         'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_week'], $nWeekCalObj->getTimestamp()),
     ],
 ];
 
 // Title of the page
-$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']);
+$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']);
 
 // Assigning navig data to the template
 $xoopsTpl->assign('navig', $navig);
@@ -160,4 +160,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'agendaweek');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';