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

5375 Commits

Author SHA1 Message Date
Hypolite Petovan c23d1b2776 Urlencode /network file parameter 2018-11-23 10:02:30 -05:00
Hypolite Petovan 9774fd8be9 Remove unused parameter $save in HTML::search 
- Remove unused variables in saved_search()
 2018-11-23 09:53:14 -05:00
Hypolite Petovan 8d7fb35463 Prevent fatal error when $friends isn't an array 2018-11-22 19:03:24 -05:00
Hypolite Petovan 03c5c7ca0a Fix formatting in mod/ostatus_subscribe 2018-11-22 19:03:02 -05:00
Hypolite Petovan 81f89ccae8 Remove stored URL from hashtag terms 2018-11-22 09:33:42 -05:00
Hypolite Petovan 4874f7f8ab Remove useless rawurlencode calls for building hashtag bbcode 
- Fix some formatting
 2018-11-22 09:32:41 -05:00
Hypolite Petovan d71e856535 Replace remaining occurrences of "0001-01-01" with DBA::NULL_DATE 2018-11-21 23:53:45 -05:00
Hypolite Petovan c91a87bc07 Fix typo in comment in mod/redir 2018-11-21 22:27:57 -05:00
Hypolite Petovan 20e7e7e3ac Add new REGISTER_INVITATION value to mod/friendica output 2018-11-21 22:27:50 -05:00
Hypolite Petovan 2ef23300a3
Merge pull request #6179 from Alkarex/sql-distinct-fix 
Fix SQL grammar error: ORDER BY clause is not in SELECT
 2018-11-21 08:07:33 -05:00
Alexandre Alapetite a1238d03a6 Fix SQL grammar error: ORDER BY clause is not in SELECT 
```
2018-11-21T08:31:28Z@e3393hprfvfqnblturqp56rjnp [Info]:DBA.php:557:p
DB Error 3065: Expression #1 of ORDER BY clause is not in SELECT list,
references column 'friendica.item.created' which is not in SELECT list;
this is incompatible with DISTINCT
q, profile_content, update_profile_content,
LegacyModule::runModuleFunction, LegacyModule::content, call_user_func,
App::runFrontend
SELECT DISTINCT(`parent-uri`) AS `uri` FROM `item` INNER JOIN `contact`
ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND
NOT `contact`.`pending` WHERE `item`.`uid` = 1 AND `item`.`visible` AND
(NOT `item`.`deleted` OR `item`.`gravity` = 3) AND NOT
`item`.`moderated` AND `item`.`wall` AND `item`.`unseen` ORDER BY
`item`.`created` DESC
```
 2018-11-21 09:57:34 +01:00
Michael 85529ed8ff "viewcontacts" hadn't displayed the AP contacts 2018-11-21 08:50:43 +00:00
Michael d89e3f4264 To safe or not so save, that is the question 2018-11-19 16:36:31 +00:00
Michael b486e48cd6 14 days 2018-11-19 10:02:44 +00:00
Michael ad3502078f Merge remote-tracking branch 'upstream/develop' into dbclean 2018-11-19 10:01:09 +00:00
Michael 191c1a400a The expiry of conversations can now be configured in the admin panel 2018-11-19 06:58:46 +00:00
Michael 43079bfaf8 Several default features are now in the core 2018-11-18 20:13:46 +00:00
Jonny Tischbein 7c690c93bb Fix setting permisson as post for uploaded photo in album via modal create post 2018-11-17 19:14:59 +01:00
Hypolite Petovan 22fedc9a1a
Merge pull request #6152 from JonnyTischbein/issue_delete_from_saved_folder 
Fix deleting last element and displaying empty saved folder
 2018-11-17 11:59:24 -05:00
Jonny Tischbein 590fbe8c6f More Code Standard 2018-11-17 17:27:12 +01:00
Jonny Tischbein 4f8e50d834 Code Standard 2018-11-17 17:24:30 +01:00
fabrixxm 1e9e06a325 Use appropriate redirect in dfrn_poll 
Got an error while remote auth to a local user, where $destination_url
is relative.
 2018-11-17 16:12:45 +01:00
Jonny Tischbein 56406b9910 Fix SQL Error if no items where found + Fix setting to null 2018-11-17 13:22:32 +01:00
Jonny Tischbein 52eb2281e4 Fix deleting last element from saved folder + Fix displaying empty saved folder 2018-11-17 12:41:00 +01:00
Alexandre Alapetite b190c2e9c7 Title difference for two different ATOM feeds 
Fix for
https://github.com/friendica/friendica/issues/6128#issuecomment-439016471
 2018-11-17 00:05:13 +01:00
Alexandre Alapetite 51f0d52100 WebSub fixes 
More fixes related to https://github.com/friendica/friendica/issues/6128
* Bug when using direct ATOM URL, which ends with .atom after nick name
* Bug when callback URL already has some ?query=parameters (which is
quite usual)
Slight refactoring
 2018-11-15 12:54:04 +01:00
Tobias Diekershoff b0d8a2fcd0
Merge pull request #6127 from annando/notice 
Avoid "Cannot modify header information - headers already sent"
 2018-11-14 10:20:47 +01:00
Hypolite Petovan 6996a172e8
Merge pull request #6130 from annando/develop 
Issue 6128: Websub could work now
 2018-11-13 18:46:17 -05:00
