MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
18325 commits 3 branches 0 tags 96 MiB
Commit graph

6268 commits

Author SHA1 Message Date
Hypolite Petovan 51a29d381f
Merge pull request #3917 from annando/worker-again 
All workers in /include now moved to /src/worker
 2017-11-19 14:51:12 -05:00
Michael 8cd21269ff The last of the big workers moved ... delivery and notifier 2017-11-19 18:59:55 +00:00
Michael 5108115fc1 Now PubSubPublish moved as well 2017-11-19 17:36:20 +00:00
Michael 2de457489f "CreateShadowentry" and "ProfileUpdate" now moved as well 2017-11-19 16:59:37 +00:00
Michael 98686e9091 Queue.php is now moved as well 2017-11-19 16:35:45 +00:00
Michael 501514bd54 expire and gprobe now moved as well 2017-11-19 16:25:13 +00:00
Hypolite Petovan cfd5e5d475 Add orphan items as children to their top-level post 
- Make get_item_children deplete the item list
 2017-11-19 10:42:00 -05:00
Hypolite Petovan 104a1d7fd3 Move ITemplateEngine to src 
- Fix method name format
 2017-11-19 10:22:18 -05:00
Hypolite Petovan 4aa003f43f Use constant instead of hardcoded string for ACTIVITY_POST 2017-11-19 08:41:33 -05:00
Hypolite Petovan 0fe4233569 Improve documentation with brief key 2017-11-19 08:41:16 -05:00
Hypolite Petovan 81c3ddd1fb Add smart_flatten_conversation function 
- Fix doc
- Fix formatting
- Update conv_sort with smart threading
 2017-11-19 00:57:06 -05:00
Michael 1f28cbd2c6 And now DiscoverPoCo.php 2017-11-18 11:02:46 +00:00
Michael 01362461cf poller.php is cleaned up, unneeded stuff has been removed 2017-11-18 11:01:01 +00:00
Michael 925d2d2383 Directory moved 2017-11-18 07:59:30 +00:00
Michael 2515d02e6d SpoolPost moved 2017-11-18 07:44:38 +00:00
Michael 13f899542d dbupdate now moved as well 2017-11-18 07:31:33 +00:00
Michael 659748d27c include/shadowupdate.php wasn't used at all 2017-11-18 07:14:39 +00:00
Michael 04cc9bb4de CronJobs moved as well 2017-11-18 06:22:41 +00:00
Michael f2e792662f DBClean moved as well 2017-11-18 05:45:44 +00:00
Michael 3687ef2f8c Another worker process moved 2017-11-17 22:16:34 +00:00
Adam Magness d127d06388 Item to src 
object/Item moved to Friendica\Core namespace.
 2017-11-16 16:39:42 -05:00
Adam Magness 7c00401c66 Conversation to src 
object/Conversation moved to Friendica\Core namespace.
 2017-11-16 16:39:42 -05:00
Adam Magness 86073ddfd1 Removed require statement 
There didn't seem to be any ostatus function calls in this file. Running with it commented out produced no errors.
 2017-11-16 07:32:31 -05:00
Adam Magness f3c8af485f Require statement 
Not sure if this is needed or not, there are no ostatus:: calls in this file.
 2017-11-15 23:11:00 -05:00
Adam Magness cd12de46f8 OStatus moved to src 
OStatus moved to Friendica\Protocol namespace. References and function calls updated.
Related to #3878
 2017-11-15 23:09:11 -05:00
Michael 0aee6d383a Now there are four more ... 2017-11-15 21:12:33 +00:00
Michael 33e98d6264 Moved some workers in their new habitat 2017-11-15 20:59:42 +00:00
Adam Magness 9e90589c21 gsFunctions renamed 
gsFetchUsers -> fetchGsUsers
gsDiscover -> discoverGsUsers
 2017-11-15 12:02:08 -05:00
Adam Magness 259f91caa9 PortableContact created 
Create PortableContact and remove socgraph, update references, and calls
 2017-11-15 10:53:16 -05:00
Adam Magness 47db624105 GlobalContact created 
Moved DirSearch and GlobalContact related functions to Friendica\Model namespace
 2017-11-15 09:47:49 -05:00
Michael 9576f6743d Command back ... 2017-11-14 22:13:33 +00:00
Michael 405753d1c3 cron.php is reworked, other worker files had been moved temporarily 2017-11-14 21:50:16 +00:00
Michael 476facde61 Onepoll moved as well 2017-11-12 18:50:35 +00:00
Michael 1aa8f56662 The cronhooks are now changed 2017-11-12 07:24:49 +00:00
Adam Magness 4d146acf90 Smilies to src 
Move Smilies to Friendica\Content namespace.

Related to #3878
 2017-11-11 07:21:15 -05:00
Michael 731ec347b1 Removed old template parser 2017-11-11 09:26:23 +00:00
Tobias Diekershoff 6ae4396299
Merge pull request #3898 from annando/show-friends 
The friend contact block wasn't displayed in the profile
 2017-11-11 08:47:47 +01:00
Michael 3764dc2bf6 Some more code improvements, removed deprecated functions 2017-11-11 06:42:39 +00:00
Michael cfdbd07628 The friend contact block wasn't displayed in the profile 2017-11-11 05:23:28 +00:00
Adam Magness bc49fc974c Capitalized XML 
Acronym classes should be capitalized
 2017-11-10 07:45:33 -05:00
Adam Magness f245bc8359 Move xml to namespace 
Relocate xml from include to src
Related to #3878
 2017-11-10 07:18:24 -05:00
rabuzarus 10f385efc4 pure comments shouldn't use doxygen style 2017-11-09 19:37:05 +01:00
Adam Magness bc65cc2af1 Revert to require_once 
Keeping these statements as they were.
 2017-11-09 12:26:32 -05:00
Adam Magness 1565061454 Remove old cache file 
Now that all references are updated, remove old cache.php
 2017-11-09 11:49:27 -05:00
Adam Magness 06c3af9b60 Move Cache to src 
relocate the cache class to Friendica\Core namespace
 2017-11-09 11:05:18 -05:00
Hypolite Petovan acd65aade1 Switch to new php-encryption library version 
- Remove references to library/ files
- Add namespace to library classes
 2017-11-09 02:21:37 -05:00
Adam Magness aa13302bbc Review updates 
Documentation and yet another use statement
 2017-11-08 08:37:03 -05:00
Adam Magness 4ca68c7af0 Class file relocations 
Issue #3878
 2017-11-08 08:37:03 -05:00
Adam Magness 6189f6c8e7 Relocate class files from /include to /src/ 
dbm, Diaspora, dfrn, and NotificationsManager moved to namespace. Includes and references in files updated.
 2017-11-08 08:36:48 -05:00
Michael 76f73c7236 And some more places 2017-11-07 22:15:59 +00:00
Michael 5a6fa4ae87 Some more 2017-11-07 21:53:11 +00:00
Michael ab73dbf346 Here as well 2017-11-07 21:48:41 +00:00
Michael 9860488eec null is not false 2017-11-07 21:41:38 +00:00
Adam Magness a782ab50f9 Correct deletion 
Bring back mod/probe.php and delete include/probe.php as intended.
 2017-11-07 12:31:32 -05:00
Adam Magness 8522c47353 Remove Includes 
Removed references to include/config.php and include/probe.php and deleted the respective files.
 2017-11-07 12:14:03 -05:00
Adam Magness 59d6ae63b1 Spelling correction 
delete is not spelled delele!
 2017-11-07 11:05:16 -05:00
