keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
16497 commits 4 branches 0 tags 179 MiB
Commit graph

5810 commits

Author SHA1 Message Date
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
Tobias Diekershoff
8580cd87a6 Merge pull request #3271 from Hypolite/issue/#3189 
Fix Diaspora code blocks being mangled
 2017-03-27 09:26:39 +02:00
Michael
fa7721c735 Prevent Hypolite from doing comments about standards ;-) 2017-03-27 06:11:45 +00:00
Michael
364d88fa70 Only import new OStatus posts if they are from our followers 2017-03-27 05:33:43 +00:00
Hypolite Petovan
3e285a690a Fix Diaspora code blocks being mangled 
- Remove whitespace removal code from `diaspora2bb()`
- Add code block skipping the HTML transforms removing whitespace in
`htm2bbcode()`
 2017-03-26 19:00:04 -04:00
Hypolite Petovan
f1a75a57fe Merge pull request #3257 from annando/1703-gcontact 
Improved gcontact handling
 2017-03-25 15:35:41 -04:00
Michael
585c2119d7 Remove the "call by reference" 2017-03-25 18:00:56 +00:00
Roland Haeder
9ddb032bf2
strange that this curly brace didn't make it in. now it is, thanks to @annando 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 18:32:33 +01:00
Roland Haeder
33fa1e79af
some spaces ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 18:32:21 +01:00
Michael
444de52859 Use of exceptions 2017-03-25 16:56:04 +00:00
Tobias Diekershoff
6e35c49cb9 Merge pull request #3263 from annando/1601-api-statuses-lookup 
More GNU Social compatibility for the API
 2017-03-25 16:26:21 +01:00
Michael
adf9ed64bb Avoid API error when calling "/api/friendica/profile/show" 2017-03-25 14:16:21 +00:00
Roland Haeder
0e6b009425
fixed another parser error, opps 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 15:04:07 +01:00
Roland Haeder
fccdc63964
Opps, fixed parser error. indending was confusing here 
+ added much more curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 14:56:23 +01:00
Roland Haeder
a391ab9a99
was a bit confusing for me or I was not sleeping to much ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:46:51 +01:00
Roland Haeder
89bd080e7e
don't kill when no result is found, this may break communication, thanks to @annando explaining it 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:42:09 +01:00
Roland Haeder
6d5826e188
PHP5 does not support native type-hints, except array + used dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:38:11 +01:00
Roland Haeder
fd468f20fd
merged 2 if() into one, closes internal TODO 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:08:56 +01:00
Roland Haeder
47ae5a9a47
removed parentheses, added curly ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:07:33 +01:00
Roland Haeder
2f5c796886
removed TODO, one day this all needs refacturizing ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:02:09 +01:00
Michael
a9dfd1fcb7 One more API call added 2017-03-25 11:31:31 +00:00
Michael
4665cda00e Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup 2017-03-25 11:25:47 +00:00
Michael
0d49143a63 "no_utf" wasn't in use anymore - it is now removed completely 2017-03-25 10:51:00 +00:00
Michael
a419bbe7c7 Hypolite is right (not always, but in this case) 2017-03-25 10:11:02 +00:00
Michael
5060300138 Reset the static variable $baseurl 2017-03-25 10:07:45 +00:00
Hypolite Petovan
29fb28de43 Remove Embedly integration 
- Remove admin setting input
 2017-03-25 01:57:19 -04:00
Hypolite Petovan
b9f4a6e4f0 Code cleanup + standards 2017-03-25 01:54:16 -04:00
Roland Haeder
d45e79dfe9
Continued: 
- converted multiple single-line comments into one multi-line comment (please
  stop abusing programming languages!)
- added more TODO tags for type-hints (upcoming rewrite)
- opps, one space was only fixed in develop branch, not in this PR branch

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-24 20:39:00 +01:00
Michael
b7242c3fa0 poco_last_updated is optimized 2017-03-23 22:56:22 +00:00
Roland Haeder
db1c2e4041
fixed comment and explained one 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 23:37:58 +01:00
Roland Haeder
e4ad359f5a
added curely braces + TODO for maybe avoiding multi-lined if() blocks as it confuses #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:53:03 +01:00
Roland Haeder
f94a10bf00
old behaviour restored 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:49:34 +01:00
Roland Haeder
66366b2804
added more spaces and curely braces 
killed ?> as it is discouraged

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:46:25 +01:00
Roland Haeder
d8eee2be55
added curely branches + reverted back to old behaviour (may come back one day) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:33:57 +01:00
Roland Haeder
09ab141404
better comment added by @Hypolite 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:29:26 +01:00
Roland Haeder
dad6a61be4
it is space-season ... ;-) #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:19:25 +01:00
Michael
2ce5ab1467 removed commented out line 2017-03-23 07:36:22 +00:00
Michael
5b6215d7bd Better server_url handling 2017-03-23 07:34:45 +00:00
Michael
c25af197c9 baseurl should now be set correctly at all the time. 2017-03-23 07:10:22 +00:00
Michael
26ec56dfa5 server_url was forgotten 2017-03-23 06:45:00 +00:00
Michael
9e5bec1bc8 "poco_check" is now replaced and removed 2017-03-23 06:23:23 +00:00
Michael
8e240a1e8c New function to validate gcontact array data 2017-03-22 23:13:32 +00:00
Michael
1d6910277d Remove more deprecated "poco_check" calls 2017-03-22 07:11:58 +00:00
Michael
bc517ef3d2 Remove reduncancies 2017-03-22 05:26:44 +00:00
Michael
a376f55c1f Linefeed added 2017-03-21 22:06:57 +00:00
Roland Häder
ddb5a8ea78
Continued: 
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
  long time around in PHP) anything can be handled over to the method/function.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-21 21:51:22 +01:00
