mambax7 / extcal

htdocs/modules/extcal/class/pear/Calendar/Factory.php

Switch Indentation +43 added lines, -43 removed lines

@@ -95,58 +95,58 @@
     {
         $firstDay = defined('CALENDAR_FIRST_DAY_OF_WEEK') ? CALENDAR_FIRST_DAY_OF_WEEK : 1;
         switch ($type) {
-        case 'Day':
-            include_once CALENDAR_ROOT.'Day.php';
+            case 'Day':
+                include_once CALENDAR_ROOT.'Day.php';
 
-            return new Calendar_Day($y, $m, $d);
-        case 'Month':
-            // Set default state for which month type to build
-            if (!defined('CALENDAR_MONTH_STATE')) {
-                define('CALENDAR_MONTH_STATE', CALENDAR_USE_MONTH);
-            }
-            switch (CALENDAR_MONTH_STATE) {
-            case CALENDAR_USE_MONTH_WEEKDAYS:
-                include_once CALENDAR_ROOT.'Month/Weekdays.php';
-                $class = 'Calendar_Month_Weekdays';
-                break;
-            case CALENDAR_USE_MONTH_WEEKS:
-                include_once CALENDAR_ROOT.'Month/Weeks.php';
-                $class = 'Calendar_Month_Weeks';
-                break;
-            case CALENDAR_USE_MONTH:
-            default:
-                include_once CALENDAR_ROOT.'Month.php';
-                $class = 'Calendar_Month';
-                break;
-            }
+                return new Calendar_Day($y, $m, $d);
+            case 'Month':
+                // Set default state for which month type to build
+                if (!defined('CALENDAR_MONTH_STATE')) {
+                    define('CALENDAR_MONTH_STATE', CALENDAR_USE_MONTH);
+                }
+                switch (CALENDAR_MONTH_STATE) {
+                    case CALENDAR_USE_MONTH_WEEKDAYS:
+                        include_once CALENDAR_ROOT.'Month/Weekdays.php';
+                        $class = 'Calendar_Month_Weekdays';
+                        break;
+                    case CALENDAR_USE_MONTH_WEEKS:
+                        include_once CALENDAR_ROOT.'Month/Weeks.php';
+                        $class = 'Calendar_Month_Weeks';
+                        break;
+                    case CALENDAR_USE_MONTH:
+                    default:
+                        include_once CALENDAR_ROOT.'Month.php';
+                        $class = 'Calendar_Month';
+                        break;
+                }
 
             return new $class($y, $m, $firstDay);
-        case 'Week':
-            include_once CALENDAR_ROOT.'Week.php';
+            case 'Week':
+                include_once CALENDAR_ROOT.'Week.php';
 
-            return new Calendar_Week($y, $m, $d, $firstDay);
-        case 'Hour':
-            include_once CALENDAR_ROOT.'Hour.php';
+                return new Calendar_Week($y, $m, $d, $firstDay);
+            case 'Hour':
+                include_once CALENDAR_ROOT.'Hour.php';
 
-            return new Calendar_Hour($y, $m, $d, $h);
-        case 'Minute':
-            include_once CALENDAR_ROOT.'Minute.php';
+                return new Calendar_Hour($y, $m, $d, $h);
+            case 'Minute':
+                include_once CALENDAR_ROOT.'Minute.php';
 
-            return new Calendar_Minute($y, $m, $d, $h, $i);
-        case 'Second':
-            include_once CALENDAR_ROOT.'Second.php';
+                return new Calendar_Minute($y, $m, $d, $h, $i);
+            case 'Second':
+                include_once CALENDAR_ROOT.'Second.php';
 
-            return new Calendar_Second($y, $m, $d, $h, $i, $s);
-        case 'Year':
-            include_once CALENDAR_ROOT.'Year.php';
+                return new Calendar_Second($y, $m, $d, $h, $i, $s);
+            case 'Year':
+                include_once CALENDAR_ROOT.'Year.php';
 
-            return new Calendar_Year($y);
-        default:
-            include_once 'PEAR.php';
-            PEAR::raiseError('Calendar_Factory::create() unrecognised type: '.$type,
-                null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()');
+                return new Calendar_Year($y);
+            default:
+                include_once 'PEAR.php';
+                PEAR::raiseError('Calendar_Factory::create() unrecognised type: '.$type,
+                    null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()');
 
-            return false;
+                return false;
         }
     }
 

htdocs/modules/extcal/class/pear/Calendar/Util/Textual.php

Switch Indentation +12 added lines, -12 removed lines

@@ -96,12 +96,12 @@ 
             $stamp = mktime(0, 0, 0, $i, 1, 2003);
             $month = strftime($formats[$format], $stamp);
             switch ($format) {
-            case 'one':
-                $month = substr($month, 0, 1);
-                break;
-            case 'two':
-                $month = substr($month, 0, 2);
-                break;
+                case 'one':
+                    $month = substr($month, 0, 1);
+                    break;
+                case 'two':
+                    $month = substr($month, 0, 2);
+                    break;
             }
             $months[$i] = $month;
         }
@@ -134,12 +134,12 @@ 
             $stamp = mktime(0, 0, 0, 11, $i+2, 2003);
             $day = strftime($formats[$format], $stamp);
             switch ($format) {
-            case 'one':
-                $day = substr($day, 0, 1);
-                break;
-            case 'two':
-                $day = substr($day, 0, 2);
-                break;
+                case 'one':
+                    $day = substr($day, 0, 1);
+                    break;
+                case 'two':
+                    $day = substr($day, 0, 2);
+                    break;
             }
             $days[$i] = $day;
         }

htdocs/modules/extcal/class/pear/Calendar/Week.php

