Inspection of "Remove pass-by-reference instances" - mambax7/extcal - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 5f5d60...a9decc )

by Michael

created 2017-05-24 04:42 UTC

Status

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

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

Please login to merge, or discard this patch.

admin/cat.php 1 patch

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

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

Please login to merge, or discard this patch.

admin/upgrade.php 1 patch

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

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

Please login to merge, or discard this patch.

admin/event.php 2 patches

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

@@ -51,176 +51,194 @@  discard block
 block discarded – undo
 
 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;
-        ///////////////////////////////////////////////////////////////////////////////
-        ExtcalUtilities::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;
+            ///////////////////////////////////////////////////////////////////////////////
+            ExtcalUtilities::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((int)$_POST['event_id']);
+                    redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDITED, false);
+                }
+
+                // New event
             } else {
-                $fileHandler->createFile((int)$_POST['event_id']);
-                redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDITED, false);
+                $notificationHandler = xoops_getHandler('notification');
+                /** @var ExtcalCatHandler $catHandler */
+                $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');
-            /** @var ExtcalCatHandler $catHandler */
-            $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);
+        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(basename(__FILE__));
+            //***************************************************************************************
+
+            $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();
             }
-        }
-        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(basename(__FILE__));
-        //***************************************************************************************
-
-        $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;
+            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);
+            } 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(basename(__FILE__));
+                //***************************************************************************************
+
+                $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)
             //***************************************************************************************
@@ -228,186 +246,168 @@  discard block
 block discarded – undo
             $eventAdmin = new ModuleAdmin();
             echo $eventAdmin->addNavigation(basename(__FILE__));
             //***************************************************************************************
+            if (isset($_POST['deleteSelection'][0])) {
+                $msg = _AM_EXTCAL_CONFIRM_DELETE_ALL;
+                $ids = array_keys($_POST['deleteAllEvents']);
+            } else {
+                $msg = _AM_EXTCAL_CONFIRM_DELETE_SELECTION;
+                $ids = array_keys($_POST['deleteEvents']);
+            }
 
-            $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');
+            //           $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 'deleteSelection':
-
-        xoops_cp_header();
-        // @author      Gregory Mage (Aka Mage)
-        //***************************************************************************************
-        //include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
-        $eventAdmin = new ModuleAdmin();
-        echo $eventAdmin->addNavigation(basename(__FILE__));
-        //***************************************************************************************
-        if (isset($_POST['deleteSelection'][0])) {
-            $msg = _AM_EXTCAL_CONFIRM_DELETE_ALL;
-            $ids = array_keys($_POST['deleteAllEvents']);
-        } else {
-            $msg = _AM_EXTCAL_CONFIRM_DELETE_SELECTION;
-            $ids = array_keys($_POST['deleteEvents']);
-        }
+            break;
 
-        //           $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;
-            }
+        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;
+            //-----------------------------------------
 
-            deleteEvents($_POST['event_ids']);
+            if (isset($_POST['deleteSelection'][0])) {
+            } else {
+                if (!$GLOBALS['xoopsSecurity']->check()) {
+                    redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+                    exit;
+                }
 
-            redirect_header('event.php', 3, _AM_EXTCAL_EVENTS_DELETED, false);
-        }
+                deleteEvents($_POST['event_ids']);
 
-        break;
+                redirect_header('event.php', 3, _AM_EXTCAL_EVENTS_DELETED, false);
+            }
 
-    case 'default':
-    default:
+            break;
 
-        //global $extcalConfig;
-        $extcalConfig      = ExtcalConfig::getHandler();
-        $xoopsModuleConfig = $extcalConfig->getModuleConfig();
+        case 'default':
+        default:
 
-        $start          = isset($_GET['start']) ? $_GET['start'] : 0;
-        $nbEventsByPage = $xoopsModuleConfig['nbEventsByPage'];
+            //global $extcalConfig;
+            $extcalConfig      = ExtcalConfig::getHandler();
+            $xoopsModuleConfig = $extcalConfig->getModuleConfig();
 
-        xoops_cp_header();
-        // @author      Gregory Mage (Aka Mage)
-        //***************************************************************************************
+            $start          = isset($_GET['start']) ? $_GET['start'] : 0;
+            $nbEventsByPage = $xoopsModuleConfig['nbEventsByPage'];
 
-        $eventAdmin = new ModuleAdmin();
-        echo $eventAdmin->addNavigation(basename(__FILE__));
-        //***************************************************************************************
+            xoops_cp_header();
+            // @author      Gregory Mage (Aka Mage)
+            //***************************************************************************************
 
-        $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-        $events       = $eventHandler->objectToArray($eventHandler->getNewEvent($start, $nbEventsByPage, 0, true), array('cat_id'));
-        $eventHandler->formatEventsDate($events, _SHORTDATESTRING);
+            $eventAdmin = new ModuleAdmin();
+            echo $eventAdmin->addNavigation(basename(__FILE__));
+            //***************************************************************************************
 
-        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;
+            $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 '<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><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 '</fieldset><br>';
+            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><legend style="font-weight:bold; color:#0A3760;">' . _MD_EXTCAL_SUBMITED_EVENT . '</legend>';
+            echo '</fieldset><br>';
 
-        echo '<form method="POST" action="event.php">';
-        echo '<input type="hidden" name="op" value="deleteSelection" />';
+            echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _MD_EXTCAL_SUBMITED_EVENT . '</legend>';
 
-        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 '<form method="POST" action="event.php">';
+            echo '<input type="hidden" name="op" value="deleteSelection" />';
 
-        echo '</tr>';
+            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>';
 
-        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 '</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>';
+
+                    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>';
                 }
-                echo '<td>' . $event['formated_reccur_rule'] . '</td>';
+                //---------------------------------------------------------
+                $pageNav = new XoopsPageNav($eventHandler->getCountNewEvent(), $nbEventsByPage, $start);
 
-                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 '<tr><td colspan="2" style="text-align: right;">';
+                echo $pageNav->renderNav(2);
                 echo '</td>';
 
-                echo '</tr>';
-            }
-            //---------------------------------------------------------
-            $pageNav = new XoopsPageNav($eventHandler->getCountNewEvent(), $nbEventsByPage, $start);
+                echo '<td colspan="2" style="text-align: right;">';
 
-            echo '<tr><td colspan="2" style="text-align: right;">';
-            echo $pageNav->renderNav(2);
-            echo '</td>';
+                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 '<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]">';
-
-            echo '</td>';
-            echo '</tr>';
-        } else {
-            echo '<tr><td colspan="5">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
-        }
-        echo '</table>';
-        echo '</form>';
+                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>';
+            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();
+            $form = $eventHandler->getEventForm('admin');
+            $form->display();
 
-        echo '</fieldset>';
+            echo '</fieldset>';
 
-        include_once __DIR__ . '/admin_footer.php';
+            include_once __DIR__ . '/admin_footer.php';
 