Michael a5ddaa9dbc Issue 6128: Websub could work now 2018-11-13 22:23:16 +00:00
Hypolite Petovan d697dbd794
Convert remaining instances of "contacts" in mod/follow 2018-11-13 16:02:33 -05:00
Hypolite Petovan 537164fd02
Convert remaining instances of "contacts" in mod/unfollow 2018-11-13 16:01:01 -05:00
Michael 83ae873646 Avoid "Cannot modify header information - headers already sent" 2018-11-13 20:20:54 +00:00
Tobias Diekershoff 320c986e05
Merge pull request #6121 from annando/hide 
Don't suggest hidden contacts / Added AP to the suggestions
 2018-11-13 09:39:58 +01:00
Michael edc6ba976d Output all technical fields - even for hidden contacts 2018-11-13 07:09:14 +00:00
Michael b5fa518998 Don't suggest hidden contacts / Added AP to the suggestions 2018-11-13 05:52:21 +00:00
Michael cc0904eb77 Issue 6032: Avoid fatal error 2018-11-12 19:10:40 +00:00
Michael de0ddfa0d8 Fix wromg server detecting / improved Pleroma version numbers 2018-11-11 21:54:50 +00:00
Steffen K9 de759e41c5
Missing use for Strings 
In line 72 'Strings::' is used but the 'use Friendica\Util\Strings' was missing.
 2018-11-11 01:14:50 +01:00
Hypolite Petovan 7242b706f0 Improve return path in mod/follow 2018-11-10 08:24:31 -05:00
Adam Magness 218f0734be Rename removeTags to escapeTags 
rename function and update calls.
 2018-11-09 13:29:42 -05:00
Adam Magness 063f0e9cb0 Rename escapeTags to escapeHtml 
rename function and update calls.
 2018-11-09 13:27:58 -05:00
Adam Magness b5a97c1abe Move getTags to BBCode 
move getTags function to BBCode class and update calls.
 2018-11-09 13:24:19 -05:00
Adam Magness e4354a0d7b Update and Remove isValidEmail 
change function calls, and remove unneeded function.
 2018-11-09 13:18:42 -05:00
Adam Magness ffc406d819 normalise_link calls 
implement normaliseLink function
 2018-11-08 11:28:29 -05:00
Adam Magness 5276c28a78 link_compare calls 
implement compareLink function.
 2018-11-08 10:46:50 -05:00
Adam Magness 6fc9c6de3b base64url calls 
implement base64UrlEncode and base64UrlDecode functions
 2018-11-08 10:37:08 -05:00
Adam Magness 0efcbe5d15 protect_sprintf calls 
implement protectSprintf function
 2018-11-08 10:30:45 -05:00
Adam Magness 46d7767fd0 formatBytes calls 
implement function in new class
 2018-11-08 10:28:49 -05:00
Adam Magness b73af72deb deindent calls 
implement function in new class
 2018-11-08 10:26:49 -05:00
Adam Magness 916b3e551e format_network_name calls 
implement formatNetworkName function
 2018-11-08 10:24:47 -05:00
Adam Magness b99925060a autoname calls 
implement getRandomName function
 2018-11-08 10:22:20 -05:00
Adam Magness 0e01568ccd escape_tags calls 
implement escapeTags function
 2018-11-08 10:20:03 -05:00
Adam Magness a0f65ca7a1 notags calls 
implement removeTags function
 2018-11-08 10:14:37 -05:00
Adam Magness 991f259ecb random_string calls 
implement getRandomHex function
 2018-11-08 08:45:46 -05:00
Adam Magness e537f7d017 Function calls 
update function calls to new class
 2018-11-06 21:16:27 -05:00
Jonny Tischbein 93d50af700 move live update: update_contacts to update_contact 2018-11-06 22:22:42 +01:00
Hypolite Petovan dc669fa736
Merge pull request #6090 from zeroadam/TextToL10n 
Split functions to L10n
 2018-11-06 13:44:30 -05:00
Hypolite Petovan dd35cd0701
Merge pull request #6086 from friendica/fabrixxm-patch-1 
Fix Friendica node info json
 2018-11-06 10:48:00 -05:00
fabrixxm 0441a169a9 Fix code style 2018-11-06 16:37:58 +01:00
Adam Magness 352da9bcf3 Update function calls 
update function calls for moved functions
 2018-11-06 09:52:58 -05:00
fabrixxm 56484eaaeb
Fix Friendica node info json 
And stop worker sending warning from PortableContacts.php
 2018-11-06 10:07:22 +01:00
Adam Magness a71eb1d127 functions moved to HTML class 
update function calls to moved class.
 2018-11-05 21:06:26 -05:00
Philipp Holzer 6e10bdf361
Move random Digits to Crypto class 2018-11-05 21:02:54 +01:00
Hypolite Petovan 0472c7b57d
Merge pull request #6070 from zeroadam/TextToXML 
split xml functions out of text.php
 2018-11-05 13:50:09 -05:00
Hypolite Petovan 81e81bd8c8
Merge pull request #6079 from annando/issue-dir-15 
Directory issue 15: Support the "account-type"
 2018-11-05 13:49:28 -05:00
Michael b011e42ad2 Issue 6074: Language and "explicit" are now exported 2018-11-05 18:14:58 +00:00
Adam Magness 9e51be7554 Revert "Update function calls" 
This reverts commit 748fb8b946.
 2018-11-05 13:07:07 -05:00