Roland Häder
830af774d3
added more curly braces + a bit more usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-21 21:50:45 +01:00
Michael Vogel
4ebebe96fe Merge branch 'develop' into 1703-worker-splitting 2017-03-21 17:08:07 +01:00
Hypolite Petovan
7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Michael Vogel
5a6da8b447 Merge branch 'develop' into 1703-worker-splitting 2017-03-21 16:38:59 +01:00
Michael
f7b0c2082b Some standards 2017-03-21 15:24:49 +00:00
Michael
9c16b47f55 Strange comment removed 2017-03-21 15:15:58 +00:00
Hypolite Petovan
9c2c483996 Merge pull request #3112 from Quix0r/rewrites/coding-convention 
Coding convention applied - part 1
 2017-03-21 10:19:53 -04:00
Michael
19825eddf7 Changed probing call. Removed dupolicated code. 2017-03-21 13:43:53 +00:00
Michael
be9db7f060 Merge remote-tracking branch 'upstream/develop' into 1703-worker-splitting 2017-03-21 07:59:14 +00:00
Michael
74cc5ade0c Worker processes are split into many more separate tasks 2017-03-21 07:57:09 +00:00
Tobias Diekershoff
0fd874a683 Merge pull request #3246 from annando/1701-poco 
Split poco discovery in smaller function calls
 2017-03-21 07:27:10 +01:00
Roland Haeder
09851331a9
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-20 20:51:32 +01:00
rabuzarus
0879b46125 add NULL_DATE & coding standard work 2017-03-20 16:59:21 +01:00
rabuzarus
0060e2449e Merge develop into 20170316_-_fix_event_edit 
Conflicts:
	mod/events.php
 2017-03-20 16:46:36 +01:00
Michael
b42a977894 Bugfix for issue 3242 - forgotten "use" 2017-03-19 22:58:35 +00:00
Michael
41ee4ec60a Standards and just some more poco slitting 2017-03-19 21:32:11 +00:00
Michael
e684fff477 Added documention 2017-03-19 18:24:49 +00:00
Michael
2615d40d6b Split the POCO discovery process in several small processes 2017-03-19 17:43:59 +00:00
Michael
7f61b2ee15 Merge remote-tracking branch 'upstream/develop' into 1701-poco 
Conflicts:
	include/socgraph.php
 2017-03-19 15:36:41 +00:00
Hypolite Petovan
65f809f5cb Merge pull request #3245 from annando/issue-3242 
Issue 3242: Define a maintenance reason
 2017-03-19 11:06:25 -04:00
Michael
e93825b9f0 Some more standards 2017-03-19 14:43:24 +00:00
Michael
8dd732a896 Issue 3242: Define a maintenance reason 2017-03-19 13:24:07 +00:00
Michael
b06d787130 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 2017-03-19 08:06:02 +00:00
Michael
132688d663 Standards, what else? 2017-03-19 08:04:04 +00:00
Michael
e9b083d13d
You shoudln't use a text variable like an array. 2017-03-19 01:23:34 +01:00
Roland Haeder
5e1c303c08
added spaces according to coding-convention 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-19 01:04:30 +01:00
Roland Haeder
1946cf143d
added logger ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-19 01:00:35 +01:00
Roland Haeder
621a77b275
added spaces around + curly braces ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-19 00:58:46 +01:00
Roland Haeder
6ca6c6813a
better log here ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-19 00:56:58 +01:00
Roland Häder
aeaafb5d71 Continued: 
- added curly braces
- added TODO
- removed TODO (no change needed, is fine)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:37 +01:00
Roland Häder
4fe5cdf3fd don't quit silently, at least a TODO is now around 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:37 +01:00
Roland Häder
e8e51d8535 Missed a 't', thanks to @annando 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:37 +01:00
Roland Häder
fbd559a823
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:24 +01:00
Roland Häder
ed0d858f98
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:24 +01:00
Roland Häder
4c72cb3584
Continued: 
- added missing spaces/curly braces
- some more usage of dbm::is_result()
- 2 oppsite if() statements can be mored to else
- added more TODOs for type-hinting

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:02 +01:00
Roland Häder
bf0a07b7ae
Continued: 
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
  long time around in PHP) anything can be handled over to the method/function.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:02 +01:00
Roland Häder
015561fec6
Opps ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:02 +01:00
Roland Häder
4a96c280d0
added more curly braces + a bit more usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:02 +01:00
Roland Häder
d9c22c7f3e
Continued a bit: 
- converted some else if to elseif (only PHP)
- converted some space -> tab (intending)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:02 +01: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
Roland Häder
cc83e9d72a
fixed curly brace (opps) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:41:00 +01:00
Roland Häder
6a3dc8b286
added more curly braces + fixed one 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:41:00 +01:00
Roland Häder
3ad0fd442e
Continued: 
- added missing spaces/curly braces
- some more usage of dbm::is_result()
- 2 oppsite if() statements can be mored to else
- added more TODOs for type-hinting

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:41:00 +01:00
Roland Häder
c6ef84a964
Continued: 
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
  long time around in PHP) anything can be handled over to the method/function.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:41:00 +01:00
