Commit Graph

503 Commits

Author SHA1 Message Date
Michael 824141d3e5 Mails shouldn't be duplicated anymore when sending 2017-05-07 17:11:09 +00:00
Hypolite Petovan 86cae070f2 Merge branch 'develop' into improvement/move-app-to-src-2 2017-05-07 12:58:11 -04:00
Michael eb0a701590 Just some more fixes to the protocol and the avatar stuff 2017-05-07 15:58:32 +00:00
Michael ee817e81a2 Bugfix: Status messages had used the wrong field / rearranges parameter order 2017-05-07 14:36:50 +00:00
Michael aa88691bc1 Diaspora: Accept new Salmon format 2017-05-07 13:11:11 +00:00
Michael 65823fe28f Standards and documentation 2017-05-04 05:11:19 +00:00
Michael a9c263a375 Retraction does now work as well 2017-05-03 19:55:33 +00:00
Michael d7b56db996 Diaspora: Better handling for unrelayed comments and likes 2017-05-03 19:28:51 +00:00
Michael e1ab0c9475 Now comments are really working 2017-05-03 05:22:39 +00:00
Hypolite Petovan 1d427aa214 Standards: Remove EOF closing PHP tags 2017-05-02 23:36:56 -04:00
Hypolite Petovan 20043914e6 Move App to src
- Add `use Friendica\App;` wherever needed
2017-05-02 22:59:36 -04:00
Hypolite Petovan 56ee734b00 Cleanup /format pre-move 2017-05-02 22:59:24 -04:00
Michael 83e50385a8 Hopefully this fixes the workflow 2017-05-02 21:06:56 +00:00
Michael 99a54df8d8 Follow up for PR 3421 - some improvements 2017-05-02 19:48:11 +00:00
Michael f639a86d02 Comments from unknown people never reached us 2017-05-02 18:42:01 +00:00
Michael 7240b2198b Missed protocol ... 2017-04-28 06:03:04 +00:00
Michael 35dc56c9c2 Salmons with Mastodon seem to work now 2017-04-27 20:38:46 +00:00
Roland Haeder ec57babf89
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-20 22:59:08 +02:00
Alexandre Alapetite d2901dcb00 Fix for MySQL 5.7+
https://github.com/friendica/friendica/issues/2786

Only tested on Ubuntu 16.10 with MySQL 5.7.17.

https://dev.mysql.com/doc/refman/8.0/en/timestamp-initialization.html

https://dev.mysql.com/doc/refman/8.0/en/sql-mode.html#sqlmode_no_zero_date
As of MySQL 5.7.4, NO_ZERO_DATE is deprecated.

Patch based on the following search & replace (and then reverting some
changes in libraries):

