}
- 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}";
}
//-- 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}";
+ }
+
+ 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
$data = file_get_contents($file);
-// 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(!empty($scaleWidth) || !empty($scaleHeight)){
- $data = $this->scale($data, $scaleWidth, $scaleHeight);
+ $data = $this->scale(false, $scaleWidth, $scaleHeight);
}
if($rotate){