rebeka-catalina
554704e6b9
Added a whitespace between comma and t()
2017-04-08 16:57:24 +02:00
Hypolite Petovan
7b352f3f74
Revert "Coding convention applied - part 1"
2017-03-21 12:02:59 -04:00
0cd241bcbe
added spaces + some curly braces + some usage of dbm::is_result()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:44:40 +01:00
c1eea3771f
Bugfix: Sometimes the self contact seems to destroy itself
2017-01-29 13:57:03 +00:00
ea22828d37
Alternate solution for pull request 3124
2017-01-28 12:19:04 +00:00
Hypolite Petovan
8a197055e3
Normalize App parameter declaration (mod folder, 1 out of 3)
2017-01-09 23:12:54 +11: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
6e44acfed6
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:15:53 +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
4dce3d8224
changed to this:
...
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:58:55 +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
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
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
2c9d282136
Convention: SQL keywords all upper-case, columns and table names (better) lower-cased and always in back-ticks.
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:11:25 +01:00
a85470b172
Opps, this has vanished by accident, thanks to @annando
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:36:32 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
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
7d5166c9fe
Closed TODO: no .= needed here. #2392
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 18:28:06 +01:00
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
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
friendica
8f0f644295
protect jappixmini/proxy from typo check, more work on email2 connector
2012-04-23 05:16:57 -07:00
friendica
19b636e7e8
more backend work on mail2 followers
2012-04-10 19:15:52 -07:00
friendica
de3b9e9584
send zrl after dfrn_request homecoming for manual entries
2012-04-08 17:28:36 -07:00
Alexander Kampmann
355c42cb30
Merge branch 'master' of https://github.com/friendica/friendica
...
Conflicts:
include/config.php
update.php
2012-04-05 13:39:15 +02:00
Thomas Willingham
d0ddd380e7
Moved Diaspora notes away from top, per user request
2012-04-02 00:18:03 +01:00
friendica
b06c5983a4
don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
2012-03-14 21:58:54 -07:00
friendica
427362c324
Merge branch 'pull'
2012-03-13 15:41:13 -07:00
friendica
dc84da520d
invite potential connectees to the free social web
2012-03-13 15:40:16 -07:00
Tobias Hößl
36a1a43f06
Avoid notices
2012-02-28 13:42:12 +00:00
Abinoam P. Marques Jr
12a8796854
mod/dfrn_request.php and templates - Friendika -> Friendica
2012-02-20 19:38:43 -03:00
friendica
1b9c03f6fc
new notifications - implement storage
2012-02-18 02:57:42 -08:00
friendica
8aa2552372
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
2012-01-18 16:21:30 -08:00
friendica
fc7d0360bb
add verb and item to notifications to aid in localisation
2012-01-03 20:26:20 -08:00
friendica
5c7df6e964
notify_intro
2011-12-26 15:47:40 -08:00
friendica
cbdc667ba2
separate dfrn introductions from email when it comes to expiration of blocked requests
2011-12-11 23:33:56 -08:00
Friendika
573670fa0c
more social graph stuff
2011-11-01 16:08:07 -07:00
Friendika
d4644d7339
name change continued, social graph tools and stuctures, fix for spanish province name
2011-10-31 20:39:04 -07:00
Friendika
a5125359d8
faster friend requests (DFRN)
2011-09-06 18:06:19 -07:00
Friendika
e921b97a7f
bug #127 , add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings
2011-09-05 18:34:30 -07:00
Friendika
bc5935061b
dfrn friendship issue
2011-08-18 16:47:45 -07:00
Friendika
48ffa880f0
cleanup
2011-08-07 16:15:54 -07:00
Friendika
2637831d90
some more zot changes migrating back to f9a mainline
2011-08-01 21:02:25 -07:00
Friendika
df8ac668b8
more calendar work, undo strict_privacy flag to use different approach
2011-06-08 21:06:02 -07:00
Friendika
c0094aa4f8
strict privacy mode (Friendika-Z) - refuse to talk to networks with privacy issues
2011-06-06 16:26:11 -07:00
Fabio Comuni
e1107b55c6
add info() function. Works like notice() but show messages in a div with class info-message.
...
update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes
2011-05-23 11:39:57 +02:00
Friendika
b2e92e0af3
deprecate load_view_file
2011-05-11 04:37:13 -07:00
Friendika
c052d68828
don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version.
2011-05-10 16:12:50 -07:00
Friendika
639d52ec18
block_public should also block the contacts page and 'Connect' page if not logged in
2011-04-21 19:12:22 -07:00
Friendika
44c47f118c
"profile locator/address" is now called "Identity Address" to reduce confusion
2011-04-14 20:37:42 -07:00
Friendika
de131c9e58
set utf-8 on all emails
2011-04-14 17:13:13 -07:00
Friendika
4043ede080
more templates
2011-04-06 23:03:54 -07:00
Friendika
0fe997490d
dfrn remote profile protocol revision
2011-03-30 15:04:18 -07:00
Friendika
04cd865cc9
placeholder arg in dfrn conversations
2011-03-30 04:20:40 -07:00
Friendika
f198c5cff8
secure profile failure
2011-03-30 04:07:47 -07:00
fabrixxm
a7af6df962
Fix spaces around t() and tt()
2011-03-13 13:50:44 +01:00
fabrixxm
9f7878057f
update source strings
2011-03-11 00:22:21 +01:00
Friendika
a80ab19483
typo
2011-01-22 02:51:31 -08:00
Friendika
d347026094
don't urlencode $_GET vars
2011-01-21 05:21:13 -08:00
Friendika
0147520e90
add contact edit hooks
2011-01-07 03:15:52 -08:00
Friendika
ffbdad7041
friend request homecoming - ensure login redirects back to confirmation page,
...
prune old introductions that remain blocked over 30 minutes.
2011-01-07 02:57:26 -08:00
Friendika
502d59089b
schema typo
2011-01-06 23:41:14 -08:00
Friendika
d8985b3a54
try to auto-fill the profile address if we actually do know it.
2011-01-01 13:12:31 -08:00
Friendika
294dc27e17
double profile image on friend requests
2010-12-22 17:27:14 -08:00
Friendika
878067101f
block connection/friend request spam
2010-12-20 00:27:00 -08:00
Friendika
70f4f172dc
pull strings from connection request templates
2010-12-16 19:38:52 -08:00
Friendika
83939f1541
clean up comments
2010-12-14 16:34:49 -08:00
Friendika
0e39f60c04
replace quick fix with correct fix
2010-12-12 14:33:04 -08:00
Friendika
004193e849
display request issue
2010-12-12 13:59:16 -08:00
Friendika
6b5a83b9b8
profile load optimisation
2010-12-11 04:16:58 -08:00
Friendika
f4fd679928
couple of issues w/ profile photo update propogation
2010-11-09 18:24:35 -08:00
Friendika
9e35fb26f7
lint
2010-11-07 17:29:30 -08:00
Mike Macgirvin
c16f314ec3
two-way subscriptions working with federated social accounts
2010-10-25 21:52:30 -07:00
Mike Macgirvin
b8b227b328
add nicknames to contact records (going forward and retroactive)
2010-10-23 01:20:26 -07:00
Mike Macgirvin
0b2d85891e
lrdd link on profile page (for salmon m/e), remove dfrn-template, qualify some contact lookups, some cleanup of app/boot
2010-10-19 15:51:56 -07:00
Mike Macgirvin
3876cab8ea
sorting out the last(?) quirks in group pages.
2010-10-18 16:38:48 -07:00
Mike Macgirvin
ac824fe83e
eradicate redundant get_uid function
2010-10-18 14:34:59 -07:00
Mike Macgirvin
0f47ac282c
celebrity/group/community pages about 75% implemented
2010-10-17 20:04:17 -07:00
Mike Macgirvin
033935c194
cleanup to ensure protocol version is passed properly. We will need it if/when any incompatible protocol changes are introduced.
2010-10-12 20:29:04 -07:00
Mike Macgirvin
3c440f70c6
Provide the ability to subscribe to our user from other federated sites.
...
This is a read-only relationship until the rest of the salmon
magic-envelope stuff lands
2010-10-12 19:32:15 -07:00
Mike Macgirvin
744edcf2ab
modularise webfinger and make it service agnostic
2010-10-12 16:50:12 -07:00
Mike Macgirvin
d5a13b1e4c
localisation path for all view templates
2010-09-22 18:00:19 -07:00
Mike Macgirvin
38fde6672e
provide allow list of friend sites for education/corporate environments,
...
pattern matchable
2010-09-13 17:12:54 -07:00
Mike Macgirvin
ffb1997902
mistpark 2.0 infrasturcture lands
2010-09-08 20:14:17 -07:00
Mike Macgirvin
19a28434c4
potential xss exploit
2010-09-01 17:26:02 -07:00
Mike Macgirvin
2c1a27b2ae
webfinger client
2010-08-30 21:08:45 -07:00
Mike Macgirvin
6fa5557994
post branch fixes
2010-08-09 22:58:58 -07:00
Mike Macgirvin
2e5fb9c37e
lots of formatting, bug fixes on profile updates, i18n
2010-07-27 19:27:14 -07:00
Mike Macgirvin
11f2eaa16d
introduction cleanup - email notification flags
2010-07-22 02:13:39 -07:00
Mike Macgirvin
023dd993f6
more intro fix
2010-07-20 21:00:49 -07:00
Mike Macgirvin
db99f3abda
fixes
2010-07-20 20:48:08 -07:00
Mike Macgirvin
b4d5af63af
yuck
2010-07-20 20:43:46 -07:00
Mike Macgirvin
21ab8356b0
try this
2010-07-20 20:41:31 -07:00
Mike Macgirvin
91fd835754
fix intro bug
2010-07-20 20:38:08 -07:00
Mike Macgirvin
c3fd5ed732
one true profile photo, force nicknames
2010-07-19 19:09:58 -07:00
Mike Macgirvin
bbe53699f2
bug fixes
2010-07-19 05:24:22 -07:00
Mike Macgirvin
9a6a60a9c1
mucho progress on notifier, email style dfrn url's
2010-07-08 07:03:25 -07:00
Mike Macgirvin
1ea69ae275
bizzy
2010-07-06 05:07:28 -07:00
Mike Macgirvin
6817c5d59a
lots of work, 2way friends, comments...
2010-07-05 21:39:55 -07:00
Mike Macgirvin
6348e70daa
Initial checkin
2010-07-01 16:48:07 -07:00
