Set mail as read already

git-svn-id: http://opensvn.csie.org/pttbbs/branches/Ptt.merge@2084 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

2 files changed, 8 insertions, 6 deletions

diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index 4a04dfef..92c4addd 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -302,11 +302,12 @@ void merge_dir(char *dir1, char *dir2)
          if( strcmp(fh[i-1].filename, fh[i].filename))
 	 {
                 fh[i-1].recommend =0;
+		fh[i-1].filemode |= 1;
                 append_record(dir1, &fh[i-1], sizeof(fileheader_t));
 		strcpy(p1, fh[i].filename);
                 if(!dashd(file1))
 		      {
-			  strcpy(p2, fh[i].filename);
+			  strcpy(p2, fh[i-1].filename);
 			  Copy(file2, file1);
 		      } 
 	 }
diff --git a/mbbsd/merge.c b/mbbsd/merge.c
index c65ab438..aff7c253 100644
--- a/mbbsd/merge.c
+++ b/mbbsd/merge.c
@@ -94,7 +94,7 @@ m_fpg()
    strcat(msg,buf);
    sprintf(buf, "¦¹±b¸¹µù¥U¤é´Á %s ±N¨ú ",Cdatedate(&(cuser.firstlogin)));
    strcat(msg,buf);
-   prints(buf, "%s", Cdatedate(&d) );
+   sprintf(buf, "±N¨ú %s\n", Cdatedate(&d) );
    strcat(msg,buf);
    cuser.firstlogin = d;
 
@@ -112,7 +112,7 @@ m_fpg()
                  man.numposts,cuser.numposts,i);
    strcat(msg,buf);
    cuser.numposts = i;
-   prints(buf);
+   outs(msg);
    while(search_ulistn(usernum,2)) 
         {vmsg("½Ð±N­«ÂФW¯¸¨ä¥L½uÃö³¬! ¦AÄ~Äò");}
    passwd_update(usernum, &cuser);
@@ -139,7 +139,7 @@ m_fpg()
 	      userid[0], userid,
 	      cuser.userid[0], cuser.userid);
         system(buf);
-        strcat(msg, "¶×¤J­Ó¤H«H½cºëµØµØØ°Ï\n");
+        strcat(msg, "¶×¤J­Ó¤H«H½cºëµØ°Ï\n");
    }
    if(getans("¬O§_¶×¤J¦n¤Í¦W³æ? (·|Âл\\²{¦³³]©w, ID¥i¯à¬O¤£¦P¤H)? (y/N)")=='y')
    {
@@ -148,15 +148,16 @@ m_fpg()
        Copy(buf, genbuf);
        strcat(buf, genbuf);
        friend_load(FRIEND_OVERRIDE);
-       strcat(msg, "¶×¤J¦n¦³¤Í¤ÍͦW³ææ\n");
+       strcat(msg, "¶×¤J¦n¦³¤Íͳææ\n");
    }
-   sprintf(buf, "±b¸¹¸¹¹¶×פJ³øø§i %s -> %s ", userid, cuser.userid);
+   sprintf(buf, "±b¸¹¶×¤J³ø§i %s -> %s ", userid, cuser.userid);
    post_msg("Security", buf, msg, "[¨t²Î¦w¥þ§½]");
    sprintf(buf, "fpg/home/bbs/home/%c/%s/PttID", userid[0],userid);
    if((fp = fopen(buf, "w")))
      {
         fprintf(fp, "%s\n", cuser.userid);
         fprintf(fp, "%s", msg);
+	fclose(fp);
      }
 
    vmsg("®¥³ß±z§¹¦¨±b¸¹Åܨ­..");