// direct via roo...
/// ctrl not used??
- function onUpload($roo)
+ function onUpload($roo, $table = false, $file = false)
{
+
+ if ($table !== false) {
+ $this->ontable = $table->tableName();
+ $this->onid = $table->pid();
+ }
+
+ if ($file === false) {
+ $file = isset($_FILES['imageUpload']) ? $_FILES['imageUpload'] : array();
+ }
+
//print_r($_FILES); echo $_FILES['imageUpload']['type'];exit;
- if (empty($_FILES['imageUpload']['tmp_name']) ||
- empty($_FILES['imageUpload']['name']) ||
- empty($_FILES['imageUpload']['type'])
+ if (empty($file['tmp_name']) ||
+ empty($file['name']) ||
+ empty($file['type'])
) {
$emap = array(
4=>"No file was uploaded",
6=>"Missing a temporary folder"
);
- $estr = (empty($_FILES['imageUpload']['error']) ? '?': $emap[$_FILES['imageUpload']['error']]);
+ $estr = (empty($file['error']) ? '?': $emap[$file['error']]);
$this->err = "Missing file details : Error=". $estr;
return false;
}
require_once 'File/MimeType.php';
$y = new File_MimeType();
- $this->mimetype = $_FILES['imageUpload']['type'];
+ $this->mimetype = $file['type'];
if (in_array($this->mimetype, array(
'text/application',
'application/octet-stream',
'application/vnd.ms-excel', /// sometimes windows reports csv as excel???
'application/csv-tab-delimited-table', // windows again!!?
))) { // weird tyeps..
- $inf = pathinfo($_FILES['imageUpload']['name']);
+ $inf = pathinfo($file['name']);
$this->mimetype = $y->fromExt($inf['extension']);
}
$ext = $y->toExt(trim((string) $this->mimetype ));
$this->filename = empty($this->filename) ?
- $_FILES['imageUpload']['name'] : ($this->filename .'.'. $ext);
+ $file['name'] : ($this->filename .'.'. $ext);
- if (!$this->createFrom($_FILES['imageUpload']['tmp_name'])) {
+ if (!$this->createFrom($file['tmp_name'])) {
$this->err = isset($this->err) ? $this->err : "createFrom Image failed";
return false;
}
}
- function toRooArray($req) {
+ function toRooArray($req)
+ {
$ret= $this->toArray();
- static $ff = false;
- if (!$ff) {
- $ff = HTML_FlexyFramework::get();
- }
+
+ $ff = HTML_FlexyFramework::get();
+
$ret['public_baseURL'] = isset($ff->Pman_Images['public_baseURL']) ?
$ff->Pman_Images['public_baseURL'] : $ff->baseURL;
if (!empty($req['query']['imagesize'])) {
$ret['url_thumb'] = $this->URL($req['query']['imagesize'], '/Images/Thumb',$baseURL);
}
+
+
}
+ $ret['shorten_name'] = $ret['filename'] = $this->shorten_name();
-
-
return $ret;
}
{
if (!$this->id) {
return 'about:blank';
-
}
-
+
+ $shorten_name = $this->shorten_name();
+
$ff = HTML_FlexyFramework::get();
$baseURL = $baseURL ? $baseURL : $ff->baseURL ;
if (preg_match('#^http[s]*://#', $provider)) {
if ($size < 0) {
$provider = preg_replace('#/Thumb$#', '', $provider);
- return $baseURL . $provider . "/{$this->id}/{$this->filename}";
+ return $baseURL . $provider . "/{$this->id}/{$shorten_name}"; // -- this breaks the rss feed #image-{$this->id}";
}
//-- max?
//$size = max(100, (int) $size);
$fc->convert($mt, $size);
- return $baseURL . $provider . "/$size/{$this->id}/{$this->filename}";
+ return $baseURL . $provider . "/$size/{$this->id}/{$shorten_name}"; // -- this breaks the rss feed #image-{$this->id}";
+ }
+
+ function getFromHashURL($url)
+ {
+ $id = false;
+ if (preg_match('/#image-([0-9]+)$/', $url, $matches)) {
+ $id = $matches[1];
+ } else if (preg_match('#Images/Thumb/[^/]+/([0-9]+)/#', $url, $matches)) {
+ $id = $matches[1];
+ } else if (preg_match('#Images/([0-9]+)/#', $url, $matches)) {
+ $id = $matches[1];
+ }
+
+ if ($id === false || $id < 1) {
+ return false;
+ }
+
+ $img = DB_DAtaObject::Factory('images');
+ if ($img->get($id)) {
+ return $img;
+ }
+ return false;
+ }
+
+
+ function shorten_name()
+ {
+ if(empty($this->filename)) {
+ return;
+ }
+
+ $filename = explode('.', $this->filename);
+ $ext = array_pop($filename);
+ $name = preg_replace("/[^A-Z0-9.]+/i", '-', implode('-', $filename)) ;
+
+ if(strlen($name) > 32) {
+ $name = substr($name, 0, 32);
+ }
+
+ $shorten_name = "{$name}.{$ext}";
+
+ return $shorten_name;
}
/**
* size could be 123x345
$roo->addEvent("ADD", $this, $this->toEventString());
$r = DB_DataObject::factory($this->tableName());
+
$r->id = $this->id;
$roo->loadMap($r);
$r->limit(1);
$r->find(true);
- $roo->jok($r->toArray());
+ $roo->jok($r->toRooArray($ar));
}
if (!$this->checkPerm($this->id ? 'A' : 'E', $roo->authUser)) {
$roo->jerr("IMAGE UPLOAD PERMISSION DENIED");
}
-
-
+
if (!isset($_FILES['imageUpload'])) {
return; // standard update...
$roo->loadMap($r);
$r->limit(1);
$r->find(true);
- $roo->jok($r->toArray());
+ $roo->jok($r->toRooArray($ar));
}
$data = file_get_contents($file);
- if($rotate){
- $data = $this->rotate();
+ if(!empty($scaleWidth) || !empty($scaleHeight)){
+ $data = $this->scale(false, $scaleWidth, $scaleHeight);
}
- if(!empty($scaleWidth) || !empty($scaleHeight)){
-
- $width = $this->width;
- $height = $this->height;
-
- if(!empty($scaleWidth)){
- $width = $scaleWidth;
-
- if(empty($scaleHeight)){
- $height = $this->height * $scaleWidth / $this->width;
- }
- }
-
-
-
- if(!empty($scaleHeight)){
- $height = $scaleHeight;
-
- if(empty($scaleWidth)){
- $width = $this->width * $scaleHeight / $this->height;
- }
- }
-
- $im = imagecreatefromstring($data);
-
- if (($scaled = imagescale($im, $width, $height)) != false) {
- ob_start();
- imagejpeg($scaled);
- $data = ob_get_contents();
- ob_end_clean();
- imagedestroy($im);
- imagedestroy($scaled);
- }
-
+ if($rotate){
+ $data = $this->rotate($data);
}
$base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
}
$orientation = $imagick->getImageOrientation();
-// print_R($orientation);exit;
+
switch($orientation) {
case Imagick::ORIENTATION_BOTTOMRIGHT:
$imagick->rotateimage(new ImagickPixel('#00000000'), 180); // rotate 180 degrees
return $imagick->getImageBlob();
}
+ function scale($imageBlob = false, $width = 0, $height = 0)
+ {
+ if(empty($imageBlob)){
+ $imagick = new Imagick($this->getStoreName());
+ } else {
+ $imagick = new Imagick();
+ $imagick->readImageBlob($imageBlob);
+ }
+
+ $imagick->resizeimage($width, $height, Imagick::FILTER_LANCZOS, true, true);
+
+ return $imagick->getImageBlob();
+
+ }
+
}
projects / Pman.Core / blobdiff