```sh
grep -l '= "0000-00-00"' -r . | xargs sed -i -e "s/= \"0000-00-00\"/=
'0000-00-00'/g"

grep -l "0000-00-00" -r . | xargs sed -i -e "s/0000-00-00/0001-01-01/g"

grep -l "!= '0001-01-01'" -r . | xargs sed -i -e "s/!= '0001-01-01'/>
'0001-01-01'/g"

grep -l " === '0001-01-01'" -r . | xargs sed -i -e "s/ === '0001-01-01'/
<= '0001-01-01'/g"

grep -l " == '0001-01-01'" -r . | xargs sed -i -e "s/ == '0001-01-01'/
<= '0001-01-01'/g"

grep -l "strpos(\$dob, '0000-') === 0" -r . | xargs sed -i -e
"s/strpos(\$dob, '0000-') === 0/strpos(\$dob, '0000-') === 0 ||
strpos(\$dob, '0001-') === 0/g"

grep -l 'array("", "0001-01-01")' -r . | xargs sed -i -e 's/array("",
"0001-01-01")/array("", "0000-00-00", "0001-01-01")/g'

grep -l "\$dob = '0000-'" -r . | xargs sed -i -e "s/\$dob =
'0000-'/\$dob = '0001-'/g"
```
2017-04-11 23:00:45 +02:00
Michael f6d7ee2781 Issue 3142: mcrypt is no more (as well as phpseclib) 2017-04-01 08:28:42 +00:00
Michael 3796a141c6 We don't need this include anymore 2017-03-31 06:25:48 +00:00
Michael 1560534621 Now it's openssl - and no copy&paste failure anymore 2017-03-31 06:22:43 +00:00
Michael 973fcd3624 Test with OpenSSL 2017-03-30 23:21:52 +00:00
Michael 54c8fb2bb8 Replaces mcrypt with phpsec. 2017-03-30 18:29:12 +00:00
Michael bc517ef3d2 Remove reduncancies 2017-03-22 05:26:44 +00:00
Hypolite Petovan 7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Roland Häder 951006dd10
more spaces + some curly spaces added
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:51:54 +01:00
Roland Häder 41a36606c6
added spaces + some curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:50:19 +01:00
Michael e5e6f4fd19 Better logging to analyze unwanted messages from Diaspora 2017-02-11 23:37:15 +00:00
Michael 40390cc5ec Diaspora Relay: Only accept postings from anyone when the relay is configured 2017-02-10 20:45:22 +00:00
Michael a9833a395f The relay query now uses a better index 2017-01-13 10:37:39 +00:00
rabuzarus 0e64d462df diaspora - add braces 2017-01-11 13:02:18 +01:00
rabuzarus 2daa0936db diaspora - switch logger for "non subscribed messages" to LOGGER_DEBUG 2017-01-11 12:45:25 +01:00
Michael ed0143c9f0 Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 16:13:57 +00:00
Michael c2543f918b Last minutes changes 2017-01-07 13:52:30 +00:00
Michael cb5df4d715 Some corrections 2017-01-06 13:30:12 +00:00
Michael 44d966574d Some more indexes and other query improvements 2017-01-04 19:13:50 +00:00
Roland Haeder 9ca789b952
Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-31 17:59:14 +01:00
Michael 4053499c38 Enable caching wirh comments 2016-12-30 23:18:31 +00:00
Michael 66902c7956 We now also transmit Dislikes 2016-12-30 22:40:30 +00:00
Michael 7cf70b64b8 We now send the participation message as well. 2016-12-30 22:31:21 +00:00
Michael 4928d00e22 Standard stuff 2016-12-30 10:03:02 +00:00
Michael 55ee80338f Events are now shared with Diaspora. 2016-12-30 03:31:38 +00:00
Michael 94977cca18 Events are now done. 2016-12-29 23:27:11 +00:00
Michael 666eb2ddbd Merge branch '1612-diaspora' of github.com:annando/friendica into 1612-diaspora 2016-12-29 17:13:07 +00:00
Michael 9af3f5b0da Improved loggin 2016-12-29 17:11:59 +00:00
Michael 483f34c4ce We now transmit event data as well 2016-12-29 03:13:57 +00:00
Michael ca0e6cba02 Relaying of Diaspora comments now work with the new fields as well. 2016-12-28 13:30:55 +00:00
Michael 6a511066c4 Threaded comments will now be transmitted 2016-12-27 14:37:48 +00:00
Michael ce4c542e37 Support for threaded comments 2016-12-27 12:59:15 +00:00
Roland Häder 20e71d21a6 Merge branch 'rewrites/app_get_baseurl_static' into develop
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/editpost.php
	mod/events.php
	mod/install.php
	mod/lostpass.php
	mod/network.php
	mod/notify.php
	mod/suggest.php
	mod/uexport.php
	mod/videos.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
2016-12-22 11:37:23 +01:00
Roland Häder ad20c5504d Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
2016-12-22 11:33:00 +01:00
Roland Häder c0df692f5f Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
2016-12-22 11:29:56 +01:00
Hypolite Petovan 769b849665 url_from_contact_guid: move network constant to arg list 2016-12-20 20:52:42 -05:00
Roland Haeder 6c0c9d542a
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:16:49 +01:00
Roland Haeder af2909bf8f
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:13:50 +01:00
Hypolite Petovan b631442760 Misc changes to url_from_contact_guid
- Rename url_from_fcontact_guid to url_from_fcontact_guid
- Use network name constant
- Standards
2016-12-20 14:33:33 -05:00
Hypolite Petovan e8e1f9253d Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links
# Conflicts:
#	include/follow.php
2016-12-20 12:50:36 -05:00
Hypolite Petovan 177f93f9a5 diaspora.php: Standards, standards everywhere 2016-12-20 12:49:50 -05:00
Hypolite Petovan 155e777d19 replace_people_guid: Break down nested calls
- Fix typo in function name
- Fix arguments
- Simplify url_from_fcontact_guid
2016-12-20 12:49:32 -05:00
Hypolite Petovan 4a7c3b9eef Diaspora: Fix class name case + add self 2016-12-20 12:44:15 -05:00
Michael 4aafbb09a5 The object type "photo" is deprecated and was replaced by "image"
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/like.php
	mod/photos.php
	mod/subthread.php
