Merge branch 'master' of https://github.com/unaio/una

inc/utils.inc.php

@@ -322,6 +322,9 @@ function sendMailTemplateSystem($sTemplateName, $aReplaceVars = array(), $iEmail
  */
 function sendMail($sRecipientEmail, $sMailSubject, $sMailBody, $iRecipientID = 0, $aPlus = array(), $iEmailType = BX_EMAIL_NOTIFY, $sEmailFlag = 'html', $isDisableAlert = false, $aCustomHeaders = array(), $bAddToQueue = false)
 {
+    if ($bAddToQueue)
+        $isDisableAlert = true;
+
     // make sure that recipient's email is valid and message isn't empty
     if (!$sMailBody || !$sRecipientEmail || preg_match('/\(2\)$/', $sRecipientEmail))
         return false;

inc/version.inc.php

@@ -7,6 +7,6 @@
  * @{
  */
 
-define('BX_DOL_VERSION', '9.0.0-RC5'); ///< system files version, for DB version @see bx_get_ver, DB and files version must match
+define('BX_DOL_VERSION', '9.0.0-DEV11'); ///< system files version, for DB version @see bx_get_ver, DB and files version must match
 
 /** @} */

install/index.php

@@ -10,7 +10,7 @@
 define ('BX_DOL_INSTALL',  true);
 define ('BX_SKIP_INSTALL_CHECK', true);
 
-define ('BX_DOL_VER', '9.0.0-RC5');
+define ('BX_DOL_VER', '9.0.0-DEV11');
 
 define ('BX_INSTALL_DEFAULT_LANGUAGE', 'en');
 

upgrade/classes/BxDolUpgradeDb.php

@@ -61,7 +61,7 @@ class BxDolUpgradeDb
 
         $this->_sStorageEngine = 'MYISAM';
 
-        $this->_sCharset = 'utf8';
+        $this->_sCharset = 'utf8mb4';
 
         $this->_sHost = BX_DATABASE_HOST;
         $this->_sPort = BX_DATABASE_PORT;
@@ -116,7 +116,7 @@ class BxDolUpgradeDb
 				PDO::ATTR_PERSISTENT => $this->_bPdoPersistent
 	        ));
 
-	    	$this->pdoExec("SET NAMES 'utf8'");
+	    	$this->pdoExec("SET NAMES 'utf8mb4' COLLATE 'utf8mb4_unicode_ci'");
 	        $this->pdoExec("SET sql_mode = ''");
 			$this->pdoExec("SET storage_engine=" . $this->_sStorageEngine);
 

upgrade/files/9.0.0.RC5-9.0.0.RC6/check.php

@@ -0,0 +1,9 @@
+<?php
+
+$mixCheckResult = 'Update can not be applied';
+
+$sVer = $this->oDb->getOne("SELECT `version` FROM `sys_modules` WHERE `name` = 'system'");
+if ('9.0.0.RC5' == $sVer || '9.0.0-RC5' == $sVer)
+    $mixCheckResult = true;
+
+return $mixCheckResult;

upgrade/files/9.0.0.RC5-9.0.0.RC6/files/inc/version.inc.php

@@ -0,0 +1,12 @@
+<?php defined('BX_DOL') or defined('BX_DOL_INSTALL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaCore UNA Core
+ * @{
+ */
+
+define('BX_DOL_VERSION', '9.0.0-RC6'); ///< system files version, for DB version @see bx_get_ver, DB and files version must match
+
+/** @} */

upgrade/files/9.0.0.RC5-9.0.0.RC6/script.php

@@ -0,0 +1,3 @@
+<?php
+
+    return true;

upgrade/files/9.0.0.RC5-9.0.0.RC6/sql.sql

@@ -0,0 +1,9 @@
+
+
+UPDATE `sys_form_inputs` SET `db_pass` = 'XssHtml', `html` = 3 WHERE `object` = 'sys_comment' AND `module` = 'system' AND `name` = 'cmt_text';
+
+
+-- Last step is to update current version
+
+UPDATE `sys_modules` SET `version` = '9.0.0-RC6' WHERE (`version` = '9.0.0.RC5' OR `version` = '9.0.0-RC5') AND `name` = 'system';
+