Commit graph

5643 commits

Author SHA1 Message Date
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
edc6ba976d Output all technical fields - even for hidden contacts 2018-11-13 07:09:14 +00:00
b5fa518998 Don't suggest hidden contacts / Added AP to the suggestions 2018-11-13 05:52:21 +00:00
cc0904eb77 Issue 6032: Avoid fatal error 2018-11-12 19:10:40 +00:00
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
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
dc669fa736
Merge pull request #6090 from zeroadam/TextToL10n
Split functions to L10n
2018-11-06 13:44:30 -05:00
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
6e10bdf361
Move random Digits to Crypto class 2018-11-05 21:02:54 +01:00
0472c7b57d
Merge pull request #6070 from zeroadam/TextToXML
split xml functions out of text.php
2018-11-05 13:50:09 -05:00
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
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
9d63c3eb01 Language is now transmitted as well 2018-11-05 18:03:26 +00:00
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
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
7d5494dd67
Merge pull request #6055 from zeroadam/FileTagHotFix
Misspelling in use statement
2018-10-31 13:57:33 -04:00
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
87f3fe24f7
Moving UPDATE defines/constants out of boot 2018-10-31 14:44:23 +01:00
4ae985e5ed
Setting update version & time on success 2018-10-31 14:44:23 +01:00
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
f7147fae96
Merge pull request #6041 from nupplaphil/install_to_module
Install to Module
2018-10-30 08:17:26 -04:00
84be62982a Diaspora signature transport via AP/DFRN should be repaired now 2018-10-29 21:15:37 +00:00
abb50fbf62
Install to Module
- Move Install to Module
- Some Bugfixings
2018-10-29 14:10:45 +01:00
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
4831688dc0 Diaspora signatures are now stored and transmitted correctly 2018-10-27 14:35:22 +00:00
de6b640483
Remove extra use statement in mod/item
Fix #6036
2018-10-27 09:54:38 -04:00
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
dde8d8976d Fix usages of Pager with JSON calls in mod/match and mod/dirfind 2018-10-25 00:07:16 -04:00
74e80f137b Update Pager->__construct calls for minimal use cases 2018-10-25 00:07:16 -04:00
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
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
99a33b7335
Code standards 2018-10-24 20:44:19 +02:00
48535c0959
Bugfixing redirects
- Adding App->redirect if both redirects are possible
2018-10-24 20:18:46 +02:00
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
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
cb75c40f4e adapted profile pic resize to 300px for whole system 2018-10-23 16:36:57 +02:00
95f9337e0e adapted 300px image size for default avatar 2018-10-23 15:16:58 +02:00
cbc898d902 raising profile photo size to comply with frio sidebar profile photo
skaling
2018-10-23 14:30:21 +02:00
9e322d2565
Fixing absolute/relative path 2018-10-23 12:14:17 +02:00
fdbf244945
Adding missing parentheses in mod/dfrn_poll 2018-10-22 22:44:17 -04:00
e511790d62 Move NULL_DATE from boot.php to DBA::NULL_DATETIME
- Add DBA::NULL_DATE constant
2018-10-22 16:50:55 -04:00
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
32af52842b
adding defaults in mod/redir.php 2018-10-22 22:13:41 +02:00
363d00cc45
Adding $a->getBaseURL for Worker in profile_photo
Adding a TODO for Contact::magicLink
2018-10-22 22:13:39 +02:00
95f3c3eca0
replaced a relative url with path 2018-10-22 22:13:38 +02:00
722a86a7ca
replaced onerror_url with onerror_path 2018-10-22 22:13:38 +02:00
d51e931db7
replaced forwardurl with forward_path 2018-10-22 22:13:37 +02:00
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
d00ddc01af
Split goaway to System::externalRedirectTo() and App->internalRedirect() 2018-10-22 22:13:35 +02:00
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
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
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
ed52b5d0a9
Remove reference to deleted include/security in mod/pubsub 2018-10-19 15:12:53 -04:00
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
4ae37c6196 Merge remote-tracking branch 'upstream/develop' into item-thread 2018-10-19 03:19:34 +00:00
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
45748da8a1 Remove network exception in handle_tag 2018-10-17 01:11:50 -04:00
c4318fe05e Fix notices in Parse URL feature 2018-10-16 18:27:13 -04:00
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
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
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
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
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
7f143c3159 Fix various spelling mistakes 2018-10-14 11:32:54 -04:00
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
f7c020af04 Add HTML result boxes to mod/babel 2018-10-14 07:44:07 -04:00
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
db0b848ae3
Merge pull request #5904 from annando/ap-announce
AP: Announce will now work
2018-10-13 20:17:14 -04:00
07da170bcf
Merge pull request #5905 from nupplaphil/move_global_functions
Move global functions
2018-10-13 19:46:57 -04:00
aab4fa0c31 The instrument is now added, updating AP contacts is now enabled 2018-10-13 20:36:44 +00:00
059bd1307f
rename argv to getArgumentValue 2018-10-13 19:05:54 +02:00
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
508032cf9a
Move Module AcctLink 2018-10-13 18:32:14 +02:00
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
14e7686df4
Merge pull request #5899 from annando/avoid-flooding
Avoid beeing flooded by invalid requests
2018-10-13 08:41:32 +02:00
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
a419eff23a Replace missing App->getURLPath in mod/install 2018-10-11 08:49:52 -04:00
ffbc688797
Curl Response Refactoring
- refactored Network::getCurl()
- replaced every Network::getCur() execution with a Curl Response
2018-10-10 21:50:13 +02:00
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
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
307286fc47
parameters and getURLpath to getURLPath 2018-10-10 01:18:47 +02:00
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
f8b74033a4 Avoid a notice 2018-10-06 18:44:42 +00:00
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
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
78a7e130ae Another renamed function 2018-10-03 15:50:21 +00:00
8841519c0d Renamed functions 2018-10-03 15:41:51 +00:00
3ab837f3c7 Functionality is now split 2018-10-03 09:15:38 +00:00
1f7cb530c7
Merge pull request #5812 from annando/develop
Issue 5811: "objects" instead of "object"
2018-10-02 22:11:28 -04:00
518d461a8f Issue 5811: "objects" instead of "object" 2018-10-02 20:12:38 +00:00
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
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
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
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
761bdafa34 Correct content type 2018-09-30 14:13:07 +00:00
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
cb9be8a7ab UUID is now createUUID 2018-09-27 11:52:15 +00:00
60b0759b50 UUID instead of GUID 2018-09-26 20:03:46 +00:00
834422d52f Merge remote-tracking branch 'upstream/develop' into ap1 2018-09-24 21:48:40 +00:00
a6996601d5
Merge pull request #5789 from friendica/master
Update develop from master-2019.09
2018-09-23 18:55:20 -04:00
8c7e5bb776 all endpoints are now working 2018-09-23 17:29:31 +00:00
6df6d82427 We can now like and dislike 2018-09-23 08:52:07 +00:00
a56565fa99 AP is enabled for all users 2018-09-22 23:49:27 +00:00
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
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
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
699a4140f9 Now sending does finally work - and some AP standards are improved as well 2018-09-16 20:12:48 +00:00
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
6f3b2b6586 Handling of unlisted posts, better uid detection 2018-09-16 09:06:09 +00:00
2eabe45a8e Contact reject does work now as well 2018-09-15 22:25:58 +00:00
e45206ae5d Merge remote-tracking branch 'upstream/2018.08-rc' into ap1 2018-09-15 20:49:46 +00:00
86bd283705 The whole contact handling does work now, yeah ... 2018-09-15 20:31:05 +00:00
6a8ebc8639 Contact follow and unfollow workd partially 2018-09-15 18:54:45 +00:00
61e2c7d20d Added AP to many network conditions / enabling inbox processing 2018-09-14 16:51:32 +00:00
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
c4825a8b53 Fixing parentheses 2018-09-12 18:49:36 +00:00
7daa46503d Don't risk incompatibilities 2018-09-12 06:13:04 +00:00
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
1afa6523bc Adding (temporary) calls to AP in existing stuff 2018-09-11 07:07:56 +00:00
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
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
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
6113fdc940 Issue 5733: Changing relationship values does work now again with DFRN 2018-09-06 09:20:45 +00:00
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
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
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
635c8d7450 Beautified the code 2018-09-04 21:24:30 +00:00
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
58148905f1 Changed documention 2018-09-02 17:48:07 +00:00
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
703c668a37 More notices ... 2018-09-02 08:01:13 +00:00
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
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
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
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
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
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
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
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
Philipp
d7395299fb Automatic Installation fix (#5565)
* Automatic Install Config Fix

* new unittest for AutomaticInstallation

* unittest for autoinstall
- removed password check

* removed bak-file

* automatic install
- always save environment variables
- just skip db environment if not `--savedb` is set

* fixed help (options)

* fixed help (options)

* Deleting Auto-Install tests until fix for proper DB restoring
2018-08-20 16:15:39 -04:00
Michael Vogel
409e939fc4 Fix for double $$ (#5641)
* Fix for double $$

* And a second $$
2018-08-20 07:54:26 +02:00
rabuzarus
dd2d680258 Frio: new photos upload template (#5637)
* frio - add missing page template to various photo pages (fix missing background)

* frio - rework photo upload album selection

* frio - rework photo upload button

* frio - fix photo upload button and acl
2018-08-20 00:29:50 -04:00
Michael Vogel
16a081871c Improved profile page, improved "limit" handling (#5639)
* Improved profile page, improved "limit" handling

* Update will now work again

* Update will work now
2018-08-20 06:26:05 +02:00
Michael Vogel
c1da44b7dc We now use a central function to fetch the importer (#5636) 2018-08-19 13:37:56 +00:00
Michael Vogel
7f3fb34c24 Some easy to replace "q" calls have been replaced by "DBA" calls (#5632)
* Some easy to replace "q" calls have been replaced by "DBA" calls

* Simplified the GUID creation

* And one in the API ...

* And OStatus has got some DBA calls more

* Just some more replaced database calls

* The event query is now simplified

* Events are now shown again

* subthread is now using the DBA calls as well

* Some more replaced database calls

* And some more replaced database calls and prevented notices

* Better use gravity

* Some more replaced database stuff

* Some more replaced database calls in DFRN.php

* The gcontact class now has got the new DBA functions as well

* The Contact class is now changed to new database functions as well

* Small correction

* We can now delete without cascade

* One more functionality is safe for future changes
2018-08-19 12:46:10 +00:00
Michael Vogel
ab5cedfa50 placeholder for a funny commit description for removing some more notices (#5631) 2018-08-19 01:52:21 +00:00
Michael Vogel
060e887a31 And still there are notices that have to be removed ... (#5629)
* And still there are notices that have to be removed ...

* Notice removed in ACL part

* Fix missing fields for notifications

* Fixes issue 5630
2018-08-18 08:20:50 +02:00
d5c2c41b02
Merge pull request #5626 from annando/notices-oh-yeah
Removed notices, will it ever end?
2018-08-17 09:33:02 +02:00
Michael Vogel
b6cb83ed4c
Merge pull request #5617 from MrPetovan/task/use-contact-network
Fix bug with ACL and contact network page
2018-08-17 05:31:06 +02:00
0342f9e084 Removed notices, will it ever end? 2018-08-17 03:19:42 +00:00
Michael Vogel
ffd2014257 Fixes the missing refresh after ignoring or unignoring a thread (#5614)
* Fixes the missing refresh after ignoring or unignoring a thread

* Use numeric values to make the JSON output happy
2018-08-15 09:27:11 +00:00
e8334c4655 Use the Item class instead of DBA calls when possible 2018-08-15 04:41:49 +00:00
Hypolite Petovan
ea17370211 Fix bug with ACL and contact network page
- Require user array parameter in ACL::getFullSelectorHTML
- Change all wrong uses where user array was replaced by default
permissions array
2018-08-15 00:43:27 +02:00
Michael Vogel
116bcae6ab Fix: Wrong array element / added logging for DFRN connects (#5609) 2018-08-14 03:15:39 +02:00
Michael Vogel
880b7177c8 And again, and again, and again, ... some more notices removed (#5601)
* And again, and again, and again, ... some more notices removed

* And some more notices ...

* Some more place
2018-08-11 23:05:42 +02:00
Roland Häder
e06fc2aa69 Stopped using deprecated constants NETWORK_* (#5537)
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...

* Removed deprecated NETWORK_* constants as per code reviewer's request.
2018-08-11 22:40:44 +02:00
170dd2a705 Some more removed notices 2018-08-10 19:39:43 +00:00
899e1000af Fix: Prevent threads from being collapsed in network view 2018-08-09 05:40:35 +00:00
2d64378984 And again removed notices 2018-08-09 04:20:31 +00:00
Michael Vogel
276abfaba6 Issue 5158: Ignore all threads, even public ones (#5588)
* Issue 5158: Ignore all threads, even public ones

* Remove some notice

* Now it really should work

* Using "defaults"
2018-08-08 22:32:11 +02:00
Michael Vogel
eaf81e5e66
Merge pull request #5563 from MrPetovan/bug/5470-fix-various-notices
Fix various notices
2018-08-07 21:34:47 +02:00
Michael Vogel
8c2efa6df4 Facebook and App.net is removed from nearly all places (#5581)
* Facebook is removed from nearly all places

* Remove app.net as well - it's dead for some time now
2018-08-07 17:06:51 +02:00
Michael Vogel
d60eb25ba7
Merge pull request #5567 from JeroenED/feature/queues-localtime
Converting timezone in admin queues
2018-08-07 14:19:15 +02:00
Unknown
62e53698df Doing some laundry 2018-08-07 12:25:55 +02:00
Unknown
5c254ee401 Adjusted implementation to a better one (thanks to Michael Vogel) 2018-08-07 10:18:59 +02:00
Michael Vogel
c032011143 Post update script for setting the uri-id (#5573)
* Post update is working now

* Changed text.
2018-08-06 18:40:41 +02:00
Unknown
480d573fc5 converting timezones in php 2018-08-06 12:30:43 +02:00
Unknown
e4049d2793 Converting timezone in admin queues 2018-08-06 09:30:17 +02:00
Hypolite Petovan
d9c6c919e8 Fix missing $prv and $nxt variables in mod/photos 2018-08-05 15:55:57 +02:00
Hypolite Petovan
fb39124301 Fix missing $a->data['user'] in mod/cal 2018-08-05 15:55:11 +02:00
Hypolite Petovan
c13dc549ed Rename PROTOCOL_* constants to Model\Conversation::PARCEL_*
- Remove unused Conversation::PROTOCOL_GS_CONVERSATION constant
- Remove now renamed PROTOCOL_* constant declarations
2018-08-05 12:24:42 +02:00
Michael Vogel
810c108297 Fix: Notes can be posted again. Never use "defaults" with "false" (#5551) 2018-08-04 16:06:36 +02:00
Michael Vogel
65d752d03c Notices what else? (#5545)
* Poco isn't filled, so we cannot store it

* We should initialize our variables
2018-08-02 16:11:21 +02:00
Michael Vogel
c72c64a6d8 Notices again (#5543)
* And again notices

* Notices in the directory

* Much more places

* Fix some double $

* Notice in ping

* Missing field

* Fix: We now remove deleted users from the directory

* Some more stuff

* Notices when removing users

* Added logging

* More logging

* Two more
2018-08-02 07:21:01 +02:00
Michael Vogel
9d0f18c0b3 Yeah, and again notices ... (#5536)
* Yeah, and again notices ...

* And some more

* Block access without given user name

* Reformatting
2018-08-01 07:29:58 +02:00
Michael Vogel
4bd7daa205 Posting to Facebook profiles is deprecated, so we don't show this anymore (#5534) 2018-07-31 18:38:02 +02:00
Michael Vogel
b552b711ee And some more notices removed ... (#5533)
* Fix for vanishing notes

* The field needs to be part of the selected fields ...

* And some more notes ...
2018-07-31 07:54:25 +02:00
Michael Vogel
c39e0dcf2a Fix for vanishing notes (#5531)
* Fix for vanishing notes

* The field needs to be part of the selected fields ...
2018-07-30 22:23:48 -04:00
Roland Häder
4d39164c1e [WIP] Rewrite to Proxy class: (#5507)
* 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)

* 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.
2018-07-30 22:06:22 -04:00
Roland Häder
bf87ad4fcf Fixed E_NOTICE in listing worker queue and new utilities class added (#5521)
* Fixes for E_NOTICE in workqueue:
- introduced class `Friendica\Util\Arrays` which will hold static methods for
  handling arrays that cannot be done with PHP's functions, like implode() on
  multi-dimensional arrays
- rewrote old-school for() loop to foreach()

* Added intial unit test with some tests on empty delimiters and/or sinle and
multi-dim array.

* Added test for for 3-dimensional arrays, thanks to  nupplaphil's feedback.
2018-07-30 21:24:26 -04:00
0257f410d5 mention if a user is blocked in the admin panel user overview 2018-07-30 17:19:22 +02:00
Michael Vogel
1eb8f04274 Fixing SQL error when receiving DFRN posts (#5527)
* Some more notices

* Fixed nasty to find notice in DFRN and OStatus

* And more notices ...

* Yeah, some removed notices ... again ...

* Fixing bad SQL query
2018-07-30 07:06:32 +02:00
Michael Vogel
a2cea16954 Some more notices (#5526)
* Some more notices

* Fixed nasty to find notice in DFRN and OStatus

* And more notices ...

* Yeah, some removed notices ... again ...
2018-07-30 06:41:20 +02:00
dc30daf3a2 And another notice removed 2018-07-29 06:08:02 +00:00
Roland Häder
4a22710b3b Moved global PAGE_* to Profile class (#5500)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class

* Fixed more rewrites from plain (global namespace) PAGE_* to Friendica\Models\Profile class

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

* CR request:
- moved ACCOUNT_TYPE_* constants from boot.php to Contact::ACCOUNT_TYPE_*

* Just copy-pasted this code from boot.php, needs to be changed to `const ACCOUNT_TYPE_FOO = x;`

* Ops, melting brain cells here ... :-/
2018-07-27 19:25:57 -04:00
Michael Vogel
986106a8f7 Item storage: Permissions aren't stored in the items anymore (#5495)
* The permission set is now used for item permissions

* Check for allow_cid, ... is superfluous. Checking for "private" is enough

* We query the permissionset

* Permissions are displayed correctly

* Changed index

* We don't store the permissions in the item table anymore

* Permission fields are now deprecated

* Reversed ...
2018-07-25 19:14:55 -04:00
5738774530 Make profile settings available in the user settings 2018-07-25 09:37:08 +02:00
Roland Häder
1213fce8e5 Fixes/rewrites on videos.php (#5489)
* 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

* CR request:
- removed stray spaces
- added some where they improve readability
2018-07-24 22:54:00 -04:00
Roland Häder
37253656e3 Moved CONTACT_* constants to Friendica\Model\Contact class, lesser in global namespace (#5490)
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class

* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
2018-07-24 22:53:46 -04:00
Roland Häder
cff90e20f2 Removal of x() and added missing columns of contact (#5479)
* Fixes:
- got rid of x() in whole mod/item.php file
- added missing 'prv' and 'forum' columns, maybe one day, let's rewrite this
  again. it is kinda a maintenance nightmare, keeping up with column renames and
  such. Well, for now it should be okay.

* Should be DBA::isResult()
2018-07-24 17:48:47 -04:00
Andreas Neustifter
b6c254eede [frio] Fix profile edit links. [#5474] (#5475) 2018-07-24 10:20:16 -04:00
Roland Häder
a38a842e86 Fixes for E_NOTICE in editpost.php (#5480)
* Added missing columns 'wall' and 'post-type'.

* Convention:
- curly brace after a a method/function declaration belongs to next line
- added space for better readability
2018-07-24 07:47:25 -04:00
Michael Vogel
0e719f5398
Merge pull request #5478 from MrPetovan/task/5410-add-missing-use-statements
Add missing use statements after dbesc conversion
2018-07-24 03:57:20 +02:00
Roland Häder
00595de6a3 Fixes: (#5477)
- use DBA::isResult() and not count()
- fixed 4 E_NOTICE when POST fields are not set
2018-07-23 18:52:48 -04:00
Roland Häder
14a4d5eb59 Avoid no needed call on parse2str() when there is nothing to parse (#5476) 2018-07-23 18:52:07 -04:00
Hypolite Petovan
30fff2077c Ad missing use statements after dbesc conversion 2018-07-23 18:44:05 -04:00
Michael Vogel
413424064c
Merge pull request #5439 from MrPetovan/task/5410-remove-dbesc
Move DBA to src/ part 4.1: Remove dbesc()
2018-07-23 21:51:49 +02:00
Jeroen De Meerleer
d57449623b Added true to json_decode (#5471) 2018-07-23 15:51:08 -04:00
Hypolite Petovan
a6fb3568f9 Rename dbesc to DBA::escape 2018-07-23 15:30:54 -04:00
Hypolite Petovan
aa26943f92 Rename DBA::esc_array to DBA::escapeArray
- Rename internal method DBA::esc_array_callback to
DBA::escapeArrayCallback
2018-07-23 11:04:15 -04:00
Hypolite Petovan
ecea7425f8 Rename DBA::is_result to DBA::isResult 2018-07-23 11:04:14 -04:00
Hypolite Petovan
0ec44f3e8a Rename DBM method calls to DBA method calls 2018-07-23 11:02:24 -04:00
Hypolite Petovan
8ddb94ef06 Use DateTimeFormat::utc() instead of DBM::date() 2018-07-23 10:57:47 -04:00
Michael Vogel
2d0a749734
Merge pull request #5431 from MrPetovan/task/5410-rename-database-methods
Move DBA to src/ part 3.1: Rename DBA methods
2018-07-23 15:18:58 +02:00
Michael Vogel
53876abfda And some more removed notices in the core (#5465) 2018-07-23 07:43:18 -04:00
Roland Häder
ea24ac9d95 Cleaned up: (#5461)
- 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)
2018-07-22 21:19:28 -04:00
Roland Häder
ffc70bee17 Fixes: (#5462)
- fixed E_NOTICE about missing array element "page-flags-raw" (should be
  "page_flags_raw"?)
- same with account-type-raw -> account_type_raw
- added spaces to nicely indent code
2018-07-22 21:17:44 -04:00
Roland Häder
a27ef8d0c9 Prevents 4 E_NOTICEs when POST fields are not set. (#5458)
* Prevents 4 E_NOTICEs when POST fields are not set.

* Don't use x().

* Replaced usage of x() which is deprecated with !isset().

* Use empty() according to MrPetovan
2018-07-22 19:49:16 -04:00
Hypolite Petovan
4db98eb43d Rename DBA::inArray to DBA::toArray 2018-07-22 19:27:35 -04:00
Hypolite Petovan
f051ae1698 Rename DBA::fetch_first to DBA::fetchFirst 2018-07-22 19:27:34 -04:00
Hypolite Petovan
591939dfc0 Rename DBA::database_name to DBA::databaseName 2018-07-22 19:27:34 -04:00
Roland Häder
ad857b4314 Fixed E_NOTICE when no valid result has been returned. (#5457) 2018-07-22 18:05:10 -04:00
Roland Häder
7876d6547b Fixed E_NOTICEs when uploading profile picture (#5456)
* Fixed E_NOTICEs when uploading profile picture.

* Fixed E_NOTICEs when $_POST doesn't contain these fields.
2018-07-22 16:01:14 -04:00
Roland Häder
c17adaf333 Uncommon logger levels in Friendica (#5453)
* "normal" is an uncommon logger level:
- changed LOGGER_NORMAL -> LOGGER_INFO
- added LOGGER_WARNING (a common logger level)

* Used constants instead of values (MrPetovan)
2018-07-22 14:07:44 -04:00
Jeroen De Meerleer
d1d2ee6b2f Added a for-loop (#5442)
* Using json_decode instead of reinventing hot water

Guys, you could have told me ;)

* changed spaces to tabs

* Guess I'll need a beer ;)
2018-07-21 17:29:39 -04:00
Jeroen De Meerleer
ddaeb305bc Worker-details: Using json_decode instead of reinventing hot water (#5441)
* Using json_decode instead of reinventing hot water

Guys, you could have told me ;)

* changed spaces to tabs
2018-07-21 13:24:03 -04:00
Andreas Neustifter
303aef34f0 Make frio more consistent by replacing textual links with icons everywhere. (#5415)
* Make frio more consistent by replacing textual links with icons everywhere I could find them.

* [frio] Move profile add link to icon.
2018-07-21 07:31:05 -04:00
Andreas Neustifter
b26da6096b [frio] Restyle album edit header. (#5426) 2018-07-20 15:23:51 -04:00
Andreas Neustifter
24fc070c5c [frio] Restyle photo upload (#5427)
* Better wording in photo upload.

* [frio] Restyle photo uploader to conform to frio style.
2018-07-20 15:23:12 -04:00
Hypolite Petovan
af6dbc654f Rename Friendica\Database\dba to Friendica\Database\DBA 2018-07-20 08:19:26 -04:00
9a6a3bf1c1 Makes Diaspora working again 2018-07-20 05:10:16 +00:00
Hypolite Petovan
daa1177e3a Update use statement lists with new Friendica\Database\dba class
- Remove unused use statement
- Remove superfluous use statements (classes in the same namespace)
- Add missing use statements
2018-07-19 22:15:21 -04:00
Roland Häder
b2899d76cf Small cleanup (#5416)
- added internal TODO to decide about is_result() usage
- removed semicolon (not needed here) from SQL query
- added empty line

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-19 18:39:05 -04:00
Andreas Neustifter
bc5cf8f3c1 Fix photo-upload and croping. (#5412) 2018-07-19 17:59:18 -04:00
Jeroen De Meerleer
b375370c37 Workerqueue param reformat (#5403)
* Prettified the parameter layout of workerqueue

* Updated to code standards :)

* Where did I go wrong?

* Seems like someone needs to sleep ;)
2018-07-19 09:52:48 -04:00
Michael Vogel
5af9596dde New item field "Post-type" and new table "permissionset" (#5408)
* "post-type" replaces "bookmark" and "type"

* Removed some more type

* Added index to permission set

* The permission set is now stored

* The permission set is now removed upon expiry

* Post update now stores the permission set

* New file

* Permissions are now sorted

* Changed documentation
2018-07-19 09:52:05 -04:00
Roland Häder
b05b96d04a Fixes: (#5404)
- fixed E_NOTICE in mod/follow.php
- fixed 2 E_NOTICE in src/Protocol/Diaspora.php
- added more type-hints for `array` type where known

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-19 07:07:14 -04:00
Roland Häder
346790cbbc According to @annando and @MrPetovan, $emailcc is no item field (column) and (#5401)
should be initialized empty (I did it above the `if()` block).

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-18 17:26:14 -04:00
Jeroen De Meerleer
b265bf2ec3 Prettified the parameter layout of workerqueue (#5397)
* Prettified the parameter layout of workerqueue

* Updated to code standards :)

* Where did I go wrong?
2018-07-18 16:24:35 -04:00
Roland Häder
2c44437d40 Fixed E_NOTICE when no 'term' was provided (#5391)
* Fixed E_NOTICE when no 'term' was provided, maybe better encapsulate this whole
$_GET, $_POST and $_SESSION thing into a `Request` class?

Signed-off-by: Roland Häder <roland@mxchange.org>

* Rewrote to recommendation by @MrPetovan which results in really nicer code.

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-18 15:41:24 -04:00
Michael Vogel
66a103e36a
Merge pull request #5295 from MrPetovan/task/4889-move-config-to-config
Move configuration to config/
2018-07-18 11:04:35 +02:00
Roland Häder
a41e49c84a Fixes for E_NOTICE in mod/item.php (#5393)
* Fixes applied:
- `if (is_array($some_array))` is better code style than `if ($some_array)` as
  the `if()` block really needs an array to be found
- same with `if ($some_id)`, maybe `if ($some_id > 0)` is a more proper check
- added missing field 'emailcc' to Item::ITEM_FIELDLIST

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fixes E_NOTICE of missing variable (PHP's lazyness again).

Signed-off-by: Roland Häder <roland@mxchange.org>

* Use !empty() to avoid accessing empty array.

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-17 18:18:42 -04:00
Hypolite Petovan
dfa461b3bc Improve help/Config page
- Remove obsolete file-only config list
- Fix heading level
- Add transition instruction for $lang
- Add reference to config.ini.php, settings.ini.php and addon.ini.php
- Add link to help page in admin warning about legacy config file
2018-07-17 02:03:39 -04:00
Hypolite Petovan
67dc08d120 Enforce systen.register_policy value type 2018-07-16 19:38:19 -04:00
Hypolite Petovan
b260ca4d1e Fix typo in mod/admin 2018-07-16 19:38:19 -04:00
Hypolite Petovan
796eb1c874 Fix undefined index in mod/settings 2018-07-16 19:38:18 -04:00
Hypolite Petovan
e72ff9ee95 Fix missing use in mod/ping 2018-07-16 19:38:17 -04:00
Hypolite Petovan
39767fb366 Fix undefined index notice messages in mod/install 2018-07-16 19:38:17 -04:00
Hypolite Petovan
820afa2284 Replace global $a with BaseObject::getApp() 2018-07-16 19:38:17 -04:00
Hypolite Petovan
d0780ccf7d Replace global $lang with system.language 2018-07-16 19:38:17 -04:00
Hypolite Petovan
4161908f43 Fix formatting in mod/help 2018-07-16 19:38:17 -04:00
Hypolite Petovan
762a786611 Replace direct accesses to App->config by Config::get/set calls 2018-07-16 19:38:16 -04:00
Hypolite Petovan
4d5b79a9d4 Move forbidden_nicknames default to config file 2018-07-16 19:38:15 -04:00
Hypolite Petovan
2e2930d770 Add addon config hook 2018-07-16 19:38:14 -04:00
Hypolite Petovan
0448ca3897 Update install procedure
- Fix Notice messages in Core\Install and Database\DBStructure
- Move local config file template from htconfig.tpl to local.ini.tpl
- Remove htconfig.php
2018-07-16 19:38:14 -04:00
Hypolite Petovan
e952d6677b Rename App->path to App->urlpath 2018-07-16 19:38:13 -04:00
Hypolite Petovan
2503660f97 Add new INI config files
- Add new local.ini.tpl template
- Change all references from .htconfig.php to config/local.ini.php
2018-07-16 19:38:13 -04:00
92104d7b85
Merge pull request #5384 from annando/item-uri
Fix for missing username in uri for comments to public posts
2018-07-16 06:45:41 +02:00
0e8fa34156 Fix for displaying public items 2018-07-16 04:00:57 +00:00
988a868f90 Fix for missing username in uri for comments to public posts 2018-07-16 03:56:36 +00:00
Michael Vogel
d3a2ed85fe Next item structure works (#5380)
* Use "LEFT JOIN" to always fetch the item. Needed for update routines.

* New conversion routine that now covers every item

* Post update is now activated

* We now use a hash based upon RIPEMD-320 for content and activity

* The hash doesn't contain the plink anymore

* Legacy item fields are now "null"able

* New hash function for a server unique item hash

* Introduction of the legacy mode (usage of old item fields)

* Code simplification

* We don't need the "uri" fields anymore in item-activity and item-content

* Use the "created" and not the "received" date for the hash

* Avoiding several notices

* Some more warnings removed

* Improved uri-hash / Likes on Diaspora are now getting a creation date

* Corrected the post update version

* Ensure an unique uri-hash

* Don't delete orhaned item data at the moment

* Partly reworked, due to strange behaviour

* Some more parts reworked

* Using the uri currently seems to be more reliable

* Using the uri here as well

* Use the hash values again

* Grouped item fields in different categories

* Notices again

* use the gravity (we always should)

* Added hint for disabled post updates

* Notices ...

* Issue #5337: Personal notes are displayed again

* Use the gravity again
2018-07-15 14:36:20 -04:00
Hypolite Petovan
ffc8b2a79a Rework smilies class and module
- Add new replaceFromArray function to enable smilies replacement with
an arbitrary array
- Moved $sample logic from class to module
2018-07-15 08:03:12 -04:00
Jeroen De Meerleer
678efab1c9 Add worker queue details (#5375)
* Added Worker queue page

* Added worker queue template

* Added translation strings

* Added en-US translation

* #TGWHT: Thank god we have Typo

* Where donkey == true

* Added in to menu correctly

* Updated link in summary page

* Updated link on summary page for frio theme

* Updated q() to dba::select()

* Revert "Added translation strings"

This reverts commit f1f3694a2412f69c39559650759b6483013f0f17.

* Revert "Added en-US translation"

This reverts commit 61777489e3add56e81c4f976599d8a2e025265cb.
2018-07-14 14:01:17 -04:00
80ac7da01d admins can mark their nodes for explicit content (#5373)
* added field explicidContent to the metadata in the nodeinfo

* admins can mark their nodes for explicit content

* booleans shall be small
2018-07-14 12:08:06 -04:00
Roland Häder
6b5d90333f Fixes for some E_NOTICE and type-hints added (#5358)
* Fixed http://github to https://github

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fixes for #4965:
- updated messages.po file

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fixed E_NOTICE where isset()/empty() was absent.

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fixed missing variable $sql_order causing E_NOTICE.

Signed-off-by: Roland Häder <roland@mxchange.org>

* Continued:
- added array type-hint where known (some)

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fixes:
- in Profile::load() $user is now only one-dimensional
- $a->get_hostname is no property, it is a method

Signed-off-by: Roland Häder <roland@mxchange.org>

* reverted changes that are unintended

Signed-off-by: Roland Häder <roland@mxchange.org>

* Continued:
- removed leading \ (uncommon, okay)
- removed entire if() block (CR by Hypolite)

Signed-off-by: Roland Häder <roland@mxchange.org>

* Removed if() block

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-13 15:47:14 -04:00
30cef1a739 some plugins left over (#5369)
* tinymce is not used anymore, we can delete the cuson CSS file

* mv the plugins_details template to addon_details

* renamed template called from admin panel

* some CSS classes that should be addon where still plugin

* Insert a warning into the generated quattro CSS files
2018-07-12 13:18:45 -04:00
Michael Vogel
0360f7197a Several more warnings ... (#5340)
* Some more warnings removed

* Even more warnings ...

* Will it ever end? ;-)

* Avoid warning in dbstructure

* Origin and OStatus ...

* There are more warnings solved ... yeah!

* And again ...

* We are not done yet

* And more ...

* And some new places ...

* And more in the feeds

* Avoid some more

* And some backend stuff

* Notifications cleared

* Some more stuff

* and again ...

* It's getting fewer ...

* Some warnings had been hidden in the notifications

* Fix the fix

* And another missing one ...

* We need the owner here, not the user

* Forgotten user

* And more ...

* And some more warnings disappeared ...

* Some more frontend warnings

* Some backend warnings removed

* Fixed sidebar for "vier"

* And more ...

* Some more ...

* And something for "remote self"

* Am I stuck in an endless loop?

* Fix: Clear tag and file field on update

* Preset page content
2018-07-10 08:27:56 -04:00
Andreas Neustifter
32ef5623ab [frio] Improve Group Editing (#5349)
* Improve group-editing and edit-navigation.

Use icons next to groups and header for navigation to editing groups and adding new groups.
Also use icon from group-sidebar for editing groups.

* Unify look&feel of contact search bars.

* Remove nogroup page and replace with /group/none.

* Make sure proper items are selected in aside.

* Use icon instead of link for 'View Contacs' on profile page.

* Fix none-working /group/none.

* Fix highlighting for everyone in group aside.
2018-07-09 18:36:50 -04:00
Andreas Neustifter
09b7e217c7 [Suggestion] Move New User Tip Link (#5342)
* Move new member tips to navigation bar.

The link looks so forlorn when its just somewhere in there. Put it in the nav bar.

* Style new member hints link propery.

* Make changes requested by @MrPetovan.
2018-07-09 18:20:57 -04:00
c829e43725
moved get_guid to System::createGUID 2018-07-09 21:38:16 +02:00
Hypolite Petovan
3a179860e5
Merge pull request #5346 from astifter/redirect_empty_group_to_contacts
Redirect empty group to /contacts.
2018-07-09 08:26:39 -04:00
Andreas Neustifter
5765b8d498 Redirect empty group to /contacts.
The empty /group page is not really doing anything, redirect to /contacts.
2018-07-09 12:42:32 +02:00
Andreas Neustifter
56b6adc396 Fix relocate button label.
In settings the 'Start Relocate' button is also labeld 'Save Settings'.
2018-07-09 12:42:32 +02:00
1d745c25a7 Some more places ... 2018-07-08 12:58:43 +00:00
3e797547a3 Warnings fixed 2018-07-08 09:37:05 +00:00
Michael Vogel
ff5ee74ecf
Merge branch 'develop' into item-activities 2018-07-08 06:35:50 +02:00
4d35e228c4 More item abstraction / making remote deletion work again 2018-07-07 18:14:16 +00:00
Michael Vogel
3eec97aa6e
Merge pull request #5314 from MrPetovan/task/4889-fix-tests
Fix tests after enabling PHP Notices
2018-07-06 22:14:01 +02:00
72638acac3 admins can forbid some nicknames from being registered 2018-07-06 15:32:56 +02:00
Hypolite Petovan
a380bcd1c1 Fix more undefined variable/index notice in tests 2018-07-02 07:45:25 -04:00
bffdf96d87 The "file" variable isn't stored anymore in the item table 2018-07-01 07:57:59 +00:00
6b31e72905 Fix for: empty posts and comments that hadn't been transmitted to Diaspora 2018-06-29 06:20:04 +00:00
dec1eaa2e8 Tagging now is a comment 2018-06-28 04:37:58 +00:00
b705a91ccd Standards and some more replace item calls 2018-06-28 03:31:10 +00:00
76dab3b2d7 Use gravity instead of verb 2018-06-27 18:09:33 +00:00
5f3f349006 "author-link" and "owner-link" aren't stored anymore in the item table 2018-06-25 06:45:05 +00:00
89fb28ae9b Content is now stored exclusively in item-content, connected via "icid" field 2018-06-25 04:56:32 +00:00
b03db4643f The fetch function now centrally controls the content 2018-06-24 10:48:29 +00:00
a7d2f126eb Fixes Issue 5276 and an endless loop in item::update 2018-06-23 10:32:53 +00:00
rabuzarus
92a84275d4 fix hovercard for not logged in users 2018-06-21 22:46:10 +02:00
rabuzarus
22816c49a1 Merge develop into 201820_-_fix_mod_redir 2018-06-21 22:38:15 +02:00
rabuzarus
a119636cd5 fix redirection - works now with logged in users, remote users, guests and visitors 2018-06-21 22:37:05 +02:00
Hypolite Petovan
8a3cae686b
Merge pull request #5261 from annando/and-again-abstraction
And again the item abstraction - and a fix for issue 5252
2018-06-21 11:50:31 -04:00
d643e00d33 Standards and a new function to fetch content 2018-06-21 15:14:01 +00:00
5743bb0dae Fix Issue 5252 2018-06-21 08:23:35 +00:00
81ac7c33da Order search results by id 2018-06-21 07:46:06 +00:00
70af2cecf2 Some of the last direct SQL calls to the item table had been changed 2018-06-21 06:21:51 +00:00
Hypolite Petovan
a5550b4702
Merge pull request #5253 from rabuzarus/20180616_-_magic_auth_test_2
Port hubzillas OpenWebAuth - remote authentification
2018-06-20 17:46:04 -04:00
8ad523fbc8
Continued a bit:
- removed/fixed whitespaces and mixture of spaces/tabs (some)
- added new-line character at end of files (POSIX-compilant)
- reverted some code which I had messed up (compared to upstream/develop)
- removed duplicate dba::update() invocation in src/Protocol/DFRN.php
- also removed no longer valid TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-06-20 22:19:54 +02:00
f806fa91b1
Replace old database queries with the new ones 2018-06-20 22:02:17 +02:00
6cb26f884e
Fixes for composer:
- ./vendor/ is being prepared by executing `utils/composer.phar install`, no
  need to have it around
- converted .gitignore to LF line-ending (more common over the whole project)
- no need to have them around ...

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-06-20 22:02:17 +02:00
7c048b5077
Opps, cutted this out by accident ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:17 +02:00
506657ec42
removed TODO, one day this all needs refacturizing ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:17 +02:00
22bbfdadd0
added more curly braces + spaces for #3254
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:15 +02:00
rabuzarus
3d1822996a port hubzillas OpenWebAuth - fix another code standards violation 2018-06-20 20:16:36 +02:00
rabuzarus
e4aaf8eb16 port hubzillas OpenWebAuth - fix some code standards violations 2018-06-20 19:32:26 +02:00
miqrogroove
b9a1e2e97f
Need the count conditions to match. 2018-06-20 11:59:13 -04:00
miqrogroove
7243dcfb09
Filter Removed Users From Directory 2018-06-20 11:50:09 -04:00
e40b247118 Increase default number of workers in config 2018-06-20 04:50:15 +00:00
962fbc9166 Many "fetch_first" had been replaced 2018-06-19 21:33:07 +00:00
ab5669e091 Some more direct SQL calls had been replaced 2018-06-19 19:06:17 +00:00
92650f9634 Null - not false 2018-06-19 17:58:28 +00:00
a9a19cb8e6 Display is reworked 2018-06-19 17:57:45 +00:00
e4adaa9900 Standards and variable renaming 2018-06-19 17:11:59 +00:00
a5ca724fd3 Merge remote-tracking branch 'upstream/develop' into more-abstraction 2018-06-19 13:48:19 +00:00
rabuzarus
ffd3ff4c69 worker.php - fix missing use statement 2018-06-19 14:45:43 +02:00
rabuzarus
35480fe4f9 xrd.php - fix coding style 2018-06-18 23:15:52 +02:00
rabuzarus
1c7f4e3c63 port hubzillas OpenWebAuth - remote authentification 2018-06-18 23:05:44 +02:00
4714cb746b Use the item functions at many more places 2018-06-18 20:36:34 +00:00
507956818d Use the item classes where possible 2018-06-18 05:19:28 +00:00
6e10de9284 New function to fetch item data especially for users 2018-06-17 17:05:17 +00:00
0280a46ab4 Use predefined field lists 2018-06-17 06:27:52 +00:00
Hypolite Petovan
7d1bb9ecf4
Merge pull request #5230 from annando/new-item-uri
New function for generating item URI
2018-06-16 10:54:56 -04:00
Hypolite Petovan
5fb8c758fd
Merge pull request #5229 from rabuzarus/20180616_-_fix_stream_position_ajax_update
fix scroll position in stream while ajax update
2018-06-16 09:06:32 -04:00
a54fea313f More indentions 2018-06-16 11:52:28 +00:00
rabuzarus
a2fc1be187 fix scroll position in stream while ajax update 2018-06-16 13:05:33 +02:00
14cb128264 New function for generating item URI 2018-06-16 06:44:19 +00:00
8592fc435c Fix indenting 2018-06-16 06:27:20 +00:00
bb79b8f4ac More item calls have been replaced with the new functions 2018-06-15 22:30:49 +00:00
71b017bfad
Merge pull request #5219 from annando/abstraction-2
Reworked notifications / use of Item class to fetch data
2018-06-15 09:54:50 +02:00
02fef0bcf5 Reworked notifications ("alt pager" added) / use of Item class to fetch data 2018-06-15 05:50:28 +00:00
Hypolite Petovan
c96b330a72 Allow share body output for private = 2 in mod/share 2018-06-14 23:53:54 -04:00
Hypolite Petovan
f0c2b77157
Merge pull request #5215 from rabuzarus/20180614_-_frio_contact_suggestion_template
Frio: provide a template for received contact suggestions
2018-06-14 13:56:30 -04:00
rabuzarus
b8186ba98b Frio: provide a template for received contact suggestions 2018-06-14 17:05:23 +02:00
rabuzarus
0db6002e3c Frio: fix contact filtering on contacts page 2018-06-13 23:04:07 +02:00
miqrogroove
5f822051d9
Quotes Altered 2018-06-13 15:07:27 -04:00
miqrogroove
6365cf955c
Patch for #5202
Add quotes to an erroneously unquoted callback so that PHP doesn’t treat it as a global constant.
2018-06-13 14:41:45 -04:00
0bdd133ebb Tabs instead of spaces 2018-06-13 12:53:56 +00:00
a4607f8d1c More abstraction for the item access 2018-06-12 09:05:36 +00:00
060997feda (Partly) reworked notes 2018-06-10 19:29:34 +00:00
c1d9c29eea Search is now changed as well. 2018-06-10 14:36:22 +00:00
8375d4ac4c Notes again 2018-06-10 08:58:03 +00:00
b26c5e7f73 And now the notes 2018-06-10 08:30:27 +00:00
a89a1f31b5 Profile is now using the new function as well 2018-06-10 08:08:53 +00:00
5d9083c369 Bugfix in notifications / network and display are using the new functions now 2018-06-10 07:26:37 +00:00
18a77a1b45 Removed some quick and dirty hack to upload pictures 2018-06-05 05:42:26 +00:00
d9bdba491a We don't poll, we work ... Bugfix for renamed config value. 2018-06-04 21:17:37 +00:00
93fd04e381 Removed deprecated functionality 2018-06-03 07:48:13 +00:00
3f07d01dd1 Get rid of unneeded or redundant fields 2018-06-03 07:42:56 +00:00
8a34895a23 Use magicLink whenever possible 2018-06-02 08:05:06 +00:00
b5b172500d Merge remote-tracking branch 'upstream/develop' into public-redir 2018-06-01 12:32:51 +00:00
Hypolite Petovan
93daf7883e Merge branch 'master' into develop
- Updated new develop version label
- Incremented database build number
2018-06-01 07:30:04 -04:00
ae8d7267a0 "redir" is now centralized and works with the public contact 2018-06-01 06:46:34 +00:00
Hypolite Petovan
71ab86d0c3
Merge pull request #5150 from abanink/5147
5147 Typo 'bandwith' should be 'bandwidth'
2018-05-31 10:35:24 -04:00
Pascal Deklerck
bdb82572ba redo correct typo Bandwith to Bandwidth in mod/settings.php 2018-05-31 06:39:30 +02:00
Pascal Deklerck
de1e514be3 redo correct typo bandwith to bandwidth in mod/admin.php 2018-05-31 06:38:14 +02:00
Pascal Deklerck
8fd33f89ea undo change to mod/admin.php 2018-05-30 20:28:38 +02:00
Pascal Deklerck
307a19074f undo changes to strings files 2018-05-30 20:22:34 +02:00
Pascal Deklerck
e1dd1aa358 5147 Typo 'bandwith' should be 'bandwidth' 2018-05-30 08:50:29 +02:00
Hypolite Petovan
2e97cbe728
Merge pull request #5144 from annando/deleted-item
Fix for not being able to delete items you don't own
2018-05-29 15:14:51 -04:00
5bcb9daa43 Use local_user instead 2018-05-29 18:57:32 +00:00
8eefe542df rewording 2018-05-29 16:54:40 +02:00
8329705eba New function to delete items for users 2018-05-29 05:22:57 +00:00
3f93b982b6 hide profile help text clarification 2018-05-28 16:16:23 +02:00
c5a22f86c7 Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item 2018-05-27 10:38:49 +00:00
54136f3a74 Added the new parameter to the delete function. 2018-05-26 21:38:45 +00:00
4c36109f02 Some more places to add the user id 2018-05-26 20:03:30 +00:00
bdbc51229a Fix for not being able to delete items 2018-05-26 18:07:27 +00:00
Hypolite Petovan
3965615fbc
Merge pull request #5129 from tobiasd/20180526-adminpanel
added a warning to an admin setting
2018-05-26 08:35:17 -04:00
Hypolite Petovan
5cc1405bae
Merge pull request #5127 from tobiasd/20180525-register
Opt-In to listing in the directory
2018-05-26 08:34:42 -04:00
c65c870032 added a warning to an admin setting 2018-05-26 07:32:39 +02:00
112c7b0248 remove false othion HTML ignored 2018-05-26 07:09:32 +02:00
9041bacebf exchange help text 2018-05-25 20:32:48 +02:00
e996354922 Opt-In to listing in the directory 2018-05-25 19:53:03 +02:00
Hypolite Petovan
44caf05f06
Merge pull request #5110 from annando/nodeinfo
Nodeinfo: The number of comments is now calculated more reliable
2018-05-22 17:20:06 -04:00
5430354f54 Issue 5111: missing "use DBM" in "removeme" 2018-05-22 20:17:32 +00:00
89a20ddbd7 Nodeinfo: The number of comments is now calculated more reliable 2018-05-22 20:10:18 +00:00
Hypolite Petovan
c41332364f
Merge pull request #5089 from tobiasd/20180519-tos
privacy statement
2018-05-20 08:20:16 -04:00
f7c24a20ae cite: just some small styling thing 2018-05-20 08:43:43 +02:00
c70ebadd7d Issue-3412 related: Don't send connection posts anymore 2018-05-19 19:34:51 +00:00
dd629d5fa4 registration: added display of privacy statement if enabled 2018-05-19 18:53:54 +02:00
ae62c1d1ea admin panel: added privacy statement preview 2018-05-19 18:52:23 +02:00
139f7cdc41
Merge pull request #5088 from annando/display-update
Follow up: Display update should really be fixed now.
2018-05-19 18:19:52 +02:00
e28819655c Follow up: Display update should really be fixed now. 2018-05-19 16:04:57 +00:00
Hypolite Petovan
d4ebf7ae52
Merge pull request #5086 from annando/issue-2880
Issue 2880: Editing post doesn't destroy mentions or hashtags anymore
2018-05-19 12:01:05 -04:00
9b55e52184
Merge pull request #5087 from annando/issue-4819
Issue 4819: The introduction note is now stored
2018-05-19 17:44:42 +02:00
c214353a5d Issue 4819: The introduction note is now stored displayed on the contact page. 2018-05-19 15:29:34 +00:00
3fe07cca57 Issue 2880: Editing post doesn't destroy mentions or hashtags anymore 2018-05-19 14:55:27 +00:00
b1a9030369 Fix constant display updates 2018-05-19 06:12:55 +00:00
81089e1b2e
Merge pull request #5083 from annando/fix-spamming
Fix: Avoid getting spammed when an admin has got several accounts
2018-05-19 08:06:33 +02:00
1cd6976faa Fix missing $ 2018-05-19 05:59:43 +00:00
e9848d7b8f End subscription for unreachable subscribers 2018-05-19 03:56:29 +00:00
a4d976b70f Fix: Avoid getting spammed when an admin has got several accounts 2018-05-19 03:38:43 +00:00
be469f6bca Fix for subscribing to the wrong feed from OStatus 2018-05-18 13:23:27 +00:00
feb3d76a5b Fix: Subscriptions from GNU Social partially don't work 2018-05-18 12:18:12 +00:00
d1783e9aeb
Fixes for #4965:
- better descriptive tooltip for adding/removing contact from/to group

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-17 02:24:42 +02:00
6129eb1623
OpenId possibly fixed:
- The LightOpenId class' constructor now requires the hostname from where the
  requested started, added it now
- sometimes need to invoke get_app() as $a was not around

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-17 00:24:25 +02:00
5a7bcd4725
Added empty line after if() block (convention)
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:22 +02:00
bacb7b70f6
Cleanups:
- added empty lines
- removed old-lost commented out line

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
57e668d9e0
Continued:
- avoided else() block which reduces code complexibility
- used more x()
- added curly braces
- added known type-hints

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
dcfd81e2ee
Some corrections 2018-05-14 22:50:04 +02:00
d54c79a772
Replace old database queries with the new ones 2018-05-14 22:50:04 +02:00
8bc565be74
Continued:
- ops, another rebase-leftover fixed

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:03 +02:00
befb080b70
Continued:
- moved to Config class

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:03 +02:00
2fd14eac70
Opps, cutted this out by accident ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:03 +02:00
6579396627
removed TODO, one day this all needs refacturizing ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
1d15e68678
added more curly braces + spaces for #3254
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:01 +02:00
bc21bf0ee6
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:01 +02:00
3bb5a416f8
Some corrections 2018-05-14 22:50:00 +02:00
8b775d48f9
Replace old database queries with the new ones 2018-05-14 22:50:00 +02:00
cbe12eba76
Continued:
- ops, another rebase-leftover fixed

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:59 +02:00
7a29944836
Fixes/cleanup:
- added missing curly braces (and some absent caused parser errors)
- <include|require>[_once] are keywords, so don't use them as such
- removed/added empty lines

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:59 +02:00
8e42e797cc
Opps, cutted this out by accident ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:57 +02:00
7514a3beb8
rewrote for() loop to foreach() + added curly braces/spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:57 +02:00
5ee91330a7
removed TODO, one day this all needs refacturizing ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:57 +02:00
85039d41a2
added more curly braces + spaces for #3254
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
d9d60346ff
more usage of dbm::is_result() and sorted a bit statements
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
128c9b20e0
fixed curly braces + added more
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:55 +02:00
1de8e31df6
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:55 +02:00
99440f3c56
Beatification:
- added space after curly braces (MrPetovan)
- added TODO for possible rewrite candidate

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-13 14:21:53 +02:00
87dbe03521
reverted back ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-13 10:20:15 +02:00
445cc1cb99
Fixes:
- brought back comment (ops)
- DBM is the class name (not dbm)

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-13 10:06:43 +02:00
8d9547777e
Ops, was redundant here.
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-13 10:05:31 +02:00
594f946ad6
No extra empty line here
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-13 10:04:49 +02:00
249d84c0b3 Automatic table optimisation is deactivated by default now 2018-05-13 05:41:05 +00:00
5debcbb5a6
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-10 13:07:22 +02:00
40d3e7982c Adopt the relay definition according to the suggestions from @jaywink 2018-05-10 11:04:18 +00:00
6c792588fd Ensure to mostly fetch the item with an non zero user id 2018-05-08 22:26:49 +00:00
eb4650ff23 dbclean settings are now available from the frontend 2018-05-07 05:37:20 +00:00
1230ff146a "remote-self" is now working for Diaspora and Twitter as well 2018-05-04 21:12:13 +00:00
eecd1e47e4 Some corrections 2018-05-02 21:12:48 +00:00
4ad655ab80 Replace old database queries with the new ones 2018-05-02 19:26:15 +00:00
Hypolite Petovan
352e136132
Merge pull request #4961 from annando/direct-dfrn
Direct Relay is now working with DFRN as well
2018-04-30 14:06:35 -04:00
rabuzarus
0c0b715c63 Merge develop into 20180425_-_fix_help_aside 2018-04-30 14:56:25 +02:00
74aa3499b0 Additional logging 2018-04-30 12:41:56 +00:00
aa4945f4a0 "x-social-relay" now exposes all supported protocols 2018-04-30 04:01:04 +00:00
b4f5311e7f Add Install Mode
- merge `friendica/develop` to `nupplaphil/install_mode`
2018-04-29 20:15:12 +02:00
fd318a1193 Corrected query to don't show hash tag posts from blocked or ignored contacts 2018-04-28 16:12:45 +00:00
8815d07765 Add Install Mode
- fixed mistake
2018-04-28 17:06:08 +02:00
41c6d63052 Add Install Mode
- merged `friendica/develop` to `nupplaPhil/install_mode`
- content merged `mod/install.php` to `src/Class/`
2018-04-28 15:15:54 +02:00
1ab965c944 Add Install Mode
- merged `friendica/develop` to `nupplaPhil/install_mode`
- content merged `mod/install.php` to `src/Class/`
2018-04-28 15:11:01 +02:00
a97ad9dc42 Add Install Mode (Part 2)
- Added constants to class `App`
- Added global App-Mode to `dba:connect()` instead parameter `$install`
2018-04-28 12:36:40 +02:00
Hypolite Petovan
66e5586d21
Merge pull request #4939 from astifter/better_curl_error_during_install
Better curl error during install.
2018-04-27 16:57:01 -04:00
Andreas Neustifter
70a781fa5a Proper error when rewrite fails during install.
When Curl tries to fetch the rewrite test URL and something goes wrong the user
has no clue what was the problem. This problems can include:
- The rewriting not working at all.
- HTTPS redirects do not work.
- Curl does not accept the presented SSL cert.

This commit fixes this by providing the Curl error message to the user to further
debug the problem.

Fixes #3629.~
2018-04-27 21:27:55 +02:00
Andreas Neustifter
846f8becae Install selected theme during settings persistence.
Themes have to be installed to be usable by the system. This is not done
automatically which lead to the problems with the site when themes where
switched right after the install and before the "Reload themes" button
was pressed in the admin page.

This patch makes sure that the selected them is always installed when
it is selected by the user either in the admin or settings page.

Fixes #4921.
2018-04-27 20:45:34 +02:00
rabuzarus
3fb993f37b frio - fix help toc aside 2018-04-25 23:30:56 +02:00
Hypolite Petovan
c8cc8e57c2
Merge pull request #4925 from rabuzarus/20180424_-_frio_invite_template
frio - provide a template for invite page
2018-04-24 11:37:10 -04:00
rabuzarus
ac753e3320 frio - provide a template for invite page 2018-04-24 17:33:48 +02:00
5cf745af44 Item distribution is now done via the public post 2018-04-24 13:21:25 +00:00
7230cc0bed Merge remote-tracking branch 'upstream/develop' into item-distribution 2018-04-24 04:23:38 +00:00
6973aaefc2 Add Install Mode
- Added $install_mode in Class App instead
- Extracted the install business logic to a new Class Install
- Replaced all $a->module == 'install' with $a->install_mode
2018-04-23 22:56:59 +02:00
Hypolite Petovan
a66e9b81ba
Merge pull request #4873 from astifter/develop
Remove pagination when empty, move new Member Tips and use common widget to find people.
2018-04-23 10:23:21 -04:00
ba35b19af6 Public federated items now always are having an entry with "uid=0" 2018-04-23 11:14:25 +00:00
Hypolite Petovan
da4892b4d2 Fix count() warning in mod/friendica
- Add default value for Config call
2018-04-23 00:00:29 -04:00
Michael Vogel
37e5272f92
Merge pull request #4881 from MrPetovan/task/4867-guess-language-from-plaintext
Guess language from plaintext
2018-04-23 00:26:05 +02:00
Friendica
666375fed1 Move new member tips to tab bar.
The new member tips link looks very misplaced and forlorn at the current position.
Move it to the tab-bar (in a somewhat crude fashion, but its for 14 days/user only.)
2018-04-22 20:44:22 +00:00
98c677f09f Currently disabled 2018-04-22 11:33:32 +00:00
8f2db61538 Receiving of public posts is now working 2018-04-22 10:58:03 +00:00
b77ae3a8a7 Public posts are now transferred successfully to the DFRN part 2018-04-22 10:42:01 +00:00
c118c03a70 Merge remote-tracking branch 'upstream/develop' into dfrn-rework 2018-04-22 07:45:28 +00:00
Hypolite Petovan
ee672b946e Add Text\BBCode::toPlaintext to mod/babel 2018-04-21 18:48:10 -04:00
Hypolite Petovan
daf94a8f63
Merge pull request #4891 from annando/private-forum-redux
Better working with private forums
2018-04-21 18:19:27 -04:00
16beab4652 Better working with private forums 2018-04-21 21:59:02 +00:00
f63be91bd5
Revert "Moved .htconfig.php file & extracted Install business logic" 2018-04-21 16:28:22 +02:00
334d392154 Merge remote-tracking branch 'origin/develop' into install_config 2018-04-21 14:23:49 +02:00
346697d771 Moved .htconfig file
Extracted install business functions to new Class `Install.php`
2018-04-21 14:10:53 +02:00
e61ed380f7 Reworked dfrn_notify endpoint, added public endpoint 2018-04-21 09:55:41 +00:00
fabrixxm
12b7bce1cc admin users, don't set account-type if page flag isn't PAGE_NORMAL 2018-04-20 14:27:36 +02:00
fabrixxm
9a7f508550 Admin users: Update page type names, add raw flags template context
Change user table header "Account" to "Type": it use less space :-)
2018-04-20 14:02:45 +02:00
Friendica
400bab676d Add space before Impressum.
The page /friendica/ contains an Impressum section which is activated with an AddOn.
Add more space after last paragraph of information, before impressum, because site
looks quite cramped otherwise.
2018-04-19 19:03:29 +00:00
7b6d1e1ab3
Merge pull request #4853 from annando/site-defaults
Default values for site configuration
2018-04-17 10:12:11 +02:00
e5583591d7 Default values for site configuration 2018-04-17 05:18:26 +00:00
150843af5f new info mail address 2018-04-16 17:28:19 +02:00
d149541dba notify admin when user deletes account 2018-04-15 11:39:05 +02:00
Michael Vogel
c4c0d09744
Merge pull request #4799 from MrPetovan/task/hide-ignored-unfollowed-contact-posts
Reintroduce own posts in network list
2018-04-10 06:58:36 +02:00
Hypolite Petovan
20843fee38 Reintroduce own posts in network list 2018-04-09 22:50:03 -04:00
Michael Vogel
74e189039a
Merge pull request #4768 from MrPetovan/task/hide-ignored-unfollowed-contact-posts
Hide posts from recently ignored/unfollowed contact
2018-04-09 20:08:20 +02:00
Hypolite Petovan
99b446eccc Remove useless intval() calls in mod/network 2018-04-09 09:19:49 -04:00
105f3ca747 Relay: Avoid empty tags / Always use the "relay account" 2018-04-09 05:53:23 +00:00
Hypolite Petovan
7563adcc7d Use positive form for relationship check in mod/network 2018-04-08 20:47:16 -04:00
5c2b54009e The magic link is added at more places 2018-04-08 19:17:50 +00:00