mambax7 / extcal

admin/etablissement.php

Indentation +4 added lines, -4 removed lines

@@ -155,10 +155,10 @@
             }
         } else {
             xoops_confirm([
-                              'ok'               => 1,
-                              'etablissement_id' => $_REQUEST['etablissement_id'],
-                              'op'               => 'delete_etablissement',
-                          ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_ETABLISSEMENT_SURDEL . '<br>');
+                                'ok'               => 1,
+                                'etablissement_id' => $_REQUEST['etablissement_id'],
+                                'op'               => 'delete_etablissement',
+                            ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_ETABLISSEMENT_SURDEL . '<br>');
         }
         break;
 

Spacing +33 added lines, -33 removed lines

@@ -20,19 +20,19 @@ 
 use XoopsModules\Extcal;
 
 // Include xoops admin header
-require_once __DIR__ . '/../../../include/cp_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
 //require_once __DIR__ . '/../class/ExtcalPersistableObjectHandler.php';
-require_once __DIR__ . '/../../../kernel/module.php';
-require_once __DIR__ . '/../../../class/xoopsformloader.php';
-require_once __DIR__ . '/../../../class/tree.php';
-require_once __DIR__ . '/../../../class/xoopslists.php';
-require_once __DIR__ . '/../../../class/pagenav.php';
-require_once __DIR__ . '/../../../class/xoopsform/grouppermform.php';
-require_once __DIR__ . '/../../../class/uploader.php';
+require_once __DIR__.'/../../../kernel/module.php';
+require_once __DIR__.'/../../../class/xoopsformloader.php';
+require_once __DIR__.'/../../../class/tree.php';
+require_once __DIR__.'/../../../class/xoopslists.php';
+require_once __DIR__.'/../../../class/pagenav.php';
+require_once __DIR__.'/../../../class/xoopsform/grouppermform.php';
+require_once __DIR__.'/../../../class/uploader.php';
 //require_once __DIR__ . '/../class/etablissement.php';
-require_once __DIR__ . '/../include/constantes.php';
+require_once __DIR__.'/../include/constantes.php';
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 //include_once("functions.php");
 //include_once("../include/functions.php");
@@ -40,10 +40,10 @@ 
 if ($xoopsUser) {
     $xoopsModule = \XoopsModule::getByDirname('extcal');
     if (!$xoopsUser->isAdmin($xoopsModule->mid())) {
-        redirect_header(XOOPS_URL . '/', 3, _NOPERM);
+        redirect_header(XOOPS_URL.'/', 3, _NOPERM);
     }
 } else {
-    redirect_header(XOOPS_URL . '/', 3, _NOPERM);
+    redirect_header(XOOPS_URL.'/', 3, _NOPERM);
 }
 
 // Include language file
