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

3034 Commits

Author SHA1 Message Date
Hypolite Petovan 30e97b4cc1 Ignore code blocks when extracting tags 2019-01-29 20:39:05 -05:00
Hypolite Petovan 9525e07971 Fix greedy regular expression and move code block escaping after tag extraction in Model\Item 2019-01-29 20:25:51 -05:00
rabuzarus 0993f3e6ef fix isssue if friendica is installed into a subdirectory 2019-01-30 01:00:40 +01:00
Hypolite Petovan 2bd62bfdea
Merge pull request #6554 from Ixiter/develop-bbcode-tags 
Fixed some bugs with weird tagging in [code] blocks and tagging of multiple ##
 2019-01-29 17:11:54 -05:00
Peter Liebetrau c3e5c77eb3 BBcode, Tags - changes for #pullrequestreview-197771905 2019-01-29 22:34:28 +01:00
Peter Liebetrau 5080778ea6 BBcode, Tags - moved [code] escaping before BBCode::getTags() call 2019-01-29 21:54:20 +01:00
Peter Liebetrau 87b1d0a4d7 BBcode, Tags - fixed doubbbllee trroubbllee 2019-01-29 21:35:11 +01:00
Peter Liebetrau d8bd1921ee BBcode, Tags - fix BBCode created tags in [code] blocks, fix usage of multiple ## created tags 2019-01-29 21:17:11 +01:00
Hypolite Petovan 8d84f33f15
Merge pull request #6541 from annando/mentions 
Display mentioned users and in the comment box by default
 2019-01-29 07:56:30 -05:00
fabrixxm a7d45682e7 Filesystem storage: handle basepath with trailing slash 2019-01-29 12:36:23 +01:00
fabrixxm ec94318a35 Filesystem storage: set permission on folders and files 
files are set 0660 and folders 0770.
fix #6545
 2019-01-29 12:35:30 +01:00
Michael e38eebe529 Standards 2019-01-28 22:06:28 +00:00
Michael d259007f11 Removing the parameter 2019-01-28 21:53:13 +00:00
Michael d40b2792b6 Display mentioned users and in the comment box by default 2019-01-28 21:22:03 +00:00
Michael Vogel 41b1c9b374
Merge pull request #6539 from nupplaphil/logger_uid 
Logger Unique ID
 2019-01-28 19:32:01 +01:00
Philipp Holzer d7e35b5802
Making the processor name more explicit 2019-01-28 18:41:29 +01:00
Philipp Holzer 26af96f31a
improving code 2019-01-28 18:26:35 +01:00
Philipp Holzer 9fe1da5f94
Double backslash 2019-01-28 12:35:14 +01:00
Philipp Holzer 88e2cc9fa2
removing array prefix (compatibility) 2019-01-28 11:35:08 +01:00
Philipp Holzer a5e12f53e8
Logger Unique ID 2019-01-28 11:21:48 +01:00
Michael 030c0b5dc6 Another preparation for forum posts via AP 2019-01-28 06:23:06 +00:00
Hypolite Petovan 2d49b71a4c
Merge pull request #6516 from Ixiter/develop 
BBCode - added preg_replaces for local [url] links without target="_blank"
 2019-01-26 14:22:34 -05:00
