mambax7 / extcal

versions/extcal_2_15.php

Spacing +5 added lines, -5 removed lines

@@ -34,19 +34,19 @@
         //$xoopsDB = \XoopsDatabaseFactory::getDatabaseConnection();
         $xoopsDB = \XoopsDatabaseFactory::getDatabaseConnection();
 
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . "` CHANGE `event_approved` `event_approved` TINYINT( 1 ) NOT NULL DEFAULT '0' ;";
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event')."` CHANGE `event_approved` `event_approved` TINYINT( 1 ) NOT NULL DEFAULT '0' ;";
         $xoopsDB->query($sql);
 
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . '` ADD `event_isrecur` TINYINT( 1 ) NOT NULL AFTER `event_nbmember` ;';
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event').'` ADD `event_isrecur` TINYINT( 1 ) NOT NULL AFTER `event_nbmember` ;';
         $xoopsDB->query($sql);
 
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . '` ADD `event_recur_rules` VARCHAR( 255 ) NOT NULL AFTER `event_isrecur` ';
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event').'` ADD `event_recur_rules` VARCHAR( 255 ) NOT NULL AFTER `event_isrecur` ';
         $xoopsDB->query($sql);
 
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . '` ADD `event_recur_start` INT( 11 ) NOT NULL AFTER `event_recur_rules` ;';
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event').'` ADD `event_recur_start` INT( 11 ) NOT NULL AFTER `event_recur_rules` ;';
         $xoopsDB->query($sql);
 
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . '` ADD `event_recur_end` INT( 11 ) NOT NULL AFTER `event_recur_start` ;';
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event').'` ADD `event_recur_end` INT( 11 ) NOT NULL AFTER `event_recur_start` ;';
         $xoopsDB->query($sql);
 
         $sql = 'CREATE TABLE `'

new_event.php

Spacing +5 added lines, -5 removed lines

@@ -2,9 +2,9 @@ 
 
 use XoopsModules\Extcal;
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
-require_once __DIR__ . '/header.php';
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
+require_once __DIR__.'/header.php';
 
 // Getting eXtCal object's handler
 $eventHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
@@ -12,7 +12,7 @@ 
 $permHandler = Extcal\Perm::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);
@@ -22,7 +22,7 @@ 
 
     //$form->display();
 
-    include XOOPS_ROOT_PATH . '/footer.php';
+    include XOOPS_ROOT_PATH.'/footer.php';
 } else {
     redirect_header('index.php', 3);
 }

event.php

Spacing +6 added lines, -6 removed lines

@@ -19,20 +19,20 @@ 
 
 use XoopsModules\Extcal;
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $params                                  = ['view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT];
 $GLOBALS['xoopsOption']['template_main'] = 'extcal_event.tpl';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 //exit;
 
-include XOOPS_ROOT_PATH . '/include/comment_view.php';
+include XOOPS_ROOT_PATH.'/include/comment_view.php';
 
 if (!isset($_GET['event'])) {
     $eventId = 0;
 } else {
-    $eventId = (int)$_GET['event'];
+    $eventId = (int) $_GET['event'];
 }
 $eventHandler          = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
 $fileHandler           = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_FILE);
@@ -230,4 +230,4 @@ 
 
 //function XoopsFormDhtmlTextArea($caption, $name, $value = "", $rows = 5, $cols = 50, $hiddentext = "xoopsHiddenText", $options = array());
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

view_month.php

Spacing +13 added lines, -13 removed lines

@@ -2,23 +2,23 @@ 
 
 use XoopsModules\Extcal;
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $params                                  = ['view' => _EXTCAL_NAV_MONTH, 'file' => _EXTCAL_FILE_MONTH];
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 /* ========================================================================== */
-$year  = isset($_GET['year']) ? (int)$_GET['year'] : date('Y');
-$month = isset($_GET['month']) ? (int)$_GET['month'] : date('n');
-$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');
+$cat   = isset($_GET['cat']) ? (int) $_GET['cat'] : 0;
 /* ========================================================================== */
 
 $form = new \XoopsSimpleForm('', 'navigSelectBox', $params['file'], 'get');
 $form->addElement(getListYears($year, $xoopsModuleConfig['agenda_nb_years_before'], $xoopsModuleConfig['agenda_nb_years_after']));
 $form->addElement(getListMonths($month));
 $form->addElement(Extcal\Utility::getListCategories($cat));
