Changeset 6122

Timestamp:

05/31/08 20:26:24 (6 months ago)

Author:

coolengineer

Message:

• #960
  
• 허용목록(White list) 추가
  
• 로그에 엔트리 링크를 추가
  
• 성공한 로그는 파란색으로 보여줌
  
• MMS 외에 일반 메일도 MMS로 인식할 수 있도록 함
  
• 메일을 전송한 시각을 기준으로 날짜를 판단함. (기존은 메일을 확인하는 시각)
  

Location:

trunk

Files:

• components/Needlworks.Mail.Pop3.php (modified) (1 diff)
• plugins/CL_Moblog/index.php (modified) (17 diffs)
• plugins/CL_Moblog/index.xml (modified) (1 diff)

trunk/components/Needlworks.Mail.Pop3.php

@@ -352 +352 @@
             if( !isset( $mail['date'] ) && preg_match( '/^Date:\s*(.*)/i', $line, $match ) ) {
                 $mail['date'] = strtotime( $match[1] );
-                $mail['date_string'] = strftime( "%Y-%m-%d %H:%M:%S", $mail['date'] );
-            }
-            if( !isset( $mail['from'] ) && preg_match( '/^From:.*<(.*)>/i', $line, $match ) ) {
-                $mail['from'] = $match[1];
+                $mail['date_string'] = strftime( "%Y-%m-%d", $mail['date'] );
+                $mail['time_string'] = strftime( "%H:%M:%S", $mail['date'] );
+                $mail['date_year'] =   strftime( "%Y", $mail['date'] );
+                $mail['date_month'] =  strftime( "%m", $mail['date'] );
+                $mail['date_day'] =    strftime( "%d", $mail['date'] );
+            }
+            if( !isset( $mail['from'] ) && preg_match( '/^From:([^<]*)<(.*)>/i', $line, $match ) ) {
+                $mail['sender'] = trim($this->decode_header($match[1]));
+                $mail['from'] = $match[2];
             }
             if( !isset( $mail['content_transfer_encoding'] ) && preg_match( '/^Content-Transfer-Encoding:\s*(\S+)/i', $line, $match ) ) {

trunk/plugins/CL_Moblog/index.php

@@ -4 +4 @@
 class Moblog
 {
-    function Moblog( $username, $password, $host, $port = 110, $ssl = 0, 
-        $userid = 1, $minsize = 10240, $visibility = 2, $category = 0 )
+    function Moblog( $options )
     {
         global $pop3logs;
@@ -11 +10 @@
             $pop3logs = array();
         }
-        $this->username = $username;
-        $this->password = $password;
-        $this->host = $host;
-        $this->port = $port;
-        $this->ssl = $ssl;
-        $this->userid = $userid;
-        $this->minsize = $minsize;
+        foreach( $options as $k => $v ) {
+            $this->$k = $v;
+        }
+
         $this->recentCount = 100;
-        $this->visibility = array( "private", "protected", "public", "syndicated" );
-        $this->visibility = $this->visibility[$visibility];
-        $this->category = $category;
+        $visibilities = array( "private", "protected", "public", "syndicated" );
+        $this->visibility = $visibilities[$this->visibility];
+        $this->allow = preg_split( "@[,\s]+@", $this->allow ) ;
 
         $this->pop3 = new Pop3();
@@ -45 +41 @@
     }
 
+    function decorate_log($s)
+    {
+        global $blogURL;
+        $s = htmlspecialchars($s);
+        $s = preg_replace( "/\(SLOGAN:([^)]+)\)/", "<a href=\"$blogURL/entry/\\1\" target=\"_blank\">click</a>", $s );
+        return $s;
+    }
+
     function log($msg)
     {
@@ -52 +56 @@
         if( $msg[0] == '*' ) {
             global $pop3logs;
-            array_push( $pop3logs, substr($msg,2) );
+            array_push( $pop3logs, Moblog::decorate_log(substr($msg,2)) );
         }
     }
@@ -110 +114 @@
     }
 
