mambax7 / extcal

event_notmember.php

Spacing +10 added lines, -10 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-include dirname(dirname(__DIR__)) . '/mainfile.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
 
-include_once __DIR__ . '/include/constantes.php';
-include_once __DIR__ . '/include/mail_fnc.php';
-include_once __DIR__ . '/include/functions.php';
+include_once __DIR__.'/include/constantes.php';
+include_once __DIR__.'/include/mail_fnc.php';
+include_once __DIR__.'/include/functions.php';
 
 /*
 ext_echoArray($_POST);
@@ -21,32 +21,32 @@ 
 $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()));
     exit;
 }
 
 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);
-            $eventNotMemberHandler->createEventNotMember(array('event_id' => (int)$_POST['event'], 'uid' => $xoopsUser->getVar('uid')));
+            $event = $eventHandler->getEvent((int) $_POST['event'], $xoopsUser);
+            $eventNotMemberHandler->createEventNotMember(array('event_id' => (int) $_POST['event'], 'uid' => $xoopsUser->getVar('uid')));
             sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_3, _MD_EXTCAL_MSG_3);
             $rediredtMessage = _MD_EXTCAL_WHOSNOT_GOING_ADDED_TO_EVENT;
 
             // 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);
     }

index.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 
-include dirname(dirname(__DIR__)) . '/mainfile.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
 
 //modif JJD
-include_once __DIR__ . '/include/constantes.php';
+include_once __DIR__.'/include/constantes.php';
 
 header("Location: {$xoopsModuleConfig['start_page']}");

view_agenda-week.php

Spacing +14 added lines, -14 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
-include dirname(dirname(__DIR__)) . '/mainfile.php';
-include_once __DIR__ . '/include/constantes.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
+include_once __DIR__.'/include/constantes.php';
 $params                                  = array('view' => _EXTCAL_NAV_AGENDA_WEEK, 'file' => _EXTCAL_FILE_AGENDA_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)
 $dayTS = mktime(0, 0, 0, $month, $day, $year);
@@ -48,7 +48,7 @@ 
     'cat'          => $cat,
     'nbJours'      => $nbJours,
     'externalKeys' => 'cat_id');
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 $eventsArray = $events;
 // Formating date
@@ -80,7 +80,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);
@@ -102,17 +102,17 @@ 
 
 $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($xoopsModuleConfig['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($xoopsModuleConfig['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($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);
@@ -152,4 +152,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'agendaweek');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

admin/cat.php

Spacing +11 added lines, -11 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-include dirname(dirname(dirname(__DIR__))) . '/class/xoopsformloader.php';
-include_once __DIR__ . '/admin_header.php';
-include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/functions.php');
-include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php');
+include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+include dirname(dirname(dirname(__DIR__))).'/class/xoopsformloader.php';
+include_once __DIR__.'/admin_header.php';
+include_once(XOOPS_ROOT_PATH.'/modules/extcal/include/functions.php');
+include_once(XOOPS_ROOT_PATH.'/modules/extcal/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 = XOOPS_ROOT_PATH . '/modules/extcal/assets/css/images';
+        $file_path = XOOPS_ROOT_PATH.'/modules/extcal/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 = XOOPS_ROOT_PATH . '/modules/extcal/assets/css/images';
+        $file_path = XOOPS_ROOT_PATH.'/modules/extcal/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'), '');
@@ -249,6 +249,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/admin_footer.php

Spacing +1 added lines, -1 removed lines

@@ -18,6 +18,6 @@
  * @version   ::     $Id $
  **/
 
-echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n" . "    <a href='http://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . '</div>';
+echo "<div class='adminfooter'>\n"."  <div style='text-align: center;'>\n"."    <a href='http://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"."  </div>\n".'  '._AM_MODULEADMIN_ADMIN_FOOTER."\n".'</div>';
 
 xoops_cp_footer();

admin/admin_header.php

Spacing +7 added lines, -7 removed lines

@@ -26,9 +26,9 @@ 
 //  ------------------------------------------------------------------------ //
 
 $path = dirname(dirname(dirname(__DIR__)));
