Commit Graph

466 Commits

Author SHA1 Message Date
woogerboy21 d7d50def51 Added user analytics table to database 2015-09-08 14:56:10 -04:00
woogerboy21 044c2356ff Added server/client feature set communication 2015-09-02 17:54:06 -04:00
marco baa61d0571 Merge branch 'master' into Refactor-settings
Conflicts:
	oracle/CMakeLists.txt
2015-09-01 21:28:53 +02:00
woogerboy21 de073a51d6 Log inconsistent session / session table situation 2015-08-31 08:29:26 -04:00
woogerboy21 66dce1bf46 Fix bug that crashes server when old session is logged out during login 2015-08-30 23:33:11 -04:00
woogerboy21 cfebd53d5d Corrected proto warnings 2015-08-25 23:40:08 -04:00
marco 4125d690fa Fix merge & relative path for portable build 2015-08-25 20:22:31 +02:00
woogerboy21 364df4daf0 Extend the login protocol to send the client id (as optional) 2015-08-24 11:38:24 -04:00
woogerboy21 b0630b81ca Log old session out of server if logging in from a second location 2015-08-22 13:41:02 -04:00
Zach e9156ecd62 Merge pull request #1391 from woogerboy21/admin_adjustmods
Allows admins to promote users to mod and demote mod to user
2015-08-22 00:03:46 -04:00
Zach a6a62b3334 Merge pull request #1354 from Cockatrice/fix-1351
Fix #1351 - Server ignores only-reg if in "none" auth mode.
2015-08-21 22:15:32 -04:00
Daenyth 6170c9037f Fix #1351 - Server ignores only-reg if in "none" auth mode.
When in none auth mode, registered users don't exist; hence the setting
makes the game impossible to join.

Normally the setting would be greyed out when the user is unregistered,
but commit 475c54bf introduced a new edge case where the stored setting
would apply to the field even if the user is unregistered, making the
setting possible to apply in no-reg mode. Regardless, any client could
have done this, not just the default cockatrice.

The server side fix should prevent all issues in the future.
2015-08-21 20:30:46 -04:00
marco c8d59eec5e Refactred settings to use settingscache & ini files 2015-08-22 01:05:15 +02:00
woogerboy21 39fcabe921 Allows moderators to promote users to mod and demote mod to user 2015-08-20 22:42:10 -04:00
woogerboy21 3e94c9d283 Define permission levels for rooms 2015-08-15 21:00:51 -04:00
woogerboy21 bb0b626cee Add last_login column to user table and populate upon login 2015-08-15 03:00:34 -04:00
woogerboy21 b102a05a36 Add ability to ban by client id 2015-08-14 00:06:37 -04:00
woogerboy21 8bf58af727 Merge pull request #1365 from woogerboy21/add_clientid_tosessions
Add clientid field to sessions table.
2015-08-12 08:07:01 -04:00
woogerboy21 eb5833609a Add clientid field to sessions table. 2015-08-11 12:45:04 -04:00
woogerboy21 fa77cdf3b5 Removed clientid requirements from the protocol handler. 2015-08-10 16:07:20 -04:00
woogerboy21 17392f1ae5 Moved the RegOnlyRequirement functions out of the Database interface into the proper Server block of code. 2015-08-08 16:24:37 -04:00
woogerboy21 bc99024e4f Added server side setting to allow the requirement of a client id from clients. 2015-08-08 08:52:19 -04:00
woogerboy21 94942e1a92 Commit to resolve requests made by @Daenyth discussed after the commit.
See https://github.com/Cockatrice/Cockatrice/pull/1340 for details.
2015-08-08 08:52:19 -04:00
woogerboy21 52db13a1ca Initial release of client ID generation. 2015-08-05 10:15:49 -04:00
woogerboy21 13011180f7 Merge pull request #1313 from woogerboy21/update_pingtime
Update Client & Server ping time
2015-08-03 12:31:20 -04:00
woogerboy21 eb9ca58fd0 Updated pingClockTimeout to account for adjustments in client keep alive settings value.
Changed the default value for the client keep alive variable back to 1 (since that is what the setting is if the value is not found in the configuration ini file).
2015-07-30 16:38:02 -04:00
Fabio Bas 8d325b9e19 Servatrice: do not disclose user emails to clients 2015-07-28 22:20:40 +02:00
woogerboy21 a9acb3f1cc Total Max User Restriction
Syntax correction.
2015-07-13 17:54:03 -04:00
Zach f199e20740 Merge pull request #1216 from ZeldaZach/fix_morphs
Fix Morphs from Sharing Information
2015-07-07 22:00:32 -04:00
Zach 6bf421cc31 Merge pull request #1210 from ctrlaltca/profile_edit
Profile management
2015-07-07 02:01:27 -04:00
Zach e76c109f2d Merge pull request #1217 from ZeldaZach/fix_cheat
Prevent Hash Collision
2015-07-06 23:49:48 -04:00
Zach H 339db24b56 efficency loop 2015-07-06 17:52:20 -04:00
Zach H 9e2da24629 use QSet for zones 2015-07-06 11:02:43 -04:00
Zach H 8e4f0c50af remove breaks 2015-07-06 01:31:24 -04:00
Zach H ef268d79c3 prevent cheating with hashes 2015-07-06 00:30:17 -04:00
Zach H 8221d37bbe don't share PT 2015-07-05 23:11:26 -04:00
Zach H 1bda6e53b2 allow mod global msg 2015-07-05 22:06:35 -04:00
Fabio Bas 15998fb3e6 Misc fixes 2015-07-05 22:44:35 +02:00
Fabio Bas 7f5f290c93 Profile management 2015-07-05 22:44:35 +02:00
Zach 31890450dc Merge pull request #1205 from ZeldaZach/fix_1173
Server Name Rules Information
2015-07-04 19:37:50 -04:00
Fabio Bas 6cf3db7e6b Servatrice: refactor signal handling and permit config reloading 2015-06-30 22:21:26 +02:00
Fabio Bas 02dcaff356 Publish username rules in login failure, too 2015-06-30 18:44:40 +02:00
Fabio Bas 4c27304047 publish username rules in registration failure 2015-06-29 23:35:27 +02:00
Fabio Bas 8826908923 Automatically attach related cards to the original card 2015-06-13 15:40:59 +02:00
Fabio Bas 471f6371b5 More work
* Refactored code out of common/ into servatrice/
 * added smtp client library
 * disable registration when connected
 * validate email address
 * send activation token via email
2015-05-24 23:02:51 +02:00
Fabio Bas 21155ce54a Make gcc an happy puppy (-Wunused-parameter) 2015-05-24 00:47:12 +02:00
Fabio Bas ff1aed717e Added token generation, user activation command and response. 2015-05-24 00:37:45 +02:00
Fabio Bas 42796b0d0e More fix for -Werror=unused-parameter 2015-05-23 21:17:22 +02:00
Fabio Bas 16d9534757 fix for -Werror=unused-parameter 2015-05-23 21:09:29 +02:00
Fabio Bas 5ace0dd892 Almost completed registration
* added missing bits of serverside code;
 * added fronted in client;
 * removed demo python scripts;
2015-05-23 20:13:03 +02:00