Michael 9d63c3eb01 Language is now transmitted as well 2018-11-05 18:03:26 +00:00
Michael 58ce0d799b Directory issue 15: Support the "account-type" 2018-11-05 17:59:46 +00:00
Adam Magness 748fb8b946 Update function calls 
update function calls to new class
 2018-11-05 07:40:18 -05:00
Adam Magness b07d47b0f7 Update function calls 
update function calls to new names
 2018-11-05 07:24:14 -05:00
Adam Magness 61bc9facc8 Implement functions 
implement functions relocated to xml class
 2018-11-05 07:24:14 -05:00
Michael 1b43d459b6 Fix for delivering forum posts again 2018-11-01 23:52:06 +00:00
Jonny Tischbein 6b43174a74 Fix for vier theme / NonAjax Call 2018-10-31 20:09:44 +01:00
Jonny Tischbein b66bcb20da Redirect to previous page after NON-AJAX Post delete via second parameter in /item/drop 2018-10-31 20:09:44 +01:00
Hypolite Petovan 7d5494dd67
Merge pull request #6055 from zeroadam/FileTagHotFix 
Misspelling in use statement
 2018-10-31 13:57:33 -04:00
Hypolite Petovan 8a46c786f3
Merge pull request #6053 from zeroadam/CoreRenderer 
Core Renderer Class
 2018-10-31 13:57:12 -04:00
Adam Magness a09273802e Misspelling in use statement 
misspelled Friendica
 2018-10-31 13:42:38 -04:00
Adam Magness 70f01d6c00 Template Engine and props to Renderer 
move methods and props from App to Renderer
 2018-10-31 13:25:38 -04:00
Adam Magness 35abc4bb64 get markup template 
implement getMarkupTemplate function
 2018-10-31 10:44:06 -04:00
Adam Magness 91facd2d0a replace macros 
implement new replaceMacros function
 2018-10-31 10:35:50 -04:00
Philipp Holzer 87f3fe24f7
Moving UPDATE defines/constants out of boot 2018-10-31 14:44:23 +01:00
Philipp Holzer 4ae985e5ed
Setting update version & time on success 2018-10-31 14:44:23 +01:00
Philipp Holzer 26aee23254
Replacing dbupdate_ in admin.php and removing it from Worker\DBUpdate 2018-10-31 14:44:22 +01:00
Adam Magness d9b558a8ed Update function calls 
update function calls to new class.
 2018-10-30 14:51:45 -04:00
Adam Magness 50da89d861 Logger Levels 
update logger levels in calls
 2018-10-30 09:58:45 -04:00
Adam Magness 14fde5dc9b Log function 
implement log() function.
 2018-10-30 09:57:14 -04:00
Hypolite Petovan f7147fae96
Merge pull request #6041 from nupplaphil/install_to_module 
Install to Module
 2018-10-30 08:17:26 -04:00
Michael 84be62982a Diaspora signature transport via AP/DFRN should be repaired now 2018-10-29 21:15:37 +00:00
Philipp Holzer abb50fbf62
Install to Module 
- Move Install to Module
- Some Bugfixings
 2018-10-29 14:10:45 +01:00
Hypolite Petovan 933f43218a
Merge pull request #6037 from annando/ap-signatures 
Diaspora signatures are now stored and transmitted correctly
 2018-10-27 13:49:19 -04:00
Michael 4831688dc0 Diaspora signatures are now stored and transmitted correctly 2018-10-27 14:35:22 +00:00
Hypolite Petovan de6b640483
Remove extra use statement in mod/item 
Fix #6036
 2018-10-27 09:54:38 -04:00
Michael 73f596cc46 Fixes duplicated transmissions and not working undo of like/dislike 2018-10-27 11:09:23 +00:00
Jonny Tischbein deed949ff0 Code Standards: var name, spaces, array_push short form 2018-10-26 00:18:47 +02:00
Jonny Tischbein 6bab8f1a43 Fix ? 2018-10-25 21:57:11 +02:00
Jonny Tischbein 581d1b9c9e Code Standards: Spaces 2018-10-25 21:49:18 +02:00
Jonny Tischbein ea36f85457 Code Standard: indent 2018-10-25 21:47:10 +02:00
Jonny Tischbein b03050c339 Replace update/delete with Term::insertFramTagFieldByItemId + Code Standards + Wording 2018-10-25 21:47:10 +02:00
Jonny Tischbein e022bac339 Code Standard + renaming deleteAllTags + move its call and add type param 2018-10-25 21:47:10 +02:00
Jonny Tischbein 26ed71cc14 Only perform Term::deleteAllTags when needed + not needed redirect 2018-10-25 21:47:10 +02:00
Jonny Tischbein 272eb5eb82 fix doxygen header + indent 2018-10-25 21:47:10 +02:00
Jonny Tischbein 1689c44085 Fix goaway call 2018-10-25 21:47:10 +02:00
Jonny Tischbein fd2e06781d Fix adding / removing photo tags + tagrm delete via GET + Item::update / add Term::deleteAllTags 2018-10-25 21:47:10 +02:00
Hypolite Petovan dde8d8976d Fix usages of Pager with JSON calls in mod/match and mod/dirfind 2018-10-25 00:07:16 -04:00
Hypolite Petovan 74e80f137b Update Pager->__construct calls for minimal use cases 2018-10-25 00:07:16 -04:00
Hypolite Petovan 7c0b591043 Move itemCount parameter from constructor to renderFull() 
- Remove Pager->itemCount property and Pager->setItemCount() method
- Update usage
 2018-10-25 00:07:16 -04:00
