mexon/friendica
1
0
Fork 0
Code Pull requests Activity
15932 commits 5 branches 60 tags 188 MiB
Commit graph

3885 commits

Author SHA1 Message Date
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 #3257 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 #3254 
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 #3245 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
Roland Häder
d9c22c7f3e
Continued a bit: 
- converted some else if to elseif (only PHP)
- converted some space -> tab (intending)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:02 +01:00
Roland Häder
0cd241bcbe
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:44:40 +01:00
Roland Häder
5f71da5862
added more curly braces + spaces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:41:00 +01:00
Roland Häder
958c24e9f3
spaces -> tab + added spaces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:41:00 +01:00
Roland Häder
3849e7c9ff
added more curly braces + a bit more usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:40:47 +01:00
Roland Häder
5471dd79e8
added missing curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:40:21 +01:00
Roland Häder
63e4750b4a
more coding convention applied: 
- added curly braces
- added spaces where needed
- $r only needs to be tested with dbm::is_result()
- made SQL keywords all uper-case

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:40:21 +01:00
Roland Häder
1c6535c0b4
applied coding convention: 
- replaced space -> tab (code indenting)
- added curly braces
- used dbm::is_result() if $r is no result (may happen)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:40:21 +01:00
Michael
1a436264cd Some standards 2017-03-18 12:13:43 +00:00
Michael
62ccb4499a Some more unneeded changes reverted 2017-03-18 08:54:25 +00:00
Michael
a2a171af06 "dob" is not a date field, so the changes are reverted 2017-03-18 08:50:27 +00:00
Michael
e301fa0832 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 2017-03-18 08:31:43 +00:00
rabuzarus
497df57ef7 more standards work 2017-03-18 04:41:54 +01:00
rabuzarus
e1d22ef5d4 some code cleanup 2017-03-17 19:10:48 +01:00
rabuzarus
c785eb29c6 more work on standards compliance 2017-03-17 17:57:57 +01:00
Michael
87771cf617 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 
Conflicts:
	include/discover_poco.php
 2017-03-17 15:53:19 +00:00
rabuzarus
3cef98caf6 Merge pull request #3226 from annando/1702-only-worker 
The worker is now the only background processing system
 2017-03-17 13:22:23 +01:00
rabuzarus
8ae8465d48 add dop event & fix event edit 2017-03-16 20:15:25 +01:00
Michael
88a69b93d5 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 2017-03-15 13:56:17 +00:00
Michael
8decd15565 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-15 13:55:43 +00:00
Michael Vogel
a7e8e86800 Merge pull request #3221 from strk/remember-openid 
Fix "remember me" cookie for OpenID logins
 2017-03-14 16:30:15 +01:00
fabrixxm
fa3490ba5b Merge pull request #3224 from annando/1702-no-old_pager 
The old pager is now removed
 2017-03-14 10:29:03 +01:00
Michael
eaf93dc041 I guess, @Hypolite will still find something to change ... 2017-03-13 17:23:02 +00:00
Michael
0dbc72c4ea Embrace the braces and spaces ... 2017-03-13 16:18:45 +00:00
Michael
d2bad13e83 Added documentation 2017-03-13 14:57:11 +00:00
Michael
fbb84ee219 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-13 10:18:29 +00:00
Tobias Diekershoff
dfc5dc2e9e Merge pull request #3223 from annando/1702-no-language 
The language string isn't displayed anymore
 2017-03-13 08:26:43 +01:00
Michael
eb6a6228f7 more spaces 2017-03-13 05:57:37 +00:00
Michael
77e8c44016 Merge remote-tracking branch 'upstream/develop' into 1702-only-worker 
Conflicts:
	include/onepoll.php
	include/queue.php
 2017-03-12 21:03:44 +00:00
Michael
1624150db4 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 
Conflicts:
	include/onepoll.php
 2017-03-12 20:54:28 +00:00
Michael
259598e569 Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share 2017-03-12 20:52:48 +00:00
Michael
044e9a6603 Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager 
Conflicts:
	mod/profile.php
 2017-03-12 20:52:14 +00:00
