Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-13 13:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
24252 commits 3 branches 64 tags 246 MiB
Commit graph

3789 commits

Author SHA1 Message Date
Hypolite Petovan
cf11f57a5b Escape HTML pre-formatted blocks before converting smilies 2019-06-22 18:22:37 -04:00
Michael Vogel
1883cfba24
Revert "Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray" 2019-06-22 22:06:43 +02:00
Dean Townsley
042fcfeb50 Enable multi-auth in dfrn autoRedir 
Update checks to account for a user being authenticated to multiple
contacts on the local server at the same time.
It was also necessary to remove a looping procection to make this work
correcly with browsers that open multiple connections because the
information about what contacts are authenticated is stored in the PHP
session.
 2019-06-22 12:34:54 -05:00
Dean Townsley
b5e195b415 Add auth to load sequence for photos 
This allows private photos to load on any page.  Previously auth
depended on some other thing like the enclosing page triggering the
authentication of the specific contact for the photo owner.
 2019-06-22 12:24:30 -05:00
Michael Vogel
85772f02ca
Merge pull request #7286 from MrPetovan/bug/invading-smilies 
Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray
 2019-06-22 12:51:49 +02:00
Hypolite Petovan
cdd23e5b6d Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray 2019-06-22 04:16:02 -04:00
Michael
b5de71c390 Fix a notice when the author is missing 2019-06-21 17:57:26 +00:00
Hypolite Petovan
b07490266c
Merge pull request #7288 from annando/fix-search 
Fix searching for contacts
 2019-06-20 19:33:00 -04:00
Michael
7c87e83dcf Fix searching for contacts 2019-06-20 21:56:18 +00:00
Michael
14c28868eb Issue 6477: Use the correct content-type to resize the images 2019-06-20 20:09:33 +00:00
Hypolite Petovan
f0849b0a93
Merge pull request #7284 from annando/fix-fatal 
Don't send activities to "null" endpoints
 2019-06-19 23:42:21 -04:00
Michael
2e4e8bdf0a Don't send activities to "null" endpoints 2019-06-20 03:06:34 +00:00
Hypolite Petovan
2ba4116118
Merge pull request #7282 from annando/issue-6477 
Issue 6477: Automatically repair self contact avatar
 2019-06-19 16:12:56 -04:00
Michael
f878cc2623 Fix for PR 7280 2019-06-19 18:38:22 +00:00
Michael
d8ed2ed76d it is poll, not notify 2019-06-19 18:32:38 +00:00
Michael
b55546b726 Merge remote-tracking branch 'upstream/2019.06-rc' into issue-6477 2019-06-19 18:26:59 +00:00
Michael
6bd5be281e Normalise it 2019-06-19 17:21:35 +00:00
Michael
4ab772ed67 Issue 6477: Automatically repair self contact avatar 2019-06-19 17:05:29 +00:00
Michael
b48a49b0f5 Added timeout 2019-06-18 08:05:45 +00:00
Michael
ea90554e7f Fix the base url detection of AP profiles 2019-06-18 07:47:21 +00:00
Hypolite Petovan
2c19b8c8e6
Merge pull request #7277 from annando/ignore-resharer 
Issue #5983: Ignore reshares from blocked and ignored contacts
 2019-06-17 09:01:31 -04:00
Michael
496910e750 Issue #5983: Ignore reshares from blocked and ignored contacts 2019-06-17 11:55:19 +00:00
Hypolite Petovan
d54e778f30 Move share conversion at the end of Text\BBCode::convert 2019-06-16 23:13:26 -04:00
Hypolite Petovan
da56e0a541 Add tests folder to typo console coverage 
- Use correct config object in Console\Typo
 2019-06-15 22:27:20 -04:00
Hypolite Petovan
84ccaf50fa Allow brackets in URLs 
- Remove obsolete $URLSearchString variable
- Add related tests
 2019-06-15 22:26:29 -04:00
Hypolite Petovan
38311a4a02 Move link conversion to the end of BBCode::convert 
- Addresses https://github.com/friendica/friendica/issues/7271
- Add related tests
 2019-06-15 22:24:51 -04:00
