From 69efffaa7734dd6187fed368cab73da695d7545d Mon Sep 17 00:00:00 2001
From: thomasfire <tomasfire@live.com>
Date: Sun, 9 Jan 2022 03:28:05 +0300
Subject: [PATCH] Multiple fixes - now charts and other functions are working
 properly. Added small icon and favicon.

Signed-off-by: thomasfire <tomasfire@live.com>
---
 Cargo.toml                                 |   2 +-
 src/autoban_service.rs                     |   8 ++++++--
 src/dashboard.rs                           |  18 ++++++++++++------
 src/file_device.rs                         |   5 ++++-
 src/printer_device.rs                      |   2 +-
 src/server.rs                              |  21 +++++++++++++++++++--
 src/stat_device.rs                         |   7 ++++---
 static/favicon16.png                       | Bin 0 -> 1547 bytes
 static/favicon32.png                       | Bin 0 -> 2412 bytes
 static/login.html                          |   3 +++
 static/login_success.html                  |   2 ++
 static/main.html                           |   3 +++
 static/webify.png                          | Bin 0 -> 5851 bytes
 templates/dashboard.hbs                    |   3 +++
 templates/json/chart_cmd_cross_user.hjs    |  10 +++++-----
 templates/json/chart_command.hjs           |  10 +++++-----
 templates/json/chart_device.hjs            |  10 +++++-----
 templates/json/chart_device_cross_user.hjs |  10 +++++-----
 templates/json/chart_user.hjs              |  10 +++++-----
 templates/stat_chart.hbs                   |   4 ++--
 templates/stat_cross_chart.hbs             |   4 ++--
 templates/stat_status.hbs                  |  10 +++++-----
 templates/upload.hbs                       |   2 ++
 23 files changed, 94 insertions(+), 50 deletions(-)
 create mode 100644 static/favicon16.png
 create mode 100644 static/favicon32.png
 create mode 100644 static/webify.png

diff --git a/Cargo.toml b/Cargo.toml
index f5c152a..9e23415 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webify"
-version = "0.6.0-dev"
+version = "0.6.0-beta"
 authors = ["thomasfire <tomasfire@live.com>"]
 edition = "2018"
 
diff --git a/src/autoban_service.rs b/src/autoban_service.rs
index d02dd8d..53456fe 100644
--- a/src/autoban_service.rs
+++ b/src/autoban_service.rs
@@ -23,7 +23,11 @@ fn perform_autoban(database: &Database, period_to_view: u32, anomaly_f: f64) ->
 
     debug!("Attempting to ban: `{}`", to_ban.join(", "));
 
-    database.update_users_ban(&to_ban)
+    if to_ban.len() > 0 {
+        database.update_users_ban(&to_ban)
+    } else {
+        Ok(())
+    }
 }
 
 pub fn run_autoban_svc(database: &Database, config: &Config) {
@@ -40,7 +44,7 @@ pub fn run_autoban_svc(database: &Database, config: &Config) {
             let res = perform_autoban(&db_copy, period_view, anomaly_f);
             match res {
                 Ok(_) => info!("Autoban successfully made a round"),
-                Err(err) => error!("Error occured in autoban: {}", err)
+                Err(err) => error!("Error occurred in autoban: {}", err)
             };
             thread::sleep(Duration::from_secs(period as u64));
         }
diff --git a/src/dashboard.rs b/src/dashboard.rs
index 8237c0b..325414f 100644
--- a/src/dashboard.rs
+++ b/src/dashboard.rs
@@ -80,7 +80,7 @@ impl Dispatch {
             file_device: filer,
             root_device: RootDev::new(database),
             blog_device: BlogDevice::new(&config.redis_config, database, config.use_scraper),
-            stat_device: StatDevice::new(database, config)
+            stat_device: StatDevice::new(database, config),
         }
     }
 
@@ -180,7 +180,7 @@ fn get_available_info(dasher: &DashBoard<'_>, username: &str, device: &str) -> j
         qtype: "S".to_string(),
         group: "rstatus".to_string(),
         username: username.to_string(),
-        command: "".to_string(),
+        command: "rstatus".to_string(),
         payload: "".to_string(),
     };
 
