Changeset 2566:9bf417837888 for plugins/importExport/inc

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.

Location:

plugins/importExport/inc

Files:

• class.dc.export.flat.php (modified) (11 diffs)
• class.dc.ieModule.php (modified) (3 diffs)
• class.dc.import.dc1.php (modified) (46 diffs)
• class.dc.import.feed.php (modified) (7 diffs)
• class.dc.import.wp.php (modified) (52 diffs)
• flat/class.flat.backup.php (modified) (12 diffs)
• flat/class.flat.export.php (modified) (7 diffs)
• lib.ie.maintenance.php (modified) (2 diffs)

plugins/importExport/inc/class.dc.export.flat.php

@@ -20 +20 @@
           $this->description = __('Exports a blog or a full Dotclear installation to flat file.');
      }
-     
+
      public function process($do)
      {
           # Export a blog
           if ($do == 'export_blog' && $this->core->auth->check('admin',$this->core->blog->id))
-          {              
+          {
                $fullname = $this->core->blog->public_path.'/.backup_'.sha1(uniqid());
                $blog_id = $this->core->con->escape($this->core->blog->id);
-               
+
                try
                {
                     $exp = new flatExport($this->core->con,$fullname,$this->core->prefix);
                     fwrite($exp->fp,'///DOTCLEAR|'.DC_VERSION."|single\n");
-                    
+
                     $exp->export('category',
                          'SELECT * FROM '.$this->core->prefix.'category '.
@@ -78 +78 @@
                          "AND P.blog_id = '".$blog_id."'"
                     );
-                    
+
                     # --BEHAVIOR-- exportSingle
                     $this->core->callBehavior('exportSingle',$this->core,$exp,$blog_id);
-                    
+
                     $_SESSION['export_file'] = $fullname;
                     $_SESSION['export_filename'] = $_POST['file_name'];
@@ -93 +93 @@
                }
           }
-          
+
           # Export all content
           if ($do == 'export_all' && $this->core->auth->isSuperAdmin())
@@ -118 +118 @@
                     $exp->exportTable('spamrule');
                     $exp->exportTable('version');
-                    
+
                     # --BEHAVIOR-- exportFull
                     $this->core->callBehavior('exportFull',$this->core,$exp);
-                    
+
                     $_SESSION['export_file'] = $fullname;
                     $_SESSION['export_filename'] = $_POST['file_name'];
@@ -133 +133 @@
                }
           }
-          
+
           # Send file content
           if ($do == 'ok')
@@ -140 +140 @@
                     throw new Exception(__('Export file not found.'));
                }
-               
+
                ob_end_clean();
-               
+
                if (substr($_SESSION['export_filename'],-4) == '.zip') {
                     $_SESSION['export_filename'] = substr($_SESSION['export_filename'],0,-4);//.'.txt';
                }
-               
+
                # Flat export
                if (empty($_SESSION['export_filezip'])) {
-               
+
                     header('Content-Disposition: attachment;filename='.$_SESSION['export_filename']);
                     header('Content-Type: text/plain; charset=UTF-8');
                     readfile($_SESSION['export_file']);
-                    
+
                     unlink($_SESSION['export_file']);
                     unset($_SESSION['export_file'],$_SESSION['export_filename'],$_SESSION['export_filezip']);
@@ -163 +163 @@
                     {
                          $file_zipname = $_SESSION['export_filename'].'.zip';
-                         
+
                          $fp = fopen('php://output','wb');
                          $zip = new fileZip($fp);
                          $zip->addFile($_SESSION['export_file'],$_SESSION['export_filename']);
-                         
+
                          header('Content-Disposition: attachment;filename='.$file_zipname);
                          header('Content-Type: application/x-zip');
-                         
+
                          $zip->write();
-                         
+
                          unlink($_SESSION['export_file']);
                          unset($zip,$_SESSION['export_file'],$_SESSION['export_filename'],$file_zipname);
@@ -181 +181 @@
                          unset($zip,$_SESSION['export_file'],$_SESSION['export_filename'],$file_zipname);
                          @unlink($_SESSION['export_file']);
-                         
+
                          throw new Exception(__('Failed to compress export file.'));
                     }
@@ -187 +187 @@
           }
      }
