mambax7 / extcal

language/english/main.php

Spacing +36 added lines, -36 removed lines

@@ -1,34 +1,34 @@ 
 <?php
-include_once XOOPS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/calendar.php';
+include_once XOOPS_ROOT_PATH.'/language/'.$GLOBALS['xoopsConfig']['language'].'/calendar.php';
 define('_MD_CLEAR_CRITERIA', 'clear criteria');
-define('_MD_EXTCAL_1_FR', '1st ' . _CAL_FRIDAY);
-define('_MD_EXTCAL_1_MO', '1st ' . _CAL_MONDAY);
-define('_MD_EXTCAL_1_SA', '1st ' . _CAL_SATURDAY);
-define('_MD_EXTCAL_1_SU', '1st ' . _CAL_SUNDAY);
-define('_MD_EXTCAL_1_TH', '1st ' . _CAL_THURSDAY);
-define('_MD_EXTCAL_1_TU', '1st ' . _CAL_TUESDAY);
-define('_MD_EXTCAL_1_WE', '1st ' . _CAL_WEDNESDAY);
-define('_MD_EXTCAL_2_FR', '2nd ' . _CAL_FRIDAY);
-define('_MD_EXTCAL_2_MO', '2nd ' . _CAL_MONDAY);
-define('_MD_EXTCAL_2_SA', '2nd ' . _CAL_SATURDAY);
-define('_MD_EXTCAL_2_SU', '2nd ' . _CAL_SUNDAY);
-define('_MD_EXTCAL_2_TH', '2nd ' . _CAL_THURSDAY);
-define('_MD_EXTCAL_2_TU', '2nd ' . _CAL_TUESDAY);
-define('_MD_EXTCAL_2_WE', '2nd ' . _CAL_WEDNESDAY);
-define('_MD_EXTCAL_3_FR', '3rd ' . _CAL_FRIDAY);
-define('_MD_EXTCAL_3_MO', '3rd ' . _CAL_MONDAY);
-define('_MD_EXTCAL_3_SA', '3rd ' . _CAL_SATURDAY);
-define('_MD_EXTCAL_3_SU', '3rd ' . _CAL_SUNDAY);
-define('_MD_EXTCAL_3_TH', '3rd ' . _CAL_THURSDAY);
-define('_MD_EXTCAL_3_TU', '3rd ' . _CAL_TUESDAY);
-define('_MD_EXTCAL_3_WE', '3rd ' . _CAL_WEDNESDAY);
-define('_MD_EXTCAL_4_FR', '4th ' . _CAL_FRIDAY);
-define('_MD_EXTCAL_4_MO', '4th ' . _CAL_MONDAY);
-define('_MD_EXTCAL_4_SA', '4th ' . _CAL_SATURDAY);
-define('_MD_EXTCAL_4_SU', '4th ' . _CAL_SUNDAY);
-define('_MD_EXTCAL_4_TH', '4th ' . _CAL_THURSDAY);
-define('_MD_EXTCAL_4_TU', '4th ' . _CAL_TUESDAY);
-define('_MD_EXTCAL_4_WE', '4th ' . _CAL_WEDNESDAY);
+define('_MD_EXTCAL_1_FR', '1st '._CAL_FRIDAY);
+define('_MD_EXTCAL_1_MO', '1st '._CAL_MONDAY);
+define('_MD_EXTCAL_1_SA', '1st '._CAL_SATURDAY);
+define('_MD_EXTCAL_1_SU', '1st '._CAL_SUNDAY);
+define('_MD_EXTCAL_1_TH', '1st '._CAL_THURSDAY);
+define('_MD_EXTCAL_1_TU', '1st '._CAL_TUESDAY);
+define('_MD_EXTCAL_1_WE', '1st '._CAL_WEDNESDAY);
+define('_MD_EXTCAL_2_FR', '2nd '._CAL_FRIDAY);
+define('_MD_EXTCAL_2_MO', '2nd '._CAL_MONDAY);
+define('_MD_EXTCAL_2_SA', '2nd '._CAL_SATURDAY);
+define('_MD_EXTCAL_2_SU', '2nd '._CAL_SUNDAY);
+define('_MD_EXTCAL_2_TH', '2nd '._CAL_THURSDAY);
+define('_MD_EXTCAL_2_TU', '2nd '._CAL_TUESDAY);
+define('_MD_EXTCAL_2_WE', '2nd '._CAL_WEDNESDAY);
+define('_MD_EXTCAL_3_FR', '3rd '._CAL_FRIDAY);
+define('_MD_EXTCAL_3_MO', '3rd '._CAL_MONDAY);
+define('_MD_EXTCAL_3_SA', '3rd '._CAL_SATURDAY);
+define('_MD_EXTCAL_3_SU', '3rd '._CAL_SUNDAY);
+define('_MD_EXTCAL_3_TH', '3rd '._CAL_THURSDAY);
+define('_MD_EXTCAL_3_TU', '3rd '._CAL_TUESDAY);
+define('_MD_EXTCAL_3_WE', '3rd '._CAL_WEDNESDAY);
+define('_MD_EXTCAL_4_FR', '4th '._CAL_FRIDAY);
+define('_MD_EXTCAL_4_MO', '4th '._CAL_MONDAY);
+define('_MD_EXTCAL_4_SA', '4th '._CAL_SATURDAY);
+define('_MD_EXTCAL_4_SU', '4th '._CAL_SUNDAY);
+define('_MD_EXTCAL_4_TH', '4th '._CAL_THURSDAY);
+define('_MD_EXTCAL_4_TU', '4th '._CAL_TUESDAY);
+define('_MD_EXTCAL_4_WE', '4th '._CAL_WEDNESDAY);
 define('_MD_EXTCAL_ABSENT', 'Absent');
 define('_MD_EXTCAL_ACTION_COME', 'Register');
 define('_MD_EXTCAL_ACTION_DELEGATION', 'Delegate');
