Changeset 2566:9bf417837888 for plugins/importExport/inc/class.dc.import.dc1.php

Timestamp:

11/17/13 20:25:53 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Children:

2567:6c11245cbf04, 2568:61c67a7d17fa

Message:

Add some people in CREDITS, remove trailing spaces and tabs.

File:

• plugins/importExport/inc/class.dc.import.dc1.php (modified) (46 diffs)

plugins/importExport/inc/class.dc.import.dc1.php

@@ -17 +17 @@
      protected $prefix;
      protected $blog_id;
-     
+
      protected $action = null;
      protected $step = 1;
-     
+
      protected $post_offset = 0;
      protected $post_limit = 20;
      protected $post_count = 0;
-     
+
      protected $has_table = array();
-     
+
      protected $vars;
      protected $base_vars = array(
@@ -37 +37 @@
           'cat_ids' => array()
      );
-     
+
      protected function setInfo()
      {
@@ -44 +44 @@
           $this->description = __('Import a Dotclear 1.2 installation into your current blog.');
      }
-     
+
      public function init()
      {
@@ -50 +50 @@
           $this->prefix = $this->core->prefix;
           $this->blog_id = $this->core->blog->id;
-          
+
           if (!isset($_SESSION['dc1_import_vars'])) {
                $_SESSION['dc1_import_vars'] = $this->base_vars;
           }
           $this->vars =& $_SESSION['dc1_import_vars'];
-          
+
           if ($this->vars['post_limit'] > 0) {
                $this->post_limit = $this->vars['post_limit'];
           }
      }
-     
+
      public function resetVars()
      {
@@ -66 +66 @@
           unset($_SESSION['dc1_import_vars']);
      }
-     
+
      public function process($do)
      {
           $this->action = $do;
      }
-     
+
      # We handle process in another way to always display something to
      # user
@@ -130 +130 @@
           }
      }
-     
+
      public function gui()
      {
@@ -138 +138 @@
                $this->error($e);
           }
-          
+
           switch ($this->step)
           {
@@ -147 +147 @@
                     '<p class="warning">'.__('Please note that this process '.
                     'will empty your categories, blogroll, entries and comments on the current blog.').'</p>';
-                    
+
                     printf($this->imForm(1,__('General information'),__('Import my blog now')),
                     '<p>'.__('We first need some information about your old Dotclear 1.2 installation.').'</p>'.
@@ -189 +189 @@
                     break;
                case 6:
-                    echo 
+                    echo
                     '<h3 class="vertical-separator">'.__('Please read carefully').'</h3>'.
                     '<ul>'.
@@ -195 +195 @@
                     'and will need to ask for a new one by following the "I forgot my password" link on the login page '.
                     '(Their registered email address has to be valid.)').'</li>'.
-                    
+
                     '<li>'.sprintf(__('Please note that Dotclear 2 has a new URL layout. You can avoid broken '.
                     'links by installing <a href="%s">DC1 redirect</a> plugin and activate it in your blog configuration.'),
                     'http://plugins.dotaddict.org/dc2/details/dc1redirect').'</li>'.
                     '</ul>'.
-                    
+
                     $this->congratMessage();
-                    
-                    break;
-          }
-     }
-     
+
+                    break;
+          }
+     }
+
      # Simple form for step by step process
      protected function imForm($step,$legend,$submit_value=null)
@@ -213 +213 @@
                $submit_value = __('next step').' >';
           }
-          
+
           return
           '<form action="'.$this->getURL(true).'" method="post">'.
@@ -224 +224 @@
           '</form>';
      }
-     
+
      # Error display
      protected function error($e)
@@ -231 +231 @@
           '<p>'.$e->getMessage().'</p></div>';
      }
-     
+
      # Database init
      protected function db()
      {
           $db = dbLayer::init('mysql',$this->vars['db_host'],$this->vars['db_name'],$this->vars['db_user'],$this->vars['db_pwd']);
-          
+
           $rs = $db->select("SHOW TABLES LIKE '".$this->vars['db_prefix']."%'");
           if ($rs->isEmpty()) {
                throw new Exception(__('Dotclear tables not found'));
           }
-          
+
           while ($rs->fetch()) {
                $this->has_table[$rs->f(0)] = true;
           }
-          
+
           # Set this to read data as they were written in Dotclear 1
           try {
                $db->execute('SET NAMES DEFAULT');
           } catch (Exception $e) {}
-          
+
           $db->execute('SET CHARACTER SET DEFAULT');
           $db->execute("SET COLLATION_CONNECTION = DEFAULT");
@@ -256 +256 @@
           $db->execute("SET CHARACTER_SET_SERVER = DEFAULT");
           $db->execute("SET CHARACTER_SET_DATABASE = DEFAULT");
-          
+
           $this->post_count = $db->select(
                'SELECT COUNT(post_id) FROM '.$this->vars['db_prefix'].'post '
           )->f(0);
-          
+
           return $db;
      }
