mambax7 / extcal

class/pear/Calendar/docs/examples/13.php

Spacing +17 added lines, -17 removed lines

@@ -9,7 +9,7 @@ 
 {
     list($usec, $sec) = explode(' ', microtime());
 
-    return (float)$usec + (float)$sec;
+    return (float) $usec + (float) $sec;
 }
 
 // Switch to PEAR::Date engine
@@ -43,27 +43,27 @@ 
         $_GET['view'] = 'calendar_year';
         // no break
     case 'calendar_year':
-        require_once CALENDAR_ROOT . 'Year.php';
+        require_once CALENDAR_ROOT.'Year.php';
         $c = new Calendar_Year($_GET['y']);
         break;
     case 'calendar_month':
-        require_once CALENDAR_ROOT . 'Month.php';
+        require_once CALENDAR_ROOT.'Month.php';
         $c = new Calendar_Month($_GET['y'], $_GET['m']);
         break;
     case 'calendar_day':
-        require_once CALENDAR_ROOT . 'Day.php';
+        require_once CALENDAR_ROOT.'Day.php';
         $c = new Calendar_Day($_GET['y'], $_GET['m'], $_GET['d']);
         break;
     case 'calendar_hour':
-        require_once CALENDAR_ROOT . 'Hour.php';
+        require_once CALENDAR_ROOT.'Hour.php';
         $c = new Calendar_Hour($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h']);
         break;
     case 'calendar_minute':
-        require_once CALENDAR_ROOT . 'Minute.php';
+        require_once CALENDAR_ROOT.'Minute.php';
         $c = new Calendar_Minute($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i']);
         break;
     case 'calendar_second':
-        require_once CALENDAR_ROOT . 'Second.php';
+        require_once CALENDAR_ROOT.'Second.php';
         $c = new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']);
         break;
 }
@@ -72,8 +72,8 @@ 
 $date = new Date($c->getTimestamp());
 
 echo '<h1>Using PEAR::Date engine</h1>';
-echo 'Viewing: ' . @$_GET['view'] . '<br>';
-echo 'The time is now: ' . $date->format('%Y %a %e %T') . '<br >';
+echo 'Viewing: '.@$_GET['view'].'<br>';
+echo 'The time is now: '.$date->format('%Y %a %e %T').'<br >';
 
 $i = 1;
 echo '<h1>First Iteration</h1>';
@@ -83,15 +83,15 @@ 
 $c->build();
 while ($e = $c->fetch()) {
     $class  = strtolower(get_class($e));
-    $link   = '&y=' . $e->thisYear() . '&m=' . $e->thisMonth() . '&d=' . $e->thisDay() . '&h=' . $e->thisHour() . '&i=' . $e->thisMinute() . '&s=' . $e->thisSecond();
-    $method = 'this' . str_replace('calendar_', '', $class);
-    echo '<a href="' . $_SERVER['PHP_SELF'] . '?view=' . $class . $link . '">' . $e->{$method}() . '</a> : ';
+    $link   = '&y='.$e->thisYear().'&m='.$e->thisMonth().'&d='.$e->thisDay().'&h='.$e->thisHour().'&i='.$e->thisMinute().'&s='.$e->thisSecond();
+    $method = 'this'.str_replace('calendar_', '', $class);
+    echo '<a href="'.$_SERVER['PHP_SELF'].'?view='.$class.$link.'">'.$e->{$method}().'</a> : ';
     if (0 == ($i % 10)) {
         echo '<br>';
     }
     ++$i;
 }
-echo '<p><b>Took: ' . (getmicrotime() - $start) . ' seconds</b></p>';
+echo '<p><b>Took: '.(getmicrotime() - $start).' seconds</b></p>';
 
 $i = 1;
 echo '<h1>Second Iteration</h1>';
@@ -100,12 +100,12 @@ 
 $start = getmicrotime();
 while ($e = $c->fetch()) {
     $class  = strtolower(get_class($e));
-    $link   = '&y=' . $e->thisYear() . '&m=' . $e->thisMonth() . '&d=' . $e->thisDay() . '&h=' . $e->thisHour() . '&i=' . $e->thisMinute() . '&s=' . $e->thisSecond();
-    $method = 'this' . str_replace('calendar_', '', $class);
-    echo '<a href="' . $_SERVER['PHP_SELF'] . '?view=' . $class . $link . '">' . $e->{$method}() . '</a> : ';
+    $link   = '&y='.$e->thisYear().'&m='.$e->thisMonth().'&d='.$e->thisDay().'&h='.$e->thisHour().'&i='.$e->thisMinute().'&s='.$e->thisSecond();
+    $method = 'this'.str_replace('calendar_', '', $class);
+    echo '<a href="'.$_SERVER['PHP_SELF'].'?view='.$class.$link.'">'.$e->{$method}().'</a> : ';
     if (0 == ($i % 10)) {
         echo '<br>';
     }
     ++$i;
 }
-echo '<p><b>Took: ' . (getmicrotime() - $start) . ' seconds</b></p>';
+echo '<p><b>Took: '.(getmicrotime() - $start).' seconds</b></p>';

class/pear/Calendar/docs/examples/8.php

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
 $basePath = explode('/', $_SERVER['SCRIPT_NAME']);
 array_pop($basePath);
 $basePath = implode('/', $basePath);
-$url      = 'http://' . $_SERVER['SERVER_NAME'] . $basePath . '/7.php?wsdl';
+$url      = 'http://'.$_SERVER['SERVER_NAME'].$basePath.'/7.php?wsdl';
 
 if (!isset($_GET['y'])) {
     $_GET['y'] = date('Y');
@@ -26,11 +26,11 @@ 
 
 $wsdl = new SOAP_WSDL($url);
 
-echo '<pre>' . $wsdl->generateProxyCode() . '</pre>';
+echo '<pre>'.$wsdl->generateProxyCode().'</pre>';
 
 $calendarClient = $wsdl->getProxy();
 
-$month = $calendarClient->getMonth((int)$_GET['y'], (int)$_GET['m']);
+$month = $calendarClient->getMonth((int) $_GET['y'], (int) $_GET['m']);
 
 if (PEAR::isError($month)) {
     die($month->toString());
@@ -62,7 +62,7 @@ 
         if (1 === $day->isEmpty) {
             echo '<td></td>';
         } else {
-            echo '<td>' . $day->day . '</td>';
+            echo '<td>'.$day->day.'</td>';
         }
         if (1 === $day->isLast) {
             echo "</tr>\n";

class/pear/Calendar/docs/examples/1.php

Spacing +17 added lines, -17 removed lines

@@ -8,7 +8,7 @@ 
 {
     list($usec, $sec) = explode(' ', microtime());
 
-    return (float)$usec + (float)$sec;
+    return (float) $usec + (float) $sec;
 }
 
 if (!@include 'Calendar/Calendar.php') {
@@ -39,33 +39,33 @@ 
         $_GET['view'] = 'calendar_year';
         // no break
     case 'calendar_year':
-        require_once CALENDAR_ROOT . 'Year.php';
+        require_once CALENDAR_ROOT.'Year.php';
         $c = new Calendar_Year($_GET['y']);
         break;
     case 'calendar_month':
-        require_once CALENDAR_ROOT . 'Month.php';
+        require_once CALENDAR_ROOT.'Month.php';
         $c = new Calendar_Month($_GET['y'], $_GET['m']);
         break;
     case 'calendar_day':
-        require_once CALENDAR_ROOT . 'Day.php';
+        require_once CALENDAR_ROOT.'Day.php';
         $c = new Calendar_Day($_GET['y'], $_GET['m'], $_GET['d']);
         break;
     case 'calendar_hour':
-        require_once CALENDAR_ROOT . 'Hour.php';
+        require_once CALENDAR_ROOT.'Hour.php';
         $c = new Calendar_Hour($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h']);
         break;
     case 'calendar_minute':
-        require_once CALENDAR_ROOT . 'Minute.php';
+        require_once CALENDAR_ROOT.'Minute.php';
         $c = new Calendar_Minute($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i']);
         break;
     case 'calendar_second':
-        require_once CALENDAR_ROOT . 'Second.php';
+        require_once CALENDAR_ROOT.'Second.php';
         $c = new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']);
         break;
 }
 
-echo 'Viewing: ' . @$_GET['view'] . '<br>';
-echo 'The time is now: ' . date('Y M d H:i:s', $c->getTimestamp()) . '<br >';
+echo 'Viewing: '.@$_GET['view'].'<br>';
+echo 'The time is now: '.date('Y M d H:i:s', $c->getTimestamp()).'<br >';
 
 $i = 1;
 echo '<h1>First Iteration</h1>';
@@ -75,15 +75,15 @@ 
 $c->build();
 while ($e = $c->fetch()) {
     $class  = strtolower(get_class($e));
-    $link   = '&y=' . $e->thisYear() . '&m=' . $e->thisMonth() . '&d=' . $e->thisDay() . '&h=' . $e->thisHour() . '&i=' . $e->thisMinute() . '&s=' . $e->thisSecond();
-    $method = 'this' . str_replace('calendar_', '', $class);
-    echo '<a href="' . $_SERVER['PHP_SELF'] . '?view=' . $class . $link . '">' . $e->{$method}() . '</a> : ';
+    $link   = '&y='.$e->thisYear().'&m='.$e->thisMonth().'&d='.$e->thisDay().'&h='.$e->thisHour().'&i='.$e->thisMinute().'&s='.$e->thisSecond();
+    $method = 'this'.str_replace('calendar_', '', $class);
+    echo '<a href="'.$_SERVER['PHP_SELF'].'?view='.$class.$link.'">'.$e->{$method}().'</a> : ';
     if (0 == ($i % 10)) {
         echo '<br>';
     }
     ++$i;
 }
-echo '<p><b>Took: ' . (getmicrotime() - $start) . ' seconds</b></p>';
+echo '<p><b>Took: '.(getmicrotime() - $start).' seconds</b></p>';
 
 $i = 1;
 echo '<h1>Second Iteration</h1>';
@@ -92,12 +92,12 @@ 
 $start = getmicrotime();
 while ($e = $c->fetch()) {
     $class  = strtolower(get_class($e));
-    $link   = '&y=' . $e->thisYear() . '&m=' . $e->thisMonth() . '&d=' . $e->thisDay() . '&h=' . $e->thisHour() . '&i=' . $e->thisMinute() . '&s=' . $e->thisSecond();
-    $method = 'this' . str_replace('calendar_', '', $class);
-    echo '<a href="' . $_SERVER['PHP_SELF'] . '?view=' . $class . $link . '">' . $e->{$method}() . '</a> : ';
+    $link   = '&y='.$e->thisYear().'&m='.$e->thisMonth().'&d='.$e->thisDay().'&h='.$e->thisHour().'&i='.$e->thisMinute().'&s='.$e->thisSecond();
+    $method = 'this'.str_replace('calendar_', '', $class);
+    echo '<a href="'.$_SERVER['PHP_SELF'].'?view='.$class.$link.'">'.$e->{$method}().'</a> : ';
     if (0 == ($i % 10)) {
         echo '<br>';
     }
     ++$i;
 }
-echo '<p><b>Took: ' . (getmicrotime() - $start) . ' seconds</b></p>';
+echo '<p><b>Took: '.(getmicrotime() - $start).' seconds</b></p>';

class/pear/Calendar/Calendar.php

Spacing +13 added lines, -13 removed lines

@@ -97,7 +97,7 @@ 
         }
         if (!$engine) {
             if (!class_exists($class)) {
-                require_once CALENDAR_ROOT . 'Engine' . '/' . CALENDAR_ENGINE . '.php';
+                require_once CALENDAR_ROOT.'Engine'.'/'.CALENDAR_ENGINE.'.php';
             }
             $engine = new $class();
         }
@@ -209,13 +209,13 @@ 
         if (!isset($cE)) {
             $cE = Calendar_Engine_Factory::getEngine();
         }
-        $this->cE     =& $cE;
-        $this->year   = (int)$y;
-        $this->month  = (int)$m;
-        $this->day    = (int)$d;
-        $this->hour   = (int)$h;
-        $this->minute = (int)$i;
-        $this->second = (int)$s;
+        $this->cE     = & $cE;
+        $this->year   = (int) $y;
+        $this->month  = (int) $m;
+        $this->day    = (int) $d;
+        $this->hour   = (int) $h;
+        $this->minute = (int) $i;
+        $this->second = (int) $s;
     }
 
     /**
@@ -331,7 +331,7 @@ 
                 return $this->toArray($stamp);
                 break;
             case 'object':
-                require_once CALENDAR_ROOT . 'Factory.php';
+                require_once CALENDAR_ROOT.'Factory.php';
 
                 return Calendar_Factory::createByTimestamp($returnType, $stamp);
                 break;
@@ -353,7 +353,7 @@ 
      */
     public function build($sDates = [])
     {
-        require_once __DIR__ . '/PEAR.php';
+        require_once __DIR__.'/PEAR.php';
         PEAR::raiseError('Calendar::build is abstract', null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar::build()');
 
         return false;
@@ -369,7 +369,7 @@ 
      */
     public function setSelection($sDates)
     {
-        require_once __DIR__ . '/PEAR.php';
+        require_once __DIR__.'/PEAR.php';
         PEAR::raiseError('Calendar::setSelection is abstract', null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar::setSelection()');
 
         return false;
@@ -436,7 +436,7 @@ 
     public function &getValidator()
     {
         if (!isset($this->validator)) {
-            require_once CALENDAR_ROOT . 'Validator.php';
+            require_once CALENDAR_ROOT.'Validator.php';
             $this->validator = new Calendar_Validator($this);
         }
 
@@ -470,7 +470,7 @@ 
     {
         if (defined('CALENDAR_FIRST_DAY_OF_WEEK')) {
             if ((CALENDAR_FIRST_DAY_OF_WEEK != $firstDay) && !is_null($firstDay)) {
-                $msg = 'CALENDAR_FIRST_DAY_OF_WEEK constant already defined.' . ' The $firstDay parameter will be ignored.';
+                $msg = 'CALENDAR_FIRST_DAY_OF_WEEK constant already defined.'.' The $firstDay parameter will be ignored.';
                 trigger_error($msg, E_USER_WARNING);
             }
 

class/event.php

Spacing +48 added lines, -48 removed lines

@@ -19,13 +19,13 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-require_once __DIR__ . '/ExtcalPersistableObjectHandler.php';
-require_once __DIR__ . '/perm.php';
-require_once __DIR__ . '/time.php';
-require_once __DIR__ . '/config.php';
-require_once __DIR__ . '/extDateTime.php';
-require_once __DIR__ . '/utility.php';
-require_once __DIR__ . '/../include/constantes.php';
+require_once __DIR__.'/ExtcalPersistableObjectHandler.php';
+require_once __DIR__.'/perm.php';
+require_once __DIR__.'/time.php';
+require_once __DIR__.'/config.php';
+require_once __DIR__.'/extDateTime.php';
+require_once __DIR__.'/utility.php';
+require_once __DIR__.'/../include/constantes.php';
 
 /**
  * Class ExtcalEvent.
@@ -66,7 +66,7 @@ 
         $this->initVar('event_etablissement', XOBJ_DTYPE_INT, 5, false);
         $this->initVar('event_icone', XOBJ_DTYPE_TXTBOX, '', false);
 
-        $this->externalKey['cat_id']          = [
+        $this->externalKey['cat_id'] = [
             'className'      => 'cat',
             'getMethodeName' => 'getCat',
             'keyName'        => 'cat',
@@ -402,7 +402,7 @@ 
 
         //        while (list($k, $v) = each($events)) {
         foreach ($events as $k => $t) {
-            $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'] = ExtcalUtility::getLighterColor($v['cat']['cat_color'], _EXTCAL_INFOBULLE_RGB_MIN, _EXTCAL_INFOBULLE_RGB_MAX);
@@ -606,7 +606,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>';
         }
     }
 
@@ -939,10 +939,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'));
@@ -962,10 +962,10 @@ 
         }
         if (is_array($cats)) {
             if (false === array_search(0, $cats)) {
-                $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'));
@@ -988,7 +988,7 @@ 
         $fileHandler = xoops_getModuleHandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
 
         /***************************************************/
-        require_once __DIR__ . '/etablissement.php';
+        require_once __DIR__.'/etablissement.php';
         if ('admin' === $siteSide) {
             $action = 'event.php?op=enreg';
             $cats   = $catHandler->getAllCat($GLOBALS['xoopsUser'], 'all');
@@ -1006,7 +1006,7 @@ 
             if ('clone' === $mode) {
                 $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);
             }
 
@@ -1190,7 +1190,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, '');
@@ -1295,7 +1295,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);
@@ -1311,7 +1311,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);
@@ -1322,8 +1322,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));
@@ -1331,7 +1331,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);
@@ -1342,8 +1342,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));
@@ -1410,7 +1410,7 @@ 
                 $recurRules = 'weekly|';
                 $recurRules .= $parm['rrule_weekly_interval'];
                 foreach ($parm['rrule_weekly_bydays'] as $day) {
-                    $recurRules .= '|' . $day;
+                    $recurRules .= '|'.$day;
                 }
 
                 break;
@@ -1420,11 +1420,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;
@@ -1458,9 +1458,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;
@@ -2390,10 +2390,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   = [];
         $tw[] = 'te.cat_id = tc.cat_id';
@@ -2402,7 +2402,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];
 
@@ -2438,12 +2438,12 @@ 
                 'te.event_address',
                 'tc.cat_name',
             ];
-            $t       = [];
+            $t = [];
             for ($i = 0, $count = count($queryarray); $i < $count; ++$i) {
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
             }
 
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
+            $flt = '('.implode(" {$andor} ", $t1).')';
 
             $t = [];
             for ($h = 0, $count = count($tFields); $h < $count; ++$h) {
@@ -2452,10 +2452,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 = [];
@@ -2465,7 +2465,7 @@ 
                 }
             }
             if (count($t) > 0) {
-                $sql .= ' ORDER BY ' . implode(',', $t);
+                $sql .= ' ORDER BY '.implode(',', $t);
             }
         }
 
