6a3dc8b286
added more curly braces + fixed one
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
3ad0fd442e
Continued:
...
- added missing spaces/curly braces
- some more usage of dbm::is_result()
- 2 oppsite if() statements can be mored to else
- added more TODOs for type-hinting
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
c6ef84a964
Continued:
...
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
long time around in PHP) anything can be handled over to the method/function.
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
6a171a96aa
Opps ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:47 +01:00
3849e7c9ff
added more curly braces + a bit more usage of dbm::is_result()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:47 +01:00
92901d8626
more curly braces added + dbm::is_result()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
fb5f1f61fc
You shoudln't use a text variable like an array.
2017-03-18 23:32:59 +00:00
1a436264cd
Some standards
2017-03-18 12:13:43 +00:00
222550e784
From now on we are using 0001-01-01 as lowest date
2017-03-18 11:42:54 +00:00
62ccb4499a
Some more unneeded changes reverted
2017-03-18 08:54:25 +00:00
a2a171af06
"dob" is not a date field, so the changes are reverted
2017-03-18 08:50:27 +00:00
e301fa0832
Merge remote-tracking branch 'upstream/develop' into 1702-null-date
2017-03-18 08:31:43 +00:00
rabuzarus
497df57ef7
more standards work
2017-03-18 04:41:54 +01:00
f3bcf63d46
Standards and some logging improvements
2017-03-17 19:25:01 +00:00
rabuzarus
c785eb29c6
more work on standards compliance
2017-03-17 17:57:57 +01:00
87771cf617
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
...
Conflicts:
include/discover_poco.php
2017-03-17 15:53:19 +00:00
rabuzarus
3cef98caf6
Merge pull request #3226 from annando/1702-only-worker
...
The worker is now the only background processing system
2017-03-17 13:22:23 +01:00
24a57020b9
Better version transformation for nodeinfo and statistics.json
2017-03-16 21:34:53 +00:00
rabuzarus
8ae8465d48
add dop event & fix event edit
2017-03-16 20:15:25 +01:00
58bf1c50af
Bugfix: When a query fails we mustn't use the result value.
2017-03-16 09:23:12 +00:00
4812f4c0f9
Without only the worker queue we don't need the deliverq anymore.
2017-03-16 07:30:59 +00:00
a211c8cb77
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-16 05:51:22 +00:00
rabuzarus
6fdc219143
Merge pull request #3227 from annando/1703-pdo
...
We now support PDO
2017-03-16 00:25:16 +01:00
8e12b159d9
Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup
2017-03-15 14:37:30 +00:00
9f9497f2ca
Merge remote-tracking branch 'upstream/develop' into 1701-poco
2017-03-15 14:34:09 +00:00
88a69b93d5
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server
2017-03-15 13:56:17 +00:00
8decd15565
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-15 13:55:43 +00:00
dc3fcf0487
Standard stuff
2017-03-15 06:00:22 +00:00
35ec1c8f26
Bugfix for pull request 3216 - feed items were mixed
2017-03-14 21:14:09 +00:00
Michael Vogel
e57bd5fe55
Merge pull request #3233 from rabuzarus/20170314_-_pagination
...
limit pagination page buttons to max 10
2017-03-14 20:05:29 +01:00
rabuzarus
0143369e54
limit pagination page buttons to max 10
2017-03-14 18:31:03 +01:00
Michael Vogel
a7e8e86800
Merge pull request #3221 from strk/remember-openid
...
Fix "remember me" cookie for OpenID logins
2017-03-14 16:30:15 +01:00
0d32f0be46
One forgotten standard
2017-03-14 15:18:56 +00:00
f73389dd12
Standard stuff
2017-03-14 15:17:21 +00:00
fabrixxm
fa3490ba5b
Merge pull request #3224 from annando/1702-no-old_pager
...
The old pager is now removed
2017-03-14 10:29:03 +01:00
43ceb72196
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-14 07:26:15 +00:00
Michael Vogel
199bba20d9
Merge pull request #3200 from Hypolite/issue/#3195
...
Improve pagination on frio
2017-03-14 06:05:42 +01:00
748caa0807
Removed debug output
2017-03-14 04:58:05 +00:00
a2b7b2a968
Daily updating the server status
2017-03-13 22:16:09 +00:00
Sandro Santilli
0b46a5f935
Standards: add braces
...
(thanks @Hypolite)
2017-03-13 23:09:09 +01:00
Sandro Santilli
8517ba1fab
Remove extra space after open parentheses
2017-03-13 23:08:03 +01:00
Michael Vogel
98945eb6fa
Merge pull request #3213 from Hypolite/issue/#2792-2
...
Like behavior fix/improvements
2017-03-13 18:35:32 +01:00
ae64f6f7e2
z_fetch_url now always returns an array
2017-03-13 14:37:51 +00:00
Sandro Santilli
cbaf196f50
Only remove the "remember me" cookie at submitting the auth form
...
Fixes loss of remember (Friendica) cookie on switching Managed accounts
2017-03-13 11:59:05 +01:00
fbb84ee219
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-13 10:18:29 +00:00
6a16565642
Merge remote-tracking branch 'upstream/develop' into 1701-poco
2017-03-13 07:23:32 +00:00
44888590e5
One error, one documentation, one brace
2017-03-13 06:32:33 +00:00
acadb8ecdb
Remove redundancies.
2017-03-13 06:09:00 +00:00
eb6a6228f7
more spaces
2017-03-13 05:57:37 +00:00
80e58964ce
Standard stuff
2017-03-13 00:09:32 +00:00
97d3176754
Querying via nodeinfo
2017-03-13 00:03:27 +00:00
49b22de705
Changes from previous pull request applied again
2017-03-12 21:57:09 +00:00
e10339a47f
Merge remote-tracking branch 'upstream/develop' into 1703-pdo
2017-03-12 21:05:10 +00:00
77e8c44016
Merge remote-tracking branch 'upstream/develop' into 1702-only-worker
...
Conflicts:
include/onepoll.php
include/queue.php
2017-03-12 21:03:44 +00:00
1624150db4
Merge remote-tracking branch 'upstream/develop' into 1702-null-date
...
Conflicts:
include/onepoll.php
2017-03-12 20:54:28 +00:00
259598e569
Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share
2017-03-12 20:52:48 +00:00
044e9a6603
Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager
...
Conflicts:
mod/profile.php
2017-03-12 20:52:14 +00:00
18d23ca443
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-12 20:49:48 +00:00
7d1e54664a
Merge pull request #3133 from mexon/mat/cidfix
...
Allow cid URLs for images
2017-03-12 15:44:22 +01:00
7275319eb6
Merge pull request #3214 from Hypolite/get_contact-rewrite
...
Reformatted get_contact()
2017-03-12 15:42:17 +01:00
1bf089e424
Merge pull request #3216 from annando/1701-performance
...
Better network handling, improved structure
2017-03-12 15:40:56 +01:00
e29d7f19d1
Merge pull request #3222 from Hypolite/issue/#3220
...
Diaspora: Normalize line endings instead of adding <br> before Markdown()
2017-03-12 15:35:42 +01:00
bfad58a777
We don't need to show the id.
2017-03-12 09:41:10 +00:00
3a3fa017a6
Discovery of new servers
2017-03-12 09:13:04 +00:00
Hypolite Petovan
2310bf994a
Normalize line endings instead of adding <br> before Markdown()
2017-03-12 03:55:22 -04:00
Sandro Santilli
df6304cc42
Fix "remember me" cookie for OpenID logins
...
Closes #2432
NOTE: in order to obtain the same "cookie hash" it was required
to include unneeded fields in the user record structure, this would
be good to change in the future...
2017-03-12 01:11:35 +01:00
2d2a35af73
Make Hypolite happy
2017-03-08 18:03:41 +00:00
32f1b2de20
Forgotten debug output
2017-03-08 13:15:24 +00:00
d898616f8d
Remove junk from the version number
2017-03-08 05:40:57 +00:00
Hypolite Petovan
37b15995d8
Add pump.io network to probing supported networks
...
- Remove useless condition
2017-03-07 16:43:22 -05:00
Hypolite Petovan
d7f62e82b9
Fix behavior regression
...
Reverted quitting get_contact if Probe::uri didn’t yield an url for
“nick@server.tld” form.
2017-03-07 16:28:15 -05:00
f7f23038db
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-03-07 21:24:20 +00:00
f09a8609df
Better separation between queries with or without result
2017-03-07 17:16:17 +00:00
Hypolite Petovan
97378893cd
Switch nurl and addr lookups
...
- nurl lookup is more frequent than addr lookup, saves queries
2017-03-06 16:26:04 -05:00
Hypolite Petovan
89f0b85905
Split slow catch-all query into three fast queries
...
Thanks @annando for the tip.
2017-03-06 16:19:12 -05:00
Hypolite Petovan
116b9e1c1f
Use Probe::uri instead of probe_url()
...
- Moved file inclusion to enable lazy loading
2017-03-06 06:01:08 -05:00
Hypolite Petovan
ff64beeb4e
Reformatted get_contact()
...
- Resolved one `@todo` (the catch-all contact query)
- Improved code readability by naming variables
- Code standards compliance
2017-03-06 05:37:01 -05:00
Hypolite Petovan
4931ecafbb
Rewriting of do_like()
...
- Fix behavior where event actions had to be performed twice to switch
from one to another
- Simplify the contact data retrieval
- Make sure contact-id, owner-id and author-id are correctly set
2017-03-06 05:28:01 -05:00
d686bdcf09
Quickfix for SQL commands that should return "true" instead of an empty array
2017-03-06 10:10:22 +00:00
Hypolite Petovan
67ae0fed7f
Fix response "self" assigment
...
- Switch from unreliable `uid` matching to `author-id` using
public_contact()
2017-03-06 05:07:17 -05:00
2ea50d9c47
Emulation for the mysqli behaviour when executing insert, update, ...
2017-03-05 23:59:53 +00:00
07516c318c
We now support PDO for database connections as well
2017-03-05 21:56:50 +00:00
9a71472be6
Only store a new gserver entry if it is a valid one
2017-03-04 14:32:40 +00:00
953477de87
Improved check for the server base url
2017-03-04 13:30:34 +00:00
b42167f0ac
We can now return a list of known servers
2017-03-04 11:04:00 +00:00
25e6244950
BlaBlaNet is now detected again. No false positive for Statusnet anymore
2017-03-04 07:57:55 +00:00
9965061359
Better detection for Hubzilla
2017-03-02 21:20:33 +00:00
324d8bfe8e
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server
2017-03-02 20:20:38 +00:00
5c92e97173
Added index for performance issues
2017-03-02 05:46:44 +00:00
Hypolite Petovan
07aefe61bf
Update paginate_data()
...
- Formatting: Normalize quotes, spaces, braces
- Add "disabled" CSS class to links previously ommitted
- Add "previous" and "next" CSS classes to minimal pager links
- Add main pager CSS class depending on type
2017-03-01 23:26:49 -05:00
60adf67f13
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-null-date
2017-02-28 06:50:46 +00:00
4de057804c
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-only-worker
2017-02-28 06:49:21 +00:00
c829dc8e71
The service at gstools.org doesn't exist anymore.
2017-02-28 06:26:50 +00:00
0afb0c2ea4
NULL_DATE is now a constant
2017-02-27 23:37:15 +00:00
997e94555b
The old pager is removed
2017-02-27 21:46:37 +00:00
39386ded36
"old_share" is removed
2017-02-27 21:26:37 +00:00
3c220dd40c
Queue.php is now reworked
2017-02-27 21:07:32 +00:00
df6913f7e1
pidfile.php is in use by two addons. So we restore it here.
2017-02-27 06:31:49 +00:00
99fb15037b
Removed some more unneeded stuff
2017-02-27 06:27:22 +00:00
48209f0ecd
Now there is only the worker.
2017-02-26 23:16:49 +00:00
2a8a5a6d88
Improved server vitality detection
2017-02-26 18:19:20 +00:00
6bd59cd094
Bugfix: "ALTER IGNORE" was missing on structure and index change
2017-02-26 08:36:05 +00:00
da8a48f89e
Bugfix: the curl option CURLOPT_SSL_VERIFYHOST is problematic
2017-02-25 13:59:24 +00:00
ca6171eb5c
For 3.5.1 use "0000-00-00 00:00:00" as lowest datetime value
2017-02-23 07:21:47 +00:00
06b16cce8b
Define the lowest possible datetime string as "0001-01-01 00:00:00"
2017-02-23 07:09:55 +00:00
f9f27c2f5f
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-23 06:55:35 +00:00
8986edf070
Merge remote-tracking branch 'upstream/develop' into bugfix-sql-date
2017-02-23 06:54:50 +00:00
ffeae7e048
Bugfix for bugfix :-)
2017-02-23 05:45:06 +00:00
c84565633e
Added check for invalid "contact-type"
2017-02-22 22:25:35 +00:00
194d80c326
Bugfix for badly formatted date time string.
2017-02-22 22:04:56 +00:00
564bc22900
Merge remote-tracking branch 'upstream/develop' into more-temp-stuff
2017-02-19 18:46:20 +00:00
9251d2af6f
Ensure that the spool path is set
2017-02-19 10:13:40 +00:00
2bfc40d74c
Bugfix for not createable spool path
2017-02-19 08:23:21 +00:00
Hypolite Petovan
58a444b430
Add original_url() param documentation
2017-02-18 20:39:16 -05:00
Hypolite Petovan
2c959b925d
Add param documentation
2017-02-18 20:35:31 -05:00
Hypolite Petovan
432587464c
Fix Diaspora link attachment probe
...
- Move analytics param stripping out of original_url
- Remove HEAD curl request in ParseUrl::getSiteInfo
- Replace original_url with strip_tracking_query_params in
ParseUrl::getSiteInfo to prevent massive curl fest in border cases
2017-02-17 22:35:46 -05:00
Hypolite Petovan
99cfae63d7
Clean trailing whitespaces
2017-02-17 22:32:33 -05:00
e647aa8846
Merge pull request #3169 from annando/bugfix-delete-spool
...
We have to delete spool files after posting in any case
2017-02-17 08:04:22 +01:00
03653072a2
We have to delete spool files after posting in any case
2017-02-16 20:23:07 +00:00
531074a72f
Handle the case when a contact is unknown.
2017-02-16 20:03:44 +00:00
7ba5228814
Bugfix: Only delete spool files that are spool files
2017-02-14 21:13:00 +00:00
e5e6f4fd19
Better logging to analyze unwanted messages from Diaspora
2017-02-11 23:37:15 +00:00
a4dcd8be55
Merge pull request #3159 from annando/bugfix-diaspora-relay
...
Bugfix: Only accept postings from anyone when the relay is configured
2017-02-11 08:58:38 +01:00
40390cc5ec
Diaspora Relay: Only accept postings from anyone when the relay is configured
2017-02-10 20:45:22 +00:00
f5a634abbc
Changed server detection.
2017-02-10 19:23:46 +00:00
rabuzarus
3474b40732
fix - pending contacts shouldn't be shown in contacts widgit and viewcontacts
2017-02-10 03:51:01 +01:00
6dd27b83ef
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-06 21:28:42 +00:00
3c5f7e457a
Merge pull request #3149 from annando/1601-new-diaspora-mention
...
Support for the new Diaspora mention format
2017-02-05 16:38:09 +01:00
e9d719a299
removed to-do
2017-02-05 07:02:20 +00:00
9f706fcfbb
Add include
2017-02-04 22:27:49 +00:00
0d1f88033b
Support for the new Diaspora mention format
2017-02-04 22:22:12 +00:00
21accc0a53
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-04 16:28:36 +00:00
9c4a53e380
Optimized query for nodeinfo, better way to analyze posting problems with DFRN
2017-02-04 16:16:15 +00:00
adedf18b30
Merge pull request #3146 from annando/1701-pnut
...
Preparation to add the social network "pnut"
2017-02-02 09:10:28 +01:00
5ffef9c96d
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-02 06:27:10 +00:00
275a1c6574
Preparation to add the social network "pnut"
2017-02-02 06:06:23 +00:00
9a19ae7ce1
The queue now works with the cache - whoch should speed it up
2017-02-02 05:52:45 +00:00
ef0fb5148c
Some more timeout checks
2017-02-01 21:35:01 +00:00
8a75a20d26
Bugfix: An index was missing
2017-02-01 21:08:13 +00:00
f6e1fbfcaa
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-01 17:29:20 +00:00
da30538a98
Bugfix for pull request 3125
2017-02-01 13:50:05 +00:00
7a89d06465
Make sure that we only quit when we are sure we can
2017-02-01 08:43:18 +00:00
7324a661f1
Optimized timeouts during network operations
2017-02-01 00:15:37 +00:00
2424cb78d1
Only process feed and dfrn items when they aren't already stored
2017-01-31 19:39:09 +00:00
Matthew Exon
96aadb23f8
Change $allowed_src_protocols to static
2017-01-31 03:44:32 +00:00
dae125e8ee
Issue 3135: dbupdate is started again and again
2017-01-30 21:18:08 +00:00
Matthew Exon
ce10a9aa7f
Break out list of acceptable protocols in "src" attribute into separate variable similar to "href" attributes
2017-01-30 15:48:12 +00:00
dd36b2bded
Merge pull request #3128 from annando/bugfix-no-self-destroy
...
Bugfix: Sometimes the self contact seems to destroy itself
2017-01-30 09:11:10 +01:00
Matthew Exon
d99a96ef49
Global is an integer, do not set it to an empty string
2017-01-30 00:56:21 +00:00
7ca809a00e
Addind unique indexes should now work with every MySQL flavour
2017-01-29 17:31:20 +00:00
ac88471e55
Make the code nicer
2017-01-29 14:00:44 +00:00
c1eea3771f
Bugfix: Sometimes the self contact seems to destroy itself
2017-01-29 13:57:03 +00:00
46ab87a303
Typo fixed
2017-01-28 13:38:18 +00:00
ea22828d37
Alternate solution for pull request 3124
2017-01-28 12:19:04 +00:00
9259feec6f
Merge pull request #3121 from annando/1701-bugfix-config
...
Issue 3117: Can't store values that are only in the .htconfig.php
2017-01-28 08:30:22 +01:00
0b5ef73d4a
Merge pull request #3119 from annando/1701-bugfix-events
...
Bugfix: Avoid duplicated birthday events
2017-01-28 07:29:29 +01:00
32b997823f
Don't forget the brackets
2017-01-28 06:21:58 +00:00
82086eea36
Bugfix: When a value was only in the .htconfig.php then it never was stored
2017-01-28 06:18:16 +00:00
Michael Vogel
d61a4a67db
Merge pull request #3109 from Hypolite/issue/scrap-tinymce
...
Scrap TinyMCE
2017-01-27 21:08:33 +01:00
5760cfeb94
Added to-do
2017-01-27 19:57:57 +00:00
cb0600976d
Bugfix: Avoid duplicated birthday events
2017-01-27 17:04:52 +00:00
2a77e426f9
Split poco discovery in smaller function calls
2017-01-27 17:00:34 +00:00
64d06b98b2
Added documentation
2017-01-27 15:13:37 +00:00
Hypolite Petovan
66482c1d9c
- Remove $theme_richtext_editor boot var
...
- Remove "richtext" feature
- Remove fix_mce_lf() function
- Remove nomce parameter
2017-01-26 22:57:53 -05:00
Hypolite Petovan
9d5384f107
- Remove tinyMCE mentions or convert to addeditortext()
...
- Remove $editselect template value
2017-01-26 22:50:27 -05:00
422be7e212
Improved handling of non string values in the config
2017-01-25 05:33:23 +00:00
becfeaf0b7
Bugfix: Caching of non string cache values now works.
2017-01-24 18:55:07 +00:00
ea18d1829f
Reformatted stuff, improved query
2017-01-24 06:45:46 +00:00
69f1deb166
Some added logging
2017-01-21 20:15:49 +00:00
dc439c6e50
Bugfix for masses of php warnings
2017-01-21 19:50:56 +00:00
c74b7565a9
Rearranged the logging
2017-01-21 06:16:15 +00:00
45d6f6c0a3
Some changed logging
2017-01-21 06:06:29 +00:00
72884d75d5
Added callstack
2017-01-21 05:05:41 +00:00
68115581d0
Avoiding some error messages
2017-01-20 22:22:05 +00:00
8939a25502
Better number format
2017-01-20 22:05:50 +00:00
9d77e91f5f
Some more logging
2017-01-20 21:58:53 +00:00
850419dd14
Hopefully better index length.
2017-01-20 13:30:06 +00:00
7757505e40
Bugfix: Quarter Hour cache was cleared every time.
2017-01-19 23:07:12 +00:00
6bbc0e4c78
Bugfix: The caching of values didn't really work for boolean values
2017-01-19 22:47:20 +00:00
1360a0a003
The worker now tells the process runtime length.
2017-01-19 17:06:23 +00:00
4e91379f4a
Added reminder
2017-01-19 07:09:56 +00:00
0548099f6c
The config class now makes less database reads.
2017-01-18 21:45:32 +00:00
53393233c3
Replace the direct access of config variables
2017-01-17 19:21:46 +00:00
b935b57c66
Merge remote-tracking branch 'upstream/develop' into 1701-index-again
2017-01-17 06:49:01 +00:00
79866f620a
OOpppss ...
2017-01-16 22:15:04 +00:00
6972faa3a8
Redo some work
2017-01-16 22:11:35 +00:00
6e1986a0f2
Removed commented text
2017-01-16 21:48:35 +00:00
2cdf87c56a
Deactivated the alternative update script by now
2017-01-16 21:35:35 +00:00
d6ca6f24a7
Merge remote-tracking branch 'upstream/develop' into 1701-index-again
2017-01-16 21:06:43 +00:00
0c310db23d
Bugfix for failed events page and api
2017-01-16 20:59:16 +00:00
b81a1fde09
Merge pull request #3093 from annando/issue-3011
...
Issue 2364: OStatus: Don't fetch liked contents
2017-01-16 07:31:53 +01:00
e7966171dd
Merge pull request #3094 from annando/1701-hubzilla-probe
...
Fixing avatar problems when probing Hubzilla contacts
2017-01-16 07:27:03 +01:00
ced7cb6828
Smarter way to create unique indexes
2017-01-15 23:30:43 +00:00
e63e241f8f
Hubzilla doesn't send a width attribute in the avatar picure in the hcard
2017-01-15 19:46:04 +00:00
021a4fad71
Some more database stuff
2017-01-15 12:36:06 +00:00
2362e78c8f
Issue 3011 (and others): OStatus: Don't fetch liked contents
2017-01-15 09:07:57 +00:00
e16afc0450
Some more changed indexes and improved queries
2017-01-14 21:36:34 +00:00
85397f3bb9
Some removed indexes
2017-01-14 00:49:41 +00:00
29ef8d29ce
Better usage of text and mediumtext.
2017-01-13 22:13:52 +00:00
3af099298c
Some more caching
2017-01-13 17:31:10 +00:00
a9833a395f
The relay query now uses a better index
2017-01-13 10:37:39 +00:00
fd5f151a72
New function to detect heavily used indexes
2017-01-13 07:46:47 +00:00
e67133ef56
Merge remote-tracking branch 'upstream/develop' into 1701-curl-range
...
Conflicts:
mod/oexchange.php
mod/uimport.php
2017-01-12 07:25:44 +00:00
rabuzarus
63e2695d22
Merge pull request #3074 from annando/1701-diaspora-ostatus-mentions
...
Bugfix: Answers to OStatus posts should never reach Diaspora
2017-01-12 02:12:25 +01:00
rabuzarus
4a8cff74f2
Merge pull request #3081 from annando/1701-top-level
...
When commenting too fast, messages weren't delivered to Diaspora
2017-01-12 02:11:43 +01:00
fcd0b198f5
Correction of commit a96eb3428d
2017-01-11 23:18:51 +00:00
12dd06f726
Merge remote-tracking branch 'upstream/develop' into 1701-top-level
2017-01-11 23:15:23 +00:00
rabuzarus
0e64d462df
diaspora - add braces
2017-01-11 13:02:18 +01:00
rabuzarus
2daa0936db
diaspora - switch logger for "non subscribed messages" to LOGGER_DEBUG
2017-01-11 12:45:25 +01:00
Michael Vogel
3c51820515
Merge pull request #3076 from Hypolite/issue/#3039-boot-doc-include
...
Normalize App parameter declaration (doc-include folders, boot)
2017-01-11 09:01:48 +01:00
84b733e1bf
Standards stuff should make Hypolite happy.
2017-01-10 16:11:08 +00:00
3cf1f5e532
Compare instead of assign ...
2017-01-10 10:23:51 +00:00
c44f859edf
We should check for the item, not the parent.
2017-01-10 07:58:17 +00:00
fafeea4382
When commenting too fast, messages weren't delivered to Diaspora
2017-01-10 07:40:57 +00:00
a2debaa68a
Download limit for fetching data via "z_fetch_url"
2017-01-09 23:10:32 +00:00
Hypolite Petovan
87eb3d5ef2
Normalize App parameter declaration (doc-include folders, boot)
2017-01-09 23:09:01 +11:00
16f0221e4c
DBClean now has a smaller limit/Query improvements
2017-01-09 09:37:37 +00:00
65226778fe
More standards
2017-01-09 06:40:56 +00:00
fc60e7f5dd
Making Hypolite smile
2017-01-08 22:29:55 +00:00
906c7d528b
Bugfix: Answers to OStatus posts should never reach Diaspora
2017-01-08 20:35:41 +00:00
28b2e599fb
it should be "gid" not "cid"
2017-01-08 20:11:15 +00:00
ed0143c9f0
Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes
2017-01-07 16:13:57 +00:00
1febf182ad
Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes
2017-01-07 14:31:25 +00:00
c2543f918b
Last minutes changes
2017-01-07 13:52:30 +00:00
414c5ddae0
Use Config class/Option to deactivate the count on albums
2017-01-07 09:05:52 +00:00
4530f4ac9d
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-06 17:10:40 +01:00
cb5df4d715
Some corrections
2017-01-06 13:30:12 +00:00
6976ad4892
Removed some removed indexes
2017-01-06 06:37:27 +00:00
ff3728be47
Cleaning up the stuff
2017-01-05 22:51:31 +00:00
2deb2b637b
Some new indexes and some removed.
2017-01-05 22:23:00 +00:00
6cdccbe2f6
Will we now find the best index fort the contact?
2017-01-05 17:48:51 +00:00
7aaf91a620
Removing and adding some indexes
2017-01-05 13:16:27 +00:00
9c7a2d2f9a
Another index
2017-01-05 09:32:16 +00:00
a4e437b56f
Contact testing
2017-01-05 09:10:02 +00:00
a92c5f464d
Hopefully this it it ...
2017-01-05 08:02:21 +00:00
db1c6c06d6
Finding the best index ...
2017-01-05 07:30:10 +00:00
00d7835ba6
Some more contact indexes
2017-01-05 07:12:13 +00:00
rabuzarus
686a7dbe01
Bugfix: make some todos usable for doxygen in dfrn.php
2017-01-05 02:23:34 +01:00
cefb36fb67
Some more indexes on the contact table
2017-01-04 23:28:51 +00:00
c221376041
Some notification thingy
2017-01-04 23:12:28 +00:00
44d966574d
Some more indexes and other query improvements
2017-01-04 19:13:50 +00:00
6b6e3e264f
Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes
2017-01-04 13:57:27 +00:00
42c2e09382
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-04 09:03:00 +01:00
9a6478b273
Don't be greedy.
2017-01-02 07:00:44 +00:00
8aaf09f9ee
Automatically add a Diaspora mention
2017-01-01 23:18:42 +00:00
9ca789b952
Merge remote-tracking branch 'upstream/develop' into develop
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-31 17:59:14 +01:00
4053499c38
Enable caching wirh comments
2016-12-30 23:18:31 +00:00
66902c7956
We now also transmit Dislikes
2016-12-30 22:40:30 +00:00
7cf70b64b8
We now send the participation message as well.
2016-12-30 22:31:21 +00:00
d2df464d8c
added curly braces + fixed indenting according to code review by Hypolite
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:49:08 +01:00
d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop
...
dbm::is_result() calls needed merge
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:33:41 +01:00
4928d00e22
Standard stuff
2016-12-30 10:03:02 +00:00
55ee80338f
Events are now shared with Diaspora.
2016-12-30 03:31:38 +00:00
5222bd2264
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
2016-12-29 23:29:01 +00:00
94977cca18
Events are now done.
2016-12-29 23:27:11 +00:00
51155d7716
Merge pull request #3047 from annando/1612-indexlength
...
New binary data fields to avoid index length problems
2016-12-29 19:11:54 +01:00
666eb2ddbd
Merge branch '1612-diaspora' of github.com:annando/friendica into 1612-diaspora
2016-12-29 17:13:07 +00:00
9af3f5b0da
Improved loggin
2016-12-29 17:11:59 +00:00
1490f2d3b7
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
2016-12-29 10:16:10 +00:00
483f34c4ce
We now transmit event data as well
2016-12-29 03:13:57 +00:00
ca0e6cba02
Relaying of Diaspora comments now work with the new fields as well.
2016-12-28 13:30:55 +00:00
Johannes Schwab
aab21838a4
Missing self befor class constants
2016-12-28 13:14:03 +01:00
6a511066c4
Threaded comments will now be transmitted
2016-12-27 14:37:48 +00:00
ce4c542e37
Support for threaded comments
2016-12-27 12:59:15 +00:00
3ba1ac595f
New binary data fields to avoid index length problems
2016-12-25 21:04:10 +00:00
b7c9d63b7a
Fixed parser errors (opps) + changed # -> // Please do so also as # for comments is deprecated.
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-23 20:09:10 +01:00
3dbb92c0dc
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-23 19:51:11 +01:00
ca82678a6d
Continued with coding convention:
...
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-23 19:51:04 +01:00
f8a213e23b
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:49:36 +01:00
97c507e763
Coding convention applied:
...
- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:49:15 +01:00
rabuzarus
e95337e9ae
correct doxygen @todo
2016-12-23 18:31:42 +01:00
5547bc2cc2
Continued rewriting a bit:
...
- more usage of dbm::is_result()
- nicer look of code
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 17:03:00 +01:00
9c81b4948e
Coding convention applied:
...
- added curly braces
- added space between if/foreach and brace
- avoided 2 return statements (true/false) by replacing them with just one
- added TODO for applying above to all findings
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 16:59:43 +01:00
8db0be09b8
Coding convention applied:
...
- added curly braces
- added space between if/foreach and brace
- avoided 2 return statements (true/false) by replacing them with just one
- added TODO for applying above to all findings
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 16:58:50 +01:00
2325d81048
Code style changed:
...
- added more curly braces
- made SQL keywords all-uppercase
- added spaces between if/foreach and brace
- // Is for single-line comments *only*, please don't abuse it for multiple
line comments, use /* */ instead and a asterisk in front of every line.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 16:52:28 +01:00
30642756e5
Code style changed:
...
- added more curly braces
- made SQL keywords all-uppercase
- added spaces between if/foreach and brace
- // Is for single-line comments *only*, please don't abuse it for multiple
line comments, use /* */ instead and a asterisk in front of every line.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 16:50:40 +01:00
d82ed5d1b4
Continued with code convention:
...
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 15:31:23 +01:00
c9194b0381
Continued with code convention:
...
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 15:30:23 +01:00
20e71d21a6
Merge branch 'rewrites/app_get_baseurl_static' into develop
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/admin.php
mod/bookmarklet.php
mod/community.php
mod/contacts.php
mod/crepair.php
mod/editpost.php
mod/events.php
mod/install.php
mod/lostpass.php
mod/network.php
mod/notify.php
mod/suggest.php
mod/uexport.php
mod/videos.php
view/theme/duepuntozero/config.php
view/theme/frio/config.php
view/theme/quattro/config.php
view/theme/vier/config.php
2016-12-22 11:37:23 +01:00
ad20c5504d
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/diaspora.php
object/Item.php
2016-12-22 11:33:00 +01:00
c0df692f5f
Merge remote-tracking branch 'upstream/develop' into develop
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/diaspora.php
object/Item.php
2016-12-22 11:29:56 +01:00
Michael Vogel
9e689e8b9b
Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links
...
Diaspora: Complete /people/* links from fcontact or author domain
2016-12-22 10:17:44 +01:00
ef5838bbd2
was not missing in develop branch, but here. :-(
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 09:10:17 +01:00
99c8fd36c0
applied coding convention rule
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 09:10:00 +01:00
d242e72c65
applied coding convention rule
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 09:09:27 +01:00
8b7d5d0efc
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
2016-12-22 09:06:00 +01:00
4c04a78d1b
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-22 09:03:44 +01:00
rabuzarus
2fcbba9410
provide local time for notifications
2016-12-22 00:28:52 +01:00
rabuzarus
125d2f24dd
frio: add profile link to the notifications url
2016-12-21 23:17:55 +01:00
d3e666f71a
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 23:12:28 +01:00
d97b6a2eba
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 23:04:09 +01:00
0436782e70
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 20:01:51 +01:00
Hypolite Petovan
769b849665
url_from_contact_guid: move network constant to arg list
2016-12-20 20:52:42 -05:00
3befdc6920
used more App::get_baseurl() instead of get_app()->get_baseurl().
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:51:54 +01:00
7c342600c3
used more App::get_baseurl() instead of get_app()->get_baseurl().
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:51:25 +01:00
b4bc07fdcc
Continued with coding convention:
...
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:32:00 +01:00
536f078ed4
Continued with coding convention:
...
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:31:05 +01:00
6c0c9d542a
Continued with coding convention:
...
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:16:49 +01:00
af2909bf8f
Continued with coding convention:
...
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:13:50 +01:00
Hypolite Petovan
b631442760
Misc changes to url_from_contact_guid
...
- Rename url_from_fcontact_guid to url_from_fcontact_guid
- Use network name constant
- Standards
2016-12-20 14:33:33 -05:00
Hypolite Petovan
a99532707b
Resolve conflict
2016-12-20 12:52:24 -05:00
Hypolite Petovan
e8e1f9253d
Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links
...
# Conflicts:
# include/follow.php
2016-12-20 12:50:36 -05:00
Hypolite Petovan
177f93f9a5
diaspora.php: Standards, standards everywhere
2016-12-20 12:49:50 -05:00
Hypolite Petovan
155e777d19
replace_people_guid: Break down nested calls
...
- Fix typo in function name
- Fix arguments
- Simplify url_from_fcontact_guid
2016-12-20 12:49:32 -05:00
Hypolite Petovan
4a7c3b9eef
Diaspora: Fix class name case + add self
2016-12-20 12:44:15 -05:00
de689583e2
added more curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/admin.php
2016-12-20 17:58:34 +01:00
4b221d216e
added more curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 17:57:40 +01:00
23cef0936f
Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes
2016-12-20 16:27:16 +00:00
361a55155c
Don't cherry-pick: reverted unrelated changes (dbm::is_result())
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 16:21:59 +01:00
d72673b162
Only distribute items to active contacts
2016-12-20 16:02:39 +01:00
4aafbb09a5
The object type "photo" is deprecated and was replaced by "image"
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/like.php
mod/photos.php
mod/subthread.php
2016-12-20 16:00:23 +01:00
1f93024ed6
Workaround for vanished database connections while authentication
2016-12-20 15:59:28 +01:00
a020086128
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-20 15:50:39 +01:00
d4c3dcf2fc
Merge pull request #3032 from annando/1612-auth-ejabber
...
Workaround for vanished database connections while authentication
2016-12-20 15:45:18 +01:00
b9e4b9f274
Merge remote-tracking branch 'upstream/develop' into develop
...
Changes in #3034 were somehow conflicting. :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/like.php
mod/photos.php
mod/subthread.php
2016-12-20 15:44:31 +01:00
cc16369b6f
Merge pull request #3033 from annando/1612-object-type
...
The object type "photo" is deprecated and was replaced by "image"
2016-12-20 15:44:07 +01:00
c1193c9c13
Merge pull request #3034 from annando/1612-no-archive
...
Only distribute items to active contacts
2016-12-20 15:42:41 +01:00
51716957b2
converted more to dbm::is_result() + added braces/space
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 15:37:27 +01:00
ace8f753ac
added much more curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/bookmarklet.php
mod/community.php
mod/contacts.php
mod/crepair.php
mod/events.php
mod/network.php
mod/suggest.php
mod/uexport.php
view/theme/duepuntozero/config.php
view/theme/frio/config.php
view/theme/quattro/config.php
view/theme/vier/config.php
2016-12-20 11:59:13 +01:00
e24c3a5b82
added much more curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:56:34 +01:00
fc9dbc0899
added spaces + curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:38:28 +01:00
5588472f6d
added spaces + curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:38:16 +01:00
f3529e7dbc
added spaces + curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:36:27 +01:00
c86f09a894
added spaces + curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:36:03 +01:00
fb0ed18a43
changed to this:
...
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:58:03 +01:00
a9bed1422e
added more curyl braces + spaces between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:44:59 +01:00
be35349495
added more curyl braces + spaces between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:44:27 +01:00
65e1cd728c
Coding convention:
...
- added curly braces
- added space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:40:09 +01:00
a5e4882e25
Coding convention:
...
- added curly braces
- added space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:35:28 +01:00
abff6372dd
Coding convention applied:
...
- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/lock.php
2016-12-20 10:12:31 +01:00
fb676335db
Coding convention applied:
...
- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:10:33 +01:00
37ce5ce886
Remove indexes that we don't use anymore
2016-12-20 07:14:59 +00:00
4c77ae2fe9
Only distribute items to active contacts
2016-12-20 07:13:22 +00:00
6e46987515
The object type "photo" is deprecated and was replaced by "image"
2016-12-20 07:10:47 +00:00
75711a947e
Workaround for vanished database connections while authentication
2016-12-20 07:08:03 +00:00
Hypolite Petovan
81d003cad1
Diaspora: Complete /people/* links from fcontact or author domain
2016-12-19 23:30:50 -05:00
dac1dbd3e9
Merge branch 'rewrites/dbm_is_result' into develop
2016-12-19 14:47:05 +01:00
a96eb3428d
Used more dbm::is_result() instead of (!$r) or (!count($r)), still there are
...
more pending ...
Also put SQL table columns into back-ticks.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-19 14:46:33 +01:00
884f44ce94
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-19 14:27:16 +01:00
4615f39836
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-19 14:21:26 +01:00
ff569756ee
Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object-reference-calls
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/follow.php
2016-12-19 09:40:34 +01:00
8cab220387
Bugfix: Reimported Friendica posts from pump.io had the links missing.
2016-12-18 23:39:44 +00:00
3f6fd4bf84
Mastodon: Hopefully we can now detect reshares better
2016-12-18 20:34:34 +00:00
a8e80ef0a6
Ostatus: The follow/unfollow XML should now be even more compliant.
2016-12-18 20:02:13 +00:00
099f51c7b5
Removal of test code
2016-12-18 17:36:48 +00:00
bc323b0bfa
OStatus: Follow/Unfollow should now work again.
2016-12-18 17:10:38 +00:00
f89044ed61
Garrr ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:07:21 +01:00
9c564c4fd3
Again, static *OR* object-referencing calls? Blue or red pill?
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:06:20 +01:00
2eb3727542
Again, static *OR* object-referencing calls? Blue or red pill?
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:05:18 +01:00
378cbd9027
Continued with #3010 :
...
- more reverts of $a->get_baseurl()
- you always do: function foo (&$a), please read my TODO why it is not so good.
- for now I have fixed this inconsistency (compared to other method signatures)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:59:13 +01:00
8e1796bb1f
Continued with #3010 :
...
- more reverts of $a->get_baseurl()
- you always do: function foo (&$a), please read my TODO why it is not so good.
- for now I have fixed this inconsistency (compared to other method signatures)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:57:55 +01:00
d26009e408
Garrr ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:52:15 +01:00
1c82ad0734
Opps, tpzo found ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:51:21 +01:00
8ad1bdaac1
Opps, tpzo found ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:51:06 +01:00
d4f737577b
And more reverts:
...
- $a->get_baseurl() -> App::get_baseurl()
- was_recently_delayed() (entirely)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:49:17 +01:00
f42935421e
And more reverts:
...
- $a->get_baseurl() -> App::get_baseurl()
- was_recently_delayed() (entirely)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:49:00 +01:00
dea8bef472
more reverts ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:32:57 +01:00
7849b3f8e3
more reverts ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:32:32 +01:00
ba3bc420ca
Also reverted these + added spaces for nicer appearance.
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:23:59 +01:00
6cef88c24e
Also reverted these + added spaces for nicer appearance.
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:23:41 +01:00
53417aaf39
Create missing self contact
2016-12-15 07:15:33 +00:00
9e28f5a0c3
fixed SQL writing: keywords upper-case, column/table names in back-ticks. #3010
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-14 20:51:38 +01:00
c830bfcd96
fixed SQL writing: keywords upper-case, column/table names in back-ticks. #3010
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-14 20:50:39 +01:00
ab50585e9a
reverted change (which duplicated above query), thanks to @annano to point this out. #3010
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:41:56 +01:00
cef6fce7f0
reverted change (which duplicated above query), thanks to @annano to point this out. #3010
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:41:28 +01:00
467cdfeb34
3 slashes for Doxygen, 2 are enough for PHP ... :-(
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:28:45 +01:00
ba45a292c4
3 slashes for Doxygen, 2 are enough for PHP ... :-(
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:28:18 +01:00
41db906dc4
Continued with #3010 :
...
- removed added debug messages (maybe they will come back in accordance to
code-style guidelines?)
- converted $a->get_baseurl() back to App::get_baseurl()
- reverted back other code I have touched/merged as this was double:
(substr($url, 0, 4) !== 'http') on $url = 'https://bla '; will be FALSE
(means found http at start), too.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:02:10 +01:00
23d4db5149
Continued with #3010 :
...
- removed added debug messages (maybe they will come back in accordance to
code-style guidelines?)
- converted $a->get_baseurl() back to App::get_baseurl()
- reverted back other code I have touched/merged as this was double:
(substr($url, 0, 4) !== 'http') on $url = 'https://bla '; will be FALSE
(means found http at start), too.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:59:35 +01:00
307df4ee5c
Also removed this, seems to come in from wrong merging? #3010 Thanks to @annando
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:41:23 +01:00
b21a1437f4
Also removed this, seems to come in from wrong merging? #3010 Thanks to @annando
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:39:39 +01:00
c75d6ad850
More dbm::is_result() instead of count()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 12:03:02 +01:00
b5776ab959
Fixes for #3010 :
...
- used static call, still App::get_baseurl() wraps it into an object-referencing
call which seems to be a bit redundant?
- added spaces around dot (see one line below)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:49:52 +01:00
a905522eb5
Cleanup for #3010 - added spaces, thanks to @annando .
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:42:36 +01:00
a8dc8b288c
import dbm here to avoid adding everywhere the namespace (if later changed,
...
only here it needs change, cool ha? ;-)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 15:24:44 +01:00
797de5bfe0
Nope, get_basepath() should be static, then also mark it as static (in signature).
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 14:53:57 +01:00
63610c7b73
Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/Photo.php
include/api.php
include/cache.php
include/dbstructure.php
include/enotify.php
include/items.php
include/onepoll.php
include/queue_fn.php
include/session.php
include/text.php
mod/contacts.php
mod/dfrn_request.php
mod/display.php
mod/events.php
mod/item.php
mod/message.php
mod/msearch.php
mod/photos.php
mod/poco.php
mod/profile.php
mod/proxy.php
mod/videos.php
update.php
view/theme/diabook/theme.php
view/theme/vier/theme.php
2016-12-13 11:00:44 +01:00
6a8a36f12d
More usage of dbm::is_result($r) instead of count($r):
...
- count() returns very different results and never a boolean (not even false on
error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
done in PHP because of its lazyness. But it is discouraged if it comes to
more clean code.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 10:44:13 +01:00
293436e5fd
Some rewrites:
...
- max_proccesses_reach() and maxload_reached() (why no _ behind max?) are called
both way, static and with object reference.
- this is strongly discouraged and should be avoided as its support (in PHP) may
be dropped in future releases.
- used $a = get_app(); to encapsulate code (even when the function does
currently the same, it may be changed later)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 10:16:36 +01:00
73e330abbe
Restore empty line
2016-12-12 06:51:08 +00:00
17f15e793f
Issue 2999: Better Mastodon handling
2016-12-12 06:46:02 +00:00
352b168e2d
Merge pull request #3007 from annando/1607-performance
...
Some more performance stuff
2016-12-12 07:04:16 +01:00
0c99cee092
Some logging to detect possible problems with the probing
2016-12-11 18:39:39 +00:00
5c04402448
String is no integer
2016-12-11 17:37:12 +00:00
c666c98559
Code bautification
2016-12-10 12:28:49 +00:00
00c74a7d6d
Some more ...
2016-12-10 12:21:16 +00:00
5572bd0cf9
Redo the index changes for testing purposes
2016-12-10 12:19:57 +00:00
fc3c1601b1
Merge remote-tracking branch 'upstream/develop' into 1607-performance
2016-12-10 12:18:11 +00:00
Michael Vogel
af42e5e481
Merge pull request #2932 from Hypolite/issue/missing-private-image-src
...
Fix Friendica private image URL replacing
2016-12-09 15:54:11 +01:00
4059e58bbf
Merge pull request #2990 from Hypolite/fix-diaspora-medium-link
...
Improve diaspora2bb autolinker
2016-12-08 21:11:47 +01:00
Hypolite Petovan
cd354d3a57
Adding default protocols on missing config value for backward compatibility
2016-12-07 23:18:10 -05:00
Hypolite Petovan
88e336b3bc
Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private-image-src
...
# Conflicts:
# doc/htconfig.md
2016-12-07 23:15:46 -05:00
Hypolite Petovan
e29023dc8c
Standards
2016-12-07 23:11:53 -05:00
Hypolite Petovan
aef2c7373c
Formatting
2016-12-05 22:48:02 -05:00
Hypolite Petovan
d0cb8cdccf
Fixs edge case where single stars on succeeding lines are wrongly turned into multi-line <em>
2016-12-05 22:47:52 -05:00
Hypolite Petovan
60b9203dd5
Add <br> for each carriage return
...
Fixes #2993
2016-12-05 22:46:51 -05:00
Hypolite Petovan
2b75ad5e0a
src and href attributes sanitization touchups
...
- Use Config::get
- Add default to config call
- Add always allowed protocol to href
- Remove relative root URLs from allowed forms
2016-12-04 21:33:29 -05:00
Hypolite Petovan
5e20aed428
Revert adding a leading slash to redir links
2016-12-04 21:31:28 -05:00
9899c30d0f
Merge pull request #2991 from rabuzarus/20161204_-_allowfullscreen
...
Bugfix: Fix full screen for embedded videos
2016-12-04 17:49:15 +01:00
rabuzarus
3d4e1176ec
Bugfix: cached data doesn't need to get unserialized anymore
2016-12-04 15:15:23 +01:00
rabuzarus
5ca93d0541
Bugfix: Fix full screen for embedded videos
2016-12-04 14:55:57 +01:00
Hypolite Petovan
166df0180b
Improve diaspora2bb autolinker for URLs
...
- Add @ support for URLs (Medium URLs)
- Exclude trailing commas from autolinked URLs, likely to be normal text
- Formatting
2016-12-03 22:04:13 -05:00
Hypolite Petovan
979fc6d38a
Add protocol whitelist for href/src attributes
...
- Add strict URL checker for src attributes
- Add protocol whitelist for href attributes
- Add error styling if URL fails to pass filter
- Add doc for new htconfig value
- Add emphasis to config key names in htconfig doc
2016-12-03 14:19:57 -05:00
Hypolite Petovan
47a370c5e3
Revert adding baseurl to private image URL
2016-12-03 10:39:06 -05:00
Hypolite Petovan
0f2c27e041
Merge branch 'develop' into issue/missing-private-image-src
2016-12-03 10:34:48 -05:00
6619e0791d
Much more standards
2016-12-01 22:52:35 +00:00
13150c09a5
File was missing
2016-12-01 21:11:52 +00:00
6845775ff9
Store spooled data
2016-12-01 20:53:18 +00:00
c5d571287c
Merge branch '1612-spool' of github.com:annando/friendica into 1612-spool
2016-12-01 13:58:47 +00:00
eff4ad2e0a
Spool items that couldn't be stored
2016-12-01 13:50:26 +00:00
6ef69ad2da
Merge pull request #2983 from annando/issue-2915-2918
...
Disable richtext editor for frio - followup for #2938
2016-12-01 14:10:08 +01:00
1fc35d5f44
Merge pull request #2979 from annando/issue-2772
...
Issue 2772: Pending contacts should now be displayed
2016-12-01 08:51:04 +01:00
57c95c93e1
The frontend worker is now working as a full replacement for the crontab.
2016-11-30 19:24:58 +00:00
63389ba23d
Pending or blocked - that's the question ...
2016-11-30 04:30:48 +00:00
cc5eebd173
The frontend worker can now fork background processes
2016-11-29 22:40:19 +00:00
624fabf884
Somehow the changes of pull request 2748 got vanished
2016-11-29 20:25:27 +00:00
d49325d177
Disable richtext editor for frio - followup for #2938
2016-11-29 20:04:31 +00:00
Michael Vogel
efb2df41ba
Merge pull request #2977 from rabuzarus/20161128_-_help_page_polishing
...
Add protocol docu to the help docs
2016-11-29 19:38:31 +01:00
af3549fa01
The first check for "pending" isn't neccessary.
2016-11-29 18:31:37 +00:00
b2302f6290
Maybe we shouldn't count pending contacts
2016-11-29 18:23:34 +00:00
rabuzarus
250f978872
Merge pull request #2978 from annando/issue-2518
...
Issue 2518: Remove contact data in the background
2016-11-29 14:59:00 +01:00
d55d500e35
Merge pull request #2975 from annando/1611-frontend-worker
...
The worker can now run from the frontend as well
2016-11-29 09:40:59 +01:00
fd28ecaacc
Pending contacts shouldn't be displayed in the sidebar
2016-11-29 06:40:35 +00:00
eede89f537
Some brackets added
2016-11-28 22:18:37 +00:00
3a76a6766f
Issue 2772: Pending contacts should now be displayed
2016-11-28 22:11:13 +00:00
e7ef34298a
remove "blubb"
2016-11-28 21:48:06 +00:00
a38a5019d0
Issue 2518: Remove contact data in the background
2016-11-28 21:44:04 +00:00
Michael Vogel
9894f7cea7
Merge pull request #2965 from tobiasd/20161122-cpActiveResponse
...
active response
2016-11-28 21:14:42 +01:00
Michael Vogel
37e8f6b442
Merge pull request #2973 from rabuzarus/berlin_parse_url
...
parse_url: recognize image/video/audio files + move functions into own class
2016-11-28 21:05:31 +01:00
rabuzarus
ac39928e5d
upload connection graphics & update doxygen headers to insert link to the spec
2016-11-28 16:23:47 +01:00
rabuzarus
f229d65f85
ParseUrl: some docu work
2016-11-27 23:41:55 +01:00
rabuzarus
85b51ee41c
xml:php - some code standard work
2016-11-27 20:42:40 +01:00
rabuzarus
56e38dd6bd
move function deletenode() to the xml class
2016-11-27 20:19:43 +01:00
636a033364
Added documentation, config stuff, ...
2016-11-27 09:02:08 +00:00
d71321c834
Some added documentation
2016-11-27 01:11:22 +00:00
e856ab9a09
The worker can now run from the frontend as well
2016-11-27 00:55:05 +00:00
ba1a304589
Delivery to other systems was needlessly deferred.
2016-11-24 03:34:11 +00:00
rabuzarus
e9226eaf45
parse_url: recognize image/video/audio files + move functions into own class
2016-11-24 01:11:22 +01:00
Michael Vogel
4eeb5a0a17
Merge pull request #2969 from gerhard6380/develop
...
Develop
2016-11-23 05:13:31 +01:00
Hypolite Petovan
4937a3b7d8
Add the self property to conversation responses
...
- Add a condition to check if the current user is amongst the responses
- Populate the responses array with the self attribute
2016-11-22 18:35:19 +01:00
edbdd0e34a
Bugfix: We should only search in the current database for MyISAM tables
2016-11-22 16:47:08 +00:00
Michael Vogel
46ba1a46f5
Merge pull request #2896 from rabuzarus/0311_fix_photo_albums
...
chache: check for valid serialized data + uncomment caching of contac…
2016-11-21 04:04:36 +01:00
3de862712d
Issue 2772: Posts from pending contacts should be displayed as well.
2016-11-20 16:52:57 +00:00
rabuzarus
721ac5fb9e
cache: use unserialize(false)
2016-11-20 17:32:37 +01:00
Hypolite Petovan
003e6a7371
Improve BBCode javascript stripping regex
2016-11-19 18:01:45 -05:00
914330bb8f
Merge pull request #2940 from annando/1611-dead-contacts
...
Mark contacts as dead or undead while transmitting and receiving messages
2016-11-19 22:59:57 +01:00
89d5aa64ba
Mark contacts as dead or undead while transmitting and receiving messages
2016-11-19 20:10:29 +00:00
b95bf00e89
Additional info in registration request
2016-11-19 18:22:49 +01:00
a7dae15e82
added return value to doxygen header
2016-11-19 14:34:06 +01:00
32c0a9ef43
added return value to doxygen header
2016-11-19 14:32:01 +01:00