-     
+
      public function gui()
      {
@@ -194 +194 @@
           '<h3>'.__('Single blog').'</h3>'.
           '<p>'.sprintf(__('This will create an export of your current blog: %s'),'<strong>'.html::escapeHTML($this->core->blog->name)).'</strong>.</p>'.
-          
+
           '<p><label for="file_name">'.__('File name:').'</label>'.
           form::field(array('file_name','file_name'),50,255,date('Y-m-d-H-i-').html::escapeHTML($this->core->blog->id.'-backup.txt')).
           '</p>'.
-          
+
           '<p><label for="file_zip" class="classic">'.
           form::checkbox(array('file_zip','file_zip'),1).' '.
           __('Compress file').'</label>'.
           '</p>'.
-          
+
           '<p class="zip-dl"><a href="media.php?d=&amp;zipdl=1">'.
           __('You may also want to download your media directory as a zip file').'</a></p>'.
-          
+
           '<p><input type="submit" value="'.__('Export').'" />'.
           form::hidden(array('do'),'export_blog').
           $this->core->formNonce().'</p>'.
-          
+
           '</form>';
-          
+
           if ($this->core->auth->isSuperAdmin())
           {
@@ -219 +219 @@
                '<h3>'.__('Multiple blogs').'</h3>'.
                '<p>'.__('This will create an export of all the content of your database.').'</p>'.
-               
+
                '<p><label for="file_name2">'.__('File name:').'</label>'.
                form::field(array('file_name','file_name2'),50,255,date('Y-m-d-H-i-').'dotclear-backup.txt').
                '</p>'.
-               
+
                '<p><label for="file_zip2" class="classic">'.
                form::checkbox(array('file_zip','file_zip2'),1).' '.
                __('Compress file').'</label>'.
                '</p>'.
-               
+
                '<p><input type="submit" value="'.__('Export').'" />'.
                form::hidden(array('do'),'export_all').
                $this->core->formNonce().'</p>'.
-               
+
                '</form>';
           }
      }
 }
-?>

plugins/importExport/inc/class.dc.ieModule.php

@@ -18 +18 @@
      public $name;
      public $description;
-     
+
      protected $import_url;
      protected $export_url;
      protected $core;
-     
+
      public function __construct($core)
      {
           $this->core =& $core;
           $this->setInfo();
-          
+
           if (!in_array($this->type,array('import','export'))) {
                throw new Exception(sprintf('Unknow type for module %s',get_class($this)));
           }
-          
+
           if (!$this->name) {
                $this->name = get_class($this);
           }
-          
+
           $this->id = get_class($this);
           $this->url = sprintf('plugin.php?p=importExport&type=%s&module=%s',$this->type,$this->id);
      }
-     
+
      public function init()
      {
      }
-     
+
      abstract protected function setInfo();
-     
+
      final public function getURL($escape=false)
      {
           return $escape ? html::escapeHTML($this->url) : $this->url;
      }
-     
+
      abstract public function process($do);
-     
+
      abstract public function gui();
-     
+
      protected function progressBar($percent)
      {
@@ -63 +63 @@
           return '<div class="ie-progress"><div style="width:'.$percent.'%">'.$percent.' %</div></div>';
      }
-     
+
      protected function autoSubmit()
      {
           return form::hidden(array('autosubmit'),1);
      }
-     
+
      protected function congratMessage()
      {
@@ -78 +78 @@
      }
 }
-?>

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 @@
      }
 }
-?>

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

@@ -16 +16 @@
      protected $status = false;
      protected $feed_url = '';
-     
+
      public function setInfo()
      {
@@ -23 +23 @@
           $this->description = __('Add a feed content to the blog.');
      }
-     
+
      public function process($do)
      {
@@ -30 +30 @@
                return;
           }