@@ -2498,7 +2498,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'];
@@ -2538,23 +2538,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 (0 != $userId) {
-            $sql .= " AND event_submitter = '" . $userId . "'";
+            $sql .= " AND event_submitter = '".$userId."'";
         }
 
         //echoArray($queryarray,false);
@@ -2574,7 +2574,7 @@ 
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
             }
 
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
+            $flt = '('.implode(" {$andor} ", $t1).')';
 
             $t = [];
             for ($h = 0, $count = count($tFields); $h < $count; ++$h) {
@@ -2583,11 +2583,11 @@ 
 
             $filtre = implode(' OR ', $t);
             $filtre = str_replace('#', '%', $filtre);
-            $sql    .= " AND ($filtre)";
+            $sql .= " AND ($filtre)";
         }
 
         if ('' != $criteresPlus) {
-            $sql .= ' AND ' . $criteresPlus;
+            $sql .= ' AND '.$criteresPlus;
         }
         $sql .= ' ORDER BY event_id DESC';
 
@@ -2597,7 +2597,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'];

class/utility.php

Spacing +28 added lines, -28 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';
 
 /**
  * Class ExtcalUtility.
@@ -49,12 +49,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',
@@ -77,15 +77,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) {
@@ -181,17 +181,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;
     }
@@ -305,7 +305,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>';
         }
     }
 
@@ -321,7 +321,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>";
     }
 
     /*****************************************************************/