Adam Magness b995e858e6 Review changes 
Replacements for ::delete() as well as changes to include use statements.
 2017-11-07 09:12:01 -05:00
Adam Magness 0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
Hypolite Petovan c847a2f9cc
Merge pull request #3874 from tobiasd/20171009-checkversion 
check upstream version
 2017-11-06 13:59:49 -05:00
Tobias Diekershoff 3b15b19e62 switches, no ifs 2017-11-06 18:57:40 +01:00
Tobias Diekershoff 64066592a4 some debug logging 2017-11-06 18:27:29 +01:00
Tobias Diekershoff 143e7fc6b7 dont use the entire url as option 2017-11-06 18:05:42 +01:00
Tobias Diekershoff 1f9b52f2bf code corrections 2017-11-06 17:45:33 +01:00
Michael 930309d2ec Merge remote-tracking branch 'upstream/develop' into worker-class 2017-11-05 17:23:53 +00:00
Michael 70c08dee1d Some more improvements 2017-11-05 15:28:55 +00:00
Hypolite Petovan cff1de034f Remove reference to languagedetect in library folder 2017-11-05 09:00:34 -05:00
Michael 478e363967 proc_run was replaced 2017-11-05 12:15:53 +00:00
Michael da212a28a2 New worker class that does all the work 2017-11-05 10:33:46 +00:00
Tobias Diekershoff 3c60e6f183 missing value 2017-11-05 07:10:46 +01:00
rabuzarus 3b4f72da93 events: better comment description 2017-11-04 16:41:06 +01:00
rabuzarus 86d3adaa50 events: use best_link_url() and zrl() for the author_link (author link as magic-link) 2017-11-04 16:38:21 +01:00
Michael d2dc61c246 Logging for ejabberd authentication is now done via syslog 2017-11-04 08:36:42 +00:00
Tobias Diekershoff 22efc4833c call checkversion from cron jobs, LOW prio 2017-11-04 08:14:56 +01:00
Michael d739fe2503 Issue 3860: Enhanced support of "!" for forums 2017-11-03 05:07:19 +00:00
Hypolite Petovan da42b91096
Merge pull request #3858 from annando/direct-forum-post 
Forum posts with "!" are now created directly as forum post
 2017-11-02 16:39:20 -04:00
Michael c105a67cd9 Issue 3857: There is the possibility of a bad handling of dislikes 2017-11-02 20:29:18 +00:00
Michael a2f9ea2642 Forum posts with "!" are now created directly as forum post 2017-11-02 20:15:14 +00:00
Michael 6949ab25f7 A single mistake 2017-11-02 11:17:10 +00:00
Michael 5326b30ad1 Edits are now possible - but unsuccessful on the receiver side 2017-11-02 07:48:41 +00:00
Michael 01af4435c8 Now the public entry is created 2017-11-02 05:46:23 +00:00
Michael 82321114ab If a post is dedicated to a single forum then it will be rewritten to a forum post 2017-11-01 23:20:43 +00:00
Michael ba6cb7bacf Merge remote-tracking branch 'upstream/develop' into forum-exclamation 2017-10-31 20:02:36 +00:00
Michael Vogel 92a17643c9
Merge pull request #3848 from annando/session-destroy 
Bugfix: Avoid dba error message
 2017-10-31 21:00:31 +01:00
Michael 5222606602 Use the exclamation mark to address forums as well 2017-10-31 19:33:23 +00:00
Michael ba627c740f Bugfix: Avoid dba error message 2017-10-31 19:28:39 +00:00
Tobias Diekershoff 22aa7f9f07
Merge pull request #3846 from annando/session-destroy 
Avoid warning "Failed to write session data"
 2017-10-31 18:37:45 +01:00
Michael 4b0f8dad49 Some more onepoll bautification 2017-10-31 16:18:48 +00:00
Michael 7566464a58 Avoid warning "Failed to write session data" 2017-10-31 16:03:01 +00:00
Michael a492a13aeb onepoll.php is reworked 2017-10-31 13:32:11 +00:00
Michael 9804e65d18 Bugfix: not complete a url with parameter or fragment 2017-10-31 06:05:52 +00:00
Tobias Diekershoff 404ed27fb4
Merge pull request #3830 from annando/dba-pdo-connected 
DBA: The "connected" check for PDO didn't work.
 2017-10-29 08:11:27 +01:00
Michael 83bbbd1fe3 Issue 3828: Better handling if query doesn't return a value 2017-10-29 06:49:43 +00:00
Michael 1cbe27de12 DBA: The "connected" check for PDO didn't work. 2017-10-29 06:31:01 +00:00
Michael 0b7e8b7fb4 Hubzilla doesn't return the handle in the hcard 2017-10-27 06:17:24 +00:00
Tobias Diekershoff b8a8bb21d0 Merge pull request #3825 from annando/index-length 
Bugfix for "Index column size too large"
 2017-10-25 07:16:45 +02:00
Michael 6396f92d9b Bugfix for "Index column size too large" 2017-10-25 04:44:45 +00:00
fabrixxm a83b051003 Order result of api/statues/friends by nickname 2017-10-24 21:29:43 +02:00
Hypolite Petovan 0c347d1466 Merge pull request #3819 from annando/photo-rework 
Better handling for GIF even, if not supported by the graphics library
 2017-10-23 13:04:52 -04:00
Michael e40c3a9d7c Static public is public static 2017-10-23 14:49:56 +00:00
Hypolite Petovan 476d7d9533 Merge pull request #3813 from annando/remove-old-stuff 
Removed stuff that was never used or isn't used anymore
 2017-10-23 10:00:16 -04:00
Tobias Diekershoff d39b0584f0 Merge pull request #3818 from annando/structure-temp 
DBStructure: Better handling of temp table
 2017-10-23 11:47:46 +02:00
rabuzarus 2332d9f62a Merge pull request #3820 from annando/contact-posts 
The selection between posts from forums and other users had a problem
 2017-10-22 14:09:18 +02:00
Michael 596bb36151 Bugfix: The selection between posts from forums and other users had a problem 2017-10-22 09:02:54 +00:00
Michael Vogel 2c55d9f3ce Merge pull request #3817 from rabuzarus/20171019_-_fix_some_html_violations 
fix some HTML violations in frio
 2017-10-22 07:48:06 +02:00
Michael b513a597c8 Static methods should be called statically 2017-10-21 16:13:25 +00:00
Michael 405b6cf4ef DBStructure: Better handling of temp table 2017-10-21 14:29:55 +00:00
rabuzarus f2d51737eb fix some HTML violations in frio 2017-10-20 15:21:42 +02:00
rabuzarus 184bfc722d fix #3812 - some brocken parts in the display of events (default template) 2017-10-19 14:16:39 +02:00
Michael 69afe50345 Removed stuff that was never used or isn't used anymore 2017-10-19 07:41:15 +00:00
Michael 0695fa699c Removed "service class" functionality 2017-10-18 21:44:27 +00:00
Michael 1cff94d476 Bugfix: Item were stored before the expiration date 2017-10-18 18:01:08 +00:00
Michael Vogel d60f96f0e1 Merge pull request #3797 from rabuzarus/20171015_-_duplicate_event 
add event action: duplicate events
 2017-10-18 18:57:58 +02:00
