Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	7b352f3f74  
						 
						
							
							
								
								
								Revert "Coding convention applied - part 1"  
							
							 
							
							
							
						 
						
							2017-03-21 12:02:59 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	09851331a9 
 
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-20 20:51:32 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	5e1c303c08 
 
						 
						
							
							
								
								
								added spaces according to coding-convention  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-19 01:04:30 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	621a77b275 
 
						 
						
							
							
								
								
								added spaces around + curly braces ...  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-19 00:58:46 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	6ca6c6813a 
 
						 
						
							
							
								
								
								better log here ...  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-19 00:56:58 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	aeaafb5d71  
						 
						
							
							
								
								
								Continued:  
							
							 
							
							... 
							
							
							
							- added curly braces
- added TODO
- removed TODO (no change needed, is fine)
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-03-19 00:52:37 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	ed0d858f98 
 
						 
						
							
							
								
								
								added spaces + some curly braces  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-03-19 00:52:24 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	bf0a07b7ae 
 
						 
						
							
							
								
								
								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:52:02 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	015561fec6 
 
						 
						
							
							
								
								
								Opps ...  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-03-19 00:52:02 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	4a96c280d0 
 
						 
						
							
							
								
								
								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:52:02 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	41a36606c6 
 
						 
						
							
							
								
								
								added spaces + some curly braces  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-03-19 00:50:19 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	1a436264cd  
						 
						
							
							
								
								
								Some standards  
							
							 
							
							
							
						 
						
							2017-03-18 12:13:43 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	a2a171af06  
						 
						
							
							
								
								
								"dob" is not a date field, so the changes are reverted  
							
							 
							
							
							
						 
						
							2017-03-18 08:50:27 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	2d2a35af73  
						 
						
							
							
								
								
								Make Hypolite happy  
							
							 
							
							
							
						 
						
							2017-03-08 18:03:41 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	9c4a53e380  
						 
						
							
							
								
								
								Optimized query for nodeinfo, better way to analyze posting problems with DFRN  
							
							 
							
							
							
						 
						
							2017-02-04 16:16:15 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ea22828d37  
						 
						
							
							
								
								
								Alternate solution for pull request 3124  
							
							 
							
							
							
						 
						
							2017-01-28 12:19:04 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	cb0600976d  
						 
						
							
							
								
								
								Bugfix: Avoid duplicated birthday events  
							
							 
							
							
							
						 
						
							2017-01-27 17:04:52 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ced7cb6828  
						 
						
							
							
								
								
								Smarter way to create unique indexes  
							
							 
							
							
							
						 
						
							2017-01-15 23:30:43 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	021a4fad71  
						 
						
							
							
								
								
								Some more database stuff  
							
							 
							
							
							
						 
						
							2017-01-15 12:36:06 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4530f4ac9d  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into develop  
							
							 
							
							
							
						 
						
							2017-01-06 17:10:40 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	686a7dbe01  
						 
						
							
							
								
								
								Bugfix: make some todos usable for doxygen in dfrn.php  
							
							 
							
							
							
						 
						
							2017-01-05 02:23:34 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	af3549fa01  
						 
						
							
							
								
								
								The first check for "pending" isn't neccessary.  
							
							 
							
							
							
						 
						
							2016-11-29 18:31:37 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3a76a6766f  
						 
						
							
							
								
								
								Issue 2772: Pending contacts should now be displayed  
							
							 
							
							
							
						 
						
							2016-11-28 22:11:13 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	ac39928e5d  
						 
						
							
							
								
								
								upload connection graphics & update doxygen headers to insert link to the spec  
							
							 
							
							
							
						 
						
							2016-11-28 16:23:47 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3de862712d  
						 
						
							
							
								
								
								Issue 2772: Posts from pending contacts should be displayed as well.  
							
							 
							
							
							
						 
						
							2016-11-20 16:52:57 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	a8bef370d3  
						 
						
							
							
								
								
								Some code adjustements and performance improvements to the DFRN feed.  
							
							 
							
							
							
						 
						
							2016-10-21 23:04:04 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	501c45def5  
						 
						
							
							
								
								
								Some more improved queries  
							
							 
							
							
							
						 
						
							2016-10-21 18:25:21 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	095fa872ed  
						 
						
							
							
								
								
								Contact Type is now transmitted via poco  
							
							 
							
							
							
						 
						
							2016-10-04 03:48:01 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	60a0235af0  
						 
						
							
							
								
								
								The account type is now read and displayed  
							
							 
							
							
							
						 
						
							2016-10-01 20:03:27 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	d632d282cd  
						 
						
							
							
								
								
								We are now having an account type and are publishing it  
							
							 
							
							
							
						 
						
							2016-09-25 20:37:27 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	196eb6009f  
						 
						
							
							
								
								
								The XMPP address is now in the profile and will be transmitted  
							
							 
							
							
							
						 
						
							2016-09-25 15:28:00 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0cba02a805  
						 
						
							
							
								
								
								Added priority to some forgotten proc_run calls  
							
							 
							
							
							
						 
						
							2016-08-03 18:24:22 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0adff6f6b8  
						 
						
							
							
								
								
								Fix for author-thumb/owner-thumb - DFRN: Relocate stuff  
							
							 
							
							
							
						 
						
							2016-06-19 20:01:25 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e512a83ecc  
						 
						
							
							
								
								
								Massively updated avatar handling  
							
							 
							
							
							
						 
						
							2016-06-19 01:07:20 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	3c9a80a31c  
						 
						
							
							
								
								
								dfrn relocate: addr field added, gcontact update added  
							
							 
							
							
							
						 
						
							2016-06-15 21:23:22 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	869a439466  
						 
						
							
							
								
								
								Merge pull request  #2595  from annando/1606-contact-priority  
							
							 
							
							... 
							
							
							
							Priority for native networks when searching by contact url 
							
						 
						
							2016-06-13 09:28:54 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	c05898c57d  
						 
						
							
							
								
								
								The queries for items are unified (a little bit)  
							
							 
							
							
							
						 
						
							2016-06-12 21:04:55 +02:00