Michael 9f2e9dfc1b Fetchting the original post at first, then the other way is dafer. 2019-01-26 12:09:38 +00:00
Michael ad782b55ef Preparation for forum posts over AP 2019-01-26 12:03:09 +00:00
Peter Liebetrau 41663c7592 BBCode - fixed syntax error 2019-01-25 17:33:25 +01:00
Peter Liebetrau 54bec2bc8e BBCode - optimized preg searchstring 2019-01-25 17:25:42 +01:00
Peter Liebetrau 71e58a0f42 BBCode - optimized preg escaping of searchstring 2019-01-25 16:56:28 +01:00
peter 6ba08e510d BBCode - removed convert for relative URLs 2019-01-25 15:32:31 +01:00
peter a505dbbe5c BBCode - fixed code styling 2019-01-25 01:25:06 +01:00
peter ae806a593d BBCode - added preg_replacers for local [url] without target="_blank" 2019-01-25 01:15:43 +01:00
Hypolite Petovan 2b0610eaf5
Merge pull request #6515 from annando/connector-posts 
Fix: Connector posts now do work again (postopts hadn't been stored)
 2019-01-24 16:23:34 -05:00
Michael 7cba8942c7 Fix: Connector posts now do work again (postopts hadn't been stored) 2019-01-24 21:06:53 +00:00
Michael ebb84f5e43 DFRN comments are now stored as comments again 2019-01-24 18:54:45 +00:00
Michael b90c8c6346 Logger: Display the correct file, function and line number 2019-01-24 14:23:42 +00:00
Michael Vogel 6e7ca479d6
Merge pull request #6508 from nupplaphil/logger_enh 
Adding an explicit FriendicaProcessor
 2019-01-24 11:15:57 +01:00
Philipp Holzer 7634663970
Adding an explicit FriendicaProcessor 2019-01-24 08:13:44 +01:00
Hypolite Petovan 46315f6946 Fix missing use statement in Module\Inbox 2019-01-23 21:22:39 -05:00
Hypolite Petovan 8a554fef2d Fix missing library include in Database\DBstructure 2019-01-23 21:22:26 -05:00
Michael 3392c7a8be Fixed "created" origin 2019-01-24 00:34:14 +00:00
Michael 7e31cebb67 Parameters redone 2019-01-23 22:04:14 +00:00
Michael 0fdab4ed10 Fix for several fatal errors 2019-01-23 21:54:20 +00:00
Hypolite Petovan 004818ca1b Fix indentation in Module\Inbox 2019-01-23 09:07:02 -05:00
Hypolite Petovan 0d9209a74b Add AP Inbox logging back with config 2019-01-23 09:07:01 -05:00
Hypolite Petovan c897969589 Fix wrong variable name in Worker\Delivery 2019-01-23 09:07:00 -05:00
Hypolite Petovan a6786ac814 Update array notation in Protocol\DFRN 2019-01-23 09:07:00 -05:00
Hypolite Petovan df706484cd User DOMDocument object call instead of static in Content\OEmbed 2019-01-23 09:07:00 -05:00
Hypolite Petovan ddad9721c0 Fix query return type in Widget\TagCloud 2019-01-23 09:06:59 -05:00
Hypolite Petovan 49c9b6f9ff Fix possibly undefined variables 2019-01-23 09:06:59 -05:00
Hypolite Petovan f8c782380f Remove unused code/use statements 2019-01-23 09:06:58 -05:00
Hypolite Petovan 64847e7cc8 Fix types in doc blocks/prototypes 2019-01-23 09:06:58 -05:00
Hypolite Petovan 5ea033db33 Remove unused variable in Model\Item 2019-01-23 09:06:58 -05:00
Hypolite Petovan d5ce74672e Fix method scope in Model\Attach 2019-01-23 09:06:57 -05:00
Hypolite Petovan 0c19c4c75d Fix missing reference to 'data' key in Util\Crypto 
- Fix doc blocks
 2019-01-23 09:06:57 -05:00
Michael Vogel 48e0b943a3
Merge pull request #6336 from MrPetovan/bug/6334-get-app-namespace 
Move mod/register to Module\Register
 2019-01-23 07:40:58 +01:00
Hypolite Petovan 1ee1d7ef4e Add new PostUpdate function to initialize delivery data 2019-01-23 00:02:00 -05:00
Hypolite Petovan cef6757c92 Replace REGISTER_* constants by Module\Register::* ones 2019-01-22 22:24:15 -05:00
Hypolite Petovan 0ccb6afdb5 Add Register module in src/ 
- Update REGISTER_* constants definition
- Update register template variable name
 2019-01-22 22:22:04 -05:00
Hypolite Petovan 0cc1a07cfa Fix default value of contact parameter of OStatus::import in mod/salmon 2019-01-22 08:53:53 -05:00
Hypolite Petovan 5d4bafb116 Fix two additional uses of uid in Worker\Notifier 2019-01-22 08:31:39 -05:00
Hypolite Petovan 282bc01994 Fix using wrong uid for APDelivery in Worker\Notifier 2019-01-22 01:59:30 -05:00
Hypolite Petovan 604262a70e Extract title determination from OStatus::entryHeader logic 2019-01-22 01:59:22 -05:00
Hypolite Petovan aa3532cd3b Fix wrong class constant in Model\APContact 2019-01-22 01:57:46 -05:00
Michael Vogel 85ff976f83
Merge pull request #6483 from MrPetovan/bug/fixes-after-2019-03-develop-rebase 
Fixes after 2019 03 develop rebase
 2019-01-21 21:52:22 +01:00
rabuzarus eabe192efc bugfix Contact.php - there is no column 'deleted' in the 'profile' table 2019-01-21 21:13:13 +01:00
Hypolite Petovan b161bd1dfa Improve get_responses() prototype 2019-01-21 11:37:05 -05:00
Hypolite Petovan ce177f22c8 Fix doc blocks and return value type 2019-01-21 11:36:01 -05:00
Hypolite Petovan 504945f9df Improve page flags doc block in Model\User 2019-01-21 11:12:53 -05:00
Hypolite Petovan d1c1c772fd Fix missing use statement in Content\Nav 2019-01-21 11:12:53 -05:00
Hypolite Petovan 41edcd1028 Fix bad rebase in Model/Contact 2019-01-21 11:12:52 -05:00
Hypolite Petovan 3c50a11ff1 Fix wrong operators in Model\Item and Model\Contact 2019-01-21 11:12:51 -05:00
Hypolite Petovan 25b8628762 Fix missing new in throw calls in Core\StorageManager 2019-01-21 11:12:51 -05:00
Hypolite Petovan 722284ca8e Fix unused $kw variable in Protocol\Diaspora 2019-01-21 11:12:51 -05:00
Hypolite Petovan 28397fc5fc Fix method parameter type in Model\Attach 2019-01-21 11:12:50 -05:00
Hypolite Petovan 78931afa6f Fix error message in Console\GlobalCommunityBlock 2019-01-21 11:12:50 -05:00
Hypolite Petovan 57ab858486 Fix calls to DBA::select missing parameters 2019-01-21 11:12:50 -05:00
Hypolite Petovan e7be87df93 Fix missing $ in front of variable names 2019-01-21 11:12:49 -05:00
Hypolite Petovan 7f2dc40601 Fix potential bugs without expected behavior change 
- Fix uninitialized variables
- Fix potentially not set variables
- Fix wrong parameter default value
- Fix method scope
- Fix missing return value
 2019-01-21 11:04:19 -05:00
Hypolite Petovan c280fc6484 Show followers for pages, followed for users in ContactBlock widget 2019-01-21 10:56:28 -05:00
Hypolite Petovan 3d839bb176 Move Contact::ACCOUNT_TYPE_* constants to User::ACCOUNT_TYPE_* 
- Keep Contact::TYPE_* constants for comparison with contact.contact-type
 2019-01-21 10:56:27 -05:00
Hypolite Petovan ad9c67663d Move Contact::Page_* constants to User::PAGE_FLAGS_* 2019-01-21 10:55:37 -05:00
Hypolite Petovan 11a4a57bfe Update HTML::contactBlock and Profile::load with new ContactBlock widget 2019-01-21 10:55:36 -05:00
Hypolite Petovan 1f98fdfda6 Add new Widget\ContactBlock 2019-01-21 10:54:42 -05:00
Philipp Holzer 1b802548b2 revert phpdoc change 2019-01-21 10:54:41 -05:00
Philipp Holzer 9e0be97703 Bugfixing legacy loglevel 2019-01-21 10:54:41 -05:00
Philipp Holzer c38782731f changing failed auth to warning 2019-01-21 10:54:41 -05:00
Philipp Holzer 282507922a Reset map function name 2019-01-21 10:54:41 -05:00
Philipp Holzer b5afd2a21d change regex for fail2ban 2019-01-21 10:54:40 -05:00
Philipp Holzer aa15c0e094 Bugfixing Monolog 
- Default Loglevel for logs set to 'info'
- Default config level is set to 'notice'
- using 'notice' for auth-failures
- Bugfixing wrong usage of legacy 'log()'
 2019-01-21 10:54:39 -05:00
Hypolite Petovan dbc6eb5422 Remove unused code in mod/ 
- Remove commented code
- Remove unused/immediately overwritten variables
- Remove extraneous parameters
- Remove unreachable code
 2019-01-21 10:53:32 -05:00
Hypolite Petovan 4a95ca280d Remove unused code 
- Remove commented code
- Remove unused/immediately overwritten variables
- Remove extraneous parameters
- Remove unreachable code
- Remove duplicate array keys
 2019-01-21 10:48:40 -05:00
Hypolite Petovan d1c6ec9718 Update namespaces declaration in include/ 
- Remove unused use statements
- Add required use statements
 2019-01-21 10:44:45 -05:00
Hypolite Petovan 14e4ab544a Update namespace use calls in mod/ 2019-01-21 10:44:21 -05:00
Hypolite Petovan cb3f09ae4f Refactor namespaces 
- Remove unused use statements
- Add required use statements
- Escape global classes
 2019-01-21 10:43:42 -05:00
Hypolite Petovan 070aa016e0 Update more PHPDoc, including in include/ 2019-01-21 10:39:28 -05:00
Hypolite Petovan af9067a381 Update PHPDoc in mod/ 2019-01-21 10:39:27 -05:00
Hypolite Petovan 3282ce5389 Fix PHPDoc comments project-wide 2019-01-21 10:35:51 -05:00
Philipp Holzer 2e602afd3e Add Monolog 2019-01-21 10:10:40 -05:00
fabrixxm 518f28a7bf Small fixes 
- Avoid an intermediate variable
- Use `rawContent()` in `Attach` module
- Small typo
 2019-01-21 10:08:09 -05:00
Hypolite Petovan 2f49c4a058 Revert "Add monolog" 2019-01-21 10:08:09 -05:00
fabrixxm 24d7ffa3fe Update "storage" console command 
add support to move data in 'attach' table
 2019-01-21 10:00:48 -05:00
fabrixxm c3c0332536 return default mimetype for unknown extensions 2019-01-21 10:00:47 -05:00
fabrixxm e561fb3a0b Fix undefined var in module Proxy 2019-01-21 10:00:47 -05:00
Philipp Holzer 6e48df2163 Refactor Loglevels 2019-01-21 10:00:46 -05:00
fabrixxm b640024b51 Item model, fix deletion of all attachments 
Item model delete all attachments on item deletion, but it should check
if same attachment isn't used somewhere else.
 2019-01-21 10:00:45 -05:00
fabrixxm 906b7841d4 Fix Attach model store() and storeFile() 2019-01-21 10:00:45 -05:00
fabrixxm 15b0a7a4d8 Photo model. Small fix to update() 
pass `$old_fields` param to `DBA::update()`
 2019-01-21 10:00:45 -05:00
fabrixxm b7b3086263 Attach: store, update, delete. Model and views 2019-01-21 10:00:44 -05:00
fabrixxm fc2b804ccc Move mod/attach to src, add Attach model, update attach table to use storage backends 2019-01-21 10:00:44 -05:00
Philipp Holzer df230126c9 skipStackFramesCount to 1 to skip static method 2019-01-21 09:59:11 -05:00
Philipp Holzer 45bde8fef1 Adding more information in case of warning (or dev) 2019-01-21 09:59:11 -05:00
Philipp Holzer 6150c2fa9c Bugfixing 2019-01-21 09:59:11 -05:00
Philipp Holzer 7f7ed16dc2 Log format 2019-01-21 09:59:09 -05:00
Philipp Holzer 8f9c0fe149 Adding Develop and normal Logging instances 2019-01-21 09:59:08 -05:00
Philipp Holzer fe8f0e0045 Add Monolog 2019-01-21 09:58:05 -05:00
Jeroen De meerleer 2bfc3d1a0c begone 2019-01-21 09:50:59 -05:00
Jeroen De Meerleer 33f7fd72ca Enable logged in users to force a certain language 2019-01-21 09:50:58 -05:00
Jeroen De Meerleer b440b4c338 Updated towards code standards 2019-01-21 09:50:58 -05:00
Jeroen De meerleer e0777b6bc9 forcing language by parameter 2019-01-21 09:50:58 -05:00
Hypolite Petovan 55e54bb950 Replace deprecated Addon::callHooks with Hook::callAll 
- Update documentation
 2019-01-21 09:50:56 -05:00
Hypolite Petovan 895b3abf32 Remove/replace killme() with *exit() 2019-01-21 09:49:17 -05:00
Hypolite Petovan 16fabb4e04 Replace misuses ItemDeliveryData::FIELD_LIST with LEGACY_FIELD_LIST 2019-01-21 09:39:15 -05:00
Hypolite Petovan 38734f17b9 Honor item delivery data legacy fields 2019-01-21 09:39:15 -05:00
Hypolite Petovan 85eb6affdf Unit test fix 2019-01-21 09:39:14 -05:00
Hypolite Petovan ff1f6564f9 Remove delivery queue done incrementation for mail delivery 2019-01-21 09:39:14 -05:00
Hypolite Petovan 6538a8eaca Add delivery queue display in frio and vier 
- Add new $item.owner_self and $item.delivery keys for display
- Add new sub/delivery_count.tpl template
 2019-01-21 09:39:13 -05:00
Hypolite Petovan 1696ad962e Add delivery queue number manipulation 
- Add new ItemDeliveryData model class
- Add queue_count initialization in Notifier
- Add queue_done incrementation in various Delivery tasks
 2019-01-21 09:36:51 -05:00
Hypolite Petovan dea1a98a5d Fix various documentation issues/unused variables 2019-01-21 09:33:24 -05:00
Hypolite Petovan 8a0e4e12e1 Replace item_id by target_id in multimode delivery workers 2019-01-21 09:32:41 -05:00
Hypolite Petovan 1e6193a14e Refactor Worker/Notifier part 4 
- Remove redundant $normal_mode flag
- Moved public message email recipient loop
- Simplify OStatus delivery
 2019-01-21 09:31:57 -05:00
Hypolite Petovan 774609dd38 Refactor Worker/Notifier part 3 
- Replace deprecated q() calls
 2019-01-21 09:31:56 -05:00
Hypolite Petovan d0228b9b97 Refactor Worker/Notifier part 2 
- Move self-removal in a sub-method in Worker/Notifier
 2019-01-21 09:27:06 -05:00
Hypolite Petovan 507c215c76 Refactor Worker/Notifier part 1 
- Rename variables
- Remove orphan, duplicate and one-use intermediary variables
- Initialize potentially missing variables
- Replace obsolete Addon::callHooks call
- Simplify Notifier::activityPubDelivery() signature
 2019-01-21 09:27:05 -05:00
Jeroen De Meerleer ff180fb0f1 Updated towards code review 2019-01-21 09:12:38 -05:00
fabrixxm b2211d31b9 Fix StorageManager::move() 2019-01-21 09:12:37 -05:00
Jeroen De Meerleer a224308d42 4 spaces to tab 2019-01-21 09:12:37 -05:00
Jeroen De Meerleer 0906c3532c Added post-update script 
Please review first. I don't want to test changes that are not going pass the review.
 2019-01-21 09:12:37 -05:00
fabrixxm 8addcf9844 Fix storage backend class names 
This should be tested on all supported PHP versions
 2019-01-21 09:12:32 -05:00
Hypolite Petovan 578a391393 Add missing methods to Storage\SystemResource 
Part of #6263
 2019-01-21 09:12:31 -05:00
fabrixxm bbbc15a5eb Method getPhoto of Photo model should return false on error 
Instead of red circle image, which breaks proxy module
 2019-01-21 09:12:31 -05:00
fabrixxm 4e38bc8a0d Use DBA::exists() in Photo::exists() 2019-01-21 09:12:31 -05:00
fabrixxm 2f935a1fbf Fix unregister storage backend 2019-01-21 09:12:30 -05:00
fabrixxm f2b29f6591 Fix moving stored data 2019-01-21 09:12:30 -05:00
fabrixxm 55292c954b Remove resourceid parameter from Photo::exists() 2019-01-21 09:12:29 -05:00
fabrixxm 8c75c26361 Use Model\Photo as much as possible 
Most important is to use `Photo::delete()` to have backend
to remove data.
 2019-01-21 09:12:28 -05:00
fabrixxm d549787bc1 Remove empty line before code 2019-01-21 09:11:41 -05:00
fabrixxm 15a3fc05d3 Photo model: set edited and updated on update, fix exists(), docs 2019-01-21 09:11:40 -05:00
fabrixxm 36f30533b7 Code standards 2019-01-21 09:11:40 -05:00
fabrixxm 5fdc9097a2 Rewrite Proxy module 2019-01-21 09:11:40 -05:00
fabrixxm a46cbfca3d Fix Module\Photo exit with error 2019-01-21 09:11:39 -05:00
fabrixxm fdc6608af8 Add storage options form in admin/site page 2019-01-21 09:11:39 -05:00
fabrixxm f7b6fef197 Code standards 2019-01-21 09:11:35 -05:00
fabrixxm 682456c7d1 Add move function to storage manager and console command 2019-01-21 09:11:35 -05:00
fabrixxm 4d9d62bcdb Add 'storage' console command 
- list registered backend
- set backend
 2019-01-21 09:11:34 -05:00
fabrixxm 6a0ed7c298 Add storage backend manager class 2019-01-21 09:11:34 -05:00
fabrixxm e5c2d4e2f8 Add Database storage backend 
This storage store files data in a separate database table
 2019-01-21 09:11:33 -05:00
fabrixxm 6e85a18678 Storage: throw StorageException on errors 2019-01-21 09:10:47 -05:00
fabrixxm 7df3f117ac Photo model: fix docs, don't update "created" field 
in store() if photo exists, don't update "created" timestamp
 2019-01-21 09:10:47 -05:00
fabrixxm 6f59c82978 Code standards 2019-01-21 09:10:46 -05:00
fabrixxm 69fcdaf9ab Photo model: set updated field in update() 2019-01-21 09:10:45 -05:00
fabrixxm 3e13799e70 Add update() to Photo model 
Edit mod/photos.php to use Photo model
 2019-01-21 09:10:45 -05:00
fabrixxm b0acf4284d Code standards 2019-01-21 09:02:58 -05:00
fabrixxm cbb5124d59 Code standards 2019-01-21 09:02:57 -05:00
fabrixxm ea0cd6c919 Filesystem storage: add "index.html" files in dirs 2019-01-21 09:02:57 -05:00
fabrixxm 76579e02cc profile_photo: use Photo model function to get photo and image 2019-01-21 09:02:57 -05:00
fabrixxm 234c110d38 Model/Photo: use self select functions, reuse backend, fix quotes, add delete() 2019-01-21 09:01:52 -05:00
fabrixxm 75daf96590 Revert "Catch HTTPExceptions in App::runFrontend()" 
This reverts commit 58bd75f8f35f89fc275d5cd8e3ef40b9b18cb149.
 2019-01-21 08:59:59 -05:00
fabrixxm 07d358adc1 More code standard 2019-01-21 08:57:30 -05:00
fabrixxm 9317a1c054 Address code standards issues 2019-01-21 08:57:30 -05:00
fabrixxm 12dd7b552f Add Filesystem storage backend and store photo via backend 2019-01-21 08:57:29 -05:00
fabrixxm 0ada604c7d Return default profile photo if no profile photo is set 2019-01-21 08:57:29 -05:00
fabrixxm 9b2e3fa916 Add IStorage interface 
storage classes should implement this interface
 2019-01-21 08:57:29 -05:00
fabrixxm 3b3c4e8cc7 Pluggable storage backends: first steps 
- add backend related columns in photo table
- add system resource storage class
- add code to load image data from backend class
- return "nosign" image as photo meta with SystemResource backend
 2019-01-21 08:57:28 -05:00
fabrixxm 89eaf508f1 Catch HTTPExceptions in App::runFrontend() 
Set correct http response header, display error message using "404.tpl"
 2019-01-21 08:49:17 -05:00
fabrixxm b96dbcd4cb Move Photo module, update Photo model 2019-01-21 08:40:47 -05:00
Unknown 5db9d2fe66 Some more alignation 2019-01-21 08:40:46 -05:00
Unknown bc553a2c49 Translated string will never match what's saved in DB if not english 
Rare jongens die Amerikanen ;)
 2019-01-21 08:40:46 -05:00
Unknown c44ca31aec Why got this even approved? 2019-01-21 08:40:46 -05:00
Unknown 24dbb69421 Added EMPTY key + updated to hypolite's suggestions 2019-01-21 08:40:45 -05:00
Jeroen De Meerleer 4d81158dd1 Translated gender etc. in profile view 2019-01-21 08:40:45 -05:00
Jeroen De Meerleer 1d8c64cfec Added original keys to maritial status 2019-01-21 08:40:44 -05:00
Jeroen De Meerleer b70d762574 Added original keys to sexual preference 2019-01-21 08:40:43 -05:00
Jeroen De Meerleer ab49a613c9 Added original keys to gender 2019-01-21 08:40:43 -05:00
Michael 70c183b495 AP Bugfix: We hadn't transmitted an tag url at all ... 2019-01-20 23:13:55 +00:00
Michael e2427eb9da We only need to fetch the content once 2019-01-20 22:56:33 +00:00
Michael 9e7c59481f Improved ID detection 2019-01-20 22:19:53 +00:00
Michael e5d694f7fa AP: Only reshare stuff that is AP content 2019-01-20 21:52:43 +00:00
Hypolite Petovan 89cb1b276d Move rawContent before theme initialization 2019-01-19 22:03:49 -05:00
Hypolite Petovan af7b852d04 Insert theme init after module init but before post/content 2019-01-19 21:52:43 -05:00
Tobias Diekershoff 892a395eb7
Merge pull request #6471 from annando/ap-bcc 
Transmit via BCC if contact is hidden, don't store announces
 2019-01-19 18:23:44 +01:00
Michael 809e556009 Transmit via BCC if contact is hidden, don't store announces 2019-01-19 16:44:15 +00:00
Hypolite Petovan 6aebece494
Merge pull request #6470 from rabuzarus/20190118_-_some_more_magic_links 
use magic links for common/all friends and the directory
 2019-01-19 10:06:35 -05:00
rabuzarus 7b78ba3929 Bugfix - use magicLinks also for common/all friends and the directory 2019-01-19 15:12:46 +01:00
Michael 103b92fc48 Avoid that forum posts are received via the Diaspora protocol first 2019-01-19 12:30:16 +00:00
Michael 2a0e18c7dd Bugfix: Theme functions hadn't been executed anymore 2019-01-18 20:08:35 +00:00
rabuzarus 528d175baa Bugfix - provide magic links for remote user in magicLink() 2019-01-18 17:50:21 +01:00
Michael c8bfa0c661 Bugfix: Private posts of contacts hadn't been displayed on the contact's page 2019-01-18 06:22:15 +00:00
Hypolite Petovan 9efe140b54
Merge pull request #6460 from annando/relaying 
Simplyfies AP relaying, fixes relaying of public contacts
 2019-01-17 19:09:33 -05:00
Michael d813d72b1a Simplyfies AP relaying, fixes relaying of public contacts 2019-01-17 23:06:27 +00:00
Tobias Diekershoff 09a44b3039
Merge pull request #6456 from annando/long-url 
This fixes a problem when the URL is too long
 2019-01-17 07:44:15 +01:00
Michael 98d44ce7c7 The "]" had been at the wrong place 2019-01-17 05:32:06 +00:00
Michael ce37e981cb This fixes a problem when the URL is too long 2019-01-16 22:34:57 +00:00
Michael fe0339dabe Fixing a bug, adding some logging 2019-01-16 22:19:41 +00:00
Michael c359c162a7 Issue 6282: Update the contact data regularly (including the network) 2019-01-16 21:39:56 +00:00
Michael ae2a8b796c Avoid a notice in HTTP signature check, preparation for authentication 2019-01-15 06:31:12 +00:00
Michael 9bec202232 Adding the date to signed get requests as well 2019-01-14 16:33:23 +00:00
Michael 2f2184cf12 Date check added for HTTP signatures 2019-01-14 16:03:13 +00:00
Hypolite Petovan 90e25faf44
Merge pull request #6447 from annando/peertube 
Enable communication with Peertube
 2019-01-14 08:40:42 -05:00
Hypolite Petovan 990bbea19d
Merge pull request #6446 from annando/approve 
Now storing the "manually approve" data / fix update routine
 2019-01-14 08:38:08 -05:00
Michael aa4aaf1971 Enable communication with Peertube 2019-01-14 12:10:11 +00:00
Michael 5554448162 Now storing the "manually approve" data / fix update routine 2019-01-14 06:36:08 +00:00
Hypolite Petovan 795268eb7a Fix undefined offset notices in Protocol\Email 2019-01-14 00:05:51 -05:00
Michael c1dec50248 Avoiding some notices 2019-01-13 18:03:13 +00:00
Michael 8b5b66838d Issue 6438: Avoid fatal error 2019-01-13 16:00:27 +00:00
Hypolite Petovan 72516191ef
Merge pull request #6435 from annando/nextcloud 
Making Friendica compatible to Nextcloud Social
 2019-01-13 07:57:37 -05:00
Michael 236c7718d3 Fixing some notice again 2019-01-13 09:44:04 +00:00
Michael d113ccd93c Making Friendica compatible to Nextcloud Social 2019-01-13 09:38:01 +00:00
Michael 297a549590 Issue 6282: Update the forum status of contacts 2019-01-12 16:09:27 +00:00
Hypolite Petovan c4038e7af1
Merge pull request #6432 from annando/deleted-pending 
Don't show deleted contacts, changed "pending" behaviour
 2019-01-12 09:08:31 -05:00
Michael 28f14c7d60 Don't show deleted contacts, changed "pending" behaviour 2019-01-12 13:28:14 +00:00
Michael Vogel 2fbf1d54e2
Merge pull request #6428 from MrPetovan/bug/5148-get-cookies-from-safari-2 
Add variable query parameter to stylesheet URL for iOS Safari
 2019-01-12 09:33:35 +01:00
Michael Vogel cd3ab5ddc9
Merge pull request #6426 from MrPetovan/bug/6425-fix-infinite-scroll-url 
Fix infinite scroll base URL
 2019-01-12 09:25:06 +01:00
Hypolite Petovan a9b8eb4d56 Refactor Theme::getStylesheetPath to return faster if theme style.php doesn't exist 2019-01-12 02:26:16 -05:00
Hypolite Petovan abf20368b0 Rework Profile::getThemeUid to ignore query parameter and include $a->profile_uid 
- Use new version in frio default.php file
- Use new version in Theme::getStylesheetPath
 2019-01-12 02:23:01 -05:00
Hypolite Petovan 6d1bc974a0 Add time parameter for iOS Safari to stylesheet URL 2019-01-11 20:49:16 -05:00
Hypolite Petovan f6092ebebb Add App->mobileDetect property 2019-01-11 20:48:29 -05:00
Hypolite Petovan ffcd9fb78d
Revert "Change stylesheet path name for mobile browsers" 2019-01-11 20:01:42 -05:00
Hypolite Petovan c5632a061f Fix output of Pager->getBaseQueryString 2019-01-11 19:30:33 -05:00
Hypolite Petovan eaea24f98b Remove Pager->ensureQueryParameter 2019-01-11 19:29:55 -05:00
Hypolite Petovan ec8b313c2d Replace Pager->ensureQueryParameter by Strings::ensureQueryParameter 2019-01-11 19:29:39 -05:00
Hypolite Petovan a20fa6a3a9 Add ensureQueryParameter method to Util\Strings 2019-01-11 19:27:56 -05:00
Michael e3576fa0bd Don't accept private answers to public parents 2019-01-10 22:51:03 +00:00
Tobias Diekershoff 59f701d5a9
Merge pull request #6419 from annando/unfollow 
Unfollow should now work with Pleroma again
 2019-01-10 11:08:23 +01:00
Tobias Diekershoff 6bc865ff4d
Merge pull request #6356 from MrPetovan/task/6355-add-password-rules 
Add password rules
 2019-01-10 10:37:32 +01:00
Michael 1a702359f1 Unfollow should now work with Pleroma again 2019-01-10 07:24:12 +00:00
Hypolite Petovan cd48b7a68e
Merge pull request #6415 from annando/pending 
Don't show deleted contacts, set new AP contacts as "pending" until accepted
 2019-01-09 18:40:30 -05:00
Michael defc89fa9a Fixing the Accepting of contact requests 2019-01-09 22:30:26 +00:00
Michael Vogel 4f5fb40202
Merge pull request #6414 from MrPetovan/bug/4609-add-support-hubzilla-forum-link 
Add support for Hubzilla forum mentions (starting with !)
 2019-01-09 20:25:28 +01:00
Michael 6ae6a8a983 Don't show deleted contacts, set new AP contacts as "pending" until they are accepted 2019-01-09 13:23:11 +00:00
Hypolite Petovan b7b7b1b664 Add support for Hubzilla forum mentions (starting with !) 2019-01-08 20:56:01 -05:00
Hypolite Petovan 3b80f335fa
Merge pull request #6412 from annando/issue-6149 
Issue 6149: Making OWA (hopefully) compatible with Hubzilla
 2019-01-08 09:17:05 -05:00
Michael 8c6df8f156 Issue 6149: Making OWA (hopefully) compatible with Hubzilla 2019-01-08 11:17:05 +00:00
Hypolite Petovan e447375cdd
Merge branch '2019.01-rc' into bug/6334-escape-get-app 2019-01-06 16:38:48 -05:00
Hypolite Petovan 4bf2701912
Merge pull request #6400 from annando/issue-6394 
Issue 6394: The contact location has to be BBEncoded
 2019-01-06 16:37:43 -05:00
Michael 7e19506435 Issue 6394: The contact location has to be BBEncoded 2019-01-06 21:04:10 +00:00
Michael Vogel b7bf335e94
Merge pull request #6380 from MrPetovan/bug/5148-get-cookies-from-safari 
Change stylesheet path name for mobile browsers
 2019-01-06 20:37:33 +01:00
Michael 9a4fc0f8bd Issue 6347: Removing the old way to fetch Diaspora posts to avoid Hubzilla problems 2019-01-06 07:43:11 +00:00
Michael 3022abe74c Reset the "forum" and "prv" field 2019-01-05 23:02:58 +00:00
Michael e88734e218 Periodically update contacts / update the contact type 2019-01-05 22:04:32 +00:00
Hypolite Petovan cb635fb3cb Change stylesheet path name for mobile browsers 2019-01-04 20:18:31 -05:00
Hypolite Petovan fc87c51bb4
Merge pull request #6377 from annando/ostatus-notice 
Prevent a notice ... again
 2019-01-04 11:28:31 -05:00
Michael d8d5031935 Prevent a notice ... again 2019-01-04 15:34:53 +00:00
Hypolite Petovan 5e1ceb57de Escape global namespaced get_app() calls 
- Add deprecated status
 2019-01-03 21:27:36 -05:00
Hypolite Petovan e86b8ef782 Use nickname instead of email for Login Name 2019-01-03 20:42:29 -05:00
rabuzarus 67a8f9dbd4 Bugfix - the remote user also has magicLinks again 2019-01-02 17:47:53 +01:00
Hypolite Petovan 61664ee659 Update usages of User::updatePassword 
- Add password rules in mod/settings display
 2019-01-01 01:15:52 -05:00
Hypolite Petovan 58adb5b431 Add password checks in User::updatePassword 2019-01-01 01:15:51 -05:00
Hypolite Petovan 909c9d0309 Increase auto-generated passwords to 12 chars + leading capital 2019-01-01 01:14:45 -05:00
Hypolite Petovan 961f737f36 Use User::updatePasswordHashed directly when re-hashing a password 2019-01-01 01:14:44 -05:00
Tobias Diekershoff e7ee3d7200
Merge pull request #6345 from MrPetovan/bug/6283-clear-message-notifications 
Clear private message notifications
 2018-12-31 08:21:55 +01:00
Tobias Diekershoff 034d0f650b
Merge pull request #6340 from MrPetovan/bug/1495-fix-admin-theme-settings 
Fix site theme settings modal form
 2018-12-30 10:35:44 +01:00
Hypolite Petovan 3095d4aa70 Add parent to private message notifications 
- Fix item id for Diaspora private message notification
 2018-12-30 01:10:10 -05:00
Hypolite Petovan 5abc22f6c5 Replace q() with DBA methods, fix code style 
- Remove unused variables
- Fix doc block
- Fix indentation
 2018-12-30 01:08:51 -05:00
Hypolite Petovan 979230da27 Allow theme setting in module 
- Restore theme name caching
 2018-12-29 15:40:04 -05:00
Hypolite Petovan 166b8ad440
Merge pull request #6342 from annando/notices 
Warning and notice fixed
 2018-12-29 12:16:37 -05:00
Tobias Diekershoff 7efde8e334
Merge pull request #6209 from MrPetovan/task/move-config-to-php-array 
Remove util/ folder
 2018-12-29 11:43:55 +01:00
Michael fd6c64f9c1 Warning and notice fixed 2018-12-29 09:53:31 +00:00
Hypolite Petovan 37c7a18d00 Replace latin-1 by latin1 in charset detection 
- Simplify conditional for charset conversion
 2018-12-29 00:43:00 -05:00
Michael Vogel 94eca77041
Merge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile 
Rework mod/match and mod/msearch
 2018-12-27 18:04:06 +01:00
Hypolite Petovan fabc90e9dd
Merge branch '2018.12-rc' into task/move-config-to-php-array 2018-12-27 01:47:53 -05:00
Hypolite Petovan 620395378e Normalize uses of Strings::formatNetworkName to $network_link 
- Unescape HTML template variable $network_link
 2018-12-26 11:11:38 -05:00
Hypolite Petovan 5b74f066f2 Fix formatting in Util\Strings 2018-12-26 11:02:50 -05:00
Michael f274357ad6 Issue-6329: Prevent double encoding 2018-12-26 11:21:42 +00:00
Hypolite Petovan 761e94d134 Remove redundant htmlentities/htmlspecialchars 2018-12-25 11:37:57 -05:00
Hypolite Petovan 56d612b2f0
Merge pull request #6323 from annando/issue-6316 
Issue 6316: Do not double encode / Avoid notice
 2018-12-25 11:26:54 -05:00
Michael ccb9be8f28 Issue 6316: Do not double encode / Avoid notice 2018-12-25 12:12:59 +00:00
Hypolite Petovan a8b0aa8c8d Normalize expected format for event fields summary, desc and location 
- Remove unnecessary HTML escaping on event submit
- Add HTML escaping on event display
- Add HTML to BBCode conversion for received ActivityPub events
 2018-12-24 23:00:35 -05:00
Hypolite Petovan c9c9fc3a96 Code cleanup in events 
- Replace killme() with exit()
- Use correctly escaped query string
- Simplify perms2str input filtering
- Add expected json header to /events/json
 2018-12-24 23:00:35 -05:00
Hypolite Petovan acaee626f5 Remove include/ requires that are now done directly from Composer 2018-12-24 09:56:25 -05:00
Michael c43bd890a5 The "Follow" activity shouldn't be send to Diaspora 2018-12-24 14:50:21 +00:00
Hypolite Petovan 1938ec3ebe Rework mod/match 
- Replace classic pager with a start index
- Remove q() calls
- Ensure template is still loaded even with no results.
- Improve Minimal Pager display of next link
 2018-12-24 00:56:14 -05:00
Hypolite Petovan a16e8d97f6
Merge pull request #6312 from annando/check-json 
Checks if JSON is enabled
 2018-12-23 18:53:32 -05:00
Hypolite Petovan d53ff9c34d Add support for FULLTEXT indices in Database\DBStructure 2018-12-23 15:40:49 -05:00
Hypolite Petovan 48a356dba2 Fix formatting in Database\DBStructure 2018-12-23 15:32:23 -05:00
Hypolite Petovan 2af0542eaa
Merge pull request #6310 from annando/issue-6122 
Handles issue 6122 - the self contact will be updated when invalid
 2018-12-22 18:15:02 -05:00
Michael 732308ce6d Hopefully this fixes the tests again 2018-12-22 22:04:47 +00:00
Michael 439afc89b6 Checks if JSON is enabled 2018-12-22 20:40:00 +00:00
Michael faa30adf68 Handles issue 6122 - the self contact will be updated when it seems to be invalid 2018-12-22 20:12:32 +00:00
Michael c06f7ad11e The curl result is an object, not an array 2018-12-22 17:00:28 +00:00
Jeroen De Meerleer 2d9f4b560f Too fast 2018-12-22 17:23:18 +01:00
Jeroen De Meerleer 27eddfee27 Fixed bug 
$curlResult is not an array
 2018-12-22 17:19:34 +01:00
Hypolite Petovan 21a055f670
Merge branch '2018.12-rc' into task/6208-escape-html-true 2018-12-18 08:36:36 -05:00
Hypolite Petovan f413abb82b
Merge pull request #6277 from annando/nextcloud-ap 
Fix ActivityPub with Nextcloud
 2018-12-17 15:28:22 -05:00
Michael c485ca6f06 Fix ActivityPub with Nextcloud 2018-12-17 20:13:56 +00:00
Hypolite Petovan faff105f86
Fix feed display in browser when using emojis 2018-12-16 22:58:43 -05:00
Hypolite Petovan 6d90d35d25 Enable Smarty default HTML escaping 2018-12-16 22:38:30 -05:00
Hypolite Petovan 38109665c7 Various improvements/fixes 
- Fix potential missing variable
- Improve replaceMacros doc
- Fix CSS value in smoothly
 2018-12-16 22:38:30 -05:00
Hypolite Petovan b6e1571b1e Fix various notices 2018-12-15 04:32:47 -05:00
Hypolite Petovan 607f7daf51 Add PHP 5 compatible recursive dirname() 2018-12-15 02:46:08 -05:00
Michael b08e5ab41b Issue 6259: Suppress contact group widget only on network page 2018-12-14 06:33:57 +00:00
Hypolite Petovan 5a802bc474
Merge pull request #6261 from annando/fix-magic 
Fix for magic auth
 2018-12-13 17:03:44 -05:00
Michael 9ea0864394 Some added to-do 2018-12-13 21:41:19 +00:00
Michael 705211100b Fix for magic auth 2018-12-13 21:19:57 +00:00
Michael Vogel e2f1fd1efb
Merge pull request #6256 from MrPetovan/bug/6255-hide-connect-remote 
Add check for relationship with remote user for connect display
 2018-12-13 22:18:24 +01:00
Hypolite Petovan 7c11194a2c Use Contact::isFollower instead 2018-12-13 11:53:15 -05:00
Hypolite Petovan 096093766a Add check for relationship with remote user for connect display 2018-12-12 22:22:43 -05:00
Michael cced018825 Possibly fix a memory issue with large posts 2018-12-11 18:48:33 +00:00
Michael f2e2066d33 Non public content is now displayed again to visitors. 2018-12-09 13:09:49 +00:00
Michael 8fbe0d46e9 Fix for remote authentication when visiting contact's pages 2018-12-08 20:28:01 +00:00
Michael a041c7c0fa Issue 6236: Handle account removal messages with very low priority 2018-12-06 10:04:16 +00:00
Michael d52d4ca355 Avoids the notice "array_merge(): Argument #1 is not an array" 2018-12-05 06:01:58 +00:00
Michael 95c150ef28 Added to-do 2018-12-04 14:20:25 +00:00
Michael 5c20f21dd8 Improved fallback when the probing fails 2018-12-04 14:17:55 +00:00
Michael 491fc5f78a Issue 6168: "redir" now mostly use OWA 2018-12-04 07:12:55 +00:00
Hypolite Petovan 89f5a9c550
Merge pull request #6231 from annando/notice 
Fix for notice
 2018-12-03 15:08:36 -05:00
Michael 6733b77b73 Make it simpler 2018-12-03 19:29:06 +00:00
Michael d76003797a Fix for notice 2018-12-03 16:32:03 +00:00
Michael fb68b50139 Fix for exceptions on external redirects 2018-12-03 15:59:53 +00:00
Hypolite Petovan bfe809f60d
Merge pull request #6229 from annando/issue-5911 
Issue 5911: Fix for fetching the correct user
 2018-12-03 07:40:14 -05:00
Michael 51bce11b69 Issue 5911: Fix for fetching the correct user 2018-12-03 06:16:25 +00:00
Hypolite Petovan f7c9ed5108 Add DB connection status check in Update::check 2018-12-02 20:57:41 -05:00
Hypolite Petovan 3a9db3f637
Merge pull request #6222 from annando/long-uri 
Avoid problems with too long URI (should only happen with some RSS feeds)
 2018-12-02 19:18:45 -05:00
Hypolite Petovan 57695d48b4
Merge pull request #6223 from annando/ap-dba-error 
Fix for "Unknown column 'guid' in 'field list'"
 2018-12-02 19:18:36 -05:00
Hypolite Petovan 69a73678eb
Merge pull request #6226 from annando/oembed-array 
Ignoring OEmbed array values
 2018-12-02 19:16:13 -05:00
Michael 58b614bea1 Ignoring OEmbed array values 2018-12-02 21:36:46 +00:00
Hypolite Petovan c5558cc459
Merge pull request #6224 from annando/dba-delete-contact 
Avoid duplicated contacts, improve contact deletion, avoid memory issues
 2018-12-02 16:16:59 -05:00
Hypolite Petovan 5e60fa8210
Merge pull request #6225 from annando/http-error 
Using the standard function to return http errors
 2018-12-02 16:15:04 -05:00
Michael 649228cd3d More detailled HTTP error explanations 2018-12-02 20:10:53 +00:00
Michael 066a040cc7 Avoid duplicated contacts, improve contact deletion, avoid memory issues 2018-12-02 16:25:25 +00:00
Hypolite Petovan 924869ab5b
Merge branch 'develop' into bug/6211-fix-contact-nets-all 2018-12-02 10:24:50 -05:00
Michael 2fd65503da Avoid database error that the field "guid" is not present in the contact table 2018-12-02 15:01:08 +00:00
Michael 3d14977b73 Avoid problems with too long URI (should only happen some RSS feeds) 2018-12-02 14:49:28 +00:00
Michael Vogel 5a3991d4f7
Merge pull request #6219 from MrPetovan/task/remove-x 
Remove x()
 2018-12-01 23:40:51 +01:00
Hypolite Petovan f9f4afa35c
Merge pull request #6220 from AndyHee/patch20181129 
Fixing permanent deletion counter
 2018-12-01 08:19:38 -05:00
AndyHee 14b4fac818 Fixing permanent deletion counter 2018-12-01 13:21:54 +07:00
Hypolite Petovan 458981f75c Replace x() by isset(), !empty() or defaults() 
- Remove extraneous parentheses around empty() calls
- Remove duplicate calls to intval(), count() or strlen() after empty()
- Replace ternary operators outputting binary value with empty() return value
- Rewrite defaults() without x()
 2018-11-30 09:06:22 -05:00
Michael 4a1f9a9bdd Improved url detection for redirects 2018-11-30 11:27:17 +00:00
Hypolite Petovan 663ba65f17 Remove "all" value for nets parameter 2018-11-30 05:43:07 -05:00
Hypolite Petovan 11a0dd4d4c Remove util directory 2018-11-28 23:10:21 -05:00
Hypolite Petovan e02295e8e8 Move testargs to bin 2018-11-28 23:10:05 -05:00
Hypolite Petovan 9102a37b37 Move master translation file away from util 
- Rewrite translation documentation
- Delete unused util/strings.php
- Updated references to util/messages.po and util/strings.php
 2018-11-28 22:57:55 -05:00
Jonny Tischbein f0d290eb18 Fix Term exists check on link which isn't stored for hashtags anymore to check on term. 2018-11-27 22:54:16 +01:00
Michael Vogel ea4e772b1e
Merge pull request #6199 from MrPetovan/task/move-config-to-php-array 
Move config to PHP array
 2018-11-26 23:57:56 +01:00
Michael 4f9f86e310 We are now escaping many template fields 2018-11-25 18:56:26 +00:00
Hypolite Petovan c964e193b9 Replace *.ini.php by *.config.php in comments 2018-11-25 01:44:51 -05:00
Hypolite Petovan 98d90e131d Update install to generate config/local.config.php 2018-11-25 01:44:09 -05:00
Hypolite Petovan d6eb1135e5 Add support for PHP array config files 
- Add new base config files
- Remove useless DIRECTORY_SEPARATOR instances
 2018-11-25 01:42:05 -05:00
Hypolite Petovan 6eb6cc94c7 Move config/dbstructure.php to config/dbstructure.config.php 2018-11-25 01:14:44 -05:00
Hypolite Petovan 92556e5161 Fix user account removal expiration delay 2018-11-24 20:59:18 -05:00
Hypolite Petovan 54f4ac6ae0 Remove redirection from User::remove 2018-11-24 20:58:41 -05:00
Hypolite Petovan 0dd120bb06 Normalize quotes in User::remove 2018-11-24 20:58:11 -05:00