@@ -100,7 +100,7 @@ 
         $etablissement_arr = $etablissementHandler->getObjects($criteria);
         $numrows           = $etablissementHandler->getCount($criteria);
         if ($numrows > $limit) {
-            $pagenav = new \XoopsPageNav($numrows, $limit, $start, 'start', 'op=liste&limit=' . $limit);
+            $pagenav = new \XoopsPageNav($numrows, $limit, $start, 'start', 'op=liste&limit='.$limit);
             $pagenav = $pagenav->renderNav(4);
         } else {
             $pagenav = '';
@@ -109,11 +109,11 @@ 
         if ($numrows > 0) {
             echo '<table width="100%" cellspacing="1" class="outer">';
             echo '<tr>';
-            echo '<th align="center">' . _AM_EXTCAL_ETABLISSEMENT_FORM_NOM . '</th>';
-            echo '<th align="center" width="20%">' . _AM_EXTCAL_ETABLISSEMENT_FORM_ADRESSE . '</th>';
-            echo '<th align="center" width="20%">' . _AM_EXTCAL_ETABLISSEMENT_FORM_CITY . '</th>';
-            echo '<th align="center" width="15%">' . _AM_EXTCAL_ETABLISSEMENT_FORM_TELEPHONE . '</th>';
-            echo '<th align="center" width="15%">' . _AM_EXTCAL_ETABLISSEMENT_FORM_ACTION . '</th>';
+            echo '<th align="center">'._AM_EXTCAL_ETABLISSEMENT_FORM_NOM.'</th>';
+            echo '<th align="center" width="20%">'._AM_EXTCAL_ETABLISSEMENT_FORM_ADRESSE.'</th>';
+            echo '<th align="center" width="20%">'._AM_EXTCAL_ETABLISSEMENT_FORM_CITY.'</th>';
+            echo '<th align="center" width="15%">'._AM_EXTCAL_ETABLISSEMENT_FORM_TELEPHONE.'</th>';
+            echo '<th align="center" width="15%">'._AM_EXTCAL_ETABLISSEMENT_FORM_ACTION.'</th>';
             echo '</tr>';
             $class = 'odd';
             foreach (array_keys($etablissement_arr) as $i) {
@@ -123,21 +123,21 @@ 
                 $etablissement_adresse   = $etablissement_arr[$i]->getVar('adresse');
                 $etablissement_city      = $etablissement_arr[$i]->getVar('ville');
                 $etablissement_telephone = $etablissement_arr[$i]->getVar('tel_fixe');
-                echo '<tr class="' . $class . '">';
-                echo '<td align="left">' . '<a href="etablissement.php?op=edit_etablissement&etablissement_id=' . $etablissement_id . '">' . $etablissement_nom . '</a>' . '</td>';
+                echo '<tr class="'.$class.'">';
+                echo '<td align="left">'.'<a href="etablissement.php?op=edit_etablissement&etablissement_id='.$etablissement_id.'">'.$etablissement_nom.'</a>'.'</td>';
 
-                echo '<td align="center"><b>' . $etablissement_adresse . '</td>';
-                echo '<td align="center"><b>' . $etablissement_city . '</td>';
-                echo '<td align="center"><b>' . $etablissement_telephone . '</td>';
+                echo '<td align="center"><b>'.$etablissement_adresse.'</td>';
+                echo '<td align="center"><b>'.$etablissement_city.'</td>';
+                echo '<td align="center"><b>'.$etablissement_telephone.'</td>';
                 echo '<td align="center" width="15%">';
-                echo '<a href="etablissement.php?op=edit_etablissement&etablissement_id=' . $etablissement_id . '"><img src=' . $pathIcon16 . '/edit.png alt="' . _AM_EXTCAL_ETABLISSEMENT_FORM_EDIT . '" title="' . _AM_EXTCAL_ETABLISSEMENT_FORM_EDIT . '"></a> ';
-                echo '<a href="etablissement.php?op=delete_etablissement&etablissement_id=' . $etablissement_id . '"><img src=' . $pathIcon16 . '/delete.png alt="' . _AM_EXTCAL_ETABLISSEMENT_FORM_DELETE . '" title="' . _AM_EXTCAL_ETABLISSEMENT_FORM_DELETE . '"></a> ';
+                echo '<a href="etablissement.php?op=edit_etablissement&etablissement_id='.$etablissement_id.'"><img src='.$pathIcon16.'/edit.png alt="'._AM_EXTCAL_ETABLISSEMENT_FORM_EDIT.'" title="'._AM_EXTCAL_ETABLISSEMENT_FORM_EDIT.'"></a> ';
+                echo '<a href="etablissement.php?op=delete_etablissement&etablissement_id='.$etablissement_id.'"><img src='.$pathIcon16.'/delete.png alt="'._AM_EXTCAL_ETABLISSEMENT_FORM_DELETE.'" title="'._AM_EXTCAL_ETABLISSEMENT_FORM_DELETE.'"></a> ';
                 echo '</td>';
             }
             echo '</table><br>';
-            echo '<br><div align=right>' . $pagenav . '</div><br>';
+            echo '<br><div align=right>'.$pagenav.'</div><br>';
         } else {
-            echo '<div class="errorMsg" style="text-align: center;">' . _AM_EXTCAL_ERREUR_NO_ETABLISSEMENT . '</div>';
+            echo '<div class="errorMsg" style="text-align: center;">'._AM_EXTCAL_ERREUR_NO_ETABLISSEMENT.'</div>';
         }
 
         // Affichage du formulaire
@@ -160,7 +160,7 @@ 
                               'ok'               => 1,
                               'etablissement_id' => $_REQUEST['etablissement_id'],
                               'op'               => 'delete_etablissement',
-                          ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_ETABLISSEMENT_SURDEL . '<br>');
+                          ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_ETABLISSEMENT_SURDEL.'<br>');
         }
         break;
 
