Commit graph

3777 commits

Author SHA1 Message Date
Alexandre Alapetite
d076b39b64 Forgotten AS in mod/admin patch 2017-04-15 23:48:02 +02:00
Alexandre Alapetite
8b3f623d29 ANY_VALUE in mod/admin
The query was not standard, not deterministic, and was not doing what
its description says. The patch makes it more standard and a bit more
deterministic. The returned protocol type is still undeterministic.
2017-04-15 23:42:10 +02:00
Alexandre Alapetite
d2b3e0daf5 Merge develop 2017-04-15 01:03:21 +02:00
Alexandre Alapetite
6be6badd91 SQL typo mod/message
Mistake in previous commit
2017-04-15 00:45:30 +02:00
Alexandre Alapetite
1058b28cea MySQL ANY_VALUE with fallback to MIN
https://github.com/friendica/friendica/issues/3322
2017-04-15 00:42:44 +02:00
Tobias Diekershoff
b8fd48dddc Merge pull request from annando/issue-3331
Issue 3331: Remove unneeded table "deliverq"
2017-04-14 07:32:30 +02:00
Michael Vogel
79e827417c Merge pull request from Hypolite/issue/#3316
Use get_contact_by_url for unknown contacts in acl_lookup
2017-04-14 07:24:27 +02:00
Pierre Rudloff
ead9cbe534 Web app manifest (fixes ) 2017-04-13 16:46:36 +02:00
Michael
d82684219a Issue 3331: Removed unneeded table "deliverq" 2017-04-13 04:51:16 +00:00
Alexandre Alapetite
38e7a0f793 Fix GROUP BY for search
https://github.com/friendica/friendica/issues/3322
Fix MySQL ERROR 1055 (42000): Expression  of SELECT list is not in
GROUP BY clause and contains nonaggregated column
'friendica.item.author-id' which is not functionally dependent on
columns in GROUP BY clause; this is incompatible with
sql_mode=only_full_group_by
2017-04-12 22:55:02 +02:00
Alexandre Alapetite
534ea6aefc Fix ping_init SQL
According to review
https://github.com/friendica/friendica/pull/3323#pullrequestreview-32401628
2017-04-12 18:54:54 +02:00
Alexandre Alapetite
9fb4ba2b73 Fix profile wrong DISTINCT + ORDER BY
Fix: ERROR 3065 (HY000) Expression  of ORDER BY clause is not in
SELECT list, references column 'friendica.item.created' which is not in
SELECT list; this is incompatible with DISTINCT
2017-04-12 18:49:29 +02:00
Alexandre Alapetite
74b6d09e89 Fix GROUP BY in acl_selector, api, notifier, photos, messages
https://github.com/friendica/friendica/issues/3322
2017-04-12 15:11:50 +02:00
Alexandre Alapetite
c3e933642e Fix missing SQL group by in ping
https://github.com/friendica/friendica/issues/3322
2017-04-12 14:17:16 +02:00
Alexandre Alapetite
d2901dcb00 Fix for MySQL 5.7+
https://github.com/friendica/friendica/issues/2786

Only tested on Ubuntu 16.10 with MySQL 5.7.17.

https://dev.mysql.com/doc/refman/8.0/en/timestamp-initialization.html

https://dev.mysql.com/doc/refman/8.0/en/sql-mode.html#sqlmode_no_zero_date
As of MySQL 5.7.4, NO_ZERO_DATE is deprecated.

Patch based on the following search & replace (and then reverting some
changes in libraries):

