fix bug 2

docker_build.bat

@@ -0,0 +1,5 @@
+docker build . -t opennamu/opennamu:dev
+docker build -t opennamu/opennamu:dev-ko -f Dockerfile.ko .
+docker login
+docker push opennamu/opennamu:dev
+docker push opennamu/opennamu:dev-ko

lang/en-US.json

@@ -225,7 +225,7 @@
         "challenge" : "Challenge",
         "user_title" : "User title",
         "multiple_ban" : "Multiple ban",
-    	"dont_move" : "Don't move",
+        "dont_move" : "Don't move",
         "file_delete" : "File delete",
         "_comment_" : "Edit",
             "load" : "Load another document",

route/main_search.py

@@ -2,4 +2,4 @@ from .tool.func import *
 
 def main_search():
     with get_db_connect() as conn:
-    	return redirect('/search/' + url_pas(flask.request.form.get('search', 'test')))
+        return redirect('/search/' + url_pas(flask.request.form.get('search', 'test')))

route/topic.py

@@ -127,7 +127,7 @@ def topic(topic_num = 0):
                 call_user_count -= 1
 
             do_add_thread(
-            	topic_num,
+                topic_num,
                 data,
                 '',
                 num

route/topic_tool_acl.py

@@ -45,7 +45,7 @@ def topic_tool_acl(topic_num = 1):
 
                 do_add_thread(
                     topic_num,
-                	'acl change ' + acl_data,
+                    'acl change ' + acl_data,
                     '1'
                 )
                 do_reload_recent_thread(

route/user_count.py

@@ -39,7 +39,11 @@ def user_count(name = None):
         curs.execute(db_change("select leng from history where date like ? and ip = ?"), [date + '%', that])
         db_data = curs.fetchall()
         for count in db_data:
-        	data_today_len += int(count[0][1:])
+            count_data = count[0]
+            count_data = count_data.replace('+', '')
+            count_data = count_data.replace('-', '')
+
+            data_today_len += int(count_data)
 
         date_yesterday = str((
             datetime.datetime.today() + datetime.timedelta(days = -1)
@@ -57,7 +61,7 @@ def user_count(name = None):
         curs.execute(db_change("select leng from history where date like ? and ip = ?"), [date_yesterday + '%', that])
         db_data = curs.fetchall()
         for count in db_data:
-        	data_yesterday_len += int(count[0][1:])
+            data_yesterday_len += int(count[0][1:])
 
         # 한글 지원 필요
         return easy_minify(flask.render_template(skin_check(),

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5 (stable2) (beta4) (dev63)",
+        "r_ver" : "v3.4.5 (stable2) (beta4) (dev64)",
         "c_ver" : "3500354",
         "s_ver" : "3500110"
     }

views/main_css/js/func/insert_version.js

@@ -1,7 +1,7 @@
 "use strict";
 
 function opennamu_do_insert_version(
-	dom_name_version_now, 
+    dom_name_version_now, 
     dom_name_version_new
 ) {
     let url = "/api/version";

views/main_css/js/func/insert_version_skin.js

@@ -1,7 +1,7 @@
 "use strict";
 
 function opennamu_do_insert_version_skin(
-	dom_name_version
+    dom_name_version
 ) {
     let url = "/api/skin_info?all=true";
     let xhr = new XMLHttpRequest();

views/main_css/js/render/markdown.js

@@ -590,7 +590,7 @@ class opennamu_render_markdown {
         while(this.doc_data.match(blockquote_regex)) {
             this.doc_data = this.doc_data.replace(blockquote_regex, function(match, x1) {
                 let blockquote_data = '<brStart>' + x1;
-                blockquote_data = blockquote_data.replace(/\n&gt;	?/g, '\n');
+                blockquote_data = blockquote_data.replace(/\n&gt;    ?/g, '\n');
 
                 parser_count += 1;
                 let parser_count_str = String(parser_count);

views/main_css/js/render_onmark.js

@@ -609,8 +609,8 @@ function do_onmark_macro_render(data, data_js) {
             } else if(x_1 === 'navertv') {
                 var video_src = 'https://tv.naver.com/embed/' + video_code
             } else {
-		var video_src = 'https://player.vimeo.com/video/' + video_code
-	    }
+        var video_src = 'https://player.vimeo.com/video/' + video_code
+        }
             
             return '<iframe style="width: ' + video_width + '; height: ' + video_height + ';" src="' + video_src + '" frameborder="0" allowfullscreen></iframe>';
         } else if(x_1 === 'anchor') {
@@ -1337,7 +1337,7 @@ function do_onmark_render(
     doc_data = ''
 ) {
     let data_wiki_set = {};
-	if(test_mode === 'normal') {
+    if(test_mode === 'normal') {
         var data = '\n' + 
             document.getElementById(name_id + '_load').innerHTML.replace(/\r/g, '') + 
         '\n';
@@ -1346,7 +1346,7 @@ function do_onmark_render(
             doc_data.replace(/\r/g, '') + 
         '\n';
     } else {
-    	var data = '\n' + (
+        var data = '\n' + (
 ``
         ).replace(/\r/g, '') + '\n';
     }
@@ -1392,7 +1392,7 @@ function do_onmark_render(
                 } else if(test_mode === 'manual') {
                     return [data, data_js];
                 } else {
-                	console.log([data, data_js]);
+                    console.log([data, data_js]);
                 }
                 
                 return 0;
@@ -1480,7 +1480,7 @@ function do_onmark_render(
                 'do_heading_move();\n' + 
                 'get_link_state("' + name_include + '");\n' + 
                 'get_file_state("' + name_include + '");\n' + 
-        		'get_heading_name();\n' +
+                'get_heading_name();\n' +
                 'render_html("' + name_include + 'nowiki_html");\n' +
             ''
             
@@ -1494,7 +1494,7 @@ function do_onmark_render(
             } else if(test_mode === 'manual') {
                 return [data, data_js];
             } else {
-            	console.log([data, data_js]);
+                console.log([data, data_js]);
             }
         }
     }