-$form->addElement( new \XoopsFormButton('', '', _SUBMIT, 'submit'));
+$form->addElement(new \XoopsFormButton('', '', _SUBMIT, 'submit'));
 
 // Assigning the form to the template
 $form->assign($xoopsTpl);
@@ -33,7 +33,7 @@ 
     'cat'          => $cat,
     'externalKeys' => 'cat_id',
 ];
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 $eventsArray = $events;
 
@@ -90,21 +90,21 @@ 
 $nMonthCalObj = $monthCalObj->nextMonth('object');
 $navig        = [
     'prev' => [
-        'uri'  => 'year=' . $pMonthCalObj->thisYear() . '&month=' . $pMonthCalObj->thisMonth(),
+        'uri'  => 'year='.$pMonthCalObj->thisYear().'&month='.$pMonthCalObj->thisMonth(),
         'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $pMonthCalObj->getTimestamp()),
     ],
     'this' => [
-        'uri'  => 'year=' . $monthCalObj->thisYear() . '&month=' . $monthCalObj->thisMonth(),
+        'uri'  => 'year='.$monthCalObj->thisYear().'&month='.$monthCalObj->thisMonth(),
         'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $monthCalObj->getTimestamp()),
     ],
     'next' => [
-        'uri'  => 'year=' . $nMonthCalObj->thisYear() . '&month=' . $nMonthCalObj->thisMonth(),
+        'uri'  => 'year='.$nMonthCalObj->thisYear().'&month='.$nMonthCalObj->thisMonth(),
         'name' => $timeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $nMonthCalObj->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);
@@ -161,4 +161,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'month');
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

edit_event.php

Spacing +7 added lines, -7 removed lines

@@ -19,10 +19,10 @@ 
 
 use XoopsModules\Extcal;
 
-include __DIR__ . '/../../mainfile.php';
+include __DIR__.'/../../mainfile.php';
 
-include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-require_once __DIR__ . '/include/constantes.php';
+include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+require_once __DIR__.'/include/constantes.php';
 
 $permHandler = Extcal\Perm::getHandler();
 $xoopsUser   = $xoopsUser ?: null;
