Commit graph

5381 commits

Author SHA1 Message Date
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 Häder 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 Häder 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 Häder 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 Häder 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 Häder 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 Häder fcf095cc6e
always surround operators like +,-,. with spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 17:43:01 +02:00
Roland Häder 851c0284ee
added spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 17:40:49 +02:00
Roland Häder ccbe7dd353
opps, missed this space ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 17:36:59 +02:00
Roland Häder a8136898b4
Opps, fixed parser errors
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 17:04:09 +02:00
Roland Häder 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 Häder 629fcd48bd
tpzo fixed ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 16:27:21 +02:00
Roland Häder f2f20c85d5
added spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 16:27:06 +02:00
Roland Häder be59fe86e5
added space + type-hinted $a (App)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 15:29:50 +02:00
Roland Häder 3a197833cd
added space
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 15:28:30 +02:00
Roland Häder 753b432ab2
fixed intending
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 15:27:45 +02:00
Roland Häder 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 Häder 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 Häder cf4bacdbd6
fixed spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-14 15:12:11 +02:00
Roland Häder 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 Häder e325c6ec85
opps, missed this one.
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-09 00:28:48 +02:00
Roland Häder 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 Häder d07236deb6
huh? missed again
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 20:08:22 +02:00
Roland Häder cd697e0d7c
more spaces! ;-)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 20:07:40 +02:00
Roland Häder 0319517f94
more curly braces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 20:06:56 +02:00
Roland Häder 6ff0b15873
more spaces + curly braces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 20:05:56 +02:00
Roland Häder 577e93e9fc
added spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 20:04:33 +02:00
Roland Häder bc5d1015b3
added curly braces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 20:03:21 +02:00
Roland Häder a66f6fe668
more spaces and curly braces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 20:01:04 +02:00
Roland Häder 80f41991a5
curly braces were missing again ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:50:29 +02:00
Roland Häder 622b532f23
more spaces again ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:49:32 +02:00
Roland Häder 676e956a72
some more spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:45:44 +02:00
Roland Häder 85d5592180
added curly braces + spaces (CR)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:43:38 +02:00
Roland Häder 3051d30c88
added spaces (CR)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:40:19 +02:00
Roland Häder 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 Häder 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 Häder 61cfa9e42d
Opps!
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:31:54 +02:00
Roland Häder 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 Häder f6c667ef45
more spaces + curly braces ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:22:33 +02:00
Roland Häder 8ba461db0a
removed spaces ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:17:20 +02:00
Roland Häder 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 Häder 3d386daf53
no spaces here ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:11:51 +02:00
Roland Häder 3220234693
more spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:10:50 +02:00
Roland Häder 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 Häder 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 Häder 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 Häder 20f8b63fca
unspaced ... ;-)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 22:45:43 +02:00
Roland Häder 32ffe4a711
more spaces/curly braces added
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 22:40:09 +02:00
Roland Häder a4773a1ac0
added more spaces + fixed tpzo: occurence
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 22:34:35 +02:00
Roland Häder 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 Häder ddd875bba0
added more spaces (CR)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 22:23:57 +02:00
Roland Häder 5a28eae59d
Opps, fixed parser error ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 22:20:19 +02:00
Roland Häder 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 Häder 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 Häder 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 Häder 57b6e4c636
added spaces (CR)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 19:34:38 +02:00
Roland Häder 849e56e3a5
added spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 19:27:44 +02:00
Roland Häder 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 Häder 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 Häder 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 Häder 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 Häder 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 Häder 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 Häder 0e6b009425
fixed another parser error, opps
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 15:04:07 +01:00
Roland Häder 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