if (!$direct_cache AND ($cachefile == "")) {
$r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash);
- if (count($r)) {
+ if (dbm::is_result($r)) {
$img_str = $r[0]['data'];
$mime = $r[0]["desc"];
if ($mime == "") $mime = "image/jpeg";
} else
$r = array();
- if (!count($r)) {
+ if (!dbm::is_result($r)) {
// It shouldn't happen but it does - spaces in URL
$_REQUEST['url'] = str_replace(" ", "+", $_REQUEST['url']);
$redirects = 0;
// Only continue if it isn't a local image and the isn't deactivated
if (proxy_is_local_image($url)) {
- $url = str_replace(normalise_link($a->get_baseurl()) . '/', $a->get_baseurl() . '/', $url);
+ $url = str_replace(normalise_link(App::get_baseurl()) . '/', App::get_baseurl() . '/', $url);
return $url;
}
}
// Image URL may have encoded ampersands for display which aren't desirable for proxy
- $url = html_entity_decode($url, ENT_NOQUOTES, 'UTF8');
+ $url = html_entity_decode($url, ENT_NOQUOTES, 'utf-8');
// Creating a sub directory to reduce the amount of files in the cache directory
$basepath = $a->get_basepath() . '/proxy';
$longpath .= '.' . $extension;
}
- $proxypath = $a->get_baseurl() . '/proxy/' . $longpath;
+ $proxypath = App::get_baseurl() . '/proxy/' . $longpath;
if ($size != '') {
$size = ':' . $size;
// Too long files aren't supported by Apache
// Writemode in combination with long files shouldn't be possible
if ((strlen($proxypath) > 250) AND $writemode) {
- return hash('md5', $url);
+ return $shortpath;
} elseif (strlen($proxypath) > 250) {
- return $a->get_baseurl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
+ return App::get_baseurl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
} elseif ($writemode) {
return $longpath;
} else {
function proxy_parse_html($html) {
$a = get_app();
- $html = str_replace(normalise_link($a->get_baseurl())."/", $a->get_baseurl()."/", $html);
+ $html = str_replace(normalise_link(App::get_baseurl())."/", App::get_baseurl()."/", $html);
return preg_replace_callback("/(<img [^>]*src *= *[\"'])([^\"']+)([\"'][^>]*>)/siU", "proxy_img_cb", $html);
}