diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-11-18 19:12:25 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-18 19:12:25 +1300 |
| commit | 3eca9acd6e6a160df8f7b86150429c3d7c09b0c3 (patch) | |
| tree | cb8bc7293a5c3fbac7f5e7557c73baded57109d8 /setup | |
| parent | f04881e56938315867a97db2027d58f27f7a20fd (diff) | |
| parent | f35da3ffdf6f960a877149b72b819a1979c9395a (diff) | |
| download | trackermap-server-3eca9acd6e6a160df8f7b86150429c3d7c09b0c3.tar.gz trackermap-server-3eca9acd6e6a160df8f7b86150429c3d7c09b0c3.tar.bz2 trackermap-server-3eca9acd6e6a160df8f7b86150429c3d7c09b0c3.zip | |
Merge pull request #2548 from tananaev/users
Add user expiration and device limit
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/default.xml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/setup/default.xml b/setup/default.xml index f50f3904f..a9d7684d4 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -62,8 +62,8 @@ </entry> <entry key='database.insertUser'> - INSERT INTO users (name, email, hashedPassword, salt, admin, map, distanceUnit, speedUnit, latitude, longitude, zoom, twelveHourFormat, attributes) - VALUES (:name, :email, :hashedPassword, :salt, :admin, :map, :distanceUnit, :speedUnit, :latitude, :longitude, :zoom, :twelveHourFormat, :attributes) + INSERT INTO users (name, email, hashedPassword, salt, admin, map, distanceUnit, speedUnit, latitude, longitude, zoom, twelveHourFormat, coordinateFormat, disabled, expirationTime, deviceLimit, attributes) + VALUES (:name, :email, :hashedPassword, :salt, :admin, :map, :distanceUnit, :speedUnit, :latitude, :longitude, :zoom, :twelveHourFormat, :coordinateFormat, :disabled, :expirationTime, :deviceLimit, :attributes) </entry> <entry key='database.updateUser'> @@ -78,6 +78,10 @@ longitude = :longitude, zoom = :zoom, twelveHourFormat = :twelveHourFormat, + coordinateFormat = :coordinateFormat, + disabled = :disabled, + expirationTime = :expirationTime, + deviceLimit = :deviceLimit, attributes = :attributes WHERE id = :id </entry> |