strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
32419 commits 2 branches 55 tags 148 MiB
Commit graph

935 commits

Author SHA1 Message Date
Hypolite Petovan 2f49c4a058 Revert "Add monolog" 2019-01-21 10:08:09 -05:00
Philipp Holzer 5ee72b681b removed unused get_app() 2019-01-21 10:00:46 -05:00
Philipp Holzer 6e48df2163 Refactor Loglevels 2019-01-21 10:00:46 -05:00
Philipp Holzer 81cb6bec30 define api log prefix 2019-01-21 09:59:10 -05:00
Philipp Holzer ff162dfef2 Replacing log usage 2019-01-21 09:59:09 -05:00
Philipp Holzer fe8f0e0045 Add Monolog 2019-01-21 09:58:05 -05:00
Hypolite Petovan 55e54bb950 Replace deprecated Addon::callHooks with Hook::callAll 
- Update documentation
 2019-01-21 09:50:56 -05:00
Hypolite Petovan 895b3abf32 Remove/replace killme() with *exit() 2019-01-21 09:49:17 -05:00
root dbd2e4cdf3 follow code standard 2019-01-21 09:13:10 -05:00
root 06ccba1c28 code style & use DBA::p 2019-01-21 09:13:09 -05:00
root 61afd5b3fb refs #6292 
APIs show number of comments
- /api/statuses/*_timeline
- /api/search
- /api/favorites

/api/search enhacement
- support exclude_replies parameter
 2019-01-21 09:13:09 -05:00
root 6c2ace3cab update hashtag regular expression 2019-01-21 09:12:35 -05:00
root 8de263df8b #6275 - q support hashtag search 2019-01-21 09:12:35 -05:00
root 939364f9a0 API - /search #6274 
- fixed: search result always return empty
- add hashtag search: friendica_tag params
- ApiTest & api.md updated
 2019-01-21 09:12:35 -05:00
root b43dd28b7a closes #6272 2019-01-21 09:12:33 -05:00
root d331e4e6e3 API - /media/upload - add return value #6272 
image.preview: string (url for small image)
 2019-01-21 09:12:33 -05:00
fabrixxm 55292c954b Remove resourceid parameter from Photo::exists() 2019-01-21 09:12:29 -05:00
fabrixxm e7fbe04b11 Fix parse error 2019-01-21 09:12:29 -05:00
fabrixxm 8c75c26361 Use Model\Photo as much as possible 
Most important is to use `Photo::delete()` to have backend
to remove data.
 2019-01-21 09:12:28 -05:00
Hypolite Petovan 5e1ceb57de Escape global namespaced get_app() calls 
- Add deprecated status
 2019-01-03 21:27:36 -05:00
Michael Vogel 94eca77041
Merge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile 
Rework mod/match and mod/msearch
 2018-12-27 18:04:06 +01:00
Hypolite Petovan c5867df24c Remove useless intermediate network_name variable in include/api 2018-12-26 11:02:28 -05:00
Hypolite Petovan acaee626f5 Remove include/ requires that are now done directly from Composer 2018-12-24 09:56:25 -05:00
Michael 1f432d006b API: Fix author of repeated items from Diaspora 2018-12-21 22:55:36 +00:00
Hypolite Petovan 9c534546e4 Fix condition in api_fr_photo_create_update 2018-11-30 10:48:47 -05:00
Hypolite Petovan 458981f75c Replace x() by isset(), !empty() or defaults() 
- Remove extraneous parentheses around empty() calls
- Remove duplicate calls to intval(), count() or strlen() after empty()
- Replace ternary operators outputting binary value with empty() return value
- Rewrite defaults() without x()
 2018-11-30 09:06:22 -05:00
Michael a5ddaa9dbc Issue 6128: Websub could work now 2018-11-13 22:23:16 +00:00
Michael 34a0e71485 API: The wrong user had been shown for repeated posts 2018-11-11 19:05:57 +00:00
Adam Magness ffc406d819 normalise_link calls 
implement normaliseLink function
 2018-11-08 11:28:29 -05:00
Adam Magness 46d7767fd0 formatBytes calls 
implement function in new class
 2018-11-08 10:28:49 -05:00
Adam Magness 991f259ecb random_string calls 
implement getRandomHex function
 2018-11-08 08:45:46 -05:00
Adam Magness 4f07ebb52f Rename properly 
rename function properly this time!
 2018-11-06 06:34:32 -05:00
Adam Magness 3eecd108c5 rename function 
rename function and update calls.
 2018-11-06 06:31:48 -05:00
Adam Magness a71eb1d127 functions moved to HTML class 
update function calls to moved class.
 2018-11-05 21:06:26 -05:00
Adam Magness 50da89d861 Logger Levels 
update logger levels in calls
 2018-10-30 09:58:45 -04:00
Adam Magness 14fde5dc9b Log function 
implement log() function.
 2018-10-30 09:57:14 -04:00
vinzv cb75c40f4e adapted profile pic resize to 300px for whole system 2018-10-23 16:36:57 +02:00
Philipp Holzer 32af52842b
adding defaults in mod/redir.php 2018-10-22 22:13:41 +02:00
Philipp Holzer d00ddc01af
Split goaway to System::externalRedirectTo() and App->internalRedirect() 2018-10-22 22:13:35 +02:00
Philipp Holzer 2ef81108b3
Renamed System::redirect() to $a->redirect() 2018-10-22 22:13:22 +02:00
Michael 1cd72e7694 API: The source field does now reliably return the correct network name of the author 2018-10-22 14:15:14 +00:00
Jonny Tischbein f3fc1f36ca Renaming functions + moving functions from security to Model/Item and BaseModule + fix multiline comments 2018-10-17 21:30:41 +02:00
Jonny Tischbein ce2b1f5715 Rename function Authentication::authenticate_success to Authentication::success 2018-10-17 18:45:32 +02:00
Jonny Tischbein 05be2db725 Move include/security tp /src/Core/Authentication and /src/Util/Security 2018-10-17 14:19:58 +02:00
Jonny Tischbein bfa05156ca change links from /contacts to /contact 2018-10-13 13:29:56 +02:00
Philipp Holzer 5a02e39a65
Rename App Methods 
- renamed a lot of App methods to CamelCase
- replaced direct public variables with get-/set-Methods
 2018-10-10 00:16:06 +02:00
Michael 3ab837f3c7 Functionality is now split 2018-10-03 09:15:38 +00:00
Hypolite Petovan 505350c9fb
Merge pull request #5794 from annando/ap1 
ActivityPub support
 2018-10-02 11:24:04 -04:00
Michael 54c7ca58d8 Repeated posts from OStatus, ActitivyPub and Twitter are now shown as is 2018-10-02 03:41:38 +00:00
Michael b746ddec64 Issue 5797: Retweets are now displayed again via API 2018-10-01 18:16:19 +00:00
Michael e3a4a9c407 Issue 5798: We had displayed the author as owner 2018-10-01 17:36:23 +00:00
Michael cb9be8a7ab UUID is now createUUID 2018-09-27 11:52:15 +00:00
Michael 60b0759b50 UUID instead of GUID 2018-09-26 20:03:46 +00:00
Jonny Tischbein 9821f173a4 fix response 2018-09-16 19:36:25 +02:00
Jonny Tischbein a0942963c9 api_friendships_detroy uid - api_user instead of local_uer, empty check for 2018-09-15 11:06:55 +02:00
Jonny Tischbein b7e15e8b38 api_friendships_destroy finally function header + NotFoundException typo 2018-09-14 19:35:24 +02:00
Jonny Tischbein 2c3a58d44e api_friendhips_destroy function header 2018-09-14 10:06:26 +02:00
Jonny Tischbein 3eb539aefd api_friendships_destroy idents, DBA::selectFirst, Excepions and LogMessages 2018-09-14 09:28:14 +02:00
root a89f9cf7d5 api_friendships_destroy cleanup 2018-09-13 23:32:26 +02:00
root 3f85fee7e3 Add api_friendships_destroy() like mod/unfollow.php 2018-09-13 23:23:53 +02:00
Tobias Diekershoff d5a3b0bd5e
Merge pull request #5710 from annando/fix-api 
Fix for timeout issues when posting to the API
 2018-09-02 14:52:09 +02:00
Michael 703c668a37 More notices ... 2018-09-02 08:01:13 +00:00
Michael 394526db74 Typo corrected / use the thread table instead 2018-09-02 07:35:12 +00:00
Michael 4bb45f611f Fix for timeout issues when posting to the API 2018-09-02 07:20:04 +00:00
fabrixxm 93ba393559 API: add private value (bool) to item results (#5647) 
* API: add private value (bool) to item results

friendica:private for xml
friendica_privarte for json

* API Docs: add a section about custom value returned in status data
 2018-08-23 10:09:50 -04:00
Michael Vogel 7f3fb34c24 Some easy to replace "q" calls have been replaced by "DBA" calls (#5632) 
* Some easy to replace "q" calls have been replaced by "DBA" calls

* Simplified the GUID creation

* And one in the API ...

* And OStatus has got some DBA calls more

* Just some more replaced database calls

* The event query is now simplified

* Events are now shown again

* subthread is now using the DBA calls as well

* Some more replaced database calls

* And some more replaced database calls and prevented notices

* Better use gravity

* Some more replaced database stuff

* Some more replaced database calls in DFRN.php

* The gcontact class now has got the new DBA functions as well

* The Contact class is now changed to new database functions as well

* Small correction

* We can now delete without cascade

* One more functionality is safe for future changes
 2018-08-19 12:46:10 +00:00
Tobias Diekershoff d5c2c41b02
Merge pull request #5626 from annando/notices-oh-yeah 
Removed notices, will it ever end?
 2018-08-17 09:33:02 +02:00
Michael 0342f9e084 Removed notices, will it ever end? 2018-08-17 03:19:42 +00:00
fabrixxm 66b4730a70 api: fix friendica/notification/seen api call 
Fix return item related to notification when notification is set as seen
 2018-08-16 11:46:53 +02:00
Roland Häder e06fc2aa69 Stopped using deprecated constants NETWORK_* (#5537) 
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...

* Removed deprecated NETWORK_* constants as per code reviewer's request.
 2018-08-11 22:40:44 +02:00
Roland Häder 4d39164c1e [WIP] Rewrite to Proxy class: (#5507) 
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
  functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
  will do this for us
- renamed those proxy_*() functions to better names:
  + proxy_init()           -> Proxy::init()         (public)
  + proxy_url()            -> Proxy::proxifyUrl()   (public)
  + proxy_parse_html()     -> Proxy::proxifyHtml()  (public)
  + proxy_is_local_image() -> Proxy::isLocalImage() (private)
  + proxy_parse_query()    -> Proxy::parseQuery()   (private)
  + proxy_img_cb()         -> Proxy::replaceUrl()   (private)

* Ops, need to set $a here ...

* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule

* Ops, no need for own instance of $a when self::getApp() is around.

* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
  methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module

* No instances from utility classes

* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`

* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.

* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.

* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
 2018-07-30 22:06:22 -04:00
Roland Häder 37253656e3 Moved CONTACT_* constants to Friendica\Model\Contact class, lesser in global namespace (#5490) 
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class

* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
 2018-07-24 22:53:46 -04:00
Hypolite Petovan a6fb3568f9 Rename dbesc to DBA::escape 2018-07-23 15:30:54 -04:00
Hypolite Petovan ecea7425f8 Rename DBA::is_result to DBA::isResult 2018-07-23 11:04:14 -04:00
Hypolite Petovan 0ec44f3e8a Rename DBM method calls to DBA method calls 2018-07-23 11:02:24 -04:00
Hypolite Petovan af6dbc654f Rename Friendica\Database\dba to Friendica\Database\DBA 2018-07-20 08:19:26 -04:00
Hypolite Petovan daa1177e3a Update use statement lists with new Friendica\Database\dba class 
- Remove unused use statement
- Remove superfluous use statements (classes in the same namespace)
- Add missing use statements
 2018-07-19 22:15:21 -04:00
Michael Vogel 5af9596dde New item field "Post-type" and new table "permissionset" (#5408) 
* "post-type" replaces "bookmark" and "type"

* Removed some more type

* Added index to permission set

* The permission set is now stored

* The permission set is now removed upon expiry

* Post update now stores the permission set

* New file

* Permissions are now sorted

* Changed documentation
 2018-07-19 09:52:05 -04:00
Hypolite Petovan 67dc08d120 Enforce systen.register_policy value type 2018-07-16 19:38:19 -04:00
Hypolite Petovan 5906c7e013 Remove api test pconfig debug 2018-07-16 19:38:17 -04:00
Hypolite Petovan 224765cdf5 Wrong table name 2018-07-16 19:38:16 -04:00
Hypolite Petovan f8a90f3425 Add more api test debug 2018-07-16 19:38:16 -04:00
Hypolite Petovan de0afd3b32 Add api test debug 2018-07-16 19:38:16 -04:00
Michael Vogel 0360f7197a Several more warnings ... (#5340) 
* Some more warnings removed

* Even more warnings ...

* Will it ever end? ;-)

* Avoid warning in dbstructure

* Origin and OStatus ...

* There are more warnings solved ... yeah!

* And again ...

* We are not done yet

* And more ...

* And some new places ...

* And more in the feeds

* Avoid some more

* And some backend stuff

* Notifications cleared

* Some more stuff

* and again ...

* It's getting fewer ...

* Some warnings had been hidden in the notifications

* Fix the fix

* And another missing one ...

* We need the owner here, not the user

* Forgotten user

* And more ...

* And some more warnings disappeared ...

* Some more frontend warnings

* Some backend warnings removed

* Fixed sidebar for "vier"

* And more ...

* Some more ...

* And something for "remote self"

* Am I stuck in an endless loop?

* Fix: Clear tag and file field on update

* Preset page content
 2018-07-10 08:27:56 -04:00
Philipp Holzer c829e43725
moved get_guid to System::createGUID 2018-07-09 21:38:16 +02:00
Michael 3e797547a3 Warnings fixed 2018-07-08 09:37:05 +00:00
Michael Vogel ff5ee74ecf
Merge branch 'develop' into item-activities 2018-07-08 06:35:50 +02:00
Michael 4d35e228c4 More item abstraction / making remote deletion work again 2018-07-07 18:14:16 +00:00
Hypolite Petovan e44111e935 Revert renaming lang to language in api 
- Normalize some quotes
- Put "Empty user-agent" log message in a else statement
 2018-07-04 17:33:09 -04:00
Hypolite Petovan 43688c04b1 Add NotFoundException for recipients in api_direct_messages_new() 2018-07-02 07:48:59 -04:00
Hypolite Petovan cb7176ee70 Fix Config use in api_statusnet_config() 2018-07-02 07:48:53 -04:00
Hypolite Petovan 757fd357f6 Fix yet more undefined variable/index notice in api 2018-07-02 07:48:48 -04:00
Hypolite Petovan dde61a77a4 Fix root element containing only text in api_create_xml() 2018-07-02 07:48:42 -04:00
Hypolite Petovan 62eba48679 Fix yet more undefined variable/index messages in api_statuses_show 2018-07-02 07:48:38 -04:00
Hypolite Petovan a380bcd1c1 Fix more undefined variable/index notice in tests 2018-07-02 07:45:25 -04:00
Hypolite Petovan a329ce5b50 Fix $called_api expecting at least 2 elements in tests 2018-07-02 07:45:11 -04:00
Hypolite Petovan 6776c4e3f9 Fix some undefined variable/index notices in tests 2018-07-02 07:44:55 -04:00
Michael 028c9f4da5 We now store the verb in the item-content as well 2018-06-27 19:37:13 +00:00
Michael 76dab3b2d7 Use gravity instead of verb 2018-06-27 18:09:33 +00:00
Michael b03db4643f The fetch function now centrally controls the content 2018-06-24 10:48:29 +00:00
Michael d643e00d33 Standards and a new function to fetch content 2018-06-21 15:14:01 +00:00
Michael e4adaa9900 Standards and variable renaming 2018-06-19 17:11:59 +00:00
Michael a5ca724fd3 Merge remote-tracking branch 'upstream/develop' into more-abstraction 2018-06-19 13:48:19 +00:00
Michael 4714cb746b Use the item functions at many more places 2018-06-18 20:36:34 +00:00
Michael Vogel f828350ba2
Merge pull request #5234 from fabrixxm/fix/api 
API: fix sender/recipient of PMs
 2018-06-18 12:03:53 +02:00
fabrixxm e3ee9ee501 API: fix sender/recipient of PMs: check api_user before get user info. 
To throw ForbiddenException and pass tests
 2018-06-18 11:55:02 +02:00
Michael 507956818d Use the item classes where possible 2018-06-18 05:19:28 +00:00
fabrixxm c015bb1b77 API: fix sender/recipient of PMs 2018-06-17 19:57:32 +02:00
Michael 6e10de9284 New function to fetch item data especially for users 2018-06-17 17:05:17 +00:00
Michael 0280a46ab4 Use predefined field lists 2018-06-17 06:27:52 +00:00
Michael 14cb128264 New function for generating item URI 2018-06-16 06:44:19 +00:00
Michael defd3d15b6 Possibly fixed test 2018-06-09 20:39:40 +00:00
Michael b6c344a80a $r was still in use 2018-06-09 20:08:15 +00:00
Michael 50dfc7d36e Small query corrections 2018-06-09 19:27:44 +00:00
Michael 446a45003d Added documentation, some indention fixes 2018-06-09 19:12:13 +00:00
Michael baf316e898 The central item fetch does work now and the API now uses these functions 2018-06-09 16:56:37 +00:00
Michael e632be763c Corrected variable 2018-06-05 05:44:04 +00:00
Michael 18a77a1b45 Removed some quick and dirty hack to upload pictures 2018-06-05 05:42:26 +00:00
Michael 443d828ba7 We don't need to look for the uid 2018-06-03 10:29:42 +00:00
Michael 6985ad4fb5 Improved error message 2018-06-03 09:55:41 +00:00
Michael b654af28fa We need "global" 2018-06-03 09:40:32 +00:00
Michael ea498ff283 And a second SQL error fixed 2018-06-03 09:21:48 +00:00
Michael d76fb6d0b9 Fixed SQL error 2018-06-03 09:19:27 +00:00
Michael a720c4f501 Removed unneeded fields from the API 2018-06-03 07:22:01 +00:00
Hypolite Petovan 93daf7883e Merge branch 'master' into develop 
- Updated new develop version label
- Incremented database build number
 2018-06-01 07:30:04 -04:00
Michael 8329705eba New function to delete items for users 2018-05-29 05:22:57 +00:00
Michael 54136f3a74 Added the new parameter to the delete function. 2018-05-26 21:38:45 +00:00
Michael bdbc51229a Fix for not being able to delete items 2018-05-26 18:07:27 +00:00
Hypolite Petovan ce75177d4e
Merge pull request #5022 from Rudloff/feature/test_api 
Add API tests
 2018-05-16 08:25:11 -04:00
Roland Häder bacb7b70f6
Cleanups: 
- added empty lines
- removed old-lost commented out line

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder 94a02f8572
Continued: 
- return is a keyword, not a function, so don't add braces here

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder e0a07d5f27
Continued: 
- used x() to make sure the array key is there, else an E_NOTICE is triggered
- added type-hints where it is safe

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:04 +02:00
Roland Häder 61fdc32d2f
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>
 2018-05-14 22:49:57 +02:00
Michael df019eb5bd Issue 4772: Display posts with uid=0 as well 2018-05-10 10:13:48 +00:00
Pierre Rudloff 9bb11ccfa5 $attachments should aways be an array 
In order to avoid a PHP 7.2 error when using count()
 2018-05-08 12:16:48 +02:00
Pierre Rudloff 23371880e8 $called_api should always be an array 
In order to avoid a PHP 7.2 error when using count()
 2018-05-08 12:16:48 +02:00
Michael 7cd7b1a9bf Some more replaced queries 2018-05-04 21:43:29 +00:00
Michael a83970bc0e Some more dba stuff 2018-05-04 06:33:36 +00:00
Michael 4ad655ab80 Replace old database queries with the new ones 2018-05-02 19:26:15 +00:00
Pierre Rudloff f3d98b2864 api_get_user() should not return false right away if the number in the URL is not a valid user 2018-04-10 10:46:10 +02:00
Pierre Rudloff 7d953d952e Various small fixes (#4795) 
* Use strict comparison to avoid 0 == false
* Avoid unecessary loop
* Avoid undefined variable
* Fix wrong variable name
* Don't try to use the $status_info variable if it does not exist
* Avoid undefined variable
* Check that variable is defined before trying to use it
* Don't cast $data array to boolean
* Fix undefined array
* $reactivate_group variable is not always defined
* Variable $found is not always defined
* Remove unused return statement
* Fix undefined array
* api_unique_id_to_nurl() requires an integer as argument
* Don't try to use $uinfo if it is false
* Don't use the same variable names in inner loop
* Throw an exception if $fileext is not defined
 2018-04-09 15:34:53 -04:00
Pierre Rudloff 773591a6ba Add some missing return types 2018-04-09 19:53:02 +02:00
Pierre Rudloff 4b36f3ad05 api_format_data() seems to never return an object 2018-04-09 19:34:09 +02:00
Pierre Rudloff 9cde7881ee Throw a ForbiddenException if api_get_user() returns false 2018-04-09 18:52:38 +02:00
Pierre Rudloff d0591dd882 The first argument for api_format_items() must be an array 2018-04-08 01:06:40 +02:00
Pierre Rudloff 9c351bad68 Fix wrong use of empty() 2018-04-08 00:55:05 +02:00
Pierre Rudloff bef3799942 Use empty() instead of !x() 2018-04-07 23:21:51 +02:00
Pierre Rudloff 333eb5f9dd Add missing variable 2018-04-07 23:20:30 +02:00
Pierre Rudloff b775cba8c2 Remove confusing comment 2018-04-07 22:39:38 +02:00
Pierre Rudloff 036803d8c7 Typo 2018-04-07 22:37:57 +02:00
Pierre Rudloff 5d8d62015c Make list_id parameter mandatory in api/lists/statuses 2018-04-07 22:36:54 +02:00
Pierre Rudloff 6401eb988b Use dba to access database in api_lists_statuses() 2018-04-07 22:35:19 +02:00
Pierre Rudloff fea7ec2482 We don't need type casting for dba::select() arguments 2018-04-07 22:18:39 +02:00
Pierre Rudloff c5aaa61d11 Rename api_list_create() to api_lists_create() for consistency 2018-04-07 22:15:35 +02:00
Pierre Rudloff c4edad212b Use dba to access the database in list API functions 2018-04-07 19:55:41 +02:00
Pierre Rudloff 929440417c We don't really need the unsen bit in api_lists_statuses() 2018-04-07 19:52:47 +02:00
Pierre Rudloff b3235c2d02 Implement parts of the list API: 
lists/statuses
lists/destroy
lists/update
lists/create
lists/ownerships
 2018-04-07 19:16:47 +02:00
Pierre Rudloff 78a979ee58 Add profile_image_url_profile_size and profile_image_url_large properties to user object returned by API (fixes #4695) 
This allows some clients to display a bigger avatar on profiles.
 2018-04-07 13:31:17 +02:00
Hypolite Petovan 27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
Hypolite Petovan 789561c7a2 Remove/Update references to include/html2*.php 2018-03-07 16:34:17 -05:00
Hypolite Petovan 5e806ff598 Replace html2plain calls by HTML::toPlaintext 2018-03-07 16:29:44 -05:00
Hypolite Petovan b5666bd27f Replace html2bbcode calls by HTML::toBBCode 2018-03-07 16:24:13 -05:00
Hypolite Petovan 95752b79e8 Add cache performance to API and worker 2018-03-04 23:13:19 -05:00
Michael 506f851b23 Bugfix: Avoid that Twidere is crashing 2018-03-04 19:25:02 +00:00
Michael a3af6807ac Improved resource id creation 2018-02-20 10:02:07 +00:00
Hypolite Petovan 9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -05:00
Hypolite Petovan 0c52866693 Refactor bbcode() into BBCode::convert() 2018-02-14 21:33:55 -05:00
rabuzarus 26fd6b1c33 fix undeclared variables or wrong variable names (/include) 2018-02-11 22:13:29 +01:00
Michael 30cfca40d8 Use a more simple HTML for API output 2018-02-10 13:33:15 +00:00
Tobias Diekershoff 85c8bf0228
Merge pull request #4399 from MrPetovan/task/3878-move-include-bbcode-to-src 
Move include/bbcode to src/ part 1 : Everything but bbcode()
 2018-02-07 07:18:39 +01:00
Michael e609de2957 Many item calls are now isolated in a single function 2018-02-06 12:40:22 +00:00
Hypolite Petovan 010cf3b1e8 Update references to BBCode methods 
- Resolve name conflicts with Util\Network
 2018-02-04 19:26:22 -05:00
Hypolite Petovan f020292408 Remove references to include/datetime 2018-02-03 20:47:37 -05:00
Hypolite Petovan 5e7285b9ba Move Temporal::convert() to DateTimeFormat::convert() 2018-02-03 08:56:55 -05:00
Hypolite Petovan 35d06bd9eb Add Temporal::utc() shorthand to Temporal::convert() 2018-02-03 08:56:53 -05:00
Hypolite Petovan 8aff8a76eb Add Temporal::utcNow() 2018-02-03 08:56:52 -05:00
Hypolite Petovan 38ff1b455b Add Temporal::MYSQL constant 
- Rename Temporal::convert() parameter names
 2018-02-03 08:56:52 -05:00
Hypolite Petovan b854905150 Move ATOM_TIME to Temporal::ATOM 2018-02-03 08:56:52 -05:00
Hypolite Petovan dc366bf1f7 Refactor datetime_convert into Temporal::convert 
- Changed parameter order to save space
- Refactor select_timezone into Temporal::getTimezoneSelect
- Refactor field_timezone into Temporal::getTimezoneField
 2018-02-03 08:56:51 -05:00
Hypolite Petovan 974539913c Remove include/like references 2018-02-01 14:17:22 -05:00
Hypolite Petovan a286e8bf3b Replace do_like() calls 2018-02-01 14:17:08 -05:00
Michael 7b27dda784 Most functions now moved from include/items.php 2018-01-28 11:18:08 +00:00
Adam Magness f04d40a37e Review update 
Rename function, move others
 2018-01-27 11:13:41 -05:00
Adam Magness c67452f72e Move fetch_url 
move fetch_url function
 2018-01-26 23:09:48 -05:00
Adam Magness 177edd2b6e Rename class to BBCode 
Rename Plaintext class to BBCode
 2018-01-26 20:01:32 -05:00
Adam Magness 21881f2885 Update function calls 
update to new function calls
 2018-01-26 19:14:47 -05:00
Adam Magness 8eecad4c7f String correction 
monthly is monthly
 2018-01-23 22:43:22 -05:00
Adam Magness 5142e65726 Review updates 
improve a t() call and move some to tt()
 2018-01-23 22:38:47 -05:00
Adam Magness 208a149a7b Review sprintf 
remove more sprintf calls
 2018-01-23 21:59:16 -05:00
Adam Magness c8ecc31405 Update functions and calls 
Update function names and calls.
 2018-01-22 18:03:26 -05:00
Adam Magness b86b04a81a Change plugin to addon 
change the use of plugin to addon where appropriate.
 2018-01-20 07:48:22 -05:00
Adam Magness 11cf36105c Update Addon functions and calls 
Update function names and calls for Addon class.
 2018-01-20 07:48:22 -05:00
Michael 034d46196f "last-child" is not used anymore 2018-01-18 06:54:44 +00:00
Michael 2d66242b4f The delete function is now changed to the new function 2018-01-17 23:22:01 +00:00
Hypolite Petovan e36f2bb1fb Use short form array syntax everywhere 
- Add short form array syntax to po2php.php generation
 2018-01-15 14:07:17 -05:00
Adam Magness b3e6a1d283 Update functions and calls 
Update functions and calls.
 2018-01-15 12:14:09 -05:00
fabrixxm 2d0fe7a30f
Fix api login 2018-01-13 09:22:40 +01:00
Hypolite Petovan 5fc4927764 Improve dba::selectFirst calls 
- Fix remaining $r[0] references
- Rename $r to meaningful names
 2018-01-11 03:43:57 -05:00
Hypolite Petovan ae66bcaff3 Rename selectOne to selectFirst 2018-01-10 12:57:21 -05:00
Hypolite Petovan da60893590 Replace dba::select(limit => 1) by dba::selectOne 
- Convert array declarations to new style
 2018-01-10 12:57:21 -05:00
Adam Magness a3ef9e35ec Update functions and calls 
Update function names and calls.
 2018-01-09 22:42:04 -05:00
Hypolite Petovan d1b3b7fbe4 Review changes 
- Remove doc for unused config value
- Restore api_get_user($a) calls
 2018-01-04 13:26:09 -05:00
Hypolite Petovan 35a18f6825 Fix unused code in include (second pass) 2018-01-04 12:21:13 -05:00
Hypolite Petovan 3b4625ebdd Fix unused code in include/api 2018-01-04 12:19:06 -05:00
Hypolite Petovan b39e06ed23
Merge pull request #4136 from Rudloff/feature/update_profile_api 
Cleaner way to get user URL in api_account_update_profile
 2017-12-26 17:13:58 -06:00
Pierre Rudloff 8b10bfe3a8 Cleaner way to get user URL in api_account_update_profile 2017-12-26 21:50:08 +01:00
Hypolite Petovan 06f32aaaa6
Merge pull request #4130 from Rudloff/feature/update_profile_api 
Basic support for account/update_profile API (fixes #4094)
 2017-12-25 20:06:34 -05:00
Pierre Rudloff c490a718ac Update profile in directory when calling api_account_update_profile 2017-12-26 01:09:51 +01:00
Pierre Rudloff 94244024ac Improve conditions in api_account_update_profile 2017-12-26 01:05:12 +01:00
Pierre Rudloff 8c17b96749 Missing return types in docblocks 2017-12-25 21:14:02 +01:00
Pierre Rudloff ee5301018a Fix typo 2017-12-25 21:12:08 +01:00
Pierre Rudloff de5dae0751 Basic support for account/update_profile API (fixes #4094) 2017-12-25 21:10:26 +01:00
Hypolite Petovan 75ba84efa8
Merge pull request #4129 from annando/issue-4121 
API: Better use "about" instead of "pdesc"
 2017-12-25 09:23:46 -05:00
Michael 0475fc1fce API: Better use "about" instead of "pdesc" 2017-12-25 05:39:11 +00:00
Hypolite Petovan c6a00f5ac4
Merge pull request #4126 from annando/issue-4121 
Fix for issue 4121 - now the description isn't empty
 2017-12-24 21:19:21 -05:00
Michael ba4329da61 Fixed typo 2017-12-24 23:07:14 +00:00
Pierre Rudloff 37eecad8cc Add missing doc in api.php 2017-12-24 15:01:43 +01:00
Michael e848e376b8 Fix for issue 4121 - now the description isn't empty 2017-12-24 11:51:38 +00:00
Pierre Rudloff 0305aa2d82 Lint api.php 2017-12-24 00:27:45 +01:00
Hypolite Petovan 1fd62ee626
Merge pull request #4122 from Rudloff/feature/cleanup_api 
Various fixes in api.php
 2017-12-22 20:04:07 -05:00
Pierre Rudloff ca73ec5cbb Incorrect return type 2017-12-23 01:36:55 +01:00
Pierre Rudloff f2758d00fb Unused variable 2017-12-23 01:34:12 +01:00
Pierre Rudloff da6a7b1fce Typo 2017-12-23 01:32:47 +01:00
Pierre Rudloff 70ab9dc9be Undefined variable 2017-12-23 01:31:29 +01:00
Pierre Rudloff 521d4b09b6 Unused argument 2017-12-23 01:27:17 +01:00
Pierre Rudloff b4cf27e767 api_format_data can also return an array 2017-12-23 01:25:43 +01:00
Pierre Rudloff 37aef32440 Remove unused variable 2017-12-23 01:23:28 +01:00
Pierre Rudloff 0691d83bbc Typo 2017-12-23 01:23:20 +01:00
Michael 1fc3993990 Code cleaning 2017-12-22 23:10:32 +00:00
Michael a309d3c733 Bugfix for the api call for remoteauth 2017-12-22 23:00:49 +00:00
Pierre Rudloff 890cda11ed Only use "@throws" in phpdoc if the function explicitely throws an exception 2017-12-19 14:52:46 +01:00
Pierre Rudloff e44da4a498 Close DB connection in api_saved_searches_list 2017-12-19 14:42:13 +01:00
Pierre Rudloff 30cb37cda5 Implement saved_searches/list API 2017-12-19 14:22:38 +01:00
Hypolite Petovan 256bf2e888
Merge pull request #4104 from Rudloff/feature/incoming_api 
Implement friendships/incoming and users/lookup APIs
 2017-12-19 05:39:23 -05:00
Pierre Rudloff a817a1a070 Throw NotFoundException if results are empty in api_users_lookup 2017-12-19 11:37:55 +01:00
Hypolite Petovan 394e94cbc1
Merge pull request #4103 from Rudloff/feature/profile_colors 
Add support for profile_*_color in API
 2017-12-19 05:35:36 -05:00
Pierre Rudloff 27646cc4ad Code standards in api_get_user 2017-12-19 11:33:59 +01:00
Pierre Rudloff 35c4a7940a Use dba::select() instead of dba::p() in api_get_user 2017-12-19 01:31:32 +01:00
Pierre Rudloff e11190b4cf Implement friendships/incoming and users/lookup APIs 2017-12-18 23:51:03 +01:00
Pierre Rudloff 3e9bc61bbf Add support for profile_*_color in API 2017-12-18 21:57:30 +01:00
Hypolite Petovan 7a6706b0f7
Merge pull request #4097 from Rudloff/feature/search_api 
Implement search API (fixes #929)
 2017-12-18 09:28:33 -05:00
Pierre Rudloff 02733c66f3 Use LIKE instead of REGEXP in api_search 2017-12-18 15:23:15 +01:00
Pierre Rudloff 3e4af13772 Implement the blocks/list API 2017-12-18 15:20:42 +01:00
Pierre Rudloff 5899d821ef Remove useless intval() in api_search 2017-12-18 14:36:06 +01:00
Pierre Rudloff 31d63d929d Use dba::inArray() instead of dba::fetch() in api_search 2017-12-18 14:28:04 +01:00
Pierre Rudloff ee8468affe Improve api_search() 
Use dba::p() instead of q()
Move exception to the beginning
Remove useless GROUP BY
Remove useless protect_sprintf()
 2017-12-18 14:00:10 +01:00
Pierre Rudloff 4a5d988d8c Implement search API (fixes #929) 2017-12-18 13:05:27 +01:00
Michael 1fbf6c014b Possible API speed ups for public timeline 2017-12-17 17:47:15 +00:00
Hypolite Petovan 691e4561e6
Merge pull request #4088 from annando/api-external-url 
API: Path to post added / "external_url" support
 2017-12-17 10:57:46 -05:00
Michael Vogel 9ff4d2d838
Merge pull request #4084 from MrPetovan/task/4071-add-networkpublic_timeline-api 
Add statuses/networkpublic_timeline api method
 2017-12-17 16:52:17 +01:00
Michael 26a89aa6ed API: Path to post added / "external_url" support 2017-12-17 15:16:18 +00:00
Hypolite Petovan cdd5bd5615 Improve networkpublic_timeline SQL performance 
- Use thread.iid for max_id and ordering
 2017-12-17 10:06:12 -05:00
Michael 995f2d719d Merge remote-tracking branch 'upstream/develop' into issue-4069 2017-12-17 12:10:32 +00:00
Michael 3c835ccb22 Alternate fix for issue 4069 2017-12-17 11:11:28 +00:00
Michael Vogel de56a3a824
Merge pull request #4079 from MrPetovan/task/4069-add-pagination-to-statuses-api 
Add pagination to API statuses/friends and statuses/followers
 2017-12-17 11:31:01 +01:00
Hypolite Petovan 53e3e49324 Add statuses/networkpublic_timeline api method 2017-12-16 15:41:50 -05:00
Hypolite Petovan 78c053c6b9 Add max_id support for statuses/user_timeline API 
- Add documentation
- Improve formatting
 2017-12-16 11:34:44 -05:00
Hypolite Petovan ecde6e456d Add pagination to API statuses/friends and statuses/followers 
- Add doc blocks for both API calls
- Remove unused parameters
 2017-12-16 10:16:25 -05:00
Michael 89ad41aca5 Bugfix: Calls to a renamed function had been changed 2017-12-14 18:06:48 +00:00
Hypolite Petovan 4fe8dab08d Remove include/group.php 2017-12-09 13:45:54 -05:00
Hypolite Petovan abdecd2b2f Use new Model methods for groups 2017-12-09 13:45:17 -05:00
Hypolite Petovan fe89e7760e Fix formatting all around 2017-12-09 13:42:02 -05:00
Hypolite Petovan a42595a30c Move Object\Contact to Model\Contact 2017-12-07 23:56:12 -05:00
Hypolite Petovan 3fc3e67b70 Separate Object\Photo into Model\Photo and Object\Image 
- Renamed a bunch of functions to shorter or clearer names
 2017-12-07 23:54:51 -05:00
Michael Vogel 5747cfc79c
Revert "Move Objects to Model" 2017-12-08 05:21:51 +01:00
Hypolite Petovan 18d93cddf6 Move Object\Contact to Model\Contact 2017-12-07 09:04:24 -05:00
Hypolite Petovan 52bddd580c Separate Object\Photo into Model\Photo and Object\Image 
- Renamed a bunch of functions to shorter or clearer names
 2017-12-07 08:56:11 -05:00
Adam Magness 0c48b4188b Non Static calls 
update calls to non static
 2017-12-04 21:10:54 -05:00
Adam Magness d3473f9999 Update use 
Forgot to update a use statement.
 2017-12-04 18:30:18 -05:00
Adam Magness 9c7b6d9d5f Functions and Standards 
Standards and convert to dba functions where possible.
 2017-12-04 14:52:04 -05:00
Adam Magness b1d16fbdf7 Update use statements 
update use statements for rename to singular.
 2017-12-04 09:04:36 -05:00
Adam Magness 6e5471def3 Rename to singular 
Rename and update references. Standards and a require_once.
 2017-12-04 09:01:27 -05:00
Adam Magness 2f0da29c75 Features to src 
Move Features to class in Friendica\Content namespace. Update function calls and references.
 2017-12-04 08:33:49 -05:00
Adam Magness 0373056448 Review and Use statements 
use statements and review changes.
 2017-11-29 17:29:11 -05:00
Adam Magness 0091d318e5 Function names 
Update function names and corresponding function calls
 2017-11-29 12:17:12 -05:00
Adam Magness 54827e7fed Photo to src 
Move Photo to Friendica\Object namespace and replace require_once statments with use statements.
 2017-11-29 07:52:27 -05:00
Hypolite Petovan ec6f5193e2 Switch to User::authenticate 
- Removed hash('whirlpool') to check password
 2017-11-26 14:46:08 -05:00
Hypolite Petovan 1f4fc87fd9 Use new HTTPExceptions in API 2017-11-23 23:48:15 -05:00
Adam Magness 609a4de5d0 src Standards 
This basically completes coding standards changes for the entire src directory, with the exception of App.php
 2017-11-23 14:01:58 -05:00
Michael c6c180e8b9 Some more changed calls 2017-11-22 09:11:44 +00:00
Adam Magness ddacbf2c13 XML class standards 
updated the xml class for PSR-2
 2017-11-20 12:56:31 -05:00
Hypolite Petovan ec02af593d Change called method names 
- Add GlobalContact::getRandomUrl
- Rename Contact::getIdForURL
- Rename Diaspora::sendUnshare
- Remove unused parameter $self in Contact::terminateFriendship
 2017-11-19 17:03:39 -05:00
Hypolite Petovan b92fc24ff0 Add Contact Object 
- Add Profile Object
- Add User Model
- Add use statements
 2017-11-19 16:55:28 -05:00
Michael 2de457489f "CreateShadowentry" and "ProfileUpdate" now moved as well 2017-11-19 16:59:37 +00:00
Michael 925d2d2383 Directory moved 2017-11-18 07:59:30 +00:00
Adam Magness bc49fc974c Capitalized XML 
Acronym classes should be capitalized
 2017-11-10 07:45:33 -05:00
Adam Magness f245bc8359 Move xml to namespace 
Relocate xml from include to src
Related to #3878
 2017-11-10 07:18:24 -05:00
Adam Magness aa13302bbc Review updates 
Documentation and yet another use statement
 2017-11-08 08:37:03 -05:00
Adam Magness 4ca68c7af0 Class file relocations 
Issue #3878
 2017-11-08 08:37:03 -05:00
Adam Magness 6189f6c8e7 Relocate class files from /include to /src/ 
dbm, Diaspora, dfrn, and NotificationsManager moved to namespace. Includes and references in files updated.
 2017-11-08 08:36:48 -05:00
Adam Magness 0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
Michael 478e363967 proc_run was replaced 2017-11-05 12:15:53 +00:00
fabrixxm a83b051003 Order result of api/statues/friends by nickname 2017-10-24 21:29:43 +02:00
Michael cb5b155083 Bugfix: The API picture upload created an invalid link 2017-09-20 21:47:12 +00:00
Michael 4b99d122dd Added explanation 2017-09-14 05:48:43 +00:00
Michael e18a037fb2 API: Improvements for clients with bad HTML support 2017-09-14 05:16:23 +00:00
Michael dbaed91a75 Bugfix: Repeating of posts generated a SQL error 2017-08-30 17:55:23 +00:00
Michael 5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
Michael 3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
Hypolite Petovan ad4cdf2a9d Replace lowercase operators 2017-06-08 21:03:44 -04:00
Hypolite Petovan 9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
gerhard6380 1a0e8723c5 corrected change 
sorry, I should not change code late in the evening when I am already tired.
 2017-05-31 10:33:35 +02:00
gerhard6380 bbddea03e9 API: link to original page for feed posts 
link to original page added to html output of feed posts if body is empty
 2017-05-31 02:24:09 +02:00
Michael 6e8e326705 Bugfix: Timeout problems when saving profile settings 2017-05-19 06:01:13 +00:00
Michael 875592f285 API: Direct Messages via the API now work again. 2017-05-15 20:11:33 +00:00
Tobias Diekershoff 1f58bcc114 Merge pull request #3418 from gerhard6380/develop 
New API calls for photo management
 2017-05-08 06:56:24 +02:00
Hypolite Petovan 86cae070f2 Merge branch 'develop' into improvement/move-app-to-src-2 2017-05-07 12:58:11 -04:00
Michael f132e27bc9 Twidere reported error 501 when accessing a profile 2017-05-05 20:36:56 +00:00
gerhard6380 877ecf6d04 changed sql for photo table from to avoid memory issues on large photo tables 2017-05-05 22:29:25 +02:00
Hypolite Petovan 20043914e6 Move App to src 
- Add `use Friendica\App;` wherever needed
 2017-05-02 22:59:36 -04:00
Hypolite Petovan 56ee734b00 Cleanup /format pre-move 2017-05-02 22:59:24 -04:00
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
gerhard6380 6a4d1fca88 change line endings to unix 2017-05-01 22:19:48 +02:00
gerhard6380 a2ccdf1fec coding conventions applied 2017-05-01 22:05:33 +02: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
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
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
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
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
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 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
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
Michael a9dfd1fcb7 One more API call added 2017-03-25 11:31:31 +00:00
Hypolite Petovan 7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04: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
Michael 8e12b159d9 Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup 2017-03-15 14:37:30 +00:00
Michael 39386ded36 "old_share" is removed 2017-02-27 21:26:37 +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 53393233c3 Replace the direct access of config variables 2017-01-17 19:21:46 +00:00
Michael 0c310db23d Bugfix for failed events page and api 2017-01-16 20:59:16 +00:00
Hypolite Petovan 87eb3d5ef2 Normalize App parameter declaration (doc-include folders, boot) 2017-01-09 23:09:01 +11: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
Roland Häder af2909bf8f
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-20 21:13:50 +01:00
Hypolite Petovan e8e1f9253d Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links 
# Conflicts:
#	include/follow.php
 2016-12-20 12:50:36 -05:00
Hypolite Petovan 4a7c3b9eef Diaspora: Fix class name case + add self 2016-12-20 12:44:15 -05:00
Roland Häder fb0ed18a43 changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:58:03 +01:00
Roland Häder a96eb3428d Used more dbm::is_result() instead of (!$r) or (!count($r)), still there are 
more pending ...

Also put SQL table columns into back-ticks.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:46:33 +01:00
Roland Häder ba3bc420ca Also reverted these + added spaces for nicer appearance. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 09:23:59 +01:00
Roland Häder 6cef88c24e Also reverted these + added spaces for nicer appearance. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 09:23:41 +01:00
Roland Häder 41db906dc4 Continued with #3010: 
- removed added debug messages (maybe they will come back in accordance to
  code-style guidelines?)
- converted $a->get_baseurl() back to App::get_baseurl()
- reverted back other code I have touched/merged as this was double:
  (substr($url, 0, 4) !== 'http') on $url = 'https://bla'; will be FALSE
  (means found http at start), too.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 17:02:10 +01:00
Roland Häder 23d4db5149 Continued with #3010: 
- removed added debug messages (maybe they will come back in accordance to
  code-style guidelines?)
- converted $a->get_baseurl() back to App::get_baseurl()
- reverted back other code I have touched/merged as this was double:
  (substr($url, 0, 4) !== 'http') on $url = 'https://bla'; will be FALSE
  (means found http at start), too.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 16:59:35 +01:00