$s .= '<div class="clear"></div>';
$s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t("Base API Path \x28remember the trailing /\x29") .'</label>';
$s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" /><br />';
- $s .= '<p></p><div class="clear"></div></div>';
+ $s .= '<div class="clear"></div>';
$s .= '<label id="statusnet-applicationname-label" for="statusnet-applicationname">'.t('StatusNet application name').'</label>';
$s .= '<input id="statusnet-applicationname" type="text" name="statusnet-applicationname" size="35" /><br />';
- $s .= '<p></p><div class="clear"></div></div>';
+ $s .= '<p></p><div class="clear"></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
+ $s .= '</div>';
} else {
/***
* ok we have a consumer key pair now look into the OAuth stuff
$msglink = $b["plink"];
// If the message is short enough then don't modify it. (if the link exists in the original message)
- if ((strlen(trim($origmsg)) <= $max_char) AND (strpos($origmsg, $msglink) OR ($msglink == "")))
+ if ((strlen(trim($origmsg)) <= $max_char) AND (($msglink == "") OR strpos($origmsg, $msglink)))
+ return(array("msg"=>trim($origmsg), "image"=>""));
+
+ // If the message is short enough and contains a picture then post the picture as well
+ if ((strlen(trim($origmsg)) <= ($max_char - 20)) AND strpos($origmsg, $msglink))
+ return(array("msg"=>trim($origmsg), "image"=>$image));
+
+ // If the message is short enough and the link exists in the original message don't modify it as well
+ if ((strlen(trim($origmsg)) <= $max_char) AND strpos($origmsg, $msglink))
return(array("msg"=>trim($origmsg), "image"=>""));
// Preserve the unshortened link
if (($image == $orig_link) OR (substr($mime, 0, 6) == "image/"))
return(array("msg"=>trim($msg), "image"=>$orig_link));
- else if (($image != $orig_link) AND ($image != "") AND (strlen($msg."\n".$msglink) <= ($max_char - 20)))
- return(array("msg"=>trim($msg."\n".$msglink), "image"=>$image));
+ else if (($image != $orig_link) AND ($image != "") AND (strlen($msg." ".$msglink) <= ($max_char - 20)))
+ return(array("msg"=>trim($msg." ".$msglink)."\n", "image"=>$image));
else
- return(array("msg"=>trim($msg."\n".$msglink), "image"=>""));
+ return(array("msg"=>trim($msg." ".$msglink), "image"=>""));
}
function statusnet_post_hook(&$a,&$b) {