projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release plat/al core v1.1.10
[platal.git]
/
classes
/
plimage.php
diff --git
a/classes/plimage.php
b/classes/plimage.php
index
c4b3e05
..
a8113db
100644
(file)
--- a/
classes/plimage.php
+++ b/
classes/plimage.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-201
0
Polytechnique.org *
+ * Copyright (C) 2003-201
1
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-20,19
+20,23
@@
***************************************************************************/
class PlImage {
***************************************************************************/
class PlImage {
- private $mime = null;
- private $x = null;
- private $y = null;
+ protected $mime = null;
+ protected $x = null;
+ protected $y = null;
+ protected $ts = null;
- pr
ivate
$data = null;
- pr
ivate
$file = null;
+ pr
otected
$data = null;
+ pr
otected
$file = null;
- pr
ivate
function __construct()
+ pr
otected
function __construct()
{
}
public function send()
{
{
}
public function send()
{
+ if (!is_null($this->ts)) {
+ header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $this->ts) . ' GMT');
+ }
pl_cached_dynamic_content_headers($this->mime);
if (empty($this->data)) {
readfile($this->file);
pl_cached_dynamic_content_headers($this->mime);
if (empty($this->data)) {
readfile($this->file);
@@
-45,7
+49,7
@@
class PlImage {
public function path()
{
if (empty($this->data)) {
public function path()
{
if (empty($this->data)) {
- return $file;
+ return $
this->
file;
} else {
$name = md5($this->data);
$GLOBALS['img' . $name] = $this->data;
} else {
$name = md5($this->data);
$GLOBALS['img' . $name] = $this->data;
@@
-68,23
+72,25
@@
class PlImage {
return $this->mime;
}
return $this->mime;
}
- public static function fromData($data, $mime, $x = null, $y = null)
+ public static function fromData($data, $mime, $x = null, $y = null
, $ts = null
)
{
$image = new PlImage();
$image->data = $data;
$image->mime = $mime;
$image->x = $x;
$image->y = $y;
{
$image = new PlImage();
$image->data = $data;
$image->mime = $mime;
$image->x = $x;
$image->y = $y;
+ $image->ts = $ts;
return $image;
}
return $image;
}
- public static function fromFile($path, $mime, $x = null, $y = null)
+ public static function fromFile($path, $mime, $x = null, $y = null
, $ts = null
)
{
$image = new PlImage();
$image->file = $path;
$image->mime = $mime;
$image->x = $x;
$image->y = $y;
{
$image = new PlImage();
$image->file = $path;
$image->mime = $mime;
$image->x = $x;
$image->y = $y;
+ $image->ts = $ts;
return $image;
}
}
return $image;
}
}