[pLog-svn] r6862 - in plugins/branches/lifetype-1.2/moblog: class/moblog install

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Wed Apr 15 12:55:52 EDT 2009


Author: jondaley
Date: 2009-04-15 12:55:52 -0400 (Wed, 15 Apr 2009)
New Revision: 6862

Modified:
   plugins/branches/lifetype-1.2/moblog/class/moblog/moblogrequest.class.php
   plugins/branches/lifetype-1.2/moblog/install/moblogbatch.php
Log:
removed dos line endings to be consistent with the rest of the code

Modified: plugins/branches/lifetype-1.2/moblog/class/moblog/moblogrequest.class.php
===================================================================
--- plugins/branches/lifetype-1.2/moblog/class/moblog/moblogrequest.class.php	2009-04-15 16:51:57 UTC (rev 6861)
+++ plugins/branches/lifetype-1.2/moblog/class/moblog/moblogrequest.class.php	2009-04-15 16:55:52 UTC (rev 6862)
@@ -1,320 +1,320 @@
-<?php
-
-    lt_include( PLOG_CLASS_PATH."plugins/moblog/class/moblog/mimeDecode.class.php" );
-    lt_include( PLOG_CLASS_PATH."plugins/moblog/class/moblog/moblogconstants.properties.php" );
-    lt_include( PLOG_CLASS_PATH."plugins/moblog/class/log/mobloglogger.class.php" );
-    lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
-    
-    /**
-     * contains all the parameters that came in the user's email.
-     */
-    class MoblogRequest
-    {
-        var $_message;
-        var $_structure;
-        var $_replyAddress;
-        var $_body;
-        var $_category;
-        var $_topic;
-        var $_user;
-        var $_pass;
-        var $_blogId;
-        var $_blogName;
-        var $_introduction;
-        var $_host;
-        var $_attachments;
-        var $_help;
+<?php
+
+    lt_include( PLOG_CLASS_PATH."plugins/moblog/class/moblog/mimeDecode.class.php" );
+    lt_include( PLOG_CLASS_PATH."plugins/moblog/class/moblog/moblogconstants.properties.php" );
+    lt_include( PLOG_CLASS_PATH."plugins/moblog/class/log/mobloglogger.class.php" );
+    lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+    
+    /**
+     * contains all the parameters that came in the user's email.
+     */
+    class MoblogRequest
+    {
+        var $_message;
+        var $_structure;
+        var $_replyAddress;
+        var $_body;
+        var $_category;
+        var $_topic;
+        var $_user;
+        var $_pass;
+        var $_blogId;
+        var $_blogName;
+        var $_introduction;
+        var $_host;
+        var $_attachments;
+        var $_help;
         var $_inputEncoding;
         var $_moblog_filter_out = array();
-
-        
-        function MoblogRequest( $request )
-        {                  
+
+        
+        function MoblogRequest( $request )
+        {                  
             
-            /**
-             * the following strings will be filtered out from moblogged messages. At least in case
-             * of Finnish Elisa operator, every message is sent including this annoying notice
-             */
-            $this->_moblog_filter_out = Array(
-              "This is a HTML message, sorry"
+            /**
+             * the following strings will be filtered out from moblogged messages. At least in case
+             * of Finnish Elisa operator, every message is sent including this annoying notice
+             */
+            $this->_moblog_filter_out = Array(
+              "This is a HTML message, sorry"
             );
             
-            isset( $request["message"] ) ? $this->_message = $request["message"] : $this->_message = 0;
-            // it is possible to specify a default user id in the POSTed email message via
-            // curl, so that the amount of stuff that we need to type in the email is reduced
-            // to only the user password. This basically means that email addresses configured to be used
-            // by a default user and blog id cannot be used as 'gateways'
-            isset( $request["blogId"] ) ? $this->_blogId = $request["blogId"] : $this->_blogId = "";
-            isset( $request["user"] ) ? $this->_user = $request["user"] : $this->_user = "";
-            isset( $request["password"] ) ? $this->_pass = $request["password"] : $this->_pass = "";
-            
-            MoblogLogger::log( "From REQUEST: user = ".$this->_user." - blogId = ".$this->_blogId." - pass = ".$this->_pass );
-            
-            // parse the mime message
-            $decode = new Mail_mimeDecode( $this->_message, "\r\n" );
-            $structure = $decode->decode(Array(
-                                             "include_bodies" => true,
-                                             "decode_bodies"  => true,
-                                             "decode_headers" => true,
-                                          ));
-
-            // get the reply address, it might be in different headers
-            if (isset($structure->headers['x-loop'])) {
-	           $this->_replyAddress = "";
-            } 
-            else {
-	           $replyTo1 = $structure->headers['from'];
-	           $replyTo2 = $structure->headers['return-path'];
-	           $this->_replyAddress = ($replyTo2 != "") ? $replyTo2 : $replyTo1;
-            }
-            
-            // parse the body
-            $this->parseBody( $structure->body );
-            $this->_inputEncoding = strtoupper( $structure->ctype_parameters['charset'] );
-            
-            MoblogLogger::log( "There are ".count($structure->parts)." MIME parts available to parse" );      
+            isset( $request["message"] ) ? $this->_message = $request["message"] : $this->_message = 0;
+            // it is possible to specify a default user id in the POSTed email message via
+            // curl, so that the amount of stuff that we need to type in the email is reduced
+            // to only the user password. This basically means that email addresses configured to be used
+            // by a default user and blog id cannot be used as 'gateways'
+            isset( $request["blogId"] ) ? $this->_blogId = $request["blogId"] : $this->_blogId = "";
+            isset( $request["user"] ) ? $this->_user = $request["user"] : $this->_user = "";
+            isset( $request["password"] ) ? $this->_pass = $request["password"] : $this->_pass = "";
             
+            MoblogLogger::log( "From REQUEST: user = ".$this->_user." - blogId = ".$this->_blogId." - pass = ".$this->_pass );
+            
+            // parse the mime message
+            $decode = new Mail_mimeDecode( $this->_message, "\r\n" );
+            $structure = $decode->decode(Array(
+                                             "include_bodies" => true,
+                                             "decode_bodies"  => true,
+                                             "decode_headers" => true,
+                                          ));
+
+            // get the reply address, it might be in different headers
+            if (isset($structure->headers['x-loop'])) {
+	           $this->_replyAddress = "";
+            } 
+            else {
+	           $replyTo1 = $structure->headers['from'];
+	           $replyTo2 = $structure->headers['return-path'];
+	           $this->_replyAddress = ($replyTo2 != "") ? $replyTo2 : $replyTo1;
+            }
+            
+            // parse the body
+            $this->parseBody( $structure->body );
+            $this->_inputEncoding = strtoupper( $structure->ctype_parameters['charset'] );
+            
+            MoblogLogger::log( "There are ".count($structure->parts)." MIME parts available to parse" );      
+            
             if(count($structure->parts) > 0) {
                 $this->parseMimeParts( $structure->parts );                        
-            }
-            
-            // if there was no subject specified, then let's see if there was something in the
-            // 'subject' line...
-            if( $this->_topic == "" ) {
-                $this->_topic = $structure->headers['subject'];
-                if( $this->_topic == "" || stristr( $this->_topic, "pass:" )) {
-                    // if there is still no subject, get the first 50 characters of the body
-                    $this->_topic = substr(strip_tags($this->_body), 0, 50 );
-                    if ( $this->_topic == "" )
-                    	$this->_topic = "No Topic";
-                }
-            }               
-            MoblogLogger::Log("subject is = ".$this->_topic );            
-        }
-        
-        /**
-         * Uses the mimeDecode class to parse the message and get the fields
-         * that we need. This class is also capable of parsing attachments, mime
-         * messages, etc.
-         */ 
-        function parseBody( $body )
-        {
-            $body = strip_tags($body, "<a><b><i><u><s>");
-            //$body = strtr($body,"\xE2\x80\xA9","\n\n\n");
-            $body = str_replace("\xE2\x80\xA9","\n",$body);
-            
-            //We try to find out where the line containing the title is at...
-            if (preg_match("/^topic:(.*)/mi", $body, $title)) {
-                //And put the title var in the proper place
-                $this->_topic = trim($title[1]);
-            }
-            
-            //We repeat the same trick as above... for all vars wanted
-            if (preg_match("/^user:(.*)/mi", $body, $user)) {
-                $this->_user = trim($user[1]); 
-            }       
-            
-            // in case ppl are lazy and use pass instead of password
-            if (preg_match("/^pass:(.*)/mi", $body, $pass)) {
-                $this->_pass = trim($pass[1]);
-            } 
-            else if (preg_match("/^password:(.*)/mi", $body, $password)) {
-                $this->_pass = trim($password[1]);
-            }
-
-            // we can either specify a blog id...
-            if (preg_match("/^blogid:(.*)/mi", $body, $blog)) {
-                $this->_blogId = trim($blog[1]); 
-            }
-            
-            // ...or a blog name
-            if (preg_match("/^blog:(.*)/mi", $body, $blogname)) {
-                $this->_blogName = trim($blogname[1]); 
-            }
-            
-            //We strip out all the lines we already used, and use what's left as the body
-            $body = str_replace($title[0], "", $body);		
-            $body = str_replace($user[0], "", $body);
-            $body = str_replace($pass[0], "", $body);
-            $body = str_replace($password[0], "", $body);
-            $body = str_replace($cat[0], "", $body);
-            $body = str_replace($publish[0], "", $body);
-            $body = str_replace($category[0], "", $body);
-            $body = str_replace($blog[0], "", $body );
-            $body = str_replace($blogname[0], "", $body );            
-            $body = str_replace($host[0], "", $body );
-            
-            // strip off a standard .sig. Properly formed .sigs start with '-- ' on a new line.
-            list($body, $sig) = explode("\n-- ", $body);
+            }
             
-            foreach( $this->_moblog_filter_out as $str ) {
-                $body = str_replace( $str, '', $body );
-            }
-            
-            MoblogLogger::log( "parseBody ---> body = $body" );
-            $body = trim($body);            
-            $this->_body .= $body;
-        }
-        
-        /**
-         * checks if there are any mime parts, perhaps attachments or something like
-         * that...
-         */
-        function parseMimeParts( $parts )
-        {
-            $this->_attachments = Array();
-            foreach( $parts as $part ) {
-                MoblogLogger::log( "attachment type = ".$part->ctype_primary."/".$part->ctype_secondary );            
-                
-                if( strtolower($part->ctype_primary) == "text" && strtolower($part->ctype_secondary) == "plain" ) {
-					// if ctype_primary == text and ctype_secondary == plain, it should be text format e-mail
-                    MoblogLogger::log( "Reparsing the body of the message!" );
-                    MoblogLogger::log( "text/plain part - contents = ".$part->body );
-                    $this->parseBody( $part->body );
-					$this->_inputEncoding = strtoupper( $part->ctype_parameters['charset'] );
-                }
-                elseif( strtolower($part->ctype_primary) == "multipart" && strtolower($part->ctype_secondary) == "alternative") {
-					// if ctype_primary == multipart and ctype_secondary == alternative, it should be html format e-mail
-					// We should look into it's child to get the real body
-                    foreach ( $part->parts as $childPart ) {
-                		if( strtolower($childPart->ctype_primary) == "text" && strtolower($childPart->ctype_secondary) == "plain" ) {
-                    		$this->parseBody( $childPart->body );
-							$this->_inputEncoding = strtoupper( $childPart->ctype_parameters['charset'] );
-                    	}
-                    }
-                }
-                else {
-                    // whatever comes as a part, we will take it and treat it as if it was 
-                    // a normal resource as long as it's not an application/smil thingie...
-                    
-                    if( strtolower($part->ctype_secondary) != 'html' && strtolower($part->ctype_secondary) != 'smil' && MOBLOG_IGNORE_SMIL_ATTACHMENTS ) {
-                        // GalleryResources::addResource only deals with uploaded files, so we'll
-                        // have to pretend that this is one of them!
-                        $config =& Config::getConfig();
-                        $tmpFolder = $config->getValue( "temp_folder" );
-                        $tmpFolderName = $tmpFolder."/".md5(microtime());
-                        //$tmpFolderName = $config->getValue( "temp_folder" );
-                        File::createDir( $tmpFolderName );
-                        MoblogLogger::log( "Creating temp folder = $tmpFolderName" );
-                        $fileName = stripslashes($part->ctype_parameters["name"]);
-                    
-                        // if the filename is not in the 'filename' field, then try with the 
-                        // 'content-location' field, since some MMS-to-email gateways seem to put
-                        // the file name there for wahtever reason
-                        if( $fileName == "" )
-                            $fileName = stripslashes($part->d_parameters["filename"]);
-                        if ( ($fileName == "") && (isset($part->headers['content-location'])) )
-                            $fileName = stripslashes($part->headers['content-location']);
-                                                   
-                        $fileName = str_replace( "\"", "", $fileName );
-                        $fileName = str_replace( "'", "", $fileName );
-                        $tmpName = $tmpFolderName."/".$fileName;
-                        $fileName = urldecode( $fileName );
-                        
-			            if ( MOBLOG_FORCE_ENCODE_TO_UTF8 )
-			            	$fileName = $this->encodeToUTF8( $fileName, $this->_inputEncoding);
-                        
-                        $f = new File( $tmpName );
-                        $f->open( "ab+" );
-                        MoblogLogger::log( "fileName = ".$tmpName );                    
-                        MoblogLogger::log( "Saving attachment as = ".$tmpName );
-                        //MoblogLogger::log( "base64 encoded data = ".$part->body );
-                        if( !$f->write( $part->body )) {
-                            MoblogLogger::log( "There was an error writing the temporary file" );
-                            die();
-                        }
-                        MoblogLogger::log( "File saved ok!" );
-                        MoblogLogger::log("FILENAME = $fileName");
-                        $uploadInfo = Array( "name" => urldecode($fileName),
-                                             "type" => $part->ctype_primary."/".$part->ctype_secondary,
-                                             "tmp_name" => $tmpName,
-                                             "size" => $f->getSize(),
-                                             "error" => 0 );
-                        
-                        $upload = new FileUpload( $uploadInfo );
-                        $upload->setFolder( $tmpFolderName );
-                        array_push( $this->_attachments, $upload );
-                    }
-                }
-            }
-        }
-		
-		function encodeToUTF8( $input, $inputEncoding)
-		{
-	        if ( $inputEncoding == "UTF-8" || $inputEncoding == "" )
-	        	return $input;
-	        
-	        if (function_exists('iconv'))  {
-	            $output = iconv($inputEncoding,'UTF-8', $input);
-	            if ($output) {
-	            	return $output;
-	            } elseif (function_exists('mb_convert_encoding')) {
-			        $output = mb_convert_encoding($input, 'UTF-8', $inputEncoding );
-			        if ($output) {
-			            return $output;
-		            } else {
-		            	return $input;
-		            }
-	            } else {
-	            	return $input;
-	            }
-	        } else {
-	        	return $input;
-	        }
-	    }
-
-        function tidy($text) 
-        {
-            $text = str_replace("&nbsp;<br />", "", $text);
-            $text = preg_replace("/([\n\r\t])+/is", "\n", $text);
-            
-            return ($text);
-        }
-        
-        function getUser()
-        {  
-            return $this->_user;
-        }
-        
-        function getBlogId()
-        {
-            return $this->_blogId;
-        }
-        
-        function getBlogName()
-        {
-            return $this->_blogName;
-        }
-        
-        function getPassword()
-        {
-            return $this->_pass;
-        }
-        
-        function getTopic()
-        {
-            if ( MOBLOG_FORCE_ENCODE_TO_UTF8 )
-            	return $this->encodeToUTF8( $this->_topic, $this->_inputEncoding);
-            else
-            	return $this->_topic;
-        }
-        
-        function getBody()
-        {
-            if ( MOBLOG_FORCE_ENCODE_TO_UTF8 )
-            	return $this->encodeToUTF8( $this->_body, $this->_inputEncoding);
-            else
-            	return $this->_body;
-        }
-        
-        function getReplyTo()
-        {
-            return $this->_replyAddress;
-        }
-        
-        function getAttachments()
-        {
-            return $this->_attachments;
-        }
-    }
+            // if there was no subject specified, then let's see if there was something in the
+            // 'subject' line...
+            if( $this->_topic == "" ) {
+                $this->_topic = $structure->headers['subject'];
+                if( $this->_topic == "" || stristr( $this->_topic, "pass:" )) {
+                    // if there is still no subject, get the first 50 characters of the body
+                    $this->_topic = substr(strip_tags($this->_body), 0, 50 );
+                    if ( $this->_topic == "" )
+                    	$this->_topic = "No Topic";
+                }
+            }               
+            MoblogLogger::Log("subject is = ".$this->_topic );            
+        }
+        
+        /**
+         * Uses the mimeDecode class to parse the message and get the fields
+         * that we need. This class is also capable of parsing attachments, mime
+         * messages, etc.
+         */ 
+        function parseBody( $body )
+        {
+            $body = strip_tags($body, "<a><b><i><u><s>");
+            //$body = strtr($body,"\xE2\x80\xA9","\n\n\n");
+            $body = str_replace("\xE2\x80\xA9","\n",$body);
+            
+            //We try to find out where the line containing the title is at...
+            if (preg_match("/^topic:(.*)/mi", $body, $title)) {
+                //And put the title var in the proper place
+                $this->_topic = trim($title[1]);
+            }
+            
+            //We repeat the same trick as above... for all vars wanted
+            if (preg_match("/^user:(.*)/mi", $body, $user)) {
+                $this->_user = trim($user[1]); 
+            }       
+            
+            // in case ppl are lazy and use pass instead of password
+            if (preg_match("/^pass:(.*)/mi", $body, $pass)) {
+                $this->_pass = trim($pass[1]);
+            } 
+            else if (preg_match("/^password:(.*)/mi", $body, $password)) {
+                $this->_pass = trim($password[1]);
+            }
+
+            // we can either specify a blog id...
+            if (preg_match("/^blogid:(.*)/mi", $body, $blog)) {
+                $this->_blogId = trim($blog[1]); 
+            }
+            
+            // ...or a blog name
+            if (preg_match("/^blog:(.*)/mi", $body, $blogname)) {
+                $this->_blogName = trim($blogname[1]); 
+            }
+            
+            //We strip out all the lines we already used, and use what's left as the body
+            $body = str_replace($title[0], "", $body);		
+            $body = str_replace($user[0], "", $body);
+            $body = str_replace($pass[0], "", $body);
+            $body = str_replace($password[0], "", $body);
+            $body = str_replace($cat[0], "", $body);
+            $body = str_replace($publish[0], "", $body);
+            $body = str_replace($category[0], "", $body);
+            $body = str_replace($blog[0], "", $body );
+            $body = str_replace($blogname[0], "", $body );            
+            $body = str_replace($host[0], "", $body );
+            
+            // strip off a standard .sig. Properly formed .sigs start with '-- ' on a new line.
+            list($body, $sig) = explode("\n-- ", $body);
+            
+            foreach( $this->_moblog_filter_out as $str ) {
+                $body = str_replace( $str, '', $body );
+            }
+            
+            MoblogLogger::log( "parseBody ---> body = $body" );
+            $body = trim($body);            
+            $this->_body .= $body;
+        }
+        
+        /**
+         * checks if there are any mime parts, perhaps attachments or something like
+         * that...
+         */
+        function parseMimeParts( $parts )
+        {
+            $this->_attachments = Array();
+            foreach( $parts as $part ) {
+                MoblogLogger::log( "attachment type = ".$part->ctype_primary."/".$part->ctype_secondary );            
+                
+                if( strtolower($part->ctype_primary) == "text" && strtolower($part->ctype_secondary) == "plain" ) {
+					// if ctype_primary == text and ctype_secondary == plain, it should be text format e-mail
+                    MoblogLogger::log( "Reparsing the body of the message!" );
+                    MoblogLogger::log( "text/plain part - contents = ".$part->body );
+                    $this->parseBody( $part->body );
+					$this->_inputEncoding = strtoupper( $part->ctype_parameters['charset'] );
+                }
+                elseif( strtolower($part->ctype_primary) == "multipart" && strtolower($part->ctype_secondary) == "alternative") {
+					// if ctype_primary == multipart and ctype_secondary == alternative, it should be html format e-mail
+					// We should look into it's child to get the real body
+                    foreach ( $part->parts as $childPart ) {
+                		if( strtolower($childPart->ctype_primary) == "text" && strtolower($childPart->ctype_secondary) == "plain" ) {
+                    		$this->parseBody( $childPart->body );
+							$this->_inputEncoding = strtoupper( $childPart->ctype_parameters['charset'] );
+                    	}
+                    }
+                }
+                else {
+                    // whatever comes as a part, we will take it and treat it as if it was 
+                    // a normal resource as long as it's not an application/smil thingie...
+                    
+                    if( strtolower($part->ctype_secondary) != 'html' && strtolower($part->ctype_secondary) != 'smil' && MOBLOG_IGNORE_SMIL_ATTACHMENTS ) {
+                        // GalleryResources::addResource only deals with uploaded files, so we'll
+                        // have to pretend that this is one of them!
+                        $config =& Config::getConfig();
+                        $tmpFolder = $config->getValue( "temp_folder" );
+                        $tmpFolderName = $tmpFolder."/".md5(microtime());
+                        //$tmpFolderName = $config->getValue( "temp_folder" );
+                        File::createDir( $tmpFolderName );
+                        MoblogLogger::log( "Creating temp folder = $tmpFolderName" );
+                        $fileName = stripslashes($part->ctype_parameters["name"]);
+                    
+                        // if the filename is not in the 'filename' field, then try with the 
+                        // 'content-location' field, since some MMS-to-email gateways seem to put
+                        // the file name there for wahtever reason
+                        if( $fileName == "" )
+                            $fileName = stripslashes($part->d_parameters["filename"]);
+                        if ( ($fileName == "") && (isset($part->headers['content-location'])) )
+                            $fileName = stripslashes($part->headers['content-location']);
+                                                   
+                        $fileName = str_replace( "\"", "", $fileName );
+                        $fileName = str_replace( "'", "", $fileName );
+                        $tmpName = $tmpFolderName."/".$fileName;
+                        $fileName = urldecode( $fileName );
+                        
+			            if ( MOBLOG_FORCE_ENCODE_TO_UTF8 )
+			            	$fileName = $this->encodeToUTF8( $fileName, $this->_inputEncoding);
+                        
+                        $f = new File( $tmpName );
+                        $f->open( "ab+" );
+                        MoblogLogger::log( "fileName = ".$tmpName );                    
+                        MoblogLogger::log( "Saving attachment as = ".$tmpName );
+                        //MoblogLogger::log( "base64 encoded data = ".$part->body );
+                        if( !$f->write( $part->body )) {
+                            MoblogLogger::log( "There was an error writing the temporary file" );
+                            die();
+                        }
+                        MoblogLogger::log( "File saved ok!" );
+                        MoblogLogger::log("FILENAME = $fileName");
+                        $uploadInfo = Array( "name" => urldecode($fileName),
+                                             "type" => $part->ctype_primary."/".$part->ctype_secondary,
+                                             "tmp_name" => $tmpName,
+                                             "size" => $f->getSize(),
+                                             "error" => 0 );
+                        
+                        $upload = new FileUpload( $uploadInfo );
+                        $upload->setFolder( $tmpFolderName );
+                        array_push( $this->_attachments, $upload );
+                    }
+                }
+            }
+        }
+		
+		function encodeToUTF8( $input, $inputEncoding)
+		{
+	        if ( $inputEncoding == "UTF-8" || $inputEncoding == "" )
+	        	return $input;
+	        
+	        if (function_exists('iconv'))  {
+	            $output = iconv($inputEncoding,'UTF-8', $input);
+	            if ($output) {
+	            	return $output;
+	            } elseif (function_exists('mb_convert_encoding')) {
+			        $output = mb_convert_encoding($input, 'UTF-8', $inputEncoding );
+			        if ($output) {
+			            return $output;
+		            } else {
+		            	return $input;
+		            }
+	            } else {
+	            	return $input;
+	            }
+	        } else {
+	        	return $input;
+	        }
+	    }
+
+        function tidy($text) 
+        {
+            $text = str_replace("&nbsp;<br />", "", $text);
+            $text = preg_replace("/([\n\r\t])+/is", "\n", $text);
+            
+            return ($text);
+        }
+        
+        function getUser()
+        {  
+            return $this->_user;
+        }
+        
+        function getBlogId()
+        {
+            return $this->_blogId;
+        }
+        
+        function getBlogName()
+        {
+            return $this->_blogName;
+        }
+        
+        function getPassword()
+        {
+            return $this->_pass;
+        }
+        
+        function getTopic()
+        {
+            if ( MOBLOG_FORCE_ENCODE_TO_UTF8 )
+            	return $this->encodeToUTF8( $this->_topic, $this->_inputEncoding);
+            else
+            	return $this->_topic;
+        }
+        
+        function getBody()
+        {
+            if ( MOBLOG_FORCE_ENCODE_TO_UTF8 )
+            	return $this->encodeToUTF8( $this->_body, $this->_inputEncoding);
+            else
+            	return $this->_body;
+        }
+        
+        function getReplyTo()
+        {
+            return $this->_replyAddress;
+        }
+        
+        function getAttachments()
+        {
+            return $this->_attachments;
+        }
+    }
 ?>

