mambax7 / extcal

event_notmember.php

Spacing +10 added lines, -10 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
+include __DIR__.'/../../mainfile.php';
 
-include_once __DIR__ . '/include/constantes.php';
-include_once __DIR__ . '/include/mail_fnc.php';
-include_once __DIR__ . '/class/utilities.php';
+include_once __DIR__.'/include/constantes.php';
+include_once __DIR__.'/include/mail_fnc.php';
+include_once __DIR__.'/class/utilities.php';
 
 /*
 ext_echoArray($_POST);
@@ -21,20 +21,20 @@ 
 $member_uid = $xoopsUser->getVar('uid');
 
 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()));
 }
 
 if ($xoopsUser && $xoopsModuleConfig['whosnot_going']) {
     // If param are right
-    if ((int)$_POST['event'] > 0 && ($_POST['mode'] === 'add' || $_POST['mode'] === 'remove')) {
+    if ((int) $_POST['event'] > 0 && ($_POST['mode'] === 'add' || $_POST['mode'] === 'remove')) {
         $eventHandler          = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
         $eventNotMemberHandler = xoops_getModuleHandler(_EXTCAL_CLS_NOT_MEMBER, _EXTCAL_MODULE);
 
         // If the user have to be added
         if ($_POST['mode'] === 'add') {
-            $event = $eventHandler->getEvent((int)$_POST['event'], $xoopsUser);
+            $event = $eventHandler->getEvent((int) $_POST['event'], $xoopsUser);
             $eventNotMemberHandler->createEventNotMember(array(
-                                                             'event_id' => (int)$_POST['event'],
+                                                             'event_id' => (int) $_POST['event'],
                                                              'uid'      => $xoopsUser->getVar('uid'),
                                                          ));
             sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_3, _MD_EXTCAL_MSG_3);
@@ -43,12 +43,12 @@ 
             // If the user have to be remove
         } else {
             if ($_POST['mode'] === 'remove') {
-                $eventNotMemberHandler->deleteEventNotMember(array((int)$_POST['event'], $xoopsUser->getVar('uid')));
+                $eventNotMemberHandler->deleteEventNotMember(array((int) $_POST['event'], $xoopsUser->getVar('uid')));
                 sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_4, _MD_EXTCAL_MSG_4);
                 $rediredtMessage = _MD_EXTCAL_WHOSNOT_GOING_REMOVED_TO_EVENT;
             }
         }
-        redirect_header('event.php?event=' . $_POST['event'], 3, $rediredtMessage, false);
+        redirect_header('event.php?event='.$_POST['event'], 3, $rediredtMessage, false);
     } else {
         redirect_header('index.php', 3, _NOPERM, false);
     }

view_calendar-month.php

Spacing +12 added lines, -12 removed lines

@@ -1,15 +1,15 @@ 
 <?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_CALMONTH, 'file' => _EXTCAL_FILE_CALMONTH);
 $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');
-$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');
+$cat   = isset($_GET['cat']) ? (int) $_GET['cat'] : 0;
 /* ========================================================================== */
 
 $form = new XoopsSimpleForm('', 'navigSelectBox', $params['file'], 'get');
@@ -31,7 +31,7 @@ 
     'cat'          => $cat,
     'externalKeys' => 'cat_id',
 );
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 
 // Calculating timestamp for the begin and the end of the month
@@ -128,21 +128,21 @@ 
 // Making navig data
 $navig = array(
     'prev' => array(
-        'uri'  => 'year=' . $pMonthCalObj->thisYear() . '&amp;month=' . $pMonthCalObj->thisMonth(),
+        'uri'  => 'year='.$pMonthCalObj->thisYear().'&amp;month='.$pMonthCalObj->thisMonth(),
         'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $pMonthCalObj->getTimestamp()),
     ),
     'this' => array(
-        'uri'  => 'year=' . $monthCalObj->thisYear() . '&amp;month=' . $monthCalObj->thisMonth(),
+        'uri'  => 'year='.$monthCalObj->thisYear().'&amp;month='.$monthCalObj->thisMonth(),
         'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $monthCalObj->getTimestamp()),
     ),
     'next' => array(
-        'uri'  => 'year=' . $nMonthCalObj->thisYear() . '&amp;month=' . $nMonthCalObj->thisMonth(),
+        'uri'  => 'year='.$nMonthCalObj->thisYear().'&amp;month='.$nMonthCalObj->thisMonth(),
         'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $nMonthCalObj->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);
@@ -182,4 +182,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'calmonth');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

print.php

Spacing +80 added lines, -80 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-include_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+include_once __DIR__.'/include/constantes.php';
 
-include_once XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/calendar.php';
+include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/calendar.php';
 
 if (!isset($_GET['event'])) {
     $eventId = 0;
 } else {
-    $eventId = (int)$_GET['event'];
+    $eventId = (int) $_GET['event'];
 }
 $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
 $event        = $eventHandler->objectToArray($eventHandler->getEvent($eventId), array('cat_id'));
@@ -23,136 +23,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_new-event.php

Spacing +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
 <?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_view_{$params['view']}.tpl";
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 /* ========================================================================== */
 //ext_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);
 }

