Commit graph

3497 commits

Author SHA1 Message Date
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
Hypolite Petovan
a6bdb2c34a overhauling proxy_url
- Decode possible HTML entities in the input URL
- Add the safe extension for the shortpath as well
- Formatting
- Documentation
2016-11-17 23:08:00 -05:00
Hypolite Petovan
c6fbb46108 ping.php performance: Add JSON output
- Added JSON/JSONP support
- Added XML backward-compatible output
- Updated main.js to handle JSON data
- Removed unused references to non-existant DOM elements
2016-11-16 23:26:43 -05:00
126c4774c3 Merge remote-tracking branch 'upstream/develop' into 1607-performance
Conflicts:
	include/dbstructure.php
	mod/item.php
	mod/nodeinfo.php
2016-11-16 06:27:21 +00:00
rabuzarus
9878974e1f fix photos page permissions 2016-11-14 18:49:51 +01:00
1aa9b7242d Merge remote-tracking branch 'upstream/develop' into 1611-parseurl 2016-11-13 19:12:11 +00:00
Michael Vogel
ce96624452 Merge pull request #2899 from tobiasd/20161109-stats
prepare for Mastodon in the federation stats and include BlaBlaNet
2016-11-13 09:42:42 +01:00
df3c776e1b shorter foreach loop 2016-11-13 09:03:22 +01:00
772d33342c add unkown to empty version strings 2016-11-13 08:12:09 +01:00
32b2d9952b some platforms don't provide version information 2016-11-13 07:03:38 +01:00
e5f55a5919 Improved handling with wrong formatted urls and fetchinfo 2016-11-12 20:23:00 +00:00
e6148f4c1c Performance improvements when storing items (via API) 2016-11-12 13:17:28 +00:00
f9911637e3 help text for settings should be translateable 2016-11-10 10:21:24 +01:00
350887f892 prepare for Mastodon in the federation stats and include BlaBlaNet 2016-11-09 14:25:51 +01:00
4b33573c20 Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean 2016-11-05 05:25:22 +00:00
rabuzarus
5459b00499 cache: serialize the cache content directly in the cache class 2016-11-04 16:44:49 +01:00
Michael Vogel
9dd3e9d19a Merge pull request #2878 from Hypolite/improvement/ping-performance
Improving ping.php performance
2016-11-02 21:56:18 +01:00
4d966e1e21 Changed priority for onepoll/further enhancement for dbclean 2016-10-31 21:32:08 +00:00
8ab90f02c3 Shadow entry mechanism improved 2016-10-29 21:27:56 +00:00
7bd79c67a7 Avoiding deadlocks and small sql improvements 2016-10-29 20:17:33 +00:00
Hypolite Petovan
8e50254bb9 Merge branch 'develop' into improvement/ping-performance 2016-10-28 22:26:38 -04:00
Hypolite Petovan
bc407080d2 ping.php performance: improve documentation and formatting 2016-10-28 22:14:51 -04:00
Hypolite Petovan
f1c855e755 ping.php performance: Cache notification bbcode
- Add two fields to notifiy table to store cached bbcode result
- Add bbcode conversion on notif creation
- Add postfact caching if cache field is empty on retrieval
2016-10-28 06:28:16 -04:00
3f0656fdbd Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-27 12:18:45 +00:00
Michael Vogel
4996003800 Merge pull request #2874 from Hypolite/bug/fix-pgettext-typo
Fix pgettext function name typo
2016-10-25 22:31:59 +02:00
967ecb4205 Merge remote-tracking branch 'upstream/develop' into 1610-performance
Conflicts:
	include/Core/Config.php
	include/Core/PConfig.php
