bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity
25428 commits 3 branches 61 tags 178 MiB
Commit graph

4445 commits

Author SHA1 Message Date
Philipp
4daa3d37c1
Merge pull request #7812 from tobiasd/20191103-tarpid 
a hidden field for the registration form
 2019-11-04 11:03:54 +01:00
Philipp
d0068170db
Merge pull request #7806 from tobiasd/20191102-csvexport 
added export and import of followed contacts to and from  CSV files
 2019-11-03 20:28:08 +01:00
Tobias Diekershoff
b7ecc62cc8 move link generation into the loop 2019-11-03 19:57:32 +01:00
Tobias Diekershoff
1377d13055 ypot 2019-11-03 17:37:53 +01:00
Tobias Diekershoff
7ca202baad add a tar pid to the registration form 2019-11-03 17:05:06 +01:00
Tobias Diekershoff
f45d39c05b create URL for categories 2019-11-03 16:34:58 +01:00
Tobias Diekershoff
d3122c396e really there is no App 2019-11-03 15:53:32 +01:00
Tobias Diekershoff
9b03e2a564 there was no App 2019-11-03 15:07:29 +01:00
Michael
17704d2458 Diaspora: Use the standard function for adding a relationship 2019-11-03 13:35:41 +00:00
Tobias Diekershoff
0c873a0548 mv q() to DBA::select() 2019-11-03 14:03:11 +01:00
Tobias Diekershoff
e5e87d546d we only need one contact export, D* _only_ exports the entire profile 2019-11-03 12:59:14 +01:00
Tobias Diekershoff
955a84a266 added export and import of followed contacts to and from CSV files 2019-11-03 00:12:16 +01:00
Michael
6f9302f389 Another duplicated "use" removed 2019-11-02 21:29:16 +00:00
Michael
04c889270b Removed duplicated "use system" 2019-11-02 21:24:22 +00:00
Michael Vogel
6ba7b5961c
Merge pull request #7798 from MrPetovan/task/rework-photo-functions 
Rework photo functions
 2019-11-02 21:20:38 +01:00
Hypolite Petovan
50a2e7001e Replace last instance of local_user() used to guess authentication status in Module/Contact/Hovercard 2019-11-02 12:48:04 -04:00
Hypolite Petovan
ff27f45cb9 Move mod/hovercard to src/Module/Contact/Hovercard 
- Rework hovercard.js to remove JS template interpolation
- Remove template/json output from Module/Contact/Hovercard
 2019-11-02 12:48:03 -04:00
Hypolite Petovan
5cd8cb7134 Add unfollow link to output of Contact::photoMenu 
- Add rel and pending keys to output of Contact::getDetailsByURL
- Add rel and pending keys to output of Contact::getDetailsByAddr
 2019-11-02 12:48:03 -04:00
Hypolite Petovan
b8a22de2d2
Merge pull request #7800 from annando/manually-improve 
AP: Respect "manually approve" during contact request
 2019-11-02 12:45:43 -04:00
Michael
9461446374 Respect "manually-improve" during contact request 2019-11-02 16:24:54 +00:00
Michael
e27ebaee48 Respect "manually improve" during contact request 2019-11-02 16:20:17 +00:00
Hypolite Petovan
dca1b8b580 Add URL decoding to query string in App\Arguments 
- Slashes were stored url encoded
 2019-11-02 07:48:45 -04:00
Hypolite Petovan
26b5de9a76 Rename Photo::newResource() result variable from $hash to $resource_id 2019-11-02 07:48:45 -04:00
Hypolite Petovan
03bf1dcbd3 Move Object\Image static methods to Util\Images 
- Optimize imports in modified files
 2019-11-02 07:48:45 -04:00
Hypolite Petovan
b543ee8ac7
Merge pull request #7726 from tobiasd/20191010-uexport 
move uexport module to src
 2019-11-02 07:46:57 -04:00
Tobias Diekershoff
8bea9e7523 mv URL path uexport -> userexport 2019-11-02 12:44:46 +01:00
Tobias Diekershoff
34932e12bf mv q() to DBA::p() 2019-11-02 12:12:29 +01:00
Tobias Diekershoff
15cdfdd414 mv Uexport to UserExport 2019-11-02 11:36:31 +01:00
Tobias Diekershoff
048b693fbf some more change requests 2019-11-02 11:24:46 +01:00
Steffen K9
7d51d45c17
Changing asort() to usort() 2019-11-02 03:44:54 +01:00
Steffen K9
fd5c122667
Added asort() to the saved folders widget 2019-11-01 22:22:52 +01:00
Hypolite Petovan
41261ba7e1
Merge pull request #7785 from nupplaphil/bug/7676-is_file_warning 
Fix wrong check for logfile in admin summary
 2019-11-01 11:06:52 -04:00
