]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Wed, 9 May 2012 12:56:48 +0000 (14:56 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 9 May 2012 12:56:48 +0000 (14:56 +0200)
1  2 
include/api.php

diff --combined include/api.php
index 11494ba278078cc38db6cab184f775f6b739d39d,a693a32c8bb3c797a4d20afa62493ed3d4bf2ce2..f58a91a72f48224616e09ee047014a304d63de7c
@@@ -4,26 -4,26 +4,26 @@@
        require_once("conversation.php");
        require_once("oauth.php");
        require_once("html2plain.php");
 -      /* 
 +      /*
         * Twitter-Like API
 -       *  
 +       *
         */
  
        $API = Array();
 -      $called_api = Null; 
 +      $called_api = Null;
  
        function api_date($str){
                //Wed May 23 06:01:13 +0000 2007
                return datetime_convert('UTC', 'UTC', $str, "D M d H:i:s +0000 Y" );
        }
 -       
 -      
 +
 +
        function api_register_func($path, $func, $auth=false){
                global $API;
                $API[$path] = array('func'=>$func,
                                                        'auth'=>$auth);
        }
 -      
 +
        /**
         * Simple HTTP Login
         */
                        $nick = $name;
  
                // Generating a random ID
-               if (!array_key_exists($nick, $usercache))
+               if (is_null($usercache[$nick]) or !array_key_exists($nick, $usercache))
                        $usercache[$nick] = mt_rand(2000000, 2100000);
  
                $ret = array(
                $_REQUEST['profile_uid'] = local_user();
                if(requestdata('parent'))
                        $_REQUEST['type'] = 'net-comment';
-               else
+               else {
                        $_REQUEST['type'] = 'wall';
+                         if(x($_FILES,'media')) {
+                               // upload the image if we have one
+                               $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
+                               require_once('mod/wall_upload.php');
+                               $media = wall_upload_post($a);
+                               if(strlen($media)>0)
+                                       $_REQUEST['body'] .= "\n\n".$media;
+                               }
+               }
  
                // set this so that the item_post() function is quiet and doesn't redirect or emit json
  
                                'geo' => '',
                                'coordinates' => $lastwall['coord'],
                                'place' => $lastwall['location'],
 -                              'contributors' => ''                                    
 +                              'contributors' => ''
                        );
                }
                return  api_apply_template("user", $type, array('$user' => $user_info));
 -              
 +
        }
        api_register_func('api/users/show','api_users_show');
 -      
 +
        /**
 -       * 
 +       *
         * http://developer.twitter.com/doc/get/statuses/home_timeline
 -       * 
 +       *
         * TODO: Optional parameters
         * TODO: Add reply info
         */
        function api_statuses_home_timeline(&$a, $type){
                if (local_user()===false) return false;
 -                              
 +
                $user_info = api_get_user($a);
                // get last newtork messages
  
                $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
                $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
                //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
 -              
 +
                $start = $page*$count;
  
                //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
                if ($max_id > 0)
                        $sql_extra = 'AND `item`.`id` <= '.intval($max_id);
  
 -              $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 +              $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
                        `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
                        `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
  
                $ret = api_format_items($r,$user_info);
  
 -              
 +
                $data = array('$statuses' => $ret);
                switch($type){
                        case "atom":
                                return($as);
                                break;
                }
 -                              
 +
                return  api_apply_template("timeline", $type, $data);
        }
        api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
  
        function api_statuses_public_timeline(&$a, $type){
                if (local_user()===false) return false;
 -                              
 +
                $user_info = api_get_user($a);
                // get last newtork messages
  
                $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
                $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
                //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
 -              
 +
                $start = $page*$count;
  
                //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
                if ($max_id > 0)
                        $sql_extra = 'AND `item`.`id` <= '.intval($max_id);
  
 -              /*$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 +              /*$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
                        `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
                        `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
                        intval($since_id),
                        intval($start), intval($count)
                );*/
 -              $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 +              $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
                        `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
 -                      `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
 +                      `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
                        `user`.`nickname`, `user`.`hidewall`
                        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                        LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
                        WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
 -                      AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
 -                      AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
 -                      AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
 +                      AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
 +                      AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
 +                      AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
                        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                        $sql_extra
                        AND `item`.`id`>%d
  
                $ret = api_format_items($r,$user_info);
  
 -              
 +
                $data = array('$statuses' => $ret);
                switch($type){
                        case "atom":
                                return($as);
                                break;
                }
 -                              
 +
                return  api_apply_template("timeline", $type, $data);
        }
        api_register_func('api/statuses/public_timeline','api_statuses_public_timeline', true);
                // params
                $id = intval($a->argv[3]);
  
 -              logger('API: api_statuses_show: '.$id);         
 +              logger('API: api_statuses_show: '.$id);
  
                //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
  
 -              $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 +              $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
                        `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
                        `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
                );
  
                $ret = api_format_items($r,$user_info);
 -              
 +
                $data = array('$status' => $ret[0]);
                /*switch($type){
                        case "atom":
  
                $ret = api_format_items($r,$user_info);
  
 -              
 +
                $data = array('$statuses' => $ret);
                switch($type){
                        case "atom":
                                return($as);
                                break;
                }
 -                              
 +
                return  api_apply_template("timeline", $type, $data);
        }
        api_register_func('api/statuses/mentions','api_statuses_mentions', true);
  
                $ret = api_format_items($r,$user_info);
  
 -              
 +
                $data = array('$statuses' => $ret);
                switch($type){
                        case "atom":
                        case "rss":
                                $data = api_rss_extra($a, $data, $user_info);
                }
 -                              
 +
                return  api_apply_template("timeline", $type, $data);
        }
  
  
        function api_favorites(&$a, $type){
                if (local_user()===false) return false;
 -              
 +
                $user_info = api_get_user($a);
                // in friendica starred item are private
                // return favorites only for self
                logger('api_favorites: self:' . $user_info['self']);
 -              
 +
                if ($user_info['self']==0) {
                        $ret = array();
                } else {
 -                      
 -                      
 +
 +
                        // params
                        $count = (x($_GET,'count')?$_GET['count']:20);
                        $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
                        if ($page<0) $page=0;
 -                      
 +
                        $start = $page*$count;
  
 -                      $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 +                      $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
                                `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
                                `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
                                `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
                        );
  
                        $ret = api_format_items($r,$user_info);
 -              
 +
                }
 -              
 +
                $data = array('$statuses' => $ret);
                switch($type){
                        case "atom":
                        case "rss":
                                $data = api_rss_extra($a, $data, $user_info);
                }
 -                              
 +
                return  api_apply_template("timeline", $type, $data);
        }
  
                $as['link']['type'] = "text/html";
                return($as);
        }
 -      
 +
        function api_format_items($r,$user_info) {
  
                //logger('api_format_items: ' . print_r($r,true));
                        $status_user = (($item['cid']==$user_info['id'])?$user_info: api_item_get_user($a,$item));
  
                        if ($item['parent']!=$item['id']) {
 -                              $r = q("select id from item where parent=%s and id<%s order by id desc limit 1", 
 +                              $r = q("select id from item where parent=%s and id<%s order by id desc limit 1",
                                        intval($item['parent']), intval($item['id']));
                                if ($r)
                                        $in_reply_to_status_id = $r[0]['id'];
                                else
                                        $in_reply_to_status_id = $item['parent'];
  
 -                              $r = q("select `item`.`contact-id`, `contact`.nick, `item`.`author-name` from item, contact 
 +                              $r = q("select `item`.`contact-id`, `contact`.nick, `item`.`author-name` from item, contact
                                        where `contact`.`id` = `item`.`contact-id` and `item`.id=%d", intval($in_reply_to_status_id));
  
                                $in_reply_to_screen_name = $r[0]['author-name'];
                        else
                                $statustext = trim($statustitle."\n\n".$statusbody);
  
 +                      if (($item["network"] == NETWORK_FEED) and (strlen($statustext)> 1000))
 +                              $statustext = substr($statustext, 0, 1000)."... \n".$item["plink"];
 +
                        $status = array(
                                'text'          => $statustext,
                                'truncated' => False,