Switch Indentation +62 added lines, -62 removed lines

@@ -347,23 +347,23 @@ 
     function prevWeek($format = 'n_in_month')
     {
         switch (strtolower($format)) {
-        case 'int':
-        case 'n_in_month':
-            return ($this->firstWeek) ? null : $this->thisWeek('n_in_month') -1;
-        case 'n_in_year':
-            return $this->cE->getWeekNInYear(
-                $this->cE->stampToYear($this->prevWeek),
-                $this->cE->stampToMonth($this->prevWeek),
-                $this->cE->stampToDay($this->prevWeek));
-        case 'array':
-            return $this->toArray($this->prevWeek);
-        case 'object':
-            include_once CALENDAR_ROOT.'Factory.php';
-
-            return Calendar_Factory::createByTimestamp('Week', $this->prevWeek);
-        case 'timestamp':
-        default:
-            return $this->prevWeek;
+            case 'int':
+            case 'n_in_month':
+                return ($this->firstWeek) ? null : $this->thisWeek('n_in_month') -1;
+            case 'n_in_year':
+                return $this->cE->getWeekNInYear(
+                    $this->cE->stampToYear($this->prevWeek),
+                    $this->cE->stampToMonth($this->prevWeek),
+                    $this->cE->stampToDay($this->prevWeek));
+            case 'array':
+                return $this->toArray($this->prevWeek);
+            case 'object':
+                include_once CALENDAR_ROOT.'Factory.php';
+
+                return Calendar_Factory::createByTimestamp('Week', $this->prevWeek);
+            case 'timestamp':
+            default:
+                return $this->prevWeek;
         }
     }
 
