X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapiattachment.php;h=b92709f5d6419b9407f407c42fd2a91bb68f1324;hb=9b7773343460514c5c5811c9add5cd96a2770c42;hp=52cb570de37193483e9b35d3f31b9d0f883d91bc;hpb=34a6624452e8b7f60b40181441c6ea2c8158379a;p=quix0rs-gnu-social.git
diff --git a/actions/apiattachment.php b/actions/apiattachment.php
index 52cb570de3..b92709f5d6 100644
--- a/actions/apiattachment.php
+++ b/actions/apiattachment.php
@@ -20,7 +20,7 @@
* along with this program. If not, see .
*
* @category API
- * @package GNUSocial
+ * @package GNUsocial
* @author Hannes Mannerheim
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://www.gnu.org/software/social/
@@ -46,10 +46,14 @@ class ApiAttachmentAction extends ApiAuthAction
*
* @return boolean success flag
*/
- function prepare($args)
+ protected function prepare(array $args=array())
{
parent::prepare($args);
+ if ($this->format !== 'json') {
+ $this->clientError('This method currently only serves JSON.', 415);
+ }
+
return true;
}
@@ -62,9 +66,10 @@ class ApiAttachmentAction extends ApiAuthAction
*
* @return void
*/
- function handle($args)
+ protected function handle()
{
- parent::handle($args);
+ parent::handle();
+
$file = new File();
$file->selectAdd(); // clears it
$file->selectAdd('url');
@@ -73,7 +78,7 @@ class ApiAttachmentAction extends ApiAuthAction
$file_txt = '';
if(strstr($url[0],'.html')) {
- $file_txt['txt'] = file_get_contents(str_replace('://quitter.se','://127.0.0.1',$url[0]));
+ $file_txt['txt'] = file_get_contents($url[0]);
$file_txt['body_start'] = strpos($file_txt['txt'],'')+6;
$file_txt['body_end'] = strpos($file_txt['txt'],'');
$file_txt = substr($file_txt['txt'],$file_txt['body_start'],$file_txt['body_end']-$file_txt['body_start']);
@@ -94,7 +99,7 @@ class ApiAttachmentAction extends ApiAuthAction
* @return boolean is read only action?
*/
- function isReadOnly($args)
+ function isReadOnly(array $args=array())
{
return true;
}