Changeset 424085

Timestamp:

08/16/2011 07:14:42 AM (14 years ago)

Author:

Orson Teodoro

Message:

Update for avatar support for BuddyPress 1.5 beta 2

Location:

forumconverter

Files:

• tags/1.07 (added)
• tags/1.07/Forum.php (added)
• tags/1.07/ForumConverter.php (added)
• tags/1.07/PhpbbAuth.php (added)
• tags/1.07/PhpbbToBbpress.php (added)
• tags/1.07/PhpbbToBpforums.php (added)
• tags/1.07/fc-auth.php (added)
• tags/1.07/fc-main.php (added)
• tags/1.07/fc-options.php (added)
• tags/1.07/license.txt (added)
• tags/1.07/readme.txt (added)
• tags/1.07/screenshot-1.png (added)
• tags/1.07/wp-db-ex.php (added)
• tags/1.07/wp-pass-ex.php (added)
• trunk/PhpbbToBbpress.php (modified) (11 diffs)
• trunk/readme.txt (modified) (3 diffs)

forumconverter/trunk/PhpbbToBbpress.php

@@ -25 +25 @@
         private $processAttachments;
         private $siteurl;
+        private $dstAvatarPath;
         
         public function __construct($forumSrc,$forumDst = NULL)
@@ -40 +41 @@
             //timeouts - this may require adjusting based on amount of posts that need to be converted
             set_time_limit(3600);
-            
+
+            $this->dstAvatarPath = '';
             if (file_exists(WP_PLUGIN_DIR.'/buddypress/bp-core/bp-core-avatars.php'))
             {
@@ -46 +48 @@
                 include_once(WP_PLUGIN_DIR.'/buddypress/bp-core/bp-core-avatars.php');
                 bp_core_set_avatar_constants();
+
+                if (defined('BP_AVATAR_UPLOAD_PATH'))
+                    $this->dstAvatarPath = BP_AVATAR_UPLOAD_PATH;        //BuddyPress 1.2.9
+                if (function_exists('bp_core_avatar_upload_path'));
+                    $this->dstAvatarPath = bp_core_avatar_upload_path(); //BuddyPress 1.5-beta-2
             }
-
         }
         
