Inspection of "updates (short array)" - mambax7/extcal - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( ec1681...68c045 )

by Michael

created 2017-09-07 05:41 UTC

Status

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -87,27 +87,27 @@
 block discarded – undo
                 $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;';
+                                    . "<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);

Please login to merge, or discard this patch.

Switch Indentation +70 added lines, -70 removed lines patch added patch discarded remove patch

@@ -33,8 +33,8 @@  discard block
 block discarded – undo
 }
 
 switch ($op) {
-    case 'notification':
-        switch ($fct) {
+        case 'notification':
+            switch ($fct) {
             case 'send':
                 if (!$GLOBALS['xoopsSecurity']->check()) {
                     redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
@@ -130,78 +130,78 @@  discard block
 block discarded – undo
                 xoops_cp_footer();
 
                 break;
-        }
+            }
         break;
 
-    default:
-    case 'default':
-        // @author      Gregory Mage (Aka Mage)
-        //***************************************************************************************
-        xoops_cp_header();
-        //        require_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);
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->addInfoBox(_MI_EXTCAL_DASHBOARD);
-        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount(), 'Green');
-        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
-        $adminObject->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(), '>='));
-        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_APPROVED . '</infolabel><infotext>', $eventHandler->getCount($criteriaCompo) . '</infotext>', 'Green');
-
-        $adminObject->addConfigBoxLine();
-        $adminObject->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
-        $adminObject->addConfigBoxLine(_EXTCAL_PEAR_ROOT, 'folder');
-
-        //JJD
-        //         $adminObject->addConfigBoxLine(XOOPS_ROOT_PATH,'folder');
-
-        //        $adminObject->addLineConfigLabel(_AM_EXTCAL_CONFIG_PHP, $xoopsModule->getInfo("min_php"), 'php');
-        //        $adminObject->addLineConfigLabel(_AM_EXTCAL_CONFIG_XOOPS, $xoopsModule->getInfo("min_xoops"), 'xoops');
-        $adminObject->displayNavigation(basename(__FILE__));
-        $adminObject->displayIndex();
-        //***************************************************************************************
-        $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), ['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();
+            //        require_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);
+            $adminObject = \Xmf\Module\Admin::getInstance();
+            $adminObject->addInfoBox(_MI_EXTCAL_DASHBOARD);
+            $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount(), 'Green');
+            $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
+            $adminObject->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(), '>='));
+            $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_APPROVED . '</infolabel><infotext>', $eventHandler->getCount($criteriaCompo) . '</infotext>', 'Green');
+
+            $adminObject->addConfigBoxLine();
+            $adminObject->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
+            $adminObject->addConfigBoxLine(_EXTCAL_PEAR_ROOT, 'folder');
+
+            //JJD
+            //         $adminObject->addConfigBoxLine(XOOPS_ROOT_PATH,'folder');
+
+            //        $adminObject->addLineConfigLabel(_AM_EXTCAL_CONFIG_PHP, $xoopsModule->getInfo("min_php"), 'php');
+            //        $adminObject->addLineConfigLabel(_AM_EXTCAL_CONFIG_XOOPS, $xoopsModule->getInfo("min_xoops"), 'xoops');
+            $adminObject->displayNavigation(basename(__FILE__));
+            $adminObject->displayIndex();
+            //***************************************************************************************
+            $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), ['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>';
 
-        require_once __DIR__ . '/admin_footer.php';
+            require_once __DIR__ . '/admin_footer.php';
 
-        break;
+            break;
 }

Please login to merge, or discard this patch.

Spacing +29 added lines, -29 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?php
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-include __DIR__ . '/../../../class/xoopsformloader.php';
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+include __DIR__.'/../../../class/xoopsformloader.php';
+require_once __DIR__.'/admin_header.php';
 
 function extgalleryLastVersion()
 {
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
         switch ($fct) {
             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()));
                 }
                 xoops_cp_header();
                 adminMenu(1);
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
                     '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);
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
             default:
                 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;';
+                $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
@@ -108,12 +108,12 @@  discard block
 block discarded – undo
                                   . '<br>'
                                   . _AM_EXTCAL_MAILTAGS9
                                   . '</span>&nbsp;&nbsp;&nbsp;';
-                $toCheckBbox    = new XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, 'mail_send_to', 'mail');
+                $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);
@@ -143,13 +143,13 @@  discard block
 block discarded – undo
         //        $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
         $adminObject = \Xmf\Module\Admin::getInstance();
         $adminObject->addInfoBox(_MI_EXTCAL_DASHBOARD);
-        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount(), 'Green');
-        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
-        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_PENDING . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 0)), 'Red');
+        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_CATEGORIES.'</infolabel>', $catHandler->getCount(), 'Green');
+        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_EVENT.'</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
+        $adminObject->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(), '>='));
-        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_APPROVED . '</infolabel><infotext>', $eventHandler->getCount($criteriaCompo) . '</infotext>', 'Green');
+        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_APPROVED.'</infolabel><infotext>', $eventHandler->getCount($criteriaCompo).'</infotext>', 'Green');
 
         $adminObject->addConfigBoxLine();
         $adminObject->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
@@ -166,42 +166,42 @@  discard block
 block discarded – undo
         $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), ['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>';
 
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
 
         break;
 }

Please login to merge, or discard this patch.