-    function isMms( & $mail )
-    {
+    function isAllowed( & $mail )
+    {
+        if( isset( $mail['from'] ) && is_array( $this->allow) ) {
+            foreach( $this->allow as $a ) {
+                if( strstr( $mail['from'], $a ) !== false ) return true; 
+                if( isset($mail['sender']) && strstr( $mail['sender'], $a ) !== false ) return true; 
+            }
+        }
+        if( $this->allowonly ) {
+            $this->logMail( $mail, "SKIP, Not in ALLOW list" );
+            return false;
+        }
+
         if( !empty($mail['mms']) ) {
+            $this->logMail( $mail, "SKIP, Not an MMS" );
             return true;
         }
@@ -142 +158 @@
     }
 
+    function logMail( $mail, $result )
+    {
+        $date = isset( $mail['date_string'] ) ? "{$mail['date_string']} {$mail['time_string']} " : '';
+        $from = isset( $mail['from'] ) ? "({$mail['sender']} <{$mail['from']}>) " : '';
+        $this->log( "* "._t("메일").": {$mail['subject']} {$date} {$from}[{$result}]" );
+    }
+
     function retrieveCallback( $lines, $uid )
     {
-        $slogan = date( "Y-m-d" );
-        $docid = date( "H:i:s" );
         $this->appendUid( $uid );
         $mail = $this->pop3->parse( $lines );
+
+        if( isset( $mail['date_string'] ) ) {
+            $slogan = $mail['date_string'];
+            $docid = $mail['time_string'];
+        } else {
+            $slogan = date( "Y-m-d" );
+            $docid = date( "H:i:s" );
+        }
         if( in_array( $mail['subject'], array( '제목없음' ) ) ) {
             $mail['subject'] = '';
         }
-        if( !$this->isMms($mail) ) {
-            $this->log( "* "._t("메일").": " . $mail['subject'] . " [SKIP]" );
+        if( !$this->isAllowed($mail) ) {
             return false;
         }
         if( empty($mail['attachments']) ) {
-            $this->log( "* "._t("메일").": " . $mail['subject'] . " [SKIP]" );
+            $this->logMail( $mail, "SKIP" );
             return false;
         }
@@ -164 +192 @@
 
         if( $post->open( "slogan = '$slogan'" ) ) {
-            $this->log( "* 기존 글을 엽니다" );
+            $this->log( "* 기존 글을 엽니다. (SLOGAN:$slogan)" );
             $post->content .= $this->_getDecoratedContent( $mail, $docid );
             $post->modified = time();
             $post->visibility = $this->visibility;
         } else {
-            $this->log( "* 새 글을 작성합니다" );
-            $post->title = empty($mail['subject']) ? $slogan : $mail['subject'];
+            $this->log( "* 새 글을 작성합니다. (SLOGAN:$slogan)" );
+            if( isset( $mail['date_year'] ) ) {
+                $post->title = str_replace( array('%Y','%M','%D'), 
+                    array( $mail['date_year'], $mail['date_month'], $mail['date_day'] ), $this->subject );
+            } else {
+                $post->title = str_replace( array('%Y','%M','%D'), 
+                    array( date("Y"), date("m"), date("d") ), $this->subject );
+            }
             $post->userid = $this->userid;
             $post->category = $this->category;
@@ -184 +218 @@
             $post->slogan = $slogan;
             if( !$post->add() ) {
-                $this->log( "* "._t("메일").": " . $mail['subject'] . " [ERROR]" );
+                $this->logMail( $mail, "ERROR" );
                 $this->log( _t("실패: 글을 추가하지 못하였습니다")." : " . $post->error );
                 return false;
@@ -204 +238 @@
                     );
                 if( !$att ) {
-                    $this->log( "* "._t("메일").": " . $mail['subject'] . " [ERROR]" );
+                    $this->logMail( $mail, "ERROR" );
                     $this->log( _t("실패: 첨부파일을 추가하지 못하였습니다")." : " . $post->error );
                     return false;
@@ -216 +250 @@
             }
             if( !$post->update() ) {
-                $this->log( "* "._t("메일").": " . $mail['subject'] . " [ERROR]" );
+                $this->logMail( $mail, "ERROR" );
                 $this->log( _t("실패: 첨부파일을 본문에 연결하지 못하였습니다").". : " . $post->error );
                 return false;
             }
         }
-        $this->log( "* "._t("메일").": " . $mail['subject'] . " [OK]" );
+        $this->logMail( $mail, "OK" );
         return true;
     }
@@ -229 +263 @@
 {
     if( isset($_GET['check']) && $_GET['check'] == 1 ) {
+        echo "<html><body style=\"font-size:0.9em\">";
         echo "<style>.emplog{color:red}.oklog{color:blue}</style>";
         echo "<ul>";
@@ -234 +269 @@
             array_map(
                 create_function( '$li', 'return preg_match( "/^\S+\s+\S+\s+\*/", $li ) ? 
-                        (preg_match( "/\[OK\]$/", $li ) ? "<li class=\"oklog\">$li</li>" : "<li class=\"emplog\">$li</li>") 
+                        (preg_match( "/\[OK\]/", $li ) ? "<li class=\"oklog\">$li</li>" : "<li class=\"emplog\">$li</li>") 
                         : "<li>$li</li>";'), 
-                split( "\n",file_get_contents(ROOT.DS."cache".DS."moblog.txt"))
+                split( "\n",Moblog::decorate_log(file_get_contents(ROOT.DS."cache".DS."moblog.txt")))
             )
         );
         echo "</ul>";
+        echo "</body></html>";
         exit;
     }
 
-    $pop3host = getBlogSetting( 'MmsPop3Host', 'localhost' );
-    $pop3port = getBlogSetting( 'MmsPop3Port', 110 );
-    $pop3ssl = getBlogSetting( 'MmsPop3Ssl', 0 );
-    $pop3username = getBlogSetting( 'MmsPop3Username', '' );
-    $pop3password = getBlogSetting( 'MmsPop3Password', '' );
-    $pop3minsize = getBlogSetting( 'MmsPop3MinSize', 0 );
-    $pop3category = getBlogSetting( 'MmsPop3Category', 0 );
-    $pop3minsize *= 1024;
-    $pop3fallbackuserid = getBlogSetting( 'MmsPop3Fallbackuserid', 1 );
-    $pop3visibility = getBlogSetting( 'MmsPop3Visibility', '2' );
-
     header( "Content-type: text/html; charset:utf-8" );
-    echo "<html><body><ul><li>";
-    $moblog = new Moblog( $pop3username, $pop3password, $pop3host, $pop3port, $pop3ssl, $pop3fallbackuserid, $pop3minsize, $pop3visibility, $pop3category );
+    echo '<html>';
+    echo '<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />';
+    echo '<body style="font-size:0.9em"><ul><li>';
+    $moblog = new Moblog( 
+        array( 
+            'username' => getBlogSetting( 'MmsPop3Username', '' ),
+            'password' => getBlogSetting( 'MmsPop3Password', '' ),
+            'host' => getBlogSetting( 'MmsPop3Host', 'localhost' ),
+            'port' => getBlogSetting( 'MmsPop3Port', 110 ),
+            'ssl' => getBlogSetting( 'MmsPop3Ssl', 0 ),
+            'userid' => getBlogSetting( 'MmsPop3Fallbackuserid', 1 ),
+            'minsize' => getBlogSetting( 'MmsPop3MinSize', 0 )*1024,
+            'visibility' => getBlogSetting( 'MmsPop3Visibility', '2' ),
+            'category' => getBlogSetting( 'MmsPop3Category', 0 ), 
+            'allowonly' => getBlogSetting( 'MmsPop3AllowOnly', '0' ),
+            'allow' => getBlogSetting( 'MmsPop3Allow', '' ),
+            'subject' => getBlogSetting( 'MmsPop3Subject', '%Y-%M-%D' ) ) 
+    );
     $moblog->log( "--BEGIN--" );
     $moblog->check();
@@ -262 +303 @@
     if( Acl::check( 'group.administrators' ) ) {
         global $pop3logs;
-        print join("</li><li>",$pop3logs);
-    }
-    echo "</li></ul></body></html>";
+        print join("</li>\n<li>",$pop3logs);
+    }
+    echo "</li>\n</ul></body></html>";
     return true;
 }
@@ -283 +324 @@
         setBlogSetting( 'MmsPop3Fallbackuserid', getUserId() );
         setBlogSetting( 'MmsPop3MinSize', 0 );
+        setBlogSetting( 'MmsPop3AllowOnly', !empty($_POST['pop3allowonly'])?1:0 );
+        setBlogSetting( 'MmsPop3Allow', $_POST['pop3allow'] );
+        setBlogSetting( 'MmsPop3Subject', $_POST['pop3subject'] );
     }
     $pop3email = getBlogSetting( 'MmsPop3Email', '' );