Michael
b6a4a2ec7f Merge remote-tracking branch 'upstream/develop' into 1702-no-language 2017-03-12 20:50:20 +00:00
Michael
18d23ca443 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-12 20:49:48 +00:00
Tobias Diekershoff
1bf089e424 Merge pull request #3216 from annando/1701-performance 
Better network handling, improved structure
 2017-03-12 15:40:56 +01:00
Sandro Santilli
df6304cc42 Fix "remember me" cookie for OpenID logins 
Closes #2432

NOTE: in order to obtain the same "cookie hash" it was required
to include unneeded fields in the user record structure, this would
be good to change in the future...
 2017-03-12 01:11:35 +01:00
Michael
0989f725a6 Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server 2017-03-05 16:23:58 +00:00
Michael
2775adfdf5 Second followup for profile issue 2017-03-05 11:07:10 +00:00
Michael
b42167f0ac We can now return a list of known servers 2017-03-04 11:04:00 +00:00
Michael
ec9dddb445 Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server 2017-03-04 10:33:43 +00:00
Michael
461ee5c8a8 Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server 2017-03-04 08:38:04 +00:00
Michael
8690b97c27 Follow up for issue 3196: We need an index hint for performance issues 2017-03-04 08:25:47 +00:00
Michael Vogel
9ccb6072b8 Merge pull request #3205 from tobiasd/20170226-issue3187 
Bugfix issue 3187
 2017-03-03 21:36:37 +01:00
Tobias Diekershoff
2fa9f76e67 better wording and placeholder for name 2017-03-03 10:28:29 +01:00
Michael
324d8bfe8e Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server 2017-03-02 20:20:38 +00:00
Michael
3ab845dcf3 Issue 3196: Not all forum posts weren't shown 2017-03-01 21:47:10 +00:00
Michael
cc86d8ea14 Language data won't be displayed anymore (it was experimental stuff) 2017-02-27 23:59:05 +00:00
Michael
0afb0c2ea4 NULL_DATE is now a constant 2017-02-27 23:37:15 +00:00
Michael
997e94555b The old pager is removed 2017-02-27 21:46:37 +00:00
Michael
39386ded36 "old_share" is removed 2017-02-27 21:26:37 +00:00
Michael
99fb15037b Removed some more unneeded stuff 2017-02-27 06:27:22 +00:00
Michael
733caa5669 Removed admin settings 2017-02-26 23:19:13 +00:00
Michael
48209f0ecd Now there is only the worker. 2017-02-26 23:16:49 +00:00
Michael
2a8a5a6d88 Improved server vitality detection 2017-02-26 18:19:20 +00:00
Tobias Diekershoff
7442ce3d6d change Fan/Admirer to Subscriber 2017-02-26 16:47:11 +01:00
Michael
f9f27c2f5f Merge remote-tracking branch 'upstream/develop' into 1701-performance 2017-02-23 06:55:35 +00:00
Michael
cec79ddf2b See issue 3157: Fulltext is now disabled 2017-02-21 05:23:37 +00:00
Tobias Diekershoff
a4dcd8be55 Merge pull request #3159 from annando/bugfix-diaspora-relay 
Bugfix: Only accept postings from anyone when the relay is configured
 2017-02-11 08:58:38 +01:00
Michael
40390cc5ec Diaspora Relay: Only accept postings from anyone when the relay is configured 2017-02-10 20:45:22 +00:00
rabuzarus
3474b40732 fix - pending contacts shouldn't be shown in contacts widgit and viewcontacts 2017-02-10 03:51:01 +01:00
Michael
9c4a53e380 Optimized query for nodeinfo, better way to analyze posting problems with DFRN 2017-02-04 16:16:15 +00:00
Michael
49834676c7 Bugfix issue 3116: Only allowed themes are displayed 2017-01-31 05:14:32 +00:00
rabuzarus
6d01dd83fe Bugfix: fix the author image in the meta elements in html head (display module) 2017-01-30 15:23:44 +01:00
Michael
c1eea3771f Bugfix: Sometimes the self contact seems to destroy itself 2017-01-29 13:57:03 +00:00
Tobias Diekershoff
069dd5b75d Merge pull request #3125 from annando/alternate-pr-3124 
Alternate solution for pull request 3124
 2017-01-28 15:25:30 +01:00
