mambax7 / extcal

class/ColorTools.php

Spacing +3 added lines, -3 removed lines

@@ -170,9 +170,9 @@
         $tHex = ['', '', '', ''];
 
         $tHex[0] = $aColors[0];
-        $tHex[1] = substr('00' . dechex($aColors[1]), -2);
-        $tHex[2] = substr('00' . dechex($aColors[2]), -2);
-        $tHex[3] = substr('00' . dechex($aColors[3]), -2);
+        $tHex[1] = substr('00'.dechex($aColors[1]), -2);
+        $tHex[2] = substr('00'.dechex($aColors[2]), -2);
+        $tHex[3] = substr('00'.dechex($aColors[3]), -2);
 
         $colorHexa = implode('', $tHex);
 

class/TableForm.php

Spacing +12 added lines, -12 removed lines

@@ -55,13 +55,13 @@ 
      */
     public function insertBreak($extra = '', $class = '')
     {
-        $class = ('' != $class) ? " class='" . preg_replace('/[^A-Za-z0-9\s\s_-]/i', '', $class) . "'" : '';
+        $class = ('' != $class) ? " class='".preg_replace('/[^A-Za-z0-9\s\s_-]/i', '', $class)."'" : '';
         // Fix for $extra tag not showing
         if ($extra) {
-            $extra = '<tr><td colspan="2" ' . $class . '>' . $extra . '</td></tr>';
+            $extra = '<tr><td colspan="2" '.$class.'>'.$extra.'</td></tr>';
             $this->addElement($extra);
         } else {
-            $extra = '<tr><td colspan="2" ' . $class . '>&nbsp;</td></tr>';
+            $extra = '<tr><td colspan="2" '.$class.'>&nbsp;</td></tr>';
             $this->addElement($extra);
         }
     }
@@ -90,7 +90,7 @@ 
         }
 
         if ('' != $title) {
-            $ret .= '<tr><th colspan="2">' . $title . '</th></tr>';
+            $ret .= '<tr><th colspan="2">'.$title.'</th></tr>';
         }
 
         $hidden = '';
@@ -102,24 +102,24 @@ 
                 if (!$ele->getNocolspan()) {
                     $ret .= '<tr valign="top" align="left"><td class="head">';
                     if ('' != ($caption = $ele->getCaption())) {
-                        $ret .= '<div class="xoops-form-element-caption' . ($ele->isRequired() ? '-required' : '') . '">';
-                        $ret .= '<span class="caption-text">' . $caption . '</span>';
+                        $ret .= '<div class="xoops-form-element-caption'.($ele->isRequired() ? '-required' : '').'">';
+                        $ret .= '<span class="caption-text">'.$caption.'</span>';
                         $ret .= '<span class="caption-marker">*</span>';
                         $ret .= '</div>';
                     }
                     if ('' != ($desc = $ele->getDescription())) {
-                        $ret .= '<div class="xoops-form-element-help">' . $desc . '</div>';
+                        $ret .= '<div class="xoops-form-element-help">'.$desc.'</div>';
                     }
-                    $ret .= '</td><td class="' . $class . '">' . $ele->render() . '</td></tr>' . NWLINE;
+                    $ret .= '</td><td class="'.$class.'">'.$ele->render().'</td></tr>'.NWLINE;
                 } else {
                     $ret .= '<tr valign="top" align="left"><td class="head" colspan="2">';
                     if ('' != ($caption = $ele->getCaption())) {
-                        $ret .= '<div class="xoops-form-element-caption' . ($ele->isRequired() ? '-required' : '') . '">';
-                        $ret .= '<span class="caption-text">' . $caption . '</span>';
+                        $ret .= '<div class="xoops-form-element-caption'.($ele->isRequired() ? '-required' : '').'">';
+                        $ret .= '<span class="caption-text">'.$caption.'</span>';
                         $ret .= '<span class="caption-marker">*</span>';
                         $ret .= '</div>';
                     }
-                    $ret .= '</td></tr><tr valign="top" align="left"><td class="' . $class . '" colspan="2">' . $ele->render() . '</td></tr>';
+                    $ret .= '</td></tr><tr valign="top" align="left"><td class="'.$class.'" colspan="2">'.$ele->render().'</td></tr>';
                 }
             } else {
                 $hidden .= $ele->render();
@@ -130,7 +130,7 @@ 
             $ret .= '</table>';
         }
 