@@ -34,7 +34,7 @@ 
 
 $params                                  = ['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
@@ -45,7 +45,7 @@ 
 if (!isset($_GET['event'])) {
     $eventId = 0;
 } else {
-    $eventId = (int)$_GET['event'];
+    $eventId = (int) $_GET['event'];
 }
 if (!isset($_GET['action'])) {
     $action = 'edit';
@@ -56,7 +56,7 @@ 
 // Getting eXtCal object's handler
 $eventHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
 
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
 // Title of the page
 $xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
@@ -65,4 +65,4 @@ 
 $form = $eventHandler->getEventForm('user', $action, ['event_id' => $eventId]);
 $form->display();
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

rss.php

Spacing +9 added lines, -9 removed lines

@@ -2,16 +2,16 @@ 
 
 use XoopsModules\Extcal;
 
-include __DIR__ . '/../../mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
-require_once __DIR__ . '/header.php';
+include __DIR__.'/../../mainfile.php';
+require_once __DIR__.'/include/constantes.php';
+require_once __DIR__.'/header.php';
 
-require_once XOOPS_ROOT_PATH . '/class/template.php';
+require_once XOOPS_ROOT_PATH.'/class/template.php';
 $eventHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_EVENT);
 if (!isset($_GET['cat'])) {
     $cat = 0;
 } else {
-    $cat = (int)$_GET['cat'];
+    $cat = (int) $_GET['cat'];
 }
 if (function_exists('mb_http_output')) {
     mb_http_output('pass');
@@ -24,7 +24,7 @@ 
     $events = $eventHandler->getUpcommingEvent($xoopsModuleConfig['rss_nb_event'], $cat);
     if (is_array($events)) {
         $tpl->assign('channel_title', xoops_utf8_encode(htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)));
-        $tpl->assign('channel_link', XOOPS_URL . '/');
+        $tpl->assign('channel_link', XOOPS_URL.'/');
         $tpl->assign('channel_desc', xoops_utf8_encode(htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES)));
         $tpl->assign('channel_lastbuild', formatTimestamp(time(), 'rss'));
         $tpl->assign('channel_webmaster', $xoopsConfig['adminmail']);
@@ -32,14 +32,14 @@ 
         $tpl->assign('channel_category', 'Event');
         $tpl->assign('channel_generator', 'XOOPS');
         $tpl->assign('channel_language', _LANGCODE);
-        $tpl->assign('image_url', XOOPS_URL . '/modules/extcal/assets/images/extcal_logo.png');
+        $tpl->assign('image_url', XOOPS_URL.'/modules/extcal/assets/images/extcal_logo.png');
         $tpl->assign('image_width', 92);
         $tpl->assign('image_height', 52);
         foreach ($events as $event) {
             $tpl->append('items', [
                 'title'       => xoops_utf8_encode(htmlspecialchars($event->getVar('event_title'), ENT_QUOTES)),
-                'link'        => XOOPS_URL . '/modules/extcal/event.php?event=' . $event->getVar('event_id'),
-                'guid'        => XOOPS_URL . '/modules/extcal/event.php?event=' . $event->getVar('event_id'),
+                'link'        => XOOPS_URL.'/modules/extcal/event.php?event='.$event->getVar('event_id'),
+                'guid'        => XOOPS_URL.'/modules/extcal/event.php?event='.$event->getVar('event_id'),
                 'pubdate'     => formatTimestamp($event->getVar('event_start'), 'rss'),
                 'description' => xoops_utf8_encode(htmlspecialchars($event->getVar('event_desc'), ENT_QUOTES)),
             ]);

class/Etablissement.php

Spacing +23 added lines, -23 removed lines

@@ -20,7 +20,7 @@ 
 //Kraven 30
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-require_once XOOPS_ROOT_PATH . '/kernel/object.php';
+require_once XOOPS_ROOT_PATH.'/kernel/object.php';
 
 //class Event extends \XoopsObject
 //class extcal_etablissement extends \XoopsObject
@@ -70,34 +70,34 @@ 
 
         $title = $this->isNew() ? sprintf(_MD_EXTCAL_ETABLISSEMENT_ADD) : sprintf(_MD_EXTCAL_ETABLISSEMENT_EDIT);
 
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
         $form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
         $form->setExtra('enctype="multipart/form-data"');
 
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_NOM, 'nom', 50, 255, $this->getVar('nom')), true);
-        $form->addElement( new \XoopsFormDhtmlTextArea(_MD_EXTCAL_ETABLISSEMENT_DESCRIPTION, 'description', $this->getVar('description'), 10), false);
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_CATEGORIE, 'categorie', 40, 255, $this->getVar('categorie')), false);
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_ADRESSE, 'adresse', 50, 255, $this->getVar('adresse')), false);
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_ADRESSE2, 'adresse2', 50, 255, $this->getVar('adresse2')), false);
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_CP, 'cp', 10, 10, $this->getVar('cp')), false);
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_VILLE, 'ville', 20, 255, $this->getVar('ville')), false);
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TEL_FIXE, 'tel_fixe', 20, 20, $this->getVar('tel_fixe')), false);
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE, 'tel_portable', 20, 20, $this->getVar('tel_portable')), false);
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_MAIL, 'mail', 50, 255, $this->getVar('mail')), false);
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_SITE, 'site', 50, 255, $this->getVar('site')), false);
-        $form->addElement( new \XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_HORAIRES, 'horaires', $this->getVar('horaires'), 3, 40));
-        $form->addElement( new \XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_DIVERS, 'divers', $this->getVar('divers'), 5, 40));
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_NOM, 'nom', 50, 255, $this->getVar('nom')), true);
+        $form->addElement(new \XoopsFormDhtmlTextArea(_MD_EXTCAL_ETABLISSEMENT_DESCRIPTION, 'description', $this->getVar('description'), 10), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_CATEGORIE, 'categorie', 40, 255, $this->getVar('categorie')), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_ADRESSE, 'adresse', 50, 255, $this->getVar('adresse')), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_ADRESSE2, 'adresse2', 50, 255, $this->getVar('adresse2')), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_CP, 'cp', 10, 10, $this->getVar('cp')), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_VILLE, 'ville', 20, 255, $this->getVar('ville')), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TEL_FIXE, 'tel_fixe', 20, 20, $this->getVar('tel_fixe')), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE, 'tel_portable', 20, 20, $this->getVar('tel_portable')), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_MAIL, 'mail', 50, 255, $this->getVar('mail')), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_SITE, 'site', 50, 255, $this->getVar('site')), false);
+        $form->addElement(new \XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_HORAIRES, 'horaires', $this->getVar('horaires'), 3, 40));
+        $form->addElement(new \XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_DIVERS, 'divers', $this->getVar('divers'), 5, 40));
         //$form->addElement( new \XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_TARIFS, 'tarifs', $this->getVar("tarifs"), 5, 40));
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TARIFS . ' ( ' . _MD_EXTCAL_DEVISE2 . ' )', 'tarifs', 20, 20, $this->getVar('tarifs')), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TARIFS.' ( '._MD_EXTCAL_DEVISE2.' )', 'tarifs', 20, 20, $this->getVar('tarifs')), false);
 
         //$form->addElement( new \XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_MAP, 'map', $this->getVar("map"), 5, 40));
