버그 수정

app.py

@@ -126,7 +126,7 @@ def db_get():
 
 start()
 
-r_ver = '2.0.3'
+r_ver = '2.0.4'
 
 db_ex('select data from other where name = "version"')
 version = db_get()
@@ -140,10 +140,14 @@ if(version):
 else:
     db_ex("insert into other (name, data) value ('version', '" + db_pas(r_ver) + "')")
     t_ver = 0
+    
+db_ex('select name from alist limit 1')
+getalist = db_get()
+if(getalist and int(t_ver) < 204):
+    db_ex("delete from alist where name = 'owner'")
+    db_ex("delete from alist where name = 'admin'")
 
-db_ex("select * from user limit 1")
-ust = db_get()
-if(int(t_ver) < 202 or not ust):
+if(int(t_ver) < 202 or not getalist):
     db_ex("insert into alist (name, acl) value ('owner', 'owner')")
     db_ex("insert into alist (name, acl) value ('admin', 'ban')")
     db_ex("insert into alist (name, acl) value ('admin', 'mdel')")
@@ -152,30 +156,33 @@ if(int(t_ver) < 202 or not ust):
     db_ex("insert into alist (name, acl) value ('admin', 'acl')")
     
 if(int(t_ver) < 203):
-    db_ex('rename table topic to old_topic')
-    db_ex('create table topic(id text, title text, sub text, data longtext, date text, ip text, block text, top text)')
-    
-    db_ex('select * from old_topic')
-    topic_old = db_get()
-    if(topic_old):
-        i = 0
-        while(True):
-            try:
-                db_ex("select id from distop where id = '" + db_pas(topic_old[i]['id']) + "' and title = '" + db_pas(topic_old[i]['title']) + "' and sub = '" + db_pas(topic_old[i]['sub']) + "'")
-                distop = db_get()
-                if(distop):
-                    top = 'O'
-                else:
-                    top = ''
+    db_ex('select title from topic limit 1')
+    gettop = db_get()
+    if(gettop):
+        db_ex('rename table topic to old_topic')
+        db_ex('create table topic(id text, title text, sub text, data longtext, date text, ip text, block text, top text)')
+        
+        db_ex('select * from old_topic')
+        topic_old = db_get()
+        if(topic_old):
+            i = 0
+            while(True):
+                try:
+                    db_ex("select id from distop where id = '" + db_pas(topic_old[i]['id']) + "' and title = '" + db_pas(topic_old[i]['title']) + "' and sub = '" + db_pas(topic_old[i]['sub']) + "'")
+                    distop = db_get()
+                    if(distop):
+                        top = 'O'
+                    else:
+                        top = ''
+                        
+                    db_ex("insert into topic (id, title, sub, data, date, ip, block, top) value ('" + db_pas(topic_old[i]['id']) + "', '" + db_pas(topic_old[i]['title']) + "', '" + db_pas(topic_old[i]['sub']) + "', '" + db_pas(topic_old[i]['data']) + "', '" + db_pas(topic_old[i]['date']) + "', '" + db_pas(topic_old[i]['ip']) + "', '" + db_pas(topic_old[i]['block']) + "', '" + db_pas(top) + "')")
                     
-                db_ex("insert into topic (id, title, sub, data, date, ip, block, top) value ('" + db_pas(topic_old[i]['id']) + "', '" + db_pas(topic_old[i]['title']) + "', '" + db_pas(topic_old[i]['sub']) + "', '" + db_pas(topic_old[i]['data']) + "', '" + db_pas(topic_old[i]['date']) + "', '" + db_pas(topic_old[i]['ip']) + "', '" + db_pas(topic_old[i]['block']) + "', '" + db_pas(top) + "')")
-                
-                i += 1
-            except:
-                break
-    
-    db_ex('drop table old_topic')
-    db_ex('drop table distop')
+                    i += 1
+                except:
+                    break
+        
+        db_ex('drop table old_topic')
+        db_ex('drop table distop')
     
 db_com()
 

func.py

@@ -46,49 +46,49 @@ def diff(seqm):
     return ''.join(output)
            
 def admin_check(num, session):
-    if(session.get('Now') == True):
-        ip = ip_check(session) 
-        db_ex("select acl from user where id = '" + db_pas(ip) + "'")
-        user = db_get()
-        if(user):
-            db_ex("select acl from alist where name = '" + db_pas(user[0]['acl']) + "'")
-            adata = db_get()
-            if(adata):
-                i = 0
-                while(True):
-                    try:
-                        if(num == 1 and adata[i]['acl'] == 'ban'):
-                            return 1
-                            
-                            break
-                        elif(num == 2 and adata[i]['acl'] == 'mdel'):
-                            return 1
-                            
-                            break
-                        elif(num == 3 and adata[i]['acl'] == 'toron'):
-                            return 1
-                            
-                            break
-                        elif(num == 4 and adata[i]['acl'] == 'check'):
-                            return 1
-                            
-                            break
-                        elif(num == 5 and adata[i]['acl'] == 'acl'):
-                            return 1
-                            
-                            break
-                        elif(num == 6 and adata[i]['acl'] == 'hidel'):
-                            return 1
-                            
-                            break
-                        elif(adata[i]['acl'] == 'owner'):
-                            return 1
-                            
-                            break
-                        else:
-                            i += 1
-                    except:
+    ip = ip_check(session) 
+    db_ex("select acl from user where id = '" + db_pas(ip) + "'")
+    user = db_get()
+    if(user):
+        db_ex("select acl from alist where name = '" + db_pas(user[0]['acl']) + "'")
+        adata = db_get()
+        print(adata)
+        if(adata):
+            i = 0
+            while(True):
+                try:
+                    if(num == 1 and adata[i]['acl'] == 'ban'):
+                        return 1
+                        
+                        break
+                    elif(num == 2 and adata[i]['acl'] == 'mdel'):
+                        return 1
+                        
+                        break
+                    elif(num == 3 and adata[i]['acl'] == 'toron'):
+                        return 1
+                        
+                        break
+                    elif(num == 4 and adata[i]['acl'] == 'check'):
+                        return 1
+                        
+                        break
+                    elif(num == 5 and adata[i]['acl'] == 'acl'):
+                        return 1
+                        
                         break
+                    elif(num == 6 and adata[i]['acl'] == 'hidel'):
+                        return 1
+                        
+                        break
+                    elif(adata[i]['acl'] == 'owner'):
+                        return 1
+                        
+                        break
+                    else:
+                        i += 1
+                except:
+                    break
                 
 def include_check(name, data):
     if(re.search('^틀:', name)):

mark.py

@@ -398,7 +398,7 @@ def namumark(session, title, data):
 
             data = re.sub('(={1,6})\s?([^=]*)\s?(?:={1,6})(?:\s+)?\n', '<h' + str(wiki) + ' id="' + c + '"><a href="#toc" id="s-' + toc + '">' + toc + '.</a> ' + d + ' <span style="font-size:11px;">[<a href="/edit/' + url_pas(title) + '/section/' + str(i) + '">편집</a>]</span></h' + str(wiki) + '>', data, 1);
         else:
-            rtoc = rtoc + '</div>'
+            rtoc += '</div>'
             break
     
     data = re.sub("\[목차\]", rtoc, data)