Browse Source

Merge remote-tracking branch 'upstream/master' into 1409-diaspora-repeated-twitter-cleanup

pull/1176/head
Michael Vogel 7 years ago
parent
commit
eb592030eb
  1. 25
      include/api.php
  2. 10440
      view/bg/messages.po
  3. 2892
      view/bg/strings.php
  4. 10586
      view/cs/messages.po
  5. 3054
      view/cs/strings.php
  6. 10590
      view/de/messages.po
  7. 2942
      view/de/strings.php
  8. 10435
      view/eo/messages.po
  9. 2942
      view/eo/strings.php
  10. 10516
      view/es/messages.po
  11. 2942
      view/es/strings.php
  12. 11019
      view/fr/messages.po
  13. 2942
      view/fr/strings.php
  14. 10228
      view/is/messages.po
  15. 2944
      view/is/strings.php
  16. 10558
      view/nb-no/messages.po
  17. 2942
      view/nb-no/strings.php
  18. 10554
      view/nl/messages.po
  19. 2942
      view/nl/strings.php
  20. 10384
      view/pl/messages.po
  21. 3054
      view/pl/strings.php
  22. 10558
      view/pt-br/messages.po
  23. 2942
      view/pt-br/strings.php
  24. 10612
      view/ro/messages.po
  25. 3054
      view/ro/strings.php
  26. 10580
      view/ru/messages.po
  27. 3054
      view/ru/strings.php
  28. 10600
      view/zh-cn/messages.po
  29. 2896
      view/zh-cn/strings.php

25
include/api.php

@ -26,6 +26,19 @@
return false;
}
function api_source() {
if (requestdata('source'))
return (requestdata('source'));
// Support for known clients that doesn't send a source name
if (strstr($_SERVER['HTTP_USER_AGENT'], "Twidere"))
return ("Twidere");
logger("Unrecognized user-agent ".$_SERVER['HTTP_USER_AGENT'], LOGGER_DEBUG);
return ("api");
}
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" );
@ -709,8 +722,6 @@
if($parent)
$_REQUEST['type'] = 'net-comment';
else {
// logger("api_statuses_update: upload ".print_r($_FILES, true)." ".print_r($_POST, true)." ".print_r($_GET, true), LOGGER_DEBUG);
//die("blubb");
$_REQUEST['type'] = 'wall';
if(x($_FILES,'media')) {
// upload the image if we have one
@ -726,8 +737,8 @@
$_REQUEST['api_source'] = true;
if (!isset($_REQUEST["source"]) OR ($_REQUEST["source"] == ""))
$_REQUEST["source"] = "api";
if (!x($_REQUEST, "source"))
$_REQUEST["source"] = api_source();
// call out normal post function
@ -1303,8 +1314,8 @@
$_REQUEST['type'] = 'wall';
$_REQUEST['api_source'] = true;
if (!isset($_REQUEST["source"]) OR ($_REQUEST["source"] == ""))
$_REQUEST["source"] = "api";
if (!x($_REQUEST, "source"))
$_REQUEST["source"] = api_source();
require_once('mod/item.php');
item_post($a);
@ -1393,7 +1404,7 @@
AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `item`.`parent` IN (SELECT `iid` from thread where uid = %d AND `mention`)
AND `item`.`parent` IN (SELECT `iid` from thread where uid = %d AND `mention` AND !`ignored`)
$sql_extra
AND `item`.`id`>%d
ORDER BY `item`.`id` DESC LIMIT %d ,%d ",

10440
view/bg/messages.po

File diff suppressed because it is too large

2892
view/bg/strings.php

File diff suppressed because it is too large

10586
view/cs/messages.po

File diff suppressed because it is too large

3054
view/cs/strings.php

File diff suppressed because it is too large

10590
view/de/messages.po

File diff suppressed because it is too large

2942
view/de/strings.php

File diff suppressed because it is too large

10435
view/eo/messages.po

File diff suppressed because it is too large

2942
view/eo/strings.php

File diff suppressed because it is too large

10516
view/es/messages.po

File diff suppressed because it is too large

2942
view/es/strings.php

File diff suppressed because it is too large

11019
view/fr/messages.po

File diff suppressed because it is too large

2942
view/fr/strings.php

File diff suppressed because it is too large

10228
view/is/messages.po

File diff suppressed because it is too large

2944
view/is/strings.php

File diff suppressed because it is too large

10558
view/nb-no/messages.po

File diff suppressed because it is too large

2942
view/nb-no/strings.php

File diff suppressed because it is too large

10554
view/nl/messages.po

File diff suppressed because it is too large

2942
view/nl/strings.php

File diff suppressed because it is too large

10384
view/pl/messages.po

File diff suppressed because it is too large

3054
view/pl/strings.php

File diff suppressed because it is too large

10558
view/pt-br/messages.po

File diff suppressed because it is too large

2942
view/pt-br/strings.php

File diff suppressed because it is too large

10612
view/ro/messages.po

File diff suppressed because it is too large

3054
view/ro/strings.php

File diff suppressed because it is too large

10580
view/ru/messages.po

File diff suppressed because it is too large

3054
view/ru/strings.php

File diff suppressed because it is too large

10600
view/zh-cn/messages.po

File diff suppressed because it is too large

2896
view/zh-cn/strings.php

File diff suppressed because it is too large
Loading…
Cancel
Save