Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	9c0d2c31e8  
						 
						
							
							
								
								
								Replace AND and OR in PHP conditions by && and ||  
							
							
							
						 
						
							2017-06-07 22:00:59 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	108f0b2d1e  
						 
						
							
							
								
								
								Improve refactoring  
							
							... 
							
							
							
							- Rename $contacts to $users where meaningful
- Use Config::get instead of get_config
- Move requires for lazy inclusion 
							
						 
						
							2017-05-08 23:03:52 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	d5b660a72f  
						 
						
							
							
								
								
								Add missing require for poco_serverlist  
							
							
							
						 
						
							2017-05-08 21:55:19 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	70cc2ccc7a  
						 
						
							
							
								
								
								Fix standards + refactored variables with meaningful names  
							
							
							
						 
						
							2017-05-08 21:55:04 -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 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	0dbc72c4ea  
						 
						
							
							
								
								
								Embrace the braces and spaces ...  
							
							
							
						 
						
							2017-03-13 16:18:45 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d2bad13e83  
						 
						
							
							
								
								
								Added documentation  
							
							
							
						 
						
							2017-03-13 14:57:11 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b42167f0ac  
						 
						
							
							
								
								
								We can now return a list of known servers  
							
							
							
						 
						
							2017-03-04 11:04:00 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	f92918f471  
						 
						
							
							
								
								
								Normalize App parameter declaration (mod folder, 2 out of 3)  
							
							
							
						 
						
							2017-01-09 23:14:25 +11: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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	095fa872ed  
						 
						
							
							
								
								
								Contact Type is now transmitted via poco  
							
							
							
						 
						
							2016-10-04 03:48:01 +00: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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	b202e02fbf  
						 
						
							
							
								
								
								Revert "Updated modules to allow for partial overrides without errors"  
							
							... 
							
							
							
							This reverts commit db949bb802 
							
						 
						
							2016-02-07 15:11:34 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrej Stieben 
								
							 
						 
						
							
							
								
							
							
	db949bb802  
						 
						
							
							
								
								
								Updated modules to allow for partial overrides without errors  
							
							... 
							
							
							
							Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions. 
							
						 
						
							2016-02-05 21:52:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	2bad2cdd91  
						 
						
							
							
								
								
								More fields in gcontact, contact search respects "hide" setting  
							
							
							
						 
						
							2016-01-06 14:13:59 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7cf4468353  
						 
						
							
							
								
								
								Bugfix: /poco was always empty  
							
							
							
						 
						
							2015-10-31 10:32:01 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	901b95e935  
						 
						
							
							
								
								
								Hide some profile data if not connected.  
							
							
							
						 
						
							2015-10-06 06:56:31 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	dcfcd6f906  
						 
						
							
							
								
								
								Poco: added caching  
							
							
							
						 
						
							2015-07-25 12:05:27 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	68e318e316  
						 
						
							
							
								
								
								Don't export contacts with empty network  
							
							
							
						 
						
							2015-07-25 10:50:00 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e3e9de2e74  
						 
						
							
							
								
								
								Export all federation contacts through poco  
							
							
							
						 
						
							2015-07-24 07:23:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	880f486044  
						 
						
							
							
								
								
								Check not only for the last contact but also for the last update for the sanity check.  
							
							
							
						 
						
							2015-07-23 22:21:22 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	cbd2fc1572  
						 
						
							
							
								
								
								"last_contact" is now set automatically if it is lower than the update value.  
							
							
							
						 
						
							2015-07-23 20:57:08 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	f1e7369283  
						 
						
							
							
								
								
								Poco: Option to activate and deactivate detection of last activity.  
							
							
							
						 
						
							2015-07-18 00:48:42 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	8257e7e1e5  
						 
						
							
							
								
								
								block poco if block_local_dir is true  
							
							
							
						 
						
							2015-06-01 01:50:27 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	d1d794f1ab  
						 
						
							
							
								
								
								The global contacts now contain a "generation" value that defines how we know this contact  
							
							
							
						 
						
							2015-02-15 10:52:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	29f732e811  
						 
						
							
							
								
								
								More details in the location field for poco.  
							
							
							
						 
						
							2015-02-04 10:43:30 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	583c2ce13e  
						 
						
							
							
								
								
								poco can now be used to query the global contacts.  
							
							
							
						 
						
							2015-01-27 08:01:37 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	bc2c046446  
						 
						
							
							
								
								
								poco: Only update the global contacts when there is a network value/Export your own contact as well  
							
							
							
						 
						
							2015-01-25 16:40:20 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	2f400627c7  
						 
						
							
							
								
								
								Support for keywords and gender in (global) contacts.  
							
							
							
						 
						
							2015-01-25 13:19:37 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	344210bd6d  
						 
						
							
							
								
								
								Global contacts are now added with reshares as well. Better support for "aboutme" and "location" in poco.  
							
							
							
						 
						
							2015-01-25 00:19:59 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	94fb0305f7  
						 
						
							
							
								
								
								Poco now shows "about" and the location as well.  
							
							
							
						 
						
							2015-01-10 00:34:08 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8f1cfac20a  
						 
						
							
							
								
								
								The global contacts now contain the network name so that the suggestions can select between this.  
							
							
							
						 
						
							2015-01-08 07:59:20 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	16e4e61cc5  
						 
						
							
							
								
								
								Only show contacts from open networks  
							
							
							
						 
						
							2015-01-05 22:44:55 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	11c82816b3  
						 
						
							
							
								
								
								Poco now returns the last update date as well. This date will be stored in the gcontact table.  
							
							
							
						 
						
							2015-01-04 19:19:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	be29ae0bce  
						 
						
							
							
								
								
								poco xml returning 500 - but with contents?  
							
							
							
						 
						
							2013-01-29 18:36:10 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	11c06e21b7  
						 
						
							
							
								
								
								simplify by making Smarty include directives behave like Friendica native ones  
							
							
							
						 
						
							2012-12-25 11:55:57 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	96ed0a7791  
						 
						
							
							
								
								
								Implement Smarty3  
							
							
							
						 
						
							2012-12-22 12:57:29 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	e2ca9e9db5  
						 
						
							
							
								
								
								poco - ignore archived contacts  
							
							
							
						 
						
							2012-10-30 14:25:33 -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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	9b6e91086b  
						 
						
							
							
								
								
								make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php  
							
							
							
						 
						
							2012-04-05 02:15:03 -07: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 
								
							 
						 
						
							
							
								
							
							
	3aab1c7140  
						 
						
							
							
								
								
								typo  
							
							
							
						 
						
							2011-12-18 00:22:44 -08:00