e05a8e9974
added curly braces + space between "if" and brace + added TODO
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:15:15 +01:00
6ab84bf520
added curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:04:53 +01:00
40dc3774e4
Also here (was committed in other branch, too. :-( )
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:02:57 +01:00
a9bed1422e
added more curyl braces + spaces between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:44:59 +01:00
4dfe64bd5a
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:40:17 +01:00
65e1cd728c
Coding convention:
...
- added curly braces
- added space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:40:09 +01:00
abff6372dd
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
2016-12-20 10:12:31 +01:00
6e46987515
The object type "photo" is deprecated and was replaced by "image"
2016-12-20 07:10:47 +00:00
Hypolite Petovan
403d1f987f
proxy_url: Fix extension extraction for URLs containing a . after a ?
2016-12-19 20:19:26 -05:00
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
4615f39836
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-19 14:21:26 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
47c60aa486
Opps, no need for this.
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 10:01:56 +01:00
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
23a97465e5
Avoid SQL errors
2016-12-11 07:09:48 +00:00
c666c98559
Code bautification
2016-12-10 12:28:49 +00:00
fc3c1601b1
Merge remote-tracking branch 'upstream/develop' into 1607-performance
2016-12-10 12:18:11 +00:00
e12227c000
The gcontact-id and the object field can now be stored with item_post
2016-12-09 09:57:02 +00:00
ac5617c40c
add frontend worker to the admin panel and regen master messages.po file
2016-12-06 08:44:59 +01:00
b904aaff11
Merge remote-tracking branch 'upstream/develop' into 1612-spool
2016-12-02 09:54:34 +00:00
6845775ff9
Store spooled data
2016-12-01 20:53:18 +00:00
aea122cd20
Little improvements to the queries in ping.php
2016-12-01 13:44:30 +00:00
1fc35d5f44
Merge pull request #2979 from annando/issue-2772
...
Issue 2772: Pending contacts should now be displayed
2016-12-01 08:51:04 +01:00
57c95c93e1
The frontend worker is now working as a full replacement for the crontab.
2016-11-30 19:24:58 +00:00
1f50dc368e
Merge remote-tracking branch 'upstream/develop' into 1611-frontend
2016-11-30 04:46:47 +00:00
cc5eebd173
The frontend worker can now fork background processes
2016-11-29 22:40:19 +00:00
Michael Vogel
d620c5d996
Merge pull request #2982 from rabuzarus/20161129_-_small_dfrn_request_polish
...
dfrn_request: include the graphic of the connection process into the doxygen header
2016-11-29 21:09:59 +01:00
rabuzarus
a208d2e72b
dfrn_request: include the graphic of the connection process into the doxygen header
2016-11-29 19:57:30 +01:00
Michael Vogel
efb2df41ba
Merge pull request #2977 from rabuzarus/20161128_-_help_page_polishing
...
Add protocol docu to the help docs
2016-11-29 19:38:31 +01:00
Michael Vogel
fa8eb101d4
Merge pull request #2981 from rabuzarus/20161129_-_small_dfrn_request_polish
...
dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries
2016-11-29 19:33:57 +01:00
rabuzarus
54f3867ebd
dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries
2016-11-29 15:52:12 +01:00
Michael Vogel
86665d47a6
Merge pull request #2980 from rabuzarus/20161129_-_small_dfrn_request_polish
...
dfrn_request: added $blocked and $pending as variable to make code mo…
2016-11-29 09:42:26 +01:00
d55d500e35
Merge pull request #2975 from annando/1611-frontend-worker
...
The worker can now run from the frontend as well
2016-11-29 09:40:59 +01:00
rabuzarus
0d223aa6f1
dfrn_request: added $blocked and $pending as variable to make code more understandable
2016-11-29 03:08:46 +01:00
3a76a6766f
Issue 2772: Pending contacts should now be displayed
2016-11-28 22:11:13 +00:00
Michael Vogel
0ef764b167
Merge pull request #2970 from Hypolite/improvement/ping-php-json
...
ping.php: Ensure data structure consistency
2016-11-28 21:08:36 +01:00
Michael Vogel
37e8f6b442
Merge pull request #2973 from rabuzarus/berlin_parse_url
...
parse_url: recognize image/video/audio files + move functions into own class
2016-11-28 21:05:31 +01:00
rabuzarus
ac39928e5d
upload connection graphics & update doxygen headers to insert link to the spec
2016-11-28 16:23:47 +01:00
rabuzarus
d0cdf863a1
fix accidentally deleted line with local_user()
2016-11-28 15:30:36 +01:00
rabuzarus
743378129b
legacy support for function parseurl_getsiteinfo_cached()
2016-11-28 15:26:51 +01:00
rabuzarus
5458f40f6a
Bugfix: better detection dfrn_request of double connection requests
2016-11-28 01:13:47 +01:00
rabuzarus
f229d65f85
ParseUrl: some docu work
2016-11-27 23:41:55 +01:00
df0d33c138
Try to get more execution time
2016-11-27 10:01:24 +00:00
636a033364
Added documentation, config stuff, ...
2016-11-27 09:02:08 +00:00
e856ab9a09
The worker can now run from the frontend as well
2016-11-27 00:55:05 +00:00
rabuzarus
c96a53b4b4
parse_url: fix typo
2016-11-26 04:10:50 +01:00
rabuzarus
26664c22e0
parse_url: add some docu
2016-11-25 16:59:31 +01:00
rabuzarus
e9226eaf45
parse_url: recognize image/video/audio files + move functions into own class
2016-11-24 01:11:22 +01:00
Hypolite Petovan
0f33311f65
pig.php: remove debug
2016-11-22 23:04:00 -05:00
Hypolite Petovan
133120007c
Merge remote-tracking branch 'friendica/develop' into improvement/ping-php-json
2016-11-22 21:14:25 -05:00
Hypolite Petovan
58e03c5155
ping.php: Ensure data structure consistency
...
- Formatting
- Documentation
2016-11-22 21:11:22 -05:00
Michael Vogel
61da46677d
Merge pull request #2967 from Hypolite/issue/#2955
...
ping.php: Prevent $register_count from being undefined
2016-11-22 21:00:34 +01:00
Hypolite Petovan
e0322546d8
ping.php improvement: Prevent $register_count from being undefined
2016-11-22 14:17:05 -05:00
edbdd0e34a
Bugfix: We should only search in the current database for MyISAM tables
2016-11-22 16:47:08 +00:00
754de768f2
Merge pull request #2960 from Hypolite/issue/#2955
...
ping.php Fix confusion between count vars and array vars
2016-11-22 08:13:36 +01:00
Hypolite Petovan
cc242d52f8
ping.php Fix confusion between count vars and array vars
2016-11-21 16:02:36 -05:00
0628068977
Merge pull request #2952 from annando/issue-2772
...
Issue 2772: Posts from pending contacts should be displayed as well.
2016-11-20 17:56:05 +01:00
3de862712d
Issue 2772: Posts from pending contacts should be displayed as well.
2016-11-20 16:52:57 +00:00
Michael Vogel
b33e817586
Merge pull request #2951 from tobiasd/20161120-mysql
...
add MySQL warning in admin panel
2016-11-20 17:09:49 +01:00
dd4a23070c
Merge pull request #2950 from rabuzarus/berlin_fix_post_preview
...
Bugfix: preview has sometimes phantom mentions and tags
2016-11-20 16:46:31 +01:00
97c6f668e6
add a warning to the admin panel when the MySQL version is problematic
2016-11-20 16:32:38 +01:00
rabuzarus
66341046d2
Bugfix: preview has sometimes phantom mentions and tags
2016-11-20 16:19:55 +01:00
b03009d962
use an array for warnings in admin panel
2016-11-20 16:14:09 +01:00
7ad4a8ca93
The warning if a group contains members of several network types can now be supressed.
2016-11-20 12:09:18 +00:00
Michael Vogel
7ca4648ffd
Merge pull request #2945 from tobiasd/20161119-admindbwarn
...
Show a warning message in the admin panel when MyISAM is still in use
2016-11-20 12:38:52 +01:00
38f9fab6c4
mysql keywords
2016-11-20 10:44:54 +01:00
20f987e814
Merge pull request #2946 from annando/1611-bugfix-groups
...
Bugfix: Filtering by group has to be done with the contact id in the thread table
2016-11-20 10:39:01 +01:00
68a31e084a
Bugfix: Filtering by group has always to be done with the contact id in the thread table
2016-11-20 09:24:56 +00:00
7aaaa0a3c7
Show a warning message in the admin panel when MyISAM is still in use
2016-11-20 09:50:14 +01:00
d6be33cbbb
Avoid UTF8 warning in mod/proxy.php
2016-11-20 08:30:30 +00:00
Michael Vogel
5be5fa1b1d
Merge pull request #2930 from Hypolite/issue/#2925
...
Overhauling proxy_url/Fix encoded ampersand
2016-11-19 21:57:57 +01:00
Michael Vogel
67c1a20ed0
Merge pull request #2941 from Hypolite/improvement/ping-php-json
...
ping.php performance: fix typo
2016-11-19 21:40:31 +01:00
Hypolite Petovan
61afd71897
ping.php performance: fix typo
2016-11-19 15:23:36 -05:00
Hypolite Petovan
1cf9506646
Overhauling proxy_url: use $shortpath for long URL in writemode
2016-11-19 14:03:31 -05:00
b95bf00e89
Additional info in registration request
2016-11-19 18:22:49 +01:00
Michael Vogel
ea38af9799
Merge pull request #2931 from tobiasd/20161118-issue2926
...
send email confirming pending registration #2916
2016-11-19 15:21:06 +01:00
f4c52f5a0e
send email confirming pending registration #2916
2016-11-18 20:16:22 +01:00