-          
+
           if (empty($_POST['feed_url'])) {
                return;
           }
-          
+
           $this->feed_url = $_POST['feed_url'];
-          
+
           $feed = feedReader::quickParse($this->feed_url);
           if ($feed === false) {
@@ -44 +44 @@
                throw new Exception(__('No items in feed.'));
           }
-          
+
           $cur = $this->core->con->openCursor($this->core->prefix.'post');
           $this->core->con->begin();
@@ -56 +56 @@
                $cur->post_status = -2;
                $cur->post_dt = strftime('%Y-%m-%d %H:%M:%S',$item->TS);
-               
+
                try {
                     $post_id = $this->core->blog->addPost($cur);
@@ -63 +63 @@
                     throw $e;
                }
-               
+
                foreach ($item->subject as $subject) {
                     $this->core->meta->setPostMeta($post_id,'tag',dcMeta::sanitizeMetaID($subject));
                }
           }
-          
+
           $this->core->con->commit();
           http::redirect($this->getURL().'&do=ok');
-          
+
      }
-     
+
      public function gui()
      {
@@ -79 +79 @@
                dcPage::success(__('Content successfully imported.'));
           }
-          
+
           echo
           '<form action="'.$this->getURL(true).'" method="post">'.
           '<p>'.sprintf(__('Add a feed content to the current blog: <strong>%s</strong>.'),html::escapeHTML($this->core->blog->name)).'</p>'.
-          
+
           '<p><label for="feed_url">'.__('Feed URL:').'</label>'.
           form::field('feed_url',50,300,html::escapeHTML($this->feed_url)).'</p>'.
-          
+
           '<p>'.
           $this->core->formNonce().
           form::hidden(array('do'),1).
           '<input type="submit" value="'.__('Import').'" /></p>'.
-          
+
           '</form>';
      }
 }
-?>

plugins/importExport/inc/class.dc.import.wp.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(
@@ -45 +45 @@
           'permalink_template' => 'p=%post_id%',
           'permalink_tags' => array(
-               '%year%', 
-               '%monthnum%', 
-               '%day%', 
-               '%hour%', 
-               '%minute%', 
-               '%second%', 
-               '%postname%', 
-               '%post_id%', 
-               '%category%', 
+               '%year%',
+               '%monthnum%',
+               '%day%',
+               '%hour%',
+               '%minute%',
+               '%second%',
+               '%postname%',
+               '%post_id%',
+               '%category%',
                '%author%'
           )
      );
      protected $formaters;
-     
+
      protected function setInfo()
      {
@@ -65 +65 @@
           $this->description = __('Import a WordPress installation into your current blog.');
      }
-     
+
      public function init()
      {
@@ -71 +71 @@
           $this->prefix = $this->core->prefix;
           $this->blog_id = $this->core->blog->id;
-          
+
           if (!isset($_SESSION['wp_import_vars'])) {
                $_SESSION['wp_import_vars'] = $this->base_vars;
           }
           $this->vars =& $_SESSION['wp_import_vars'];
-          
+
           if ($this->vars['post_limit'] > 0) {
                $this->post_limit = $this->vars['post_limit'];
@@ -83 +83 @@
           $this->formaters = dcAdminCombos::getFormatersCombo();
      }
-     
+
      public function resetVars()
      {
@@ -89 +89 @@
           unset($_SESSION['wp_import_vars']);
      }
-     
+
      public function process($do)
      {
           $this->action = $do;
      }
-     
+
      # We handle process in another way to always display something to
      # user
@@ -159 +159 @@
           }
      }
-     
+
      public function gui()
      {
@@ -167 +167 @@
                $this->error($e);
           }
-          
+
           switch ($this->step)
           {
@@ -176 +176 @@
                     '<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 WordPress installation.').'</p>'.
@@ -218 +218 @@
                     form::field('post_limit',3,3,html::escapeHTML($this->vars['post_limit'])).'</p>'.
                     '</div>'.
-                    
+
                     '</div>'.
 
@@ -253 +253 @@
                     break;
                case 6:
-                    echo 
+                    echo
                     '<p class="message">'.__('Every newly imported user has received a random password '.
                     'and will need to ask for a new one by following the "I forgot my password" link on the login page '.
@@ -261 +261 @@
           }
      }
-     
+
      # Simple form for step by step process
      protected function imForm($step,$legend,$submit_value=null)
@@ -268 +268 @@
                $submit_value = __('next step').' >';
           }
-          
+
           return
           '<form action="'.$this->getURL(true).'" method="post">'.
@@ -279 +279 @@
           '</form>';
      }
-     
+
      # Error display
      protected function error($e)
@@ -286 +286 @@
           '<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(__('WordPress tables not found'));
           }
-          
+
           while ($rs->fetch()) {
                $this->has_table[$rs->f(0)] = true;
           }
-          
+
           # Set this to read data as they were written
           try {
                $db->execute('SET NAMES DEFAULT');
           } catch (Exception $e) {}
-          
+
           $db->execute('SET CHARACTER SET DEFAULT');
           $db->execute("SET COLLATION_CONNECTION = DEFAULT");
@@ -311 +311 @@
           $db->execute("SET CHARACTER_SET_SERVER = DEFAULT");
           $db->execute("SET CHARACTER_SET_DATABASE = DEFAULT");
-          
+
           $this->post_count = $db->select(
                'SELECT COUNT(ID) FROM '.$this->vars['db_prefix'].'posts '.
                'WHERE post_type = \'post\' OR post_type = \'page\''
           )->f(0);
-          
+
           return $db;
      }
-     
+
      protected function cleanStr($str)
      {
           return text::cleanUTF8(@text::toUTF8($str));
      }
-     
+
      # Users import
      protected function importUsers()
@@ -331 +331 @@
           $prefix = $this->vars['db_prefix'];
           $rs = $db->select('SELECT * FROM '.$prefix.'users');
-          
+
           try
           {
                $this->con->begin();
-               
+
                while ($rs->fetch())
                {
@@ -352 +352 @@
                          $cur->user_tz          = $this->core->blog->settings->system->blog_timezone;
                          $permissions           = array();
-                         
+
                          $rs_meta = $db->select('SELECT * FROM '.$prefix.'usermeta WHERE user_id = '.$rs->ID);
                          while ($rs_meta->fetch())
@@ -425 +425 @@
           }
      }
-     
+
      # Categories import
      protected function importCategories()
@@ -438 +438 @@
                'ORDER BY t.term_id ASC'
           );
-          
+
           try
           {
@@ -445 +445 @@
                     "WHERE blog_id = '".$this->con->escape($this->blog_id)."' "
                );
-               
+
                $ord = 2;
                while ($rs->fetch())
@@ -456 +456 @@
                     $cur->cat_lft      = $ord++;
                     $cur->cat_rgt      = $ord++;
-                    
+
                     $cur->cat_id = $this->con->select(
                          'SELECT MAX(cat_id) FROM '.$this->prefix.'category'
@@ -463 +463 @@
                     $cur->insert();
                }
-               
+
                $db->close();
           }
@@ -472 +472 @@
           }
      }
-     
+
      # Blogroll import
      protected function importLinks()
@@ -479 +479 @@
           $prefix = $this->vars['db_prefix'];
           $rs = $db->select('SELECT * FROM '.$prefix.'links ORDER BY link_id ASC');
-          
+
           try
           {
@@ -486 +486 @@
                     "WHERE blog_id = '".$this->con->escape($this->blog_id)."' "
                );
-               
+
                while ($rs->fetch())
                {
@@ -495 +495 @@
                     $cur->link_desc     = $this->cleanStr($rs->link_description);
                     $cur->link_xfn      = $this->cleanStr($rs->link_rel);
-                    
+
                     $cur->link_id = $this->con->select(
                          'SELECT MAX(link_id) FROM '.$this->prefix.'link'
@@ -501 +501 @@
                     $cur->insert();
                }
-               
+
                $db->close();
           }
