Merge remote-tracking branch 'remotes/origin/master' into api-rewrite

# Conflicts:
#	build.php
#	install/install_functions.inc.php
#	install/mods-for-hesk/ajax/install-database-ajax.php
#	install/mods-for-hesk/installModsForHesk.php
#	install/mods-for-hesk/js/version-scripts.js
#	install/mods-for-hesk/modsForHesk.php
#	install/mods-for-hesk/sql/installSql.php
#	knowledgebase.php

api/Core/database.inc.php

@@ -33,7 +33,25 @@
 *******************************************************************************/
 
 /* Check if this is a valid include */
-if (!defined('IN_SCRIPT')) {die('Invalid attempt');} 
+if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
+
+
+function hesk_dbCollate()
+{
+    global $hesklang;
+
+    // MySQL vesions prior to 5.6 don't support some collations
+    if ( in_array($hesklang['_COLLATE'], array('utf8_croatian_ci', 'utf8_german2_ci', 'utf8_vietnamese_ci')) )
+    {
+        if ( version_compare( hesk_dbResult( hesk_dbQuery('SELECT VERSION() AS version') ), '5.6', '<') )
+        {
+            $hesklang['_COLLATE'] = 'utf8_general_ci';
+        }
+    }
+
+    return hesk_dbEscape($hesklang['_COLLATE']);
+
+} // END hesk_dbCollate()
 
 
 function hesk_dbSetNames()
@@ -77,6 +95,16 @@ function hesk_dbTime()
 } // END hesk_dbTime()
 
 
+function hesk_dbSetTimezone()
+{
+    global $hesk_settings;
+
+    hesk_dbQuery('SET time_zone = "'.hesk_timeToHHMM(date('Z')).'"');
+
+    return true;
+} // END hesk_dbSetTimezone()
+
+
 function hesk_dbEscape($in)
 {
 	global $hesk_db_link;
@@ -126,6 +154,9 @@ function hesk_dbConnect()
     // Check MySQL/PHP version and set encoding to utf8
     hesk_dbSetNames();
 
+    // Set the correct timezone
+    hesk_dbSetTimezone();
+
     return $hesk_db_link;
 
 } // END hesk_dbConnect()

api/Core/database_mysqli.inc.php

@@ -36,6 +36,24 @@
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 
+function hesk_dbCollate()
+{
+    global $hesklang;
+
+    // MySQL vesions prior to 5.6 don't support some collations
+    if ( in_array($hesklang['_COLLATE'], array('utf8_croatian_ci', 'utf8_german2_ci', 'utf8_vietnamese_ci')) )
+    {
+        if ( version_compare( hesk_dbResult( hesk_dbQuery('SELECT VERSION() AS version') ), '5.6', '<') )
+        {
+            $hesklang['_COLLATE'] = 'utf8_general_ci';
+        }
+    }
+
+    return hesk_dbEscape($hesklang['_COLLATE']);
+
+} // END hesk_dbCollate()
+
+
 function hesk_dbSetNames()
 {
 	global $hesk_settings, $hesk_db_link;
@@ -77,6 +95,16 @@ function hesk_dbTime()
 } // END hesk_dbTime()
 
 
+function hesk_dbSetTimezone()
+{
+    global $hesk_settings;
+
+    hesk_dbQuery('SET time_zone = "'.hesk_timeToHHMM(date('Z')).'"');
+
+    return true;
+} // END hesk_dbSetTimezone()
+
+
 function hesk_dbEscape($in)
 {
 	global $hesk_db_link;
@@ -128,6 +156,9 @@ function hesk_dbConnect()
     // Check MySQL/PHP version and set encoding to utf8
     hesk_dbSetNames();
 
+    // Set the correct timezone
+    hesk_dbSetTimezone();
+
     return $hesk_db_link;
 
 } // END hesk_dbConnect()

build.php

@@ -1,4 +1,4 @@
 <?php
 
 // Define the current build
-define('MODS_FOR_HESK_BUILD', 40);
+define('MODS_FOR_HESK_BUILD', 41);

cron/core/database.inc.php

@@ -33,7 +33,25 @@
 *******************************************************************************/
 
 /* Check if this is a valid include */
