mambax7 / extcal

admin/cat.php

Spacing +10 added lines, -10 removed lines

@@ -20,11 +20,11 @@ 
 use Xmf\Request;
 use XoopsModules\Extcal;
 
-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';
 // require_once __DIR__ . '/../class/Utility.php';
-require_once __DIR__ . '/../include/constantes.php';
+require_once __DIR__.'/../include/constantes.php';
 
 //$gepeto = array_merge($_GET, $_POST);
 //while (list($key, $value) = each($gepeto)) {
@@ -95,7 +95,7 @@ 
         $form->addElement(new \XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, 0), false);
         $form->addElement(new \XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#FF0000'));
 
-        $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(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), '');
@@ -107,7 +107,7 @@ 
 
         $form->display();
 
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 
     case 'edit':
@@ -120,15 +120,15 @@ 
             //            $cat = $catHandler->getCat($cat_id, true);
         }
 
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_EDIT_CATEGORY . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_EDIT_CATEGORY.'</legend>';
 
         $form = new \XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true);
         $form->addElement(new \XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255, $cat->getVar('cat_name')), true);
         $form->addElement(new \XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', $cat->getVar('cat_desc')), false);
         $form->addElement(new \XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, $cat->getVar('cat_weight')), false);
-        $form->addElement(new \XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#' . $cat->getVar('cat_color')));
+        $form->addElement(new \XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#'.$cat->getVar('cat_color')));
 
-        $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(_AM_EXTCAL_ICONE, 'cat_icone', $cat->getVar('cat_icone'), '');
@@ -284,6 +284,6 @@ 
         //$xoopsTpl->assign("module_dirname",    $xoopsModule->getVar("dirname") );
 
         $xoopsTpl->display('db:admin/extcal_admin_cat_list.tpl');
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 }

class/ExtcalPersistableObjectHandler.php

Indentation +2 added lines, -2 removed lines

@@ -162,7 +162,7 @@ 
     public function convertResultSet($result, $idAsKey = false, $asObject = true)
     {
         $ret = [];
-       while (false !== ($myrow = $this->db->fetchArray($result))) {
+        while (false !== ($myrow = $this->db->fetchArray($result))) {
             $obj = $this->create(false);
             $obj->assignVars($myrow);
             if (!$idAsKey) {
@@ -233,7 +233,7 @@ 
         }
 
         $myts = \MyTextSanitizer::getInstance();
-       while (false !== ($myrow = $this->db->fetchArray($result))) {
+        while (false !== ($myrow = $this->db->fetchArray($result))) {
             //identifiers should be textboxes, so sanitize them like that
             $ret[$myrow[$this->keyName]] = empty($this->identifierName) ? 1 : $myts->htmlSpecialChars($myrow[$this->identifierName]);
         }

Spacing +45 added lines, -45 removed lines

@@ -104,13 +104,13 @@ 
         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);
+        $objectArray = & $this->getObjects($criteria, false, true);
         if (1 != count($objectArray)) {
             return $this->create();
         }
@@ -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/EventHandler.php

Spacing +45 added lines, -45 removed lines

@@ -23,7 +23,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once __DIR__ . '/../include/constantes.php';
+require_once __DIR__.'/../include/constantes.php';
 
 /**
  * Class EventHandler.
@@ -131,7 +131,7 @@ 
      */
     public function getAllEvents($criteria = null, $asObject = false)
     {
-        $rst =& $this->getObjects($criteria, $asObject);
+        $rst = & $this->getObjects($criteria, $asObject);
         if ($asObject) {
             return $rst;
         } else {
@@ -157,7 +157,7 @@ 
         if (!$skipPerm) {
             $this->addCatPermCriteria($criteriaCompo, $user);
         }
-        $ret =& $this->getObjects($criteriaCompo);
+        $ret = & $this->getObjects($criteriaCompo);
         if (isset($ret[0])) {
             return $ret[0];
         } else {
@@ -182,7 +182,7 @@ 
         if (!$skipPerm) {
             $this->addCatPermCriteria($criteriaCompo, $user);
         }
-        $ret =& $this->getObjects($criteriaCompo);
+        $ret = & $this->getObjects($criteriaCompo);
         if (isset($ret[0])) {
             return $ret[0];
         } else {
@@ -335,7 +335,7 @@ 
 
         //        while (list($k, $v) = each($events)) {
         foreach ($events as $k => $v) {
-            $ordre[] = (int)$v['event_start'];
+            $ordre[] = (int) $v['event_start'];
             $this->formatEventDate($v, Extcal\Helper::getInstance()->getConfig('event_date_week'));
             //$v['cat']['cat_light_color'] = $v['cat']['cat_color'];
             $v['cat']['cat_light_color'] = Extcal\Utility::getLighterColor($v['cat']['cat_color'], _EXTCAL_INFOBULLE_RGB_MIN, _EXTCAL_INFOBULLE_RGB_MAX);
@@ -424,7 +424,7 @@ 
         $criteriaCompo->add(new \Criteria('event_isrecur', 0, '='));
         $criteriaCompo->setOrder($sens);
 
-        $result =& $this->getObjects($criteriaCompo);
+        $result = & $this->getObjects($criteriaCompo);
         $events = $this->objectToArray($result, $externalKeys);
         $this->serverTimeToUserTimes($events);
 
@@ -497,7 +497,7 @@ 
         $criteriaCompo->add(new \Criteria('event_isrecur', 1, '='));
         $criteriaCompo->setOrder($sens);
 
-        $result =& $this->getObjects($criteriaCompo);
+        $result = & $this->getObjects($criteriaCompo);
         $events = $this->objectToArray($result, $externalKeys);
         $this->serverTimeToUserTimes($events);
 
@@ -537,7 +537,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>';
         }
     }
 
@@ -866,10 +866,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'));
@@ -889,10 +889,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'));
@@ -933,7 +933,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);
             }
 
@@ -1117,7 +1117,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, '');
@@ -1222,7 +1222,7 @@ 
         if (count($files) > 0) {
             $eventFiles = new Extcal\Form\FormFileCheckBox('', '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);
@@ -1238,7 +1238,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);
@@ -1249,8 +1249,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));
@@ -1258,7 +1258,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);
@@ -1269,8 +1269,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));
@@ -1337,7 +1337,7 @@ 
                 $recurRules = 'weekly|';
                 $recurRules .= $parm['rrule_weekly_interval'];
                 foreach ($parm['rrule_weekly_bydays'] as $day) {
-                    $recurRules .= '|' . $day;
+                    $recurRules .= '|'.$day;
                 }
 
                 break;