@@ -510 +510 @@
           }
      }
-     
+
      # Entries import
      protected function importPosts(&$percent)
@@ -516 +516 @@
           $db = $this->db();
           $prefix = $this->vars['db_prefix'];
-          
+
           $plink = $db->select(
                     'SELECT option_value FROM '.$prefix.'options '.
@@ -524 +524 @@
                $this->vars['permalink_template'] = substr($plink,1);
           }
-          
+
           $rs = $db->select(
                'SELECT * FROM '.$prefix.'posts '.
@@ -531 +531 @@
                $db->limit($this->post_offset,$this->post_limit)
           );
-          
+
           try
           {
@@ -540 +540 @@
                          "WHERE blog_id = '".$this->con->escape($this->blog_id)."' "
                     );
-               }    
-               
+               }
+
                while ($rs->fetch()) {
                     $this->importPost($rs,$db);
                }
-               
+
                $db->close();
           }
@@ -553 +553 @@
                throw $e;
           }
-          
+
           if ($rs->count() < $this->post_limit) {
                return -1;
@@ -559 +559 @@
                $this->post_offset += $this->post_limit;
           }
-          
+
           if ($this->post_offset > $this->post_count) {
                $percent = 100;
@@ -566 +566 @@
           }
      }
-     
+
      protected function importPost($rs,$db)
      {
@@ -575 +575 @@
                $user_id = $this->vars['user_ids'][$rs->post_author];
           }
-          
+
           $cur = $this->con->openCursor($this->prefix.'post');
           $cur->blog_id     = $this->blog_id;
@@ -583 +583 @@
           $cur->post_upddt  = $rs->post_modified;
           $cur->post_title  = $this->cleanStr($rs->post_title);
-          
+
           if (!$cur->post_title) {
                $cur->post_title = 'No title';
           }
-          
+
           if ($this->vars['cat_import'] || $this->vars['cat_as_tags'])
           {
@@ -601 +601 @@
                     ' ORDER BY t.term_id ASC '
                     );
-               if (!$old_cat_ids->isEmpty() && $this->vars['cat_import']) 
+               if (!$old_cat_ids->isEmpty() && $this->vars['cat_import'])
                {
                     $cur->cat_id = $this->vars['cat_ids'][(integer) $old_cat_ids->term_id];
                }
           }
-          
+
           $permalink_infos = array(
-               date('Y',strtotime($cur->post_dt)), 
-               date('m',strtotime($cur->post_dt)), 
-               date('d',strtotime($cur->post_dt)), 
-               date('H',strtotime($cur->post_dt)), 
-               date('i',strtotime($cur->post_dt)), 
-               date('s',strtotime($cur->post_dt)), 
-               $rs->post_name, 
-               $rs->ID, 
-               $cur->cat_id, 
+               date('Y',strtotime($cur->post_dt)),
+               date('m',strtotime($cur->post_dt)),
+               date('d',strtotime($cur->post_dt)),
+               date('H',strtotime($cur->post_dt)),
+               date('i',strtotime($cur->post_dt)),
+               date('s',strtotime($cur->post_dt)),
+               $rs->post_name,
+               $rs->ID,
+               $cur->cat_id,
                $cur->user_id
           );
@@ -625 +625 @@
           );
           $cur->post_url = substr($cur->post_url,0,255);
-          
+
           if (!$cur->post_url) {
                $cur->post_url = $rs->ID;
           }
-          
+
           $cur->post_format = $this->vars['post_formater'];
           $_post_content = explode('<!--more-->',$rs->post_content,2);
@@ -639 +639 @@
                $cur->post_content = $this->cleanStr(array_shift($_post_content));
           }
-          
+
           $cur->post_content_xhtml = $this->core->callFormater($this->vars['post_formater'],$cur->post_content);
           $cur->post_excerpt_xhtml = $this->core->callFormater($this->vars['post_formater'],$cur->post_excerpt);
