@@ -40,13 +40,13 @@ discard block |
||
40 | 40 | //check for minimum XOOPS version |
41 | 41 | $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string |
42 | 42 | if (null === $requiredVer) { |
43 | - $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string |
|
43 | + $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string |
|
44 | 44 | } |
45 | 45 | $success = true; |
46 | 46 | |
47 | 47 | if (version_compare($currentVer, $requiredVer, '<')) { |
48 | 48 | $success = false; |
49 | - $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer)); |
|
49 | + $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer)); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | return $success; |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $reqVer = $module->getInfo('min_php'); |
71 | 71 | if (false !== $reqVer && '' !== $reqVer) { |
72 | 72 | if (version_compare($verNum, $reqVer, '<')) { |
73 | - $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum)); |
|
73 | + $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum)); |
|
74 | 74 | $success = false; |
75 | 75 | } |
76 | 76 | } |
@@ -70,7 +70,7 @@ |
||
70 | 70 | require_once $GLOBALS['xoops']->path('class/template.php'); |
71 | 71 | $breadcrumbTpl = new \XoopsTpl(); |
72 | 72 | $breadcrumbTpl->assign('breadcrumb', $this->bread); |
73 | - $html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl'); |
|
73 | + $html = $breadcrumbTpl->fetch('db:'.$this->dirname.'_common_breadcrumb.tpl'); |
|
74 | 74 | unset($breadcrumbTpl); |
75 | 75 | |
76 | 76 | return $html; |
@@ -16,11 +16,11 @@ discard block |
||
16 | 16 | */ |
17 | 17 | public function __construct($form, $startTS = 0, $endTS = 0) |
18 | 18 | { |
19 | - $startTS = (int)$startTS; |
|
19 | + $startTS = (int) $startTS; |
|
20 | 20 | $startTS = ($startTS > 0) ? $startTS : time(); |
21 | 21 | $startDatetime = getdate($startTS); |
22 | 22 | |
23 | - $endTS = (int)$endTS; |
|
23 | + $endTS = (int) $endTS; |
|
24 | 24 | $endTS = ($endTS > 0) ? $endTS : time(); |
25 | 25 | $endDatetime = getdate($endTS); |
26 | 26 | |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | for ($i = 0; $i < 24; ++$i) { |
29 | 29 | for ($j = 0; $j < _EXTCAL_TS_MINUTE; $j += 15) { |
30 | 30 | $key = ($i * _EXTCAL_TS_HOUR) + ($j * _EXTCAL_TS_MINUTE); |
31 | - $timearray[$key] = (0 != $j) ? $i . ':' . $j : $i . ':0' . $j; |
|
31 | + $timearray[$key] = (0 != $j) ? $i.':'.$j : $i.':0'.$j; |
|
32 | 32 | } |
33 | 33 | } |
34 | 34 | ksort($timearray); |
@@ -72,12 +72,12 @@ |
||
72 | 72 | $eventNotMember = $this->getObjects(new \Criteria('event_id', $eventId)); |
73 | 73 | $count = count($eventNotMember); |
74 | 74 | if ($count > 0) { |
75 | - $in = '(' . $eventNotMember[0]->getVar('uid'); |
|
75 | + $in = '('.$eventNotMember[0]->getVar('uid'); |
|
76 | 76 | array_shift($eventNotMember); |
77 | 77 | foreach ($eventNotMember as $member) { |
78 | - $in .= ',' . $member->getVar('uid'); |
|
78 | + $in .= ','.$member->getVar('uid'); |
|
79 | 79 | } |
80 | - $in .= ')'; |
|
80 | + $in .= ')'; |
|
81 | 81 | $criteria = new \Criteria('uid', $in, 'IN'); |
82 | 82 | } else { |
83 | 83 | $criteria = new \Criteria('uid', '(0)', 'IN'); |
@@ -104,10 +104,10 @@ discard block |
||
104 | 104 | if (is_array($this->keyName)) { |
105 | 105 | $criteria = new \CriteriaCompo(); |
106 | 106 | for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) { |
107 | - $criteria->add(new \Criteria($this->keyName[$i], (int)$id[$i])); |
|
107 | + $criteria->add(new \Criteria($this->keyName[$i], (int) $id[$i])); |
|
108 | 108 | } |
109 | 109 | } else { |
110 | - $criteria = new \Criteria($this->keyName, (int)$id); |
|
110 | + $criteria = new \Criteria($this->keyName, (int) $id); |
|
111 | 111 | } |
112 | 112 | $criteria->setLimit(1); |
113 | 113 | $objectArray = $this->getObjects($criteria, false, true); |
@@ -131,11 +131,11 @@ discard block |
||
131 | 131 | { |
132 | 132 | $ret = []; |
133 | 133 | $limit = $start = 0; |
134 | - $sql = 'SELECT * FROM ' . $this->table; |
|
134 | + $sql = 'SELECT * FROM '.$this->table; |
|
135 | 135 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
136 | - $sql .= ' ' . $criteria->renderWhere(); |
|
136 | + $sql .= ' '.$criteria->renderWhere(); |
|
137 | 137 | if ('' != $criteria->getSort()) { |
138 | - $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder(); |
|
138 | + $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder(); |
|
139 | 139 | } |
140 | 140 | $limit = $criteria->getLimit(); |
141 | 141 | $start = $criteria->getStart(); |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $ret[] = $obj; |
171 | 171 | } else { |
172 | 172 | $row = []; |
173 | - $vars =& $obj->getVars(); |
|
173 | + $vars = & $obj->getVars(); |
|
174 | 174 | foreach (array_keys($vars) as $i) { |
175 | 175 | $row[$i] = $obj->getVar($i); |
176 | 176 | } |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | $ret[$myrow[$this->keyName]] = $obj; |
182 | 182 | } else { |
183 | 183 | $row = []; |
184 | - $vars =& $obj->getVars(); |
|
184 | + $vars = & $obj->getVars(); |
|
185 | 185 | foreach (array_keys($vars) as $i) { |
186 | 186 | $row[$i] = $obj->getVar($i); |
187 | 187 | } |
@@ -214,15 +214,15 @@ discard block |
||
214 | 214 | $criteria->setSort($this->identifierName); |
215 | 215 | } |
216 | 216 | |
217 | - $sql = 'SELECT ' . $this->keyName; |
|
217 | + $sql = 'SELECT '.$this->keyName; |
|
218 | 218 | if (!empty($this->identifierName)) { |
219 | - $sql .= ', ' . $this->identifierName; |
|
219 | + $sql .= ', '.$this->identifierName; |
|
220 | 220 | } |
221 | - $sql .= ' FROM ' . $this->table; |
|
221 | + $sql .= ' FROM '.$this->table; |
|
222 | 222 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
223 | - $sql .= ' ' . $criteria->renderWhere(); |
|
223 | + $sql .= ' '.$criteria->renderWhere(); |
|
224 | 224 | if ('' != $criteria->getSort()) { |
225 | - $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder(); |
|
225 | + $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder(); |
|
226 | 226 | } |
227 | 227 | $limit = $criteria->getLimit(); |
228 | 228 | $start = $criteria->getStart(); |
@@ -255,12 +255,12 @@ discard block |
||
255 | 255 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
256 | 256 | if ('' != $criteria->groupby) { |
257 | 257 | $groupby = true; |
258 | - $field = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used |
|
258 | + $field = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used |
|
259 | 259 | } |
260 | 260 | } |
261 | - $sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table; |
|
261 | + $sql = 'SELECT '.$field.'COUNT(*) FROM '.$this->table; |
|
262 | 262 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
263 | - $sql .= ' ' . $criteria->renderWhere(); |
|
263 | + $sql .= ' '.$criteria->renderWhere(); |
|
264 | 264 | if ('' != $criteria->groupby) { |
265 | 265 | $sql .= $criteria->getGroupby(); |
266 | 266 | } |
@@ -296,13 +296,13 @@ discard block |
||
296 | 296 | if (is_array($this->keyName)) { |
297 | 297 | $clause = []; |
298 | 298 | for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) { |
299 | - $clause[] = $this->keyName[$i] . ' = ' . $id[$i]; |
|
299 | + $clause[] = $this->keyName[$i].' = '.$id[$i]; |
|
300 | 300 | } |
301 | 301 | $whereclause = implode(' AND ', $clause); |
302 | 302 | } else { |
303 | - $whereclause = $this->keyName . ' = ' . $id; |
|
303 | + $whereclause = $this->keyName.' = '.$id; |
|
304 | 304 | } |
305 | - $sql = 'DELETE FROM ' . $this->table . ' WHERE ' . $whereclause; |
|
305 | + $sql = 'DELETE FROM '.$this->table.' WHERE '.$whereclause; |
|
306 | 306 | if (false !== $force) { |
307 | 307 | $result = $this->db->queryF($sql); |
308 | 308 | } else { |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | } |
334 | 334 | |
335 | 335 | if (!($obj instanceof $this->className && class_exists($this->className))) { |
336 | - $obj->setErrors(get_class($obj) . ' Differs from ' . $this->className); |
|
336 | + $obj->setErrors(get_class($obj).' Differs from '.$this->className); |
|
337 | 337 | |
338 | 338 | return false; |
339 | 339 | } |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | |
345 | 345 | foreach ($obj->cleanVars as $k => $v) { |
346 | 346 | if (XOBJ_DTYPE_INT == $obj->vars[$k]['data_type']) { |
347 | - $cleanvars[$k] = (int)$v; |
|
347 | + $cleanvars[$k] = (int) $v; |
|
348 | 348 | } elseif (is_array($v)) { |
349 | 349 | $cleanvars[$k] = $this->db->quoteString(implode(',', $v)); |
350 | 350 | } else { |
@@ -354,12 +354,12 @@ discard block |
||
354 | 354 | if ($obj->isNew()) { |
355 | 355 | if (!is_array($this->keyName)) { |
356 | 356 | if ($cleanvars[$this->keyName] < 1) { |
357 | - $cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq'); |
|
357 | + $cleanvars[$this->keyName] = $this->db->genId($this->table.'_'.$this->keyName.'_seq'); |
|
358 | 358 | } |
359 | 359 | } |
360 | - $sql = 'INSERT INTO ' . $this->table . ' (' . implode(',', array_keys($cleanvars)) . ') VALUES (' . implode(',', array_values($cleanvars)) . ')'; |
|
360 | + $sql = 'INSERT INTO '.$this->table.' ('.implode(',', array_keys($cleanvars)).') VALUES ('.implode(',', array_values($cleanvars)).')'; |
|
361 | 361 | } else { |
362 | - $sql = 'UPDATE ' . $this->table . ' SET'; |
|
362 | + $sql = 'UPDATE '.$this->table.' SET'; |
|
363 | 363 | foreach ($cleanvars as $key => $value) { |
364 | 364 | if ((!is_array($this->keyName) && $key == $this->keyName) |
365 | 365 | || (is_array($this->keyName) |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | if (isset($notfirst)) { |
370 | 370 | $sql .= ','; |
371 | 371 | } |
372 | - $sql .= ' ' . $key . ' = ' . $value; |
|
372 | + $sql .= ' '.$key.' = '.$value; |
|
373 | 373 | $notfirst = true; |
374 | 374 | } |
375 | 375 | if (is_array($this->keyName)) { |
@@ -378,12 +378,12 @@ discard block |
||
378 | 378 | if ($i > 0) { |
379 | 379 | $whereclause .= ' AND '; |
380 | 380 | } |
381 | - $whereclause .= $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]); |
|
381 | + $whereclause .= $this->keyName[$i].' = '.$obj->getVar($this->keyName[$i]); |
|
382 | 382 | } |
383 | 383 | } else { |
384 | - $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName); |
|
384 | + $whereclause = $this->keyName.' = '.$obj->getVar($this->keyName); |
|
385 | 385 | } |
386 | - $sql .= ' WHERE ' . $whereclause; |
|
386 | + $sql .= ' WHERE '.$whereclause; |
|
387 | 387 | } |
388 | 388 | if (false !== $force) { |
389 | 389 | $result = $this->db->queryF($sql); |
@@ -412,7 +412,7 @@ discard block |
||
412 | 412 | */ |
413 | 413 | public function updateAll($fieldname, $fieldvalue, \CriteriaElement $criteria = null, $force = false) |
414 | 414 | { |
415 | - $setClause = $fieldname . ' = '; |
|
415 | + $setClause = $fieldname.' = '; |
|
416 | 416 | if (is_numeric($fieldvalue)) { |
417 | 417 | $setClause .= $fieldvalue; |
418 | 418 | } elseif (is_array($fieldvalue)) { |
@@ -420,9 +420,9 @@ discard block |
||
420 | 420 | } else { |
421 | 421 | $setClause .= $this->db->quoteString($fieldvalue); |
422 | 422 | } |
423 | - $sql = 'UPDATE ' . $this->table . ' SET ' . $setClause; |
|
423 | + $sql = 'UPDATE '.$this->table.' SET '.$setClause; |
|
424 | 424 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
425 | - $sql .= ' ' . $criteria->renderWhere(); |
|
425 | + $sql .= ' '.$criteria->renderWhere(); |
|
426 | 426 | } |
427 | 427 | if (false !== $force) { |
428 | 428 | $result = $this->db->queryF($sql); |
@@ -446,9 +446,9 @@ discard block |
||
446 | 446 | */ |
447 | 447 | public function updateFieldValue($fieldname, $fieldvalue, $criteria = null, $force = true) |
448 | 448 | { |
449 | - $sql = 'UPDATE ' . $this->table . ' SET ' . $fieldname . ' = ' . $fieldvalue; |
|
449 | + $sql = 'UPDATE '.$this->table.' SET '.$fieldname.' = '.$fieldvalue; |
|
450 | 450 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
451 | - $sql .= ' ' . $criteria->renderWhere(); |
|
451 | + $sql .= ' '.$criteria->renderWhere(); |
|
452 | 452 | } |
453 | 453 | if (false !== $force) { |
454 | 454 | $result = $this->db->queryF($sql); |
@@ -475,8 +475,8 @@ discard block |
||
475 | 475 | public function deleteAll(\CriteriaElement $criteria = null, $force = true, $asObject = false) |
476 | 476 | { |
477 | 477 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
478 | - $sql = 'DELETE FROM ' . $this->table; |
|
479 | - $sql .= ' ' . $criteria->renderWhere(); |
|
478 | + $sql = 'DELETE FROM '.$this->table; |
|
479 | + $sql .= ' '.$criteria->renderWhere(); |
|
480 | 480 | if (!$this->db->query($sql)) { |
481 | 481 | return false; |
482 | 482 | } |
@@ -610,8 +610,8 @@ discard block |
||
610 | 610 | */ |
611 | 611 | public function updateCounter($fieldname, $criteria, $op = '+') |
612 | 612 | { |
613 | - $sql = 'UPDATE ' . $this->table . ' SET ' . $fieldname . ' = ' . $fieldname . $op . '1'; |
|
614 | - $sql .= ' ' . $criteria->renderWhere(); |
|
613 | + $sql = 'UPDATE '.$this->table.' SET '.$fieldname.' = '.$fieldname.$op.'1'; |
|
614 | + $sql .= ' '.$criteria->renderWhere(); |
|
615 | 615 | $result = $this->db->queryF($sql); |
616 | 616 | if (!$result) { |
617 | 617 | return false; |
@@ -633,12 +633,12 @@ discard block |
||
633 | 633 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
634 | 634 | if ('' != $criteria->groupby) { |
635 | 635 | $groupby = true; |
636 | - $field = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used |
|
636 | + $field = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used |
|
637 | 637 | } |
638 | 638 | } |
639 | - $sql = 'SELECT ' . $field . "SUM($sum) FROM " . $this->table; |
|
639 | + $sql = 'SELECT '.$field."SUM($sum) FROM ".$this->table; |
|
640 | 640 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
641 | - $sql .= ' ' . $criteria->renderWhere(); |
|
641 | + $sql .= ' '.$criteria->renderWhere(); |
|
642 | 642 | if ('' != $criteria->groupby) { |
643 | 643 | $sql .= $criteria->getGroupby(); |
644 | 644 | } |
@@ -674,12 +674,12 @@ discard block |
||
674 | 674 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
675 | 675 | if ('' != $criteria->groupby) { |
676 | 676 | $groupby = true; |
677 | - $field = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used |
|
677 | + $field = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used |
|
678 | 678 | } |
679 | 679 | } |
680 | - $sql = 'SELECT ' . $field . "MAX($max) FROM " . $this->table; |
|
680 | + $sql = 'SELECT '.$field."MAX($max) FROM ".$this->table; |
|
681 | 681 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
682 | - $sql .= ' ' . $criteria->renderWhere(); |
|
682 | + $sql .= ' '.$criteria->renderWhere(); |
|
683 | 683 | if ('' != $criteria->groupby) { |
684 | 684 | $sql .= $criteria->getGroupby(); |
685 | 685 | } |
@@ -712,9 +712,9 @@ discard block |
||
712 | 712 | { |
713 | 713 | $field = ''; |
714 | 714 | |
715 | - $sql = 'SELECT ' . $field . "AVG($avg) FROM " . $this->table; |
|
715 | + $sql = 'SELECT '.$field."AVG($avg) FROM ".$this->table; |
|
716 | 716 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
717 | - $sql .= ' ' . $criteria->renderWhere(); |
|
717 | + $sql .= ' '.$criteria->renderWhere(); |
|
718 | 718 | } |
719 | 719 | $result = $this->db->query($sql); |
720 | 720 | if (!$result) { |
@@ -71,12 +71,12 @@ |
||
71 | 71 | $eventMember = $this->getObjects(new \Criteria('event_id', $eventId)); |
72 | 72 | $count = count($eventMember); |
73 | 73 | if ($count > 0) { |
74 | - $in = '(' . $eventMember[0]->getVar('uid'); |
|
74 | + $in = '('.$eventMember[0]->getVar('uid'); |
|
75 | 75 | array_shift($eventMember); |
76 | 76 | foreach ($eventMember as $member) { |
77 | - $in .= ',' . $member->getVar('uid'); |
|
77 | + $in .= ','.$member->getVar('uid'); |
|
78 | 78 | } |
79 | - $in .= ')'; |
|
79 | + $in .= ')'; |
|
80 | 80 | $criteria = new \Criteria('uid', $in, 'IN'); |
81 | 81 | } else { |
82 | 82 | $criteria = new \Criteria('uid', '(0)', 'IN'); |
@@ -186,10 +186,10 @@ |
||
186 | 186 | $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view'); |
187 | 187 | $count = count($authorizedAccessCats); |
188 | 188 | if ($count > 0) { |
189 | - $in = '(' . $authorizedAccessCats[0]; |
|
189 | + $in = '('.$authorizedAccessCats[0]; |
|
190 | 190 | array_shift($authorizedAccessCats); |
191 | 191 | foreach ($authorizedAccessCats as $authorizedAccessCat) { |
192 | - $in .= ',' . $authorizedAccessCat; |
|
192 | + $in .= ','.$authorizedAccessCat; |
|
193 | 193 | } |
194 | 194 | $in .= ')'; |
195 | 195 | $criteria->add(new \Criteria('cat_id', $in, 'IN')); |
@@ -151,11 +151,11 @@ |
||
151 | 151 | $cat_color = $catList->getVar('cat_color'); |
152 | 152 | $checked = in_array($cat_id, $cat) ? 'checked' : ''; |
153 | 153 | $cat = '' |
154 | - . "<div style='float:left; margin-left:5px;'>" |
|
155 | - . "<input type='checkbox' name='{$name}[{$cat_id}]' value='1' {$checked}>" |
|
156 | - . "<div style='absolute:left;height:12px; width:6px; background-color:#{$cat_color}; border:1px solid black; float:left; margin-right:5px;' ></div>" |
|
157 | - . " {$name}" |
|
158 | - . '</div>'; |
|
154 | + . "<div style='float:left; margin-left:5px;'>" |
|
155 | + . "<input type='checkbox' name='{$name}[{$cat_id}]' value='1' {$checked}>" |
|
156 | + . "<div style='absolute:left;height:12px; width:6px; background-color:#{$cat_color}; border:1px solid black; float:left; margin-right:5px;' ></div>" |
|
157 | + . " {$name}" |
|
158 | + . '</div>'; |
|
159 | 159 | |
160 | 160 | $t[] = $cat; |
161 | 161 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | * L'utilisation de ce formulaire d'adminitration suppose |
17 | 17 | * que la classe correspondante de la table a été générées avec classGenerator |
18 | 18 | **/ |
19 | -require_once XOOPS_ROOT_PATH . '/class/uploader.php'; |
|
19 | +require_once XOOPS_ROOT_PATH.'/class/uploader.php'; |
|
20 | 20 | |
21 | 21 | use XoopsModules\Extcal; |
22 | 22 | use XoopsModules\Extcal\Common; |
@@ -60,12 +60,12 @@ discard block |
||
60 | 60 | public static function loadImg(&$REQUEST, &$event_picture1, &$event_picture2) |
61 | 61 | { |
62 | 62 | /////////////////////////////////////////////////////////////////////////////// |
63 | - $uploaddir_event = XOOPS_ROOT_PATH . '/uploads/extcal/'; |
|
64 | - $uploadurl_event = XOOPS_URL . '/uploads/extcal/'; |
|
63 | + $uploaddir_event = XOOPS_ROOT_PATH.'/uploads/extcal/'; |
|
64 | + $uploadurl_event = XOOPS_URL.'/uploads/extcal/'; |
|
65 | 65 | //$picture = ''; |
66 | 66 | for ($j = 1; $j < 3; ++$j) { |
67 | - $delimg = @$REQUEST['delimg_' . $j . '']; |
|
68 | - $delimg = isset($delimg) ? (int)$delimg : 0; |
|
67 | + $delimg = @$REQUEST['delimg_'.$j.'']; |
|
68 | + $delimg = isset($delimg) ? (int) $delimg : 0; |
|
69 | 69 | if (0 == $delimg && !empty($REQUEST['xoops_upload_file'][$j])) { |
70 | 70 | $upload = new \XoopsMediaUploader($uploaddir_event, [ |
71 | 71 | 'image/gif', |
@@ -88,15 +88,15 @@ discard block |
||
88 | 88 | $event_picture2 = $upload->getSavedFileName(); |
89 | 89 | } |
90 | 90 | } |
91 | - } elseif (!empty($REQUEST['file' . $j])) { |
|
91 | + } elseif (!empty($REQUEST['file'.$j])) { |
|
92 | 92 | if (1 == $j) { |
93 | - $event_picture1 = $REQUEST['file' . $j]; |
|
93 | + $event_picture1 = $REQUEST['file'.$j]; |
|
94 | 94 | } elseif (2 == $j) { |
95 | - $event_picture2 = $REQUEST['file' . $j]; |
|
95 | + $event_picture2 = $REQUEST['file'.$j]; |
|
96 | 96 | } |
97 | 97 | } |
98 | 98 | } else { |
99 | - $url_event = XOOPS_ROOT_PATH . '/uploads/extcal/' . $REQUEST['file' . $j]; |
|
99 | + $url_event = XOOPS_ROOT_PATH.'/uploads/extcal/'.$REQUEST['file'.$j]; |
|
100 | 100 | if (1 == $j) { |
101 | 101 | $event_picture1 = ''; |
102 | 102 | } elseif (2 == $j) { |
@@ -192,17 +192,17 @@ discard block |
||
192 | 192 | $select->addOption('', ''); |
193 | 193 | } |
194 | 194 | |
195 | - $select->addOption('year ASC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
196 | - $select->addOption('year DESC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
195 | + $select->addOption('year ASC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
196 | + $select->addOption('year DESC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
197 | 197 | |
198 | - $select->addOption('month ASC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
199 | - $select->addOption('month DESC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
198 | + $select->addOption('month ASC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
199 | + $select->addOption('month DESC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
200 | 200 | |
201 | - $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
202 | - $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
201 | + $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
202 | + $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
203 | 203 | |
204 | - $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
205 | - $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
204 | + $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
205 | + $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
206 | 206 | |
207 | 207 | return $select; |
208 | 208 | } |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | public static function echoDateArray($period) |
317 | 317 | { |
318 | 318 | foreach ($period as $dt) { |
319 | - echo $dt->format("l Y-m-d H:i:s\n") . '<br>'; |
|
319 | + echo $dt->format("l Y-m-d H:i:s\n").'<br>'; |
|
320 | 320 | } |
321 | 321 | } |
322 | 322 | |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | } |
333 | 333 | |
334 | 334 | $txt = print_r($t, true); |
335 | - echo '<pre>Number of items: ' . count($t) . "<br>{$txt}</pre>"; |
|
335 | + echo '<pre>Number of items: '.count($t)."<br>{$txt}</pre>"; |
|
336 | 336 | } |
337 | 337 | |
338 | 338 | /*****************************************************************/ |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | if ('' != $msg) { |
346 | 346 | echo "<hr>{$msg}<hr>"; |
347 | 347 | } |
348 | - echo $line . '<br>'; |
|
348 | + echo $line.'<br>'; |
|
349 | 349 | } |
350 | 350 | |
351 | 351 | /*****************************************************************/ |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | echo "<hr>{$msg}<hr>"; |
373 | 373 | } |
374 | 374 | |
375 | - echo 'date --->' . $tsName . ' = ' . $ts . ' - ' . date('d-m-Y H:m:s', $ts) . '<br>'; |
|
375 | + echo 'date --->'.$tsName.' = '.$ts.' - '.date('d-m-Y H:m:s', $ts).'<br>'; |
|
376 | 376 | } |
377 | 377 | |
378 | 378 | /*****************************************************************/ |
@@ -35,33 +35,33 @@ |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | switch (@$_GET['view']) { |
38 | - default: |
|
39 | - $_GET['view'] = 'calendar_year'; |
|
40 | - // no break |
|
41 | - case 'calendar_year': |
|
42 | - require_once CALENDAR_ROOT . 'Year.php'; |
|
43 | - $c = new Calendar_Year($_GET['y']); |
|
44 | - break; |
|
45 | - case 'calendar_month': |
|
46 | - require_once CALENDAR_ROOT . 'Month.php'; |
|
47 | - $c = new Calendar_Month($_GET['y'], $_GET['m']); |
|
48 | - break; |
|
49 | - case 'calendar_day': |
|
50 | - require_once CALENDAR_ROOT . 'Day.php'; |
|
51 | - $c = new Calendar_Day($_GET['y'], $_GET['m'], $_GET['d']); |
|
52 | - break; |
|
53 | - case 'calendar_hour': |
|
54 | - require_once CALENDAR_ROOT . 'Hour.php'; |
|
55 | - $c = new Calendar_Hour($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h']); |
|
56 | - break; |
|
57 | - case 'calendar_minute': |
|
58 | - require_once CALENDAR_ROOT . 'Minute.php'; |
|
59 | - $c = new Calendar_Minute($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i']); |
|
60 | - break; |
|
61 | - case 'calendar_second': |
|
62 | - require_once CALENDAR_ROOT . 'Second.php'; |
|
63 | - $c = new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']); |
|
64 | - break; |
|
38 | + default: |
|
39 | + $_GET['view'] = 'calendar_year'; |
|
40 | + // no break |
|
41 | + case 'calendar_year': |
|
42 | + require_once CALENDAR_ROOT . 'Year.php'; |
|
43 | + $c = new Calendar_Year($_GET['y']); |
|
44 | + break; |
|
45 | + case 'calendar_month': |
|
46 | + require_once CALENDAR_ROOT . 'Month.php'; |
|
47 | + $c = new Calendar_Month($_GET['y'], $_GET['m']); |
|
48 | + break; |
|
49 | + case 'calendar_day': |
|
50 | + require_once CALENDAR_ROOT . 'Day.php'; |
|
51 | + $c = new Calendar_Day($_GET['y'], $_GET['m'], $_GET['d']); |
|
52 | + break; |
|
53 | + case 'calendar_hour': |
|
54 | + require_once CALENDAR_ROOT . 'Hour.php'; |
|
55 | + $c = new Calendar_Hour($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h']); |
|
56 | + break; |
|
57 | + case 'calendar_minute': |
|
58 | + require_once CALENDAR_ROOT . 'Minute.php'; |
|
59 | + $c = new Calendar_Minute($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i']); |
|
60 | + break; |
|
61 | + case 'calendar_second': |
|
62 | + require_once CALENDAR_ROOT . 'Second.php'; |
|
63 | + $c = new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']); |
|
64 | + break; |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | echo 'Viewing: ' . @$_GET['view'] . '<br>'; |
@@ -8,10 +8,10 @@ discard block |
||
8 | 8 | { |
9 | 9 | list($usec, $sec) = explode(' ', microtime()); |
10 | 10 | |
11 | - return (float)$usec + (float)$sec; |
|
11 | + return (float) $usec + (float) $sec; |
|
12 | 12 | } |
13 | 13 | |
14 | -if (!@require_once __DIR__ . '/Calendar/Calendar.php') { |
|
14 | +if (!@require_once __DIR__.'/Calendar/Calendar.php') { |
|
15 | 15 | define('CALENDAR_ROOT', '../../'); |
16 | 16 | } |
17 | 17 | |
@@ -39,33 +39,33 @@ discard block |
||
39 | 39 | $_GET['view'] = 'calendar_year'; |
40 | 40 | // no break |
41 | 41 | case 'calendar_year': |
42 | - require_once CALENDAR_ROOT . 'Year.php'; |
|
42 | + require_once CALENDAR_ROOT.'Year.php'; |
|
43 | 43 | $c = new Calendar_Year($_GET['y']); |
44 | 44 | break; |
45 | 45 | case 'calendar_month': |
46 | - require_once CALENDAR_ROOT . 'Month.php'; |
|
46 | + require_once CALENDAR_ROOT.'Month.php'; |
|
47 | 47 | $c = new Calendar_Month($_GET['y'], $_GET['m']); |
48 | 48 | break; |
49 | 49 | case 'calendar_day': |
50 | - require_once CALENDAR_ROOT . 'Day.php'; |
|
50 | + require_once CALENDAR_ROOT.'Day.php'; |
|
51 | 51 | $c = new Calendar_Day($_GET['y'], $_GET['m'], $_GET['d']); |
52 | 52 | break; |
53 | 53 | case 'calendar_hour': |
54 | - require_once CALENDAR_ROOT . 'Hour.php'; |
|
54 | + require_once CALENDAR_ROOT.'Hour.php'; |
|
55 | 55 | $c = new Calendar_Hour($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h']); |
56 | 56 | break; |
57 | 57 | case 'calendar_minute': |
58 | - require_once CALENDAR_ROOT . 'Minute.php'; |
|
58 | + require_once CALENDAR_ROOT.'Minute.php'; |
|
59 | 59 | $c = new Calendar_Minute($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i']); |
60 | 60 | break; |
61 | 61 | case 'calendar_second': |
62 | - require_once CALENDAR_ROOT . 'Second.php'; |
|
62 | + require_once CALENDAR_ROOT.'Second.php'; |
|
63 | 63 | $c = new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']); |
64 | 64 | break; |
65 | 65 | } |
66 | 66 | |
67 | -echo 'Viewing: ' . @$_GET['view'] . '<br>'; |
|
68 | -echo 'The time is now: ' . date('Y M d H:i:s', $c->getTimestamp()) . '<br >'; |
|
67 | +echo 'Viewing: '.@$_GET['view'].'<br>'; |
|
68 | +echo 'The time is now: '.date('Y M d H:i:s', $c->getTimestamp()).'<br >'; |
|
69 | 69 | |
70 | 70 | $i = 1; |
71 | 71 | echo '<h1>First Iteration</h1>'; |
@@ -75,15 +75,15 @@ discard block |
||
75 | 75 | $c->build(); |
76 | 76 | while ($e = $c->fetch()) { |
77 | 77 | $class = strtolower(get_class($e)); |
78 | - $link = '&y=' . $e->thisYear() . '&m=' . $e->thisMonth() . '&d=' . $e->thisDay() . '&h=' . $e->thisHour() . '&i=' . $e->thisMinute() . '&s=' . $e->thisSecond(); |
|
79 | - $method = 'this' . str_replace('calendar_', '', $class); |
|
80 | - echo '<a href="' . $_SERVER['PHP_SELF'] . '?view=' . $class . $link . '">' . $e->{$method}() . '</a> : '; |
|
78 | + $link = '&y='.$e->thisYear().'&m='.$e->thisMonth().'&d='.$e->thisDay().'&h='.$e->thisHour().'&i='.$e->thisMinute().'&s='.$e->thisSecond(); |
|
79 | + $method = 'this'.str_replace('calendar_', '', $class); |
|
80 | + echo '<a href="'.$_SERVER['PHP_SELF'].'?view='.$class.$link.'">'.$e->{$method}().'</a> : '; |
|
81 | 81 | if (0 == ($i % 10)) { |
82 | 82 | echo '<br>'; |
83 | 83 | } |
84 | 84 | ++$i; |
85 | 85 | } |
86 | -echo '<p><b>Took: ' . (getmicrotime() - $start) . ' seconds</b></p>'; |
|
86 | +echo '<p><b>Took: '.(getmicrotime() - $start).' seconds</b></p>'; |
|
87 | 87 | |
88 | 88 | $i = 1; |
89 | 89 | echo '<h1>Second Iteration</h1>'; |
@@ -92,12 +92,12 @@ discard block |
||
92 | 92 | $start = getmicrotime(); |
93 | 93 | while ($e = $c->fetch()) { |
94 | 94 | $class = strtolower(get_class($e)); |
95 | - $link = '&y=' . $e->thisYear() . '&m=' . $e->thisMonth() . '&d=' . $e->thisDay() . '&h=' . $e->thisHour() . '&i=' . $e->thisMinute() . '&s=' . $e->thisSecond(); |
|
96 | - $method = 'this' . str_replace('calendar_', '', $class); |
|
97 | - echo '<a href="' . $_SERVER['PHP_SELF'] . '?view=' . $class . $link . '">' . $e->{$method}() . '</a> : '; |
|
95 | + $link = '&y='.$e->thisYear().'&m='.$e->thisMonth().'&d='.$e->thisDay().'&h='.$e->thisHour().'&i='.$e->thisMinute().'&s='.$e->thisSecond(); |
|
96 | + $method = 'this'.str_replace('calendar_', '', $class); |
|
97 | + echo '<a href="'.$_SERVER['PHP_SELF'].'?view='.$class.$link.'">'.$e->{$method}().'</a> : '; |
|
98 | 98 | if (0 == ($i % 10)) { |
99 | 99 | echo '<br>'; |
100 | 100 | } |
101 | 101 | ++$i; |
102 | 102 | } |
103 | -echo '<p><b>Took: ' . (getmicrotime() - $start) . ' seconds</b></p>'; |
|
103 | +echo '<p><b>Took: '.(getmicrotime() - $start).' seconds</b></p>'; |