Changeset 3551:e22eab0d16b1 for plugins/importExport/inc/class.dc.import.dc1.php

Timestamp:

07/21/17 10:48:05 (8 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Give mysql driver choice for DC 1.2 import, closes #2252

File:

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

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

@@ -29 +29 @@
      protected $vars;
      protected $base_vars = array(
+          'db_driver' => 'mysql',
           'db_host' => '',
           'db_name' => '',
@@ -79 +80 @@
           {
                case 'step1':
+                    $this->vars['db_driver'] = $_POST['db_driver'];
                     $this->vars['db_host'] = $_POST['db_host'];
                     $this->vars['db_name'] = $_POST['db_name'];
@@ -139 +141 @@
           }
 
+          # db drivers
+          $db_drivers = array(
+               'mysql' => 'mysql',
+               'mysqli' => 'mysqli'
+          );
+
           switch ($this->step)
           {
@@ -150 +158 @@
                     printf($this->imForm(1,__('General information'),__('Import my blog now')),
                     '<p>'.__('We first need some information about your old Dotclear 1.2 installation.').'</p>'.
+                    '<p><label for="db_driver">'.__('Database driver (must be mysqli if PHP 7 or higher):').'</label> '.
+                    form::combo('db_driver',$db_drivers,html::escapeHTML($this->vars['db_driver'])).'</p>'.
                     '<p><label for="db_host">'.__('Database Host Name:').'</label> '.
                     form::field('db_host',30,255,html::escapeHTML($this->vars['db_host'])).'</p>'.
@@ -235 +245 @@
      protected function db()
      {
-          $db = dbLayer::init('mysql',$this->vars['db_host'],$this->vars['db_name'],$this->vars['db_user'],$this->vars['db_pwd']);
+          $db = dbLayer::init($this->vars['db_driver'],$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']."%'");