-        $form->addElement( new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_MAP, 'map', 150, 255, $this->getVar('map')), false);
+        $form->addElement(new \XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_MAP, 'map', 150, 255, $this->getVar('map')), false);
 
         //Logo
         $file_tray = new \XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 2), '');
         if ('' != $this->getVar('logo')) {
-            $file_tray->addElement( new \XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/etablissement/' . $this->getVar('logo') . "' name='image' id='image' alt=''><br><br>"));
+            $file_tray->addElement(new \XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/etablissement/'.$this->getVar('logo')."' name='image' id='image' alt=''><br><br>"));
             $check_del_img = new \XoopsFormCheckBox('', 'delimg');
             $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG);
             $file_tray->addElement($check_del_img);
@@ -108,15 +108,15 @@ 
         }
         $file_img->setExtra("size ='40'");
         $file_tray->addElement($file_img);
-        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(3145728 / 1000), 500, 500);
-        $file_label = new \XoopsFormLabel('', '<br>' . $msg);
+        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (3145728 / 1000), 500, 500);
+        $file_label = new \XoopsFormLabel('', '<br>'.$msg);
         $file_tray->addElement($file_label);
         $form->addElement($file_tray);
-        $form->addElement( new \XoopsFormHidden('file', $this->getVar('logo')));
+        $form->addElement(new \XoopsFormHidden('file', $this->getVar('logo')));
         unset($file_img, $file_tray);
 