Roland Häder
6a171a96aa
Opps ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:40:47 +01:00
Roland Häder
3849e7c9ff
added more curly braces + a bit more usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:40:47 +01:00
Roland Häder
92901d8626
more curly braces added + dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:40:21 +01:00
Michael
fb5f1f61fc You shoudln't use a text variable like an array. 2017-03-18 23:32:59 +00:00
Michael
1a436264cd Some standards 2017-03-18 12:13:43 +00:00
Michael
222550e784 From now on we are using 0001-01-01 as lowest date 2017-03-18 11:42:54 +00:00
Michael
62ccb4499a Some more unneeded changes reverted 2017-03-18 08:54:25 +00:00
Michael
a2a171af06 "dob" is not a date field, so the changes are reverted 2017-03-18 08:50:27 +00:00
Michael
e301fa0832 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 2017-03-18 08:31:43 +00:00
rabuzarus
497df57ef7 more standards work 2017-03-18 04:41:54 +01:00
Michael
f3bcf63d46 Standards and some logging improvements 2017-03-17 19:25:01 +00:00
rabuzarus
c785eb29c6 more work on standards compliance 2017-03-17 17:57:57 +01:00
Michael
87771cf617 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 
Conflicts:
	include/discover_poco.php
 2017-03-17 15:53:19 +00:00
rabuzarus
3cef98caf6 Merge pull request #3226 from annando/1702-only-worker 
The worker is now the only background processing system
 2017-03-17 13:22:23 +01:00
Michael
24a57020b9 Better version transformation for nodeinfo and statistics.json 2017-03-16 21:34:53 +00:00
rabuzarus
8ae8465d48 add dop event & fix event edit 2017-03-16 20:15:25 +01:00
Michael
58bf1c50af Bugfix: When a query fails we mustn't use the result value. 2017-03-16 09:23:12 +00:00
Michael
4812f4c0f9 Without only the worker queue we don't need the deliverq anymore. 2017-03-16 07:30:59 +00:00
Michael
a211c8cb77 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-16 05:51:22 +00:00
rabuzarus
6fdc219143 Merge pull request #3227 from annando/1703-pdo 
We now support PDO
 2017-03-16 00:25:16 +01:00
Michael
8e12b159d9 Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup 2017-03-15 14:37:30 +00:00
Michael
9f9497f2ca Merge remote-tracking branch 'upstream/develop' into 1701-poco 2017-03-15 14:34:09 +00:00
Michael
88a69b93d5 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 2017-03-15 13:56:17 +00:00
Michael
8decd15565 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-15 13:55:43 +00:00
Michael
dc3fcf0487 Standard stuff 2017-03-15 06:00:22 +00:00
Michael
35ec1c8f26 Bugfix for pull request 3216 - feed items were mixed 2017-03-14 21:14:09 +00:00
Michael Vogel
e57bd5fe55 Merge pull request #3233 from rabuzarus/20170314_-_pagination 
limit pagination page buttons to  max 10
 2017-03-14 20:05:29 +01:00
rabuzarus
0143369e54 limit pagination page buttons to max 10 2017-03-14 18:31:03 +01:00
Michael Vogel
a7e8e86800 Merge pull request #3221 from strk/remember-openid 
Fix "remember me" cookie for OpenID logins
 2017-03-14 16:30:15 +01:00
Michael
0d32f0be46 One forgotten standard 2017-03-14 15:18:56 +00:00
Michael
f73389dd12 Standard stuff 2017-03-14 15:17:21 +00:00
fabrixxm
fa3490ba5b Merge pull request #3224 from annando/1702-no-old_pager 
The old pager is now removed
 2017-03-14 10:29:03 +01:00
Michael
43ceb72196 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-14 07:26:15 +00:00
Michael Vogel
199bba20d9 Merge pull request #3200 from Hypolite/issue/#3195 
Improve pagination on frio
 2017-03-14 06:05:42 +01:00
Michael
748caa0807 Removed debug output 2017-03-14 04:58:05 +00:00
Michael
a2b7b2a968 Daily updating the server status 2017-03-13 22:16:09 +00:00
Sandro Santilli
0b46a5f935 Standards: add braces 
(thanks @Hypolite)
 2017-03-13 23:09:09 +01:00
Sandro Santilli
8517ba1fab Remove extra space after open parentheses 2017-03-13 23:08:03 +01:00
Michael Vogel
98945eb6fa Merge pull request #3213 from Hypolite/issue/#2792-2 
Like behavior fix/improvements
 2017-03-13 18:35:32 +01:00
Michael
ae64f6f7e2 z_fetch_url now always returns an array 2017-03-13 14:37:51 +00:00
Sandro Santilli
cbaf196f50 Only remove the "remember me" cookie at submitting the auth form 
Fixes loss of remember (Friendica) cookie on switching Managed accounts
 2017-03-13 11:59:05 +01:00
Michael
fbb84ee219 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-13 10:18:29 +00:00
Michael
6a16565642 Merge remote-tracking branch 'upstream/develop' into 1701-poco 2017-03-13 07:23:32 +00:00
Michael
44888590e5 One error, one documentation, one brace 2017-03-13 06:32:33 +00:00
Michael
acadb8ecdb Remove redundancies. 2017-03-13 06:09:00 +00:00
Michael
eb6a6228f7 more spaces 2017-03-13 05:57:37 +00:00
Michael
80e58964ce Standard stuff 2017-03-13 00:09:32 +00:00
Michael
97d3176754 Querying via nodeinfo 2017-03-13 00:03:27 +00:00
Michael
49b22de705 Changes from previous pull request applied again 2017-03-12 21:57:09 +00:00
Michael
e10339a47f Merge remote-tracking branch 'upstream/develop' into 1703-pdo 2017-03-12 21:05:10 +00:00
Michael
77e8c44016 Merge remote-tracking branch 'upstream/develop' into 1702-only-worker 
Conflicts:
	include/onepoll.php
	include/queue.php
 2017-03-12 21:03:44 +00:00
Michael
1624150db4 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 
Conflicts:
	include/onepoll.php
 2017-03-12 20:54:28 +00:00