@@ -109,13 +109,13 @@ 
 define('_MD_EXTCAL_JAN', 'Jan');
 define('_MD_EXTCAL_JUL', 'Jul');
 define('_MD_EXTCAL_JUN', 'Jun');
-define('_MD_EXTCAL_LAST_FR', 'Last ' . _CAL_FRIDAY);
-define('_MD_EXTCAL_LAST_MO', 'Last ' . _CAL_MONDAY);
-define('_MD_EXTCAL_LAST_SA', 'Last ' . _CAL_SATURDAY);
-define('_MD_EXTCAL_LAST_SU', 'Last ' . _CAL_SUNDAY);
-define('_MD_EXTCAL_LAST_TH', 'Last ' . _CAL_THURSDAY);
-define('_MD_EXTCAL_LAST_TU', 'Last ' . _CAL_TUESDAY);
-define('_MD_EXTCAL_LAST_WE', 'Last ' . _CAL_WEDNESDAY);
+define('_MD_EXTCAL_LAST_FR', 'Last '._CAL_FRIDAY);
+define('_MD_EXTCAL_LAST_MO', 'Last '._CAL_MONDAY);
+define('_MD_EXTCAL_LAST_SA', 'Last '._CAL_SATURDAY);
+define('_MD_EXTCAL_LAST_SU', 'Last '._CAL_SUNDAY);
+define('_MD_EXTCAL_LAST_TH', 'Last '._CAL_THURSDAY);
+define('_MD_EXTCAL_LAST_TU', 'Last '._CAL_TUESDAY);
+define('_MD_EXTCAL_LAST_WE', 'Last '._CAL_WEDNESDAY);
 define('_MD_EXTCAL_LIB_COME', 'Register');
 define('_MD_EXTCAL_LIB_NONE', 'None');
 define('_MD_EXTCAL_LIB_NOTCOME', 'Unsubscribe');

class/event.php

Spacing +47 added lines, -47 removed lines