```sh
grep -l '= "0000-00-00"' -r . | xargs sed -i -e "s/= \"0000-00-00\"/=
'0000-00-00'/g"

grep -l "0000-00-00" -r . | xargs sed -i -e "s/0000-00-00/0001-01-01/g"

grep -l "!= '0001-01-01'" -r . | xargs sed -i -e "s/!= '0001-01-01'/>
'0001-01-01'/g"

grep -l " === '0001-01-01'" -r . | xargs sed -i -e "s/ === '0001-01-01'/
<= '0001-01-01'/g"

grep -l " == '0001-01-01'" -r . | xargs sed -i -e "s/ == '0001-01-01'/
<= '0001-01-01'/g"

grep -l "strpos(\$dob, '0000-') === 0" -r . | xargs sed -i -e
"s/strpos(\$dob, '0000-') === 0/strpos(\$dob, '0000-') === 0 ||
strpos(\$dob, '0001-') === 0/g"

grep -l 'array("", "0001-01-01")' -r . | xargs sed -i -e 's/array("",
"0001-01-01")/array("", "0000-00-00", "0001-01-01")/g'

grep -l "\$dob = '0000-'" -r . | xargs sed -i -e "s/\$dob =
'0000-'/\$dob = '0001-'/g"
```
2017-04-11 23:00:45 +02:00
Hypolite Petovan
05a5e1792d Left trim at sign from nicks in ACL 2017-04-10 22:09:49 -04:00
Hypolite Petovan
ffbf330585 Merge pull request from annando/1704-probing
Avoid possible problems with numeric nicknames and GNU Social
2017-04-09 01:08:12 -04:00
Michael
5c75fe4c14 Avoid possible problems with numeric nicknames and GNU Social 2017-04-09 04:29:02 +00:00
Hypolite Petovan
472345d740 Merge branch 'develop' into space_before_t 2017-04-08 23:17:31 -04:00
rabuzarus
6338636ff3 short test with array 2017-04-08 23:46:59 +02:00
rebeka-catalina
050675a629 The other lone comma in 1177 2017-04-08 18:07:30 +02:00
rebeka-catalina
554704e6b9 Added a whitespace between comma and t() 2017-04-08 16:57:24 +02:00
rebeka-catalina
d8a8fa9baa Modified the warning message 2017-04-08 16:48:11 +02:00
rebeka-catalina
7320327fa1 Deleted the lone comma between paratheses 2017-04-08 16:37:18 +02:00
rebeka-catalina
895a6254a0 Correction of 1177 and added modification to 1171 2017-04-08 15:48:15 +02:00
rebeka-catalina
bcfbfeeba4 adding space for readability 2017-04-08 13:52:37 +02:00
rebeka-catalina
4c9c83e8e8 Warning, that profile published in local directory may be visible in public 2017-04-08 13:21:35 +02:00
rebeka-catalina
892ef45474 Warning, that profile published in local directory may be visible in public 2017-04-08 13:13:38 +02:00
Hypolite Petovan
cfb99aa323 Merge pull request from rabuzarus/20170321_-_frio-fbbrowser
frio: fbrowser styling
2017-04-07 00:01:46 -04:00
Michael
407e25e7d6 Some little standard stuff 2017-04-04 05:39:43 +00:00
Michael
a0216af4bb Issue 1720: Group filter and new tab don't like each other 2017-04-04 05:35:04 +00:00
rabuzarus
ee293f2ce2 Merge develop into 20170321_-_frio-fbbrowser
Conflicts:
	view/theme/frio/js/filebrowser.js
	view/theme/frio/js/theme.js
	view/theme/frio/templates/filebrowser.tpl
	view/theme/frio/templates/jot.tpl