Michael
259598e569 Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share 2017-03-12 20:52:48 +00:00
Michael
044e9a6603 Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager 
Conflicts:
	mod/profile.php
 2017-03-12 20:52:14 +00:00
Michael
18d23ca443 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-12 20:49:48 +00:00
Tobias Diekershoff
7d1e54664a Merge pull request #3133 from mexon/mat/cidfix 
Allow cid URLs for images
 2017-03-12 15:44:22 +01:00
Tobias Diekershoff
7275319eb6 Merge pull request #3214 from Hypolite/get_contact-rewrite 
Reformatted get_contact()
 2017-03-12 15:42:17 +01:00
Tobias Diekershoff
1bf089e424 Merge pull request #3216 from annando/1701-performance 
Better network handling, improved structure
 2017-03-12 15:40:56 +01:00
Tobias Diekershoff
e29d7f19d1 Merge pull request #3222 from Hypolite/issue/#3220 
Diaspora: Normalize line endings instead of adding <br> before Markdown()
 2017-03-12 15:35:42 +01:00
Michael
bfad58a777 We don't need to show the id. 2017-03-12 09:41:10 +00:00
Michael
3a3fa017a6 Discovery of new servers 2017-03-12 09:13:04 +00:00
Hypolite Petovan
2310bf994a Normalize line endings instead of adding <br> before Markdown() 2017-03-12 03:55:22 -04:00
Sandro Santilli
df6304cc42 Fix "remember me" cookie for OpenID logins 
Closes #2432

NOTE: in order to obtain the same "cookie hash" it was required
to include unneeded fields in the user record structure, this would
be good to change in the future...
 2017-03-12 01:11:35 +01:00
Michael
2d2a35af73 Make Hypolite happy 2017-03-08 18:03:41 +00:00
Michael
32f1b2de20 Forgotten debug output 2017-03-08 13:15:24 +00:00
Michael
d898616f8d Remove junk from the version number 2017-03-08 05:40:57 +00:00
Hypolite Petovan
37b15995d8 Add pump.io network to probing supported networks 
- Remove useless condition
 2017-03-07 16:43:22 -05:00
Hypolite Petovan
d7f62e82b9 Fix behavior regression 
Reverted quitting get_contact if Probe::uri didn’t yield an url for
“nick@server.tld” form.
 2017-03-07 16:28:15 -05:00
Michael
f7f23038db Merge remote-tracking branch 'upstream/develop' into 1701-performance 2017-03-07 21:24:20 +00:00
Michael
f09a8609df Better separation between queries with or without result 2017-03-07 17:16:17 +00:00
Hypolite Petovan
97378893cd Switch nurl and addr lookups 
- nurl lookup is more frequent than addr lookup, saves queries
 2017-03-06 16:26:04 -05:00
Hypolite Petovan
89f0b85905 Split slow catch-all query into three fast queries 
Thanks @annando for the tip.
 2017-03-06 16:19:12 -05:00
Hypolite Petovan
116b9e1c1f Use Probe::uri instead of probe_url() 
- Moved file inclusion to enable lazy loading
 2017-03-06 06:01:08 -05:00
Hypolite Petovan
ff64beeb4e Reformatted get_contact() 
- Resolved one `@todo` (the catch-all contact query)
- Improved code readability by naming variables
- Code standards compliance
 2017-03-06 05:37:01 -05:00
Hypolite Petovan
4931ecafbb Rewriting of do_like() 
- Fix behavior where event actions had to be performed twice to switch
from one to another
- Simplify the contact data retrieval
- Make sure contact-id, owner-id and author-id are correctly set
 2017-03-06 05:28:01 -05:00
Michael
d686bdcf09 Quickfix for SQL commands that should return "true" instead of an empty array 2017-03-06 10:10:22 +00:00
Hypolite Petovan
67ae0fed7f Fix response "self" assigment 
- Switch from unreliable `uid` matching to `author-id` using
public_contact()
 2017-03-06 05:07:17 -05:00
Michael
2ea50d9c47 Emulation for the mysqli behaviour when executing insert, update, ... 2017-03-05 23:59:53 +00:00
Michael
07516c318c We now support PDO for database connections as well 2017-03-05 21:56:50 +00:00
Michael
9a71472be6 Only store a new gserver entry if it is a valid one 2017-03-04 14:32:40 +00:00
Michael
953477de87 Improved check for the server base url 2017-03-04 13:30:34 +00:00
Michael
b42167f0ac We can now return a list of known servers 2017-03-04 11:04:00 +00:00
Michael
25e6244950 BlaBlaNet is now detected again. No false positive for Statusnet anymore 2017-03-04 07:57:55 +00:00
Michael
9965061359 Better detection for Hubzilla 2017-03-02 21:20:33 +00:00
Michael
324d8bfe8e Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server 2017-03-02 20:20:38 +00:00
Michael
5c92e97173 Added index for performance issues 2017-03-02 05:46:44 +00:00
Hypolite Petovan
07aefe61bf Update paginate_data() 
- Formatting: Normalize quotes, spaces, braces
- Add "disabled" CSS class to links previously ommitted
- Add "previous" and "next" CSS classes to minimal pager links
- Add main pager CSS class depending on type
 2017-03-01 23:26:49 -05:00