-include_once $path . '/mainfile.php';
-include_once $path . '/include/cp_functions.php';
-require_once $path . '/include/cp_header.php';
+include_once $path.'/mainfile.php';
+include_once $path.'/include/cp_functions.php';
+require_once $path.'/include/cp_header.php';
 
 global $xoopsModule;
 
@@ -39,12 +39,12 @@ 
 xoops_loadLanguage('modinfo', $moduleDirName);
 xoops_loadLanguage('main', $moduleDirName);
 
-$pathIcon16      = '../' . $xoopsModule->getInfo('icons16');
-$pathIcon32      = '../' . $xoopsModule->getInfo('icons32');
+$pathIcon16      = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32      = '../'.$xoopsModule->getInfo('icons32');
 $pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
 
-if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))) {
-    include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))) {
+    include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
 } else {
     redirect_header('../../../admin.php', 5, _AM_EXTCAL_MODULEADMIN_MISSING, false);
 }

admin/index.php

Switch Indentation +70 added lines, -70 removed lines

@@ -34,9 +34,9 @@ 
 
 switch ($op) {
 
-    case 'notification':
+        case 'notification':
 
-        switch ($fct) {
+            switch ($fct) {
 
             case 'send':
 
@@ -116,79 +116,79 @@ 
 
                 break;
 
-        }
+            }
 
         break;
 
-    default:
-    case 'default':
-        // @author      Gregory Mage (Aka Mage)
-        //***************************************************************************************
-        xoops_cp_header();
-        //        include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
-        $catHandler   = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
-        $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-        $indexAdmin   = new ModuleAdmin();
-        $indexAdmin->addInfoBox(_MI_EXTCAL_DASHBOARD);
-        $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount(), 'Green');
-        $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
-        $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_PENDING . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 0)), 'Red');
-        $criteriaCompo = new CriteriaCompo();
-        $criteriaCompo->add(new Criteria('event_approved', 1));
-        $criteriaCompo->add(new Criteria('event_start', time(), '>='));
-        $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_APPROVED . '</infolabel><infotext>', $eventHandler->getCount($criteriaCompo) . '</infotext>', 'Green');
-
-        $indexAdmin->addConfigBoxLine();
-        $indexAdmin->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
-        $indexAdmin->addConfigBoxLine(_EXTCAL_PEAR_ROOT, 'folder');
-
-        //JJD
-        //         $indexAdmin->addConfigBoxLine(XOOPS_ROOT_PATH,'folder');
-
-        //        $indexAdmin->addLineConfigLabel(_AM_EXTCAL_CONFIG_PHP, $xoopsModule->getInfo("min_php"), 'php');
-        //        $indexAdmin->addLineConfigLabel(_AM_EXTCAL_CONFIG_XOOPS, $xoopsModule->getInfo("min_xoops"), 'xoops');
-        echo $indexAdmin->addNavigation(basename(__FILE__));
-        echo $indexAdmin->renderIndex();
-        //***************************************************************************************
-        $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), array('cat_id'));
-        $eventHandler->formatEventsDate($pendingEvent, 'd/m/Y');
-
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_PENDING_EVENT . '</legend>';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
-        //        echo '<img src="../assets/images/icons/on.png"  />&nbsp;&nbsp;'._AM_EXTCAL_INFO_APPROVE_PENDING_EVENT.'<br />';
-        echo '<img src=' . $pathIcon16 . '/edit.png />&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br />';
-        echo '<img src=' . $pathIcon16 . '/delete.png />&nbsp;&nbsp;' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br />';
-        echo '</fieldset><br />';
-
-        echo '<table class="outer" style="width:100%;">';
-        echo '<tr style="text-align:center;">';
-        echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
-        echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
-        echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
-        echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
-        echo '</tr>';
-
-        if (count($pendingEvent) > 0) {
-            $i = 0;
-            foreach ($pendingEvent as $event) {
-                $class = (++$i % 2 == 0) ? 'even' : 'odd';
-                echo '<tr style="text-align:center;" class="' . $class . '">';
-                echo '<td>' . $event['cat']['cat_name'] . '</td>';
-                echo '<td>' . $event['event_title'] . '</td>';
-                echo '<td>' . $event['formated_event_start'] . '</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 /></a>&nbsp;&nbsp;';
-                echo '<a href="event.php?op=delete&amp;event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/delete.png /></a>';
-                echo '</td>';
-                echo '</tr>';
+        default:
+        case 'default':
+            // @author      Gregory Mage (Aka Mage)
+            //***************************************************************************************
+            xoops_cp_header();
+            //        include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
+            $catHandler   = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+            $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+            $indexAdmin   = new ModuleAdmin();
+            $indexAdmin->addInfoBox(_MI_EXTCAL_DASHBOARD);
+            $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount(), 'Green');
+            $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
+            $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_PENDING . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 0)), 'Red');
+            $criteriaCompo = new CriteriaCompo();
+            $criteriaCompo->add(new Criteria('event_approved', 1));
+            $criteriaCompo->add(new Criteria('event_start', time(), '>='));
+            $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_APPROVED . '</infolabel><infotext>', $eventHandler->getCount($criteriaCompo) . '</infotext>', 'Green');
+
+            $indexAdmin->addConfigBoxLine();
+            $indexAdmin->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
+            $indexAdmin->addConfigBoxLine(_EXTCAL_PEAR_ROOT, 'folder');
+
+            //JJD
+            //         $indexAdmin->addConfigBoxLine(XOOPS_ROOT_PATH,'folder');
+
+            //        $indexAdmin->addLineConfigLabel(_AM_EXTCAL_CONFIG_PHP, $xoopsModule->getInfo("min_php"), 'php');
+            //        $indexAdmin->addLineConfigLabel(_AM_EXTCAL_CONFIG_XOOPS, $xoopsModule->getInfo("min_xoops"), 'xoops');
+            echo $indexAdmin->addNavigation(basename(__FILE__));
+            echo $indexAdmin->renderIndex();
+            //***************************************************************************************
+            $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), array('cat_id'));
+            $eventHandler->formatEventsDate($pendingEvent, 'd/m/Y');
+
+            echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_PENDING_EVENT . '</legend>';
+            echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+            //        echo '<img src="../assets/images/icons/on.png"  />&nbsp;&nbsp;'._AM_EXTCAL_INFO_APPROVE_PENDING_EVENT.'<br />';
+            echo '<img src=' . $pathIcon16 . '/edit.png />&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br />';
+            echo '<img src=' . $pathIcon16 . '/delete.png />&nbsp;&nbsp;' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br />';
+            echo '</fieldset><br />';
+
+            echo '<table class="outer" style="width:100%;">';
+            echo '<tr style="text-align:center;">';
+            echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
+            echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
+            echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
+            echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
+            echo '</tr>';
+
+            if (count($pendingEvent) > 0) {
+                $i = 0;
+                foreach ($pendingEvent as $event) {
+                    $class = (++$i % 2 == 0) ? 'even' : 'odd';
+                    echo '<tr style="text-align:center;" class="' . $class . '">';
+                    echo '<td>' . $event['cat']['cat_name'] . '</td>';
+                    echo '<td>' . $event['event_title'] . '</td>';
+                    echo '<td>' . $event['formated_event_start'] . '</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 /></a>&nbsp;&nbsp;';
+                    echo '<a href="event.php?op=delete&amp;event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/delete.png /></a>';
+                    echo '</td>';
+                    echo '</tr>';
+                }
+            } else {
+                echo '<tr><td colspan="4">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
             }
