2du před 3 roky
rodič
revize
12ba7abccd

+ 1 - 2
route/recent_change.py

@@ -132,14 +132,13 @@ def recent_change(name = None, tool = ''):
                         <td>''' + date + '''</td>
                     </tr>
                     <tr ''' + style[1] + '''>
-                        <td class="opennamu_send_content" colspan="3">''' + html.escape(send) + '''</td>
+                        <td class="opennamu_js_send_content" colspan="3">''' + html.escape(send) + '''</td>
                     </tr>
                 '''
 
             div += '''
                     </tbody>
                 </table>
-                <!-- JS : opennamu_send_render -->
             '''
 
             if name:

+ 1 - 2
route/user_alarm.py

@@ -21,14 +21,13 @@ def user_alarm():
             for data_one in data_list:
                 data += '' + \
                     '<li>' + \
-                        '<span class="opennamu_send_content">' + html.escape(data_one[0]) + '</span> ' + \
+                        '<span class="opennamu_js_send_content">' + html.escape(data_one[0]) + '</span> ' + \
                         '(' + data_one[1] + ')' + \
                     '</li>' + \
                 ''
     
         data += '' + \
             '</ul>' + \
-            '<!-- JS : opennamu_send_render -->' + \
             next_fix('/alarm?num=', num, data_list) + \
         ''
     

+ 25 - 3
route/user_count.py

@@ -19,16 +19,38 @@ def user_count(name = None):
         curs.execute(db_change("select count(*) from topic where ip = ?"), [that])
         count = curs.fetchall()
         if count:
-            t_data = count[0][0]
+            data_topic = count[0][0]
         else:
-            t_data = 0
+            data_topic = 0
+            
+        date = get_time()
+        date = date.split()
+        date = date[0]
+            
+        curs.execute(db_change("select count(*) from history where date like ? and ip = ?"), [date + '%', that])
+        count = curs.fetchall()
+        if count:
+            data_today = count[0][0]
+        else:
+            data_today = 0
+            
+        data_today_len = 0
+            
+        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:])
 
+        # 한글 지원 필요
         return easy_minify(flask.render_template(skin_check(),
             imp = [load_lang('count'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
             data = '''
                 <ul class="inside_ul">
                     <li><a href="/record/''' + url_pas(that) + '''">''' + load_lang('edit_record') + '''</a> : ''' + str(data) + '''</li>
-                    <li><a href="/record/topic/''' + url_pas(that) + '''">''' + load_lang('discussion_record') + '''</a> : ''' + str(t_data) + '''</a></li>
+                    <li><a href="/record/topic/''' + url_pas(that) + '''">''' + load_lang('discussion_record') + '''</a> : ''' + str(data_topic) + '''</a></li>
+                    <hr>
+                    <li>(''' + load_lang('beta') + ''') TODAY : ''' + str(data_today) + '''</li>
+                    <li>(''' + load_lang('beta') + ''') TODAY LEN : ''' + str(data_today_len) + '''</li>
                 </ul>
             ''',
             menu = [['user', load_lang('return')]]

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5 (stable2) (beta3) (dev32)",
+        "r_ver" : "v3.4.5 (stable2) (beta3) (dev33)",
         "c_ver" : "3500113",
         "s_ver" : "3500110"
     }

+ 1 - 0
views/main_css/js/func/insert_user_info.js

@@ -12,6 +12,7 @@ function do_insert_user_info() {
             if(this.readyState === 4 && this.status === 200) {
                 let get_data = JSON.parse(this.responseText);
                 
+                // 한글 지원 필요
                 let get_data_auth = get_data[name]['auth'];
                 if(get_data_auth === '0') {
                     get_data_auth = 'IP';

+ 4 - 11
views/main_css/js/func/render_send.js

@@ -1,13 +1,13 @@
 "use strict";
 
 function opennamu_send_render(i = 0) {
-    let get_class = document.getElementsByClassName('opennamu_send_content')[i];
+    let get_class = document.getElementsByClassName('opennamu_js_send_content')[i];
     if(get_class) {
         opennamu_send_render(i + 1);
         
         let data = get_class.innerHTML;
         if(data === '&lt;br&gt;' || data === '') {
-            document.getElementsByClassName('opennamu_send_content')[i].innerHTML = '<br>';
+            document.getElementsByClassName('opennamu_js_send_content')[i].innerHTML = '<br>';
         } else {
             data = data.replace(/javascript:/i, '');
             data = data.replace(/&lt;a(?:(?:(?!&gt;).)*)&gt;((?:(?!&lt;\/a&gt;).)+)&lt;\/a&gt;/g, function(x, x_1) {
@@ -16,16 +16,9 @@ function opennamu_send_render(i = 0) {
                 return '<a href="/w/' + encodeURIComponent(x_1_org) + '">' + x_1 + '</a>';
             });
             
-            document.getElementsByClassName('opennamu_send_content')[i].innerHTML = data;
+            document.getElementsByClassName('opennamu_js_send_content')[i].innerHTML = data;
         }
     }
 }
 
-let opennamu_send_render_url = [
-    '/alarm',
-    '/recent_change',
-    '/recent_changes'
-];
-if(opennamu_send_render_url.includes(window.location.pathname)) {
-    opennamu_send_render();
-}
+opennamu_send_render();