friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
22,318 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

6684 Commits

Author SHA1 Message Date
Hypolite Petovan 62eba48679 Fix yet more undefined variable/index messages in api_statuses_show 2018-07-02 07:48:38 -04:00
Hypolite Petovan 0ee153e1bd Fix Array to String conversion message for IN conditions 2018-07-02 07:47:47 -04:00
Hypolite Petovan a380bcd1c1 Fix more undefined variable/index notice in tests 2018-07-02 07:45:25 -04:00
Hypolite Petovan a329ce5b50 Fix $called_api expecting at least 2 elements in tests 2018-07-02 07:45:11 -04:00
Hypolite Petovan 6776c4e3f9 Fix some undefined variable/index notices in tests 2018-07-02 07:44:55 -04:00
Michael 717ca0b7eb Use already fetched data for magiclink 2018-07-02 05:41:55 +00:00
Michael 0ab9f2e265 Preparations to not store the tags in the item table anymore 2018-06-30 13:54:01 +00:00
Michael 028c9f4da5 We now store the verb in the item-content as well 2018-06-27 19:37:13 +00:00
Michael 76dab3b2d7 Use gravity instead of verb 2018-06-27 18:09:33 +00:00
Michael b03db4643f The fetch function now centrally controls the content 2018-06-24 10:48:29 +00:00
Hypolite Petovan 98a5749b45
Merge pull request #5277 from annando/native-pdo 
We now are using the native pdo mode
 2018-06-22 16:04:50 -04:00
Michael 6e64091fc7 We now are using the native pdo mode 2018-06-22 19:35:42 +00:00
miqrogroove c37a8cc661
Update dba.php 2018-06-22 07:34:27 -04:00
miqrogroove 150989ba99
Ensure IN() Conditions Never Mix Data Types 2018-06-21 23:56:19 -04:00
Hypolite Petovan 47ab72352e
Merge pull request #5269 from annando/non-unique-values 
This fixes the problem with mixed variables in queries
 2018-06-21 22:12:07 -04:00
Michael e1e28ba7c3 Better float detection 2018-06-21 21:55:43 +00:00
miqrogroove c600ccad5c
Correct dba::close() To Match dba::p() 2018-06-21 17:27:12 -04:00
Michael 1b85b75563 Currently removed, needs more testing 2018-06-21 20:42:58 +00:00
Michael 261d7435c0 Check for floats and enable native prepares 2018-06-21 20:33:27 +00:00
Michael 5656c0564a We don't need to look $is_int there 2018-06-21 19:52:28 +00:00
Michael c1059875bc This fixes the problem with mixed variables in queries 2018-06-21 19:48:25 +00:00
Michael Vogel 4b0cf8d60f
Merge pull request #5267 from miqrogroove/patch-2 
Allow for Integer Literals in PDO Database Driver
 2018-06-21 18:51:01 +02:00
miqrogroove 759dfe6bb1
Allow for Integer Literals in PDO Database Driver 
This should fix things like "LIMIT ?"
 2018-06-21 11:42:43 -04:00
Michael d643e00d33 Standards and a new function to fetch content 2018-06-21 15:14:01 +00:00
Michael 70af2cecf2 Some of the last direct SQL calls to the item table had been changed 2018-06-21 06:21:51 +00:00
Roland Häder 1567eb0791
fixed another left-over ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:02:16 +02:00
Roland Häder 852ef4021b
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:02:16 +02:00
Roland Häder f2f12d6f50
Minor improvements: 
- added spaces and curly braces
- added more TODOs as there really more to be done
- removed redundant braces from "return" keyword (no function)
- merged 2 nested if() into one single

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:02:15 +02:00
Michael 962fbc9166 Many "fetch_first" had been replaced 2018-06-19 21:33:07 +00:00
Michael ab5669e091 Some more direct SQL calls had been replaced 2018-06-19 19:06:17 +00:00
Hypolite Petovan 82d55f120f
Merge pull request #5238 from annando/more-abstraction 
Even more replaced item calls ...
 2018-06-19 14:02:43 -04:00
