clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,411 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

5361 Commits

Author SHA1 Message Date
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