Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 11:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
21191 commits 3 branches 64 tags 246 MiB
Commit graph

206 commits

Author SHA1 Message Date
Adam Magness
8522c47353 Remove Includes 
Removed references to include/config.php and include/probe.php and deleted the respective files.
 2017-11-07 12:14:03 -05:00
Adam Magness
0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
Michael
5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
Michael
3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
Hypolite Petovan
9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
rabuzarus
cc8a3a4101 rename methods of the Probe class to camelCase 2017-05-08 16:19:10 +02:00
Hypolite Petovan
3a2988c3fd Rename include/Scrape to include/probe 2017-05-07 14:45:19 -04:00
Hypolite Petovan
36e515ee6d Move Probe to src 2017-05-07 14:44:30 -04:00
Hypolite Petovan
82b423c5ac Fix require_once format 2017-05-07 14:40:23 -04:00
Hypolite Petovan
20043914e6 Move App to src 
- Add `use Friendica\App;` wherever needed
 2017-05-02 22:59:36 -04:00
Hypolite Petovan
188d3a6f5e Renamed check_domain_blocklist to blocked_url 
- Remove debug
 2017-04-26 00:23:01 -04:00
Hypolite Petovan
c7e1a8e871 Added check_domain_blocklist 2017-04-25 22:45:56 -04:00
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
Roland Häder
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
Michael
c1eea3771f Bugfix: Sometimes the self contact seems to destroy itself 2017-01-29 13:57:03 +00:00
Michael
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
Roland Häder
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
Roland Haeder
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
Roland Häder
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
Roland Häder
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
Roland Häder
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
Roland Häder
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
Roland Häder
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
Roland Häder
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
Roland Häder
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
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 Haeder
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 Haeder
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 Haeder
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 Haeder
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 Haeder
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 Haeder
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 Haeder
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 Haeder
7d5166c9fe
Closed TODO: no .= needed here. #2392 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:28:06 +01:00
Roland Haeder
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
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