Michael 4744d6bf84 we now provide a feed for the conversation 2017-10-18 06:25:22 +00:00
Michael e38da9a3a5 And some further refinements 2017-10-17 11:39:09 +00:00
Michael 9c5cd476dd Better rule to replace content 2017-10-17 09:58:29 +00:00
Michael 7c658439da Removed unneeded stuff 2017-10-17 09:14:10 +00:00
Michael aa284a2ae6 Enhance feed information 2017-10-17 09:10:19 +00:00
Michael 5498f04ffa OStatus: Auto subscribe to forum accounts 2017-10-17 04:45:38 +00:00
Michael 3eed3316ea Some more camels 2017-10-16 20:59:16 +00:00
Michael b521215383 Camels aren't studly 2017-10-16 20:57:53 +00:00
Michael f127d65de9 Added spaces 2017-10-16 20:55:37 +00:00
Michael 2a28591415 Complete incomplete URL during feed import 2017-10-16 20:31:13 +00:00
Tobias Diekershoff cadc8aa6e8 Merge pull request #3787 from rabuzarus/20171013_-_format_event_in_stream 
event items are now more themeable in the networkstream
 2017-10-16 11:29:43 +02:00
Tobias Diekershoff 3fd0210681 Merge pull request #3793 from annando/parse-fix 
Special treatment for HTTP Code 416
 2017-10-16 07:34:41 +02:00
Michael 0a1554e08b Special treatment for HTTP Code 416 2017-10-16 03:14:32 +00:00
Tobias Diekershoff 74af893b87 Merge pull request #3791 from annando/parse-fix 
Bugfix: Range checking with ParseUrl made problems
 2017-10-16 00:37:05 +02:00
Michael 08f461f70c Bugfix: Revive dead contacts 2017-10-15 19:34:15 +00:00
Michael 1506886947 Bugfix: Range checking with ParseUrl made problems - we now use the standard 2017-10-15 19:29:58 +00:00
rabuzarus 4584670af4 add event action: duplicate events 2017-10-15 17:30:28 +02:00
rabuzarus dcbf4d6d11 fix event html construction (fixes #2646) 2017-10-13 20:03:47 +02:00
rabuzarus 553428d1b1 event items are now more themeable in the networkstream. 
The event description stays the same - but the theme developer can provide an template how the other event data should be organized and look
 2017-10-13 19:42:27 +02:00
Michael e091a610d7 Fixed indention level 2017-10-13 16:24:38 +00:00
Michael b31c6413fe Can be private 2017-10-13 15:51:57 +00:00
Michael 9f2196aa1a Parameter should fit ... 2017-10-13 15:48:59 +00:00
Michael 0a45f40c9d Diaspora: We now support the receiving of account migration messages 2017-10-13 15:32:10 +00:00
rabuzarus 0882b2df97 Merge pull request #3779 from annando/event-data 
export event data for display purposes
 2017-10-13 13:06:46 +02:00
Michael b31b29c557 Now it could work 2017-10-13 09:41:01 +00:00
Michael 2b80bf4683 Improved documentation 2017-10-13 09:26:07 +00:00
Michael 09020192d6 Diaspora: Support account migration 2017-10-13 09:22:05 +00:00
Michael eeec1ea163 We should take the event-id as well 2017-10-11 20:45:03 +00:00
Michael 42a76bced9 export event data for display purposes 2017-10-11 19:51:18 +00:00
Michael 225eea2ca6 Avoid undefined class variables 2017-10-11 14:52:08 +00:00
Michael a29b7e7153 "dba" is now a static class 2017-10-11 12:56:36 +00:00
Michael dbcd1d1ae3 Additional check if the database object is initialized 2017-10-10 22:25:38 +00:00
Michael 63e02eb57f Checks if the database variable is initialized 2017-10-10 22:18:57 +00:00
Michael 763838c78d OStatus: Better handling of changed nicknames 2017-10-10 09:13:37 +00:00
Tobias Diekershoff 4c75c59039 Merge pull request #3772 from annando/relocate-ignore 
Process "relocate" messages even if we are ignoring a contact
 2017-10-09 05:16:32 +00:00
Michael 09af73168c Process "relocate" messages even if we are ignoring a contact 2017-10-09 05:02:50 +00:00
Tobias Diekershoff 495b639e55 .com -> .ca 2017-10-08 10:22:29 +02:00
Michael 5d0e7d24ba When showing posts for a contact we have to tread forums in a special way 2017-10-08 05:20:09 +00:00
Michael 67e57a83df Feeds are now trimmed before importing 2017-10-07 18:35:10 +00:00
Michael c6dbbe21b4 Preparation for the possibility to globally block contacts 2017-10-07 09:52:43 +00:00
Michael ceb0dda486 Fixes the not changed "addr" entry when an account is imported 2017-10-07 05:20:46 +00:00
Michael 1870f942d3 Fix SQL error when changing the SSL paths 2017-10-06 19:25:04 +00:00
Tobias Diekershoff 071946fa78 Revert "Update languagedetect library" 2017-10-05 11:58:18 +02:00
Tobias Diekershoff c22920edba Merge pull request #3743 from MrPetovan/task/update-languagedetect 
Update languagedetect library
 2017-10-05 08:49:17 +00:00
Michael a8a7f4a76d Better handling of blocked contacts in OStatus 2017-10-03 20:52:24 +00:00
Michael c33aa2ccee Diaspora: Reshares of reshares sometimes had problems 2017-10-02 19:00:33 +00:00
Michael fffc360c6a Detect the hostname when the URI is in the format data@host.tld 2017-09-30 21:39:32 +00:00
Michael 3354f01ed5 Doxygen and bugfix 2017-09-30 17:42:03 +00:00
Michael 2971501f63 The direct structure call is now only executed when called via the poller.php 2017-09-30 17:12:27 +00:00
Michael bd88179419 Add additional checks for the worker 2017-09-30 11:19:46 +00:00
Michael 42a8f27034 Semaphore lock deactivated for PHP lower 5.6.1 2017-09-30 07:51:09 +00:00
Michael 98a3e012f8 Reliably show posts from contact 2017-09-28 06:01:31 +00:00
Hypolite Petovan ba1975ac3a Remove references to the library/langdet folder 2017-09-27 22:40:58 -04:00
Michael 8d95106b9d XML parsing is more tolerant now 2017-09-25 21:34:44 +00:00
Michael 03c9e22334 Poller: A limit of 1 seems to be better 2017-09-25 19:33:41 +00:00
Michael 1aafb80743 Added log information 2017-09-25 06:04:40 +00:00
Michael 66515ed85e Diaspora: Posts from Diaspora relais are transmitted the old way 2017-09-25 04:24:47 +00:00
Michael 9d7ab9d941 OStatus: Thread completition hadn't worked for (some) Mastodon systems 2017-09-24 15:31:09 +00:00
Tobias Diekershoff bcdccac39c Merge pull request #3729 from annando/plaintext-again 
And another plaintext correction :)
 2017-09-24 16:00:39 +02:00
Michael 2b3bc54049 And another plaintext correction :) 2017-09-24 13:47:31 +00:00
Michael ff6f937f2b Author check works now 2017-09-24 13:27:35 +00:00
Michael 80d787d990 Bugfix: Diaspora retractions not always worked 2017-09-24 12:02:32 +00:00
Tobias Diekershoff e6f80b3bc1 Merge pull request #3726 from annando/plaintext 
Improved type detection
 2017-09-24 09:48:36 +02:00
Michael 17f2928535 Improved type detection 2017-09-24 06:36:03 +00:00
Tobias Diekershoff d6d1ee9112 Merge pull request #3724 from annando/plaintext 
Better content detection for posts to Twitter
 2017-09-24 07:23:47 +02:00
