mambax7 / extcal

admin/event.php

Spacing +44 added lines, -44 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-include_once __DIR__ . '/../../../include/cp_header.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-include_once __DIR__ . '/../class/form/extcalform.php';
-include_once __DIR__ . '/admin_header.php';
-include_once __DIR__ . '/../class/utilities.php';
+include_once __DIR__.'/../../../include/cp_header.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+include_once __DIR__.'/../class/form/extcalform.php';
+include_once __DIR__.'/admin_header.php';
+include_once __DIR__.'/../class/utilities.php';
 
 $gepeto = array_merge($_GET, $_POST);
 while (list($k, $v) = each($gepeto)) {
@@ -31,15 +31,15 @@ 
 
     while (list($k, $t) = each($rst)) {
         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>';
         }
     }
 
@@ -101,7 +101,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);
             }
 
@@ -172,7 +172,7 @@ 
         $eventId      = $_GET['event_id'];
         $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
 
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _MD_EXTCAL_EDIT_EVENT . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._MD_EXTCAL_EDIT_EVENT.'</legend>';
 
         if ($form = $eventHandler->getEventForm('admin', $action, array('event_id' => $eventId))) {
             $form->display();
@@ -197,7 +197,7 @@ 
         }
 
         $data['event_id'] = 0;
-        $data['event_title'] .= ' (' . _AM_EXTCAL_CLONE_OF . $eventId . ')';
+        $data['event_title'] .= ' ('._AM_EXTCAL_CLONE_OF.$eventId.')';
 
         $newEvent = $eventHandler->create();
         $newEvent->setVars($data);
@@ -213,7 +213,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()));
                 exit;
             }
             //             $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
@@ -279,7 +279,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()));
                 exit;
             }
 
