Changeset 624

Timestamp:

07/16/06 15:38:43 (2 years ago)

Author:

coolengineer

Message:

BlogAPI/blogger.php:

Move _get_post function to index.php

BlogAPI/metaweblog.php:

Change build post instance via _make_post

BlogAPI/index.php:

Include components after checking existance.
Added _make_post for building post instance.
Change selecting randome name of attached files.

Location:

sandbox/plugins/BlogAPI

Files:

• blogger.php (modified) (1 diff)
• index.php (modified) (9 diffs)
• metaweblog.php (modified) (5 diffs)

sandbox/plugins/BlogAPI/blogger.php

@@ -139 +139 @@
 }
 
-function _get_post( $post, $type = "bl" )
-{ 
-    DEBUG( "Enter: " . __FUNCTION__ . "\n" );
-    $params = func_get_args();
-    global $service, $hostURL, $blogURL;
-    return array( 
-                "userid" => "",
-                "dateCreated" => _dateiso8601( $post->created ),
-                "datePosted" => _dateiso8601( $post->published ),
-                "dateModified" => _dateiso8601( $post->modified ),
-                "title" =>  _escape_content($post->title),
-                "postid" => $post->id,
-                "categories" => array( _getCategoryNameById($post->category) ),
-                "link" => $hostURL . $blogURL . "/" . $post->id ,
-                "permaLink" => $hostURL . $blogURL . "/" . $post->id ,
-                "description" => ($type == "mt" ? $post->content : "" ),
-                "content" => $post->content
-                );
-}
-
 function blogger_getRecentPosts()
 {

sandbox/plugins/BlogAPI/index.php

@@ -41 +41 @@
     if( TATTERTOOLS_VERSION < "1.0.6" && file_exists( $blogapi_dir . "/$name.php" ) )
     {
-        include_once ( $blogapi_dir . "/$name.php");
+        DEBUG ( $blogapi_dir . "/$name.php\n");
+        include_once( $blogapi_dir . "/$name.php");
     }
     else
     {
-        include_once ( $blogapi_dir . "/../../components/$name.php");
+        $componet_file = $blogapi_dir . "/../../components/$name.php";
+        if( file_exists( $componet_file ) )
+        {
+            include_once( $componet_file );
+        }
+        else
+        {
+            print( "File($componet_file) doesn't exist\n" );
+        }
     }
 }
@@ -243 +252 @@
     return $name;
 
+}
+
+function _make_post( $param, $ispublic, $postid = -1 )
+{
+    $post = new Post();
+    if( $postid != -1 )
+    {
+        if( !$post->open( $postid ) )
+        {
+            return false;
+        }
+    }
+
+    $post->content = $param['description'];
+    $post->title = $param['title'];
+    $post->tags = array_merge( split(",", $param['mt_excerpt']) , $param['tagwords'] );
+
+    $post->created = _timestamp( $param['dateCreated'] );
+    $post->modified = _timestamp( $param['dateCreated'] );
+
+    $post->category = _getCategoryIdByName( $param['categories'] );
+    $post->acceptComment = $param['mt_allow_comments'] !== 0 ? true : false;
+    $post->acceptTrackback = $param['mt_allow_pings'] !== 0 ? true : false;
+
+    if( $ispublic )
+    {
+        $post->visibility = "public";
+        $post->published = _timestamp( $param['dateCreated'] );
+    }
+    else
+    {
+        $post->visibility = "private";
+    }
+
+    return $post;
+}
+
+function _get_post( $post, $type = "bl" )
+{ 
+    DEBUG( "Enter: " . __FUNCTION__ . "\n" );
+    $post->loadTags();
+    DEBUG( "Post " );
+    DEBUG( $post, true );
+    $params = func_get_args();
+    global $service, $hostURL, $blogURL;
+    return array( 
+                "userid" => "",
+                "dateCreated" => _dateiso8601( $post->created ),
+                "datePosted" => _dateiso8601( $post->published ),
+                "dateModified" => _dateiso8601( $post->modified ),
+                "title" =>  _escape_content($post->title),
+                "postid" => $post->id,
+                "categories" => array( _getCategoryNameById($post->category) ),
+                "link" => $hostURL . $blogURL . "/" . $post->id ,
+                "permaLink" => $hostURL . $blogURL . "/" . $post->id ,
+                "description" => ($type == "mt" ? $post->content : "" ),
+                "content" => $post->content,
+                "mt_allow_comments" => $post->acceptComment ? 1 : 0,
+                "mt_allow_pings" => $post->acceptTrackback ? 1 : 0,
+                "mt_excerpt" => join( ",", $post->tags )
+                );
 }
 
