Commit graph

6413 commits

Author SHA1 Message Date
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
Hypolite Petovan
49f99d94f6 Replace disapora2bb function content with Markdown::toBBCode call 2018-03-04 08:31:40 -05:00
Hypolite Petovan
7bd4a52156
Merge pull request #4532 from annando/dba-array
[develop] We now accept array as condition parameters
2018-03-03 18:14:19 -05:00
74f6dc5373 Renamed functions / each is replaced 2018-03-03 23:02:45 +00:00
Hypolite Petovan
b8fca5efe7 [PHP 7.2] Fix missing Countable warning 2018-03-03 08:48:30 -05:00
194da423e0 An array with fieldnames as keys is important for the "insert" in the "update" function 2018-03-03 13:26:23 +00:00
1510b3d948 tyoi, found by 朱陈锬 thanks for that! 2018-03-03 11:02:40 +01:00
5bda6c7f6d We now accept array as condition parameters 2018-03-03 08:47:13 +00:00
Hypolite Petovan
2f463dfb17 Remove include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan
09c717d751 Remove references to include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan
207eac4a16 Move navbar_complete to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan
824262b824 Move populate_acl to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan
2b35938e34 Move get_acl_permissions to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan
ce9e0f3649 Move prune_deadguys to Contact 2018-03-02 18:40:08 -05:00
Hypolite Petovan
113ea38d50 Move contact_select to Acl
- Simplify Acl::getMessageContactSelectHTML parameters
2018-03-02 18:40:08 -05:00
Hypolite Petovan
eef25a3259 Move contact_selector() 2018-03-02 18:40:08 -05:00
Hypolite Petovan
e2de86de46 Update references in acl_selectors to new functions 2018-03-02 18:40:08 -05:00
1be5275eef Some more performance measuring for database stuff 2018-03-02 13:37:49 +00:00
Hypolite Petovan
4fe1d804ab
Merge pull request #4511 from annando/no-activity
Only show visible activities
2018-02-27 04:41:12 -05:00
74ff36eee9 Only show visible activities 2018-02-27 09:29:11 +00:00
20368cbbf4 Fix for network update (number of maximum comments set to 0) 2018-02-26 22:15:57 +00:00
d2728cad2e Children for the network page are now fetched correctly in the conversation 2018-02-26 06:38:27 +00:00
a1eb5a584f Improve the queries on the network page 2018-02-25 21:33:15 +00:00
a59796d1d4 No gcontact-id anymore (It wasn't really used) 2018-02-21 05:15:55 +00:00
a3af6807ac Improved resource id creation 2018-02-20 10:02:07 +00:00
Hypolite Petovan
e2d8c80f33
Revert "Fix PHP Warning: preg_replace(): Compilation failed in include/items" 2018-02-16 11:12:41 -05:00
Hypolite Petovan
31831b9fdb Remove partial preg_quote in include/items 2018-02-16 00:31:32 -05:00
Hypolite Petovan
f4d76d10b2 Fix PHP Warning: preg_replace(): Compilation failed in include/items 2018-02-15 22:13:45 -05:00
Hypolite Petovan
71cb1523d5 Remove include/bbcode.php 2018-02-14 22:05:16 -05:00
Hypolite Petovan
9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -05:00
Hypolite Petovan
05a2ea4220 Refactor comments including "bbcode()" 2018-02-14 22:00:43 -05:00
Hypolite Petovan
4e4f5862b2 Remove unused $preserve_nl parameter from bb2diaspora() 2018-02-14 21:45:41 -05:00
Hypolite Petovan
0c52866693 Refactor bbcode() into BBCode::convert() 2018-02-14 21:33:55 -05:00
Hypolite Petovan
29f5270313 Remove unused parameter preserve_nl in BBCode::convert 2018-02-14 21:31:28 -05:00
rabuzarus
5fe7a21482 add $no_photos parameter to add_page_info_data() 2018-02-12 03:56:20 +01:00
rabuzarus
26fd6b1c33 fix undeclared variables or wrong variable names (/include) 2018-02-11 22:13:29 +01:00
30cfca40d8 Use a more simple HTML for API output 2018-02-10 13:33:15 +00:00
ee7c587693 Suppress content from hidden or blocked contacts 2018-02-10 12:34:10 +00:00
Hypolite Petovan
164f4f7cdf
Merge pull request #4424 from annando/manage-admin
We can now delegate again like before
2018-02-08 21:41:51 -05:00
Hypolite Petovan
6f9c66b0bc Add missing require in include/text 2018-02-08 19:59:34 -05:00
d42f86e218 We can now delegate again like before 2018-02-08 22:18:34 +00:00
c953784945 Forgotten "use" 2018-02-07 20:22:40 +00:00
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
1ec6359faa Duplicate check 2018-02-06 16:44:48 +00:00
e609de2957 Many item calls are now isolated in a single function 2018-02-06 12:40:22 +00:00
Hypolite Petovan
a0cdd9c674 Rename Core\Network to Core\Protocol 2018-02-05 12:57:41 -05:00
Adam Magness
8906b98426 Remove old file
remove old file
2018-02-05 12:47:37 -05:00
Adam Magness
4be49e706b Remove requires
remove require_once for old file
2018-02-05 12:47:37 -05:00
Michael Vogel
fa95911fdb
Merge pull request #4393 from MrPetovan/task/3878-move-include-tags-to-src
Move include/tags to src/
2018-02-05 18:11:29 +01:00
Hypolite Petovan
8b60cffcb5 Remove most moved functions from include/bbcode 2018-02-04 19:26:22 -05: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
b4651870db Add references to new methods and constants in include/bbcode
- Remove all private callback functions from include/bbcode
2018-02-04 19:25:22 -05:00
Hypolite Petovan
2a5431a59e Rename Model\Term methods 2018-02-04 16:48:50 -05:00
Michael Vogel
dad58e0f6f
Merge pull request #4387 from MrPetovan/task/3878-move-datetime-to-src
Move include/datetime to src/ - Part 2
2018-02-04 21:05:27 +01:00
Hypolite Petovan
fd76b15638 Add is_null check 2018-02-04 08:58:29 -05:00
Hypolite Petovan
ef77a772e5 Remove include/tags.php 2018-02-04 00:00:11 -05:00
Hypolite Petovan
2a486903d1 Remove references to include/tags.php 2018-02-03 23:59:31 -05:00
Hypolite Petovan
d00c6111fd Replace include/tags function content with references to src methods 2018-02-03 23:52:36 -05:00
Hypolite Petovan
0abe4158d2 Rename Term methods ahead of the move
- Rename createFromItemURI() to insertFromItemFileByUri()
- Rename createFromItem() to insertFromItemFileById()
2018-02-03 22:42:31 -05:00
Hypolite Petovan
3dda70baf1 Add system.dlogip setting usage in dlogger() 2018-02-03 21:46:28 -05:00
Hypolite Petovan
6b50c42de6 Actually delete include/datetime.php 2018-02-03 20:47:37 -05:00
Hypolite Petovan
d037300d3b Remove include/datetime.php 2018-02-03 20:47:37 -05:00
Hypolite Petovan
f020292408 Remove references to include/datetime 2018-02-03 20:47:37 -05:00
Hypolite Petovan
cea80c78e4 Replace remaining functions in include/datetime by Temporal methods
- Fix uses statements
2018-02-03 20:47:37 -05:00
Hypolite Petovan
876acd68a0
Merge branch 'develop' into task/3878-move-session-to-src 2018-02-03 11:59:43 -05:00
e5a5a7dc7b
Merge pull request #4386 from MrPetovan/task/3878-move-friendica_smarty-to-src
Move SMARTY3_TEMPLATE_FOLDER to FriendicaSmarty
2018-02-03 17:01:30 +01:00
Hypolite Petovan
5e7285b9ba Move Temporal::convert() to DateTimeFormat::convert() 2018-02-03 08:56:55 -05:00
Hypolite Petovan
b7a7355292 Simplify include/bb2diaspora event format 2018-02-03 08:56:53 -05:00
Hypolite Petovan
0bee706e51 Add Temporal::local() shorthand for Temporal::convert() 2018-02-03 08:56:53 -05:00
Hypolite Petovan
25954314ec Add missing Temporal::utc() 2018-02-03 08:56:53 -05:00
Hypolite Petovan
a2ee2b56d2 Add Temporal::localNow() shorthand for Temporal::convert() 2018-02-03 08:56:53 -05:00
Hypolite Petovan
89602e44da Add Temporal::timezoneNow() shorthand for Temporal::convert() 2018-02-03 08:56:53 -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
d478ef6c6d Add Util\Temporal to src
- Map include/datetime functions to Temporal methods
- Move update_contact_birthdays() to Model\Contact::updateBirthdays()
2018-02-03 08:56:51 -05:00
Hypolite Petovan
7be49913d4 Remove get_template_file function 2018-02-03 08:52:55 -05:00
Hypolite Petovan
87b19dd9ac Remove include/session file 2018-02-03 08:40:18 -05:00
Hypolite Petovan
99eb696386 Remove include/friendica_smarty 2018-02-02 07:46:13 -05:00
Hypolite Petovan
65713f26f4 Remove references to include/friendica_smarty 2018-02-02 07:46:13 -05:00
Hypolite Petovan
1ef02bd36b Remove include/like 2018-02-01 14:17:31 -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
Hypolite Petovan
d1001bf158 Replace do_like() content 2018-02-01 14:14:27 -05:00
03aafa8228 Public commenting is now always enabled 2018-01-31 23:22:41 +00:00
9cbc4a7355 Basic forum support for Diaspora 2018-01-30 06:22:09 +00:00
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
0f1be37279 Remove old file
remove network.php and all require_once statements
2018-01-27 08:28:20 -05:00
Adam Magness
ca76e49c23 Move remaining functions
update remaining function calls
2018-01-27 08:25:54 -05:00
Adam Magness
1eb7c19c1e Move multiple functions
move multiple smaller functions
2018-01-26 23:51:41 -05:00
Adam Magness
cd3643d174 Move xml_status and http_status_exit
move functions
2018-01-26 23:37:55 -05:00
Adam Magness
a32ba32ff4 Move post_url
move post_url function
2018-01-26 23:24:23 -05:00
Adam Magness
2f9642392d Move z_fetch_url
move z_fetch_url method
2018-01-26 23:18:38 -05:00
Adam Magness
c67452f72e Move fetch_url
move fetch_url function
2018-01-26 23:09:48 -05:00
Adam Magness
1b51777825 Create Network class
Create Network class and copy methods
2018-01-26 22:51:07 -05:00
Adam Magness
177edd2b6e Rename class to BBCode
Rename Plaintext class to BBCode
2018-01-26 20:01:32 -05:00
Adam Magness
c437b0c871 Remove old file
remove include/plaintext.php
2018-01-26 19:16:26 -05:00
Adam Magness
11c7441e94 Remove requires
remove require_once statements
2018-01-26 19:15:57 -05:00
Adam Magness
21881f2885 Update function calls
update to new function calls
2018-01-26 19:14:47 -05:00
cd7b81afd5 Use "sup" instead of "h5" for the link to the website 2018-01-26 13:27:16 +00:00
Adam Magness
5951ceeb6f Remove old file
remove include/post_update.php
2018-01-25 11:29:43 -05:00
Hypolite Petovan
9ab55181ed
Merge pull request #4331 from annando/other-hashtags
Support for hashtags with "#" inside the link (mastodon style?)
2018-01-25 10:02:04 -05:00
8abc4d25b4 Support for hashtags with "#" inside the link (mastodon style?) 2018-01-25 14:58:10 +00:00
66fe4cc5d6
Merge pull request #4326 from MrPetovan/task/fix-translation-strings
Fix translation strings
2018-01-25 07:02:09 +01:00
Hypolite Petovan
49b7a830dc
Merge pull request #4324 from annando/items-rework
Some functions had been moved away from include/items.php
2018-01-24 17:25:36 -05:00