-        } else {
-            echo '<tr><td colspan="4">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
-        }
 
-        echo '</table></fieldset><br />';
+            echo '</table></fieldset><br />';
 
-        include_once __DIR__ . '/admin_footer.php';
+            include_once __DIR__ . '/admin_footer.php';
 
-        break;
+            break;
 }

Spacing +29 added lines, -29 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-include dirname(dirname(dirname(__DIR__))) . '/class/xoopsformloader.php';
-include_once __DIR__ . '/admin_header.php';
+include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+include dirname(dirname(dirname(__DIR__))).'/class/xoopsformloader.php';
+include_once __DIR__.'/admin_header.php';
 
 function extgalleryLastVersion()
 {
@@ -41,7 +41,7 @@ 
             case 'send':
 
                 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;
                 }
                 xoops_cp_header();
@@ -75,7 +75,7 @@ 
                     'EV_TITLE' => $event->getVar('event_title'),
                     'EV_START' => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_start')),
                     'EV_END'   => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_end')),
-                    'EV_LINK'  => XOOPS_URL . '/modules/extcal/event.php?event=' . $event->getVar('event_id'));
+                    'EV_LINK'  => XOOPS_URL.'/modules/extcal/event.php?event='.$event->getVar('event_id'));
                 $xoopsMailer->assign($tag);
                 $xoopsMailer->send(true);
                 echo $xoopsMailer->getSuccess();