Michael fc1bfe043b The "else" case was only confusing 2017-09-23 23:15:04 +00:00
Michael d72e6b2c82 Bugfix for better mail import 2017-09-23 22:53:44 +00:00
Michael aeb6e53d02 Better content detection for posts to Twitter 2017-09-23 20:13:09 +00:00
Tobias Diekershoff 7360945d8a Merge pull request #3722 from annando/diaspora-plink 
The plink in Diaspora posts now links to the correct place
 2017-09-23 17:41:57 +02:00
Michael 8983dcaa77 Improvements for following/unfollowing of Diaspora and OStatus 2017-09-23 14:48:27 +00:00
Michael e8a2c68647 The plink in Diaspora posts now links to the correct place 2017-09-23 08:52:06 +00:00
Michael cb5b155083 Bugfix: The API picture upload created an invalid link 2017-09-20 21:47:12 +00:00
Tobias Diekershoff 3e8dc38180 Merge pull request #3716 from annando/bugfix-mail 
Bugfix: Mails weren't created
 2017-09-19 15:10:22 +02:00
Michael fdc010bb1b Bugfix: Mails weren't created 2017-09-19 12:59:24 +00:00
Michael b79c3241c6 Directly serve atom+xml if requested 2017-09-19 11:53:19 +00:00
Michael 5ed24954f0 Bugfix: Pleroma was detected as Mastodon 2017-09-18 06:09:18 +00:00
Michael 926314a24c gcontact is now updated with the new database functions as well 2017-09-17 08:13:10 +00:00
Michael 8d4736c942 OStatus: We can now process delete messages / better account detection 2017-09-17 08:01:22 +00:00
Tobias Diekershoff af44e96fc9 Merge pull request #3710 from annando/diaspora-retraction 
Diaspora: Sending retractions only worked for posts
 2017-09-16 21:24:50 +02:00
Michael ef8ad9f1ed Diaspora: Sending retractions only worked for posts - nor for comments or likes 2017-09-16 18:23:24 +00:00
Michael 0982a30c89 Improvement for PR 3705: The detection has to be changed here as well 2017-09-16 17:22:22 +00:00
Michael 0eb92bf12a Unused functions removed 2017-09-16 05:09:14 +00:00
Michael dfd48dd6f6 "qu" is no more 2017-09-15 21:00:39 +00:00
Michael 6d7ececc42 Bugfix for pictures that weren't stored / reworked database calls 2017-09-15 19:41:30 +00:00
Tobias Diekershoff 0384e875a2 Merge pull request #3702 from annando/new-dba 
The old database function is now replaced with a wrapper
 2017-09-15 08:31:25 +02:00
Michael f8d34e35e7 "exists", "select" whre is the difference? 2017-09-15 06:15:25 +00:00
Michael 88ada98245 Added documentation 2017-09-15 06:07:34 +00:00
Tobias Diekershoff ad3566aeaa Merge pull request #3704 from annando/ostatus-improved 
OStatus: Only fetch items that don't exist in the system
 2017-09-15 07:18:14 +02:00
Michael cf90e3571f Merge remote-tracking branch 'upstream/develop' into new-dba 2017-09-15 03:17:40 +00:00
Michael cd16155c96 Only warn when there are arguments at all 2017-09-15 03:10:04 +00:00
Michael f29e21eb5c We now avoid prepared statements without an argument 2017-09-15 03:00:38 +00:00
Michael d10eaefaa9 Improved regular expression for the Diaspora link detection 2017-09-14 22:04:37 +00:00
Michael 87fffde80e Documented some unknown verbs 2017-09-14 20:40:05 +00:00
Michael 9dfb9c1c45 Only fetch items that don't exist in the system 2017-09-14 19:23:14 +00:00
Michael 9468b7427d Allow replies as well 2017-09-14 10:00:45 +00:00
Tobias Diekershoff 641e41067e Merge pull request #3701 from annando/issue-3700 
Issue 3700: Security and Privacy related Headers
 2017-09-14 10:28:03 +02:00
Michael 4b99d122dd Added explanation 2017-09-14 05:48:43 +00:00
Michael 7a3bb02f11 Issue 3700: Security and Privacy related Headers 2017-09-14 05:40:23 +00:00
Michael c6ceae5225 The old database function is now replaced with a wrapper 2017-09-14 05:19:05 +00:00
Michael e18a037fb2 API: Improvements for clients with bad HTML support 2017-09-14 05:16:23 +00:00
Michael 519a8807f1 Added documentation 2017-09-11 22:15:16 +00:00
Michael ec929d8207 Fetch the own single post if we are processing a feed of multiple entries 2017-09-11 12:44:37 +00:00
Michael 8e17be7225 Store conversation data 2017-09-10 21:56:05 +00:00
Michael b847f63e2a Added logging 2017-09-10 08:27:24 +00:00
Michael bdf490e2fa Added missing function 2017-09-10 07:58:14 +00:00
Michael 21a630ebae Added documentation 2017-09-10 07:52:07 +00:00
Michael 746169eabf Improve comparabilty 2017-09-10 07:29:24 +00:00
Michael c98c157efe Only some tabs 2017-09-10 07:23:14 +00:00
Michael 4b403e4fe2 OStatus: Reworked import 2017-09-10 07:21:23 +00:00
Michael 52b12fccc9 OStatus: Attached pictures now show up in repeated posts as well. 2017-09-09 07:43:50 +00:00
Michael 637eb0bfb4 Bugfix: Mails weren't sent 2017-09-08 15:14:33 +00:00
Michael c44448dd57 We should reset the session variable 2017-09-08 08:50:08 +00:00
Michael a5a4f53287 This is a better place 2017-09-08 07:08:06 +00:00
Michael 3c6d83acd9 Remote self should now finally trigger all addons 2017-09-08 07:00:38 +00:00
Michael 6e196a6afd Diaspora will introduce "like on comment" so we doing it as well 2017-09-08 05:36:00 +00:00
Michael c3eaf336dc Removed code 2017-09-07 15:48:25 +00:00
Michael 6e670df80f OStatus: Better attachment handling for pictures 2017-09-07 15:34:50 +00:00
Michael 66968efb9a Logger date format is now ISO8601 compatible 2017-09-06 21:13:06 +00:00
Michael c35a43bcb8 "remote-self" hadn't worked well with addons 2017-09-06 06:02:26 +00:00
Michael cb8581b29a Support for server independant Diaspora style links 2017-09-06 04:55:36 +00:00
Tobias Diekershoff 65f1bcb780 Merge pull request #3673 from annando/contact-updating 
Better updating of contacts
 2017-08-30 22:34:01 +02:00
Michael 1cc50a80f4 Only update if there is a change 2017-08-30 19:33:16 +00:00
Michael 0083c16e87 Better updating of contacts 2017-08-30 18:05:41 +00:00
Michael dbaed91a75 Bugfix: Repeating of posts generated a SQL error 2017-08-30 17:55:23 +00:00
Michael 1893c3df16 Pleroma-Servers are now detected and displayed in the statistics 2017-08-29 16:40:08 +00:00
Michael 83ce42172b Don't add "redir" links on mentions 2017-08-27 09:56:41 +00:00
Michael 12ae59dba3 No linefeeds 2017-08-27 07:12:27 +00:00
Michael d8acb62ba6 Small formatting issue 2017-08-27 07:02:44 +00:00
Michael a36c8a0173 Possibly Issue 3611: Better feed handling when there is no body 2017-08-27 06:59:07 +00:00
Michael a729519de9 And some more static warnings removed 2017-08-26 10:01:50 +00:00
Michael c382f9f3d7 Some more 2017-08-26 07:52:49 +00:00
Michael 5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
Michael 3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
Michael b0c26921ad Statically used methods should be defined statically as well 2017-08-25 15:56:08 +00:00
Tobias Diekershoff 959d6ae15e Merge pull request #3654 from annando/externalpubsubhubbub 
Removed external pubsubhubbub URL
 2017-08-25 09:47:58 +02:00