view_agenda-day.php

Spacing +13 added lines, -13 removed lines

@@ -1,17 +1,17 @@ 
 <?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_AGENDA_DAY, 'file' => _EXTCAL_FILE_AGENDA_DAY);
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-include_once __DIR__ . '/header.php';
+include_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>";
@@ -44,7 +44,7 @@ 
     'nbJours'      => $nbJours,
     'externalKeys' => 'cat_id',
 );
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 $eventsArray = $events;
 $startDay    = mktime(0, 0, 0, $month, $day, $year);
@@ -99,21 +99,21 @@ 
 
 $navig = array(
     'prev' => array(
-        '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' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_day'], $pDayCalObj->getTimestamp()),
     ),
     'this' => array(
-        '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' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_day'], $dayCalObj->getTimestamp()),
     ),
     'next' => array(
-        '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' => $extcalTimeHandler->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);
@@ -154,4 +154,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'agendaday');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

comment_reply.php

Spacing +2 added lines, -2 removed lines

@@ -24,5 +24,5 @@
 //  along with this program; if not, write to the Free Software              //
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 //  ------------------------------------------------------------------------ //
-include __DIR__ . '/../../mainfile.php';
-include XOOPS_ROOT_PATH . '/include/comment_reply.php';
+include __DIR__.'/../../mainfile.php';
+include XOOPS_ROOT_PATH.'/include/comment_reply.php';

admin/cat.php

Spacing +11 added lines, -11 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-include_once __DIR__ . '/../../../include/cp_header.php';
-include __DIR__ . '/../../../class/xoopsformloader.php';
-include_once __DIR__ . '/admin_header.php';
-include_once __DIR__ . '/../class/utilities.php';
-include_once __DIR__ . '/../include/constantes.php';
+include_once __DIR__.'/../../../include/cp_header.php';
+include __DIR__.'/../../../class/xoopsformloader.php';
+include_once __DIR__.'/admin_header.php';
+include_once __DIR__.'/../class/utilities.php';
+include_once __DIR__.'/../include/constantes.php';
 
 $gepeto = array_merge($_GET, $_POST);
 while (list($k, $v) = each($gepeto)) {
@@ -61,7 +61,7 @@ 
         $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'), '');
@@ -73,7 +73,7 @@ 
 
         $form->display();
 
-        include_once __DIR__ . '/admin_footer.php';
+        include_once __DIR__.'/admin_footer.php';
         break;
 
     case 'edit':
@@ -86,15 +86,15 @@ 
             $cat = $catHandler->getCat($cat_id, true);
         }
 
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_EDIT_CATEGORY . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_EDIT_CATEGORY.'</legend>';
 
         $form = new XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true);
         $form->addElement(new XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255, $cat->getVar('cat_name')), true);
         $form->addElement(new XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', $cat->getVar('cat_desc')), false);
         $form->addElement(new XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, $cat->getVar('cat_weight')), false);
