README.md

@@ -18,7 +18,7 @@ picked from articles selected for him to read according his vocabulary level.  E
 
 `python3 main.py`
 
-Make sure you have put the SQLite database file in the path `app/db` (see below).
+Make sure you have put the SQLite database file in the path `app/static` (see below).
 
 
 ## Run it as a Docker container
@@ -214,5 +214,5 @@ Bug report: http://118.25.96.118/bugzilla/show_bug.cgi?id=215
 Bug report: http://118.25.96.118/bugzilla/show_bug.cgi?id=489
 
 
-*Last modified on 2026-03-12*
+*Last modified on 2023-01-30*
 

app/Article.py

@@ -106,7 +106,7 @@ def get_today_article(user_word_list, visited_articles):
         text_level = text_difficulty_level(d['text'], d3)
         result_of_generate_article = "found"
 
-    today_article = {}
+    today_article = None
     if d:
         oxford_words = load_oxford_words(oxford_words_path)
         oxford_word_count, total_words = count_oxford_words(d['text'],oxford_words)

app/Login.py

@@ -21,6 +21,11 @@ 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):
     user = get_user_by_username(username)
     encoded_password = md5(username + password)
@@ -49,12 +54,12 @@ def change_password(username, old_password, new_password):
     :return: 修改成功:True 否则:False
     '''
     if not verify_user(username, old_password):  # 旧密码错误
-        return {'error':'Old password is wrong.', 'username':username}
+        return False
     # 将用户名和密码一起加密，以免暴露不同用户的相同密码
-    if new_password == old_password:  #新旧密码一致
+    if verify_pass(new_password, old_password):  #新旧密码一致
-        return {'error':'New password cannot be the same as the old password.', 'username':username}
+        return False
     update_password_by_username(username, new_password)
-    return {'success':'Password changed', 'username':username}
+    return True
 
 
 def get_expiry_date(username):

app/account_service.py

@@ -133,7 +133,10 @@ def reset():
         # POST请求用于提交修改后信息
         old_password = escape(request.form['old-password'])
         new_password = escape(request.form['new-password'])
-        result = change_password(username, old_password, new_password)
+        flag = change_password(username, old_password, new_password) # flag表示是否修改成功
-        return jsonify(result)
+        if flag:
-
+            session['logged_in'] = False
+            return jsonify({'status':'1'})  # 修改成功
+        else:
+            return jsonify({'status':'2'})  # 修改失败
 

app/main.py

@@ -144,8 +144,8 @@ if __name__ == '__main__':
     运行程序
     '''
     # app.secret_key = os.urandom(16)
-    app.run(debug=True, port=5000)
+    # app.run(debug=False, port='6000')
-    # app.run(debug=True)
+    app.run(debug=True)
     # app.run(debug=True, port='6000')
     # app.run(host='0.0.0.0', debug=True, port='6000')
     # print(mod5('123'))

app/static/js/password.js

@@ -1,20 +0,0 @@
-function containsDigitsLettersSpecialCharacters(s) {
-    let resultD = 0, resultL = 0, resultS = 0;
-
-    // Digit test
-    '0123456789'.split('').forEach((x) => {
-	if (s.includes(x))
-	    resultD = 1;
-    });
-
-    // Letter test
-    resultL =  /[a-z]/i.test(s);
-
-    // Special charater test
-    '+-*/,.:;/\[]<>$%&()!?^~'.split('').forEach((x) => {
-	if (s.includes(x))
-	    resultS = 1;
-    });
-
-    return resultD + resultL + resultS == 3;
-}

app/static/js/word_operation.js

@@ -60,13 +60,7 @@ function delete_word(theWord) {
                 removeWord(theWord);
             } else {
                 $("#p_" + theWord).remove();
-            }
+            }    
-	    // remove highlighting for the word
-	    let highlightedWords = document.querySelectorAll('.highlighted');
-	    for (let x of highlightedWords) {
-		if (x.innerHTML == word)
-		    x.replaceWith(x.innerHTML);
-	    }
         }
     });
 }