Hypolite Petovan
14725bbd6a Fix undefined index addr notices in Model\Contact::getIdForURL 
- Addresses https://github.com/friendica/friendica/issues/6918#issuecomment-502393030
 2019-06-15 17:16:10 -04:00
Hypolite Petovan
aa5a61baef Fix variable by reference notice in Module\Admin\Federation 
- Addresses https://github.com/friendica/friendica/issues/6918#issuecomment-502347979
 2019-06-15 17:12:36 -04:00
Hypolite Petovan
75894fa275 Use item created date if edited doesn't exist in Protocol\Diaspora::buildStatus 
- Addresses https://github.com/friendica/friendica/issues/6918#issuecomment-502347886
 2019-06-15 17:11:01 -04:00
Hypolite Petovan
da114445c9
Merge pull request #7268 from annando/issue-5983 
Issue 5983: Central check for blocked and ignored contacts added
 2019-06-15 16:53:41 -04:00
Hypolite Petovan
394159d41e Use correct entry list in Module\Directory 2019-06-15 08:44:55 -04:00
Hypolite Petovan
68c65af046 Remove unused Module\Directory::init method 2019-06-15 08:44:36 -04:00
Michael
f6f22378f1 Ignored stuff must be stored. 2019-06-14 18:34:17 +00:00
Michael Vogel
097ecdd106
Merge pull request #7266 from MrPetovan/bug/notices 
Add type-hint in ActivityPub\Receiver::fetchObject to catch wrong type coercion
 2019-06-14 15:03:30 +02:00
Michael Vogel
dc3bbb749b
Merge pull request #7270 from MrPetovan/bug/7269-fetch-routes 
Define expected /fetch module routes
 2019-06-14 13:24:43 +02:00
Hypolite Petovan
95094aa53d Check for existing protocols.inbound value in Protocol\PortableContact 2019-06-14 06:25:44 -04:00
Hypolite Petovan
9f2529df30 Define expected /fetch module routes 2019-06-14 06:22:01 -04:00
Michael
2482072457 Issue 5983: Central check for blocked and ignored contacts added 2019-06-14 05:25:10 +00:00
Michael
e4efddbabb Avoid a notice in AP Receiver 2019-06-14 02:58:40 +00:00
Hypolite Petovan
66d4f1d40b Add type-hint in ActivityPub\Receiver::fetchObject to catch wrong type coercion 2019-06-13 19:07:39 -04:00
Hypolite Petovan
af9ce6b92a Add type-hint for dynamic variables in DBA 2019-06-13 19:07:04 -04:00
Michael
f41513f4ec Issue 7264: Count local delivery as well 2019-06-13 20:24:49 +00:00
Philipp Holzer
a85aa24d56
Add additional check for $links in Probe 
see https://github.com/friendica/friendica/issues/6917#issuecomment-501661530
 2019-06-13 15:01:24 +02:00
Hypolite Petovan
5b291abc7f Restore show_connect flag in Model\Profile::sidebar 2019-06-13 03:26:42 -04:00
Philipp
6c6e3058f2
Merge pull request #7260 from annando/sanitize-input 
Sanitize the date for mails
 2019-06-13 09:11:41 +02:00
Michael
20eb7ae73f Empty dates are now set to today as well 2019-06-13 05:43:00 +00:00
Michael
6970fb2862 Issue 7142: Prevent respawn of "remote self" items 2019-06-13 05:06:52 +00:00
Michael
2ae4371606 Sanitize the date for mails 2019-06-13 03:22:15 +00:00
Michael Vogel
33f5a98fd6
Merge pull request #7259 from MrPetovan/bug/7240-private-message-ap 
Normalize the datetime format of received activity before DB insertion
 2019-06-13 05:21:53 +02:00
Hypolite Petovan
94a70f54d1 Normalize the datetime format of received activity before DB insertion in ActivityPub\Processor 
- Restore private message storage
 2019-06-12 21:02:37 -04:00
Hypolite Petovan
9e24b8c55f Fix formatting and PHPDoc in ActivityPub\Processor 
Add expected return value to postMail method
 2019-06-12 21:01:44 -04:00
