Commit graph

625 commits

Author SHA1 Message Date
Michael
784770db6f Some more stuff removed 2021-07-24 17:49:10 +00:00
Michael
30aad250df App->contact is now removed 2021-07-24 11:49:11 +00:00
Michael
2502a9192d Many more app-variables removed 2021-07-24 10:09:39 +00:00
Michael
0d0b14303a Remove space 2021-07-04 17:36:28 +00:00
Michael
f0268b57be Use "getOwnerDataById" and "getOwnerDataByNick" to fetch owner data 2021-07-04 17:25:08 +00:00
Michael
fe07dc828b Fix noscrape publishing and pulling, added header 2021-06-17 11:23:32 +00:00
Michael
f00e4c2a4c Issue 10219: Don't display follow activities 2021-05-24 18:04:47 +00:00
Michael
9072107b83 Use post-type for the item container 2021-04-01 04:58:53 +00:00
Balázs Úr
054c301ef0 Update copyright 2021-03-29 08:40:20 +02:00
Michael
1792046a4f post/thread views are renamed, search bugs fixed 2021-02-22 19:47:08 +00:00
Michael
312c01a517 Several speed improvements (magiclink, caching, indexes) 2021-02-17 18:59:19 +00:00
Michael
4157db5473 "item" is replaced by "post-view" / postupdate check added 2021-01-17 20:32:13 +00:00
Michael
2b1d0b9db8 "selectForUser" and "" selectFirstForUser" is now moved to Post 2021-01-16 22:37:27 +00:00
Michael
65c8f33754 Post class introduced in "mod" and "include" 2021-01-16 04:11:28 +00:00
Michael Vogel
ae386a78a4
Merge pull request #9696 from MrPetovan/bug/9306-poke-privacy
Use correct request parameter type for poke privacy
2020-12-22 17:11:37 +01:00
Hypolite Petovan
2ef4972782 Fix capitalization of Contact::magicLinkById calls 2020-12-22 01:01:43 -05:00
Hypolite Petovan
49c1f5c55c Improve handling of the visibility parameter of the new ACL
- Add backward compatibility with old ACL parameters
2020-12-21 22:23:13 -05:00
Hypolite Petovan
42d05bcc1b Append author's contact id to allowed contacts to prevent empty ACL for private posts 2020-12-21 00:27:16 -05:00
Hypolite Petovan
4370d0b967 Add missing activity toggle capability to photos 2020-11-21 11:10:04 -05:00
Hypolite Petovan
8b3ab4e6bb Refactor builtin_activity_puller() and format_like()
- Simplify output array
- Rename format_like() to format_activity()
- Remove duplicate parameters in format_activity()
2020-11-21 11:08:44 -05:00
Hypolite Petovan
0c3a5c815e Remove obsolete references to item.parent-uri 2020-11-14 10:08:50 -05:00
Philipp
8318a0b640
Move ExAuth, FKOAuth1 & FKOAuthDataStore to own namespace Friendica\Security 2020-09-30 11:14:01 +02:00
Hypolite Petovan
043e04f484 Remove confirm template obsolete uses (except for contacts)
- Remove obsolete explode_querystring() function
- Remove $extra_inputs template variable
2020-09-12 09:09:15 -04:00
Hypolite Petovan
4065f71382 Fix qcomment addon
- Initialize $qcomment template variable everywhere it is expected
- Remove addon Javascript from core head template
2020-09-09 16:49:03 -04:00
Hypolite Petovan
c4267bbca0 Remove unused jot.tpl template variables 2020-09-07 19:27:23 -04:00
Michael
ce2af84cba Use a constant for the contact photos / dom't cache them 2020-08-18 22:18:48 +00:00
Michael
0007da8630 EOL removed 2020-07-23 06:25:01 +00:00
Michael
3fc3ded750 Useless info messages removed 2020-07-23 06:11:21 +00:00
Hypolite Petovan
5ce13b210e Add check for exif data existence in mod/photos 2020-07-09 15:03:14 -04:00
Hypolite Petovan
89b3ae2657 Add null/empty string parameter value case in BBCode::convert
- Remove obsolete coalesce operator uses
2020-06-08 19:15:08 -04:00
Michael
0acb5d4558 "parent = id" is replaced with gravity check 2020-05-28 16:02:36 +00:00
Michael
973abb6196 Replace "id = parent" checks with "gravity" checks 2020-05-27 12:19:06 +00:00
Hypolite Petovan
75977ee72b Remove remaining references to cirtual field item.tag 2020-05-13 22:35:13 -04:00
Michael
180b4e51df fix a fatal error when displaying photos 2020-05-06 04:58:25 +00:00
Michael
d33f6fc167 Renamed function 2020-05-05 21:58:25 +00:00
Michael
980de37047 Removed legacy usage of the "tag" field 2020-05-05 19:54:25 +00:00
Michael
b7e25d16e7 Removed usage of "tag" field 2020-05-05 05:11:59 +00:00
Hypolite Petovan
43b8bdea07
Merge pull request #8520 from annando/term2tag
We now store tags in "tag"
2020-04-22 22:56:07 -04:00
Hypolite Petovan
16f48731b1 Remove album name bin2hex conversion in file browser
- Avoids Javascript hex2bin() limitation to Latin-1 string encoding
2020-04-21 22:14:11 -04:00
Michael
9e9a104320 Tags can now be added and removed from photos 2020-04-18 20:46:41 +00:00
Michael
d3722c945b Improved Mime Type detection 2020-04-01 05:42:44 +00:00
Hypolite Petovan
f814ca30d3 Use sensible URLs for return after album actions instead of $_SESSION['photo_return'] in mod/photos 2020-03-01 09:56:02 -05:00
Hypolite Petovan
452d7e6404 Remove unused conversation response code
- Remove get_responses()
- Remove get_response_button_text()
- Remove title key from $conv_responses array
- Address https://github.com/friendica/friendica/issues/8000#issuecomment-589263329
2020-02-22 20:41:12 -05:00
Hypolite Petovan
b2bfec3381 Remove unused template variable in mod/photos 2020-02-22 20:30:28 -05:00
Hypolite Petovan
637e38e535 User hide_dislike user setting to hide dislike button and conversation responses 2020-02-20 05:37:07 -05:00
Hypolite Petovan
561472b975 Add L10n parameter to Pager classes 2020-02-16 12:50:39 -05:00
Hypolite Petovan
95b09aaec4 [frio] Add loading animation on comment form submit 2020-02-11 23:45:47 -05:00
Michael Vogel
13a10b8f20
Merge pull request #8277 from MrPetovan/task/8251-use-about-for-pdesc
Remove profile about field double HTML escaping
2020-02-12 05:23:04 +01:00
Hypolite Petovan
1ce5b1d65b Remove profile about field double HTML escaping
- Add BBcode conversion for profile.about in widget/vcard.tpl
2020-02-11 21:38:42 -05:00
Michael Vogel
e80d68ba53
Merge pull request #8261 from MrPetovan/task/8251-use-about-for-pdesc
Use profile.about for profile description
2020-02-10 23:36:59 +01:00
nupplaPhil
85dc9bb96b
Add license info at Friendica PHP files 2020-02-09 16:18:46 +01:00
Hypolite Petovan
a42104ce43 Use profile.about instead of profile.pdesc for profile description 2020-02-09 02:36:19 -05:00
Hypolite Petovan
f2d917114f Move Model\Profile::getTabs to new Module\BaseProfile class 2020-01-26 14:21:18 -05:00
Hypolite Petovan
0d1befdf2d Move /profile_photo to Module\Settings\Profile\Photo 2020-01-20 07:27:12 -05:00
nupplaPhil
ed9392469e
Remove unneeded Config namespace usages 2020-01-19 22:50:44 +01:00
nupplaPhil
6c36fd9e01
Move Config::get() to DI::config()->get() 2020-01-19 21:21:13 +01:00
nupplaPhil
d6efc90194
cleanup namespace usages for L10n 2020-01-19 16:31:33 +01:00
nupplaPhil
5dfee31108
Move L10n::t() calls to DI::l10n()->t() calls 2020-01-19 16:31:16 +01:00
Michael
b83f328983 Remove "f" parameter / network page parameter cleanup 2020-01-13 20:10:13 +00:00
nupplaPhil
244f440d97
Remove unused killme() 2020-01-04 23:43:13 +01:00
nupplaPhil
3f34229752
Move redundant System::baseUrl() to DI::baseUrl() calls 2019-12-30 23:00:08 +01:00
nupplaPhil
6d7362da41
Replace deprecated $a->page with DI::page() 2019-12-30 20:02:09 +01:00
nupplaPhil
33674808dc
Remove deprecated App::cmd - replace with DI::args()->getCommand() 2019-12-29 20:17:51 +01:00
nupplaPhil
e6f61c2cc7
Remove deprecated App::query_string - replace with DI::args()->getQueryString() 2019-12-29 20:17:50 +01:00
nupplaPhil
8e6973b774
Refactor deprecated App::internalRedirect() to DI::baseUrl()->redirect() 2019-12-29 20:17:43 +01:00
nupplaPhil
388b963714
Replace BaseObject class with DI::* calls 2019-12-29 20:17:38 +01:00
Hypolite Petovan
66e9f0e0da Remove unused albumname input in album drop modal
- Addresses https://github.com/friendica/friendica/issues/8000#issuecomment-568798634
2019-12-24 15:19:08 -05:00
Hypolite Petovan
f989c331a3 Fix warnings about unexpected parameter array values type in ACL::getFullSelectorHTML
- Addresses https://github.com/friendica/friendica/issues/7676#issuecomment-560503744
2019-12-03 06:59:51 -05:00
Hypolite Petovan
ae3d4f63a3 Use visibility tags input for the default ACL selector
- Move friendica-tagsinput to default view folder
- Update all references to ACL::getFullSelectorHTML
- Fix theme-specific issues with the new ACL
2019-11-28 12:54:53 -05:00
Hypolite Petovan
26b5de9a76 Rename Photo::newResource() result variable from $hash to $resource_id 2019-11-02 07:48:45 -04:00
Hypolite Petovan
03bf1dcbd3 Move Object\Image static methods to Util\Images
- Optimize imports in modified files
2019-11-02 07:48:45 -04:00
Philipp Holzer
3897c74deb
Add docs 2019-10-25 00:10:20 +02:00
Philipp Holzer
07cea24430
Move Activity/Namespaces defines to constants 2019-10-24 21:40:12 +02:00
Philipp Holzer
c9e1098dd2
Adapt naming convention 2019-10-23 21:39:00 +02:00
Philipp Holzer
52c42491c4
Move activity_match() to Protocol\Activity::match()
- With tests
2019-10-23 02:05:11 +02:00
Philipp Holzer
5843a80b6c
Move perms2str to ACLFormatter::aclToString()
- including new tests
2019-10-23 00:54:34 +02:00
Hypolite Petovan
2db6171641 Replace deprecated defaults() calls by a combination of ?? and ?: operators in mod/ 2019-10-15 09:01:17 -04:00
Michael
83b00ef308 New function "isAuthenticated" 2019-09-28 18:09:11 +00:00
Michael
1c26baec46 remote_user is replaced 2019-09-28 09:59:08 +00:00
Michael
6e9026e033 Renamed function, beginning to replace the "remote_user" function 2019-09-28 09:36:41 +00:00
Michael
1ddd2df4b8 Removed obsolete code 2019-09-28 05:37:24 +00:00
Michael
3dd94355b7 Fix permissions when viewing photos, applying same fix to items as well 2019-09-27 05:49:23 +00:00
Michael
ec66553032 Reworked "remote" cookie handling 2019-09-25 22:24:17 +00:00
Michael
5254147ccc Fix "redir" loop 2019-09-23 22:13:20 +00:00
Michael
1b7f96dac8 Partly reverted, real problem fixed 2019-08-04 04:29:52 +00:00
Hypolite Petovan
e745506c04
Replace removed Photo::select by new Photo::selectToArray in /photos 2019-07-29 13:38:55 -04:00
Hypolite Petovan
19247b62ae Ensure $uid parameter of Feature::isEnabled to be an integer 2019-07-15 22:00:49 -04:00
Hypolite Petovan
b124c414dc Rewrite conditions for photo linked item to prevent crash on old photos
- Addresses https://github.com/friendica/friendica/issues/7297#issuecomment-509064260
2019-07-07 23:51:23 -04:00
Hypolite Petovan
f92752c9b4 Ensure $link_item variable type when calling get_responses() in mod/photos
- Addresses https://github.com/friendica/friendica/issues/7297#issuecomment-508622668
2019-07-05 13:40:33 -04:00
Hypolite Petovan
ac294be746
Merge pull request #7207 from nupplaphil/bug/6917-php_warnings
Add hexadecimal check (fix warnings)
2019-05-30 09:31:50 -04:00
Philipp Holzer
03ca26f0c4
Change fallback logic 2019-05-30 13:45:39 +02:00
Philipp Holzer
4c5dd9f47c
Add more Strings::isHex() checks to photos 2019-05-30 10:30:15 +02:00
Philipp Holzer
7334be803d
Bugfix - item_id 2019-05-29 21:40:21 +02:00
Philipp Holzer
3de540d1d1
Adding hexadecimal check for photos
see https://github.com/friendica/friendica/issues/6917#issuecomment-492798238
2019-05-29 20:28:25 +02:00
Philipp Holzer
2652787460
friendica-7130 Edits of images not possible 2019-05-26 15:00:19 +02:00
Hypolite Petovan
c65faecc8c Add current tab parameter to Model\Profile::getTabs 2019-05-20 15:09:33 -04:00
Hypolite Petovan
71ae8d07a6 Refactor widgets
- Move widget templates to subfolder
- Add new generic filter widget templates to replace category, network and filer filters
- Update styles
2019-05-18 11:33:35 -04:00
Philipp
774d04cd2f
Merge pull request #7044 from MrPetovan/task/router
Move mod/admin to src/Module/Admin
2019-05-02 18:26:30 +02:00
Hypolite Petovan
9774c95b80 Remove duplicate $baseurl template variable
- Remove unused $overwriteURL parameter in Renderer::replaceMacros
2019-05-02 09:55:48 -04:00
Hypolite Petovan
dd0b7d2642 Replace straightforward q() calls by DBA::selectFirst or DBA::exists in mod/photos 2019-05-02 09:49:20 -04:00
Hypolite Petovan
5dd6e6b5fb Reworked /photos module without App->error
- Moved confirm dialogs to photos_content()
- Removed comments/interactions from photo edit page
2019-05-01 19:36:14 -04:00
Hypolite Petovan
b161bd1dfa Improve get_responses() prototype 2019-01-21 11:37:05 -05:00
Hypolite Petovan
8a5ef2b6f4 Replace deprecated calls to q() in mod/fsuggest and mod/photos 2019-01-21 11:12:48 -05:00
Hypolite Petovan
ad9c67663d Move Contact::Page_* constants to User::PAGE_FLAGS_* 2019-01-21 10:55:37 -05:00
Hypolite Petovan
dbc6eb5422 Remove unused code in mod/
- Remove commented code
- Remove unused/immediately overwritten variables
- Remove extraneous parameters
- Remove unreachable code
2019-01-21 10:53:32 -05:00
Hypolite Petovan
55e54bb950 Replace deprecated Addon::callHooks with Hook::callAll
- Update documentation
2019-01-21 09:50:56 -05:00
Hypolite Petovan
895b3abf32 Remove/replace killme() with *exit() 2019-01-21 09:49:17 -05:00
fabrixxm
8c75c26361 Use Model\Photo as much as possible
Most important is to use `Photo::delete()` to have backend
to remove data.
2019-01-21 09:12:28 -05:00
fabrixxm
6f59c82978 Code standards 2019-01-21 09:10:46 -05:00
fabrixxm
3e13799e70 Add update() to Photo model
Edit mod/photos.php to use Photo model
2019-01-21 09:10:45 -05:00
fabrixxm
3ca0b0bf9d photos: use model delete() to delete photos 2019-01-21 09:02:56 -05:00
Hypolite Petovan
acaee626f5 Remove include/ requires that are now done directly from Composer 2018-12-24 09:56:25 -05:00
Hypolite Petovan
458981f75c Replace x() by isset(), !empty() or defaults()
- Remove extraneous parentheses around empty() calls
- Remove duplicate calls to intval(), count() or strlen() after empty()
- Replace ternary operators outputting binary value with empty() return value
- Rewrite defaults() without x()
2018-11-30 09:06:22 -05:00
Hypolite Petovan
4874f7f8ab Remove useless rawurlencode calls for building hashtag bbcode
- Fix some formatting
2018-11-22 09:32:41 -05:00
Michael
43079bfaf8 Several default features are now in the core 2018-11-18 20:13:46 +00:00
Adam Magness
218f0734be Rename removeTags to escapeTags
rename function and update calls.
2018-11-09 13:29:42 -05:00
Adam Magness
b5a97c1abe Move getTags to BBCode
move getTags function to BBCode class and update calls.
2018-11-09 13:24:19 -05:00
Adam Magness
5276c28a78 link_compare calls
implement compareLink function.
2018-11-08 10:46:50 -05:00
Adam Magness
46d7767fd0 formatBytes calls
implement function in new class
2018-11-08 10:28:49 -05:00
Adam Magness
a0f65ca7a1 notags calls
implement removeTags function
2018-11-08 10:14:37 -05:00
Philipp Holzer
6e10bdf361
Move random Digits to Crypto class 2018-11-05 21:02:54 +01:00
Adam Magness
9e51be7554 Revert "Update function calls"
This reverts commit 748fb8b946.
2018-11-05 13:07:07 -05:00
Adam Magness
748fb8b946 Update function calls
update function calls to new class
2018-11-05 07:40:18 -05:00
Adam Magness
b07d47b0f7 Update function calls
update function calls to new names
2018-11-05 07:24:14 -05:00
Adam Magness
61bc9facc8 Implement functions
implement functions relocated to xml class
2018-11-05 07:24:14 -05:00
Adam Magness
35abc4bb64 get markup template
implement getMarkupTemplate function
2018-10-31 10:44:06 -04:00
Adam Magness
91facd2d0a replace macros
implement new replaceMacros function
2018-10-31 10:35:50 -04:00
Adam Magness
50da89d861 Logger Levels
update logger levels in calls
2018-10-30 09:58:45 -04:00
Adam Magness
14fde5dc9b Log function
implement log() function.
2018-10-30 09:57:14 -04:00
Michael
73f596cc46 Fixes duplicated transmissions and not working undo of like/dislike 2018-10-27 11:09:23 +00:00
Jonny Tischbein
deed949ff0 Code Standards: var name, spaces, array_push short form 2018-10-26 00:18:47 +02:00
Jonny Tischbein
ea36f85457 Code Standard: indent 2018-10-25 21:47:10 +02:00
Jonny Tischbein
b03050c339 Replace update/delete with Term::insertFramTagFieldByItemId + Code Standards + Wording 2018-10-25 21:47:10 +02:00
Jonny Tischbein
e022bac339 Code Standard + renaming deleteAllTags + move its call and add type param 2018-10-25 21:47:10 +02:00
Jonny Tischbein
fd2e06781d Fix adding / removing photo tags + tagrm delete via GET + Item::update / add Term::deleteAllTags 2018-10-25 21:47:10 +02:00
Hypolite Petovan
7c0b591043 Move itemCount parameter from constructor to renderFull()
- Remove Pager->itemCount property and Pager->setItemCount() method
- Update usage
2018-10-25 00:07:16 -04:00
Hypolite Petovan
14237a9599 Move $pager and $page_offset out of App
- Move infinite scroll data output in a module hook
- Use Pager instead of paginate() and alt_pager()
2018-10-25 00:07:15 -04:00
Philipp Holzer
3edad1591e
replaced $return_url to $return_path to make it more clear that it is a relative path to the Friendica baseurl 2018-10-22 22:13:37 +02:00
Philipp Holzer
d00ddc01af
Split goaway to System::externalRedirectTo() and App->internalRedirect() 2018-10-22 22:13:35 +02:00
Philipp Holzer
2ef81108b3
Renamed System::redirect() to $a->redirect() 2018-10-22 22:13:22 +02:00
Jonny Tischbein
f3fc1f36ca Renaming functions + moving functions from security to Model/Item and BaseModule + fix multiline comments 2018-10-17 21:30:41 +02:00
Jonny Tischbein
05be2db725 Move include/security tp /src/Core/Authentication and /src/Util/Security 2018-10-17 14:19:58 +02:00
Philipp Holzer
5a02e39a65
Rename App Methods
- renamed a lot of App methods to CamelCase
- replaced direct public variables with get-/set-Methods
2018-10-10 00:16:06 +02:00
Michael
cb9be8a7ab UUID is now createUUID 2018-09-27 11:52:15 +00:00
Michael
60b0759b50 UUID instead of GUID 2018-09-26 20:03:46 +00:00
Michael
8b96a53fba Burn notices, burn 2018-09-11 04:10:11 +00:00
Michael
04fb885857 Fix: Posts with pictures will now look good again on connector networks 2018-09-06 04:24:34 +00:00
Tobias Diekershoff
6a549d4cfb
Merge pull request #5659 from annando/notices-oh-no
Oh no ... there are still some notices that want to be removed ...
2018-08-24 14:46:21 +02:00
Michael
82d097879b Oh no ... there are still some notices that want to be removed ... 2018-08-24 11:09:58 +00:00
Roland Häder
61693419e8 Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?

* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
  BadMethodCallException in SPL)

* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.

* Ops, one more left ...

* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'

* Added empty lines for better readability

* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)

* Re-fixed DBM -> DBA switch

* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability

* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class

* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)

* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"

* Ops, one still there (return is no function)

* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
  functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
  will do this for us
- renamed those proxy_*() functions to better names:
  + proxy_init()           -> Proxy::init()         (public)
  + proxy_url()            -> Proxy::proxifyUrl()   (public)
  + proxy_parse_html()     -> Proxy::proxifyHtml()  (public)
  + proxy_is_local_image() -> Proxy::isLocalImage() (private)
  + proxy_parse_query()    -> Proxy::parseQuery()   (private)
  + proxy_img_cb()         -> Proxy::replaceUrl()   (private)

* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes

* Ops, need to set $a here ...

* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule

* Ops, no need for own instance of $a when self::getApp() is around.

* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
  methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module

* No instances from utility classes

* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`

* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.

* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.

* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.

* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...

* Ops, was added accidentally ...

* Ops, why these wrong moves?

* Ops, one to much (thanks to MrPetovan)

* Ops, wrong moving ...

* moved back to original place ...

* spaces added

* empty lines add for better readability.

* convertered spaces -> tab for code indenting.

* CR request: Add space between if and brace.

* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 01:05:49 -04:00