Changeset 5220

Timestamp:

Mar 21, 2010, 6:20:56 PM (14 years ago)

Author:

patdenice

Message:

feature 1255: set mysql as default engine.

Location:

trunk

Files:

• admin/include/functions_install.inc.php (modified) (2 diffs)
• admin/themes/default/template/install.tpl (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)
• install.php (modified) (7 diffs)

trunk/admin/include/functions_install.inc.php

@@ -90 +90 @@
     {
       $engines[$engine_name]['label'] = $engine['engine'];
-      $engines[$engine_name]['available'] = 'disabled';
+      $engines[$engine_name]['available'] = false;
 
       if (isset($engine['function_available'])
@@ -105 +105 @@
   }
 
-  if (count($engines)>1)
-  {
-    $engines[$GLOBALS['conf']['dbengine_select_default']]['selected'] = true;
-  }
-  
   if ($engines['sqlite']['available'] && $engines['pdo-sqlite']['available'])
   {

trunk/admin/themes/default/template/install.tpl

@@ -113 +113 @@
           {foreach from=$F_DB_ENGINES key=k item=v}
           <option value="{$k}"
-                  {if $k==$F_DB_LAYER or $v.selected} selected="selected"{/if}
-                  {if $v.available!=1} disabled="disabled"{/if}
+                  {if $k==$F_DB_LAYER and $v.available} selected="selected"{/if}
+                  {if !$v.available} disabled="disabled"{/if}
                   >{$v.label}</option>
           {/foreach}

trunk/include/config_default.inc.php

@@ -537 +537 @@
 // choices : sqlite, mysql, pgsql, pdo-sqlite
 // see include/dblayer/dblayers.inc.php
-$conf['dbengine_select_default'] = 'sqlite'; 
+$conf['dbengine_select_default'] = 'mysql'; 
 
 // pass_convert : function to crypt or hash the clear user password to store

trunk/install.php

@@ -99 +99 @@
 define('DEFAULT_PREFIX_TABLE', 'piwigo_');
 
+if (isset($_POST['install']))
+{
+  $prefixeTable = $_POST['prefix'];
+}
+else
+{
+  $prefixeTable = DEFAULT_PREFIX_TABLE;
+}
+
+include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
+
 // Obtain various vars
 $dbhost = (!empty($_POST['dbhost'])) ? $_POST['dbhost'] : 'localhost';
@@ -104 +116 @@
 $dbpasswd = (!empty($_POST['dbpasswd'])) ? $_POST['dbpasswd'] : '';
 $dbname = (!empty($_POST['dbname'])) ? $_POST['dbname'] : '';
-$dblayer = (!empty($_POST['dblayer'])) ? $_POST['dblayer'] : 'mysql';
-
-if (isset($_POST['install']))
-{
-  $table_prefix = $_POST['prefix'];
-}
-else
-{
-  $table_prefix = DEFAULT_PREFIX_TABLE;
-}
+$dblayer = (!empty($_POST['dblayer'])) ? $_POST['dblayer'] : $conf['dbengine_select_default'];
 
 $admin_name = (!empty($_POST['admin_name'])) ? $_POST['admin_name'] : '';
@@ -157 +160 @@
 }
 
-$prefixeTable = $table_prefix;
-include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
-@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
 include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$dblayer.'.inc.php');
 include(PHPWG_ROOT_PATH . 'include/constants.php');
@@ -290 +290 @@
 $conf[\'db_host\'] = \''.$dbhost.'\';
 
-$prefixeTable = \''.$table_prefix.'\';
+$prefixeTable = \''.$prefixeTable.'\';
 
 define(\'PHPWG_INSTALLED\', true);
@@ -317 +317 @@
       PHPWG_ROOT_PATH.'install/piwigo_structure-'.$dblayer.'.sql',
       DEFAULT_PREFIX_TABLE,
-      $table_prefix
+      $prefixeTable
       );
     // We fill the tables with basic informations
@@ -323 +323 @@
       PHPWG_ROOT_PATH.'install/config.sql',
       DEFAULT_PREFIX_TABLE,
-      $table_prefix
+      $prefixeTable
       );
 
     $query = '
-INSERT INTO '.$table_prefix.'config (param,value,comment) 
+INSERT INTO '.$prefixeTable.'config (param,value,comment) 
    VALUES (\'secret_key\',\'md5('.pwg_db_cast_to_text(DB_RANDOM_FUNCTION.'()').')\',
    \'a secret key specific to the gallery for internal use\');';
@@ -437 +437 @@
       'F_DB_USER' => $dbuser,
       'F_DB_NAME' => $dbname,
-      'F_DB_PREFIX' => $table_prefix,
+      'F_DB_PREFIX' => $prefixeTable,
       'F_ADMIN' => $admin_name,
       'F_ADMIN_EMAIL' => $admin_mail,