clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,702 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

3424 Commits

Author SHA1 Message Date
Roland Häder 76f43f9b30 added curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:35:36 +01:00
Roland Häder 61c1317f80 added much more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:59:31 +01:00
Roland Häder e70b3b45df Continued: 
- added curly braces + spaces
- added todo about testing empty/non-empty strings

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:40:24 +01:00
Roland Häder ad3779fd06 added spaces + curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:38:33 +01:00
Roland Häder d3391e12e3 added spaces + curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:36:17 +01:00
Roland Häder 1248b26d3c added more curly braces + fixed space->tab for code indentation. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:33:53 +01:00
Roland Häder d0bc38dbf8 added curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:27:48 +01:00
Roland Häder beca51bfba added curly braces + space between "if" and brace + initialized $result (was only within if() block but not outside of it) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:22:13 +01:00
Roland Häder 757a0c76f0 added curly braces + space between "if" and brace + added missing @param 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:19:48 +01:00
Roland Häder 244636d26c added curly braces + space between "if" and brace + added TODO 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:14:55 +01:00
Roland Häder 92ad87590b added curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:04:29 +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 064b53e673 Coding convention: 
- added curly braces
- added space between "if" and brace
- also added TODO (old-lost code?)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:39:06 +01:00
Roland Häder a5e4882e25 Coding convention: 
- added curly braces
- added space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:35:28 +01:00
Roland Häder 5a90e7f822 Continued a bit: 
- converted some bad checks to use dbm::is_result()
- added space between "if" and brace
- added curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:20:10 +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 dac1dbd3e9 Merge branch 'rewrites/dbm_is_result' into develop 2016-12-19 14:47:05 +01:00
Roland Häder a96eb3428d Used more dbm::is_result() instead of (!$r) or (!count($r)), still there are 
more pending ...

Also put SQL table columns into back-ticks.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:46: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 4615f39836 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-19 14:21:26 +01:00
Roland Häder ff569756ee Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object-reference-calls 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/follow.php
 2016-12-19 09:40:34 +01:00
Thomas Willingham a58d8d2c71 This error message had me confused for about twenty minutes. I couldn't 
figure out what was wrong with my imagick install that would make it give
me an orange button if it was installed.  Of course, the problem was that
it wasn't installed, and the message was worded badly.  This is a bit less
confusing.
 2016-12-19 00:10:11 +00:00
Roland Häder a126db451c 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:12:00 +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 9c564c4fd3 Again, static *OR* object-referencing calls? Blue or red pill? 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 10:06:20 +01:00
Roland Häder c43e9aa74e get_basepath() uses a lot $this (which means object-referenced calls, or 
non-static calls). but still it is called statically in many places.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 10:06:12 +01:00
Roland Häder 2eb3727542 Again, static *OR* object-referencing calls? Blue or red pill? 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 10:05:18 +01:00
Roland Häder b54c22666c get_basepath() uses a lot $this (which means object-referenced calls, or 
non-static calls). but still it is called statically in many places.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 10:03:06 +01:00
Roland Häder 378cbd9027 Continued with #3010: 
- more reverts of $a->get_baseurl()
- you always do: function foo (&$a), please read my TODO why it is not so good.
- for now I have fixed this inconsistency (compared to other method signatures)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 09:59:13 +01:00
Roland Häder 8e1796bb1f Continued with #3010: 
- more reverts of $a->get_baseurl()
- you always do: function foo (&$a), please read my TODO why it is not so good.
- for now I have fixed this inconsistency (compared to other method signatures)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 09:57:55 +01:00
Roland Häder ba3bc420ca Also reverted these + added spaces for nicer appearance. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 09:23:59 +01:00
Roland Häder 6cef88c24e Also reverted these + added spaces for nicer appearance. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 09:23:41 +01:00
Roland Häder a31acb5fda Opps, this has vanished by accident, thanks to @annando 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 16:41:16 +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 c75d6ad850 More dbm::is_result() instead of count() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 12:03:02 +01:00
Roland Häder cee169997e Opps, no && and AND in same line (confusing, thanks to @annando) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 10:02:39 +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 797de5bfe0 Nope, get_basepath() should be static, then also mark it as static (in signature). 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-13 14:53:57 +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
Roland Häder 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
Roland Häder 47c60aa486 Opps, no need for this. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-13 10:01:56 +01:00
Roland Häder d489ba1510 Merge remote-tracking branch 'upstream/develop' into develop 
Also removed <<<<< as this interfers (a bit) with searching for merge conflicts
with a more simplier editor.

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/ping.php
	view/lang/fr/messages.po
	view/lang/fr/strings.php
 2016-12-13 09:59:43 +01:00
Michael 23a97465e5 Avoid SQL errors 2016-12-11 07:09:48 +00:00
Michael c666c98559 Code bautification 2016-12-10 12:28:49 +00:00
Michael fc3c1601b1 Merge remote-tracking branch 'upstream/develop' into 1607-performance 2016-12-10 12:18:11 +00:00