@@ -1347,11 +1347,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;
@@ -1385,9 +1385,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;
@@ -2313,10 +2313,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';
@@ -2325,7 +2325,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];
 
@@ -2361,12 +2361,12 @@ 
                 'te.event_address',
                 'tc.cat_name',
             ];
-            $t       = [];
+            $t = [];
             foreach ($queryarray as $i => $iValue) {
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
             }
 
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
+            $flt = '('.implode(" {$andor} ", $t1).')';
 
             $t = [];
             foreach ($tFields as $h => $hValue) {
@@ -2375,10 +2375,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 = [];
@@ -2388,7 +2388,7 @@ 
                 }
             }
             if (count($t) > 0) {
-                $sql .= ' ORDER BY ' . implode(',', $t);
+                $sql .= ' ORDER BY '.implode(',', $t);
             }
         }
 
@@ -2421,7 +2421,7 @@ 
         $i = 0;
         while (false !== ($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'];
@@ -2461,23 +2461,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);
@@ -2497,7 +2497,7 @@ 
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
             }
 
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
+            $flt = '('.implode(" {$andor} ", $t1).')';
 
             $t = [];
             foreach ($tFields as $h => $hValue) {
@@ -2506,11 +2506,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';
 
@@ -2520,7 +2520,7 @@ 
         if ($xoopsSearch) {
             while (false !== ($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/EventNotMemberHandler.php

Spacing +4 added lines, -4 removed lines

@@ -69,15 +69,15 @@
     public function getMembers($eventId)
     {
         $memberHandler  = xoops_getHandler('member');
-        $eventNotMember =& $this->getObjects(new \Criteria('event_id', $eventId));
+        $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/Common/ServerStats.php

Spacing +13 added lines, -13 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>';
+            if (true === ($gdlib = gd_info())) {
+                $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>';
 

class/Common/Configurator.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
  *
  */
 
-require_once __DIR__ . '/../../include/common.php';
+require_once __DIR__.'/../../include/common.php';
 
 /**
  * Class Configurator
@@ -45,7 +45,7 @@ 
         $moduleDirName = basename(dirname(__DIR__));
         $capsDirName   = strtoupper($moduleDirName);
 
-        include_once __DIR__ . '/../../include/config.php';        
+        include_once __DIR__.'/../../include/config.php';        
         $config = getConfig();
 
         $this->name            = $config->name;

class/FileHandler.php

Spacing +11 added lines, -11 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 FileHandler.
@@ -46,13 +46,13 @@ 
         $userId = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
 
         $allowedMimeType = [];
-        $mimeType        = include XOOPS_ROOT_PATH . '/include/mimetypes.inc.php';
+        $mimeType        = include XOOPS_ROOT_PATH.'/include/mimetypes.inc.php';
         foreach ($GLOBALS['xoopsModuleConfig']['allowed_file_extention'] as $fileExt) {
             $allowedMimeType[] = $mimeType[$fileExt];
         }
 
-        $uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH . '/uploads/extcal', $allowedMimeType, 3145728);
-        $uploader->setPrefix($userId . '-' . $eventId . '_');
+        $uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH.'/uploads/extcal', $allowedMimeType, 3145728);
+        $uploader->setPrefix($userId.'-'.$eventId.'_');
         if ($uploader->fetchMedia('event_file')) {
             if (!$uploader->upload()) {
                 return false;
@@ -113,19 +113,19 @@ 
         if (isset($_POST['filetokeep'])) {
             if (is_array($_POST['filetokeep'])) {
                 $count = count($_POST['filetokeep']);
-                $in    = '(' . $_POST['filetokeep'][0];
+                $in    = '('.$_POST['filetokeep'][0];
                 array_shift($_POST['filetokeep']);
                 foreach ($_POST['filetokeep'] as $elmt) {
-                    $in .= ',' . $elmt;
+                    $in .= ','.$elmt;
                 }
                 $in .= ')';
             } else {
-                $in = '(' . $_POST['filetokeep'] . ')';
+                $in = '('.$_POST['filetokeep'].')';
             }
             $criteria->add(new \Criteria('file_id', $in, 'NOT IN'));
         }
 
-        $files =& $this->getObjects($criteria);
+        $files = & $this->getObjects($criteria);
         foreach ($files as $file) {
             $this->deleteFile($file);
         }
@@ -157,7 +157,7 @@ 
     public function formatFileSize(&$file)
     {
         if ($file['file_size'] > 1000) {
-            $file['formated_file_size'] = round($file['file_size'] / 1000) . 'kb';
+            $file['formated_file_size'] = round($file['file_size'] / 1000).'kb';
         } else {
             $file['formated_file_size'] = '1kb';
         }
@@ -168,8 +168,8 @@ 
      */
     public function _deleteFile(&$file)
     {
-        if (file_exists(XOOPS_ROOT_PATH . '/uploads/extcal/' . $file->getVar('file_name'))) {
-            unlink(XOOPS_ROOT_PATH . '/uploads/extcal/' . $file->getVar('file_name'));
+        if (file_exists(XOOPS_ROOT_PATH.'/uploads/extcal/'.$file->getVar('file_name'))) {
+            unlink(XOOPS_ROOT_PATH.'/uploads/extcal/'.$file->getVar('file_name'));
         }
     }
 }

class/Event.php

Spacing +7 added lines, -7 removed lines

@@ -21,12 +21,12 @@ 
 // defined('XOOPS_ROOT_PATH') || die('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__.'/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 Event.
@@ -67,7 +67,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'      => 'Category',
             'getMethodeName' => 'getCat',
             'keyName'        => 'cat',

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.