@@ -317 +387 @@
 }
 
+
+function _file_hash( $content )
+{
+    $md5sum = md5( $content );
+    return sprintf( "ta%stt%ser%s", substr( $md5sum, 0, 7 ), substr( $md5sum, 7, 7 ), substr( $md5sum, 14, 7 ) );
+}
+
+
 function addAttachment($owner,$parent,$file){
     global $database;
@@ -342 +420 @@
             break;
     }
+
+    /* Create directory for owner */
     $path="../../attach/$owner";
     if(!is_dir($path)){
@@ -349 +429 @@
         @chmod($path,0777);
     }
-    do{
-        $attachment['name']=rand(1000000000,9999999999).".$extension";
-        $attachment['path']="$path/{$attachment['name']}";
-    }while(file_exists($attachment['path']));
-
-    /* Fixed by coolengineer */
+
+    /* Select unique file name from md5sum of content */
+    $attachment['name'] = _file_hash( $file['content'] )  . ".$extension";
+    $attachment['path'] = "$path/{$attachment['name']}";
+
+DEBUG("\nCHECK " . __LINE__ );
+    deleteAttachment($owner,-1,$attachment['name']);
+DEBUG("\nCHECK " . __LINE__ );
+
     if( $file['content'] )
     {
@@ -362 +445 @@
             return false;
         }
-        DEBUG( "Length 1: " . $attachment['size'] . "\n");
         $attachment['size'] = fwrite( $f, $file['content'] );
-        DEBUG( "Length 2: " . $attachment['size'] . "\n");
         fclose( $f );
         $file['tmp_name'] = $attachment['path'];
@@ -382 +463 @@
         return false;
 */
+DEBUG("\nCHECK " . __LINE__ );
     @chmod($attachment['path'],0666);
+    DEBUG( "\ninsert into {$database['prefix']}Attachments values ($owner, {$attachment['parent']}, '{$attachment['name']}', '$label', '{$attachment['mime']}', {$attachment['size']}, {$attachment['width']}, {$attachment['height']}, UNIX_TIMESTAMP(), 0,0)");
     $result=mysql_query("insert into {$database['prefix']}Attachments values ($owner, {$attachment['parent']}, '{$attachment['name']}', '$label', '{$attachment['mime']}', {$attachment['size']}, {$attachment['width']}, {$attachment['height']}, UNIX_TIMESTAMP(), 0,0)");
     if(!$result){
+DEBUG("\nCHECK " . __LINE__ );
         @unlink($attachment['path']);
         return false;
     }
+DEBUG("\nCHECK " . __LINE__ );
     return $attachment;
 }
+
 
 /* Up to here, copied from blog/owner/entry/attach/index.php */
@@ -406 +492 @@
     global $database, $blogapi_dir;
     @unlink("$blogapi_dir/../../attach/$owner/$name");
-    if($parent===false){
+    $name=mysql_escape_string($name);
+    $parent_clause = "";
+    if( $parent >= 0 )
+    {
+        $parent_clause = "parent = $parent and ";
+    }
+    DEBUG("\ndelete from {$database['prefix']}Attachments where owner = $owner and $parent_clause name = '$name'");
+    if(mysql_query("delete from {$database['prefix']}Attachments where owner = $owner and $parent_clause name = '$name'")&&(mysql_affected_rows()==1)){
         return true;
     }
-    $name=mysql_escape_string($name);
-    if(mysql_query("delete from {$database['prefix']}Attachments where owner = $owner and parent = $parent and name = '$name'")&&(mysql_affected_rows()==1)){
-        return true;
-    }
+    DEBUG("\nDelete failure: " . mysql_error() );
     return false;
 }
@@ -429 +519 @@
 /* Work around end */
 