2016-12-20 16:00:23 +01:00
Tobias Diekershoff cc16369b6f Merge pull request #3033 from annando/1612-object-type
The object type "photo" is deprecated and was replaced by "image"
2016-12-20 15:44:07 +01:00
Michael 6e46987515 The object type "photo" is deprecated and was replaced by "image" 2016-12-20 07:10:47 +00:00
Hypolite Petovan 81d003cad1 Diaspora: Complete /people/* links from fcontact or author domain 2016-12-19 23:30:50 -05:00
Roland Häder a905522eb5 Cleanup for #3010 - added spaces, thanks to @annando .
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:42:36 +01:00
Roland Häder 63610c7b73 Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/Photo.php
	include/api.php
	include/cache.php
	include/dbstructure.php
	include/enotify.php
	include/items.php
	include/onepoll.php
	include/queue_fn.php
	include/session.php
	include/text.php
	mod/contacts.php
	mod/dfrn_request.php
	mod/display.php
	mod/events.php
	mod/item.php
	mod/message.php
	mod/msearch.php
	mod/photos.php
	mod/poco.php
	mod/profile.php
	mod/proxy.php
	mod/videos.php
	update.php
	view/theme/diabook/theme.php
	view/theme/vier/theme.php
2016-12-13 11:00:44 +01:00
Michael 89d5aa64ba Mark contacts as dead or undead while transmitting and receiving messages 2016-11-19 20:10:29 +00:00
Michael e925c4139c Some documentation 2016-11-13 18:28:55 +00:00
Michael 26936755d9 Bugfix: Locations without coordinates aren't good for Diaspora 2016-11-13 17:42:26 +00:00
Roland Haeder c825cc8d0d
This merge brings back dbm::is_result() where I could find it.
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-18 23:21:18 +02:00
Michael Vogel 80bfcc7694 The handle (user@domain.tld) for Diaspora contacts must always be lowercase 2016-08-23 07:48:48 +02:00
Michael Vogel 0cba02a805 Added priority to some forgotten proc_run calls 2016-08-03 18:24:22 +02:00
Michael Vogel 1603aa41ef Bugfix: There was an SQL error when adding new entries in the fcontact table 2016-07-15 17:25:30 +02:00
Michael Vogel 2c5fb55725 Diaspora: Link to protocol description added. Support for creation date of comments 2016-07-14 07:20:20 +02:00
Tobias Diekershoff 26098fa263 Merge pull request #2671 from annando/1607-diaspora-soapbox-connect
Bugfix: Diaspora connect requests to soapbox account work now
2016-07-10 13:55:56 +02:00
Michael Vogel 9ac26802ce Diaspora: Send the profile data after a successful connect 2016-07-10 13:11:09 +02:00
Michael Vogel 19377f2a9c Just make the bugfix a little bit simpler 2016-07-10 12:18:10 +02:00
Michael Vogel 84aa01b377 Bugfix: Diaspora connects to a Soapbox account weren't established correctly 2016-07-10 12:09:58 +02:00
Michael Vogel e43a90252c Diaspora: Relayed retraction hadn't worked. 2016-07-08 20:39:14 +02:00
Michael Vogel c1ce7059b6 If it doesn't work with the new method, try the old one 2016-06-30 22:58:56 +02:00
Michael Vogel e5dd67121f Some logging added. 2016-06-30 22:42:46 +02:00
Michael Vogel 97abbe83f4 Diaspora: Support for reading the /fetch/post/ functionality 2016-06-30 22:18:48 +02:00
Michael Vogel 24e0fffa2e Small bugfix 2016-06-30 07:56:06 +02:00
Michael Vogel d125939888 Just some more centralised functionality 2016-06-30 07:46:00 +02:00
Michael Vogel 99f0746660 Cleaned up the code 2016-06-30 07:32:07 +02:00
Michael Vogel 2c7fd1cb3c It should be now valid 2016-06-30 01:18:44 +02:00
Michael Vogel 2d72e2d932 Diaspora: Support for new fetch functionality (replacement for /p/) 2016-06-29 22:50:30 +02:00
Michael Vogel 230a645307 Diaspora: Another Bugfix for the new protocol 2016-06-29 20:37:04 +02:00
Michael Vogel 152efdaec5 Diaspora: Incompatibilities with signature check solved 2016-06-29 10:33:43 +02:00
Michael Vogel 0b1188b7fe Imrpoved avatar handling when storing them/partly use of "micro" 2016-06-25 13:56:55 +02:00
Michael Vogel a657377616 Diaspora: Try to fetch the uri if we already received the message 2016-06-20 22:48:55 +02:00
Michael Vogel 40a44f1571 Some manual revert ... 2016-06-20 22:48:09 +02:00
Michael Vogel 467176fa65 Diaspora: Ensure that we always store the correct URI 2016-06-20 22:43:14 +02:00
Michael Vogel ea78f63eac Diaspora: Reshares of non native reshares now look better 2016-05-06 08:22:27 +02:00
Michael Vogel fbc5404522 DFRN: "Hidewall" is now transmitted, "hide" is respected in dfrn and ostatus. 2016-05-04 23:21:30 +02:00
Michael Vogel 761fa37f94
Diaspora: Comments and Likes are now signed at any time 2016-05-01 13:48:52 +02:00
Michael Vogel 0e79f8cbca
Some small Diaspora changes 2016-05-01 13:48:52 +02:00
Michael Vogel 535f382c4e
Bugfix: "default_group" behaviour wasn't implemented correctly 2016-05-01 13:47:24 +02:00
Michael Vogel 0bf076ecc0
Some changed doxygen header stuff 2016-05-01 13:47:24 +02:00