Michael 5c53544118 Removed external pubsubhubbub URL 2017-08-25 02:58:38 +00:00
Michael 2ecd5a55b7 Bugfix for "1" instead of "connect" 2017-08-24 19:11:27 +00:00
Tobias Diekershoff 417ea99ba5 Merge pull request #3650 from annando/feed-probing 
Probing sometimes failed / problems with some web servers
 2017-08-24 10:16:24 +02:00
Michael c09c806f78 Probing sometimes failed / problems with some web servers 2017-08-24 07:56:46 +00:00
Michael ba52dd9fa7 Merge remote-tracking branch 'upstream/develop' into pleroma2 2017-08-24 06:26:58 +00:00
Michael 6998897a34 Limit the number of feed entries (Can solve resub problems) 2017-08-23 23:01:37 +00:00
Michael e533572ca3 Issue 3645: Avoid problems with boolean values 2017-08-23 19:40:42 +00:00
Michael b378f5fb01 The "hub" url now contains the nickname 2017-08-23 05:01:15 +00:00
Michael 51dca9b034 Compatibility with pleroma added 2017-08-21 20:21:04 +00:00
Michael 85c49060e2 Preparation for Unicode Emojis 2017-08-20 19:47:00 +00:00
Michael 17b05c9ad9 Hash tag links now do a redir 2017-08-19 09:22:50 +00:00
Michael f8946c9e0a When "local_search" is activated, then point all hashtags to the local server 2017-08-18 22:12:40 +00:00
Michael e10bb40e1a Added logging 2017-08-16 04:53:15 +00:00
Michael 791fc1d8b3 DFRN: Improved delivery status handling 2017-08-16 04:08:57 +00:00
Michael 6c9953809a Improved position of "close" 2017-08-15 10:10:09 +00:00
Michael a0567d4081 dbm::is_result now checks whether a dba:... call returns at least one result 2017-08-15 06:08:26 +00:00
Tobias Diekershoff d2b7a44299 Merge pull request #3631 from annando/1708-libertree 
Shared posts to Libertree now look better.
 2017-08-15 07:44:53 +02:00
Michael 3290ccc779 Now some more stuff is fixed 2017-08-14 21:46:58 +00:00
Michael 4f6f47f714 Now the bugfix really should work 2017-08-14 20:58:02 +00:00
Michael 2d99e86b12 Bugfix for PR 3630: "get_contact_details_by_url" not always returned a value 2017-08-14 20:17:17 +00:00
Michael 3c59eefa22 Shared posts to Libertree now look better. 2017-08-14 19:16:28 +00:00
Michael 796cee6273 Cleaning code 2017-08-14 05:52:36 +00:00
Michael 1fa82581b6 Avoid warning 2017-08-14 05:47:25 +00:00
Michael 217a8ce6ee Events now work again 2017-08-14 05:05:32 +00:00
Michael 0ac725dc47 Some more updated queries 2017-08-12 22:15:16 +00:00
Michael 41a81624a2 Now deletions will also work with complicated queries 2017-08-12 18:07:47 +00:00
Michael 89017d4e6c DBA: The condition can now be a complex string 2017-08-12 13:54:29 +00:00
Michael 1d8c91c478 Restructured "dba::exists" function 2017-08-12 08:55:50 +00:00
Michael b14b44e8a8 Merge remote-tracking branch 'upstream/develop' into dba-2 2017-08-12 07:37:06 +00:00
Michael 51f6c46923 Issue 3616: Don't create notifications for forum accounts 2017-08-12 05:08:45 +00:00
Michael 4ada71081f No timeout problem anymore in preview. 2017-08-11 20:25:02 +00:00
Michael 556cc0cc4c And some more changed lines 2017-08-11 19:26:08 +00:00
Michael 99f0c01cdd Some more changed queries 2017-08-11 16:21:55 +00:00
Michael d810b21f87 New dba functions 2017-08-11 08:04:01 +00:00
Michael 7b6664f0f7 Improved parameter handling 2017-08-10 12:38:32 +00:00
Michael 33b61ab262 Database connections should be closed 2017-08-10 06:33:24 +00:00
Michael eb7cbb9ada Now there are fewer than 300 updates left ... 2017-08-10 05:07:23 +00:00
Michael bd8efb7f92 Several updates are transformed as well 2017-08-10 04:31:46 +00:00
Michael 03b86d3766 Now we have less than 100 insert commands, yeah 2017-08-09 23:02:57 +00:00
Michael c6b04aa922 And some more inserts 2017-08-09 22:23:46 +00:00
Michael 6180d62ebc Some more inserts 2017-08-09 22:04:00 +00:00
Michael f248f9cc85 Merge remote-tracking branch 'upstream/develop' into new-dba 2017-08-09 21:42:51 +00:00
Michael fce72cbbc8 Modifed "update" and "insert" function / many changed queries 2017-08-09 21:12:41 +00:00
Michael b01ab3e64c DBA: Do a fallback to other db functions on problems 2017-08-09 06:02:48 +00:00
Tobias Diekershoff 4d77c8a90a Merge pull request #3618 from annando/mysqli-fix 
Quickfix for MYSQLi (prepared statement problem)
 2017-08-08 09:32:26 +02:00
Michael c3e1f88d4b Quickfix for MYSQLi (prepared statement problem) 2017-08-08 06:07:04 +00:00
Johannes Schwab 37262c24d9 Catch exceptions in PDO constructor 2017-08-04 11:01:29 +02:00
Tobias Diekershoff 93fb98959a Merge pull request #3613 from annando/some-ostatus 
Speed up of OStatus transmission/Ignoring "created" with remote self
 2017-08-03 08:01:04 +02:00
Michael 1bd85971a4 Avoid some PHP warnings, no functional changes 2017-08-03 05:50:44 +00:00
Michael a80329b416 Speed up of OStatus transmission/Ignoring "created" with remote self 2017-08-03 05:42:44 +00:00
Michael c98ae304c0 Endless scroll now avoids showing the same items 2017-07-31 06:04:37 +00:00
Michael 57b4ea4759 Bugfix: The ACL lookup had its problems after the last changes 2017-07-27 14:02:25 +00:00
Tobias Diekershoff f3f42ae3a2 Merge pull request #3602 from annando/1707-expiration 
Bugfix: the expiration check in item_store now works again
 2017-07-23 22:21:30 +02:00
Michael b266d7d6ff Bugfix: the expiration check in item_store now works again 2017-07-23 19:59:29 +00:00
Tobias Diekershoff 152eec4f2f Merge pull request #3597 from annando/1707-acl-separator 
In the acl there is now a separation between groups, forums and contacts
 2017-07-23 10:27:40 +02:00
Michael 2e704d79eb In the acl there is now a separation between groups, forums and contacts 2017-07-23 06:49:31 +00:00
Michael 8d66909ba5 Check general expiration time at item storing as well 2017-07-23 05:51:55 +00:00
Michael Vogel 0f67d82d05 Update socgraph.php 
Two little style changes
 2017-07-21 19:36:13 +02:00
