Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

[mailer.git] / inc / install-functions.php

diff --git a/inc/install-functions.php b/inc/install-functions.php
index e4ab52901ffa3672712203a3eeb2c413465eaf89..a0ac6850a6ff8d6affeb9fab5e7530d341572915 100644 (file)
--- a/inc/install-functions.php
+++ b/inc/install-functions.php
@@ -474,7 +474,7 @@ function isInstallerBaseUrlValid ($value) {
                ($value == getUrl())
        || (
                // Starts with http:// or https:// ?
-               ((substr($value, 0, 7) == 'http://') || (substr($value, 0, 8) == 'https://'))
+               (isFullQualifiedUrl($value))
        &&
                // Has no trailing slash?
                (substr($value, -1, 1) != '/')
@@ -563,6 +563,15 @@ function isInstallerMysqlEngineValid ($value) {
        return $isValid;
 }
 
+// Call-back function to check validity of 'database_extension'
+function isInstallerDatabaseExtensionValid ($value) {
+       // This value must be 'mysql' or 'mysqli'
+       $isValid = in_array($value, array('mysql', 'mysqli'));
+
+       // Return it
+       return $isValid;
+}
+
 // Call-back function to check validity of 'mysql_dbase'
 function isInstallerMysqlDbaseValid ($value) {
        // This value must not be empty