-if (!defined('IN_SCRIPT')) {die('Invalid attempt');} 
+if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
+
+
+function hesk_dbCollate()
+{
+    global $hesklang;
+
+    // MySQL vesions prior to 5.6 don't support some collations
+    if ( in_array($hesklang['_COLLATE'], array('utf8_croatian_ci', 'utf8_german2_ci', 'utf8_vietnamese_ci')) )
+    {
+        if ( version_compare( hesk_dbResult( hesk_dbQuery('SELECT VERSION() AS version') ), '5.6', '<') )
+        {
+            $hesklang['_COLLATE'] = 'utf8_general_ci';
+        }
+    }
+
+    return hesk_dbEscape($hesklang['_COLLATE']);
+
+} // END hesk_dbCollate()
 
 
 function hesk_dbSetNames()
@@ -77,6 +95,17 @@ function hesk_dbTime()
 } // END hesk_dbTime()
 
 
+function hesk_dbSetTimezone()
+{
+    global $hesk_settings;
+
+    hesk_dbQuery('SET time_zone = "'.hesk_timeToHHMM(date('Z')).'"');
+
+    return true;
+} // END hesk_dbSetTimezone()
+
+
+
 function hesk_dbEscape($in)
 {
 	global $hesk_db_link;
@@ -142,6 +171,9 @@ function hesk_dbConnect()
     // Check MySQL/PHP version and set encoding to utf8
     hesk_dbSetNames();
 
+    // Set the correct timezone
+    hesk_dbSetTimezone();
+
     return $hesk_db_link;
 
 } // END hesk_dbConnect()

cron/core/database_mysqli.inc.php

@@ -36,6 +36,24 @@
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 
+function hesk_dbCollate()
+{
+    global $hesklang;
+
+    // MySQL vesions prior to 5.6 don't support some collations
+    if ( in_array($hesklang['_COLLATE'], array('utf8_croatian_ci', 'utf8_german2_ci', 'utf8_vietnamese_ci')) )
+    {
+        if ( version_compare( hesk_dbResult( hesk_dbQuery('SELECT VERSION() AS version') ), '5.6', '<') )
+        {
+            $hesklang['_COLLATE'] = 'utf8_general_ci';
+        }
+    }
+
+    return hesk_dbEscape($hesklang['_COLLATE']);
+
+} // END hesk_dbCollate()
+
+
 function hesk_dbSetNames()
 {
 	global $hesk_settings, $hesk_db_link;
@@ -77,6 +95,16 @@ function hesk_dbTime()
 } // END hesk_dbTime()
 
 
+function hesk_dbSetTimezone()
+{
+    global $hesk_settings;
+
+    hesk_dbQuery('SET time_zone = "'.hesk_timeToHHMM(date('Z')).'"');
+
+    return true;
+} // END hesk_dbSetTimezone()
+
+
 function hesk_dbEscape($in)
 {
 	global $hesk_db_link;
@@ -137,6 +165,9 @@ function hesk_dbConnect()
     // Check MySQL/PHP version and set encoding to utf8
     hesk_dbSetNames();
 
+    // Set the correct timezone
+    hesk_dbSetTimezone();
+
     return $hesk_db_link;
 
 } // END hesk_dbConnect()

install/install_functions.inc.php

@@ -37,7 +37,7 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 // We will be installing this HESK version:
 define('HESK_NEW_VERSION','2.7.3');
-define('MODS_FOR_HESK_NEW_VERSION','3.0.6');
+define('MODS_FOR_HESK_NEW_VERSION','3.0.7');
 define('REQUIRE_PHP_VERSION','5.3.0');
 define('REQUIRE_MYSQL_VERSION','5.0.7');
 

install/mods-for-hesk/ajax/install-database-ajax.php