@@ -294 +338 @@
     $pop3fallheadercharset = getBlogSetting( 'MmsPop3Fallbackcharset', 'euc-kr' );
     $pop3visibility = getBlogSetting( 'MmsPop3Visibility', '2' );
+    $pop3mmsallowonly = getBlogSetting( 'MmsPop3AllowOnly', '0' );
+    $pop3mmsallow = getBlogSetting( 'MmsPop3Allow', '' );
+    $pop3subject = getBlogSetting( 'MmsPop3Subject', '%Y-%M-%D' );
 ?>
                         <hr class="hidden" />
@@ -386 +433 @@
                                             </dd>
                                         </dl>
+                                    <div class="button-box">
+                                        <input type="submit" class="save-button input-button wide-button" value="<?php echo _t('저장하기');?>"  />
+                                    </div>
+                                </div>
+                            <h2 class="caption"><span class="main-text"><?php echo _t('글 쓰기 환경 설정');?></span></h2>
+                                <div id="editor-section" class="section">
+                                        <dl id="editor-line" class="line">
+                                            <dt><span class="label"><?php echo _t('제목');?></span></dt>
+                                            <dd>
+                                                <input type="text" style="width:24em" class="input-text" id="pop3subject" name="pop3subject" value="<?php echo $pop3subject; ?>" />
+                                                (<?php echo _t('%Y:년, %M:월, %D:일');?>) <input type="button" value="<?php echo _t("초기화");?>" onclick="document.getElementById('pop3subject').value='%Y-%M-%D';return false;" />
+                                            </dd>
+                                        </dl>
                                         <dl id="editor-line" class="line">
                                             <dt><span class="label"><?php echo _t('공개여부');?></span></dt>
