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