@@ -2,13 +2,13 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once __DIR__ . '/ExtcalPersistableObjectHandler.php';
-include_once __DIR__ . '/perm.php';
-include_once __DIR__ . '/time.php';
-include_once __DIR__ . '/config.php';
-include_once __DIR__ . '/extDateTime.php';
-include_once __DIR__ . '/utilities.php';
-include_once __DIR__ . '/../include/constantes.php';
+include_once __DIR__.'/ExtcalPersistableObjectHandler.php';
+include_once __DIR__.'/perm.php';
+include_once __DIR__.'/time.php';
+include_once __DIR__.'/config.php';
+include_once __DIR__.'/extDateTime.php';
+include_once __DIR__.'/utilities.php';
+include_once __DIR__.'/../include/constantes.php';
 
 /**
  * Class ExtcalEvent.
@@ -49,7 +49,7 @@ 
         $this->initVar('event_etablissement', XOBJ_DTYPE_INT, 5, false);
         $this->initVar('event_icone', XOBJ_DTYPE_TXTBOX, '', false);
 
-        $this->externalKey['cat_id']          = array(
+        $this->externalKey['cat_id'] = array(
             'className'      => 'cat',
             'getMethodeName' => 'getCat',
             'keyName'        => 'cat',
@@ -382,7 +382,7 @@ 
         $eventArray = array();
 
         while (list($k, $v) = each($events)) {
-            $ordre[] = (int)$v['event_start'];
+            $ordre[] = (int) $v['event_start'];
             $this->formatEventDate($v, $extcalConfig['event_date_week']);
             //$v['cat']['cat_light_color'] = $v['cat']['cat_color'];
             $v['cat']['cat_light_color'] = ExtcalUtilities::getLighterColor($v['cat']['cat_color'], _EXTCAL_INFOBULLE_RGB_MIN, _EXTCAL_INFOBULLE_RGB_MAX);
@@ -583,7 +583,7 @@ 
 
         reset($period);
         foreach ($period as $dt) {
-            echo $dt->format("l d-m-Y H:i:s\n") . '<br>';
+            echo $dt->format("l d-m-Y H:i:s\n").'<br>';
         }
     }
 
@@ -909,10 +909,10 @@ 
         $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'));
@@ -932,10 +932,10 @@ 
         }
         if (is_array($cats)) {
             if (array_search(0, $cats) === false) {
-                $in = '(' . current($cats);
+                $in = '('.current($cats);
                 array_shift($cats);
                 foreach ($cats as $cat) {
-                    $in .= ',' . $cat;
+                    $in .= ','.$cat;
                 }
                 $in .= ')';
                 $criteria->add(new Criteria('cat_id', $in, 'IN'));
@@ -958,7 +958,7 @@ 
         $fileHandler = xoops_getModuleHandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
 
         /***************************************************/
-        include_once __DIR__ . '/etablissement.php';
+        include_once __DIR__.'/etablissement.php';
         if ($siteSide === 'admin') {
             $action = 'event.php?op=enreg';
             $cats   = $catHandler->getAllCat($GLOBALS['xoopsUser'], 'all');
@@ -976,7 +976,7 @@ 
             if ($mode === 'clone') {
                 $data['event_id'] = 0;
                 $event->setVar('event_id', 0);
-                $newTitle = $event->getVar('event_title') . ' (' . _MD_EXTCAL_CLONE_OF . $data['event_id'] . ')';
+                $newTitle = $event->getVar('event_title').' ('._MD_EXTCAL_CLONE_OF.$data['event_id'].')';
                 $event->setVar('event_title', $newTitle);
             }
 
@@ -1160,7 +1160,7 @@ 
         $form->addElement($catSelect, true);
         //-----------------------------------------------------------
 
-        $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(_MD_EXTCAL_ICONE, 'event_icone', $event_icone, '');
@@ -1265,7 +1265,7 @@ 
         if (count($files) > 0) {
             $eventFiles = new ExtcalFormFileCheckBox('', 'filetokeep');
             foreach ($files as $file) {
-                $name = $file['file_nicename'] . ' (<i>' . $file['file_mimetype'] . '</i>) ' . $file['formated_file_size'];
+                $name = $file['file_nicename'].' (<i>'.$file['file_mimetype'].'</i>) '.$file['formated_file_size'];
                 $eventFiles->addOption($file['file_id'], $name);
             }
             $fileElmtTray->addElement($eventFiles);
@@ -1281,7 +1281,7 @@ 
         //Picture1
         $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 1), '');
         if (!empty($event_picture1)) {
-            $file_tray->addElement(new XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/' . $event_picture1 . "' name='image' id='image' alt=''/><br><br>"));
+            $file_tray->addElement(new XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/'.$event_picture1."' name='image' id='image' alt=''/><br><br>"));
             $check_del_img = new XoopsFormCheckBox('', 'delimg_1');
             $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG);
             $file_tray->addElement($check_del_img);
@@ -1292,8 +1292,8 @@ 
         }
         $file_img->setExtra("size ='40'");
         $file_tray->addElement($file_img);
-        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(400728 / 1000), 500, 500);
-        $file_label = new XoopsFormLabel('', '<br>' . $msg);
+        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (400728 / 1000), 500, 500);
+        $file_label = new XoopsFormLabel('', '<br>'.$msg);
         $file_tray->addElement($file_label);
         $form->addElement($file_tray);
         $form->addElement(new XoopsFormHidden('file1', $event_picture1));
