Commit Graph

14787 Commits

Author SHA1 Message Date
Roland Häder 467cdfeb34 3 slashes for Doxygen, 2 are enough for PHP ... :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:28:45 +01:00
Roland Häder ba45a292c4 3 slashes for Doxygen, 2 are enough for PHP ... :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:28:18 +01:00
Roland Häder 41db906dc4 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 17:02:10 +01:00
Roland Häder 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
Roland Häder 4b860e7575 No more needed ... util/typo.php is there.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:43:03 +01:00
Roland Häder 307df4ee5c Also removed this, seems to come in from wrong merging? #3010 Thanks to @annando
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:41:23 +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 b21a1437f4 Also removed this, seems to come in from wrong merging? #3010 Thanks to @annando
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:39:39 +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 09a24955df Use [] instead of test.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 12:51:20 +01:00
Roland Häder d5b4e09ec4 added lint.sh which needs to be executed like this:
$ ./util/lint.sh

No parameters needed. It will use "php -l" (current interpreter) for checking
for syntax errors in all PHP scripts.

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 12:45:11 +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 582b8db8e8 Maybe no longer needed: converted $a->get_baseurl() to App::get_baseurl(). #3010
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 11:55:12 +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 b5776ab959 Fixes for #3010:
- used static call, still App::get_baseurl() wraps it into an object-referencing
  call which seems to be a bit redundant?
- added spaces around dot (see one line below)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:49:52 +01:00
Roland Häder 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
Roland Häder 448c5aa694 Cleanup for #3010 - added spaces, thanks to @annando .
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:42:28 +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 dd8d797d9f Fixes for #3010 - removed baseurl as this is no longer done, still there are 89
left in templates.

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:34:13 +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 a8dc8b288c import dbm here to avoid adding everywhere the namespace (if later changed,
only here it needs change, cool ha? ;-)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 15:24:44 +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
Tobias Diekershoff 789f13dd00 some issues closed 2016-12-12 09:26:46 +01:00
Tobias Diekershoff 29bc27fa6a Merge pull request #3009 from annando/issue-2999
Issue 2999: Better Mastodon handling
2016-12-12 07:54:59 +01:00
Michael 73e330abbe Restore empty line 2016-12-12 06:51:08 +00:00
Michael 17f15e793f Issue 2999: Better Mastodon handling 2016-12-12 06:46:02 +00:00
Tobias Diekershoff 352b168e2d Merge pull request #3007 from annando/1607-performance
Some more performance stuff
2016-12-12 07:04:16 +01:00
rabuzarus 68bcb99d3a Merge pull request #3008 from annando/1612-probe-logging
Issue 2835: Some logging to detect possible problems with the probing
2016-12-11 20:01:09 +01:00
Michael 0c99cee092 Some logging to detect possible problems with the probing 2016-12-11 18:39:39 +00:00
Michael 5c04402448 String is no integer 2016-12-11 17:37:12 +00:00
Michael 23a97465e5 Avoid SQL errors 2016-12-11 07:09:48 +00:00
Michael Vogel 28cb2857eb Merge pull request #3006 from rabuzarus/20161210_-_frio_submit_fix
frio: delete unneeded button attributes in search forms
2016-12-11 00:22:20 +01:00
rabuzarus 7dcf44aa96 frio: delete unneeded button attributes in search forms 2016-12-10 21:25:40 +01:00
Michael c666c98559 Code bautification 2016-12-10 12:28:49 +00:00
Michael 00c74a7d6d Some more ... 2016-12-10 12:21:16 +00:00
Michael 5572bd0cf9 Redo the index changes for testing purposes 2016-12-10 12:19:57 +00:00
Michael fc3c1601b1 Merge remote-tracking branch 'upstream/develop' into 1607-performance 2016-12-10 12:18:11 +00:00
Michael Vogel b43691cc4b Merge pull request #3004 from tobiasd/20161210-2932followup
add allowed protocols during installation
2016-12-10 08:02:19 +01:00
Tobias Diekershoff 132477990d move that option up, as the admin panel has no control over it ATM 2016-12-10 07:16:16 +01:00
Tobias Diekershoff 89caa18fe0 add the kickstart allowed protocols to htconfig.tpl. 2932 follow-up 2016-12-10 07:05:35 +01:00
Tobias Diekershoff ef29e03491 make vier also the default from the emergency htconfig file 2016-12-10 07:04:39 +01:00
Michael Vogel 5065def530 Merge pull request #3000 from tobiasd/20161208-convert
only convert tables in friendica DB
2016-12-09 18:13:27 +01:00
Tobias Diekershoff 6f3e91d4c0 Michael may keep the typo 2016-12-09 18:11:27 +01:00