-function preview_encode( $owner, $name )
-{
-    return "?__preview__{" . $owner . "," . $name . "}";
-}
-
-function preview_decode_core( $content )
-{
-    if( preg_match( "/\?__preview__{([^,]+),([^}]+)}/", $content, $matches ) )
-    {
-        return array( $matches[1], $matches[2] );
-    }
-    return false;
-}
-
-function preview_decode( $content, $parent )
+function _get_attaches( $content, $parent )
 {
     global $owner;
-    $attaches = array();
-    while( list($o,$n) = preview_decode_core($content) )
-    {
-DEBUG("Owner: $o, Name $n\n" );
-        array_push( $attaches, array( $o, $n ) );
-        $content = preg_replace( "/\?__preview__[^}]+}/", "", $content, 1 );
-    }
-    DEBUG( $attaches, true );
-    return array( $content, $attaches );
-}
-
-function fixAttachments( $attaches, $parent )
+    preg_match_all( "/attach\/$owner\/(ta.{7}tt.{7}er.{7}\.[a-z]{2,5})/", $content, $matches );
+    DEBUG( $matches[1], true );
+    return $matches[1];
+}
+
+function _update_attaches( $attaches, $parent )
 {
     global $database, $owner;
-    deleteAttachments( $owner, $parent );
     foreach( $attaches as $att )
     {
-        if( $att[0] == $owner )
-        {
-            DEBUG( "update {$database['prefix']}Attachments set parent=$parent where owner=$owner and parent=0 and name='" . $att[1] . "'\n");
-            mysql_query( "update {$database['prefix']}Attachments set parent=$parent where owner=$owner and parent=0 and name='" . $att[1] . "'");
-        }
+        DEBUG( "update {$database['prefix']}Attachments set parent=$parent where owner=$owner and parent=0 and name='" . $att . "'\n");
+        mysql_query( "update {$database['prefix']}Attachments set parent=$parent where owner=$owner and parent=0 and name='" . $att . "'");
     }
 }

sandbox/plugins/BlogAPI/metaweblog.php

@@ -19 +19 @@
 
     $cat = array();
-    while(1)
+    while($category->id)
     {
         DEBUG( " Category: " . $category->name . "\n" );
@@ -139 +139 @@
     }
 
-    $post = new Post();
-    $post->content = $params[3]['description'];
-    $post->title = $params[3]['title'];
-    $post->tags = join( ',', $params[3]['mt_keywords'] );
-    $post->created = _timestamp( $params[3]['dateCreated'] );
-    $post->modified = _timestamp( $params[3]['dateCreated'] );
-    $post->published = _timestamp( $params[3]['dateCreated'] );
-    $post->category = _getCategoryIdByName( $params[3]['categories'] );
-
-    if( $params[4] )
-    {
-        $post->visibility = "public";
-    }
-    else
-    {
-        $post->visibility = "private";
-    }
-
-    list( $post->content, $attaches ) = preview_decode( $post->content );
+    $post = _make_post( $params[3], $params[4] );
+
+    $attaches = _get_attaches( $post->content );
 
     if( !$post->add() )
@@ -163 +147 @@
         $post->close();
         DEBUG( "Adding failure." );
-        return XMLRPCFault( 1, "Posting error" );
-    }
-
-    fixAttachments( $attaches, $post->id );
+        return XMLRPCFault( 1, "Tattertools posting error" );
+    }
+
+    _update_attaches( $attaches, $post->id );
     RSS::refresh();
 
@@ -249 +233 @@
     }
 
-    $post = new Post();
-    if( !$post->open( $params[0] ) )
-    {
-        return XMLRPCFault( 1, "Posting error" );
-    }
-
-    $post->content = $params[3]['description'];
-    $post->title = $params[3]['title'];
-    $post->tags = join( ',', $params[3]['categories'] );
-    $post->modified = _timestamp( $params[3]['dateCreated'] );
-
-    list( $post->content, $attaches ) = preview_decode( $post->content );
-
-    if( $params[4] )
-    {
-        $post->visibility = "public";
-        $post->published = _timestamp( $params[3]['dateCreated'] );
-    }
-    else
-    {
-        $post->visibility = "private";
-    }
+    $post = _make_post( $params[3], $params[4], $params[0] );
+    if( !$post )
+    {
+        return XMLRPCFault( 1, "Tattertools editing error" );
+    }
+
+    $attaches = _get_attaches( $post->content );
 
     $ret = $post->update();
 
-    fixAttachments( $attaches, $post->id );
+    _update_attaches( $attaches, $post->id );
     RSS::refresh();
 
@@ -319 +288 @@
         return new XMLRPCFault( 1, "Can't create file" );
     }
-    return array ( 'url' => getBlogURL() . "/attach/$owner/" . $attachment['name'] . preview_encode( $owner, $attachment['name'] ) );
+    $attachurl = array ( 'url' => getBlogURL() . "/attach/$owner/" . $attachment['name'] );
+    DEBUG( "\nAttached url : " );
+    DEBUG( $attachurl, true );
+    return $attachurl;
 }
 ?>