Hypolite Petovan 14237a9599 Move $pager and $page_offset out of App 
- Move infinite scroll data output in a module hook
- Use Pager instead of paginate() and alt_pager()
 2018-10-25 00:07:15 -04:00
Philipp Holzer 99a33b7335
Code standards 2018-10-24 20:44:19 +02:00
Philipp Holzer 48535c0959
Bugfixing redirects 
- Adding App->redirect if both redirects are possible
 2018-10-24 20:18:46 +02:00
Hypolite Petovan 9c9ebfc7c9
Merge pull request #6013 from JonnyTischbein/issue_comment_media_link_prompt 
[frio] Add media / link prompt in comments
 2018-10-24 12:17:58 -04:00
Jonny Tischbein d2b5f77be9 Add multimedia link for jot + enables hover text in jot + autosize in when paste link + renaming / Code Standards 2018-10-24 16:20:10 +02:00
Michael 95dc030926 Show deferred worker tasks in the admin interface and workerqueue logs 2018-10-23 20:38:28 +00:00
Jonny Tischbein d0c43c5597 Add prompt for link and media in comment + remove video symbol 2018-10-23 19:50:19 +02:00
vinzv cb75c40f4e adapted profile pic resize to 300px for whole system 2018-10-23 16:36:57 +02:00
vinzv 95f9337e0e adapted 300px image size for default avatar 2018-10-23 15:16:58 +02:00
vinzv cbc898d902 raising profile photo size to comply with frio sidebar profile photo 
skaling
 2018-10-23 14:30:21 +02:00
Philipp Holzer 9e322d2565
Fixing absolute/relative path 2018-10-23 12:14:17 +02:00
Hypolite Petovan fdbf244945
Adding missing parentheses in mod/dfrn_poll 2018-10-22 22:44:17 -04:00
Hypolite Petovan e511790d62 Move NULL_DATE from boot.php to DBA::NULL_DATETIME 
- Add DBA::NULL_DATE constant
 2018-10-22 16:50:55 -04:00
Hypolite Petovan ca9cad3491 Move hook-related methods from Core\Addon to Core\Hook 2018-10-22 16:50:54 -04:00
Michael Vogel c0abff0bda
Merge pull request #5990 from MrPetovan/task/move-apps-out-of-app 
Road to Router Part 4: Move $apps out of App
 2018-10-22 22:47:22 +02:00
Philipp Holzer 32af52842b
adding defaults in mod/redir.php 2018-10-22 22:13:41 +02:00
Philipp Holzer 363d00cc45
Adding $a->getBaseURL for Worker in profile_photo 
Adding a TODO for Contact::magicLink
 2018-10-22 22:13:39 +02:00
Philipp Holzer 95f3c3eca0
replaced a relative url with path 2018-10-22 22:13:38 +02:00
Philipp Holzer 722a86a7ca
replaced onerror_url with onerror_path 2018-10-22 22:13:38 +02:00
Philipp Holzer d51e931db7
replaced forwardurl with forward_path 2018-10-22 22:13:37 +02:00
Philipp Holzer 3edad1591e
replaced $return_url to $return_path to make it more clear that it is a relative path to the Friendica baseurl 2018-10-22 22:13:37 +02:00
Philipp Holzer d00ddc01af
Split goaway to System::externalRedirectTo() and App->internalRedirect() 2018-10-22 22:13:35 +02:00
Philipp Holzer 2ef81108b3
Renamed System::redirect() to $a->redirect() 2018-10-22 22:13:22 +02:00
Benjamin Lorteau 339a5da946 Move $apps out of App 
- Move $nav_sel out of App
- Add new Content\Nav::getAppMenu() method
 2018-10-22 16:02:15 -04:00
Hypolite Petovan c6f0bea51d Move $strings from App to Core\L10n 
- Add L10n::init() call in App constructor
- Improve pushLang/popLang
- Remove no longer needed references to App
 2018-10-22 15:58:42 -04:00
Philipp Holzer 4392858662
Move Global Functions - Part 3 
- Replaced every CACHE definition
- Moved check_url to App->checkURL()
- Removed unused definition "ZCURL_TIMEOUT"
 2018-10-20 18:19:55 +02:00
Hypolite Petovan ed52b5d0a9
Remove reference to deleted include/security in mod/pubsub 2018-10-19 15:12:53 -04:00
Hypolite Petovan ec0d3a6eac
Merge pull request #5946 from JonnyTischbein/move_include_security 
Move and Split include/security
 2018-10-19 08:55:08 -04:00
