mambax7 / extcal

class/Form/FormDateTime.php

Spacing +3 added lines, -3 removed lines

@@ -16,11 +16,11 @@ 
      */
     public function __construct($form, $startTS = 0, $endTS = 0)
     {
-        $startTS       = (int)$startTS;
+        $startTS       = (int) $startTS;
         $startTS       = ($startTS > 0) ? $startTS : time();
         $startDatetime = getdate($startTS);
 
-        $endTS       = (int)$endTS;
+        $endTS       = (int) $endTS;
         $endTS       = ($endTS > 0) ? $endTS : time();
         $endDatetime = getdate($endTS);
 
@@ -28,7 +28,7 @@ 
         for ($i = 0; $i < 24; ++$i) {
             for ($j = 0; $j < _EXTCAL_TS_MINUTE; $j += 15) {
                 $key             = ($i * _EXTCAL_TS_HOUR) + ($j * _EXTCAL_TS_MINUTE);
-                $timearray[$key] = (0 != $j) ? $i . ':' . $j : $i . ':0' . $j;
+                $timearray[$key] = (0 != $j) ? $i.':'.$j : $i.':0'.$j;
             }
         }
         ksort($timearray);

class/EventNotMemberHandler.php

Spacing +3 added lines, -3 removed lines

@@ -72,12 +72,12 @@
         $eventNotMember = $this->getObjects(new \Criteria('event_id', $eventId));
         $count          = count($eventNotMember);
         if ($count > 0) {
-            $in = '(' . $eventNotMember[0]->getVar('uid');
+            $in = '('.$eventNotMember[0]->getVar('uid');
             array_shift($eventNotMember);
             foreach ($eventNotMember as $member) {
-                $in .= ',' . $member->getVar('uid');
+                $in .= ','.$member->getVar('uid');
             }
-            $in       .= ')';
+            $in .= ')';
             $criteria = new \Criteria('uid', $in, 'IN');
         } else {
             $criteria = new \Criteria('uid', '(0)', 'IN');

class/ExtcalPersistableObjectHandler.php

Spacing +44 added lines, -44 removed lines

@@ -104,10 +104,10 @@ 
         if (is_array($this->keyName)) {
             $criteria = new \CriteriaCompo();
             for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
-                $criteria->add(new \Criteria($this->keyName[$i], (int)$id[$i]));
+                $criteria->add(new \Criteria($this->keyName[$i], (int) $id[$i]));
             }
         } else {
-            $criteria = new \Criteria($this->keyName, (int)$id);
+            $criteria = new \Criteria($this->keyName, (int) $id);
         }
         $criteria->setLimit(1);
         $objectArray = $this->getObjects($criteria, false, true);
@@ -131,11 +131,11 @@ 
     {
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->table;
+        $sql   = 'SELECT * FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' != $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -170,7 +170,7 @@ 
                     $ret[] = $obj;
                 } else {
                     $row  = [];
-                    $vars =& $obj->getVars();
+                    $vars = & $obj->getVars();
                     foreach (array_keys($vars) as $i) {
                         $row[$i] = $obj->getVar($i);
                     }
@@ -181,7 +181,7 @@ 
                     $ret[$myrow[$this->keyName]] = $obj;
                 } else {
                     $row  = [];
-                    $vars =& $obj->getVars();
+                    $vars = & $obj->getVars();
                     foreach (array_keys($vars) as $i) {
                         $row[$i] = $obj->getVar($i);
                     }
@@ -214,15 +214,15 @@ 
             $criteria->setSort($this->identifierName);
         }
 
-        $sql = 'SELECT ' . $this->keyName;
+        $sql = 'SELECT '.$this->keyName;
         if (!empty($this->identifierName)) {
-            $sql .= ', ' . $this->identifierName;
+            $sql .= ', '.$this->identifierName;
         }
-        $sql .= ' FROM ' . $this->table;
+        $sql .= ' FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' != $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -255,12 +255,12 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
             if ('' != $criteria->groupby) {
                 $groupby = true;
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
             }
         }
-        $sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table;
+        $sql = 'SELECT '.$field.'COUNT(*) FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' != $criteria->groupby) {
                 $sql .= $criteria->getGroupby();
             }
@@ -296,13 +296,13 @@ 
         if (is_array($this->keyName)) {
             $clause = [];
             for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
-                $clause[] = $this->keyName[$i] . ' = ' . $id[$i];
+                $clause[] = $this->keyName[$i].' = '.$id[$i];
             }
             $whereclause = implode(' AND ', $clause);
         } else {
-            $whereclause = $this->keyName . ' = ' . $id;
+            $whereclause = $this->keyName.' = '.$id;
         }