@@ -312,32 +312,32 @@ 
         $events       = $eventHandler->objectToArray($eventHandler->getNewEvent($start, $nbEventsByPage, 0, true), array('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>';
 
@@ -345,15 +345,15 @@ 
             $i = 0;
             foreach ($events as $event) {
                 $class = (++$i % 2 == 0) ? 'even' : 'odd';
-                echo '<tr style="text-align:left;" class="' . $class . '">';
+                echo '<tr style="text-align:left;" class="'.$class.'">';
                 echo "<td width='10%' align='center'>";
                 echo "<input type='checkbox' name='deleteEvents[{$event['event_id']}]' value='1' >";
                 echo "<input type='hidden' name='deleteAllEvents[{$event['event_id']}]' value='1' />";
                 echo '</td>';
-                echo "<td align = 'center' width='5%'>" . $event['event_id'] . '</td>';
-                echo "<td  width='10%'>" . '<a href=cat.php?op=modify&amp;cat_id=' . $event['cat']['cat_id'] . '&form_modify' . '>' . $event['cat']['cat_name'] . '</a>' . '</td>';
+                echo "<td align = 'center' width='5%'>".$event['event_id'].'</td>';
+                echo "<td  width='10%'>".'<a href=cat.php?op=modify&amp;cat_id='.$event['cat']['cat_id'].'&form_modify'.'>'.$event['cat']['cat_name'].'</a>'.'</td>';
 
-                echo '<td>' . '<a href=event.php?op=modify&amp;event_id=' . $event['event_id'] . '>' . $event['event_title'] . '</a>' . '</td>';
+                echo '<td>'.'<a href=event.php?op=modify&amp;event_id='.$event['event_id'].'>'.$event['event_title'].'</a>'.'</td>';
 
                 //                 if ($event['event_isrecur']) {
                 //                     echo '<td>' . $event['formated_reccur_rule'] . '</td>';
@@ -361,18 +361,18 @@ 
                 //                     echo '<td>' . $event['formated_event_start'] . '</td>';
                 //                 }
 
-                echo "<td align = 'center' width='10%'>" . $event['formated_event_start'] . '</td>';
-                echo "<td align = 'center' width='10%'>" . $event['formated_event_end'] . '</td>';
-                echo '<td align="center">' . (($event['event_isrecur'] == 1) ? _YES : _NO) . '</td>';
+                echo "<td align = 'center' width='10%'>".$event['formated_event_start'].'</td>';
+                echo "<td align = 'center' width='10%'>".$event['formated_event_end'].'</td>';
+                echo '<td align="center">'.(($event['event_isrecur'] == 1) ? _YES : _NO).'</td>';
                 if (!isset($event['formated_reccur_rule'])) {
                     $event['formated_reccur_rule'] = '';
                 }
-                echo '<td>' . $event['formated_reccur_rule'] . '</td>';
+                echo '<td>'.$event['formated_reccur_rule'].'</td>';
 
                 echo '<td style="width:10%; text-align:center;">';
-                echo '<a href=event.php?op=modify&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/edit.png' title='" . _AM_EXTCAL_ICONE_EDIT . "' /></a>&nbsp;&nbsp;";
-                echo '<a href=event.php?op=delete&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/delete.png' title='" . _AM_EXTCAL_ICONE_DELETE . "' /></a>&nbsp;&nbsp;";
-                echo '<a href=event.php?op=clone&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/editcopy.png' title='" . _AM_EXTCAL_ICONE_CLONE . "' /></a>";
+                echo '<a href=event.php?op=modify&amp;event_id='.$event['event_id']."><img src='".$pathIcon16."/edit.png' title='"._AM_EXTCAL_ICONE_EDIT."' /></a>&nbsp;&nbsp;";
+                echo '<a href=event.php?op=delete&amp;event_id='.$event['event_id']."><img src='".$pathIcon16."/delete.png' title='"._AM_EXTCAL_ICONE_DELETE."' /></a>&nbsp;&nbsp;";
+                echo '<a href=event.php?op=clone&amp;event_id='.$event['event_id']."><img src='".$pathIcon16."/editcopy.png' title='"._AM_EXTCAL_ICONE_CLONE."' /></a>";
                 echo '</td>';
 
                 echo '</tr>';
@@ -386,13 +386,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>';
@@ -400,14 +400,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>';
 
-        include_once __DIR__ . '/admin_footer.php';
+        include_once __DIR__.'/admin_footer.php';
 
         break;
 }

view_week.php

Spacing +13 added lines, -13 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-include_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+include_once __DIR__.'/include/constantes.php';
 $params                                  = array('view' => _EXTCAL_NAV_WEEK, 'file' => _EXTCAL_FILE_WEEK);
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-include_once __DIR__ . '/header.php';
+include_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)
@@ -45,7 +45,7 @@ 
     'cat'          => $cat,
     'externalKeys' => 'cat_id',
 );
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 $eventsArray = $events;
 // Formating date
@@ -86,21 +86,21 @@ 
 $nWeekCalObj = $weekCalObj->nextWeek('object');
 $navig       = array(
     'prev' => array(
-        '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' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $pWeekCalObj->getTimestamp()),
     ),
     'this' => array(
-        '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' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $weekCalObj->getTimestamp()),
     ),
     'next' => array(
-        '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' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $nWeekCalObj->getTimestamp()),
     ),
 );
 
 // Title of the page
-$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']);
+$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']);
 
 // Assigning navig data to the template
 $xoopsTpl->assign('navig', $navig);
@@ -160,4 +160,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'week');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

view_search.php

Spacing +10 added lines, -10 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-include_once __DIR__ . '/include/constantes.php';
-$params                                  = array(
+include __DIR__.'/../../mainfile.php';
+include_once __DIR__.'/include/constantes.php';
+$params = array(
     'view' => _EXTCAL_NAV_SEARCH,
     'file' => _EXTCAL_FILE_SEARCH,
 );
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 $recurEventsArray = array();
 //needed to save the state of the form, so we don't show on the first time the list of available events
@@ -19,10 +19,10 @@ 
 /***************************************************************/
 $searchExp = isset($_POST['searchExp']) ? $_POST['searchExp'] : '';
 $andor     = isset($_POST['andor']) ? $_POST['andor'] : '';
-$year      = isset($_POST['year']) ? (int)$_POST['year'] : date('Y');
-$month     = isset($_POST['month']) ? (int)$_POST['month'] : date('n');
-$day       = isset($_POST['day']) ? (int)$_POST['day'] : 0;
-$cat       = isset($_POST['cat']) ? (int)$_POST['cat'] : 0;
+$year      = isset($_POST['year']) ? (int) $_POST['year'] : date('Y');
+$month     = isset($_POST['month']) ? (int) $_POST['month'] : date('n');
+$day       = isset($_POST['day']) ? (int) $_POST['day'] : 0;
+$cat       = isset($_POST['cat']) ? (int) $_POST['cat'] : 0;
 $orderby1  = isset($_POST['orderby1']) ? $_POST['orderby1'] : 'cat_name ASC';
 $orderby2  = isset($_POST['orderby2']) ? $_POST['orderby2'] : 'event_title ASC';
 $orderby3  = isset($_POST['orderby3']) ? $_POST['orderby3'] : '';
@@ -143,7 +143,7 @@ 
     }
 }
 