@@ -1301,7 +1301,7 @@ 
         //Picture2
         $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 2), '');
         if (!empty($event_picture2)) {
-            $file_tray->addElement(new XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/' . $event_picture2 . "' name='image' id='image' alt=''/><br><br>"));
+            $file_tray->addElement(new XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/'.$event_picture2."' name='image' id='image' alt=''/><br><br>"));
             $check_del_img = new XoopsFormCheckBox('', 'delimg_2');
             $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG);
             $file_tray->addElement($check_del_img);
@@ -1312,8 +1312,8 @@ 
         }
         $file_img->setExtra("size ='40'");
         $file_tray->addElement($file_img);
-        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(400728 / 1000), 500, 500);
-        $file_label = new XoopsFormLabel('', '<br>' . $msg);
+        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (400728 / 1000), 500, 500);
+        $file_label = new XoopsFormLabel('', '<br>'.$msg);
         $file_tray->addElement($file_label);
         $form->addElement($file_tray);
         $form->addElement(new XoopsFormHidden('file2', $event_picture2));
@@ -1380,7 +1380,7 @@ 
                 $recurRules = 'weekly|';
                 $recurRules .= $parm['rrule_weekly_interval'];
                 foreach ($parm['rrule_weekly_bydays'] as $day) {
-                    $recurRules .= '|' . $day;
+                    $recurRules .= '|'.$day;
                 }
 
                 break;
@@ -1390,11 +1390,11 @@ 
                     $parm['rrule_monthly_interval'] = 0;
                 }
                 $recurRules = 'monthly|';
-                $recurRules .= $parm['rrule_monthly_interval'] . '|';
+                $recurRules .= $parm['rrule_monthly_interval'].'|';
                 if ($parm['rrule_monthly_byday'] != '') {
                     $recurRules .= $parm['rrule_monthly_byday'];
                 } else {
-                    $recurRules .= 'MD' . $parm['rrule_bymonthday'];
+                    $recurRules .= 'MD'.$parm['rrule_bymonthday'];
                 }
 
                 break;
@@ -1428,9 +1428,9 @@ 
 
                 $recurRules = 'yearly|';
                 $recurRules .= $parm['rrule_yearly_interval'];
-                $recurRules .= '|' . $parm['rrule_yearly_byday'];
+                $recurRules .= '|'.$parm['rrule_yearly_byday'];
                 foreach ($parm['rrule_yearly_bymonths'] as $month) {
-                    $recurRules .= '|' . $month;
+                    $recurRules .= '|'.$month;
                 }
 
                 break;
@@ -2363,10 +2363,10 @@ 
         global $xoopsDB;
 
         //echo "<hr>{$andor}-{$limit}-{$offset}-{$userId}-{$user}<br>{$criteresPlus}";
-        $tEvent = $xoopsDB->prefix('extcal_event') . ' AS te';
-        $tCat   = $xoopsDB->prefix('extcal_cat') . ' AS tc';
+        $tEvent = $xoopsDB->prefix('extcal_event').' AS te';
+        $tCat   = $xoopsDB->prefix('extcal_cat').' AS tc';
 
-        $sql = 'SELECT te.*, tc.cat_name , tc.cat_color, ' . 'year(FROM_UNIXTIME(event_start)) AS year,' . 'month(FROM_UNIXTIME(event_start)) AS month,' . 'day(FROM_UNIXTIME(event_start)) AS day' . " FROM {$tEvent}, {$tCat}";
+        $sql = 'SELECT te.*, tc.cat_name , tc.cat_color, '.'year(FROM_UNIXTIME(event_start)) AS year,'.'month(FROM_UNIXTIME(event_start)) AS month,'.'day(FROM_UNIXTIME(event_start)) AS day'." FROM {$tEvent}, {$tCat}";
         //---------------------------------------------------
         $tw   = array();
         $tw[] = 'te.cat_id = tc.cat_id';