-          
+
           switch ($rs->post_status)
           {
@@ -661 +661 @@
           $cur->post_open_comment = $rs->comment_status == 'open' ? 1 : 0;
           $cur->post_open_tb      = $rs->ping_status == 'open' ? 1 : 0;
-          
+
           $cur->post_words = implode(' ',text::splitWords(
                $cur->post_title.' '.
@@ -667 +667 @@
                $cur->post_content_xhtml
           ));
-          
+
           $cur->post_id = $this->con->select(
                'SELECT MAX(post_id) FROM '.$this->prefix.'post'
                )->f(0) + 1;
-          
+
           $cur->post_url = $this->core->blog->getPostURL($cur->post_url,$cur->post_dt,$cur->post_title,$cur->post_id);
-          
+
           $cur->insert();
           $this->importComments($rs->ID,$cur->post_id,$db);
           $this->importPings($rs->ID,$cur->post_id,$db);
-          
+
           # Create tags
           $this->importTags($rs->ID,$cur->post_id,$db);
-          
+
           if (isset($old_cat_ids))
           {
-               if (!$old_cat_ids->isEmpty() && $this->vars['cat_as_tags']) 
+               if (!$old_cat_ids->isEmpty() && $this->vars['cat_as_tags'])
                {
                     $old_cat_ids->moveStart();
@@ -692 +692 @@
           }
      }
-     
+
      # 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'].'comments '.
                'WHERE comment_post_ID = '.(integer) $post_id.' '
                );
-          
+
           while ($rs->fetch())
           {
@@ -716 +716 @@
                $cur->comment_site = substr($this->cleanStr($rs->comment_author_url),0,255);
                if ($cur->comment_site == '') $cur->comment_site = NULL;
-               
+
                if ($rs->comment_approved == 'spam') {
                     $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++;
@@ -735 +735 @@
                }
           }
-          
+
           if ($count_t > 0 || $count_c > 0)
           {
@@ -746 +746 @@
           }
      }
-     
+
      # Pings import
      protected function importPings($post_id,$new_post_id,$db)
@@ -752 +752 @@
           $urls = array();
           $pings = array();
-          
+
           $rs = $db->select(
                'SELECT pinged FROM '.$this->vars['db_prefix'].'posts '.
@@ -759 +759 @@
           $pings = explode ("\n",$rs->pinged);
           unset ($pings[0]);
-          
+
           foreach($pings as $ping_url)
           {
@@ -766 +766 @@
                     continue;
                }
-               
+
                $cur = $this->con->openCursor($this->prefix.'ping');
                $cur->post_id = (integer) $new_post_id;
                $cur->ping_url = $url;
                $cur->insert();
-               
+
                $urls[$url] = true;
           }
      }
-     
+
      # Meta import
      protected function importTags($post_id,$new_post_id,$db)
@@ -789 +789 @@
                ' ORDER BY t.term_id ASC'
           );
-          
+
           if ($rs->isEmpty()) {
                return;
           }
-          
+
           while ($rs->fetch()) {
                $this->core->meta->setPostMeta($new_post_id,'tag',$this->cleanStr($rs->name));
@@ -799 +799 @@
      }
 }
-?>

plugins/importExport/inc/flat/class.flat.backup.php

@@ -18 +18 @@
      private $line_name;
      private $line_num;
-     
+
      private $replacement = array(
           '/(?<!\\\\)(?>(\\\\\\\\)*+)(\\\\n)/u' => "\$1\n",
@@ -25 +25 @@
           '/(\\\\\\\\)/' => '\\'
      );
-     
+
      public function __construct($file)
      {
@@ -35 +35 @@
           }
      }
-     
+
      public function __destruct()
      {
@@ -42 +42 @@
           }
      }
-     
+
      public function getLine()
      {
@@ -48 +48 @@
                return false;
           }
-          
+
           if (substr($line,0,1) == '[')
           {
                $this->line_name = substr($line,1,strpos($line,' ')-1);
-               
+
                $line = substr($line,strpos($line,' ')+1,-1);
                $this->line_cols = explode(',',$line);
-               
+
                return $this->getLine();
           }