@@ -334,7 +334,7 @@ 
         if ('' != $msg) {
             echo "<hr>{$msg}<hr>";
         }
-        echo $line . '<br>';
+        echo $line.'<br>';
     }
 
     /*****************************************************************/
@@ -361,7 +361,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>';
     }
 
     /*****************************************************************/
@@ -475,7 +475,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);
@@ -497,7 +497,7 @@ 
                 if (!mkdir($folder) && !is_dir($folder)) {
                     throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
                 } else {
-                    file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+                    file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
                 }
             }
         } catch (Exception $e) {
@@ -535,10 +535,10 @@ 
         //    @mkdir($dst);
         while (false !== ($file = readdir($dir))) {
             if (('.' !== $file) && ('..' !== $file)) {
-                if (is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+                if (is_dir($src.'/'.$file)) {
+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                 } else {
-                    copy($src . '/' . $file, $dst . '/' . $file);
+                    copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -565,7 +565,7 @@ 
         $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
         $currArray  = explode('.', $currentVer);
         if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
         $reqArray = explode('.', $requiredVer);
         $success  = true;
@@ -580,7 +580,7 @@ 
                     break;
                 }
             } else {
-                if ((int)$v > 0) { // handles versions like x.x.x.0_RC2
+                if ((int) $v > 0) { // handles versions like x.x.x.0_RC2
                     $success = false;
                     break;
                 }

event_notmember.php

Indentation +3 added lines, -3 removed lines

@@ -34,9 +34,9 @@
         if ('add' === $_POST['mode']) {
             $event = $eventHandler->getEvent((int)$_POST['event'], $xoopsUser);
             $eventNotMemberHandler->createEventNotMember([
-                                                             'event_id' => (int)$_POST['event'],
-                                                             'uid'      => $xoopsUser->getVar('uid'),
-                                                         ]);
+                                                                'event_id' => (int)$_POST['event'],
+                                                                'uid'      => $xoopsUser->getVar('uid'),
+                                                            ]);
             sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_3, _MD_EXTCAL_MSG_3);
             $rediredtMessage = _MD_EXTCAL_WHOSNOT_GOING_ADDED_TO_EVENT;
 

Spacing +10 added lines, -10 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-include __DIR__ . '/../../mainfile.php';
+include __DIR__.'/../../mainfile.php';
 
-require_once __DIR__ . '/include/constantes.php';
-require_once __DIR__ . '/include/mail_fnc.php';
-require_once __DIR__ . '/class/utility.php';
+require_once __DIR__.'/include/constantes.php';
+require_once __DIR__.'/include/mail_fnc.php';
+require_once __DIR__.'/class/utility.php';
 
 /*
 ext_echoArray($_POST);
@@ -21,20 +21,20 @@ 
 $member_uid = $xoopsUser->getVar('uid');
 
 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()));
 }
 
 if ($xoopsUser && $xoopsModuleConfig['whosnot_going']) {
     // If param are right
-    if ((int)$_POST['event'] > 0 && ('add' === $_POST['mode'] || 'remove' === $_POST['mode'])) {
+    if ((int) $_POST['event'] > 0 && ('add' === $_POST['mode'] || 'remove' === $_POST['mode'])) {
         $eventHandler          = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
         $eventNotMemberHandler = xoops_getModuleHandler(_EXTCAL_CLS_NOT_MEMBER, _EXTCAL_MODULE);
 
         // If the user have to be added
         if ('add' === $_POST['mode']) {
-            $event = $eventHandler->getEvent((int)$_POST['event'], $xoopsUser);
+            $event = $eventHandler->getEvent((int) $_POST['event'], $xoopsUser);
             $eventNotMemberHandler->createEventNotMember([
-                                                             'event_id' => (int)$_POST['event'],
+                                                             'event_id' => (int) $_POST['event'],
                                                              'uid'      => $xoopsUser->getVar('uid'),
                                                          ]);
             sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_3, _MD_EXTCAL_MSG_3);
@@ -43,12 +43,12 @@ 
             // If the user have to be remove
         } else {
             if ('remove' === $_POST['mode']) {
-                $eventNotMemberHandler->deleteEventNotMember([(int)$_POST['event'], $xoopsUser->getVar('uid')]);
+                $eventNotMemberHandler->deleteEventNotMember([(int) $_POST['event'], $xoopsUser->getVar('uid')]);
                 sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_4, _MD_EXTCAL_MSG_4);
                 $rediredtMessage = _MD_EXTCAL_WHOSNOT_GOING_REMOVED_TO_EVENT;
             }
         }
-        redirect_header('event.php?event=' . $_POST['event'], 3, $rediredtMessage, false);
+        redirect_header('event.php?event='.$_POST['event'], 3, $rediredtMessage, false);
     } else {
         redirect_header('index.php', 3, _NOPERM, false);
     }

admin/main.php

Switch Indentation +70 added lines, -70 removed lines

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

Spacing +29 added lines, -29 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-include __DIR__ . '/../../../class/xoopsformloader.php';
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+include __DIR__.'/../../../class/xoopsformloader.php';
+require_once __DIR__.'/admin_header.php';
 
 function extgalleryLastVersion()
 {
@@ -37,7 +37,7 @@ 
         switch ($fct) {
             case 'send':
                 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()));
                 }
                 xoops_cp_header();
                 adminMenu(1);
@@ -70,7 +70,7 @@ 
                     'EV_TITLE' => $event->getVar('event_title'),
                     'EV_START' => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_start')),
                     'EV_END'   => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_end')),
-                    'EV_LINK'  => XOOPS_URL . '/modules/extcal/event.php?event=' . $event->getVar('event_id'),
+                    'EV_LINK'  => XOOPS_URL.'/modules/extcal/event.php?event='.$event->getVar('event_id'),
                 ];
                 $xoopsMailer->assign($tag);
                 $xoopsMailer->send(true);
@@ -85,7 +85,7 @@ 
             default:
                 xoops_cp_header();
                 $fromemail      = !empty($xoopsConfig['adminmail']) ? $xoopsConfig['adminmail'] : $xoopsUser->getVar('email', 'E');
-                $subjectCaption = _AM_EXTCAL_SUBJECT . "<br><br><span style='font-size:x-small;font-weight:bold;'>" . _AM_EXTCAL_USEFUL_TAGS . "</span><br><span style='font-size:x-small;font-weight:normal;'>" . _AM_EXTCAL_MAILTAGS6 . '<br>' . _AM_EXTCAL_MAILTAGS2 . '</span>&nbsp;&nbsp;&nbsp;';
+                $subjectCaption = _AM_EXTCAL_SUBJECT."<br><br><span style='font-size:x-small;font-weight:bold;'>"._AM_EXTCAL_USEFUL_TAGS."</span><br><span style='font-size:x-small;font-weight:normal;'>"._AM_EXTCAL_MAILTAGS6.'<br>'._AM_EXTCAL_MAILTAGS2.'</span>&nbsp;&nbsp;&nbsp;';
                 $bodyCaption    = _AM_EXTCAL_BODY
                                   . "<br><br><span style='font-size:x-small;font-weight:bold;'>"
                                   . _AM_EXTCAL_USEFUL_TAGS
@@ -108,12 +108,12 @@ 
                                   . '<br>'
                                   . _AM_EXTCAL_MAILTAGS9
                                   . '</span>&nbsp;&nbsp;&nbsp;';
-                $toCheckBbox    = new XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, 'mail_send_to', 'mail');
+                $toCheckBbox = new XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, 'mail_send_to', 'mail');
                 $toCheckBox->addOption('mail', _AM_EXTCAL_EMAIL);
                 $toCheckBox->addOption('pm', _AM_EXTCAL_PM);
 
-                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 _AM_EXTCAL_INFO_SEND_NOTIF;
                 echo '</fieldset><br>';
                 $form = new XoopsThemeForm(_AM_EXTCAL_SEND_NOTIFICATION, 'mailusers', 'index.php?op=notification&amp;fct=send', 'post', true);
@@ -143,13 +143,13 @@ 
         //        $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
         $adminObject = \Xmf\Module\Admin::getInstance();
         $adminObject->addInfoBox(_MI_EXTCAL_DASHBOARD);
-        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount(), 'Green');
-        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
-        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_PENDING . '</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 0)), 'Red');
+        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_CATEGORIES.'</infolabel>', $catHandler->getCount(), 'Green');
+        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_EVENT.'</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
+        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_PENDING.'</infolabel>', $eventHandler->getCount(new Criteria('event_approved', 0)), 'Red');
         $criteriaCompo = new CriteriaCompo();
         $criteriaCompo->add(new Criteria('event_approved', 1));
         $criteriaCompo->add(new Criteria('event_start', time(), '>='));
-        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>' . _AM_EXTCAL_INDEX_APPROVED . '</infolabel><infotext>', $eventHandler->getCount($criteriaCompo) . '</infotext>', 'Green');
+        $adminObject->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, '<infolabel>'._AM_EXTCAL_INDEX_APPROVED.'</infolabel><infotext>', $eventHandler->getCount($criteriaCompo).'</infotext>', 'Green');
 
         $adminObject->addConfigBoxLine();
         $adminObject->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
@@ -166,42 +166,42 @@ 
         $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), ['cat_id']);
         $eventHandler->formatEventsDate($pendingEvent, 'd/m/Y');
 
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_PENDING_EVENT . '</legend>';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_PENDING_EVENT.'</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         //        echo '<img src="../assets/images/icons/on.png" >&nbsp;&nbsp;'._AM_EXTCAL_INFO_APPROVE_PENDING_EVENT.'<br>';
-        echo '<img src=' . $pathIcon16 . '/edit.png>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br>';
-        echo '<img src=' . $pathIcon16 . '/delete.png>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br>';
+        echo '<img src='.$pathIcon16.'/edit.png>&nbsp;&nbsp;'._AM_EXTCAL_INFO_EDIT_PENDING_EVENT.'<br>';
+        echo '<img src='.$pathIcon16.'/delete.png>&nbsp;&nbsp;'._AM_EXTCAL_INFO_DELETE_PENDING_EVENT.'<br>';
         echo '</fieldset><br>';
 
         echo '<table class="outer" style="width:100%;">';
         echo '<tr style="text-align:center;">';
-        echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
-        echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
-        echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
-        echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
+        echo '<th>'._AM_EXTCAL_CATEGORY.'</th>';
+        echo '<th>'._AM_EXTCAL_TITLE.'</th>';
+        echo '<th>'._AM_EXTCAL_START_DATE.'</th>';
+        echo '<th>'._AM_EXTCAL_ACTION.'</th>';
         echo '</tr>';
 
         if (count($pendingEvent) > 0) {
             $i = 0;
             foreach ($pendingEvent as $event) {
                 $class = (0 == ++$i % 2) ? 'even' : 'odd';
-                echo '<tr style="text-align:center;" class="' . $class . '">';
-                echo '<td>' . $event['cat']['cat_name'] . '</td>';
-                echo '<td>' . $event['event_title'] . '</td>';
-                echo '<td>' . $event['formated_event_start'] . '</td>';
+                echo '<tr style="text-align:center;" class="'.$class.'">';
+                echo '<td>'.$event['cat']['cat_name'].'</td>';
+                echo '<td>'.$event['event_title'].'</td>';
+                echo '<td>'.$event['formated_event_start'].'</td>';
                 echo '<td style="width:10%; text-align:center;">';
-                echo '<a href="event.php?op=modify&amp;event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/edit.png></a>&nbsp;&nbsp;';
-                echo '<a href="event.php?op=delete&amp;event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/delete.png></a>';
+                echo '<a href="event.php?op=modify&amp;event_id='.$event['event_id'].'"><img src='.$pathIcon16.'/edit.png></a>&nbsp;&nbsp;';
+                echo '<a href="event.php?op=delete&amp;event_id='.$event['event_id'].'"><img src='.$pathIcon16.'/delete.png></a>';
                 echo '</td>';
                 echo '</tr>';
             }
         } else {
-            echo '<tr><td colspan="4">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
+            echo '<tr><td colspan="4">'._AM_EXTCAL_NO_PENDING_EVENT.'</td></tr>';
         }
 
         echo '</table></fieldset><br>';
 
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
 
         break;
 }

admin/upgrade.php

Spacing +20 added lines, -20 removed lines

@@ -5,8 +5,8 @@ 
     $step = $_POST['step'];
 }
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-include __DIR__ . '/function.php';
+require_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 @@ 
 $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 @@ 
             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 @@ 
 
         // English file are included on module package
         if ('english' !== $xoopsConfig['language']) {
-            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 @@ 
         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 && 'index.html' !== $file) {
-                    unlink(XOOPS_ROOT_PATH . '/templates_c/' . $file);
+                    unlink(XOOPS_ROOT_PATH.'/templates_c/'.$file);
                 }
             }
 
@@ -111,7 +111,7 @@ 
         }
         //TrDisplay();
 
-        xoops_confirm(['dirname' => $localModuleDir, 'op' => 'update_ok', 'fct' => 'modulesadmin'], XOOPS_URL . '/modules/system/admin.php', _AM_EXTCAL_INSTALL_DONE, _AM_EXTCAL_UPDATE);
+        xoops_confirm(['dirname' => $localModuleDir, 'op' => 'update_ok', 'fct' => 'modulesadmin'], XOOPS_URL.'/modules/system/admin.php', _AM_EXTCAL_INSTALL_DONE, _AM_EXTCAL_UPDATE);
 
         xoops_cp_footer();