-        $ret .= NWLINE . ' ' . $hidden . NWLINE;
+        $ret .= NWLINE.' '.$hidden.NWLINE;
 
         return $ret;
     }

class/Form/FormRecurRules.php

Spacing +18 added lines, -18 removed lines

@@ -67,45 +67,45 @@ 
         $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;');
@@ -145,20 +145,20 @@ 
         $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 Extcal\Form\FormRRuleCheckBox('', 'rrule_yearly_bymonths', $this->_rrule_yearly_bymonths);
         $formObject->addOption('1', _MD_EXTCAL_JAN);

class/Form/FormRRuleCheckBox.php

Spacing +3 added lines, -3 removed lines

@@ -42,18 +42,18 @@
         $ret = '<table><tr>';
         $i   = 0;
         if (count($this->getOptions()) > 1 && '[]' !== substr($this->getName(), -2, 2)) {
-            $newname = $this->getName() . '[]';
+            $newname = $this->getName().'[]';
             $this->setName($newname);
         }
         foreach ($this->getOptions() as $value => $name) {
             if (0 == (++$i) % 6) {
                 $ret .= '</tr><tr>';
             }
-            $ret .= "<td><input type='checkbox' name='" . $this->getName() . "' value='" . $value . "'";
+            $ret .= "<td><input type='checkbox' name='".$this->getName()."' value='".$value."'";
             if (count($this->getValue()) > 0 && in_array($value, $this->getValue())) {
                 $ret .= ' checked';
             }
-            $ret .= $this->getExtra() . '>' . $name . "</td>\n";
+            $ret .= $this->getExtra().'>'.$name."</td>\n";
         }
         $ret .= '</tr></table>';
 

class/Form/FormFileCheckBox.php

Spacing +3 added lines, -3 removed lines

@@ -43,13 +43,13 @@
     {
         $ret = '';
         if (count($this->getOptions()) > 1 && '[]' !== substr($this->getName(), -2, 2)) {
-            $newname = $this->getName() . '[]';
+            $newname = $this->getName().'[]';
             $this->setName($newname);
         }
         foreach ($this->getOptions() as $value => $name) {
-            $ret .= "<input type='checkbox' name='" . $this->getName() . "' value='" . $value . "'";
+            $ret .= "<input type='checkbox' name='".$this->getName()."' value='".$value."'";
             $ret .= ' checked';
-            $ret .= $this->getExtra() . '>' . $name . "<br>\n";
+            $ret .= $this->getExtra().'>'.$name."<br>\n";
         }
 
         return $ret;

class/Form/Spin/FormSpin.php

Spacing +7 added lines, -7 removed lines

@@ -201,7 +201,7 @@ 
      */
     public function setMin($min)
     {
-        $this->_min = (int)$min;
+        $this->_min = (int) $min;
     }
     /*-----------------------------------------------------------------*/
     /**
@@ -219,7 +219,7 @@ 
      */
     public function setMax($max)
     {
-        $this->_max = (int)$max;
+        $this->_max = (int) $max;
     }
 
     /*-----------------------------------------------------------------*/
@@ -241,7 +241,7 @@ 
      */
     public function setSmallIncrement($smallIncrement)
     {
-        $this->_smallIncrement = (int)$smallIncrement;
+        $this->_smallIncrement = (int) $smallIncrement;
         if (0 == $this->_smallIncrement) {
             $this->_smallIncrement = 1;
         }
@@ -263,7 +263,7 @@ 
      */
     public function setLargeIncrement($largeIncrement)
     {
-        $this->_largeIncrement = (int)$largeIncrement;
+        $this->_largeIncrement = (int) $largeIncrement;
         if (0 == $this->_largeIncrement) {
             $this->_largeIncrement = 10;
         }
@@ -404,7 +404,7 @@ 
         $sFolderImg  = "{$sSpinFolder}/images/{$this->getImgFolder()}/";
 
         $prefixe  = $this->getName();
-        $prefixe2 = 'spin' . $prefixe;
+        $prefixe2 = 'spin'.$prefixe;
 
         $smallIncrement = $this->getSmallIncrement();
         $largeIncrement = $this->getLargeIncrement();
@@ -423,7 +423,7 @@ 
         $t = [];
 
         if ($this->_loadJS) {
-            $js  = $sSpinFolder . '/js/spin.js';
+            $js  = $sSpinFolder.'/js/spin.js';
             $t[] = "<script src='{$js}' type='text/javascript'></script>";
         }
 
@@ -468,7 +468,7 @@ 
         //-------------------------------------------------------
 
         $t[] = '  </tr>';
-        $t[] = '</table>' . "\n";
+        $t[] = '</table>'."\n";
         $t[] = '</div>';
         //-------------------------------------------
         $html = implode("\n", $t);

class/Helper.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     {
         $ret   = false;
         $db    = \XoopsDatabaseFactory::getDatabaseConnection();
-        $class = '\\XoopsModules\\' . ucfirst(strtolower(basename(dirname(__DIR__)))) . '\\' . $name . 'Handler';
+        $class = '\\XoopsModules\\'.ucfirst(strtolower(basename(dirname(__DIR__)))).'\\'.$name.'Handler';
         $ret   = new $class($db);
         return $ret;
     }

admin/admin_header.php

Spacing +3 added lines, -3 removed lines

@@ -19,11 +19,11 @@
 
 use XoopsModules\Extcal;
 
-require_once __DIR__ . '/../../../include/cp_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
 require_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
-require_once __DIR__ . '/../include/constantes.php';
+require_once __DIR__.'/../include/constantes.php';
 
-include __DIR__ . '/../preloads/autoloader.php';
+include __DIR__.'/../preloads/autoloader.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 

admin/main.php

Indentation +21 added lines, -21 removed lines

@@ -87,27 +87,27 @@
                 $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);

Switch Indentation +70 added lines, -70 removed lines

@@ -35,8 +35,8 @@ 
 }
 
 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()));