-$eventsArray = array_merge((array)$eventsArray, (array)$recurEventsArray);
+$eventsArray = array_merge((array) $eventsArray, (array) $recurEventsArray);
 
 // Sort event array by event start
 //usort($eventsArray, "orderEvents");
@@ -234,4 +234,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'search');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

new_event.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-include_once __DIR__ . '/include/constantes.php';
-include_once __DIR__ . '/header.php';
+include __DIR__.'/../../mainfile.php';
+include_once __DIR__.'/include/constantes.php';
+include_once __DIR__.'/header.php';
 
 // Getting eXtCal object's handler
 $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
@@ -10,7 +10,7 @@ 
 $permHandler = ExtcalPerm::getHandler();
 $xoopsUser   = $xoopsUser ?: null;
 if (count($permHandler->getAuthorizedCat($xoopsUser, 'extcal_cat_submit')) > 0) {
-    include XOOPS_ROOT_PATH . '/header.php';
+    include XOOPS_ROOT_PATH.'/header.php';
 
     // Title of the page
     $xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
@@ -20,7 +20,7 @@ 
 
     //$form->display();
 
-    include XOOPS_ROOT_PATH . '/footer.php';
+    include XOOPS_ROOT_PATH.'/footer.php';
 } else {
     redirect_header('index.php', 3);
 }

etablissement.php

Spacing +11 added lines, -11 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
-include_once __DIR__ . '/../../mainfile.php';
-include_once __DIR__ . '/include/constantes.php';
+include_once __DIR__.'/../../mainfile.php';
+include_once __DIR__.'/include/constantes.php';
 $GLOBALS['xoopsOption']['template_main'] = 'extcal_etablissement.tpl';
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 //include_once XOOPS_ROOT_PATH."/modules/extcal/class/etablissement.php";
 $etablissementHandler = xoops_getModuleHandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE);
@@ -19,7 +19,7 @@ 
 $etablissement_exist = $etablissementHandler->getCount($criteria);
 
 if ($etablissement_exist == 0) {
-    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);
@@ -33,13 +33,13 @@ 
 /* todo a deplacer dans le template JJD */
 $uid = $xoopsUser ? $xoopsUser->getVar('uid') : 0;
 global $xoopsModule;
-$pathIcon16 =& $xoopsModule->getInfo('icons16');
+$pathIcon16 = & $xoopsModule->getInfo('icons16');
 
 $edit_delete = '';
 if (is_object($xoopsUser) && $isAdmin) {
-    $edit_delete = '<a href="' . XOOPS_URL . '/modules/extcal/admin/etablissement.php?op=edit_etablissement&etablissement_id=' . $etablissement_id . '"><img src="' . $pathIcon16 . '/edit.png" width="16px" height="16px" border="0" title="'
-                   . _MD_EXTCAL_ETABLISSEMENT_EDIT . '"/></a><a href="' . XOOPS_URL . '/modules/extcal/admin/etablissement.php?op=delete_etablissement&etablissement_id=' . $etablissement_id . '"><img src="' . $pathIcon16
-                   . '/delete.png" width="16px" height="16px" border="0" title="' . _MD_EXTCAL_ETABLISSEMENT_DELETE . '"/></a>';
+    $edit_delete = '<a href="'.XOOPS_URL.'/modules/extcal/admin/etablissement.php?op=edit_etablissement&etablissement_id='.$etablissement_id.'"><img src="'.$pathIcon16.'/edit.png" width="16px" height="16px" border="0" title="'
+                   . _MD_EXTCAL_ETABLISSEMENT_EDIT.'"/></a><a href="'.XOOPS_URL.'/modules/extcal/admin/etablissement.php?op=delete_etablissement&etablissement_id='.$etablissement_id.'"><img src="'.$pathIcon16
+                   . '/delete.png" width="16px" height="16px" border="0" title="'._MD_EXTCAL_ETABLISSEMENT_DELETE.'"/></a>';
 }
 $xoopsTpl->assign('edit_delete', $edit_delete);
 
