Ticket #133: 133.diff

system/classes/installhandler.php

@@ -203 +203 @@
         if (! $pdo_extension_ok) {
             $requirements_met= false;
         }
+        /* Check for PDO drivers */
+        $pdo_drivers= array_combine( PDO::getAvailableDrivers(), PDO::getAvailableDrivers() );
+        if ( isset( $pdo_drivers['sqlite2'] ) ) {
+            // we don't currently support SQLite2, so exclude it
+            unset( $pdo_drivers['sqlite2'] );
+        }
+        $pdo_drivers_ok= count( $pdo_drivers );
+        $this->theme->assign( 'pdo_drivers_ok', $pdo_drivers_ok );
+        $this->theme->assign( 'pdo_drivers', $pdo_drivers );
+        if ( ! $pdo_drivers_ok ) {
+            $requirements_met= false;
+        }
         return $requirements_met;
     }
 

system/installer/script.js

@@ -15 +15 @@
 
 function setDatabaseType()
 {
-    switch($('#databasetype').val()) {
+    switch($('#db_type').val()) {
         case 'mysql':
             $('.forsqlite').hide();
             $('.formysql').show();
@@ -30 +30 @@
 
 function checkDBCredentials()
 {
-    if ( ( $('#databasetype').val() == 'mysql' ) && ( $('#databasehost').val() != '' ) && ( $('#databaseuser').val() != '' ) && ( $('#databasename').val() != '' ) ) {
+    if ( ( $('#db_type').val() == 'mysql' ) && ( $('#databasehost').val() != '' ) && ( $('#databaseuser').val() != '' ) && ( $('#databasename').val() != '' ) ) {
         $.ajax({
             type: 'POST',
             url: 'ajax/check_mysql_credentials',
@@ -69 +69 @@
             error: handleAjaxError,
         });
     }
-    else if ( ( $('#databasetype').val() == 'sqlite' ) && ( $('#databasefile').val() != '' ) ) {
+    else if ( ( $('#db_type').val() == 'sqlite' ) && ( $('#databasefile').val() != '' ) ) {
         $.ajax({
             type: 'POST',
             url: 'ajax/check_sqlite_credentials',
@@ -196 +196 @@
     setDatabaseType();
     checkDBCredentials();
     checkSiteConfigurationCredentials();
-    $('#databasetype').change(setDatabaseType);
+    $('#db_type').change(setDatabaseType);
     $('#databasesetup input').keyup(function(){queueTimer(checkDBCredentials)});
     $('#siteconfiguration input').keyup(function(){queueTimer(checkSiteConfigurationCredentials)});
     $('#databaseuser').focus()

system/installer/requirements.php

@@ -73 +73 @@
         <?php if (! $pdo_extension_ok) {?>
           <h2>PDO extension needed...</h2>
           <p class="instructions">
-            <em>habari</em> requires that the PDO PHP extension  be installed.
+            <em>habari</em> requires that the <a href="http://www.php.net/pdo">PDO PHP extension</a> be installed.  Please contact your hosting provider to enable PDO.
           </p>
-          <strong>@todo Installing PDO instructions</strong>
         <?php }?>
+    <?php if ( ! $pdo_drivers_ok ) { ?>
+      <h2>No PDO drivers enabled</h2>
+        <p class="instructions"><em>habari</em> requires that at least one <a href="http://www.php.net/pdo">PDO driver</a> be installed.  Please ask your hosting provider to enable one of the PDO drivers supported by Habari.</p>
+    <? } ?>
      </div>
     </div>
   </body>

system/installer/db_setup.php

@@ -29 +29 @@
             <div class="options">
             
                 <div class="inputfield">
-                    <label for="databasetype">Database Type <strong>*</strong></label>
-                    <select id="databasetype" name="db_type" onchange="setDatabaseType(this)">
-                        <option value="mysql" <?php echo $db_type=='mysql' ? 'selected' : ''; ?>>MySQL</option>
-                        <option value="sqlite" <?php echo $db_type=='sqlite' ? 'selected' : ''; ?>>SQLite</option>
-                    </select>
+                    <label for="db_type">Database Type <strong>*</strong></label>
+                    <?php echo Utils::html_select( 'db_type', $pdo_drivers, $db_type ); ?>
                     <div class="help">
                         <strong>Database Type</strong> specifies the type of database to which 
                         Habari will connect.  Changing this setting may affect the other fields