@@ -132,78 +132,78 @@ 
                 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(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount()), '', 'Green');
-        $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new \Criteria('event_approved', 1))), '', 'Green');
-        $adminObject->addInfoBoxLine(sprintf('<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(sprintf('<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 = (0 == ++$i % 2) ? 'even' : 'odd';
-                echo '<tr style="text-align:center;" class="' . $class . '">';
-                echo '<td>' . $event['Category']['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(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount()), '', 'Green');
+            $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new \Criteria('event_approved', 1))), '', 'Green');
+            $adminObject->addInfoBoxLine(sprintf('<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(sprintf('<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 = (0 == ++$i % 2) ? 'even' : 'odd';
+                    echo '<tr style="text-align:center;" class="' . $class . '">';
+                    echo '<td>' . $event['Category']['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;
 }

Spacing +29 added lines, -29 removed lines

@@ -2,9 +2,9 @@ 
 
 use XoopsModules\Extcal;
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-include __DIR__ . '/../../../class/xoopsformloader.php';
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+include __DIR__.'/../../../class/xoopsformloader.php';
+require_once __DIR__.'/admin_header.php';
 
 function extgalleryLastVersion()
 {
@@ -39,7 +39,7 @@ 
         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);
@@ -72,7 +72,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);
@@ -87,7 +87,7 @@ 
             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
@@ -110,12 +110,12 @@ 
                                   . '<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);
@@ -145,13 +145,13 @@ 
         //        $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
         $adminObject = \Xmf\Module\Admin::getInstance();
         $adminObject->addInfoBox(_MI_EXTCAL_DASHBOARD);
-        $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount()), '', 'Green');
-        $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new \Criteria('event_approved', 1))), '', 'Green');
-        $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_PENDING . '</infolabel>', $eventHandler->getCount(new \Criteria('event_approved', 0))), '', 'Red');
+        $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_EXTCAL_INDEX_CATEGORIES.'</infolabel>', $catHandler->getCount()), '', 'Green');
+        $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_EXTCAL_INDEX_EVENT.'</infolabel>', $eventHandler->getCount(new \Criteria('event_approved', 1))), '', 'Green');
+        $adminObject->addInfoBoxLine(sprintf('<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(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_APPROVED . '</infolabel><infotext>', $eventHandler->getCount($criteriaCompo) . '</infotext>'), '', 'Green');
+        $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_EXTCAL_INDEX_APPROVED.'</infolabel><infotext>', $eventHandler->getCount($criteriaCompo).'</infotext>'), '', 'Green');
 
         $adminObject->addConfigBoxLine();
         $adminObject->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
@@ -168,42 +168,42 @@ 
         $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 = (0 == ++$i % 2) ? 'even' : 'odd';
-                echo '<tr style="text-align:center;" class="' . $class . '">';
-                echo '<td>' . $event['Category']['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['Category']['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;
 }