Commit graph

129 commits

Author SHA1 Message Date
Roland Häder 042ed17826 removed own debug lines (no more needed).
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:58:27 +01:00
Roland Häder 036edc2fd0 added extra spaces to make it look nice. #3010
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:56:27 +01:00
Roland Häder 46d383369c Cleanup for #3010 - added spaces, thanks to @annando .
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:41:33 +01:00
Roland Häder 6de232c60a Cleanup for #3010 - removed all redundant lines found by @rabuzarus
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:31:27 +01:00
Roland Häder 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
Roland Häder 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
rabuzarus a208d2e72b dfrn_request: include the graphic of the connection process into the doxygen header 2016-11-29 19:57:30 +01:00
rabuzarus 54f3867ebd dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries 2016-11-29 15:52:12 +01:00
rabuzarus 0d223aa6f1 dfrn_request: added $blocked and $pending as variable to make code more understandable 2016-11-29 03:08:46 +01:00
rabuzarus d0cdf863a1 fix accidentally deleted line with local_user() 2016-11-28 15:30:36 +01:00
rabuzarus 5458f40f6a Bugfix: better detection dfrn_request of double connection requests 2016-11-28 01:13:47 +01:00
Roland Häder c1a15befc5
Some improvements/fix:
- fixed curly brace bug (introduced by myself)
- make all SQL keywords upper-case, column and table names lower-case
- used some more dbm::is_result

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-20 22:18:35 +02:00
Roland Häder e171a1cd22
Some fixes:
- avoids warning if no result is coming back
- brought back init variable before using it

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-18 23:39:07 +02:00
Roland Häder c825cc8d0d
This merge brings back dbm::is_result() where I could find it.
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-18 23:21:18 +02:00
Michael Vogel f27bc00464 Remove obsolote functions 2016-07-09 20:09:09 +02:00
Michael Vogel 4e5d335492 Removed the legacy function calls, removed unused functions 2016-07-04 08:05:30 +02:00
Michael Vogel 0b1188b7fe Imrpoved avatar handling when storing them/partly use of "micro" 2016-06-25 13:56:55 +02:00
Roland Häder 738e22d3eb
Some fixes:
- Letting $profile_link and $hcard always been overwritten with newly found
  entries has caused DFRN network detectio to fail and "connect" is no longer
  working. This fix makes sure that these both variables are only set if they
  are still empty.
- added more debug lines to see which URL was it before and after webfinger "detection"

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 14:52:48 +02:00
Roland Häder 3e701b90ac
Continued rewriting:
- use dba::is_result() everywhere (where I found the old, bad way)
- converted some spaces -> tabs for code
- converted some CRLF -> LF as mixures of both is not good

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 14:24:44 +02:00
Roland Häder 6177607bca More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE).
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 13:51:48 +02:00
Roland Häder 3448437156 More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE).
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 13:51:10 +02:00
Michael Vogel 535f382c4e
Bugfix: "default_group" behaviour wasn't implemented correctly 2016-05-01 13:47:24 +02:00
Michael Vogel d6a79abb68 Bugfix: "default_group" behaviour wasn't implemented correctly 2016-04-13 22:21:23 +02:00
Michael Vogel 8752ec11b2 Central function for default group, special setting for OStatus 2016-03-06 13:15:27 +01:00
Roland Häder 7d5166c9fe
Closed TODO: no .= needed here. #2392
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 18:28:06 +01:00
Roland Häder 76b042ddee
More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE).
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 14:42:55 +01:00
Tobias Diekershoff 75ed2f830d moved include Scape to top of the file 2016-01-03 19:15:13 +01:00
Michael Vogel 2ed3ae1aab Bugfix: The request process from DFRN hadn't worked anymore since the last pull request 2016-01-01 17:49:07 +01:00
Michael Vogel 72f7ee7fd3 Support for remote subscription in Diaspora 2015-12-28 03:14:38 +01:00
Michael Vogel 602821279a scrape_dfrn now scrapes the address as well. 2015-11-25 18:46:02 +01:00
fabrixxm b988aa7cb4 fix warning in /dfrn_request 2015-08-26 19:17:41 +02:00
Michael Vogel 123ad84689 Make the hardcoded path to dir.friendica.com configurable 2015-08-23 11:05:10 +02:00
Michael Vogel f6ea872986 The behaviour when following a new contact is now unified. 2015-04-09 00:10:21 +02:00
Fabrixxm f7cf72e450 fix use of $->query_string 2014-10-22 09:32:24 +02:00
fabrixxm 1bdddebd44 connection confirm notification mail via notification()
remove unused email templates
add a check for unexpected reponse from server
2014-09-06 17:28:46 +02:00
Michael Vogel 2b182b2dcf After a new friendica contact is added, the user is directed to the contact page of the new contact. (Instead of the remote profile) 2014-09-01 16:55:16 +02:00
Michael Vogel d23d26f44d Reduced options when adding a friendica contact and an address was provided via URL parameter. 2014-08-21 00:56:21 +02:00
Michael Vogel 6e7bd68ebb More "LIMIT 1" removed - and some other SQL improvements. 2014-03-11 23:52:32 +01:00
Michael Vogel b0dd16696a Solving some more SQL warnings ("limit" must never be used in update statements) 2013-12-02 20:30:24 +01:00
Zach Prezkuta e684324032 use explicit include paths 2012-12-28 14:51:50 -07:00
friendica e98dc70008 sn subscription fix 2012-12-23 02:47:14 -08:00
friendica 5c0f0df59a provide local_block - block_public as far as content but can connect with the grid. 2012-09-06 20:17:50 -07:00
friendica eeceecc9ba unterminated sql string 2012-06-22 00:25:01 -07:00
friendica 832d9eeaaf more fixes 2012-06-12 16:17:34 -07:00
friendica 8eb81a99c6 fix default group for local follows 2012-06-12 01:13:09 -07:00
friendica b6fe837a64 hide private group if desired 2012-05-29 18:43:56 -07:00
friendica 7b0ded3f14 more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
friendica 5d10672fb8 fix join group notifications 2012-04-30 04:11:42 -07:00
friendica ecc4962bd1 pass zrl to dfrn_request as fallback 2012-04-27 16:23:25 -07:00
friendica f265863435 more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips 2012-04-23 18:28:33 -07:00