zotlabs a583bda5fc reduce the number of network fetches for server detection of hubzilla/red systems from around 10 to maybe 5. Kind of wasteful to get hit on 10 non-existent endpoints every couple of minutes. 2017-07-19 17:56:40 -07:00
Michael 4a7ca0d44f Fix crash with expiration, false logger constant, no empty postings 2017-07-19 05:51:39 +00:00
Michael a5baba84af Only show the attachment elements if there are one. 2017-07-17 19:49:58 +00:00
Michael 1c8e74edce Attachments now look fine. 2017-07-17 19:38:15 +00:00
Michael f65d6531ca Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach 2017-07-15 10:36:56 +00:00
Michael 2bad626be6 Bugfix: Signatures for likes hadn't been stored 2017-07-15 04:03:50 +00:00
Michael b49a36f949 The attached image has now a class 2017-07-15 04:02:12 +00:00
Michael 181947f774 Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach 
Conflicts:
	include/text.php
 2017-07-13 20:38:18 +00:00
Tobias Diekershoff 86934119b1 Merge pull request #3580 from annando/issue-3571-2 
Reworked "get_contact"
 2017-07-13 08:34:59 +02:00
Tobias Diekershoff 3334e0332d Merge pull request #3582 from annando/duplicate-error 
Avoid duplicate database errors when storing the conversations
 2017-07-13 08:30:20 +02:00
Michael 4c7a197f4b Avoid duplicate database errors when storing the conversations 2017-07-13 06:00:53 +00:00
Michael beaa911bac Bugfix: Some special characters weren't converted correctly 2017-07-13 05:57:37 +00:00
Michael 568abd537a Fixed error reporting 2017-07-12 08:14:36 +00:00
Michael 69f20959ff Update existing contact records with data from probing 2017-07-12 06:07:22 +00:00
Michael a47e1e13d7 Process all data that we can fetch via probing 2017-07-12 05:56:35 +00:00
Michael 35b3723c4a database logging now works for database errors 2017-07-11 19:14:49 +00:00
Michael 8ec7f1de56 Issue 3571: Reworked "get_contact" function 2017-07-11 18:32:35 +00:00
Tobias Diekershoff 81dedb3f92 Merge pull request #3577 from annando/2in1 
Issue 3571 and Diaspora mail bugfix
 2017-07-11 08:31:39 +02:00
Michael 363322ba78 Issue 3571 and Diaspora mail bugfix 2017-07-10 22:35:32 +00:00
Michael Vogel ef3398f09a Merge pull request #3573 from irhen/issue-3529-fix-mega-age 
fix big age
 2017-07-10 18:43:05 +02:00
irhen c6137ca0df is empty check 2017-07-10 14:17:06 +03:00
Tobias Diekershoff 6bbc1ac602 Merge pull request #3575 from annando/dfrn-update-copy 
DFRN: Update the public item copy as well
 2017-07-09 10:17:22 +02:00
Tobias Diekershoff 5921fd03e5 Merge pull request #3574 from annando/further-expire-split 
Split the delete process into a separate expire process
 2017-07-09 10:15:34 +02:00
Michael 9f92fddb00 DFRN: Update the public item copy as well 2017-07-09 04:29:35 +00:00
Michael af181941db Split the delete process into a separate expire process 2017-07-09 03:37:20 +00:00
irhen 534f79a5a5 fix big age 2017-07-08 23:30:30 +03:00
Dean Townsley 11d271f3c5 Only delete uid=0 entries when cleaning up extra public entries 
This delete can inadvertently remove contacts from normal users under
some conditions.  Since it appears to be intended to only operate on
"public" (uid=0) contacts, this change constrains the delete query to
only uid=0 records.
 2017-07-08 09:55:40 -05:00
Tobias Diekershoff d88584af69 Merge pull request #3567 from rjm6823/develop 
Contacts page directory link
 2017-07-08 08:36:54 +02:00
RJ Madsen d7de2e0750 Fixed minor spaces to tabs conversion 2017-07-06 17:33:30 -04:00
RJ Madsen c4b40babb0 Switched to proper global directory instead of local directory 2017-07-06 17:31:36 -04:00
RJ Madsen 7593152bcb re-named variable to match scheme 2017-07-06 16:37:55 -04:00
RJ Madsen b7b8c5477b Converted from space to tab indentation 2017-07-06 15:27:03 -04:00
RJ Madsen 255f38710c Added global directory link to the find people side panel 2017-07-06 14:19:58 -04:00
Michael 30b0a035f9 Split expire.php in several processes / small worker changes 2017-07-06 05:48:02 +00:00
Michael c8b1b51809 Improved logging 2017-07-04 05:31:42 +00:00
Michael 0ab7915810 Only kill the first stale process 2017-07-04 05:01:06 +00:00
Michael bae4569a0b Avoid the killing of the wrong process 2017-07-02 19:43:36 +00:00
Michael 0cd9db9cb7 Degrade priority step by step 2017-07-01 18:55:12 +00:00
Michael 7726353601 Prevent soon killings 2017-06-30 23:08:08 +00:00
Michael 99b86c9fd9 Just found the handbrake ... 2017-06-29 21:19:31 +00:00
Michael 18d6eba8d0 Some more performance stuff 2017-06-29 05:40:02 +00:00
Michael 4515c36f69 Semaphore based locking and hopefully the fix for the workerqueue 2017-06-28 04:53:11 +00:00
Michael 7097673fa1 Bugfix: Poller entries had been executed multiple times 2017-06-21 03:49:05 +00:00
Hypolite Petovan ea88e15a8c Merge pull request #3473 from Quix0r/rewrites/coding-convention-split2-6-2 
Coding convention applied split 2-6-2 (of 2-14-2)
 2017-06-18 18:44:34 -04:00