Michael
422ebb5d58 Fix notice in Model\Profile 2019-06-12 19:41:15 +00:00
Philipp
fb63274aaf
Merge pull request #7250 from MrPetovan/bug/6410-normalize-message-button 
Normalize message button in profile sidebar
 2019-06-12 17:56:05 +02:00
Hypolite Petovan
304c144bc2
Use App::getBaseURL instead of System::getBaseURL in Model\Profile::load 
Co-Authored-By: Philipp <admin+Github@philipp.info>
 2019-06-12 10:56:41 -04:00
Philipp
17490fca33
Merge pull request #7256 from MrPetovan/bug/7249-remote-logout 
Fix remote logout
 2019-06-12 07:37:42 +02:00
Hypolite Petovan
0af10a42b0 Normalize logout link behavior across themes 2019-06-11 19:42:08 -04:00
Hypolite Petovan
fd8844db83 Redirect remote visitors to their own profile after logout 2019-06-11 19:41:11 -04:00
Michael
bfc6bad916 Added comment 2019-06-11 21:40:44 +00:00
Michael
a11b258fd6 Issue 7223: Don't strip links 2019-06-11 20:34:21 +00:00
Michael
16b9d9f199 Fix pixture posts to connectors / fix delivery counter for connector posts 2019-06-11 19:35:03 +00:00
Philipp
f4d20c577b
Merge pull request #7251 from annando/fix-fatal 
Avoid fatal error when AP contact has no photo
 2019-06-11 08:45:49 +02:00
Michael
9d8f01c49c Fix another fatal error 2019-06-11 06:02:18 +00:00
Michael
76a420fbe9 Avoid fatal error when AP contact has no photo 2019-06-11 05:26:16 +00:00
Hypolite Petovan
b00bcbb1c1 Normalize the contact sidebar with the profile sidebar 
- Remove un/follow text links in contact status window
 2019-06-10 21:56:06 -04:00
Hypolite Petovan
3aebb92cf3 Rework Profile::sidebar profile link conditions 
- Now show Follow, Unfollow, Atom Feed and Message in profile sidebar more consistently with the status of the current visitor
- Remove pseudo-field contact.remoteconnect
 2019-06-10 21:56:03 -04:00
Hypolite Petovan
61c79ce9ee Add new Model\Contact::canReceivePrivateMessages method 2019-06-10 21:29:11 -04:00
Hypolite Petovan
0fbfb7c970 Prevents an endless loop when only the non-public contact is available in Contact::magicLinkByContact 2019-06-10 19:10:39 -04:00
Philipp Holzer
7c54edd4b4
Fixing Network::post() caused by wrong argument 2019-06-10 19:34:16 +02:00
Hypolite Petovan
9491c63934
Merge pull request #7247 from annando/fix-7242 
Fixes PR 7242: Now the "post" function works again
 2019-06-10 13:30:33 -04:00
Michael
7bbacd3878 Fixes PR 7242: Now the "post" function works again 2019-06-10 16:58:00 +00:00
Michael
7d0ebe8bbe Fix the detection of image posts 2019-06-10 16:06:54 +00:00
Hypolite Petovan
d7d44e1af7
Merge pull request #7245 from annando/unify-constants 
Fix delivery counter for poking / unify delivery commands
 2019-06-10 11:59:40 -04:00
Hypolite Petovan
151c026a8a
Merge pull request #7244 from nupplaphil/task/hidden_string 
Introduce HiddenString for Config-Values
 2019-06-10 10:50:41 -04:00
Michael
41dc243186 Fix delivery counter for poking / unify delivery commands 2019-06-10 14:19:24 +00:00
Philipp Holzer
50d8dbb123
Bugfixing wrong typed password setting 2019-06-10 15:46:51 +02:00
Philipp Holzer
4666b18e5b
Bugfixing empty password setting 2019-06-10 15:40:15 +02:00
Hypolite Petovan
165607ffe7
Merge pull request #7242 from nupplaphil/bugs/6917-php_warning 
Add typed parameter for methods in `Friendica\Util\Network`
 2019-06-10 09:22:27 -04:00