@@ -86,6 +86,8 @@ if ($version == 2) {
     execute305Scripts();
 } elseif ($version == 40) {
     execute306Scripts();
+} elseif ($version == 41) {
+    execute307Scripts();
 } else {
     $response = 'The version "' . $version . '" was not recognized. Check the value submitted and try again.';
     print $response;

install/mods-for-hesk/installModsForHesk.php

@@ -49,6 +49,7 @@ $buildToVersionMap = array(
     38 => '3.0.4',
     39 => '3.0.5',
     40 => '3.0.6',
+    41 => '3.0.7',
 );
 
 function echoInitialVersionRows($version, $build_to_version_map)

install/mods-for-hesk/js/version-scripts.js

@@ -116,6 +116,9 @@ function processUpdates(startingVersion) {
     } else if (startingVersion < 40) {
         startVersionUpgrade('306');
         executeUpdate(40, '306', '3.0.6');
+    } else if (startingVersion < 41) {
+        startVersionUpgrade('307');
+        executeUpdate(41, '307', '3.0.7');
     } else {
         installationFinished();
     }

install/mods-for-hesk/modsForHesk.php

@@ -118,6 +118,7 @@ hesk_dbConnect();
                                         <select name="current-version" class="form-control">
                                             <option disabled>Select One, or "No Previous Installation" Below</option>
                                             <optgroup label="Mods for HESK 3">
+                                                <option value="40">3.0.6</option>
                                                 <option value="39">3.0.5</option>
                                                 <option value="38">3.0.4</option>
                                                 <option value="37">3.0.3</option>

install/mods-for-hesk/sql/installSql.php

@@ -980,6 +980,14 @@ function execute306Scripts() {
 
     updateVersion('3.0.6');
 }
+
+function execute307Scripts() {
+    global $hesk_settings;
+    hesk_dbConnect();
+
+    updateVersion('3.0.7');
+}
+
 function execute310Scripts() {
     global $hesk_settings;
     hesk_dbConnect();

internal-api/core/database.inc.php

@@ -33,7 +33,25 @@
 *******************************************************************************/
 
 /* Check if this is a valid include */
-if (!defined('IN_SCRIPT')) {die('Invalid attempt');} 
+if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
+
+
+function hesk_dbCollate()
+{
+    global $hesklang;
+
+    // MySQL vesions prior to 5.6 don't support some collations
+    if ( in_array($hesklang['_COLLATE'], array('utf8_croatian_ci', 'utf8_german2_ci', 'utf8_vietnamese_ci')) )
+    {
+        if ( version_compare( hesk_dbResult( hesk_dbQuery('SELECT VERSION() AS version') ), '5.6', '<') )
+        {
+            $hesklang['_COLLATE'] = 'utf8_general_ci';
+        }
+    }
+
+    return hesk_dbEscape($hesklang['_COLLATE']);
+
+} // END hesk_dbCollate()
 
 
 function hesk_dbSetNames()
@@ -77,6 +95,16 @@ function hesk_dbTime()
 } // END hesk_dbTime()
 
 
+function hesk_dbSetTimezone()
+{
+    global $hesk_settings;
+
+    hesk_dbQuery('SET time_zone = "'.hesk_timeToHHMM(date('Z')).'"');
+
+    return true;
+} // END hesk_dbSetTimezone()
+
+
 function hesk_dbEscape($in)
 {
 	global $hesk_db_link;
@@ -143,6 +171,9 @@ function hesk_dbConnect()
     // Check MySQL/PHP version and set encoding to utf8
     hesk_dbSetNames();
 
+    // Set the correct timezone
+    hesk_dbSetTimezone();
+
     return $hesk_db_link;
 
 } // END hesk_dbConnect()

internal-api/core/database_mysqli.inc.php

@@ -36,6 +36,24 @@
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 
+function hesk_dbCollate()
+{
+    global $hesklang;
+
+    // MySQL vesions prior to 5.6 don't support some collations
+    if ( in_array($hesklang['_COLLATE'], array('utf8_croatian_ci', 'utf8_german2_ci', 'utf8_vietnamese_ci')) )
+    {
+        if ( version_compare( hesk_dbResult( hesk_dbQuery('SELECT VERSION() AS version') ), '5.6', '<') )
+        {
+            $hesklang['_COLLATE'] = 'utf8_general_ci';
+        }
+    }
+
+    return hesk_dbEscape($hesklang['_COLLATE']);
+
+} // END hesk_dbCollate()
+
+
 function hesk_dbSetNames()
 {
 	global $hesk_settings, $hesk_db_link;
@@ -77,6 +95,16 @@ function hesk_dbTime()
 } // END hesk_dbTime()
 
 
+function hesk_dbSetTimezone()
+{
+    global $hesk_settings;
+
+    hesk_dbQuery('SET time_zone = "'.hesk_timeToHHMM(date('Z')).'"');
+
+    return true;
+} // END hesk_dbSetTimezone()
+
+
 function hesk_dbEscape($in)
 {
 	global $hesk_db_link;
@@ -136,6 +164,9 @@ function hesk_dbConnect()
     // Check MySQL/PHP version and set encoding to utf8
     hesk_dbSetNames();
 
+    // Set the correct timezone
+    hesk_dbSetTimezone();
+
     return $hesk_db_link;
 
 } // END hesk_dbConnect()

knowledgebase.php

@@ -17,10 +17,10 @@ define('HESK_PATH', './');
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
-require(HESK_PATH . 'inc/knowledgebase_functions.inc.php');
 
 
 // Connect to database
+hesk_load_database_functions();
 hesk_dbConnect();
 
 // Are we in maintenance mode?