Modified: plugins/branches/lifetype-1.2/moblog/install/moblogbatch.php
===================================================================
--- plugins/branches/lifetype-1.2/moblog/install/moblogbatch.php	2009-04-15 16:51:57 UTC (rev 6861)
+++ plugins/branches/lifetype-1.2/moblog/install/moblogbatch.php	2009-04-15 16:55:52 UTC (rev 6862)
@@ -1,66 +1,66 @@
-<?php
-
-    // define the entry point
-    if (!defined( "PLOG_CLASS_PATH" )) {
-    	define( "PLOG_CLASS_PATH", dirname(__FILE__)."/");
-    }
-    
-    // bring in some code that we need
-    include( PLOG_CLASS_PATH."class/bootstrap.php" );    
-    lt_include( PLOG_CLASS_PATH."plugins/moblog/class/PEAR/Net/POP3.php" );
-    lt_include( PLOG_CLASS_PATH."plugins/moblog/class/PEAR/HTTP/Request.php");
-    lt_include( PLOG_CLASS_PATH."class/net/baserequestgenerator.class.php" ); 
-    lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
-
-    $config =& Config::getConfig();
-
-	$mailServer = $config->getValue('plugin_moblog_mailserver');
-	$port = $config->getValue('plugin_moblog_port');
-	$userName = $config->getValue('plugin_moblog_username');
-	$password = $config->getValue('plugin_moblog_password');
-
-    // pop3 connection and log-in
-    $pop3 =& new Net_POP3();
-
-	if(PEAR::isError( $ret= $pop3->connect($mailServer , $port ) )) {
-    	echo "ERROR: " . $ret->getMessage() . "\n";
-    	exit();
-	}
-
-	if(PEAR::isError( $ret= $pop3->login($userName , $password, 'USER' ) )){
-	    echo "ERROR: " . $ret->getMessage() . "\n";
-	    exit();
-	}
-   
-	$messageNumber = $pop3->numMsg();
-	
-	if ($messageNumber == 0) {
-	    $pop3->disconnect();
-	    die();
-    } else {  
-        // get message list
-        $messageList = $pop3->getListing();
-        $messages = Array();
-		         
-        for ($cnt = 0; $cnt < count($messageList); $cnt++) {
-            $messages[$cnt] = $pop3->getMsg($messageList[$cnt]['msg_id']);
-            $pop3->deleteMsg($messageList[$cnt]['msg_id']);
-        }
-		
-        // pop3 disconnect
-      	$pop3->disconnect();
-
-	    $config->setValue( "plugin_moblog_lastupdate", time() );
-        $config->save();
-        
-        $url = &new BaseRequestGenerator();
-
-	    for ($cnt = 0; $cnt < count($messages); $cnt++) {
-			$req = &new HTTP_Request($url->getBaseUrl(false)."/moblog.php");
-			$req->setMethod(HTTP_REQUEST_METHOD_POST);
-			$req->addPostData('message', $messages[$cnt]);
-			$req->sendRequest();
-			$response = $req->getResponseBody();
-		}
-    }
+<?php
+
+    // define the entry point
+    if (!defined( "PLOG_CLASS_PATH" )) {
+    	define( "PLOG_CLASS_PATH", dirname(__FILE__)."/");
+    }
+    
+    // bring in some code that we need
+    include( PLOG_CLASS_PATH."class/bootstrap.php" );    
+    lt_include( PLOG_CLASS_PATH."plugins/moblog/class/PEAR/Net/POP3.php" );
+    lt_include( PLOG_CLASS_PATH."plugins/moblog/class/PEAR/HTTP/Request.php");
+    lt_include( PLOG_CLASS_PATH."class/net/baserequestgenerator.class.php" ); 
+    lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+    $config =& Config::getConfig();
+
+	$mailServer = $config->getValue('plugin_moblog_mailserver');
+	$port = $config->getValue('plugin_moblog_port');
+	$userName = $config->getValue('plugin_moblog_username');
+	$password = $config->getValue('plugin_moblog_password');
+
+    // pop3 connection and log-in
+    $pop3 =& new Net_POP3();
+
+	if(PEAR::isError( $ret= $pop3->connect($mailServer , $port ) )) {
+    	echo "ERROR: " . $ret->getMessage() . "\n";
+    	exit();
+	}
+
+	if(PEAR::isError( $ret= $pop3->login($userName , $password, 'USER' ) )){
+	    echo "ERROR: " . $ret->getMessage() . "\n";
+	    exit();
+	}
+   
+	$messageNumber = $pop3->numMsg();
+	
+	if ($messageNumber == 0) {
+	    $pop3->disconnect();
+	    die();
+    } else {  
+        // get message list
+        $messageList = $pop3->getListing();
+        $messages = Array();
+		         
+        for ($cnt = 0; $cnt < count($messageList); $cnt++) {
+            $messages[$cnt] = $pop3->getMsg($messageList[$cnt]['msg_id']);
+            $pop3->deleteMsg($messageList[$cnt]['msg_id']);
+        }
+		
+        // pop3 disconnect
+      	$pop3->disconnect();
+
+	    $config->setValue( "plugin_moblog_lastupdate", time() );
+        $config->save();
+        
+        $url = &new BaseRequestGenerator();
+
+	    for ($cnt = 0; $cnt < count($messages); $cnt++) {
+			$req = &new HTTP_Request($url->getBaseUrl(false)."/moblog.php");
+			$req->setMethod(HTTP_REQUEST_METHOD_POST);
+			$req->addPostData('message', $messages[$cnt]);
+			$req->sendRequest();
+			$response = $req->getResponseBody();
+		}
+    }
 ?>



More information about the pLog-svn mailing list