keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19962 commits 4 branches 0 tags 179 MiB
Commit graph

6478 commits

Author SHA1 Message Date
Roland Häder
1a61cee5a7
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder
f7ceea7a85
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder
5b56f189ae
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:54 +02:00
Roland Häder
bc259cdc44
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:54 +02:00
Michael
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
Michael
df019eb5bd Issue 4772: Display posts with uid=0 as well 2018-05-10 10:13:48 +00:00
Michael
6c792588fd Ensure to mostly fetch the item with an non zero user id 2018-05-08 22:26:49 +00:00
Michael
8d513d74be Reverted SQL sorting 2018-05-08 22:08:25 +00:00
Michael
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
Michael
7cd7b1a9bf Some more replaced queries 2018-05-04 21:43:29 +00:00
Michael
125afb4ae5 Suppress blocked contacts from being displayed 2018-05-04 21:27:20 +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
Philipp Holzer
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
Michael
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
Philipp Holzer
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
Philipp Holzer
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
Philipp Holzer
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
Philipp Holzer
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
Tobias Diekershoff
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
Michael
0ccb29c4df Only compare the HTML when we forcefully ignore the cache 2018-04-06 16:52:01 +00:00
Michael
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
Michael
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
Michael
e74f186b34 Event: Prevent SQL errors with events without end 2018-03-21 20:16:43 +00:00
Michael
73efdb99e3 Fix for incorrect datetime values 2018-03-21 05:20:55 +00:00
Tobias Diekershoff
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
Michael
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
Michael
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
Michael
5bd519efff There is now a "content-warning" field 2018-03-14 22:28:35 +00:00
Michael
d98c6819e7 $contact isn't called by reference anymore 2018-03-14 20:53:03 +00:00
Michael
32ee4ca4b1 OStatus: Fixed communication issues with deleted contacts 2018-03-13 06:21:44 +00:00
Michael
4bb9263e43 Fix: The acl lookup now works in multi threaded posts as well 2018-03-12 04:51:27 +00:00
Michael
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
Michael
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
Michael
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
Michael
194da423e0 An array with fieldnames as keys is important for the "insert" in the "update" function 2018-03-03 13:26:23 +00:00
Tobias Diekershoff
1510b3d948 tyoi, found by 朱陈锬 thanks for that! 2018-03-03 11:02:40 +01:00
Michael
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
Michael
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
Michael
74ff36eee9 Only show visible activities 2018-02-27 09:29:11 +00:00
Michael
20368cbbf4 Fix for network update (number of maximum comments set to 0) 2018-02-26 22:15:57 +00:00
Michael
d2728cad2e Children for the network page are now fetched correctly in the conversation 2018-02-26 06:38:27 +00:00
Michael
a1eb5a584f Improve the queries on the network page 2018-02-25 21:33:15 +00:00
Michael
a59796d1d4 No gcontact-id anymore (It wasn't really used) 2018-02-21 05:15:55 +00:00
Michael
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
Michael
30cfca40d8 Use a more simple HTML for API output 2018-02-10 13:33:15 +00:00
Michael
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
Michael
d42f86e218 We can now delegate again like before 2018-02-08 22:18:34 +00:00
Michael
c953784945 Forgotten "use" 2018-02-07 20:22:40 +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