Jonny Tischbein cafd5ca781 update function names in logger and comments 2018-10-19 10:03:52 +02:00
Michael 4ae37c6196 Merge remote-tracking branch 'upstream/develop' into item-thread 2018-10-19 03:19:34 +00:00
Hypolite Petovan 6d5b2c484d Replace remaining instances of "contacts/" 2018-10-18 07:48:34 -04: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 0c0e17b7a7 Remove unneeded Util/Security includings + Resolve including merge conflict with develop 2018-10-17 21:52:08 +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
Jonny Tischbein 3065d1c40a Add Link promt in comment + only add URL instead of attachement via parse_url 2018-10-17 21:05:45 +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
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
Jonny Tischbein 05be2db725 Move include/security tp /src/Core/Authentication and /src/Util/Security 2018-10-17 14:19:58 +02:00
Hypolite Petovan 45748da8a1 Remove network exception in handle_tag 2018-10-17 01:11:50 -04:00
Hypolite Petovan c4318fe05e Fix notices in Parse URL feature 2018-10-16 18:27:13 -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 d71327e311 Fix namespace usage in mod/group 2018-10-15 18:35:36 -04: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
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 ea8b159df4 Fix wrong use statement in mod/update_contacts 2018-10-14 23:09:11 -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 d54e56c659 Fix batch action query + Fix Namespace import 2018-10-14 21:14:32 +02:00
Jonny Tischbein 5fd4402074 code standards + fixing navigation links to /contact/... 2018-10-14 20:03:22 +02: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 7f143c3159 Fix various spelling mistakes 2018-10-14 11:32:54 -04:00
Hypolite Petovan 0563a28438 Replace System::baseUrl() by App->getBaseURL() in mod/register 
- Remove redundant System::baseUrl() in goaway() calls
- Add more generic Friendica\Model use statement
- Allow empty path in goaway()
 2018-10-14 11:19:59 -04:00
Hypolite Petovan f7c020af04 Add HTML result boxes to mod/babel 2018-10-14 07:44:07 -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
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 aab4fa0c31 The instrument is now added, updating AP contacts is now enabled 2018-10-13 20:36:44 +00:00
Philipp Holzer 059bd1307f
rename argv to getArgumentValue 2018-10-13 19:05:54 +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
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
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
Tobias Diekershoff 14e7686df4
Merge pull request #5899 from annando/avoid-flooding 
Avoid beeing flooded by invalid requests
 2018-10-13 08:41:32 +02:00
Michael b6f2144237 Avoid beeing flooded by invalid requests 2018-10-13 04:31:37 +00:00
Jonny Tischbein 93ab82b7f0 Rename Contacts:content function 2018-10-11 23:45:01 +02:00
Jonny Tischbein 80ea86113d Move mod Contacts to /src/Module 2018-10-11 23:14:12 +02:00
Hypolite Petovan a419eff23a Replace missing App->getURLPath in mod/install 2018-10-11 08:49:52 -04: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
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
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 307286fc47
parameters and getURLpath to getURLPath 2018-10-10 01:18:47 +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
Jonny Tischbein 29033bdf05 goaway to network if deleted item + remove goaway for filerm 2018-10-09 20:44:30 +02:00
Jonny Tischbein d8780b1640 Replace goaway location SESSION var return_url with page as string value 2018-10-09 20:10:34 +02: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 f8b74033a4 Avoid a notice 2018-10-06 18:44:42 +00:00
Hypolite Petovan 58c6ef2bc0
Merge pull request #5841 from JonnyTischbein/issue_profile_edit_sexual_marital 
Fix (short) profile editing showing 'e' for martial and sexual preferences
 2018-10-06 07:13:04 -04:00
Jonny Tischbein 17019772a4 Fix (short) profile editing showing 'e' for martial and sexual preference 2018-10-06 11:37:15 +02:00
Michael 09302367d5 Include AP in the contact search 2018-10-06 03:17:44 +00:00
Jonny Tischbein faa86aa2c0 fix indent with tabs 2018-10-04 21:38:44 +02:00
Jonny Tischbein 07489a3a9c Install: After detecting DB already in use, go back to db_stettings with error 2018-10-04 18:53:52 +02:00
Michael 78a7e130ae Another renamed function 2018-10-03 15:50:21 +00:00
Michael 8841519c0d Renamed functions 2018-10-03 15:41:51 +00:00
Michael 3ab837f3c7 Functionality is now split 2018-10-03 09:15:38 +00:00
Hypolite Petovan 1f7cb530c7
Merge pull request #5812 from annando/develop 
Issue 5811: "objects" instead of "object"
 2018-10-02 22:11:28 -04:00
Michael 518d461a8f Issue 5811: "objects" instead of "object" 2018-10-02 20:12:38 +00:00
Hypolite Petovan 406b46b635
Merge pull request #5800 from JonnyTischbein/issue_return_path 
Update return path former via $_SESSION['return_url']
 2018-10-02 12:30:38 -04:00
Jonny Tischbein 6d1b98dc0e wrong var name - conversation not found 2018-10-02 18:24:16 +02:00
Jonny Tischbein ecb67cfcb4 syntax typo 2018-10-02 18:22:23 +02:00
Jonny Tischbein fa3bbc5f45 Code Standards + return path for \!local_user() and cancel 2018-10-02 18:13:58 +02:00
Hypolite Petovan 505350c9fb
Merge pull request #5794 from annando/ap1 
ActivityPub support
 2018-10-02 11:24:04 -04:00
Jonny Tischbein 9915523490 mod/message return to conversation if message deleted 2018-10-02 13:16:43 +02:00
Michael 7e9499ac13 AP contacts are now tagged upon commenting 2018-10-01 21:09:08 +00:00
Michael Vogel 103535d620
Merge pull request #5773 from MrPetovan/task/rewrite-js-hooks 
Rewrite JS hooks
 2018-10-01 17:10:30 +00:00