Michael e4adaa9900 Standards and variable renaming 2018-06-19 17:11:59 +00:00
rabuzarus 0a97a3f822 Bugfix: hide savedsearch butten and subthread button for non local_users 2018-06-19 18:27:54 +02:00
Michael a5ca724fd3 Merge remote-tracking branch 'upstream/develop' into more-abstraction 2018-06-19 13:48:19 +00:00
Michael 4714cb746b Use the item functions at many more places 2018-06-18 20:36:34 +00:00
Michael Vogel f828350ba2
Merge pull request #5234 from fabrixxm/fix/api 
API: fix sender/recipient of PMs
 2018-06-18 12:03:53 +02:00
fabrixxm e3ee9ee501 API: fix sender/recipient of PMs: check api_user before get user info. 
To throw ForbiddenException and pass tests
 2018-06-18 11:55:02 +02:00
Michael 507956818d Use the item classes where possible 2018-06-18 05:19:28 +00:00
fabrixxm c015bb1b77 API: fix sender/recipient of PMs 2018-06-17 19:57:32 +02:00
Michael 6e10de9284 New function to fetch item data especially for users 2018-06-17 17:05:17 +00:00
Michael 0280a46ab4 Use predefined field lists 2018-06-17 06:27:52 +00:00
Michael abef0cd46c Don't use the author-link anymore - just author-id 2018-06-16 15:35:30 +00:00
Michael 14cb128264 New function for generating item URI 2018-06-16 06:44:19 +00:00
Michael bb79b8f4ac More item calls have been replaced with the new functions 2018-06-15 22:30:49 +00:00
Hypolite Petovan 7469de29f1 Fix corrupt registration emails 
- Use double quotes for line break-containing translation string
- Simplify HTML/plaintext email body conversion
 2018-06-14 23:42:08 -04:00
Hypolite Petovan d46cac7905 Wrap content filter around entire post including attachments 2018-06-12 21:54:36 -04:00
Michael 738644a006 Quit if database connection was lost during "e" 2018-06-11 03:56:19 +00:00
Michael 8584e09e12 Store the database credentials for reconnect 2018-06-11 03:45:45 +00:00
Michael b02cdc8a7f Merge remote-tracking branch 'upstream/develop' into quit-on-error 2018-06-11 03:15:59 +00:00
Michael aa3f8ec09d Force a database reconnection in the daemon to prevent lost connections 2018-06-10 22:04:09 +00:00
Michael 5d9083c369 Bugfix in notifications / network and display are using the new functions now 2018-06-10 07:26:37 +00:00
Michael defd3d15b6 Possibly fixed test 2018-06-09 20:39:40 +00:00
Michael b6c344a80a $r was still in use 2018-06-09 20:08:15 +00:00
Michael 50dfc7d36e Small query corrections 2018-06-09 19:27:44 +00:00
Michael 446a45003d Added documentation, some indention fixes 2018-06-09 19:12:13 +00:00
Michael baf316e898 The central item fetch does work now and the API now uses these functions 2018-06-09 16:56:37 +00:00
Michael 4874e589f1 New class function to fetch items 2018-06-07 06:03:12 +00:00
Michael e632be763c Corrected variable 2018-06-05 05:44:04 +00:00
Michael 18a77a1b45 Removed some quick and dirty hack to upload pictures 2018-06-05 05:42:26 +00:00
Hypolite Petovan 0a13ab6b9f
Merge pull request #5166 from annando/unsed-item-fields 
Remove unused, unneeded or redundant item fields
 2018-06-03 12:19:50 -04:00
Hypolite Petovan 973ece09c5
Merge pull request #5157 from annando/daemon 
Workers can now be started exclusively from the daemon and other workers
 2018-06-03 12:18:47 -04:00