Michael
60adf67f13 Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-null-date 2017-02-28 06:50:46 +00:00
Michael
4de057804c Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-only-worker 2017-02-28 06:49:21 +00:00
Michael
c829dc8e71 The service at gstools.org doesn't exist anymore. 2017-02-28 06:26:50 +00:00
Michael
0afb0c2ea4 NULL_DATE is now a constant 2017-02-27 23:37:15 +00:00
Michael
997e94555b The old pager is removed 2017-02-27 21:46:37 +00:00
Michael
39386ded36 "old_share" is removed 2017-02-27 21:26:37 +00:00
Michael
3c220dd40c Queue.php is now reworked 2017-02-27 21:07:32 +00:00
Michael
df6913f7e1 pidfile.php is in use by two addons. So we restore it here. 2017-02-27 06:31:49 +00:00
Michael
99fb15037b Removed some more unneeded stuff 2017-02-27 06:27:22 +00:00
Michael
48209f0ecd Now there is only the worker. 2017-02-26 23:16:49 +00:00
Michael
2a8a5a6d88 Improved server vitality detection 2017-02-26 18:19:20 +00:00
Michael
6bd59cd094 Bugfix: "ALTER IGNORE" was missing on structure and index change 2017-02-26 08:36:05 +00:00
Michael
da8a48f89e Bugfix: the curl option CURLOPT_SSL_VERIFYHOST is problematic 2017-02-25 13:59:24 +00:00
Michael
ca6171eb5c For 3.5.1 use "0000-00-00 00:00:00" as lowest datetime value 2017-02-23 07:21:47 +00:00
Michael
06b16cce8b Define the lowest possible datetime string as "0001-01-01 00:00:00" 2017-02-23 07:09:55 +00:00
Michael
f9f27c2f5f Merge remote-tracking branch 'upstream/develop' into 1701-performance 2017-02-23 06:55:35 +00:00
Michael
8986edf070 Merge remote-tracking branch 'upstream/develop' into bugfix-sql-date 2017-02-23 06:54:50 +00:00
Michael
ffeae7e048 Bugfix for bugfix :-) 2017-02-23 05:45:06 +00:00
Michael
c84565633e Added check for invalid "contact-type" 2017-02-22 22:25:35 +00:00
Michael
194d80c326 Bugfix for badly formatted date time string. 2017-02-22 22:04:56 +00:00
Michael
564bc22900 Merge remote-tracking branch 'upstream/develop' into more-temp-stuff 2017-02-19 18:46:20 +00:00
Michael
9251d2af6f Ensure that the spool path is set 2017-02-19 10:13:40 +00:00
Michael
2bfc40d74c Bugfix for not createable spool path 2017-02-19 08:23:21 +00:00
Hypolite Petovan
58a444b430 Add original_url() param documentation 2017-02-18 20:39:16 -05:00
Hypolite Petovan
2c959b925d Add param documentation 2017-02-18 20:35:31 -05:00
Hypolite Petovan
432587464c Fix Diaspora link attachment probe 
- Move analytics param stripping out of original_url
- Remove HEAD curl request in ParseUrl::getSiteInfo
- Replace original_url with strip_tracking_query_params in
ParseUrl::getSiteInfo to prevent massive curl fest in border cases
 2017-02-17 22:35:46 -05:00
Hypolite Petovan
99cfae63d7 Clean trailing whitespaces 2017-02-17 22:32:33 -05:00
Tobias Diekershoff
e647aa8846 Merge pull request #3169 from annando/bugfix-delete-spool 
We have to delete spool files after posting in any case
 2017-02-17 08:04:22 +01:00
Michael
03653072a2 We have to delete spool files after posting in any case 2017-02-16 20:23:07 +00:00
Michael
531074a72f Handle the case when a contact is unknown. 2017-02-16 20:03:44 +00:00
Michael
7ba5228814 Bugfix: Only delete spool files that are spool files 2017-02-14 21:13:00 +00:00
Michael
e5e6f4fd19 Better logging to analyze unwanted messages from Diaspora 2017-02-11 23:37:15 +00:00
Tobias Diekershoff
a4dcd8be55 Merge pull request #3159 from annando/bugfix-diaspora-relay 
Bugfix: Only accept postings from anyone when the relay is configured
 2017-02-11 08:58:38 +01:00
Michael
40390cc5ec Diaspora Relay: Only accept postings from anyone when the relay is configured 2017-02-10 20:45:22 +00:00
Michael
f5a634abbc Changed server detection. 2017-02-10 19:23:46 +00:00
rabuzarus
3474b40732 fix - pending contacts shouldn't be shown in contacts widgit and viewcontacts 2017-02-10 03:51:01 +01:00
Michael
6dd27b83ef Merge remote-tracking branch 'upstream/develop' into 1701-performance 2017-02-06 21:28:42 +00:00
Tobias Diekershoff
3c5f7e457a Merge pull request #3149 from annando/1601-new-diaspora-mention 
Support for the new Diaspora mention format
 2017-02-05 16:38:09 +01:00
Michael
e9d719a299 removed to-do 2017-02-05 07:02:20 +00:00
Michael
9f706fcfbb Add include 2017-02-04 22:27:49 +00:00
Michael
0d1f88033b Support for the new Diaspora mention format 2017-02-04 22:22:12 +00:00
Michael
21accc0a53 Merge remote-tracking branch 'upstream/develop' into 1701-performance 2017-02-04 16:28:36 +00:00
Michael
9c4a53e380 Optimized query for nodeinfo, better way to analyze posting problems with DFRN 2017-02-04 16:16:15 +00:00
Tobias Diekershoff
adedf18b30 Merge pull request #3146 from annando/1701-pnut 
Preparation to add the social network "pnut"
 2017-02-02 09:10:28 +01:00