2016-10-25 16:16:01 +00:00
Michael Vogel
75a996c4e4 Merge pull request #2839 from Hypolite/Issue-#2822
Issue #2822 - Fix [Embedded content - reload the page to view]
2016-10-25 07:31:20 +02:00
Hypolite Petovan
2fc2a1a228 Fix typo in get_available_languages function name
- Add Doxygen comment block
- Fix formatting
- Renamed variable for faster understanding
2016-10-24 22:17:02 -04:00
Hypolite Petovan
9ef63efa1c Leave formatting alone 2016-10-24 16:16:49 -04:00
Hypolite Petovan
fb75394766 Some more formatting reverts 2016-10-24 12:43:38 -04:00
Hypolite Petovan
8787587011 Fix undiscriminate spaces=>tabs replace 2016-10-24 12:34:10 -04:00
Hypolite Petovan
789e1f4275 Revert some more unwarranted formatting 2016-10-24 12:27:27 -04:00
Michael Vogel
3463a442ba Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-24 08:12:13 +00:00
Michael Vogel
8cab3b5592 More transactions, more queries on uncommitted data 2016-10-24 08:10:27 +00:00
Michael Vogel
ee5ada6991 We now use memcache if configured and installed. 2016-10-23 21:59:40 +00:00
Hypolite Petovan
2741726402 Reverting too extensive formatting changes 2016-10-22 21:33:54 -04:00
Michael Vogel
561f45b83b And again ... 2016-10-22 10:33:18 +00:00
Michael Vogel
b429b85680 CSR changes, split dbclean in separate processes if worker is active 2016-10-22 10:14:41 +00:00
Michael Vogel
4c5a7fac83 Some stuff to make Hypolite happy :) 2016-10-21 21:32:27 +00:00
Michael Vogel
b56bdf06ed Merge remote-tracking branch 'upstream/develop' into 1610-duplicate-check 2016-10-21 21:17:58 +00:00
Michael Vogel
501c45def5 Some more improved queries 2016-10-21 18:25:21 +00:00
Michael Vogel
fd2d8cc180 Orphans are removed without giant lock problems 2016-10-20 22:05:21 +00:00
Michael Vogel
abb827b784 Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-20 08:44:19 +00:00
Michael Vogel
493d7bc698 Remove orphaned data 2016-10-19 21:06:37 +00:00
Michael Vogel
356414846b Check for duplicated postings from connectors 2016-10-17 19:17:11 +00:00
Michael Vogel
3e5cf5290e Improved queries, more uncommitted queries 2016-10-17 18:38:51 +00:00
Michael Vogel
e09c55527c Merge pull request #2856 from rabuzarus/0510-update_fullcalendar
update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover
2016-10-16 18:04:11 +02:00
rabuzarus
8064ff6ecb update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover 2016-10-16 16:04:53 +02:00
Michael Vogel
e5c7ce0902 Use "last-item" in the contact table instead of an expensive sql query 2016-10-14 05:45:32 +00:00
Hypolite Petovan
a843858654 Merge from develop 2016-10-08 13:45:14 -04:00
Michael Vogel
b70676d231 Optimized query for nodeinfo and admin user page 2016-10-07 21:07:21 +00:00
Michael Vogel
6abac720e2 Small performance tweaks for "item_store" as well. 2016-10-07 06:05:43 +00:00
Michael Vogel
f9b9ee6b77 Increased performance when storing items 2016-10-06 21:24:29 +00:00
Michael Vogel
aca6f63985 Merge remote-tracking branch 'upstream/develop' into 1610-performance-nodeinfo 2016-10-05 16:19:42 +00:00
Michael Vogel
5fb2e47809 Increased performance when storing items 2016-10-05 16:12:53 +00:00
rabuzarus
2a3e235f9a show/hide page-flags according to the account-type 2016-10-05 14:45:19 +02:00
Michael Vogel
8cde8b375b Merge remote-tracking branch 'upstream/develop' into 1610-gcontact-type 2016-10-04 03:52:22 +00:00
Michael Vogel
66bec9475d Improved queries for the nodeinfo functionality and the admin page 2016-10-04 03:51:13 +00:00
Michael Vogel
095fa872ed Contact Type is now transmitted via poco 2016-10-04 03:48:01 +00:00
Michael Vogel
860f11e71b Merge pull request #2842 from tobiasd/20160929-lng
lang handling for #2752
2016-10-04 05:22:38 +02:00
Hypolite Petovan
d9a5554543 Fix Issue #2822 - Add new setting to user settings page
- Convert formatting to PSR-2
- Add new bandwitdh saver setting
2016-10-02 15:25:10 -04:00
Hypolite Petovan
08a30bc1c6 Fix Issue #2822 - Update update_*.php files with new bandwitdh_saver user setting
- Fix formatting according to PSR-2
- Add bandwitdh_saver setting check before replacing with "Embedded
content - Please reload"
2016-10-02 15:23:05 -04:00
Michael Vogel
6d16c39b7e dbstructure now switches in the maintenance mode when updating 2016-10-02 13:52:52 +00:00
rabuzarus
fa33f94b29 Merge pull request #2830 from annando/1610-account_type
The account type is now read and displayed
2016-10-02 14:55:52 +02:00
Michael Vogel
60a0235af0 The account type is now read and displayed 2016-10-01 20:03:27 +00:00
5cfca894c1 On registration use the browser preferred language for the new account 2016-10-01 15:55:56 +02:00
7aa4f5297d when the admin creates a new account, use the system language for this accounts 2016-10-01 15:55:18 +02:00
Hypolite Petovan
f0382bb159 Restore admin notification email on register approval
- Reverted changes to mod/register.php
- Added "show_in_notification_page" flag to prevent `notify` DB
insertion
2016-09-30 08:57:16 -04:00