ea498ff283
And a second SQL error fixed
2018-06-03 09:21:48 +00:00
d76fb6d0b9
Fixed SQL error
2018-06-03 09:19:27 +00:00
3f07d01dd1
Get rid of unneeded or redundant fields
2018-06-03 07:42:56 +00:00
a720c4f501
Removed unneeded fields from the API
2018-06-03 07:22:01 +00:00
723b5ae803
Use MagicLinkbyId when possible
2018-06-02 08:28:01 +00:00
8a34895a23
Use magicLink whenever possible
2018-06-02 08:05:06 +00:00
28f8beebfc
Workers can now be started exclusively from the daemon and other workers
2018-06-01 22:09:27 +00:00
b5b172500d
Merge remote-tracking branch 'upstream/develop' into public-redir
2018-06-01 12:32:51 +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
ae8d7267a0
"redir" is now centralized and works with the public contact
2018-06-01 06:46:34 +00:00
8329705eba
New function to delete items for users
2018-05-29 05:22:57 +00:00
c5a22f86c7
Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item
2018-05-27 10:38:49 +00:00
Pascal Deklerck
334aa40292
Fix autoname output length
2018-05-27 10:20:27 +02:00
54136f3a74
Added the new parameter to the delete function.
2018-05-26 21:38:45 +00:00
4c36109f02
Some more places to add the user id
2018-05-26 20:03:30 +00:00
bdbc51229a
Fix for not being able to delete items
2018-05-26 18:07:27 +00:00
de609e49f0
Improved logging
2018-05-24 22:00:54 +00:00
f8230badba
Avoid problems with better variable naming
2018-05-24 21:46:57 +00:00
1bce39120d
Reconnect after the connection had been lost.
2018-05-24 21:19:59 +00:00
Hypolite Petovan
b0155fe37b
Remove obsolete DNS test from include/dba
2018-05-24 01:31:03 -04:00
87b5e26063
Do a hard exit when the SQL connection went down
2018-05-24 04:07:39 +00:00
3fe07cca57
Issue 2880: Editing post doesn't destroy mentions or hashtags anymore
2018-05-19 14:55:27 +00:00
Alexandre Alapetite
e7d2d27938
sizeof bug
...
sizeof cannot be used to test existance.
Fixes: Got error 'PHP message: PHP Warning: sizeof(): Parameter must be
an array or an object that implements Countable in
/.../include/items.php on line 66\n': 1 Time(s)
PHP 7.2.5 / Ubuntu 17.04 LTS
2018-05-17 07:37:50 +02:00
Hypolite Petovan
ce75177d4e
Merge pull request #5022 from Rudloff/feature/test_api
...
Add API tests
2018-05-16 08:25:11 -04:00
c9f55f6b3d
Show "Remove from your screen" or "delete" depending of the impact of the deletion
2018-05-15 21:06:34 +00:00
f34d72c143
Fixes:
...
- used empty() instead of x()
- removed superflous count()
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:22 +02:00
d0c7ba5257
Fixed parser error
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:21 +02:00
debcdea82a
Continued:
...
- merged 2 if() into one with &&
- added TODO for possible rewrite (avoid "complex" code)
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
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
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
57e668d9e0
Continued:
...
- avoided else() block which reduces code complexibility
- used more x()
- added curly braces
- added known type-hints
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
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
47f95855c0
added spaces + some curly braces + some usage of dbm::is_result()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:01 +02:00
de50d62b81
more spaces + some curly spaces added
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:01 +02:00
35ada99954
Opps, added missing curly brace.
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:58 +02:00
78ffd5b80f
fixed parser error
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:58 +02:00
1c9dc6526f
Continued:
...
- added more curly braces
- replaced if (blaFoo()) { return true; } return false; with return blaFoo();
- added spaces
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:58 +02:00
337824f649
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>
2018-05-14 22:49:58 +02:00
c3c9a53364
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>
2018-05-14 22:49:58 +02:00
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
09384119b1
added spaces + some curly braces + some usage of dbm::is_result()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:55 +02:00
c7e256f9de
more spaces + some curly spaces added
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:55 +02:00
1a61cee5a7
added spaces + some curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:55 +02:00
f7ceea7a85
added spaces + some curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:55 +02:00
5b56f189ae
more spaces + some curly spaces added
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:54 +02:00
bc259cdc44
added spaces + some curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:54 +02:00
914a4e2e0a
Fix: Public items werent visible under certain circumstances
2018-05-10 22:06:34 +00:00
Pierre Rudloff
3195d6e125
Add API tests
2018-05-10 19:12:00 +02:00
df019eb5bd
Issue 4772: Display posts with uid=0 as well
2018-05-10 10:13:48 +00:00
6c792588fd
Ensure to mostly fetch the item with an non zero user id
2018-05-08 22:26:49 +00:00
8d513d74be
Reverted SQL sorting
2018-05-08 22:08:25 +00:00
14833edb2d
Issue 4990: Fixes missing posts on network page
2018-05-08 22:00:32 +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
Hypolite Petovan
3a3a4807a8
Merge pull request #4978 from annando/dba-2
...
Diaspora: Fix person/contact retraction
2018-05-04 18:04:38 -04:00
7cd7b1a9bf
Some more replaced queries
2018-05-04 21:43:29 +00:00
125afb4ae5
Suppress blocked contacts from being displayed
2018-05-04 21:27:20 +00:00
a83970bc0e
Some more dba stuff
2018-05-04 06:33:36 +00:00
4ad655ab80
Replace old database queries with the new ones
2018-05-02 19:26:15 +00:00
b4f5311e7f
Add Install Mode
...
- merge `friendica/develop` to `nupplaphil/install_mode`
2018-04-29 20:15:12 +02:00
Michael Vogel
bd0ba24518
Merge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app
...
Move current_theme() to App
2018-04-29 19:11:49 +02:00
78f563407a
Fix PR 4942: Fixed item query
2018-04-29 16:32:46 +00:00
Hypolite Petovan
20289393da
Fix own post check for content filter
2018-04-28 19:11:11 -04:00
Hypolite Petovan
fde3d6f870
Replace current_theme() and current_theme_url() calls
2018-04-28 18:37:25 -04:00
Hypolite Petovan
9edff6cc5c
Add exception for self-contact in item_joins()
2018-04-28 11:38:01 -04:00
1ab965c944
Add Install Mode
...
- merged `friendica/develop` to `nupplaPhil/install_mode`
- content merged `mod/install.php` to `src/Class/`
2018-04-28 15:11:01 +02:00
Hypolite Petovan
c417f779c4
Add missing readonly check for displaying items in item_joins
2018-04-28 07:47:02 -04:00
a97ad9dc42
Add Install Mode (Part 2)
...
- Added constants to class `App`
- Added global App-Mode to `dba:connect()` instead parameter `$install`
2018-04-28 12:36:40 +02:00
d5b68cd146
Add a App-Mode with defined constants
...
- Normal Mode = 0
- Install Mode = 1
- Maintenance Mode = 2
Moved Install-Mode check to class `App`
Replaced all maintenance and install checks with $a->mode checks
2018-04-27 21:07:04 +02:00
6973aaefc2
Add Install Mode
...
- Added $install_mode in Class App instead
- Extracted the install business logic to a new Class Install
- Replaced all $a->module == 'install' with $a->install_mode
2018-04-23 22:56:59 +02:00
Hypolite Petovan
a84477ed2d
Fix count() warning in include/dba.php
2018-04-23 00:00:06 -04:00
Hypolite Petovan
48122733b8
Move content filter HTML in a template
2018-04-22 18:02:00 -04:00
Hypolite Petovan
4cfb12e9d9
Add one-line content filter when there's only one reason
2018-04-22 14:28:34 -04:00
Hypolite Petovan
273dde508b
Add default value doc for options.cascade in dba::delete
2018-04-22 11:34:41 -04:00
Hypolite Petovan
0a026515bd
Add documentation for $options parameter in dba::delete
2018-04-22 11:33:20 -04:00
Hypolite Petovan
ba3f721524
Prevent side effect with cascade => false in dba::delete
2018-04-22 04:46:46 -04:00
Hypolite Petovan
18078ce7a4
Prevent infinite loop when a dbstructure_definition hook is orphan
...
- Add cascade option to dba::delete
- use cascade = false for orphan hook deletion
2018-04-21 20:34:07 -04:00
Hypolite Petovan
98f64ed824
Replace duplicate behaviors by Model\Term::populateTagsFromItem
...
- Replaced in include/conversation
- Replaced in include/text
2018-04-16 22:22:58 -04:00
Hypolite Petovan
54b75026fc
Add header support for security token check
2018-04-16 22:22:58 -04:00
d149541dba
notify admin when user deletes account
2018-04-15 11:39:05 +02:00
Marcus Müller
3761797e5f
Merge branch 'develop' into patch-1
2018-04-13 09:41:24 +02:00
Marcus Müller
89ba3b78ff
[BUGFIX] DB: Remove host DNS_PTR check
...
DNS_PTR checks fail on some domains and result in the return value `false`, even if the domain is valid and reachable.
2018-04-12 19:32:04 +02:00
Marcus Müller
e382dfcfbd
[BUGFIX] DB: Don't check DNS on IPs
...
Fixes https://github.com/friendica/friendica/issues/4786
2018-04-12 19:14:53 +02: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
32ca95a1b0
Use App->getSenderEmailAddress in include/enotify
2018-04-06 21:47:42 -04:00
0ccb29c4df
Only compare the HTML when we forcefully ignore the cache
2018-04-06 16:52:01 +00:00
297784880e
Update the cached rendered html when it changed
2018-04-06 14:01:52 +00:00
Michael Vogel
05cff59f70
Merge pull request #4722 from MrPetovan/task/add-content_filter-hook
...
Add content_filter hook
2018-04-06 06:42:52 +02:00
3792012723
Improved accessibility for "Frio"
2018-04-05 21:50:34 +00:00
Hypolite Petovan
34fd442821
Rename social.disable_cw pconfig to system.disable_cw
2018-04-04 23:08:48 -04:00
Hypolite Petovan
41db5f0912
Display content warning as title if collapsing is deactivated
2018-04-04 23:08:48 -04:00
Hypolite Petovan
296f561878
Rename hook to "prepare_body_content_filter"
2018-04-04 23:08:48 -04:00
Hypolite Petovan
d38b86dabf
Fix disabled content filter for own posts
2018-04-04 23:08:48 -04:00
Hypolite Petovan
f26c99d17b
Disable content filter for preview and own posts
2018-04-04 23:08:48 -04:00
Hypolite Petovan
d603bf062d
Add CSS classes to content-filter wrapper
2018-04-04 23:08:48 -04:00
Hypolite Petovan
b755e808df
Add new content_filter hook in prepare_body
...
- Add content warning processing to prepare_body with use of disable_cw
setting
- Add filter_reasons params to prepare_body hook
2018-04-04 23:08:48 -04:00
Hypolite Petovan
bec46d7b01
Remove content warning processing in put_item_in_cache
2018-04-04 23:08:48 -04:00
Hypolite Petovan
586b0b6e57
Add bash to text_highlight language list
2018-03-29 19:29:09 -04:00
Hypolite Petovan
daffc27061
Move suppress_tags config to template
...
- Add new item.suppress_tags template variable
- Fix template formatting
2018-03-25 00:38:23 -04:00
Hypolite Petovan
4eaf0d76b0
Remove include/event
2018-03-23 06:32:34 -04:00
Hypolite Petovan
6e7c6ab0fa
Remove references to include/event
2018-03-23 06:32:34 -04:00
Hypolite Petovan
f7e2071117
Replace include/event function with method calls
...
- Updated scope of Model\Event methods
- Updated use list
2018-03-23 06:32:34 -04:00
Hypolite Petovan
5aecc758f9
Replace include/event function content by method calls
2018-03-23 06:32:34 -04:00
Hypolite Petovan
27d94023ee
Merge branch 'master' into develop
2018-03-23 06:15:55 -04:00
e74f186b34
Event: Prevent SQL errors with events without end
2018-03-21 20:16:43 +00:00
73efdb99e3
Fix for incorrect datetime values
2018-03-21 05:20:55 +00:00
f082f0da4f
Merge pull request #4636 from annando/event-diaspora
...
Fix: Events on Diaspora now should look fine
2018-03-20 08:48:37 +01:00
f4ba5d9799
Fix: Events on Diaspora now should look fine
2018-03-20 06:32:17 +00:00
fabrixxm
e6c59b0593
fix docstring of get_poke_verbs()
2018-03-19 10:20:01 +01:00
fabrixxm
8a2a4510ec
Small fixes to translatable string
...
and some small cosmetic fixup to docstring for `notification()`
2018-03-19 10:15:09 +01:00
Hypolite Petovan
881c7ccfc1
Add meaningful return value to dba::connect
...
- Move System::unavailable call to index
2018-03-18 05:15:14 -04:00
537ef83a24
If we aren't connected to the database, we shouldn't return "true" on connect
2018-03-17 09:21:06 +00:00
Hypolite Petovan
c53c00ba4e
Add rendred-hash to put_item_in_cache todo
2018-03-15 03:23:11 -04:00
Hypolite Petovan
644767519e
Ensure the item body stays the same in put_item_in_cache()
...
- Add documentation
2018-03-15 02:13:00 -04:00
Hypolite Petovan
e28020c68a
Fix for CW: Items weren't cached
2018-03-15 01:32:04 -04:00
Hypolite Petovan
65b0159282
Merge pull request #4593 from annando/fix-ostatus
...
OStatus: Fixed communication issues with deleted contacts
2018-03-14 18:46:21 -04:00
5bd519efff
There is now a "content-warning" field
2018-03-14 22:28:35 +00:00
d98c6819e7
$contact isn't called by reference anymore
2018-03-14 20:53:03 +00:00
32ee4ca4b1
OStatus: Fixed communication issues with deleted contacts
2018-03-13 06:21:44 +00:00
4bb9263e43
Fix: The acl lookup now works in multi threaded posts as well
2018-03-12 04:51:27 +00:00
052ad155a2
Issue 4115: Events are now formatted better for Diaspora
2018-03-11 21:10:36 +00:00
Hypolite Petovan
9f693cc443
Display attach with missing title
...
- Rework preg_match_all call to remove 3 indentation levels
2018-03-08 23:52:01 -05:00
Hypolite Petovan
f633acd8d1
Remove include/html2*.php files
2018-03-07 16:34:48 -05: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
3bb2f72d05
Replace html2* function content by references to HTML class
2018-03-07 16:21:02 -05:00
Michael Vogel
cc688e2b4f
Merge pull request #4549 from MrPetovan/task/4518-add-memcached-support
...
[develop] Performance: Add memcached support/Improve database cache (redux)
2018-03-06 16:34:28 +01:00
Hypolite Petovan
95752b79e8
Add cache performance to API and worker
2018-03-04 23:13:19 -05:00
Hypolite Petovan
6447a45a06
Remove include/bb2diaspora.php
2018-03-04 17:43:51 -05:00
Hypolite Petovan
fe5ce67ef8
Move bb2diaspora() content to Content\Text\BBCode::toMarkdown
...
- Use self where appropriate
- Add BaseObject extension
2018-03-04 17:34:59 -05:00
506f851b23
Bugfix: Avoid that Twidere is crashing
2018-03-04 19:25:02 +00:00
