52f14ffa5f 
 
						 
						
							
							
								
								
								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:17:09 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ace8f753ac  
						 
						
							
							
								
								
								added much more curly braces + space between "if" and brace  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/events.php
	mod/network.php
	mod/suggest.php
	mod/uexport.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php 
							
						 
						
							2016-12-20 11:59:13 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	23a97465e5  
						 
						
							
							
								
								
								Avoid SQL errors  
							
							 
							
							
							
						 
						
							2016-12-11 07:09:48 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	fc3c1601b1  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1607-performance  
							
							 
							
							
							
						 
						
							2016-12-10 12:18:11 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3a76a6766f  
						 
						
							
							
								
								
								Issue 2772: Pending contacts should now be displayed  
							
							 
							
							
							
						 
						
							2016-11-28 22:11:13 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3de862712d  
						 
						
							
							
								
								
								Issue 2772: Posts from pending contacts should be displayed as well.  
							
							 
							
							
							
						 
						
							2016-11-20 16:52:57 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	7ad4a8ca93  
						 
						
							
							
								
								
								The warning if a group contains members of several network types can now be supressed.  
							
							 
							
							
							
						 
						
							2016-11-20 12:09:18 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	68a31e084a  
						 
						
							
							
								
								
								Bugfix: Filtering by group has always to be done with the contact id in the thread table  
							
							 
							
							
							
						 
						
							2016-11-20 09:24:56 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	126c4774c3  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1607-performance  
							
							 
							
							... 
							
							
							
							Conflicts:
	include/dbstructure.php
	mod/item.php
	mod/nodeinfo.php 
							
						 
						
							2016-11-16 06:27:21 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	3e5cf5290e  
						 
						
							
							
								
								
								Improved queries, more uncommitted queries  
							
							 
							
							
							
						 
						
							2016-10-17 18:38:51 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	60a0235af0  
						 
						
							
							
								
								
								The account type is now read and displayed  
							
							 
							
							
							
						 
						
							2016-10-01 20:03:27 +00: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 
								
							 
						 
						
							
							
								
							
							
	4961fb3a45  
						 
						
							
							
								
								
								Unused indexes removed, queries changed  
							
							 
							
							
							
						 
						
							2016-07-26 22:10:13 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e4c6cfd2d8  
						 
						
							
							
								
								
								Moves the function "is_result" from dba to dbm.  
							
							 
							
							
							
						 
						
							2016-07-02 14:00:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7d531afd00  
						 
						
							
							
								
								
								Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced  
							
							 
							
							... 
							
							
							
							Conflicts:
	boot.php 
							
						 
						
							2016-07-02 13:38:23 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	cf696f6d1f  
						 
						
							
							
								
								
								network.php - raw && update mode don't need the network tabs  
							
							 
							
							
							
						 
						
							2016-06-24 00:33:31 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	51b5d16f1b  
						 
						
							
							
								
								
								Improved SQL queries  
							
							 
							
							
							
						 
						
							2016-06-19 21:41:06 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e512a83ecc  
						 
						
							
							
								
								
								Massively updated avatar handling  
							
							 
							
							
							
						 
						
							2016-06-19 01:07:20 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	c05898c57d  
						 
						
							
							
								
								
								The queries for items are unified (a little bit)  
							
							 
							
							
							
						 
						
							2016-06-12 21:04:55 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	e4ba493a01  
						 
						
							
							
								
								
								Renamed "Search results for:" in "Results for:" to have more space on mobile  
							
							 
							
							
							
						 
						
							2016-06-09 13:06:21 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	
	
	c69aab6ee0 
 
						 
						
							
							
								
								
								Avoid write operations if not needed  
							
							 
							
							
							
						 
						
							2016-05-01 13:48:52 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	ca2454eeb4  
						 
						
							
							
								
								
								Avoid write operations if not needed  
							
							 
							
							
							
						 
						
							2016-04-23 00:06:34 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	47b591c09a 
 
						 
						
							
							
								
								
								Fixes another warning because of count()'s lazyness.  #2390  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2016-03-12 23:02:42 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	f7537c9e90  
						 
						
							
							
								
								
								Remove the baseurl where possible to avoid mixed content  
							
							 
							
							
							
						 
						
							2016-02-17 00:01:24 +01: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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	9330a6994c  
						 
						
							
							
								
								
								Merge pull request  #2319  from stieben/develop  
							
							 
							
							... 
							
							
							
							Added the possibility for themes to override core module functions 
							
						 
						
							2016-02-07 09:52:20 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	52dbb0b4a2  
						 
						
							
							
								
								
								Forum class - rename Class CamelCase and rename some methods  
							
							 
							
							
							
						 
						
							2016-02-04 14:51:54 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	9a54afa629  
						 
						
							
							
								
								
								Forum class - rename Class CamelCase and rename some methods  
							
							 
							
							
							
						 
						
							2016-02-04 14:47:20 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	c1070e4655  
						 
						
							
							
								
								
								forums.php is now forum.php and providing class forum  
							
							 
							
							
							
						 
						
							2016-02-03 18:05:26 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b4631cebed  
						 
						
							
							
								
								
								Fixed SQL problems  
							
							 
							
							
							
						 
						
							2016-01-10 17:10:56 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	2f49e984bd  
						 
						
							
							
								
								
								Updated database.sql file, further code cleanup  
							
							 
							
							
							
						 
						
							2016-01-10 14:12:05 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	885dc1df81  
						 
						
							
							
								
								
								gcontact update script, rebuilt follow page, query speedup for community and network groups  
							
							 
							
							
							
						 
						
							2016-01-10 09:19:00 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	75e2ec01fe  
						 
						
							
							
								
								
								The gcontact will now be connected to the items  
							
							 
							
							
							
						 
						
							2016-01-05 15:34:27 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	3df5c17124  
						 
						
							
							
								
								
								reformat todo according to doxygen style  
							
							 
							
							
							
						 
						
							2015-12-25 23:17:34 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	4efb6c6f79  
						 
						
							
							
								
								
								Merge pull request  #2120  from rabuzarus/2911_network_header  
							
							 
							
							... 
							
							
							
							2911 network header 
							
						 
						
							2015-11-30 08:30:34 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	a6aac8f950  
						 
						
							
							
								
								
								networkheader: do css work the other supported themes  
							
							 
							
							
							
						 
						
							2015-11-30 01:24:22 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	1a0cb99d56  
						 
						
							
							
								
								
								redesign the network page header when cid selected  
							
							 
							
							
							
						 
						
							2015-11-29 04:57:42 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	f5597da059  
						 
						
							
							
								
								
								forumlist - mark selected forum as selected  
							
							 
							
							
							
						 
						
							2015-11-28 23:52:12 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	a3059d02d4  
						 
						
							
							
								
								
								group_side - unify look with forumlist  
							
							 
							
							
							
						 
						
							2015-11-28 20:09:28 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	dac6f39f41  
						 
						
							
							
								
								
								forumlist: use a more unique identifier  
							
							 
							
							
							
						 
						
							2015-11-11 01:29:31 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	96b764425e  
						 
						
							
							
								
								
								move forumlist addon to core  
							
							 
							
							
							
						 
						
							2015-11-09 15:56:20 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	cfc9d2b88f  
						 
						
							
							
								
								
								Merge pull request  #1998  from annando/1510-network-profile2  
							
							 
							
							... 
							
							
							
							New function for fetching contact data 
							
						 
						
							2015-10-31 19:02:01 +01:00