Michael
5ffef9c96d Merge remote-tracking branch 'upstream/develop' into 1701-performance 2017-02-02 06:27:10 +00:00
Michael
275a1c6574 Preparation to add the social network "pnut" 2017-02-02 06:06:23 +00:00
Michael
9a19ae7ce1 The queue now works with the cache - whoch should speed it up 2017-02-02 05:52:45 +00:00
Michael
ef0fb5148c Some more timeout checks 2017-02-01 21:35:01 +00:00
Michael
8a75a20d26 Bugfix: An index was missing 2017-02-01 21:08:13 +00:00
Michael
f6e1fbfcaa Merge remote-tracking branch 'upstream/develop' into 1701-performance 2017-02-01 17:29:20 +00:00
Michael
da30538a98 Bugfix for pull request 3125 2017-02-01 13:50:05 +00:00
Michael
7a89d06465 Make sure that we only quit when we are sure we can 2017-02-01 08:43:18 +00:00
Michael
7324a661f1 Optimized timeouts during network operations 2017-02-01 00:15:37 +00:00
Michael
2424cb78d1 Only process feed and dfrn items when they aren't already stored 2017-01-31 19:39:09 +00:00
Matthew Exon
96aadb23f8 Change $allowed_src_protocols to static 2017-01-31 03:44:32 +00:00
Michael
dae125e8ee Issue 3135: dbupdate is started again and again 2017-01-30 21:18:08 +00:00
Matthew Exon
ce10a9aa7f Break out list of acceptable protocols in "src" attribute into separate variable similar to "href" attributes 2017-01-30 15:48:12 +00:00
Tobias Diekershoff
dd36b2bded Merge pull request #3128 from annando/bugfix-no-self-destroy 
Bugfix: Sometimes the self contact seems to destroy itself
 2017-01-30 09:11:10 +01:00
Matthew Exon
d99a96ef49 Global is an integer, do not set it to an empty string 2017-01-30 00:56:21 +00:00
Michael
7ca809a00e Addind unique indexes should now work with every MySQL flavour 2017-01-29 17:31:20 +00:00
Michael
ac88471e55 Make the code nicer 2017-01-29 14:00:44 +00:00
Michael
c1eea3771f Bugfix: Sometimes the self contact seems to destroy itself 2017-01-29 13:57:03 +00:00
Michael
46ab87a303 Typo fixed 2017-01-28 13:38:18 +00:00
Michael
ea22828d37 Alternate solution for pull request 3124 2017-01-28 12:19:04 +00:00
Tobias Diekershoff
9259feec6f Merge pull request #3121 from annando/1701-bugfix-config 
Issue 3117: Can't store values that are only in the .htconfig.php
 2017-01-28 08:30:22 +01:00
Tobias Diekershoff
0b5ef73d4a Merge pull request #3119 from annando/1701-bugfix-events 
Bugfix: Avoid duplicated birthday events
 2017-01-28 07:29:29 +01:00
Michael
32b997823f Don't forget the brackets 2017-01-28 06:21:58 +00:00
Michael
82086eea36 Bugfix: When a value was only in the .htconfig.php then it never was stored 2017-01-28 06:18:16 +00:00
Michael Vogel
d61a4a67db Merge pull request #3109 from Hypolite/issue/scrap-tinymce 
Scrap TinyMCE
 2017-01-27 21:08:33 +01:00
Michael
5760cfeb94 Added to-do 2017-01-27 19:57:57 +00:00
Michael
cb0600976d Bugfix: Avoid duplicated birthday events 2017-01-27 17:04:52 +00:00
Michael
2a77e426f9 Split poco discovery in smaller function calls 2017-01-27 17:00:34 +00:00
Michael
64d06b98b2 Added documentation 2017-01-27 15:13:37 +00:00
Hypolite Petovan
66482c1d9c - Remove $theme_richtext_editor boot var 
- Remove "richtext" feature
- Remove fix_mce_lf() function
- Remove nomce parameter
 2017-01-26 22:57:53 -05:00
Hypolite Petovan
9d5384f107 - Remove tinyMCE mentions or convert to addeditortext() 
- Remove $editselect template value
 2017-01-26 22:50:27 -05:00
Michael
422be7e212 Improved handling of non string values in the config 2017-01-25 05:33:23 +00:00
Michael
becfeaf0b7 Bugfix: Caching of non string cache values now works. 2017-01-24 18:55:07 +00:00
Michael
ea18d1829f Reformatted stuff, improved query 2017-01-24 06:45:46 +00:00
Michael
69f1deb166 Some added logging 2017-01-21 20:15:49 +00:00
Michael
dc439c6e50 Bugfix for masses of php warnings 2017-01-21 19:50:56 +00:00
Michael
c74b7565a9 Rearranged the logging 2017-01-21 06:16:15 +00:00
Michael
45d6f6c0a3 Some changed logging 2017-01-21 06:06:29 +00:00
Michael
72884d75d5 Added callstack 2017-01-21 05:05:41 +00:00
Michael
68115581d0 Avoiding some error messages 2017-01-20 22:22:05 +00:00
Michael
8939a25502 Better number format 2017-01-20 22:05:50 +00:00
Michael
9d77e91f5f Some more logging 2017-01-20 21:58:53 +00:00
Michael
850419dd14 Hopefully better index length. 2017-01-20 13:30:06 +00:00
Michael
7757505e40 Bugfix: Quarter Hour cache was cleared every time. 2017-01-19 23:07:12 +00:00
Michael
6bbc0e4c78 Bugfix: The caching of values didn't really work for boolean values 2017-01-19 22:47:20 +00:00
Michael
1360a0a003 The worker now tells the process runtime length. 2017-01-19 17:06:23 +00:00
Michael
4e91379f4a Added reminder 2017-01-19 07:09:56 +00:00
Michael
0548099f6c The config class now makes less database reads. 2017-01-18 21:45:32 +00:00
Michael
53393233c3 Replace the direct access of config variables 2017-01-17 19:21:46 +00:00
Michael
b935b57c66 Merge remote-tracking branch 'upstream/develop' into 1701-index-again 2017-01-17 06:49:01 +00:00
Michael
79866f620a OOpppss ... 2017-01-16 22:15:04 +00:00
Michael
6972faa3a8 Redo some work 2017-01-16 22:11:35 +00:00
Michael
6e1986a0f2 Removed commented text 2017-01-16 21:48:35 +00:00
Michael
2cdf87c56a Deactivated the alternative update script by now 2017-01-16 21:35:35 +00:00
Michael
d6ca6f24a7 Merge remote-tracking branch 'upstream/develop' into 1701-index-again 2017-01-16 21:06:43 +00:00
Michael
0c310db23d Bugfix for failed events page and api 2017-01-16 20:59:16 +00:00
Tobias Diekershoff
b81a1fde09 Merge pull request #3093 from annando/issue-3011 
Issue 2364: OStatus: Don't fetch liked contents
 2017-01-16 07:31:53 +01:00