2017-04-03 00:51:34 +02:00
Roland Häder
49527b70d3 Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-01 22:16:08 +02:00
Roland Haeder
3cea176ef2
added spaces + used x ()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-01 22:12:53 +02:00
Michael
240a0961c6 Standards ... 2017-04-01 17:08:11 +00:00
Michael
f6d7ee2781 Issue 3142: mcrypt is no more (as well as phpseclib) 2017-04-01 08:28:42 +00:00
Roland Haeder
60552260e1
Continued with CR:
- added spaces as requested
- removed parentheses from include/require calls as they are no functions

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 21:04:39 +02:00
Roland Haeder
d4e67338d8
space-time contines ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:56:43 +02:00
Roland Haeder
18ca141f5c
space-time!
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:52:43 +02:00
Roland Haeder
44a137a8de
Continued a bit:
- converted multiple single-line comments into one multi-line comment
- added spaces (space-time!)

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:51:47 +02:00
Roland Haeder
07a0d300c3
added space, marked rest 86 occurrences in todos.txt
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:49:58 +02:00
Roland Haeder
9cfcf8f7ca
added spaces, marked in todos.txt as usual
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:47:44 +02:00
Roland Haeder
eab654dd65
$tagged is being initialized but not written to until the foreach() loop is
being executed. Maybe here is old-lost code anyway?

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:45:15 +02:00
Roland Haeder
8824da8962
Continued a bit:
- recommended way is to use foreach() instead of own looping through arrays
- even when you need the index:
<?php
foreach ($someArray as $key => $value) {
	// Handle $key/$value somehow
}
?>

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:37:01 +02:00
Roland Haeder
6db3d72ee3
added spaces (space-time!) and TODO that x() is maybe proper way?
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:33:11 +02:00
Roland Haeder
d98ac6b42d
Continued a bit:
- removed parentheses from include/require as they are no functions
- added type-hint for $a which is unused btw.

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:31:00 +02:00
Roland Haeder
0bc15efef6
whoops, parser error fixed
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:51:42 +02:00
Roland Haeder
192f6d7cf4
merged 2 if() into one three times
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:49:03 +02:00
Roland Haeder
de5125a4c7
merged 2 if() into one as requested by CR
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:45:49 +02:00
Roland Haeder
2a480df6fa
added spaces + removed parentheses (include/require are no functions)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:44:55 +02:00
Roland Haeder
6b8f581897
added spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:42:09 +02:00
Roland Haeder
f998438d43
removed old-lost code by CR request
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:38:36 +02:00
Roland Haeder
5bc2ebb267
Please use x() correctly:
<?php
if (x($someArray, 'element')) {
	// Do something
}
?>

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:37:08 +02:00
Roland Haeder
3d595c4dcc
Continued a bit:
- added spaces / curly braces
- converted multiple single-line comments into one multi-line comment
- used more dbm::is_result()
- include/require are no functions, let's not abuse them ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:33:24 +02:00
Roland Haeder
d091759888
space to the rescue ... ;-) CR request
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 20:34:14 +02:00
Roland Haeder
9c056d0bf0
it is ... SPACE TIME! ;-)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 20:30:35 +02:00
Roland Haeder
e0f4d22049
removed old-lost code by CR request + spaces added ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 20:26:50 +02:00
Hypolite Petovan
55e4bab00e Improve babel page display for diaspora2bb mode
- Fix formatting
2017-03-26 19:06:22 -04:00
Michael
8fe1fc2f52 Remove parendingsdas 2017-03-26 13:12:02 +00:00
Michael
92f5315320 We now return basic system data via nodeinfo at every time. 2017-03-26 12:51:25 +00:00
Michael
4168d47ecd Issue 3248: Make communityhome work again. 2017-03-26 05:29:24 +00:00
rabuzarus
b6ab3bdd36 make use of Config class 2017-03-25 21:07:12 +01:00
Hypolite Petovan
f1a75a57fe Merge pull request from annando/1703-gcontact
Improved gcontact handling
2017-03-25 15:35:41 -04:00
rabuzarus
a2ad013830 some work on code standards compliance 2017-03-25 19:12:16 +01:00
Roland Haeder
0e6b009425
fixed another parser error, opps
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 15:04:07 +01:00
Roland Haeder
fccdc63964
Opps, fixed parser error. indending was confusing here
+ added much more curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 14:56:23 +01:00
Roland Haeder
73ee285212
rewrote for() loop to foreach() + added curly braces/spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 14:33:59 +01:00
Roland Haeder
006b4b88b2
Continued:
- added curly braces/spaces
- converted multiple single-line comments into one multi-line comment

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 14:07:59 +01:00
Roland Haeder
177a0c8320
Continued:
- used dbm::is_result() to avoid E_WARNING when false is returned
- added curly braces + some spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:23:15 +01:00
Roland Haeder
e503141b0c
added spaces and curly braces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:18:39 +01:00
Roland Haeder
67707247c8
Continued:
- added curly braces/spaces
- changed lower-case SQL keywords to upper-case
- used dbm::is_result() instead of count() (avoids warning in case of false is
  returned)

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:15:42 +01:00
Roland Haeder
c1287df655
removed old-lost code + internal TODO closed
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:12:41 +01:00
Roland Haeder
2f5c796886
removed TODO, one day this all needs refacturizing ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:02:09 +01:00
Roland Haeder
506af8b556
changed "and" -> && according to CR
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 12:47:47 +01:00
Michael
0d49143a63 "no_utf" wasn't in use anymore - it is now removed completely 2017-03-25 10:51:00 +00:00
Hypolite Petovan
29fb28de43 Remove Embedly integration
- Remove admin setting input
2017-03-25 01:57:19 -04:00
Roland Haeder
239dfea4e6
it is space-time! ;-)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 22:40:33 +01:00
Roland Haeder
caad9f5214
added more spaces (CR request)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 22:36:52 +01:00
Roland Haeder
be717649a4
added more curly braces/spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 22:34:13 +01:00
Roland Haeder
c0be733d6d
Opps, became lazy here, thanks to @Hypolite finding it.
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 21:15:36 +01:00
Roland Haeder
b5b3451b31
Continued:
- marked commented-out code as possible old-lost
- added more curly braces
- used more dbm::is_result() where SELECT is stated
- ! added quotes in array element, else (here) >thumb< (without quotes) is
  considered as a constant and causes an E_NOTICE

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 20:57:52 +01:00
Roland Haeder
c4b82133e9
added more curly braces + spaces for
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 23:06:28 +01:00
Roland Haeder
16c405b387
more spaces added (CR by @Hypolite)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 22:22:41 +01:00
Michael
1d6910277d Remove more deprecated "poco_check" calls 2017-03-22 07:11:58 +00:00
rabuzarus
835e54dfc3 upload images to the selected album 2017-03-21 23:08:37 +01:00
Roland Häder
830af774d3
added more curly braces + a bit more usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-21 21:50:45 +01:00
Hypolite Petovan
7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Roland Haeder
09851331a9
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-20 20:51:32 +01:00
rabuzarus
0557a42e2f add missed NULL_DATE 2017-03-20 17:19:24 +01:00
rabuzarus
0879b46125 add NULL_DATE & coding standard work 2017-03-20 16:59:21 +01:00
rabuzarus
0060e2449e Merge develop into 20170316_-_fix_event_edit
Conflicts:
	mod/events.php
2017-03-20 16:46:36 +01:00
Michael
24ee60492b If the maintenance reason is a url, then redirect to this address 2017-03-19 19:03:09 +00:00
Hypolite Petovan
65f809f5cb Merge pull request from annando/issue-3242
Issue 3242: Define a maintenance reason
2017-03-19 11:06:25 -04:00
Michael
8dd732a896 Issue 3242: Define a maintenance reason 2017-03-19 13:24:07 +00:00
Michael
132688d663 Standards, what else? 2017-03-19 08:04:04 +00:00
Roland Haeder
621a77b275
added spaces around + curly braces ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 00:58:46 +01:00
Roland Häder
4fe5cdf3fd don't quit silently, at least a TODO is now around
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:37 +01:00
Roland Häder
d529125c8e
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:24 +01:00
Roland Häder
aeb0ed32c8
added curly braces + removed more useless intval() calls on file_exists()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder
fef61a28cc
fixed chmod
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00