@@ -155,11 +155,11 @@ discard block |
||
155 | 155 | * |
156 | 156 | */ |
157 | 157 | function XoopsFormSpin($caption, $name, $value = 0, |
158 | - $min = 0, $max=100, |
|
159 | - $smallIncrement = 1, $largeIncrement = 10, |
|
160 | - $size = 5, $unite='', $imgFolder='default', |
|
161 | - $styleText = '', $styleBordure = '', |
|
162 | - $minMaxVisible = true) |
|
158 | + $min = 0, $max=100, |
|
159 | + $smallIncrement = 1, $largeIncrement = 10, |
|
160 | + $size = 5, $unite='', $imgFolder='default', |
|
161 | + $styleText = '', $styleBordure = '', |
|
162 | + $minMaxVisible = true) |
|
163 | 163 | { |
164 | 164 | $this->setName($name); |
165 | 165 | $this->setCaption($caption); |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | */ |
193 | 193 | function setValue($value) |
194 | 194 | { |
195 | - $this->_value = $value; |
|
195 | + $this->_value = $value; |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | /*-----------------------------------------------------------------*/ |
@@ -392,83 +392,83 @@ discard block |
||
392 | 392 | */ |
393 | 393 | function render() |
394 | 394 | { |
395 | - $sSpinFolder = $this->getFolder(); |
|
396 | - $sFolderImg = "{$sSpinFolder}/images/{$this->getImgFolder()}/"; |
|
395 | + $sSpinFolder = $this->getFolder(); |
|
396 | + $sFolderImg = "{$sSpinFolder}/images/{$this->getImgFolder()}/"; |
|
397 | 397 | |
398 | 398 | |
399 | - $prefixe = $this->getName(); |
|
400 | - $prefixe2 = 'spin'.$prefixe; |
|
399 | + $prefixe = $this->getName(); |
|
400 | + $prefixe2 = 'spin'.$prefixe; |
|
401 | 401 | |
402 | - $smallIncrement = $this->getSmallIncrement(); |
|
403 | - $largeIncrement = $this->getLargeIncrement(); |
|
402 | + $smallIncrement = $this->getSmallIncrement(); |
|
403 | + $largeIncrement = $this->getLargeIncrement(); |
|
404 | 404 | |
405 | - /*----------------------------------------------*/ |
|
406 | - $delai = 200; |
|
407 | - $onMouseDown1 = "spinStart(\"{$prefixe}\", \"{$prefixe2}\", {$smallIncrement}, {$largeIncrement}, {$delai}, \"{$sFolderImg}spinUp1.gif\");"; |
|
408 | - $onMouseDown2 = "spinStart(\"{$prefixe}\", \"{$prefixe2}\", -{$smallIncrement}, -{$largeIncrement}, {$delai}, \"{$sFolderImg}spinDown1.gif\");"; |
|
409 | - |
|
410 | - $onMouseUp = "spinStop();"; |
|
411 | - //---------------------------------------------------------------- |
|
412 | - $styleBordure = $this->htmlAddAttribut ('style', $this->getStyleBordure()); |
|
413 | - $styleText = $this->htmlAddAttribut ('style', $this->getStyleText()); |
|
414 | - $styleArrow = "style=\"display: table-cell;vertical-align: middle; text-align: center; line-height: 100%; font-size: 7 pt; margin-top: 0; margin-bottom: 0; padding: 0\""; |
|
415 | - //---------------------------------------------------------------- |
|
416 | - $t = array(); |
|
405 | + /*----------------------------------------------*/ |
|
406 | + $delai = 200; |
|
407 | + $onMouseDown1 = "spinStart(\"{$prefixe}\", \"{$prefixe2}\", {$smallIncrement}, {$largeIncrement}, {$delai}, \"{$sFolderImg}spinUp1.gif\");"; |
|
408 | + $onMouseDown2 = "spinStart(\"{$prefixe}\", \"{$prefixe2}\", -{$smallIncrement}, -{$largeIncrement}, {$delai}, \"{$sFolderImg}spinDown1.gif\");"; |
|
409 | + |
|
410 | + $onMouseUp = "spinStop();"; |
|
411 | + //---------------------------------------------------------------- |
|
412 | + $styleBordure = $this->htmlAddAttribut ('style', $this->getStyleBordure()); |
|
413 | + $styleText = $this->htmlAddAttribut ('style', $this->getStyleText()); |
|
414 | + $styleArrow = "style=\"display: table-cell;vertical-align: middle; text-align: center; line-height: 100%; font-size: 7 pt; margin-top: 0; margin-bottom: 0; padding: 0\""; |
|
415 | + //---------------------------------------------------------------- |
|
416 | + $t = array(); |
|
417 | 417 | |
418 | 418 | |
419 | - if ($this->_loadJS) { |
|
419 | + if ($this->_loadJS) { |
|
420 | 420 | $js = $sSpinFolder . "/js/spin.js"; |
421 | 421 | $t[] = "<script src='{$js}' type='text/javascript'></script>"; |
422 | - } |
|
422 | + } |
|
423 | 423 | |
424 | - $t[] = "<div STYLE='width:50px'>"; |
|
425 | - //$t[] = "<table border='0' width='8%' cellpadding='0' cellspacing='0'>"; |
|
426 | - $t[] = "<table border='0' width='8%' cellpadding='0' cellspacing='0' {$styleBordure}>"; |
|
427 | - $t[] = " <tr>"; |
|
428 | - //$t[] = " <td width='60%'>{$Caption}</td>"; |
|
429 | - $t[] = " <td width='60%'>"; |
|
430 | - $t[] = " <INPUT TYPE='hidden' NAME='{$prefixe2}_min' VALUE='{$this->getMin()}'>"; |
|
431 | - $t[] = " <INPUT TYPE='hidden' NAME='{$prefixe2}_max' VALUE='{$this->getMax()}'>"; |
|
432 | - $t[] = " <INPUT TYPE='hidden' NAME='{$prefixe2}_smallIncrement' VALUE='{$this->_smallIncrement}' style='text-align: right'>"; |
|
433 | - $t[] = " <input type='text' name='{$prefixe}' size='{$this->GetSize()}' value='{$this->getValue()}' {$styleText}>"; |
|
434 | - $t[] = " </td>"; |
|
424 | + $t[] = "<div STYLE='width:50px'>"; |
|
425 | + //$t[] = "<table border='0' width='8%' cellpadding='0' cellspacing='0'>"; |
|
426 | + $t[] = "<table border='0' width='8%' cellpadding='0' cellspacing='0' {$styleBordure}>"; |
|
427 | + $t[] = " <tr>"; |
|
428 | + //$t[] = " <td width='60%'>{$Caption}</td>"; |
|
429 | + $t[] = " <td width='60%'>"; |
|
430 | + $t[] = " <INPUT TYPE='hidden' NAME='{$prefixe2}_min' VALUE='{$this->getMin()}'>"; |
|
431 | + $t[] = " <INPUT TYPE='hidden' NAME='{$prefixe2}_max' VALUE='{$this->getMax()}'>"; |
|
432 | + $t[] = " <INPUT TYPE='hidden' NAME='{$prefixe2}_smallIncrement' VALUE='{$this->_smallIncrement}' style='text-align: right'>"; |
|
433 | + $t[] = " <input type='text' name='{$prefixe}' size='{$this->GetSize()}' value='{$this->getValue()}' {$styleText}>"; |
|
434 | + $t[] = " </td>"; |
|
435 | 435 | |
436 | - $unite = $this->getUnite(); |
|
437 | - if ($unite <> ''){ |
|
436 | + $unite = $this->getUnite(); |
|
437 | + if ($unite <> ''){ |
|
438 | 438 | $t[] = " <td style='display: table-cell;vertical-align: middle; '> {$unite} </td>"; |
439 | - } |
|
440 | - //------------------------------------------------------- |
|
441 | - if ($this->getMinMaxVisible()){ |
|
439 | + } |
|
440 | + //------------------------------------------------------- |
|
441 | + if ($this->getMinMaxVisible()){ |
|
442 | 442 | $onMouseDownMin = "spinSetValue(\"{$prefixe}\", \"{$prefixe2}\", \"Min\", {$this->getMin()}, {$delai}, \"{$sFolderImg}spinMin1.gif\");"; |
443 | 443 | $t[] = " <td width='63%' align='center' {$styleArrow}>"; |
444 | 444 | $t[] = " <img border='0' name='{$prefixe2}_imgMin' src='{$sFolderImg}spinMin0.gif' onmousedown='{$onMouseDownMin}'><br>"; |
445 | 445 | $t[] = " </td>"; |
446 | - } |
|
447 | - //------------------------------------------------------- |
|
448 | - $t[] = " <td width='63%' align='center' {$styleArrow}>"; |
|
446 | + } |
|
447 | + //------------------------------------------------------- |
|
448 | + $t[] = " <td width='63%' align='center' {$styleArrow}>"; |
|
449 | 449 | |
450 | - $t[] = " <img border='0' name='{$prefixe2}_img0' src='{$sFolderImg}spinUp0.gif' onmousedown='{$onMouseDown1}' onmouseup='{$onMouseUp}' onmouseout='{$onMouseUp}'><br>"; |
|
451 | - $t[] = " <img border='0' name='{$prefixe2}_img1' src='{$sFolderImg}spinDown0.gif' onmousedown='{$onMouseDown2}' onmouseup='{$onMouseUp}' onmouseout='{$onMouseUp}'>"; |
|
450 | + $t[] = " <img border='0' name='{$prefixe2}_img0' src='{$sFolderImg}spinUp0.gif' onmousedown='{$onMouseDown1}' onmouseup='{$onMouseUp}' onmouseout='{$onMouseUp}'><br>"; |
|
451 | + $t[] = " <img border='0' name='{$prefixe2}_img1' src='{$sFolderImg}spinDown0.gif' onmousedown='{$onMouseDown2}' onmouseup='{$onMouseUp}' onmouseout='{$onMouseUp}'>"; |
|
452 | 452 | |
453 | - $t[] = " </td>"; |
|
453 | + $t[] = " </td>"; |
|
454 | 454 | |
455 | - //------------------------------------------------------- |
|
456 | - if ($this->getMinMaxVisible()){ |
|
455 | + //------------------------------------------------------- |
|
456 | + if ($this->getMinMaxVisible()){ |
|
457 | 457 | $onMouseDownMax = "spinSetValue(\"{$prefixe}\", \"{$prefixe2}\", \"Max\", {$this->getMax()}, {$delai}, \"{$sFolderImg}spinMax1.gif\");"; |
458 | 458 | $t[] = " <td width='63%' align='center' {$styleArrow}>"; |
459 | 459 | $t[] = " <img border='0' name='{$prefixe2}_imgMax' src='{$sFolderImg}spinMax0.gif' onmousedown='{$onMouseDownMax}'><br>"; |
460 | 460 | $t[] = " </td>"; |
461 | - } |
|
462 | - //------------------------------------------------------- |
|
461 | + } |
|
462 | + //------------------------------------------------------- |
|
463 | 463 | |
464 | 464 | |
465 | - $t[] = " </tr>"; |
|
466 | - $t[] = "</table>"."\n"; |
|
467 | - $t[] = "</div>"; |
|
468 | - //------------------------------------------- |
|
469 | - $html = implode ("\n", $t); |
|
465 | + $t[] = " </tr>"; |
|
466 | + $t[] = "</table>"."\n"; |
|
467 | + $t[] = "</div>"; |
|
468 | + //------------------------------------------- |
|
469 | + $html = implode ("\n", $t); |
|
470 | 470 | |
471 | - return $html; |
|
471 | + return $html; |
|
472 | 472 | |
473 | 473 | } |
474 | 474 | |
@@ -487,17 +487,17 @@ discard block |
||
487 | 487 | *********************************************************************/ |
488 | 488 | function htmlAddAttribut($attribut, $value, $default = ''){ |
489 | 489 | |
490 | - if ($value == ''){$value = $default;} |
|
490 | + if ($value == ''){$value = $default;} |
|
491 | 491 | |
492 | - if ($value <> ""){ |
|
492 | + if ($value <> ""){ |
|
493 | 493 | if (substr($value,0,strlen($attribut)) <> $attribut){ |
494 | - $r ="{$attribut}=\"{$value}\""; |
|
494 | + $r ="{$attribut}=\"{$value}\""; |
|
495 | 495 | } |
496 | - }else{ |
|
496 | + }else{ |
|
497 | 497 | $r = ''; |
498 | - } |
|
498 | + } |
|
499 | 499 | |
500 | - return $r; |
|
500 | + return $r; |
|
501 | 501 | |
502 | 502 | } |
503 | 503 |
@@ -30,21 +30,21 @@ |
||
30 | 30 | { |
31 | 31 | global $xoopsDB; |
32 | 32 | |
33 | - $this->alterTable_etablissement(); |
|
33 | + $this->alterTable_etablissement(); |
|
34 | 34 | |
35 | 35 | } |
36 | 36 | //---------------------------------------------------- |
37 | 37 | function alterTable_etablissement() |
38 | 38 | { |
39 | 39 | global $xoopsDB; |
40 | - $tbl = $xoopsDB->prefix('extcal_etablissement'); |
|
40 | + $tbl = $xoopsDB->prefix('extcal_etablissement'); |
|
41 | 41 | |
42 | 42 | $sql = <<<__sql__ |
43 | 43 | ALTER TABLE `{$tbl}` |
44 | 44 | CHANGE `desc` `description` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; |
45 | 45 | __sql__; |
46 | 46 | |
47 | - $xoopsDB->queryF($sql); |
|
47 | + $xoopsDB->queryF($sql); |
|
48 | 48 | //echo "<hr>{$sql}<hr>"; |
49 | 49 | } |
50 | 50 | //---------------------------------------------------- |
@@ -30,8 +30,8 @@ discard block |
||
30 | 30 | { |
31 | 31 | global $xoopsDB; |
32 | 32 | |
33 | - $this->addTable_etablissement(); |
|
34 | - $this->alterTable_event(); |
|
33 | + $this->addTable_etablissement(); |
|
34 | + $this->alterTable_event(); |
|
35 | 35 | |
36 | 36 | } |
37 | 37 | //---------------------------------------------------- |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | { |
40 | 40 | global $xoopsDB; |
41 | 41 | |
42 | - $tbl = $xoopsDB->prefix('extcal_event'); |
|
42 | + $tbl = $xoopsDB->prefix('extcal_event'); |
|
43 | 43 | |
44 | 44 | $sql = <<<__sql__ |
45 | 45 | ALTER TABLE `{$tbl}` |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | add `event_etablissement` int(5) NOT NULL DEFAULT '1'; |
51 | 51 | __sql__; |
52 | 52 | |
53 | - $xoopsDB->queryF($sql); |
|
53 | + $xoopsDB->queryF($sql); |
|
54 | 54 | |
55 | 55 | } |
56 | 56 | |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | { |
60 | 60 | global $xoopsDB; |
61 | 61 | |
62 | - $tbl = $xoopsDB->prefix('extcal_etablissement'); |
|
62 | + $tbl = $xoopsDB->prefix('extcal_etablissement'); |
|
63 | 63 | |
64 | 64 | $sql = <<<__sql__ |
65 | 65 | CREATE TABLE `{$tbl}` ( |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | ) ENGINE = MYISAM ; |
86 | 86 | __sql__; |
87 | 87 | |
88 | - $xoopsDB->queryF($sql); |
|
88 | + $xoopsDB->queryF($sql); |
|
89 | 89 | //--------------------------------------------------- |
90 | 90 | |
91 | 91 | } |
@@ -30,21 +30,21 @@ |
||
30 | 30 | { |
31 | 31 | global $xoopsDB; |
32 | 32 | |
33 | - $this->alterTable_event(); |
|
33 | + $this->alterTable_event(); |
|
34 | 34 | |
35 | 35 | } |
36 | 36 | //---------------------------------------------------- |
37 | 37 | function alterTable_event() |
38 | 38 | { |
39 | 39 | global $xoopsDB; |
40 | - $tbl = $xoopsDB->prefix('extcal_event'); |
|
40 | + $tbl = $xoopsDB->prefix('extcal_event'); |
|
41 | 41 | |
42 | 42 | $sql = <<<__sql__ |
43 | 43 | ALTER TABLE `{$tbl}` |
44 | 44 | CHANGE `event_etablissement` `event_etablissement` INT( 5 ) NOT NULL DEFAULT '0'; |
45 | 45 | __sql__; |
46 | 46 | |
47 | - $xoopsDB->queryF($sql); |
|
47 | + $xoopsDB->queryF($sql); |
|
48 | 48 | |
49 | 49 | } |
50 | 50 |
@@ -30,36 +30,36 @@ |
||
30 | 30 | { |
31 | 31 | global $xoopsDB; |
32 | 32 | |
33 | - $this->alterTable_cat(); |
|
34 | - $this->alterTable_eventmember(); |
|
33 | + $this->alterTable_cat(); |
|
34 | + $this->alterTable_eventmember(); |
|
35 | 35 | |
36 | 36 | } |
37 | 37 | //---------------------------------------------------- |
38 | 38 | function alterTable_cat() |
39 | 39 | { |
40 | 40 | global $xoopsDB; |
41 | - $tbl = $xoopsDB->prefix('extcal_cat'); |
|
41 | + $tbl = $xoopsDB->prefix('extcal_cat'); |
|
42 | 42 | |
43 | 43 | $sql = <<<__sql__ |
44 | 44 | ALTER TABLE `{$tbl}` |
45 | 45 | ADD `cat_weight` INT NOT NULL DEFAULT '0'; |
46 | 46 | __sql__; |
47 | 47 | |
48 | - $xoopsDB->queryF($sql); |
|
48 | + $xoopsDB->queryF($sql); |
|
49 | 49 | |
50 | 50 | } |
51 | 51 | //---------------------------------------------------- |
52 | 52 | function alterTable_eventmember() |
53 | 53 | { |
54 | 54 | global $xoopsDB; |
55 | - $tbl = $xoopsDB->prefix('eventmember'); |
|
55 | + $tbl = $xoopsDB->prefix('eventmember'); |
|
56 | 56 | |
57 | 57 | $sql = <<<__sql__ |
58 | 58 | ALTER TABLE `{$tbl}` |
59 | 59 | ADD `status` INT NOT NULL DEFAULT '0'; |
60 | 60 | __sql__; |
61 | 61 | |
62 | - $xoopsDB->queryF($sql); |
|
62 | + $xoopsDB->queryF($sql); |
|
63 | 63 | |
64 | 64 | } |
65 | 65 |
@@ -30,21 +30,21 @@ discard block |
||
30 | 30 | { |
31 | 31 | global $xoopsDB; |
32 | 32 | |
33 | - $this->alterTable_event(); |
|
34 | - $this->alterTable_cat(); |
|
33 | + $this->alterTable_event(); |
|
34 | + $this->alterTable_cat(); |
|
35 | 35 | |
36 | 36 | } |
37 | 37 | //---------------------------------------------------- |
38 | 38 | function alterTable_event() |
39 | 39 | { |
40 | 40 | global $xoopsDB; |
41 | - $tbl = $xoopsDB->prefix('extcal_event'); |
|
41 | + $tbl = $xoopsDB->prefix('extcal_event'); |
|
42 | 42 | |
43 | 43 | $sql = <<<__sql__ |
44 | 44 | ALTER TABLE `{$tbl}` ADD `event_icone` VARCHAR(50) NOT NULL; |
45 | 45 | __sql__; |
46 | 46 | |
47 | - $xoopsDB->queryF($sql); |
|
47 | + $xoopsDB->queryF($sql); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | //----------------------------------------------------------------- |
@@ -52,13 +52,13 @@ discard block |
||
52 | 52 | function alterTable_cat() |
53 | 53 | { |
54 | 54 | global $xoopsDB; |
55 | - $tbl = $xoopsDB->prefix('extcal_cat'); |
|
55 | + $tbl = $xoopsDB->prefix('extcal_cat'); |
|
56 | 56 | |
57 | 57 | $sql = <<<__sql__ |
58 | 58 | ALTER TABLE `{$tbl}` ADD `cat_icone` VARCHAR(50) NOT NULL ; |
59 | 59 | __sql__; |
60 | 60 | |
61 | - $xoopsDB->queryF($sql); |
|
61 | + $xoopsDB->queryF($sql); |
|
62 | 62 | |
63 | 63 | } |
64 | 64 |
@@ -332,102 +332,102 @@ |
||
332 | 332 | $modversion['config'][$i]['valuetype'] = 'array'; |
333 | 333 | $modversion['config'][$i]['default'] = array('doc', 'jpg', 'jpeg', 'gif', 'png', 'pdf', 'txt'); |
334 | 334 | $modversion['config'][$i]['options'] = array('ai' => 'ai', |
335 | - 'aif' => 'aif', |
|
336 | - 'aiff' => 'aiff', |
|
337 | - 'asc' => 'asc', |
|
338 | - 'au' => 'au', |
|
339 | - 'avi' => 'avi', |
|
340 | - 'bin' => 'bin', |
|
341 | - 'bmp' => 'bmp', |
|
342 | - 'class' => 'class', |
|
343 | - 'csh' => 'csh', |
|
344 | - 'css' => 'css', |
|
345 | - 'dcr' => 'dcr', |
|
346 | - 'dir' => 'dir', |
|
347 | - 'dll' => 'dll', |
|
348 | - 'doc' => 'doc', |
|
349 | - 'dot' => 'dot', |
|
350 | - 'dtd' => 'dtd', |
|
351 | - 'dxr' => 'dxr', |
|
352 | - 'ent' => 'ent', |
|
353 | - 'eps' => 'eps', |
|
354 | - 'exe' => 'exe', |
|
355 | - 'gif' => 'gif', |
|
356 | - 'gtar' => 'gtar', |
|
357 | - 'gz' => 'gz', |
|
358 | - 'hqx' => 'hqx', |
|
359 | - 'htm' => 'htm', |
|
360 | - 'html' => 'html', |
|
361 | - 'ics' => 'ics', |
|
362 | - 'ifb' => 'ifb', |
|
363 | - 'jpe' => 'jpe', |
|
364 | - 'jpeg' => 'jpeg', |
|
365 | - 'jpg' => 'jpg', |
|
366 | - 'js' => 'js', |
|
367 | - 'kar' => 'kar', |
|
368 | - 'lha' => 'lha', |
|
369 | - 'lzh' => 'lzh', |
|
370 | - 'm3u' => 'm3u', |
|
371 | - 'mid' => 'mid', |
|
372 | - 'midi' => 'midi', |
|
373 | - 'mod' => 'mod', |
|
374 | - 'mov' => 'mov', |
|
375 | - 'mp1' => 'mp1', |
|
376 | - 'mp2' => 'mp2', |
|
377 | - 'mp3' => 'mp3', |
|
378 | - 'mpe' => 'mpe', |
|
379 | - 'mpeg' => 'mpeg', |
|
380 | - 'mpg' => 'mpg', |
|
381 | - 'pbm' => 'pbm', |
|
382 | - 'pdf' => 'pdf', |
|
383 | - 'pgm' => 'pgm', |
|
384 | - 'php' => 'php', |
|
385 | - 'php3' => 'php3', |
|
386 | - 'php5' => 'php5', |
|
387 | - 'phtml' => 'phtml', |
|
388 | - 'png' => 'png', |
|
389 | - 'pnm' => 'pnm', |
|
390 | - 'ppm' => 'ppm', |
|
391 | - 'ppt' => 'ppt', |
|
392 | - 'ps' => 'ps', |
|
393 | - 'qt' => 'qt', |
|
394 | - 'ra' => 'ra', |
|
395 | - 'ram' => 'ram', |
|
396 | - 'rm' => 'rm', |
|
397 | - 'rpm' => 'rpm', |
|
398 | - 'rtf' => 'rtf', |
|
399 | - 'sgm' => 'sgm', |
|
400 | - 'sgml' => 'sgml', |
|
401 | - 'sh' => 'sh', |
|
402 | - 'sit' => 'sit', |
|
403 | - 'smi' => 'smi', |
|
404 | - 'smil' => 'smil', |
|
405 | - 'snd' => 'snd', |
|
406 | - 'so' => 'so', |
|
407 | - 'spl' => 'spl', |
|
408 | - 'swf' => 'swf', |
|
409 | - 'tar' => 'tar', |
|
410 | - 'tcl' => 'tcl', |
|
411 | - 'tif' => 'tif', |
|
412 | - 'tiff' => 'tiff', |
|
413 | - 'tsv' => 'tsv', |
|
414 | - 'txt' => 'txt', |
|
415 | - 'wav' => 'wav', |
|
416 | - 'wbmp' => 'wbmp', |
|
417 | - 'wbxml' => 'wbxml', |
|
418 | - 'wml' => 'wml', |
|
419 | - 'wmlc' => 'wmlc', |
|
420 | - 'wmls' => 'wmls', |
|
421 | - 'wmlsc' => 'wmlsc', |
|
422 | - 'xbm' => 'xbm', |
|
423 | - 'xht' => 'xht', |
|
424 | - 'xhtml' => 'xhtml', |
|
425 | - 'xla' => 'xla', |
|
426 | - 'xls' => 'xls', |
|
427 | - 'xlt' => 'xlt', |
|
428 | - 'xpm' => 'xpm', |
|
429 | - 'xsl' => 'xsl', |
|
430 | - 'zip' => 'zip' |
|
335 | + 'aif' => 'aif', |
|
336 | + 'aiff' => 'aiff', |
|
337 | + 'asc' => 'asc', |
|
338 | + 'au' => 'au', |
|
339 | + 'avi' => 'avi', |
|
340 | + 'bin' => 'bin', |
|
341 | + 'bmp' => 'bmp', |
|
342 | + 'class' => 'class', |
|
343 | + 'csh' => 'csh', |
|
344 | + 'css' => 'css', |
|
345 | + 'dcr' => 'dcr', |
|
346 | + 'dir' => 'dir', |
|
347 | + 'dll' => 'dll', |
|
348 | + 'doc' => 'doc', |
|
349 | + 'dot' => 'dot', |
|
350 | + 'dtd' => 'dtd', |
|
351 | + 'dxr' => 'dxr', |
|
352 | + 'ent' => 'ent', |
|
353 | + 'eps' => 'eps', |
|
354 | + 'exe' => 'exe', |
|
355 | + 'gif' => 'gif', |
|
356 | + 'gtar' => 'gtar', |
|
357 | + 'gz' => 'gz', |
|
358 | + 'hqx' => 'hqx', |
|
359 | + 'htm' => 'htm', |
|
360 | + 'html' => 'html', |
|
361 | + 'ics' => 'ics', |
|
362 | + 'ifb' => 'ifb', |
|
363 | + 'jpe' => 'jpe', |
|
364 | + 'jpeg' => 'jpeg', |
|
365 | + 'jpg' => 'jpg', |
|
366 | + 'js' => 'js', |
|
367 | + 'kar' => 'kar', |
|
368 | + 'lha' => 'lha', |
|
369 | + 'lzh' => 'lzh', |
|
370 | + 'm3u' => 'm3u', |
|
371 | + 'mid' => 'mid', |
|
372 | + 'midi' => 'midi', |
|
373 | + 'mod' => 'mod', |
|
374 | + 'mov' => 'mov', |
|
375 | + 'mp1' => 'mp1', |
|
376 | + 'mp2' => 'mp2', |
|
377 | + 'mp3' => 'mp3', |
|
378 | + 'mpe' => 'mpe', |
|
379 | + 'mpeg' => 'mpeg', |
|
380 | + 'mpg' => 'mpg', |
|
381 | + 'pbm' => 'pbm', |
|
382 | + 'pdf' => 'pdf', |
|
383 | + 'pgm' => 'pgm', |
|
384 | + 'php' => 'php', |
|
385 | + 'php3' => 'php3', |
|
386 | + 'php5' => 'php5', |
|
387 | + 'phtml' => 'phtml', |
|
388 | + 'png' => 'png', |
|
389 | + 'pnm' => 'pnm', |
|
390 | + 'ppm' => 'ppm', |
|
391 | + 'ppt' => 'ppt', |
|
392 | + 'ps' => 'ps', |
|
393 | + 'qt' => 'qt', |
|
394 | + 'ra' => 'ra', |
|
395 | + 'ram' => 'ram', |
|
396 | + 'rm' => 'rm', |
|
397 | + 'rpm' => 'rpm', |
|
398 | + 'rtf' => 'rtf', |
|
399 | + 'sgm' => 'sgm', |
|
400 | + 'sgml' => 'sgml', |
|
401 | + 'sh' => 'sh', |
|
402 | + 'sit' => 'sit', |
|
403 | + 'smi' => 'smi', |
|
404 | + 'smil' => 'smil', |
|
405 | + 'snd' => 'snd', |
|
406 | + 'so' => 'so', |
|
407 | + 'spl' => 'spl', |
|
408 | + 'swf' => 'swf', |
|
409 | + 'tar' => 'tar', |
|
410 | + 'tcl' => 'tcl', |
|
411 | + 'tif' => 'tif', |
|
412 | + 'tiff' => 'tiff', |
|
413 | + 'tsv' => 'tsv', |
|
414 | + 'txt' => 'txt', |
|
415 | + 'wav' => 'wav', |
|
416 | + 'wbmp' => 'wbmp', |
|
417 | + 'wbxml' => 'wbxml', |
|
418 | + 'wml' => 'wml', |
|
419 | + 'wmlc' => 'wmlc', |
|
420 | + 'wmls' => 'wmls', |
|
421 | + 'wmlsc' => 'wmlsc', |
|
422 | + 'xbm' => 'xbm', |
|
423 | + 'xht' => 'xht', |
|
424 | + 'xhtml' => 'xhtml', |
|
425 | + 'xla' => 'xla', |
|
426 | + 'xls' => 'xls', |
|
427 | + 'xlt' => 'xlt', |
|
428 | + 'xpm' => 'xpm', |
|
429 | + 'xsl' => 'xsl', |
|
430 | + 'zip' => 'zip' |
|
431 | 431 | ); |
432 | 432 | ++$i; |
433 | 433 | $modversion['config'][$i]['name'] = 'allow_html'; |
@@ -1726,7 +1726,7 @@ discard block |
||
1726 | 1726 | |
1727 | 1727 | $eventHourOccurStart = $event['event_recur_start'] - mktime(0, 0, 0, $month, $day, $year); |
1728 | 1728 | $eventHourOccurEnd |
1729 | - = $event['event_end'] - $event['event_start']; |
|
1729 | + = $event['event_end'] - $event['event_start']; |
|
1730 | 1730 | |
1731 | 1731 | // Parse all occurence of this event |
1732 | 1732 | while ($nbOccur < $rRuleInterval) { |
@@ -1736,7 +1736,7 @@ discard block |
||
1736 | 1736 | } |
1737 | 1737 | |
1738 | 1738 | $occurEventStart |
1739 | - = $eventDayOccurStart + $eventHourOccurStart; |
|
1739 | + = $eventDayOccurStart + $eventHourOccurStart; |
|
1740 | 1740 | $occurEventEnd = $occurEventStart + $eventHourOccurEnd; |
1741 | 1741 | |
1742 | 1742 | if // Event start falls within search period |
@@ -1786,7 +1786,7 @@ discard block |
||
1786 | 1786 | |
1787 | 1787 | $eventHourOccurStart = $event['event_recur_start'] - mktime(0, 0, 0, $month, $day, $year); |
1788 | 1788 | $eventHourOccurEnd |
1789 | - = $event['event_end'] - $event['event_start']; |
|
1789 | + = $event['event_end'] - $event['event_start']; |
|
1790 | 1790 | |
1791 | 1791 | // If recurring month not specified, make it starting month |
1792 | 1792 | if (!count($eventOptions)) { |
@@ -1802,7 +1802,7 @@ discard block |
||
1802 | 1802 | } |
1803 | 1803 | |
1804 | 1804 | $occurEventStart |
1805 | - = $eventDayOccurStart + $eventHourOccurStart; |
|
1805 | + = $eventDayOccurStart + $eventHourOccurStart; |
|
1806 | 1806 | $occurEventEnd = $eventDayOccurStart + $eventHourOccurEnd; |
1807 | 1807 | |
1808 | 1808 | if // Event start falls within search period |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | * |
396 | 396 | * @return int e.g. 4 or Unix timestamp |
397 | 397 | * @access public |
398 | - */ |
|
398 | + */ |
|
399 | 399 | function prevMonth($format = 'int') |
400 | 400 | { |
401 | 401 | return $this->calendar->prevMonth($format); |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | * |
435 | 435 | * @return int e.g. 4 or Unix timestamp |
436 | 436 | * @access public |
437 | - */ |
|
437 | + */ |
|
438 | 438 | function prevWeek($format = 'n_in_month') |
439 | 439 | { |
440 | 440 | if ( method_exists($this->calendar, 'prevWeek')) { |