no more googlegroups

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index 03514ecd580e7117d704f85dfefd01656f3a007c..9b2073e09a2bf3b76a09a544be7f135bc23b59f0 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -450,6 +450,11 @@
                        case "xml":
                                $data = array_xmlify($data);
                                $tpl = get_markup_template("api_".$templatename."_".$type.".tpl");
+                               if(! $tpl) {
+                                       header ("Content-Type: text/xml");
+                                       echo '<?xml version="1.0" encoding="UTF-8"?>'."\n".'<status><error>not implemented</error></status>';
+                                       killme();
+                               }
                                $ret = replace_macros($tpl, $data);
                                break;
                        case "json":
@@ -944,7 +949,7 @@
                //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
 
                $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`nick` as `reply_author`,
-                       `contact`.`name`, `contact`.`photo`, `contact`.`url` as `reply_url`, `contact`.`rel`,
+                       `contact`.`name`, `contact`.`photo` as `reply_photo`, `contact`.`url` as `reply_url`, `contact`.`rel`,
                        `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
                        FROM `item`, `contact`
@@ -957,7 +962,18 @@
                );
 
                if ($r[0]['body'] != "") {
-                       $_REQUEST['body'] = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body'];
+                       if (intval(get_config('system','new_share'))) {
+                               $post = "[share author='".str_replace("'", "&#039;", $r[0]['reply_author']).
+                                               "' profile='".$r[0]['reply_url'].
+                                               "' avatar='".$r[0]['reply_photo'].
+                                               "' link='".$r[0]['plink']."']";
+
+                               $post .= $r[0]['body'];
+                               $post .= "[/share]";
+                               $_REQUEST['body'] = $post;
+                       } else
+                               $_REQUEST['body'] = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body'];
+
                        $_REQUEST['profile_uid'] = api_user();
                        $_REQUEST['type'] = 'wall';
                        $_REQUEST['api_source'] = true;