-        $sql = 'DELETE FROM ' . $this->table . ' WHERE ' . $whereclause;
+        $sql = 'DELETE FROM '.$this->table.' WHERE '.$whereclause;
         if (false !== $force) {
             $result = $this->db->queryF($sql);
         } else {
@@ -333,7 +333,7 @@ 
             }
 
             if (!($obj instanceof $this->className && class_exists($this->className))) {
-                $obj->setErrors(get_class($obj) . ' Differs from ' . $this->className);
+                $obj->setErrors(get_class($obj).' Differs from '.$this->className);
 
                 return false;
             }
@@ -344,7 +344,7 @@ 
 
         foreach ($obj->cleanVars as $k => $v) {
             if (XOBJ_DTYPE_INT == $obj->vars[$k]['data_type']) {
-                $cleanvars[$k] = (int)$v;
+                $cleanvars[$k] = (int) $v;
             } elseif (is_array($v)) {
                 $cleanvars[$k] = $this->db->quoteString(implode(',', $v));
             } else {
@@ -354,12 +354,12 @@ 
         if ($obj->isNew()) {
             if (!is_array($this->keyName)) {
                 if ($cleanvars[$this->keyName] < 1) {
-                    $cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq');
+                    $cleanvars[$this->keyName] = $this->db->genId($this->table.'_'.$this->keyName.'_seq');
                 }
             }
-            $sql = 'INSERT INTO ' . $this->table . ' (' . implode(',', array_keys($cleanvars)) . ') VALUES (' . implode(',', array_values($cleanvars)) . ')';
+            $sql = 'INSERT INTO '.$this->table.' ('.implode(',', array_keys($cleanvars)).') VALUES ('.implode(',', array_values($cleanvars)).')';
         } else {
-            $sql = 'UPDATE ' . $this->table . ' SET';
+            $sql = 'UPDATE '.$this->table.' SET';
             foreach ($cleanvars as $key => $value) {
                 if ((!is_array($this->keyName) && $key == $this->keyName)
                     || (is_array($this->keyName)
@@ -369,7 +369,7 @@ 
                 if (isset($notfirst)) {
                     $sql .= ',';
                 }
-                $sql      .= ' ' . $key . ' = ' . $value;
+                $sql .= ' '.$key.' = '.$value;
                 $notfirst = true;
             }
             if (is_array($this->keyName)) {
@@ -378,12 +378,12 @@ 
                     if ($i > 0) {
                         $whereclause .= ' AND ';
                     }
-                    $whereclause .= $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
+                    $whereclause .= $this->keyName[$i].' = '.$obj->getVar($this->keyName[$i]);
                 }
             } else {
-                $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
+                $whereclause = $this->keyName.' = '.$obj->getVar($this->keyName);
             }
-            $sql .= ' WHERE ' . $whereclause;
+            $sql .= ' WHERE '.$whereclause;
         }
         if (false !== $force) {
             $result = $this->db->queryF($sql);
@@ -412,7 +412,7 @@ 
      */
     public function updateAll($fieldname, $fieldvalue, \CriteriaElement $criteria = null, $force = false)
     {
-        $setClause = $fieldname . ' = ';
+        $setClause = $fieldname.' = ';
         if (is_numeric($fieldvalue)) {
             $setClause .= $fieldvalue;
         } elseif (is_array($fieldvalue)) {
@@ -420,9 +420,9 @@ 
         } else {
             $setClause .= $this->db->quoteString($fieldvalue);
         }
-        $sql = 'UPDATE ' . $this->table . ' SET ' . $setClause;
+        $sql = 'UPDATE '.$this->table.' SET '.$setClause;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (false !== $force) {
             $result = $this->db->queryF($sql);
@@ -446,9 +446,9 @@ 
      */
     public function updateFieldValue($fieldname, $fieldvalue, $criteria = null, $force = true)
     {
-        $sql = 'UPDATE ' . $this->table . ' SET ' . $fieldname . ' = ' . $fieldvalue;
+        $sql = 'UPDATE '.$this->table.' SET '.$fieldname.' = '.$fieldvalue;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (false !== $force) {
             $result = $this->db->queryF($sql);
@@ -475,8 +475,8 @@ 
     public function deleteAll(\CriteriaElement $criteria = null, $force = true, $asObject = false)
     {
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql = 'DELETE FROM ' . $this->table;
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql = 'DELETE FROM '.$this->table;
+            $sql .= ' '.$criteria->renderWhere();
             if (!$this->db->query($sql)) {
                 return false;
             }
@@ -610,8 +610,8 @@ 
      */
     public function updateCounter($fieldname, $criteria, $op = '+')
     {
-        $sql    = 'UPDATE ' . $this->table . ' SET ' . $fieldname . ' = ' . $fieldname . $op . '1';
-        $sql    .= ' ' . $criteria->renderWhere();
+        $sql    = 'UPDATE '.$this->table.' SET '.$fieldname.' = '.$fieldname.$op.'1';
+        $sql .= ' '.$criteria->renderWhere();
         $result = $this->db->queryF($sql);
         if (!$result) {
             return false;
@@ -633,12 +633,12 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
             if ('' != $criteria->groupby) {
                 $groupby = true;
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
             }
         }
-        $sql = 'SELECT ' . $field . "SUM($sum) FROM " . $this->table;
+        $sql = 'SELECT '.$field."SUM($sum) FROM ".$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' != $criteria->groupby) {
                 $sql .= $criteria->getGroupby();
             }
@@ -674,12 +674,12 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
             if ('' != $criteria->groupby) {
                 $groupby = true;
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
             }
         }
-        $sql = 'SELECT ' . $field . "MAX($max) FROM " . $this->table;
+        $sql = 'SELECT '.$field."MAX($max) FROM ".$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' != $criteria->groupby) {
                 $sql .= $criteria->getGroupby();
             }
@@ -712,9 +712,9 @@ 
     {
         $field = '';
 
-        $sql = 'SELECT ' . $field . "AVG($avg) FROM " . $this->table;
+        $sql = 'SELECT '.$field."AVG($avg) FROM ".$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $result = $this->db->query($sql);
         if (!$result) {

class/EventmemberHandler.php

Spacing +3 added lines, -3 removed lines

@@ -71,12 +71,12 @@
         $eventMember   = $this->getObjects(new \Criteria('event_id', $eventId));
         $count         = count($eventMember);
         if ($count > 0) {
-            $in = '(' . $eventMember[0]->getVar('uid');
+            $in = '('.$eventMember[0]->getVar('uid');
             array_shift($eventMember);
             foreach ($eventMember as $member) {
-                $in .= ',' . $member->getVar('uid');
+                $in .= ','.$member->getVar('uid');
             }
-            $in       .= ')';
+            $in .= ')';
             $criteria = new \Criteria('uid', $in, 'IN');
         } else {
             $criteria = new \Criteria('uid', '(0)', 'IN');

class/CategoryHandler.php

Spacing +2 added lines, -2 removed lines

@@ -186,10 +186,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'));

class/File.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 // require_once __DIR__ . '/ExtcalPersistableObjectHandler.php';
-require_once XOOPS_ROOT_PATH . '/class/uploader.php';
+require_once XOOPS_ROOT_PATH.'/class/uploader.php';
 
 /**
  * Class File.

class/Time.php

Spacing +23 added lines, -23 removed lines

@@ -4,7 +4,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once XOOPS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/calendar.php';
+require_once XOOPS_ROOT_PATH.'/language/'.$GLOBALS['xoopsConfig']['language'].'/calendar.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 Extcal\Helper::getInstance()->loadLanguage('main');
@@ -92,7 +92,7 @@ 
      */
     public function getFormatedDate($format, $timestamp)
     {
-        $patterns     = [
+        $patterns = [
             '/January/',
             '/February/',
             '/March/',
@@ -145,18 +145,18 @@ 
             _CAL_OCTOBER,
             _CAL_NOVEMBER,
             _CAL_DECEMBER,
-            substr(_CAL_JANUARY, 0, 3) . ' ',
-            substr(_CAL_FEBRUARY, 0, 3) . ' ',
-            substr(_CAL_MARCH, 0, 3) . ' ',
-            substr(_CAL_APRIL, 0, 3) . ' ',
-            substr(_CAL_MAY, 0, 3) . ' ',
-            substr(_CAL_JUNE, 0, 3) . ' ',
-            substr(_CAL_JULY, 0, 3) . ' ',
-            substr(_CAL_AUGUST, 0, 3) . ' ',
-            substr(_CAL_SEPTEMBER, 0, 3) . ' ',
-            substr(_CAL_OCTOBER, 0, 3) . ' ',
-            substr(_CAL_NOVEMBER, 0, 3) . ' ',
-            substr(_CAL_DECEMBER, 0, 3) . ' ',
+            substr(_CAL_JANUARY, 0, 3).' ',
+            substr(_CAL_FEBRUARY, 0, 3).' ',
+            substr(_CAL_MARCH, 0, 3).' ',
+            substr(_CAL_APRIL, 0, 3).' ',
+            substr(_CAL_MAY, 0, 3).' ',
+            substr(_CAL_JUNE, 0, 3).' ',
+            substr(_CAL_JULY, 0, 3).' ',
+            substr(_CAL_AUGUST, 0, 3).' ',
+            substr(_CAL_SEPTEMBER, 0, 3).' ',
+            substr(_CAL_OCTOBER, 0, 3).' ',
+            substr(_CAL_NOVEMBER, 0, 3).' ',
+            substr(_CAL_DECEMBER, 0, 3).' ',
             _CAL_SUNDAY,
             _CAL_MONDAY,
             _CAL_TUESDAY,
@@ -164,13 +164,13 @@ 
             _CAL_THURSDAY,
             _CAL_FRIDAY,
             _CAL_SATURDAY,
-            substr(_CAL_SUNDAY, 0, 3) . ' ',
-            substr(_CAL_MONDAY, 0, 3) . ' ',
-            substr(_CAL_TUESDAY, 0, 3) . ' ',
-            substr(_CAL_WEDNESDAY, 0, 3) . ' ',
-            substr(_CAL_THURSDAY, 0, 3) . ' ',
-            substr(_CAL_FRIDAY, 0, 3) . ' ',
-            substr(_CAL_SATURDAY, 0, 3) . ' ',
+            substr(_CAL_SUNDAY, 0, 3).' ',
+            substr(_CAL_MONDAY, 0, 3).' ',
+            substr(_CAL_TUESDAY, 0, 3).' ',
+            substr(_CAL_WEDNESDAY, 0, 3).' ',
+            substr(_CAL_THURSDAY, 0, 3).' ',
+            substr(_CAL_FRIDAY, 0, 3).' ',
+            substr(_CAL_SATURDAY, 0, 3).' ',
         ];
 
         return preg_replace($patterns, $replacements, date($format, $timestamp));
@@ -212,7 +212,7 @@ 
                 array_shift($eventOptions);
                 $day = '';
                 foreach ($eventOptions as $option) {
-                    $day .= ' ' . $daysName[$option] . ', ';
+                    $day .= ' '.$daysName[$option].', ';
                 }
                 $ret = sprintf(_MD_EXTCAL_RR_WEEKLY, $day, $interval);
 
@@ -331,7 +331,7 @@ 
                 array_shift($eventOptions);
                 $month = '';
                 foreach ($eventOptions as $option) {
-                    $month .= ' ' . $monthName[$option] . ', ';
+                    $month .= ' '.$monthName[$option].', ';
                 }
                 $dayString = $day;
                 if (array_key_exists($day, $monthDays)) {

class/Utility.php

Spacing +21 added lines, -21 removed lines

@@ -16,7 +16,7 @@ 
  * L'utilisation de ce formulaire d'adminitration suppose
  * que la classe correspondante de la table a été générées avec classGenerator
  **/
-require_once XOOPS_ROOT_PATH . '/class/uploader.php';
+require_once XOOPS_ROOT_PATH.'/class/uploader.php';
 
 use XoopsModules\Extcal;
 use XoopsModules\Extcal\Common;
@@ -60,12 +60,12 @@ 
     public static function loadImg(&$REQUEST, &$event_picture1, &$event_picture2)
     {
         ///////////////////////////////////////////////////////////////////////////////
-        $uploaddir_event = XOOPS_ROOT_PATH . '/uploads/extcal/';
-        $uploadurl_event = XOOPS_URL . '/uploads/extcal/';
+        $uploaddir_event = XOOPS_ROOT_PATH.'/uploads/extcal/';
+        $uploadurl_event = XOOPS_URL.'/uploads/extcal/';
         //$picture = '';
         for ($j = 1; $j < 3; ++$j) {
-            $delimg = @$REQUEST['delimg_' . $j . ''];
-            $delimg = isset($delimg) ? (int)$delimg : 0;
+            $delimg = @$REQUEST['delimg_'.$j.''];
+            $delimg = isset($delimg) ? (int) $delimg : 0;
             if (0 == $delimg && !empty($REQUEST['xoops_upload_file'][$j])) {
                 $upload = new \XoopsMediaUploader($uploaddir_event, [
                     'image/gif',
@@ -88,15 +88,15 @@ 
                             $event_picture2 = $upload->getSavedFileName();
                         }
                     }
-                } elseif (!empty($REQUEST['file' . $j])) {
+                } elseif (!empty($REQUEST['file'.$j])) {
                     if (1 == $j) {
-                        $event_picture1 = $REQUEST['file' . $j];
+                        $event_picture1 = $REQUEST['file'.$j];
                     } elseif (2 == $j) {
-                        $event_picture2 = $REQUEST['file' . $j];
+                        $event_picture2 = $REQUEST['file'.$j];
                     }
                 }
             } else {
-                $url_event = XOOPS_ROOT_PATH . '/uploads/extcal/' . $REQUEST['file' . $j];
+                $url_event = XOOPS_ROOT_PATH.'/uploads/extcal/'.$REQUEST['file'.$j];
                 if (1 == $j) {
                     $event_picture1 = '';
                 } elseif (2 == $j) {
@@ -192,17 +192,17 @@ 
             $select->addOption('', '');
         }
 
-        $select->addOption('year ASC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-        $select->addOption('year DESC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+        $select->addOption('year ASC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_ASC);
+        $select->addOption('year DESC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_DESC);
 
-        $select->addOption('month ASC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-        $select->addOption('month DESC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+        $select->addOption('month ASC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_ASC);
+        $select->addOption('month DESC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_DESC);
 
-        $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-        $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+        $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_ASC);
+        $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_DESC);
 
-        $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_ASC);
-        $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_DESC);
+        $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_ASC);
+        $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_DESC);
 
         return $select;
     }
@@ -316,7 +316,7 @@ 
     public static function echoDateArray($period)
     {
         foreach ($period as $dt) {
-            echo $dt->format("l Y-m-d H:i:s\n") . '<br>';
+            echo $dt->format("l Y-m-d H:i:s\n").'<br>';
         }
     }
 
@@ -332,7 +332,7 @@ 
         }
 
         $txt = print_r($t, true);
-        echo '<pre>Number of items: ' . count($t) . "<br>{$txt}</pre>";
+        echo '<pre>Number of items: '.count($t)."<br>{$txt}</pre>";
     }
 
     /*****************************************************************/
@@ -345,7 +345,7 @@ 
         if ('' != $msg) {
             echo "<hr>{$msg}<hr>";
         }
-        echo $line . '<br>';
+        echo $line.'<br>';
     }
 
     /*****************************************************************/
@@ -372,7 +372,7 @@ 
             echo "<hr>{$msg}<hr>";
         }
 
-        echo 'date --->' . $tsName . ' = ' . $ts . ' - ' . date('d-m-Y H:m:s', $ts) . '<br>';
+        echo 'date --->'.$tsName.' = '.$ts.' - '.date('d-m-Y H:m:s', $ts).'<br>';
     }
 
     /*****************************************************************/

class/Common/ServerStats.php

Spacing +12 added lines, -12 removed lines

@@ -34,19 +34,19 @@ 
         //        $sql   .= " WHERE metakey='version' LIMIT 1";
         //        $query = $GLOBALS['xoopsDB']->query($sql);
         //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
-        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
+        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>".constant('CO_'.$moduleDirNameUpper.'_IMAGEINFO')."</legend>\n";
         $html .= "<div style='padding: 8px;'>\n";
         //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
         //        $html .= "<br>\n";
         //        $html .= "<br>\n";
-        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
+        $html .= '<div>'.constant('CO_'.$moduleDirNameUpper.'_SPHPINI')."</div>\n";
         $html .= "<ul>\n";
         //
-        $gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
-        $html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
+        $gdlib = function_exists('gd_info') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_GDON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_GDOFF').'</span>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS').$gdlib;
         if (function_exists('gd_info')) {
             if (true === ($gdlib = gd_info())) {
-                $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
+                $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBVERSION').'<b>'.$gdlib['GD Version'].'</b>';
             }
         }
         //
@@ -56,18 +56,18 @@ 
         //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
         //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
         //
-        $downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
-        $html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
+        $downloads = ini_get('file_uploads') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_ON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_OFF').'</span>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS').$downloads;
         //
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE').' <b><span style="color: blue;">'.ini_get('upload_max_filesize')."</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE').' <b><span style="color: blue;">'.ini_get('post_max_size')."</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT').' <b><span style="color: blue;">'.ini_get('memory_limit')."</span></b>\n";
         $html .= "</ul>\n";
         $html .= "<ul>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERPATH').' <b>'.XOOPS_ROOT_PATH."</b>\n";
         $html .= "</ul>\n";
         $html .= "<br>\n";
-        $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
+        $html .= constant('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC')."\n";
         $html .= '</div>';
         $html .= '</fieldset><br>';