-        $form->addElement( new \XoopsFormHidden('op', 'save_etablissement'));
-        $form->addElement( new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+        $form->addElement(new \XoopsFormHidden('op', 'save_etablissement'));
+        $form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
         $form->display();
 
         return $form;

class/Utility.php

Spacing +25 added lines, -25 removed lines

@@ -15,7 +15,7 @@ 
  * L'utilisation de ce formulaire d'adminitration suppose
  * que la classe correspondante de la table a été générées avec classGenerator
  **/
-require_once XOOPS_ROOT_PATH . '/class/uploader.php';
+require_once XOOPS_ROOT_PATH.'/class/uploader.php';
 
 use Xmf\Request;
 use XoopsModules\Extcal;
@@ -60,12 +60,12 @@ 
     public static function extcal_loadImg(&$REQUEST, &$event_picture1, &$event_picture2)
     {
         ///////////////////////////////////////////////////////////////////////////////
-        $uploaddir_event = XOOPS_ROOT_PATH . '/uploads/extcal/';
-        $uploadurl_event = XOOPS_URL . '/uploads/extcal/';
+        $uploaddir_event = XOOPS_ROOT_PATH.'/uploads/extcal/';
+        $uploadurl_event = XOOPS_URL.'/uploads/extcal/';
         //$picture = '';
         for ($j = 1; $j < 3; ++$j) {
-            $delimg = @$REQUEST['delimg_' . $j . ''];
-            $delimg = isset($delimg) ? (int)$delimg : 0;
+            $delimg = @$REQUEST['delimg_'.$j.''];
+            $delimg = isset($delimg) ? (int) $delimg : 0;
             if (0 == $delimg && !empty($REQUEST['xoops_upload_file'][$j])) {
                 $upload = new \XoopsMediaUploader($uploaddir_event, [
                     'image/gif',
@@ -88,15 +88,15 @@ 
                             $event_picture2 = $upload->getSavedFileName();
                         }
                     }
-                } elseif (!empty($REQUEST['file' . $j])) {
+                } elseif (!empty($REQUEST['file'.$j])) {
                     if (1 == $j) {
-                        $event_picture1 = $REQUEST['file' . $j];
+                        $event_picture1 = $REQUEST['file'.$j];
                     } elseif (2 == $j) {
-                        $event_picture2 = $REQUEST['file' . $j];
+                        $event_picture2 = $REQUEST['file'.$j];
                     }
                 }
             } else {
-                $url_event = XOOPS_ROOT_PATH . '/uploads/extcal/' . $REQUEST['file' . $j];
+                $url_event = XOOPS_ROOT_PATH.'/uploads/extcal/'.$REQUEST['file'.$j];
                 if (1 == $j) {
                     $event_picture1 = '';
                 } elseif (2 == $j) {
@@ -124,7 +124,7 @@ 
     {
         global $xoopsUser;
         // Category selectbox
-        $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+        $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
 
         $catsList  = $catHandler->getAllCat($xoopsUser);
         $catSelect = new \XoopsFormSelect('', $name, $cat);
@@ -152,8 +152,8 @@ 
         // Category selectbox
         //<option style="background-color:#00FFFF;">VARCHAR</option>
 
-         $catHandler   = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
-        $catsList   = $catHandler->getAllCat($xoopsUser);
+         $catHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_CAT);
+        $catsList = $catHandler->getAllCat($xoopsUser);
 
         $t = [];
         foreach ($catsList as $catList) {
@@ -192,17 +192,17 @@ 
             $select->addOption('', '');
         }
 
-        $select->addOption('year ASC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-        $select->addOption('year DESC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+        $select->addOption('year ASC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_ASC);
+        $select->addOption('year DESC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_DESC);
 
-        $select->addOption('month ASC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-        $select->addOption('month DESC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+        $select->addOption('month ASC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_ASC);
+        $select->addOption('month DESC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_DESC);
 
-        $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-        $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+        $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_ASC);
+        $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_DESC);
 
-        $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-        $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+        $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_ASC);
+        $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_DESC);
 
         return $select;
     }
@@ -316,7 +316,7 @@ 
     public static function echoDateArray($period)
     {
         foreach ($period as $dt) {
-            echo $dt->format("l Y-m-d H:i:s\n") . '<br>';
+            echo $dt->format("l Y-m-d H:i:s\n").'<br>';
         }
     }
 
@@ -332,7 +332,7 @@ 
         }
 
         $txt = print_r($t, true);
-        echo '<pre>Number of items: ' . count($t) . "<br>{$txt}</pre>";
+        echo '<pre>Number of items: '.count($t)."<br>{$txt}</pre>";
     }
 
     /*****************************************************************/
@@ -345,7 +345,7 @@ 
         if ('' != $msg) {
             echo "<hr>{$msg}<hr>";
         }
-        echo $line . '<br>';
+        echo $line.'<br>';
     }
 
     /*****************************************************************/
@@ -372,7 +372,7 @@ 
             echo "<hr>{$msg}<hr>";
         }
 
-        echo 'date --->' . $tsName . ' = ' . $ts . ' - ' . date('d-m-Y H:m:s', $ts) . '<br>';
+        echo 'date --->'.$tsName.' = '.$ts.' - '.date('d-m-Y H:m:s', $ts).'<br>';
     }
 
     /*****************************************************************/
