bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
Friendika 2011-08-28 05:05:32 -07:00
commit 030dcbd467
3 changed files with 80 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
include/api.php
View file

@ -1,6 +1,7 @@
<?php <?php
require_once("bbcode.php"); require_once("bbcode.php");
require_once("datetime.php"); require_once("datetime.php");
require_once("conversation.php");
/* /*
* Twitter-Like API * Twitter-Like API
@ -8,7 +9,7 @@
*/ */
$API = Array(); $API = Array();
$called_api = Null;
function api_date($str){ function api_date($str){
//Wed May 23 06:01:13 +0000 2007 //Wed May 23 06:01:13 +0000 2007
@ -103,9 +104,10 @@
* MAIN API ENTRY POINT * * MAIN API ENTRY POINT *
**************************/ **************************/
function api_call(&$a){ function api_call(&$a){
GLOBAL $API; GLOBAL $API, $called_api;
foreach ($API as $p=>$info){ foreach ($API as $p=>$info){
if (strpos($a->query_string, $p)===0){ if (strpos($a->query_string, $p)===0){
$called_api= explode("/",$p);
#unset($_SERVER['PHP_AUTH_USER']); #unset($_SERVER['PHP_AUTH_USER']);
if ($info['auth']===true && local_user()===false) { if ($info['auth']===true && local_user()===false) {
api_login($a); api_login($a);
@ -131,7 +133,7 @@
return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r; return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
break; break;
case "json": case "json":
header ("Content-Type: application/json"); //header ("Content-Type: application/json");
foreach($r as $rr) foreach($r as $rr)
return json_encode($rr); return json_encode($rr);
break; break;
@ -193,6 +195,7 @@
* Returns user info array. * Returns user info array.
*/ */
function api_get_user(&$a, $contact_id = Null){ function api_get_user(&$a, $contact_id = Null){
global $called_api;
$user = null; $user = null;
$extra_query = ""; $extra_query = "";
@ -209,16 +212,20 @@
if(is_null($user) && x($_GET, 'screen_name')) { if(is_null($user) && x($_GET, 'screen_name')) {
$user = dbesc($_GET['screen_name']); $user = dbesc($_GET['screen_name']);
$extra_query = "AND `contact`.`nick` = '%s' "; $extra_query = "AND `contact`.`nick` = '%s' ";
if (local_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(local_user());
} }
if (is_null($user) && $a->argc > 3){ if (is_null($user) && $a->argc > (count($called_api)-1)){
list($user, $null) = explode(".",$a->argv[3]); $argid = count($called_api);
list($user, $null) = explode(".",$a->argv[$argid]);
if(is_numeric($user)){ if(is_numeric($user)){
$user = intval($user); $user = intval($user);
$extra_query = "AND `contact`.`id` = %d "; $extra_query = "AND `contact`.`id` = %d ";
} else { } else {
$user = dbesc($user); $user = dbesc($user);
$extra_query = "AND `contact`.`nick` = '%s' "; $extra_query = "AND `contact`.`nick` = '%s' ";
if (local_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(local_user());
} }
} }
@ -301,6 +308,7 @@
} }
$ret = Array( $ret = Array(
'self' => intval($uinfo[0]['self']),
'uid' => intval($uinfo[0]['uid']), 'uid' => intval($uinfo[0]['uid']),
'id' => intval($uinfo[0]['cid']), 'id' => intval($uinfo[0]['cid']),
'name' => $uinfo[0]['name'], 'name' => $uinfo[0]['name'],
@ -321,7 +329,7 @@
'followers_count' => intval($countfollowers), 'followers_count' => intval($countfollowers),
'favourites_count' => intval($starred), 'favourites_count' => intval($starred),
'contributors_enabled' => false, 'contributors_enabled' => false,
'follow_request_sent' => false, 'follow_request_sent' => true,
'profile_background_color' => 'cfe8f6', 'profile_background_color' => 'cfe8f6',
'profile_text_color' => '000000', 'profile_text_color' => '000000',
'profile_link_color' => 'FF8500', 'profile_link_color' => 'FF8500',
@ -616,6 +624,7 @@
$user_info = api_get_user($a); $user_info = api_get_user($a);
// get last newtork messages // get last newtork messages
// params // params
$count = (x($_REQUEST,'count')?$_REQUEST['count']:20); $count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
@ -664,6 +673,12 @@
$user_info = api_get_user($a); $user_info = api_get_user($a);
// get last newtork messages // get last newtork messages
logger("api_statuses_user_timeline: local_user: ". local_user() .
"\nuser_info: ".print_r($user_info, true) .
"\n_REQUEST: ".print_r($_REQUEST, true),
LOGGER_DEBUG);
// params // params
$count = (x($_REQUEST,'count')?$_REQUEST['count']:20); $count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
@ -672,6 +687,7 @@
$start = $page*$count; $start = $page*$count;
if ($user_info['self']==1) $sql_extra = "AND `item`.`wall` = 1 ";
$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`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@ -679,14 +695,15 @@
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM `item`, `contact` FROM `item`, `contact`
WHERE `item`.`uid` = %d WHERE `item`.`uid` = %d
AND `item`.`contact-id` = %d
AND `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `item`.`wall` = 1
AND `contact`.`id` = `item`.`contact-id` AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra $sql_extra
AND `item`.`id`>%d AND `item`.`id`>%d
ORDER BY `item`.`received` DESC LIMIT %d ,%d ", ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
intval($user_info['uid']), intval(local_user()),
intval($user_info['id']),
intval($since_id), intval($since_id),
intval($start), intval($count) intval($start), intval($count)
); );
@ -711,33 +728,41 @@
if (local_user()===false) return false; if (local_user()===false) return false;
$user_info = api_get_user($a); $user_info = api_get_user($a);
// get last newtork messages // in friendika starred item are private
// return favorites only for self
logger('api_favorites: self:' . $user_info['self']);
// params if ($user_info['self']==0) {
$count = (x($_GET,'count')?$_GET['count']:20); $ret = array();
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); } else {
if ($page<0) $page=0;
$start = $page*$count;
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, // params
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, $count = (x($_GET,'count')?$_GET['count']:20);
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` if ($page<0) $page=0;
FROM `item`, `contact`
WHERE `item`.`uid` = %d
AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `item`.`starred` = 1
AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
intval($user_info['uid']),
intval($start), intval($count)
);
$ret = api_format_items($r,$user_info); $start = $page*$count;
$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`
FROM `item`, `contact`
WHERE `item`.`uid` = %d
AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `item`.`starred` = 1
AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
intval($user_info['uid']),
intval($start), intval($count)
);
$ret = api_format_items($r,$user_info);
}
$data = array('$statuses' => $ret); $data = array('$statuses' => $ret);
switch($type){ switch($type){
@ -762,6 +787,7 @@
$ret = Array(); $ret = Array();
foreach($r as $item) { foreach($r as $item) {
localize_item($item);
$status_user = (($item['cid']==$user_info['id'])?$user_info: api_item_get_user($a,$item)); $status_user = (($item['cid']==$user_info['id'])?$user_info: api_item_get_user($a,$item));
$status = array( $status = array(
'created_at'=> api_date($item['created']), 'created_at'=> api_date($item['created']),
@ -819,15 +845,21 @@
if (local_user()===false) return false; if (local_user()===false) return false;
$user_info = api_get_user($a); $user_info = api_get_user($a);
// friends and followers only for self
if ($user_info['self']==0){
return false;
}
if (x($_GET,'cursor') && $_GET['cursor']=='undefined'){ if (x($_GET,'cursor') && $_GET['cursor']=='undefined'){
/* this is to stop Hotot to load friends multiple times /* this is to stop Hotot to load friends multiple times
* I'm not sure if I'm missing return something or * I'm not sure if I'm missing return something or
* is a bug in hotot. Workaround, meantime * is a bug in hotot. Workaround, meantime
*/ */
$ret=Array(); /*$ret=Array();
$data = array('$users' => $ret); return array('$users' => $ret);*/
return api_apply_template("friends", $type, $data); return false;
} }
if($qtype == 'friends') if($qtype == 'friends')
@ -845,15 +877,18 @@
} }
$data = array('$users' => $ret); return array('$users' => $ret);
return api_apply_template("friends", $type, $data);
} }
function api_statuses_friends(&$a, $type){ function api_statuses_friends(&$a, $type){
return api_statuses_f($a,$type,"friends"); $data = api_statuses_f($a,$type,"friends");
if ($data===false) return false;
return api_apply_template("friends", $type, $data);
} }
function api_statuses_followers(&$a, $type){ function api_statuses_followers(&$a, $type){
return api_statuses_f($a,$type,"followers"); $data = api_statuses_f($a,$type,"followers");
if ($data===false) return false;
return api_apply_template("friends", $type, $data);
} }
api_register_func('api/statuses/friends','api_statuses_friends',true); api_register_func('api/statuses/friends','api_statuses_friends',true);
api_register_func('api/statuses/followers','api_statuses_followers',true); api_register_func('api/statuses/followers','api_statuses_followers',true);

6
view/it/messages.po
View file

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: friendika\n" "Project-Id-Version: friendika\n"
"Report-Msgid-Bugs-To: http://bugs.friendika.com/\n" "Report-Msgid-Bugs-To: http://bugs.friendika.com/\n"
"POT-Creation-Date: 2011-08-14 21:17-0700\n" "POT-Creation-Date: 2011-08-14 21:17-0700\n"
"PO-Revision-Date: 2011-08-17 17:49+0000\n" "PO-Revision-Date: 2011-08-26 14:28+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n" "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.net/projects/p/friendika/team/it/)\n" "Language-Team: Italian (http://www.transifex.net/projects/p/friendika/team/it/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -2158,7 +2158,7 @@ msgstr "Regitrati"
#: ../../include/diaspora.php:446 ../../include/conversation.php:26 #: ../../include/diaspora.php:446 ../../include/conversation.php:26
#: ../../include/conversation.php:35 #: ../../include/conversation.php:35
msgid "status" msgid "status"
msgstr "stato" msgstr "lo stato"
#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:958 #: ../../mod/like.php:127 ../../addon/facebook/facebook.php:958
#: ../../include/diaspora.php:463 ../../include/conversation.php:43 #: ../../include/diaspora.php:463 ../../include/conversation.php:43
@ -4420,7 +4420,7 @@ msgstr "Hai un nuovo seguace su "
#: ../../include/conversation.php:23 #: ../../include/conversation.php:23
msgid "event" msgid "event"
msgstr "evento" msgstr "l'evento"
#: ../../include/conversation.php:213 ../../include/conversation.php:488 #: ../../include/conversation.php:213 ../../include/conversation.php:488
#: ../../include/conversation.php:489 #: ../../include/conversation.php:489

4
view/it/strings.php
View file

@ -459,7 +459,7 @@ $a->strings["Your Email Address: "] = "Il tuo Indirizzo Email: ";
$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Scegli un soprannome. Deve cominciare con un carattere. L'indirizzo del tuo profilo sarà '<strong>soprannome@\$sitename</strong>'."; $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Scegli un soprannome. Deve cominciare con un carattere. L'indirizzo del tuo profilo sarà '<strong>soprannome@\$sitename</strong>'.";
$a->strings["Choose a nickname: "] = "Scegli un soprannome: "; $a->strings["Choose a nickname: "] = "Scegli un soprannome: ";
$a->strings["Register"] = "Regitrati"; $a->strings["Register"] = "Regitrati";
$a->strings["status"] = "stato"; $a->strings["status"] = "lo stato";
$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s piace %3\$s di %2\$s"; $a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s piace %3\$s di %2\$s";
$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s non piace %3\$s di %2\$s"; $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s non piace %3\$s di %2\$s";
$a->strings["This is Friendika version"] = "Questo è Friendika versione"; $a->strings["This is Friendika version"] = "Questo è Friendika versione";
@ -985,7 +985,7 @@ $a->strings["show"] = "mostra";
$a->strings["don't show"] = "non mostrare"; $a->strings["don't show"] = "non mostrare";
$a->strings["(no subject)"] = "(nessun oggetto)"; $a->strings["(no subject)"] = "(nessun oggetto)";
$a->strings["You have a new follower at "] = "Hai un nuovo seguace su "; $a->strings["You have a new follower at "] = "Hai un nuovo seguace su ";
$a->strings["event"] = "evento"; $a->strings["event"] = "l'evento";
$a->strings["View %s's profile"] = "Vedi il profilo di %s"; $a->strings["View %s's profile"] = "Vedi il profilo di %s";
$a->strings["%s from %s"] = "%s da %s"; $a->strings["%s from %s"] = "%s da %s";
$a->strings["View in context"] = "Vedi nel contesto"; $a->strings["View in context"] = "Vedi nel contesto";