Tobias Diekershoff
e7966171dd Merge pull request #3094 from annando/1701-hubzilla-probe 
Fixing avatar problems when probing Hubzilla contacts
 2017-01-16 07:27:03 +01:00
Michael
ced7cb6828 Smarter way to create unique indexes 2017-01-15 23:30:43 +00:00
Michael
e63e241f8f Hubzilla doesn't send a width attribute in the avatar picure in the hcard 2017-01-15 19:46:04 +00:00
Michael
021a4fad71 Some more database stuff 2017-01-15 12:36:06 +00:00
Michael
2362e78c8f Issue 3011 (and others): OStatus: Don't fetch liked contents 2017-01-15 09:07:57 +00:00
Michael
e16afc0450 Some more changed indexes and improved queries 2017-01-14 21:36:34 +00:00
Michael
85397f3bb9 Some removed indexes 2017-01-14 00:49:41 +00:00
Michael
29ef8d29ce Better usage of text and mediumtext. 2017-01-13 22:13:52 +00:00
Michael
3af099298c Some more caching 2017-01-13 17:31:10 +00:00
Michael
a9833a395f The relay query now uses a better index 2017-01-13 10:37:39 +00:00
Michael
fd5f151a72 New function to detect heavily used indexes 2017-01-13 07:46:47 +00:00
Michael
e67133ef56 Merge remote-tracking branch 'upstream/develop' into 1701-curl-range 
Conflicts:
	mod/oexchange.php
	mod/uimport.php
 2017-01-12 07:25:44 +00:00
rabuzarus
63e2695d22 Merge pull request #3074 from annando/1701-diaspora-ostatus-mentions 
Bugfix: Answers to OStatus posts should never reach Diaspora
 2017-01-12 02:12:25 +01:00
rabuzarus
4a8cff74f2 Merge pull request #3081 from annando/1701-top-level 
When commenting too fast, messages weren't delivered to Diaspora
 2017-01-12 02:11:43 +01:00
Michael
fcd0b198f5 Correction of commit a96eb3428d 2017-01-11 23:18:51 +00:00
Michael
12dd06f726 Merge remote-tracking branch 'upstream/develop' into 1701-top-level 2017-01-11 23:15:23 +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 Vogel
3c51820515 Merge pull request #3076 from Hypolite/issue/#3039-boot-doc-include 
Normalize App parameter declaration (doc-include folders, boot)
 2017-01-11 09:01:48 +01:00
Michael
84b733e1bf Standards stuff should make Hypolite happy. 2017-01-10 16:11:08 +00:00
Michael
3cf1f5e532 Compare instead of assign ... 2017-01-10 10:23:51 +00:00
Michael
c44f859edf We should check for the item, not the parent. 2017-01-10 07:58:17 +00:00
Michael
fafeea4382 When commenting too fast, messages weren't delivered to Diaspora 2017-01-10 07:40:57 +00:00
Michael
a2debaa68a Download limit for fetching data via "z_fetch_url" 2017-01-09 23:10:32 +00:00
Hypolite Petovan
87eb3d5ef2 Normalize App parameter declaration (doc-include folders, boot) 2017-01-09 23:09:01 +11:00
Michael
16f0221e4c DBClean now has a smaller limit/Query improvements 2017-01-09 09:37:37 +00:00
Michael
65226778fe More standards 2017-01-09 06:40:56 +00:00
Michael
fc60e7f5dd Making Hypolite smile 2017-01-08 22:29:55 +00:00
Michael
906c7d528b Bugfix: Answers to OStatus posts should never reach Diaspora 2017-01-08 20:35:41 +00:00
Michael
28b2e599fb it should be "gid" not "cid" 2017-01-08 20:11:15 +00:00
Michael
ed0143c9f0 Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 16:13:57 +00:00
Michael
1febf182ad Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 14:31:25 +00:00
Michael
c2543f918b Last minutes changes 2017-01-07 13:52:30 +00:00
Michael
414c5ddae0 Use Config class/Option to deactivate the count on albums 2017-01-07 09:05:52 +00:00
Roland Häder
4530f4ac9d Merge remote-tracking branch 'upstream/develop' into develop 2017-01-06 17:10:40 +01:00
Michael
cb5df4d715 Some corrections 2017-01-06 13:30:12 +00:00
Michael
6976ad4892 Removed some removed indexes 2017-01-06 06:37:27 +00:00
Michael
ff3728be47 Cleaning up the stuff 2017-01-05 22:51:31 +00:00
Michael
2deb2b637b Some new indexes and some removed. 2017-01-05 22:23:00 +00:00
Michael
6cdccbe2f6 Will we now find the best index fort the contact? 2017-01-05 17:48:51 +00:00
Michael
7aaf91a620 Removing and adding some indexes 2017-01-05 13:16:27 +00:00
Michael
9c7a2d2f9a Another index 2017-01-05 09:32:16 +00:00
Michael
a4e437b56f Contact testing 2017-01-05 09:10:02 +00:00
Michael
a92c5f464d Hopefully this it it ... 2017-01-05 08:02:21 +00:00
Michael
db1c6c06d6 Finding the best index ... 2017-01-05 07:30:10 +00:00
Michael
00d7835ba6 Some more contact indexes 2017-01-05 07:12:13 +00:00
rabuzarus
686a7dbe01 Bugfix: make some todos usable for doxygen in dfrn.php 2017-01-05 02:23:34 +01:00
Michael
cefb36fb67 Some more indexes on the contact table 2017-01-04 23:28:51 +00:00
Michael
c221376041 Some notification thingy 2017-01-04 23:12:28 +00:00
Michael
44d966574d Some more indexes and other query improvements 2017-01-04 19:13:50 +00:00
Michael
6b6e3e264f Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-04 13:57:27 +00:00
Roland Häder
42c2e09382 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-04 09:03:00 +01:00
Michael
9a6478b273 Don't be greedy. 2017-01-02 07:00:44 +00:00
Michael
8aaf09f9ee Automatically add a Diaspora mention 2017-01-01 23:18:42 +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
Roland Haeder
d2df464d8c
added curly braces + fixed indenting according to code review by Hypolite 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-30 21:49:08 +01:00
Roland Haeder
d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop 
dbm::is_result() calls needed merge

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-30 21:33:41 +01: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
5222bd2264 Merge remote-tracking branch 'upstream/develop' into 1612-diaspora 2016-12-29 23:29:01 +00:00
Michael
94977cca18 Events are now done. 2016-12-29 23:27:11 +00:00
Tobias Diekershoff
51155d7716 Merge pull request #3047 from annando/1612-indexlength 
New binary data fields to avoid index length problems
 2016-12-29 19:11:54 +01: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