@@ -47,12 +47,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', array(
         'event_picture1' => $donnees['event_picture1'],
@@ -64,4 +64,4 @@ 
 }
 $xoTheme->addScript('browse.php?modules/extcal/assets/js/highslide.js');
 $xoTheme->addStylesheet('browse.php?modules/extcal/assets/js/highslide.css');
-include_once XOOPS_ROOT_PATH . '/footer.php';
+include_once XOOPS_ROOT_PATH.'/footer.php';

include/config.php

Spacing +10 added lines, -10 removed lines

@@ -17,18 +17,18 @@ 
  * @author       XOOPS Development Team
  */
 
-require_once __DIR__ . '/../../../mainfile.php';
+require_once __DIR__.'/../../../mainfile.php';
 $moduleDirName = basename(dirname(__DIR__));
 
 if (!defined('EXTCAL_DIRNAME')) {
     define('EXTCAL_DIRNAME', $moduleDirName);
-    define('EXTCAL_PATH', XOOPS_ROOT_PATH . '/modules/' . EXTCAL_DIRNAME);
-    define('EXTCAL_URL', XOOPS_URL . '/modules/' . EXTCAL_DIRNAME);
-    define('EXTCAL_ADMIN', EXTCAL_URL . '/admin/index.php');
-    define('EXTCAL_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . EXTCAL_DIRNAME);
-    define('EXTCAL_AUTHOR_LOGOIMG', EXTCAL_URL . '/assets/images/logoModule.png');
-    define('EXTCAL_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . EXTCAL_DIRNAME); // WITHOUT Trailing slash
-    define('EXTCAL_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . EXTCAL_DIRNAME); // WITHOUT Trailing slash
+    define('EXTCAL_PATH', XOOPS_ROOT_PATH.'/modules/'.EXTCAL_DIRNAME);
+    define('EXTCAL_URL', XOOPS_URL.'/modules/'.EXTCAL_DIRNAME);
+    define('EXTCAL_ADMIN', EXTCAL_URL.'/admin/index.php');
+    define('EXTCAL_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.EXTCAL_DIRNAME);
+    define('EXTCAL_AUTHOR_LOGOIMG', EXTCAL_URL.'/assets/images/logoModule.png');
+    define('EXTCAL_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.EXTCAL_DIRNAME); // WITHOUT Trailing slash
+    define('EXTCAL_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.EXTCAL_DIRNAME); // WITHOUT Trailing slash
 
 }
 
@@ -37,7 +37,7 @@ 
     'name'          => 'Module Configurator',
     'uploadFolders' => array(
         EXTCAL_UPLOAD_PATH,
-        EXTCAL_UPLOAD_PATH . '/etablissement'
+        EXTCAL_UPLOAD_PATH.'/etablissement'
     ),
 //    'copyFiles'     => array(
 //        EXTCAL_UPLOAD_PATH,
@@ -58,4 +58,4 @@ 
 
 // module information
 $mod_copyright = "<a href='http://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . EXTCAL_AUTHOR_LOGOIMG . "' alt='XOOPS Project' /></a>";
+                     <img src='" . EXTCAL_AUTHOR_LOGOIMG."' alt='XOOPS Project' /></a>";

include/constantes.php

Spacing +22 added lines, -22 removed lines

@@ -37,7 +37,7 @@ 
 define('_EXTCAL_CLN_EVENT', 'ExtcalEvent');
 
 //-------------------------------------------------------------------
-define('_EXTCAL_PEAR_ROOT_DEFAULT', __DIR__ . '/../class/pear');
+define('_EXTCAL_PEAR_ROOT_DEFAULT', __DIR__.'/../class/pear');
 //define('_EXTCAL_PEAR_ROOT', 'F:/wamp/www/xfr254b/xoops_lib/Frameworks/pear' );
 
 $pear_path = _EXTCAL_PEAR_ROOT_DEFAULT;
@@ -72,22 +72,22 @@ 
 //}
 define('_EXTCAL_PEAR_ROOT', $pear_path);
 
-define('_EXTCAL_PEAR_CALENDAR_ROOT', _EXTCAL_PEAR_ROOT . '/Calendar');
-define('CALENDAR_ROOT', _EXTCAL_PEAR_CALENDAR_ROOT . '/');
+define('_EXTCAL_PEAR_CALENDAR_ROOT', _EXTCAL_PEAR_ROOT.'/Calendar');
+define('CALENDAR_ROOT', _EXTCAL_PEAR_CALENDAR_ROOT.'/');
 
 //-------------------------------------------------------------------
 define('_EXTCAL_SHOW_NO_PICTURE', false);
 
 define('_EXTCAL_PATH_HORLOGES', '/modules/extcal/assets/images/horloges/');
-define('_EXTCAL_PATH_ICONS16', XOOPS_URL . '/Frameworks/moduleclasses/icons/16/');
-define('_EXTCAL_PATH_ICONS32', XOOPS_URL . '/Frameworks/moduleclasses/icons/32/');
-define('_EXTCAL_PATH_FO', XOOPS_URL . '/modules/extcal/');
-define('_EXTCAL_PATH_BO', _EXTCAL_PATH_FO . 'admin/');
-define('_EXTCAL_PATH_LG', XOOPS_URL . '/modules/extcal/languages/');
+define('_EXTCAL_PATH_ICONS16', XOOPS_URL.'/Frameworks/moduleclasses/icons/16/');
+define('_EXTCAL_PATH_ICONS32', XOOPS_URL.'/Frameworks/moduleclasses/icons/32/');
+define('_EXTCAL_PATH_FO', XOOPS_URL.'/modules/extcal/');
+define('_EXTCAL_PATH_BO', _EXTCAL_PATH_FO.'admin/');
+define('_EXTCAL_PATH_LG', XOOPS_URL.'/modules/extcal/languages/');
 
 define('_EXTCAL_IMG_INTERVAL', 'interval04.png');
-define('_EXTCAL_IMG_INTERVAL16', _EXTCAL_PATH_ICONS16 . _EXTCAL_IMG_INTERVAL);
-define('_EXTCAL_IMG_INTERVAL32', _EXTCAL_PATH_ICONS32 . _EXTCAL_IMG_INTERVAL);
+define('_EXTCAL_IMG_INTERVAL16', _EXTCAL_PATH_ICONS16._EXTCAL_IMG_INTERVAL);
+define('_EXTCAL_IMG_INTERVAL32', _EXTCAL_PATH_ICONS32._EXTCAL_IMG_INTERVAL);
 
 //define('_EXTCAL_DIRNAME',    $xoopsModule->getVar('dirname'));
 
@@ -103,22 +103,22 @@ 
 define('_EXTCAL_NAV_NEW_EVENT', 'new-event');
 
 define('_EXTCAL_NAV_LIST',
-       _EXTCAL_NAV_CALMONTH . "\n" . _EXTCAL_NAV_CALWEEK . "\n" . _EXTCAL_NAV_YEAR . "\n" . _EXTCAL_NAV_MONTH . "\n" . _EXTCAL_NAV_WEEK . "\n" . _EXTCAL_NAV_DAY . "\n" . _EXTCAL_NAV_AGENDA_WEEK . "\n" . _EXTCAL_NAV_AGENDA_DAY . "\n"
-       . _EXTCAL_NAV_SEARCH . "\n" . _EXTCAL_NAV_NEW_EVENT);
+       _EXTCAL_NAV_CALMONTH."\n"._EXTCAL_NAV_CALWEEK."\n"._EXTCAL_NAV_YEAR."\n"._EXTCAL_NAV_MONTH."\n"._EXTCAL_NAV_WEEK."\n"._EXTCAL_NAV_DAY."\n"._EXTCAL_NAV_AGENDA_WEEK."\n"._EXTCAL_NAV_AGENDA_DAY."\n"
+       . _EXTCAL_NAV_SEARCH."\n"._EXTCAL_NAV_NEW_EVENT);
 
 define('_EXTCAL_PREFIX_VIEW', 'view_');
 define('_EXTCAL_SUFFIX_VIEW', '.php');
 
-define('_EXTCAL_FILE_CALMONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALMONTH . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_CALWEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALWEEK . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_YEAR', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_YEAR . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_MONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_MONTH . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_WEEK . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_DAY . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_AGENDA_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_WEEK . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_AGENDA_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_DAY . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_SEARCH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_SEARCH . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_NEW_EVENT', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_NEW_EVENT . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_CALMONTH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_CALMONTH._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_CALWEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_CALWEEK._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_YEAR', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_YEAR._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_MONTH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_MONTH._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_WEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_WEEK._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_DAY', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_DAY._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_AGENDA_WEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_AGENDA_WEEK._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_AGENDA_DAY', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_AGENDA_DAY._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_SEARCH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_SEARCH._EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_NEW_EVENT', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_NEW_EVENT._EXTCAL_SUFFIX_VIEW);
 
 define('_EXTCAL_MULTILOADER', '/class/xoopsform/multiuploads/formmultiuploads.php');
 

edit_event.php

Spacing +9 added lines, -9 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
+include __DIR__.'/../../mainfile.php';
 
-include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-include __DIR__ . '/class/form/extcalform.php';
-include __DIR__ . '/class/perm.php';
-include_once __DIR__ . '/include/constantes.php';
+include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+include __DIR__.'/class/form/extcalform.php';
+include __DIR__.'/class/perm.php';
+include_once __DIR__.'/include/constantes.php';
 
 $permHandler = ExtcalPerm::getHandler();
 $xoopsUser   = $xoopsUser ?: null;
@@ -19,7 +19,7 @@ 
 
 $params                                  = array('view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT);
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 /* ========================================================================== */
 
 // Tooltips include
@@ -29,7 +29,7 @@ 
 if (!isset($_GET['event'])) {
     $eventId = 0;
 } else {
-    $eventId = (int)$_GET['event'];
+    $eventId = (int) $_GET['event'];
 }
 if (!isset($_GET['action'])) {
     $action = 'edit';
@@ -40,7 +40,7 @@ 
 // Getting eXtCal object's handler
 $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
 
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
 // Title of the page
 $xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
@@ -49,4 +49,4 @@ 
 $form = $eventHandler->getEventForm('user', $action, array('event_id' => $eventId));
 $form->display();
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

event.php

Spacing +8 added lines, -8 removed lines

@@ -1,27 +1,27 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-include_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+include_once __DIR__.'/include/constantes.php';
 $params                                  = array('view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT);
 $GLOBALS['xoopsOption']['template_main'] = 'extcal_event.tpl';
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 //exit;
 
-include XOOPS_ROOT_PATH . '/include/comment_view.php';
+include XOOPS_ROOT_PATH.'/include/comment_view.php';
 
 if (!isset($_GET['event'])) {
     $eventId = 0;
 } else {
-    $eventId = (int)$_GET['event'];
+    $eventId = (int) $_GET['event'];
 }
 $eventHandler          = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
 $fileHandler           = xoops_getModuleHandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
 $eventMemberHandler    = xoops_getModuleHandler(_EXTCAL_CLS_MEMBER, _EXTCAL_MODULE);
 $eventNotMemberHandler = xoops_getModuleHandler(_EXTCAL_CLS_NOT_MEMBER, _EXTCAL_MODULE);
 $permHandler           = ExtcalPerm::getHandler();
-include_once __DIR__ . '/class/etablissement.php';
-include_once __DIR__ . '/class/utilities.php';
+include_once __DIR__.'/class/etablissement.php';
+include_once __DIR__.'/class/utilities.php';
 $myts = MyTextSanitizer::getInstance(); // MyTextSanitizer object
 
 if (!function_exists('clear_unicodeslashes')) {
@@ -211,4 +211,4 @@ 
 
 //function XoopsFormDhtmlTextArea($caption, $name, $value = "", $rows = 5, $cols = 50, $hiddentext = "xoopsHiddenText", $options = array());
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';