Philipp Holzer
f8e43ddf8d
rename developer to debug :-) 2019-11-01 15:59:00 +01:00
Philipp Holzer
f4ad82bcfb
make ACLFormatter::expand() nullable and return an empty array 
- optimize tests
 2019-11-01 15:43:16 +01:00
Philipp Holzer
aa7be41728
Fix ACLFormatterTest 
- Add nullable to expand() function again
- Add angle bracket support to toString()
 2019-11-01 14:13:29 +01:00
Michael
44cc750f79 Some more warnings removed 2019-10-31 07:33:25 +00:00
Michael
422f0cbdbc Solve warning 2019-10-30 09:44:07 +00:00
Michael
dc065eed42 Fix several warnings and errors 2019-10-30 06:50:20 +00:00
Hypolite Petovan
d6ff89d7b4
Merge pull request #7769 from annando/issue-3229 
Changed OpenID registration
 2019-10-29 10:32:02 -04:00
Michael
eb0d8c1ed0 Uswe default value 2019-10-29 13:26:54 +00:00
Tobias Diekershoff
5e55aa41cb
Merge pull request #7787 from annando/issue-7778 
Fix 7778: Don't return empty string in permissions
 2019-10-29 07:24:02 +01:00
Michael
bef7eeed13 Fix 7778: Don't return empty string in permissions 2019-10-29 06:01:50 +00:00
Philipp Holzer
dc4d3842e0
Fix wrong check for logfile in admin summary 2019-10-28 22:26:34 +01:00
Michael
8470fa70d3 Using "args" 2019-10-28 20:38:53 +00:00
Michael
dd7070938b Use "http_build_query" 2019-10-28 19:34:09 +00:00
Philipp Holzer
3eda62bfa6
Check null for acl-fields 2019-10-28 18:16:10 +01:00
Michael
bfbce16d0b Merge remote-tracking branch 'upstream/develop' into issue-3229 2019-10-28 13:50:06 +00:00
Philipp Holzer
d9d71ea1e6
Wrong condition for home notifications 2019-10-28 00:01:35 +01:00
Michael
945e256b7b Possibly handle issue 7772 2019-10-27 18:36:04 +00:00
Michael
30a6231f11 Fix indentation 2019-10-27 17:45:43 +00:00
Michael
60eb6603bf (hopefully) fix preview issue with tags on Mastodon 2019-10-27 17:41:47 +00:00
Philipp Holzer
3465bd9f11
rename methods 2019-10-26 05:02:14 +02:00
Philipp Holzer
fdc0236aa1
Fix arguments 2019-10-26 04:37:31 +02:00
Philipp Holzer
a72e65a760
Adapt class structure 
- Introduce constants
- Add constructor parameters
- Add typehints
- Renamed fields more meaningful
- Renamed method names to match identifier
- Adjust PHP doc
- Add GetClass call at used places
 2019-10-26 04:03:27 +02:00
Philipp Holzer
1f368d469f
Move Friendica\Core\NotificationsManager to Friendica\Model\Notify 2019-10-26 02:01:46 +02:00
Hypolite Petovan
b632114b12
Merge pull request #7774 from annando/img-title 
Images: Show the description as title
 2019-10-25 19:29:55 -04:00
Michael
9f86465fb9 Images: Show the description as title 2019-10-25 23:23:38 +00:00
Philipp
b34afa990b
Merge pull request #7767 from MrPetovan/bug/fatal-errors 
Expect outbox->first to be a Link structure in Model\GContact
 2019-10-25 08:46:42 +02:00
Philipp Holzer
7343ee5108
Move Namespace of ActivityNamespace 2019-10-25 00:41:48 +02:00
Philipp Holzer
dc2858938d
Renamed to ActivityNamespace 2019-10-25 00:32:35 +02:00
Philipp Holzer
3897c74deb
Add docs 2019-10-25 00:10:20 +02:00
Michael
aca701bef8 Changed OpenID registration 2019-10-24 20:23:26 +00:00
Philipp Holzer
a83dfc11a0
Fixing https://github.com/friendica/friendica/pull/7759#discussion_r337102107 2019-10-24 21:43:20 +02:00
Philipp Holzer
2fba7ed477
Rename namespace 2019-10-24 21:40:13 +02:00
Philipp Holzer
07cea24430
Move Activity/Namespaces defines to constants 2019-10-24 21:40:12 +02:00
Hypolite Petovan
ee1954f294
Merge pull request #7762 from nupplaphil/task/mod_ignored 
move mod/ignored to src/Module/Item/Ignored
 2019-10-24 12:04:50 -04:00