Michael
ea22828d37 Alternate solution for pull request 3124 2017-01-28 12:19:04 +00:00
Tobias Diekershoff
af699940d4 typo 2017-01-28 11:20:39 +01:00
Tobias Diekershoff
703628cd01 wording 2017-01-28 11:12:31 +01:00
Tobias Diekershoff
83607ff894 enforce them, but inform the user about it 2017-01-28 10:10:35 +01:00
Tobias Diekershoff
334bc7037a don't enfoce non-empty passwords during installation 2017-01-28 10:02:32 +01:00
Hypolite Petovan
c38a5e443d Merge branch 'develop' into issue/#3062 
* develop: (68 commits)
  Added documentation
  update to the translation
  update to the translations
  translation docs now contain basic usage of the Transifex client
  - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
  - Remove misc TinyMCE mentions in docs and minifyjs
  - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter
  - Remove TinyMCE mentions in themes
  - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value
  Remove tinyMCE libraries
  limit the description of the meta tag to 160 characters in /mod/display
  Improved handling of non string values in the config
  Bugfix: Caching of non string cache values now works.
  Reformatted stuff, improved query
  Auto-focus first input field of modal when shown
  Use cache instead of config for storing last proc_run time
  Some added logging
  Bugfix for masses of php warnings
  Rearranged the logging
  Some changed logging
  ...

# Conflicts:
#	view/theme/frost-mobile/js/theme.js
#	view/theme/frost/js/theme.js
 2017-01-27 15:30:21 -05:00
Michael Vogel
d61a4a67db Merge pull request #3109 from Hypolite/issue/scrap-tinymce 
Scrap TinyMCE
 2017-01-27 21:08:33 +01:00
Tobias Diekershoff
722b18ead7 Merge pull request #3096 from annando/1701-index-again 
Some more index stuff
 2017-01-27 16:52:12 +01:00
Hypolite Petovan
bf6d235b26 - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content 2017-01-26 23:04:38 -05:00
Hypolite Petovan
66482c1d9c - Remove $theme_richtext_editor boot var 
- Remove "richtext" feature
- Remove fix_mce_lf() function
- Remove nomce parameter
 2017-01-26 22:57:53 -05:00
Hypolite Petovan
9d5384f107 - Remove tinyMCE mentions or convert to addeditortext() 
- Remove $editselect template value
 2017-01-26 22:50:27 -05:00
rabuzarus
4c8de5fcfd limit the description of the meta tag to 160 characters in /mod/display 2017-01-25 13:10:42 +01:00
Michael
becfeaf0b7 Bugfix: Caching of non string cache values now works. 2017-01-24 18:55:07 +00:00
Michael
df28f99caa Merge remote-tracking branch 'upstream/develop' into 1701-index-again 2017-01-24 06:48:05 +00:00
Michael
ea18d1829f Reformatted stuff, improved query 2017-01-24 06:45:46 +00:00
rabuzarus
5ab6843f38 Bugfix: fix typo in event variable 2017-01-20 13:24:53 +01:00
Michael
75097ebf37 Added limit 2017-01-19 10:00:44 +00:00
Michael
0548099f6c The config class now makes less database reads. 2017-01-18 21:45:32 +00:00
Michael
53393233c3 Replace the direct access of config variables 2017-01-17 19:21:46 +00:00
Michael
47d04416b1 As well here ... 2017-01-15 15:18:31 +00:00
Michael
99e9791d1f We fetched a little bit too much ... 2017-01-15 15:06:32 +00:00
Michael
7e846ba7ac Hide the calculation for "previous" and "next" behind a setting 2017-01-15 14:50:26 +00:00
Michael
3af099298c Some more caching 2017-01-13 17:31:10 +00:00
Michael
844fefc9c4 Caching the events. 2017-01-13 13:04:37 +00:00
Michael
fd5f151a72 New function to detect heavily used indexes 2017-01-13 07:46:47 +00:00
Michael
e67133ef56 Merge remote-tracking branch 'upstream/develop' into 1701-curl-range 
Conflicts:
	mod/oexchange.php
	mod/uimport.php
 2017-01-12 07:25:44 +00:00
