diff --git a/include/mysqli.php b/include/mysqli.php index 2079318e1f30901f72288bad449b721ed734b26c..737fd3a065795c007911a0abb663e103c8b80567 100644 --- a/include/mysqli.php +++ b/include/mysqli.php @@ -42,9 +42,12 @@ function db_connect($host, $user, $passwd, $options = array()) { $start = microtime(true); $port = 3306; if (strpos($host, ':') !== false) { - $_host = explode(':', $host); - $host = $_host[0]; - $port = (int) $_host[1]; + list($host, $port) = explode(':', $host); + // PHP may not honor the port number if connecting to 'localhost' + if (!strcasecmp($host, 'localhost')) + // XXX: Looks like PHP gethostbyname() is IPv4 only + $host = gethostbyname($host); + $port = (int) $port; } if (!@$__db->real_connect($host, $user, $passwd, null, $port)) # nolint return NULL; diff --git a/setup/inc/class.installer.php b/setup/inc/class.installer.php index ad2ee14a3c0459dd3b1fee34e52a42d03c85cebe..aeec06d2e0f8d728779ba08d9b2fd8ebedd5249d 100644 --- a/setup/inc/class.installer.php +++ b/setup/inc/class.installer.php @@ -79,6 +79,13 @@ class Installer extends SetupWizard { if(!$this->errors['username'] && in_array(strtolower($vars['username']),array('admin','admins','username','osticket'))) $this->errors['username']='Bad username'; + // Support port number specified in the hostname with a colon (:) + list($host, $port) = explode(':', $vars['dbhost']); + if ($port && (!is_numeric($port) || !((int)$port))) + $this->errors['db'] = 'Database port number must be a number'; + elseif ($port && ($port < 1 || $port > 65535)) + $this->errors['db'] = 'Invalid database port number'; + //MYSQL: Connect to the DB and check the version & database (create database if it doesn't exist!) if(!$this->errors) { if(!db_connect($vars['dbhost'],$vars['dbuser'],$vars['dbpass'])) diff --git a/setup/inc/footer.inc.php b/setup/inc/footer.inc.php index 90dc3ddc75ffb5e5928a943f2ff6968d67b6499c..852062efeba285b4cc856fde61a2ffb8481c1abb 100644 --- a/setup/inc/footer.inc.php +++ b/setup/inc/footer.inc.php @@ -2,6 +2,6 @@ <div class="clear"></div> </div> <!-- content --> </div> <!-- wizard --> - <div id="footer" class="centered">Copyright © 2012 <a target="_blank" href="http://osticket.com">osTicket.com</a></div> + <div id="footer" class="centered">Copyright © 2013 <a target="_blank" href="http://osticket.com">osTicket.com</a></div> </body> </html> diff --git a/setup/inc/header.inc.php b/setup/inc/header.inc.php index 28aa849a1455ee160fac96f4b909e2c3fdf9704d..a1ee36a1dd0833f6bab52b2be732610bdf67afe3 100644 --- a/setup/inc/header.inc.php +++ b/setup/inc/header.inc.php @@ -5,7 +5,7 @@ <title><?php echo $wizard['title']; ?></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="stylesheet" href="css/wizard.css"> - <script type="text/javascript" src="../js/jquery-1.7.2.min.js"></script> + <script type="text/javascript" src="../js/jquery-1.8.3.min.js"></script> <script type="text/javascript" src="js/tips.js"></script> <script type="text/javascript" src="js/setup.js"></script> </head> diff --git a/setup/tips.html b/setup/tips.html index 1cd8de936c37b24139da914f08889d49ad8b01ae..f1089688592465c36e96aad2d27e5c21fcf82da6 100644 --- a/setup/tips.html +++ b/setup/tips.html @@ -36,7 +36,14 @@ </div> <div id="t10"> <b>MySQL Hostname</b> -<p>Most hosts use 'localhost' for local database hostname. Check with your host if localhost fails. Default port set in php.ini is assumed.</p> +<p> +Most hosts use 'localhost' for local database hostname. Check with your +host if localhost fails. +</p> +<p> +Default port set in php.ini is assumed. A non-standard port number can be +specified as <code>hostname:port</code> +</p> </div> <div id="t11"> <b>MySQL Database</b>