Philipp Holzer
062e472314
Rename route '/ignored/{iid}' to '/item/ignore/{iid}' 2019-10-24 17:18:29 +02:00
Hypolite Petovan
b0987f637c Expect outbox->first to be a Link structure in Model\GContact 
- See https://www.w3.org/TR/activitystreams-vocabulary/#dfn-first
- Addresses https://github.com/friendica/friendica/issues/7675#issuecomment-545300597
 2019-10-24 08:47:00 -04:00
Philipp Holzer
5aa73afa7e
Rename module class name 2019-10-24 09:09:47 +02:00
Hypolite Petovan
9f460c6797
Merge pull request #7765 from nupplaphil/task/move_text 
Move include/text.php to class structure
 2019-10-23 15:57:01 -04:00
Philipp Holzer
c9e1098dd2
Adapt naming convention 2019-10-23 21:39:00 +02:00
Philipp Holzer
dba2d574b1
Adapt because of feedback 2019-10-23 21:29:17 +02:00
Philipp Holzer
db25f5b6ca
Add jsonExit() and fix UID issue 2019-10-23 16:24:19 +02:00
Philipp Holzer
edf006905b
Move (last) get_cats_and_terms to Content\Item::determineCategoriesTerms() 
- Added incomplete test
 2019-10-23 02:48:46 +02:00
Philipp Holzer
ad67fd3aa8
Move is_a_date_arg to DateTimeFormat::isYearMonth 
- Improved functionality
- Added tests
 2019-10-23 02:39:28 +02:00
Philipp Holzer
52c42491c4
Move activity_match() to Protocol\Activity::match() 
- With tests
 2019-10-23 02:05:11 +02:00
Philipp Holzer
9e94e8b48c
Remove function prepare_text and use BBCode::convert() instead 2019-10-23 00:58:13 +02:00
Philipp Holzer
5843a80b6c
Move perms2str to ACLFormatter::aclToString() 
- including new tests
 2019-10-23 00:54:34 +02:00
Philipp Holzer
f65f7f11c3
Move expand_acl to ACLFormatter::expand() 
- including tests
 2019-10-23 00:40:14 +02:00
Philipp Holzer
a3e350313d
Move redir_private_images to Item::addRedirLinkToImageLinks() 2019-10-23 00:20:44 +02:00
Philipp Holzer
2870f42ca2
Move bb_translate_video 
- To new Class BBCode\Video
- Adding tests
- Make BaseObject::getClass() public
 2019-10-23 00:14:47 +02:00
Philipp Holzer
04a86dad75
remove superfluous line 2019-10-22 22:52:40 +02:00
Philipp Holzer
1fe9b789f3
Add some PHP doc 2019-10-22 22:51:52 +02:00
Philipp Holzer
4e32d46f97
switch case 2019-10-22 22:48:54 +02:00
Philipp Holzer
6b2c28e2d7
Add checks & realpath() usage 
- New util class "FileSystem"
- Add check in admin summary too
 2019-10-22 22:47:37 +02:00
Philipp Holzer
0e84a843a4
Add Fallback in case the logfile isn't accessible. 
- Fixes https://github.com/friendica/friendica/issues/7756#issuecomment-544227862
 2019-10-21 21:53:55 +02:00
Philipp Holzer
17aca9bee8
move mod/ignored to src/Module/Item/Ignored 2019-10-21 21:19:28 +02:00
Hypolite Petovan
2edccf9341
Merge pull request #7759 from nupplaphil/task/mod_receive 
Move mod/receive to src/Module/Diaspora/receive
 2019-10-21 11:59:13 -04:00
Philipp Holzer
a25d841b85
some improvements 2019-10-21 17:29:53 +02:00
Philipp Holzer
2a41f0b104
wrong field 2019-10-21 11:34:47 +02:00
Michael
17bb1eaf12 Fix fatal error 2019-10-21 05:52:45 +00:00
Philipp Holzer
7716374593
Move mod/receive to src/Module/Diaspora/receive 
- Added routes
- Make Diaspora::decode(Raw) more explicit
- Add new User::getByGuid() method
 2019-10-20 13:07:16 +02:00
