clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
21,348 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

2181 Commits

Author SHA1 Message Date
Michael d307aa1484 For test purposes we can now deactivate polling 2018-10-18 02:46:02 +00:00
Jonny Tischbein a937cf06a3 add remaning/moving to files not touch by refactoring because of typo 2018-10-17 22:35:49 +02:00
Michael Vogel a19f8d642d
Merge pull request #5942 from MrPetovan/feature/3218-add-convert-share-callback 
Add BBCode::convertShare callback parameter
 2018-10-17 22:01:02 +02: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
Michael Vogel 389685e099
Merge pull request #5920 from MrPetovan/bug/remove-password-from-register 
Avoid storing plaintext password in register table
 2018-10-17 21:04:11 +02:00
Hypolite Petovan e254ace9d5
Merge pull request #5947 from annando/uri-id 
Use "uri-id" for item relations
 2018-10-17 14:45:40 -04:00
Michael 62ad755980 Use "uri-id" for item relations 2018-10-17 18:34:24 +00:00
Jonny Tischbein ce2b1f5715 Rename function Authentication::authenticate_success to Authentication::success 2018-10-17 18:45:32 +02:00
Jonny Tischbein 45e5a7f59f remove unsed require_onces of security.php 2018-10-17 18:39:27 +02:00
Hypolite Petovan 057385a4ec Add $is_quote_share parameter to convert share callback 
- Restore former behavior when content is present before [share] block
 2018-10-17 08:20:56 -04:00
Jonny Tischbein 05be2db725 Move include/security tp /src/Core/Authentication and /src/Util/Security 2018-10-17 14:19:58 +02:00
Hypolite Petovan 9239ecc5e0 Rework BBCode::convertShare to accept a callback function 
- Create default convertShare callback from previous code
- Remove $simplehtml = 8 case (moved to Twitter addon)
 2018-10-17 01:13:18 -04:00
Hypolite Petovan b5fb81f535 Add Mastodon/Pleroma protocol guessing 2018-10-17 01:10:07 -04:00
Hypolite Petovan c50be325bd Remove unused parameter $selected in Model\Item::fieldlist 2018-10-16 18:30:24 -04:00
Hypolite Petovan 341b83d1df Fix Undefined index: photo in ActivityPub/Receiver 2018-10-16 18:29:28 -04:00
Hypolite Petovan cb854b8b10 Fix Undefined index: timezone in Protocol\Diaspora 2018-10-16 18:29:08 -04:00
Hypolite Petovan 2b1d15de87 Fix undefined index: id in Protocol\Diaspora 2018-10-16 18:28:27 -04:00
Hypolite Petovan c4318fe05e Fix notices in Parse URL feature 2018-10-16 18:27:13 -04:00
Hypolite Petovan e9c9eb9c66 Fix notice in Worker\Delivery 2018-10-16 18:26:43 -04:00
Hypolite Petovan ff643c4b6a
Merge pull request #5940 from JonnyTischbein/issue_update_display_network 
Fix redirect after edit post to /update_*
 2018-10-16 13:37:19 -04:00
Jonny Tischbein be2e6c3929 Fix Issue #5896 by setting static return for edit_post to display item page (kind of revert parts of #5774) 2018-10-16 19:14:55 +02:00
Hypolite Petovan 93c6dddc0d
Merge pull request #5939 from annando/onepoll 
Onepoll hadn't polled anymore / small relocation in zrlinit for better logging
 2018-10-16 11:27:48 -04:00
Michael 35a73b729f Onepoll hadn't polled anymore / small relocation in zrlinit for better logging 2018-10-16 13:17:01 +00:00
Tobias Diekershoff dbd2aa1196
Merge pull request #5938 from annando/magic-loop 
Avoid endless loop at magic auth
 2018-10-16 09:17:17 +02:00
Michael 012fe3c11e Avoid endless loop at magic auth 2018-10-16 06:32:12 +00:00
Hypolite Petovan 481b0ac138 Fix notices in include/enotify 2018-10-15 23:13:00 -04:00
Hypolite Petovan 0de1351a09 Fix notices in Network\Probe 2018-10-15 23:12:29 -04:00
Michael 8d0f4710a4 Signed Diaspora posts should now be stored more reliable 2018-10-15 21:42:55 +00:00
Benjamin Lorteau 9e1065ff87 Improve transition from previous behavior 
- Simplify Model\User methods parameter list
- Use DBA methods in mod/regmod
- Replace killme with exit in mod/regmod
- Simplify goaway() calls
 2018-10-15 11:58:52 -04:00
