Commit graph

5972 commits

Author SHA1 Message Date
Michael Vogel 3f448d9a42
Merge pull request #3970 from MrPetovan/task/3942-add-user-authenticate
Migrate password hashing Part 1: Add User::authenticate
2017-11-27 15:14:36 +01:00
Hypolite Petovan ced1063a10 Improved dba calls
- Removed intval calls
- Used boolean values for params when relevant
2017-11-27 08:17:56 -05:00
Michael 9612496e9e The function "template_escape" doesn't exist anymore. 2017-11-27 06:44:49 +00:00
Hypolite Petovan 2a60146a43 Revert "Add new legacy password field"
This reverts commit 2236f60cfa.
2017-11-26 15:45:59 -05:00
Hypolite Petovan 2196a0577b Remove unused upubkey and uprvkey from queries
- Switched queries to new dba::* functions
2017-11-26 14:55:47 -05:00
Hypolite Petovan ec6f5193e2 Switch to User::authenticate
- Removed hash('whirlpool') to check password
2017-11-26 14:46:08 -05:00
Hypolite Petovan 90a8ae2cb8 Fix formatting
- include/auth.php
- include/oauth.php
- include/user.php
- mod/removeme.php
- src/Worker/Queue.php
2017-11-26 14:18:45 -05:00
Hypolite Petovan 3fbf2e3bcf
Merge pull request #3966 from rabuzarus/20171122_-_port_tagcloud
A tag cloud widget for the profile page
2017-11-26 11:16:14 -05:00
rabuzarus 7d8370a178 tag cloud: fix query 2017-11-26 16:24:26 +01:00
rabuzarus ac6b191976 tag cloud: use dba for db request 2017-11-26 16:14:16 +01:00
Hypolite Petovan e82bbc75cd
Merge pull request #3963 from annando/default-features
Additional features should now work with the forumlist as well
2017-11-26 08:51:14 -05:00
Michael e4995dbad5 Good looking and better performance 2017-11-26 13:12:54 +00:00
Hypolite Petovan d5c38b9fc9 Add odd number of character support to random_string() 2017-11-26 07:57:29 -05:00
Michael 6cb637e8ab Default features should now work with the forumwidget again 2017-11-26 11:31:07 +00:00
rabuzarus 2844947f5c tag cloud: add doxygen docu 2017-11-26 04:33:21 +01:00
Hypolite Petovan d38c040d50 Update random_string with random_bytes
- Updated update.php
2017-11-25 21:15:50 -05:00
Hypolite Petovan 2236f60cfa Add new legacy password field 2017-11-25 18:05:32 -05:00
rabuzarus 4224209497 Merge develop into 20171122_-_port_tagcloud
Conflicts:
	include/features.php
2017-11-25 23:41:20 +01:00
Michael ba184f9038 Show the preview picture even if the posting contains the huge image 2017-11-25 16:00:51 +00:00
Michael 3cb906c420 Issue 3911: Fetch keywords for feeds 2017-11-25 11:59:20 +00:00
Michael 4ddcc77c77 Always show small preview pictures, not the big ones 2017-11-25 10:07:49 +00:00
Michael 3046455b1c Some posts weren't shown 2017-11-24 21:39:12 +00:00
Tobias Diekershoff 5a0f33dca0
Merge pull request #3939 from annando/fix-sql
Fix some SQL problems
2017-11-24 09:53:36 +01:00
Michael 4a4be4d664 Fix some SQL problems 2017-11-24 07:44:02 +00:00
Hypolite Petovan 9943393b71 Remove include/HTTPExceptions.php 2017-11-23 23:52:23 -05:00
Hypolite Petovan 1f4fc87fd9 Use new HTTPExceptions in API 2017-11-23 23:48:15 -05:00
Hypolite Petovan 5ec011c7be
Merge pull request #3937 from annando/additional
Additional features still had got problems
2017-11-23 20:43:46 -05:00
Michael da5857529f Additional features still had got problems 2017-11-23 20:41:35 +00:00
Adam Magness 609a4de5d0 src Standards
This basically completes coding standards changes for the entire src directory, with the exception of App.php
2017-11-23 14:01:58 -05:00
rabuzarus f1b86d31ca tags-cloud: respect remote perms 2017-11-23 03:43:39 +01:00
rabuzarus 19afabd268 tags: possibility to filter posts for tags and profile owner (profile) 2017-11-23 00:59:20 +01:00
Michael ffceb601d5 Some handling for empty parameters 2017-11-22 22:50:45 +00:00
rabuzarus 59ae5633ec tag-cloud: some polishing + remove authors (we don't use it at the moment) 2017-11-22 23:18:01 +01:00
rabuzarus d7d653aab6 port tag cloud widget from hubzilla 2017-11-22 21:29:07 +01:00
Michael c6c180e8b9 Some more changed calls 2017-11-22 09:11:44 +00:00
Michael 7c3fd2adb5 Some more replaced old database functions 2017-11-22 07:21:19 +00:00
Hypolite Petovan d99a7efd90
Merge pull request #3929 from annando/remove-old-mysql
No obsolete mysql_* anymore
2017-11-21 16:06:22 -05:00
Michael 723b40eea4 No obsolete mysql_* anymore 2017-11-21 21:00:11 +00:00
Adam Magness 7cee150868 ForumManager to src
ForumManager moved to Friendica\Content namespace
2017-11-21 07:20:22 -05:00
Adam Magness 1726ededac Emailer to src
Move emailer to src Friendica\Util namespace
2017-11-20 15:37:30 -05:00
Adam Magness ddacbf2c13 XML class standards
updated the xml class for PSR-2
2017-11-20 12:56:31 -05:00
Michael Vogel 2ee928b081
Merge pull request #3921 from MrPetovan/issue/3878-move-Contact-to-src
Move Contact to src
2017-11-20 16:53:29 +01:00
Hypolite Petovan b85c94a60d
Merge branch 'develop' into issue/3878-move-Contact-to-src 2017-11-19 18:09:14 -05:00
Michael 0c35dff73d One script needed to be moved, one script was obsolete 2017-11-19 22:47:12 +00:00
Hypolite Petovan 81647cefed
Merge pull request #3920 from annando/scripts
The poller is now the worker and we have a "scripts" folder
2017-11-19 17:25:14 -05:00
Hypolite Petovan 898fe2db1e Code cleanup
- Remove extraneous use statements
- Format require_once
2017-11-19 17:06:18 -05:00
Hypolite Petovan 5ee728972e Remove include/Contact.php
- Remove all mentions to include/Contact.php
2017-11-19 17:05:21 -05:00
Hypolite Petovan ec02af593d Change called method names
- Add GlobalContact::getRandomUrl
- Rename Contact::getIdForURL
- Rename Diaspora::sendUnshare
- Remove unused parameter $self in Contact::terminateFriendship
2017-11-19 17:03:39 -05:00
Hypolite Petovan b92fc24ff0 Add Contact Object
- Add Profile Object
- Add User Model
- Add use statements
2017-11-19 16:55:28 -05:00
Hypolite Petovan f43aaf5227 Move Item and Conversation from Core to Object
- Move BaseObject from Core\ to Friendica\
2017-11-19 16:50:49 -05:00
Michael 920160cb28 The poller is now the worker 2017-11-19 21:47:21 +00:00
Michael cabfcfc904 We now are having a "scripts" folder 2017-11-19 21:21:54 +00:00
Adam Magness d9e9cbe753 Coding Standards
A few updates for coding standards
2017-11-19 15:32:54 -05:00
Michael 6a1885a46a Additional features can now be changed again 2017-11-19 19:58:11 +00:00
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