include/install_function.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -9,15 +9,15 @@
 block discarded – undo
 {
 
     // Create eXtCal upload directory
-    $dir = XOOPS_ROOT_PATH . '/uploads/extcal';
+    $dir = XOOPS_ROOT_PATH.'/uploads/extcal';
     if (!is_dir($dir)) {
         mkdir($dir);
-        mkdir($dir . '/etablissement');
+        mkdir($dir.'/etablissement');
 
         // Copy index.html files on uploads folders
-        $indexFile = __DIR__ . '/index.html';
-        copy($indexFile, $dir . '/index.html');
-        copy($indexFile, $dir . '/etablissement/index.html');
+        $indexFile = __DIR__.'/index.html';
+        copy($indexFile, $dir.'/index.html');
+        copy($indexFile, $dir.'/etablissement/index.html');
     }
 
     $moduleId               = $xoopsModule->getVar('mid');

Please login to merge, or discard this patch.

class/form/extcalform.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,9 +1,9 @@
 block discarded – undo
 <?php
 
-include __DIR__ . '/formdatetime.php';
-include __DIR__ . '/formrecurrules.php';
-include __DIR__ . '/formfilecheckbox.php';
-include __DIR__ . '/formrrulecheckbox.php';
+include __DIR__.'/formdatetime.php';
+include __DIR__.'/formrecurrules.php';
+include __DIR__.'/formfilecheckbox.php';
+include __DIR__.'/formrrulecheckbox.php';
 
 /**
  * Class ExtcalThemeForm.

Please login to merge, or discard this patch.

class/form/formrecurrules.php 1 patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -66,45 +66,45 @@  discard block
 block discarded – undo
         $formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
         $formObject->addOption('none', _MD_EXTCAL_NO_RECCUR_EVENT);
         $ret .= $formObject->render();
-        $ret .= '<br><br><fieldset><legend>' . _MD_EXTCAL_RECCUR_POLICY . '</legend><fieldset><legend>';
+        $ret .= '<br><br><fieldset><legend>'._MD_EXTCAL_RECCUR_POLICY.'</legend><fieldset><legend>';
 
         $formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
         $formObject->addOption('daily', _MD_EXTCAL_DAILY);
         $ret .= $formObject->render();
-        $ret .= '</legend>' . _MD_EXTCAL_DURING . ' ';
+        $ret .= '</legend>'._MD_EXTCAL_DURING.' ';
 
         $formObject = new XoopsFormText('', 'rrule_daily_interval', 3, 2, $this->_rrule_daily_interval);
         $ret        .= $formObject->render();
-        $ret        .= ' ' . _MD_EXTCAL_DAYS . '</fieldset><br><fieldset><legend>';
+        $ret        .= ' '._MD_EXTCAL_DAYS.'</fieldset><br><fieldset><legend>';
 
         $formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
         $formObject->addOption('weekly', _MD_EXTCAL_WEEKLY);
         $ret .= $formObject->render();
-        $ret .= '</legend>' . _MD_EXTCAL_DURING . ' ';
+        $ret .= '</legend>'._MD_EXTCAL_DURING.' ';
 
         $formObject = new XoopsFormText('', 'rrule_weekly_interval', 3, 2, $this->_rrule_weekly_interval);
         $ret        .= $formObject->render();
-        $ret        .= ' ' . _MD_EXTCAL_WEEKS . '<br>';
+        $ret        .= ' '._MD_EXTCAL_WEEKS.'<br>';
 
         $formObject = new XoopsFormCheckBox('', 'rrule_weekly_bydays', $this->_rrule_weekly_bydays);
-        $formObject->addOption('MO', _MD_EXTCAL_MO2 . '&nbsp;');
-        $formObject->addOption('TU', _MD_EXTCAL_TU2 . '&nbsp;');
-        $formObject->addOption('WE', _MD_EXTCAL_WE2 . '&nbsp;');
-        $formObject->addOption('TH', _MD_EXTCAL_TH2 . '&nbsp;');
-        $formObject->addOption('FR', _MD_EXTCAL_FR2 . '&nbsp;');
-        $formObject->addOption('SA', _MD_EXTCAL_SA2 . '&nbsp;');
-        $formObject->addOption('SU', _MD_EXTCAL_SU2 . '&nbsp;');
+        $formObject->addOption('MO', _MD_EXTCAL_MO2.'&nbsp;');
+        $formObject->addOption('TU', _MD_EXTCAL_TU2.'&nbsp;');
+        $formObject->addOption('WE', _MD_EXTCAL_WE2.'&nbsp;');
+        $formObject->addOption('TH', _MD_EXTCAL_TH2.'&nbsp;');
+        $formObject->addOption('FR', _MD_EXTCAL_FR2.'&nbsp;');
+        $formObject->addOption('SA', _MD_EXTCAL_SA2.'&nbsp;');
+        $formObject->addOption('SU', _MD_EXTCAL_SU2.'&nbsp;');
         $ret .= $formObject->render();
         $ret .= '</fieldset><br><fieldset><legend>';
 
         $formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
         $formObject->addOption('monthly', _MD_EXTCAL_MONTHLY);
         $ret .= $formObject->render();
-        $ret .= '</legend>' . _MD_EXTCAL_DURING . ' ';
+        $ret .= '</legend>'._MD_EXTCAL_DURING.' ';
 
         $formObject = new XoopsFormText('', 'rrule_monthly_interval', 3, 2, $this->_rrule_monthly_interval);
         $ret        .= $formObject->render();
-        $ret        .= ' ' . _MD_EXTCAL_MONTH . ', ' . _MD_EXTCAL_ON . ' ';
+        $ret        .= ' '._MD_EXTCAL_MONTH.', '._MD_EXTCAL_ON.' ';
 
         $formObject = new XoopsFormSelect('', 'rrule_monthly_byday', $this->_rrule_monthly_byday);
         $formObject->addOption('', '&nbsp;');
@@ -144,20 +144,20 @@  discard block
 block discarded – undo
         $formObject->addOption('-1SA', _MD_EXTCAL_LAST_SA);
         $formObject->addOption('-1SU', _MD_EXTCAL_LAST_SU);
         $ret .= $formObject->render();
-        $ret .= ' ' . _MD_EXTCAL_OR_THE . ' ';
+        $ret .= ' '._MD_EXTCAL_OR_THE.' ';
 
         $formObject = new XoopsFormText('', 'rrule_bymonthday', 3, 2, $this->_rrule_bymonthday);
         $ret        .= $formObject->render();
-        $ret        .= ' ' . _MD_EXTCAL_DAY_NUM_MONTH . '</fieldset><br><fieldset><legend>';
+        $ret        .= ' '._MD_EXTCAL_DAY_NUM_MONTH.'</fieldset><br><fieldset><legend>';
 
         $formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
         $formObject->addOption('yearly', _MD_EXTCAL_YEARLY);
         $ret .= $formObject->render();
-        $ret .= '</legend>' . _MD_EXTCAL_DURING . ' ';
+        $ret .= '</legend>'._MD_EXTCAL_DURING.' ';
 
         $formObject = new XoopsFormText('', 'rrule_yearly_interval', 3, 2, $this->_rrule_yearly_interval);
         $ret        .= $formObject->render();
-        $ret        .= ' ' . _MD_EXTCAL_YEARS . '<br>';
+        $ret        .= ' '._MD_EXTCAL_YEARS.'<br>';
 
         $formObject = new ExtcalFormRRuleCheckBox('', 'rrule_yearly_bymonths', $this->_rrule_yearly_bymonths);
         $formObject->addOption('1', _MD_EXTCAL_JAN);

Please login to merge, or discard this patch.

class/pclerror.lib.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -138,7 +138,7 @@
 block discarded – undo
         global $g_pcl_error_string;
         global $g_pcl_error_code;
 
-        return $g_pcl_error_string . " [code $g_pcl_error_code]";
+        return $g_pcl_error_string." [code $g_pcl_error_code]";
     }
 
     // --------------------------------------------------------------------------------

Please login to merge, or discard this patch.

class/pear/Calendar/Factory.php 1 patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -50,7 +50,7 @@  discard block
 block discarded – undo
 /**
  * Load Calendar base class.
  */
-require_once CALENDAR_ROOT . 'Calendar.php';
+require_once CALENDAR_ROOT.'Calendar.php';
 
 /**
  * Contains a factory method to return a Singleton instance of a class
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
         $firstDay = defined('CALENDAR_FIRST_DAY_OF_WEEK') ? CALENDAR_FIRST_DAY_OF_WEEK : 1;
         switch ($type) {
             case 'Day':
-                require_once CALENDAR_ROOT . 'Day.php';
+                require_once CALENDAR_ROOT.'Day.php';
 
                 return new Calendar_Day($y, $m, $d);
             case 'Month':
@@ -107,44 +107,44 @@  discard block
 block discarded – undo
                 }
                 switch (CALENDAR_MONTH_STATE) {
                     case CALENDAR_USE_MONTH_WEEKDAYS:
-                        require_once CALENDAR_ROOT . 'Month/Weekdays.php';
+                        require_once CALENDAR_ROOT.'Month/Weekdays.php';
                         $class = 'Calendar_Month_Weekdays';
                         break;
                     case CALENDAR_USE_MONTH_WEEKS:
-                        require_once CALENDAR_ROOT . 'Month/Weeks.php';
+                        require_once CALENDAR_ROOT.'Month/Weeks.php';
                         $class = 'Calendar_Month_Weeks';
                         break;
                     case CALENDAR_USE_MONTH:
                     default:
-                        require_once CALENDAR_ROOT . 'Month.php';
+                        require_once CALENDAR_ROOT.'Month.php';
                         $class = 'Calendar_Month';
                         break;
                 }
 
                 return new $class($y, $m, $firstDay);
             case 'Week':
-                require_once CALENDAR_ROOT . 'Week.php';
+                require_once CALENDAR_ROOT.'Week.php';
 
                 return new Calendar_Week($y, $m, $d, $firstDay);
             case 'Hour':
-                require_once CALENDAR_ROOT . 'Hour.php';
+                require_once CALENDAR_ROOT.'Hour.php';
 
                 return new Calendar_Hour($y, $m, $d, $h);
             case 'Minute':
-                require_once CALENDAR_ROOT . 'Minute.php';
+                require_once CALENDAR_ROOT.'Minute.php';
 
                 return new Calendar_Minute($y, $m, $d, $h, $i);
             case 'Second':
-                require_once CALENDAR_ROOT . 'Second.php';
+                require_once CALENDAR_ROOT.'Second.php';
 
                 return new Calendar_Second($y, $m, $d, $h, $i, $s);
             case 'Year':
-                require_once CALENDAR_ROOT . 'Year.php';
+                require_once CALENDAR_ROOT.'Year.php';
 
                 return new Calendar_Year($y);
             default:
-                require_once __DIR__ . '/PEAR.php';
-                PEAR::raiseError('Calendar_Factory::create() unrecognised type: ' . $type, null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()');
+                require_once __DIR__.'/PEAR.php';
+                PEAR::raiseError('Calendar_Factory::create() unrecognised type: '.$type, null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()');
 
                 return false;
         }

Please login to merge, or discard this patch.

class/pear/Calendar/tests/decorator_test.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@
 block discarded – undo
 <?php
 //
 
-require_once __DIR__ . '/simple_include.php';
-require_once __DIR__ . '/calendar_include.php';
+require_once __DIR__.'/simple_include.php';
+require_once __DIR__.'/calendar_include.php';
 
 Mock::generate('Calendar_Engine_Interface', 'Mock_Calendar_Engine');
 Mock::generate('Calendar_Second', 'Mock_Calendar_Second');

Please login to merge, or discard this patch.

class/pear/Calendar/tests/second_test.php 2 patches

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,10 +1,10 @@
 block discarded – undo
 <?php
 //
 
-require_once __DIR__ . '/simple_include.php';
-require_once __DIR__ . '/calendar_include.php';
+require_once __DIR__.'/simple_include.php';
+require_once __DIR__.'/calendar_include.php';
 
-require_once __DIR__ . '/./calendar_test.php';
+require_once __DIR__.'/./calendar_test.php';
 
 /**
  * Class TestOfSecond.

Please login to merge, or discard this patch.

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -27,13 +27,13 @@
 block discarded – undo
     public function testPrevDay_Array()
     {
         $this->assertEqual([
-                               'year'   => 2003,
-                               'month'  => 10,
-                               'day'    => 24,
-                               'hour'   => 0,
-                               'minute' => 0,
-                               'second' => 0,
-                           ], $this->cal->prevDay('array'));
+                                'year'   => 2003,
+                                'month'  => 10,
+                                'day'    => 24,
+                                'hour'   => 0,
+                                'minute' => 0,
+                                'second' => 0,
+                            ], $this->cal->prevDay('array'));
     }
 }
 

Please login to merge, or discard this patch.

class/pear/Calendar/tests/all_tests.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -1,19 +1,19 @@
 block discarded – undo
 <?php
 //
 
-require_once __DIR__ . '/simple_include.php';
-require_once __DIR__ . '/calendar_include.php';
+require_once __DIR__.'/simple_include.php';
+require_once __DIR__.'/calendar_include.php';
 
 define('TEST_RUNNING', true);
 
-require_once __DIR__ . '/calendar_tests.php';
-require_once __DIR__ . '/calendar_tabular_tests.php';
-require_once __DIR__ . '/validator_tests.php';
-require_once __DIR__ . '/calendar_engine_tests.php';
-require_once __DIR__ . '/calendar_engine_tests.php';
-require_once __DIR__ . '/table_helper_tests.php';
-require_once __DIR__ . '/decorator_tests.php';
-require_once __DIR__ . '/util_tests.php';
+require_once __DIR__.'/calendar_tests.php';
+require_once __DIR__.'/calendar_tabular_tests.php';
+require_once __DIR__.'/validator_tests.php';
+require_once __DIR__.'/calendar_engine_tests.php';
+require_once __DIR__.'/calendar_engine_tests.php';
+require_once __DIR__.'/table_helper_tests.php';
+require_once __DIR__.'/decorator_tests.php';
+require_once __DIR__.'/util_tests.php';
 
 /**
  * Class AllTests.

Please login to merge, or discard this patch.

		@@ -33,8 +33,8 @@ discard block
		block discarded – undo
33	33	}
34	34
35	35	switch ($op) {
36		- case 'notification':
37		- switch ($fct) {
	36	+ case 'notification':
	37	+ switch ($fct) {
38	38	case 'send':
39	39	if (!$GLOBALS['xoopsSecurity']->check()) {
40	40	redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
		@@ -130,78 +130,78 @@ discard block
		block discarded – undo
130	130	xoops_cp_footer();
131	131
132	132	break;
133		- }
	133	+ }
134	134	break;
135	135
136		- default:
137		- case 'default':
138		- // @author Gregory Mage (Aka Mage)
139		- //***************************************************************************************
140		- xoops_cp_header();
141		- // require_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
142		- // $catHandler = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
143		- // $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
144		- $adminObject = \Xmf\Module\Admin::getInstance();
145		- $adminObject->addInfoBox(_MI_EXTCAL_DASHBOARD);
146		- $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount(), 'Green');
147		- $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
148		- $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_PENDING . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 0)), 'Red');
149		- $criteriaCompo = new CriteriaCompo();
150		- $criteriaCompo->add(new Criteria('event_approved', 1));
151		- $criteriaCompo->add(new Criteria('event_start', time(), '>='));
152		- $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_APPROVED . '</infolabel><infotext>', $eventHandler->getCount($criteriaCompo) . '</infotext>', 'Green');
153		-
154		- $adminObject->addConfigBoxLine();
155		- $adminObject->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
156		- $adminObject->addConfigBoxLine(_EXTCAL_PEAR_ROOT, 'folder');
157		-
158		- //JJD
159		- // $adminObject->addConfigBoxLine(XOOPS_ROOT_PATH,'folder');
160		-
161		- // $adminObject->addLineConfigLabel(_AM_EXTCAL_CONFIG_PHP, $xoopsModule->getInfo("min_php"), 'php');
162		- // $adminObject->addLineConfigLabel(_AM_EXTCAL_CONFIG_XOOPS, $xoopsModule->getInfo("min_xoops"), 'xoops');
163		- $adminObject->displayNavigation(basename(__FILE__));
164		- $adminObject->displayIndex();
165		- //***************************************************************************************
166		- $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), ['cat_id']);
167		- $eventHandler->formatEventsDate($pendingEvent, 'd/m/Y');
168		-
169		- echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_PENDING_EVENT . '</legend>';
170		- echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
171		- // echo '<img src="../assets/images/icons/on.png" >  '._AM_EXTCAL_INFO_APPROVE_PENDING_EVENT.'<br>';
172		- echo '<img src=' . $pathIcon16 . '/edit.png>  ' . _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br>';
173		- echo '<img src=' . $pathIcon16 . '/delete.png>  ' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br>';
174		- echo '</fieldset><br>';
175		-
176		- echo '<table class="outer" style="width:100%;">';
177		- echo '<tr style="text-align:center;">';
178		- echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
179		- echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
180		- echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
181		- echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
182		- echo '</tr>';
183		-
184		- if (count($pendingEvent) > 0) {
185		- $i = 0;
186		- foreach ($pendingEvent as $event) {
187		- $class = (++$i % 2 == 0) ? 'even' : 'odd';
188		- echo '<tr style="text-align:center;" class="' . $class . '">';
189		- echo '<td>' . $event['cat']['cat_name'] . '</td>';
190		- echo '<td>' . $event['event_title'] . '</td>';
191		- echo '<td>' . $event['formated_event_start'] . '</td>';
192		- echo '<td style="width:10%; text-align:center;">';
193		- echo '<a href="event.php?op=modify&event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/edit.png></a>  ';
194		- echo '<a href="event.php?op=delete&event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/delete.png></a>';
195		- echo '</td>';
196		- echo '</tr>';
	136	+ default:
	137	+ case 'default':
	138	+ // @author Gregory Mage (Aka Mage)
	139	+ //***************************************************************************************
	140	+ xoops_cp_header();
	141	+ // require_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
	142	+ // $catHandler = xoops_getModuleHandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
	143	+ // $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
	144	+ $adminObject = \Xmf\Module\Admin::getInstance();
	145	+ $adminObject->addInfoBox(_MI_EXTCAL_DASHBOARD);
	146	+ $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount(), 'Green');
	147	+ $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
	148	+ $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_PENDING . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 0)), 'Red');
	149	+ $criteriaCompo = new CriteriaCompo();
	150	+ $criteriaCompo->add(new Criteria('event_approved', 1));
	151	+ $criteriaCompo->add(new Criteria('event_start', time(), '>='));
	152	+ $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_APPROVED . '</infolabel><infotext>', $eventHandler->getCount($criteriaCompo) . '</infotext>', 'Green');
	153	+
	154	+ $adminObject->addConfigBoxLine();
	155	+ $adminObject->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
	156	+ $adminObject->addConfigBoxLine(_EXTCAL_PEAR_ROOT, 'folder');
	157	+
	158	+ //JJD
	159	+ // $adminObject->addConfigBoxLine(XOOPS_ROOT_PATH,'folder');
	160	+
	161	+ // $adminObject->addLineConfigLabel(_AM_EXTCAL_CONFIG_PHP, $xoopsModule->getInfo("min_php"), 'php');
	162	+ // $adminObject->addLineConfigLabel(_AM_EXTCAL_CONFIG_XOOPS, $xoopsModule->getInfo("min_xoops"), 'xoops');
	163	+ $adminObject->displayNavigation(basename(__FILE__));
	164	+ $adminObject->displayIndex();
	165	+ //***************************************************************************************
	166	+ $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), ['cat_id']);
	167	+ $eventHandler->formatEventsDate($pendingEvent, 'd/m/Y');
	168	+
	169	+ echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_PENDING_EVENT . '</legend>';
	170	+ echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
	171	+ // echo '<img src="../assets/images/icons/on.png" >  '._AM_EXTCAL_INFO_APPROVE_PENDING_EVENT.'<br>';
	172	+ echo '<img src=' . $pathIcon16 . '/edit.png>  ' . _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br>';
	173	+ echo '<img src=' . $pathIcon16 . '/delete.png>  ' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br>';
	174	+ echo '</fieldset><br>';
	175	+
	176	+ echo '<table class="outer" style="width:100%;">';
	177	+ echo '<tr style="text-align:center;">';
	178	+ echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
	179	+ echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
	180	+ echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
	181	+ echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
	182	+ echo '</tr>';
	183	+
	184	+ if (count($pendingEvent) > 0) {
	185	+ $i = 0;
	186	+ foreach ($pendingEvent as $event) {
	187	+ $class = (++$i % 2 == 0) ? 'even' : 'odd';
	188	+ echo '<tr style="text-align:center;" class="' . $class . '">';
	189	+ echo '<td>' . $event['cat']['cat_name'] . '</td>';
	190	+ echo '<td>' . $event['event_title'] . '</td>';
	191	+ echo '<td>' . $event['formated_event_start'] . '</td>';
	192	+ echo '<td style="width:10%; text-align:center;">';
	193	+ echo '<a href="event.php?op=modify&event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/edit.png></a>  ';
	194	+ echo '<a href="event.php?op=delete&event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/delete.png></a>';
	195	+ echo '</td>';
	196	+ echo '</tr>';
	197	+ }
	198	+ } else {
	199	+ echo '<tr><td colspan="4">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
197	200	}
198		- } else {
199		- echo '<tr><td colspan="4">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
200		- }
201	201
202		- echo '</table></fieldset><br>';
	202	+ echo '</table></fieldset><br>';
203	203
204		- require_once __DIR__ . '/admin_footer.php';
	204	+ require_once __DIR__ . '/admin_footer.php';
205	205
206		- break;
	206	+ break;
207	207	}

		@@ -1,8 +1,8 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-require_once __DIR__ . '/../../../include/cp_header.php';
4		-include __DIR__ . '/../../../class/xoopsformloader.php';
5		-require_once __DIR__ . '/admin_header.php';
	3	+require_once __DIR__.'/../../../include/cp_header.php';
	4	+include __DIR__.'/../../../class/xoopsformloader.php';
	5	+require_once __DIR__.'/admin_header.php';
6	6
7	7	function extgalleryLastVersion()
8	8	{
		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	switch ($fct) {
38	38	case 'send':
39	39	if (!$GLOBALS['xoopsSecurity']->check()) {
40		- redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
	40	+ redirect_header('index.php', 3, _NOPERM.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
41	41	}
42	42	xoops_cp_header();
43	43	adminMenu(1);
		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70	'EV_TITLE' => $event->getVar('event_title'),
71	71	'EV_START' => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_start')),
72	72	'EV_END' => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_end')),
73		- 'EV_LINK' => XOOPS_URL . '/modules/extcal/event.php?event=' . $event->getVar('event_id'),
	73	+ 'EV_LINK' => XOOPS_URL.'/modules/extcal/event.php?event='.$event->getVar('event_id'),
74	74	];
75	75	$xoopsMailer->assign($tag);
76	76	$xoopsMailer->send(true);
		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85	default:
86	86	xoops_cp_header();
87	87	$fromemail = !empty($xoopsConfig['adminmail']) ? $xoopsConfig['adminmail'] : $xoopsUser->getVar('email', 'E');
88		- $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>   ';
	88	+ $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>   ';
89	89	$bodyCaption = _AM_EXTCAL_BODY
90	90	. "<br><br><span style='font-size:x-small;font-weight:bold;'>"
91	91	. _AM_EXTCAL_USEFUL_TAGS
		@@ -108,12 +108,12 @@ discard block
		block discarded – undo
108	108	. '<br>'
109	109	. _AM_EXTCAL_MAILTAGS9
110	110	. '</span>   ';
111		- $toCheckBbox = new XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, 'mail_send_to', 'mail');
	111	+ $toCheckBbox = new XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, 'mail_send_to', 'mail');
112	112	$toCheckBox->addOption('mail', _AM_EXTCAL_EMAIL);
113	113	$toCheckBox->addOption('pm', _AM_EXTCAL_PM);
114	114
115		- echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
116		- echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
	115	+ echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_APPROVED_EVENT.'</legend>';
	116	+ echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
117	117	echo _AM_EXTCAL_INFO_SEND_NOTIF;
118	118	echo '</fieldset><br>';
119	119	$form = new XoopsThemeForm(_AM_EXTCAL_SEND_NOTIFICATION, 'mailusers', 'index.php?op=notification&fct=send', 'post', true);
		@@ -143,13 +143,13 @@ discard block
		block discarded – undo
143	143	// $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
144	144	$adminObject = \Xmf\Module\Admin::getInstance();
145	145	$adminObject->addInfoBox(_MI_EXTCAL_DASHBOARD);
146		- $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount(), 'Green');
147		- $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
148		- $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_PENDING . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 0)), 'Red');
	146	+ $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_CATEGORIES.'</infolabel>', $catHandler->getCount(), 'Green');
	147	+ $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_EVENT.'</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
	148	+ $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_PENDING.'</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 0)), 'Red');
149	149	$criteriaCompo = new CriteriaCompo();
150	150	$criteriaCompo->add(new Criteria('event_approved', 1));
151	151	$criteriaCompo->add(new Criteria('event_start', time(), '>='));
152		- $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_APPROVED . '</infolabel><infotext>', $eventHandler->getCount($criteriaCompo) . '</infotext>', 'Green');
	152	+ $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_APPROVED.'</infolabel><infotext>', $eventHandler->getCount($criteriaCompo).'</infotext>', 'Green');
153	153
154	154	$adminObject->addConfigBoxLine();
155	155	$adminObject->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
		@@ -166,42 +166,42 @@ discard block
		block discarded – undo
166	166	$pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), ['cat_id']);
167	167	$eventHandler->formatEventsDate($pendingEvent, 'd/m/Y');
168	168
169		- echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_PENDING_EVENT . '</legend>';
170		- echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
	169	+ echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_PENDING_EVENT.'</legend>';
	170	+ echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
171	171	// echo '<img src="../assets/images/icons/on.png" >  '._AM_EXTCAL_INFO_APPROVE_PENDING_EVENT.'<br>';
172		- echo '<img src=' . $pathIcon16 . '/edit.png>  ' . _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br>';
173		- echo '<img src=' . $pathIcon16 . '/delete.png>  ' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br>';
	172	+ echo '<img src='.$pathIcon16.'/edit.png>  '._AM_EXTCAL_INFO_EDIT_PENDING_EVENT.'<br>';
	173	+ echo '<img src='.$pathIcon16.'/delete.png>  '._AM_EXTCAL_INFO_DELETE_PENDING_EVENT.'<br>';
174	174	echo '</fieldset><br>';
175	175
176	176	echo '<table class="outer" style="width:100%;">';
177	177	echo '<tr style="text-align:center;">';
178		- echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
179		- echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
180		- echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
181		- echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
	178	+ echo '<th>'._AM_EXTCAL_CATEGORY.'</th>';
	179	+ echo '<th>'._AM_EXTCAL_TITLE.'</th>';
	180	+ echo '<th>'._AM_EXTCAL_START_DATE.'</th>';
	181	+ echo '<th>'._AM_EXTCAL_ACTION.'</th>';
182	182	echo '</tr>';
183	183
184	184	if (count($pendingEvent) > 0) {
185	185	$i = 0;
186	186	foreach ($pendingEvent as $event) {
187	187	$class = (++$i % 2 == 0) ? 'even' : 'odd';
188		- echo '<tr style="text-align:center;" class="' . $class . '">';
189		- echo '<td>' . $event['cat']['cat_name'] . '</td>';
190		- echo '<td>' . $event['event_title'] . '</td>';
191		- echo '<td>' . $event['formated_event_start'] . '</td>';
	188	+ echo '<tr style="text-align:center;" class="'.$class.'">';
	189	+ echo '<td>'.$event['cat']['cat_name'].'</td>';
	190	+ echo '<td>'.$event['event_title'].'</td>';
	191	+ echo '<td>'.$event['formated_event_start'].'</td>';
192	192	echo '<td style="width:10%; text-align:center;">';
193		- echo '<a href="event.php?op=modify&event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/edit.png></a>  ';
194		- echo '<a href="event.php?op=delete&event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/delete.png></a>';
	193	+ echo '<a href="event.php?op=modify&event_id='.$event['event_id'].'"><img src='.$pathIcon16.'/edit.png></a>  ';
	194	+ echo '<a href="event.php?op=delete&event_id='.$event['event_id'].'"><img src='.$pathIcon16.'/delete.png></a>';
195	195	echo '</td>';
196	196	echo '</tr>';
197	197	}
198	198	} else {
199		- echo '<tr><td colspan="4">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
	199	+ echo '<tr><td colspan="4">'._AM_EXTCAL_NO_PENDING_EVENT.'</td></tr>';
200	200	}
201	201
202	202	echo '</table></fieldset><br>';
203	203
204		- require_once __DIR__ . '/admin_footer.php';
	204	+ require_once __DIR__.'/admin_footer.php';
205	205
206	206	break;
207	207	}

		@@ -66,45 +66,45 @@ discard block
		block discarded – undo
66	66	$formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
67	67	$formObject->addOption('none', _MD_EXTCAL_NO_RECCUR_EVENT);
68	68	$ret .= $formObject->render();
69		- $ret .= '<br><br><fieldset><legend>' . _MD_EXTCAL_RECCUR_POLICY . '</legend><fieldset><legend>';
	69	+ $ret .= '<br><br><fieldset><legend>'._MD_EXTCAL_RECCUR_POLICY.'</legend><fieldset><legend>';
70	70
71	71	$formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
72	72	$formObject->addOption('daily', _MD_EXTCAL_DAILY);
73	73	$ret .= $formObject->render();
74		- $ret .= '</legend>' . _MD_EXTCAL_DURING . ' ';
	74	+ $ret .= '</legend>'._MD_EXTCAL_DURING.' ';
75	75
76	76	$formObject = new XoopsFormText('', 'rrule_daily_interval', 3, 2, $this->_rrule_daily_interval);
77	77	$ret .= $formObject->render();
78		- $ret .= ' ' . _MD_EXTCAL_DAYS . '</fieldset><br><fieldset><legend>';
	78	+ $ret .= ' '._MD_EXTCAL_DAYS.'</fieldset><br><fieldset><legend>';
79	79
80	80	$formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
81	81	$formObject->addOption('weekly', _MD_EXTCAL_WEEKLY);
82	82	$ret .= $formObject->render();
83		- $ret .= '</legend>' . _MD_EXTCAL_DURING . ' ';
	83	+ $ret .= '</legend>'._MD_EXTCAL_DURING.' ';
84	84
85	85	$formObject = new XoopsFormText('', 'rrule_weekly_interval', 3, 2, $this->_rrule_weekly_interval);
86	86	$ret .= $formObject->render();
87		- $ret .= ' ' . _MD_EXTCAL_WEEKS . '<br>';
	87	+ $ret .= ' '._MD_EXTCAL_WEEKS.'<br>';
88	88
89	89	$formObject = new XoopsFormCheckBox('', 'rrule_weekly_bydays', $this->_rrule_weekly_bydays);
90		- $formObject->addOption('MO', _MD_EXTCAL_MO2 . ' ');
91		- $formObject->addOption('TU', _MD_EXTCAL_TU2 . ' ');
92		- $formObject->addOption('WE', _MD_EXTCAL_WE2 . ' ');
93		- $formObject->addOption('TH', _MD_EXTCAL_TH2 . ' ');
94		- $formObject->addOption('FR', _MD_EXTCAL_FR2 . ' ');
95		- $formObject->addOption('SA', _MD_EXTCAL_SA2 . ' ');
96		- $formObject->addOption('SU', _MD_EXTCAL_SU2 . ' ');
	90	+ $formObject->addOption('MO', _MD_EXTCAL_MO2.' ');
	91	+ $formObject->addOption('TU', _MD_EXTCAL_TU2.' ');
	92	+ $formObject->addOption('WE', _MD_EXTCAL_WE2.' ');
	93	+ $formObject->addOption('TH', _MD_EXTCAL_TH2.' ');
	94	+ $formObject->addOption('FR', _MD_EXTCAL_FR2.' ');
	95	+ $formObject->addOption('SA', _MD_EXTCAL_SA2.' ');
	96	+ $formObject->addOption('SU', _MD_EXTCAL_SU2.' ');
97	97	$ret .= $formObject->render();
98	98	$ret .= '</fieldset><br><fieldset><legend>';
99	99
100	100	$formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
101	101	$formObject->addOption('monthly', _MD_EXTCAL_MONTHLY);
102	102	$ret .= $formObject->render();
103		- $ret .= '</legend>' . _MD_EXTCAL_DURING . ' ';
	103	+ $ret .= '</legend>'._MD_EXTCAL_DURING.' ';
104	104
105	105	$formObject = new XoopsFormText('', 'rrule_monthly_interval', 3, 2, $this->_rrule_monthly_interval);
106	106	$ret .= $formObject->render();
107		- $ret .= ' ' . _MD_EXTCAL_MONTH . ', ' . _MD_EXTCAL_ON . ' ';
	107	+ $ret .= ' '._MD_EXTCAL_MONTH.', '._MD_EXTCAL_ON.' ';
108	108
109	109	$formObject = new XoopsFormSelect('', 'rrule_monthly_byday', $this->_rrule_monthly_byday);
110	110	$formObject->addOption('', ' ');
		@@ -144,20 +144,20 @@ discard block
		block discarded – undo
144	144	$formObject->addOption('-1SA', _MD_EXTCAL_LAST_SA);
145	145	$formObject->addOption('-1SU', _MD_EXTCAL_LAST_SU);
146	146	$ret .= $formObject->render();
147		- $ret .= ' ' . _MD_EXTCAL_OR_THE . ' ';
	147	+ $ret .= ' '._MD_EXTCAL_OR_THE.' ';
148	148
149	149	$formObject = new XoopsFormText('', 'rrule_bymonthday', 3, 2, $this->_rrule_bymonthday);
150	150	$ret .= $formObject->render();
151		- $ret .= ' ' . _MD_EXTCAL_DAY_NUM_MONTH . '</fieldset><br><fieldset><legend>';
	151	+ $ret .= ' '._MD_EXTCAL_DAY_NUM_MONTH.'</fieldset><br><fieldset><legend>';
152	152
153	153	$formObject = new XoopsFormRadio('', 'rrule_freq', $this->_rrule_freq);
154	154	$formObject->addOption('yearly', _MD_EXTCAL_YEARLY);
155	155	$ret .= $formObject->render();
156		- $ret .= '</legend>' . _MD_EXTCAL_DURING . ' ';
	156	+ $ret .= '</legend>'._MD_EXTCAL_DURING.' ';
157	157
158	158	$formObject = new XoopsFormText('', 'rrule_yearly_interval', 3, 2, $this->_rrule_yearly_interval);
159	159	$ret .= $formObject->render();
160		- $ret .= ' ' . _MD_EXTCAL_YEARS . '<br>';
	160	+ $ret .= ' '._MD_EXTCAL_YEARS.'<br>';
161	161
162	162	$formObject = new ExtcalFormRRuleCheckBox('', 'rrule_yearly_bymonths', $this->_rrule_yearly_bymonths);
163	163	$formObject->addOption('1', _MD_EXTCAL_JAN);

		@@ -50,7 +50,7 @@ discard block
		block discarded – undo
50	50	/**
51	51	* Load Calendar base class.
52	52	*/
53		-require_once CALENDAR_ROOT . 'Calendar.php';
	53	+require_once CALENDAR_ROOT.'Calendar.php';
54	54
55	55	/**
56	56	* Contains a factory method to return a Singleton instance of a class
		@@ -97,7 +97,7 @@ discard block
		block discarded – undo
97	97	$firstDay = defined('CALENDAR_FIRST_DAY_OF_WEEK') ? CALENDAR_FIRST_DAY_OF_WEEK : 1;
98	98	switch ($type) {
99	99	case 'Day':
100		- require_once CALENDAR_ROOT . 'Day.php';
	100	+ require_once CALENDAR_ROOT.'Day.php';
101	101
102	102	return new Calendar_Day($y, $m, $d);
103	103	case 'Month':
		@@ -107,44 +107,44 @@ discard block
		block discarded – undo
107	107	}
108	108	switch (CALENDAR_MONTH_STATE) {
109	109	case CALENDAR_USE_MONTH_WEEKDAYS:
110		- require_once CALENDAR_ROOT . 'Month/Weekdays.php';
	110	+ require_once CALENDAR_ROOT.'Month/Weekdays.php';
111	111	$class = 'Calendar_Month_Weekdays';
112	112	break;
113	113	case CALENDAR_USE_MONTH_WEEKS:
114		- require_once CALENDAR_ROOT . 'Month/Weeks.php';
	114	+ require_once CALENDAR_ROOT.'Month/Weeks.php';
115	115	$class = 'Calendar_Month_Weeks';
116	116	break;
117	117	case CALENDAR_USE_MONTH:
118	118	default:
119		- require_once CALENDAR_ROOT . 'Month.php';
	119	+ require_once CALENDAR_ROOT.'Month.php';
120	120	$class = 'Calendar_Month';
121	121	break;
122	122	}
123	123
124	124	return new $class($y, $m, $firstDay);
125	125	case 'Week':
126		- require_once CALENDAR_ROOT . 'Week.php';
	126	+ require_once CALENDAR_ROOT.'Week.php';
127	127
128	128	return new Calendar_Week($y, $m, $d, $firstDay);
129	129	case 'Hour':
130		- require_once CALENDAR_ROOT . 'Hour.php';
	130	+ require_once CALENDAR_ROOT.'Hour.php';
131	131
132	132	return new Calendar_Hour($y, $m, $d, $h);
133	133	case 'Minute':
134		- require_once CALENDAR_ROOT . 'Minute.php';
	134	+ require_once CALENDAR_ROOT.'Minute.php';
135	135
136	136	return new Calendar_Minute($y, $m, $d, $h, $i);
137	137	case 'Second':
138		- require_once CALENDAR_ROOT . 'Second.php';
	138	+ require_once CALENDAR_ROOT.'Second.php';
139	139
140	140	return new Calendar_Second($y, $m, $d, $h, $i, $s);
141	141	case 'Year':
142		- require_once CALENDAR_ROOT . 'Year.php';
	142	+ require_once CALENDAR_ROOT.'Year.php';
143	143
144	144	return new Calendar_Year($y);
145	145	default:
146		- require_once __DIR__ . '/PEAR.php';
147		- PEAR::raiseError('Calendar_Factory::create() unrecognised type: ' . $type, null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()');
	146	+ require_once __DIR__.'/PEAR.php';
	147	+ PEAR::raiseError('Calendar_Factory::create() unrecognised type: '.$type, null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()');
148	148
149	149	return false;
150	150	}

		@@ -87,27 +87,27 @@
		block discarded – undo
87	87	$fromemail = !empty($xoopsConfig['adminmail']) ? $xoopsConfig['adminmail'] : $xoopsUser->getVar('email', 'E');
88	88	$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>   ';
89	89	$bodyCaption = _AM_EXTCAL_BODY
90		- . "<br><br><span style='font-size:x-small;font-weight:bold;'>"
91		- . _AM_EXTCAL_USEFUL_TAGS
92		- . "</span><br><span style='font-size:x-small;font-weight:normal;'>"
93		- . _AM_EXTCAL_MAILTAGS1
94		- . '<br>'
95		- . _AM_EXTCAL_MAILTAGS2
96		- . '<br>'
97		- . _AM_EXTCAL_MAILTAGS3
98		- . '<br>'
99		- . _AM_EXTCAL_MAILTAGS4
100		- . '<br>'
101		- . _AM_EXTCAL_MAILTAGS5
102		- . '<br>'
103		- . _AM_EXTCAL_MAILTAGS6
104		- . '<br>'
105		- . _AM_EXTCAL_MAILTAGS7
106		- . '<br>'
107		- . _AM_EXTCAL_MAILTAGS8
108		- . '<br>'
109		- . _AM_EXTCAL_MAILTAGS9
110		- . '</span>   ';
	90	+ . "<br><br><span style='font-size:x-small;font-weight:bold;'>"
	91	+ . _AM_EXTCAL_USEFUL_TAGS
	92	+ . "</span><br><span style='font-size:x-small;font-weight:normal;'>"
	93	+ . _AM_EXTCAL_MAILTAGS1
	94	+ . '<br>'
	95	+ . _AM_EXTCAL_MAILTAGS2
	96	+ . '<br>'
	97	+ . _AM_EXTCAL_MAILTAGS3
	98	+ . '<br>'
	99	+ . _AM_EXTCAL_MAILTAGS4
	100	+ . '<br>'
	101	+ . _AM_EXTCAL_MAILTAGS5
	102	+ . '<br>'
	103	+ . _AM_EXTCAL_MAILTAGS6
	104	+ . '<br>'
	105	+ . _AM_EXTCAL_MAILTAGS7
	106	+ . '<br>'
	107	+ . _AM_EXTCAL_MAILTAGS8
	108	+ . '<br>'
	109	+ . _AM_EXTCAL_MAILTAGS9
	110	+ . '</span>   ';
111	111	$toCheckBbox = new XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, 'mail_send_to', 'mail');
112	112	$toCheckBox->addOption('mail', _AM_EXTCAL_EMAIL);
113	113	$toCheckBox->addOption('pm', _AM_EXTCAL_PM);

		@@ -9,15 +9,15 @@
		block discarded – undo
9	9	{
10	10
11	11	// Create eXtCal upload directory
12		- $dir = XOOPS_ROOT_PATH . '/uploads/extcal';
	12	+ $dir = XOOPS_ROOT_PATH.'/uploads/extcal';
13	13	if (!is_dir($dir)) {
14	14	mkdir($dir);
15		- mkdir($dir . '/etablissement');
	15	+ mkdir($dir.'/etablissement');
16	16
17	17	// Copy index.html files on uploads folders
18		- $indexFile = __DIR__ . '/index.html';
19		- copy($indexFile, $dir . '/index.html');
20		- copy($indexFile, $dir . '/etablissement/index.html');
	18	+ $indexFile = __DIR__.'/index.html';
	19	+ copy($indexFile, $dir.'/index.html');
	20	+ copy($indexFile, $dir.'/etablissement/index.html');
21	21	}
22	22
23	23	$moduleId = $xoopsModule->getVar('mid');

		@@ -1,9 +1,9 @@
		block discarded – undo
1	1	<?php
2	2
3		-include __DIR__ . '/formdatetime.php';
4		-include __DIR__ . '/formrecurrules.php';
5		-include __DIR__ . '/formfilecheckbox.php';
6		-include __DIR__ . '/formrrulecheckbox.php';
	3	+include __DIR__.'/formdatetime.php';
	4	+include __DIR__.'/formrecurrules.php';
	5	+include __DIR__.'/formfilecheckbox.php';
	6	+include __DIR__.'/formrrulecheckbox.php';
7	7
8	8	/**
9	9	* Class ExtcalThemeForm.

		@@ -138,7 +138,7 @@
		block discarded – undo
138	138	global $g_pcl_error_string;
139	139	global $g_pcl_error_code;
140	140
141		- return $g_pcl_error_string . " [code $g_pcl_error_code]";
	141	+ return $g_pcl_error_string." [code $g_pcl_error_code]";
142	142	}
143	143
144	144	// --------------------------------------------------------------------------------

		@@ -1,8 +1,8 @@
		block discarded – undo
1	1	<?php
2	2	//
3	3
4		-require_once __DIR__ . '/simple_include.php';
5		-require_once __DIR__ . '/calendar_include.php';
	4	+require_once __DIR__.'/simple_include.php';
	5	+require_once __DIR__.'/calendar_include.php';
6	6
7	7	Mock::generate('Calendar_Engine_Interface', 'Mock_Calendar_Engine');
8	8	Mock::generate('Calendar_Second', 'Mock_Calendar_Second');

		@@ -1,10 +1,10 @@
		block discarded – undo
1	1	<?php
2	2	//
3	3
4		-require_once __DIR__ . '/simple_include.php';
5		-require_once __DIR__ . '/calendar_include.php';
	4	+require_once __DIR__.'/simple_include.php';
	5	+require_once __DIR__.'/calendar_include.php';
6	6
7		-require_once __DIR__ . '/./calendar_test.php';
	7	+require_once __DIR__.'/./calendar_test.php';
8	8
9	9	/**
10	10	* Class TestOfSecond.

		@@ -27,13 +27,13 @@
		block discarded – undo
27	27	public function testPrevDay_Array()
28	28	{
29	29	$this->assertEqual([
30		- 'year' => 2003,
31		- 'month' => 10,
32		- 'day' => 24,
33		- 'hour' => 0,
34		- 'minute' => 0,
35		- 'second' => 0,
36		- ], $this->cal->prevDay('array'));
	30	+ 'year' => 2003,
	31	+ 'month' => 10,
	32	+ 'day' => 24,
	33	+ 'hour' => 0,
	34	+ 'minute' => 0,
	35	+ 'second' => 0,
	36	+ ], $this->cal->prevDay('array'));
37	37	}
38	38	}
39	39

		@@ -1,19 +1,19 @@
		block discarded – undo
1	1	<?php
2	2	//
3	3
4		-require_once __DIR__ . '/simple_include.php';
5		-require_once __DIR__ . '/calendar_include.php';
	4	+require_once __DIR__.'/simple_include.php';
	5	+require_once __DIR__.'/calendar_include.php';
6	6
7	7	define('TEST_RUNNING', true);
8	8
9		-require_once __DIR__ . '/calendar_tests.php';
10		-require_once __DIR__ . '/calendar_tabular_tests.php';
11		-require_once __DIR__ . '/validator_tests.php';
12		-require_once __DIR__ . '/calendar_engine_tests.php';
13		-require_once __DIR__ . '/calendar_engine_tests.php';
14		-require_once __DIR__ . '/table_helper_tests.php';
15		-require_once __DIR__ . '/decorator_tests.php';
16		-require_once __DIR__ . '/util_tests.php';
	9	+require_once __DIR__.'/calendar_tests.php';
	10	+require_once __DIR__.'/calendar_tabular_tests.php';
	11	+require_once __DIR__.'/validator_tests.php';
	12	+require_once __DIR__.'/calendar_engine_tests.php';
	13	+require_once __DIR__.'/calendar_engine_tests.php';
	14	+require_once __DIR__.'/table_helper_tests.php';
	15	+require_once __DIR__.'/decorator_tests.php';
	16	+require_once __DIR__.'/util_tests.php';
17	17
18	18	/**
19	19	* Class AllTests.

mambax7 / extcal

Push — master ( ec1681...68c045 )

Status

Category

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

Switch Indentation +70 added lines, -70 removed lines patch added patch discarded remove patch

Spacing +29 added lines, -29 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch