Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-09-21 23:25:11 +00:00
Code Issues Projects Releases Packages Wiki Activity
15912 commits 2 branches 64 tags 236 MiB
Commit graph

5594 commits

Author SHA1 Message Date
Roland Haeder
701e761c68
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-05-16 14:37:12 +02:00
Hypolite Petovan
48e3f4f47f Merge pull request #3465 from annando/bugfix-dba-1 
Bugfix: dba::num_rows hadn't checked the object variable
 2017-05-16 02:05:16 -04:00
Michael
41f94a62fc Spelling 2017-05-16 06:00:01 +00:00
Michael
124690cc4d dba: Beautification is now a separate function 2017-05-15 21:06:17 +00:00
Michael
875592f285 API: Direct Messages via the API now work again. 2017-05-15 20:11:33 +00:00
Michael
83e4141639 Bugfix: dba::num_rows hadn't checked the object variable 2017-05-15 15:17:38 +00:00
Michael
05c890f256 Bugfix: The commit in dba::delete was never executed 2017-05-14 07:01:38 +00:00
Michael
e884090efa Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba 
Conflicts:
	include/uimport.php
 2017-05-13 04:13:07 +00:00
Michael
74a0a92742 Just some more dba::delete 2017-05-13 04:04:17 +00:00
Hypolite Petovan
2bbcbdc704 Merge pull request #3381 from Quix0r/rewrites/coding-convention-split2-4-2 
Coding convention applied split 2-4-2 (of 2-14-2)
 2017-05-12 21:40:30 -04:00
Roland Häder
cc4b481bc9
fixed parser error, need parentheses 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-12 21:02:58 +02:00
Michael
2b180d7804 Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba 2017-05-12 16:12:00 +00:00
Michael
377fe31907 dba functions in poller / avoiding SQL errors in conversation / dbclean is better 2017-05-12 16:09:25 +00:00
Hypolite Petovan
06ea23665c Merge pull request #3460 from annando/1705-dbclean 
dbclean is now using the new database functions
 2017-05-12 11:45:27 -04:00
Michael
acd9f453d7 And another one 2017-05-12 06:55:04 +00:00
Michael
58b2b1dbef Some more cleaner delete 2017-05-12 06:30:45 +00:00
Michael
11e524a555 This item removal is much more cleaner 2017-05-12 06:17:48 +00:00
Michael
c00a5223d6 Removed code from the pre worker era. 2017-05-12 04:33:52 +00:00
Hypolite Petovan
4293e27d5c Improved usage of use in dba_pdo 2017-05-11 23:05:49 -04:00
Hypolite Petovan
c0a6f1122b Removed useless usage of use 2017-05-11 23:01:49 -04:00
Michael
c52f7657ab Now it should work 2017-05-11 20:19:43 +00:00
Michael
6ef24890bb dbclean is now using the new database functions / new functions for commit, rollback and transaction 2017-05-11 20:13:45 +00:00
Hypolite Petovan
39f894bd4a Use use instead of \ 2017-05-11 11:53:04 -04:00
Roland Häder
7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2 
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-11 14:54:26 +02:00
Hypolite Petovan
6f6b029c4d Merge pull request #3456 from annando/1704-mastodon-html 
HTML for OStatus posts look better (in Mastodon and GNU Social)
 2017-05-08 16:54:45 -04:00
Michael
3db3d2f1f7 This should make posts fine on GNU Social as well 2017-05-08 19:11:47 +00:00
Michael
f602ec30cc Shared links create now a better HTML 2017-05-08 18:11:37 +00:00
Michael
722e03cc58 Added documentation 2017-05-08 17:29:46 +00:00
Michael
aa4eafc304 Even better? 2017-05-08 14:31:37 +00:00
rabuzarus
cc8a3a4101 rename methods of the Probe class to camelCase 2017-05-08 16:19:10 +02:00
Michael
5abef34284 Should work now ... 2017-05-08 14:02:32 +00:00
Michael
3f975f6751 More URL can be styled 2017-05-08 12:35:44 +00:00
Michael
2002fc8a2a Better design for links in Mastodon posts 2017-05-08 12:18:30 +00:00
Tobias Diekershoff
1f58bcc114 Merge pull request #3418 from gerhard6380/develop 
New API calls for photo management
 2017-05-08 06:56:24 +02:00
Michael Vogel
6680ce1dd7 Merge pull request #3445 from Hypolite/improvement/move-probe-to-src 
Move Probe to src
 2017-05-07 23:14:22 +02:00
Hypolite Petovan
45ec3fb5d8 Add missing include/probe require for probe_url support 2017-05-07 17:08:32 -04:00
Michael
2c11e91e65 The first queries are replaced with the new functions. More to come ... 2017-05-07 20:52:00 +00:00
Hypolite Petovan
92550861e9 Updated doc in include/probe.php 
- Fix standards
 2017-05-07 15:00:38 -04:00
Hypolite Petovan
3a2988c3fd Rename include/Scrape to include/probe 2017-05-07 14:45:19 -04:00
Hypolite Petovan
36e515ee6d Move Probe to src 2017-05-07 14:44:30 -04:00
Hypolite Petovan
82b423c5ac Fix require_once format 2017-05-07 14:40:23 -04:00
Hypolite Petovan
1c38540f20 Merge pull request #3444 from annando/1705-mail-duplicates 
Mails shouldn't be duplicated anymore when sending
 2017-05-07 13:45:34 -04:00
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
Hypolite Petovan
12cc5f8360 Merge pull request #3443 from annando/1705-diaspora-new-salmon 
Diaspora: Accept new Salmon format
 2017-05-07 12:56:12 -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 Vogel
9c3e968581 Merge pull request #3442 from Alkarex/any_value_dbstructure 
Fix GROUP BY in dbstructure
 2017-05-07 12:16:10 +02:00
Alexandre Alapetite
354531bfa6 Generate field_list only when needed 
https://github.com/friendica/friendica/pull/3442/files#r115137722
 2017-05-07 11:07:34 +02:00
Alexandre Alapetite
f838430535 Fix GROUP BY in dbstructure 
https://github.com/friendica/friendica/issues/3440
 2017-05-07 10:53:38 +02:00
Michael
054e40de65 And another one 2017-05-07 08:18:50 +00:00
Michael
7a3bdbfc15 Wrong parameter for delete command 2017-05-07 08:12:36 +00:00
Michael
8dd8936dd0 DESC should be ASC - this is more logically. 2017-05-06 12:46:31 +00:00
Michael
3ca70e6362 New function "dba::select" to fetch table rows 2017-05-06 11:32:18 +00:00
Hypolite Petovan
a849a25470 Merge pull request #3433 from annando/1705-check_server 
Set "last_failure" on connection timeout when checking server
 2017-05-05 21:41:52 -04:00
Hypolite Petovan
96fb743364 Merge pull request #3434 from annando/1705-unique-index 
Some useful unique indexes
 2017-05-05 21:41:19 -04:00
Hypolite Petovan
3f4502155d Merge pull request #3432 from annando/1705-api 
Twidere reported error 501 when accessing a profile
 2017-05-05 17:57:30 -04:00
Michael
6a594ca8a9 Some useful unique indexes 2017-05-05 21:55:19 +00:00
Michael
9ab0a9299e Set "last_failure" on connection timeout when checking server 2017-05-05 20:51:45 +00:00
Hypolite Petovan
b9d64be59f Merge pull request #3431 from annando/issue-3318 
Issue 3318: Make sure that we fetch an author
 2017-05-05 16:38:59 -04:00
Michael
f132e27bc9 Twidere reported error 501 when accessing a profile 2017-05-05 20:36:56 +00:00
gerhard6380
877ecf6d04 changed sql for photo table from to avoid memory issues on large photo tables 2017-05-05 22:29:25 +02:00
Michael
30476623c5 Issue 3318: Make sure that we fetch an author 2017-05-05 19:41:41 +00:00
Michael
e11ff8bde5 Issue 3428: Autocompletion now always show user@domain.tld 2017-05-05 11:55:01 +00:00
Michael
8d97bc61f5 Mastodon now does return a version number 2017-05-05 05:36:43 +00:00
Hypolite Petovan
0c64178de7 Merge pull request #3426 from annando/1705-diaspora-again 
Diaspora: Better handling for unrelayed comments and likes
 2017-05-04 03:33:13 -04: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
353074850e It is now possible to connect to a db server with host:port 2017-05-03 19:22:44 +00:00
Michael
e1ab0c9475 Now comments are really working 2017-05-03 05:22:39 +00:00
Hypolite Petovan
569cd459ec Add basepath to App 2017-05-02 23:37:57 -04:00
Hypolite Petovan
3437e73ae4 Yet more standards 2017-05-02 23:37:50 -04:00
Hypolite Petovan
70563e0324 Minor fixes, including overzealous replacement of app -> App 2017-05-02 23:37:30 -04:00
Hypolite Petovan
ce866ad39b Remove unrecommended leading backslash for fully qualified namespaces 2017-05-02 23:37:06 -04:00
Hypolite Petovan
1d427aa214 Standards: Remove EOF closing PHP tags 2017-05-02 23:36:56 -04:00
Hypolite Petovan
4b16de6d80 Fix wrong class name case 
- Use leading backslash for non-namespace class names in App
 2017-05-02 23:36:46 -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
b767a47527 PR 3419: Avoid problems with PHP7 and dba.php 2017-05-02 10:47:53 +00:00
Tobias Diekershoff
5ef44ad71b Merge pull request #3415 from annando/1704-db-relation 
New function to recursively delete data
 2017-05-02 08:37:06 +02:00
gerhard6380
38f476eedb end code with exception where cause is not clear should better be thrown as 500 InternalServerError instead of 400 BadRequest as the request was ok (all checks before passed). 2017-05-02 01:16:54 +02:00
Michael
d106ff5086 Error reporting hadn't worked for the new functions 2017-05-01 21:38:37 +00:00
gerhard6380
6a4d1fca88 change line endings to unix 2017-05-01 22:19:48 +02:00
gerhard6380
cd2ed72b37 coding convention applied 2017-05-01 22:16:22 +02:00
gerhard6380
a2ccdf1fec coding conventions applied 2017-05-01 22:05:33 +02:00
Michael
0241a88c0d Avoid duplicated queries 2017-05-01 19:54:08 +00:00
Michael
b9b43e30e6 Delete queries are now split into chunks. 2017-05-01 17:42:37 +00:00
gerhard6380
8d95e4ffc8 remove "not implemented by now" comment for update_profile_image 2017-05-01 16:48:45 +02:00
gerhard6380
2275fecec0 line breaks by mistake reversed 2017-05-01 16:47:17 +02:00
gerhard6380
e267d07c91 change line endings from VS 2017-05-01 16:45:22 +02:00
gerhard6380
5b35901716 new api calls for photo management within clients 2017-05-01 16:38:39 +02:00
Michael
e90ae79d35 The number of queries is reduced dramatically 2017-05-01 09:34:15 +00:00
Michael
e6cbe3be11 This is better 2017-05-01 06:35:41 +00:00
Michael
0d7996d852 Only fetch the rows when needed 2017-05-01 05:45:36 +00:00
Michael
f1c53530a1 Add a missing relation 2017-04-30 20:19:47 +00:00
Michael
c2820c452f Delete now works 2017-04-30 19:54:41 +00:00
Thomas Willingham
7177cc3858 Accidentally included a self-loathing verb. 2017-04-30 11:16:04 +01:00
Thomas Willingham
6eff506cdd Add the dlogger 2017-04-30 11:14:38 +01:00
Michael
44beb62e5a Added information about table relations 2017-04-29 23:33:02 +00:00
Hypolite Petovan
9ff4fed7d2 Merge pull request #3408 from annando/1704-conversation-2 
Conversation data is stored for own posts as well/improved function dba:update
 2017-04-29 16:37:53 -04:00
Michael
9d9909cf10 Some more places were we check now 2017-04-29 17:45:09 +00:00
Michael
715e15cbe1 There is now a memory limit for the poller 2017-04-29 17:36:46 +00:00
Michael
10ea759282 Don't update the conversation only because the source changed 2017-04-29 08:30:43 +00:00
Michael
0e4cd900d5 Improved dba:update function. 2017-04-29 07:50:09 +00:00
Michael
edbbdf9761 Store conversation data for self created posts as well 2017-04-29 05:44:13 +00:00
Michael
c0b5339691 There is now a function to store conversations 2017-04-28 16:35:53 +00:00
Tobias Diekershoff
50da541860 Merge pull request #3402 from annando/1704-conversation 
OStatus improvements (Mastodon) and new SQL functions
 2017-04-28 10:00:12 +02:00
Michael
9900d28c4b We should return a return value when we say that we have a return value. 2017-04-28 06:21:12 +00:00
Michael
7240b2198b Missed protocol ... 2017-04-28 06:03:04 +00:00
Michael
782783aa52 New function "dba::update" and changed unique index for the conversations 2017-04-28 05:50:27 +00:00
Michael
3b5e1bbfc3 dba:p and dba:e can now be called with a parameter array as well. 2017-04-28 04:47:28 +00:00
Michael
615197e044 We should escape the table name as well. 2017-04-28 04:05:50 +00:00
Michael
35dc56c9c2 Salmons with Mastodon seem to work now 2017-04-27 20:38:46 +00:00
Hypolite Petovan
9c53108a3e Use Config::get instead of get_config 2017-04-26 22:08:47 -04:00
Michael
45d73b106b Conversation data is now stored in another table 2017-04-26 21:16:25 +00:00
Hypolite Petovan
188d3a6f5e Renamed check_domain_blocklist to blocked_url 
- Remove debug
 2017-04-26 00:23:01 -04:00
Hypolite Petovan
8d469c155a Add check_blocklist to z_fetch_url and post_url 
- Standard compliance
 2017-04-25 22:59:11 -04:00
Hypolite Petovan
c7e1a8e871 Added check_domain_blocklist 2017-04-25 22:45:56 -04:00
Michael
2e4db2e64e Merge remote-tracking branch 'upstream/develop' into 1704-conversation 2017-04-25 20:23:38 +00:00
Michael
d11e3afc6c Added class description 2017-04-25 16:05:26 +00:00
Michael
4c131362b3 Better debugging 2017-04-25 05:20:34 +00:00
Michael
67bae59c66 Small corrections 2017-04-25 05:11:04 +00:00
Michael
8de510e635 We weren't able to test mysqlnd, so better remove the code 2017-04-24 21:51:47 +00:00
Michael
eb63ce5df5 Free results 2017-04-24 21:36:04 +00:00
Michael
ec0d2a1a03 Little spelling problem 2017-04-24 21:23:00 +00:00
Michael
b5f10e5ddb Replace spaces by tabs 2017-04-24 21:20:24 +00:00
Michael
ed437e978a Code cleanup 2017-04-24 21:18:30 +00:00
Michael
82f13441bc Removed old functions 2017-04-24 21:02:51 +00:00
Michael
9959da5a1c New function to calculate rows 2017-04-24 20:32:35 +00:00
Michael
d67338a895 New function to check for the existance of data 2017-04-24 19:23:49 +00:00
Michael
0c8a2fd345 Örgs 2017-04-24 06:28:57 +00:00
Michael
d636bcb9d3 Restored privates variables 2017-04-24 06:27:59 +00:00
Michael
311c029bcf Rearranged lines 2017-04-24 06:26:49 +00:00
Michael
34bb34b9a4 Lost lines are back 2017-04-24 06:24:03 +00:00
Michael
28a28f00a4 New function skeleton for execution of queries 2017-04-24 06:13:42 +00:00
Michael
63b0b05445 We now can work with prepared statements 2017-04-23 23:15:38 +00:00
Michael
05dcedb54c Merge remote-tracking branch 'upstream/develop' into 1704-conversation 2017-04-23 14:25:35 +00:00
Michael
2628ff91f4 Call it "toinnodb" 2017-04-22 21:55:16 +00:00
Roland Haeder
1dc4b60a5a
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-22 23:41:04 +02:00
Roland Haeder
2ef3251293
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-22 23:41:04 +02:00
Michael
aaa558f7ea New command in dbstructure.php to convert all tables from MyISAM to InnoDB 2017-04-22 21:36:01 +00:00
Michael
c0784f7301 New tables for conversations 2017-04-22 20:46:40 +00:00
Hypolite Petovan
0f67934e05 Merge pull request #3375 from Quix0r/rewrites/coding-convention-split2-3-2 
Coding convention applied split 2-3-2 (of 2-14-2)
 2017-04-22 09:11:18 -04:00
Hypolite Petovan
affb3938d2 Merge pull request #3376 from annando/1704-key-length 
Issue 3358: The key length should now work on InnoDB and MyISAM
 2017-04-21 20:41:45 -04:00
Alexandre Alapetite
7f1c71c9fd Fix SQL date format bug in dfrn 
https://github.com/friendica/friendica/issues/3336
https://github.com/friendica/friendica/pull/3338
 2017-04-22 00:00:13 +02:00
Michael
fef0fe2fb9 Issue 3358: The key length should now work on InnoDB and MyISAM 2017-04-21 21:26:05 +00:00
Roland Haeder
299c0122f6
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-21 20:08:57 +02:00
Roland Haeder
cdff732044
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-21 20:08:57 +02:00
Sandro Santilli
a6c6287288 Fix Config::get call 2017-04-21 17:36:45 +02:00
Sandro Santilli
e2a0a72598 Use Config::get 2017-04-21 17:09:06 +02:00
Sandro Santilli
05b6891e89 Allow specifying cookie lifetime via config variable 
Tweak $a->config['system']['auth_cookie_lifetime']
 2017-04-21 16:15:39 +02:00
Sandro Santilli
e9f1a2e276 Expire log-in cookie in 90 days rather than 7 2017-04-21 15:16:12 +02:00
Roland Häder
b7c21e1b65
fixed parser error 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-04-20 22:59:43 +02: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
Hypolite Petovan
792ed55ae6 Merge pull request #3367 from annando/1704-mastodon 
Reworked OStatus communication part to better support Mastodon.
 2017-04-20 02:12:41 -04:00