-        $form->addElement(new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#' . $cat->getVar('cat_color')));
+        $form->addElement(new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#'.$cat->getVar('cat_color')));
 
-        $file_path = __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'), '');
@@ -250,6 +250,6 @@ 
         //$xoopsTpl->assign("module_dirname",    $xoopsModule->getVar("dirname") );
 
         $xoopsTpl->display('db:admin/extcal_admin_cat_list.tpl');
-        include_once __DIR__ . '/admin_footer.php';
+        include_once __DIR__.'/admin_footer.php';
         break;
 }

admin/upgrade.php

Spacing +20 added lines, -20 removed lines

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

admin/permissions.php

Spacing +34 added lines, -34 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-include_once __DIR__ . '/../../../include/cp_header.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/../../../include/cp_header.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php';
+include_once __DIR__.'/admin_header.php';
 
 $step = 'default';
 if (isset($_POST['step'])) {
@@ -76,36 +76,36 @@ 
          * Public category permission mask
          */
         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>';
+             . _AM_EXTCAL_PUBLIC_PERM_MASK.'</a></legend><div id="default">';
+        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 = (++$i % 2 == 0) ? '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>';
@@ -125,14 +125,14 @@ 
             $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
         }
 
-        echo '<fieldset id="' . $permName . 'Bookmark"><legend><a href="#' . $permName . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\'' . $permName . '\'); toggleIcon(\'' . $permName . 'Icon\');"><img id="' . $permName
-             . 'Icon" src="../assets/images/icons/minus.gif" />&nbsp;' . $titleOfForm . '</a></legend><div id="' . $permName . '">';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset id="'.$permName.'Bookmark"><legend><a href="#'.$permName.'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''.$permName.'\'); toggleIcon(\''.$permName.'Icon\');"><img id="'.$permName
+             . 'Icon" src="../assets/images/icons/minus.gif" />&nbsp;'.$titleOfForm.'</a></legend><div id="'.$permName.'">';
+        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);
         }
@@ -150,13 +150,13 @@ 
             $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
         }
 
-        echo '<fieldset id="' . $permName . 'Bookmark"><legend><a href="#' . $permName . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\'' . $permName . '\'); toggleIcon(\'' . $permName . 'Icon\');"><img id="' . $permName
-             . 'Icon" src="../assets/images/icons/minus.gif" />&nbsp;' . $titleOfForm . '</a></legend><div id="' . $permName . '">';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset id="'.$permName.'Bookmark"><legend><a href="#'.$permName.'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''.$permName.'\'); toggleIcon(\''.$permName.'Icon\');"><img id="'.$permName
+             . 'Icon" src="../assets/images/icons/minus.gif" />&nbsp;'.$titleOfForm.'</a></legend><div id="'.$permName.'">';
+        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);
         }
@@ -174,13 +174,13 @@ 
             $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
         }
 
-        echo '<fieldset id="' . $permName . 'Bookmark"><legend><a href="#' . $permName . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\'' . $permName . '\'); toggleIcon(\'' . $permName . 'Icon\');"><img id="' . $permName
-             . 'Icon" src="../assets/images/icons/minus.gif" />&nbsp;' . $titleOfForm . '</a></legend><div id="' . $permName . '">';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset id="'.$permName.'Bookmark"><legend><a href="#'.$permName.'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''.$permName.'\'); toggleIcon(\''.$permName.'Icon\');"><img id="'.$permName
+             . 'Icon" src="../assets/images/icons/minus.gif" />&nbsp;'.$titleOfForm.'</a></legend><div id="'.$permName.'">';
+        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);
         }
@@ -198,13 +198,13 @@ 
             $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
         }
 
-        echo '<fieldset id="' . $permName . 'Bookmark"><legend><a href="#' . $permName . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\'' . $permName . '\'); toggleIcon(\'' . $permName . 'Icon\');"><img id="' . $permName
-             . 'Icon" src="../assets/images/icons/minus.gif" />&nbsp;' . $titleOfForm . '</a></legend><div id="' . $permName . '">';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset id="'.$permName.'Bookmark"><legend><a href="#'.$permName.'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''.$permName.'\'); toggleIcon(\''.$permName.'Icon\');"><img id="'.$permName
+             . 'Icon" src="../assets/images/icons/minus.gif" />&nbsp;'.$titleOfForm.'</a></legend><div id="'.$permName.'">';
+        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);
         }
@@ -221,7 +221,7 @@ 
         echo 'toggle(\'extcal_cat_edit\'); toggleIcon (\'extcal_cat_editIcon\');';
         echo '</script>';
 
-        include_once __DIR__ . '/admin_footer.php';
+        include_once __DIR__.'/admin_footer.php';
 
         break;