Roland Häder 29ca5b3021
added missing curly brace ... :-( 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-18 23:15:50 +02:00
Roland Häder c0a0748831
converted upper-case to lower-case as they are no constants but keywords 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-18 23:15:11 +02:00
Roland Häder dc8f758860
Opps, also this! 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-18 22:14:31 +02:00
Roland Häder 470556764b
Fixed some stuff as requested by @Hypolite 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-18 22:10:03 +02:00
Tobias Diekershoff b000012bc3 Merge pull request #3537 from annando/1706-diaspora2 
We now use the new Diaspora protocol for sending
 2017-06-18 21:31:25 +02:00
Michael fda4cd6001 Changed documentation 2017-06-17 19:13:40 +00:00
Michael ec8a945189 Corrected query 2017-06-17 14:15:17 +00:00
Michael cf179188b6 Some more worker fine tuning 2017-06-17 13:58:18 +00:00
Michael e33ac224b0 Now the Salmons flys 2017-06-17 08:58:28 +00:00
Michael 2ee8d1694f Added documentation 2017-06-16 21:01:56 +00:00
Michael 9c4bf6b0d5 The new envelope could work now 2017-06-16 20:57:35 +00:00
Michael c031482d7d "unsharing" is now done different 2017-06-16 16:39:17 +00:00
Michael 5a11ef5b90 Merge remote-tracking branch 'upstream/develop' into 1706-diaspora2 2017-06-16 06:10:35 +00:00
Michael 0dc1c932f8 We now should send all data in the new format 2017-06-16 05:21:25 +00:00
Michael a453ae4f66 Removed unneeded stuff 2017-06-15 21:45:36 +00:00
Michael f36ffe3c03 Just some more message types 2017-06-15 21:20:18 +00:00
Michael 6482495001 We now use the new Diaspora format while sending 2017-06-15 20:50:53 +00:00
Michael bafa26c060 We don't need the timeout there anymore 2017-06-13 22:25:24 +00:00
Michael a7526f1291 New function for affected rows 2017-06-13 21:56:50 +00:00
Roland Häder 4e49939421
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-13 23:26:06 +02:00
Michael a056afd566 Small corrections 2017-06-13 20:51:24 +00:00
Michael 5183de8075 Don't fork these calls 2017-06-13 15:14:53 +00:00
Michael 21e84e4d25 Fetching new queue tasks in a bulk to increase speed 2017-06-13 13:51:25 +00:00
Michael e232c683b6 Changed timeout, logging added 2017-06-13 09:03:19 +00:00
Michael cd129665ef örgs 2017-06-13 05:56:02 +00:00
Michael 97be344a4a Handle deadlocks centrally 2017-06-13 05:52:59 +00:00
Michael 228993596a Really fast, sadly with deadlocks 2017-06-12 21:39:20 +00:00
Michael 1301a29505 It's faster without locks, gnarl ... 2017-06-12 19:20:50 +00:00
Michael 1932a6d634 Replaced "table lock" - it is not so good, it seems 2017-06-12 14:19:47 +00:00
Michael 2372ef7fd5 Locking seems to be better here 2017-06-12 12:28:48 +00:00
Michael dc00d89b9a Remove test message 2017-06-12 09:45:13 +00:00
Michael 8be52424f5 Only check for stale processes every 5 minutes 2017-06-12 09:44:46 +00:00
Michael 4fdaca861b Contact ID is integer 2017-06-11 20:25:51 +00:00
Michael 7d0a7f6be9 We got rid of two workerqueue queries, yeah! 2017-06-11 19:51:18 +00:00
Michael 06815f1a38 Merge remote-tracking branch 'upstream/develop' into 1706-worker-even-faster 
Conflicts:
	include/poller.php
 2017-06-11 07:49:34 +00:00
Michael 4f70682f7a Inherit the creation date 2017-06-11 07:41:38 +00:00
Tobias Diekershoff 1838024f6d Merge pull request #3528 from Hypolite/task/replace-explicit-php-logical-operators 
Replace explicit php logical operators
 2017-06-09 07:44:19 +02:00
Hypolite Petovan ad4cdf2a9d Replace lowercase operators 2017-06-08 21:03:44 -04:00
rabuzarus fa27256932 Merge pull request #3527 from annando/acl-speedup 
Increase the page load speed with Frio
 2017-06-08 23:09:49 +02:00
Michael 34815de99c Changed documentation 2017-06-08 21:00:45 +00:00
Michael f1119b4198 Removed commented out line 2017-06-08 20:53:21 +00:00
Michael 8f336bffc2 further improvements to the workerqueue 2017-06-08 20:43:30 +00:00
Tobias Diekershoff b9b047f2af Merge pull request #3523 from annando/issue-2864 
Issue 2864: Create a alternate link for every status
 2017-06-08 10:45:36 +02:00
Michael 0541a62134 The function "construct_acl_data" isn't used at all, it seems. it is deactivated now 2017-06-08 03:56:42 +00:00
Hypolite Petovan 2281989866 Replace && by AND in SQL queries 2017-06-07 22:01:14 -04:00
Hypolite Petovan 9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
Michael d5cc757943 Merge branch 'bugfix-index' of github.com:annando/friendica into acl-speedup 2017-06-07 20:26:00 +00:00
Michael 1916f7858f Increase the page load speed with Frio 2017-06-07 19:51:37 +00:00
Michael 71a5de40f1 The index mustn't be 192 characters long 2017-06-07 18:34:17 +00:00
Michael 5aee2fde1b Merge remote-tracking branch 'upstream/develop' into issue-2864 2017-06-07 18:17:37 +00:00
Michael 1b5f1effa0 Code beautification 2017-06-07 09:51:21 +00:00
Michael 2ad784d37a Speeded up calling "proc_run" 2017-06-07 05:42:30 +00:00
Michael 6161ceff64 Merge remote-tracking branch 'upstream/develop' into 1706-lock 2017-06-07 05:28:37 +00:00
Michael 6e6941a546 We have an alternate link 2017-06-06 21:56:25 +00:00
Michael 4e748668c6 Spaces 2017-06-06 20:10:47 +00:00
Michael 910cca0629 Attached pictures in OStatus posts are now displayed 2017-06-06 17:55:14 +00:00
Michael 929f518e5c Added documentation 2017-06-06 17:38:58 +00:00
Michael de9cddc82f Merge remote-tracking branch 'upstream/develop' into 1705-dbclean-advanced 2017-06-06 17:30:40 +00:00
Michael Vogel f4652d6e50 Merge branch 'develop' into 1706-lock 2017-06-06 14:16:00 +02:00
Michael f96423feae Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock 2017-06-06 12:12:07 +00:00
Michael 8d13751d40 Increased database version 2017-06-06 12:07:27 +00:00
Michael e00105d649 Don't fork a new worker 2017-06-06 11:59:38 +00:00
Tobias Diekershoff f3d8da7d33 Merge branch 'master' into develop 2017-06-06 12:20:55 +02:00
Michael ba7b4fddea memory check is now also only done once in a while 2017-06-06 04:00:24 +00:00
Michael 2b04865cdb We found the handbrake ... 2017-06-05 22:41:33 +00:00
Michael 2bff8e302a Removing the lock after the process was removed is better 2017-06-05 16:56:21 +00:00
Michael b86c4d539e Locking waits now for a shorter period. DB locking is used at other locations as well 2017-06-05 14:59:53 +00:00
Michael 8db079c65e Don't always fork the poller. 2017-06-05 06:08:26 +00:00
Michael fb72fc77f5 Some code beautification 2017-06-04 20:03:37 +00:00
Michael 2d229ad856 Merge remote-tracking branch 'upstream/3.5.2rc' into 1706-lock 2017-06-04 19:06:40 +00:00
Michael 16276b21eb Typo 2017-06-04 19:05:15 +00:00
Michael bde4943da5 Every hour should mean: every hour :) 2017-06-04 19:01:22 +00:00
Michael 30b24a2908 Locking seems to work great now 2017-06-04 18:59:50 +00:00
Michael bca5776e9c Lock now can use the memcache as well 2017-06-04 15:59:20 +00:00
Michael d2cb87a200 Database locks are now having its very own functions 2017-06-04 12:59:29 +00:00
Michael ad53a03f83 It should be "e" not "p" 2017-06-04 09:00:07 +00:00
Michael 32f61016d3 Overhauled "lock" functionality 2017-06-04 07:26:21 +00:00
Michael 945d3cc048 The constant CURLE_OPERATION_TIMEDOUT isn't defined on older PHP versions 2017-06-03 19:46:19 +00:00
Tobias Diekershoff ec5a3c3440 Merge pull request #3514 from annando/worker-locking 
Fixed locking behaviour for the worker
 2017-06-03 11:02:50 +02:00
Michael 21eb9a4b2e Fixed locking behaviour for the worker 2017-06-03 07:25:01 +00:00
rabuzarus 8806688d68 restructure the conditions if gnetwork and gaddr is empty 2017-06-01 12:47:47 +02:00
rabuzarus a726056c5f use get_contact_details_by_url() instead of Probe:uri() 2017-06-01 11:44:59 +02:00
rabuzarus 8311af3e92 use Probe:uri() instead of probe_url 2017-05-31 18:43:57 +02:00
rabuzarus df7acc7655 Bugfix: don't probe for introduction if it is not necessary 2017-05-31 14:29:33 +02:00
gerhard6380 1a0e8723c5 corrected change 
sorry, I should not change code late in the evening when I am already tired.
 2017-05-31 10:33:35 +02:00