Michael
df1db84846 Fix: Friendica contacts had falsely been detected as ActivityPub 2019-10-20 06:04:47 +00:00
Michael
1f98067189 Cleaned up code / removed legacy stuff 2019-10-19 16:41:07 +00:00
Michael
98c12006d5 Merge remote-tracking branch 'upstream/develop' into sanitize-gcontact 2019-10-18 18:48:32 +00:00
Hypolite Petovan
1a8bc6e73f
Merge pull request #7753 from annando/http-417 
Handling for HTTP Error code 417
 2019-10-18 12:53:33 -04:00
Hypolite Petovan
f8c0f24e34
Merge pull request #7752 from kPherox/develop 
Change Model type to `OrderedCollectionPage`
 2019-10-18 06:54:42 -04:00
kPherox
0da36b839c
Change Model type to OrderedCollectionPage 
Use type `OrderedCollectionPage` instead of `OrderedCollection` in pages or distinct subsets
FYI: https://www.w3.org/TR/activitystreams-core/#h-paging
 2019-10-18 12:58:47 +09:00
Michael
4664249fec Improved comment 2019-10-17 21:49:29 +00:00
Michael
36ba7fa79c Merge remote-tracking branch 'upstream/develop' into http-417 2019-10-17 21:37:24 +00:00
Tobias Diekershoff
2ed61194d5 adopted some change requests 2019-10-17 07:45:48 +02:00
Hypolite Petovan
1997938ae7 Remove remaining Logger log level in explicit Logger::debug call 2019-10-16 22:39:31 -04:00
Michael
4c5b97834b Replaced quotes 2019-10-16 17:13:56 +00:00
Hypolite Petovan
5dcf6bfc58 Remove extra spaces before closing parentheses in src/ 2019-10-16 08:58:09 -04:00
Hypolite Petovan
146646c4d4 Replace deprecated calls to defaults() by ?? and ?: in src/ 2019-10-16 08:38:52 -04:00
Philipp
c0b78a9720
Merge pull request #7743 from MrPetovan/task/7190-remove-defaults-modules 
Replace deprecated defaults() calls by ?? and ?: operators in src/Module/
 2019-10-15 18:17:45 +02:00