Hypolite Petovan
01dab95d60 Merge pull request #3366 from annando/issue-3358 
Issue 3358; Avoid key length problems when changing collation
 2017-04-20 02:03:30 -04:00
Michael
3592f90910 Merge remote-tracking branch 'upstream/develop' into 1704-mastodon 
Conflicts:
	include/bbcode.php
 2017-04-20 05:44:31 +00:00
Michael
2354cc243e Issue 3358; Avoid key length problems when changing collation 2017-04-20 05:24:08 +00:00
Michael
c6e7f6306c Some standards 2017-04-20 05:17:00 +00:00
Hypolite Petovan
37efb5725e Remove debug 2017-04-19 23:31:38 -04:00
Hypolite Petovan
8680068037 Remove vcard Edit link pointing to profiles for contacts 2017-04-19 21:58:33 -04:00
Michael
e16fb74b0c Reworked OStatus communication part to better support Mastodon. 2017-04-19 21:37:00 +00:00
Roland Häder
9739758c42
added curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-04-19 23:07:59 +02:00
Roland Häder
b9d8587f41 Merge branch 'develop' into rewrites/coding-convention-split2-1-2 2017-04-19 23:06:01 +02:00
Roland Häder
98edbde05c
added braces, opps 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-04-19 23:03:44 +02:00
Hypolite Petovan
5432af3414 Merge pull request #3363 from sesom42/develop 
displays the correct profile for contacts that have set the default profile
 2017-04-19 15:45:38 -04:00
Jens Tautenhahn
a8c20013c4 displays the correct profile for contacts that have set the default profile 2017-04-19 20:25:25 +01:00
Hypolite Petovan
bf1199f2ea Standards 2017-04-19 10:14:43 -04:00
Hypolite Petovan
941dd48b53 Add explicit parentheses in condition 2017-04-19 07:05:48 -04:00
Hypolite Petovan
83ab3e3307 Skip lang file search if lang=en 2017-04-18 19:21:26 -04:00
Michael
828ae671f0 Handle the case when the given contact url or address is empty 2017-04-18 18:50:01 +00:00
Michael
47fd9226c3 Resubmit all profiles on directory change 2017-04-17 21:39:11 +00:00
Hypolite Petovan
1955d3d1b8 Merge pull request #3349 from annando/1704-api-owner 
API: The "friendica-owner" has only to be different from the user on starting posts
 2017-04-17 13:00:58 -04:00
Michael
1681d18693 API: The "friendica-owner" has only to be different from the user on starting posts 2017-04-17 14:38:13 +00:00
Hypolite Petovan
457cec3e0d Merge pull request #3321 from Alkarex/MySQL5.7 
Fix for MySQL 5.7+ NO_ZERO_DATE
 2017-04-16 16:03:13 -04:00
Michael
d80a09c9e5 Doxygen header added 2017-04-16 13:37:42 +00:00
Michael
3e6f501bc0 Print out database error messages 2017-04-16 13:21:49 +00:00
Alexandre Alapetite
6b250d3ae9 Merge branch 'develop' into MySQL5.7 2017-04-16 15:16:58 +02:00
Tobias Diekershoff
4e5b926d23 Merge pull request #3343 from annando/1704-mastodon 
Discover Mastodon servers
 2017-04-16 10:23:07 +02:00
Michael
dc0ce4e08c Discover Mastodon servers 2017-04-16 07:46:04 +00:00
Hypolite Petovan
d1fd797d6e Merge pull request #3323 from Alkarex/ostatus-only_full_group_by 
Fix MySQL bugs related to only_full_group_by
 2017-04-15 18:32:50 -04:00
Alexandre Alapetite
062070058e Move any_value_fallback() to dba class 
https://github.com/friendica/friendica/pull/3323#discussion_r111666245
 2017-04-15 17:31:32 +02:00
Alexandre Alapetite
06f374b26b Document any_value_fallback() 
https://github.com/friendica/friendica/pull/3323#discussion_r111663767
 2017-04-15 14:39:41 +02:00
Alexandre Alapetite
5007be3cf5 Use server_info to fallback from ANY_VALUE if needed 2017-04-15 12:40:32 +02:00
Alexandre Alapetite
d2b3e0daf5 Merge develop 2017-04-15 01:03:21 +02:00
Alexandre Alapetite
1058b28cea MySQL ANY_VALUE with fallback to MIN 
https://github.com/friendica/friendica/issues/3322
 2017-04-15 00:42:44 +02:00
