4 changed files with 44 additions and 57 deletions
--- a/app/Login.py
+++ b/app/Login.py
@ -5,6 +5,10 @@ from UseSqlite import InsertQuery, RecordQuery
 path_prefix = '/var/www/wordfreq/wordfreq/'
 path_prefix = './'  # comment this line in deployment

+def verify_pass(newpass,oldpass):
+    if(newpass==oldpass):
+        return True
+

 def verify_user(username, password):
    rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
@ -47,6 +51,8 @@ def change_password(username, old_password, new_password):
    if not verify_user(username, old_password):  # 旧密码错误
        return False
    # 将用户名和密码一起加密，以免暴露不同用户的相同密码
+    if verify_pass(new_password,old_password): #新旧密码一致
+        return False
    password = md5(username + new_password)
    rq = InsertQuery(path_prefix + 'static/wordfreqapp.db')
    rq.instructions_with_parameters("UPDATE user SET password=:password WHERE name=:username", dict(
--- a/app/templates/userpage_post.html
+++ b/app/templates/userpage_post.html
@ -1,64 +1,45 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes"
-    />
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes" />
    <meta name="format-detection" content="telephone=no" />

-    {{ yml['header'] | safe }} {% if yml['css']['item'] %} {% for css in
-    yml['css']['item'] %}
-    <link href="{{ css }}" rel="stylesheet" />
-    {% endfor %} {% endif %} {% if yml['js']['head'] %} {% for js in
-    yml['js']['head'] %}
-    <script src="{{ js }}"></script>
-    {% endfor %} {% endif %}
+    {{ yml['header'] | safe }}
+    {% if yml['css']['item'] %}
+        {% for css in yml['css']['item'] %}
+        <link href="{{ css }}" rel="stylesheet">
+        {% endfor %}
+    {% endif %}
+    {% if yml['js']['head'] %}
+        {% for js in yml['js']['head'] %}
+            <script src="{{ js }}" ></script>
+        {% endfor %}
+    {% endif %}

    <title>EnglishPal Study Room for {{username}}</title>
-  </head>
-  <body>
+</head>
+<body>
     <p>勾选不认识的单词</p>
      <form method="post" action="/{{username}}/mark">
-      <input type="submit" name="add-btn" value="加入我的生词簿" />
-      <input
-        onclick="checkall()"
-        type="button"
-        name="add-btn"
-        value="select all"
-      />
-      {% for x in lst %} {% set word = x[0]%}
+       <input type="submit" name="add-btn" value="加入我的生词簿"/>
+       {% for x in lst %}
+          {% set word = x[0]%}
        <p>
            <font color="grey">{{loop.index}}</font>
            :
-        <a
-          href="http://youdao.com/w/eng/{{word}}/#keyfrom=dict2.index"
-          title="{{word}}"
-          >{{word}}</a
-        >
+            <a href='http://youdao.com/w/eng/{{word}}/#keyfrom=dict2.index' title={{word}}>{{word}}</a>
            ({{x[1]}})
-        <input
-          class="select-all"
-          type="checkbox"
-          name="marked"
-          value="{{word}}"
-        />
+            <input type="checkbox" name="marked" value={{word}}>
        </p>

       {% endfor %}
       </form>
-    {{ yml['footer'] | safe }} {% if yml['js']['bottom'] %} {% for js in
-    yml['js']['bottom'] %}
-    <script src="{{ js }}"></script>
-    <script>
-      function checkall() {
-        const selectAllCheckBox = document.querySelectorAll(".select-all");
-        for (let i = 0; i < selectAllCheckBox.length; i++) {
-          selectAllCheckBox[i].checked = true;
-        }
-      }
-    </script>
-    {% endfor %} {% endif %}
-  </body>
+    {{ yml['footer'] | safe }}
+    {% if yml['js']['bottom'] %}
+        {% for js in yml['js']['bottom'] %}
+            <script src="{{ js }}" ></script>
+        {% endfor %}
+    {% endif %}
+</body>
 </html>
--- a/build.sh
+++ b/build.sh
--- a/wordfreqapp.db
+++ b/wordfreqapp.db