Hypolite Petovan
f59ea2af55 Replace deprecated defaults() calls by ?? and ?: operators in src/Module/ 2019-10-15 09:20:32 -04:00
Michael
f1e7d97b8c Merge remote-tracking branch 'upstream/develop' into sanitize-gcontact 2019-10-15 10:10:12 +00:00
Michael
3e93c62a9c Changed quotation (" to ') 2019-10-15 07:55:20 +00:00
Philipp
fed486bfc5
Merge pull request #7727 from MrPetovan/task/4090-move-manage-to-src 
Move mod/manage to src/Module/Delegation
 2019-10-13 18:20:47 +02:00
Philipp
05c4fd9daa
Merge pull request #7737 from MrPetovan/task/4090-move-search-to-src 
Saved Search fixes
 2019-10-13 15:40:42 +02:00
Hypolite Petovan
230a97ccdd Correctly URL encode return URLS for saved search 2019-10-13 08:39:55 -04:00
Hypolite Petovan
74bf3a4dc8 Replace path parameter with query string parameter in Module\Search\Saved 2019-10-13 08:39:41 -04:00
Hypolite Petovan
c5f4f730e1 Use init() rather than rawContent() in Module\Search\Saved since there's no output 2019-10-13 08:37:25 -04:00
Hypolite Petovan
db0630b0f9 Catch missing Certainty bundle exception when checking for exposed password in Model\User 2019-10-12 21:10:03 -04:00
Hypolite Petovan
1cdbf32aa2 Remove duplicate array entry in Core\Logger 2019-10-12 21:10:03 -04:00
Michael
440da8a9f4 eol 2019-10-12 14:07:22 +00:00
Michael
c1ab93a5d8 Strings.php: Spaces are transformed to Tabs. 2019-10-12 10:28:18 +00:00
Hypolite Petovan
2c2beb5c0a
Revert Util\Strings::escapeHtml changes from #7725 
- Breaks display of inserted mentions
 2019-10-11 22:19:20 -04:00
Hypolite Petovan
02f02d44dc Move mod/manage to src/Module/Delegation 
- Move templates/manage to templates/delegation
- Update navigation links
- Update CSS classes
 2019-10-11 19:59:06 -04:00
Hypolite Petovan
4ee9e21a4f Make Router::getModuleClass throw exceptions 
- Add new MethodNotAllowedModule
- Add new Module->determineClass catch blocks
- Update Module and Router tests
 2019-10-11 19:59:05 -04:00
Hypolite Petovan
001c9ed259 Fix typo in Core\Authentication 2019-10-11 19:57:04 -04:00
Hypolite Petovan
27eaffd7fb
Merge pull request #7725 from dew-git/develop 
Fix security vulnerabilities.
 2019-10-11 14:48:07 -04:00
Tobias Diekershoff
10a66f368c self should be lower case 2019-10-11 17:44:50 +02:00
Tobias Diekershoff
9f3e68c2c5 correct the file name in the header 2019-10-11 11:55:57 +02:00
Tobias Diekershoff
5ac5a67b6b enhance description 2019-10-11 11:49:28 +02:00
Tobias Diekershoff
e3a947fb3d keep the ToDo hint from delegations 2019-10-11 11:48:05 +02:00
Tobias Diekershoff
882449266c removed debugging leftover 2019-10-11 11:45:28 +02:00
Tobias Diekershoff
06a964c32f only take action, when there is something to do 2019-10-11 11:42:07 +02:00
dew-git
e1e1d26b5b Revert random_int changes. 2019-10-11 00:00:15 -08:00
Tobias Diekershoff
46172b641d moved UExport to src/Module/Settings/Uexport 2019-10-11 07:38:42 +02:00
dew-git
b5dac16def Comply with coding style. 2019-10-10 20:50:51 -08:00
dew-git
3940e804e3 Remove uneeded variable. 2019-10-10 20:48:13 -08:00
dew-git
dc01bdbc80 Use the utility instead. 2019-10-10 20:43:32 -08:00
dew-git
811cdcdfcb Fix security vulnerbilities. 
Fix possible length extension attack, predicable generators, timing attacks on hash comparision and improved formatting.
 2019-10-10 15:21:41 -08:00
Hypolite Petovan
4b71fd2442 Replace deprecated calls to App->getBaseURL in Module\Register 2019-10-10 13:13:23 -04:00
Hypolite Petovan
67d374a14f Complete L10n::detectLanguage call parameters in Module\Register 2019-10-10 13:12:55 -04:00
Tobias Diekershoff
50fa119f79
Merge pull request #7722 from nupplaphil/bug/7718-lang 
Fix browser language detection
 2019-10-10 16:54:32 +02:00
Philipp Holzer
a522cf609b
Fix browser language detection (& tests) 2019-10-10 16:39:04 +02:00
Philipp
cf4bae26c7
Merge pull request #7720 from MrPetovan/task/4090-move-delegate-to-src 
Move mod/delegate to src/Module/Settings/Delegation
 2019-10-10 10:24:15 +02:00
Hypolite Petovan
43567bcf0e Add documentation comments to Module\Settings\Delegation 2019-10-10 04:17:37 -04:00
Hypolite Petovan
3cd916d7aa Use Model\User::getById when possible in Module\Settings\Delegation 2019-10-10 04:10:57 -04:00
Hypolite Petovan
cc0cf2b8ce Improve parent user password check in Module/Settings/Delegation 2019-10-10 04:10:29 -04:00
Hypolite Petovan
616edd0600 Move mod/delegate to src/Module/Settings/Delegation 
- Move templates/delegate to templates/settings/delegation
 2019-10-09 22:17:09 -04:00
Philipp
e72402389d
Merge pull request #7715 from annando/fix-getguid 
The getGUID function hadn't fetched the GUID from pictures with scale "0"
 2019-10-08 07:01:17 +02:00
Michael
11194d6679 Fix: The getGUID function hadn't fetched the GUID from pictures with scale "0" 2019-10-08 04:42:51 +00:00
Hypolite Petovan
e3e3ee72a0 Improve logging in Module\Search\Index 2019-10-07 16:18:19 -04:00
Hypolite Petovan
c8316bfe57 Use Dice instantiation to access App\Arguments 
- Remove App->args accessors
 2019-10-07 16:16:42 -04:00
Hypolite Petovan
1e737ae888 Move mod/search to src/Module/Search/Index 
- Update BaseSeachModule not to depend on a single query string parameter
 2019-10-07 14:27:46 -04:00
Hypolite Petovan
22598fc7e8 Improve search box 
- Use new saved search module
- Use dynamic search option loop
- Use "q" instead of "search" for search query string parameter
 2019-10-07 14:27:46 -04:00