Tobias Diekershoff 664afbcafb
Merge pull request #5926 from annando/defer-worker 
Poddibility to defer worker execution
 2018-10-15 08:02:51 +02:00
Michael e2762e032c Poddibility to defer worker execution 2018-10-15 05:19:35 +00:00
Michael Vogel 0080d117ee
Merge pull request #5923 from MrPetovan/task/improve-contact-module 
Improve Contact module
 2018-10-15 06:02:55 +02:00
Hypolite Petovan aa8039373a Update formatting of Module\Contact 
- Replace double quotes with single
- Align array declarations
- Replace q() call with Model\User::getOwnerDataById()
 2018-10-14 18:30:02 -04:00
Hypolite Petovan a883a99fe6 Replace string fields by array in Module\Contact 2018-10-14 18:27:24 -04:00
Hypolite Petovan 12ddb3bb54 Replace unwarranted uses of $a->data['contact'] 2018-10-14 18:25:44 -04:00
Hypolite Petovan 57e8fb5cb1 Normalize uses of defaults() in Module\Contact 
- Remove uses without default value
- Add relevant uses
 2018-10-14 18:24:02 -04:00
Hypolite Petovan 756a4f1111 Fix remaining instances of "contacts" 2018-10-14 18:02:54 -04:00
Jonny Tischbein 3a95644848 Add Support for relativeDateTime in future + update Admin user waiting for deleting table header 2018-10-14 22:57:44 +02:00
Hypolite Petovan 74c5f1f684
Merge pull request #5891 from JonnyTischbein/move_module_contacts 
Move module contacts
 2018-10-14 16:42:50 -04:00
Jonny Tischbein e41c59b193 Fix batch action choice - All Actions for one contact were taken before 2018-10-14 21:38:38 +02:00
Jonny Tischbein d54e56c659 Fix batch action query + Fix Namespace import 2018-10-14 21:14:32 +02:00
Hypolite Petovan ce74a4d9a1
Merge pull request #5921 from annando/ap-video 
ActivityPub: Rudimentary support for videos
 2018-10-14 14:05:51 -04:00
Jonny Tischbein 5fd4402074 code standards + fixing navigation links to /contact/... 2018-10-14 20:03:22 +02:00
Michael Vogel 68af56a10e
Merge pull request #5912 from MrPetovan/bug/fix-code-tag-nonsense 
Fix [code] tag whitespace nonsense
 2018-10-14 20:00:19 +02:00
Michael 37ad4a7d22 ActivityPub: Rudimentary support for videos 2018-10-14 17:57:44 +00:00
Hypolite Petovan 540adaf829 Use Model\Register methods in modules 
- Update registration emails to avoid storing the plaintext password in
the register table
- Remove redundant sprintf() when used with L10n::t()
- Remove redundant Systen::baseUrl() with goaway()
 2018-10-14 12:26:18 -04:00
Hypolite Petovan 59d6dd809d
Merge pull request #5906 from annando/ap-switch 
OStatus contacts are now automatically converted to AP
 2018-10-14 12:04:52 -04:00
Hypolite Petovan 123992384b Create Model\Register 
- Add Model\User::exists method
 2018-10-14 11:34:34 -04:00
Hypolite Petovan 7f143c3159 Fix various spelling mistakes 2018-10-14 11:32:54 -04:00
Hypolite Petovan a769efae38 Remove whitespace clearing around code tags 
- Normalize inline code blocks to <code>
 2018-10-14 07:43:44 -04:00
Hypolite Petovan 6606c9cbb2
Merge pull request #5910 from nupplaphil/acctlink_followup 
FollowUp Acctlink move
 2018-10-14 06:27:02 -04:00
Hypolite Petovan 6c80601a4a
Merge pull request #5902 from nupplaphil/Install_Class_to_methods 
Install class bugfixing & tests & changed method signature
 2018-10-14 06:23:33 -04:00
Philipp Holzer 248c1b8074
Type hinting & call bugfixing 2018-10-14 10:37:19 +02:00
Philipp Holzer 753f61f633
FollowUp Acctlink move 2018-10-14 10:31:11 +02:00
Michael 6be04a73e3 The outbox is now more complete / No more duplicates in the receiver array 2018-10-14 07:47:04 +00:00
Hypolite Petovan db0b848ae3
Merge pull request #5904 from annando/ap-announce 
AP: Announce will now work
 2018-10-13 20:17:14 -04:00