@@ -378,37 +378,37 @@ 
     function thisWeek($format = 'n_in_month')
     {
         switch (strtolower($format)) {
-        case 'int':
-        case 'n_in_month':
-            if ($this->firstWeek) {
-                return 1;
-            }
-            if ($this->lastWeek) {
-                return $this->cE->getWeeksInMonth(
+            case 'int':
+            case 'n_in_month':
+                if ($this->firstWeek) {
+                    return 1;
+                }
+                if ($this->lastWeek) {
+                    return $this->cE->getWeeksInMonth(
+                        $this->thisYear(),
+                        $this->thisMonth(),
+                        $this->firstDay);
+                }
+
+                return $this->cE->getWeekNInMonth(
                     $this->thisYear(),
                     $this->thisMonth(),
+                    $this->thisDay(),
                     $this->firstDay);
-            }
-
-            return $this->cE->getWeekNInMonth(
-                $this->thisYear(),
-                $this->thisMonth(),
-                $this->thisDay(),
-                $this->firstDay);
-        case 'n_in_year':
-            return $this->cE->getWeekNInYear(
-                $this->cE->stampToYear($this->thisWeek),
-                $this->cE->stampToMonth($this->thisWeek),
-                $this->cE->stampToDay($this->thisWeek));
-        case 'array':
-            return $this->toArray($this->thisWeek);
-        case 'object':
-            include_once CALENDAR_ROOT.'Factory.php';
-
-            return Calendar_Factory::createByTimestamp('Week', $this->thisWeek);
-        case 'timestamp':
-        default:
-            return $this->thisWeek;
+            case 'n_in_year':
+                return $this->cE->getWeekNInYear(
+                    $this->cE->stampToYear($this->thisWeek),
+                    $this->cE->stampToMonth($this->thisWeek),
+                    $this->cE->stampToDay($this->thisWeek));
+            case 'array':
+                return $this->toArray($this->thisWeek);
+            case 'object':
+                include_once CALENDAR_ROOT.'Factory.php';
+
+                return Calendar_Factory::createByTimestamp('Week', $this->thisWeek);
+            case 'timestamp':
+            default:
+                return $this->thisWeek;
         }
     }
 
@@ -423,23 +423,23 @@ 
     function nextWeek($format = 'n_in_month')
     {
         switch (strtolower($format)) {
-        case 'int':
-        case 'n_in_month':
-            return ($this->lastWeek) ? null : $this->thisWeek('n_in_month') +1;
-        case 'n_in_year':
-            return $this->cE->getWeekNInYear(
-                $this->cE->stampToYear($this->nextWeek),
-                $this->cE->stampToMonth($this->nextWeek),
-                $this->cE->stampToDay($this->nextWeek));
-        case 'array':
-            return $this->toArray($this->nextWeek);
-        case 'object':
-            include_once CALENDAR_ROOT.'Factory.php';
-
-            return Calendar_Factory::createByTimestamp('Week', $this->nextWeek);
-        case 'timestamp':
-        default:
-            return $this->nextWeek;
+            case 'int':
+            case 'n_in_month':
+                return ($this->lastWeek) ? null : $this->thisWeek('n_in_month') +1;
+            case 'n_in_year':
+                return $this->cE->getWeekNInYear(
+                    $this->cE->stampToYear($this->nextWeek),
+                    $this->cE->stampToMonth($this->nextWeek),
+                    $this->cE->stampToDay($this->nextWeek));
+            case 'array':
+                return $this->toArray($this->nextWeek);
+            case 'object':
+                include_once CALENDAR_ROOT.'Factory.php';
+
+                return Calendar_Factory::createByTimestamp('Week', $this->nextWeek);
+            case 'timestamp':
+            default:
+                return $this->nextWeek;
         }
     }
 

htdocs/modules/extcal/class/pear/Calendar/Calendar.php

Switch Indentation +21 added lines, -21 removed lines

@@ -87,13 +87,13 @@ 
     {
         static $engine = false;
         switch (CALENDAR_ENGINE) {
-        case 'PearDate':
-            $class = 'Calendar_Engine_PearDate';
-            break;
-        case 'UnixTS':
-        default:
-            $class = 'Calendar_Engine_UnixTS';
-            break;
+            case 'PearDate':
+                $class = 'Calendar_Engine_PearDate';
+                break;
+            case 'UnixTS':
+            default:
+                $class = 'Calendar_Engine_UnixTS';
+                break;
         }
         if (!$engine) {
             if (!class_exists($class)) {
@@ -342,20 +342,20 @@ 
     function returnValue($returnType, $format, $stamp, $default)
     {
         switch (strtolower($format)) {
-        case 'int':
-            return $default;
-        case 'array':
-            return $this->toArray($stamp);
-            break;
-        case 'object':
-            include_once CALENDAR_ROOT.'Factory.php';
-
-            return Calendar_Factory::createByTimestamp($returnType, $stamp);
-            break;
-        case 'timestamp':
-        default:
-            return $stamp;
-            break;
+            case 'int':
+                return $default;
+            case 'array':
+                return $this->toArray($stamp);
+                break;
+            case 'object':
+                include_once CALENDAR_ROOT.'Factory.php';
+
+                return Calendar_Factory::createByTimestamp($returnType, $stamp);
+                break;
+            case 'timestamp':
+            default:
+                return $stamp;
+                break;
         }
     }
 

htdocs/modules/extcal/admin/event.php

Switch Indentation +320 added lines, -320 removed lines

@@ -51,180 +51,198 @@ 
 
 switch ($op) {
 
-    case 'enreg':
-
-        $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-        $fileHandler  = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
-// $t = print_r($_POST,true);
-// echo "<pre>{$t}</pre><br>";
-// exit;
-        // If the date format is wrong
-//        if (
-//            !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_start']['date'])
-//                || !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_end']['date'])
-//        ) {
-//            redirect_header(
-//                'event.php', 3, _MD_EXTCAL_WRONG_DATE_FORMAT . "<br />"
-//                . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
-//            );
-//            exit;
-//        }
-
-//exit;
-        ///////////////////////////////////////////////////////////////////////////////
-        extcal_loadImg($_REQUEST, $event_picture1, $event_picture2);
-        ///////////////////////////////////////////////////////////////////////////////
-        $data = array(
-            'event_title'         => $_POST['event_title'],
-            'cat_id'              => $_POST['cat_id'],
-            'event_desc'          => $_POST['event_desc'],
-            'event_nbmember'      => $_POST['event_nbmember'],
-            'event_organisateur'  => $_POST['event_organisateur'],
-            'event_contact'       => $_POST['event_contact'],
-            'event_url'           => $_POST['event_url'],
-            'event_email'         => $_POST['event_email'],
-            'event_address'       => $_POST['event_address'],
-            'event_approved'      => 1,
-            'event_start'         => $_POST['event_start'],
-            'have_end'            => $_POST['have_end'],
-            'event_end'           => $_POST['event_end'],
-            'event_picture1'      => @$event_picture1,
-            'event_picture2'      => @$event_picture2,
-            'event_price'         => @$_POST['event_price'],
-            'event_etablissement' => $_POST['event_etablissement'],
-            'dohtml'              => $extcalConfig['allow_html'],
-            'event_icone'         => $_POST['event_icone']
-        );
-
-        // Event edited
-        if (isset($_POST['event_id'])) {
-
-            if (!$eventHandler->modifyEvent($_POST['event_id'], $data)) {
-                redirect_header("event.php", 3, _AM_EXTCAL_EVENT_EDIT_FAILED, false);
+        case 'enreg':
+
+            $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+            $fileHandler  = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
+    // $t = print_r($_POST,true);
+    // echo "<pre>{$t}</pre><br>";
+    // exit;
+            // If the date format is wrong
+    //        if (
+    //            !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_start']['date'])
+    //                || !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_end']['date'])
+    //        ) {
+    //            redirect_header(
+    //                'event.php', 3, _MD_EXTCAL_WRONG_DATE_FORMAT . "<br />"
+    //                . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
+    //            );
+    //            exit;
+    //        }
+
+    //exit;
+            ///////////////////////////////////////////////////////////////////////////////
+            extcal_loadImg($_REQUEST, $event_picture1, $event_picture2);
+            ///////////////////////////////////////////////////////////////////////////////
+            $data = array(
+                'event_title'         => $_POST['event_title'],
+                'cat_id'              => $_POST['cat_id'],
+                'event_desc'          => $_POST['event_desc'],
+                'event_nbmember'      => $_POST['event_nbmember'],
+                'event_organisateur'  => $_POST['event_organisateur'],
+                'event_contact'       => $_POST['event_contact'],
+                'event_url'           => $_POST['event_url'],
+                'event_email'         => $_POST['event_email'],
+                'event_address'       => $_POST['event_address'],
+                'event_approved'      => 1,
+                'event_start'         => $_POST['event_start'],
+                'have_end'            => $_POST['have_end'],
+                'event_end'           => $_POST['event_end'],
+                'event_picture1'      => @$event_picture1,
+                'event_picture2'      => @$event_picture2,
+                'event_price'         => @$_POST['event_price'],
+                'event_etablissement' => $_POST['event_etablissement'],
+                'dohtml'              => $extcalConfig['allow_html'],
+                'event_icone'         => $_POST['event_icone']
+            );
+
+            // Event edited
+            if (isset($_POST['event_id'])) {
+
+                if (!$eventHandler->modifyEvent($_POST['event_id'], $data)) {
+                    redirect_header("event.php", 3, _AM_EXTCAL_EVENT_EDIT_FAILED, false);
+                } else {
+                    $fileHandler->createFile(intval($_POST['event_id']));
+                    redirect_header("event.php", 3, _AM_EXTCAL_EVENT_EDITED, false);
+                }
+
+                // New event
             } else {
-                $fileHandler->createFile(intval($_POST['event_id']));
-                redirect_header("event.php", 3, _AM_EXTCAL_EVENT_EDITED, false);
+                $notificationHandler =& xoops_gethandler('notification');
+                $catHandler          = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+
+                $data['event_submitter']  = ($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+                $data['event_submitdate'] = time();
+
+                if ($eventHandler->createEvent($data, $_POST)) {
+
+                    $fileHandler->createFile($eventHandler->getInsertId());
+                    $cat = $catHandler->getCat($_POST['cat_id'], $xoopsUser, 'all');
+                    $notificationHandler->triggerEvent('global', 0, 'new_event', array('EVENT_TITLE' => $_POST['event_title']));
+                    $notificationHandler->triggerEvent('cat', $_POST['cat_id'], 'new_event_cat', array('EVENT_TITLE' => $_POST['event_title'], 'CAT_NAME' => $cat->getVar('cat_name')));
+                    redirect_header("event.php", 3, _AM_EXTCAL_EVENT_CREATED, false);
+                } else {
+                    redirect_header("event.php", 3, _AM_EXTCAL_EVENT_CREATE_FAILED, false);
+                }
+
             }
+            break;
 
-            // New event
-        } else {
-            $notificationHandler =& xoops_gethandler('notification');
-            $catHandler          = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+        case 'clone': /* sur validation du formulaire */
+        case 'modify':
+            $action = (($op == 'clone') ? 'clone' : 'edit');
+            xoops_cp_header();
+    //================================================
+    // include_once (XOOPS_ROOT_PATH . '/class/xoopsform/tc_calendar/formtccalendar.php');
+    //
+    // 		  // Call the calendar constructor - use the desired form and format, according to the instructions/samples provided on triconsole.com
+    // 		  $dateBirthday = new XoopsTcCalendar("datez1", true, false);
+    // 		  //$dateBirthday->setIcon("/images/iconCalendar.gif");
+    // 		  $dateBirthday->setIcon("/class/xoopsform/tc_calendar/images/iconCalendar.gif");
+    // 		  //$dateBirthday->rtl=false;
+    // 		  $dateBirthday->setAutoHide(false);
+    //
+    //       //$myCalendar->setDate(date('d'), date('m'), date('Y'));
+    //       //$dateBirthday->setDate($p['date1_day'], $p['date1_month'], $p['date1_year']);
+    // 		  $dateBirthday->setDate(date('d'), date('m'), date('Y'));
+    //
+    // 		  $dateBirthday->setPath(XOOPS_URL . "/class/xoopsform/tc_calendar/");
+    // 		  $dateBirthday->zindex = 150; //default 1
+    // 		  $dateBirthday->setYearInterval(1995, date('Y'));
+    // 		  $dateBirthday->dateAllow('1960-03-01', date('Y-m-d'));
+    // 		  //$dateBirthday->autoSubmit(true, "calendar");
+    // 		  $dateBirthday->disabledDay("sat");
+    // 		  $dateBirthday->disabledDay("sun");
+    // 		  $dateBirthday->setSpecificDate(array("2011-04-14", "2010-12-25"), 0, 'month');
+    // 		  $dateBirthday->setSpecificDate(array("2011-04-01"), 0, 'year');
+    // 		  $dateBirthday->setAlignment('right', 'bottom'); //optional
+    // echo "<table><tr><td>zzzzz</td><td></td><td>";
+    // echo $dateBirthday->render();
+    // echo "</td></tr></table>";
+    //echo $dateBirthday->render();
+    //================================================
+            // @author      Gregory Mage (Aka Mage)
+            //***************************************************************************************
+    //         include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
+            $eventAdmin = new ModuleAdmin();
+            echo $eventAdmin->addNavigation('event.php');
+            //***************************************************************************************
 
-            $data['event_submitter']  = ($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
-            $data['event_submitdate'] = time();
+            $eventId      = $_GET['event_id'];
+            $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
 
-            if ($eventHandler->createEvent($data, $_POST)) {
+            echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _MD_EXTCAL_EDIT_EVENT . '</legend>';
 
-                $fileHandler->createFile($eventHandler->getInsertId());
-                $cat = $catHandler->getCat($_POST['cat_id'], $xoopsUser, 'all');
-                $notificationHandler->triggerEvent('global', 0, 'new_event', array('EVENT_TITLE' => $_POST['event_title']));
-                $notificationHandler->triggerEvent('cat', $_POST['cat_id'], 'new_event_cat', array('EVENT_TITLE' => $_POST['event_title'], 'CAT_NAME' => $cat->getVar('cat_name')));
-                redirect_header("event.php", 3, _AM_EXTCAL_EVENT_CREATED, false);
-            } else {
-                redirect_header("event.php", 3, _AM_EXTCAL_EVENT_CREATE_FAILED, false);
+            if ($form = $eventHandler->getEventForm('admin', $action, array('event_id' => $eventId))) {
+                $form->display();
             }
 
-        }
-        break;
-
-    case 'clone': /* sur validation du formulaire */
-    case 'modify':
-        $action = (($op == 'clone') ? 'clone' : 'edit');
-        xoops_cp_header();
-//================================================
-// include_once (XOOPS_ROOT_PATH . '/class/xoopsform/tc_calendar/formtccalendar.php');
-//
-// 		  // Call the calendar constructor - use the desired form and format, according to the instructions/samples provided on triconsole.com
-// 		  $dateBirthday = new XoopsTcCalendar("datez1", true, false);
-// 		  //$dateBirthday->setIcon("/images/iconCalendar.gif");
-// 		  $dateBirthday->setIcon("/class/xoopsform/tc_calendar/images/iconCalendar.gif");
-// 		  //$dateBirthday->rtl=false;
-// 		  $dateBirthday->setAutoHide(false);
-//
-//       //$myCalendar->setDate(date('d'), date('m'), date('Y'));
-//       //$dateBirthday->setDate($p['date1_day'], $p['date1_month'], $p['date1_year']);
-// 		  $dateBirthday->setDate(date('d'), date('m'), date('Y'));
-//
-// 		  $dateBirthday->setPath(XOOPS_URL . "/class/xoopsform/tc_calendar/");
-// 		  $dateBirthday->zindex = 150; //default 1
-// 		  $dateBirthday->setYearInterval(1995, date('Y'));
-// 		  $dateBirthday->dateAllow('1960-03-01', date('Y-m-d'));
-// 		  //$dateBirthday->autoSubmit(true, "calendar");
-// 		  $dateBirthday->disabledDay("sat");
-// 		  $dateBirthday->disabledDay("sun");
-// 		  $dateBirthday->setSpecificDate(array("2011-04-14", "2010-12-25"), 0, 'month');
-// 		  $dateBirthday->setSpecificDate(array("2011-04-01"), 0, 'year');
-// 		  $dateBirthday->setAlignment('right', 'bottom'); //optional
-// echo "<table><tr><td>zzzzz</td><td></td><td>";
-// echo $dateBirthday->render();
-// echo "</td></tr></table>";
-//echo $dateBirthday->render();
-//================================================
-        // @author      Gregory Mage (Aka Mage)
-        //***************************************************************************************
-//         include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
-        $eventAdmin = new ModuleAdmin();
-        echo $eventAdmin->addNavigation('event.php');
-        //***************************************************************************************
-
-        $eventId      = $_GET['event_id'];
-        $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _MD_EXTCAL_EDIT_EVENT . '</legend>';
-
-        if ($form = $eventHandler->getEventForm('admin', $action, array('event_id' => $eventId))) {
-            $form->display();
-        }
+            echo '</fieldset><br />';
 
-        echo '</fieldset><br />';
+            xoops_cp_footer();
 
-        xoops_cp_footer();
+            break;
 
-        break;
+        case 'clone2': /* sur clique de l'icone du formulaire*/
 
-    case 'clone2': /* sur clique de l'icone du formulaire*/
+            //$newEventId = 1;
+            $eventId      = $_GET['event_id'];
+            $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+            $event        = $eventHandler->getEvent($eventId);
+            $t            = $event->getVars();
+            $data         = array();
+            while (list($key, $val) = each($t)) {
+                $data[$key] = $val['value'];
+            }
 
-        //$newEventId = 1;
-        $eventId      = $_GET['event_id'];
-        $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-        $event        = $eventHandler->getEvent($eventId);
-        $t            = $event->getVars();
-        $data         = array();
-        while (list($key, $val) = each($t)) {
-            $data[$key] = $val['value'];
-        }
+            $data['event_id'] = 0;
+            $data['event_title'] .= ' (' . _AM_EXTCAL_CLONE_OF . $eventId . ')';
 
-        $data['event_id'] = 0;
-        $data['event_title'] .= ' (' . _AM_EXTCAL_CLONE_OF . $eventId . ')';
+            $newEvent = $eventHandler->create();
+            $newEvent->setVars($data);
+            $t = $eventHandler->insert($newEvent, true);
 
-        $newEvent = $eventHandler->create();
-        $newEvent->setVars($data);
-        $t = $eventHandler->insert($newEvent, true);
+            $newEventId = $newEvent->getVar('event_id');
+            $ts         = print_r($newEventId, true);
 
-        $newEventId = $newEvent->getVar('event_id');
-        $ts         = print_r($newEventId, true);
+            redirect_header("event.php?op=modify&event_id={$newEventId}", 3, _AM_EXTCAL_EVENT_DELETED, false);
+            break;
 
-        redirect_header("event.php?op=modify&event_id={$newEventId}", 3, _AM_EXTCAL_EVENT_DELETED, false);
-        break;
+        case 'delete':
 
-    case 'delete':
+            if (isset($_POST['confirm'])) {
+                if (!$GLOBALS['xoopsSecurity']->check()) {
+                    redirect_header(
+                        'index.php',
+                        3,
+                        _NOPERM . "<br />" . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
+                    );
+                    exit;
+                }
+    //             $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+    //             $eventHandler->deleteEvent($_POST['event_id']);
+                deleteEvents($_POST['event_id']);
+                redirect_header("event.php", 3, _AM_EXTCAL_EVENT_DELETED, false);
 
-        if (isset($_POST['confirm'])) {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header(
-                    'index.php',
-                    3,
-                    _NOPERM . "<br />" . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
-                );
-                exit;
+            } else {
+                xoops_cp_header();
+                // @author      Gregory Mage (Aka Mage)
+                //***************************************************************************************
+                //include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
+                $eventAdmin = new ModuleAdmin();
+                echo $eventAdmin->addNavigation('event.php');
+                //***************************************************************************************
+
+                $hiddens = array('event_id' => $_GET['event_id'], 'form_delete' => '', 'confirm' => 1);
+                xoops_confirm($hiddens, 'event.php?op=delete', _AM_EXTCAL_CONFIRM_DELETE_EVENT, _DELETE, 'event.php');
+
+                xoops_cp_footer();
             }
-//             $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-//             $eventHandler->deleteEvent($_POST['event_id']);
-            deleteEvents($_POST['event_id']);
-            redirect_header("event.php", 3, _AM_EXTCAL_EVENT_DELETED, false);
 
-        } else {
+            break;
+
+        case 'deleteSelection':
+
             xoops_cp_header();
             // @author      Gregory Mage (Aka Mage)
             //***************************************************************************************
@@ -232,197 +250,179 @@ 
             $eventAdmin = new ModuleAdmin();
             echo $eventAdmin->addNavigation('event.php');
             //***************************************************************************************
+            if (isset($_POST['deleteSelection'][0])) {
+                $msg = _AM_EXTCAL_CONFIRM_DELETE_ALL;
+                $ids = array_keys($_POST['deleteAllEvents']);
 
-            $hiddens = array('event_id' => $_GET['event_id'], 'form_delete' => '', 'confirm' => 1);
-            xoops_confirm($hiddens, 'event.php?op=delete', _AM_EXTCAL_CONFIRM_DELETE_EVENT, _DELETE, 'event.php');
+            } else {
+                $msg = _AM_EXTCAL_CONFIRM_DELETE_SELECTION;
+                $ids = array_keys($_POST['deleteEvents']);
+
+            }
+
+    //           $msg = ((isset($_POST['deleteSelection'][0])) ? _AM_EXTCAL_CONFIRM_DELETE_ALL : _AM_EXTCAL_CONFIRM_DELETE_SELECTION);
+    //           $ids = array_keys($_POST['deleteEvents']);
+            $ids = implode(',', $ids);
+            //echo $ids.'<br>';
+            $hiddens = array('event_ids' => $ids, 'form_delete' => '', 'confirm' => 1);
+            //$hiddens = array('event_ids' => $_POST['deleteEvents'], 'form_delete' => '', 'confirm' => 1);
+            xoops_confirm($hiddens, 'event.php?op=deleteSelectionOK', $msg, _DELETE, 'event.php');
 
             xoops_cp_footer();
-        }
 
-        break;
+            break;
 
-    case 'deleteSelection':
+        case 'deleteSelectionOK':
+    //-----------------------------------------
+    // $t = print_r($_GET,true);
+    // echo "<hr><pre>{$t}</pre><hr>";
+    //
+    // $t = print_r($_POST,true);
+    // echo "<hr><pre>{$t}</pre><hr>";
+    // exit;
+    //-----------------------------------------
 
-        xoops_cp_header();
-        // @author      Gregory Mage (Aka Mage)
-        //***************************************************************************************
-        //include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
-        $eventAdmin = new ModuleAdmin();
-        echo $eventAdmin->addNavigation('event.php');
-        //***************************************************************************************
-        if (isset($_POST['deleteSelection'][0])) {
-            $msg = _AM_EXTCAL_CONFIRM_DELETE_ALL;
-            $ids = array_keys($_POST['deleteAllEvents']);
+            if (isset($_POST['deleteSelection'][0])) {
 
-        } else {
-            $msg = _AM_EXTCAL_CONFIRM_DELETE_SELECTION;
-            $ids = array_keys($_POST['deleteEvents']);
+            } else {
+                if (!$GLOBALS['xoopsSecurity']->check()) {
+                    redirect_header(
+                        'index.php',
+                        3,
+                        _NOPERM . "<br />" . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
+                    );
+                    exit;
+                }
 
-        }
+                deleteEvents($_POST['event_ids']);
+
+                redirect_header("event.php", 3, _AM_EXTCAL_EVENTS_DELETED, false);
 
-//           $msg = ((isset($_POST['deleteSelection'][0])) ? _AM_EXTCAL_CONFIRM_DELETE_ALL : _AM_EXTCAL_CONFIRM_DELETE_SELECTION);
-//           $ids = array_keys($_POST['deleteEvents']);
-        $ids = implode(',', $ids);
-        //echo $ids.'<br>';
-        $hiddens = array('event_ids' => $ids, 'form_delete' => '', 'confirm' => 1);
-        //$hiddens = array('event_ids' => $_POST['deleteEvents'], 'form_delete' => '', 'confirm' => 1);
-        xoops_confirm($hiddens, 'event.php?op=deleteSelectionOK', $msg, _DELETE, 'event.php');
-
-        xoops_cp_footer();
-
-        break;
-
-    case 'deleteSelectionOK':
-//-----------------------------------------
-// $t = print_r($_GET,true);
-// echo "<hr><pre>{$t}</pre><hr>";
-//
-// $t = print_r($_POST,true);
-// echo "<hr><pre>{$t}</pre><hr>";
-// exit;
-//-----------------------------------------
-
-        if (isset($_POST['deleteSelection'][0])) {
-
-        } else {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header(
-                    'index.php',
-                    3,
-                    _NOPERM . "<br />" . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
-                );
-                exit;
             }
 
-            deleteEvents($_POST['event_ids']);
+            break;
 
-            redirect_header("event.php", 3, _AM_EXTCAL_EVENTS_DELETED, false);
+        case 'default':
+        default:
 
-        }
+            //global $extcalConfig;
+            $extcalConfig      = ExtcalConfig::getHandler();
+            $xoopsModuleConfig = $extcalConfig->getModuleConfig();
 
-        break;
-
-    case 'default':
-    default:
-
-        //global $extcalConfig;
-        $extcalConfig      = ExtcalConfig::getHandler();
-        $xoopsModuleConfig = $extcalConfig->getModuleConfig();
-
-        $start          = (isset($_GET['start'])) ? $_GET['start'] : 0;
-        $nbEventsByPage = $xoopsModuleConfig['nbEventsByPage'];
-
-        xoops_cp_header();
-        // @author      Gregory Mage (Aka Mage)
-        //***************************************************************************************
-
-        $eventAdmin = new ModuleAdmin();
-        echo $eventAdmin->addNavigation('event.php');
-        //***************************************************************************************
-
-        $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-        $events       = $eventHandler->objectToArray($eventHandler->getNewEvent($start, $nbEventsByPage, 0, true), array('cat_id'));
-        $eventHandler->formatEventsDate($events, _SHORTDATESTRING);
-
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
-        //echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/assets/images/action/edit.png' .' '.'style=vertical-align:middle;/>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT . '<br />';
-        //echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/assets/images/action/delete.png'. ' '."style=vertical-align:middle;/>&nbsp;&nbsp;". _AM_EXTCAL_INFO_DELETE;
-
-        echo '<img src=' . $pathIcon16 . '/edit.png' . ' ' . 'style=vertical-align:middle;/>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT . '<br />';
-        echo '<img src=' . $pathIcon16 . '/delete.png' . ' ' . 'style=vertical-align:middle;/>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_DELETE . '<br />';
-
-        echo '</fieldset><br />';
-
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _MD_EXTCAL_SUBMITED_EVENT . '</legend>';
-
-        echo '<form method="POST" action="event.php">';
-        echo '<input type="hidden" name="op" value="deleteSelection" />';
-
-        echo '<table class="outer" style="width:100%;">';
-        echo '<tr style="text-align:center;">';
-        echo '<th>' . _AM_EXTCAL_DELETE . '</th>';
-        echo '<th>#</th>';
-        echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
-        echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
-        echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
-        echo '<th>' . _AM_EXTCAL_END_DATE . '</th>';
-        echo '<th>' . _AM_EXTCAL_RECURRENT . '</th>';
-        echo '<th>' . _AM_EXTCAL_START_RULES . '</th>';
-        echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
-
-        echo '</tr>';
-
-        if (count($events) > 0) {
-            $i = 0;
-            foreach (
-                $events as $event
-            ) {
-                $class = (++$i % 2 == 0) ? 'even' : 'odd';
-                echo '<tr style="text-align:left;" class="' . $class . '">';
-                echo "<td width='10%' align='center'>";
-                echo "<input type='checkbox' name='deleteEvents[{$event['event_id']}]' value='1' >";
-                echo "<input type='hidden' name='deleteAllEvents[{$event['event_id']}]' value='1' />";
-                echo "</td>";
-                echo "<td align = 'center' width='5%'>" . $event['event_id'] . '</td>';
-                echo "<td  width='10%'>" . '<a href=cat.php?op=modify&amp;cat_id=' . $event['cat']['cat_id'] . '&form_modify' . '>' . $event['cat']['cat_name'] . '</a>' . '</td>';
-
-                echo '<td>' . '<a href=event.php?op=modify&amp;event_id=' . $event['event_id'] . '>' . $event['event_title'] . '</a>' . '</td>';
-
-//                 if ($event['event_isrecur']) {
-//                     echo '<td>' . $event['formated_reccur_rule'] . '</td>';
-//                 } else {
-//                     echo '<td>' . $event['formated_event_start'] . '</td>';
-//                 }
-
-
-                echo "<td align = 'center' width='10%'>" . $event['formated_event_start'] . '</td>';
-                echo "<td align = 'center' width='10%'>" . $event['formated_event_end'] . '</td>';
-                echo '<td align="center">' . (($event['event_isrecur'] == 1) ? _YES : _NO) . '</td>';
-                if (!isset($event['formated_reccur_rule'])) {
-                    $event['formated_reccur_rule'] = '';
-                }
-                echo '<td>' . $event['formated_reccur_rule'] . '</td>';
+            $start          = (isset($_GET['start'])) ? $_GET['start'] : 0;
+            $nbEventsByPage = $xoopsModuleConfig['nbEventsByPage'];
 
-                echo '<td style="width:10%; text-align:center;">';
-                echo '<a href=event.php?op=modify&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/edit.png' title='" . _AM_EXTCAL_ICONE_EDIT . "' /></a>&nbsp;&nbsp;";
-                echo '<a href=event.php?op=delete&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/delete.png' title='" . _AM_EXTCAL_ICONE_DELETE . "' /></a>&nbsp;&nbsp;";
-                echo '<a href=event.php?op=clone&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/editcopy.png' title='" . _AM_EXTCAL_ICONE_CLONE . "' /></a>";
-                echo '</td>';
+            xoops_cp_header();
+            // @author      Gregory Mage (Aka Mage)
+            //***************************************************************************************
 
-                echo '</tr>';
-            }
-            //---------------------------------------------------------
-            $pageNav = new XoopsPageNav($eventHandler->getCountNewEvent(), $nbEventsByPage, $start);
+            $eventAdmin = new ModuleAdmin();
+            echo $eventAdmin->addNavigation('event.php');
+            //***************************************************************************************
+
+            $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+            $events       = $eventHandler->objectToArray($eventHandler->getNewEvent($start, $nbEventsByPage, 0, true), array('cat_id'));
+            $eventHandler->formatEventsDate($events, _SHORTDATESTRING);
+
+            echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
+            echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+            //echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/assets/images/action/edit.png' .' '.'style=vertical-align:middle;/>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT . '<br />';
+            //echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/assets/images/action/delete.png'. ' '."style=vertical-align:middle;/>&nbsp;&nbsp;". _AM_EXTCAL_INFO_DELETE;
 
-            echo '<tr><td colspan="2" style="text-align: right;">';
-            echo $pageNav->renderNav(2);
-            echo '</td>';
+            echo '<img src=' . $pathIcon16 . '/edit.png' . ' ' . 'style=vertical-align:middle;/>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT . '<br />';
+            echo '<img src=' . $pathIcon16 . '/delete.png' . ' ' . 'style=vertical-align:middle;/>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_DELETE . '<br />';
 
-            echo '<td colspan="2" style="text-align: right;">';
+            echo '</fieldset><br />';
 
-            echo '<input type="submit" value="' . _AM_EXTCAL_DELETE_ALL . '" name="deleteSelection[0]">';
-            echo '<input type="submit" value="' . _AM_EXTCAL_DELETE_SELECTION . '" name="deleteSelection[1]">';
+            echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _MD_EXTCAL_SUBMITED_EVENT . '</legend>';
+
+            echo '<form method="POST" action="event.php">';
+            echo '<input type="hidden" name="op" value="deleteSelection" />';
+
+            echo '<table class="outer" style="width:100%;">';
+            echo '<tr style="text-align:center;">';
+            echo '<th>' . _AM_EXTCAL_DELETE . '</th>';
+            echo '<th>#</th>';
+            echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
+            echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
+            echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
+            echo '<th>' . _AM_EXTCAL_END_DATE . '</th>';
+            echo '<th>' . _AM_EXTCAL_RECURRENT . '</th>';
+            echo '<th>' . _AM_EXTCAL_START_RULES . '</th>';
+            echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
 
-            echo '</td>';
             echo '</tr>';
-        } else {
-            echo '<tr><td colspan="5">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
-        }
-        echo '</table>';
-        echo '</form>';
 
-        echo '</fieldset>';
-        echo '</fieldset><br /><br />';
-        //Fin de la liste des evennement -------------------------------------
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _MD_EXTCAL_SUBMIT_EVENT . '</legend>';
+            if (count($events) > 0) {
+                $i = 0;
+                foreach (
+                    $events as $event
+                ) {
+                    $class = (++$i % 2 == 0) ? 'even' : 'odd';
+                    echo '<tr style="text-align:left;" class="' . $class . '">';
+                    echo "<td width='10%' align='center'>";
+                    echo "<input type='checkbox' name='deleteEvents[{$event['event_id']}]' value='1' >";
+                    echo "<input type='hidden' name='deleteAllEvents[{$event['event_id']}]' value='1' />";
+                    echo "</td>";
+                    echo "<td align = 'center' width='5%'>" . $event['event_id'] . '</td>';
+                    echo "<td  width='10%'>" . '<a href=cat.php?op=modify&amp;cat_id=' . $event['cat']['cat_id'] . '&form_modify' . '>' . $event['cat']['cat_name'] . '</a>' . '</td>';
+
+                    echo '<td>' . '<a href=event.php?op=modify&amp;event_id=' . $event['event_id'] . '>' . $event['event_title'] . '</a>' . '</td>';
+
+    //                 if ($event['event_isrecur']) {
+    //                     echo '<td>' . $event['formated_reccur_rule'] . '</td>';
+    //                 } else {
+    //                     echo '<td>' . $event['formated_event_start'] . '</td>';
+    //                 }
+
+
+                    echo "<td align = 'center' width='10%'>" . $event['formated_event_start'] . '</td>';
+                    echo "<td align = 'center' width='10%'>" . $event['formated_event_end'] . '</td>';
+                    echo '<td align="center">' . (($event['event_isrecur'] == 1) ? _YES : _NO) . '</td>';
+                    if (!isset($event['formated_reccur_rule'])) {
+                        $event['formated_reccur_rule'] = '';
+                    }
+                    echo '<td>' . $event['formated_reccur_rule'] . '</td>';
+
+                    echo '<td style="width:10%; text-align:center;">';
+                    echo '<a href=event.php?op=modify&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/edit.png' title='" . _AM_EXTCAL_ICONE_EDIT . "' /></a>&nbsp;&nbsp;";
+                    echo '<a href=event.php?op=delete&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/delete.png' title='" . _AM_EXTCAL_ICONE_DELETE . "' /></a>&nbsp;&nbsp;";
+                    echo '<a href=event.php?op=clone&amp;event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/editcopy.png' title='" . _AM_EXTCAL_ICONE_CLONE . "' /></a>";
+                    echo '</td>';
+
+                    echo '</tr>';
+                }
+                //---------------------------------------------------------
+                $pageNav = new XoopsPageNav($eventHandler->getCountNewEvent(), $nbEventsByPage, $start);
+
+                echo '<tr><td colspan="2" style="text-align: right;">';
+                echo $pageNav->renderNav(2);
+                echo '</td>';
+
+                echo '<td colspan="2" style="text-align: right;">';
+
+                echo '<input type="submit" value="' . _AM_EXTCAL_DELETE_ALL . '" name="deleteSelection[0]">';
+                echo '<input type="submit" value="' . _AM_EXTCAL_DELETE_SELECTION . '" name="deleteSelection[1]">';
 
-        $form = $eventHandler->getEventForm('admin');
-        $form->display();
+                echo '</td>';
+                echo '</tr>';
+            } else {
+                echo '<tr><td colspan="5">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
+            }
+            echo '</table>';
+            echo '</form>';
+
+            echo '</fieldset>';
+            echo '</fieldset><br /><br />';
+            //Fin de la liste des evennement -------------------------------------
+            echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _MD_EXTCAL_SUBMIT_EVENT . '</legend>';
+
+            $form = $eventHandler->getEventForm('admin');
+            $form->display();
 
-        echo '</fieldset>';
+            echo '</fieldset>';
 
-        include_once __DIR__ . '/admin_footer.php';
+            include_once __DIR__ . '/admin_footer.php';
 
-        break;
+            break;
 }

htdocs/modules/extcal/admin/index.php

Switch Indentation +72 added lines, -72 removed lines

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