-     
+
      protected function cleanStr($str)
      {
           return text::cleanUTF8(@text::toUTF8($str));
      }
-     
+
      # Users import
      protected function importUsers()
@@ -275 +275 @@
           $prefix = $this->vars['db_prefix'];
           $rs = $db->select('SELECT * FROM '.$prefix.'user');
-          
+
           try
           {
                $this->con->begin();
-               
+
                while ($rs->fetch())
                {
@@ -298 +298 @@
                               'post_format' => $rs->user_post_format
                          ));
-                         
+
                          $permissions = array();
                          switch ($rs->user_level)
@@ -317 +317 @@
                                    break;
                          }
-                         
+
                          $this->core->addUser($cur);
                          $this->core->setUserBlogPermissions(
@@ -326 +326 @@
                     }
                }
-               
+
                $this->con->commit();
                $db->close();
@@ -337 +337 @@
           }
      }
-     
+
      # Categories import
      protected function importCategories()
@@ -344 +344 @@
           $prefix = $this->vars['db_prefix'];
           $rs = $db->select('SELECT * FROM '.$prefix.'categorie ORDER BY cat_ord ASC');
-          
+
           try
           {
@@ -351 +351 @@
                     "WHERE blog_id = '".$this->con->escape($this->blog_id)."' "
                );
-               
+
                $ord = 2;
                while ($rs->fetch())
@@ -362 +362 @@
                     $cur->cat_lft      = $ord++;
                     $cur->cat_rgt      = $ord++;
-                    
+
                     $cur->cat_id = $this->con->select(
                          'SELECT MAX(cat_id) FROM '.$this->prefix.'category'
@@ -369 +369 @@
                     $cur->insert();
                }
-               
+
                $db->close();
           }
@@ -378 +378 @@
           }
      }
-     
+
      # Blogroll import
      protected function importLinks()
@@ -385 +385 @@
           $prefix = $this->vars['db_prefix'];
           $rs = $db->select('SELECT * FROM '.$prefix.'link ORDER BY link_id ASC');
-          
+
           try
           {
@@ -392 +392 @@
                     "WHERE blog_id = '".$this->con->escape($this->blog_id)."' "
                );
-               
+
                while ($rs->fetch())
                {
@@ -403 +403 @@
                     $cur->link_xfn      = $this->cleanStr($rs->rel);
                     $cur->link_position = (integer) $rs->position;
-                    
+
                     $cur->link_id = $this->con->select(
                          'SELECT MAX(link_id) FROM '.$this->prefix.'link'
@@ -409 +409 @@
                     $cur->insert();
                }
-               
+
                $db->close();
           }
@@ -418 +418 @@
           }
      }
-     
+
      # Entries import
      protected function importPosts(&$percent)
@@ -424 +424 @@
           $db = $this->db();
           $prefix = $this->vars['db_prefix'];
-          
+
           $count = $db->select('SELECT COUNT(post_id) FROM '.$prefix.'post')->f(0);
-          
+
           $rs = $db->select(
                'SELECT * FROM '.$prefix.'post ORDER BY post_id ASC '.
                $db->limit($this->post_offset,$this->post_limit)
           );
-          
+
           try
           {
@@ -441 +441 @@
                     );
                }
-               
+
                while ($rs->fetch()) {
                     $this->importPost($rs,$db);
                }
-               
+
                $db->close();
           }
@@ -453 +453 @@
                throw $e;
           }
-          
+
           if ($rs->count() < $this->post_limit) {
                return -1;
@@ -459 +459 @@
                $this->post_offset += $this->post_limit;
           }
-          
+
           if ($this->post_offset > $this->post_count) {
                $percent = 100;
@@ -466 +466 @@
           }
      }