@@ -93,9 +87,7 @@ function parseWord(element) {
     const word = element
         .querySelector("a.btn.btn-light[role=button]")  // 获取当前词频元素的词汇元素
         .innerText  // 获取词汇值;
-    let freqId = `freq_${word}`;
+    const freq = Number.parseInt(element.querySelector(`#freq_${word}`).innerText);   // 获取词汇的数量
-    freqId = CSS.escape(freqId); // for fixing bug 580, escape the apostrophe in the word
-    const freq = Number.parseInt(element.querySelector("#"+freqId).innerText);   // 获取词汇的数量
     return {
         word,
         freq

app/templates/mainpage_get.html

@@ -31,7 +31,7 @@
             <p><a href="/login">登录</a>  <a href="/signup">注册</a> <a href="/static/usr/instructions.html">使用说明</a></p >
             <p><b> {{ random_ads }}。 <a href="/signup">试试</a>吧！</b></p>
         {% endif %}
-        <div class="alert alert-success" role="alert">共有文章 <span class="badge bg-success"> {{ number_of_essays }} </span> 篇，Oxford 5000 单词占比 <span class="badge bg-success"> {{ (ratio * 100) | int }}%  </span> </div>
+        <div class="alert alert-success" role="alert">共有文章 <span class="badge bg-success"> {{ number_of_essays }} </span> 篇，覆盖 <span class="badge bg-success"> {{ (ratio * 100) | int }}%  </span> 的 Oxford5000 单词</div>
         <p>粘贴1篇文章 (English only)</p>
         <form method="post" action="/">
             <textarea name="content" id="article" rows="10" cols="120"></textarea><br/>

app/templates/reset.html

@@ -3,7 +3,6 @@
           content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes"/>
     <link rel="stylesheet" href="static/css/login_service.css">
     <script src="static/js/jquery.js"></script>
-    <script src="static/js/password.js"></script>
     <script>
         function reset() {
             let old_password = $("#old-password").val();
@@ -25,19 +24,15 @@
                 alert('密码过于简单。(密码长度至少4位)');
                 return false;
             }
-            if (!containsDigitsLettersSpecialCharacters(new_password)) {
-		alert('密码过于简单。(密码要包括数字，字母，特殊符号)');
-		return false;
-            }
             $.post("/reset", {'old-password': old_password, 'new-password': new_password},
-                   function (response) {
+                function (response) {
-		       console.log(response);
+                    if (response.status === '1') {
-                    if ('success' in response) {
+                        alert('密码修改成功，请重新登录。');
-                        alert('密码修改成功。');
+                        window.location.href = "/login";
-                    } else if ('error' in response) {
+                    } else if (response.status === '2') {
-                        alert(`密码修改失败 ${response.error}`);
+                        alert('密码修改失败');
+                        window.location.href = "/reset";
                     }
-                    window.location.href = `/${response.username}/userpage`;
                 }
             )
             return false;
@@ -57,4 +52,4 @@
         <button class="btn" onclick="window.location.href='/{{ username }}/userpage'">放弃修改</button>
 
     </div>
-{% endblock %}
+{% endblock %}

app/templates/signup.html

@@ -7,7 +7,6 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE-edge,chrome=1">
     <link href="static/css/slide-unlock.css" rel="stylesheet">
-    <script src="static/js/password.js"></script>
     <script src="static/js/jquery.js"></script>
     <script src="static/js/jquery.slideunlock.js"></script>
     <script>
@@ -22,6 +21,27 @@
         slider.init(); // 初始化滑块解锁功能
     });
 
+      function containsDigitsLettersSpecialCharacters(s) {
+	  let resultD = 0, resultL = 0, resultS = 0;
+
+	  // Digit test
+          '0123456789'.split('').forEach((x) => {
+	      if (s.includes(x))
+		  resultD = 1;
+	  });
+
+	  // Letter test
+	  resultL =  /[a-z]/i.test(s);
+
+	  // Special charater test
+          '+-*/,.:;/\[]<>$%&()!?^~'.split('').forEach((x) => {
+	      if (s.includes(x))
+		  resultS = 1;
+	  });
+
+	  return resultD + resultL + resultS == 3;
+      }
+
     function signup(){
         // 发起 AJAX 请求来处理注册
         username = $("#username").val().trim();

app/templates/userpage_get.html

@@ -87,7 +87,7 @@
 
     <div id="text-content">
         <div id="found">
-          <div class="alert alert-success" role="alert">According to your word list, your level is <span class="text-decoration-underline" id="user_level">{{ today_article["user_level"] }}</span>  and we have chosen an article with a difficulty level of <span class="text-decoration-underline" id="text_level">{{ today_article["text_level"] }}</span> for you. <span class="text-decoration-underline" id="ratio">{{ (today_article["ratio"] * 100) | int }}%</span> of the words in this article are in Oxford Word 5000.</div>
+          <div class="alert alert-success" role="alert">According to your word list, your level is <span class="text-decoration-underline" id="user_level">{{ today_article["user_level"] }}</span>  and we have chosen an article with a difficulty level of <span class="text-decoration-underline" id="text_level">{{ today_article["text_level"] }}</span> for you. The Oxford word coverage is <span class="text-decoration-underline" id="ratio">{{ (today_article["ratio"] * 100) | int }}%.</span></div>
             <p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>
 
 	    <button onclick="saveArticle()" >标记文章</button>

requirements.txt

@@ -6,4 +6,3 @@ snowballstemmer==2.2.0
 Werkzeug==2.2.2
 requests
 pytest~=8.1.1
-Flask-HTTPAuth==4.4.0