-        break;
+            break;
 }

Please login to merge, or discard this patch.

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

@@ -1,11 +1,11 @@  discard block
 block discarded – undo
 <?php
 
-include_once __DIR__ . '/../../../include/cp_header.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-include_once __DIR__ . '/../class/form/extcalform.php';
-include_once __DIR__ . '/admin_header.php';
-include_once __DIR__ . '/../class/utilities.php';
+include_once __DIR__.'/../../../include/cp_header.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+include_once __DIR__.'/../class/form/extcalform.php';
+include_once __DIR__.'/admin_header.php';
+include_once __DIR__.'/../class/utilities.php';
 
 $gepeto = array_merge($_GET, $_POST);
 while (list($k, $v) = each($gepeto)) {
@@ -31,15 +31,15 @@  discard block
 block discarded – undo
 
     while (list($k, $t) = each($rst)) {
         if ($t['event_picture1'] != '') {
-            $f = XOOPS_ROOT_PATH . '/uploads/extcal/' . $t['event_picture1'];
+            $f = XOOPS_ROOT_PATH.'/uploads/extcal/'.$t['event_picture1'];
             unlink($f);
-            echo $f . '<br>';
+            echo $f.'<br>';
         }
 
         if ($t['event_picture2'] != '') {
-            $f = XOOPS_ROOT_PATH . '/uploads/extcal/' . $t['event_picture1'];
+            $f = XOOPS_ROOT_PATH.'/uploads/extcal/'.$t['event_picture1'];
             unlink($f);
-            echo $f . '<br>';
+            echo $f.'<br>';
         }
     }
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
             if (!$eventHandler->modifyEvent($_POST['event_id'], $data)) {
                 redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDIT_FAILED, false);
             } else {
-                $fileHandler->createFile((int)$_POST['event_id']);
+                $fileHandler->createFile((int) $_POST['event_id']);
                 redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDITED, false);
             }
 
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
         $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>';
+        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();
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
         }
 
         $data['event_id'] = 0;
-        $data['event_title'] .= ' (' . _AM_EXTCAL_CLONE_OF . $eventId . ')';
+        $data['event_title'] .= ' ('._AM_EXTCAL_CLONE_OF.$eventId.')';
 
         $newEvent = $eventHandler->create();
         $newEvent->setVars($data);
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
 
         if (isset($_POST['confirm'])) {
             if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+                redirect_header('index.php', 3, _NOPERM.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
                 exit;
             }
             //             $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
         if (isset($_POST['deleteSelection'][0])) {
         } else {
             if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+                redirect_header('index.php', 3, _NOPERM.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
                 exit;
             }
 
@@ -312,32 +312,32 @@  discard block
 block discarded – undo
         $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 '<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 '<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 '<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>'._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 '<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>';
 
@@ -345,15 +345,15 @@  discard block
 block discarded – undo
             $i = 0;
             foreach ($events as $event) {
                 $class = (++$i % 2 == 0) ? 'even' : 'odd';
-                echo '<tr style="text-align:left;" class="' . $class . '">';
+                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 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>';
+                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>';
@@ -361,18 +361,18 @@  discard block
 block discarded – undo
                 //                     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>';
+                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>'.$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 '<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>';
@@ -386,13 +386,13 @@  discard block
 block discarded – undo
 
             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]">';
+            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 '</td>';
             echo '</tr>';
         } else {
-            echo '<tr><td colspan="5">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
+            echo '<tr><td colspan="5">'._AM_EXTCAL_NO_PENDING_EVENT.'</td></tr>';
         }
         echo '</table>';
         echo '</form>';
@@ -400,14 +400,14 @@  discard block
 block discarded – undo
         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>';
+        echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._MD_EXTCAL_SUBMIT_EVENT.'</legend>';
 
         $form = $eventHandler->getEventForm('admin');
         $form->display();
 
         echo '</fieldset>';
 
-        include_once __DIR__ . '/admin_footer.php';
+        include_once __DIR__.'/admin_footer.php';
 
         break;
 }

Please login to merge, or discard this patch.

view_week.php 1 patch

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

@@ -1,16 +1,16 @@  discard block
 block discarded – undo
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-include_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+include_once __DIR__.'/include/constantes.php';
 $params                                  = array('view' => _EXTCAL_NAV_WEEK, 'file' => _EXTCAL_FILE_WEEK);
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 /* ========================================================================== */
-$year  = isset($_GET['year']) ? (int)$_GET['year'] : date('Y');
-$month = isset($_GET['month']) ? (int)$_GET['month'] : date('n');
-$day   = isset($_GET['day']) ? (int)$_GET['day'] : date('j');
-$cat   = isset($_GET['cat']) ? (int)$_GET['cat'] : 0;
+$year  = isset($_GET['year']) ? (int) $_GET['year'] : date('Y');
+$month = isset($_GET['month']) ? (int) $_GET['month'] : date('n');
+$day   = isset($_GET['day']) ? (int) $_GET['day'] : date('j');
+$cat   = isset($_GET['cat']) ? (int) $_GET['cat'] : 0;
 /* ========================================================================== */
 
 // Validate the date (day, month and year)
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
     'cat'          => $cat,
     'externalKeys' => 'cat_id',
 );
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 $eventsArray = $events;
 // Formating date
@@ -86,21 +86,21 @@  discard block
 block discarded – undo
 $nWeekCalObj = $weekCalObj->nextWeek('object');
 $navig       = array(
     'prev' => array(
-        'uri'  => 'year=' . $pWeekCalObj->thisYear() . '&amp;month=' . $pWeekCalObj->thisMonth() . '&amp;day=' . $pWeekCalObj->thisDay(),
+        'uri'  => 'year='.$pWeekCalObj->thisYear().'&amp;month='.$pWeekCalObj->thisMonth().'&amp;day='.$pWeekCalObj->thisDay(),
         'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $pWeekCalObj->getTimestamp()),
     ),
     'this' => array(
-        'uri'  => 'year=' . $weekCalObj->thisYear() . '&amp;month=' . $weekCalObj->thisMonth() . '&amp;day=' . $weekCalObj->thisDay(),
+        'uri'  => 'year='.$weekCalObj->thisYear().'&amp;month='.$weekCalObj->thisMonth().'&amp;day='.$weekCalObj->thisDay(),
         'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $weekCalObj->getTimestamp()),
     ),
     'next' => array(
-        'uri'  => 'year=' . $nWeekCalObj->thisYear() . '&amp;month=' . $nWeekCalObj->thisMonth() . '&amp;day=' . $nWeekCalObj->thisDay(),
+        'uri'  => 'year='.$nWeekCalObj->thisYear().'&amp;month='.$nWeekCalObj->thisMonth().'&amp;day='.$nWeekCalObj->thisDay(),
         'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $nWeekCalObj->getTimestamp()),
     ),
 );
 
 // Title of the page