Hypolite Petovan 07da170bcf
Merge pull request #5905 from nupplaphil/move_global_functions 
Move global functions
 2018-10-13 19:46:57 -04:00
Michael e829e074fc Location, coord and app are now processed as well 2018-10-13 21:37:39 +00:00
Michael aab4fa0c31 The instrument is now added, updating AP contacts is now enabled 2018-10-13 20:36:44 +00:00
Michael f60468677e We now transmit location and application as well. 2018-10-13 19:49:20 +00:00
Michael 8b9aa80aad "to" is now used for mentions, "cc" for everything else 2018-10-13 18:59:39 +00:00
Michael efad4936b0 OStatus contacts are now automatically converted to AP 2018-10-13 18:13:01 +00:00
Philipp Holzer 4f7cb049fb
isAjax bugfix 2018-10-13 19:10:46 +02:00
Michael Vogel 514ec1be6d
Merge pull request #5903 from nupplaphil/move_module_acctlink 
Move module AcctLink
 2018-10-13 19:09:59 +02:00
Philipp Holzer 3f729df258
Renamed AcctLink to Acctlink 2018-10-13 19:03:38 +02:00
Philipp Holzer 2c541afd47
Moved functions out of boot.php into class 
- z_root() => $a->getBaseURL()
- absurl() => removed because no usage
- is_ajax() => $a->isAjax()
- current_load() => System::currentLoad()
- argc() => $a->argc
- argv($x) => $a->getArgumentValue($x)
 2018-10-13 19:03:08 +02:00
Michael 3c48a1f787 AP: Announce will now work 2018-10-13 16:41:29 +00:00
Philipp Holzer 508032cf9a
Move Module AcctLink 2018-10-13 18:32:14 +02:00
Philipp Holzer c32ac7f194
Install Class to methods 
- Bugfixing Install checks (worked not as expected)
- Changed static methods from Install to class functions
- Added tests
 2018-10-13 18:09:53 +02:00
Michael d23386f9b2 Catching error when compacting doesn't work 2018-10-13 13:17:10 +00:00
Jonny Tischbein bfa05156ca change links from /contacts to /contact 2018-10-13 13:29:56 +02:00
Jonny Tischbein 738cb4ace6 finish refactoring to Module\Contact 2018-10-13 11:35:51 +02:00
Jonny Tischbein cdbddd0103 Renaming functions and class 2018-10-13 11:23:52 +02:00
Michael 4d4dd1a99c Some beautification 2018-10-12 20:52:22 +00:00
Michael 5af0ee1b95 We can now store it without any problem 2018-10-12 18:53:13 +00:00
Michael 914b3a9e3e Merge remote-tracking branch 'upstream/develop' into fix-diaspora-signature 2018-10-12 18:52:22 +00:00
Michael 1b18be6715 The virtuel fields for the diaspora signatures have to be removed at any time 2018-10-12 18:47:32 +00:00
Hypolite Petovan 986528b77f
Revert "We now store the diaspora comment data as well" 2018-10-12 10:35:43 -04:00
Jonny Tischbein 93ab82b7f0 Rename Contacts:content function 2018-10-11 23:45:01 +02:00
Jonny Tischbein ba95487abf Upate Contacts module file 2018-10-11 23:41:27 +02:00
Jonny Tischbein 80ea86113d Move mod Contacts to /src/Module 2018-10-11 23:14:12 +02:00
Hypolite Petovan 735a5980bd
Merge pull request #5889 from annando/ap-store-diaspora 
We now store the diaspora comment data as well
 2018-10-11 16:42:53 -04:00
Hypolite Petovan 90254fd74b
Merge pull request #5888 from nupplaphil/curl_result_tests 
Curl result tests
 2018-10-11 16:42:09 -04:00
Michael 8268288953 We now store the diaspora comment data as well 2018-10-11 20:38:57 +00:00
Hypolite Petovan fc19373ec4
Merge pull request #5887 from annando/ap-store-conversation 
Store conversation data directly from the AP receiver
 2018-10-11 16:32:00 -04:00
Philipp Holzer b099cba4b4
CurlResult Tests & RegEx fix 2018-10-11 22:18:27 +02:00
Michael 1bf7521af8 Store conversation data directly from the AP receiver 2018-10-11 20:08:04 +00:00
Philipp Holzer 00bf0c24b6
CurlResult Tests 2018-10-11 21:19:38 +02:00
Hypolite Petovan ac1ff6c8ce Try additional $_SERVER properties to get relative path of Friendica 2018-10-11 08:54:45 -04:00
Philipp Holzer a95e7f6504
Bugfixing CurlResult 2018-10-11 07:45:04 +02:00
Hypolite Petovan a066befba5
Merge pull request #5878 from nupplaphil/curl_response_refactoring 
Curl response refactoring
 2018-10-10 18:31:49 -04:00