1490f2d3b7 Merge remote-tracking branch 'upstream/develop' into 1612-diaspora 2016-12-29 10:16:10 +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
Johannes Schwab
aab21838a4 Missing self befor class constants 2016-12-28 13:14:03 +01: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
Michael
3ba1ac595f New binary data fields to avoid index length problems 2016-12-25 21:04:10 +00:00
Roland Haeder
b7c9d63b7a
Fixed parser errors (opps) + changed # -> // Please do so also as # for comments is deprecated. 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-23 20:09:10 +01:00
Roland Haeder
3dbb92c0dc
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-23 19:51:11 +01:00
Roland Haeder
ca82678a6d
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-23 19:51:04 +01:00
Roland Häder
f8a213e23b
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:49:36 +01:00
Roland Häder
97c507e763
Coding convention applied: 
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:49:15 +01:00
rabuzarus
e95337e9ae correct doxygen @todo 2016-12-23 18:31:42 +01:00
Roland Häder
5547bc2cc2 Continued rewriting a bit: 
- more usage of dbm::is_result()
- nicer look of code

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 17:03:00 +01:00
Roland Häder
9c81b4948e Coding convention applied: 
- added curly braces
- added space between if/foreach and brace
- avoided 2 return statements (true/false) by replacing them with just one
- added TODO for applying above to all findings

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 16:59:43 +01:00
Roland Häder
8db0be09b8 Coding convention applied: 
- added curly braces
- added space between if/foreach and brace
- avoided 2 return statements (true/false) by replacing them with just one
- added TODO for applying above to all findings

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 16:58:50 +01:00
Roland Häder
2325d81048 Code style changed: 
- added more curly braces
- made SQL keywords all-uppercase
- added spaces between if/foreach and brace
- // Is for single-line comments *only*, please don't abuse it for multiple
  line comments, use /* */ instead and a asterisk in front of every line.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 16:52:28 +01:00
Roland Häder
30642756e5 Code style changed: 
- added more curly braces
- made SQL keywords all-uppercase
- added spaces between if/foreach and brace
- // Is for single-line comments *only*, please don't abuse it for multiple
  line comments, use /* */ instead and a asterisk in front of every line.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 16:50:40 +01:00
Roland Häder
d82ed5d1b4 Continued with code convention: 
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 15:31:23 +01:00
Roland Häder
c9194b0381 Continued with code convention: 
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 15:30:23 +01: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
Michael Vogel
9e689e8b9b Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links 
Diaspora: Complete /people/* links from fcontact or author domain
 2016-12-22 10:17:44 +01:00
Roland Häder
ef5838bbd2 was not missing in develop branch, but here. :-( 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 09:10:17 +01:00
Roland Häder
99c8fd36c0 applied coding convention rule 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 09:10:00 +01:00
Roland Häder
d242e72c65 applied coding convention rule 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 09:09:27 +01:00
Roland Häder
8b7d5d0efc Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 09:06:00 +01:00
Roland Häder
4c04a78d1b Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 09:03:44 +01:00
rabuzarus
2fcbba9410 provide local time for notifications 2016-12-22 00:28:52 +01:00
rabuzarus
125d2f24dd frio: add profile link to the notifications url 2016-12-21 23:17:55 +01:00
Roland Haeder
d3e666f71a
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 23:12:28 +01:00
Roland Haeder
d97b6a2eba
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 23:04:09 +01:00
Roland Haeder
0436782e70
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 20:01:51 +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
3befdc6920
used more App::get_baseurl() instead of get_app()->get_baseurl(). 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:51:54 +01:00
Roland Haeder
7c342600c3
used more App::get_baseurl() instead of get_app()->get_baseurl(). 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:51:25 +01:00
Roland Haeder
b4bc07fdcc
Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- 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:32:00 +01:00
Roland Haeder
536f078ed4
Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- 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:31:05 +01:00