Michael
e7783e2018 Merge remote-tracking branch 'upstream/develop' into issue-3326 2017-04-14 22:30:48 +00:00
Roland Häder
9423db628f
Merge branch 'develop' into rewrites/coding-convention-split2-1-2 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 17:56:51 +02:00
Roland Haeder
fcf095cc6e
always surround operators like +,-,. with spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 17:43:01 +02:00
Roland Haeder
851c0284ee
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 17:40:49 +02:00
Roland Haeder
ccbe7dd353
opps, missed this space ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 17:36:59 +02:00
Roland Haeder
a8136898b4
Opps, fixed parser errors 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 17:04:09 +02:00
Roland Haeder
03d23838f5
Continued: 
- added curly braces/spaces
- added TODOs (type-hints, old-lost code)
- more usage of dbm::is_result()
- combined some if() return stuff into a simple return statement

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 17:00:51 +02:00
Roland Haeder
629fcd48bd
tpzo fixed ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 16:27:21 +02:00
Roland Haeder
f2f20c85d5
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 16:27:06 +02:00
Roland Haeder
be59fe86e5
added space + type-hinted $a (App) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:29:50 +02:00
Roland Haeder
3a197833cd
added space 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:28:30 +02:00
Roland Haeder
753b432ab2
fixed intending 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:27:45 +02:00
Roland Haeder
83d6d68efd
removed some parentheses, but left them in where a string was concated 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:25:12 +02:00
Roland Haeder
3feece56dc
Continued a bit: 
- rewrote 2 multi-line single comments to one multi-line comment
- added TODO for rewriting function to closure (CR request)

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:14:39 +02:00
Roland Haeder
cf4bacdbd6
fixed spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:12:11 +02:00
Roland Haeder
8e1b6186f1
CR: added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:11:10 +02:00
Michael
d7537e7346 We only need to define the collation. 2017-04-14 12:22:36 +00:00
Michael
2930601719 it should work now 2017-04-14 11:26:47 +00:00
Michael
fdcb6d3c6f Issue 3326: We are now completely working with utf8mb4 2017-04-14 07:58:56 +00:00
Tobias Diekershoff
b8fd48dddc Merge pull request #3335 from annando/issue-3331 
Issue 3331: Remove unneeded table "deliverq"
 2017-04-14 07:32:30 +02:00
Michael Vogel
79e827417c Merge pull request #3319 from Hypolite/issue/#3316 
Use get_contact_by_url for unknown contacts in acl_lookup
 2017-04-14 07:24:27 +02:00
Hypolite Petovan
bffd3f2304 Add htmlentities to protect nick/addr in acl_lookup 2017-04-13 18:33:40 -04:00
Hypolite Petovan
ad53764832 Merge pull request #3338 from annando/issue-3336 
Issue 3336: The date format should now be okay
 2017-04-13 15:48:25 -04:00
Michael
319284c665 Issue 3336: The date format should now be okay 2017-04-13 19:25:00 +00:00
Michael
d5c6f67a4a Changed documentation 2017-04-13 19:10:53 +00:00
Hypolite Petovan
96b1a00e91 Fiddling with the unknown contact array values 2017-04-12 21:32:06 -04:00
Alexandre Alapetite
325d3afe18 Bump DB version 2017-04-12 23:14:33 +02:00
Alexandre Alapetite
b8e4094e7b Allow negative contact.contat-type 
https://github.com/friendica/friendica/issues/3328
 2017-04-12 23:09:22 +02:00
Alexandre Alapetite
74b6d09e89 Fix GROUP BY in acl_selector, api, notifier, photos, messages 
https://github.com/friendica/friendica/issues/3322
 2017-04-12 15:11:50 +02:00
Hypolite Petovan
6b8ad57399 Add error handling for missing contacts 2017-04-11 21:18:34 -04:00
Alexandre Alapetite
15a44d945b Another GROUP BY fix for MySQL 
https://github.com/friendica/friendica/issues/3322
 2017-04-12 01:06:08 +02:00
Alexandre Alapetite
dbbe6efd27 Fix ostatus bug related to only_full_group_by 
https://github.com/friendica/friendica/issues/3322
 2017-04-12 00:19:05 +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 Vogel
0d2bf557de Merge pull request #3315 from Hypolite/issue/#3285 
Add spoiler tags for Mastodon Content Warning
 2017-04-11 18:28:43 +02:00
Hypolite Petovan
762e8eda7a Use get_contact_details_by_url for unknown contacts 
- Fix typo
- Fix comment
- Fix closure
 2017-04-11 02:41:19 -04:00