Hypolite Petovan
b61479ba6e Merge remote-tracking branch 'friendica/develop' into issue/#3062 
# Conflicts:
#	view/theme/duepuntozero/theme.php
#	view/theme/smoothly/theme.php
 2017-01-12 09:19:59 +11:00
Michael Vogel
5eaa5951a1 Merge pull request #3078 from Hypolite/issue/#3039-mod-2of3 
Normalize App parameter declaration (mod folder, 2 out of 3)
 2017-01-11 22:49:01 +01:00
Michael Vogel
05a2989ecb Merge pull request #3079 from Hypolite/issue/#3039-mod-3of3 
Normalize App parameter declaration (mod folder, 3 out of 3)
 2017-01-11 22:33:41 +01:00
Michael Vogel
df8b522f6b Merge pull request #3077 from Hypolite/issue/#3039-mod-1of3 
Normalize App parameter declaration (mod folder, 1 out of 3)
 2017-01-10 17:28:21 +01:00
Michael
a2debaa68a Download limit for fetching data via "z_fetch_url" 2017-01-09 23:10:32 +00:00
Hypolite Petovan
a7ce601580 Normalize App parameter declaration (mod folder, 3 out of 3) 2017-01-09 23:14:55 +11:00
Hypolite Petovan
f92918f471 Normalize App parameter declaration (mod folder, 2 out of 3) 2017-01-09 23:14:25 +11:00
Hypolite Petovan
8a197055e3 Normalize App parameter declaration (mod folder, 1 out of 3) 2017-01-09 23:12:54 +11:00
Hypolite Petovan
479180ca8e Merge branch 'develop' into issue/#3062 2017-01-08 11:44:45 +11:00
Michael
ed0143c9f0 Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 16:13:57 +00:00
Hypolite Petovan
daa8e4f901 Cleaning up, actual changes are in the next commits 
- Formatting
- Trailing spaces
- Extraneous blank lines
- Large comments
 2017-01-08 02:03:11 +11:00
Michael
c2543f918b Last minutes changes 2017-01-07 13:52:30 +00:00
Michael
1b48799f08 Don't do queries if not needed 2017-01-07 11:28:18 +00:00
Michael
6976ad4892 Removed some removed indexes 2017-01-06 06:37:27 +00:00
Roland Häder
42c2e09382 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-04 09:03:00 +01:00
Michael
db2d0e0095 removal of useless variable 2017-01-01 23:38:32 +00:00
Michael
79b5eb63db Some more reverts 2017-01-01 23:37:29 +00:00
Michael
212f78386d Deactivated the auto mention - we should do it differently. 2017-01-01 23:35:34 +00:00
Michael
8aaf09f9ee Automatically add a Diaspora mention 2017-01-01 23:18:42 +00:00
Michael
8c579735f9 Diaspora: Add a mention when doing a thread reply 2017-01-01 21:21:16 +00:00
Roland Haeder
d2df464d8c
added curly braces + fixed indenting according to code review by Hypolite 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-30 21:49:08 +01:00
Roland Haeder
d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop 
dbm::is_result() calls needed merge

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-30 21:33:41 +01:00
Michael Vogel
c348dd6134 Merge pull request #3046 from rabuzarus/2016125_-_photo_albums_refresh 
Update the photo albums cache on upload, album deletion or renaming
 2016-12-29 11:08:16 +01:00
Tobias Diekershoff
236c7805a4 for the fed stats it is better to have a >= then a = in the query 2016-12-27 17:53:59 +01:00
rabuzarus
a6d7ad0755 Update cache on photo edit only when album name has changed 2016-12-26 02:41:00 +01:00
rabuzarus
08fb35838c Update the photo albums cache on upload, album deletion or renaming 2016-12-25 16:58:38 +01:00
Roland Haeder
f844d96a7f
added some spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-23 20:21:38 +01:00
Roland Haeder
b7c9d63b7a
Fixed parser errors (opps) + changed # -> // Please do so also as # for comments is deprecated. 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-23 20:09:10 +01:00
Roland Haeder
3dbb92c0dc
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-23 19:51:11 +01:00
Roland Haeder
89319d9579
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>
 2016-12-23 19:51:09 +01:00
