aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-07-22 23:17:41 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-07-22 23:17:41 -0700
commit7a07a2cf3198ecc5de8ef2d45f5be48fdabd48a3 (patch)
treee31747fe45f4ec548a27a01d75e16e8d02cb80e6
parent36b66dccb60a7d65724da542f9d7a2d6722fc6aa (diff)
downloadvolse-hubzilla-7a07a2cf3198ecc5de8ef2d45f5be48fdabd48a3.tar.gz
volse-hubzilla-7a07a2cf3198ecc5de8ef2d45f5be48fdabd48a3.tar.bz2
volse-hubzilla-7a07a2cf3198ecc5de8ef2d45f5be48fdabd48a3.zip
enhance url parse
-rw-r--r--mod/parse_url.php37
-rw-r--r--mod/wall_upload.php24
2 files changed, 40 insertions, 21 deletions
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 33381a0d2..db306ca76 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -3,15 +3,20 @@
require_once('library/HTML5/Parser.php');
function parse_url_content(&$a) {
+
$url = trim($_GET['url']);
- $template = "<a href=\"%s\" >%s</a>";
+ $template = "<a href=\"%s\" >%s</a>%s";
if($url)
$s = fetch_url($url);
+ else {
+ echo '';
+ killme();
+ }
if(! $s) {
- echo sprintf($template,$url,$url);
+ echo sprintf($template,$url,$url,'');
killme();
}
@@ -21,12 +26,30 @@ function parse_url_content(&$a) {
return $ret;
$items = $dom->getElementsByTagName('title');
-
- foreach($items as $item) {
- $title = $item->textContent;
- break;
+
+ if($items) {
+ foreach($items as $item) {
+ $title = $item->textContent;
+ break;
+ }
+ }
+
+ $items = $dom->getElementsByTagName('p');
+ if($items) {
+ foreach($items as $item) {
+ $text = $item->textContent;
+ $text = strip_tags($text);
+ if(strlen($text) < 100)
+ continue;
+ $text = substr($text,0,250) . '...' ;
+ break;
+ }
+ }
+
+ if(strlen($text)) {
+ $text = '<br />' . $text;
}
- echo sprintf($template,$url,$title);
+ echo sprintf($template,$url,$title,$text);
killme();
} \ No newline at end of file
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index d74eae302..d2e732545 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -5,8 +5,8 @@ require_once('Photo.php');
function wall_upload_post(&$a) {
if(! local_user()) {
- notice ( "Permission denied." . EOL );
- return;
+ echo ( "Permission denied." . EOL );
+ killme();
}
$src = $_FILES['userfile']['tmp_name'];
@@ -17,9 +17,9 @@ function wall_upload_post(&$a) {
$ph = new Photo($imagedata);
if(! ($image = $ph->getImage())) {
- notice("Unable to process image." . EOL);
+ echo ("Unable to process image." . EOL);
@unlink($src);
- return;
+ killme();
}
@unlink($src);
@@ -43,10 +43,10 @@ function wall_upload_post(&$a) {
intval($height),
intval($width),
dbesc($str_image));
- if($r)
- notice("Image uploaded successfully." . EOL);
- else
- notice("Image upload failed." . EOL);
+ if(! $r) {
+ echo ("Image upload failed." . EOL);
+ killme();
+ }
if($width > 640 || $height > 640) {
$ph->scaleImage(640);
@@ -63,9 +63,7 @@ function wall_upload_post(&$a) {
intval($ph->getWidth()),
dbesc($ph->imageString())
);
- if($r === false)
- notice("Image size reduction (640) failed." . EOL );
- else
+ if($r)
$smallest = 1;
}
@@ -84,9 +82,7 @@ function wall_upload_post(&$a) {
intval($ph->getWidth()),
dbesc($ph->imageString())
);
- if($r === false)
- notice("Image size reduction (320) failed." . EOL );
- else
+ if($r)
$smallest = 2;
}