Changeset 6349

Timestamp:

06/27/08 16:24:46 (5 months ago)

Author:

coolengineer

Message:

• #960
  
• merged from braches/1.7 of r6348
  

Files:

• trunk/plugins/CL_Moblog/index.php (modified) (6 diffs)

trunk/plugins/CL_Moblog/index.php

@@ -146 +146 @@
                 $mail['text'] = preg_replace( '@<BR>\s*<BR>\s*<BR>@smi', '<BR>', $mail['text']);
             }
-            $text = "<h3 id=\"$docid\">$docid</h3>\r\n";
-            $text .= empty($mail['subject']) ? '' : ("<p>".$mail['subject']."</p>\r\n");
-            $text .= "<p>{$mail['text']}</p>\r\n";
+            $text = "<h3 class=\"moblog-title\" id=\"$docid\">$docid</h3>\r\n";
+            //$text .= empty($mail['subject']) ? '' : ("<p>".$mail['subject']."</p>\r\n");
+            if( !empty($mail['text']) ) {
+                $text .= "<div class=\"moblog-body\">{$mail['text']}</div>\r\n";
+            }
             return $text;
     }
@@ -197 +199 @@
 
         $post = new Post();
+        $moblog_begin = "\n<div class=\"moblog-entry\">";
+        $moblog_end = "\n</div>\n";
 
         if( $post->open( "slogan = '$slogan'" ) ) {
             $this->log( "* 기존 글을 엽니다. (SLOGAN:$slogan)" );
-            $post->content .= $this->_getDecoratedContent( $mail, $docid );
+            $post->content .= $moblog_begin.$this->_getDecoratedContent( $mail, $docid );
             $post->modified = time();
             $post->visibility = $this->visibility;
@@ -214 +218 @@
             $post->userid = $this->userid;
             $post->category = $this->category;
-            $post->content = $this->_getDecoratedContent( $mail, $docid );
+            $post->content = $moblog_begin.$this->_getDecoratedContent( $mail, $docid );
             $post->contentFormatter = getDefaultFormatter();
             $post->contentEditor = getDefaultEditor();
@@ -235 +239 @@
         if( isset( $mail['attachments'] ) && count($mail['attachments']) ) {
             requireModel( "blog.api" );
+            $post->content .= "<div class=\"moblog-attachments\">\n";
             foreach( $mail['attachments'] as $mail_att ) {
                 $this->log( "* ". _t("첨부")." : {$mail_att['filename']}" );
@@ -250 +255 @@
                 }
                 $alt = htmlentities($mail_att['filename'],ENT_QUOTES,'utf-8');
-                $content ='<p>[##_1C|$FILENAME|width="$WIDTH" height="$HEIGHT" alt="'.$alt.'"|_##]</p>';
+                $content ='[##_1C|$FILENAME|width="$WIDTH" height="$HEIGHT" alt="'.$alt.'"|_##]';
                 $content = str_replace( '$FILENAME', $att['name'], $content );
                 $content = str_replace( '$WIDTH', $att['width'], $content );
@@ -256 +261 @@
                 $post->content .= $content;
             }
-            if( !$post->update() ) {
-                $this->logMail( $mail, "ERROR" );
-                $this->log( _t("실패: 첨부파일을 본문에 연결하지 못하였습니다").". : " . $post->error );
-                return false;
-            }
+            $post->content .= "\n</div>";
+        }
+        $post->content .= $moblog_end;
+
+        if( !$post->update() ) {
+            $this->logMail( $mail, "ERROR" );
+            $this->log( _t("실패: 첨부파일을 본문에 연결하지 못하였습니다").". : " . $post->error );
+            return false;
         }
         $this->logMail( $mail, "OK" );