@@ -91,14 +91,14 @@ 
                 xoops_cp_header();
 
                 $fromemail      = !empty($xoopsConfig['adminmail']) ? $xoopsConfig['adminmail'] : $xoopsUser->getVar('email', 'E');
-                $subjectCaption = _AM_EXTCAL_SUBJECT . "<br /><br /><span style='font-size:x-small;font-weight:bold;'>" . _AM_EXTCAL_USEFUL_TAGS . "</span><br /><span style='font-size:x-small;font-weight:normal;'>" . _AM_EXTCAL_MAILTAGS6 . '<br />' . _AM_EXTCAL_MAILTAGS2 . '</span>&nbsp;&nbsp;&nbsp;';
-                $bodyCaption    = _AM_EXTCAL_BODY . "<br /><br /><span style='font-size:x-small;font-weight:bold;'>" . _AM_EXTCAL_USEFUL_TAGS . "</span><br /><span style='font-size:x-small;font-weight:normal;'>" . _AM_EXTCAL_MAILTAGS1 . '<br />' . _AM_EXTCAL_MAILTAGS2 . '<br />' . _AM_EXTCAL_MAILTAGS3 . '<br />' . _AM_EXTCAL_MAILTAGS4 . '<br />' . _AM_EXTCAL_MAILTAGS5 . '<br />' . _AM_EXTCAL_MAILTAGS6 . '<br />' . _AM_EXTCAL_MAILTAGS7 . '<br />' . _AM_EXTCAL_MAILTAGS8 . '<br />' . _AM_EXTCAL_MAILTAGS9 . '</span>&nbsp;&nbsp;&nbsp;';
+                $subjectCaption = _AM_EXTCAL_SUBJECT."<br /><br /><span style='font-size:x-small;font-weight:bold;'>"._AM_EXTCAL_USEFUL_TAGS."</span><br /><span style='font-size:x-small;font-weight:normal;'>"._AM_EXTCAL_MAILTAGS6.'<br />'._AM_EXTCAL_MAILTAGS2.'</span>&nbsp;&nbsp;&nbsp;';
+                $bodyCaption    = _AM_EXTCAL_BODY."<br /><br /><span style='font-size:x-small;font-weight:bold;'>"._AM_EXTCAL_USEFUL_TAGS."</span><br /><span style='font-size:x-small;font-weight:normal;'>"._AM_EXTCAL_MAILTAGS1.'<br />'._AM_EXTCAL_MAILTAGS2.'<br />'._AM_EXTCAL_MAILTAGS3.'<br />'._AM_EXTCAL_MAILTAGS4.'<br />'._AM_EXTCAL_MAILTAGS5.'<br />'._AM_EXTCAL_MAILTAGS6.'<br />'._AM_EXTCAL_MAILTAGS7.'<br />'._AM_EXTCAL_MAILTAGS8.'<br />'._AM_EXTCAL_MAILTAGS9.'</span>&nbsp;&nbsp;&nbsp;';
                 $toCheckBbox    = new XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, 'mail_send_to', 'mail');
                 $toCheckBox->addOption('mail', _AM_EXTCAL_EMAIL);
                 $toCheckBox->addOption('pm', _AM_EXTCAL_PM);
 
