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

1302 Commits

Author SHA1 Message Date
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
Philipp Holzer 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
Tobias Diekershoff e51a017d92
Merge pull request #4917 from annando/show-private-forums 
Show private forums in the sidebar
 2018-04-23 18:47:21 +02:00
Michael c3ee596ff4 Show private forums in the sidebar 2018-04-23 16:41:00 +00: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
Michael ba35b19af6 Public federated items now always are having an entry with "uid=0" 2018-04-23 11:14:25 +00:00
Hypolite Petovan a25c07b162
Merge pull request #4912 from annando/archivecontacts 
Added console command to manually archive contacts
 2018-04-23 02:07:53 -04:00
Michael b3d24f0ff2 DFRN: mark for archival at different places 2018-04-23 06:03:55 +00:00
Michael 866fbb4d80 Added console command to manually archive contacts 2018-04-23 05:33:47 +00:00
Hypolite Petovan 00985fe340 Fix self warning in Util\Temporal 2018-04-23 00:03:27 -04:00
Hypolite Petovan 9b052b5ea8 Fix count() warning in Object\Post 2018-04-23 00:02:18 -04:00
Hypolite Petovan b0564ea40d Fix count() warning in Model\Profile 
- Replace x() calls with empty() in Profile::load
- Remove extraneous $a->page['aside'] initialization
 2018-04-23 00:01:46 -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 390983a331 Haromonize Find People Widget. 
In the right_aside on the /contacts page in the left aside there are
almost identical widgets to search for contacts. Drop one and use common
widget in both places.
 2018-04-22 20:44:22 +00:00
Hypolite Petovan d977ff78df Uncomment some code in ItemContent::getPlaintextPost 
- I have no idea what I'm doing
 2018-04-22 11:43:27 -04:00
Michael Vogel 6e9ed3f01b
Merge pull request #4894 from MrPetovan/task/4513-show-events-reminders-attendence 
Only show event reminders of events attendyes or attendmaybe
 2018-04-22 17:38:32 +02:00
Hypolite Petovan 82ed6fff9f Use public_contact() instead of wrong query in Profile::getEventsReminderHTML 2018-04-22 11:29:55 -04:00
Michael 8f2db61538 Receiving of public posts is now working 2018-04-22 10:58:03 +00:00
Michael c59b28a8c4 create public endpoint 2018-04-22 10:04:30 +00:00
Hypolite Petovan e0b33b36a2 Decrease scope of query in Profile::getEventsReminderHTML 
- Use specific SELECT fields
- Use INNER JOIN
 2018-04-22 04:41:53 -04:00
Michael Vogel 25662eb6f4
Merge pull request #4892 from MrPetovan/bug/infinite-loop-in-dba-delete 
Prevent infinite loop when a dbstructure_definition hook is orphan
 2018-04-22 07:55:39 +02:00
Michael Vogel 39edd086e0
Merge pull request #4893 from MrPetovan/bug/4879-remove-backslash-in-birthday-events 
Fix quoting style in DFRN::birthdayEvent()
 2018-04-22 07:54:07 +02:00
Hypolite Petovan 08afec3170 Only show event reminders of events attendyes or attendmaybe 2018-04-21 22:53:13 -04:00
Hypolite Petovan 851c5d841f Fix quoting style in DFRN::birthdayEvent() 2018-04-21 21:03:12 -04:00
Hypolite Petovan 6d88984ee5 Move Model\Item::getPlaintextPost to Model\ItemContent::getPlaintextPost 2018-04-21 20:50:13 -04:00
Hypolite Petovan 18078ce7a4 Prevent infinite loop when a dbstructure_definition hook is orphan 
- Add cascade option to dba::delete
- use cascade = false for orphan hook deletion
 2018-04-21 20:34:07 -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
Michael 16beab4652 Better working with private forums 2018-04-21 21:59:02 +00:00
Tobias Diekershoff f63be91bd5
Revert "Moved .htconfig.php file & extracted Install business logic" 2018-04-21 16:28:22 +02:00
Philipp Holzer 334d392154 Merge remote-tracking branch 'origin/develop' into install_config 2018-04-21 14:23:49 +02:00
Philipp Holzer 346697d771 Moved .htconfig file 
Extracted install business functions to new Class `Install.php`
 2018-04-21 14:10:53 +02:00
Tobias Diekershoff ebe203336f
Merge pull request #4882 from annando/private-forums 
Contact requests from Diaspora for private forums aren't accepted automatically anymore
 2018-04-21 13:54:10 +02:00
Michael fd7658a70a Contact requests from Diaspora for private forums aren't accepted automatically anymore 2018-04-21 10:39:46 +00:00
Hypolite Petovan 1e67c32142 Fix BBCode::getAbstract scope 2018-04-21 04:38:27 -04:00