@@ -413 +473 @@
                                                     </optgroup>
                                                 </select>
+                                            </dd>
+                                        </dl>
+                                    <div class="button-box">
+                                        <input type="submit" class="save-button input-button wide-button" value="<?php echo _t('저장하기');?>"  />
+                                    </div>
+                                </div>
+                            <h2 class="caption"><span class="main-text"><?php echo _t('메일 필터링 설정');?></span></h2>
+                                <div id="editor-section" class="section">
+                                        <dl id="formatter-line" class="line">
+                                            <dt><span class="label"><?php echo _t('허용 목록');?></span></dt>
+                                            <dd>
+                                                <input type="radio" id="pop3allowonly" name="pop3allowonly" value="1" <?php echo $pop3mmsallowonly ? 'checked="checked"':'' ?> />
+                                                <label for="pop3allowonly"><?php echo _t('다음 송신자로부터 전송된 메일만 MMS로 인식하여 처리합니다') ?></label>
+                                            </dd>
+                                            <dd>
+                                                <input type="radio" id="pop3allowlist" name="pop3allowonly" value="0" <?php echo $pop3mmsallowonly ? '':'checked="checked"' ?> />
+                                                <label for="pop3allowlist"><?php echo _t('다음 송신자로부터 전송된 메일도 MMS로 인식하여 처리합니다'); ?></label>
+                                            </dd>
+                                            <dd>
+                                                <input type="text" maxlength="128" name="pop3allow" value="<?php echo htmlentities($pop3mmsallow)?>" style="width:90%" />
+                                            </dd>
+                                            <dd>
+                                                <?php echo _t('여러 개인 경우 전화번호 혹은 이메일 주소를 쉼표나 공백으로 구별하여 나열합니다') ?>
+                                            </dd>
+                                            <dd>
                                             </dd>
                                         </dl>

trunk/plugins/CL_Moblog/index.xml

@@ -54 +54 @@
               </param>
               <param>
+                  <name>pop3allowonly</name><type>int</type><mandatory>0</mandatory>
+              </param>
+              <param>
+                  <name>pop3allow</name><type>string</type><mandatory>0</mandatory>
+              </param>
+              <param>
+                  <name>pop3subject</name><type>string</type><mandatory>0</mandatory>
+              </param>
+              <param>
                   <name>check</name><type>int</type><mandatory>0</mandatory>
               </param>