@@ -2375,7 +2375,7 @@ 
         $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
         $inCat                = 'te.cat_id IN (0)';
         if (count($authorizedAccessCats) > 0) {
-            $inCat = 'te.cat_id IN (' . implode(',', $authorizedAccessCats) . ')';
+            $inCat = 'te.cat_id IN ('.implode(',', $authorizedAccessCats).')';
         }
         //echo $tw[count($tw)-1];
 
@@ -2411,12 +2411,12 @@ 
                 'te.event_address',
                 'tc.cat_name',
             );
-            $t       = array();
+            $t = array();
             for ($i = 0, $count = count($queryarray); $i < $count; ++$i) {
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
             }
 
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
+            $flt = '('.implode(" {$andor} ", $t1).')';
 
             $t = array();
             for ($h = 0, $count = count($tFields); $h < $count; ++$h) {
@@ -2425,10 +2425,10 @@ 
 
             $filtre = implode(' OR ', $t);
             $filtre = str_replace('#', '%', $filtre);
-            $tw[]   = '(' . $filtre . ')';
+            $tw[]   = '('.$filtre.')';
         }
 
-        $sql .= ' WHERE ' . implode(' AND ', $tw);
+        $sql .= ' WHERE '.implode(' AND ', $tw);
         //------------------------------------------------------------
         if (count($orderBy) > 0) {
             $t = array();
@@ -2438,7 +2438,7 @@ 
                 }
             }
             if (count($t) > 0) {
-                $sql .= ' ORDER BY ' . implode(',', $t);
+                $sql .= ' ORDER BY '.implode(',', $t);
             }
         }
 
@@ -2471,7 +2471,7 @@ 
         $i = 0;
         while ($myrow = $xoopsDB->fetchArray($result)) {
             $ret[$i]['image'] = 'assets/images/icons/extcal.gif';
-            $ret[$i]['link']  = 'event.php?event=' . $myrow['event_id'];
+            $ret[$i]['link']  = 'event.php?event='.$myrow['event_id'];
             $ret[$i]['title'] = $myrow['event_title'];
             $ret[$i]['time']  = $myrow['event_submitdate'];
             $ret[$i]['uid']   = $myrow['event_submitter'];
@@ -2511,23 +2511,23 @@ 
         //        }
         $tEvent = $xoopsDB->prefix('extcal_event');
         $tCat   = $xoopsDB->prefix('extcal_cat');
-        $sql    = "SELECT {$tEvent}.*, {$tCat}.cat_name AS categorie, {$tCat}.cat_color " . " FROM {$tEvent}, {$tCat}" . " WHERE {$tEvent}.cat_id = {$tCat}.cat_id AND event_approved = '1'";
+        $sql    = "SELECT {$tEvent}.*, {$tCat}.cat_name AS categorie, {$tCat}.cat_color "." FROM {$tEvent}, {$tCat}"." WHERE {$tEvent}.cat_id = {$tCat}.cat_id AND event_approved = '1'";
 
         $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 .= ')';
         } else {
             $in = '(0)';
         }
-        $sql .= " AND {$tEvent}.cat_id IN " . $in . '';
+        $sql .= " AND {$tEvent}.cat_id IN ".$in.'';
         if ($userId != 0) {
-            $sql .= " AND event_submitter = '" . $userId . "'";
+            $sql .= " AND event_submitter = '".$userId."'";
         }
 
         //echoArray($queryarray,false);
@@ -2547,7 +2547,7 @@ 
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
             }
 
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
+            $flt = '('.implode(" {$andor} ", $t1).')';
 
             $t = array();
             for ($h = 0, $count = count($tFields); $h < $count; ++$h) {
@@ -2560,7 +2560,7 @@ 
         }
 
         if ($criteresPlus != '') {
-            $sql .= ' AND ' . $criteresPlus;
+            $sql .= ' AND '.$criteresPlus;
         }
         $sql .= ' ORDER BY event_id DESC';
 
@@ -2570,7 +2570,7 @@ 
         if ($xoopsSearch) {
             while ($myrow = $xoopsDB->fetchArray($result)) {
                 $ret[$i]['image'] = 'assets/images/icons/extcal.gif';
-                $ret[$i]['link']  = 'event.php?event=' . $myrow['event_id'];
+                $ret[$i]['link']  = 'event.php?event='.$myrow['event_id'];
                 $ret[$i]['title'] = $myrow['event_title'];
                 $ret[$i]['time']  = $myrow['event_submitdate'];
                 $ret[$i]['uid']   = $myrow['event_submitter'];