Michael 93ccca5807 AP hast to be enabled here as well 2018-09-30 21:23:40 +00:00
Jonny Tischbein 57fe36e9a3 replace session return url by static pages 2018-09-30 19:26:29 +02:00
Jonny Tischbein 0a699be3c0 replace session return url by static pages 2018-09-30 19:03:05 +02:00
Michael 761bdafa34 Correct content type 2018-09-30 14:13:07 +00:00
Michael cb44aa83c7 Object instead of Display 2018-09-30 12:21:57 +00:00
Jonny Tischbein 1803862fc5 associative array + adding mysql value + removing table header 2018-09-27 19:46:28 +02:00
Jonny Tischbein 24117c24ce Get PHP Configuration for upload limit and display in /admin summary site 2018-09-27 18:53:16 +02:00
Michael cb9be8a7ab UUID is now createUUID 2018-09-27 11:52:15 +00:00
Michael 60b0759b50 UUID instead of GUID 2018-09-26 20:03:46 +00:00
Michael 834422d52f Merge remote-tracking branch 'upstream/develop' into ap1 2018-09-24 21:48:40 +00:00
Hypolite Petovan a6996601d5
Merge pull request #5789 from friendica/master 
Update develop from master-2019.09
 2018-09-23 18:55:20 -04:00
Michael 8c7e5bb776 all endpoints are now working 2018-09-23 17:29:31 +00:00
Michael 6df6d82427 We can now like and dislike 2018-09-23 08:52:07 +00:00
Michael a56565fa99 AP is enabled for all users 2018-09-22 23:49:27 +00:00
Michael c083ae047c Merge remote-tracking branch 'upstream/2018.08-rc' into ap1 2018-09-22 15:18:53 +00:00
Hypolite Petovan 1eaa523e61 Remove unused App->page['end'] 
- Remove unused empty templates
 2018-09-20 21:02:28 -04:00
Hypolite Petovan 8dc5b04be7
Merge pull request #5776 from annando/fix-contact 
Fix: Update routine for conversations in contacts was missing
 2018-09-20 10:10:45 -04:00
Jonny Tischbein 0f63a62761 fix return fallback to SESSION Variable 2018-09-20 15:55:24 +02:00
Michael 58d43ad576 Fix: Update routine for conversations in contacts was missing 2018-09-20 12:44:40 +00:00
Jonny Tischbein 58f26d195f adjust argc check in mod/editpost + relative path in mod/message 2018-09-20 14:41:52 +02:00
Jonny Tischbein 807ad14521 calculate form return_url for post and message instead of using SESSION var 2018-09-19 23:55:29 +02:00
Michael Vogel bd0515714c
Merge pull request #5765 from MrPetovan/bug/php7-remove-pear-text_highlighter 
[php7] Remove PHP code highlighting
 2018-09-18 18:34:46 +00:00
Hypolite Petovan d6985baaed Improve mod/babel 
- Handle multiple line endings
- Conserve HTML special chars in input box on submit
- Add new result panel with HTML::toMarkdown result
 2018-09-17 23:18:34 -04:00
Michael f772ece86f New delivery module for ap 2018-09-17 21:13:08 +00:00
Hypolite Petovan c4ea3bfb3e
Merge pull request #5728 from rabuzarus/20180905_-_fix_lockview 
lockview - prevent notices
 2018-09-16 23:02:23 -04:00
Michael 699a4140f9 Now sending does finally work - and some AP standards are improved as well 2018-09-16 20:12:48 +00:00
Michael e4d28629e4 First posting tests 2018-09-16 17:47:00 +00:00
Hypolite Petovan 87c425e388 Improve whitespace display in mod/babel 
- Add a couple more result panels for Markdown input
- Remove \x28/\x29 parentheses encoding
- Convert remaining double quotes
 2018-09-16 09:07:17 -04:00
Michael 6f3b2b6586 Handling of unlisted posts, better uid detection 2018-09-16 09:06:09 +00:00
Michael 2eabe45a8e Contact reject does work now as well 2018-09-15 22:25:58 +00:00
Michael e45206ae5d Merge remote-tracking branch 'upstream/2018.08-rc' into ap1 2018-09-15 20:49:46 +00:00
Michael 86bd283705 The whole contact handling does work now, yeah ... 2018-09-15 20:31:05 +00:00
Michael 6a8ebc8639 Contact follow and unfollow workd partially 2018-09-15 18:54:45 +00:00
Michael 61e2c7d20d Added AP to many network conditions / enabling inbox processing 2018-09-14 16:51:32 +00:00
Michael 8c00e88f79 The endless saga of the fight against notices continues 2018-09-13 21:11:52 +00:00
Hypolite Petovan 70c94abd8e
Merge pull request #5759 from annando/issue-5733 
Issue 5733: Removing contacts does work now on the same machine as well
 2018-09-12 19:40:03 -04:00