Philipp Holzer 9711581d49
Code standard 2018-10-10 22:51:26 +02:00
Philipp Holzer b2e7ce47b3
Renaming Curl to CurlResult 2018-10-10 22:08:13 +02:00
Philipp Holzer ffbc688797
Curl Response Refactoring 
- refactored Network::getCurl()
- replaced every Network::getCur() execution with a Curl Response
 2018-10-10 21:50:13 +02:00
Hypolite Petovan 67afa069ab
Merge pull request #5877 from annando/issue-5859 
Issue 5859: Avoid returning empty arrays
 2018-10-10 15:23:39 -04:00
Philipp Holzer 7c73e8634c
Curl Response Refactoring 
- refactored Network::post()
- replaced every Network::post() execution with the new Curl container
 2018-10-10 21:15:26 +02:00
Michael c4da138eee Issue 5859: Avoid returning empty arrays 2018-10-10 19:15:16 +00:00
Philipp Holzer 2dec8895a9
Curl Response Refactoring 
- extended Curl to parse Curl Response
- refactored Network::curl()
- replaced every Network::curl() execution with the new Curl container
 2018-10-10 21:08:43 +02:00
Philipp Holzer e6b1f9ef09
friendica-5875 Uncaught Error: Call to undefined method Friendica\App::getCurlCode() fixed 2018-10-10 18:10:38 +02:00
Philipp Holzer 97dc4bba1a
some more renamings & doku 2018-10-10 09:16:06 +02:00
Philipp Holzer 3d04562c87
some more renamings & doku 2018-10-10 08:54:18 +02:00
Philipp Holzer 307286fc47
parameters and getURLpath to getURLPath 2018-10-10 01:18:47 +02:00
Philipp Holzer 3eb4332f33
Bugfixing Backend 2018-10-10 01:16:51 +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
Hypolite Petovan 5f9dd11cfb
Merge pull request #5867 from annando/ap-fix-follow 
AP: Switchting existing contacts to AP when receiving activities
 2018-10-09 16:08:38 -04:00
Hypolite Petovan c9f1857c4a
Merge pull request #5866 from annando/ap-cleanup 
AP: Avoid a misleading log entry / unneeded field removed
 2018-10-09 16:06:58 -04:00
Michael 0994aaf875 AP: Avoid a misleading log entry / unneeded field removed 2018-10-09 20:00:57 +00:00
Michael c0f26ace2e AP: Switchting existing contacts to AP when receiving activities 2018-10-09 19:58:15 +00:00
Jonny Tischbein 2db2b79bfa Give Login Form previous URL to return to. SESSION var is empty if invalid page. empty args is catched by function 2018-10-09 21:38:17 +02:00
Michael b5d73f840c AP fixes: LD-signature, wrong owner for completed thres, account removal 2018-10-09 05:04:24 +00:00
Michael 4047952703 AP: Avoid an empty avatar field 2018-10-08 03:28:49 +00:00
Hypolite Petovan 3bccaccede
Merge pull request #5848 from nupplaphil/friendica-5847 
friendica-5847 Console Cache List command doesn't work
 2018-10-07 17:47:51 -04:00
Hypolite Petovan 28b4fdb1c3
Merge pull request #5854 from annando/ap-parser 
We now parse a compacted JSON
 2018-10-07 17:42:03 -04:00
Michael 30ad6d60fd Duplicated line removed 2018-10-07 20:51:39 +00:00
Michael 46f77f3486 Detect the object type 2018-10-07 20:36:15 +00:00
Philipp Holzer 7da6da6666
Bugfixings for getAllKeys() 2018-10-07 22:14:05 +02:00
Michael 93866b477a Several fixes 2018-10-07 19:42:04 +00:00
Michael bd6ba98e8d Some more cleanup 2018-10-07 18:41:45 +00:00
Michael 1efca1b75d owner is now actor 2018-10-07 17:35:43 +00:00
Michael 616c4a89bd The new parsing is now active 2018-10-07 17:17:06 +00:00
Michael 36c31e4091 Switching to parsing the JSON-LD 2018-10-07 15:34:51 +00:00
Jonny Tischbein 28456de249 Save return_url before login. Add login mask to many sites if not logged in. 2018-10-07 16:34:08 +02:00
Michael 3a74f3364d Switch to parsing compacted JSON data 2018-10-07 13:37:05 +00:00
Hypolite Petovan 772d735f12
Merge pull request #5845 from annando/ap-suggest 
Preparation for suggestions under AP
 2018-10-07 08:58:21 -04:00
