Commit Graph

15829 Commits

Author SHA1 Message Date
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
Tobias Diekershoff 81eec6b2b5 Merge pull request #3264 from annando/1703-avoid-api-error
Avoid API error when calling "/api/friendica/profile/show"
2017-03-25 16:25:20 +01:00
Michael adf9ed64bb Avoid API error when calling "/api/friendica/profile/show" 2017-03-25 14:16:21 +00:00
Roland Haeder 66f5e104b1
and without self:: ;-(
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 15:13:38 +01:00
Roland Haeder 952f2218ed
there is already $this->backend around, needs renaming
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 15:12:41 +01: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 73ee285212
rewrote for() loop to foreach() + added curly braces/spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 14:33:59 +01:00
Roland Haeder 006b4b88b2
Continued:
- added curly braces/spaces
- converted multiple single-line comments into one multi-line comment

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 14:07:59 +01:00
Roland Haeder 4d731dd838
Convention:
- comment blocks with 2 stars at beinging are doc-tags, with only star is a
  regular multi-line comment
- added curly braces + spaces
- removed TODO, there needs to be a way of writing this better than using @

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:58:50 +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 83dec2f815
fixed indending + closed own internal todo: better usage of x()
removed todo

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:37:46 +01:00
Roland Haeder 48a1d97f46
closed internal TODO, added parentheses as this is a minimized if/else block
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:30:12 +01:00
Roland Haeder b830d839f0
added a space
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:27:52 +01:00
Roland Haeder 1d48801d70
Continued:
- added spaces
- made a code block even

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:25:51 +01:00
Roland Haeder 177a0c8320
Continued:
- used dbm::is_result() to avoid E_WARNING when false is returned
- added curly braces + some spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:23:15 +01:00
Roland Haeder e503141b0c
added spaces and curly braces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:18:39 +01:00
Roland Haeder 67707247c8
Continued:
- added curly braces/spaces
- changed lower-case SQL keywords to upper-case
- used dbm::is_result() instead of count() (avoids warning in case of false is
  returned)

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:15:42 +01:00
Roland Haeder c1287df655
removed old-lost code + internal TODO closed
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:12:41 +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
Roland Haeder 1514fdaead
rewrote to static approach and if() condition can be simplified.
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:00:10 +01:00
Roland Haeder d64dafec63
removed parentheses and indended it for better readability
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 12:55:39 +01:00
Roland Haeder bd4cee8c21
added spaces/curly braces and TODO for better using trim()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 12:53:48 +01:00
Roland Haeder a70a2381c9
removed old-lost code
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 12:49:17 +01:00
Roland Haeder 506af8b556
changed "and" -> && according to CR
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 12:47:47 +01:00
Roland Haeder 689b81171e
added spaces, removed parentheses. there is more ahead than just this one.
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 12:44:24 +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
Tobias Diekershoff eb482c3acf Merge pull request #3262 from annando/1703-no-no-utf
"no_utf" wasn't in use anymore - it is now removed completely
2017-03-25 12:01:53 +01: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
Tobias Diekershoff 3b28f5a992 Merge pull request #3259 from Hypolite/issue/#3256
Upgrade PHP-Markdown + enable hard_wrap
2017-03-25 10:14:43 +01:00
Tobias Diekershoff d8d2bc8456 Merge pull request #3261 from Hypolite/issue/#3260
Remove Embedly integration
2017-03-25 10:13:20 +01:00
Hypolite Petovan 86ed5caab7 Cleanup + Standards for library/markdown.php 2017-03-25 02:03:47 -04: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 566cfb8418
space-time season continues ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 22:45:09 +01:00
Roland Haeder 239dfea4e6
it is space-time! ;-)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 22:40:33 +01:00
Roland Haeder caad9f5214
added more spaces (CR request)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 22:36:52 +01:00
Roland Haeder be717649a4
added more curly braces/spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 22:34:13 +01:00
Roland Haeder daa32d49cf
killme() does the same here + added curly braces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 21:19:37 +01:00
Roland Haeder c0be733d6d
Opps, became lazy here, thanks to @Hypolite finding it.
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 21:15:36 +01:00
Roland Haeder 084dbd6859
Continued:
- some spaces added
- removed parentheses as requested by @Hypolite
- added really important TODO as remote-inclusion is not what you want

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 21:11:21 +01:00
Roland Haeder 0e19fdfc71
removed parentheses + added TODO about a small rewrite
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 21:05:55 +01:00
Roland Haeder b5b3451b31
Continued:
- marked commented-out code as possible old-lost
- added more curly braces
- used more dbm::is_result() where SELECT is stated
- ! added quotes in array element, else (here) >thumb< (without quotes) is
  considered as a constant and causes an E_NOTICE

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 20:57:52 +01:00