Commit graph

20970 commits

Author SHA1 Message Date
Michael Vogel
edcd0a3744 Issue 4960: Ignoring and blocking of contacts should work again (#5657)
* Issue 4960: Ignoring and blocking of contacts should work again

* Renamed functions

* This function should be renamed as well.

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

* Hide some parts for public contacts

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

* We now show contact conversations and contact posts

* We now use a new conversation mode

* The update functionality is disabled until it will work completely

* Fixing tabs chaos

* Update after posts on the contacts page will now work

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

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

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

* Ops, one more left ...

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

* Added empty lines for better readability

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

* Re-fixed DBM -> DBA switch

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

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

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

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

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

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

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

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

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

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

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

* No instances from utility classes

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

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

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

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

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

* Ops, was added accidentally ...

* Ops, why these wrong moves?

* Ops, one to much (thanks to MrPetovan)

* Ops, wrong moving ...

* moved back to original place ...

* spaces added

* empty lines add for better readability.

* convertered spaces -> tab for code indenting.

* CR request: Add space between if and brace.

* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 01:05:49 -04:00
fabrixxm
93ba393559 API: add private value (bool) to item results (#5647)
* API: add private value (bool) to item results

friendica:private for xml
friendica_privarte for json

* API Docs: add a section about custom value returned in status data
2018-08-23 10:09:50 -04:00
Michael Vogel
dc3d2d5988 "dba" is now "DBA". This hadn't been respected at some places (#5655)
* "dba" is now "DBA". This hadn't been respected at some places

* Cleaning up unneeded stuff
2018-08-23 09:51:58 -04:00
Michael Vogel
d29cb1acaf Fix: Mail notifications arrive again (#5654)
* Fix: Mail notifications arrive again

* Ensure that user data is always there
2018-08-23 10:00:25 +02:00
Michael Vogel
20127a77b3 Removing a small notice in the network.php (#5652) 2018-08-22 18:46:44 -04:00
Michael Vogel
29b73877a9 Fix the settings in frio (#5650) 2018-08-22 00:14:16 -04:00
rabuzarus
1eb147cb48 fix redirection - don't dfrn auth when contact is still pending (#5648) 2018-08-21 23:58:09 -04:00
Michael Vogel
e20ea092d2 You can now filter the community page by account types (#5649)
* You can now filter the community page by account types

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

* And more notices removed that occured over night

* One more ..

* Some more notices of the day ...
2018-08-21 17:35:09 +02:00
Michael
1fb5925073 The notes are now fetching their content from a central function 2018-08-21 07:35:22 +00:00
Tobias Diekershoff
5a171c0afd
Merge pull request #5644 from annando/notices
And again ... notices
2018-08-21 06:06:52 +02:00
Michael
334c628511 And again ... notices 2018-08-20 21:20:21 +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
Tobias Diekershoff
15fb198109 typo in config/settings.ini.php (#5640) 2018-08-20 00:30:30 -04: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
rabuzarus
47c2565917
Merge pull request #5634 from astifter/photo_view_page_icons
[frio] Add icons on photo view page.
2018-08-19 23:04:28 +02:00
Andreas Neustifter
66d8a67884 Add icons on photo view page.
This page still had textual links, change them to icons. Also remove missleading header.
2018-08-19 21:53:32 +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
dfe4413463 Avoid blocks with invalid entries in superblock (#5635) 2018-08-19 12:14:12 +02:00
Andreas Neustifter
fc3aa9e58b [frio] Vertically align toolbar items. (#5633) 2018-08-19 02:19:36 +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
Philipp
4eaeea7889 Config Console Tests (#5621)
* Config Console Tests
- `MultiUseConsole` is now a testable console
- `ConsoleTest` is a abstract TestClass for console tests
- `ConfigConsoleTest` tests the config console commands

* disable preserve global state because of smarty

* fixed requires & basepath für Console Test
2018-08-17 19:41:46 +00:00
Michael Vogel
1711f4dc56
Merge pull request #5628 from tobiasd/20180817-cs
CS translation update THX Aditoo
2018-08-17 13:44:06 +02:00
Tobias Diekershoff
7b3cfcb469 CS translation update THX Aditoo 2018-08-17 10:28:57 +02:00
Tobias Diekershoff
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
Michael
0342f9e084 Removed notices, will it ever end? 2018-08-17 03:19:42 +00:00
Michael Vogel
2b67e8e80d
Merge pull request #5624 from fabrixxm/fix/api-seen
api: fix `friendica/notification/seen` api call
2018-08-16 12:41:57 +02:00
fabrixxm
66b4730a70 api: fix friendica/notification/seen api call
Fix return item related to notification when notification is set as seen
2018-08-16 11:46:53 +02:00
Tobias Diekershoff
6892e56b3e
Merge pull request #5622 from annando/forum-storage
Fix for storing posts of private forums
2018-08-16 09:28:57 +02:00
Michael
bb0cf93374 Fix for storing posts of private forums 2018-08-15 20:13:10 +00:00
Tobias Diekershoff
3488b937ea
Merge pull request #5620 from annando/fix-remove
Fix a fatal error when removing contacts
2018-08-15 14:31:13 +02:00
Hypolite Petovan
84a3cd747f Revert "Change contact post link to contact network page"
This reverts commit 4c32661022.
2018-08-15 12:12:49 +02:00
Michael
6d852ff6fd Fix a fatal error when removing contacts 2018-08-15 09:27:25 +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
Tobias Diekershoff
a8b74e6bc7
Merge pull request #5619 from annando/dba-item
Use the Item class instead of DBA calls when possible
2018-08-15 07:23:02 +02:00
Michael
e8334c4655 Use the Item class instead of DBA calls when possible 2018-08-15 04:41:49 +00:00
rabuzarus
e1d2ee3400 frio - add missing page template to various photo pages (fix missing background) (#5613) 2018-08-14 23:58:51 +00:00
Hypolite Petovan
4c32661022 Change contact post link to contact network page 2018-08-15 00:43:45 +02: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
1283b99c6f Removed notices in the frio theme (#5610)
* Removed notices in the frio theme

* And fixed notices in the notifications

* And some more in frio

* Null is the default value

* And some small notice in the probing removed

* Added note

* Clarified note

* And a removed notice in OStatus
2018-08-14 19:37:44 +00:00