Changeset 421867

Timestamp:

08/10/2011 09:14:06 PM (14 years ago)

Author:

Orson Teodoro

Message:

increase script execution time and fix attachments

Location:

forumconverter

Files:

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

forumconverter/trunk/PhpbbToBbpress.php

@@ -36 +36 @@
             $this->processAttachments = true;
             $this->forumLoginSrc = $forumSrc;
+
+            //timeouts - this may require adjusting based on amount of posts that need to be converted
+            set_time_limit(3600);
         }
         
@@ -502 +505 @@
             
             $fdb = new wpdb($this->forumLoginSrc->username, $this->forumLoginSrc->password, $this->forumLoginSrc->databasename, $this->forumLoginSrc->hostname);
-            //$fdb->show_errors();
-            //$wpdb->show_errors();
+            //$fdb->query("set session wait_timeout=1");
+            $fdb->show_errors();
+            $wpdb->show_errors();
 
             //trash existing topics
@@ -619 +623 @@
                     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)
                         {
@@ -637 +646 @@
                                     if ($data->post_attachment)
                                     {
-                                        //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.'"');
@@ -655 +659 @@
                                         $status = copy($this->forumLoginSrc->uploadpath.DIRECTORY_SEPARATOR.$attachment->physical_filename, $dir['basedir'].DIRECTORY_SEPARATOR.'bbpress'.DIRECTORY_SEPARATOR.$insertId.DIRECTORY_SEPARATOR.$filename);
                                         if ($status == FALSE)
-                                            $this->fc_echo('failed to copy file');
+                                            $this->fc_echo('failed to copy file<br/>');
 
                                         $attachmenturl = content_url().'/uploads/bbpress/'.$insertId.'/'.$filename;
@@ -729 +733 @@
                         else
                         {
+
                             //lookup attachment
-                            $attachments = $fdb->get_results('SELECT * FROM '.$this->forumLoginSrc->prefix.'fc_attachments WHERE post_msg_id='.$data->post_id);
+                            $attachments = $fdb->get_results('SELECT * FROM '.$this->forumLoginSrc->prefix.'attachments WHERE post_msg_id='.$data->post_id);
                             if ($attachments === false)
-                                $this->fc_die('failed to check attachment'.$wpdb->last_error);
+                                $this->fc_die('failed to check attachment'.$fdb->last_error);
                             if ($wpdb->num_rows > 0)
                             {
@@ -738 +743 @@
                                 foreach ($attachments as $attachment)
                                 {
-                                    //$this->fc_echo('adding post/reply attachment<br/>');
+                                    $this->fc_echo('adding post/reply attachment<br/>');
 
                                     //add download link
                                     if ($data->post_attachment)
                                     {
-                                        //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.'"');
-
                                         //try to maintain the original filename name without any extra fancy script
                                         //copy attachment to wordpress uploads folder
@@ -761 +758 @@
                                         $status = copy($this->forumLoginSrc->uploadpath.DIRECTORY_SEPARATOR.$attachment->physical_filename, $dir['basedir'].DIRECTORY_SEPARATOR.'bbpress'.DIRECTORY_SEPARATOR.$insertId.DIRECTORY_SEPARATOR.$filename);
                                         if ($status == FALSE)
-                                            $this->fc_echo('failed to copy file');
+                                            $this->fc_echo('failed to copy file<br/>');
 
                                         $attachmenturl = content_url().'/uploads/bbpress/'.$insertId.'/'.$filename;
@@ -820 +817 @@
                                         );
 
-                                        $postText .= '<p>Download <a href="'.$attachmenturl.'">'.$attachment->real_filename.'</a>. (Caution: This file may not be virus scanned.)</p>';
+                                        $postText .= '<p>Download <a href="'.$attachmenturl.'">'.$attachment->real_filename.'</a>. (1Caution: This file may not be virus scanned.)</p>';
                                     }
                                 }

forumconverter/trunk/readme.txt

@@ -119 +119 @@
 
 == Upgrade Notice ==
+= 1.05 =
+None
+
 = 1.04 =
 None
@@ -132 +135 @@
 
 == Changelog ==
+= 1.05 =
+* Bugfix: increase execution time to 1 hour for those who don't have it in their php.ini
+* Bugfix: fix attachments for those not attached inline
+
 = 1.04 =
 * Remove end of file whitespace to get rid of plugin activation warnings.