Roland Haeder
45dd1ccc7b
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>
 2016-12-23 19:51:08 +01:00
Roland Haeder
c1b76e889e
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>
 2016-12-23 19:51:06 +01:00
Roland Häder
54905a3d81
added more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:51:02 +01:00
Roland Häder
3472191b05
Changed $a->get_baseurl() to App::get_baseurl() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:51:00 +01:00
Roland Häder
8ce20f975c
Changed $a->get_baseurl() to App::get_baseurl() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:50:58 +01:00
Roland Häder
8b8a45b703
added curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:50:53 +01:00
Roland Häder
9fad8109ff
changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:50:21 +01:00
Roland Häder
9b6ad2fc47
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-23 19:49:39 +01:00
Roland Häder
f8a213e23b
*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-23 19:49:36 +01:00
Roland Häder
97c507e763
Coding convention applied: 
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:49:15 +01:00
Roland Häder
31cd3fb33c Coding convention continued: 
- added curly braces
- added spaces between if/foreach and brace
- made code block look nicer (spaces added, tabs replaced by space)
- added TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 17:13:34 +01:00
Roland Häder
13b57d4d50 Coding convention continued: 
- added curly braces
- added spaces between if/foreach and brace
- made code block look nicer (spaces added, tabs replaced by space)
- added TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 17:12:34 +01:00
Roland Häder
5547bc2cc2 Continued rewriting a bit: 
- more usage of dbm::is_result()
- nicer look of code

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 17:03:00 +01:00
Roland Häder
d82ed5d1b4 Continued with code convention: 
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 15:31:23 +01:00
Roland Häder
c9194b0381 Continued with code convention: 
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 15:30:23 +01:00
Roland Häder
20e71d21a6 Merge branch 'rewrites/app_get_baseurl_static' into develop 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/editpost.php
	mod/events.php
	mod/install.php
	mod/lostpass.php
	mod/network.php
	mod/notify.php
	mod/suggest.php
	mod/uexport.php
	mod/videos.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
 2016-12-22 11:37:23 +01:00
Roland Häder
ad20c5504d Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
 2016-12-22 11:33:00 +01:00
Roland Häder
c0df692f5f Merge remote-tracking branch 'upstream/develop' into develop 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
 2016-12-22 11:29:56 +01:00