Michael 443d828ba7 We don't need to look for the uid 2018-06-03 10:29:42 +00:00
Michael 6985ad4fb5 Improved error message 2018-06-03 09:55:41 +00:00
Michael b654af28fa We need "global" 2018-06-03 09:40:32 +00:00
Michael ea498ff283 And a second SQL error fixed 2018-06-03 09:21:48 +00:00
Michael d76fb6d0b9 Fixed SQL error 2018-06-03 09:19:27 +00:00
Michael 3f07d01dd1 Get rid of unneeded or redundant fields 2018-06-03 07:42:56 +00:00
Michael a720c4f501 Removed unneeded fields from the API 2018-06-03 07:22:01 +00:00
Michael 723b5ae803 Use MagicLinkbyId when possible 2018-06-02 08:28:01 +00:00
Michael 8a34895a23 Use magicLink whenever possible 2018-06-02 08:05:06 +00:00
Michael 28f8beebfc Workers can now be started exclusively from the daemon and other workers 2018-06-01 22:09:27 +00:00
Michael b5b172500d Merge remote-tracking branch 'upstream/develop' into public-redir 2018-06-01 12:32:51 +00:00
Hypolite Petovan 93daf7883e Merge branch 'master' into develop 
- Updated new develop version label
- Incremented database build number
 2018-06-01 07:30:04 -04:00
Michael ae8d7267a0 "redir" is now centralized and works with the public contact 2018-06-01 06:46:34 +00:00
Michael 8329705eba New function to delete items for users 2018-05-29 05:22:57 +00:00
Michael c5a22f86c7 Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item 2018-05-27 10:38:49 +00:00
Pascal Deklerck 334aa40292 Fix autoname output length 2018-05-27 10:20:27 +02:00
Michael 54136f3a74 Added the new parameter to the delete function. 2018-05-26 21:38:45 +00:00
Michael 4c36109f02 Some more places to add the user id 2018-05-26 20:03:30 +00:00
Michael bdbc51229a Fix for not being able to delete items 2018-05-26 18:07:27 +00:00
Michael de609e49f0 Improved logging 2018-05-24 22:00:54 +00:00
Michael f8230badba Avoid problems with better variable naming 2018-05-24 21:46:57 +00:00
Michael 1bce39120d Reconnect after the connection had been lost. 2018-05-24 21:19:59 +00:00
Hypolite Petovan b0155fe37b Remove obsolete DNS test from include/dba 2018-05-24 01:31:03 -04:00
Michael 87b5e26063 Do a hard exit when the SQL connection went down 2018-05-24 04:07:39 +00:00
Michael 3fe07cca57 Issue 2880: Editing post doesn't destroy mentions or hashtags anymore 2018-05-19 14:55:27 +00:00
Alexandre Alapetite e7d2d27938 sizeof bug 
sizeof cannot be used to test existance.

Fixes: Got error 'PHP message: PHP Warning:  sizeof(): Parameter must be
an array or an object that implements Countable in
/.../include/items.php on line 66\n':  1 Time(s)

PHP 7.2.5 / Ubuntu 17.04 LTS
 2018-05-17 07:37:50 +02:00
Hypolite Petovan ce75177d4e
Merge pull request #5022 from Rudloff/feature/test_api 
Add API tests
 2018-05-16 08:25:11 -04:00
