Commit Graph
83 Commits
Author SHA1 Message Date
woogerboy21andGitHub da7c7c1f83 Update Servatrice MySQL Search Path (#3039)
Removed the older versions of the mysql library install paths and updated to reflect the 5.7 product paths.
2018-01-21 11:05:13 -05:00
woogerboy21andGitHub b684c12964 Correct VS2017 Compile Issue (#2878)
A line in the servatrice CMAKE file was removed in a prior commit causing a compile error in newer versions of visual studio.  This returns the line.
2017-10-03 09:23:33 -04:00
woogerboy21andctrlaltca 2094910b7a More descriptive reason for "to many requests" when registering (#2760)
* More descriptive reason for "to many requests" when registering

Currently the only way for a user to get a response of "to many registration attempts"  is by the servers configuration to restrict the number of registration attempts but the error message presented to the user is very vague as to why they have been denied.  This PR updates the reasoning.  I'm open for suggestions on any clarity recommendations.

* Added more clarity

Updated error message to include email address information for even greater clarity.
2017-06-12 12:12:36 +02:00
woogerboy21andGitHub 1811bad835 Fix room chat history (#2698)
Looks like an addition to the table shifted things.  We probably  should look into some how use the actual column names (if it can be done).  But for now this should fix the server room chat history.
2017-05-09 23:22:48 -04:00
woogerboy21andZach H 2f23a9cb2f Smarter rooms (#2484)
* Added VIP only room

* Added DONATOR room.

* Extended Room to include privilege level.

* Updated room join logic

* Updated server tab permissions column display based on perm+privlevel definitions

* Fixed new client -> old server blank permissions column on server tab

Added the ability for registered user - VIP/DONATOR/PRIVILEGED room.
2017-03-22 21:45:16 -04:00
woogerboy21andZach H 33e8a2ea95 Fix mysql appveyor (#2529) 2017-03-21 16:42:14 -04:00
woogerboy21andctrlaltca bf154559eb Reset idle timer when a message is sent. (#2456) 2017-03-12 11:52:43 +01:00
woogerboy21andGitHub d0088f6a18 Server audit table (#2423)
* Creating of server side audit table for auditing actions such as password resets, account registrations and log queries.

* Add migration script

Add migration script for database

* Update database script

Update database script to reflect new audit table

* Creating of server side audit table for auditing actions such as password resets, account registrations and log queries.

* Add migration script

Add migration script for database

* Update database script

Update database script to reflect new audit table

* Corrected results column possible value(s).

* Fixed migration script.

* Added boolean audit logic

Added enable/disable audit options
Added audit functionality for forgot password

* Added registration auditing

Added registration auditing

* Updated ActivateAccount Function

Created clientid variable and used it in preporation for future
potential protocol expansion.

* Extended activation protocol

Added clientid to activation command protocol

* Typo correction

Fix typo's

* Missed type fix

Found the infamous E!

* Updated database function syntax

Updated if/else syntax in db add audit function

* Untabify content

Untab files changed in PR
2017-02-25 13:48:31 -05:00
woogerboy21andZach H 0cfa6863d5 Simpler forgot password functionality (#2393)
* Simpler forgot password functionality (Server/Client)
2017-02-15 17:41:40 -05:00
woogerboy21andGitHub b64eab204c Added custom notify user event (#2398)
* Added custom notify user event.

* Untabbify
2017-02-08 18:00:53 -05:00
woogerboy21andGitHub 0fdb9b7c83 Added registration email blacklist (#2352)
* Added registration email blacklist

Added the ability to define email blacklist for user registration.  Now
server operators can prevent users from registering accounts that
contain providers they do not wish users to use.

* Update ini option for clarity

Updated servatrice ini option name for clarity.

* Updated description for clarity

Added implicit explination
2017-02-08 15:25:27 -05:00
woogerboy21andGitHub a85b0dcbba Add email registration restriction (#2350)
* Add ability to limit number of account registrations with same email address

This commit adds server side functionality that will allow operators to
limit the number of accounts that can be registered to the server with
the same email address.

* Updated ini wording

Updated configuration file wording for better description.
2017-01-07 11:26:23 -05:00
woogerboy21andGitHub 3e39432ccc Add configuration to enable/disable internal smtp client (#2337)
Fix #1881
This change allows the server operator to enable or disable the internal
SMTP client that sends activation emails.  With this new configuration
option server operators can choose to require email activation yet use
an external method of account verification and/or account token
notification.
2017-01-06 17:02:52 -05:00
woogerboy21andGitHub dbf7d7f748 Fix replay chatview with new gummys (#2340)
Fix #2334
This update fixes the violation that happens when watching replays to
determin the proper user privlevel in order to generate the correct
gummy.
2017-01-06 15:28:30 -05:00
woogerboy21andGitHub f7c8651d51 Added privilege level start/end columns (#2328)
* Added privilege level start/end columns

Added 2 new columns to the users table to indicate when a users
privilege level date / time was recognised and when the privilege level
should end.

* Updated database header

Always forget about the database header file...

* Added priv level maintenance script

Added a bash maintenance script that can be run on a scheduled basis
that will demote privileged users that have the end times on the
accounts that are prior to the date/time the script is executed.

* Added donations table

Added donations table to db for tracking user donations
2016-12-30 16:45:28 -08:00
woogerboy21andGitHub 36e6da2abd Fix idle timeout warning on registration / login (#2322)
Fix #2319
This should resolve the issue of users getting the popup immediately when logging in and the time out value is set to 0.
This needs tested, its a quick fix put in with the web editor.
2016-12-20 16:15:16 -08:00
woogerboy21andZach H 960ecaaeda New privuser gummys (#2305)
* New user gummys based on account privilege level

This change add's new user gummy icons for vip/donator priv levels that
are now available.

YaY for Zach!
2016-12-08 22:52:25 -05:00
woogerboy21andctrlaltca c9a8dafd01 Update sessions table columns for consistency (#2299)
* Update sessions table columns for consistency

Fix #2276
This update changes two columns in the sessions table to match the
column declartations in the users table.

* Update servatrice.sql

Update servatrice.sql to reflect new db schema version
2016-12-08 10:43:11 +01:00
woogerboy21andGitHub c78eed576f Fix store replays (#2301)
* Fix Store Replays Functionality

For whatever reason we have a variable in the servers ini to
enable/disable the storing of replays but there is no code that uses
that variable.  At one time there was but in light of it being removed
some were along the line this add's the ability back in for server
owners to disable the storing of game replay data.

* Added code

* Moved store replay check

Moved the check for storing replay information into existing routine.

* Updated Per Request

Combined lines per request
2016-12-07 07:52:39 -05:00
woogerboy21andGitHub f86b9e0be7 Remedy connection type query at every login (#2298)
Fix #2285
This change adds an internal counter for each tcp/web socket connection
that the server makes and queries the stored memory count at login
rather than the previous way that quired the database during each login.
Each login that quired the DB put a significant load on the server as
the user base grew.
2016-12-07 01:35:35 -05:00
woogerboy21andZach H a6f1f4c01d Add enable/disable log query functionality (#2294)
* Add enable/disable log query functionality

This change adds the ability for server owners to allow log querying
from inside the client.  In the event the functionality is not allowed a
result is returned indicating the functionality is disabled.

* Added translation

Added the ability for the disabled messages to be translated.
2016-12-06 15:37:36 -05:00
woogerboy21andGitHub d039c9b6bd Add missing feature rememberance to client (#2275)
Fix #2249
Add the ability for the client to remember the missing features that it
received from the server it last connected to and not display the
"missing/optional feature" message at every login.
2016-11-29 15:50:00 -05:00
woogerboy21andctrlaltca f6e4ee9a4a Fix #2270 (#2271)
Fix #2270
Check userinfo first before trying to use it.
2016-11-09 14:40:18 +01:00
woogerboy21andGitHub 6962777ded Rework idle timeout, now server side (#2259)
* Server side idle timeout

Initial commit for server side idle timeout counter.  This adds a new
int value that is updated when room/game/mod/admin commands occur and is
checked during the regular ping timout function that if the users new
"idle" value exceeds the idleclienttimeout value defined in the servers
configuration file the user is logged out.  The user will receive a
warning at the 90% time frame mark about being idle.

* Use round instead of ceil

Travis fix for older xcode issue's.

* Fixed requested items

Mis-spelleed function, added header, added warning message sent check
value.  Also corrected the protobuf declaration file for
event_notifyuser

* Moved bool to protected

* Re-Ordered Declarations

* Removed most stylistic items

Resolved most noted things.

* Remove client side idle timeout

Removed client side idle timeout functionality
2016-11-08 22:18:12 -05:00
woogerboy21andZach H 1cebe030f6 Fix one to many zero's (#2260)
Looks like I typo'd the default value for the number of seconds in 1
hour for the default client side idle time out.  This fixes it.
2016-11-02 01:26:00 -04:00
woogerboy21andctrlaltca 21a34eaaa1 Cleanup server running variable information (#2239)
* Created first round of helper functions

Started to go through server init function and move statically defined
variables that the server uses into helper functions to allow for
dynamic changing while the server is up rather than requiring a restart.

* Completed Helper Function Creation

Completed adding all the helper functions along with updated the virtual
server function calls and renamed helper functions to match settings
cached ini value names for clarity.

* Comment Cleanup

Removed lines commented out throughout previous changes as well as
cleaned up variable declarations that are no longer needed with helper
functions that query the settingsCache

* Added featureset dynamic refreshing

Added slots/functions/calls for updating the required feature sets
dynamically.

* Created first round of helper functions

Started to go through server init function and move statically defined
variables that the server uses into helper functions to allow for
dynamic changing while the server is up rather than requiring a restart.
2016-10-31 10:30:12 +01:00
woogerboy21andZach H 63a4f147f4 Add client UI setting for idleclientdisconnect (#2244)
* Add client UI setting for idleclientdisconnect

Added disabled option in client UI for client disconnect.

* Updated settings text

Updated settings text for clarity.

* Updated descripton text (again)

Per request for clarity
2016-10-29 04:24:18 -04:00
woogerboy21andZach H f17a0da434 Added user privilege level (#2228)
* Update log path example when running under windows

Added example of log path syntax when running servatrice under windows.

* Missed example bra cket

* Added user privilege level

Added a enum column in the users table named "privilevel" with the
current values of "none", "vip", and "donator".  Also allowed anyone
with a higher privilege level than "none" to log in even if the server
is set to limit the user total and the user limit is reached.  This
change add's the new user information into the users container that gets
populated and passed between client and server.

* Added user privilege level

Added a enum column in the users table named "privilevel" with the
current values of "none", "vip", and "donator".  Also allowed anyone
with a higher privilege level than "none" to log in even if the server
is set to limit the user total and the user limit is reached.  This
change add's the new user information into the users container that gets
populated and passed between client and server.

* don't use corrected name when downloading card (#2164)

* Fix dynamic user limit settings

PR #2220 removed the ability to be able to change the max user limit
count while the server is running requiring a restart to make the
settings change.  This PR reverts the behavior back to how it operated
prior to the PR.

* Call class functions for consistency

Updated code to call functions for consistency.

* don't use corrected name when downloading card (#2164)

* Added user privilege level

Added a enum column in the users table named "privilevel" with the
current values of "none", "vip", and "donator".  Also allowed anyone
with a higher privilege level than "none" to log in even if the server
is set to limit the user total and the user limit is reached.  This
change add's the new user information into the users container that gets
populated and passed between client and server.

* Corrected Typo

Corrected typo in DB Migration Script

* Git fuckup?

* Added word column

Added the word column to migration script for backwards compatibility
2016-10-26 02:07:42 -04:00
woogerboy21andGitHub 1197c10a70 Merge pull request #2236 from woogerboy21/fix_dynamic_user_limit
Fix dynamic user limit settings
2016-10-25 18:04:56 -04:00
woogerboy21andGitHub 2dd7158802 Merge pull request #2227 from Cockatrice/servatricelogpathsyntaxexample
Update log path example when running under windows
2016-10-19 23:34:27 -04:00
woogerboy21andGitHub 32d2fa13f6 Missed example bra cket 2016-10-19 19:26:06 -04:00
woogerboy21andGitHub 05f90a74a4 Update log path example when running under windows
Added example of log path syntax when running servatrice under windows.
2016-10-19 19:24:44 -04:00
woogerboy21andGitHub 632a2db18e Merge pull request #2220 from woogerboy21/CleanupMaxUserCheck
Cleanup max user check at login
2016-10-17 09:38:30 -04:00
woogerboy21andGitHub a4b1a79cd4 Merge pull request #2195 from wincinderith/login-error-fix
Prevent login error handler being incorrectly called
2016-10-11 11:33:48 -04:00
woogerboy21andGitHub 89ceb889e0 Merge pull request #2209 from woogerboy21/inactivetimeout
Idle Client Timeout Functionality
2016-10-09 14:40:53 -04:00
woogerboy21andGitHub deb6d4dec6 Merge pull request #2111 from woogerboy21/fix_serv_sql_file
Corrected servatrice.sql file room table entries that were missed
2016-07-25 01:19:14 -04:00
woogerboy21andGitHub 569ae87cbe Merge pull request #2101 from woogerboy21/remove_news_table
Remove news table (cleanup)
2016-07-21 23:29:53 -04:00
woogerboy21andGitHub c04298fb43 Merge pull request #2087 from woogerboy21/client_id_nametoip_fix
Client id nametoip fix
2016-07-21 10:20:16 -04:00
woogerboy21andGitHub 8060c8f37b Merge pull request #2099 from woogerboy21/serverid_roomdbgtable_fix
Servatrice rooms table respect Server ID
2016-07-21 09:54:20 -04:00
woogerboy21 0b8f52e084 Merge pull request #1836 from Cockatrice/mysql57update
Added MySQL 5.7 lib path to servatrice CMAKE
2016-02-28 17:48:09 -05:00
woogerboy21 3ba3f1e2a7 Added MySQL 5.7 lib path to servatrice CMAKE
Added default search path for most recent version of MySQL
2016-02-27 15:13:59 -05:00
woogerboy21 108ec145b7 Merge pull request #1604 from woogerboy21/mod_notify_onbanwarn
Re-Implemented the moderator notification upon user warning/ban
2016-02-22 09:02:39 -05:00
woogerboy21 93d4f78715 Merge pull request #1803 from Cockatrice/replay-maint-update
Update replay maintenance script
2016-02-10 15:16:41 -05:00
woogerboy21 8f819dfa66 Update replay maintenance script
Update the replay maintenance script to allow for rolling replay maintenance along with cleanup of the two associated db tables (replay access and games).  This updated script will now allow players to see the past X days (8 by default) of replays rather than loosing all replays from the point in the the script gets run.
2016-02-10 10:53:18 -05:00
woogerboy21 cd02df78a1 Merge pull request #1627 from ctrlaltca/no_jom_no_cry
Fix appveyor builds
2015-10-05 15:13:43 -04:00
woogerboy21 9c4bd8ebed Merge pull request #1593 from woogerboy21/remove_mod_notify
Crash Fix: Removed mod notification code that causes crashes
2015-09-26 23:36:50 -04:00
woogerboy21 c1663d578a Merge pull request #1588 from Cockatrice/servatrice.sql_warntable_syntaxfix
Corrected mod_name column syntax in warnings table
2015-09-25 18:40:09 -04:00
woogerboy21 7a4cabaf67 Corrected mod_name column syntax in warnings table
It was missing a comma at the end of the line.
2015-09-25 18:19:44 -04:00
woogerboy21 291b262b64 Merge pull request #1569 from woogerboy21/correct_warn_schema
Updated cockatrice_warnings table to use id column as primary key
2015-09-25 08:09:56 -04:00
woogerboy21 cd7b25f712 Fix #1542
This should fix #1542 (please test)
2015-09-22 01:19:31 -04:00
woogerboy21 dd4900b038 Merge pull request #1471 from ctrlaltca/deckeditor_theme_cardback
get cardback image from theme
2015-09-06 08:25:48 -04:00
woogerboy21 15e8121cf2 Merge pull request #1468 from woogerboy21/fix_old_gcc
Fix older gcc nested pre-def with portable builds
2015-09-05 18:01:31 -04:00
woogerboy21 13e536013e Merge pull request #1442 from woogerboy21/fix_oldsession
Fix bug that crashes server when old session is logged out during login
2015-08-30 23:51:33 -04:00
woogerboy21 8bb6bb04d7 Merge pull request #1441 from woogerboy21/fix_check
Fix ban issue
2015-08-30 19:45:04 -04:00
woogerboy21 fdea69cfed Merge pull request #1421 from woogerboy21/fix_proto_warnings
Corrected proto warnings & spacing
2015-08-26 08:22:50 -04:00
woogerboy21 7453385903 Merge pull request #1417 from woogerboy21/send_clientver
Extend the login protocol to send the client version (as optional)
2015-08-24 11:54:04 -04:00
woogerboy21 2a0197a7ab Merge pull request #2 from Cockatrice/admin_adjustmods
Address PR feedback
2015-08-21 23:08:29 -04:00
woogerboy21 1ef9041815 Merge pull request #1389 from Cockatrice/schema_level_correction
Corrected miss-matched schema versions
2015-08-18 08:04:29 -04:00
woogerboy21 65635bcdd8 Corrected miss-matched schema versions
Schema version should be 7 (not 6) for current commit level.  Not sure exactly why it wasn't updated.
2015-08-18 07:40:12 -04:00
woogerboy21 487cbb23cb Merge pull request #1379 from woogerboy21/room_userlevel
Add permission levels to rooms
2015-08-16 08:57:34 -04:00
woogerboy21 5634b564e8 Merge pull request #1378 from woogerboy21/last_login
Add last_login column to user table and populate upon login
2015-08-15 20:24:18 -04:00
woogerboy21 0f4dc18074 Merge pull request #1374 from woogerboy21/ban_by_clientid
Ban by client ID
2015-08-14 11:25:01 -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 de1b925b7d Merge pull request #1352 from Cockatrice/nonreg_nodbserver_fix
#1351 Fix
2015-08-09 15:25:14 -04:00
woogerboy21 5fc0da6ab9 #1351 Fix
This update address's the issue were a server with no db has only non-registered users but when creating a game will cause the dialogue to only allow the check box of "registered users only" resulting in a game that no user will ever be able to join.
2015-08-09 15:07:30 -04:00
woogerboy21 90381aa38f Merge pull request #1350 from woogerboy21/showmoreinfo_logincontexterror
Update Error 11 Clarity
2015-08-09 14:02:34 -04:00
woogerboy21 f4942d1ea7 Merge pull request #1346 from woogerboy21/regonly_server_refactor
Reg only server cleanup
2015-08-09 13:57:17 -04:00
woogerboy21 1f22f1743c Merge pull request #1348 from woogerboy21/fix_clientid_dbmigration
Add database migration script for client id
2015-08-09 09:19:12 -04:00
woogerboy21 644ea0482f Merge pull request #1347 from woogerboy21/fix_clientid_localgame
Fix local game not starting properly.
2015-08-08 17:33:34 -04:00
woogerboy21 129a6983ed Merge pull request #1345 from Cockatrice/login-error-message
Add more informative message on unrecognized login response
2015-08-08 11:12:50 -04:00
woogerboy21 c64bc3fb81 Merge pull request #1344 from woogerboy21/clientid_commit_res
Commit to resolve requests made by @Daenyth discussed after the commit.
2015-08-08 09:23:21 -04:00
woogerboy21 62dc3a7ca3 Merge pull request #1342 from marcofernandezheras/CardInfoLayout
Deck Editor layout
2015-08-08 08:28:12 -04:00
woogerboy21 ba90d84a13 Merge pull request #1340 from woogerboy21/clientid
Client ID Generation
2015-08-06 14:17:06 -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 51d12f3ed6 Merge pull request #1259 from woogerboy21/update_servatrice_scripts
Script Cleanup
2015-07-14 15:33:11 -04:00
woogerboy21 d2af7ff99e Merge pull request #1254 from ZeldaZach/fix_1248
require pass & email confirmation
2015-07-14 15:21:35 -04:00
woogerboy21 f1cafa0609 Merge pull request #1258 from woogerboy21/servatrice_remove_pcconsoleecho
Removed Player Count Debug Line
2015-07-14 09:57:24 -04:00
woogerboy21 d91bbcfbce Removed Player Count Debug Line
Removed the output put to console for every logged in user.  It just cluttered things up.
2015-07-14 08:54:05 -04:00
woogerboy21 8a0fdd2089 Merge pull request #1252 from woogerboy21/max_player_limit
Servatrice: Restrict the total number of users able to connect (Max User Limit)
2015-07-13 18:20:19 -04:00
woogerboy21 aa540f7968 Merge pull request #1240 from woogerboy21/db_backup_scripts
Update DB Scripts
2015-07-13 13:51:08 -04:00
woogerboy21 ea40db972d Merge pull request #1244 from woogerboy21/multi_server_sessions_update
Multi Server Session Functionality
2015-07-13 13:12:27 -04:00
woogerboy21 a14a642b2b Merge pull request #1181 from ctrlaltca/servatrice_reload_config
Servatrice: refactor signal handling and permit config reloading
2015-07-03 12:29:12 -04:00
woogerboy21 304835c526 Activation Email Misspelling
Corrected the misspelling of the word "activating' in the servatrice.ini example file.
2015-06-29 17:05:48 -04:00