Michael Vogel
9e689e8b9b Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links 
Diaspora: Complete /people/* links from fcontact or author domain
 2016-12-22 10:17:44 +01:00
Roland Häder
a314dbc562 removed conflict solving remains, took from upstream/develop 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 09:14:14 +01:00
Roland Häder
8b7d5d0efc Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 09:06:00 +01:00
Roland Häder
4c04a78d1b Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 09:03:44 +01:00
rabuzarus
2fcbba9410 provide local time for notifications 2016-12-22 00:28:52 +01:00
rabuzarus
125d2f24dd frio: add profile link to the notifications url 2016-12-21 23:17:55 +01:00
Roland Haeder
b3d33ee1e6
More curly braces added, left some TODOs behind 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 23:17:47 +01:00
Roland Haeder
59404e4eaf
More curly braces added, left some TODOs behind 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 23:17:36 +01:00
Roland Haeder
d3e666f71a
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 23:12:28 +01:00
Roland Haeder
d97b6a2eba
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 23:04:09 +01:00
Roland Haeder
d80b82c55d no need for this else block 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 22:53:32 +01:00
Roland Haeder
e6a4a736fc
no need for this else block 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 22:53:08 +01:00
Roland Haeder
0436782e70
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 20:01:51 +01:00
Roland Häder
7f98c8086c added curly braces + space 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/events.php
 2016-12-21 09:31:31 +01:00
Roland Häder
bb37cac772 added curly braces + space 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-21 09:30:49 +01:00
Hypolite Petovan
47f88bd625 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
 2016-12-21 09:15:20 +01:00
Hypolite Petovan
1f94cb9aac proxy: Simplify url extension extraction 2016-12-21 09:14:49 +01:00
Hypolite Petovan
c0ec9c5907 proxy_url: Fix extension extraction for URLs containing a . after a ? 2016-12-21 09:14:09 +01:00
Roland Häder
b580c23844 Merge remote-tracking branch 'upstream/develop' into develop 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/proxy.php
 2016-12-21 09:11:58 +01:00
Roland Haeder
3befdc6920
used more App::get_baseurl() instead of get_app()->get_baseurl(). 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:51:54 +01:00
Roland Haeder
7c342600c3
used more App::get_baseurl() instead of get_app()->get_baseurl(). 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:51:25 +01:00
Roland Haeder
9814414b6a
used dbm::is_result() instead of count() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:39:06 +01:00
Roland Haeder
b4bc07fdcc
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>
 2016-12-20 21:32:00 +01:00
Roland Haeder
536f078ed4
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>
 2016-12-20 21:31:05 +01:00
Hypolite Petovan
e54ee2e509 Merge remote-tracking branch 'friendica/develop' into bug/proxy_url_extension 
# Conflicts:
#	include/follow.php
 2016-12-20 15:29:30 -05:00
Hypolite Petovan
b2768d8f1c 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
 2016-12-20 15:23:08 -05:00
Roland Haeder
52f14ffa5f
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>
 2016-12-20 21:17:09 +01:00
Roland Haeder
6e44acfed6
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>
 2016-12-20 21:15:53 +01:00
Hypolite Petovan
6e929934c5 proxy: Simplify url extension extraction 2016-12-20 15:14:43 -05:00
Roland Haeder
b6d11f2129
Merge remote-tracking branch 'upstream/develop' into develop 2016-12-20 19:33:40 +01:00
Hypolite Petovan
e8e1f9253d Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links 
# Conflicts:
#	include/follow.php
 2016-12-20 12:50:36 -05:00
Hypolite Petovan
4a7c3b9eef Diaspora: Fix class name case + add self 2016-12-20 12:44:15 -05:00
Roland Häder
de689583e2 added more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
 2016-12-20 17:58:34 +01:00
Roland Häder
4b221d216e added more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 17:57:40 +01:00
Michael Vogel
7141ce9163 Merge pull request #3030 from Hypolite/bug/proxy_url_extension 
proxy_url: Fix extension extraction for URLs containing a . after a ?
 2016-12-20 17:53:26 +01:00
Roland Häder
4805aa8fdb Don't cherry-pick: 
- reverted dbm::is_result() to count()

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 16:28:23 +01:00
Michael
4aafbb09a5 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
 2016-12-20 16:00:23 +01:00
Roland Häder
b9e4b9f274 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
 2016-12-20 15:44:31 +01:00
Tobias Diekershoff
cc16369b6f Merge pull request #3033 from annando/1612-object-type 
The object type "photo" is deprecated and was replaced by "image"
 2016-12-20 15:44:07 +01:00
Roland Häder
51716957b2 converted more to dbm::is_result() + added braces/space 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 15:37:27 +01:00
Roland Häder
4f26bee453 Changed $a->get_baseurl() to App::get_baseurl() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:45:36 +01:00
Roland Häder
0e58bf6675 Changed $a->get_baseurl() to App::get_baseurl() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:45:16 +01:00
Roland Häder
d5f2d387bd 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>
 2016-12-20 12:42:33 +01:00
Roland Häder
b69d82e64c 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>
 2016-12-20 12:42:10 +01:00
Roland Häder
a883514604 Opps, forgot this ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:38:23 +01:00
Roland Häder
c22878643b Opps, forgot this ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:38:11 +01:00
Roland Häder
a25b628286 added curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:36:09 +01:00
Roland Häder
8d28135c59 added curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:35:18 +01:00
Roland Häder
ace8f753ac 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
 2016-12-20 11:59:13 +01:00
Roland Häder
e24c3a5b82 added much more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:56:34 +01:00
Roland Häder
5f41375ad3 Continued: 
- added curly braces + spaces
- added todo about testing empty/non-empty strings

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:41:20 +01:00
Roland Häder
51d352922a Continued: 
- added curly braces + spaces
- added todo about testing empty/non-empty strings

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:39:53 +01:00
Roland Häder
fc9dbc0899 added spaces + curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:38:28 +01:00