gerhard6380 bbddea03e9 API: link to original page for feed posts 
link to original page added to html output of feed posts if body is empty
 2017-05-31 02:24:09 +02:00
Michael 81c87885cf Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-30 21:07:28 +00:00
Michael f6d10198cc Bugfix: The poller often couldn't store the pid in the workerqueue 2017-05-30 13:20:29 +00:00
Michael c9ea18ce74 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-29 20:54:43 +00:00
Michael a32de855cc Don't quit if the own host cannot be reached via SSL 2017-05-29 19:14:44 +00:00
Michael 104acec09c The database structure is now checked ad the admin summary page 2017-05-28 08:39:41 +00:00
Michael 497778ef54 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-25 06:03:08 +00:00
Michael 646ef9842c Bugfix: pubsubpublish has always to be called with high priority 2017-05-25 03:04:26 +00:00
Michael d649873f80 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-24 20:55:12 +00:00
Michael 3d14fa3d81 Priority needs to be integer 2017-05-24 10:36:44 +00:00
Michael d2dd0b3248 Minimal poll intervall 2017-05-24 08:21:05 +00:00
Michael d7de7bb70a Optimized priorities for the automated expiring of items 2017-05-24 06:29:47 +00:00
Michael 8abdbb799a Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-23 08:13:37 +00:00
Michael 1bd6d7dd7a Bugfix OStatus: Avoid empty author data 2017-05-23 05:28:51 +00:00
Roland Häder e9c9c47a84
Continued a bit: 
- opps, cherry-pick/rebase/what-ever did not take all over
- used x() for array key check

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-22 13:09:07 +02:00
Roland Häder 291af19f25
Some improvements 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-22 13:06:22 +02:00
Michael ac65423de1 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-20 20:08:24 +00:00
Michael 44efdc3e1b Central item expiration routine for external items 2017-05-20 20:02:06 +00:00
Michael 6e8e326705 Bugfix: Timeout problems when saving profile settings 2017-05-19 06:01:13 +00:00
Michael 192a5e254a Merge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail 2017-05-17 19:56:38 +00:00
Michael 696404739b Bugfix Diaspora: We exited with the wrong return values and the guid for messages was too short 2017-05-17 19:25:30 +00:00
Roland Häder b6648215b8
Opps, missed them 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:42:40 +02:00
Roland Häder 98b407218d
Fixes: 
- don't do $string[position] anymore, use substr() instead
- 'extends' was hanging loose there, rewrote it twice to fix parser error

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:39:10 +02:00
Roland Häder 0e0fb2b1ee
removed TODOs 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:34:16 +02:00
Roland Häder 11c16f1123
Continued: 
- added more curly braces
- replaced if (blaFoo()) { return true; } return false; with return blaFoo();
- added spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:32:03 +02:00
Roland Häder 0394004fee
reverted comments, but maintained multi-line comment. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:11:22 +02:00
Roland Häder 4c2d4934f7
Some CR applied: 
- removed todo
- added explanation
- merged next if() block with already merged

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:06:13 +02:00
Roland Häder f55ea4bc83
tpzo fixed again ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:02:44 +02:00
Roland Häder afb430b908
tpzo fixed 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 15:41:01 +02:00
Roland Häder 249065b421
opps, went in again? :-/ 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 15:31:46 +02:00
Roland Häder 031d96d933
improved some comments 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 15:28:01 +02:00
Roland Häder 635b26353c
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-05-17 15:08:15 +02:00
Roland Häder 347803fd5c
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-05-17 15:08:15 +02:00
Roland Häder f66c5c6823
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-05-17 15:07:31 +02:00
Michael cb3077b7a9 It is better this way 2017-05-17 06:07:55 +00:00
Michael 7daf5ecde1 Use the contact picture instead of the profile picture 2017-05-17 06:00:20 +00:00
Michael 80103f8ad9 Issue 3309: Avatar update should work now 2017-05-16 21:21:54 +00:00
Roland Häder d7b420a44e
opps, re-introduced this out-dated code by mistake 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-16 20:13:08 +02:00
Roland Häder 79d524a9ad
opps, added missing curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-16 17:56:36 +02:00
Roland Häder f4a33ed3f0
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-05-16 14:40:07 +02:00
Roland Häder 701e761c68
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-05-16 14:37:12 +02:00
Hypolite Petovan 48e3f4f47f Merge pull request #3465 from annando/bugfix-dba-1 
Bugfix: dba::num_rows hadn't checked the object variable
 2017-05-16 02:05:16 -04:00
Michael 41f94a62fc Spelling 2017-05-16 06:00:01 +00:00
Michael 124690cc4d dba: Beautification is now a separate function 2017-05-15 21:06:17 +00:00
Michael 875592f285 API: Direct Messages via the API now work again. 2017-05-15 20:11:33 +00:00
Michael 83e4141639 Bugfix: dba::num_rows hadn't checked the object variable 2017-05-15 15:17:38 +00:00
Michael 05c890f256 Bugfix: The commit in dba::delete was never executed 2017-05-14 07:01:38 +00:00
Michael e884090efa Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba 
Conflicts:
	include/uimport.php
 2017-05-13 04:13:07 +00:00
Michael 74a0a92742 Just some more dba::delete 2017-05-13 04:04:17 +00:00
Hypolite Petovan 2bbcbdc704 Merge pull request #3381 from Quix0r/rewrites/coding-convention-split2-4-2 
Coding convention applied split 2-4-2 (of 2-14-2)
 2017-05-12 21:40:30 -04:00
Roland Häder cc4b481bc9
fixed parser error, need parentheses 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-12 21:02:58 +02:00
Michael 2b180d7804 Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba 2017-05-12 16:12:00 +00:00
Michael 377fe31907 dba functions in poller / avoiding SQL errors in conversation / dbclean is better 2017-05-12 16:09:25 +00:00
Hypolite Petovan 06ea23665c Merge pull request #3460 from annando/1705-dbclean 
dbclean is now using the new database functions
 2017-05-12 11:45:27 -04:00
Michael acd9f453d7 And another one 2017-05-12 06:55:04 +00:00
Michael 58b2b1dbef Some more cleaner delete 2017-05-12 06:30:45 +00:00
Michael 11e524a555 This item removal is much more cleaner 2017-05-12 06:17:48 +00:00
Michael c00a5223d6 Removed code from the pre worker era. 2017-05-12 04:33:52 +00:00
Hypolite Petovan 4293e27d5c Improved usage of use in dba_pdo 2017-05-11 23:05:49 -04:00
Hypolite Petovan c0a6f1122b Removed useless usage of use 2017-05-11 23:01:49 -04:00
Michael c52f7657ab Now it should work 2017-05-11 20:19:43 +00:00
Michael 6ef24890bb dbclean is now using the new database functions / new functions for commit, rollback and transaction 2017-05-11 20:13:45 +00:00
Hypolite Petovan 39f894bd4a Use use instead of \ 2017-05-11 11:53:04 -04:00
Roland Häder 7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2 
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-11 14:54:26 +02:00
Hypolite Petovan 6f6b029c4d Merge pull request #3456 from annando/1704-mastodon-html 
HTML for OStatus posts look better (in Mastodon and GNU Social)
 2017-05-08 16:54:45 -04:00
Michael 3db3d2f1f7 This should make posts fine on GNU Social as well 2017-05-08 19:11:47 +00:00