-$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']);
+$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']);
 
 // Assigning navig data to the template
 $xoopsTpl->assign('navig', $navig);
@@ -160,4 +160,4 @@  discard block
 block discarded – undo
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'week');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

Please login to merge, or discard this patch.

view_search.php 1 patch

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

@@ -1,13 +1,13 @@  discard block
 block discarded – undo
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-include_once __DIR__ . '/include/constantes.php';
-$params                                  = array(
+include __DIR__.'/../../mainfile.php';
+include_once __DIR__.'/include/constantes.php';
+$params = array(
     'view' => _EXTCAL_NAV_SEARCH,
     'file' => _EXTCAL_FILE_SEARCH,
 );
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 $recurEventsArray = array();
 //needed to save the state of the form, so we don't show on the first time the list of available events
@@ -19,10 +19,10 @@  discard block
 block discarded – undo
 /***************************************************************/
 $searchExp = isset($_POST['searchExp']) ? $_POST['searchExp'] : '';
 $andor     = isset($_POST['andor']) ? $_POST['andor'] : '';
-$year      = isset($_POST['year']) ? (int)$_POST['year'] : date('Y');
-$month     = isset($_POST['month']) ? (int)$_POST['month'] : date('n');
-$day       = isset($_POST['day']) ? (int)$_POST['day'] : 0;
-$cat       = isset($_POST['cat']) ? (int)$_POST['cat'] : 0;
+$year      = isset($_POST['year']) ? (int) $_POST['year'] : date('Y');
+$month     = isset($_POST['month']) ? (int) $_POST['month'] : date('n');
+$day       = isset($_POST['day']) ? (int) $_POST['day'] : 0;
+$cat       = isset($_POST['cat']) ? (int) $_POST['cat'] : 0;
 $orderby1  = isset($_POST['orderby1']) ? $_POST['orderby1'] : 'cat_name ASC';
 $orderby2  = isset($_POST['orderby2']) ? $_POST['orderby2'] : 'event_title ASC';
 $orderby3  = isset($_POST['orderby3']) ? $_POST['orderby3'] : '';
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
     }
 }
 
-$eventsArray = array_merge((array)$eventsArray, (array)$recurEventsArray);
+$eventsArray = array_merge((array) $eventsArray, (array) $recurEventsArray);
 
 // Sort event array by event start
 //usort($eventsArray, "orderEvents");
@@ -234,4 +234,4 @@  discard block
 block discarded – undo
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'search');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

Please login to merge, or discard this patch.

new_event.php 1 patch

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

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-include_once __DIR__ . '/include/constantes.php';
-include_once __DIR__ . '/header.php';
+include __DIR__.'/../../mainfile.php';
+include_once __DIR__.'/include/constantes.php';
+include_once __DIR__.'/header.php';
 
 // Getting eXtCal object's handler
 $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
 $permHandler = ExtcalPerm::getHandler();
 $xoopsUser   = $xoopsUser ?: null;
 if (count($permHandler->getAuthorizedCat($xoopsUser, 'extcal_cat_submit')) > 0) {
-    include XOOPS_ROOT_PATH . '/header.php';
+    include XOOPS_ROOT_PATH.'/header.php';
 
     // Title of the page
     $xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
 
     //$form->display();
 
-    include XOOPS_ROOT_PATH . '/footer.php';
+    include XOOPS_ROOT_PATH.'/footer.php';
 } else {
     redirect_header('index.php', 3);
 }

Please login to merge, or discard this patch.

include/config.php 1 patch

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

@@ -17,18 +17,18 @@  discard block
 block discarded – undo
  * @author       XOOPS Development Team
  */
 
