]>
git.mxchange.org Git - friendica.git/log
Roland Häder [Tue, 20 Dec 2016 10:06:07 +0000 (11:06 +0100)]
Merge branch 'develop' into rewrites/dbm_is_result
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/events.php
mod/fbrowser.php
mod/group.php
view/theme/quattro/theme.php
Roland Häder [Tue, 20 Dec 2016 10:04:29 +0000 (11:04 +0100)]
added curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 09:59:11 +0000 (10:59 +0100)]
changed to this:
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 09:59:06 +0000 (10:59 +0100)]
changed to this:
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 09:58:55 +0000 (10:58 +0100)]
changed to this:
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 09:58:03 +0000 (10:58 +0100)]
changed to this:
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 09:44:27 +0000 (10:44 +0100)]
added more curyl braces + spaces between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 09:44:27 +0000 (10:44 +0100)]
added more curyl braces + spaces between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 09:39:06 +0000 (10:39 +0100)]
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>
Roland Häder [Tue, 20 Dec 2016 09:35:28 +0000 (10:35 +0100)]
Coding convention:
- added curly braces
- added space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 09:39:06 +0000 (10:39 +0100)]
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>
Roland Häder [Tue, 20 Dec 2016 09:35:28 +0000 (10:35 +0100)]
Coding convention:
- added curly braces
- added space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 09:16:48 +0000 (10:16 +0100)]
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>
Roland Häder [Tue, 20 Dec 2016 09:16:48 +0000 (10:16 +0100)]
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>
Roland Häder [Tue, 20 Dec 2016 09:10:33 +0000 (10:10 +0100)]
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
Roland Häder [Mon, 19 Dec 2016 13:26:13 +0000 (14:26 +0100)]
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 09:10:33 +0000 (10:10 +0100)]
Coding convention applied:
- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Mon, 19 Dec 2016 13:47:05 +0000 (14:47 +0100)]
Merge branch 'rewrites/dbm_is_result' into develop
Roland Häder [Mon, 19 Dec 2016 13:42:20 +0000 (14:42 +0100)]
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>
Roland Häder [Mon, 19 Dec 2016 13:26:13 +0000 (14:26 +0100)]
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 15:43:03 +0000 (16:43 +0100)]
No more needed ... util/typo.php is there.
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 11:51:20 +0000 (12:51 +0100)]
Use [] instead of test.
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 11:45:11 +0000 (12:45 +0100)]
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>
Roland Häder [Mon, 19 Dec 2016 13:21:26 +0000 (14:21 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop
Michael Vogel [Mon, 19 Dec 2016 13:12:50 +0000 (14:12 +0100)]
Merge pull request #3010 from Quix0r/rewrites/mixed-static-object-reference-calls
Rewrites: mixed static object reference calls (and very sadly more ...)
Michael Vogel [Mon, 19 Dec 2016 13:09:57 +0000 (14:09 +0100)]
Merge pull request #3026 from tobiasd/
20161219 -lng
DE translation of the core
Tobias Diekershoff [Mon, 19 Dec 2016 11:22:47 +0000 (12:22 +0100)]
DE translation of the core
Roland Häder [Mon, 19 Dec 2016 08:40:34 +0000 (09:40 +0100)]
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
Michael Vogel [Mon, 19 Dec 2016 07:40:49 +0000 (08:40 +0100)]
Merge pull request #3025 from tobiasd/
20161219 -messagespo
regenerated master messages.po file
Tobias Diekershoff [Mon, 19 Dec 2016 06:47:52 +0000 (07:47 +0100)]
regenerated master messages.po file
Tobias Diekershoff [Mon, 19 Dec 2016 06:44:42 +0000 (07:44 +0100)]
Merge pull request #3023 from annando/1612-attachment-link
Bugfix: Reimported Friendica posts from pump.io had the links missing.
Tobias Diekershoff [Mon, 19 Dec 2016 06:44:10 +0000 (07:44 +0100)]
Merge pull request #3024 from beardyunixer/develop
This error message had me confused for about twenty minutes. I couldn't
Thomas Willingham [Mon, 19 Dec 2016 00:10:11 +0000 (00:10 +0000)]
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.
Michael [Sun, 18 Dec 2016 23:39:44 +0000 (23:39 +0000)]
Bugfix: Reimported Friendica posts from pump.io had the links missing.
Tobias Diekershoff [Sun, 18 Dec 2016 21:27:02 +0000 (22:27 +0100)]
Merge pull request #3022 from annando/1612-ostatus-follow2
Ostatus: The follow/unfollow XML should now be even more compliant.
Michael [Sun, 18 Dec 2016 20:34:34 +0000 (20:34 +0000)]
Mastodon: Hopefully we can now detect reshares better
Michael [Sun, 18 Dec 2016 20:02:13 +0000 (20:02 +0000)]
Ostatus: The follow/unfollow XML should now be even more compliant.
Tobias Diekershoff [Sun, 18 Dec 2016 18:11:34 +0000 (19:11 +0100)]
Merge pull request #3021 from annando/1612-ostatus-follow
OStatus: Follow/Unfollow should now work again.
Michael [Sun, 18 Dec 2016 17:36:48 +0000 (17:36 +0000)]
Removal of test code
Michael [Sun, 18 Dec 2016 17:10:38 +0000 (17:10 +0000)]
OStatus: Follow/Unfollow should now work again.
Tobias Diekershoff [Thu, 15 Dec 2016 17:44:44 +0000 (18:44 +0100)]
Merge pull request #3014 from annando/1612-missing-self-contact
Create missing self contact
Roland Häder [Thu, 15 Dec 2016 09:11:25 +0000 (10:11 +0100)]
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>
Roland Häder [Thu, 15 Dec 2016 09:11:25 +0000 (10:11 +0100)]
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>
Roland Häder [Thu, 15 Dec 2016 08:52:15 +0000 (09:52 +0100)]
Garrr ...
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 15 Dec 2016 09:05:18 +0000 (10:05 +0100)]
Again, static *OR* object-referencing calls? Blue or red pill?
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 15 Dec 2016 09:03:06 +0000 (10:03 +0100)]
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>
Roland Häder [Thu, 15 Dec 2016 09:05:18 +0000 (10:05 +0100)]
Again, static *OR* object-referencing calls? Blue or red pill?
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 15 Dec 2016 09:03:06 +0000 (10:03 +0100)]
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>
Roland Häder [Thu, 15 Dec 2016 08:57:55 +0000 (09:57 +0100)]
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>
Roland Häder [Thu, 15 Dec 2016 08:57:55 +0000 (09:57 +0100)]
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>
Roland Häder [Thu, 15 Dec 2016 08:52:15 +0000 (09:52 +0100)]
Garrr ...
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 15 Dec 2016 08:51:06 +0000 (09:51 +0100)]
Opps, tpzo found ...
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 15 Dec 2016 08:51:06 +0000 (09:51 +0100)]
Opps, tpzo found ...
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 15 Dec 2016 08:49:00 +0000 (09:49 +0100)]
And more reverts:
- $a->get_baseurl() -> App::get_baseurl()
- was_recently_delayed() (entirely)
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 15 Dec 2016 08:49:00 +0000 (09:49 +0100)]
And more reverts:
- $a->get_baseurl() -> App::get_baseurl()
- was_recently_delayed() (entirely)
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 15 Dec 2016 08:32:32 +0000 (09:32 +0100)]
more reverts ...
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 15 Dec 2016 08:32:32 +0000 (09:32 +0100)]
more reverts ...
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 15 Dec 2016 08:22:38 +0000 (09:22 +0100)]
Also reverted these + added spaces for nicer appearance.
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 15 Dec 2016 08:22:38 +0000 (09:22 +0100)]
Also reverted these + added spaces for nicer appearance.
Signed-off-by: Roland Häder <roland@mxchange.org>
Michael [Thu, 15 Dec 2016 07:15:33 +0000 (07:15 +0000)]
Create missing self contact
Roland Haeder [Wed, 14 Dec 2016 19:50:39 +0000 (20:50 +0100)]
fixed SQL writing: keywords upper-case, column/table names in back-ticks. #3010
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Wed, 14 Dec 2016 19:50:39 +0000 (20:50 +0100)]
fixed SQL writing: keywords upper-case, column/table names in back-ticks. #3010
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 16:41:28 +0000 (17:41 +0100)]
reverted change (which duplicated above query), thanks to @annano to point this out. #3010
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 16:41:28 +0000 (17:41 +0100)]
reverted change (which duplicated above query), thanks to @annano to point this out. #3010
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 16:28:18 +0000 (17:28 +0100)]
3 slashes for Doxygen, 2 are enough for PHP ... :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 16:28:18 +0000 (17:28 +0100)]
3 slashes for Doxygen, 2 are enough for PHP ... :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 15:59:35 +0000 (16:59 +0100)]
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>
Roland Häder [Wed, 14 Dec 2016 15:59:35 +0000 (16:59 +0100)]
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>
Roland Häder [Wed, 14 Dec 2016 15:43:03 +0000 (16:43 +0100)]
No more needed ... util/typo.php is there.
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 15:39:39 +0000 (16:39 +0100)]
Also removed this, seems to come in from wrong merging? #3010 Thanks to @annando
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 15:36:32 +0000 (16:36 +0100)]
Opps, this has vanished by accident, thanks to @annando
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 15:39:39 +0000 (16:39 +0100)]
Also removed this, seems to come in from wrong merging? #3010 Thanks to @annando
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 15:36:32 +0000 (16:36 +0100)]
Opps, this has vanished by accident, thanks to @annando
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 11:51:20 +0000 (12:51 +0100)]
Use [] instead of test.
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 11:45:11 +0000 (12:45 +0100)]
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>
Roland Häder [Wed, 14 Dec 2016 11:03:02 +0000 (12:03 +0100)]
More dbm::is_result() instead of count()
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 10:55:12 +0000 (11:55 +0100)]
Maybe no longer needed: converted $a->get_baseurl() to App::get_baseurl(). #3010
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 09:02:39 +0000 (10:02 +0100)]
Opps, no && and AND in same line (confusing, thanks to @annando)
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 08:58:27 +0000 (09:58 +0100)]
removed own debug lines (no more needed).
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 08:56:27 +0000 (09:56 +0100)]
added extra spaces to make it look nice. #3010
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 08:49:52 +0000 (09:49 +0100)]
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>
Roland Häder [Wed, 14 Dec 2016 08:42:36 +0000 (09:42 +0100)]
Cleanup for #3010 - added spaces, thanks to @annando .
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 08:42:28 +0000 (09:42 +0100)]
Cleanup for #3010 - added spaces, thanks to @annando .
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 08:41:33 +0000 (09:41 +0100)]
Cleanup for #3010 - added spaces, thanks to @annando .
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 14 Dec 2016 08:34:13 +0000 (09:34 +0100)]
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>
Roland Häder [Wed, 14 Dec 2016 08:31:27 +0000 (09:31 +0100)]
Cleanup for #3010 - removed all redundant lines found by @rabuzarus
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 13 Dec 2016 14:24:44 +0000 (15:24 +0100)]
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>
Roland Häder [Tue, 13 Dec 2016 13:53:57 +0000 (14:53 +0100)]
Nope, get_basepath() should be static, then also mark it as static (in signature).
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 13 Dec 2016 10:00:44 +0000 (11:00 +0100)]
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
Roland Häder [Tue, 13 Dec 2016 09:44:13 +0000 (10:44 +0100)]
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>
Roland Häder [Tue, 13 Dec 2016 09:16:36 +0000 (10:16 +0100)]
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>
Roland Häder [Tue, 13 Dec 2016 09:01:56 +0000 (10:01 +0100)]
Opps, no need for this.
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 13 Dec 2016 08:59:43 +0000 (09:59 +0100)]
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
Tobias Diekershoff [Mon, 12 Dec 2016 06:54:59 +0000 (07:54 +0100)]
Merge pull request #3009 from annando/issue-2999
Issue 2999: Better Mastodon handling
Michael [Mon, 12 Dec 2016 06:51:08 +0000 (06:51 +0000)]
Restore empty line
Michael [Mon, 12 Dec 2016 06:46:02 +0000 (06:46 +0000)]
Issue 2999: Better Mastodon handling
Tobias Diekershoff [Mon, 12 Dec 2016 06:04:16 +0000 (07:04 +0100)]
Merge pull request #3007 from annando/1607-performance
Some more performance stuff
rabuzarus [Sun, 11 Dec 2016 19:01:09 +0000 (20:01 +0100)]
Merge pull request #3008 from annando/1612-probe-logging
Issue 2835: Some logging to detect possible problems with the probing
Michael [Sun, 11 Dec 2016 18:39:39 +0000 (18:39 +0000)]
Some logging to detect possible problems with the probing
Michael [Sun, 11 Dec 2016 17:37:12 +0000 (17:37 +0000)]
String is no integer