Michael c9f55f6b3d Show "Remove from your screen" or "delete" depending of the impact of the deletion 2018-05-15 21:06:34 +00:00
Roland Häder f34d72c143
Fixes: 
- used empty() instead of x()
- removed superflous count()

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:22 +02:00
Roland Häder d0c7ba5257
Fixed parser error 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:21 +02:00
Roland Häder debcdea82a
Continued: 
- merged 2 if() into one with &&
- added TODO for possible rewrite (avoid "complex" code)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder bacb7b70f6
Cleanups: 
- added empty lines
- removed old-lost commented out line

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder 94a02f8572
Continued: 
- return is a keyword, not a function, so don't add braces here

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder 57e668d9e0
Continued: 
- avoided else() block which reduces code complexibility
- used more x()
- added curly braces
- added known type-hints

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder e0a07d5f27
Continued: 
- used x() to make sure the array key is there, else an E_NOTICE is triggered
- added type-hints where it is safe

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:04 +02:00
Roland Häder 47f95855c0
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:01 +02:00
Roland Häder de50d62b81
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:01 +02:00
Roland Häder 35ada99954
Opps, added missing curly brace. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:58 +02:00
Roland Häder 78ffd5b80f
fixed parser error 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:58 +02:00
Roland Häder 1c9dc6526f
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>
 2018-05-14 22:49:58 +02:00
Roland Häder 337824f649
Continued: 
- added curly braces/spaces
- added TODOs (type-hints, old-lost code)
- more usage of dbm::is_result()
- combined some if() return stuff into a simple return statement

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:58 +02:00
Roland Häder c3c9a53364
added spaces + curly braces and TODOs for upcoming type-hint rewrite. Please 
note that PHP5 allows 'array' as type-hint already (+ interface/class name).

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:58 +02:00
Roland Häder 61fdc32d2f
Continued a bit: 
- more spaces added
- more curly braces added
- let's use x($_FOO, 'bar') and not isset($_FOOT['bar'])

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:57 +02:00
Roland Häder 09384119b1
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder c7e256f9de
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder 1a61cee5a7
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder f7ceea7a85
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder 5b56f189ae
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:54 +02:00
Roland Häder bc259cdc44
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:54 +02:00
Michael 914a4e2e0a Fix: Public items werent visible under certain circumstances 2018-05-10 22:06:34 +00:00
Pierre Rudloff 3195d6e125 Add API tests 2018-05-10 19:12:00 +02:00
Michael df019eb5bd Issue 4772: Display posts with uid=0 as well 2018-05-10 10:13:48 +00:00
Michael 6c792588fd Ensure to mostly fetch the item with an non zero user id 2018-05-08 22:26:49 +00:00
Michael 8d513d74be Reverted SQL sorting 2018-05-08 22:08:25 +00:00
Michael 14833edb2d Issue 4990: Fixes missing posts on network page 2018-05-08 22:00:32 +00:00
Pierre Rudloff 9bb11ccfa5 $attachments should aways be an array 
In order to avoid a PHP 7.2 error when using count()
 2018-05-08 12:16:48 +02:00
Pierre Rudloff 23371880e8 $called_api should always be an array 
In order to avoid a PHP 7.2 error when using count()
 2018-05-08 12:16:48 +02: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
Michael 7cd7b1a9bf Some more replaced queries 2018-05-04 21:43:29 +00:00
Michael 125afb4ae5 Suppress blocked contacts from being displayed 2018-05-04 21:27:20 +00:00
Michael a83970bc0e Some more dba stuff 2018-05-04 06:33:36 +00:00
Michael 4ad655ab80 Replace old database queries with the new ones 2018-05-02 19:26:15 +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
Michael 78f563407a Fix PR 4942: Fixed item query 2018-04-29 16:32:46 +00:00
Hypolite Petovan 20289393da Fix own post check for content filter 2018-04-28 19:11:11 -04:00
Hypolite Petovan fde3d6f870 Replace current_theme() and current_theme_url() calls 2018-04-28 18:37:25 -04:00
Hypolite Petovan 9edff6cc5c Add exception for self-contact in item_joins() 2018-04-28 11:38:01 -04: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
Hypolite Petovan c417f779c4 Add missing readonly check for displaying items in item_joins 2018-04-28 07:47:02 -04: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
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
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
Hypolite Petovan a84477ed2d Fix count() warning in include/dba.php 2018-04-23 00:00:06 -04:00
Hypolite Petovan 48122733b8 Move content filter HTML in a template 2018-04-22 18:02:00 -04:00
Hypolite Petovan 4cfb12e9d9 Add one-line content filter when there's only one reason 2018-04-22 14:28:34 -04:00
Hypolite Petovan 273dde508b Add default value doc for options.cascade in dba::delete 2018-04-22 11:34:41 -04:00
Hypolite Petovan 0a026515bd Add documentation for $options parameter in dba::delete 2018-04-22 11:33:20 -04:00
Hypolite Petovan ba3f721524 Prevent side effect with cascade => false in dba::delete 2018-04-22 04:46:46 -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 98f64ed824 Replace duplicate behaviors by Model\Term::populateTagsFromItem 
- Replaced in include/conversation
- Replaced in include/text
 2018-04-16 22:22:58 -04:00