-                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 _AM_EXTCAL_INFO_SEND_NOTIF;
                 echo '</fieldset><br />';
                 $form = new XoopsThemeForm(_AM_EXTCAL_SEND_NOTIFICATION, 'mailusers', 'index.php?op=notification&amp;fct=send', 'post', true);
@@ -130,13 +130,13 @@ 
         $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
         $indexAdmin   = new ModuleAdmin();
         $indexAdmin->addInfoBox(_MI_EXTCAL_DASHBOARD);
-        $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount(), 'Green');
-        $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
-        $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_PENDING . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 0)), 'Red');
+        $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_CATEGORIES.'</infolabel>', $catHandler->getCount(), 'Green');
+        $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_EVENT.'</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
+        $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_PENDING.'</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 0)), 'Red');
         $criteriaCompo = new CriteriaCompo();
         $criteriaCompo->add(new Criteria('event_approved', 1));
         $criteriaCompo->add(new Criteria('event_start', time(), '>='));
-        $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_APPROVED . '</infolabel><infotext>', $eventHandler->getCount($criteriaCompo) . '</infotext>', 'Green');
+        $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_APPROVED.'</infolabel><infotext>', $eventHandler->getCount($criteriaCompo).'</infotext>', 'Green');
 
         $indexAdmin->addConfigBoxLine();
         $indexAdmin->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
@@ -153,42 +153,42 @@ 
         $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), array('cat_id'));
         $eventHandler->formatEventsDate($pendingEvent, 'd/m/Y');
 
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_PENDING_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_PENDING_EVENT.'</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         //        echo '<img src="../assets/images/icons/on.png"  />&nbsp;&nbsp;'._AM_EXTCAL_INFO_APPROVE_PENDING_EVENT.'<br />';
-        echo '<img src=' . $pathIcon16 . '/edit.png />&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br />';
-        echo '<img src=' . $pathIcon16 . '/delete.png />&nbsp;&nbsp;' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br />';
+        echo '<img src='.$pathIcon16.'/edit.png />&nbsp;&nbsp;'._AM_EXTCAL_INFO_EDIT_PENDING_EVENT.'<br />';
+        echo '<img src='.$pathIcon16.'/delete.png />&nbsp;&nbsp;'._AM_EXTCAL_INFO_DELETE_PENDING_EVENT.'<br />';
         echo '</fieldset><br />';
 
         echo '<table class="outer" style="width:100%;">';
         echo '<tr style="text-align:center;">';
-        echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
-        echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
-        echo '<th>' . _AM_EXTCAL_START_DATE . '</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_ACTION.'</th>';
         echo '</tr>';
 
         if (count($pendingEvent) > 0) {
             $i = 0;
             foreach ($pendingEvent as $event) {
                 $class = (++$i % 2 == 0) ? 'even' : 'odd';
-                echo '<tr style="text-align:center;" class="' . $class . '">';
-                echo '<td>' . $event['cat']['cat_name'] . '</td>';
-                echo '<td>' . $event['event_title'] . '</td>';
-                echo '<td>' . $event['formated_event_start'] . '</td>';
+                echo '<tr style="text-align:center;" class="'.$class.'">';
+                echo '<td>'.$event['cat']['cat_name'].'</td>';
+                echo '<td>'.$event['event_title'].'</td>';
+                echo '<td>'.$event['formated_event_start'].'</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 /></a>&nbsp;&nbsp;';
-                echo '<a href="event.php?op=delete&amp;event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/delete.png /></a>';
+                echo '<a href="event.php?op=modify&amp;event_id='.$event['event_id'].'"><img src='.$pathIcon16.'/edit.png /></a>&nbsp;&nbsp;';
+                echo '<a href="event.php?op=delete&amp;event_id='.$event['event_id'].'"><img src='.$pathIcon16.'/delete.png /></a>';
                 echo '</td>';
                 echo '</tr>';
             }
         } else {
-            echo '<tr><td colspan="4">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
+            echo '<tr><td colspan="4">'._AM_EXTCAL_NO_PENDING_EVENT.'</td></tr>';
         }
 
         echo '</table></fieldset><br />';
 