Michael c4825a8b53 Fixing parentheses 2018-09-12 18:49:36 +00:00
Michael 7daa46503d Don't risk incompatibilities 2018-09-12 06:13:04 +00:00
Michael 96d10c25e3 Issue 5733: Removing contacts does work now on the same machine as well 2018-09-12 06:05:14 +00:00
Hypolite Petovan 7529fc61dd Fix introductions notifications links 2018-09-11 19:54:45 -04:00
Michael 1afa6523bc Adding (temporary) calls to AP in existing stuff 2018-09-11 07:07:56 +00:00
Michael 8b96a53fba Burn notices, burn 2018-09-11 04:10:11 +00:00
Hypolite Petovan e461474290 Fix count being called on the wrong variable in mod/notes 2018-09-09 18:34:05 -04:00
Hypolite Petovan 071aff223a Format source of mod/events 2018-09-09 09:51:59 -04:00
Michael d581318c7c Notices come, notices go ... 2018-09-09 06:32:01 +00:00
Benjamin Lorteau 71215115eb Restore template choice by notification label 2018-09-07 11:15:23 -04:00
Tobias Diekershoff 55f72b5767
Merge pull request #5743 from MrPetovan/bug/fix-empty-notifications 
Fix empty notifications
 2018-09-07 07:33:47 +02:00
Hypolite Petovan 480d792356
Merge pull request #5732 from annando/fix-picture-posts 
Fix: Posts with pictures will now look good again on connector networks
 2018-09-06 19:00:44 -04:00
Hypolite Petovan f85af78097 Source format mod/notifications 
- Add array alignment
- Convert remaining double quotes to quotes
- Replace x() with defaults()
- Add missing spaces
 2018-09-06 18:55:06 -04:00
Hypolite Petovan 2f7ba13702 Restore display when there aren't unread notifications 2018-09-06 18:42:57 -04:00
Michael 6113fdc940 Issue 5733: Changing relationship values does work now again with DFRN 2018-09-06 09:20:45 +00:00
Michael 04fb885857 Fix: Posts with pictures will now look good again on connector networks 2018-09-06 04:24:34 +00:00
rabuzarus 1fe1628237 lockview - prevent notices 2018-09-05 18:44:47 +02:00
rabuzarus bd9d102da2 apply coding standards to lockview module 2018-09-05 14:24:51 +02:00
rabuzarus 88d25f977a fix lockview for photos 
- use the private field only for items because other tables than the item table don't have the private field
 2018-09-05 14:12:56 +02:00
Tobias Diekershoff 31cbc80981
Merge pull request #5722 from annando/dissolve 
Restore the behaviour to remove the remote contact upon termination
 2018-09-05 08:23:41 +02:00
Michael Vogel d7bb671b77
Merge pull request #5720 from MrPetovan/bug/fix-unfollow 
Remove extraneous SQL condition part in mod/unfollow
 2018-09-05 05:42:00 +00:00
Michael 9ef1d827f3 Restore the behaviour to remove the remote contact upon termination 2018-09-05 05:02:06 +00:00
Hypolite Petovan 9de0d35450 Remove extraneous SQL condition part in mod/unfollow 2018-09-04 19:29:36 -04:00
Hypolite Petovan 59d06b6c78
Merge pull request #5719 from annando/notices-yeah 
Good news, everyone - again somce notices removed
 2018-09-04 19:09:11 -04:00
Michael 635c8d7450 Beautified the code 2018-09-04 21:24:30 +00:00
Michael 821429fdf1 Good news, everyone - again somce notices removed 2018-09-04 17:48:09 +00:00
Hypolite Petovan 475d3f8f3a Fix formatting in mod/parse_url 2018-09-02 17:24:56 -04:00
Michael 58148905f1 Changed documention 2018-09-02 17:48:07 +00:00
Tobias Diekershoff d5a3b0bd5e
Merge pull request #5710 from annando/fix-api 
Fix for timeout issues when posting to the API
 2018-09-02 14:52:09 +02:00
Michael 703c668a37 More notices ... 2018-09-02 08:01:13 +00:00
Michael 4bb45f611f Fix for timeout issues when posting to the API 2018-09-02 07:20:04 +00:00
Michael Vogel 196ef0111c
Merge pull request #5704 from MrPetovan/bug/fix-unfollow 
Fix unfollow sharing-only contacts (except connector protocols)
 2018-08-31 15:40:51 +00:00
Benjamin Lorteau 76b40cf05e Use User::getOwnerDataById in mod/unfollow 2018-08-31 11:22:51 -04:00
Michael 380eeaab88 Still there had been notices - must have a good camouflage 2018-08-31 05:08:22 +00:00
Hypolite Petovan e25c579c76 Add Protocol::NATIVE_SUPPORT constant usage to mod/contacts 2018-08-30 21:03:57 -04:00
Hypolite Petovan 92c4ca0911 Prevent unfollowing contacts from networks not supported natively 2018-08-30 17:53:23 -04:00
Hypolite Petovan 55c676d8b0 Source cleaning mod/unfollow.php 
- Normalize quotes
- Remove unneeded EOL
- Use DBA method where tasteful
 2018-08-30 08:54:12 -04:00
Hypolite Petovan b81eaec885 Enable unfollowing contacts from all networks (but Statusnet) 2018-08-30 08:52:15 -04:00
Hypolite Petovan e480da788e Fix unfollow for sharing-only contacts 
- Add removal when unfollowing sharing-only contacts
 2018-08-30 08:28:10 -04:00
