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

5215 Commits

Author SHA1 Message Date
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