Hypolite Petovan 54b75026fc Add header support for security token check 2018-04-16 22:22:58 -04:00
Tobias Diekershoff d149541dba notify admin when user deletes account 2018-04-15 11:39:05 +02:00
Marcus Müller 3761797e5f
Merge branch 'develop' into patch-1 2018-04-13 09:41:24 +02:00
Marcus Müller 89ba3b78ff
[BUGFIX] DB: Remove host DNS_PTR check 
DNS_PTR checks fail on some domains and result in the return value `false`, even if the domain is valid and reachable.
 2018-04-12 19:32:04 +02:00
Marcus Müller e382dfcfbd
[BUGFIX] DB: Don't check DNS on IPs 
Fixes https://github.com/friendica/friendica/issues/4786
 2018-04-12 19:14:53 +02:00
Pierre Rudloff f3d98b2864 api_get_user() should not return false right away if the number in the URL is not a valid user 2018-04-10 10:46:10 +02:00
Pierre Rudloff 7d953d952e Various small fixes (#4795) 
* Use strict comparison to avoid 0 == false
* Avoid unecessary loop
* Avoid undefined variable
* Fix wrong variable name
* Don't try to use the $status_info variable if it does not exist
* Avoid undefined variable
* Check that variable is defined before trying to use it
* Don't cast $data array to boolean
* Fix undefined array
* $reactivate_group variable is not always defined
* Variable $found is not always defined
* Remove unused return statement
* Fix undefined array
* api_unique_id_to_nurl() requires an integer as argument
* Don't try to use $uinfo if it is false
* Don't use the same variable names in inner loop
* Throw an exception if $fileext is not defined
 2018-04-09 15:34:53 -04:00
Pierre Rudloff 773591a6ba Add some missing return types 2018-04-09 19:53:02 +02:00
Pierre Rudloff 4b36f3ad05 api_format_data() seems to never return an object 2018-04-09 19:34:09 +02:00
Pierre Rudloff 9cde7881ee Throw a ForbiddenException if api_get_user() returns false 2018-04-09 18:52:38 +02:00
Pierre Rudloff d0591dd882 The first argument for api_format_items() must be an array 2018-04-08 01:06:40 +02:00
Pierre Rudloff 9c351bad68 Fix wrong use of empty() 2018-04-08 00:55:05 +02:00
Pierre Rudloff bef3799942 Use empty() instead of !x() 2018-04-07 23:21:51 +02:00
Pierre Rudloff 333eb5f9dd Add missing variable 2018-04-07 23:20:30 +02:00
Pierre Rudloff b775cba8c2 Remove confusing comment 2018-04-07 22:39:38 +02:00
Pierre Rudloff 036803d8c7 Typo 2018-04-07 22:37:57 +02:00
Pierre Rudloff 5d8d62015c Make list_id parameter mandatory in api/lists/statuses 2018-04-07 22:36:54 +02:00
Pierre Rudloff 6401eb988b Use dba to access database in api_lists_statuses() 2018-04-07 22:35:19 +02:00
Pierre Rudloff fea7ec2482 We don't need type casting for dba::select() arguments 2018-04-07 22:18:39 +02:00
Pierre Rudloff c5aaa61d11 Rename api_list_create() to api_lists_create() for consistency 2018-04-07 22:15:35 +02:00
Pierre Rudloff c4edad212b Use dba to access the database in list API functions 2018-04-07 19:55:41 +02:00
Pierre Rudloff 929440417c We don't really need the unsen bit in api_lists_statuses() 2018-04-07 19:52:47 +02:00
Pierre Rudloff b3235c2d02 Implement parts of the list API: 
lists/statuses
lists/destroy
lists/update
lists/create
lists/ownerships
 2018-04-07 19:16:47 +02:00
Pierre Rudloff 78a979ee58 Add profile_image_url_profile_size and profile_image_url_large properties to user object returned by API (fixes #4695) 
This allows some clients to display a bigger avatar on profiles.
 2018-04-07 13:31:17 +02:00
Hypolite Petovan 32ca95a1b0 Use App->getSenderEmailAddress in include/enotify 2018-04-06 21:47:42 -04:00
Michael 0ccb29c4df Only compare the HTML when we forcefully ignore the cache 2018-04-06 16:52:01 +00:00
Michael 297784880e Update the cached rendered html when it changed 2018-04-06 14:01:52 +00:00
Michael Vogel 05cff59f70
Merge pull request #4722 from MrPetovan/task/add-content_filter-hook 
Add content_filter hook
 2018-04-06 06:42:52 +02:00
Michael 3792012723 Improved accessibility for "Frio" 2018-04-05 21:50:34 +00:00
Hypolite Petovan 34fd442821 Rename social.disable_cw pconfig to system.disable_cw 2018-04-04 23:08:48 -04:00
Hypolite Petovan 41db5f0912 Display content warning as title if collapsing is deactivated 2018-04-04 23:08:48 -04:00
Hypolite Petovan 296f561878 Rename hook to "prepare_body_content_filter" 2018-04-04 23:08:48 -04:00
Hypolite Petovan d38b86dabf Fix disabled content filter for own posts 2018-04-04 23:08:48 -04:00
Hypolite Petovan f26c99d17b Disable content filter for preview and own posts 2018-04-04 23:08:48 -04:00
Hypolite Petovan d603bf062d Add CSS classes to content-filter wrapper 2018-04-04 23:08:48 -04:00
Hypolite Petovan b755e808df Add new content_filter hook in prepare_body 
- Add content warning processing to prepare_body with use of disable_cw
setting
- Add filter_reasons params to prepare_body hook
 2018-04-04 23:08:48 -04:00
Hypolite Petovan bec46d7b01 Remove content warning processing in put_item_in_cache 2018-04-04 23:08:48 -04:00
Hypolite Petovan 586b0b6e57 Add bash to text_highlight language list 2018-03-29 19:29:09 -04:00
Hypolite Petovan daffc27061 Move suppress_tags config to template 
- Add new item.suppress_tags template variable
- Fix template formatting
 2018-03-25 00:38:23 -04:00
Hypolite Petovan 4eaf0d76b0 Remove include/event 2018-03-23 06:32:34 -04:00
Hypolite Petovan 6e7c6ab0fa Remove references to include/event 2018-03-23 06:32:34 -04:00
Hypolite Petovan f7e2071117 Replace include/event function with method calls 
- Updated scope of Model\Event methods
- Updated use list
 2018-03-23 06:32:34 -04:00
Hypolite Petovan 5aecc758f9 Replace include/event function content by method calls 2018-03-23 06:32:34 -04:00
Hypolite Petovan 27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
Michael e74f186b34 Event: Prevent SQL errors with events without end 2018-03-21 20:16:43 +00:00
Michael 73efdb99e3 Fix for incorrect datetime values 2018-03-21 05:20:55 +00:00
Tobias Diekershoff f082f0da4f
Merge pull request #4636 from annando/event-diaspora 
Fix: Events on Diaspora now should look fine
 2018-03-20 08:48:37 +01:00
Michael f4ba5d9799 Fix: Events on Diaspora now should look fine 2018-03-20 06:32:17 +00:00
fabrixxm e6c59b0593
fix docstring of `get_poke_verbs()` 2018-03-19 10:20:01 +01:00
fabrixxm 8a2a4510ec
Small fixes to translatable string 
and some small cosmetic fixup to docstring for `notification()`
 2018-03-19 10:15:09 +01:00
Hypolite Petovan 881c7ccfc1 Add meaningful return value to dba::connect 
- Move System::unavailable call to index
 2018-03-18 05:15:14 -04:00
Michael 537ef83a24 If we aren't connected to the database, we shouldn't return "true" on connect 2018-03-17 09:21:06 +00:00
Hypolite Petovan c53c00ba4e Add rendred-hash to put_item_in_cache todo 2018-03-15 03:23:11 -04:00
Hypolite Petovan 644767519e Ensure the item body stays the same in put_item_in_cache() 
- Add documentation
 2018-03-15 02:13:00 -04:00
Hypolite Petovan e28020c68a Fix for CW: Items weren't cached 2018-03-15 01:32:04 -04:00
Hypolite Petovan 65b0159282
Merge pull request #4593 from annando/fix-ostatus 
OStatus: Fixed communication issues with deleted contacts
 2018-03-14 18:46:21 -04:00
Michael 5bd519efff There is now a "content-warning" field 2018-03-14 22:28:35 +00:00
Michael d98c6819e7 $contact isn't called by reference anymore 2018-03-14 20:53:03 +00:00
Michael 32ee4ca4b1 OStatus: Fixed communication issues with deleted contacts 2018-03-13 06:21:44 +00:00
Michael 4bb9263e43 Fix: The acl lookup now works in multi threaded posts as well 2018-03-12 04:51:27 +00:00
Michael 052ad155a2 Issue 4115: Events are now formatted better for Diaspora 2018-03-11 21:10:36 +00:00
Hypolite Petovan 9f693cc443 Display attach with missing title 
- Rework preg_match_all call to remove 3 indentation levels
 2018-03-08 23:52:01 -05:00
Hypolite Petovan f633acd8d1 Remove include/html2*.php files 2018-03-07 16:34:48 -05:00
Hypolite Petovan 789561c7a2 Remove/Update references to include/html2*.php 2018-03-07 16:34:17 -05:00
Hypolite Petovan 5e806ff598 Replace html2plain calls by HTML::toPlaintext 2018-03-07 16:29:44 -05:00
Hypolite Petovan b5666bd27f Replace html2bbcode calls by HTML::toBBCode 2018-03-07 16:24:13 -05:00
Hypolite Petovan 3bb2f72d05 Replace html2* function content by references to HTML class 2018-03-07 16:21:02 -05:00
Michael Vogel cc688e2b4f
Merge pull request #4549 from MrPetovan/task/4518-add-memcached-support 
[develop] Performance: Add memcached support/Improve database cache (redux)
 2018-03-06 16:34:28 +01:00
Hypolite Petovan 95752b79e8 Add cache performance to API and worker 2018-03-04 23:13:19 -05:00
Hypolite Petovan 6447a45a06 Remove include/bb2diaspora.php 2018-03-04 17:43:51 -05:00
Hypolite Petovan fe5ce67ef8 Move bb2diaspora() content to Content\Text\BBCode::toMarkdown 
- Use self where appropriate
- Add BaseObject extension
 2018-03-04 17:34:59 -05:00
Michael 506f851b23 Bugfix: Avoid that Twidere is crashing 2018-03-04 19:25:02 +00:00
Hypolite Petovan 49f99d94f6 Replace disapora2bb function content with Markdown::toBBCode call 2018-03-04 08:31:40 -05:00
Hypolite Petovan 7bd4a52156
Merge pull request #4532 from annando/dba-array 
[develop] We now accept array as condition parameters
 2018-03-03 18:14:19 -05:00
Michael 74f6dc5373 Renamed functions / each is replaced 2018-03-03 23:02:45 +00:00
Hypolite Petovan b8fca5efe7 [PHP 7.2] Fix missing Countable warning 2018-03-03 08:48:30 -05:00
Michael 194da423e0 An array with fieldnames as keys is important for the "insert" in the "update" function 2018-03-03 13:26:23 +00:00
Tobias Diekershoff 1510b3d948 tyoi, found by 朱陈锬 thanks for that! 2018-03-03 11:02:40 +01:00
Michael 5bda6c7f6d We now accept array as condition parameters 2018-03-03 08:47:13 +00:00
Hypolite Petovan 2f463dfb17 Remove include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan 09c717d751 Remove references to include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan 207eac4a16 Move navbar_complete to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan 824262b824 Move populate_acl to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan 2b35938e34 Move get_acl_permissions to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan ce9e0f3649 Move prune_deadguys to Contact 2018-03-02 18:40:08 -05:00
Hypolite Petovan 113ea38d50 Move contact_select to Acl 
- Simplify Acl::getMessageContactSelectHTML parameters
 2018-03-02 18:40:08 -05:00
Hypolite Petovan eef25a3259 Move contact_selector() 2018-03-02 18:40:08 -05:00
Hypolite Petovan e2de86de46 Update references in acl_selectors to new functions 2018-03-02 18:40:08 -05:00
Michael 1be5275eef Some more performance measuring for database stuff 2018-03-02 13:37:49 +00:00
Hypolite Petovan 4fe1d804ab
Merge pull request #4511 from annando/no-activity 
Only show visible activities
 2018-02-27 04:41:12 -05:00
Michael 74ff36eee9 Only show visible activities 2018-02-27 09:29:11 +00:00
Michael 20368cbbf4 Fix for network update (number of maximum comments set to 0) 2018-02-26 22:15:57 +00:00
Michael d2728cad2e Children for the network page are now fetched correctly in the conversation 2018-02-26 06:38:27 +00:00
Michael a1eb5a584f Improve the queries on the network page 2018-02-25 21:33:15 +00:00
Michael a59796d1d4 No gcontact-id anymore (It wasn't really used) 2018-02-21 05:15:55 +00:00
Michael a3af6807ac Improved resource id creation 2018-02-20 10:02:07 +00:00
Hypolite Petovan e2d8c80f33
Revert "Fix PHP Warning: preg_replace(): Compilation failed in include/items" 2018-02-16 11:12:41 -05:00
Hypolite Petovan 31831b9fdb Remove partial preg_quote in include/items 2018-02-16 00:31:32 -05:00
Hypolite Petovan f4d76d10b2 Fix PHP Warning: preg_replace(): Compilation failed in include/items 2018-02-15 22:13:45 -05:00
Hypolite Petovan 71cb1523d5 Remove include/bbcode.php 2018-02-14 22:05:16 -05:00
Hypolite Petovan 9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -05:00
Hypolite Petovan 05a2ea4220 Refactor comments including "bbcode()" 2018-02-14 22:00:43 -05:00
Hypolite Petovan 4e4f5862b2 Remove unused $preserve_nl parameter from bb2diaspora() 2018-02-14 21:45:41 -05:00
Hypolite Petovan 0c52866693 Refactor bbcode() into BBCode::convert() 2018-02-14 21:33:55 -05:00
Hypolite Petovan 29f5270313 Remove unused parameter preserve_nl in BBCode::convert 2018-02-14 21:31:28 -05:00
rabuzarus 5fe7a21482 add $no_photos parameter to add_page_info_data() 2018-02-12 03:56:20 +01:00
rabuzarus 26fd6b1c33 fix undeclared variables or wrong variable names (/include) 2018-02-11 22:13:29 +01:00
Michael 30cfca40d8 Use a more simple HTML for API output 2018-02-10 13:33:15 +00:00