modify merge bbs for SOB's boards

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2281 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

4 files changed, 13 insertions, 12 deletions

diff --git a/include/proto.h b/include/proto.h
index 8b1f1927..edfad702 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -359,7 +359,7 @@ int Name_Menu(void);
 #ifdef MERGEBBS
 /* merge */
 int m_fpg(void);
-void m_fpg_brd(char *bname,char *fromdir);
+void m_sob_brd(char *bname,char *fromdir);
 #endif
 
 /* more */
diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index 93daf32a..90038ab3 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -430,10 +430,10 @@ m_mod_board(char *bname)
 	if (HAS_PERM(PERM_SYSOP)) {
 	   char frombname[20], fromdir[256];
 #ifdef MERGEBBS
-	   if(getans("是否匯入小魚看板? (y/N)")=='y')
+	   if(getans("是否匯入SOB看板? (y/N)")=='y')
 	   { 
                  setbdir(genbuf, bname);
-	         m_fpg_brd(bname, fromdir);
+	         m_sob_brd(bname, fromdir);
 		 if(!fromdir[0]) break;
                  merge_dir(genbuf, fromdir, 1);
            }
diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index e4ef891c..2dd14d4e 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -395,7 +395,7 @@ const static commands_t userlist[] = {
     {u_register, PERM_BASIC,        "RRegister      填寫《註冊申請單》"},
     {u_list, PERM_SYSOP,            "UUsers         列出註冊名單"},
 #ifdef MERGEBBS
-    {m_fpg, PERM_LOGINOK,             "FFPG Import    花園變身術"},
+    {m_fpg, PERM_SYSOP,             "FFPG Import    花園變身術"},
 #endif
     {NULL, 0, NULL}
 };
diff --git a/mbbsd/merge.c b/mbbsd/merge.c
index 9601bf1e..3423e91e 100644
--- a/mbbsd/merge.c
+++ b/mbbsd/merge.c
@@ -194,7 +194,7 @@ m_fpg()
 }
 
 void
-m_fpg_brd(char *bname, char *fromdir)
+m_sob_brd(char *bname, char *fromdir)
 {
   char fbname[25], buf[256];
   fileheader_t fh;
@@ -202,24 +202,25 @@ m_fpg_brd(char *bname, char *fromdir)
   fromdir[0]=0;
   do{
 
-     if(!getdata(20,0, "小魚的板名 [英文大小寫要完全正確]:", fbname, 20,
+     if(!getdata(20,0, "SOB的板名 [英文大小寫要完全正確]:", fbname, 20,
 	        DOECHO)) return;
   }
   while((invalid_brdname(fbname)&1));
 
-  sprintf(buf, "fpg/boards/%s.inf", fbname);
+  sprintf(buf, "sob/man/%s.tar.gz", fbname);
   if(!dashf(buf))
   {
        vmsg("無此看板");
        return;
   }
-  chdir("fpg");
-  sprintf(buf, "tar zxf boards/%s.tgz >/dev/null",fbname);
+  chdir(BBSHOME"/sob/boards");
+  sprintf(buf, "tar zxf %s.tar.gz >/dev/null",fbname);
   system(buf);
-  sprintf(buf, "tar zxf boards/%s.man.tgz >/dev/null", fbname);
+  chdir(BBSHOME"/sob/man");
+  sprintf(buf, "tar zxf %s.tar.gz >/dev/null", fbname);
   system(buf);
   chdir(BBSHOME);
-  sprintf(buf, "mv fpg/home/bbs/man/boards/%s man/boards/%c/%s", fbname,
+  sprintf(buf, "mv sob/man/%s man/boards/%c/%s", fbname,
 	    bname[0], bname);
   system(buf);
   sprintf(fh.title, "◆ %s 精華區", fbname);
@@ -227,6 +228,6 @@ m_fpg_brd(char *bname, char *fromdir)
   sprintf(fh.owner, cuser.userid);
   sprintf(buf, "man/boards/%c/%s/.DIR", bname[0], bname);
   append_record(buf, &fh, sizeof(fh));
-  sprintf(fromdir, "fpg/home/bbs/boards/%s/.DIR", fbname);
+  sprintf(fromdir, "sob/boards/%s/.DIR", fbname);
   vmsg("即將匯入 %s 版資料..按鍵後需要一點時間",fbname);
 }