Commit Graph

1635 Commits

Author SHA1 Message Date
Michael 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 e84c48b979
Merge pull request #5259 from rabuzarus/20180616_-_magic_auth_test_2
port hubzillas OpenWebAuth - don't initiate magic auth if the contact is allready authentificated
2018-06-20 20:15:14 -04:00
rabuzarus 02d96623f2 port hubzillas OpenWebAuth - don't initiate magic auth if the contact is allready authentificated 2018-06-21 02:08:54 +02: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
rabuzarus 04fe3acb69 port hubzillas OpenWebAuth - fix method call 2018-06-20 23:29:36 +02:00
Roland Häder 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
Michael f806fa91b1
Replace old database queries with the new ones 2018-06-20 22:02:17 +02:00
Roland Haeder 593d1feca6
was a bit confusing for me or I was not sleeping to much ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:17 +02:00
Roland Haeder 2d744fa189
PHP5 does not support native type-hints, except array + used dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:17 +02:00
Roland Haeder 4ca26fd3bc
fixed comment and explained one
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:16 +02:00
Roland Haeder a5dba628c4
old behaviour restored
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:16 +02:00
Roland Haeder 0e5daa86df
added curely branches + reverted back to old behaviour (may come back one day)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:16 +02:00
Roland Haeder ad9bd7bb72
better comment added by @Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:16 +02:00
Roland Häder fe77e1b538
added more curly braces + a bit more usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-06-20 22:02:16 +02:00
Roland Haeder f89b999659
was a bit confusing for me or I was not sleeping to much ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:15 +02:00
Roland Haeder f0b05838cb
fixed comment and explained one
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:15 +02:00
Roland Haeder a95db714ca
added curely branches + reverted back to old behaviour (may come back one day)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:15 +02:00
Roland Haeder 63f5598766
better comment added by @Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:15 +02:00
Roland Haeder 9cc0d5479b
old behaviour restored
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:15 +02:00
rabuzarus 9f493357f4 port hubzillas OpenWebAuth - fix wrong table name + fix wrong method name 2018-06-20 20:11:26 +02:00
rabuzarus e4aaf8eb16 port hubzillas OpenWebAuth - fix some code standards violations 2018-06-20 19:32:26 +02:00
rabuzarus 149142b4bc port hubzillas OpenWebAuth - rename Verify class to OpenWebAuthToken 2018-06-20 19:24:02 +02:00
rabuzarus d5afbd3357 port hubzillas OpenWebAuth - rename verify table to openwebauth-token 2018-06-20 19:18:41 +02:00
rabuzarus 1ab3f7bfc8 port hubzillas OpenWebAuth - HTTPSignature - comment out some ActivityPub parts 2018-06-20 19:05:33 +02:00
rabuzarus 863a49d8e7 port hubzillas OpenWebAuth - rework the HTTPHeaders class 2018-06-20 18:52:37 +02:00
rabuzarus 1148c29916 port hubzillas OpenWebAuth - use random_bytes() in crypto class + bugfixes 2018-06-20 18:45:37 +02:00
rabuzarus f0235c4a98 port hubzillas OpenWebAuth - rename some methods and classes 2018-06-20 18:38:23 +02:00
miqrogroove 12d0f4bf3c
Add Comments to Worker Exponent Implementation 2018-06-20 06:43:57 -04:00
miqrogroove 9cde4aa109
Make Load Exponent Configurable 2018-06-20 06:22:53 -04:00
miqrogroove 97cabcecf2
Unify Worker Load Formulas 2018-06-20 06:06:20 -04:00
Michael 00124f9ac0 Makes the linear load calculation optional 2018-06-20 04:38:50 +00:00
miqrogroove 0dbddb240c
Update Worker.php 2018-06-19 18:55:55 -04:00
miqrogroove 7e4d7b9aac
Fix logic errors in tooMuchWorkers()
There are probably a dozen different ways to do this, so this is not necessarily the "right" way.
2018-06-19 18:53:02 -04:00
Hypolite Petovan 43ab1b2cf2
Merge pull request #5246 from annando/abstraction-encore
Urgent bugfix: Non existing field / double "network" in field list
2018-06-19 17:58:50 -04:00
Michael c540154f8e "shadow" does not exist 2018-06-19 21:41:38 +00:00
Michael 962fbc9166 Many "fetch_first" had been replaced 2018-06-19 21:33:07 +00:00
Michael 139d35438d Fix: network had been empty 2018-06-19 21:32:42 +00:00
miqrogroove 79446a625d
Update Emailer.php 2018-06-19 16:58:06 -04:00
miqrogroove 5b8619f501
Add Missing Fifth Argument to mail() Function Call
This is desperately needed to fix Issue #5190.  In case of any unexpected problem, the admin can use

