Yoshihisa Fukuhara
higef****@users*****
2006年 3月 23日 (木) 12:46:14 JST
Index: affelio/apps/bb/AF_app.cfg diff -u affelio/apps/bb/AF_app.cfg:1.1 affelio/apps/bb/AF_app.cfg:1.2 --- affelio/apps/bb/AF_app.cfg:1.1 Mon Dec 19 15:46:27 2005 +++ affelio/apps/bb/AF_app.cfg Thu Mar 23 12:46:13 2006 @@ -4,10 +4,10 @@ [application] app_URI = http://affelio.jp/NS/apps/bb app_name=AffelioBB -app_version=1.0.1 +app_version=2.0 app_desc=AffelioBB -app_author=Affelio project +app_author=Affelio Inc. guest_index=index.cgi -owner_index=owner.cgi +owner_index=admin.cgi action_types=super, user action_types_desc=特権ユーザ,一般ユーザ Index: affelio/apps/bb/README diff -u affelio/apps/bb/README:1.1 affelio/apps/bb/README:1.2 --- affelio/apps/bb/README:1.1 Mon Dec 19 15:46:27 2005 +++ affelio/apps/bb/README Thu Mar 23 12:46:13 2006 @@ -1,5 +1,5 @@ ################################################## -# Žg‚¢•û +# Affelio BB ver2.0 README ################################################## ‚PjƒCƒ“ƒXƒg[ƒ‹ @@ -11,62 +11,104 @@ resource/face/@ƒtƒHƒ‹ƒ_ˆÈ‰º‚É•Û‘¶‚µ‚Ä‚‚¾‚³‚¢B ‚È‚¨Aowner.gif‚Æ‚¢‚¤–¼‘O‚̉摜‚ðÝ’u‚·‚é‚ÆAŽ©“®“I‚ÉŠÇ—ŽÒê—p‚̃AƒCƒRƒ“‚É‚È‚è‚Ü‚·B ŠÇ—ŽÒ‚Æ‚µ‚ăRƒƒ“ƒg‚ð“o˜^‚·‚éÛA‘¼‚ÌŠçƒAƒCƒRƒ“‚ð‘I‘ð‚µ‚È‚¢‚ÆŽ©“®“I‚ÉŠÇ—ŽÒƒAƒCƒRƒ“‚ªÌ—p‚³‚ê‚Ü‚·B - + + ¦¦¦ƒAƒbƒvƒOƒŒ[ƒh¦¦¦ + ‹Œ”Åiver0.xŒn‚¨‚æ‚Ñver1.xŒnj‚©‚ç‚̃AƒbƒvƒOƒŒ[ƒh•û–@‚ɂ‚¢‚ÄB + bb/upgrade/index.cgi‚ðŽÀs‚µ‚Ä‚‚¾‚³‚¢B + ì‹Æ‘O‚É•K‚¸ƒf[ƒ^ƒx[ƒX‚̃oƒbƒNƒAƒbƒv‚ðŽæ“¾‚µ‚ÄAƒ†[ƒU[‚̃AƒNƒZƒX‚ð‹ÖŽ~‚µ‚Ä‚‚¾‚³‚¢B + + ‚QjŽg‚¢•û - 3.1 ʼn‚É - E‚Ü‚¸Å‰‚ÉŠÇ—‰æ–Ê‚ÌuƒJƒeƒSƒŠ‚̒ljÁ^•ÒWv‚©‚ç‚È‚É‚©ƒJƒeƒSƒŠ‚ð’ljÁ‚µ‚Ä‚‚¾‚³‚¢B - Å’áˆê‚ˆÈã‚̃JƒeƒSƒŠ‚ª‚È‚¢‚ÆŒfŽ¦”‚͎g‚¦‚Ü‚¹‚ñB - EŽŸ‚ÉAuƒAƒNƒZƒXƒRƒ“ƒgƒ[ƒ‹v‚©‚çAƒAƒNƒZƒXŒ ‚ÌÝ’è‚ð‚µ‚Ä‚‚¾‚³‚¢B - ŒfŽ¦”‚ðŠÜ‚ÞƒRƒ~ƒ…ƒjƒeƒB‚̉^‰c‚ÉŽQ‰Á‚·‚éƒRƒAƒƒ“ƒo[‚Íu“ÁŒ ƒ†[ƒUv‚ÉŽw’è‚·‚é‚Æ‚æ‚¢‚Å‚µ‚傤B - ŒfŽ¦”‚ł̋c˜_‚ÉŽQ‰Á‚³‚¹‚郆[ƒU‚É‚Íuˆê”ʃ†[ƒUv‚ÌŽw’è‚ð‚µ‚Ä‚‚¾‚³‚¢B‚±‚ê‚ð‚µ‚È‚¢‚Æ‘ž‚ß‚Ü‚¹‚ñB - ˆê”ʃQƒXƒg‚É‚àŒfŽ¦”‚ðŒöŠJ‚·‚éꇂɂÍuˆê”ʃ†[ƒUv‚Æ‚µ‚Ä“o˜^‚µ‚Ä‚‚¾‚³‚¢Bˆê”ʃQƒXƒg‚É“ÁŒ ƒ†[ƒUŒ ŒÀ‚ð—^‚¦‚邱‚Æ‚Í„§‚µ‚Ü‚¹‚ñB - EŽŸ‚Ƀgƒbƒvƒy[ƒW‚©‚çƒJƒeƒSƒŠ“à‚É‚¢‚‚‚©ƒtƒH[ƒ‰ƒ€‚ðì‚Á‚Ä‚Ý‚Ü‚µ‚傤B - ˆê”ʃ†[ƒU‚Í‚±‚̃tƒH[ƒ‰ƒ€‚̉º‚ɃgƒsƒbƒN‚𗧂Ă邱‚Æ‚ª‚Å‚«‚é‚悤‚É‚È‚è‚Ü‚·B - - 3.2 ‹LŽ–‚Ì“Še‚â•ÒW^íœ + 2.1 ʼn‚É + EAffelio Bulletin Board‚ÍAˆê”ÔãŠK‘w‚ÌuƒJƒeƒSƒŠ[vA‚»‚̉º‚ÌuƒtƒH[ƒ‰ƒ€vA‚»‚µ‚ÄŒfŽ¦”‚̃XƒŒƒbƒh‚É‚ ‚½‚éuƒgƒsƒbƒNv‚Ì‚RŠK‘w‚©‚ç‚È‚Á‚Ä‚¢‚Ü‚·B + E‚Ü‚¸Å‰‚ÉŠÇ—‰æ–Ê‚ÌuƒJƒeƒSƒŠ‚Ìì¬v‚©‚ç‚È‚É‚©ƒJƒeƒSƒŠ‚ð’ljÁ‚µ‚Ä‚‚¾‚³‚¢B + @ŽŸ‚ɃJƒeƒSƒŠ“à‚É‚¢‚‚‚©ƒtƒH[ƒ‰ƒ€‚ðì‚Á‚Ä‚Ý‚Ü‚µ‚傤B‚±‚̃tƒH[ƒ‰ƒ€‚̉º‚ɃgƒsƒbƒN‚𗧂Ă邱‚Æ‚ª‚Å‚«‚é‚悤‚É‚È‚è‚Ü‚·B + @Å’áˆê‚ˆÈã‚̃JƒeƒSƒŠ‚ƃtƒH[ƒ‰ƒ€‚ª‚È‚¢‚ÆŒfŽ¦”‚͎g‚¦‚Ü‚¹‚ñB + + 2.2 ‹LŽ–‚Ì“Še‚â•ÒW^íœ —˜—pŽÒ‚̓gƒsƒbƒN‚𗧂Ă½‚èA‚»‚ê‚ɃRƒƒ“ƒg‚ð‚‚¯‚½‚è‚Å‚«‚Ü‚·B “ŠeŽÒ‚ÍŽ©•ª‚Ì쬂µ‚½ƒgƒsƒbƒN‚Ì•ÒW‚ª‚Å‚«‚Ü‚·B - “ŠeŽÒ‚ÍŽ©•ª‚Ì“Še‚µ‚½ƒRƒƒ“ƒg‚Ì휂ª‚Å‚«‚Ü‚·B + Œ ŒÀ‚ª—^‚¦‚ç‚ê‚Ä‚¢‚ê‚ΓŠeŽÒ‚ÍŽ©•ª‚Ì“Še‚µ‚½ƒgƒsƒbƒN‚âƒRƒƒ“ƒg‚ÌíœAƒgƒsƒbƒN‚̃ƒbƒNAd—v“x‚ÌÝ’è‚È‚Ç‚Ì‹@”\‚ªŽg‚¦‚Ü‚·iŒãqjB - 3.3 ˆê”ʃQƒXƒg‚Ì“Še‚ɂ‚¢‚Ä + 2.3 ˆê”ʃQƒXƒg‚Ì“Še‚ɂ‚¢‚Ä AffelioƒŠƒ“ƒN‚³‚ê‚Ä‚¢‚él‚ªŒfŽ¦”‚𗘗p‚·‚éê‡AƒjƒbƒNƒl[ƒ€‚âƒpƒXƒ[ƒh‚ð“ü—Í‚·‚é•K—v‚Í‚ ‚è‚Ü‚¹‚ñB ‚»‚êˆÈŠO‚Ì•û‚ª—˜—p‚·‚éꇂ̓jƒbƒNƒl[ƒ€‚â•ÒW^휗pƒpƒXƒ[ƒh‚Ì“ü—Í‚ð‹‚ß‚ç‚ê‚Ü‚·B ‚RjƒAƒNƒZƒXŒ ‚ÌÝ’è - ƒAƒNƒZƒXŒ ‚̓AƒvƒŠŠÇ—‰æ–ʂ̃AƒNƒZƒXƒRƒ“ƒgƒ[ƒ‹‚©‚çÝ’è‚Å‚«‚Ü‚·B - ƒ†[ƒU[‚ɑ΂·‚éƒAƒNƒZƒXŒ ‚Íuˆê”ʃ†[ƒUv‚Æu“ÁŒ ƒ†[ƒUv‚Ì“ñŽí—Þ‚ªÝ’è‚Å‚«‚Ü‚·B - ˆÈ‰º‚É‚»‚ꂼ‚ê‚̃†[ƒU[‚ɂ‚¢‚Äq‚ׂ܂·B - - Eˆê”ʃ†[ƒU - ƒgƒsƒbƒN‚Ì쬂âƒRƒƒ“ƒg‚Ì‘‚«ž‚Ý‚ª‚Å‚«‚Ü‚·B - E“ÁŒ ƒ†[ƒU - ã‹L‚ɉÁ‚¦‚ătƒH[ƒ‰ƒ€‚Ì쬂ª‚Å‚«‚Ü‚·B - ƒgƒsƒbƒN‚̃ƒbƒN^ƒAƒ“ƒƒbƒN‚ª‚Å‚«‚Ü‚·iƒƒbƒN‚³‚ꂽƒgƒsƒbƒN‚̓Rƒƒ“ƒg‘ž‚Ý‚ª‚Å‚«‚È‚‚È‚è‚Ü‚·jB - ƒgƒsƒbƒN‚Éd—v“x‚ªÝ’è‚Å‚«‚Ü‚·B - ‚½‚¾‚µAŽ©•ª‚Ì‘‚¢‚½ƒgƒsƒbƒN‚âƒtƒH[ƒ‰ƒ€ˆÈŠO‚Í•ÒW^휂ł«‚Ü‚¹‚ñB - EƒTƒCƒgƒI[ƒi[ - ã‹L‚Ì‹@”\‚ª‚·‚ׂĎg‚¦‚Ü‚·B - ‚Ü‚½‚·‚ׂĂ̑‚«ž‚݂ɑ΂µ‚ÄA•ÒW^휌 ŒÀ‚ðŽ‚¿‚Ü‚·B - ƒJƒeƒSƒŠ[‚Ì쬂ª‚Å‚«‚Ü‚·B - ‚»‚Ì‘¼ŠÇ—‰æ–Ê‚æ‚èŠeŽí‹@”\BBB + 3.1 ‚¨‚¨‚Ü‚©‚ȃAƒNƒZƒXƒRƒ“ƒgƒ[ƒ‹ + ƒAƒNƒZƒXŒ ‚̓AƒvƒŠŠÇ—‰æ–Ê‚ÌuƒAƒNƒZƒXƒRƒ“ƒgƒ[ƒ‹v‚©‚çÝ’è‚Å‚«‚Ü‚·B + ƒ†[ƒU[‚ɑ΂·‚éƒAƒNƒZƒXŒ ‚Íuˆê”ʃ†[ƒUv‚Æu“ÁŒ ƒ†[ƒUv‚Ì“ñŽí—Þ‚ªÝ’è‚Å‚«‚Ü‚·B + ŒfŽ¦”‚ðŠÜ‚ÞƒRƒ~ƒ…ƒjƒeƒB‚̉^‰c‚ÉŽQ‰Á‚·‚éƒRƒAƒƒ“ƒo[‚Íu“ÁŒ ƒ†[ƒUv‚ÉŽw’è‚·‚é‚Æ‚æ‚¢‚Å‚µ‚傤B + ŒfŽ¦”‚ł̋c˜_‚ÉŽQ‰Á‚³‚¹‚郆[ƒU‚É‚Íuˆê”ʃ†[ƒUv‚ÌŽw’è‚ð‚µ‚Ä‚‚¾‚³‚¢B’Êí‚Í‚±‚ê‚ð‚µ‚È‚¢‚Æ‘ž‚ß‚Ü‚¹‚ñB + ˆê”ʃQƒXƒg‚É‚àŒfŽ¦”‚ðŒöŠJ‚·‚éꇂɂÍuˆê”ʃ†[ƒUv‚Æ‚µ‚Ä“o˜^‚µ‚Ä‚‚¾‚³‚¢Bˆê”ʃQƒXƒg‚É“ÁŒ ƒ†[ƒUŒ ŒÀ‚ð—^‚¦‚邱‚Æ‚Í„§‚µ‚Ü‚¹‚ñB + ‰ŠúÝ’è‚ł͈ȉº‚̂悤‚ÈÝ’è‚É‚È‚è‚Ü‚·‚ªAˆê”ʃ†[ƒUA“ÁŒ ƒ†[ƒU‚»‚ꂼ‚ꂪŽg‚¦‚é‹@”\‚ÍŽŸÍ‚ÌuŒ ŒÀ‚ÌÝ’èv‚©‚çׂ©‚Ý’è‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·B + + Eˆê”ʃ†[ƒU + @ƒgƒsƒbƒN‚Ì쬂âƒRƒƒ“ƒg‚Ì‘‚«ž‚Ý‚ª‚Å‚«‚Ü‚·B + @‚½‚¾‚µAŽ©•ª‚Ì‘‚¢‚½ƒgƒsƒbƒN‚âƒtƒH[ƒ‰ƒ€ˆÈŠO‚Í•ÒW^휂ł«‚Ü‚¹‚ñB + E“ÁŒ ƒ†[ƒU + @ã‹L‚ɉÁ‚¦‚ătƒH[ƒ‰ƒ€‚Ì쬂ª‚Å‚«‚Ü‚·B + @ƒgƒsƒbƒN‚̃ƒbƒN^ƒAƒ“ƒƒbƒN‚ª‚Å‚«‚Ü‚·iƒƒbƒN‚³‚ꂽƒgƒsƒbƒN‚̓Rƒƒ“ƒg‘ž‚Ý‚ª‚Å‚«‚È‚‚È‚è‚Ü‚·jB + @ƒgƒsƒbƒN‚Éd—v“x‚ªÝ’è‚Å‚«‚Ü‚·B + @‚½‚¾‚µAŽ©•ª‚Ì‘‚¢‚½ƒgƒsƒbƒN‚âƒtƒH[ƒ‰ƒ€ˆÈŠO‚Í•ÒW^휂ł«‚Ü‚¹‚ñB + EƒTƒCƒgƒI[ƒi[ + @ã‹L‚Ì‹@”\‚ª‚·‚ׂĎg‚¦‚Ü‚·B + @‚Ü‚½‚·‚ׂĂ̑‚«ž‚݂ɑ΂µ‚ÄA•ÒW^휌 ŒÀ‚ðŽ‚¿‚Ü‚·B + @ƒJƒeƒSƒŠ[‚Ì쬂ª‚Å‚«‚Ü‚·B + @‚»‚Ì‘¼ŠÇ—‰æ–Ê‚æ‚èŠeŽí‹@”\BBB + + 3.2 ׂ©‚ÈŒ ŒÀ‚ÌÝ’è + EƒJƒeƒSƒŠ‚Ìì¬^•ÒW + ƒJƒeƒSƒŠ‚Ì쬂Ɠà—e‚Ì•ÒW‚ª‚¨‚±‚È‚¦‚Ü‚·B + EƒJƒeƒSƒŠ‚Ìíœ + ƒJƒeƒSƒŠ‚Ì휂ª‚Å‚«‚Ü‚·BŠY“–ƒJƒeƒSƒŠˆÈ‰º‚ɃtƒH[ƒ‰ƒ€‚ª‚ ‚éꇂÍ휂ł«‚Ü‚¹‚ñB + EƒJƒeƒSƒŠ‚Ìó‘ÔÝ’è + Œ»Ý–¢Žg—pB + EƒtƒH[ƒ‰ƒ€‚Ìì¬^•ÒW + ƒtƒH[ƒ‰ƒ€‚Ì쬂Ɠà—e‚Ì•ÒW‚ª‚¨‚±‚È‚¦‚Ü‚·B‚Ü‚½AƒtƒH[ƒ‰ƒ€‚ð•Ê‚̃JƒeƒSƒŠ[‚Ɉړ®‚·‚邱‚Æ‚à‚Å‚«‚Ü‚·B + EƒtƒH[ƒ‰ƒ€‚Ìíœ + ƒtƒH[ƒ‰ƒ€‚Ì휂ª‚Å‚«‚Ü‚·BŠY“–ƒtƒH[ƒ‰ƒ€ˆÈ‰º‚ɃgƒsƒbƒN‚ª‚ ‚éꇂÍ휂ł«‚Ü‚¹‚ñB + EƒtƒH[ƒ‰ƒ€‚Ìó‘ÔÝ’è + Œ»Ý–¢Žg—pB + EƒgƒsƒbƒN‚Ìì¬^•ÒW + ƒgƒsƒbƒN‚Ì쬂Ɠà—e‚Ì•ÒW‚ª‚¨‚±‚È‚¦‚Ü‚·B‚Ü‚½ƒgƒsƒbƒN‚ð•Ê‚̃tƒH[ƒ‰ƒ€‚Ɉړ®‚·‚邱‚Æ‚à‚Å‚«‚Ü‚·B + EƒgƒsƒbƒN‚Ìíœ + ƒgƒsƒbƒN‚Ì휂ª‚Å‚«‚Ü‚·B + EƒgƒsƒbƒN‚Ìó‘ÔÝ’è + ƒgƒsƒbƒN‚Ìd—v“x‚ÌÝ’èA‚¨‚æ‚уgƒsƒbƒN‚̃ƒbƒN‚ª‚Å‚«‚Ü‚·B + EƒRƒƒ“ƒg‚Ì‘‚«ž‚Ý + ƒgƒsƒbƒN‚ɃRƒƒ“ƒg‚ª‘ž‚ß‚Ü‚·B + EƒRƒƒ“ƒg‚Ìíœ + ƒRƒƒ“ƒg‚ð휂µ‚Ü‚·B + + ‚·‚ׂĂ̋@”\‚Íuì¬^•ÒWvŒ ŒÀ‚ª—DˆÊ‚É‚ ‚è‚Ü‚·B—Ⴆ‚ÎAƒgƒsƒbƒN‚Ìì¬^•ÒWŒ ŒÀ‚ª‚È‚¢ê‡A휂âó‘ÔÝ’è‚Ƀ`ƒFƒbƒN‚ð“ü‚ê‚Ä‚àˆÓ–¡‚ª‚ ‚è‚Ü‚¹‚ñB + ‚Ü‚½A•ÒW‘€ì‚â휂͎©•ª‚Ìì‚Á‚½ƒRƒ“ƒeƒ“ƒc‚ɑ΂µ‚Ä‚Ì‚Ý‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·iƒTƒCƒgƒI[ƒi[‚Í‚·‚ׂẴRƒ“ƒeƒ“ƒc‚ð‘€ì‚Å‚«‚Ü‚·jB + ƒJƒeƒSƒŠ‚âƒtƒH[ƒ‰ƒ€‚͉ºˆÊƒRƒ“ƒeƒ“ƒc‚ª‘¶Ý‚·‚éê‡A휂ł«‚Ü‚¹‚ñBˆê”Ê“I‚Éíœsˆ×‚Í‹—Í‚ÈŒ ŒÀ‚Å‚·‚Ì‚ÅAƒ†[ƒU‚ɉ^—p‚ð‚Ü‚©‚¹‚éÛ‚ÍŒ ŒÀŽÒ‚ð‚«‚¿‚ñ‚ƧŒÀ‚µA‚Ü‚½íœ‘O‚ÉŽü’m‚·‚é‚Ȃǂ̃‹[ƒ‹‚ðݒ肵‚½•û‚ª—Ç‚¢‚Å‚µ‚傤Bi‚È‚¨‚±‚Ì‹@”\‚Í¡ŒãA‰ºˆÊƒRƒ“ƒeƒ“ƒc‚ª‚ ‚éꇂłà휂ł«‚é‚悤‚ÉŠg’£‚³‚ê‚é‰Â”\«‚ª‚ ‚è‚Ü‚·Bj + ƒJƒeƒSƒŠ‚Ì‘€ì‚ÍAffelio‚̈ê”ʃQƒXƒg‚ɂ̓AƒNƒZƒXƒRƒ“ƒgƒ[ƒ‹‚ÌÝ’è‚Å‹–‰Â‚µ‚Ä‚ ‚Á‚Ä‚à‘€ì‚Å‚«‚Ü‚¹‚ñB ################################################## # —š—ð ################################################## - -2005.12.17 Ver1.0RC - First experimental release. +2006.03.22 Ver2.0 + ƒ†[ƒU[Œ ŒÀ‚Ìׂ©‚¢Ý’肪‰Â”\‚É‚È‚éB + ƒJƒeƒSƒŠ[‚âƒtƒH[ƒ‰ƒ€‚̈ړ®^Á‹Ž‚ª‰Â”\‚ÉB + ƒ\[ƒXƒR[ƒh‘S‘Ì‚Ì‘å•‚ÈŒ©’¼‚µB‚³‚Ü‚´‚܂ȃoƒOC³B + ƒe[ƒuƒ‹–¼‚Ì•ÏXBƒ†[ƒU[Œ ŒÀÝ’è‚Ì‚½‚ß‚ÌV‚µ‚¢ƒe[ƒuƒ‹‚̒ljÁB + owner.cgi->admin.cgi‚É•ÏXB 2005.12.21 Ver1.0.1 Fixed some minor bugs. +2005.12.17 Ver1.0RC + First experimental release. + ################################################## # ƒ‰ƒCƒZƒ“ƒX ################################################## -# Copyright (C) 2005 FishGrove Inc. +# Copyright (C) 2005-2006 Affelio Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License Index: affelio/apps/bb/admin.cgi diff -u /dev/null affelio/apps/bb/admin.cgi:1.1 --- /dev/null Thu Mar 23 12:46:14 2006 +++ affelio/apps/bb/admin.cgi Thu Mar 23 12:46:13 2006 @@ -0,0 +1,36 @@ +#!/usr/bin/perl + +# Copyright (C) 2006 Affelio Inc. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +use strict; +use lib("../../extlib"); +use Error qw(:try); +use bb; +use bb::Admin; + +try{ + my $admin = new bb(); + $admin->run_admin(); +}catch Error with{ + my $e = shift; + print "Content-type: text/html; charset=UTF-8\n"; + print "Pragma: no-cache", "\n\n"; + print "<HTML>"; + print "<HEAD><TITLE>Error</TITLE></HEAD>"; + print "$e<BR><BR><HR><PRE>" . $e->stacktrace; +}; + Index: affelio/apps/bb/bb.pm diff -u affelio/apps/bb/bb.pm:1.4 affelio/apps/bb/bb.pm:1.5 --- affelio/apps/bb/bb.pm:1.4 Wed Jan 25 22:59:21 2006 +++ affelio/apps/bb/bb.pm Thu Mar 23 12:46:13 2006 @@ -1,4 +1,4 @@ -# Copyright (C) 2005 FishGrove Inc. +# Copyright (C) 2006 Affelio Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -15,143 +15,172 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. package bb; - -use strict; -use DBI; -use Jcode; -use HTML::Template; -use Config::Tiny; -use bb::L10N; -use Affelio::NetLib::Email qw(send_email); - +{ + use strict; + use lib("../../extlib"); + use lib("../../lib"); + use bb::L10N; + use DBI; + use AffelioApp; + use HTML::Template; + use CGI; + use Cwd; + use Affelio::misc::Debug qw( debug_print); + use Affelio::misc::WebInput; + use Affelio::exception::SystemException; + use Error qw(:try); + + use Affelio::NetLib::Email qw(send_email); + use Config::Tiny; + use bb::Topic; ############################################## # Constructor ############################################## -sub new { - my ($class, $afap) = @_; - unless ($afap) { die("bb::new: Error: missing username\n"); } - - my $self = {}; - $self->{afap} = $afap; - $self->{tmpfile}= $afap->get_userdata_dir()."/.sqltmp"; - $self->{category_tb}= "$afap->{install_name}_category"; - $self->{forum_tb}= "$afap->{install_name}_forum"; - $self->{topic_tb}= "$afap->{install_name}_topic"; - $self->{pref_tb}= "$afap->{install_name}_pref"; - $self->{spam_tb}= "$afap->{install_name}_spam"; - - $self->{dbh} = undef; - #initialize - - ########################### - #Locale init - ########################### - $self->{lh} = bb::L10N->get_handle(($afap->get_site_info("locale"), - $afap->get_site_info("locale"))); - ########################### - my $sth; - my $query; - $self->{dbh} = $afap->get_userdata_dbh(); - unless(-f $self->{tmpfile}) { - open(TMP,"> $self->{tmpfile}"); - close(TMP); - - #Category table - $query="category_id INTEGER".get_query_primarykey($self)." - title TEXT, - timestamp INTEGER, - update_time INTEGER, - user TEXT, - afid TEXT, - last_user TEXT, - last_afid TEXT, - lock INTEGER, - ord INTEGER"; - - $self->{dbh}->do("CREATE TABLE $self->{category_tb} ($query)"); - - #Forum table - $query="forum_id INTEGER".get_query_primarykey($self)." - category_id INTEGER, - title TEXT, - description TEXT, - timestamp INTEGER, - update_time INTEGER, - user TEXT, - afid TEXT, - pwd TEXT, - last_user TEXT, - last_afid TEXT, - topics INTEGER, - posts INTEGER, - status INTEGER, - lock INTEGER, - ord INTEGER"; - - $self->{dbh}->do("CREATE TABLE $self->{forum_tb} ($query)"); - - - #Topic table - $query="topic_id INTEGER".get_query_primarykey($self)." - forum_id INTEGER, - title TEXT, - description TEXT, - icon TEXT, - user TEXT, - afid TEXT, - pwd TEXT, - last_user TEXT, - last_afid TEXT, - view INTEGER, - posts INTEGER, - status INTEGER, - lock INTEGER, - timestamp INTEGER, - update_time INTEGER"; - - $self->{dbh}->do("CREATE TABLE $self->{topic_tb} ($query)"); - - - #general setting table - $query="key TEXT,value TEXT"; - $self->{dbh}->do("CREATE TABLE $self->{pref_tb} ($query)"); - $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('title', 'Affelio BB')"); - $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('email', '$self->{afap}->{af}->{user__email1}')"); - $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('max_topics', '300')"); - $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('max_comments', '1000')"); - $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('num_topics', '50')"); - $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('num_comments', '50')"); - $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('max_sbjlen', '256')"); - $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('max_textlen', '2000')"); - - - #SPAM keywords table - $query="spam_id INTEGER".get_query_primarykey($self)." - keyword TEXT"; - $self->{dbh}->do("CREATE TABLE $self->{spam_tb} ($query)"); - } + sub new { + my $class = shift; + my %param = @_; + + debug_print("BB::new: start."); + + my $cgi = new CGI; + my $wi = new Affelio::misc::WebInput(); + ########################### + #Load afap + ########################### + my $afap = new AffelioApp(ConfigDir => Cwd::getcwd(), cgi => $cgi); + debug_print("BB::new: AFAP loaded."); + + my $self = { + cgi => $cgi, + afap => $afap, + wi => $wi, + uname => $afap->{af}->{site__username}, + header_title => $afap->{install_title}, + tmpfile => $afap->get_userdata_dir()."/.sqltmp", + category_tb => "AFuser_bb_$afap->{install_name}_category", + forum_tb => "AFuser_bb_$afap->{install_name}_forum", + topic_tb => "AFuser_bb_$afap->{install_name}_topic", + pref_tb => "AFuser_bb_$afap->{install_name}_pref", + spam_tb => "AFuser_bb_$afap->{install_name}_spam", + permission_tb => "AFuser_bb_$afap->{install_name}_permission", + dbh => undef + }; + + ########################### + #Locale init + ########################### + $self->{lh} = bb::L10N->get_handle(($afap->get_site_info("locale"), + $afap->get_site_info("locale"))); + $self->{dbh} = $afap->get_userdata_dbh(); + unless(-f $self->{tmpfile}) { + initTables($self); + open(TMP,"> $self->{tmpfile}"); + close(TMP); + } - bless $self, $class; - return $self; + bless $self, $class; + debug_print("BB::new: end."); + return $self; } ############################################## # destructor ############################################## + + sub DESTROY { + my $self = shift; + $self->{dbh}->disconnect; +} + -sub DESTROY { - my $self = shift; - $self->{dbh}->disconnect; + ###################################################################### + #run + ###################################################################### + sub run{ + my $self = shift; + my $afap = $self->{afap}; + my $cgi = $self->{cgi}; + my $wi = $self->{wi}; + + my %handlers = ("top","Top", + "view_forum", "ViewForum", + "view_topic", "ViewTopic", + "forum", "Forum", + "topic", "Topic", + "comment", "Comment", + "category", "Category"); + + ########################### + #Check DF_access + ########################### + unless ($afap->check_access("DF_access")) { + $self->accessErrorExit('Access Denied. You don\'t have permission to this application.'); + } + + $self->{c_id} = $wi->PTN_num($cgi->param("c_id")); + $self->{f_id} = $wi->PTN_num($cgi->param("f_id")); + $self->{t_id} = $wi->PTN_num($cgi->param("t_id")); + $self->{pb_user} = ($afap->get_visitor_info("type") eq "pb") ? "1" : "0"; + if ($self->{pb_user} eq "0"){ + $self->{afid} = $afap->get_visitor_info("afid"); + $self->{nickname} = $afap->get_visitor_info("nickname"); + $self->{user} = $afap->get_visitor_info("nickname"); + }else{ + $self->{user} = $wi->PTN_nickname($cgi->param("user")); + $self->{afid} = $wi->PTN_URL($cgi->param("afid")); + } + ############################################################## + #prep vars + ############################################################## + my %output_data = ("tmpl_path", Cwd::getcwd()."/templates/"); + + ############################################################## + #Model invocation + ############################################################## + my $mode = $wi->PTN_mode($cgi->param("mode")); + if ($mode eq "") {$mode="top";} + debug_print("Diary::run: mode=$mode"); + + my $classname = "bb::" . $handlers{$mode}; + debug_print("bb::run: handler= $classname"); + eval "use $classname"; + if($@){ + throw Affelio::exception::SystemException("Could not load handler [$mode]"); + } + debug_print("bb::run: handler function loaded."); + + my $ret=""; + try{ + debug_print("bb::run: handler function..... "); + handler($cgi, $self, \%output_data); + debug_print("bb::run: handler function done."); + }catch Error with{ + my $e = shift; + $output_data{"err_msg"} .= $e->stacktrace; + }; + ############################################################## + #Output View + ############################################################## + my $tmpl = new HTML::Template(filename => $output_data{tmpl_file}, + die_on_bad_params => 0); + $tmpl->param(%output_data); + + print "Content-type: text/html; charset=UTF-8\n"; + print "Pragma: no-cache", "\n\n"; + print $afap->get_HTML_header($self->{header_title}); + print $self->translate_templateL10N($tmpl->output); + print $afap->get_HTML_footer; } + ############################################## # createReplyTable ############################################## sub createReplyTable { my ($self, $topic_id) = @_; - my $reply_tb = "reply_".$self->escape($topic_id, 'int'); + my $reply_tb = "AFuser_bb_$self->{afap}->{install_name}_reply_".$self->escape($topic_id, 'int'); my $query="reply_id INTEGER".get_query_primarykey($self)." title TEXT, @@ -167,239 +196,28 @@ } ############################################## -# addCategory -############################################## - -sub addCategory { - my ($self, $title, $user, $afid) = @_; - my $time = time; - -# my $id = $self->getColumn("SELECT MAX(category_id) FROM $self->{category_tb}"); - $title = $self->escape_all($title); - $user = $self->escape_all($user); - $afid = $self->escape_all($afid); - $self->checkContent($title, $user, $afid, "","",""); - - my @same = $self->getall("SELECT category_id FROM $self->{category_tb} WHERE title='$title'"); - $self->errorExit('<AF_M text="A category of the proposed name already exists.">') if($#same >= 0); - - $self->{dbh}->do("INSERT INTO $self->{category_tb} (title, timestamp, update_time, user, afid, last_user, last_afid, lock, ord) VALUES ('$title', $time, $time, '$user', '$afid', '$user', '$afid', 0, 0)"); -# $id = $self->getColumn("SELECT MAX(category_id) FROM $self->{category_tb}"); -} - - -############################################## -# addForum -############################################## - -sub addForum { - my ($self, $category_id,$title, $description, $user, $afid, $pwd) = @_; - my $time = time; - my $crypt=""; - $category_id = $self->escape($category_id, 'int'); - $title = $self->escape_all($title); - $user = $self->escape_all($user); - $afid = $self->escape_all($afid); - $description = $self->escape($description); - $pwd = $self->escape_all($pwd); - $crypt = $self->cryptPwd($pwd) if ($pwd ne ""); - $self->checkContent($title, $user, $afid, $description, "", $pwd); - - my @same = $self->getall("SELECT forum_id FROM $self->{forum_tb} WHERE title='$title'"); - $self->errorExit('<AF_M text="A forum of the proposed name already exists.">') if($#same >= 0); - - $self->{dbh}->do("INSERT INTO $self->{forum_tb} (category_id, title, description, timestamp, update_time, user, afid, pwd, last_user, last_afid, topics, posts, status, lock, ord) VALUES ($category_id, '$title', '$description', $time, $time, '$user', '$afid', '$crypt', '$user', '$afid', 0, 0,0,0,0)"); - my $forum_id=$self->getColumn("SELECT MAX(forum_id) FROM $self->{forum_tb} WHERE category_id = $category_id"); - - $self->{afap}->post_news($title, "", $user, - $self->{afap}->get_site_info("web_root") . "/apps/". - $self->{afap}->{install_name} . "/view_forum.cgi?f_id=".$forum_id); - - $description =~ s/<br[^>]*>/\n/g; - $self->sendBbMail("New Forum $title was created by $user.\n\n-----\n$description\n\n$self->{afap}->{app__web_root}/view_forum.cgi?f_id=$forum_id"); - - return $forum_id; -} - -############################################## -# addTopic -############################################## - -sub addTopic { - my ($self, $forum_id,$title, $description, $icon,$user, $afid, $pwd,$status) = @_; - my $time = time; - my $crypt=""; - my $num_topics = 0; - my $num_posts = 0; - $forum_id = $self->escape($forum_id, 'int'); - $title = $self->escape_all($title); - $description = $self->escape($description); - $icon = $self->escape_all($icon); - $user = $self->escape_all($user); - $afid = $self->escape_all($afid); - $pwd = $self->escape_all($pwd); - $status = $self->escape($status, 'int'); - $crypt = $self->cryptPwd($pwd) if ($pwd ne ""); - $self->checkContent($title, $user, $afid, $description, $icon, $pwd); - - my @same = $self->getall("SELECT topic_id FROM $self->{topic_tb} WHERE title='$title'"); - $self->errorExit('<AF_M text="A topic of the proposed name already exists.">') if($#same >= 0); - - $self->{dbh}->do("INSERT INTO $self->{topic_tb} (forum_id, title, description, icon, user, afid, pwd, last_user, last_afid, view, posts, status, lock,timestamp, update_time) VALUES ($forum_id, '$title', '$description', '$icon', '$user', '$afid', '$crypt', '$user', '$afid', 0, 0, $status, 0, $time, $time)"); - - my $topic_id=$self->getColumn("SELECT MAX(topic_id) FROM $self->{topic_tb} WHERE forum_id = $forum_id"); - - $num_topics = $self->getColumn("SELECT count(forum_id) FROM $self->{topic_tb} WHERE forum_id=$forum_id"); - $num_posts = $self->getColumn("SELECT sum(posts) FROM $self->{topic_tb} WHERE forum_id=$forum_id"); - $num_posts = $num_posts+$num_topics; - $self->{dbh}->do("UPDATE $self->{forum_tb} SET topics = $num_topics, posts = $num_posts, last_user = '$user', last_afid = '$afid', update_time = $time WHERE forum_id = $forum_id"); - - $self->{afap}->post_news($title, "", $user, - $self->{afap}->get_site_info("web_root") . "/apps/". - $self->{afap}->{install_name} . "/view_topic.cgi?t_id=".$topic_id); - $description =~ s/<br[^>]*>/\n/g; - $self->sendBbMail("New Topic $title was created by $user.\n\n-----\n$description\n\n$self->{afap}->{app__web_root}/view_topic.cgi?t_id=$topic_id"); - - return $topic_id; -} - - -############################################## -# updateTopic -############################################## - -sub updateTopic { - my ($self, $topic_id,$title, $description, $icon,$user, $afid, $status,$lock) = @_; - my $time = time; - $topic_id = $self->escape($topic_id, 'int'); - $title = $self->escape_all($title); - $description = $self->escape($description); - $icon = $self->escape_all($icon); - $user = $self->escape_all($user); - $afid = $self->escape_all($afid); - $status = $self->escape($status, 'int'); - $lock = $self->escape($lock, 'int'); - $self->checkContent($title, $user, $afid, $description, $icon, ""); - - my @same = $self->getall("SELECT topic_id FROM $self->{topic_tb} WHERE title='$title'"); - $self->errorExit('<AF_M text="A topic of the proposed name already exists.">') if($#same >= 1); - - $self->{dbh}->do("UPDATE $self->{topic_tb} SET title='$title', description='$description', icon='$icon', status=$status, lock=$lock, user = '$user', afid = '$afid', timestamp = $time WHERE topic_id = $topic_id"); - $description =~ s/<br[^>]*>/\n/g; - $self->sendBbMail("Topic $title was updated by $user.\n\n-----\n$description\n\n$self->{afap}->{app__web_root}/view_topic.cgi?t_id=$topic_id"); - - return $topic_id; -} - - -############################################## -# updateForum -############################################## - -sub updateForum { - my ($self, $forum_id,$title, $description, $user, $afid) = @_; - my $time = time; - $forum_id = $self->escape($forum_id, 'int'); - $title = $self->escape_all($title); - $description = $self->escape($description); - $user = $self->escape_all($user); - $afid = $self->escape_all($afid); - $self->checkContent($title, $user, $afid, $description, "", ""); - - my @same = $self->getall("SELECT forum_id FROM $self->{forum_tb} WHERE title='$title'"); - $self->errorExit('<AF_M text="A forum of the proposed name already exists.">') if($#same >= 1); - - $self->{dbh}->do("UPDATE $self->{forum_tb} SET title='$title', description='$description', user = '$user', afid = '$afid', timestamp = $time WHERE forum_id = $forum_id"); - $description =~ s/<br[^>]*>/\n/g; - $self->sendBbMail("Forum $title was updated by $user.\n\n-----\n$description\n\n$self->{afap}->{app__web_root}/view_forum.cgi?f_id=$forum_id"); - - return $forum_id; -} - - -############################################## -# addSpamkey -############################################## - -sub addSpamkey { - my ($self, $keyword) = @_; - $keyword = $self->escape_all($keyword); - my @same = $self->getall("SELECT keyword FROM $self->{spam_tb} WHERE keyword = '$keyword'"); - if($#same >= 0) { return; } - $self->{dbh}->do("INSERT INTO $self->{spam_tb} (keyword) VALUES ('$keyword')"); -} - -############################################## -# removeSpamkey -############################################## - -sub removeSpamkey { - my ($self, $spam_id) = @_; - $spam_id = $self->escape($spam_id, 'int'); - $self->{dbh}->do("DELETE FROM $self->{spam_tb} WHERE spam_id = $spam_id"); -} - -############################################## -# deleteReply -############################################## - -sub deleteReply { - my ($self, $topic_id, $reply_id) = @_; - $reply_id = $self->escape($reply_id, 'int'); - my $reply_tb = "reply_".$self->escape($topic_id, 'int'); - $self->{dbh}->do("UPDATE $reply_tb SET user = NULL, afid = NULL, title = NULL, icon = NULL, comment = '\<AF_M text=\"Deleted\"\>' WHERE reply_id = $reply_id"); -} - -############################################## # updateCategoryInfo ############################################## sub updateCategoryInfo { - my ($self, $category_id, $user, $afid) = @_; + my ($self, $category_id, $user, $afid, $title) = @_; my $time = time; $category_id = $self->escape($category_id, 'int'); $user = $self->escape_all($user); $afid = $self->escape_all($afid); + $title = $self->escape_all($title); - $self->{dbh}->do("UPDATE $self->{category_tb} SET last_user = '$user', last_afid = '$afid', update_time = $time WHERE category_id = $category_id"); + my $query = "UPDATE $self->{category_tb} SET last_user = '$user', last_afid = '$afid', update_time = $time "; + if ($title ne ""){ + $query .= ",title = '$title' "; + } + $query .= "WHERE category_id = $category_id"; + $self->{dbh}->do($query); +# $self->{dbh}->do("UPDATE $self->{category_tb} SET last_user = '$user', last_afid = '$afid', update_time = $time WHERE category_id = $category_id"); } ############################################## -# updateForumInfo -############################################## -#sub updateForumInfo { -# my ($self, $forum_id, $user, $afid) = @_; -# my $time = time; -# $forum_id = $self->escape($forum_id, 'int'); -# $user = $self->escape_all($user); -# $afid = $self->escape_all($afid); -# $self->{dbh}->do("UPDATE $self->{forum_tb} SET last_user = '$user', last_afid = '$afid', update_time = $time WHERE forum_id = $forum_id"); -#} - - -############################################## -# addViewCountTopic -############################################## - -sub addViewCountTopic { - my ($self, $topic_id) = @_; - $topic_id = $self->escape($topic_id, 'int'); - $self->{dbh}->do("UPDATE $self->{topic_tb} SET view = view+1 WHERE topic_id = $topic_id"); -} - -############################################## -# getCategory -############################################## - -sub getCategory { - my ($self, $category_id) = @_; - $category_id = $self->escape($category_id, 'int'); - my @ret = $self->getall("SELECT * FROM $self->{category_tb} WHERE category_id = $category_id"); - return $ret[0]; -} - -############################################## # getForum ############################################## @@ -407,6 +225,7 @@ my ($self, $forum_id) = @_; $forum_id = $self->escape($forum_id, 'int'); my @ret = $self->getall("SELECT * FROM $self->{forum_tb} WHERE forum_id = $forum_id"); + $self->errorExit('<AF_M text="The forum was not found.">') if ($#ret<0); return $ret[0]; } @@ -421,57 +240,6 @@ return $ret[0]; } -############################################## -# deleteTopic -############################################## - -sub deleteTopic { - my ($self, $topic_id, $forum_id) = @_; - my $reply_tb = "reply_".$self->escape($topic_id, 'int'); - $forum_id = $self->escape($forum_id, 'int'); - $self->{dbh}->do("DELETE FROM $self->{topic_tb} WHERE topic_id = $topic_id"); - $self->{dbh}->do("DROP TABLE $reply_tb"); - my $num_topics = $self->getColumn("SELECT count(topic_id) FROM $self->{topic_tb} WHERE forum_id=$forum_id"); - - my $num_posts = $self->getColumn("SELECT sum(posts) FROM $self->{topic_tb} WHERE forum_id=$forum_id"); - - $num_posts += $num_topics; - $self->{dbh}->do("UPDATE $self->{forum_tb} SET topics = $num_topics, posts = $num_posts WHERE forum_id = $forum_id"); -} - -############################################## -# getAllReplies -############################################## - -sub getAllReplies { - my ($self, $topic_id) = @_; - my $reply_tb = "reply_".$self->escape($topic_id, 'int'); - return $self->getall("SELECT * FROM $reply_tb ORDER BY timestamp"); -} - -############################################## -# getReplies -############################################## - -sub getReplies { - my ($self, $topic_id, $end, $start) = @_; - my $reply_tb = "reply_".$self->escape($topic_id, 'int'); -# print "$start:$end"; - - return $self->getall("SELECT * FROM $reply_tb WHERE reply_id BETWEEN $start AND $end"); -} - -############################################## -# getReply -############################################## - -sub getReply { - my ($self, $topic_id, $reply_id) = @_; - $reply_id = $self->escape($reply_id, 'int'); - my $reply_tb = "reply_".$self->escape($topic_id, 'int'); - my @ret = $self->getall("SELECT * FROM $reply_tb WHERE reply_id = $reply_id"); - return $ret[0]; -} ############################################## # getPreference @@ -490,67 +258,7 @@ return @pref; } -############################################## -# updatePreference -############################################## - -sub updatePreference { - my ($self,$title,$email,$max_topics,$max_comments,$num_topics,$num_comments,$max_sbjlen,$max_textlen) = @_; - $self->errorExit('<AF_M text="Please input data correctly.">') if ($max_topics =~ /\D/ || $max_comments =~ /\D/ || $num_topics =~ /\D/ || $num_comments =~ /\D/ || $max_sbjlen =~ /\D/ || $max_textlen =~ /\D/); - $title = $self->escape_all($title); - - $self->{dbh}->do("UPDATE $self->{pref_tb} SET value = '$title' WHERE key = 'title'"); - $self->{dbh}->do("UPDATE $self->{pref_tb} SET value = '$email' WHERE key = 'email'"); - $self->{dbh}->do("UPDATE $self->{pref_tb} SET value = '$max_topics' WHERE key = 'max_topics'"); - $self->{dbh}->do("UPDATE $self->{pref_tb} SET value = '$max_comments' WHERE key = 'max_comments'"); - $self->{dbh}->do("UPDATE $self->{pref_tb} SET value = '$num_topics' WHERE key = 'num_topics'"); - $self->{dbh}->do("UPDATE $self->{pref_tb} SET value = '$num_comments' WHERE key = 'num_comments'"); - $self->{dbh}->do("UPDATE $self->{pref_tb} SET value = '$max_sbjlen' WHERE key = 'max_sbjlen'"); - $self->{dbh}->do("UPDATE $self->{pref_tb} SET value = '$max_textlen' WHERE key = 'max_textlen'"); -} - - -############################################## -# getAllComments -############################################## - -sub getAllComments { - my ($self, $topic_id) = @_; - $topic_id = $self->escape($topic_id, 'int'); - return $self->getall("SELECT * FROM $self->{reply_tb} WHERE topic_id = $topic_id ORDER BY timestamp"); -} - - - -############################################## -# getNewestEntries -############################################## -#sub getNewestEntries { -# my ($self, $num) = @_; -# unless ($num) { $num = 5; } -# return $self->getall("SELECT * FROM $self->{category_tb} ORDER BY update_time DESC LIMIT $num"); -#} - -############################################## -# getNewestCategoryId -############################################## - -sub getNewestCategoryId { - my ($self) = @_; - my @ret = $self->getall("SELECT MAX(category_id) as category_id FROM $self->{category_tb}"); - return $ret[0]; -} - -############################################## -# getNewestProjectId -############################################## - -sub getNewestProjectId { - my ($self) = @_; - my @ret = $self->getall("SELECT MAX(forum_id) as forum_id FROM $self->{forum_tb}"); - return $ret[0]; -} ############################################## # getAllCategories @@ -561,118 +269,17 @@ return $self->getall("SELECT * FROM $self->{category_tb} ORDER BY timestamp"); } -############################################## -# getAllForums -############################################## - -sub getAllForums { - my ($self,$category_id) = @_; - $category_id = $self->escape($category_id, 'int'); - return $self->getall("SELECT * FROM $self->{forum_tb} WHERE category_id = $category_id ORDER BY update_time DESC"); -} - -############################################## -# getAllTopics -############################################## - -sub getAllTopics { - my ($self,$forum_id) = @_; - $forum_id = $self->escape($forum_id, 'int'); - return $self->getall("SELECT * FROM $self->{topic_tb} WHERE forum_id = $forum_id ORDER BY status DESC, update_time DESC"); -} - -############################################## -# getAllSpamkeys -############################################## - -sub getAllSpamkeys { - my ($self) = @_; - return $self->getall("SELECT * FROM $self->{spam_tb}"); -} - - -############################################## -# getSumOfFiles -############################################## -sub getSumOfFiles { - my ($self, $category_id) = @_; - $category_id = $self->escape($category_id, 'int'); - return $self->getColumn("SELECT COUNT(*) FROM $self->{topic_tb} WHERE category_id = $category_id"); -} - -############################################## -# getNumOfComments -############################################## -#sub getNumOfComments { -# my ($self, $topic_id) = @_; -## my $reply_tb = "reply_".$topic_id; -## return $self->getColumn("SELECT COUNT(*) FROM $reply_tb"); -# return $self->getColumn("SELECT posts FROM $topic_tb WHERE topic_id=$topic_id"); -#} - -############################################## -# addComment -############################################## - -sub addComment { - my ($self, $topic_id, $title, $user, $afid, $comment, $pwd, $icon) = @_; - my $time = time; - my $crypt = ""; - $topic_id = $self->escape($topic_id, 'int'); - $title = $self->escape_all($title); - $user = $self->escape_all($user); - $afid = $self->escape_all($afid); - $comment = $self->escape($comment); - $pwd = $self->escape_all($pwd); - $icon = $self->escape_all($icon); - $crypt = $self->cryptPwd($pwd) if ($pwd ne ""); - $self->checkContent($title, $user, $afid, $comment, $icon, $pwd); - - my @same = $self->getall("SELECT reply_id FROM reply_$topic_id WHERE title = '$title' AND user = '$user' AND comment = '$comment'"); - $self->errorExit('<AF_M text="A same comment already exists.">') if($#same >= 0); - - $self->{dbh}->do("INSERT INTO reply_$topic_id (title, user, afid, comment, icon, pwd, timestamp) VALUES ('$title', '$user', '$afid', '$comment', '$icon', '$crypt', $time)"); - - $self->{dbh}->do("UPDATE $self->{topic_tb} SET posts = posts+1 WHERE topic_id = $topic_id"); - my $forum_id = $self->getColumn("SELECT forum_id FROM $self->{topic_tb} WHERE topic_id = $topic_id"); - $self->{dbh}->do("UPDATE $self->{forum_tb} SET posts = posts+1, last_user = '$user', last_afid = '$afid', update_time = $time WHERE forum_id = $forum_id"); - - $self->{dbh}->do("UPDATE $self->{topic_tb} SET last_user = '$user', last_afid = '$afid', update_time = $time WHERE topic_id = $topic_id"); - - $self->{afap}->post_news($title, "", $user, - $self->{afap}->get_site_info("web_root") . "/apps/". - $self->{afap}->{install_name} . "/view_topic.cgi?t_id=".$topic_id); - $comment =~ s/<br[^>]*>/\n/g; - $self->sendBbMail("New Comment $title was written by $user.\n\n-----\n$comment\n\n$self->{afap}->{app__web_root}/view_topic.cgi?t_id=$topic_id"); -} ############################################## # sendBbMail ############################################## sub sendBbMail { - my ($self,$msg) = @_; + my ($self,$msg,$msg_title) = @_; my $mailto = $self->getColumn("SELECT value FROM $self->{pref_tb} WHERE key = 'email'"); my $bb_title = $self->getColumn("SELECT value FROM $self->{pref_tb} WHERE key = 'title'"); - Affelio::NetLib::Email::send_email($self->{afap}->{af}->{cmd__sendmail}, "$self->{afap}->{af}->{user__email1}", "Affelio BB", $mailto, "Message from $bb_title", "$msg"); + Affelio::NetLib::Email::send_email($self->{afap}->{af}->{cmd__sendmail}, "$self->{afap}->{af}->{user__email1}", "$self->{uname}", $mailto, "$self->{uname}/$bb_title/$msg_title", "$msg"); } -############################################## -# getComments -############################################## -sub getComments { - my ($self, $id) = @_; - $id = $self->escape($id, 'int'); - return $self->getall("SELECT * FROM $self->{reply_tb} WHERE id = $id ORDER BY timestamp"); -} - -############################################## -# getCommentsNo -############################################## -sub getCommentsNo { - my ($self, $id) = @_; - $id = $self->escape($id, 'int'); - return $self->getColumn("SELECT COUNT(*) FROM $self->{reply_tb} WHERE id = $id"); -} ############################################## # getColumn @@ -722,17 +329,16 @@ else { $str =~ s/[\t\a]//g; $str =~ s/&/&/g; - $str =~ s/["']/"/g; + $str =~ s/"/"/g; + $str =~ s/'/'/g; $str =~ s/</</g; $str =~ s/>/>/g; - $str =~ s/<(\/?)(a|p|i|b|big|strong|small|em|u|blockquote)>/<$1$2>/ig; - $str =~ s/<a +href=(")?(s?https?:\/\/[-_.!~*'()a-zA-Z0-9;\/?:\@&=+\$,%#]+) *(&quo\ -t;)? *>/<a href="$2">/ig; + $str =~ s/<(\/?)(a|p|i|b|big|strong|small|em|u|blockquote|br)>/<$1$2>/ig; + $str =~ s/<image="([A-Za-z0-9\-\_]*\.(jpg|png|gif|bmp|jpeg))">/<image="$1">/ig; + $str =~ s/<a +href=(")?(s?https?:\/\/[-_.!~*'()a-zA-Z0-9;\/?:\@&=+\$,%#]+) *(")? *>/<a href="$2">/ig; $str =~ s/""/"/g; - $str =~ s/(\r\n|\r|\n)/<br \/>/g; - - while ($str =~ /(<(a|p|i|b|big|strong|small|em|u|blockquote)\b(?:(?!<\/\2>).)*(?:<\2>|$))\ -/sigx) { + + while ($str =~ /(<(a|p|i|b|big|strong|small|em|u|blockquote)\b(?:(?!<\/\2>).)*(?:<\2>|$))/sigx) { $self->errorExit("Error: You may mistype a tag or forget to close it."); } } @@ -745,14 +351,23 @@ $str =~ s/[\t\a]//g; $str =~ s/&/&/g; - $str =~ s/['"]/"/g; + $str =~ s/"/"/g; + $str =~ s/'/'/g; $str =~ s/</</g; $str =~ s/>/>/g; - $str =~ s/(\r\n|\r|\n)/<br \/>/g; + return $str; +} + +sub n2br { + my ($self, $str) = @_; + $str =~ s/\x0D\x0A/<br \/>/g; + $str =~ s/\x0D/<br \/>/g; + $str =~ s/\x0A/<br \/>/g; return $str; } + sub autolink { my ($self, $str) = @_; @@ -818,23 +433,6 @@ } } -############################################## -# cryptID -############################################## -sub cryptID { - my ($self, $pwd) = @_; - if ( $pwd !~ /[a-zA-Z0-9]/){ - $self->errorExit('<AF_M text="Please use alphameric characters.">'); - } - if (length($pwd)<4){ - $self->errorExit('<AF_M text="Please input more than 4 characters.">'); - } - my $salt = substr($pwd ,0,2); - - my $crypt = crypt($pwd, $salt); - return $crypt; -} - ############################################################################ #L10N added by slash @@ -873,7 +471,7 @@ my $max_textlen = $self->getColumn("SELECT value FROM $self->{pref_tb} WHERE key = 'max_textlen'"); $self->errorExit('<AF_M text="Too long title.">') if (length($title)>int($max_sbjlen)); $self->errorExit('<AF_M text="Too long content.">') if (length($description)>int($max_textlen)); - $self->errorExit('<AF_M text="Too long nickname.">') if (length($user)>256); + $self->errorExit('<AF_M text="Too long nickname.">') if (length($user)>16); $self->errorExit('<AF_M text="Too long URI.">') if (length($afid)>256); $self->errorExit('<AF_M text="Too long filename of icon.">') if (length($icon)>64); $self->errorExit('<AF_M text="Too long password.">') if (length($pwd)>32); @@ -893,23 +491,169 @@ ############################################################################ sub errorExit { my ($self,$msg) = @_; + debug_print("bb::errorExit: start."); my $affelio_id = $self->{afap}->get_visitor_info("afid"); my $visitor_type=$self->{afap}->get_visitor_info("type"); - if($visitor_type eq ""){ $visitor_type="pb"; } - my $tmpl = HTML::Template->new(filename => "./templates/error.tmpl"); + + my $tmpl = HTML::Template->new(filename => $self->{afap}->{app__fs_root}."/templates/error.tmpl"); $tmpl->param(V_TYPE => $visitor_type); $tmpl->param(AF_ID => $affelio_id); $tmpl->param(MSG => $msg); + debug_print("bb::errorExit: end."); + print "Content-type: text/html; charset=UTF-8\n"; + print "Pragma: no-cache", "\n\n"; + print $self->{afap}->get_HTML_header($self->{header_title}); print $self->translate_templateL10N( $tmpl->output ); print $self->{afap}->get_HTML_footer(); exit; } -1; +############################################################################ +#Initialize Tables +############################################################################ +sub initTables { + my $self = shift; + my $query; + #Category table + $query="category_id INTEGER".get_query_primarykey($self)." + title TEXT, + timestamp INTEGER, + update_time INTEGER, + user TEXT, + afid TEXT, + last_user TEXT, + last_afid TEXT, + lock INTEGER, + ord INTEGER"; + + $self->{dbh}->do("CREATE TABLE $self->{category_tb} ($query)"); + + #Forum table + $query="forum_id INTEGER".get_query_primarykey($self)." + category_id INTEGER, + title TEXT, + description TEXT, + timestamp INTEGER, + update_time INTEGER, + user TEXT, + afid TEXT, + pwd TEXT, + last_user TEXT, + last_afid TEXT, + topics INTEGER, + posts INTEGER, + status INTEGER, + lock INTEGER, + ord INTEGER"; + + $self->{dbh}->do("CREATE TABLE $self->{forum_tb} ($query)"); + + #Topic table + $query="topic_id INTEGER".get_query_primarykey($self)." + forum_id INTEGER, + title TEXT, + description TEXT, + icon TEXT, + user TEXT, + afid TEXT, + pwd TEXT, + last_user TEXT, + last_afid TEXT, + view INTEGER, + posts INTEGER, + status INTEGER, + lock INTEGER, + timestamp INTEGER, + update_time INTEGER"; + + $self->{dbh}->do("CREATE TABLE $self->{topic_tb} ($query)"); + + #general setting table + $query="key TEXT,value TEXT"; + $self->{dbh}->do("CREATE TABLE $self->{pref_tb} ($query)"); + $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('title', '$self->{header_title}')"); + $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('email', '$self->{afap}->{af}->{user__email1}')"); + $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('max_topics', '300')"); + $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('max_comments', '1000')"); + $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('num_topics', '50')"); + $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('num_comments', '50')"); + $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('max_sbjlen', '256')"); + $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('max_textlen', '2000')"); + + #SPAM keywords table + $query="spam_id INTEGER".get_query_primarykey($self)." + keyword TEXT"; + $self->{dbh}->do("CREATE TABLE $self->{spam_tb} ($query)"); + + #permission setting table + $query="key TEXT, super BOOLEAN, user BOOLEAN"; + $self->{dbh}->do("CREATE TABLE $self->{permission_tb} ($query)"); + $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('category_edit', 0,0)"); + $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('category_delete', 0,0)"); + $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('category_status', 0,0)"); + + $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('forum_edit', 1,0)"); + $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('forum_delete', 0,0)"); + $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('forum_status', 0,0)"); + $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('topic_edit', 1,1)"); + $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('topic_delete', 1,0)"); + $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('topic_status', 1,0)"); + $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('comment_edit', 1,1)"); + $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('comment_delete', 1,1)"); + +} + +############################################## +# getPermission +############################################## +sub getPermission { + my $self = shift; + my $key = shift; + if ($self->{afap}->get_visitor_info("type") eq "self"){ + return 1; + }elsif ($self->{afap}->check_access("super")) { + return 1 if ($self->getColumn("SELECT super FROM $self->{permission_tb} WHERE key = '$key'")); + }elsif ($self->{afap}->check_access("user")) { + return 1 if ($self->getColumn("SELECT user FROM $self->{permission_tb} WHERE key = '$key'")); + }else{ + return 0; + } + return 0; +} +############################################## +# checkAuthentication +############################################## +sub checkAuthentication { + my ($self, $pb_user, $user, $afid, $pwd, $content_afid, $content_pwd)=@_; + if ($self->{afap}->get_visitor_info("type") eq "self"){ + return 1; + }else{ + if($pb_user eq "0") { + if ($content_pwd eq "" && $content_afid eq $afid){ + return 1; + }else{ + $self->errorExit('<AF_M text="Authentication error.">'); + } + } elsif($content_pwd ne ""){ + if ($pb_user){ + $self->errorExit('<AF_M text="Please input your nickname.">') if($user eq ""); + $self->checkPwd($pwd); + } + if (crypt($pwd,$content_pwd) eq $content_pwd){ + return 1; + }else{ + $self->errorExit('<AF_M text="Authentication error.">'); + } + } + } + return 0; +} +} +1; Index: affelio/apps/bb/comment.cgi diff -u affelio/apps/bb/comment.cgi:1.2 affelio/apps/bb/comment.cgi:removed --- affelio/apps/bb/comment.cgi:1.2 Tue Dec 20 16:56:51 2005 +++ affelio/apps/bb/comment.cgi Thu Mar 23 12:46:14 2006 @@ -1,186 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2005 FishGrove Inc. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -use strict; -use lib("../../extlib"); -use lib("../../lib"); -use HTML::Template; -use CGI; -use Cwd; -use AffelioApp; -use bb; - - -#Initialize AFAP -our $cgi = new CGI(); -our $afap = new AffelioApp(ConfigDir => Cwd::getcwd(), cgi => $cgi); -our $bb = new bb($afap); -my $tmpl; - -# put Content-type -print "Content-type: text/html; charset=UTF-8\n"; -print "Pragma: no-cache", "\n\n"; -# put HTML Header -print $afap->get_HTML_header("Affelio BB"); -# check access -unless ($afap->check_access("super")||$afap->check_access("user")) { - $bb->errorExit('<AF_M text="Access denied">'); -} - -########### Init BB #################################################### -my $mode = $afap->{cgi}->param("mode"); -my $action = $afap->{cgi}->param("action"); -my $t_id = $afap->{cgi}->param("t_id"); -$bb->errorExit('<AF_M text="Please specify the Topic.">') if ($t_id =~ /\D/ || $t_id eq ""); -my $reply_title = $afap->{cgi}->param("reply_title"); -my $comment = $afap->{cgi}->param("comment"); -my $pb_user = ($afap->get_visitor_info("type") eq "pb") ? "1" : "0"; -my $pwd = $afap->{cgi}->param("pwd"); -my $user_name = $afap->{cgi}->param("user_name"); -my $afid = $afap->{cgi}->param("afid"); -my $icon = $afap->{cgi}->param("icon"); -if ($pb_user eq "0"){ - $user_name = $afap->get_visitor_info("nickname"); - $afid = $afap->get_visitor_info("afid"); -} -$bb->errorExit('<AF_M text="This topic is locked.">') if ($bb->getColumn("SELECT lock FROM $bb->{topic_tb} WHERE topic_id=$t_id")); - -########### Add new comment #################################################### -if ($mode eq "new_comment"){ - $bb->errorExit('<AF_M text="Please input a subject.">') if($reply_title eq ""); - $bb->errorExit('<AF_M text="Please input your comment.">') if($comment eq ""); - if ($pb_user){ - $bb->errorExit('<AF_M text="Please input your nickname.">') if($user_name eq ""); - $bb->errorExit('<AF_M text="Please input a password.">') if($pwd eq ""); - } - $tmpl = HTML::Template->new(filename => "./templates/comment.tmpl"); - $tmpl->param( - NEW => "1", - T_ID => $t_id, - TITLE => $reply_title, - COMMENT => $comment, - USER => $user_name, - AFID => $afid, - ); - -########### Confirm comment #################################################### -}elsif ($mode eq "confirm_comment"){ - $bb->errorExit('<AF_M text="Please input a subject.">') if($reply_title eq ""); - $bb->errorExit('<AF_M text="Please input your comment.">') if($comment eq ""); - if ($pb_user){ - $bb->errorExit('<AF_M text="Please input your nickname.">') if($user_name eq ""); - $bb->checkPwd($pwd); - } - if (-f "./resource/face/owner.gif"){ - $icon = "owner.gif" if ($afap->get_visitor_info("type") eq "self" && $icon eq ""); - } - $tmpl = HTML::Template->new(filename => "./templates/comment.tmpl"); - $tmpl->param( - CONFIRM => "1", - T_ID => $t_id, - PB_USER => $pb_user, - TITLE => $reply_title, - COMMENT_SHOW => $bb->escape($comment), - COMMENT => $comment, - USER => $user_name, - AFID => $afid, - PWD => $pwd, - ICON => $icon, - ); - -########### Submit comment #################################################### -}elsif ($mode eq "submit_comment"){ - $bb->errorExit('<AF_M text="Please input a subject.">') if($reply_title eq ""); - $bb->errorExit('<AF_M text="Please input your comment.">') if($comment eq ""); - if ($pb_user){ - $bb->errorExit('<AF_M text="Please input your nickname.">') if($user_name eq ""); - $bb->errorExit('<AF_M text="Please input a password.">') if($pwd eq ""); - } - $bb->addComment($t_id, $reply_title, $user_name, $afid, $comment, $pwd, $icon); - - $tmpl = HTML::Template->new(filename => "./templates/comment.tmpl"); - $tmpl->param( - SUBMIT => "1", - T_ID => $t_id, - ); -########### delete comment #################################################### -}elsif ($mode eq "delete_comment"){ - my $r_id = $afap->{cgi}->param("r_id"); - $bb->errorExit('<AF_M text="Please specify the comment.">') if ($r_id =~ /\D/ || $r_id eq ""); - $tmpl = HTML::Template->new(filename => "./templates/comment.tmpl"); - #Do delete - if ($action eq "do_delete"){ - my $reply = $bb->getReply($t_id, $r_id); - if ($afap->get_visitor_info("type") eq "self"){ - $bb->deleteReply($t_id, $r_id); - }else{ - if($pb_user eq "0") { - if ($reply->{pwd} eq "" && $reply->{afid} eq $afid){ - $bb->deleteReply($t_id, $r_id); - }else{ - $bb->errorExit('<AF_M text="Authentication error.">'); - } - } elsif($reply->{pwd} ne ""){ - if ($pb_user){ - $bb->errorExit('<AF_M text="Please input your nickname.">') if($user_name eq ""); - $bb->checkPwd($pwd); - } - if (crypt($pwd,$reply->{pwd}) eq $reply->{pwd}){ - $bb->deleteReply($t_id, $r_id); - }else{ - $bb->errorExit('<AF_M text="Authentication error.">'); - } - } - } - - $tmpl->param( - DONE_DELETE => "1", - T_ID => $t_id, - ); - # Delete mode (no action) - }else{ - my $reply = $bb->getReply($t_id, $r_id); - if ($afap->get_visitor_info("type") eq "self"){ - $tmpl->param(PWD => "0"); - }else{ - if ($pb_user eq "0"){ - if ($reply->{pwd} eq "" && $reply->{afid} eq $afid){ - $tmpl->param(PWD => "0"); - } else{ - $bb->errorExit('<AF_M text="Authentication error.">'); - } - }elsif($reply->{pwd} ne ""){ - $tmpl->param(PWD => "1"); - } - } - - $tmpl->param( - CONFIRM_DELETE => "1", - T_ID => $t_id, - R_ID => $r_id, - USER => $reply->{user}, - TITLE => $reply->{title}, - COMMENT => $reply->{comment}, - AFID => $reply->{afid}, - ); - } -} else { - $bb->errorExit('<AF_M text="Error: Unknown access.">'); -} - -print $bb->translate_templateL10N( $tmpl->output ); -print $afap->get_HTML_footer(); Index: affelio/apps/bb/forum.cgi diff -u affelio/apps/bb/forum.cgi:1.1 affelio/apps/bb/forum.cgi:removed --- affelio/apps/bb/forum.cgi:1.1 Mon Dec 19 15:46:27 2005 +++ affelio/apps/bb/forum.cgi Thu Mar 23 12:46:14 2006 @@ -1,177 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2005 FishGrove Inc. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -use strict; -use lib("../../extlib"); -use lib("../../lib"); -use HTML::Template; -use CGI; -use Cwd; -use AffelioApp; -use bb; - - -#Initialize AFAP -our $cgi = new CGI(); -our $afap = new AffelioApp(ConfigDir => Cwd::getcwd(), cgi => $cgi); -our $bb = new bb($afap); -my $tmpl; - -# put Content-type -print "Content-type: text/html; charset=UTF-8\n"; -print "Pragma: no-cache", "\n\n"; -# put HTML Header -print $afap->get_HTML_header("Affelio BB"); -# check access -unless ($afap->check_access("super")) { - $bb->errorExit('<AF_M text="Access denied">'); -} - -########### Init BB #################################################### -my $mode = $afap->{cgi}->param("mode"); -my $action = $afap->{cgi}->param("action"); -my $c_id = $afap->{cgi}->param("c_id"); -$bb->errorExit('<AF_M text="Please specify the category.">') if ($c_id =~ /\D/); -my $title = $afap->{cgi}->param("title"); -my $description = $afap->{cgi}->param("description"); -my $status = $afap->{cgi}->param("status"); -my $user = $afap->{cgi}->param("user"); -my $afid = $afap->{cgi}->param("afid"); -my $pwd = $afap->{cgi}->param("pwd"); -my $pb_user = ($afap->get_visitor_info("type") eq "pb") ? "1" : "0"; -if ($pb_user eq "0"){ - $user = $afap->get_visitor_info("nickname"); - $afid = $afap->get_visitor_info("afid"); -} -my $status_edit = $afap->check_access("super") ? "1" : "0"; - -########### Add new forum #################################################### -if ($mode eq "add_forum"){ - $tmpl = HTML::Template->new(filename => "./templates/forum.tmpl"); - $tmpl->param( - NEW => "1", - C_ID => $c_id, - TITLE => $title, - DESCRIPTION => $description, - PB_USER => $pb_user, - AFID => $afid, - USER => $user - ); -########### Confirm forum info #################################################### -}elsif ($mode eq "confirm_forum"){ - $bb->errorExit('<AF_M text="Please input a title.">') if ($title eq ""); - $bb->errorExit('<AF_M text="Please input a description.">') if ($description eq ""); - $bb->errorExit('<AF_M text="Please input your nickname.">') if ($user eq ""); - $bb->checkPwd($pwd) if ($pb_user eq "1"); - $tmpl = HTML::Template->new(filename => "./templates/forum.tmpl"); - $tmpl->param( - CONFIRM => "1", - C_ID => $c_id, - TITLE => $title, - DESCRIPTION_SHOW=> $bb->escape($description), - DESCRIPTION => $description, - PB_USER => $pb_user, - AFID => $afid, - PWD => $pwd, - USER => $user - ); -########### Submit forum #################################################### -}elsif ($mode eq "submit_forum"){ - $bb->errorExit('<AF_M text="Please input a title.">') if ($title eq ""); - $bb->errorExit('<AF_M text="Please input a description.">') if ($description eq ""); - $bb->errorExit('<AF_M text="Please input your nickname.">') if ($user eq ""); - $bb->errorExit('<AF_M text="Please input a password.">') if ($pwd eq "" && $pb_user); - - my $forum_id = $bb->addForum($c_id, $title, $description, $user, $afid, $pwd); - $bb->updateCategoryInfo($c_id, $user, $afid); - $tmpl = HTML::Template->new(filename => "./templates/forum.tmpl"); - $tmpl->param( - DONE => "1", - F_ID => $forum_id, - MSG => "New forum was created.", - ); -########### edit forum #################################################### -}elsif ($mode eq "edit_forum"){ - my $f_id = $afap->{cgi}->param("f_id"); - $bb->errorExit('<AF_M text="Please specify the forum.">') if ($f_id =~ /\D/ || $f_id eq ""); - $tmpl = HTML::Template->new(filename => "./templates/forum.tmpl"); - my $forum = $bb->getForum($f_id); - my $auth=0; - if ($action ne ""){ - if ($afap->get_visitor_info("type") eq "self"){ - $auth=1; - }else{ - if($pb_user eq "0") { - if ($forum->{pwd} eq "" && $forum->{afid} eq $afid){ - $auth=1; - }else{ - $bb->errorExit('<AF_M text="Authentication error.">'); - } - } elsif($forum->{pwd} ne ""){ - if ($pb_user){ - $bb->errorExit('<AF_M text="Please input your nickname.">') if($user eq ""); - $bb->checkPwd($pwd); - } - if (crypt($pwd,$forum->{pwd}) eq $forum->{pwd}){ - $auth=1; - }else{ - $bb->errorExit('<AF_M text="Authentication error.">'); - } - } - } - # Do update - if($action eq "do_update"){ - $bb->updateForum($f_id, $title, $description, $user, $afid) if ($auth); - $tmpl->param( - DONE => "1", - F_ID => $f_id, - MSG => "The forum was updated.", - ); - } - # Edit mode (no action) - }else{ - my $can_delete=""; - if ($afap->get_visitor_info("type") eq "self"){ - $tmpl->param(PWD => "0"); - $can_delete = 1; - }else{ - if ($pb_user eq "0"){ - if ($forum->{pwd} eq "" && $forum->{afid} eq $afid){ - $tmpl->param(PWD => "0"); - } else { - $bb->errorExit('<AF_M text="Authentication error.">'); - } - }elsif($forum->{pwd} ne ""){ - $tmpl->param(PWD => "1"); - } - } - $forum->{description} =~ s/<br[^>]*>/\n/g; - $tmpl->param( - EDIT => "1", - F_ID => $f_id, - USER => $forum->{user}, - TITLE => $forum->{title}, - DESCRIPTION => $forum->{description}, - AFID => $forum->{afid}, - ); - } -}else { - $bb->errorExit('<AF_M text="Error: Unknown access.">'); -} - -print $bb->translate_templateL10N( $tmpl->output ); -print $afap->get_HTML_footer(); Index: affelio/apps/bb/index.cgi diff -u affelio/apps/bb/index.cgi:1.1 affelio/apps/bb/index.cgi:1.2 --- affelio/apps/bb/index.cgi:1.1 Mon Dec 19 15:46:27 2005 +++ affelio/apps/bb/index.cgi Thu Mar 23 12:46:13 2006 @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2005 FishGrove Inc. +# Copyright (C) 2006 Affelio Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -15,95 +15,20 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + use strict; use lib("../../extlib"); -use lib("../../lib"); -use HTML::Template; -use CGI; -use Cwd; -use AffelioApp; +use Error qw(:try); use bb; -#Initialize AFAP -our $cgi = new CGI(); -our $afap = new AffelioApp(ConfigDir => Cwd::getcwd(), cgi => $cgi); -our $bb = new bb($afap); -my $tmpl; - -# put Content-type -print "Content-type: text/html; charset=UTF-8\n"; -print "Pragma: no-cache", "\n\n"; -# put HTML Header -print $afap->get_HTML_header("Affelio BB"); -# check access -unless ($afap->check_access("DF_access")) { - $bb->errorExit('<AF_M text="Access denied">'); -} - -########### Show Category,Forum List #################################################### -my %pref = $bb->getPreference; -my @categories_param; -my @categories; -my @forums_param; -my @forums; -my $i=0; -my $j=0; -$tmpl = HTML::Template->new(filename => "./templates/index.tmpl"); - - ＠ categories = $bb->getAllCategories; -$tmpl->param( - PAGE_TITLE => $pref{'title'}, - EDITABLE => $afap->check_access("super"), - HAS_CATEGORY=>$#categories+1 -); - -foreach(@categories) { - @forums = $bb->getAllForums($_->{category_id}); - - foreach(@forums) { - my ($sec, $min, $hour, $mday, $mon, $year) = localtime($_->{update_time}); - $mon+=1; - $year+=1900; - push @forums_param, - { - F_ID => $_->{forum_id}, - TITLE => $_->{title}, - DESCRIPTION => $_->{description}, - USER => $_->{user}, - AFID => $bb->getUserURI($_->{afid}), - TOPICS => $_->{topics}, - POSTS => $_->{posts}, - YEAR => $year, - MONTH => $mon, - DAY => $mday, - TIME => sprintf("%02d:%02d", $hour, $min), - LAST_USER =>$_->{last_user}, - LAST_AFID =>$bb->getUserURI($_->{last_afid}), - }; - $j++; - } - - push @categories_param, - { - FORUM => [@forums_param[$i..($j-1)]], - TITLE => $_->{title}, - HAS_FORUM => $#forums+1, - }; - $i=$j; -} -$tmpl->param(CATEGORIES =>\@categories_param); - -########### Show 'add forum' button #################################################### -my @select_list; -foreach(@categories) { - push @select_list, - { - C_ID => $_->{category_id}, - TITLE => $_->{title}, - }; -} -$tmpl->param(SELECT_LIST =>\@select_list); - -########### Output html #################################################### -print $bb->translate_templateL10N( $tmpl->output ); -print $afap->get_HTML_footer(); +try{ + my $bb = new bb(); + $bb->run(); +}catch Error with{ + my $e = shift; + print "Content-type: text/html; charset=UTF-8\n"; + print "Pragma: no-cache", "\n\n"; + print "<HTML>"; + print "<HEAD><TITLE>Error</TITLE></HEAD>"; + print "$e<BR><BR><HR><PRE>" . $e->stacktrace; +}; Index: affelio/apps/bb/owner.cgi diff -u affelio/apps/bb/owner.cgi:1.1 affelio/apps/bb/owner.cgi:1.2 --- affelio/apps/bb/owner.cgi:1.1 Mon Dec 19 15:46:27 2005 +++ affelio/apps/bb/owner.cgi Thu Mar 23 12:46:13 2006 @@ -1,6 +1,5 @@ #!/usr/bin/perl - -# Copyright (C) 2005 FishGrove Inc. +# Copyright (C) 2006 Affelio Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -15,158 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -use strict; -use lib("../../extlib"); -use lib("../../lib"); -use HTML::Template; -use CGI; -use Cwd; -use AffelioApp; -use bb; - -############################################## -#Initialize AFAP & put header -############################################## -our $cgi = new CGI(); -our $afap = new AffelioApp(ConfigDir => Cwd::getcwd(), cgi => $cgi); -our $bb = new bb($afap); -my $tmpl; - -# put Content-type -print "Content-type: text/html; charset=UTF-8\n"; -print "Pragma: no-cache", "\n\n"; -# put HTML Header -print $afap->get_HTML_header("Affelio BB"); -# check access -unless ($afap->get_visitor_info("type") eq "self"){ - $bb->errorExit('<AF_M text="Access denied">'); -} -my $mode = $afap->{cgi}->param("mode"); -my $action = $afap->{cgi}->param("action"); - -########### Add Category #################################################### -if ($mode eq "add_category"){ - if ($afap->get_visitor_info("type") eq "self"){ - my $title=$afap->{cgi}->param("title"); - $tmpl = HTML::Template->new(filename => "./templates/owner/add_category.tmpl"); - $tmpl->param( - EDIT => "1", - TITLE => $title, - USER => $afap->get_visitor_info("nickname"), - ); - }else{ - $bb->errorExit('<AF_M text="Access denied">'); - } -########### Confirm Category #################################################### -}elsif ($mode eq "confirm_category"){ - if ($afap->get_visitor_info("type") eq "self"){ - my $title = $afap->{cgi}->param("title"); - $tmpl = HTML::Template->new(filename => "./templates/owner/add_category.tmpl"); - $tmpl->param( - CONFIRM => "1", - TITLE => $title, - USER => $afap->get_visitor_info("nickname"), - ); - }else{ - $bb->errorExit('<AF_M text="Access denied">'); - } - -########### Submit Category #################################################### -}elsif ($mode eq "submit_category"){ - if ($afap->get_visitor_info("type") eq "self"){ - my $title = $afap->{cgi}->param("title"); - my $user = $afap->get_visitor_info("nickname"); - my $afid = $afap->get_visitor_info("afid"); - #insert entry to DB - - $bb->addCategory($title, $user, $afid); -# my $ret = $bb->getNewestCategoryId; - - $tmpl = HTML::Template->new(filename => "./templates/owner/add_category.tmpl"); - $tmpl->param( - SUBMIT => "1", -# ID => $ret->{e_id}, - ); - }else{ - $bb->errorExit('<AF_M text="Access denied">'); - } - -########### Category List #################################################### -}elsif ($mode eq "list_category"){ - $tmpl = HTML::Template->new(filename => "./templates/owner/list_category.tmpl"); - $tmpl->param(access_control_URL => $afap->get_URL("access_control")); - my @entries_param; - my @entries; - @entries = $bb->getAllCategories; - $tmpl->param(has_category => '0'); - if (@entries > 0 ){ - $tmpl->param(has_category=>'1'); - foreach(@entries) { - push @entries_param, - { - TITLE => $_->{title}, - ID => $_->{category_id}, - }; - } - $tmpl->param(ENTRIES => \@entries_param); - } -}elsif ($mode eq "spam"){ -########### Prevent a SPAM comment #################################################### - $tmpl = HTML::Template->new(filename => "./templates/owner/spam.tmpl"); - $tmpl->param(access_control_URL => $afap->get_URL("access_control")); - - if ($action eq "add_spam_key"){ - my $spam_key = $afap->{cgi}->param("spam_key"); - $bb->addSpamkey($spam_key) if ($spam_key ne ""); - }elsif ($action eq "remove_spam_key"){ - my $spam_id = $afap->{cgi}->param("spam_keys"); - $bb->removeSpamkey($spam_id); - } - my @key_list; - my @spam_keys; - @spam_keys = $bb->getAllSpamkeys; - $tmpl->param(HAS_KEY => '0'); - if (@spam_keys > 0 ){ - $tmpl->param(HAS_KEY=>'1'); - foreach(@spam_keys) { - push @key_list, - { - S_ID => $_->{spam_id}, - KEYWORD => $_->{keyword}, - }; - } - $tmpl->param(KEY_LIST => \@key_list); - } - -############################################## -# Default (Owner mode) -############################################## -}else{ - $tmpl = HTML::Template->new(filename => "./templates/owner/admin_general.tmpl"); - $tmpl->param(access_control_URL => $afap->get_URL("access_control")); - if ($action eq "update"){ - my $title = $afap->{cgi}->param("title"); - my $email = $afap->{cgi}->param("email"); - my $max_topics = $afap->{cgi}->param("max_topics"); - my $max_comments = $afap->{cgi}->param("max_comments"); - my $num_topics = $afap->{cgi}->param("num_topics"); - my $num_comments = $afap->{cgi}->param("num_comments"); - my $max_sbjlen = $afap->{cgi}->param("max_sbjlen"); - my $max_textlen = $afap->{cgi}->param("max_textlen"); - - $bb->updatePreference($title,$email,$max_topics,$max_comments,$num_topics,$num_comments,$max_sbjlen,$max_textlen); - } - my %pref = $bb->getPreference; - $tmpl->param(TITLE => $pref{"title"}, - EMAIL => $pref{"email"}, - MAX_TOPICS => $pref{"max_topics"}, - MAX_COMMENTS => $pref{"max_comments"}, - NUM_TOPICS => $pref{"num_topics"}, - NUM_COMMENTS => $pref{"num_comments"}, - MAX_SBJLEN => $pref{"max_sbjlen"}, - MAX_TEXTLEN => $pref{"max_textlen"}, - ); -} -print $bb->translate_templateL10N( $tmpl->output ); -print $afap->get_HTML_footer(); +print "Content-type: text/html; charset=UTF-8\n". + "Location: admin.cgi"."\n\n"; Index: affelio/apps/bb/style.css diff -u affelio/apps/bb/style.css:1.2 affelio/apps/bb/style.css:1.3 --- affelio/apps/bb/style.css:1.2 Wed Jan 25 23:45:47 2006 +++ affelio/apps/bb/style.css Thu Mar 23 12:46:13 2006 @@ -32,6 +32,13 @@ td.afAppBbCategory { font-size: large; font-weight: bold; +border-right: none; + background-color: #ddf; +} +td.afAppBbCategoryBtn { +font-size: x-small; +text-align: right; +border-left: none; background-color: #ddf; } @@ -97,4 +104,6 @@ background-color: #eafaff; } - +img { +border :none; + } \ No newline at end of file Index: affelio/apps/bb/topic.cgi diff -u affelio/apps/bb/topic.cgi:1.1 affelio/apps/bb/topic.cgi:removed --- affelio/apps/bb/topic.cgi:1.1 Mon Dec 19 15:46:27 2005 +++ affelio/apps/bb/topic.cgi Thu Mar 23 12:46:14 2006 @@ -1,232 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2005 FishGrove Inc. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -use strict; -use lib("../../extlib"); -use lib("../../lib"); -use HTML::Template; -use CGI; -use Cwd; -use AffelioApp; -use bb; - - -#Initialize AFAP -our $cgi = new CGI(); -our $afap = new AffelioApp(ConfigDir => Cwd::getcwd(), cgi => $cgi); -our $bb = new bb($afap); -my $tmpl; - -# put Content-type -print "Content-type: text/html; charset=UTF-8\n"; -print "Pragma: no-cache", "\n\n"; -# put HTML Header -print $afap->get_HTML_header("Affelio BB"); -# check access - -unless ($afap->check_access("super")||$afap->check_access("user")) { - $bb->errorExit('<AF_M text="Access denied">'); -} - -########### Init BB #################################################### -my $mode = $afap->{cgi}->param("mode"); -my $action = $afap->{cgi}->param("action"); -my $f_id = $afap->{cgi}->param("f_id"); -$bb->errorExit('<AF_M text="Please specify the forum.">') if ($f_id =~ /\D/); -my $title = $afap->{cgi}->param("title"); -my $description = $afap->{cgi}->param("description"); -my $status = $afap->{cgi}->param("status"); -my $user = $afap->{cgi}->param("user"); -my $afid = $afap->{cgi}->param("afid"); -my $pwd = $afap->{cgi}->param("pwd"); -my $pb_user = ($afap->get_visitor_info("type") eq "pb") ? "1" : "0"; -if ($pb_user eq "0"){ - $user = $afap->get_visitor_info("nickname"); - $afid = $afap->get_visitor_info("afid"); -} -my $status_edit = $afap->check_access("super") ? "1" : "0"; - -########### Add new topic #################################################### -if ($mode eq "add_topic"){ - $tmpl = HTML::Template->new(filename => "./templates/topic.tmpl"); - $tmpl->param( - NEW => "1", - F_ID => $f_id, - TITLE => $title, - DESCRIPTION => $description, - STATUS_EDIT => $status_edit, - PB_USER => $pb_user, - AFID => $afid, - USER => $user - ); -########### Confirm topic #################################################### -}elsif ($mode eq "confirm_topic"){ - $bb->errorExit('<AF_M text="Please input a title.">') if ($title eq ""); - $bb->errorExit('<AF_M text="Please input a description.">') if ($description eq ""); - $bb->errorExit('<AF_M text="Please input your nickname.">') if ($user eq ""); - $bb->checkPwd($pwd) if ($pb_user eq "1"); - my $status_str; - if ($status eq "0"){ - $status_str = '<AF_M text="Default">'; - }elsif ($status eq "1"){ - $status_str = '<AF_M text="Sticky">'; - }elsif ($status eq "2"){ - $status_str = '<AF_M text="Announcement">'; - } - - $tmpl = HTML::Template->new(filename => "./templates/topic.tmpl"); - $tmpl->param( - CONFIRM => "1", - F_ID => $f_id, - TITLE => $title, - DESCRIPTION_SHOW=> $bb->escape($description), - DESCRIPTION => $description, - STATUS => $status, - STATUS_STR => $status_str, - STATUS_EDIT => $status_edit, - PB_USER => $pb_user, - AFID => $afid, - PWD => $pwd, - USER => $user - ); -########### Submit topic #################################################### -}elsif ($mode eq "submit_topic"){ - $bb->errorExit('<AF_M text="Please input a title.">') if ($title eq ""); - $bb->errorExit('<AF_M text="Please input a description.">') if ($description eq ""); - $bb->errorExit('<AF_M text="Please input your nickname.">') if ($user eq ""); - $bb->errorExit('<AF_M text="Please input a password.">') if ($pwd eq "" && $pb_user); - - my $icon=""; - $status=0 if (!$afap->check_access("super")); - my $topic_id=$bb->addTopic($f_id, $title, $description, $icon,$user, $afid, $pwd, $status); - - my $current_forum = $bb->getForum($f_id); - $bb->updateCategoryInfo($current_forum->{category_id}, $user, $afid); - $bb->createReplyTable($topic_id); - - $tmpl = HTML::Template->new(filename => "./templates/topic.tmpl"); - $tmpl->param( - DONE => "1", - T_ID => $topic_id, - MSG => "New Topic was created.", - ); - -########### Edit topic mode #################################################### -}elsif ($mode eq "edit_topic"){ - my $t_id = $afap->{cgi}->param("t_id"); - $bb->errorExit('<AF_M text="Please specify the topic.">') if ($t_id =~ /\D/ || $t_id eq ""); - $tmpl = HTML::Template->new(filename => "./templates/topic.tmpl"); - my $topic = $bb->getTopic($t_id); - my $auth=0; - if ($action ne ""){ - if ($afap->get_visitor_info("type") eq "self"){ - $auth=1; - }else{ - if($pb_user eq "0") { - if ($topic->{pwd} eq "" && $topic->{afid} eq $afid){ - $auth=1; - }else{ - $bb->errorExit('<AF_M text="Authentication error.">'); - } - } elsif($topic->{pwd} ne ""){ - if ($pb_user){ - $bb->errorExit('<AF_M text="Please input your nickname.">') if($user eq ""); - $bb->checkPwd($pwd); - } - if (crypt($pwd,$topic->{pwd}) eq $topic->{pwd}){ - $auth=1; - }else{ - $bb->errorExit('<AF_M text="Authentication error.">'); - } - } - } - # Do update - if($action eq "do_update"){ - $bb->updateTopic($t_id, $title, $description, $topic->{icon}, $user, $afid, $status, $topic->{lock}) if ($auth); - $tmpl->param( - DONE => "1", - T_ID => $t_id, - MSG => "The topic was updated.", - ); - # Lock/unlock topic - }elsif($action eq "lock"){ - $bb->updateTopic($t_id, $topic->{title}, $topic->{description}, $topic->{icon}, $user, $afid, $topic->{status}, abs($topic->{lock}-1)) if ($auth); - if ($topic->{lock}){ - $tmpl->param(MSG=>"The topic was unlocked."); - }else{ - $tmpl->param(MSG=>"The topic was locked."); - } - $tmpl->param( - DONE => "1", - T_ID => $t_id, - ); - # Confirm delete topic - }elsif($action eq "confirm_delete"){ - $bb->errorExit('<AF_M text="Authentication error.">') if ($afap->get_visitor_info("type") ne "self"); - $tmpl->param( - CONFIRM_DELETE => "1", - T_ID => $t_id, - F_ID => $f_id, - MSG => "Realy?", - ); - # Do delete - }elsif($action eq "do_delete"){ - $bb->errorExit('<AF_M text="Authentication error.">') if ($afap->get_visitor_info("type") ne "self"); - $bb->deleteTopic($t_id,$f_id); - $tmpl->param( - DONE => "1", - T_ID => $t_id, - MSG => "The topic was removed.", - ); - } - # Edit topic (no action) - }else{ - my $can_delete = ""; - if ($afap->get_visitor_info("type") eq "self"){ - $tmpl->param(PWD => "0"); - $can_delete = 1; - }else{ - if ($pb_user eq "0"){ - if ($topic->{pwd} eq "" && $topic->{afid} eq $afid){ - $tmpl->param(PWD => "0"); - } else { - $bb->errorExit('<AF_M text="Authentication error.">'); - } - }elsif($topic->{pwd} ne ""){ - $tmpl->param(PWD => "1"); - } - } - $topic->{description} =~ s/<br[^>]*>/\n/g; - $tmpl->param( - EDIT => "1", - T_ID => $t_id, - F_ID => $f_id, - USER => $topic->{user}, - TITLE => $topic->{title}, - DESCRIPTION => $topic->{description}, - AFID => $topic->{afid}, - SUPER => $afap->check_access("super"), - STATUS => $topic->{status}, - CAN_DELETE => $can_delete, - ); - } -}else { - $bb->errorExit('<AF_M text="Error: Unknown access.">'); -} - -print $bb->translate_templateL10N( $tmpl->output ); -print $afap->get_HTML_footer(); Index: affelio/apps/bb/view_forum.cgi diff -u affelio/apps/bb/view_forum.cgi:1.1 affelio/apps/bb/view_forum.cgi:removed --- affelio/apps/bb/view_forum.cgi:1.1 Mon Dec 19 15:46:27 2005 +++ affelio/apps/bb/view_forum.cgi Thu Mar 23 12:46:14 2006 @@ -1,153 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2005 FishGrove Inc. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -use strict; -use lib("../../extlib"); -use lib("../../lib"); -use HTML::Template; -use CGI; -use Cwd; -use AffelioApp; -use bb; - - -#Initialize AFAP -our $cgi = new CGI(); -our $afap = new AffelioApp(ConfigDir => Cwd::getcwd(), cgi => $cgi); -our $bb = new bb($afap); -my $tmpl; - -# put Content-type -print "Content-type: text/html; charset=UTF-8\n"; -print "Pragma: no-cache", "\n\n"; -# put HTML Header -print $afap->get_HTML_header("Affelio BB"); -# check access -unless ($afap->check_access("DF_access")) { - $bb->errorExit('<AF_M text="Access denied">'); -} - -########### Init BB #################################################### - -my $f_id = $afap->{cgi}->param("f_id"); -$bb->errorExit('<AF_M text="Please specify the forum.">') if ($f_id =~ /\D/); -my $pb_user = ($afap->get_visitor_info("type") eq "pb") ? "1" : "0"; -my $afid; -$afid = $afap->get_visitor_info("afid") if ($pb_user eq "0"); -my %pref = $bb->getPreference; -$tmpl = HTML::Template->new(filename => "./templates/view_forum.tmpl"); -my @topic_list; -my @topics; -my $icon; -my $last_user; -my $last_afid; -my $current_forum = $bb->getForum($f_id); -my $category = $bb->getColumn("SELECT title FROM $bb->{category_tb} WHERE category_id=$current_forum->{category_id}"); -my $can_add=""; -my $can_edit=""; -my $opt_msg=""; -$can_add=1 if ($afap->check_access("super") || $afap->check_access("user")); - -if ($pb_user eq "0"){ - if ($current_forum->{pwd} eq "" && $current_forum->{afid} eq $afid){ - $can_edit = 1; - } -}elsif($current_forum->{pwd} ne ""){ - $can_edit = 1; -} -$can_edit=1 if ($afap->get_visitor_info("type") eq "self"); - -########### Get Topic List #################################################### - ＠ topics = $bb->getAllTopics($f_id); -if ($#topics+1 >= int($bb->getColumn("SELECT value FROM $bb->{pref_tb} WHERE key = 'max_topics'"))){ - $can_add = ""; - $opt_msg = '<AF_M text="This forum was cloesd. Please make a new forum.">'; -} - -########### Get current time #################################################### -my ($sec, $min, $hour, $mday, $mon, $year) = localtime($current_forum->{timestamp}); -$mon+=1; -$year+=1900; - -########### Set forum info #################################################### -$tmpl->param( - PAGE_TITLE => $pref{"title"}, - F_ID => $f_id, - CATEGORY => $category, - FORUM_NAME => $current_forum->{title}, - FORUM_DESCRIPTION => $current_forum->{description}, - AFID => $bb->getUserURI($current_forum->{afid}), - MODERATOR => $current_forum->{user}, - YEAR => $year, - MONTH => $mon, - DAY => $mday, - TIME => sprintf("%02d:%02d", $hour, $min), - CAN_ADD => $can_add, - CAN_EDIT => $can_edit, - OPT_MSG => $opt_msg, - HAS_TOPIC => $#topics+1 -); - -########### Set Topic List #################################################### -foreach(@topics) { - my $abst=$_->{description}; - my ($sec, $min, $hour, $mday, $mon, $year) = localtime($_->{update_time}); - $mon+=1; - $year+=1900; - if($_->{status} == 1){ - $icon="sticky"; - }elsif($_->{status} == 2){ - $icon="announce"; - }else{ - $icon="normal"; - } - if ($_->{lock} == 1){ - $icon.="_lock"; - } - $icon.=".gif"; - if ($_->{posts}<1) { - $last_user=$_->{user}; - $last_afid=$_->{afid}; - } - if (length($_->{description})>50){ - $abst = substr($_->{description},0,49)."..."; - } - - push @topic_list, - { - T_ID => $_->{topic_id}, - TITLE => $_->{title}, - ABST => $abst, - POSTS => $_->{posts}, - USER => $_->{user}, - AFID => $bb->getUserURI($_->{afid}), - VIEWS => $_->{view}, - YEAR => $year, - MONTH => $mon, - DAY => $mday, - TIME => sprintf("%02d:%02d", $hour, $min), - LAST_USER => $_->{last_user}, - LAST_AFID => $bb->getUserURI($_->{last_afid}), - ICON => $icon, - }; -} - -$tmpl->param(TOPIC_LIST => \@topic_list); - -########### Output html #################################################### -print $bb->translate_templateL10N( $tmpl->output ); -print $afap->get_HTML_footer(); Index: affelio/apps/bb/view_topic.cgi diff -u affelio/apps/bb/view_topic.cgi:1.2 affelio/apps/bb/view_topic.cgi:removed --- affelio/apps/bb/view_topic.cgi:1.2 Wed Jan 25 22:59:21 2006 +++ affelio/apps/bb/view_topic.cgi Thu Mar 23 12:46:14 2006 @@ -1,199 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2005 FishGrove Inc. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -use strict; -use lib("../../extlib"); -use lib("../../lib"); -use HTML::Template; -use CGI; -use Cwd; -use AffelioApp; -use bb; - - -#Initialize AFAP -our $cgi = new CGI(); -our $afap = new AffelioApp(ConfigDir => Cwd::getcwd(), cgi => $cgi); -our $bb = new bb($afap); -my $tmpl; - -# put Content-type -print "Content-type: text/html; charset=UTF-8\n"; -print "Pragma: no-cache", "\n\n"; -# put HTML Header -print $afap->get_HTML_header("Affelio BB"); -# check access -unless ($afap->check_access("DF_access")) { - $bb->errorExit('<AF_M text="Access denied">'); -} - -########### Init BB #################################################### -my $t_id = $afap->{cgi}->param("t_id"); -$bb->errorExit('<AF_M text="Please specify the topic.">') if ($t_id =~ /\D/ || $t_id==""); -my $page = $afap->{cgi}->param("page"); -$bb->errorExit('<AF_M text="Please specify the page correctly.">') if ($page =~ /\D/); -$page=0 if ($page eq ""); -my $comment = $afap->{cgi}->param("comment"); -my $pb_user = ($afap->get_visitor_info("type") eq "pb") ? "1" : "0"; -my $user_name = $afap->{cgi}->param("user_name"); -my $afid = $afap->{cgi}->param("afid"); -if ($pb_user eq "0"){ - $user_name = $afap->get_visitor_info("nickname"); - $afid = $afap->get_visitor_info("afid"); -} -my %pref = $bb->getPreference; -my @reply_list; -my @replies; -$bb->errorExit('<AF_M text="The topic was not found.">') if (!(my $current_topic = $bb->getTopic($t_id))); -my $current_forum = $bb->getForum($current_topic->{forum_id}); -my $current_category = $bb->getCategory($current_forum->{category_id}); -my $can_reply=""; -my $opt_msg=""; -$bb->addViewCountTopic($t_id); -$tmpl = HTML::Template->new(filename => "./templates/view_topic.tmpl"); - -########### Can you reply to this topic? #################################################### -$can_reply="1" if ($afap->check_access("super") || $afap->check_access("user")); -if ($current_topic->{lock}) { - $can_reply = ""; - $opt_msg = '<AF_M text="This topic is locked.">'; -} - -########### Can you edit this topic? #################################################### -my $can_edit=""; -if ($pb_user eq "0"){ - if ($current_topic->{pwd} eq "" && $current_topic->{afid} eq $afid){ - $can_edit = 1; - } -}elsif($current_topic->{pwd} ne ""){ - $can_edit = 1; -} -$can_edit=1 if ($afap->get_visitor_info("type") eq "self"); - -########### Get current time #################################################### -my ($sec, $min, $hour, $mday, $mon, $year) = localtime($current_topic->{timestamp}); -$mon+=1; -$year+=1900; - -my $rep_count = $bb->getColumn("SELECT count(reply_id) FROM reply_$t_id"); -if ($rep_count >= int($bb->getColumn("SELECT value FROM $bb->{pref_tb} WHERE key = 'max_comments'"))){ - $can_reply = ""; - $opt_msg = '<AF_M text="This topic was cloesd. Please make a new topic.">'; -} - -########### Set page index #################################################### -use integer; -my @page_index; -my $num_comments = $bb->getColumn("SELECT value FROM $bb->{pref_tb} WHERE key = 'num_comments'"); -my $i = ($rep_count)/$num_comments; -while ($i>0){ - unshift @page_index, - { - page => $i, - p_id => $i-1, - F_ID => $current_topic->{forum_id}, - T_ID => $t_id, - }; - $i--; -} -no integer; - ＠ replies = $bb->getReplies($t_id, $rep_count - $page*$num_comments, $rep_count - ($page*$num_comments+$num_comments)+1); - -########### Set topic info #################################################### -$tmpl->param( - PAGE_TITLE => $pref{"title"}, - CATEGORY => $current_category->{title}, - FORUM => $current_forum->{title}, - F_ID => $current_topic->{forum_id}, - T_ID => $t_id, - TOPIC_NAME => $current_topic->{title}, - TOPIC_USER => $current_topic->{user}, - TOPIC_AFID => $bb->getUserURI($current_topic->{afid}), - CAN_EDIT => $can_edit, - CAN_REPLY => $can_reply, - PB_USER => $pb_user, - REPLY_TITLE => "RE:$current_topic->{title}", - USER_NAME => $user_name, - AFID => $afid, - COMMENT => $comment, - OPT_MSG => $opt_msg, - PAGE_INDEX => \@page_index, - YEAR => $year, - MONTH => $mon, - DAY => $mday, - TIME => sprintf("%02d:%02d", $hour, $min), - HAS_REPLY => $#replies+1, - TOPIC_DESCRIPTION => $current_topic->{description}, -); - -########### Set comments #################################################### -foreach(@replies) { - my $can_edit=""; - my ($sec, $min, $hour, $mday, $mon, $year) = localtime($_->{timestamp}); - $mon+=1; - $year+=1900; - if ($pb_user eq "0"){ - if ($_->{pwd} eq "" && $_->{afid} eq $afid){ - $can_edit = 1; - } - }elsif($_->{pwd} ne ""){ - $can_edit = 1; - } - $can_edit=1 if ($afap->get_visitor_info("type") eq "self"); - $can_edit="" if ($_->{title} eq "" && $_->{user} eq "" && $_->{afid} eq ""); - my $uri = $bb->getUserURI($_->{afid}) unless ($_->{afid} eq ""); - - push @reply_list, - { - T_ID => $t_id, - R_ID => $_->{reply_id}, - TITLE => $_->{title}, - USER => $_->{user}, - AFID => $uri, - COMMENT => $bb->autolink($_->{comment}), - YEAR => $year, - MONTH => $mon, - DAY => $mday, - TIME => sprintf("%02d:%02d", $hour, $min), - CAN_EDIT=> $can_edit, - ICON => $_->{icon}, - }; -} -$tmpl->param(REPLY_LIST => \@reply_list); - -########### Set face icons #################################################### -if ($can_reply){ - my @face_list; - my $face_dir = './resource/face'; - opendir DIR, "$face_dir"; - my @faces = grep(!/^\.+/, readdir DIR); - close DIR; - - foreach (@faces){ - unless ($_ eq "owner.gif"){ - push @face_list, - { - FACE => $_ - }; - } - } - $tmpl->param(FACE_LIST => \@face_list); -} - -########### Output html #################################################### -print $bb->translate_templateL10N( $tmpl->output ); -print $afap->get_HTML_footer();