@@ -234,7 +234,10 @@ pub async fn dashboard_page(id: Identity, info: web::Path<String>, mdata: web::D
     match mdata.templater.render_template("dashboard.hbs",
                                           &json!({
                                               "devices": mdata.database.get_user_devices(&user).unwrap_or(vec![]),
-                                              "err": match &inner_template{Ok(_) => "", Err(err) => err},
+                                              "err": match inner_info.get("err") {
+                                                  Some(v) => v.as_str().unwrap_or(""),
+                                                  None => match &inner_template{Ok(_) => "", Err(err) => err}
+                                              },
                                               "subpage": match &inner_template{Ok(data) => data, Err(_) => ""}
                                             })) {
         Ok(data) => Ok(HttpResponse::Ok().content_type("text/html; charset=utf-8").body(data)),
@@ -268,7 +271,7 @@ pub async fn dashboard_page_req(id: Identity, info: web::Path<String>,
     }
 
     let (inner_info, reject) = match mdata.dispatch(&user, info.as_str(), form.0.clone()) {
-        Ok(d) => (d, RejectReason::Ok as i32) ,
+        Ok(d) => (d, RejectReason::Ok as i32),
         Err(e) => (json!({"err": format!("Error on getting the available info: {}", e)}), RejectReason::NoAuth as i32)
     };
     match mdata.database.insert_history(&user, info.as_str(), &form.0.command, &form.0.qtype, reject) {
@@ -279,7 +282,10 @@ pub async fn dashboard_page_req(id: Identity, info: web::Path<String>,
     match mdata.templater.render_template("dashboard.hbs",
                                           &json!({
                                               "devices": mdata.database.get_user_devices(&user).unwrap_or(vec![]),
-                                              "err": match &inner_template{Ok(_) => "", Err(err) => err},
+                                              "err": match inner_info.get("err") {
+                                                  Some(v) => v.as_str().unwrap_or(""),
+                                                  None => match &inner_template{Ok(_) => "", Err(err) => err}
+                                              },
                                               "subpage": match &inner_template{Ok(data) => data, Err(_) => ""}
                                             })) {
         Ok(data) => Ok(HttpResponse::Ok().content_type("text/html; charset=utf-8").body(data)),
@@ -319,7 +325,7 @@ pub async fn file_sender(id: Identity, info: web::Path<String>, mdata: web::Data
                 Ok(htmld) => return Ok(HttpResponse::BadRequest().body(htmld)),
                 Err(err) => {
                     error!("Error on rendering template: {}", err);
-                    return Ok(HttpResponse::InternalServerError().body("Internal error")) }
+                    return Ok(HttpResponse::InternalServerError().body("Internal error")); }
             }
         }
     };
diff --git a/src/file_device.rs b/src/file_device.rs
index a26177e..5079af3 100644
--- a/src/file_device.rs
+++ b/src/file_device.rs
@@ -148,7 +148,10 @@ impl FileDevice {
     fn get_list(&self, username: &str, payload: &str) -> Result<jsVal, String> {
         let filepath = format!("{}/{}", &self.storage, username);
         if !exists(&filepath) {
-            return Err("No container was found".to_string());
+            match fs::create_dir(&filepath) {
+                Ok(_) => (),
+                Err(err) => return Err(format!("No container was found and couldn't create new: {:?}", err))
+            };
         }
         if payload.contains("..") {
             return Err("Bad request".to_string());
diff --git a/src/printer_device.rs b/src/printer_device.rs
index ae9cf13..b475202 100644
--- a/src/printer_device.rs
+++ b/src/printer_device.rs
@@ -216,7 +216,7 @@ impl DeviceRead for PrinterDevice {
     }
 
     fn read_status(&self, query: &QCommand) -> Result<jsVal, String> {
-        if &query.group != "rstatus" {
+        if &query.group != DEV_GROUPS[Devices::Zero as usize][Groups::RStatus as usize].unwrap() {
             return Err("Error: wrong permission".to_string());
         }
 
diff --git a/src/server.rs b/src/server.rs
index 4c152bb..ce126d0 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -31,6 +31,22 @@ fn get_static_file(info: &str, mdata: web::Data<FileCache>) -> Result<HttpRespon
     Ok(HttpResponse::Ok().body(format!("{}", static_str)))
 }
 
+fn get_static_file_raw(info: &str, mdata: web::Data<FileCache>) -> Result<HttpResponse, Error> {
+    let static_bytes = match mdata.get_ref().clone().get_byte_file(info) {
+        Ok(res) => res,
+        Err(err) => {
+            error!("Error on reading static file: {}", err);
+            return Ok(HttpResponse::InternalServerError().body(format!("Error on loading raw file")));
+        }
+    };
+
+    Ok(HttpResponse::Ok().body(static_bytes))
+}
+
+async fn responce_static_file_raw(info: web::Path<String>, mdata: web::Data<FileCache>) -> Result<HttpResponse, Error> {
+    get_static_file_raw(&info.0, mdata)
+}
+
 async fn responce_static_file(info: web::Path<String>, mdata: web::Data<FileCache>) -> Result<HttpResponse, Error> {
     get_static_file(&info.0, mdata)
 }
@@ -39,7 +55,7 @@ async fn responce_static_file(info: web::Path<String>, mdata: web::Data<FileCach
 #[derive(Deserialize)]
 struct LoginInfo {
     username: String,
-    password: SecStr,
+    password: String,
 }
 
 
@@ -48,7 +64,7 @@ async fn login_handler(form: web::Form<LoginInfo>, id: Identity, mdata: web::Dat
     debug!("login_handler: {:?}", id.identity());
 
     let nick = form.username.clone();
-    let password = form.password.clone();
+    let password = SecStr::from(form.password.as_str());
 
     let validated = match mdata.database.validate_user(&nick, &password) {
         Ok(data) => data,
@@ -161,6 +177,7 @@ pub async fn run_server(a_config: Arc<Mutex<Config>>) {
                 .route(web::get().to(dashboard_page)))
             .service(web::resource("/dashboard/{device}").to(dashboard_page))
             .service(web::resource("/static/{path}").to(responce_static_file))
+            .service(web::resource("/rstatic/{path}").to(responce_static_file_raw))
             .service(web::resource("/download/{path}").to(file_sender))
             .service(
                 web::resource("/upload/{path}")
diff --git a/src/stat_device.rs b/src/stat_device.rs
index 7d6fbce..f23a26f 100644
--- a/src/stat_device.rs
+++ b/src/stat_device.rs
@@ -17,7 +17,7 @@ type RedisPool = r2d2_red::Pool<RedisConnectionManager>;
 #[derive(Clone)]
 pub struct StatDevice {
     redis_pool: RedisPool,
-    database: Database
+    database: Database,
 }
 
 pub const STAT_CHARTS: [&'static str; 3] = [
@@ -37,7 +37,7 @@ impl StatDevice {
         let pool = RedisPool::builder().build(manager).unwrap();
         run_stat_service(&pool, database, config);
         run_autoban_svc(database, config);
-        StatDevice {redis_pool: pool, database: database.clone()}
+        StatDevice { redis_pool: pool, database: database.clone() }
     }
 
     fn get_chart_data(&self, username: &str, chart_name: &str) -> Result<jsVal, String> {
@@ -98,7 +98,8 @@ impl DeviceRead for StatDevice {
             return Err("No access to this action".to_string());
         }
         Ok(json!({
-            "template": "stat_status.hbs"
+            "template": "stat_status.hbs",
+            "username": query.username
         }))
     }
 }
diff --git a/static/favicon16.png b/static/favicon16.png
new file mode 100644
index 0000000000000000000000000000000000000000..f913ec49269907a4f2fd05635332c6c26a47fa53
GIT binary patch
literal 1547
zcmZ{kcTiJV6viK2k+Mh$7W65KD1rfG*JaT)2&NzqiXhm4BuHFJ2+1foBN)mE3@lZO
zENxh$z_OqME-D>_Bp^+iA|NFsC<cO|guJ(pozWTp*gLm<XMW#3bMKkC@kA%Ay6R3<
z007kSI6GHl{b6%#Q9x#6Q%yGjkfT%2oFP(4BqWf^Og-t)Lez;HuSu{sG0@R+=^(Zh
z#TJ9C#K9tmR9BM=Onh*<2d<BnzQ64}E!6nLU9;QjkiumpPbCadQR`4-)YZg{o55}Y
zsgjucV$pl?o`sVr5u4#Zd^xlcZIF*QDtYrRcR;MMm!;plyPfQRahrglYB0r5Ej_%)
zuh^4cSJRv28Kk_*YPIBj&{(tyz0R#t{H&$<xH#|7seQ?GYjE+e9^K!^6;U?OcHWa5
z`^IAtgjhWf?`++FFgEzz=F1kp<ze3)D9JV9W?%!7n$IfZ4}ciVj{7~6;MtLqoa&Xf
z`TBzy9W8SqMe<I`@(I&PY2FVij!=>qnWqeN%~xRY(`v!tzi%1KF&gR?_$PXvXbzNC
zNN)-2sx3j0{H6Pjk@2&~rH&ERkL;80h%{*7{R0^a6W3Atw`<5|Lw^FM4G-k@qE1I@
z=s#157<%btB?*NT$+d#`g{T%oAC|CXSEPnGKuf#p8XGABNW!@~0ziZj07S(Az&a9&
zngakP8UTbo0AQUB04Q2sor?`psVL$(cY7Fy2j4<j#bS2ZMmrBeWZBcT><o!`1>TS$
z>c6(~<?9Y!zLyJ2#NVWpT>>?}KxAFh8no$#2ZkVL?^2&2-p2)aV*`d{ut*H&B#ArH
zC&s6s+X)jfN&RbU(2M{|e6+x>`y!RXl2tf6ZJ{K3y0mm%x&hVJ)(VA!+Lra8>ZXvQ
zVZl6HQB~jC`DtiqsJXcrf@J+~W;4qcav!~)o0}Jl#Z^^RQmJ%#dAYK(a(#V$e0+Rn
zW~QT~V{&q`zP`Sure<((u)DikCX<bfjP&*OH8wUD6cmU=B8f!O(9qD-)Wqd-*=#n4
z!^zLj9~&DhFE8iw`7tpuqobqc6%}RW<#BOw8&c`>l9CtY<<Dws8=lum-@JaA;nH=F
z0)P4hudWCS3dSO1p}yYrSM?QT=h_Rs;pr)e*Ex3YG4JKV=d@gSZB5E+l@0g9$TPhi
znMp1jDr|vzx*mFGQIR6)GhChAfY3!*(pHi9#v*@q{wl6d;HO~O^wvdwl;-7uFmiql
zSUcdZk^v48TWL72FaXf>-5hcce`Rl;qQbyC+N;dUZ9$=aA`)JyA)!IM9mZY1pX5VM
zOUYo#Q~mWklz-ge^)q<!3Wh*%!RP!Djj=!Pc$q*r<K}RYfc11PNXKv*dvFBKaO=Q1
z0_UAAHUUH6^bt6t?StJ{I8D8H)dLeBKL}^dW+o=51qYS%QkEo(U((Z-7Bxk&s*1`=
z3Y{rE=*WksZz>M!rn>YJ@AT+bo({ZZ;|}iAIy#Z1vsDY{gpYk@V`{KJB{e5g{R4k`
zcE%ypoaUgbqo*6KNFZ=I;Wu}zu9_SvE5*oLRWs#TwrXn4`-!hThY}OwEdk(Im{}!^
zPuz~&@F2tf0)y<!pjeaW6l4J`&=wY^XmeBa33m%iYouFQnV`|uXmr@lUsS#`1ci{P
z{^9>`kjF+pM+`=r8IUi{niN6{r&F&5FaW0z@S8XaGQ%jKKb=Ae3}@$xSct>mtAk7l
zBhjfe1~nuY2y?~Sf__YDAj6azJQds7hJbs%f<eB)On+YzgGr~*zbBpb@w*Tb^^FW6
zQv$z7x>Af{5yUgX{Q|?)_XbF#hxk(iDIg=9MgfuR$Y*>rZ)!<xOQ?sjF~^z9!_T+^
z3WnRvNZYgxwH?xR6tqFRsN*eU1;Z!qAa{76qm|dXyH$l7g)1bO0Ya1(W69Pk6G;K!
M?Vao@Y<*b&0vs6m3jhEB

literal 0
HcmV?d00001

diff --git a/static/favicon32.png b/static/favicon32.png
new file mode 100644
index 0000000000000000000000000000000000000000..406f30da1f91e589ac53c82b36687e437641d085
GIT binary patch
literal 2412
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
ZU<=G4G#E?nj)k%m0N&Hj<DPp2`yb2~DPRBq

literal 0
HcmV?d00001

diff --git a/static/login.html b/static/login.html
index 0846455..cf8ca60 100644
--- a/static/login.html
+++ b/static/login.html
@@ -1,10 +1,13 @@
 <!DOCTYPE html>
 <html>
 <link rel="stylesheet" type="text/css" href="/static/styles.css" media="screen" />
+<link rel="icon" type="image/png" sizes="32x32" href="/rstatic/favicon32.png">
+<link rel="icon" type="image/png" sizes="16x16" href="/rstatic/favicon16.png">
 <head>
     <title>Webify Main</title>
 </head>
 <body>
+<img src="/rstatic/webify.png" height="64" width="64">
 <div class="login_form">
     <form action="/get_logged_in"  method="post" >
         <div class="text_field">
diff --git a/static/login_success.html b/static/login_success.html
index c146a4f..1bbaa37 100644
--- a/static/login_success.html
+++ b/static/login_success.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html>
 <link rel="stylesheet" type="text/css" href="/static/lite.css" media="screen" />
+<link rel="icon" type="image/png" sizes="32x32" href="/rstatic/favicon32.png">
+<link rel="icon" type="image/png" sizes="16x16" href="/rstatic/favicon16.png">
 <head>
     <title>Webify Main</title>
 </head>
diff --git a/static/main.html b/static/main.html
index c2a0e9e..d47e025 100644
--- a/static/main.html
+++ b/static/main.html
@@ -1,10 +1,13 @@
 <!DOCTYPE html>
 <html>
 <link rel="stylesheet" type="text/css" href="/static/styles.css" media="screen" />
+<link rel="icon" type="image/png" sizes="32x32" href="/rstatic/favicon32.png">
+<link rel="icon" type="image/png" sizes="16x16" href="/rstatic/favicon16.png">
 <head>
   <title>Webify Main</title>
 </head>
 <body>
+<img src="/rstatic/webify.png" height="64" width="64">
 <div class="login_btn">
   <a href="/login">Log In</a>
 </div>
diff --git a/static/webify.png b/static/webify.png
new file mode 100644
index 0000000000000000000000000000000000000000..e105a30201680c5035428a852e4acf4863c1fbdb
GIT binary patch
literal 5851
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

literal 0
HcmV?d00001

diff --git a/templates/dashboard.hbs b/templates/dashboard.hbs
index 1944de4..794206e 100644
--- a/templates/dashboard.hbs
+++ b/templates/dashboard.hbs
@@ -3,6 +3,8 @@
 <head>
     <title>Webify Dashboard</title>
     <link rel="stylesheet" type="text/css" href="/static/dashboard.css" media="screen"/>
+    <link rel="icon" type="image/png" sizes="32x32" href="/rstatic/favicon32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/rstatic/favicon16.png">
 </head>
 <body>
 <div class="dashboard">
@@ -10,6 +12,7 @@
     <div class="devices">
         <div class="devrow">
             <div class="devcell">
+                <img src="/rstatic/webify.png" height="64" width="64"><br>
                 Available devices: <br>
                 <ul class="devlist">
                 {{#each devices as |dev|}}
diff --git a/templates/json/chart_cmd_cross_user.hjs b/templates/json/chart_cmd_cross_user.hjs
index 47c2d80..9a6a13b 100644
--- a/templates/json/chart_cmd_cross_user.hjs
+++ b/templates/json/chart_cmd_cross_user.hjs
@@ -1,23 +1,23 @@
 const data = {
-    labels: [{{#each labels as |label|}}{{label}},{{/each}}],
+    labels: [{{#each labels as |label|}}"{{label}}",{{/each}}],
     datasets: [{
-        label: 'Chart by commands per user',
+        label: "Chart by commands per user",
         data: [{{#each data_values as |dval|}}{{dval}},{{/each}}],
         backgroundColor: [
             {{#each alpha_colors as |color|}}
-                {{color}},
+                "{{color}}",
             {{/each}}
         ],
         borderColor: [
             {{#each simple_colors as |color|}}
-                {{color}},
+                "{{color}}",
             {{/each}}
         ],
         borderWidth: 1
     }]
 };
 const config = {
-    type: 'bar',
+    type: "bar",
     data: data,
     options: {
         scales: {
diff --git a/templates/json/chart_command.hjs b/templates/json/chart_command.hjs
index fc0213a..f00ab4c 100644
--- a/templates/json/chart_command.hjs
+++ b/templates/json/chart_command.hjs
@@ -1,23 +1,23 @@
 const data = {
-    labels: [{{#each labels as |label|}}{{label}},{{/each}}],
+    labels: [{{#each labels as |label|}}"{{label}}",{{/each}}],
     datasets: [{
-        label: 'Chart by commands',
+        label: "Chart by commands",
         data: [{{#each data_values as |dval|}}{{dval}},{{/each}}],
         backgroundColor: [
             {{#each alpha_colors as |color|}}
-                {{color}},
+                "{{color}}",
             {{/each}}
         ],
         borderColor: [
             {{#each simple_colors as |color|}}
-                {{color}},
+                "{{color}}",
             {{/each}}
         ],
         borderWidth: 1
     }]
 };
 const config = {
-    type: 'bar',
+    type: "bar",
     data: data,
     options: {
         scales: {
diff --git a/templates/json/chart_device.hjs b/templates/json/chart_device.hjs
index bc8b594..85b23b4 100644
--- a/templates/json/chart_device.hjs
+++ b/templates/json/chart_device.hjs
@@ -1,23 +1,23 @@
 const data = {
-    labels: [{{#each labels as |label|}}{{label}},{{/each}}],
+    labels: [{{#each labels as |label|}}"{{label}}", {{/each}}],
     datasets: [{
-        label: 'Chart by devices',
+        label: "Chart by devices",
         data: [{{#each data_values as |dval|}}{{dval}},{{/each}}],
         backgroundColor: [
             {{#each alpha_colors as |color|}}
-                {{color}},
+                "{{color}}",
             {{/each}}
         ],
         borderColor: [
             {{#each simple_colors as |color|}}
-                {{color}},
+                "{{color}}",
             {{/each}}
         ],
         borderWidth: 1
     }]
 };
 const config = {
-    type: 'bar',
+    type: "bar",
     data: data,
     options: {
         scales: {
diff --git a/templates/json/chart_device_cross_user.hjs b/templates/json/chart_device_cross_user.hjs
index afc741f..c7e1ccb 100644
--- a/templates/json/chart_device_cross_user.hjs
+++ b/templates/json/chart_device_cross_user.hjs
@@ -1,23 +1,23 @@
 const data = {
-    labels: [{{#each labels as |label|}}{{label}},{{/each}}],
+    labels: [{{#each labels as |label|}}"{{label}}",{{/each}}],
     datasets: [{
-        label: 'Chart by devices for user',
+        label: "Chart by devices for user",
         data: [{{#each data_values as |dval|}}{{dval}},{{/each}}],
         backgroundColor: [
             {{#each alpha_colors as |color|}}
-                {{color}},
+                "{{color}}",
             {{/each}}
         ],
         borderColor: [
             {{#each simple_colors as |color|}}
-                {{color}},
+                "{{color}}",
             {{/each}}
         ],
         borderWidth: 1
     }]
 };
 const config = {
-    type: 'bar',
+    type: "bar",
     data: data,
     options: {
         scales: {
diff --git a/templates/json/chart_user.hjs b/templates/json/chart_user.hjs
index 9cab602..bb1f250 100644
--- a/templates/json/chart_user.hjs
+++ b/templates/json/chart_user.hjs
@@ -1,23 +1,23 @@
 const data = {
-    labels: [{{#each labels as |label|}}{{label}},{{/each}}],
+    labels: [{{#each labels as |label|}}"{{label}}",{{/each}}],
     datasets: [{
-        label: 'Chart by user',
+        label: "Chart by user",
         data: [{{#each data_values as |dval|}}{{dval}},{{/each}}],
         backgroundColor: [
             {{#each alpha_colors as |color|}}
-                {{color}},
+                "{{color}}",
             {{/each}}
         ],
         borderColor: [
             {{#each simple_colors as |color|}}
-                {{color}},
+                "{{color}}",
             {{/each}}
         ],
         borderWidth: 1
     }]
 };
 const config = {
-    type: 'bar',
+    type: "bar",
     data: data,
     options: {
         scales: {
diff --git a/templates/stat_chart.hbs b/templates/stat_chart.hbs
index a21a309..1fdaa99 100644
--- a/templates/stat_chart.hbs
+++ b/templates/stat_chart.hbs
@@ -1,4 +1,4 @@
-<script src="/static/chart.min.js"></script>
+<script src="/static/chart.min.js" type="application/javascript"></script>
 
 <div>
     <h3>{{chart_name}}</h3>
@@ -6,7 +6,7 @@
 </div>
 
 <script>
-    {{chart_data}}
+        {{{chart_data}}}
 
     const StatChart = new Chart(
             document.getElementById('StatChart'),
diff --git a/templates/stat_cross_chart.hbs b/templates/stat_cross_chart.hbs
index cd1a948..7504821 100644
--- a/templates/stat_cross_chart.hbs
+++ b/templates/stat_cross_chart.hbs
@@ -1,4 +1,4 @@
-<script src="/static/chart.min.js"></script>
+<script src="/static/chart.min.js" type="application/javascript"></script>
 
 <div>
     <h3>{{chart_name}} {{chart_user}}</h3>
@@ -6,7 +6,7 @@
 </div>
 
 <script>
-        {{chart_data}}
+        {{{chart_data}}}
 
     const StatChart = new Chart(
             document.getElementById('StatChart'),
diff --git a/templates/stat_status.hbs b/templates/stat_status.hbs
index 49811fa..fae7fb7 100644
--- a/templates/stat_status.hbs
+++ b/templates/stat_status.hbs
@@ -5,7 +5,7 @@
             <div class="command_f">
                 <input type="hidden" name="qtype" value="R" class="qtype">
                 <input type="hidden" name="group" value="statdev_read" class="group">
-                <input type="hidden" name="username" value="{{../username}}" class="username">
+                <input type="hidden" name="username" value="{{username}}" class="username">
                 <input type="hidden" name="command" value="chart_device" class="command">
                 <input type="hidden" name="payload" value="" class="payload">
             </div>
@@ -17,7 +17,7 @@
             <div class="command_f">
                 <input type="hidden" name="qtype" value="R" class="qtype">
                 <input type="hidden" name="group" value="statdev_read" class="group">
-                <input type="hidden" name="username" value="{{../username}}" class="username">
+                <input type="hidden" name="username" value="{{username}}" class="username">
                 <input type="hidden" name="command" value="chart_user" class="command">
                 <input type="hidden" name="payload" value="" class="payload">
             </div>
@@ -29,7 +29,7 @@
             <div class="command_f">
                 <input type="hidden" name="qtype" value="R" class="qtype">
                 <input type="hidden" name="group" value="statdev_read" class="group">
-                <input type="hidden" name="username" value="{{../username}}" class="username">
+                <input type="hidden" name="username" value="{{username}}" class="username">
                 <input type="hidden" name="command" value="chart_command" class="command">
                 <input type="hidden" name="payload" value="" class="payload">
             </div>
@@ -42,7 +42,7 @@
             <div class="command_f">
                 <input type="hidden" name="qtype" value="R" class="qtype">
                 <input type="hidden" name="group" value="statdev_read" class="group">
-                <input type="hidden" name="username" value="{{../username}}" class="username">
+                <input type="hidden" name="username" value="{{username}}" class="username">
                 <input type="hidden" name="command" value="chart_cmd_cross_user" class="command">
                 <input type="text" name="payload" value="" placeholder="username" class="payload">
             </div>
@@ -55,7 +55,7 @@
             <div class="command_f">
                 <input type="hidden" name="qtype" value="R" class="qtype">
                 <input type="hidden" name="group" value="statdev_read" class="group">
-                <input type="hidden" name="username" value="{{../username}}" class="username">
+                <input type="hidden" name="username" value="{{username}}" class="username">
                 <input type="hidden" name="command" value="chart_device_cross_user" class="command">
                 <input type="text" name="payload" value="" placeholder="username" class="payload">
             </div>
diff --git a/templates/upload.hbs b/templates/upload.hbs
index c149eae..795bcdc 100644
--- a/templates/upload.hbs
+++ b/templates/upload.hbs
@@ -1,6 +1,8 @@
 <html>
 <head><title>Upload to Filer</title></head>
 <link rel="stylesheet" type="text/css" href="/static/lite.css" media="screen" />
+<link rel="icon" type="image/png" sizes="32x32" href="/rstatic/favicon32.png">
+<link rel="icon" type="image/png" sizes="16x16" href="/rstatic/favicon16.png">
 <body>
 <div class="uploader">
     <form target="/{{target}}" method="post" enctype="multipart/form-data">