`$a->config['system']['sendmail_params'] = false;`
2018-06-19 16:23:42 -04:00
rabuzarus b65e4b278b port hubzillas OpenWebAuth - use Contact::getIdForURL to query for contact entry 2018-06-19 16:15:28 +02:00
Michael ed00b63613 Typo 2018-06-19 13:26:03 +00:00
rabuzarus 9195ea26b1 port hubzillas OpenWebAuth - add some notes to the doxygen to refer to hubzilla's source code 2018-06-19 13:30:55 +02:00
rabuzarus af9116635b port hubzillas OpenWebAuth - readd some ActivityPup code to HTTPSig 2018-06-19 13:18:35 +02:00
Michael ebd76285d8 New item functions, improved feed cache behaviour 2018-06-19 05:39:56 +00:00
rabuzarus 1c7f4e3c63 port hubzillas OpenWebAuth - remote authentification 2018-06-18 23:05:44 +02:00
Michael 4714cb746b Use the item functions at many more places 2018-06-18 20:36:34 +00:00
Michael 507956818d Use the item classes where possible 2018-06-18 05:19:28 +00:00
Michael 2a76290d19 Using the constants 2018-06-17 21:55:01 +00:00
Michael 23aa9dffa0 New item functions are now used in the delivery process as well 2018-06-17 21:35:33 +00:00
Michael e42b934807 Item field list structure is unified 2018-06-17 17:14:52 +00:00
Michael 6e10de9284 New function to fetch item data especially for users 2018-06-17 17:05:17 +00:00
Michael 0280a46ab4 Use predefined field lists 2018-06-17 06:27:52 +00:00
Michael 1aec8f620d More item abstractions for DFRN and Diaspora 2018-06-16 22:32:57 +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 133cd342d4
Merge pull request #5226 from annando/even-more-abstraction
More item calls have been replaced with the new functions
2018-06-16 07:57:00 -04:00
Tobias Diekershoff 7966c48e75
Merge pull request #5228 from annando/fix-5199
Fix for PR 5199: Corrected check for empty object
2018-06-16 09:42:36 +02:00
Michael d2da5d63c7 Fix for PR 5199: Corrected check for empty object 2018-06-16 07:26:09 +00:00
Michael 14cb128264 New function for generating item URI 2018-06-16 06:44:19 +00:00
Hypolite Petovan c651641856 Fix PHP 7.2 Warning in Model\Contact 2018-06-15 20:50:31 -04:00
Michael bb79b8f4ac More item calls have been replaced with the new functions 2018-06-15 22:30:49 +00:00
Michael e97a3c25e7 Multiple daemon improvements (foreground, faster spawning) 2018-06-15 18:18:20 +00:00
Tobias Diekershoff 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
Michael 02fef0bcf5 Reworked notifications ("alt pager" added) / use of Item class to fetch data 2018-06-15 05:50:28 +00:00
Hypolite Petovan 6191fab4d7
Merge pull request #5216 from abanink/2337
solves 2337 Smiley Pack 1.04: some smiley keywords aren't replaced correctly
2018-06-14 15:36:21 -04:00
Pascal Deklerck ce4b793acf solves 2337 Smiley Pack 1.04: some smiley keywords aren't replaced correctly 2018-06-14 21:09:55 +02: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
fabrixxm 574bfecdfd Create config keys if they not exists on set. 2018-06-14 13:18:01 +02:00
Michael 77c423ec04 Don't allow deletion of public posts 2018-06-13 19:19:17 +00:00
Hypolite Petovan 0bcf7b7c39 Fix PHP 7.2 sizeof notice messages in Protocol\PortableContact 2018-06-12 22:01:50 -04:00
Hypolite Petovan d71281e45b
Merge pull request #5193 from annando/dbstructure
Fix: Avoid endlessly dbstructure changes
2018-06-11 09:53:03 -04:00
Michael b9811f1bef Fix: Avoid endlessly dbstructure changes 2018-06-11 13:22:08 +00:00
Michael 5bfd424fd2 Clean up tag claud (remove "item_condition()" call) 2018-06-10 15:19:52 +00:00
Michael 4d4cce4867 The new function is now used here as well. 2018-06-10 10:14:53 +00:00
Michael 446a45003d Added documentation, some indention fixes 2018-06-09 19:12:13 +00:00
Michael baf316e898 The central item fetch does work now and the API now uses these functions 2018-06-09 16:56:37 +00:00
Michael 4874e589f1 New class function to fetch items 2018-06-07 06:03:12 +00:00
Michael 1304dae0d3 Bugfix: In the daemon mode we forgot to call the cron jobs 2018-06-06 03:48:04 +00:00
Hypolite Petovan 0a13ab6b9f
Merge pull request #5166 from annando/unsed-item-fields
Remove unused, unneeded or redundant item fields
2018-06-03 12:19:50 -04:00
Hypolite Petovan 973ece09c5
Merge pull request #5157 from annando/daemon
Workers can now be started exclusively from the daemon and other workers
2018-06-03 12:18:47 -04:00
Michael b654af28fa We need "global" 2018-06-03 09:40:32 +00:00
VVelox ea64ec21ac
a domain name is unlikely to be both a CNAME and A record 2018-06-03 04:29:06 -05:00
Michael d7c477d0f4 Don't probe anymore, but ensure that we got good contact data 2018-06-03 08:36:05 +00:00
Michael 3f07d01dd1 Get rid of unneeded or redundant fields 2018-06-03 07:42:56 +00:00
Hypolite Petovan 0eafea86ed
Merge pull request #5163 from annando/bugfix-user-item
Fix SQL error in tagcloud
2018-06-02 13:49:58 -04:00
Michael 41423e578a Fix SQL error in tagcloud 2018-06-02 17:07:28 +00:00
Michael c6c94b8cea Weird stuff 2018-06-02 13:00:47 +00:00
Michael 81c002370e Only redirections to the same host do make sense 2018-06-02 08:42:46 +00:00
Michael 723b5ae803 Use MagicLinkbyId when possible 2018-06-02 08:28:01 +00:00
Michael 8a34895a23 Use magicLink whenever possible 2018-06-02 08:05:06 +00:00
Michael 885f2b52d1 Merge remote-tracking branch 'upstream/develop' into public-redir 2018-06-02 06:18:45 +00:00
AndyHee 2b25bd48d4 Improved distinction between delete and remove 2018-06-02 12:40:41 +07:00
Michael 371f511954 Respect "don't fork" 2018-06-02 05:17:32 +00:00
Michael 3034170088 DBStruxture can now create "memory" tables as well 2018-06-02 05:03:23 +00:00
AndyHee a75d28e521 Rewording label 2018-06-02 11:23:27 +07:00
Michael 6d64667cdb Merge remote-tracking branch 'upstream/develop' into daemon 2018-06-02 04:03:55 +00:00
Michael 047c02371a Small corrections to the database descriptions 2018-06-01 22:12:35 +00:00
Michael 28f8beebfc Workers can now be started exclusively from the daemon and other workers 2018-06-01 22:09:27 +00:00
Michael 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
Michael ae8d7267a0 "redir" is now centralized and works with the public contact 2018-06-01 06:46:34 +00:00
Tobias Diekershoff 9ea6d4b26d the detected language was not stored during user creation 2018-05-31 08:27:27 +02:00
Michael c86111d193 Coding standards 2018-05-29 19:00:26 +00:00
Pascal Deklerck 1853c5623b 4419 Update the comments in src/Database/DBStructure.php from doc/database/* 2018-05-29 10:24:36 +02:00
Michael 8329705eba New function to delete items for users 2018-05-29 05:22:57 +00:00
Michael deb015be12 Changed documentation 2018-05-27 10:42:47 +00:00
Michael c5a22f86c7 Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item 2018-05-27 10:38:49 +00:00
rabuzarus 32c3762989
Merge pull request #5138 from annando/optimize-workerqueue
Possibly fixes 5137: Only execute "optimize table" when allowed
2018-05-27 10:10:11 +02:00
Michael 04fd6eff01 Possibly fixes 5137: Only execute "optimize table" when allowed 2018-05-27 06:23:18 +00:00
Michael 708ddf2b02 Preparation for new deletion functionality 2018-05-26 20:23:49 +00:00
Michael a6396dde55 Removed useless line 2018-05-26 20:08:42 +00:00
Michael a50805c371 Grammar fix 2018-05-26 20:07:30 +00:00
Michael bdbc51229a Fix for not being able to delete items 2018-05-26 18:07:27 +00:00
rabuzarus c66d1f01a3 add missing database use statements 2018-05-25 09:05:16 +02:00
rabuzarus f013625382 fix typo in comment 2018-05-25 08:52:03 +02:00
rabuzarus 8174bfeb2b Bugfix: compute the current theme each time we want to know which theme is beeing used 2018-05-25 08:44:01 +02:00
Michael 4a67919be7 Issue 5010: Don't show removed users 2018-05-24 04:44:02 +00:00
Michael 89a20ddbd7 Nodeinfo: The number of comments is now calculated more reliable 2018-05-22 20:10:18 +00:00
Michael df531cd400 Don't proxy pictures when they are sent to other networks 2018-05-21 10:15:50 +00:00
Hypolite Petovan c41332364f
Merge pull request #5089 from tobiasd/20180519-tos
privacy statement
2018-05-20 08:20:16 -04:00
Tobias Diekershoff d78b1f5191
Merge pull request #5091 from annando/issue-4956
Don't fail during installation because of a missing theme configuration
2018-05-20 08:50:28 +02:00
Tobias Diekershoff f7c24a20ae cite: just some small styling thing 2018-05-20 08:43:43 +02:00
Michael 9d0ed1a2af Issue 4956: Don't fail during installation because of a missing theme configuration 2018-05-20 05:44:20 +00:00
Michael c70ebadd7d Issue-3412 related: Don't send connection posts anymore 2018-05-19 19:34:51 +00:00
Tobias Diekershoff 2798d4ea4d missing sign 2018-05-19 19:08:50 +02:00
Tobias Diekershoff 4f8530070b removed one line too much 2018-05-19 19:07:13 +02:00
Tobias Diekershoff e02093c7ea text of the priv. statement can now be shown outside of the module 2018-05-19 18:55:29 +02:00
Michael 3fe07cca57 Issue 2880: Editing post doesn't destroy mentions or hashtags anymore 2018-05-19 14:55:27 +00:00
Tobias Diekershoff 5ae9193aa7
Merge pull request #5084 from annando/dead-subscriber
End subscription for unreachable subscribers
2018-05-19 07:07:00 +02:00
Michael e9848d7b8f End subscription for unreachable subscribers 2018-05-19 03:56:29 +00:00
Michael 5d708fd9a9 Avaoid warning when no valid data could be read 2018-05-18 16:07:55 +00:00
Hypolite Petovan 83ff57777f
Merge pull request #5079 from annando/fix-self
Fix: Sometimes the contact endpoints seem to be wrong
2018-05-18 08:54:00 -04:00
Michael 8983c61023 Fix: Sometimes the contact endpoints seem to be wrong 2018-05-18 12:26:10 +00:00
Michael feb3d76a5b Fix: Subscriptions from GNU Social partially don't work 2018-05-18 12:18:12 +00:00
Hypolite Petovan 1d2b0c0a81
Merge pull request #5077 from annando/fix-blocking-ostatus
Fix to OStatus delivery to be not so blocking to other tasks
2018-05-17 19:59:08 -04:00
Michael 4355014492 Now it should work ... 2018-05-17 23:47:15 +00:00
Michael f4a71b76dd Dynamic priority handling 2018-05-17 23:43:44 +00:00
Michael 61824119e4 Moved functionality in new model class 2018-05-17 23:30:49 +00:00
Michael 5a1e1c1ec9 Fix to OStatus delivery to be not so blocking to other tasks 2018-05-17 22:17:03 +00:00
Tobias Diekershoff 41b7d75cca
Merge pull request #5072 from Alkarex/ru-plural-intval-bug
i18n ru intval bug
2018-05-17 09:43:25 +02:00
Alexandre Alapetite f980516545 Fix PoToPhp
https://github.com/friendica/friendica/pull/5072#issuecomment-389754406
2018-05-17 08:12:55 +02:00
Tobias Diekershoff ac67f3c154
Merge pull request #5071 from annando/fix-duplicated-posts
Bugfix: Only send a notifier when the item was really edited
2018-05-17 07:59:56 +02:00
Michael b333c7ae2e Bugfix: Only send a notifier when the item was really edited 2018-05-17 05:49:55 +00:00
Roland Häder 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
Michael Vogel e8e93768db
Merge pull request #5065 from tobiasd/2018.05-rc
added link to the TOS page if it is activated
2018-05-16 14:21:24 +02:00
Tobias Diekershoff eec0826750 added link to the TOS page if it is activated 2018-05-16 11:57:06 +02:00
Michael 3b2752c2fe Follow up to PR 5060: Missing index update 2018-05-16 08:59:15 +00:00
Michael 84248ac4c1 Grammar stuff 2018-05-16 03:54:08 +00:00
Michael c9f55f6b3d Show "Remove from your screen" or "delete" depending of the impact of the deletion 2018-05-15 21:06:34 +00:00
Michael e77cd17495 We do the notify stuff now directly in the item class 2018-05-15 19:50:29 +00:00
Michael fe8a4d50c8 Merge branch 'item-delete' of github.com:annando/friendica into item-delete 2018-05-15 19:31:05 +00:00
Michael 4a1bbd114c Lower priority for "remote self" 2018-05-15 19:29:14 +00:00
Michael 82937189ba Only delete undeleted items 2018-05-15 19:25:35 +00:00
Michael fc60e23314 Added comments / hourly workerqueue deletion 2018-05-15 17:50:29 +00:00
Michael 3e475f3b82 Delete the shadow post when it is the last one 2018-05-15 16:40:13 +00:00
Michael 4a7bf95926 Fix: Delete all item copies if it is an original item 2018-05-15 15:51:58 +00:00
Tobias Diekershoff 0848cef605
Merge pull request #5055 from annando/worker-spawning
Fix for the slow spawning of workers
2018-05-15 08:22:33 +02:00
Tobias Diekershoff ba4f9b6136
Merge pull request #5054 from annando/diaspora-comments
Fix: public comments weren't distributed to the followers.
2018-05-15 07:30:34 +02:00
Michael 8564eeec4e Fix: public comments weren't distributed to the followers. 2018-05-15 04:33:28 +00:00
Roland Häder e409001dfb
Fixed "constant" result, maybe there is a $ missing?
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-15 03:26:20 +02:00
Roland Häder 538760d9da
No direct $a->config['foo'] needed when Config::get() is around ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
Roland Häder 751394fc1d
Redis:
- added support for redis server:

// Required to actually have this cache driver active:
$a->config['system']['cache_driver'] = 'redis';

// ---- OPTIONAL/DEFAULT: ----
$a->config['system']['redis_host'] = '127.0.0.1';
$a->config['system']['redis_port'] = 6379;

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
Roland Häder 69ac6feff7
Continued:
- you can directly use constant($var) instead of this switch()

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
Roland Häder fe1e7b92f2
Continued:
- system,worker_dont_fork may not be set, always set default to "false" to
  have it properly set as Config::get() may one day behave differently

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
Roland Häder 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
Michael 17a39340b5
"pending" shouldn't be set as well by default ... 2018-05-14 22:50:04 +02:00
Michael f28301e18f
Urgent bugfix: Public contacts had been blocked automatically when created 2018-05-14 22:50:04 +02:00
Michael 72f5b863d8
Reshares had been detected falsely so that were rejected by Diaspora 2018-05-14 22:50:04 +02:00
Michael f19066c6cf
Ensure that the link will be displayed correctly on Diaspora 2018-05-14 22:50:04 +02:00
Michael dcfd81e2ee
Some corrections 2018-05-14 22:50:04 +02:00
Michael d54c79a772
Replace old database queries with the new ones 2018-05-14 22:50:04 +02:00
Roland Haeder 11dcb31960
was a bit confusing for me or I was not sleeping to much ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
Roland Haeder ce07c20130
PHP5 does not support native type-hints, except array + used dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
Roland Haeder 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
Roland Haeder 7526afcf13
Continued:
- converted multiple single-line comments into one multi-line comment (please
  stop abusing programming languages!)
- added more TODO tags for type-hints (upcoming rewrite)
- opps, one space was only fixed in develop branch, not in this PR branch

Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
Roland Haeder f5f1650b62
fixed comment and explained one
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:02 +02:00
Roland Haeder 1fcd4f52e7
old behaviour restored
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:01 +02:00
Roland Haeder 87bb934f8f
added curely branches + reverted back to old behaviour (may come back one day)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:01 +02:00
Roland Haeder 116d0ee1e0
better comment added by @Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:01 +02:00
Roland Häder e5c4b0203a
added more curly braces + a bit more usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:00 +02:00
Michael 7e54499856
"pending" shouldn't be set as well by default ... 2018-05-14 22:50:00 +02:00
Michael cd7c337134
Urgent bugfix: Public contacts had been blocked automatically when created 2018-05-14 22:50:00 +02:00
Michael 002a1d1f54
Reshares had been detected falsely so that were rejected by Diaspora 2018-05-14 22:50:00 +02:00
Michael d217d74081
Ensure that the link will be displayed correctly on Diaspora 2018-05-14 22:50:00 +02:00
Michael 3bb5a416f8
Some corrections 2018-05-14 22:50:00 +02:00
Michael 8b775d48f9
Replace old database queries with the new ones 2018-05-14 22:50:00 +02:00
Roland Häder dd6fd32883
rewrote based on CR by @Annando, thank you. It is now clear to me.
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:59 +02:00
Roland Häder 25fd270959
Continued:
- added spaces and curly braces
- added more TODOs as there really more to be done

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:58 +02:00
Roland Haeder fc4d1296e3
was a bit confusing for me or I was not sleeping to much ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:57 +02:00
Roland Haeder 4d5c61395e
PHP5 does not support native type-hints, except array + used dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:57 +02:00
Roland Haeder 03f283ca36
fixed comment and explained one
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
Roland Haeder d2d6200669
old behaviour restored
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
Roland Haeder be3d0a90a5
added curely branches + reverted back to old behaviour (may come back one day)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
Roland Haeder b823708c50
better comment added by @Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
Michael f1b5e828db Fix for the slow spawning of workers 2018-05-14 05:02:18 +00:00
Hypolite Petovan f937dabc9e
Merge pull request #5044 from annando/no-feed-reshare
We mustn't reshare a feed item (only DFRN and Diaspora)
2018-05-13 18:31:58 -04:00
Michael Vogel 24ef818d0d
Merge pull request #5038 from tobiasd/20180519-3834
dont delete but remove from your stream
2018-05-13 22:24:59 +02:00
Michael 57bd073ffd We mustn't reshare a feed item (only DFRN and Diaspora) 2018-05-13 18:31:01 +00:00
Hypolite Petovan 288b508e2a
Merge pull request #5041 from M-arcus/patch-1
[TASK] Automatic installation: Install theme
2018-05-13 10:03:11 -04:00
Roland Häder 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
Marcus Müller 64a799198a
[TASK] Automatic installation: Install theme 2018-05-13 12:50:53 +02:00
Tobias Diekershoff 17dda0fc43 dont delete but remove from your stream 2018-05-13 11:10:34 +02:00
Hypolite Petovan ec626fb76c
Merge pull request #5036 from Alkarex/fix-constants
Fix wrong use of class constants
2018-05-13 04:38:32 -04:00
Alexandre Alapetite 736c76d068 Simplify constant names
https://github.com/friendica/friendica/pull/5036#discussion_r187792865
2018-05-13 10:34:33 +02:00
Alexandre Alapetite 41a8c62bee Fix wrong use of class constants
http://php.net/manual/language.oop5.constants.php
2018-05-13 10:07:15 +02:00
Roland Häder 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
Roland Häder 3191fee763
Ops, one to much ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-13 10:02:47 +02:00
Michael 926c9719e0 Avoid SQL error with empty "bd" field 2018-05-11 15:27:19 +00:00
Michael 79a343a69a Only set the "updated" value when it contains a value 2018-05-11 10:44:28 +00:00
Michael f9c695e78d Fix SQL error during postupdate 2018-05-11 09:20:59 +00:00
Michael 8d8f2a1845 Change the community value as well 2018-05-11 08:04:01 +00:00
Michael 78271e88f5 Insert a gcontact on probing, but not insert a contact 2018-05-11 05:44:31 +00:00
Michael 3d2bc7700e Fix SQL error 2018-05-10 20:14:51 +00:00
Michael 6d4f3e8ee2 Issue 4997: Avoid database duplicates 2018-05-10 12:49:28 +00:00
Roland Häder cf9fa51f2f
Continued:
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
  long time around in PHP) anything can be handled over to the method/function.

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-10 13:07:21 +02:00
Roland Häder f66cb9b0a3
added more curly braces + a bit more usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-10 13:07:21 +02:00
Michael 40d3e7982c Adopt the relay definition according to the suggestions from @jaywink 2018-05-10 11:04:18 +00:00
Michael ed664b1091 For feed items show the avatar of the local user 2018-05-09 21:09:16 +00:00
Tobias Diekershoff 7f7ccc3f51 the widget is not needed here 2018-05-09 12:49:29 +02:00
Tobias Diekershoff 21f9f74ad0 use Archives for the additional feature setting like it is used in the network sidebar 2018-05-09 12:32:47 +02:00
Michael 3eb0b795fc Bugfix: Avoid empty avatar photos when a public contact is created 2018-05-09 06:53:57 +00:00
Michael 74908c0125 Corrected placeholders 2018-05-08 20:22:21 +00:00
Michael 08bf19082c Ensure that there will always be an author-id and owner-id in the items 2018-05-08 20:20:15 +00:00
Michael e7e0bee0a9 Added maintenance notice 2018-05-08 18:46:47 +00:00
Michael 6c35f8ebf3 Update script for setting author-id and owner-id in item and thread table 2018-05-08 17:50:06 +00:00
Michael 7d6b1264ec Fix for issue 4994: Feed items now appear again 2018-05-08 06:11:46 +00:00
Michael eb4650ff23 dbclean settings are now available from the frontend 2018-05-07 05:37:20 +00:00
Michael c33df7a05e Fix video display problems with videos with parameters 2018-05-06 16:57:46 +00:00
Hypolite Petovan 3a3a4807a8
Merge pull request #4978 from annando/dba-2
Diaspora: Fix person/contact retraction
2018-05-04 18:04:38 -04:00
Hypolite Petovan 4e1441bb3e
Merge pull request #4981 from annando/remote-self
"remote-self" is now working for Diaspora and Twitter as well
2018-05-04 17:50:17 -04:00
Michael dfa0dbf33f Ups 2018-05-04 21:33:15 +00:00
Michael 1230ff146a "remote-self" is now working for Diaspora and Twitter as well 2018-05-04 21:12:13 +00:00
Philipp Holzer 7e28e3e5f4 using \PDO instead PDO (bugfix) 2018-05-04 19:48:01 +02:00
Michael 6dbf0de9f2 Removed activities that aren't in the Diaspora protocol 2018-05-04 06:34:02 +00:00
Michael d52b226a6e Reformat wrong expansion 2018-05-03 20:49:32 +00:00
Michael 321a36d4db Avoid SQL error with wrong formatted datetime value 2018-05-03 20:48:35 +00:00
Michael 08bfced11b "pending" shouldn't be set as well by default ... 2018-05-03 18:19:40 +00:00
Michael bce3b6f896 Urgent bugfix: Public contacts had been blocked automatically when created 2018-05-03 17:43:10 +00:00
Michael 53b7028d35 Reshares had been detected falsely so that were rejected by Diaspora 2018-05-03 13:03:41 +00:00
Michael aba93df94f Ensure that the link will be displayed correctly on Diaspora 2018-05-03 04:43:50 +00:00
Michael eecd1e47e4 Some corrections 2018-05-02 21:12:48 +00:00
Michael 4ad655ab80 Replace old database queries with the new ones 2018-05-02 19:26:15 +00:00
Hypolite Petovan 538143f628
Merge pull request #4967 from nupplaphil/4899-autoinstall-with-file
AutomaticInstallation - use config file
2018-05-01 08:19:02 -04:00
Philipp Holzer 559250b8b3 Updated help-text
accidentaly changed `htconfig.php` (reverted)
2018-05-01 13:21:42 +02:00
Philipp Holzer 95ef07d67b Updated help-text 2018-05-01 13:14:41 +02:00
Philipp Holzer fa78f148c8 AutomaticInstallation - use config file
- added new parameter "-f config file" to `AutomaticInstallation.php`
2018-05-01 13:11:25 +02:00
Michael 1e0200884f Fixed private messaging/relaying is controlled by the parent 2018-05-01 06:37:12 +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
Michael b72bc0735f Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn 2018-04-30 16:52:44 +00:00
Michael a182dd3400 Improved logging, avoiding PHP warning 2018-04-30 16:46:49 +00:00
Michael 1a8d0a573e Bugfix: Contact wasn't added on probing 2018-04-30 16:45:00 +00:00
Michael 4909075321 Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn 2018-04-30 13:09:11 +00:00
Michael 5588f0d2ae Improved logging 2018-04-30 13:08:48 +00:00
Michael b2b597288c Deliver with the new function when delivering to a "uid=0" contact 2018-04-30 13:07:40 +00:00
Michael bbbebb2b9c Don't spool relay deliveries 2018-04-30 05:56:40 +00:00
Michael d0dd5c44d9 Update or create relay contact from discovery / process new protocol values 2018-04-30 05:33:47 +00:00
Philipp Holzer b4f5311e7f Add Install Mode
- merge `friendica/develop` to `nupplaphil/install_mode`
2018-04-29 20:15:12 +02:00
Michael Vogel bd0ba24518
Merge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app
Move current_theme() to App
2018-04-29 19:11:49 +02:00
Philipp Holzer da9ac7b879 Add Install Mode
- increased code quality
2018-04-29 18:13:24 +02:00
Philipp Holzer 6cb277b0bb Add Install Mode
- added PHP docBlock to methods
- increased code quality
2018-04-29 18:11:24 +02:00
Hypolite Petovan fde3d6f870 Replace current_theme() and current_theme_url() calls 2018-04-28 18:37:25 -04:00
Hypolite Petovan 964bf3f3cc Add new methods to src
- Add App::getCurrentTheme()
- Add App::getCurrentThemeStylesheetPath()
- Add Theme::getStylesheetPath()
2018-04-28 18:30:13 -04:00
Hypolite Petovan acbc733dce Fix formatting in Core\Theme 2018-04-28 18:28:23 -04:00
Michael Vogel 833fe0e0dc
Merge pull request #4942 from MrPetovan/task/import-post-ignored-contact
Import posts from ignored contacts
2018-04-28 18:16:30 +02:00
Philipp Holzer 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
Philipp Holzer 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
Philipp Holzer 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
Andreas Neustifter 91e0a9227e Fix #4943.
PR #4939 introduced a bug that only surfaces when using Network from extern.
Use proper self reference to fix that.
2018-04-28 06:46:46 +00:00
Hypolite Petovan bd21fc3751 Import posts from ignored contacts 2018-04-27 21:08:19 -04:00
Andreas Neustifter 9bf58e46f6 Changes requested by @MrPetovan. 2018-04-27 20:22:17 +00: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
Philipp Holzer d5b68cd146 Add a App-Mode with defined constants
- Normal Mode = 0
- Install Mode = 1
- Maintenance Mode = 2

Moved Install-Mode check to class `App`

Replaced all maintenance and install checks with $a->mode checks
2018-04-27 21:07:04 +02:00
Michael 6879be5168 Possibly not so important change ;-) 2018-04-27 14:21:12 +00:00
Michael 98415e0e34 Diaspora reshares should now always reshare the correct content 2018-04-27 14:03:10 +00:00
Michael 84909d9711 Standard stuff 2018-04-27 12:40:52 +00:00
Michael 9f5a6c05fb Preparation for relay posts with DFRN 2018-04-27 05:11:52 +00:00
Michael 4904be0d6f Better fallback on values > 299 as well 2018-04-27 04:55:46 +00:00
Michael 1e2bc1e6cf Ensure local delivery of Diaspora comments 2018-04-27 04:11:33 +00:00
Michael e3c9d31088 Added header 2018-04-27 03:08:13 +00:00
Michael 488c6c9b68 Constants moved 2018-04-27 02:52:12 +00:00
Michael 66e34b9357 Improvements 2018-04-26 22:30:43 +00:00
Michael 8c23fea1df Added some explanation, beautified code 2018-04-26 21:16:16 +00:00
Michael a785d8c2f9 Merge remote-tracking branch 'upstream/develop' into reworked-delivery 2018-04-26 20:42:57 +00:00
Michael 4957ab8fbb Avoid PHP warning with a missing key 2018-04-26 20:41:06 +00:00
Hypolite Petovan 33a551235e
Merge pull request #4934 from annando/distribute-precaution
Item distribution: Better don't store these values
2018-04-26 16:26:23 -04:00
Michael 4a792761d1 Item distribution: Better don't store these values 2018-04-26 20:11:29 +00:00
Hypolite Petovan 9e700ba6ea
Merge pull request #4933 from annando/bugfix-distribute
Bugfix: The Distribition of public items failed with comments
2018-04-26 16:02:56 -04:00
Michael da3658c80d Bugfix: The Distribition of public items failed with comments# Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen, 2018-04-26 19:47:12 +00:00
Hypolite Petovan f7f640175a Fix PHP 7.2 warning in Model\Profile 2018-04-26 04:56:42 -04:00
Michael a0c5a84ce8 Better way to fetch items 2018-04-26 07:11:18 +00:00
Michael b70b020490 Unneeded stuff removed, only fetch needed records 2018-04-26 06:23:01 +00:00
Michael 71d4c6e4a0 Cleaned up 2018-04-26 05:45:05 +00:00
Michael c437dac3a0 Delivery to non followers 2018-04-25 21:55:24 +00:00
Michael 3abd0b54cc Reworked delivery 2018-04-25 21:18:21 +00:00
Hypolite Petovan a9f1f47be2
Merge pull request #4931 from annando/no-ignored
Don't distribute for ignored contacts
2018-04-25 12:07:00 -04:00
Michael 66547e5107 Don't distribute for ignored contacts 2018-04-25 16:00:21 +00:00
Michael ad45a73bf3 Improvements for the Diaspora protocol 2018-04-24 18:34:35 +00:00
Michael 5019d46071 We only need the uid 2018-04-24 14:58:39 +00:00
Michael 5cf745af44 Item distribution is now done via the public post 2018-04-24 13:21:25 +00:00
Michael 7230cc0bed Merge remote-tracking branch 'upstream/develop' into item-distribution 2018-04-24 04:23:38 +00:00