@@ -202,11 +202,11 @@ 
         $obj->setVar('map', $_REQUEST['map']);
 
         //Logo
-        $uploaddir_etablissement = XOOPS_ROOT_PATH . '/uploads/extcal/etablissement/';
-        $uploadurl_etablissement = XOOPS_URL . '/uploads/extcal/etablissement/';
+        $uploaddir_etablissement = XOOPS_ROOT_PATH.'/uploads/extcal/etablissement/';
+        $uploadurl_etablissement = XOOPS_URL.'/uploads/extcal/etablissement/';
 
         $delimg = @$_REQUEST['delimg'];
-        $delimg = isset($delimg) ? (int)$delimg : 0;
+        $delimg = isset($delimg) ? (int) $delimg : 0;
         if (0 == $delimg && !empty($_REQUEST['xoops_upload_file'][0])) {
             $upload = new \XoopsMediaUploader($uploaddir_etablissement, [
                 'image/gif',
@@ -229,7 +229,7 @@ 
             }
         } else {
             $logo              = '';
-            $url_etablissement = XOOPS_ROOT_PATH . '/uploads/extcal/etablissement/' . $_REQUEST['file'];
+            $url_etablissement = XOOPS_ROOT_PATH.'/uploads/extcal/etablissement/'.$_REQUEST['file'];
             if (is_file($url_etablissement)) {
                 chmod($url_etablissement, 0777);
                 unlink($url_etablissement);
@@ -249,4 +249,4 @@ 
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

class/pear/Calendar/Hour.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
 /**
  * Load Calendar base class.
  */
-require_once CALENDAR_ROOT . 'Calendar.php';
+require_once CALENDAR_ROOT.'Calendar.php';
 
 /**
  * Represents an Hour and builds Minutes
@@ -94,7 +94,7 @@ 
      */
     public function build($sDates = [])
     {
-        require_once CALENDAR_ROOT . 'Minute.php';
+        require_once CALENDAR_ROOT.'Minute.php';
         $mIH = $this->cE->getMinutesInHour($this->year, $this->month, $this->day, $this->hour);
         for ($i = 0; $i < $mIH; ++$i) {
             $this->children[$i] = new Calendar_Minute($this->year, $this->month, $this->day, $this->hour, $i);
@@ -118,7 +118,7 @@ 
             if ($this->year == $sDate->thisYear() && $this->month == $sDate->thisMonth()
                 && $this->day == $sDate->thisDay()
                 && $this->hour == $sDate->thisHour()) {
-                $key = (int)$sDate->thisMinute();
+                $key = (int) $sDate->thisMinute();
                 if (isset($this->children[$key])) {
                     $sDate->setSelected();
                     $this->children[$key] = $sDate;

class/pear/Calendar/Validator.php

Spacing +16 added lines, -16 removed lines

@@ -90,8 +90,8 @@ 
      */
     public function __construct(&$calendar)
     {
-        $this->calendar =& $calendar;
-        $this->cE       =& $calendar->getEngine();
+        $this->calendar = & $calendar;
+        $this->cE       = & $calendar->getEngine();
     }
 
     /**
@@ -109,7 +109,7 @@ 
             'isValidMinute',
             'isValidSecond',
         ];
-        $valid  = true;
+        $valid = true;
         foreach ($checks as $check) {
             if (!$this->{$check}()) {
                 $valid = false;
@@ -129,13 +129,13 @@ 
         $y   = $this->calendar->thisYear();
         $min = $this->cE->getMinYears();
         if ($min > $y) {
-            $this->errors[] = new Calendar_Validation_Error('Year', $y, CALENDAR_VALUE_TOOSMALL . $min);
+            $this->errors[] = new Calendar_Validation_Error('Year', $y, CALENDAR_VALUE_TOOSMALL.$min);
 
             return false;
         }
         $max = $this->cE->getMaxYears();
         if ($y > $max) {
-            $this->errors[] = new Calendar_Validation_Error('Year', $y, CALENDAR_VALUE_TOOLARGE . $max);
+            $this->errors[] = new Calendar_Validation_Error('Year', $y, CALENDAR_VALUE_TOOLARGE.$max);
 
             return false;
         }
@@ -153,13 +153,13 @@ 
         $m   = $this->calendar->thisMonth();
         $min = 1;
         if ($min > $m) {
-            $this->errors[] = new Calendar_Validation_Error('Month', $m, CALENDAR_VALUE_TOOSMALL . $min);
+            $this->errors[] = new Calendar_Validation_Error('Month', $m, CALENDAR_VALUE_TOOSMALL.$min);
 
             return false;
         }
         $max = $this->cE->getMonthsInYear($this->calendar->thisYear());
         if ($m > $max) {
-            $this->errors[] = new Calendar_Validation_Error('Month', $m, CALENDAR_VALUE_TOOLARGE . $max);
+            $this->errors[] = new Calendar_Validation_Error('Month', $m, CALENDAR_VALUE_TOOLARGE.$max);
 
             return false;
         }
@@ -177,13 +177,13 @@ 
         $d   = $this->calendar->thisDay();
         $min = 1;
         if ($min > $d) {
-            $this->errors[] = new Calendar_Validation_Error('Day', $d, CALENDAR_VALUE_TOOSMALL . $min);
+            $this->errors[] = new Calendar_Validation_Error('Day', $d, CALENDAR_VALUE_TOOSMALL.$min);
 
             return false;
         }
         $max = $this->cE->getDaysInMonth($this->calendar->thisYear(), $this->calendar->thisMonth());
         if ($d > $max) {
-            $this->errors[] = new Calendar_Validation_Error('Day', $d, CALENDAR_VALUE_TOOLARGE . $max);
+            $this->errors[] = new Calendar_Validation_Error('Day', $d, CALENDAR_VALUE_TOOLARGE.$max);
 
             return false;
         }
@@ -201,13 +201,13 @@ 
         $h   = $this->calendar->thisHour();
         $min = 0;
         if ($min > $h) {
-            $this->errors[] = new Calendar_Validation_Error('Hour', $h, CALENDAR_VALUE_TOOSMALL . $min);
+            $this->errors[] = new Calendar_Validation_Error('Hour', $h, CALENDAR_VALUE_TOOSMALL.$min);
 
             return false;
         }
         $max = ($this->cE->getHoursInDay($this->calendar->thisDay()) - 1);
         if ($h > $max) {
-            $this->errors[] = new Calendar_Validation_Error('Hour', $h, CALENDAR_VALUE_TOOLARGE . $max);
+            $this->errors[] = new Calendar_Validation_Error('Hour', $h, CALENDAR_VALUE_TOOLARGE.$max);
 
             return false;
         }
@@ -225,13 +225,13 @@ 
         $i   = $this->calendar->thisMinute();
         $min = 0;
         if ($min > $i) {
-            $this->errors[] = new Calendar_Validation_Error('Minute', $i, CALENDAR_VALUE_TOOSMALL . $min);
+            $this->errors[] = new Calendar_Validation_Error('Minute', $i, CALENDAR_VALUE_TOOSMALL.$min);
 
             return false;
         }
         $max = ($this->cE->getMinutesInHour($this->calendar->thisHour()) - 1);
         if ($i > $max) {
-            $this->errors[] = new Calendar_Validation_Error('Minute', $i, CALENDAR_VALUE_TOOLARGE . $max);
+            $this->errors[] = new Calendar_Validation_Error('Minute', $i, CALENDAR_VALUE_TOOLARGE.$max);
 
             return false;
         }
@@ -249,13 +249,13 @@ 
         $s   = $this->calendar->thisSecond();
         $min = 0;
         if ($min > $s) {
-            $this->errors[] = new Calendar_Validation_Error('Second', $s, CALENDAR_VALUE_TOOSMALL . $min);
+            $this->errors[] = new Calendar_Validation_Error('Second', $s, CALENDAR_VALUE_TOOSMALL.$min);
 
             return false;
         }
         $max = ($this->cE->getSecondsInMinute($this->calendar->thisMinute()) - 1);
         if ($s > $max) {
-            $this->errors[] = new Calendar_Validation_Error('Second', $s, CALENDAR_VALUE_TOOLARGE . $max);
+            $this->errors[] = new Calendar_Validation_Error('Second', $s, CALENDAR_VALUE_TOOLARGE.$max);
 
             return false;
         }
@@ -367,6 +367,6 @@ 
      */
     public function toString()
     {
-        return $this->unit . ' = ' . $this->value . ' [' . $this->message . ']';
+        return $this->unit.' = '.$this->value.' ['.$this->message.']';
     }
 }

class/pear/Calendar/Day.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
 /**
  * Load Calendar base class.
  */
-require_once CALENDAR_ROOT . 'Calendar.php';
+require_once CALENDAR_ROOT.'Calendar.php';
 
 /**
  * Represents a Day and builds Hours.
@@ -113,7 +113,7 @@ 
      */
     public function build($sDates = [])
     {
-        require_once CALENDAR_ROOT . 'Hour.php';
+        require_once CALENDAR_ROOT.'Hour.php';
 
         $hID = $this->cE->getHoursInDay($this->year, $this->month, $this->day);
         for ($i = 0; $i < $hID; ++$i) {
@@ -137,7 +137,7 @@ 
         foreach ($sDates as $sDate) {
             if ($this->year == $sDate->thisYear() && $this->month == $sDate->thisMonth()
                 && $this->day == $sDate->thisDay()) {
-                $key = (int)$sDate->thisHour();
+                $key = (int) $sDate->thisHour();
                 if (isset($this->children[$key])) {
                     $sDate->setSelected();
                     $this->children[$key] = $sDate;

class/pear/Calendar/Month/Weeks.php

Spacing +4 added lines, -4 removed lines

@@ -50,12 +50,12 @@ 
 /**
  * Load Calendar base class.
  */
-require_once CALENDAR_ROOT . 'Calendar.php';
+require_once CALENDAR_ROOT.'Calendar.php';
 
 /**
  * Load base month.
  */
-require_once CALENDAR_ROOT . 'Month.php';
+require_once CALENDAR_ROOT.'Month.php';
 
 /**
  * Represents a Month and builds Weeks
@@ -116,9 +116,9 @@ 
      */
     public function build($sDates = [])
     {
-        require_once CALENDAR_ROOT . 'Table/Helper.php';
+        require_once CALENDAR_ROOT.'Table/Helper.php';
         $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
-        require_once CALENDAR_ROOT . 'Week.php';
+        require_once CALENDAR_ROOT.'Week.php';
         $numWeeks = $this->tableHelper->getNumWeeks();
         for ($i = 1, $d = 1; $i <= $numWeeks; ++$i, $d += $this->cE->getDaysInWeek($this->thisYear(), $this->thisMonth(), $this->thisDay())) {
             $this->children[$i] = new Calendar_Week($this->year, $this->month, $d, $this->tableHelper->getFirstDay());

class/pear/Calendar/Month/Weekdays.php

Spacing +3 added lines, -3 removed lines

@@ -49,12 +49,12 @@ 
 /**
  * Load Calendar base class.
  */
-require_once CALENDAR_ROOT . 'Calendar.php';
+require_once CALENDAR_ROOT.'Calendar.php';
 
 /**
  * Load base month.
  */
-require_once CALENDAR_ROOT . 'Month.php';
+require_once CALENDAR_ROOT.'Month.php';
 
 /**
  * Represents a Month and builds Days in tabular form<br>
@@ -129,7 +129,7 @@ 
      */
     public function build($sDates = [])
     {
-        require_once CALENDAR_ROOT . 'Table/Helper.php';
+        require_once CALENDAR_ROOT.'Table/Helper.php';
         $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
         Calendar_Month::build($sDates);
         $this->buildEmptyDaysBefore();

class/pear/Calendar/Week.php

Spacing +6 added lines, -6 removed lines

@@ -50,7 +50,7 @@ 
 /**
  * Load Calendar base class.
  */
-require_once CALENDAR_ROOT . 'Calendar.php';
+require_once CALENDAR_ROOT.'Calendar.php';
 
 /**
  * Represents a Week and builds Days in tabular format<br>
@@ -138,7 +138,7 @@ 
      */
     public function __construct($y, $m, $d, $firstDay = null)
     {
-        require_once CALENDAR_ROOT . 'Table/Helper.php';
+        require_once CALENDAR_ROOT.'Table/Helper.php';
         parent::__construct($y, $m, $d);
         $this->firstDay    = $this->defineFirstDayOfWeek($firstDay);
         $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
@@ -170,7 +170,7 @@ 
      */
     public function build($sDates = [])
     {
-        require_once CALENDAR_ROOT . 'Day.php';
+        require_once CALENDAR_ROOT.'Day.php';
         $year  = $this->cE->stampToYear($this->thisWeek);
         $month = $this->cE->stampToMonth($this->thisWeek);
         $day   = $this->cE->stampToDay($this->thisWeek);
@@ -294,7 +294,7 @@ 
             case 'array':
                 return $this->toArray($this->prevWeek);
             case 'object':
-                require_once CALENDAR_ROOT . 'Factory.php';
+                require_once CALENDAR_ROOT.'Factory.php';
 
                 return Calendar_Factory::createByTimestamp('Week', $this->prevWeek);
             case 'timestamp':
@@ -328,7 +328,7 @@ 
             case 'array':
                 return $this->toArray($this->thisWeek);
             case 'object':
-                require_once CALENDAR_ROOT . 'Factory.php';
+                require_once CALENDAR_ROOT.'Factory.php';
 
                 return Calendar_Factory::createByTimestamp('Week', $this->thisWeek);
             case 'timestamp':
@@ -355,7 +355,7 @@ 
             case 'array':
                 return $this->toArray($this->nextWeek);
             case 'object':
-                require_once CALENDAR_ROOT . 'Factory.php';
+                require_once CALENDAR_ROOT.'Factory.php';
 
                 return Calendar_Factory::createByTimestamp('Week', $this->nextWeek);
             case 'timestamp':

class/pear/Calendar/Year.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 /**
  * Load Calendar base class.
  */
-require_once CALENDAR_ROOT . 'Calendar.php';
+require_once CALENDAR_ROOT.'Calendar.php';
 
 /**
  * Represents a Year and builds Months<br>
@@ -103,7 +103,7 @@ 
      */
     public function build($sDates = [], $firstDay = null)
     {
-        require_once CALENDAR_ROOT . 'Factory.php';
+        require_once CALENDAR_ROOT.'Factory.php';
         $this->firstDay = $this->defineFirstDayOfWeek($firstDay);
         $monthsInYear   = $this->cE->getMonthsInYear($this->thisYear());
         for ($i = 1; $i <= $monthsInYear; ++$i) {

class/pear/Calendar/Month.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 /**
  * Load Calendar base class.
  */
-require_once CALENDAR_ROOT . 'Calendar.php';
+require_once CALENDAR_ROOT.'Calendar.php';
 
 /**
  * Represents a Month and builds Days
@@ -95,7 +95,7 @@ 
      */
     public function build($sDates = [])
     {
-        require_once CALENDAR_ROOT . 'Day.php';
+        require_once CALENDAR_ROOT.'Day.php';
         $daysInMonth = $this->cE->getDaysInMonth($this->year, $this->month);
         for ($i = 1; $i <= $daysInMonth; ++$i) {
             $this->children[$i] = new Calendar_Day($this->year, $this->month, $i);