3 files changed
+18
-17
No files matched your search
@@ -357,7 +357,7 @@ namespace Vocaluxe.Base
|
|||||||
|
|
||||||
public static bool IsProfileIDValid(Guid profileID)
|
public static bool IsProfileIDValid(Guid profileID)
|
||||||
{
|
{
|
||||||
return _Profiles.ContainsKey(profileID);
|
return profileID != Guid.Empty && _Profiles.ContainsKey(profileID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool IsAvatarIDValid(int avatarID)
|
public static bool IsAvatarIDValid(int avatarID)
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ namespace Vocaluxe.Base.Server
|
|||||||
{
|
{
|
||||||
Guid sessionKey = _GetSession();
|
Guid sessionKey = _GetSession();
|
||||||
|
|
||||||
if (profile.ProfileId != Guid.Empty) //-1 is the id for a new profile
|
if (profile.ProfileId != Guid.Empty) //Guid.Empty is the id for a new profile
|
||||||
{
|
{
|
||||||
if (CSessionControl.GetUserIdFromSession(sessionKey) != profile.ProfileId
|
if (CSessionControl.GetUserIdFromSession(sessionKey) != profile.ProfileId
|
||||||
&& !(_CheckRight(EUserRights.EditAllProfiles)))
|
&& !(_CheckRight(EUserRights.EditAllProfiles)))
|
||||||
|
|||||||
+16
-15
@@ -1,6 +1,7 @@
|
|||||||
/// <reference path="../index.html" />
|
/// <reference path="../index.html" />
|
||||||
/// <reference path="../index.html" />
|
/// <reference path="../index.html" />
|
||||||
(function () {
|
(function () {
|
||||||
|
var PROFILE_NULL_ID = '00000000-0000-0000-0000-000000000000';
|
||||||
var imageLoader;
|
var imageLoader;
|
||||||
var translator;
|
var translator;
|
||||||
var pageHandler;
|
var pageHandler;
|
||||||
@@ -192,8 +193,8 @@
|
|||||||
var t = this;
|
var t = this;
|
||||||
|
|
||||||
this.customSelectPlaylistSongCallback = null;
|
this.customSelectPlaylistSongCallback = null;
|
||||||
this.profileIdRequest = -1;
|
this.profileIdRequest = PROFILE_NULL_ID;
|
||||||
this.songIdRequest = -1;
|
this.songIdRequest = PROFILE_NULL_ID;
|
||||||
|
|
||||||
this.init = function () {
|
this.init = function () {
|
||||||
replaceTransitionHandler();
|
replaceTransitionHandler();
|
||||||
@@ -207,8 +208,8 @@
|
|||||||
|
|
||||||
this.reset = function () {
|
this.reset = function () {
|
||||||
t.customSelectPlaylistSongCallback = null;
|
t.customSelectPlaylistSongCallback = null;
|
||||||
t.profileIdRequest = -1;
|
t.profileIdRequest = PROFILE_NULL_ID;
|
||||||
t.songIdRequest = -1;
|
t.songIdRequest = PROFILE_NULL_ID;
|
||||||
};
|
};
|
||||||
|
|
||||||
var replaceTransitionHandler = function () {
|
var replaceTransitionHandler = function () {
|
||||||
@@ -251,7 +252,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (sessionHandler.sessionId != "") {
|
if (sessionHandler.sessionId != "") {
|
||||||
if (sessionHandler.ownProfileId != -1) {
|
if (sessionHandler.ownProfileId != PROFILE_NULL_ID) {
|
||||||
$.mobile.changePage("#main", { transition: "slidefade" });
|
$.mobile.changePage("#main", { transition: "slidefade" });
|
||||||
} else {
|
} else {
|
||||||
request({
|
request({
|
||||||
@@ -297,8 +298,8 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
$('#registerButton').click(function () {
|
$('#registerButton').click(function () {
|
||||||
sessionHandler.ownProfileId = -1;
|
sessionHandler.ownProfileId = PROFILE_NULL_ID;
|
||||||
pageHandler.profileIdRequest = -1;
|
pageHandler.profileIdRequest = PROFILE_NULL_ID;
|
||||||
$.mobile.changePage("#displayProfile", { transition: "slidefade" });
|
$.mobile.changePage("#displayProfile", { transition: "slidefade" });
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
@@ -549,7 +550,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
var pagebeforeshowDisplayProfile = function () {
|
var pagebeforeshowDisplayProfile = function () {
|
||||||
if (pageHandler.profileIdRequest >= 0) {
|
if (pageHandler.profileIdRequest != PROFILE_NULL_ID) {
|
||||||
var promise = request({
|
var promise = request({
|
||||||
url: "getProfile?profileId=" + pageHandler.profileIdRequest
|
url: "getProfile?profileId=" + pageHandler.profileIdRequest
|
||||||
}).done(function (result) {
|
}).done(function (result) {
|
||||||
@@ -596,7 +597,7 @@
|
|||||||
"Difficulty": 0,
|
"Difficulty": 0,
|
||||||
"IsEditable": true,
|
"IsEditable": true,
|
||||||
"PlayerName": i18n.t("YourName") || "YourName",
|
"PlayerName": i18n.t("YourName") || "YourName",
|
||||||
"ProfileId": -1,
|
"ProfileId": PROFILE_NULL_ID,
|
||||||
"Type": 1
|
"Type": 1
|
||||||
});
|
});
|
||||||
$('#playerType').prop("value", 0);
|
$('#playerType').prop("value", 0);
|
||||||
@@ -605,7 +606,7 @@
|
|||||||
$('#playerSaveButton').click(function () {
|
$('#playerSaveButton').click(function () {
|
||||||
var dataToUpload = {};
|
var dataToUpload = {};
|
||||||
|
|
||||||
dataToUpload["ProfileId"] = -1;
|
dataToUpload["ProfileId"] = PROFILE_NULL_ID;
|
||||||
dataToUpload["PlayerName"] = $('#playerName').prop("value");
|
dataToUpload["PlayerName"] = $('#playerName').prop("value");
|
||||||
dataToUpload["Type"] = $('#playerType').prop("value");
|
dataToUpload["Type"] = $('#playerType').prop("value");
|
||||||
dataToUpload["Difficulty"] = $('#playerDifficulty').prop("value");
|
dataToUpload["Difficulty"] = $('#playerDifficulty').prop("value");
|
||||||
@@ -738,7 +739,7 @@
|
|||||||
$('#selectUserAdminList').children().remove();
|
$('#selectUserAdminList').children().remove();
|
||||||
|
|
||||||
function handleSelectUserAdminLineClick(e) {
|
function handleSelectUserAdminLineClick(e) {
|
||||||
pageHandler.profileIdRequest = parseInt(e.currentTarget.id.replace("SelectUserAdminLine_", ""));
|
pageHandler.profileIdRequest = e.currentTarget.id.replace("SelectUserAdminLine_", "");
|
||||||
$.mobile.changePage("#displayUserAdmin", { transition: "slidefade" });
|
$.mobile.changePage("#displayUserAdmin", { transition: "slidefade" });
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1190,7 +1191,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function SessionHandler() {
|
function SessionHandler() {
|
||||||
this.ownProfileId = -1;
|
this.ownProfileId = PROFILE_NULL_ID;
|
||||||
this.sessionId = "";
|
this.sessionId = "";
|
||||||
this.serverBaseAddress = "";
|
this.serverBaseAddress = "";
|
||||||
|
|
||||||
@@ -1204,7 +1205,7 @@
|
|||||||
request({
|
request({
|
||||||
url: "logout"
|
url: "logout"
|
||||||
}, "noOverlay").always(function () {
|
}, "noOverlay").always(function () {
|
||||||
t.ownProfileId = -1;
|
t.ownProfileId = PROFILE_NULL_ID;
|
||||||
|
|
||||||
t.sessionId = "";
|
t.sessionId = "";
|
||||||
|
|
||||||
@@ -1219,8 +1220,8 @@
|
|||||||
|
|
||||||
|
|
||||||
var checkSession = function () {
|
var checkSession = function () {
|
||||||
if (t.ownProfileId == -1
|
if (t.ownProfileId == PROFILE_NULL_ID
|
||||||
&& pageHandler.profileIdRequest == -1
|
&& pageHandler.profileIdRequest == PROFILE_NULL_ID
|
||||||
&& ($.mobile.activePage.attr("id") == "displayProfile" || $.mobile.activePage.attr("id") == "login")) {
|
&& ($.mobile.activePage.attr("id") == "displayProfile" || $.mobile.activePage.attr("id") == "login")) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user