-require_once __DIR__ . '/../../../mainfile.php';
+require_once __DIR__.'/../../../mainfile.php';
 $moduleDirName = basename(dirname(__DIR__));
 
 if (!defined('EXTCAL_DIRNAME')) {
     define('EXTCAL_DIRNAME', $moduleDirName);
-    define('EXTCAL_PATH', XOOPS_ROOT_PATH . '/modules/' . EXTCAL_DIRNAME);
-    define('EXTCAL_URL', XOOPS_URL . '/modules/' . EXTCAL_DIRNAME);
-    define('EXTCAL_ADMIN', EXTCAL_URL . '/admin/index.php');
-    define('EXTCAL_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . EXTCAL_DIRNAME);
-    define('EXTCAL_AUTHOR_LOGOIMG', EXTCAL_URL . '/assets/images/logoModule.png');
-    define('EXTCAL_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . EXTCAL_DIRNAME); // WITHOUT Trailing slash
-    define('EXTCAL_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . EXTCAL_DIRNAME); // WITHOUT Trailing slash
+    define('EXTCAL_PATH', XOOPS_ROOT_PATH.'/modules/'.EXTCAL_DIRNAME);
+    define('EXTCAL_URL', XOOPS_URL.'/modules/'.EXTCAL_DIRNAME);
+    define('EXTCAL_ADMIN', EXTCAL_URL.'/admin/index.php');
+    define('EXTCAL_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.EXTCAL_DIRNAME);
+    define('EXTCAL_AUTHOR_LOGOIMG', EXTCAL_URL.'/assets/images/logoModule.png');
+    define('EXTCAL_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.EXTCAL_DIRNAME); // WITHOUT Trailing slash
+    define('EXTCAL_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.EXTCAL_DIRNAME); // WITHOUT Trailing slash
 
 }
 
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
     'name'          => 'Module Configurator',
     'uploadFolders' => array(
         EXTCAL_UPLOAD_PATH,
-        EXTCAL_UPLOAD_PATH . '/etablissement'
+        EXTCAL_UPLOAD_PATH.'/etablissement'
     ),
 //    'copyFiles'     => array(
 //        EXTCAL_UPLOAD_PATH,
@@ -58,4 +58,4 @@  discard block
 block discarded – undo
 
 // module information
 $mod_copyright = "<a href='http://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . EXTCAL_AUTHOR_LOGOIMG . "' alt='XOOPS Project' /></a>";
+                     <img src='" . EXTCAL_AUTHOR_LOGOIMG."' alt='XOOPS Project' /></a>";

Please login to merge, or discard this patch.

edit_event.php 1 patch

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

@@ -1,11 +1,11 @@  discard block
 block discarded – undo
 <?php
 
-include __DIR__ . '/../../mainfile.php';
+include __DIR__.'/../../mainfile.php';
 
-include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-include __DIR__ . '/class/form/extcalform.php';
-include __DIR__ . '/class/perm.php';
-include_once __DIR__ . '/include/constantes.php';
+include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+include __DIR__.'/class/form/extcalform.php';
+include __DIR__.'/class/perm.php';
+include_once __DIR__.'/include/constantes.php';
 
 $permHandler = ExtcalPerm::getHandler();
 $xoopsUser   = $xoopsUser ?: null;
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
 
 $params                                  = array('view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT);
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 /* ========================================================================== */
 
 // Tooltips include
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
 if (!isset($_GET['event'])) {
     $eventId = 0;
 } else {
-    $eventId = (int)$_GET['event'];
+    $eventId = (int) $_GET['event'];
 }
 if (!isset($_GET['action'])) {
     $action = 'edit';
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
 // Getting eXtCal object's handler
 $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
 
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
 // Title of the page
 $xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
@@ -49,4 +49,4 @@  discard block
 block discarded – undo
 $form = $eventHandler->getEventForm('user', $action, array('event_id' => $eventId));
 $form->display();
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

Please login to merge, or discard this patch.

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

		@@ -1,10 +1,10 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-include_once __DIR__ . '/../../../include/cp_header.php';
4		-include __DIR__ . '/../../../class/xoopsformloader.php';
5		-include_once __DIR__ . '/admin_header.php';
6		-include_once __DIR__ . '/../class/utilities.php';
7		-include_once __DIR__ . '/../include/constantes.php';
	3	+include_once __DIR__.'/../../../include/cp_header.php';
	4	+include __DIR__.'/../../../class/xoopsformloader.php';
	5	+include_once __DIR__.'/admin_header.php';
	6	+include_once __DIR__.'/../class/utilities.php';
	7	+include_once __DIR__.'/../include/constantes.php';
8	8
9	9	$gepeto = array_merge($_GET, $_POST);
10	10	while (list($k, $v) = each($gepeto)) {
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61	$form->addElement(new XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, 0), false);
62	62	$form->addElement(new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#FF0000'));
63	63
64		- $file_path = __DIR__ . '/../assets/css/images';
	64	+ $file_path = __DIR__.'/../assets/css/images';
65	65	$tf = XoopsLists::getImgListAsArray($file_path);
66	66	array_unshift($tf, _MD_EXTCAL_NONE);
67	67	//$xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), '');
		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73
74	74	$form->display();
75	75
76		- include_once __DIR__ . '/admin_footer.php';
	76	+ include_once __DIR__.'/admin_footer.php';
77	77	break;
78	78
79	79	case 'edit':
		@@ -86,15 +86,15 @@ discard block
		block discarded – undo
86	86	$cat = $catHandler->getCat($cat_id, true);
87	87	}
88	88
89		- echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_EDIT_CATEGORY . '</legend>';
	89	+ echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_EDIT_CATEGORY.'</legend>';
90	90
91	91	$form = new XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true);
92	92	$form->addElement(new XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255, $cat->getVar('cat_name')), true);
93	93	$form->addElement(new XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', $cat->getVar('cat_desc')), false);
94	94	$form->addElement(new XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, $cat->getVar('cat_weight')), false);
95		- $form->addElement(new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#' . $cat->getVar('cat_color')));
	95	+ $form->addElement(new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#'.$cat->getVar('cat_color')));
96	96
97		- $file_path = __DIR__ . '/../assets/css/images';
	97	+ $file_path = __DIR__.'/../assets/css/images';
98	98	$tf = XoopsLists::getImgListAsArray($file_path);
99	99	array_unshift($tf, _MD_EXTCAL_NONE);
100	100	$xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, 'cat_icone', $cat->getVar('cat_icone'), '');
		@@ -250,6 +250,6 @@ discard block
		block discarded – undo
250	250	//$xoopsTpl->assign("module_dirname", $xoopsModule->getVar("dirname") );
251	251
252	252	$xoopsTpl->display('db:admin/extcal_admin_cat_list.tpl');
253		- include_once __DIR__ . '/admin_footer.php';
	253	+ include_once __DIR__.'/admin_footer.php';
254	254	break;
255	255	}

		@@ -5,8 +5,8 @@ discard block
		block discarded – undo
5	5	$step = $_POST['step'];
6	6	}
7	7
8		-include_once __DIR__ . '/../../../include/cp_header.php';
9		-include __DIR__ . '/function.php';
	8	+include_once __DIR__.'/../../../include/cp_header.php';
	9	+include __DIR__.'/function.php';
10	10
11	11	// Change this variable if you use a cloned version of eXtGallery
12	12	$localModuleDir = 'extcal';
		@@ -16,9 +16,9 @@ discard block
		block discarded – undo
16	16	$downloadServer = 'http://downloads.sourceforge.net/zoullou/';
17	17
18	18	$lastVersion = @file_get_contents($versionFile);
19		-$lastVersionString = substr($lastVersion, 0, 1) . '.' . substr($lastVersion, 1, 1) . '.' . substr($lastVersion, 2, 1);
20		-$moduleFileName = $moduleName . '-' . $lastVersionString . '.tar.gz';
21		-$langFileName = $moduleName . '-lang-' . $lastVersionString . '_' . $xoopsConfig['language'] . '.tar.gz';
	19	+$lastVersionString = substr($lastVersion, 0, 1).'.'.substr($lastVersion, 1, 1).'.'.substr($lastVersion, 2, 1);
	20	+$moduleFileName = $moduleName.'-'.$lastVersionString.'.tar.gz';
	21	+$langFileName = $moduleName.'-lang-'.$lastVersionString.'_'.$xoopsConfig['language'].'.tar.gz';
22	22
23	23	switch ($step) {
24	24	case 'download':
		@@ -30,12 +30,12 @@ discard block
		block discarded – undo
30	30	break;
31	31	}
32	32
33		- if (!$handle = @fopen($downloadServer . $moduleFileName, 'r')) {
	33	+ if (!$handle = @fopen($downloadServer.$moduleFileName, 'r')) {
34	34	printf(_AM_EXTCAL_MD_FILE_DONT_EXIST, $downloadServer, $moduleFileName);
35	35	xoops_cp_footer();
36	36	break;
37	37	}
38		- $localHandle = @fopen(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName, 'w+');
	38	+ $localHandle = @fopen(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName, 'w+');
39	39
40	40	// Downlad module archive
41	41	if ($handle) {
		@@ -49,10 +49,10 @@ discard block
		block discarded – undo
49	49
50	50	// English file are included on module package
51	51	if ($xoopsConfig['language'] !== 'english') {
52		- if (!$handle = @fopen($downloadServer . $langFileName, 'r')) {
	52	+ if (!$handle = @fopen($downloadServer.$langFileName, 'r')) {
53	53	printf(_AM_EXTCAL_LG_FILE_DONT_EXIST, $downloadServer, $langFileName);
54	54	} else {
55		- $localHandle = @fopen(XOOPS_ROOT_PATH . '/uploads/' . $langFileName, 'w+');
	55	+ $localHandle = @fopen(XOOPS_ROOT_PATH.'/uploads/'.$langFileName, 'w+');
56	56	// Download language archive
57	57	if ($handle) {
58	58	while (!feof($handle)) {
		@@ -75,35 +75,35 @@ discard block
		block discarded – undo
75	75	xoops_cp_header();
76	76	adminMenu();
77	77
78		- if (!file_exists(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName)) {
	78	+ if (!file_exists(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName)) {
79	79	echo _AM_EXTCAL_MD_FILE_DONT_EXIST_SHORT;
80	80	xoops_cp_footer();
81	81
82	82	break;
83	83	}
84	84
85		- $gPcltarLibDir = XOOPS_ROOT_PATH . '/modules/' . $localModuleDir . '/class';
86		- include __DIR__ . '/../class/pcltar.lib.php';
	85	+ $gPcltarLibDir = XOOPS_ROOT_PATH.'/modules/'.$localModuleDir.'/class';
	86	+ include __DIR__.'/../class/pcltar.lib.php';
87	87
88	88	//TrOn(5);
89	89
90	90	// Extract module files
91		- PclTarExtract(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName, XOOPS_ROOT_PATH . '/modules/' . $localModuleDir . '/', 'modules/' . $moduleName . '/');
	91	+ PclTarExtract(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName, XOOPS_ROOT_PATH.'/modules/'.$localModuleDir.'/', 'modules/'.$moduleName.'/');
92	92	// Delete downloaded module's files
93		- unlink(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName);
	93	+ unlink(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName);
94	94
95		- if (file_exists(XOOPS_ROOT_PATH . '/uploads/' . $langFileName)) {
	95	+ if (file_exists(XOOPS_ROOT_PATH.'/uploads/'.$langFileName)) {
96	96	// Extract language files
97		- PclTarExtract(XOOPS_ROOT_PATH . '/uploads/' . $langFileName, XOOPS_ROOT_PATH . '/modules/' . $localModuleDir . '/', 'modules/' . $moduleName . '/');
	97	+ PclTarExtract(XOOPS_ROOT_PATH.'/uploads/'.$langFileName, XOOPS_ROOT_PATH.'/modules/'.$localModuleDir.'/', 'modules/'.$moduleName.'/');
98	98	// Delete downloaded module's files
99		- unlink(XOOPS_ROOT_PATH . '/uploads/' . $langFileName);
	99	+ unlink(XOOPS_ROOT_PATH.'/uploads/'.$langFileName);
100	100	}
101	101
102	102	// Delete template_c file
103		- if ($handle = opendir(XOOPS_ROOT_PATH . '/templates_c')) {
	103	+ if ($handle = opendir(XOOPS_ROOT_PATH.'/templates_c')) {
104	104	while (false !== ($file = readdir($handle))) {
105	105	if ($file !== '.' && $file !== '..' && $file !== 'index.html') {
106		- unlink(XOOPS_ROOT_PATH . '/templates_c/' . $file);
	106	+ unlink(XOOPS_ROOT_PATH.'/templates_c/'.$file);
107	107	}
108	108	}
109	109
		@@ -111,7 +111,7 @@ discard block
		block discarded – undo
111	111	}
112	112	//TrDisplay();
113	113
114		- xoops_confirm(array('dirname' => $localModuleDir, 'op' => 'update_ok', 'fct' => 'modulesadmin'), XOOPS_URL . '/modules/system/admin.php', _AM_EXTCAL_INSTALL_DONE, _AM_EXTCAL_UPDATE);
	114	+ xoops_confirm(array('dirname' => $localModuleDir, 'op' => 'update_ok', 'fct' => 'modulesadmin'), XOOPS_URL.'/modules/system/admin.php', _AM_EXTCAL_INSTALL_DONE, _AM_EXTCAL_UPDATE);
115	115
116	116	xoops_cp_footer();
117	117

		@@ -1,11 +1,11 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-include_once __DIR__ . '/../../../include/cp_header.php';
4		-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
5		-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
6		-include_once __DIR__ . '/../class/form/extcalform.php';
7		-include_once __DIR__ . '/admin_header.php';
8		-include_once __DIR__ . '/../class/utilities.php';
	3	+include_once __DIR__.'/../../../include/cp_header.php';
	4	+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
	5	+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
	6	+include_once __DIR__.'/../class/form/extcalform.php';
	7	+include_once __DIR__.'/admin_header.php';
	8	+include_once __DIR__.'/../class/utilities.php';
9	9
10	10	$gepeto = array_merge($_GET, $_POST);
11	11	while (list($k, $v) = each($gepeto)) {
		@@ -31,15 +31,15 @@ discard block
		block discarded – undo
31	31
32	32	while (list($k, $t) = each($rst)) {
33	33	if ($t['event_picture1'] != '') {
34		- $f = XOOPS_ROOT_PATH . '/uploads/extcal/' . $t['event_picture1'];
	34	+ $f = XOOPS_ROOT_PATH.'/uploads/extcal/'.$t['event_picture1'];
35	35	unlink($f);
36		- echo $f . '<br>';
	36	+ echo $f.'<br>';
37	37	}
38	38
39	39	if ($t['event_picture2'] != '') {
40		- $f = XOOPS_ROOT_PATH . '/uploads/extcal/' . $t['event_picture1'];
	40	+ $f = XOOPS_ROOT_PATH.'/uploads/extcal/'.$t['event_picture1'];
41	41	unlink($f);
42		- echo $f . '<br>';
	42	+ echo $f.'<br>';
43	43	}
44	44	}
45	45
		@@ -101,7 +101,7 @@ discard block
		block discarded – undo
101	101	if (!$eventHandler->modifyEvent($_POST['event_id'], $data)) {
102	102	redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDIT_FAILED, false);
103	103	} else {
104		- $fileHandler->createFile((int)$_POST['event_id']);
	104	+ $fileHandler->createFile((int) $_POST['event_id']);
105	105	redirect_header('event.php', 3, _AM_EXTCAL_EVENT_EDITED, false);
106	106	}
107	107
		@@ -172,7 +172,7 @@ discard block
		block discarded – undo
172	172	$eventId = $_GET['event_id'];
173	173	$eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
174	174
175		- echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _MD_EXTCAL_EDIT_EVENT . '</legend>';
	175	+ echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._MD_EXTCAL_EDIT_EVENT.'</legend>';
176	176
177	177	if ($form = $eventHandler->getEventForm('admin', $action, array('event_id' => $eventId))) {
178	178	$form->display();
		@@ -197,7 +197,7 @@ discard block
		block discarded – undo
197	197	}
198	198
199	199	$data['event_id'] = 0;
200		- $data['event_title'] .= ' (' . _AM_EXTCAL_CLONE_OF . $eventId . ')';
	200	+ $data['event_title'] .= ' ('._AM_EXTCAL_CLONE_OF.$eventId.')';
201	201
202	202	$newEvent = $eventHandler->create();
203	203	$newEvent->setVars($data);
		@@ -213,7 +213,7 @@ discard block
		block discarded – undo
213	213
214	214	if (isset($_POST['confirm'])) {
215	215	if (!$GLOBALS['xoopsSecurity']->check()) {
216		- redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
	216	+ redirect_header('index.php', 3, _NOPERM.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
217	217	exit;
218	218	}
219	219	// $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
		@@ -279,7 +279,7 @@ discard block
		block discarded – undo
279	279	if (isset($_POST['deleteSelection'][0])) {
280	280	} else {
281	281	if (!$GLOBALS['xoopsSecurity']->check()) {
282		- redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
	282	+ redirect_header('index.php', 3, _NOPERM.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
283	283	exit;
284	284	}
285	285
		@@ -312,32 +312,32 @@ discard block
		block discarded – undo
312	312	$events = $eventHandler->objectToArray($eventHandler->getNewEvent($start, $nbEventsByPage, 0, true), array('cat_id'));
313	313	$eventHandler->formatEventsDate($events, _SHORTDATESTRING);
314	314
315		- echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
316		- echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
	315	+ echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_APPROVED_EVENT.'</legend>';
	316	+ echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
317	317	//echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/assets/images/action/edit.png' .' '.'style=vertical-align:middle;/>  ' . _AM_EXTCAL_INFO_EDIT . '<br>';
318	318	//echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/assets/images/action/delete.png'. ' '."style=vertical-align:middle;/>  ". _AM_EXTCAL_INFO_DELETE;
319	319
320		- echo '<img src=' . $pathIcon16 . '/edit.png' . ' ' . 'style=vertical-align:middle;/>  ' . _AM_EXTCAL_INFO_EDIT . '<br>';
321		- echo '<img src=' . $pathIcon16 . '/delete.png' . ' ' . 'style=vertical-align:middle;/>  ' . _AM_EXTCAL_INFO_DELETE . '<br>';
	320	+ echo '<img src='.$pathIcon16.'/edit.png'.' '.'style=vertical-align:middle;/>  '._AM_EXTCAL_INFO_EDIT.'<br>';
	321	+ echo '<img src='.$pathIcon16.'/delete.png'.' '.'style=vertical-align:middle;/>  '._AM_EXTCAL_INFO_DELETE.'<br>';
322	322
323	323	echo '</fieldset><br>';
324	324
325		- echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _MD_EXTCAL_SUBMITED_EVENT . '</legend>';
	325	+ echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._MD_EXTCAL_SUBMITED_EVENT.'</legend>';
326	326
327	327	echo '<form method="POST" action="event.php">';
328	328	echo '<input type="hidden" name="op" value="deleteSelection" />';
329	329
330	330	echo '<table class="outer" style="width:100%;">';
331	331	echo '<tr style="text-align:center;">';
332		- echo '<th>' . _AM_EXTCAL_DELETE . '</th>';
	332	+ echo '<th>'._AM_EXTCAL_DELETE.'</th>';
333	333	echo '<th>#</th>';
334		- echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
335		- echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
336		- echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
337		- echo '<th>' . _AM_EXTCAL_END_DATE . '</th>';
338		- echo '<th>' . _AM_EXTCAL_RECURRENT . '</th>';
339		- echo '<th>' . _AM_EXTCAL_START_RULES . '</th>';
340		- echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
	334	+ echo '<th>'._AM_EXTCAL_CATEGORY.'</th>';
	335	+ echo '<th>'._AM_EXTCAL_TITLE.'</th>';
	336	+ echo '<th>'._AM_EXTCAL_START_DATE.'</th>';
	337	+ echo '<th>'._AM_EXTCAL_END_DATE.'</th>';
	338	+ echo '<th>'._AM_EXTCAL_RECURRENT.'</th>';
	339	+ echo '<th>'._AM_EXTCAL_START_RULES.'</th>';
	340	+ echo '<th>'._AM_EXTCAL_ACTION.'</th>';
341	341
342	342	echo '</tr>';
343	343
		@@ -345,15 +345,15 @@ discard block
		block discarded – undo
345	345	$i = 0;
346	346	foreach ($events as $event) {
347	347	$class = (++$i % 2 == 0) ? 'even' : 'odd';
348		- echo '<tr style="text-align:left;" class="' . $class . '">';
	348	+ echo '<tr style="text-align:left;" class="'.$class.'">';
349	349	echo "<td width='10%' align='center'>";
350	350	echo "<input type='checkbox' name='deleteEvents[{$event['event_id']}]' value='1' >";
351	351	echo "<input type='hidden' name='deleteAllEvents[{$event['event_id']}]' value='1' />";
352	352	echo '</td>';
353		- echo "<td align = 'center' width='5%'>" . $event['event_id'] . '</td>';
354		- echo "<td width='10%'>" . '<a href=cat.php?op=modify&cat_id=' . $event['cat']['cat_id'] . '&form_modify' . '>' . $event['cat']['cat_name'] . '</a>' . '</td>';
	353	+ echo "<td align = 'center' width='5%'>".$event['event_id'].'</td>';
	354	+ echo "<td width='10%'>".'<a href=cat.php?op=modify&cat_id='.$event['cat']['cat_id'].'&form_modify'.'>'.$event['cat']['cat_name'].'</a>'.'</td>';
355	355
356		- echo '<td>' . '<a href=event.php?op=modify&event_id=' . $event['event_id'] . '>' . $event['event_title'] . '</a>' . '</td>';
	356	+ echo '<td>'.'<a href=event.php?op=modify&event_id='.$event['event_id'].'>'.$event['event_title'].'</a>'.'</td>';
357	357
358	358	// if ($event['event_isrecur']) {
359	359	// echo '<td>' . $event['formated_reccur_rule'] . '</td>';
		@@ -361,18 +361,18 @@ discard block
		block discarded – undo
361	361	// echo '<td>' . $event['formated_event_start'] . '</td>';
362	362	// }
363	363
364		- echo "<td align = 'center' width='10%'>" . $event['formated_event_start'] . '</td>';
365		- echo "<td align = 'center' width='10%'>" . $event['formated_event_end'] . '</td>';
366		- echo '<td align="center">' . (($event['event_isrecur'] == 1) ? _YES : _NO) . '</td>';
	364	+ echo "<td align = 'center' width='10%'>".$event['formated_event_start'].'</td>';
	365	+ echo "<td align = 'center' width='10%'>".$event['formated_event_end'].'</td>';
	366	+ echo '<td align="center">'.(($event['event_isrecur'] == 1) ? _YES : _NO).'</td>';
367	367	if (!isset($event['formated_reccur_rule'])) {
368	368	$event['formated_reccur_rule'] = '';
369	369	}
370		- echo '<td>' . $event['formated_reccur_rule'] . '</td>';
	370	+ echo '<td>'.$event['formated_reccur_rule'].'</td>';
371	371
372	372	echo '<td style="width:10%; text-align:center;">';
373		- echo '<a href=event.php?op=modify&event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/edit.png' title='" . _AM_EXTCAL_ICONE_EDIT . "' /></a>  ";
374		- echo '<a href=event.php?op=delete&event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/delete.png' title='" . _AM_EXTCAL_ICONE_DELETE . "' /></a>  ";
375		- echo '<a href=event.php?op=clone&event_id=' . $event['event_id'] . "><img src='" . $pathIcon16 . "/editcopy.png' title='" . _AM_EXTCAL_ICONE_CLONE . "' /></a>";
	373	+ echo '<a href=event.php?op=modify&event_id='.$event['event_id']."><img src='".$pathIcon16."/edit.png' title='"._AM_EXTCAL_ICONE_EDIT."' /></a>  ";
	374	+ echo '<a href=event.php?op=delete&event_id='.$event['event_id']."><img src='".$pathIcon16."/delete.png' title='"._AM_EXTCAL_ICONE_DELETE."' /></a>  ";
	375	+ echo '<a href=event.php?op=clone&event_id='.$event['event_id']."><img src='".$pathIcon16."/editcopy.png' title='"._AM_EXTCAL_ICONE_CLONE."' /></a>";
376	376	echo '</td>';
377	377
378	378	echo '</tr>';
		@@ -386,13 +386,13 @@ discard block
		block discarded – undo
386	386
387	387	echo '<td colspan="2" style="text-align: right;">';
388	388
389		- echo '<input type="submit" value="' . _AM_EXTCAL_DELETE_ALL . '" name="deleteSelection[0]">';
390		- echo '<input type="submit" value="' . _AM_EXTCAL_DELETE_SELECTION . '" name="deleteSelection[1]">';
	389	+ echo '<input type="submit" value="'._AM_EXTCAL_DELETE_ALL.'" name="deleteSelection[0]">';
	390	+ echo '<input type="submit" value="'._AM_EXTCAL_DELETE_SELECTION.'" name="deleteSelection[1]">';
391	391
392	392	echo '</td>';
393	393	echo '</tr>';
394	394	} else {
395		- echo '<tr><td colspan="5">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
	395	+ echo '<tr><td colspan="5">'._AM_EXTCAL_NO_PENDING_EVENT.'</td></tr>';
396	396	}
397	397	echo '</table>';
398	398	echo '</form>';
		@@ -400,14 +400,14 @@ discard block
		block discarded – undo
400	400	echo '</fieldset>';
401	401	echo '</fieldset><br><br>';
402	402	//Fin de la liste des evennement -------------------------------------
403		- echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _MD_EXTCAL_SUBMIT_EVENT . '</legend>';
	403	+ echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._MD_EXTCAL_SUBMIT_EVENT.'</legend>';
404	404
405	405	$form = $eventHandler->getEventForm('admin');
406	406	$form->display();
407	407
408	408	echo '</fieldset>';
409	409
410		- include_once __DIR__ . '/admin_footer.php';
	410	+ include_once __DIR__.'/admin_footer.php';
411	411
412	412	break;
413	413	}

		@@ -1,16 +1,16 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-include __DIR__ . '/../../mainfile.php';
4		-include_once __DIR__ . '/include/constantes.php';
	3	+include __DIR__.'/../../mainfile.php';
	4	+include_once __DIR__.'/include/constantes.php';
5	5	$params = array('view' => _EXTCAL_NAV_WEEK, 'file' => _EXTCAL_FILE_WEEK);
6	6	$GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
7		-include_once __DIR__ . '/header.php';
	7	+include_once __DIR__.'/header.php';
8	8
9	9	/* ========================================================================== */
10		-$year = isset($_GET['year']) ? (int)$_GET['year'] : date('Y');
11		-$month = isset($_GET['month']) ? (int)$_GET['month'] : date('n');
12		-$day = isset($_GET['day']) ? (int)$_GET['day'] : date('j');
13		-$cat = isset($_GET['cat']) ? (int)$_GET['cat'] : 0;
	10	+$year = isset($_GET['year']) ? (int) $_GET['year'] : date('Y');
	11	+$month = isset($_GET['month']) ? (int) $_GET['month'] : date('n');
	12	+$day = isset($_GET['day']) ? (int) $_GET['day'] : date('j');
	13	+$cat = isset($_GET['cat']) ? (int) $_GET['cat'] : 0;
14	14	/* ========================================================================== */
15	15
16	16	// Validate the date (day, month and year)
		@@ -45,7 +45,7 @@ discard block
		block discarded – undo
45	45	'cat' => $cat,
46	46	'externalKeys' => 'cat_id',
47	47	);
48		-$events = $eventHandler->getEventsOnPeriode($criteres);
	48	+$events = $eventHandler->getEventsOnPeriode($criteres);
49	49	/**********************************************************************/
50	50	$eventsArray = $events;
51	51	// Formating date
		@@ -86,21 +86,21 @@ discard block
		block discarded – undo
86	86	$nWeekCalObj = $weekCalObj->nextWeek('object');
87	87	$navig = array(
88	88	'prev' => array(
89		- 'uri' => 'year=' . $pWeekCalObj->thisYear() . '&month=' . $pWeekCalObj->thisMonth() . '&day=' . $pWeekCalObj->thisDay(),
	89	+ 'uri' => 'year='.$pWeekCalObj->thisYear().'&month='.$pWeekCalObj->thisMonth().'&day='.$pWeekCalObj->thisDay(),
90	90	'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $pWeekCalObj->getTimestamp()),
91	91	),
92	92	'this' => array(
93		- 'uri' => 'year=' . $weekCalObj->thisYear() . '&month=' . $weekCalObj->thisMonth() . '&day=' . $weekCalObj->thisDay(),
	93	+ 'uri' => 'year='.$weekCalObj->thisYear().'&month='.$weekCalObj->thisMonth().'&day='.$weekCalObj->thisDay(),
94	94	'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $weekCalObj->getTimestamp()),
95	95	),
96	96	'next' => array(
97		- 'uri' => 'year=' . $nWeekCalObj->thisYear() . '&month=' . $nWeekCalObj->thisMonth() . '&day=' . $nWeekCalObj->thisDay(),
	97	+ 'uri' => 'year='.$nWeekCalObj->thisYear().'&month='.$nWeekCalObj->thisMonth().'&day='.$nWeekCalObj->thisDay(),
98	98	'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_week'], $nWeekCalObj->getTimestamp()),
99	99	),
100	100	);
101	101
102	102	// Title of the page
103		-$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']);
	103	+$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']);
104	104
105	105	// Assigning navig data to the template
106	106	$xoopsTpl->assign('navig', $navig);
		@@ -160,4 +160,4 @@ discard block
		block discarded – undo
160	160	$xoopsTpl->assign('lang', $lang);
161	161	$xoopsTpl->assign('view', 'week');
162	162
163		-include XOOPS_ROOT_PATH . '/footer.php';
	163	+include XOOPS_ROOT_PATH.'/footer.php';

		@@ -1,13 +1,13 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-include __DIR__ . '/../../mainfile.php';
4		-include_once __DIR__ . '/include/constantes.php';
5		-$params = array(
	3	+include __DIR__.'/../../mainfile.php';
	4	+include_once __DIR__.'/include/constantes.php';
	5	+$params = array(
6	6	'view' => _EXTCAL_NAV_SEARCH,
7	7	'file' => _EXTCAL_FILE_SEARCH,
8	8	);
9	9	$GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
10		-include_once __DIR__ . '/header.php';
	10	+include_once __DIR__.'/header.php';
11	11
12	12	$recurEventsArray = array();
13	13	//needed to save the state of the form, so we don't show on the first time the list of available events
		@@ -19,10 +19,10 @@ discard block
		block discarded – undo
19	19	/***************************************************************/
20	20	$searchExp = isset($_POST['searchExp']) ? $_POST['searchExp'] : '';
21	21	$andor = isset($_POST['andor']) ? $_POST['andor'] : '';
22		-$year = isset($_POST['year']) ? (int)$_POST['year'] : date('Y');
23		-$month = isset($_POST['month']) ? (int)$_POST['month'] : date('n');
24		-$day = isset($_POST['day']) ? (int)$_POST['day'] : 0;
25		-$cat = isset($_POST['cat']) ? (int)$_POST['cat'] : 0;
	22	+$year = isset($_POST['year']) ? (int) $_POST['year'] : date('Y');
	23	+$month = isset($_POST['month']) ? (int) $_POST['month'] : date('n');
	24	+$day = isset($_POST['day']) ? (int) $_POST['day'] : 0;
	25	+$cat = isset($_POST['cat']) ? (int) $_POST['cat'] : 0;
26	26	$orderby1 = isset($_POST['orderby1']) ? $_POST['orderby1'] : 'cat_name ASC';
27	27	$orderby2 = isset($_POST['orderby2']) ? $_POST['orderby2'] : 'event_title ASC';
28	28	$orderby3 = isset($_POST['orderby3']) ? $_POST['orderby3'] : '';
		@@ -143,7 +143,7 @@ discard block
		block discarded – undo
143	143	}
144	144	}
145	145
146		-$eventsArray = array_merge((array)$eventsArray, (array)$recurEventsArray);
	146	+$eventsArray = array_merge((array) $eventsArray, (array) $recurEventsArray);
147	147
148	148	// Sort event array by event start
149	149	//usort($eventsArray, "orderEvents");
		@@ -234,4 +234,4 @@ discard block
		block discarded – undo
234	234	$xoopsTpl->assign('lang', $lang);
235	235	$xoopsTpl->assign('view', 'search');
236	236
237		-include XOOPS_ROOT_PATH . '/footer.php';
	237	+include XOOPS_ROOT_PATH.'/footer.php';

		@@ -1,8 +1,8 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-include __DIR__ . '/../../mainfile.php';
4		-include_once __DIR__ . '/include/constantes.php';
5		-include_once __DIR__ . '/header.php';
	3	+include __DIR__.'/../../mainfile.php';
	4	+include_once __DIR__.'/include/constantes.php';
	5	+include_once __DIR__.'/header.php';
6	6
7	7	// Getting eXtCal object's handler
8	8	$eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
		@@ -10,7 +10,7 @@ discard block
		block discarded – undo
10	10	$permHandler = ExtcalPerm::getHandler();
11	11	$xoopsUser = $xoopsUser ?: null;
12	12	if (count($permHandler->getAuthorizedCat($xoopsUser, 'extcal_cat_submit')) > 0) {
13		- include XOOPS_ROOT_PATH . '/header.php';
	13	+ include XOOPS_ROOT_PATH.'/header.php';
14	14
15	15	// Title of the page
16	16	$xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20
21	21	//$form->display();
22	22
23		- include XOOPS_ROOT_PATH . '/footer.php';
	23	+ include XOOPS_ROOT_PATH.'/footer.php';
24	24	} else {
25	25	redirect_header('index.php', 3);
26	26	}

		@@ -17,18 +17,18 @@ discard block
		block discarded – undo
17	17	* @author XOOPS Development Team
18	18	*/
19	19
20		-require_once __DIR__ . '/../../../mainfile.php';
	20	+require_once __DIR__.'/../../../mainfile.php';
21	21	$moduleDirName = basename(dirname(__DIR__));
22	22
23	23	if (!defined('EXTCAL_DIRNAME')) {
24	24	define('EXTCAL_DIRNAME', $moduleDirName);
25		- define('EXTCAL_PATH', XOOPS_ROOT_PATH . '/modules/' . EXTCAL_DIRNAME);
26		- define('EXTCAL_URL', XOOPS_URL . '/modules/' . EXTCAL_DIRNAME);
27		- define('EXTCAL_ADMIN', EXTCAL_URL . '/admin/index.php');
28		- define('EXTCAL_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . EXTCAL_DIRNAME);
29		- define('EXTCAL_AUTHOR_LOGOIMG', EXTCAL_URL . '/assets/images/logoModule.png');
30		- define('EXTCAL_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . EXTCAL_DIRNAME); // WITHOUT Trailing slash
31		- define('EXTCAL_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . EXTCAL_DIRNAME); // WITHOUT Trailing slash
	25	+ define('EXTCAL_PATH', XOOPS_ROOT_PATH.'/modules/'.EXTCAL_DIRNAME);
	26	+ define('EXTCAL_URL', XOOPS_URL.'/modules/'.EXTCAL_DIRNAME);
	27	+ define('EXTCAL_ADMIN', EXTCAL_URL.'/admin/index.php');
	28	+ define('EXTCAL_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.EXTCAL_DIRNAME);
	29	+ define('EXTCAL_AUTHOR_LOGOIMG', EXTCAL_URL.'/assets/images/logoModule.png');
	30	+ define('EXTCAL_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.EXTCAL_DIRNAME); // WITHOUT Trailing slash
	31	+ define('EXTCAL_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.EXTCAL_DIRNAME); // WITHOUT Trailing slash
32	32
33	33	}
34	34
		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	'name' => 'Module Configurator',
38	38	'uploadFolders' => array(
39	39	EXTCAL_UPLOAD_PATH,
40		- EXTCAL_UPLOAD_PATH . '/etablissement'
	40	+ EXTCAL_UPLOAD_PATH.'/etablissement'
41	41	),
42	42	// 'copyFiles' => array(
43	43	// EXTCAL_UPLOAD_PATH,
		@@ -58,4 +58,4 @@ discard block
		block discarded – undo
58	58
59	59	// module information
60	60	$mod_copyright = "<a href='http://xoops.org' title='XOOPS Project' target='_blank'>
61		- <img src='" . EXTCAL_AUTHOR_LOGOIMG . "' alt='XOOPS Project' /></a>";
	61	+ <img src='" . EXTCAL_AUTHOR_LOGOIMG."' alt='XOOPS Project' /></a>";

mambax7 / extcal

Push — master ( 5f5d60...a9decc )

Status

Category

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

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

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

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

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

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

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

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

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

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