@@ -640 +646 @@
                     if ($this->processAttachments)
                     {
-                        //create a folder to dump the attachments
-                        $dir = wp_upload_dir();
-                        if (is_dir ($dir['basedir'].DIRECTORY_SEPARATOR.'bbpress'.DIRECTORY_SEPARATOR.$insertId) == FALSE)
-                            mkdir($dir['basedir'].DIRECTORY_SEPARATOR.'bbpress'.DIRECTORY_SEPARATOR.$insertId,0644,true);
-                        
                         if (strpos($postText, '[attachment=') !== FALSE)
                         {
@@ -655 +656 @@
                                 if (strpos($v,'[attachment=') !== FALSE)
                                 {
-                                    $this->fc_echo('adding inline attachment<br/>');
-
                                     //grab the filename
                                     //$a = array($v);
@@ -663 +662 @@
                                     if ($data->post_attachment)
                                     {
+                                        $this->fc_echo('adding inline attachment<br/>');
+
+                                        //create a folder to dump the attachments
+                                        $dir = wp_upload_dir();
+                                        if (is_dir ($dir['basedir'].DIRECTORY_SEPARATOR.'bbpress'.DIRECTORY_SEPARATOR.$insertId) == FALSE)
+                                            mkdir($dir['basedir'].DIRECTORY_SEPARATOR.'bbpress'.DIRECTORY_SEPARATOR.$insertId,0644,true);
+
                                         //insert as attachment
                                         $attachment = $fdb->get_row('SELECT * FROM '.$this->forumLoginSrc->prefix.'attachments WHERE post_msg_id='.$data->post_id.' AND real_filename="'.$filename.'"');
@@ -760 +766 @@
                                 foreach ($attachments as $attachment)
                                 {
-                                    $this->fc_echo('adding post/reply attachment<br/>');
-
                                     //add download link
                                     if ($data->post_attachment)
                                     {
+                                        $this->fc_echo('adding post/reply attachment<br/>');
+
+                                        //create a folder to dump the attachments
+                                        $dir = wp_upload_dir();
+                                        if (is_dir ($dir['basedir'].DIRECTORY_SEPARATOR.'bbpress'.DIRECTORY_SEPARATOR.$insertId) == FALSE)
+                                            mkdir($dir['basedir'].DIRECTORY_SEPARATOR.'bbpress'.DIRECTORY_SEPARATOR.$insertId,0644,true);
+                                        
                                         //try to maintain the original filename name without any extra fancy script
                                         //copy attachment to wordpress uploads folder
@@ -1750 +1761 @@
 
                     //buddypress avatar transfer
-                    if (defined('BP_AVATAR_UPLOAD_PATH'))
+                    if (strlen($this->dstAvatarPath) > 0)
                     {
                         //find the file
@@ -1772 +1783 @@
                             $this->fc_echo('transfering avatar<br/>');
 
-                            if (is_dir (BP_AVATAR_UPLOAD_PATH.DIRECTORY_SEPARATOR.'avatars'.DIRECTORY_SEPARATOR.$insertId) == FALSE)
-                                mkdir(BP_AVATAR_UPLOAD_PATH.DIRECTORY_SEPARATOR.'avatars'.DIRECTORY_SEPARATOR.$insertId,0644,true);
+                            if (is_dir ($this->dstAvatarPath.DIRECTORY_SEPARATOR.'avatars'.DIRECTORY_SEPARATOR.$insertId) == FALSE)
+                                mkdir($this->dstAvatarPath.DIRECTORY_SEPARATOR.'avatars'.DIRECTORY_SEPARATOR.$insertId,0644,true);
 
                             //large
@@ -1780 +1791 @@
                             $filename = str_replace('.gif', '-bpfull.gif', $filename);
                             $filename = str_replace('.png', '-bpfull.png', $filename);
-                            $status = copy($this->forumLoginSrc->avatarpath.DIRECTORY_SEPARATOR.$found, BP_AVATAR_UPLOAD_PATH.DIRECTORY_SEPARATOR.'avatars'.DIRECTORY_SEPARATOR.$insertId.DIRECTORY_SEPARATOR.$filename);
+                            $status = copy($this->forumLoginSrc->avatarpath.DIRECTORY_SEPARATOR.$found, $this->dstAvatarPath.DIRECTORY_SEPARATOR.'avatars'.DIRECTORY_SEPARATOR.$insertId.DIRECTORY_SEPARATOR.$filename);
                             if ($status == FALSE)
                                 $this->fc_echo('failed to copy file<br/>');
@@ -1789 +1800 @@
                             $filename = str_replace('.gif', '-bpthumb.gif', $filename);
                             $filename = str_replace('.png', '-bpthumb.png', $filename);
-                            $status = copy($this->forumLoginSrc->avatarpath.DIRECTORY_SEPARATOR.$found, BP_AVATAR_UPLOAD_PATH.DIRECTORY_SEPARATOR.'avatars'.DIRECTORY_SEPARATOR.$insertId.DIRECTORY_SEPARATOR.$filename);
+                            $status = copy($this->forumLoginSrc->avatarpath.DIRECTORY_SEPARATOR.$found, $this->dstAvatarPath.DIRECTORY_SEPARATOR.'avatars'.DIRECTORY_SEPARATOR.$insertId.DIRECTORY_SEPARATOR.$filename);
                             if ($status == FALSE)
                                 $this->fc_echo('failed to copy file<br/>');

forumconverter/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.2.1
 Tested up to: 3.2.1
-Stable tag: 1.06
+Stable tag: 1.07
 
 Migrates a phpBB forum into a bbPress forum.
@@ -119 +119 @@
 
 == Upgrade Notice ==
+= 1.07 =
+None
+
+= 1.06 =
+None
+
 = 1.05 =
 None
@@ -138 +144 @@
 
 == Changelog ==
+= 1.07 =
+* Update avatar support for BuddyPress 1.5 beta 2
+* Prevent empty folder creation for posts without attachments
+
 = 1.06 =
 * Add buddypress avatar support