ruby: deleting uid cookie

This commit is contained in:
Vladimir Kurguzov
2022-11-15 10:55:02 +03:00
parent 93accdac7c
commit dd0c049a70
3 changed files with 29 additions and 18 deletions

View File

@ -17,11 +17,13 @@
*/
var directUrl;
var userId;
if (typeof jQuery != "undefined") {
jq = jQuery.noConflict();
directUrl = getUrlVars()["directUrl"] == "true";
userId = getUrlVars()["userId"];
mustReload = false;
@ -29,11 +31,20 @@ if (typeof jQuery != "undefined") {
jq("#directUrl").prop("checked", directUrl);
else
directUrl = jq("#directUrl").prop("checked");
jq("#directUrl").change(function() {
window.location = "?directUrl=" + jq(this).prop("checked");
window.location = "?directUrl=" + jq(this).prop("checked") + "&userId=" + userId;
});
if ("" != userId && undefined != userId)
jq("#user").val();
else
userId = jq("#user").val();
jq("#user").change(function() {
window.location = "?directUrl=" + directUrl + "&userId=" + jq(this).val();
});
jq(function () {
jq('#fileupload').fileupload({
dataType: 'json',
@ -199,14 +210,10 @@ if (typeof jQuery != "undefined") {
document.cookie = name + "=" + value + "; expires=" + new Date(Date.now() + 1000 * 60 * 60 * 24 * 7).toUTCString(); //week
}
var userId = getCookie("uid");
if (userId) userSel.val(userId);
var langId = getCookie("ulang");
if (langId) langSel.val(langId);
userSel.on("change", function () {
setCookie("uid", userSel.val());
});
langSel.on("change", function () {
setCookie("ulang", langSel.val());
});
@ -231,7 +238,7 @@ if (typeof jQuery != "undefined") {
jq(document).on("click", "#beginEdit:not(.disable)", function () {
var fileId = encodeURIComponent(jq('#hiddenFileName').val());
var url = UrlEditor + "?fileName=" + fileId + "&directUrl=" + directUrl;
var url = UrlEditor + "?fileName=" + fileId + "&directUrl=" + directUrl + "&userId=" + userId;
window.open(url, "_blank");
jq('#hiddenFileName').val("");
jq.unblockUI();
@ -239,7 +246,7 @@ if (typeof jQuery != "undefined") {
jq(document).on("click", "#beginView:not(.disable)", function () {
var fileId = encodeURIComponent(jq('#hiddenFileName').val());
var url = UrlEditor + "?editorsMode=view&fileName=" + fileId + "&directUrl=" + directUrl;
var url = UrlEditor + "?editorsMode=view&fileName=" + fileId + "&directUrl=" + directUrl + "&userId=" + userId;
window.open(url, "_blank");
jq('#hiddenFileName').val("");
jq.unblockUI();
@ -247,7 +254,7 @@ if (typeof jQuery != "undefined") {
jq(document).on("click", "#beginEmbedded:not(.disable)", function () {
var fileId = encodeURIComponent(jq('#hiddenFileName').val());
var url = UrlEditor + "?editorsType=embedded&editorsMode=embedded&fileName=" + fileId + "&directUrl=" + directUrl;
var url = UrlEditor + "?editorsType=embedded&editorsMode=embedded&fileName=" + fileId + "&directUrl=" + directUrl + "&userId=" + userId;
jq("#mainProgress").addClass("embedded");
jq("#beginEmbedded").addClass("disable");
@ -269,6 +276,9 @@ if (typeof jQuery != "undefined") {
if (jq("#createSample").is(":checked")) {
url += "&sample=true";
}
if (userId != "" && userId != undefined) {
url += "&userId=" + userId;
}
var w = window.open(url, "_blank");
w.onload = function () {
window.location.reload();

View File

@ -24,8 +24,7 @@ class HomeController < ApplicationController
def editor
DocumentHelper.init(request.remote_ip, request.base_url)
user = Users.get_user(cookies[:uid])
user = Users.get_user(params[:userId])
@file = FileModel.new(:file_name => File.basename(params[:fileName]), :mode => params[:editorsMode], :type => params[:editorsType], :user_ip => request.remote_ip, :lang => cookies[:ulang], :user => user, :action_data => params[:actionLink], :direct_url => params[:directUrl])
end
@ -34,10 +33,9 @@ class HomeController < ApplicationController
def sample
DocumentHelper.init(request.remote_ip, request.base_url)
user = Users.get_user(cookies[:uid])
user = Users.get_user(params[:userId])
file_name = DocumentHelper.create_demo(params[:fileExt], params[:sample], user)
redirect_to :controller => 'home', :action => 'editor', :fileName => file_name
redirect_to :controller => 'home', :action => 'editor', :fileName => file_name, :userId => user.id
end
@ -73,7 +71,7 @@ class HomeController < ApplicationController
end
# create file meta information
user = Users.get_user(cookies[:uid])
user = Users.get_user(params[:userId])
DocumentHelper.create_meta(file_name, user.id, user.name, nil)
@ -134,7 +132,7 @@ class HomeController < ApplicationController
end
file_name = correct_name
user = Users.get_user(cookies[:uid])
user = Users.get_user(params[:userId])
DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file
end
@ -335,7 +333,7 @@ class HomeController < ApplicationController
File.open(DocumentHelper.storage_path(file_name, nil), 'wb') do |file|
file.write(data)
end
user = Users.get_user(cookies[:uid])
user = Users.get_user(params[:userId])
DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file
render plain: '{"file" : "' + file_name + '"}'

View File

@ -96,6 +96,7 @@
DocumentHelper.init(request.remote_ip, request.base_url)
docs = DocumentHelper.get_stored_files(nil)
directUrl = request.params[:directUrl]
userId = request.params[:userId]
%>
<div class="main-panel">
<div id="portal-info" style="display: <%= docs.length > 0 ? "none" : "table-cell" %>">
@ -137,7 +138,9 @@
<%
docs.each { |d|
isFillFormDoc = DocumentHelper.fill_forms_exts.include?(File.extname(d).downcase)
editUrl = directUrl == nil ? "editor?fileName=#{ERB::Util.url_encode(d)}" : "editor?fileName=#{ERB::Util.url_encode(d)}&directUrl=#{directUrl}"
userIdParam = userId == nil ? "" : "&userId=#{userId}";
directUrlParam = directUrl == nil ? "" : "&directUrl=#{directUrl}";
editUrl = "editor?fileName=#{ERB::Util.url_encode(d)}" + directUrlParam + userIdParam;
docType = FileUtility.get_file_type(d)
canEdit = DocumentHelper.edited_exts.include?(File.extname(d).downcase) %>
<tr class="tableRow" title="<%= d %> [<%= DocumentHelper.get_file_version(DocumentHelper.history_dir(DocumentHelper.storage_path(d, nil))) %>]">