Hypolite Petovan
21bb47a2e5 Added "braces" for @annando 2017-04-11 02:12:14 -04:00
Hypolite Petovan
ca7c2bfa00 Ignore Activity Streams delete messages from Mastodon 2017-04-10 22:20:03 -04:00
Hypolite Petovan
7f2fddea69 Add network for unknown contacts in ACL 2017-04-10 22:10:05 -04:00
Hypolite Petovan
05a5e1792d Left trim at sign from nicks in ACL 2017-04-10 22:09:49 -04:00
Hypolite Petovan
e45da5bcd3 Rewrote code according to @annando feedback 
- Normalize boolean operators
 2017-04-10 21:11:28 -04:00
Hypolite Petovan
ada5c4cc6a Add Content Warning support for comments too 
Doh!
 2017-04-10 00:57:36 -04:00
Hypolite Petovan
69d157c319 Add spoiler tags for Mastodon Content Warning 2017-04-10 00:08:14 -04:00
Michael
5c75fe4c14 Avoid possible problems with numeric nicknames and GNU Social 2017-04-09 04:29:02 +00:00
Roland Haeder
e325c6ec85
opps, missed this one. 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-09 00:28:48 +02:00
Roland Haeder
3778b15b7c
not on develop was this code in, but here? :-/ 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:09:31 +02:00
Roland Haeder
d07236deb6
huh? missed again 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:08:22 +02:00
Roland Haeder
cd697e0d7c
more spaces! ;-) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:07:40 +02:00
Roland Haeder
0319517f94
more curly braces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:06:56 +02:00
Roland Haeder
6ff0b15873
more spaces + curly braces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:05:56 +02:00
Roland Haeder
577e93e9fc
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:04:33 +02:00
Roland Haeder
bc5d1015b3
added curly braces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:03:21 +02:00
Roland Haeder
a66f6fe668
more spaces and curly braces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:01:04 +02:00
Roland Haeder
80f41991a5
curly braces were missing again ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:50:29 +02:00
Roland Haeder
622b532f23
more spaces again ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:49:32 +02:00
Roland Haeder
676e956a72
some more spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:45:44 +02:00
Roland Haeder
85d5592180
added curly braces + spaces (CR) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:43:38 +02:00
Roland Haeder
3051d30c88
added spaces (CR) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:40:19 +02:00
Roland Haeder
215cae204d
again develop and this branch differs ... (no blame on cherry-picking though) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:38:40 +02:00
Roland Haeder
d94e878714
opps, was somehow missed to cherry-pick/merge ? 
+ converted multiple single-line comments into one multi-line comment

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:36:38 +02:00
Roland Haeder
61cfa9e42d
Opps! 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:31:54 +02:00
Roland Haeder
a69f3017fb
Cleanups: 
- made SQL keywords all uper-case
- put all SQL columns in back-ticks
- added curly braces
- added/removed spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:31:09 +02:00
Roland Haeder
f6c667ef45
more spaces + curly braces ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:22:33 +02:00
Roland Haeder
8ba461db0a
removed spaces ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:17:20 +02:00
Roland Haeder
78b9cf97e0
huh? was in develop branch but not here? 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:12:31 +02:00
Roland Haeder
3d386daf53
no spaces here ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:11:51 +02:00
Roland Haeder
3220234693
more spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:10:50 +02:00
Roland Haeder
a0e5f7a59a
added spaces + curly braces and TODOs for upcoming type-hint rewrite. Please 
note that PHP5 allows 'array' as type-hint already (+ interface/class name).

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:05:50 +02:00
Roland Haeder
8191bcc402
more spaces + curly braces + converted multiple single-line comments to one mult-line comment 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 18:52:15 +02:00
Roland Haeder
a4d60b65f1
fixed spacing + intending 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 18:49:01 +02:00
Roland Häder
3d1626781d Merge branch 'develop' into rewrites/coding-convention-split2-1-2 2017-04-08 18:45:59 +02:00
Michael
c94525938d Merge remote-tracking branch 'upstream/develop' into 1704-duplicate-feed 2017-04-08 10:05:01 +00:00
Michael
8786bcdf0a Avoid duplicates with feeds and "remote self" 2017-04-08 08:12:14 +00:00
Michael Vogel
56c0675fba Merge pull request #3295 from Hypolite/issue/#3274 
Friendica code blocks aren't rendered in Diaspora
 2017-04-07 22:59:44 +02:00