Michael Vogel c7f8f190b9 Oh no, even more notices ... (#5697) 2018-08-29 14:28:13 -04:00
Michael 47ca5bbf71 Use item class instead of direct call 2018-08-28 20:44:39 +00:00
Michael Vogel 99b8f85624 Poke is fixed (#5689) 
* Fix: Poke hasn't worked. It does work now partially

* Poke are now displayed good again

* removed code
 2018-08-28 15:38:28 -04:00
Michael Vogel 91a3bf5610 Fix: The profile page is now ordered after the creation date again (#5690) 2018-08-28 14:15:25 -04:00
Michael Vogel f7953a2b02 Issue 1490: User import is now only possible on open sites or via an administrator. (#5680) 2018-08-27 07:55:08 -04:00
Philipp 2838e4ebaf Automatic Install Tests & Doku (#5674) 
* Automatic Installation Testing
- New dev-library "mikey179/vfsStream"
- created "reload" method for App-Reloads
- ConsoleTest now using virtual directory
- Adding Automatic Installation Tests
- Fixing some probable install-failures

* Updating README for Automatic Installation

* Updating README for Automatic Installation

* Bugfix normal installation

* Fixing copying of config files
 2018-08-27 00:15:55 -04:00
Michael 4406677576 Issue 5670: Jump to the unassigned contacts as a starting point for group edit 2018-08-26 08:24:45 +00:00
Michael Vogel 3d5ac950e3 Issue 5660: Check if .well-known is reachable (#5661) 
* Issue 5660: Check if .well-known is reachable

* Fixes ".."

* Some text correction

* Some more correction

* Anf again some changed text :-)
 2018-08-25 18:31:22 -04:00
Michael Vogel 3b50e94a1a Issue 5320: Deleting of events returned a wrong message (#5663) 
* Issue 5320: Deleting of events returned a wrong message

* Remove unneeded variable
 2018-08-25 17:38:54 -04:00
Michael Vogel edcd0a3744 Issue 4960: Ignoring and blocking of contacts should work again (#5657) 
* Issue 4960: Ignoring and blocking of contacts should work again

* Renamed functions

* This function should be renamed as well.

* We now have a frontend to block and ignore public contacts

* Hide some parts for public contacts

* Removed notices, public contact is now accessible from dirfind as well

* We now show contact conversations and contact posts

* We now use a new conversation mode

* The update functionality is disabled until it will work completely

* Fixing tabs chaos

* Update after posts on the contacts page will now work

* Show connect link
 2018-08-25 09:48:00 -04:00
Tobias Diekershoff 6a549d4cfb
Merge pull request #5659 from annando/notices-oh-no 
Oh no ... there are still some notices that want to be removed ...
 2018-08-24 14:46:21 +02:00
Michael 82d097879b Oh no ... there are still some notices that want to be removed ... 2018-08-24 11:09:58 +00:00
Roland Häder 61693419e8 Cleanups: isResult() more used, readability improved (#5608) 
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?

* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
  BadMethodCallException in SPL)

* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.

* Ops, one more left ...

* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'

* Added empty lines for better readability

* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)

* Re-fixed DBM -> DBA switch

* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability

* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class

* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)

* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"

* Ops, one still there (return is no function)

* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
  functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
  will do this for us
- renamed those proxy_*() functions to better names:
  + proxy_init()           -> Proxy::init()         (public)
  + proxy_url()            -> Proxy::proxifyUrl()   (public)
  + proxy_parse_html()     -> Proxy::proxifyHtml()  (public)
  + proxy_is_local_image() -> Proxy::isLocalImage() (private)
  + proxy_parse_query()    -> Proxy::parseQuery()   (private)
  + proxy_img_cb()         -> Proxy::replaceUrl()   (private)

* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes

* Ops, need to set $a here ...

* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule

* Ops, no need for own instance of $a when self::getApp() is around.

* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
  methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module

* No instances from utility classes

* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`

* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.

* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.

* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.

* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...

* Ops, was added accidentally ...

* Ops, why these wrong moves?

* Ops, one to much (thanks to MrPetovan)

* Ops, wrong moving ...

* moved back to original place ...

* spaces added

* empty lines add for better readability.

* convertered spaces -> tab for code indenting.

* CR request: Add space between if and brace.

* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
 2018-08-24 01:05:49 -04:00
rabuzarus 1eb147cb48 fix redirection - don't dfrn auth when contact is still pending (#5648) 2018-08-21 23:58:09 -04:00
Michael Vogel e20ea092d2 You can now filter the community page by account types (#5649) 
* You can now filter the community page by account types

* Better use "null"
 2018-08-21 17:39:49 +02:00
Tobias Diekershoff 578549df13
Merge pull request #5646 from annando/notes 
The notes are now fetching their content from a central function
 2018-08-21 17:36:15 +02:00
Michael Vogel 54aee2aaa7 Removed notices that revealed themselfes over night ... (#5645) 
* Removed notices that revealed themselfes over night ...

* And more notices removed that occured over night

* One more ..

* Some more notices of the day ...
 2018-08-21 17:35:09 +02:00
Michael 1fb5925073 The notes are now fetching their content from a central function 2018-08-21 07:35:22 +00:00
Michael Vogel d9b44153da The content generation for the display page is now using a centralized function (#5642) 
* The content generation for the display page is now using a centralized function

* Small correction to avoid notices
 2018-08-20 16:32:55 -04:00