This commit is contained in:
yuri
2015-11-04 10:56:15 +02:00
parent 03ecfdb805
commit de68abfbb4
919 changed files with 9833 additions and 415 deletions
+47 -5
View File
@@ -18,6 +18,13 @@
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
*
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU General Public License version 3.
*
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
@@ -147,7 +154,14 @@ class SystemHelper extends \Espo\Core\Utils\System
$result['success'] = false;
}
/** Check MySQL settings */
/** Check MySQL settings *
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU General Public License version 3.
*
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
if ($result['success']) {
$currentMysqlVersion = $this->getMysqlSetting('version', $dbh);
if (isset($currentMysqlVersion) && version_compare($currentMysqlVersion, $this->requirements['mysqlVersion']) == -1) {
@@ -155,7 +169,14 @@ class SystemHelper extends \Espo\Core\Utils\System
$result['success'] = false;
}
/** Check required MySQL settings */
/** Check required MySQL settings *
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU General Public License version 3.
*
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
foreach ($this->requirements['mysqlRequires'] as $name => $requiredValue) {
$currentValue = $this->getMysqlSetting($name, $dbh);
$acceptable = ( isset($currentValue) && $this->convertToBytes($currentValue) >= $this->convertToBytes($requiredValue) ) ? true : false;
@@ -170,7 +191,14 @@ class SystemHelper extends \Espo\Core\Utils\System
}
}
/** try to create a database */
/** try to create a database *
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU General Public License version 3.
*
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
if ($isCreateDatabase && !$result['success'] && $result['errors']['dbConnect']['errorCode'] == '1049')
{
$dsn = "mysql:host={$hostName};" . ((!empty($port)) ? "port={$port}" : '');
@@ -187,7 +215,14 @@ class SystemHelper extends \Espo\Core\Utils\System
return $this->checkDbConnection($hostName, $port, $dbUserName, $dbUserPass, $dbName, false);
}
}
/** END: try to create a database */
/** END: try to create a database *
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU General Public License version 3.
*
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
return $result;
}
@@ -319,7 +354,14 @@ class SystemHelper extends \Espo\Core\Utils\System
* @param boolean $isSudo
* @param bool $isFile
* @return string
*/
*
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU General Public License version 3.
*
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
public function getPermissionCommands($path, $permissions = array('644', '755'), $isSudo = false, $isFile = null, $changeOwner = true)
{
if (is_string($path)) {