Small cleanups in installer.

[fa-stable.git] / includes / db / connect_db_mysql.inc

diff --git a/includes/db/connect_db_mysql.inc b/includes/db/connect_db_mysql.inc
index 56e36a0ae9d95650b05c7c8f7cae3ff2328067c5..8abdaa34f268e4cce6b934213abf645f6c0426ad 100644 (file)
--- a/includes/db/connect_db_mysql.inc
+++ b/includes/db/connect_db_mysql.inc
@@ -10,7 +10,7 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 define('DB_DUPLICATE_ERROR', 1062);
-define('SQL_MODE', ''); // STRICT_ALL_TABLES,NO_ZERO_IN_DATE ?
+define('SQL_MODE', 'STRICT_ALL_TABLES'); // prevents SQL injection with silent field content truncation
 
 function set_global_connection($company=-1)
 {
@@ -25,9 +25,13 @@ function set_global_connection($company=-1)
        $_SESSION["wa_current_user"]->cur_con = $company;
 
        $connection = $db_connections[$company];
+       
+       $server = $connection["host"];
+       if (!empty($connection["port"]))
+               $server .= ":".$connection["port"];
 
-       $db = mysql_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]);
-               mysql_select_db($connection["dbname"], $db);
+       $db = mysql_connect($server, $connection["dbuser"], $connection["dbpassword"]);
+       mysql_select_db($connection["dbname"], $db);
        ///// From MySql release 5.6.6 the sql_mode is no longer empty as it was prior to
        ///// this release. Just for safety we make it empty for all 5.6 release and higher.
        ///// This non empty sql_mode values can interphere with FA, so all is set empty during
@@ -47,7 +51,7 @@ function db_query($sql, $err_msg=null)
 
        // set current db prefix
        $comp = isset($_SESSION["wa_current_user"]->cur_con) ? $_SESSION["wa_current_user"]->cur_con : 0;
-       $cur_prefix = $db_connections[$comp]['tbpref'];
+       $cur_prefix = @$db_connections[$comp]['tbpref'];
        $sql = str_replace(TB_PREF, $cur_prefix, $sql);
 
        if ($SysPrefs->show_sql)
@@ -197,8 +201,10 @@ function db_set_collation($db, $fa_collation)
 */
 function db_create_db($connection)
 {
-       $db = mysql_connect($connection["host"] ,
-               $connection["dbuser"], $connection["dbpassword"]);
+       $server = $connection["host"];
+       if (!empty($connection["port"]))
+               $server .= ":".$connection["port"];
+       $db = mysql_connect($server, $connection["dbuser"], $connection["dbpassword"]);
 
        if (!mysql_select_db($connection["dbname"], $db))
        {