if (empty($_REQUEST['anytype'])) {
$img->whereAdd("mimetype like 'image/%'");
}
-
+ $img->orderBy('title ASC'); /// spurious ordering... (curretnly used by shipping project)
if (isset($onbits[2])) {
$img->imgtype = $onbits[2];
}
}
// print_r($img);exit;
$x = $img->toFileConvert();
- if (empty($this->as_mimetype)) {
+ if (empty($this->as_mimetype) || $img->mimetype == 'image/gif') {
$this->as_mimetype = $img->mimetype;
}
if (!$this->thumb) {
//echo "SKALING? $this->size";
// acutally if we generated the image, then we do not need to validate the size..
-
-
// if the mimetype is not converted..
// then the filename should be original.{size}.jpeg
$fn = $img->getStoreName() . '.'. $this->size . '.jpeg'; // thumbs are currenly all jpeg.!???
+ if($img->mimetype == 'image/gif'){
+ $fn = $img->getStoreName() . '.'. $this->size . '.gif';
+ }
+
if (!file_exists($fn)) {
$fn = $img->getStoreName() . '.'. $this->size . '.'. $img->fileExt();
// if it's an image, convert into the same type for thumbnail..
}
function validateSize()
{
- print_r('run???');exit;
- if (($this->authUser && $this->authUser->company_id && $this->authUser->company()->comptype=='OWNER') || $_SERVER['SERVER_ADDR'] == $_SERVER['REMOTE_ADDR']) {
+ if (($this->authUser && !empty($this->authUser->company_id) && $this->authUser->company()->comptype=='OWNER')
+ || $_SERVER['SERVER_ADDR'] == $_SERVER['REMOTE_ADDR']) {
return true;
}
- // DEFAULT allowed - override with Pman_Core_Images[sizes] => array();
+
+ $ff = HTML_FlexyFramework::get();
$sizes = array(
'100',
'200x0',
'200x200',
'400x0',
- '300x100', // logo on login.
+ '300x100',
'500'
);
- // this should be configurable...
- $ff = HTML_FlexyFramework::get();
-
-
$cfg = isset($ff->Pman_Images) ? $ff->Pman_Images :
(isset($ff->Pman_Core_Images) ? $ff->Pman_Core_Images : array());
-
-
if (!empty($cfg['sizes'])) {
$sizes = array_merge($sizes , $cfg['sizes']);
}
+ $project = $ff->project;
+
+ require_once $ff->project . '.php';
+
+ $project = str_replace('/', '_', $project);
+
+ $pr_obj = new $project;
+
+ // var_dump($pr_obj->Pman_Core_Images_Size);
+ if(isset($pr_obj->Pman_Core_Images_Size)){
+ $sizes = $pr_obj->Pman_Core_Images_Size;
+
+
+ }
if (!in_array($this->size, $sizes)) {
- print_r($sizes);
die("invalid scale - ".$this->size);
}
}
$html = self::replaceImgUrl($html, $baseURL, $img, $attr, 'src' );
continue;
}
- if (false !== strpos($attr['src'], '//')) {
+ if (false !== strpos($attr['src'], '//') && false === strpos($attr['src'], $baseURL)) {
// contains an absolute path.. that is probably not us...
continue;
}
$html = self::replaceImgUrl($html, $baseURL, $img, $attr, 'src' );
-
-
}