]>
git.mxchange.org Git - friendica.git/log
Roland Haeder [Wed, 21 Dec 2016 22:17:22 +0000 (23:17 +0100)]
More curly braces added, left some TODOs behind
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Wed, 21 Dec 2016 22:04:09 +0000 (23:04 +0100)]
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Wed, 21 Dec 2016 21:53:08 +0000 (22:53 +0100)]
no need for this else block
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Wed, 21 Dec 2016 19:01:51 +0000 (20:01 +0100)]
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
Signed-off-by: Roland Haeder <roland@mxchange.org>
Michael Vogel [Wed, 21 Dec 2016 17:53:00 +0000 (18:53 +0100)]
Merge pull request #3040 from rabuzarus/20161221_-_frio_tooltip
frio: append tooltip and hovercard to body element
rabuzarus [Wed, 21 Dec 2016 15:22:20 +0000 (16:22 +0100)]
frio: append hovercard to body element
rabuzarus [Wed, 21 Dec 2016 15:12:13 +0000 (16:12 +0100)]
frio: append bs tooltip to body element
Roland Häder [Wed, 21 Dec 2016 08:30:49 +0000 (09:30 +0100)]
added curly braces + space
Signed-off-by: Roland Häder <roland@mxchange.org>
Hypolite Petovan [Tue, 20 Dec 2016 20:23:08 +0000 (15:23 -0500)]
proxy mod: Standards bearer
- Enforced PSR-2 standards
- Normalized concatenation formatting
- Normalized string delimiters
- Normalized condition operators
- Collapsed directly nested conditions
- Used dvm::is_result
- Added comments
Hypolite Petovan [Tue, 20 Dec 2016 20:14:43 +0000 (15:14 -0500)]
proxy: Simplify url extension extraction
Hypolite Petovan [Tue, 20 Dec 2016 01:19:26 +0000 (20:19 -0500)]
proxy_url: Fix extension extraction for URLs containing a . after a ?
Michael Vogel [Tue, 20 Dec 2016 21:44:34 +0000 (22:44 +0100)]
Merge pull request #3038 from Hypolite/bug/proxy_url_extension
proxy_url: Fix extension extraction for URLs containing a . after a ? redux
Roland Haeder [Tue, 20 Dec 2016 20:51:25 +0000 (21:51 +0100)]
used more App::get_baseurl() instead of get_app()->get_baseurl().
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Tue, 20 Dec 2016 20:31:05 +0000 (21:31 +0100)]
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
Hypolite Petovan [Tue, 20 Dec 2016 20:29:30 +0000 (15:29 -0500)]
Merge remote-tracking branch 'friendica/develop' into bug/proxy_url_extension
# Conflicts:
# include/follow.php
Hypolite Petovan [Tue, 20 Dec 2016 20:23:08 +0000 (15:23 -0500)]
proxy mod: Standards bearer
- Enforced PSR-2 standards
- Normalized concatenation formatting
- Normalized string delimiters
- Normalized condition operators
- Collapsed directly nested conditions
- Used dvm::is_result
- Added comments
Roland Haeder [Tue, 20 Dec 2016 20:16:01 +0000 (21:16 +0100)]
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>
Roland Haeder [Tue, 20 Dec 2016 20:15:53 +0000 (21:15 +0100)]
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>
Roland Haeder [Tue, 20 Dec 2016 20:13:50 +0000 (21:13 +0100)]
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>
Hypolite Petovan [Tue, 20 Dec 2016 20:14:43 +0000 (15:14 -0500)]
proxy: Simplify url extension extraction
Roland Häder [Tue, 20 Dec 2016 16:43:46 +0000 (17:43 +0100)]
added more curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/admin.php
Michael Vogel [Tue, 20 Dec 2016 16:53:26 +0000 (17:53 +0100)]
Merge pull request #3030 from Hypolite/bug/proxy_url_extension
proxy_url: Fix extension extraction for URLs containing a . after a ?
Roland Häder [Tue, 20 Dec 2016 15:28:23 +0000 (16:28 +0100)]
Don't cherry-pick:
- reverted dbm::is_result() to count()
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 15:21:59 +0000 (16:21 +0100)]
Don't cherry-pick: reverted unrelated changes (dbm::is_result())
Signed-off-by: Roland Häder <roland@mxchange.org>
Michael [Tue, 20 Dec 2016 07:13:22 +0000 (07:13 +0000)]
Only distribute items to active contacts
Michael [Tue, 20 Dec 2016 07:10:47 +0000 (07:10 +0000)]
The object type "photo" is deprecated and was replaced by "image"
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/like.php
mod/photos.php
mod/subthread.php
Michael [Tue, 20 Dec 2016 07:08:03 +0000 (07:08 +0000)]
Workaround for vanished database connections while authentication
Tobias Diekershoff [Tue, 20 Dec 2016 14:45:18 +0000 (15:45 +0100)]
Merge pull request #3032 from annando/1612-auth-ejabber
Workaround for vanished database connections while authentication
Tobias Diekershoff [Tue, 20 Dec 2016 14:44:07 +0000 (15:44 +0100)]
Merge pull request #3033 from annando/1612-object-type
The object type "photo" is deprecated and was replaced by "image"
Tobias Diekershoff [Tue, 20 Dec 2016 14:42:41 +0000 (15:42 +0100)]
Merge pull request #3034 from annando/1612-no-archive
Only distribute items to active contacts
Roland Häder [Tue, 20 Dec 2016 11:45:16 +0000 (12:45 +0100)]
Changed $a->get_baseurl() to App::get_baseurl()
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 11:36:51 +0000 (12:36 +0100)]
Continued a bit:
- added more curly braces around conditional blocks
- added space between "if" and brace
- aligned "=>" (will do with more if wanted)
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 11:36:51 +0000 (12:36 +0100)]
Opps, forgot this ...
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 11:35:18 +0000 (12:35 +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 10:56:34 +0000 (11:56 +0100)]
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
Roland Häder [Tue, 20 Dec 2016 10:39:53 +0000 (11:39 +0100)]
Continued:
- added curly braces + spaces
- added todo about testing empty/non-empty strings
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 10:38:16 +0000 (11:38 +0100)]
added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 10:36:03 +0000 (11:36 +0100)]
added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 10:33:04 +0000 (11:33 +0100)]
added more curly braces + fixed space->tab for code indentation.
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 10:27:40 +0000 (11:27 +0100)]
added curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/notify.php
Roland Häder [Tue, 20 Dec 2016 10:21:32 +0000 (11:21 +0100)]
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>
Roland Häder [Tue, 20 Dec 2016 10:18:54 +0000 (11:18 +0100)]
added curly braces + space between "if" and brace + added missing @param
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 10:14:30 +0000 (11:14 +0100)]
added curly braces + space between "if" and brace + added TODO
Signed-off-by: Roland Häder <roland@mxchange.org>
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 10:02:57 +0000 (11:02 +0100)]
Also here (was committed in other branch, too. :-( )
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: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
Michael [Tue, 20 Dec 2016 07:13:22 +0000 (07:13 +0000)]
Only distribute items to active contacts
Michael [Tue, 20 Dec 2016 07:10:47 +0000 (07:10 +0000)]
The object type "photo" is deprecated and was replaced by "image"
Michael [Tue, 20 Dec 2016 07:08:03 +0000 (07:08 +0000)]
Workaround for vanished database connections while authentication
Hypolite Petovan [Tue, 20 Dec 2016 01:19:26 +0000 (20:19 -0500)]
proxy_url: Fix extension extraction for URLs containing a . after a ?
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>