Philipp Holzer
357d9b5108
Introduce HiddenString for Config-Values 2019-06-10 14:46:31 +02:00
Philipp Holzer
cc7444d84d
Move internal recursion-counter to the end of all cur/fetchUrl parameters 2019-06-10 14:34:54 +02:00
Hypolite Petovan
1c6bf7d25a Add App parameter to Module\Profile::sidebar method prototype 2019-06-10 08:21:06 -04:00
Philipp Holzer
236c0dc248
Check $contact['id'] 
- see https://github.com/friendica/friendica/issues/6918#issuecomment-498043313
 2019-06-10 12:36:42 +02:00
Philipp Holzer
10683a43c8
Add typed parameter for methods in Friendica\Util\Network 2019-06-10 12:06:41 +02:00
Dean Townsley
19e99f7e81 Use accessing function for session variable 2019-06-09 21:06:42 -05:00
Dean Townsley
5c93db4097 remove leftover logging 2019-06-09 21:06:42 -05:00
Dean Townsley
af85e498ce expand permission check to remote array 
This check was preventing multiple private images from different
users on the same server from loading on the same page.
It was only checking for permission for the single id returned by the
remote_user() function rather than the multiple possible autheniticated
id's stored in the remote arry session variable.
 2019-06-09 21:06:42 -05:00
Hypolite Petovan
8c5923bb46
Merge pull request #7233 from nupplaphil/bug/installer_replace_macro 
Fixing Installer - ReplaceMacro
 2019-06-06 20:37:11 -04:00
Philipp Holzer
79fe3c92c7
Fixing Installer - ReplaceMacro 2019-06-07 00:36:10 +02:00
Michael
52a3ece8b6 Added comments 2019-06-06 17:58:49 +00:00
Michael
44a49a8d7d Ensure that pokes are always send only via DFRN 2019-06-06 04:26:02 +00:00
Philipp
f1c044e3b6
Merge pull request #7221 from annando/issue-6799 
Issue #6799 - remove linefeeds inside of a table structure
 2019-06-02 11:28:43 +02:00
Michael
bcf0be5db1 Issue #6799 - remove linefeeds inside of a table structure 2019-06-02 04:18:38 +00:00
Hypolite Petovan
7875199167
Merge pull request #7218 from nupplaphil/bug/remove_queue_summary 
Remove queue from Admin/Summary
 2019-06-01 22:26:58 -04:00
Philipp Holzer
aba7c9f08c
Remove queue from Admin/Summary 2019-06-02 03:28:22 +02:00
Philipp Holzer
dec5983850
Remove .well-known hardening 2019-06-02 03:19:44 +02:00
Michael
9f026f1814 The only reason we don't defer is when it was a post to a relay 2019-06-01 11:28:37 +00:00
Hypolite Petovan
bbac95d692
Merge pull request #7213 from annando/fix-counter 
The delivery counter now counts only successful deliveries
 2019-06-01 07:12:31 -04:00