-     
+
      protected function importPost($rs,$db)
      {
@@ -477 +477 @@
           $cur->post_upddt  = $rs->post_upddt;
           $cur->post_title  = html::decodeEntities($this->cleanStr($rs->post_titre));
-          
+
           $cur->post_url = date('Y/m/d/',strtotime($cur->post_dt)).$rs->post_id.'-'.$rs->post_titre_url;
           $cur->post_url = substr($cur->post_url,0,255);
-          
+
           $cur->post_format        = $rs->post_content_wiki == '' ? 'xhtml' : 'wiki';
           $cur->post_content_xhtml = $this->cleanStr($rs->post_content);
           $cur->post_excerpt_xhtml = $this->cleanStr($rs->post_chapo);
-          
+
           if ($cur->post_format == 'wiki') {
                $cur->post_content = $this->cleanStr($rs->post_content_wiki);
@@ -492 +492 @@
                $cur->post_excerpt = $this->cleanStr($rs->post_chapo);
           }
-          
+
           $cur->post_notes        = $this->cleanStr($rs->post_notes);
           $cur->post_status       = (integer) $rs->post_pub;
@@ -499 +499 @@
           $cur->post_open_tb      = (integer) $rs->post_open_tb;
           $cur->post_lang         = $rs->post_lang;
-          
+
           $cur->post_words = implode(' ',text::splitWords(
                $cur->post_title.' '.
@@ -505 +505 @@
                $cur->post_content_xhtml
           ));
-          
+
           $cur->post_id = $this->con->select(
                'SELECT MAX(post_id) FROM '.$this->prefix.'post'
                )->f(0) + 1;
-          
+
           $cur->insert();
           $this->importComments($rs->post_id,$cur->post_id,$db);
           $this->importPings($rs->post_id,$cur->post_id,$db);
-          
+
           # Load meta if we have some in DC1
           if (isset($this->has_table[$this->vars['db_prefix'].'post_meta'])) {
@@ -519 +519 @@
           }
      }
-     
+
      # Comments import
      protected function importComments($post_id,$new_post_id,$db)
      {
           $count_c = $count_t = 0;
-          
+
           $rs = $db->select(
                'SELECT * FROM '.$this->vars['db_prefix'].'comment '.
                'WHERE post_id = '.(integer) $post_id.' '
                );
-          
+
           while ($rs->fetch())
           {
@@ -542 +542 @@
                $cur->comment_ip        = $rs->comment_ip;
                $cur->comment_trackback = (integer) $rs->comment_trackback;
-               
+
                $cur->comment_site = $this->cleanStr($rs->comment_site);
                if ($cur->comment_site != '' && !preg_match('!^http://.*$!',$cur->comment_site)) {
                     $cur->comment_site = substr('http://'.$cur->comment_site,0,255);
                }
-               
+
                if ($rs->exists('spam') && $rs->spam && $rs->comment_status = 0) {
                     $cur->comment_status = -2;
                }
-               
+
                $cur->comment_words = implode(' ',text::splitWords($cur->comment_content));
-               
+
                $cur->comment_id = $this->con->select(
                     'SELECT MAX(comment_id) FROM '.$this->prefix.'comment'
                )->f(0) + 1;
-               
+
                $cur->insert();
-               
+
                if ($cur->comment_trackback && $cur->comment_status == 1) {
                     $count_t++;
@@ -566 +566 @@
                }
           }
-          
+
           if ($count_t > 0 || $count_c > 0)
           {
@@ -577 +577 @@
           }
      }
-     
+
      # Pings import
      protected function importPings($post_id,$new_post_id,$db)
      {
           $urls = array();
-          
+
           $rs = $db->select(
                'SELECT * FROM '.$this->vars['db_prefix'].'ping '.
                'WHERE post_id = '.(integer) $post_id
                );
-          
+
           while ($rs->fetch())
           {
@@ -594 +594 @@
                     continue;
                }
-               
+
                $cur = $this->con->openCursor($this->prefix.'ping');
                $cur->post_id = (integer) $new_post_id;
@@ -600 +600 @@
                $cur->ping_dt = $rs->ping_dt;
                $cur->insert();
-               
+
                $urls[$url] = true;
           }
      }
-     
+
      # Meta import
      protected function importMeta($post_id,$new_post_id,$db)
@@ -612 +612 @@
                'WHERE post_id = '.(integer) $post_id.' '
                );
-          
+
           if ($rs->isEmpty()) {
                return;
           }
-          
+
           while ($rs->fetch()) {
                $this->core->meta->setPostMeta($new_post_id,$this->cleanStr($rs->meta_key),$this->cleanStr($rs->meta_value));
@@ -622 +622 @@
      }
 }
-?>