@@ -62 +62 @@
                $line = preg_replace('/^"|"$/','',$line);
                $line = preg_split('/(^"|","|(?<!\\\)\"$)/m',$line);
-               
+
                if (count($this->line_cols) != count($line)) {
                     throw new Exception(sprintf('Invalid row count at line %s',$this->line_num));
                }
-               
+
                $res = array();
-               
+
                for ($i=0; $i<count($line); $i++) {
                     $res[$this->line_cols[$i]] =
                     preg_replace(array_keys($this->replacement),array_values($this->replacement),$line[$i]);
                }
-               
+
                return new flatBackupItem($this->line_name,$res,$this->line_num);
           }
@@ -81 +81 @@
           }
      }
-     
+
      private function nextLine()
      {
@@ -88 +88 @@
           }
           $this->line_num++;
-          
+
           $line = fgets($this->fp);
           $line = trim($line);
-          
+
           return empty($line) ? $this->nextLine() : $line;
      }
@@ -101 +101 @@
      public $__line;
      private $__data = array();
-     
+
      public function __construct($name,$data,$line)
      {
@@ -108 +108 @@
           $this->__line = $line;
      }
-     
+
      public function f($name)
      {
           return iconv('UTF-8','UTF-8//IGNORE',$this->__data[$name]);
      }
-     
+
      public function __get($name)
      {
           return $this->f($name);
      }
-     
+
      public function __set($n,$v)
      {
           $this->__data[$n] = $v;
      }
-     
+
      public function exists($n)
      {
           return isset($this->__data[$n]);
      }
-     
+
      public function drop()
      {
@@ -137 +137 @@
           }
      }
-     
+
      public function substitute($old,$new)
      {
@@ -146 +146 @@
      }
 }
-?>

plugins/importExport/inc/flat/class.flat.export.php

@@ -16 +16 @@
      private $con;
      private $prefix;
-     
+
      private $line_reg = array('/\\\\/u',  '/\n/u','/\r/u','/"/u');
      private $line_rep = array('\\\\\\\\', '\n'   ,'\r'   ,'\"');
-     
+
      public $fp;
-     
+
      function __construct($con,$out='php://output',$prefix=null)
      {
           $this->con =& $con;
           $this->prefix = $prefix;
-          
+
           if (($this->fp = fopen($out,'w')) === false) {
                return false;
@@ -32 +32 @@
           @set_time_limit(300);
      }
-     
+
      function __destruct()
      {
@@ -39 +39 @@
           }
      }
-     
+
      function export($name,$sql)
      {
           $rs = $this->con->select($sql);
-          
+
           if (!$rs->isEmpty())
           {
@@ -53 +53 @@
           }
      }
-     
+
      function exportAll()
      {
           $tables = $this->getTables();
-          
+
           foreach ($tables as $table)
           {
@@ -63 +63 @@
           }
      }
-     
+
      function exportTable($table)
      {
           $req = 'SELECT * FROM '.$this->con->escapeSystem($this->prefix.$table);
-          
+
           $this->export($table,$req);
      }
-     
+
      function getTables()
      {
           $schema = dbSchema::init($this->con);
           $db_tables = $schema->getTables();
-          
+
           $tables = array();
           foreach ($db_tables as $t)
@@ -87 +87 @@
                }
           }
-          
+
           return $tables;
      }
-     
+
      function getLine($rs)
      {
@@ -104 +104 @@
      }
 }
-?>

plugins/importExport/inc/lib.ie.maintenance.php

@@ -58 +58 @@
           }
           else {
-               return 
+               return
                '<p><label for="file_name">'.__('File name:').'</label>'.
                form::field('file_name', 50, 255, date('Y-m-d-H-i-').$this->export_name).
@@ -115 +115 @@
           }
           else {
-               return 
+               return
                '<p><label for="file_name">'.__('File name:').'</label>'.
                form::field('file_name', 50, 255, date('Y-m-d-H-i-').$this->export_name).