From 507085494ee6e3703a66b02d83bbd951f0b74791 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Fri, 10 Feb 2023 17:04:26 +0000
Subject: [PATCH] import variable names

---
 daemon.py                | 18 +++++++++---------
 webapp_profile.py        |  6 +++---
 webapp_theme_designer.py |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/daemon.py b/daemon.py
index af5bdd6cd..b478552f2 100644
--- a/daemon.py
+++ b/daemon.py
@@ -6173,9 +6173,9 @@ class PubServer(BaseHTTPRequestHandler):
                 'banner', 'search_banner',
                 'instanceLogo',
                 'left_col_image', 'right_col_image',
-                'submitImportFollows',
-                'submitImportBlocks',
-                'submitImportTheme'
+                'import_follows',
+                'import_blocks',
+                'import_theme'
             )
             profile_media_types_uploaded = {}
             for m_type in profile_media_types:
@@ -6208,7 +6208,7 @@ class PubServer(BaseHTTPRequestHandler):
                 if m_type == 'instanceLogo':
                     filename_base = \
                         base_dir + '/accounts/login.temp'
-                elif m_type == 'submitImportTheme':
+                elif m_type == 'import_theme':
                     if not os.path.isdir(base_dir + '/imports'):
                         os.mkdir(base_dir + '/imports')
                     filename_base = \
@@ -6219,11 +6219,11 @@ class PubServer(BaseHTTPRequestHandler):
                         except OSError:
                             print('EX: _profile_edit unable to delete ' +
                                   filename_base)
-                elif m_type == 'submitImportFollows':
+                elif m_type == 'import_follows':
                     filename_base = \
                         acct_dir(base_dir, nickname, domain) + \
                         '/import_following.csv'
-                elif m_type == 'submitImportBlocks':
+                elif m_type == 'import_blocks':
                     filename_base = \
                         acct_dir(base_dir, nickname, domain) + \
                         '/import_blocks.csv'
@@ -6243,7 +6243,7 @@ class PubServer(BaseHTTPRequestHandler):
                           ' media, zip, csv or font filename in POST')
                     continue
 
-                if m_type == 'submitImportFollows':
+                if m_type == 'import_follows':
                     if os.path.isfile(filename_base):
                         print(nickname + ' imported follows csv')
                     else:
@@ -6251,7 +6251,7 @@ class PubServer(BaseHTTPRequestHandler):
                               nickname)
                     continue
 
-                if m_type == 'submitImportBlocks':
+                if m_type == 'import_blocks':
                     if os.path.isfile(filename_base):
                         blocks_import_succeeded = False
                         if import_blocks(base_dir, nickname, domain,
@@ -6270,7 +6270,7 @@ class PubServer(BaseHTTPRequestHandler):
                           nickname)
                     continue
 
-                if m_type == 'submitImportTheme':
+                if m_type == 'import_theme':
                     if nickname == admin_nickname or \
                        is_artist(base_dir, nickname):
                         if import_theme(base_dir, filename):
diff --git a/webapp_profile.py b/webapp_profile.py
index 9d85fdc41..e4dc1114d 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1540,7 +1540,7 @@ def _html_edit_profile_graphic_design(base_dir: str, translate: {}) -> str:
         '      <label class="labels">' + \
         translate['Import Theme'] + '</label>\n'
     graphics_str += '      <input type="file" id="import_theme" '
-    graphics_str += 'name="submitImportTheme" '
+    graphics_str += 'name="import_theme" '
     graphics_str += 'accept="' + THEME_FORMATS + '">\n'
     graphics_str += \
         '      <label class="labels">' + \
@@ -2049,7 +2049,7 @@ def _html_edit_profile_filtering(base_dir: str, nickname: str, domain: str,
         '      <label class="labels">' + \
         translate['Import Blocks'] + '</label>\n'
     edit_profile_form += '      <input type="file" id="import_blocks" '
-    edit_profile_form += 'name="submitImportBlocks" '
+    edit_profile_form += 'name="import_blocks" '
     edit_profile_form += 'accept="' + BLOCKFILE_FORMATS + '">\n'
     edit_profile_form += \
         '      <label class="labels">' + \
@@ -2282,7 +2282,7 @@ def _html_edit_profile_import_export(nickname: str, domain: str,
         '<p><label class="labels">' + \
         translate['Import Follows'] + '</label>\n'
     edit_profile_form += '<input type="file" id="import_follows" '
-    edit_profile_form += 'name="submitImportFollows" '
+    edit_profile_form += 'name="import_follows" '
     edit_profile_form += 'accept=".csv"></p>\n'
 
     edit_profile_form += \
diff --git a/webapp_theme_designer.py b/webapp_theme_designer.py
index 1bd02ee90..452db9d5a 100644
--- a/webapp_theme_designer.py
+++ b/webapp_theme_designer.py
@@ -334,7 +334,7 @@ def html_theme_designer(base_dir: str,
         '      <label class="labels">' + \
         translate['Import Theme'] + '</label>\n'
     export_import_str += '      <input type="file" id="import_theme" '
-    export_import_str += 'name="submitImportTheme" '
+    export_import_str += 'name="import_theme" '
     export_import_str += 'accept="' + theme_formats + '">\n'
     export_import_str += \
         '      <label class="labels">' + \