Tobias Diekershoff
6060f311e9 small fix for #3254 2017-04-07 11:26:11 +02:00
Hypolite Petovan
b0accf4d4c Fix code blocks to Diaspora 
- Extracts code blocks before BBCode conversion to prevent code
highlighting and whitespace meddling
- Use the improved HTLM To Markdown library
- Use <code>  instead of <key> for Diaspora inline code blocks
 2017-04-06 23:49:56 -04:00
Hypolite Petovan
8149e21add Enforce standards 2017-04-06 23:43:55 -04:00
Roland Haeder
20f8b63fca
unspaced ... ;-) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 22:45:43 +02:00
Roland Haeder
32ffe4a711
more spaces/curly braces added 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 22:40:09 +02:00
Roland Haeder
a4773a1ac0
added more spaces + fixed tpzo: occurence 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 22:34:35 +02:00
Roland Haeder
28c08467fd
Continued a bit: 
- added spaces/curly braces
- used x($foo, 'bar') instead of isset($foo['bar'])
- let's wrap html_entity_encode() somehow

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 22:31:33 +02:00
Roland Haeder
ddd875bba0
added more spaces (CR) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 22:23:57 +02:00
Roland Haeder
5a28eae59d
Opps, fixed parser error ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 22:20:19 +02:00
Roland Haeder
737a6670af
Continued a bit: 
- more spaces added
- more curly braces added
- let's use x($_FOO, 'bar') and not isset($_FOOT['bar'])

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 22:18:03 +02:00
Roland Haeder
2a2e55e53d
overworked api.php: 
- added 'new' keyword because 'throw Exception' won't work
- removed self-advertisement
- added tons of spaces
- added tons of curly braces
- removed parentheses from require/include
- more usage of dbm::is_result()
- still there is a lot todo

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 22:11:09 +02:00
Roland Haeder
33e938a837
added spaces + used x() the proper way 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 19:36:01 +02:00
Roland Haeder
57b6e4c636
added spaces (CR) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 19:34:38 +02:00
Roland Haeder
849e56e3a5
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 19:27:44 +02:00
Roland Haeder
64cf909ca2
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-05 19:26:37 +02:00
Hypolite Petovan
1ab28bbe03 Add Text_Highlighter to Composer 
- Fixes critical mistake in boot.php regarding set_include_path
- Fixes minor mistake in text.php regarding strpos order of arguments

Note: This change significantly increases Composer running time because
Text_Highlither is a PEAR package. I'm already planning to replace it
with scrivo/highlight.php.
 2017-04-05 00:31:49 -04:00
Roland Haeder
03571f6e74
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-04 19:46:56 +02:00
Hypolite Petovan
9237b2611a Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-03 06:35:27 -04:00
Michael
c574c317ef Removed unneeded comment 2017-04-02 20:43:54 +00:00
Michael
884c75a350 Issue 3278: Attachments in Reshares should now work 2017-04-02 19:18:11 +00:00
Michael Vogel
d9451ef969 Merge pull request #3279 from Hypolite/improvement/add-composer 
Add Composer
 2017-04-02 14:57:37 +02:00
Michael
94f3f0887b Issue 2957: The avatar problem with mastodon should now finally be solved 2017-04-02 12:37:22 +00:00
Michael
54f49169d4 Show real platform names 2017-04-02 07:53:55 +00:00
Michael
07fd61b912 Mastodon: plink for reshares, missing hostnames for avatars 2017-04-01 23:39:19 +00:00
Roland Häder
49527b70d3 Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-01 22:16:08 +02:00
Michael
16d4392573 Documentation added 2017-04-01 09:05:56 +00:00
Michael
f6d7ee2781 Issue 3142: mcrypt is no more (as well as phpseclib) 2017-04-01 08:28:42 +00:00
Hypolite Petovan
799e60aa62 Replace existing autoloader with Composer-supplied 
- Move Friendica namespace to `src`
- Move required `ezyang/htmlpurifier` to vendor
- Remove existing static autoloader
- Change boot.php reference to the autoloader
 2017-03-31 23:02:38 -04:00
Roland Haeder
8bdc906013
Continued a bit: 
- added 'array' type-hint which is valid for many versions back
- added spaces as requested by CR
- removed $a = get_app(); call, $a was no longer needed here

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-31 20:42:20 +02: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
Roland Haeder
d091759888
space to the rescue ... ;-) CR request 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-30 20:34:14 +02:00
Michael
54c8fb2bb8 Replaces mcrypt with phpsec. 2017-03-30 18:29:12 +00:00
Michael
4fc1ebd4ea Doing some Hypolyzation 2017-03-27 21:02:56 +00:00
Michael
c85331d8ac Reestablish the communication with Mastodon 2017-03-27 20:58:15 +00:00