diff --git a/app/controllers/admin/site_panel_controller.rb b/app/controllers/admin/site_panel_controller.rb index bd642cc..330a6d9 100644 --- a/app/controllers/admin/site_panel_controller.rb +++ b/app/controllers/admin/site_panel_controller.rb @@ -146,7 +146,7 @@ class Admin::SitePanelController < OrbitAdminController elsif params[:type] == 'detect_sites' extra_text = "" if params[:key].present? - extra_text = "[#{params[:key].gsub(/[\(\)\[\]]/){|ff| "\\"+ff }}]" + extra_text = "['#{params[:key].gsub(/[\(\)\[\]]/){|ff| "\\"+ff }}']" end Thread.new do system("bundle exec rake create_site:detect_sites#{extra_text}") diff --git a/lib/tasks/change_site_cert.rake b/lib/tasks/change_site_cert.rake index e8e64e1..4255e7e 100644 --- a/lib/tasks/change_site_cert.rake +++ b/lib/tasks/change_site_cert.rake @@ -155,7 +155,7 @@ namespace :create_site do if output.include?("sudo:") && output.include?("command not found") output = session.exec!(command) end - return output + return output.encode!("UTF-8", :invalid => :replace, :undef => :replace, :replace => '') end def auto_update_infos(info) if @is_multithread diff --git a/lib/tasks/change_site_server_name.rake b/lib/tasks/change_site_server_name.rake index e1a92b9..98b96ac 100644 --- a/lib/tasks/change_site_server_name.rake +++ b/lib/tasks/change_site_server_name.rake @@ -46,6 +46,6 @@ namespace :create_site do if output.include?("sudo:") && output.include?("command not found") output = session.exec!(command) end - return output + return output.encode!("UTF-8", :invalid => :replace, :undef => :replace, :replace => '') end end \ No newline at end of file diff --git a/lib/tasks/copy_site.rake b/lib/tasks/copy_site.rake index ca817db..508578c 100644 --- a/lib/tasks/copy_site.rake +++ b/lib/tasks/copy_site.rake @@ -136,7 +136,7 @@ namespace :create_site do if output.include?("sudo:") && output.include?("command not found") output = session.exec!(command) end - return output + return output.encode!("UTF-8", :invalid => :replace, :undef => :replace, :replace => '') end def update_thread_infos_for_exec(info,update_last=false) if update_last diff --git a/lib/tasks/create_site.rake b/lib/tasks/create_site.rake index 5d49ae5..f1e78b1 100644 --- a/lib/tasks/create_site.rake +++ b/lib/tasks/create_site.rake @@ -88,7 +88,7 @@ namespace :create_site do if output.include?("sudo:") && output.include?("command not found") output = session.exec!(command) end - return output + return output.encode!("UTF-8", :invalid => :replace, :undef => :replace, :replace => '') end def update_thread_infos_for_exec(info,update_last=false) if update_last diff --git a/lib/tasks/delete_dbs.rake b/lib/tasks/delete_dbs.rake index 3152aa9..473bd0c 100644 --- a/lib/tasks/delete_dbs.rake +++ b/lib/tasks/delete_dbs.rake @@ -32,7 +32,7 @@ namespace :create_site do if output.include?("sudo:") && output.include?("command not found") output = session.exec!(command) end - return output + return output.encode!("UTF-8", :invalid => :replace, :undef => :replace, :replace => '') end def update_infos(info) puts info diff --git a/lib/tasks/detect_sites.rake b/lib/tasks/detect_sites.rake index 75ec0b0..bee5ca3 100644 --- a/lib/tasks/detect_sites.rake +++ b/lib/tasks/detect_sites.rake @@ -171,7 +171,7 @@ namespace :create_site do if output.include?("sudo:") && output.include?("command not found") output = session.exec!(command) end - return output + return output.encode!("UTF-8", :invalid => :replace, :undef => :replace, :replace => '') end def update_thread_infos(info) puts info diff --git a/lib/tasks/exec_command.rake b/lib/tasks/exec_command.rake index efb899c..b95c9e0 100644 --- a/lib/tasks/exec_command.rake +++ b/lib/tasks/exec_command.rake @@ -154,7 +154,7 @@ namespace :exec_commands do if output.include?("sudo:") && output.include?("command not found") output = session.exec!(command) end - return output + return output.encode!("UTF-8", :invalid => :replace, :undef => :replace, :replace => '') end def update_infos_for_exec(info,update_last=false,update_array=false) return if @site_construct.nil? diff --git a/lib/tasks/test_vpn.rake b/lib/tasks/test_vpn.rake index 3ae8e74..5632886 100644 --- a/lib/tasks/test_vpn.rake +++ b/lib/tasks/test_vpn.rake @@ -37,7 +37,7 @@ namespace :create_site do if output.include?("sudo:") && output.include?("command not found") output = session.exec!(command) end - return output + return output.encode!("UTF-8", :invalid => :replace, :undef => :replace, :replace => '') end def update_thread_infos(info) puts info diff --git a/lib/tasks/update_multiple_nginx_setting.rake b/lib/tasks/update_multiple_nginx_setting.rake index 6bac19b..3b20187 100644 --- a/lib/tasks/update_multiple_nginx_setting.rake +++ b/lib/tasks/update_multiple_nginx_setting.rake @@ -57,7 +57,7 @@ namespace :create_site do if output.include?("sudo:") && output.include?("command not found") output = session.exec!(command) end - return output + return output.encode!("UTF-8", :invalid => :replace, :undef => :replace, :replace => '') end def update_thread_infos(info) puts info