mirror of
https://github.com/friendica/friendica
synced 2024-12-23 12:40:17 +00:00
API: Now returns a real 404 when a function isn't implemented
parse_url: Image handling improved
This commit is contained in:
parent
02a1fc9cd0
commit
5f400c4a97
3 changed files with 5 additions and 30 deletions
|
@ -156,6 +156,7 @@
|
|||
//echo "<pre>"; var_dump($r); die();
|
||||
}
|
||||
}
|
||||
header("HTTP/1.1 404 Not Found");
|
||||
logger('API call not implemented: '.$a->query_string." - ".print_r($_REQUEST,true));
|
||||
$r = '<status><error>not implemented</error></status>';
|
||||
switch($type){
|
||||
|
|
|
@ -698,9 +698,10 @@ function get_atom_elements($feed,$item) {
|
|||
call_hooks('parse_atom', $arr);
|
||||
|
||||
//if (($res["title"] != "") or (strpos($res["body"], "RT @") > 0)) {
|
||||
// $debugfile = tempnam("/home/ike/log", "item-res2-");
|
||||
// file_put_contents($debugfile, serialize($res));
|
||||
//}
|
||||
if (strpos($res["body"], "RT @") !== false) {
|
||||
$debugfile = tempnam("/home/ike/log", "item-res2-");
|
||||
file_put_contents($debugfile, serialize($arr));
|
||||
}
|
||||
|
||||
return $res;
|
||||
}
|
||||
|
|
|
@ -294,33 +294,6 @@ function parse_url_content(&$a) {
|
|||
else
|
||||
$image .= '<img height="'.$imagedata["height"].'" width="'.$imagedata["width"].'" src="'.$imagedata["src"].'" alt="photo" />';
|
||||
|
||||
/* if ($image != "") {
|
||||
$i = fetch_url($image);
|
||||
if($i) {
|
||||
require_once('include/Photo.php');
|
||||
// guess mimetype from headers or filename
|
||||
$type = guess_image_type($image,true);
|
||||
|
||||
$ph = new Photo($i, $type);
|
||||
if($ph->is_valid()) {
|
||||
if($ph->getWidth() > 300 || $ph->getHeight() > 300) {
|
||||
$ph->scaleImage(300);
|
||||
$new_width = $ph->getWidth();
|
||||
$new_height = $ph->getHeight();
|
||||
if($textmode)
|
||||
$image = $br . $br . '[img=' . $new_width . 'x' . $new_height . ']' . $image . '[/img]';
|
||||
else
|
||||
$image = '<br /><br /><img height="' . $new_height . '" width="' . $new_width . '" src="' .$image . '" alt="photo" />';
|
||||
} else {
|
||||
if($textmode)
|
||||
$image = $br.$br.'[img]'.$image.'[/img]';
|
||||
else
|
||||
$image = '<br /><br /><img src="'.$image.'" alt="photo" />';
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
if(strlen($text)) {
|
||||
if($textmode)
|
||||
$text = $br.'[quote]'.trim($text).'[/quote]'.$br ;
|
||||
|
|
Loading…
Reference in a new issue