bygdis.fi

commit 8eb1df8916432da618c1d9ead5935fadf9ffe381
parent 02461a15ac8563a3f9bd3928efad7f697b37382d
Author: rob <rob@tarina.org>
Date:   Tue, 15 Apr 2025 17:03:42 +0300

ööh, wat the?? när ha dedär hänt?

Diffstat:
M
server.py
 | 
22
+++++++++++-----------

1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/server.py b/server.py
@@ -21,16 +21,14 @@ basedir = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(basedir)
 import settings
 
-web.config.session_parameters['cookie_name'] = 'bygdis.fi'
-web.config.session_parameters['cookie_domain'] = None
-web.config.session_parameters['cookie_path'] = None
-web.config.session_parameters['timeout'] = 839808000  # in seconds
-web.config.session_parameters['ignore_expiry'] = True
-web.config.session_parameters['ignore_change_ip'] = True
+#web.config.session_parameters['cookie_name'] = 'bygdis.fi'
+#web.config.session_parameters['cookie_domain'] = None
+#web.config.session_parameters['cookie_path'] = None
+#web.config.session_parameters['timeout'] = 839808000  # in seconds
+#web.config.session_parameters['ignore_expiry'] = True
+#web.config.session_parameters['ignore_change_ip'] = True
 #web.config.session_parameters['secret_key'] = 'fLjUfxqXtfNoIldA0A0R'
-web.config.session_parameters['expired_message'] = 'Session expired'
-
-
+#web.config.session_parameters['expired_message'] = 'Session expired'
 
 urls = (
     "/", "index",
@@ -186,7 +184,7 @@ def md_to_pdf(markdownfile):
 
 def md_to_text(markdownfile):
     read_p=basedir + '/'+markdownfile
-    with open(read_p, 'rU') as file:
+    with open(read_p, 'r') as file:
         p_list=file.readlines()
     pr=''
     for p in p_list:
@@ -1201,6 +1199,7 @@ class upload():
                 fout = open(imgdir +'/'+ imgname,'wb') # creates the file where the uploaded file should be stored
                 fout.write(i.imgfile.file.read()) # writes the uploaded file to the newly created file.
                 fout.close() # closes the file, upload complete.
+                os.chmod(imgdir+'/'+imgname, 0o755)
 
                 ##---------- OPEN FILE & CHEKC IF JPEG --------
                 image = Image.open(imgdir +'/'+ imgname)
@@ -1213,7 +1212,7 @@ class upload():
                 image.save(imgdir + '/web/' + imgname)
                 image.thumbnail((300,300), Image.ANTIALIAS)
                 image.save(imgdir + '/thumb/' + imgname)
-                if i.edit != None:
+                if i.edit == None:
                     db.insert('bilder', filename=imghash, uploaddate=datetime.datetime.now(), uppladdare=session.user, lastmod=datetime.datetime.now(), moddedby=session.user)
                 raise web.seeother('/bildinfo/' + imghash)
             else:
@@ -1239,6 +1238,7 @@ class bildinfo():
                 oldinfo = db.select('allaversioner', where="id='" + v.id +"'", what='titel, year, fotograf, beskrivning, personer, moddedby, lastmod, plats')
             else:
                 oldinfo = db.select('bilder', where="filename='" + imghash +"'", what='titel, year, fotograf, beskrivning, personer, moddedby, lastmod, plats')
+            print('fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu')
             oldinfo = oldinfo[0]
             allaversioner = db.select('allaversioner', where="filename='" + imghash +"'", what='id, moddedby, lastmod', order='id DESC')
             infoform.fill(titel=oldinfo.titel, year=oldinfo.year, fotograf=oldinfo.fotograf, plats=oldinfo.plats, beskrivning=oldinfo.beskrivning, personer=oldinfo.personer)