]>
git.mxchange.org Git - friendica.git/log
Roland Häder [Thu, 22 Dec 2016 08:09:27 +0000 (09:09 +0100)]
applied coding convention rule
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 22 Dec 2016 08:03:44 +0000 (09:03 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop
Michael Vogel [Thu, 22 Dec 2016 06:31:07 +0000 (07:31 +0100)]
Merge pull request #3041 from rabuzarus/20161221_-_frio_notifications
frio notifications templates + local date & profile link for the notifications page
rabuzarus [Thu, 22 Dec 2016 00:54:41 +0000 (01:54 +0100)]
frio: revert img.intro-photo to 80pxx80px
rabuzarus [Wed, 21 Dec 2016 23:28:52 +0000 (00:28 +0100)]
provide local time for notifications
rabuzarus [Wed, 21 Dec 2016 22:17:55 +0000 (23:17 +0100)]
frio: add profile link to the notifications url
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>
rabuzarus [Wed, 21 Dec 2016 19:39:07 +0000 (20:39 +0100)]
frio: add notifications templates to frio
Roland Haeder [Wed, 21 Dec 2016 18:59:38 +0000 (19:59 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop
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>
Conflicts:
mod/events.php
Roland Häder [Wed, 21 Dec 2016 08:11:58 +0000 (09:11 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/proxy.php
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:39:06 +0000 (21:39 +0100)]
used dbm::is_result() instead of count()
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:21:31 +0000 (21:21 +0100)]
Merge branch 'rewrites/dbm_is_result' into develop
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>
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>
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 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>
Hypolite Petovan [Tue, 20 Dec 2016 20:14:43 +0000 (15:14 -0500)]
proxy: Simplify url extension extraction
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>
Roland Haeder [Tue, 20 Dec 2016 18:33:40 +0000 (19:33 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop
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>
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 14:50:46 +0000 (15:50 +0100)]
Merge remote-tracking branch 'upstream/develop' into rewrites/dbm_is_result
Roland Häder [Tue, 20 Dec 2016 14:50:39 +0000 (15:50 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop
Roland Häder [Tue, 20 Dec 2016 14:46:38 +0000 (15:46 +0100)]
Merge branch 'develop' into rewrites/dbm_is_result
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
Roland Häder [Tue, 20 Dec 2016 14:44:31 +0000 (15:44 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop
Changes in #3034 were somehow conflicting. :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/like.php
mod/photos.php
mod/subthread.php
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 14:37:27 +0000 (15:37 +0100)]
converted more to dbm::is_result() + added braces/space
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 14:37:27 +0000 (15:37 +0100)]
converted more to dbm::is_result() + added braces/space
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 11:51:51 +0000 (12:51 +0100)]
Merge branch 'develop' into rewrites/dbm_is_result
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: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)]
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: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 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>
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>
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: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: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: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: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>
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>
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: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: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: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: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>
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: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 ...)