Changeset 10036

Timestamp:

11/28/08 18:31:30 (1 month ago)

Author:

afz

Message:

select default database driver in upgrade wizard

Files:

• trunk/jaws/html/upgrade/stages/Database.php (modified) (5 diffs)

trunk/jaws/html/upgrade/stages/Database.php

@@ -19 +19 @@
-    var $_Defaults = array(
-        'host'     => 'localhost',
+        'driver'   => '',
-        'user'     => '',
-        'isdba'    => '',
@@ -42 +43 @@
-    {
-        $this->_Defaults['host']     = $db_config['host'];
+        $this->_Defaults['driver']   = $db_config['driver'];
-        $this->_Defaults['user']     = $db_config['user'];
-$db_config['isdba']
-? $db_config['path']
+isset($db_config['isdba'])? $db_config['isdba'] : 'false';
+ ? $db_config['path'] 
-        $this->_Defaults['database'] = $db_config['name'];
-        $this->_Defaults['prefix']   = $db_config['prefix'];
@@ -111 +113 @@
-            $tpl->setVariable('is_db_admin',  _t('UPGRADE_DB_IS_ADMIN'));
-            $tpl->SetVariable('user', $values['user']);
- !empty($values['isdba'])? 'checked="checked"' : '
+(empty($values['isdba']) || $values['isdba'] == 'false')? '' : 'checked="checked"
-            $tpl->ParseBlock('Database/user');
-        }
@@ -197 +199 @@
-                $tpl->setVariable('d_name', $driver);
-                $tpl->setVariable('d_realname', $driver_info['title']);
-post['driver']) && $post
+values['driver']) && $values
-                    $selected = ' selected="selected"';
-                } else {
@@ -261 +263 @@
-    {
-        $keys = array_keys($this->_Defaults);
-        $keys[] = 'driver';
-        $keys[] = 'dbpass';
-        $request =& Jaws_Request::getInstance();