-        include_once __DIR__ . '/admin_footer.php';
+        include_once __DIR__.'/admin_footer.php';
 
         break;
 }

admin/etablissement.php

Spacing +37 added lines, -37 removed lines

@@ -18,18 +18,18 @@ 
  */
 
 // Include xoops admin header
-include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-include_once XOOPS_ROOT_PATH . '/modules/extcal/class/ExtcalPersistableObjectHandler.php';
-include_once(XOOPS_ROOT_PATH . '/kernel/module.php');
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-include_once XOOPS_ROOT_PATH . '/class/tree.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-include_once XOOPS_ROOT_PATH . '/modules/extcal/class/etablissement.php';
-include_once XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php';
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
-include_once(XOOPS_ROOT_PATH . '/class/uploader.php');
-include_once __DIR__ . '/admin_header.php';
+include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+include_once XOOPS_ROOT_PATH.'/modules/extcal/class/ExtcalPersistableObjectHandler.php';
+include_once(XOOPS_ROOT_PATH.'/kernel/module.php');
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+include_once XOOPS_ROOT_PATH.'/class/tree.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+include_once XOOPS_ROOT_PATH.'/modules/extcal/class/etablissement.php';
+include_once XOOPS_ROOT_PATH.'/modules/extcal/include/constantes.php';
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php';
+include_once(XOOPS_ROOT_PATH.'/class/uploader.php');
+include_once __DIR__.'/admin_header.php';
 
 //include_once("functions.php");
 //include_once("../include/functions.php");
@@ -37,10 +37,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
@@ -98,7 +98,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 = '';
@@ -107,11 +107,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) {
@@ -121,21 +121,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
@@ -154,7 +154,7 @@ 
                 redirect_header('etablissement.php', 1, _AM_EXTCAL_REDIRECT_DELOK);
             }
         } else {
-            xoops_confirm(array('ok' => 1, 'etablissement_id' => $_REQUEST['etablissement_id'], 'op' => 'delete_etablissement'), $_SERVER['REQUEST_URI'], _AM_EXTCAL_ETABLISSEMENT_SURDEL . '<br>');
+            xoops_confirm(array('ok' => 1, 'etablissement_id' => $_REQUEST['etablissement_id'], 'op' => 'delete_etablissement'), $_SERVER['REQUEST_URI'], _AM_EXTCAL_ETABLISSEMENT_SURDEL.'<br>');
         }
         break;
 
@@ -174,9 +174,9 @@ 
             redirect_header('etablissement.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
         }
         if (isset($_REQUEST['etablissement_id'])) {
-            $obj =& $etablissementHandler->get($_REQUEST['etablissement_id']);
+            $obj = & $etablissementHandler->get($_REQUEST['etablissement_id']);
         } else {
-            $obj =& $etablissementHandler->create();
+            $obj = & $etablissementHandler->create();
         }
 
         $obj->setVar('nom', $_REQUEST['nom']);
@@ -196,11 +196,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 ($delimg == 0 && !empty($_REQUEST['xoops_upload_file'][0])) {
             $upload = new XoopsMediaUploader($uploaddir_etablissement, array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png'), 3145728, null, null);
             if ($upload->fetchMedia($_REQUEST['xoops_upload_file'][0])) {
@@ -217,7 +217,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);
@@ -237,4 +237,4 @@ 
         break;
 }
 
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';

admin/upgrade.php

Spacing +20 added lines, -20 removed lines

@@ -5,8 +5,8 @@ 
     $step = $_POST['step'];
 }
 
-include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-include __DIR__ . '/function.php';
+include_once dirname(dirname(dirname(__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) {
 
@@ -33,12 +33,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) {
@@ -52,10 +52,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)) {
@@ -79,35 +79,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 dirname(__DIR__) . '/class/pcltar.lib.php';
+        $gPcltarLibDir = XOOPS_ROOT_PATH.'/modules/'.$localModuleDir.'/class';
+        include dirname(__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);
                 }
             }
 
@@ -115,7 +115,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();