projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into fusionax
[platal.git]
/
modules
/
events.php
diff --git
a/modules/events.php
b/modules/events.php
index
e49dc70
..
c40e75e
100644
(file)
--- a/
modules/events.php
+++ b/
modules/events.php
@@
-193,7
+193,7
@@
class EventsModule extends PLModule
$res = XDB::query("SELECT * FROM evenements_photo WHERE eid = {?}", $eid);
if ($res->numRows()) {
$photo = $res->fetchOneAssoc();
$res = XDB::query("SELECT * FROM evenements_photo WHERE eid = {?}", $eid);
if ($res->numRows()) {
$photo = $res->fetchOneAssoc();
-
header('Content-Type: image/'
. $photo['attachmime']);
+
pl_cached_dynamic_content_headers("image/"
. $photo['attachmime']);
echo $photo['attach'];
exit;
}
echo $photo['attach'];
exit;
}
@@
-201,20
+201,20
@@
class EventsModule extends PLModule
require_once 'validations.inc.php';
$valid = Validate::get_request_by_id($valid);
if ($valid && $valid->img) {
require_once 'validations.inc.php';
$valid = Validate::get_request_by_id($valid);
if ($valid && $valid->img) {
-
header('Content-Type: image/'
. $valid->imgtype);
+
pl_cached_dynamic_content_headers("image/"
. $valid->imgtype);
echo $valid->img;
exit;
}
} else {
$upload = new PlUpload(S::user()->login(), 'event');
if ($upload->exists() && $upload->isType('image')) {
echo $valid->img;
exit;
}
} else {
$upload = new PlUpload(S::user()->login(), 'event');
if ($upload->exists() && $upload->isType('image')) {
-
header('Content-Type: ' .
$upload->contentType());
+
pl_cached_dynamic_content_headers(
$upload->contentType());
echo $upload->getContents();
exit;
}
}
global $globals;
echo $upload->getContents();
exit;
}
}
global $globals;
-
header('Content-Type: image/png'
);
+
pl_cached_dynamic_content_headers("image/png"
);
echo file_get_contents($globals->spoolroot . '/htdocs/images/logo.png');
exit;
}
echo file_get_contents($globals->spoolroot . '/htdocs/images/logo.png');
exit;
}
@@
-239,7
+239,7
@@
class EventsModule extends PLModule
}
$page->assign('texte', $texte);
$page->assign('titre', $titre);
}
$page->assign('texte', $texte);
$page->assign('titre', $titre);
-
header('Content-Type: text/html; charset=utf-8'
);
+
pl_content_headers("text/html"
);
}
function handler_ev_submit(&$page)
}
function handler_ev_submit(&$page)
@@
-297,7
+297,7
@@
class EventsModule extends PLModule
function handler_tips(&$page, $tips = null)
{
function handler_tips(&$page, $tips = null)
{
-
header('Content-Type: text/html; charset="UTF-8"'
);
+
pl_content_headers("text/html"
);
$page->changeTpl('include/tips.tpl', NO_SKIN);
$page->assign('tips', $this->get_tips($tips));
}
$page->changeTpl('include/tips.tpl', NO_SKIN);
$page->assign('tips', $this->get_tips($tips));
}