Michael
ecf809c7ae The delivery counter now counts only successful deliveries 2019-06-01 06:54:47 +00:00
Philipp
25433e79d5
Merge pull request #7211 from MrPetovan/bug/7209-admin-forbidden 
Add themed themed error page or login page for /admin[/*]
 2019-05-31 11:49:40 +02:00
Hypolite Petovan
f0de19dd8a
Merge pull request #7208 from nupplaphil/bug/6916-filetag 
Adding null checks before FileTag method (fix fatal)
 2019-05-31 01:47:52 -04:00
Hypolite Petovan
4b4a319af9 Add themed themed error page or login page for /admin[/*] 2019-05-31 00:23:30 -04:00
Hypolite Petovan
a9e534ea79
Merge pull request #7210 from annando/diaspora-edit 
Fix edited messages for Diaspora
 2019-05-30 15:25:29 -04:00
Michael
19e95ebdda Fix edited messages for Diaspora 2019-05-30 18:56:31 +00:00
Hypolite Petovan
ac294be746
Merge pull request #7207 from nupplaphil/bug/6917-php_warnings 
Add hexadecimal check (fix warnings)
 2019-05-30 09:31:50 -04:00
Philipp Holzer
c76258c370
catching nulls for FileTag 2019-05-30 13:54:35 +02:00
Philipp Holzer
4c5dd9f47c
Add more Strings::isHex() checks to photos 2019-05-30 10:30:15 +02:00
Philipp Holzer
694cd82d0e
Bugfix - author-network (adding to unset list during insert) 2019-05-29 21:48:03 +02:00
Philipp Holzer
7334be803d
Bugfix - item_id 2019-05-29 21:40:21 +02:00
Philipp Holzer
3de540d1d1
Adding hexadecimal check for photos 
see https://github.com/friendica/friendica/issues/6917#issuecomment-492798238
 2019-05-29 20:28:25 +02:00
Philipp Holzer
766a10b3b6
Adding author-network to ITEM::ITEM_FIELDLIST 
see https://github.com/friendica/friendica/issues/6918#issuecomment-493515358
 2019-05-29 20:09:20 +02:00
Philipp Holzer
15ffb70c5f
Adding item_id to Item::ITEM_FIELDLIST 
see https://github.com/friendica/friendica/issues/6918#issuecomment-493515358
 2019-05-29 20:08:21 +02:00
Philipp Holzer
5002bda5fc
Checking the existence of '-' before array operation 
See https://github.com/friendica/friendica/issues/6918#issuecomment-491490533
 2019-05-29 20:07:53 +02:00
Philipp
dc0978141c
Merge pull request #7202 from MrPetovan/bug/fatal-errors 
Prevent fatal error in ACL::getFullSelectorHTML when accessing a profile as a remote visitor
 2019-05-29 07:05:05 +02:00
Michael Vogel
64f51d337f
Merge pull request #7204 from MrPetovan/bug/notices 
Check for array index existence
 2019-05-29 07:04:46 +02:00
Philipp
9245942a0c
Merge pull request #7199 from MrPetovan/bug/7171-filer-network 
Allow commas in saved folder names
 2019-05-29 07:03:44 +02:00
Michael
824d35774b Fix "Undefined index: protocol" 2019-05-29 04:30:01 +00:00
Hypolite Petovan
8a0c568fe1 Check for href existence for links in Protocol\PortableContact 
See https://github.com/friendica/friendica/issues/6918#issuecomment-495198587
 2019-05-28 21:27:13 -04:00
Hypolite Petovan
5414d51d4c Prevent fatal error in ACL::getFullSelectorHTML when accessing a profile as a remote visitor 
See https://github.com/friendica/friendica/issues/6916#issuecomment-495724811
 2019-05-28 21:09:06 -04:00
Philipp
e557457158
Merge pull request #7201 from annando/mail-db-error 
Fix Issue 7196
 2019-05-28 20:02:39 +02:00
Philipp
32b8c6f65e
Merge pull request #7200 from annando/tag-process 
Process incoming tag add requests
 2019-05-28 19:43:23 +02:00
Michael
ae940755c7 Fix Issue 7196 2019-05-28 17:39:26 +00:00
Philipp
bae4a5e406
Merge pull request #7187 from MrPetovan/bug/7023-emailer-hooks 
Enable addon using emailer hooks to skip default call to mail()
 2019-05-28 08:02:48 +02:00
Philipp
be3d7759f0
Merge pull request #7198 from MrPetovan/task/6861-to-plaintext 
Simplify BBCode::toPlaintext and HTML::toPlaintext
 2019-05-28 07:49:25 +02:00
Hypolite Petovan
ed768c71ee Remove "f=&" nonsense from network module 
- Fixes wrong redirect when using the sidebar filters
 2019-05-27 17:45:27 -04:00
Hypolite Petovan
0fadc7730c Replace deprecated string-bases Model\FileTag calls with array-based ones 2019-05-27 17:40:08 -04:00
Hypolite Petovan
6de3449cae Add new fileToArray and arrayToFile methods to Module\FileTag 2019-05-27 17:38:36 -04:00
Hypolite Petovan
96402e306a Fix formatting of Model\FileTag 
- Normalize indent style
- Remove extraneous new lines after ifs/foreachs
 2019-05-27 17:38:32 -04:00
Hypolite Petovan
5d2bf73517 Add Babel result screen for compact HTML::toPlaintext 2019-05-27 12:02:28 -04:00
Hypolite Petovan
5f9fb1f14f Simplify BBCode::toPlaintext 
- Keep white spaces after tags
 2019-05-27 12:02:12 -04:00
Hypolite Petovan
596b5b0982 Simplify HTML::toPlaintext 
- Keep new lines in plain text output
 2019-05-27 12:01:48 -04:00
Hypolite Petovan
3c7e4b474b
Merge pull request #7193 from nupplaphil/bug/uimport_datetime 
Fix NULL datetime for uimport/uexport
 2019-05-27 09:13:01 -04:00
Hypolite Petovan
4e207ef786 Enable addon using emailer hooks to skip default call to mail() 2019-05-26 21:36:09 -04:00
Hypolite Petovan
01e71254d9 Replace defaults() calls on $_SESSION by Core\Session calls 
- Replace direct calls to $_SESSION by Core\Session calls in Module\Login
 2019-05-26 21:26:59 -04:00
Philipp Holzer
26d4214c19
added suggestions 2019-05-26 21:53:24 +02:00
Hypolite Petovan
e99e8096bf
Merge pull request #7191 from nupplaphil/bug/logfile_permission 
Fixing logfile permission denied exceptions
 2019-05-26 15:19:26 -04:00
Philipp Holzer
220f8f0862
friendica-6950 uimport doesn't support "pwdreset_time":null 2019-05-26 15:49:44 +02:00
Philipp
57f6086fcd
Merge pull request #7189 from MrPetovan/bug/7183-archives-profile-widget 
Ensures Widget::postedByYear uid parameter is integer in Module\Profile
 2019-05-26 14:42:25 +02:00
Philipp Holzer
b56b56ccb6
friendica-6379 Monolog - logfile permission denied 2019-05-26 14:33:09 +02:00
Hypolite Petovan
cc6a17d27a Ensures Widget::postedByYear uid parameter is integer in Module\Profile 2019-05-26 08:18:59 -04:00
Michael
ecf4789cc4 Process incoming tag add requests 2019-05-26 11:20:03 +00:00
Philipp
ea218438d2
Merge pull request #7186 from MrPetovan/bug/7183-archives-profile-widget 
Restore profile archives widget
 2019-05-26 08:16:54 +02:00
Philipp
6ceb74c365
Merge pull request #7184 from annando/add-tag 
AP: We now transmit "add tag" activity
 2019-05-26 08:14:18 +02:00
Hypolite Petovan
50e44f46ae Add profile archive URL pattern to Router 2019-05-25 19:08:43 -04:00
Hypolite Petovan
d27d4d8927 Move posted date widget to Content\Widget 2019-05-25 19:08:15 -04:00
Michael
32b1f75ece AP: We now transmit "add tag" activity / On Diaspora this is now supressed 2019-05-25 19:33:58 +00:00
Philipp
5c2cca432f
Merge pull request #7170 from MrPetovan/bug/6981-contact-request-blocked 
Contact requests blocked
 2019-05-25 20:20:36 +02:00
Philipp
bd0c536736
Merge pull request #7156 from MrPetovan/task/add-relationship-filter 
Add contact relationship filter
 2019-05-25 20:17:05 +02:00
Hypolite Petovan
08d7d42f81 Ensures Search methods return an empty ResultList instead of null 
- Addresses https://github.com/friendica/friendica/issues/6916#issuecomment-494876901
 2019-05-24 08:13:36 -04:00
Hypolite Petovan
0dae4f9492
Fix typo in Module\Contact 
Follow-up to #7154, thanks to @AlfredSK
 2019-05-23 13:01:40 -04:00
Hypolite Petovan
40ca25f4f7 Fix SQL error in Module\Admin\Summary 2019-05-21 17:01:15 -04:00
Michael
30143aa5b1 Identifier have to be escaped different than values 2019-05-21 05:34:41 +00:00