Philipp Holzer 8491f8660f
Bugfixing Memcached 2018-10-07 10:38:45 +02:00
Philipp Holzer 1ec5c6b284
friendica-5847 Console Cache List command doesn't work 
- filterPrefix => filterArrayKeysByPrefix()
- Logging failed Executions of getAllKeys and get from Memcached
 2018-10-07 10:35:37 +02:00
Hypolite Petovan 571e37f4d4
Merge pull request #5844 from nupplaphil/mode_followup 
Changing Friendica\App\Mode from static methods to public methods
 2018-10-06 22:38:54 -04:00
Philipp Holzer 3f0f3b6ae6
friendica-5847 Console Cache List command doesn't work 
- Added $prefix to all CacheDriver
- Moved hostname magic to CacheDriver
- Added test for getAllKeys()
 2018-10-07 00:27:54 +02:00
Michael 192c6c8d4f Preparation for suggestions under AP 2018-10-06 18:42:26 +00:00
Philipp Holzer a2fb49a2b4
Removing debugging echo 
Updating Tests
 2018-10-06 19:11:00 +02:00
Philipp Holzer 31148e25cf
Changing Friendica\App\Mode from static methods to public methods 
- Changing from static methods to public methods
- Adding dev-composer-dependency Mockery for static method mocking (f.e. Config, DBA)
- Adding ModeTest with Mocking
- removing bootstrap from phpunit.xml because of double loading tests\bootstrap.php
 2018-10-06 16:27:20 +02:00
Michael 389a651005 Transmit the Diaspora GUID with activities (Like, Dislike, ...) 2018-10-06 14:02:23 +00:00
Hypolite Petovan 2341ce353d
Merge pull request #5842 from annando/ap-distribution 
Improved AP distribution / Only process trusted content
 2018-10-06 09:35:44 -04:00
Michael a413ce15aa "name" must be plaintext 2018-10-06 13:28:17 +00:00
Michael 6b374c32a2 Improved AP distribution / Only process trusted content 2018-10-06 13:16:52 +00:00
Michael acf31ab64b Additional check to ensure that the owner of an activity is always the author 2018-10-06 09:38:51 +00:00
Michael 510032444f The owner of a "like" should be the author 2018-10-06 08:51:52 +00:00
Tobias Diekershoff ce4204e81a
Merge pull request #5836 from annando/ap4 
No @brief anymore
 2018-10-06 09:19:28 +02:00
Tobias Diekershoff 3b41535dfe
Merge pull request #5835 from annando/ap3 
Some more AP stuff ...
 2018-10-06 09:18:30 +02:00
Michael 41123162f1 No @brief anymore 2018-10-06 04:18:40 +00:00
Hypolite Petovan 13c5bc807b
Merge pull request #5829 from annando/develop 
Cache the AP delivery process
 2018-10-06 00:06:47 -04:00
Michael 09302367d5 Include AP in the contact search 2018-10-06 03:17:44 +00:00
Michael f69c80b9e2 AP delivery is relocated to the top of the notifier 2018-10-06 03:16:38 +00:00
Michael 9dbf8d0b9d Spaces 2018-10-06 02:09:27 +00:00
Hypolite Petovan 3ed9e7fe1d Replace remaining $a->isInstallMode() instances 2018-10-05 20:31:32 -04:00
Hypolite Petovan 3564daf24d
Merge pull request #5828 from nupplaphil/mode_class 
Creating Friendica\App\Mode for encapsulating the App Mode
 2018-10-05 20:07:39 -04:00
Hypolite Petovan 7ac652e20d
Merge pull request #5831 from nupplaphil/addon_check 
moving boot::check_addons to Friendica\Core\Addon::check
 2018-10-05 19:45:04 -04:00
Hypolite Petovan f287d76264
Merge pull request #5827 from annando/follow-on-switch 
Send a follow request upon contact switch to AP
 2018-10-05 19:39:38 -04:00
Philipp Holzer eb1a257224
Used new select function 2018-10-06 01:21:05 +02:00
Philipp Holzer d72473fd51
moving boot::check_addons to Friendica\Core\Addon::check 
And extending Addon from BaseObject because of self::getApp()
 2018-10-06 01:13:29 +02:00