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];
}
}
function validateSize()
{
- 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;
}
$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' );
-
-
}