Commit graph

17 commits

Author SHA1 Message Date
Partydragen
95d4a440e2
Merging of OAuth + Connections (#3460)
* Beginning merging of OAuth2 + Connections

* Add Google Integration

* Remove oauth language terms

* Move OAuth settings to Integration settings

* Make OAuth optional for register/login

* Beginning merging of OAuth2 + Connections

Add Google Integration

Remove oauth language terms

Move OAuth settings to Integration settings

Make OAuth optional for register/login

* Fixes

---------

Co-authored-by: Sam <samerton@users.noreply.github.com>
2024-03-09 20:40:13 +00:00
Tadhg Boyle
d0fba0cbe9
Replace Util::getSetting/Util::setSetting usages (#3387) 2023-06-12 10:30:49 -06:00
Tadhg Boyle
26ac376a2d
Remove MCAssoc 🔥 (#3220) 2023-01-26 14:08:11 -08:00
Partydragen
e93b91ea57 Make sure integration verify code is not null 2023-01-14 00:59:14 +01:00
Partydragen
21c222850e
Add Integrations settings system & Setting to turn off mc username requirement (#3109)
* Add integrations settings system

* Move discord link method to integrations settings

* Add option to disable minecraft username on registration

Closes https://github.com/NamelessMC/Nameless/issues/3043

* Add error if integration settings does not exist
2022-10-19 14:14:53 +02:00
Partydragen
6a7a168b3b
Fix verification_code typo 2022-07-17 17:41:41 +02:00
Partydragen
45fe41af10 Re-add format uuid function and relocate getOfflineModeUuid 2022-07-03 01:00:51 +02:00
Robin
27e0a80d5e
Allow server to send correct verify command (#2881) 2022-06-21 22:41:34 -06:00
Robin
01355dcc54 Replace insecure RNG 2022-06-01 22:15:07 +02:00
Robin
67ee4bd17b Remove more queries usage 2022-06-01 11:09:17 +02:00
Robin
f1ab385e47 Update more settings usage 2022-06-01 10:30:09 +02:00
Robin
c2a1d934ff Deprecate redundant method in queries class 2022-05-28 14:10:01 +02:00
Tadhg Boyle
eb8841149d Remove unneeded = in where clauses 2022-05-01 23:22:19 -07:00
Tadhg Boyle
40ef677c25 Init 2022-05-01 23:16:22 -07:00
Partydragen
78e5d62ffb Fix missing /verify command 2022-04-24 13:55:12 +02:00
Tadhg Boyle
2c21149a1e
Use i18n for translations (#2658)
* Dependency updates

* Start i18n conversion

* Switch to ellipsis character

* Add Dutch language json

* Remove Dutch PHP language files + fix variables

* Further variable fixes

* WIP i18n Language class conversion

* Convert Cookie Consent module to new language format

* Further progress including timeago translations

* Misc

* Replace {x}

* Replace more {x} usage

* {{time}}

this took way too long

* replace last {x}

* Remove comments

So searching for {x} produces relevant results

* forgot to save

* move to onPageLoad

* Accept both string and int

* types in doc

* Remove unused (broken?) function

* Don't convert to string first

* Last arg doesn't seem to be used anywhere

* Time `{x}` replacements

* Email `{x}` replacements

* misc `{x}` replacements

* misc `{x}` replacements

* misc `{x}` replacements

* misc `{x}` replacements

* misc `{x}` replacements

* misc `{x}` replacements

* misc `{x}` replacements

* misc `{x}` replacements

* misc `{x}` replacements

* remove comments (makes searching for "{x}" nicer)

* misc `{x}` replacements

* JS `{x}` replacements

* Cleanup language initialization

* Change language constant + add pluralForm support

* Misc language update things

* Add script to find unused terms

* Check all quote types

* Remove most english translations from non-english languages

* Also match with more args

* Missed some apparently

* Missed some (more) apparently

* Misc work

* Add script to convert *all* language files to json

* Fix language codes

* Remove a lot of unused terms

* Remove a lot more unused terms

* Convert everything to JSON, delete old files, get installer working with new system

* Fix general configuration language dropdown + email messages

* Fix page load time, fix language term `set` method

* Fix discord integration command

* Misc

* Misc

* Uncomment RTL definition

* Misc

* Convert links

* Convert links

* Convert links

* Convert links

* Misc work (bolding, fixes, etc)

* Style fix

* Fix variable

* Fix #2668

* Fix old page load timers

* Fix installer group sync injector error

* Convert integration language terms

* Fix more integration language things

* Re-add upgrade script language things

* Resolve PR comments

* Remove unnecessary date()

* Resolve some PR issues

* Fix endpoint

* Style

* Fix Semantic -> Fomantic

* Fix Semantic -> Fomantic

* Return locale short code, not language id/name

Only the short code is interesting to the API, return short code in user info endpoint just like in the website info endpoint.

Also renamed to locale because it's language + region

* Revert "warn people to not translate old language files"

This reverts commit 690b77afff.

* Fix query when there are no filters

* Update 200-pr12.php

* Update footer.php

* insert time into string using placeholder

* Fix getDisplayname case

* Clean username

* PR suggestions

* Include newly created language in converted languages (migration)

* PR suggestions

* PR suggestions

* Update init.php

* Fix default language

Co-authored-by: samerton <samerton@users.noreply.github.com>
Co-authored-by: Robin <robinslot@hotmail.nl>
Co-authored-by: Robin <robin+git@rkslot.nl>
Co-authored-by: Partydragen <adrian_kili@outlook.com>
2022-04-23 14:27:10 +01:00
Partydragen
d2503a1ae0
User Integrations systems (#2606)
* Initial work for User Integrations systems

* Convert a few endpoints to new user integration system

* Finish minecraft part to new User Integration system

* Fixes verify banner issue https://github.com/NamelessMC/Nameless/issues/2052

Fixes https://github.com/NamelessMC/Nameless/issues/2052

* Convert discord to new user integrations system

* Update fields to show user integrations

* Add user integrations to StaffCP user page / move over

* Update UserInfo and Rename MinecraftVerify endpoint

* Rework user listing endpoint

* Password check never returns null

* Add support for offline mode uuid

* Fix documentation phpstan warnings

* else if

* remove die()

* Revamp registration page

* add integrations settings page

* Convert authme & fix phpstan issues

* refix settings page

* Load uuid when user is loaded

* Redirect user to complete required integrations

* Fix translation for user connections page

* Rework integrations registration in Register Endpoint

Completes https://github.com/NamelessMC/Nameless/issues/2516

* make getIntegration ignore case sensitive

* Update installer

* Update upgrader script to convert users

* Fix index for user integrations

* Remove uuid from user data

* Misc

* Remove one unused query

* Add event for integration linking, verify and unlink

* Finish user transformer, Finish user integrations

* Thx phpstan

* Fix phpdocs

* Fix user reports page

* Remove validation banner

* Change default field value

* resolve samerton feedback

* don't clean when inserting data

* don't clean event data

* remove more clean

* increase reset_code length from 60 to 64

* pr13 confirmed

* one more clean

* Remove API verification setting

* Register integrations edit permission

* Resolve a few requested changes

* Rework username and identifier validation

* Add button to sync user integration

* Fix Synchronisation text

* Fix is verified term

Co-authored-by: Robin <robinslot@hotmail.nl>
Co-authored-by: Robin <robin+git@rkslot.nl>
2022-04-16 17:42:24 +01:00