@@ -486,7 +486,7 @@ 
      */
     public static function getLighterColor($color, $plancher, $plafond)
     {
-        require_once __DIR__ . '/ColorTools.php';
+        require_once __DIR__.'/ColorTools.php';
 
         //$ct = new ColorTools();
         //return $ct->eclaircir($color,$plancher,$plafond);

class/CategoryHandler.php

Spacing +11 added lines, -11 removed lines

@@ -61,9 +61,9 @@ 
         $groupPermissionHandler = xoops_getHandler('groupperm');
         $moduleId               = $GLOBALS['xoopsModule']->getVar('mid');
 
-        $criteria =  new \CriteriaCompo();
-        $criteria->add( new \Criteria('gperm_name', 'extcal_perm_mask'));
-        $criteria->add( new \Criteria('gperm_modid', $moduleId));
+        $criteria = new \CriteriaCompo();
+        $criteria->add(new \Criteria('gperm_name', 'extcal_perm_mask'));
+        $criteria->add(new \Criteria('gperm_modid', $moduleId));
         $permMask = $groupPermissionHandler->getObjects($criteria);
 
         // Retriving group list
@@ -124,8 +124,8 @@ 
      */
     public function getCat($catId, $skipPerm = false)
     {
-        $criteriaCompo =  new \CriteriaCompo();
-        $criteriaCompo->add( new \Criteria('cat_id', $catId));
+        $criteriaCompo = new \CriteriaCompo();
+        $criteriaCompo->add(new \Criteria('cat_id', $catId));
         if (!$skipPerm) {
             $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
         }
@@ -145,7 +145,7 @@ 
      */
     public function getAllCat($user, $perm = 'extcal_cat_view')
     {
-        $criteriaCompo =  new \CriteriaCompo();
+        $criteriaCompo = new \CriteriaCompo();
         if ('all' !== $perm) {
             $this->_addCatPermCriteria($criteriaCompo, $user, $perm);
         }
@@ -161,7 +161,7 @@ 
      */
     public function getAllCatById($user, $perm = 'all')
     {
-        $criteriaCompo =  new \CriteriaCompo();
+        $criteriaCompo = new \CriteriaCompo();
         if ('all' !== $perm) {
             $this->_addCatPermCriteria($criteriaCompo, $user, $perm);
         }
@@ -186,15 +186,15 @@ 
         $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
         $count                = count($authorizedAccessCats);
         if ($count > 0) {
-            $in = '(' . $authorizedAccessCats[0];
+            $in = '('.$authorizedAccessCats[0];
             array_shift($authorizedAccessCats);
             foreach ($authorizedAccessCats as $authorizedAccessCat) {
-                $in .= ',' . $authorizedAccessCat;
+                $in .= ','.$authorizedAccessCat;
             }
             $in .= ')';
-            $criteria->add( new \Criteria('cat_id', $in, 'IN'));
+            $criteria->add(new \Criteria('cat_id', $in, 'IN'));
         } else {
-            $criteria->add( new \Criteria('cat_id', '(0)', 'IN'));
+            $criteria->add(new \Criteria('cat_id', '(0)', 'IN'));
         }
     }