Compare commits

...

44 Commits

Author SHA1 Message Date
Yuri Kuznetsov 6e9f368a0a version 2021-04-12 10:42:26 +03:00
Yuri Kuznetsov 84a3688525 scheduler honor eventAssignedUserIsAttendeeDisabled 2021-04-12 10:40:06 +03:00
Yuri Kuznetsov 3c08986889 cs fix 2021-04-12 10:37:07 +03:00
Yuri Kuznetsov 477828beb9 fix get entity followers 2021-04-12 10:31:47 +03:00
Eymen Elkum fadc6c46ba fix (#1969) 2021-04-12 10:31:29 +03:00
Yuri Kuznetsov c1b7e06308 remove noJoin 2021-04-01 13:27:42 +03:00
Taras Machyshyn e86ec32dd7 Hide permission warnings 2021-03-31 15:12:46 +03:00
Taras Machyshyn c8bd2ec1a1 Time format fixes 2021-03-31 14:39:47 +03:00
Taras Machyshyn 3cf94bb728 Notification fixes 2021-03-31 12:17:18 +03:00
Yuri Kuznetsov 0f8621d923 spatie async update 2021-03-25 16:11:30 +02:00
Yuri Kuznetsov 2d9e9a5e93 async downgrade 2021-03-25 15:38:50 +02:00
Yuri Kuznetsov abeb5fc0e3 v 2021-03-25 15:14:57 +02:00
Taras Machyshyn 47e61cecdd Upgrade scripts 2021-03-25 15:14:22 +02:00
Taras Machyshyn 17aaf08717 Installation: code changes 2021-03-25 13:23:23 +02:00
Taras Machyshyn 89e849d851 Installation: bug fixes 2021-03-25 13:06:19 +02:00
Yuri Kuznetsov 42098f477a fix oauth client 2021-03-25 12:14:22 +02:00
Taras Machyshyn e44ee9ca03 Installation: corrected languages 2021-03-25 11:10:18 +02:00
Yuri Kuznetsov c4861c5efa fix exceptions 2021-03-22 09:16:45 +02:00
Taras Machyshyn 4380175c8b Upgrade scripts 2021-03-18 17:39:32 +02:00
Yuri Kuznetsov 8ff46bba74 diff: removing git folder in vendor 2021-03-18 15:47:40 +02:00
Yuri Kuznetsov 06f1305f23 removing git folder in vendor on build 2021-03-18 15:29:21 +02:00
Eymen Elkum 43723697f7 fix (#1944) 2021-03-15 14:20:42 +02:00
Yuri Kuznetsov 99d6a0ab32 local storage cache exceeded no error 2021-03-15 13:52:01 +02:00
Yuri Kuznetsov c2809ca091 no lib cache 2021-03-15 13:44:31 +02:00
Yuri Kuznetsov 108432c268 cs fix 2021-03-15 13:43:49 +02:00
Yuri Kuznetsov 970242e860 cs fixes 2021-03-10 16:05:38 +02:00
Yuri Kuznetsov dff2e344a4 fix formula modulo 2021-03-06 16:25:13 +02:00
Eymen Elkum 24617f4a41 variable name typo (#1937) 2021-03-04 09:25:31 +02:00
Taras Machyshyn 2ae0f36241 LDAP bug fixes 2021-03-03 10:57:01 +02:00
Yuri Kuznetsov eec372c6df fix css 2021-03-02 11:39:26 +02:00
Yuri Kuznetsov 011e83fac6 update selectize 2021-03-02 11:37:07 +02:00
Yuri Kuznetsov dd8e55c2ac restpore tcpdf 2021-03-01 14:34:38 +02:00
Yuri Kuznetsov 00fcd5a9b6 fix tcpdf page number 2021-02-26 12:32:48 +02:00
Yuri Kuznetsov 3dda43c70a update tcpdf 2021-02-26 10:38:46 +02:00
Yuri Kuznetsov 34029c6f6f update composer deps 2021-02-26 09:26:40 +02:00
Yuri Kuznetsov cc307e3217 cleanup 2021-02-25 16:40:42 +02:00
Yuri Kuznetsov e3c45a5039 hide reset to default field for custom entities 2021-02-25 16:39:33 +02:00
Yuri Kuznetsov 7cbc24feb8 v 2021-02-22 10:52:07 +02:00
Yuri Kuznetsov 2ff248a4c4 use forked lighrncandy 2021-02-18 15:35:01 +02:00
Yuri Kuznetsov 0010976803 attachment download calculating actual filesize 2021-02-18 08:54:03 +02:00
Eymen Elkum bd422323ee fix typo (#1924) 2021-02-18 08:44:40 +02:00
Eymen Elkum 6a66d99017 add missing import (#1923) 2021-02-18 08:34:24 +02:00
Yuri Kuznetsov 1f7d92b209 return type fix 2021-02-17 16:36:15 +02:00
Yuri Kuznetsov 71c72136f6 attachment proper size calculation 2021-02-17 09:09:52 +02:00
77 changed files with 1020 additions and 569 deletions
+1
View File
@@ -149,6 +149,7 @@ module.exports = function (grunt) {
'build/tmp/custom/Espo/Custom/*',
'!build/tmp/custom/Espo/Custom/.htaccess',
'build/tmp/install/config.php',
'build/tmp/vendor/*/*/.git',
]
}
},
+1 -1
View File
@@ -69,7 +69,7 @@ class Attachment extends \Espo\Core\Controllers\Record
$response->setHeader('Content-Type', $fileData->type);
$response->setHeader('Content-Disposition', 'Content-Disposition: attachment; filename="'.$fileData->name.'"');
if ($fileData->size) {
$response->setHeader('Content-Length', $fileData->size);
$response->setHeader('Content-Length', strlen($fileData->contents));
}
return $fileData->contents;
@@ -305,11 +305,11 @@ class LDAP extends Espo
$data[$fieldName] = $fieldValue;
}
$this->useSystemUser();
$user = $this->entityManager->getEntity('User');
$user->set($data);
$this->applicationUser->setUser($user);
$this->entityManager->saveEntity($user);
return $this->entityManager->getEntity('User', $user->id);
@@ -29,6 +29,8 @@
namespace Espo\Core\ExternalAccount\OAuth2;
use Exception;
class Client
{
const AUTH_TYPE_URI = 0;
@@ -79,7 +81,7 @@ class Client
public function __construct(array $params = [])
{
if (!extension_loaded('curl')) {
throw new \Exception('CURL extension not found.');
throw new Exception('CURL extension not found.');
}
}
@@ -139,16 +141,21 @@ class Client
switch ($this->tokenType) {
case self::TOKEN_TYPE_URI:
$params[$this->accessTokenParamName] = $this->accessToken;
break;
case self::TOKEN_TYPE_BEARER:
$httpHeaders['Authorization'] = 'Bearer ' . $this->accessToken;
break;
case self::TOKEN_TYPE_OAUTH:
$httpHeaders['Authorization'] = 'OAuth ' . $this->accessToken;
break;
default:
throw new \Exception('Unknown access token type.');
break;
default:
throw new Exception('Unknown access token type.');
}
}
@@ -157,15 +164,16 @@ class Client
private function execute($url, $params, $httpMethod, array $httpHeaders = [])
{
$curlOptions = array(
$curlOptions = [
CURLOPT_RETURNTRANSFER => true,
CURLOPT_SSL_VERIFYPEER => true,
CURLOPT_CUSTOMREQUEST => $httpMethod
);
CURLOPT_CUSTOMREQUEST => $httpMethod,
];
switch ($httpMethod) {
case self::HTTP_METHOD_POST:
$curlOptions[CURLOPT_POST] = true;
case self::HTTP_METHOD_PUT:
case self::HTTP_METHOD_PATCH:
if (is_array($params)) {
@@ -173,36 +181,49 @@ class Client
} else {
$postFields = $params;
}
$curlOptions[CURLOPT_POSTFIELDS] = $postFields;
break;
case self::HTTP_METHOD_HEAD:
$curlOptions[CURLOPT_NOBODY] = true;
case self::HTTP_METHOD_DELETE:
case self::HTTP_METHOD_GET:
if (strpos($url, '?') === false) {
$url .= '?';
}
if (is_array($params)) {
$url .= http_build_query($params, null, '&');
}
break;
default:
break;
}
$curlOptions[CURLOPT_URL] = $url;
$curlOptHttpHeader = array();
$curlOptHttpHeader = [];
foreach ($httpHeaders as $key => $value) {
if (is_int($key) && !is_string($key)) {
$curlOptHttpHeader[] = $value;
continue;
}
$curlOptHttpHeader[] = "{$key}: {$value}";
}
$curlOptions[CURLOPT_HTTPHEADER] = $curlOptHttpHeader;
$ch = curl_init();
curl_setopt_array($ch, $curlOptions);
curl_setopt($ch, CURLOPT_HEADER, 1);
@@ -230,18 +251,20 @@ class Client
$resultArray = null;
if ($curlError = curl_error($ch)) {
throw new \Exception($curlError);
} else {
throw new Exception($curlError);
}
else {
$resultArray = json_decode($responceBody, true);
}
curl_close($ch);
return array(
return [
'result' => (null !== $resultArray) ? $resultArray: $responceBody,
'code' => intval($httpCode),
'contentType' => $contentType,
'header' => $responceHeader,
);
];
}
public function getAccessToken($url, $grantType, array $params)
@@ -249,18 +272,24 @@ class Client
$params['grant_type'] = $grantType;
$httpHeaders = [];
switch ($this->tokenType) {
switch ($this->authType) {
case self::AUTH_TYPE_URI:
case self::AUTH_TYPE_FORM:
$params['client_id'] = $this->clientId;
$params['client_secret'] = $this->clientSecret;
break;
case self::AUTH_TYPE_AUTHORIZATION_BASIC:
$params['client_id'] = $this->clientId;
$httpHeaders['Authorization'] = 'Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret);
break;
default:
throw new \Exception();
throw new Exception("Bad auth type.");
}
return $this->execute($url, $params, self::HTTP_METHOD_POST, $httpHeaders);
@@ -38,18 +38,19 @@ class ModuloType extends BaseFunction
{
public function process(ArgumentList $args)
{
$result = 1;
foreach ($args as $subItem) {
$part = $this->evaluate($subItem);
if (!is_float($part) && !is_int($part)) {
$part = floatval($part);
}
$result %= $part;
if (count($args) < 2) {
$this->throwTooFewArguments();
}
$result = $this->evaluate($args[0]);
$part = $this->evaluate($args[1]);
if (!is_float($part) && !is_int($part)) {
$part = floatval($part);
}
$result %= $part;
return $result;
}
}
+1 -1
View File
@@ -123,7 +123,7 @@ class Tcpdf extends \TCPDF
$html = str_replace('{pageNumber}', '{{:png:}}', $html);
$html = str_replace('{pageAbsoluteNumber}', '{{:pnp:}}', $html);
} else {
$html = str_replace('{pageNumber}', '{{:pnp:}', $html);
$html = str_replace('{pageNumber}', '{{:pnp:}}', $html);
$html = str_replace('{pageAbsoluteNumber}', '{{:pnp:}}', $html);
}
@@ -29,8 +29,11 @@
namespace Espo\Core\Utils\Database;
use Espo\Core\Utils\Util;
use Espo\ORM\Entity;
use Espo\Core\{
Utils\Metadata,
Utils\File\Manager as FileManager,
Utils\Config,
};
class Converter
{
@@ -40,11 +43,7 @@ class Converter
private $config;
private $schemaConverter;
private $schemaFromMetadata = null;
public function __construct(\Espo\Core\Utils\Metadata $metadata, \Espo\Core\Utils\File\Manager $fileManager, \Espo\Core\Utils\Config $config = null)
public function __construct(Metadata $metadata, FileManager $fileManager, Config $config = null)
{
$this->metadata = $metadata;
$this->fileManager = $fileManager;
+49 -36
View File
@@ -29,13 +29,8 @@
namespace Espo\Core\Utils\Database;
use PDO;
use ReflectionClass;
use Espo\ORM\Entity;
use Espo\Core\{
Exceptions\Error,
Utils\Util,
Utils\Config,
};
@@ -44,6 +39,9 @@ use Doctrine\DBAL\{
Platforms\AbstractPlatform as DbalPlatform,
};
use PDO;
use ReflectionClass;
class Helper
{
private $config;
@@ -53,15 +51,15 @@ class Helper
private $pdoConnection;
protected $dbalDrivers = [
'mysqli' => '\\Doctrine\\DBAL\\Driver\\Mysqli\\Driver',
'pdo_mysql' => '\\Espo\\Core\\Utils\\Database\\DBAL\\Driver\\PDO\\MySQL\\Driver',
'mysqli' => 'Doctrine\\DBAL\\Driver\\Mysqli\\Driver',
'pdo_mysql' => 'Espo\\Core\\Utils\\Database\\DBAL\\Driver\\PDO\\MySQL\\Driver',
];
protected $dbalPlatforms = [
'MariaDb1027Platform' => '\\Espo\\Core\\Utils\\Database\\DBAL\\Platforms\\MariaDb1027Platform',
'MySQL57Platform' => '\\Espo\\Core\\Utils\\Database\\DBAL\\Platforms\\MySQL57Platform',
'MySQL80Platform' => '\\Espo\\Core\\Utils\\Database\\DBAL\\Platforms\\MySQL80Platform',
'MySQLPlatform' => '\\Espo\\Core\\Utils\\Database\\DBAL\\Platforms\\MySQLPlatform',
'MariaDb1027Platform' => 'Espo\\Core\\Utils\\Database\\DBAL\\Platforms\\MariaDb1027Platform',
'MySQL57Platform' => 'Espo\\Core\\Utils\\Database\\DBAL\\Platforms\\MySQL57Platform',
'MySQL80Platform' => 'Espo\\Core\\Utils\\Database\\DBAL\\Platforms\\MySQL80Platform',
'MySQLPlatform' => 'Espo\\Core\\Utils\\Database\\DBAL\\Platforms\\MySQLPlatform',
];
public function __construct(Config $config = null)
@@ -106,6 +104,7 @@ class Helper
{
if (!isset($params)) {
$config = $this->getConfig();
if ($config) {
$params = $config->get('database');
}
@@ -116,6 +115,7 @@ class Helper
}
$driverName = isset($params['driver']) ? $params['driver'] : 'pdo_mysql';
unset($params['driver']);
if (!isset($this->dbalDrivers[$driverName])) {
@@ -131,23 +131,23 @@ class Helper
$driver = new $driverClass();
$version = $this->getFullDatabaseVersion();
$platform = $driver->createDatabasePlatformForVersion($version);
$params['platform'] = $this->createDbalPlatform($platform);
return new DbalConnection(
$params,
$driver
);
return new DbalConnection($params, $driver);
}
protected function createDbalPlatform(DbalPlatform $platform)
{
$reflect = new ReflectionClass($platform);
$platformClass = $reflect->getShortName();
if (isset($this->dbalPlatforms[$platformClass])) {
$class = $this->dbalPlatforms[$platformClass];
return new $class();
}
@@ -155,14 +155,16 @@ class Helper
}
/**
* Create PDO connection
* @param array $params
* @return \Pdo| \PDOException
* Create PDO connection.
*
* @param array $params
* @return PDO|\PDOException
*/
public function createPdoConnection(array $params = null)
{
if (!isset($params)) {
$config = $this->getConfig();
if ($config) {
$params = $config->get('database');
}
@@ -176,40 +178,45 @@ class Helper
$port = empty($params['port']) ? '' : ';port=' . $params['port'];
$dbname = empty($params['dbname']) ? '' : ';dbname=' . $params['dbname'];
$options = array();
$options = [];
if (isset($params['sslCA'])) {
$options[PDO::MYSQL_ATTR_SSL_CA] = $params['sslCA'];
}
if (isset($params['sslCert'])) {
$options[PDO::MYSQL_ATTR_SSL_CERT] = $params['sslCert'];
}
if (isset($params['sslKey'])) {
$options[PDO::MYSQL_ATTR_SSL_KEY] = $params['sslKey'];
}
if (isset($params['sslCAPath'])) {
$options[PDO::MYSQL_ATTR_SSL_CAPATH] = $params['sslCAPath'];
}
if (isset($params['sslCipher'])) {
$options[PDO::MYSQL_ATTR_SSL_CIPHER] = $params['sslCipher'];
}
$dsn = $platform . ':host='.$params['host'].$port.$dbname;
$dbh = new \PDO($dsn, $params['user'], $params['password'], $options);
$dbh = new PDO($dsn, $params['user'], $params['password'], $options);
return $dbh;
}
/**
* Get maximum index length. If $tableName is empty get a value for all database tables
*
* @param string|null $tableName
* Get maximum index length. If $tableName is empty get a value for all database tables.
*
* @param ?string $tableName
* @return int
*/
public function getMaxIndexLength($tableName = null, $default = 1000)
{
$tableEngine = $this->getTableEngine($tableName);
if (!$tableEngine) {
return $default;
}
@@ -224,17 +231,18 @@ class Helper
if (version_compare($version, '10.2.2') >= 0) {
return 3072; //InnoDB, MariaDB 10.2.2+
}
break;
case 'MySQL':
if (version_compare($version, '5.7.0') >= 0) {
return 3072; //InnoDB, MySQL 5.7+
}
break;
}
return 767; //InnoDB
break;
}
return 1000; //MyISAM
@@ -263,19 +271,22 @@ class Helper
protected function getFullDatabaseVersion()
{
$connection = $this->getPdoConnection();
if (!$connection) {
return null;
}
$sth = $connection->prepare("select version()");
$sth->execute();
return $sth->fetchColumn();
}
/**
* Get Database version
* @return string|null
* Get Database version.
*
* @return ?string
*/
public function getDatabaseVersion()
{
@@ -287,7 +298,7 @@ class Helper
}
/**
* Get table/database tables engine. If $tableName is empty get a value for all database tables
* Get table/database tables engine. If $tableName is empty get a value for all database tables.
*
* @param string|null $tableName
*
@@ -318,15 +329,16 @@ class Helper
}
/**
* Check if full text supports. If $tableName is empty get a value for all database tables
* Check if full text is supported. If $tableName is empty get a value for all database tables.
*
* @param string $tableName
* @param string $tableName
*
* @return boolean
*/
public function isSupportsFulltext($tableName = null, $default = false)
public function doesSupportFulltext($tableName = null, $default = false)
{
$tableEngine = $this->getTableEngine($tableName);
if (!$tableEngine) {
return $default;
}
@@ -340,33 +352,34 @@ class Helper
}
return false; //InnoDB
break;
}
return true; //MyISAM
}
public function isTableSupportsFulltext($tableName, $default = false)
public function doesTableSupportFulltext($tableName, $default = false)
{
return $this->isSupportsFulltext($tableName, $default);
return $this->doesSupportFulltext($tableName, $default);
}
public function getPdoDatabaseParam($name, \PDO $pdoConnection)
public function getPdoDatabaseParam($name, PDO $pdoConnection)
{
if (!method_exists($pdoConnection, 'prepare')) {
return null;
}
$sth = $pdoConnection->prepare("SHOW VARIABLES LIKE '" . $name . "'");
$sth->execute();
$res = $sth->fetch(\PDO::FETCH_NUM);
$res = $sth->fetch(PDO::FETCH_NUM);
$version = empty($res[1]) ? null : $res[1];
return $version;
}
public function getPdoDatabaseVersion(\PDO $pdoConnection)
public function getPdoDatabaseVersion(PDO $pdoConnection)
{
return $this->getPdoDatabaseParam('version', $pdoConnection);
}
@@ -548,7 +548,7 @@ class Converter
protected function applyFullTextSearch(array &$ormMetadata, string $entityType)
{
if (!$this->getDatabaseHelper()->isTableSupportsFulltext(Util::toUnderScore($entityType))) return;
if (!$this->getDatabaseHelper()->doesTableSupportFulltext(Util::toUnderScore($entityType))) return;
if (!$this->getMetadata()->get(['entityDefs', $entityType, 'collection', 'fullTextSearch'])) return;
$fieldList = $this->getMetadata()->get(['entityDefs', $entityType, 'collection', 'textFilterFields'], ['name']);
@@ -390,7 +390,7 @@ class Permission
protected function chmodReal($filename, $mode)
{
try {
$result = chmod($filename, $mode);
$result = @chmod($filename, $mode);
} catch (\Exception $e) {
$result = false;
}
@@ -400,7 +400,7 @@ class Permission
$this->chgrp($filename, $this->getDefaultGroup(true));
try {
$result = chmod($filename, $mode);
$result = @chmod($filename, $mode);
} catch (\Exception $e) {
throw new Error($e->getMessage());
}
@@ -412,7 +412,7 @@ class Permission
protected function chownReal($path, $user)
{
try {
$result = chown($path, $user);
$result = @chown($path, $user);
} catch (\Exception $e) {
throw new Error($e->getMessage());
}
@@ -423,7 +423,7 @@ class Permission
protected function chgrpReal($path, $group)
{
try {
$result = chgrp($path, $group);
$result = @chgrp($path, $group);
} catch (\Exception $e) {
throw new Error($e->getMessage());
}
@@ -645,8 +645,7 @@
"campaign": {
"type": "belongsTo",
"entity": "Campaign",
"foreign": "contacts",
"noJoin": true
"foreign": "contacts"
},
"campaignLogRecords": {
"type": "hasChildren",
+1 -1
View File
@@ -641,7 +641,7 @@ class BaseMapper implements Mapper
foreach ($conditions as $left => $value) {
$columns[] = $left;
$valueList[] = $v;
$valueList[] = $value;
}
$columns[] = $distantKey;
@@ -292,7 +292,7 @@ class RDBRelation
protected function processCheckForeignEntity(Entity $entity)
{
if ($this->foreignEntityType && $this->foreignEntityType !== $entity->getEntityType()) {
throw new InvalidArgumentException("Entity type doesn't match an entity type of the relation.");
throw new RuntimeException("Entity type doesn't match an entity type of the relation.");
}
if (!$entity->id) {
@@ -370,7 +370,7 @@ class RDBRelation
}
if ($id === '') {
throw new InvalidArgumentException();
throw new RuntimeException();
}
$seed = $this->entityManager->getEntityFactory()->create($this->foreignEntityType);
@@ -389,7 +389,7 @@ class RDBRelation
}
if ($id === '') {
throw new InvalidArgumentException();
throw new RuntimeException();
}
$seed = $this->entityManager->getEntityFactory()->create($this->foreignEntityType);
@@ -408,7 +408,7 @@ class RDBRelation
}
if ($id === '') {
throw new InvalidArgumentException();
throw new RuntimeException();
}
$seed = $this->entityManager->getEntityFactory()->create($this->foreignEntityType);
@@ -40,7 +40,6 @@ use Espo\ORM\{
};
use RuntimeException;
use BadMethodCallException;
/**
* Builds select parameters for related records for RDB repository.
@@ -41,7 +41,6 @@ use Espo\ORM\{
use StdClass;
use RuntimeException;
use InvalidArgumentException;
class RDBRepository extends Repository
{
@@ -232,7 +231,7 @@ class RDBRepository extends Repository
$params = $params ?? [];
if ($entity->getEntityType() !== $this->entityType) {
throw new InvalidArgumentException("Not supported entity type.");
throw new RuntimeException("Not supported entity type.");
}
if (!$entity->id) {
@@ -283,7 +282,7 @@ class RDBRepository extends Repository
$params = $params ?? [];
if ($entity->getEntityType() !== $this->entityType) {
throw new InvalidArgumentException("Not supported entity type.");
throw new RuntimeException("Not supported entity type.");
}
if (!$entity->id) {
@@ -373,7 +372,7 @@ class RDBRepository extends Repository
}
if ($entity->getEntityType() !== $this->entityType) {
throw new InvalidArgumentException("Not supported entity type.");
throw new RuntimeException("Not supported entity type.");
}
if ($foreign instanceof Entity) {
@@ -421,7 +420,7 @@ class RDBRepository extends Repository
}
if ($entity->getEntityType() !== $this->entityType) {
throw new InvalidArgumentException("Not supported entity type.");
throw new RuntimeException("Not supported entity type.");
}
$this->beforeRelate($entity, $relationName, $foreign, $columnData, $options);
@@ -478,7 +477,7 @@ class RDBRepository extends Repository
}
if ($entity->getEntityType() !== $this->entityType) {
throw new InvalidArgumentException("Not supported entity type.");
throw new RuntimeException("Not supported entity type.");
}
$this->beforeUnrelate($entity, $relationName, $foreign, $options);
+7 -1
View File
@@ -69,13 +69,19 @@ class Attachment extends \Espo\Core\Repositories\Database implements
parent::beforeSave($entity, $options);
$storage = $entity->get('storage');
if (!$storage) {
$entity->set('storage', $this->config->get('defaultFileStorage', null));
}
if ($entity->isNew()) {
if (!$entity->has('size') && $entity->has('contents')) {
$entity->set('size', mb_strlen($entity->get('contents')));
$contents = $entity->get('contents');
$entity->set(
'size',
mb_strlen($contents, '8bit')
);
}
}
}
@@ -44,7 +44,7 @@ return [
'version' => '@@version',
'timeZone' => 'UTC',
'dateFormat' => 'DD.MM.YYYY',
'timeFormat' => 'hh:mm',
'timeFormat' => 'HH:mm',
'weekStart' => 0,
'thousandSeparator' => ',',
'decimalMark' => '.',
+2 -2
View File
@@ -42,7 +42,7 @@ use Espo\Core\Exceptions\{
use Espo\ORM\{
Entity,
EntityCollection,
Collection,
EntityManager,
};
@@ -2128,7 +2128,7 @@ class Record implements Crud,
return false;
}
public function findDuplicates(Entity $entity, $data = null) : ?EntityCollection
public function findDuplicates(Entity $entity, $data = null) : ?Collection
{
if (!$data) {
$data = (object) [];
+6
View File
@@ -1626,6 +1626,12 @@ class Stream
$collection = $this->entityManager->getRepository('User')->find($selectParams);
$total = $this->entityManager->getRepository('User')->count($selectParams);
$userService = $this->serviceFactory->create('User');
foreach ($collection as $e) {
$userService->prepareEntityForOutput($e);
}
return new RecordCollection($collection, $total);
}
@@ -32,10 +32,10 @@ namespace Espo\Tools\LeadCapture;
use Espo\Core\{
Exceptions\Error,
Exceptions\NotFound,
Exceptions\BadRequest,
ORM\EntityManager,
Utils\FieldUtil,
Utils\Language,
ServicaFactory,
HookManager,
Mail\EmailSender,
Utils\Config,
@@ -729,7 +729,7 @@ class LeadCapture
]);
if (!empty($data->description)) {
$logRecord->set('description', $description);
$logRecord->set('description', $data->description);
}
$this->entityManager->saveEntity($logRecord);
+3 -3
View File
File diff suppressed because one or more lines are too long
@@ -49,10 +49,14 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
this.assignedUserField = this.options.assignedUserField || 'assignedUser';
var usersFieldDefault = 'users';
if (!this.model.hasLink('users') && this.model.hasLink('assignedUsers')) {
usersFieldDefault = 'assignedUsers';
}
this.eventAssignedUserIsAttendeeDisabled =
this.getConfig().get('eventAssignedUserIsAttendeeDisabled') || false;
this.usersField = this.options.usersField || usersFieldDefault;
this.userIdList = [];
@@ -65,16 +69,24 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
m.hasChanged(this.startField) ||
m.hasChanged(this.endField) ||
m.hasChanged(this.usersField + 'Ids') ||
m.hasChanged(this.assignedUserField + 'Id');
if (!isChanged) return;
!this.eventAssignedUserIsAttendeeDisabled && m.hasChanged(this.assignedUserField + 'Id');
if (!isChanged) {
return;
}
if (!m.hasChanged(this.assignedUserField + 'Id') && !m.hasChanged(this.usersField + 'Ids')) {
this.initDates(true);
if (!this.start || !this.end || !this.userIdList.length) {
if (!this.timeline) return;
if (!this.timeline) {
return;
}
this.showNoData();
this.trigger('no-data');
return;
}
@@ -93,8 +105,12 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
this.reRender();
}
} else {
if (this.isRemoved()) return;
if (this.isRemoved()) {
return;
}
this.trigger('has-data');
this.reRender();
}
}, this);
@@ -132,13 +148,17 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
this.initGroupsDataSet();
this.initDates();
if (!$timeline.get(0)) return;
if (!$timeline.get(0)) {
return;
}
$timeline.get(0).innerHTML = '';
if (!this.start || !this.end || !this.userIdList.length) {
this.showNoData();
this.trigger('no-data');
return;
}
@@ -151,15 +171,17 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
this.fetch(this.start, this.end, function (eventList) {
var itemsDataSet = new Vis.DataSet(eventList);
var timeline = this.timeline = new Vis.Timeline($timeline.get(0), itemsDataSet, this.groupsDataSet, {
var timeline = this.timeline =new Vis.Timeline($timeline.get(0), itemsDataSet, this.groupsDataSet, {
dataAttributes: 'all',
start: this.start.toDate(),
end: this.end.toDate(),
moment: function (date) {
var m = moment(date);
if (date && date.noTimeZone) {
return m;
}
return m.tz(this.getDateTime().getTimeZone());
}.bind(this),
format: this.getFormatObject(),
@@ -195,6 +217,7 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
e.skipClick = true;
this.blockClick = true;
setTimeout(function () {this.blockClick = false}.bind(this), 100);
this.start = moment(e.start);
@@ -217,6 +240,7 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
this.addEvent(convertedEventList);
var itemsDataSet = new this.Vis.DataSet(convertedEventList);
this.timeline.setItems(itemsDataSet);
},
@@ -242,13 +266,15 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
endS = this.model.get(this.endField + 'Date');
}
if (!startS || !endS) return;
if (!startS || !endS) {
return;
}
if (this.model.get('isAllDay')) {
this.eventStart = moment.tz(startS, this.getDateTime().getTimeZone());
this.eventEnd = moment.tz(endS, this.getDateTime().getTimeZone());
this.eventEnd.add(1, 'day');
} else {
}else {
this.eventStart = moment.utc(startS).tz(this.getDateTime().getTimeZone());
this.eventEnd = moment.utc(endS).tz(this.getDateTime().getTimeZone());
}
@@ -281,6 +307,7 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
runFetch: function () {
this.fetch(this.start, this.end, function (eventList) {
var itemsDataSet = new this.Vis.DataSet(eventList);
this.timeline.setItems(itemsDataSet);
}.bind(this));
},
@@ -304,6 +331,7 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
this.ajaxGetRequest(url).then(function (data) {
this.fetchedStart = from.clone();
this.fetchedEnd = to.clone();
var eventList = [];
for (var userId in data) {
@@ -344,6 +372,7 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
};
var color = this.getColorFromScopeName(this.model.entityType);
if (color) {
o.style += '; border-color: ' + color;
var rgb = this.hexToRgb(color);
@@ -362,11 +391,17 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
convertEventList: function (list) {
var resultList = [];
list.forEach(function (iten) {
var event = this.convertEvent(iten);
if (!event) return;
if (!event) {
return;
}
resultList.push(event);
}, this);
return resultList;
},
@@ -410,8 +445,12 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
var assignedUserId = this.model.get(this.assignedUserField + 'Id');
var names = this.model.get(this.usersField + 'Names') || {};
if (assignedUserId) {
if (!~userIdList.indexOf(assignedUserId)) userIdList.unshift(assignedUserId);
if (!this.eventAssignedUserIsAttendeeDisabled && assignedUserId) {
if (!~userIdList.indexOf(assignedUserId)) {
userIdList.unshift(assignedUserId);
}
names[assignedUserId] = this.model.get(this.assignedUserField + 'Name');
}
@@ -435,8 +474,13 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
if (this.calendarType === 'single') {
return name;
}
var avatarHtml = this.getAvatarHtml(id);
if (avatarHtml) avatarHtml += ' ';
if (avatarHtml) {
avatarHtml += ' ';
}
var html = avatarHtml + '<span data-id="'+id+'" class="group-title">' + name + '</span>';
return html;
@@ -446,8 +490,11 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
if (this.getConfig().get('avatarsDisabled')) {
return '';
}
var t;
var cache = this.getCache();
if (cache) {
t = cache.get('app', 'timestamp');
} else {
@@ -481,6 +528,7 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
year: ''
}
};
return format;
},
@@ -493,10 +541,11 @@ define('crm:views/scheduler/scheduler', ['view', 'lib!vis'], function (Dep, Vis)
hexToRgb: function (hex) {
var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
return result ? {
r: parseInt(result[1], 16),
g: parseInt(result[2], 16),
b: parseInt(result[3], 16)
r: parseInt(result[1], 16),
g: parseInt(result[2], 16),
b: parseInt(result[3], 16),
} : null;
},
@@ -2,7 +2,12 @@
<div class="btn-group">
<button class="btn btn-primary" data-action="save">{{translate 'Save'}}</button>
<button class="btn btn-default" data-action="close">{{translate 'Close'}}</button>
{{#unless isCustom}}{{#unless isNew}}<button class="btn btn-default" data-action="resetToDefault">{{translate 'Reset to Default' scope='Admin'}}</button>{{/unless}}{{/unless}}
{{#if hasResetToDefault}}
<button
class="btn btn-default"
data-action="resetToDefault"
>{{translate 'Reset to Default' scope='Admin'}}</button>
{{/if}}
</div>
</div>
+28 -6
View File
@@ -30,9 +30,11 @@ define('cache', [], function () {
var Cache = function (cacheTimestamp) {
this.basePrefix = this.prefix;
if (cacheTimestamp) {
this.prefix = this.basePrefix + '-' + cacheTimestamp;
}
if (!this.get('app', 'timestamp')) {
this.storeTimestamp();
}
@@ -44,15 +46,20 @@ define('cache', [], function () {
handleActuality: function (cacheTimestamp) {
var stored = parseInt(this.get('app', 'cacheTimestamp'));
if (stored) {
if (stored !== cacheTimestamp) {
this.clear();
this.set('app', 'cacheTimestamp', cacheTimestamp);
this.storeTimestamp();
}
} else {
this.clear();
this.set('app', 'cacheTimestamp', cacheTimestamp);
this.storeTimestamp();
}
},
@@ -83,8 +90,10 @@ define('cache', [], function () {
try {
var stored = localStorage.getItem(key);
} catch (error) {
}
catch (error) {
console.error(error);
return null;
}
@@ -93,42 +102,55 @@ define('cache', [], function () {
if (stored.length > 9 && stored.substr(0, 9) === '__JSON__:') {
var jsonString = stored.substr(9);
try {
result = JSON.parse(jsonString);
} catch (error) {
}
catch (error) {
result = stored;
}
}
return result;
}
return null;
},
set: function (type, name, value) {
this.checkType(type);
var key = this.composeKey(type, name);
if (value instanceof Object || Array.isArray(value)) {
value = '__JSON__:' + JSON.stringify(value);
}
try {
localStorage.setItem(key, value);
} catch (error) {
console.error(error);
}
catch (error) {
console.log('Local storage limit exceeded.');
}
},
clear: function (type, name) {
var reText;
if (typeof type !== 'undefined') {
if (typeof name === 'undefined') {
reText = '^' + this.composeFullPrefix(type);
} else {
}
else {
reText = '^' + this.composeKey(type, name);
}
} else {
}
else {
reText = '^' + this.basePrefix + '-';
}
var re = new RegExp(reText);
for (var i in localStorage) {
if (re.test(i)) {
delete localStorage[i];
+4 -1
View File
@@ -243,12 +243,15 @@ var Espo = Espo || {classMap:{}};
if (realName in this.libsConfig) {
var libData = this.libsConfig[realName] || {};
path = libData.path || path;
exportsTo = libData.exportsTo || exportsTo;
exportsAs = libData.exportsAs || exportsAs;
noAppCache = libData.noAppCache || noAppCache;
//noAppCache = libData.noAppCache || noAppCache;
}
noAppCache = true;
fetchObject = function () {
var from = root;
+6 -2
View File
@@ -46,7 +46,8 @@ define('views/admin/field-manager/edit', ['view', 'model'], function (Dep, Model
fieldList: this.fieldList,
isCustom: this.defs.isCustom,
isNew: this.isNew,
hasDynamicLogicPanel: this.hasDynamicLogicPanel
hasDynamicLogicPanel: this.hasDynamicLogicPanel,
hasResetToDefault: !this.defs.isCustom && !this.entityTypeIsCustom && !this.isNew,
};
},
@@ -74,13 +75,16 @@ define('views/admin/field-manager/edit', ['view', 'model'], function (Dep, Model
fields: {
name: {required: true, maxLength: 100},
label: {required: true},
tooltipText: {}
tooltipText: {},
}
};
this.entityTypeIsCustom = !!this.getMetadata().get(['scopes', this.scope, 'isCustom']);
if (!this.isNew) {
this.model.id = this.field;
this.model.scope = this.scope;
this.model.set('name', this.field);
this.model.set('label', this.getLanguage().translate(this.field, 'fields', this.scope));
+1 -1
View File
@@ -126,7 +126,7 @@ define('views/admin/layouts/detail', 'views/admin/layouts/grid', function (Dep)
promiseList.push(
new Promise(
function (resolve) {
if (this.getMetadata().get(['clientDefs', scope, 'layoutDefaultSidePanelDisabled'])) resolve();
if (this.getMetadata().get(['clientDefs', this.scope, 'layoutDefaultSidePanelDisabled'])) resolve();
this.getHelper().layoutManager.getOriginal(this.scope, 'defaultSidePanel', this.setId,
function (layoutLoaded) {
+19 -3
View File
@@ -283,19 +283,27 @@ define('views/fields/array', ['views/fields/base', 'lib!Selectize'], function (D
var $element = this.$element = this.$el.find('.main-element');
var valueList = this.getSearchParamsData().valueList || this.searchParams.valueFront || [];
this.$element.val(valueList.join(':,:'));
var data = [];
(this.params.options || []).forEach(function (value) {
var label = this.getLanguage().translateOption(value, this.name, this.scope);
if (this.translatedOptions) {
if (value in this.translatedOptions) {
label = this.translatedOptions[value];
}
}
if (label === '') {
return;
};
data.push({
value: value,
label: label
label: label,
});
}, this);
@@ -312,11 +320,14 @@ define('views/fields/array', ['views/fields/base', 'lib!Selectize'], function (D
if (!this.matchAnyWord) {
selectizeOptions.score = function (search) {
var score = this.getScoreFunction(search);
search = search.toLowerCase();
return function (item) {
if (item.label.toLowerCase().indexOf(search) === 0) {
return score(item);
}
return 0;
};
};
@@ -324,16 +335,17 @@ define('views/fields/array', ['views/fields/base', 'lib!Selectize'], function (D
if (this.allowCustomOptions) {
selectizeOptions.persist = false;
selectizeOptions.create = function (input) {
return {
value: input,
label: input
label: input,
}
};
selectizeOptions.render = {
option_create: function (data, escape) {
return '<div class="create"><strong>' + escape(data.input) + '</strong>&hellip;</div>';
}
},
};
}
@@ -342,6 +354,7 @@ define('views/fields/array', ['views/fields/base', 'lib!Selectize'], function (D
this.$el.find('.selectize-dropdown-content').addClass('small');
var type = this.$el.find('select.search-type').val();
this.handleSearchType(type);
this.$el.find('select.search-type').on('change', function () {
@@ -355,10 +368,13 @@ define('views/fields/array', ['views/fields/base', 'lib!Selectize'], function (D
fetchFromDom: function () {
var selected = [];
this.$el.find('.list-group .list-group-item').each(function (i, el) {
var value = $(el).data('value').toString();
selected.push(value);
});
this.selected = selected;
},
+14 -2
View File
@@ -220,22 +220,31 @@ define('views/fields/enum', ['views/fields/base', 'lib!Selectize'], function (De
var $element = this.$element = this.$el.find('.main-element');
var type = this.$el.find('select.search-type').val();
this.handleSearchType(type);
var valueList = this.getSearchParamsData().valueList || this.searchParams.value || [];
this.$element.val(valueList.join(':,:'));
var data = [];
(this.params.options || []).forEach(function (value) {
var label = this.getLanguage().translateOption(value, this.name, this.scope);
if (this.translatedOptions) {
if (value in this.translatedOptions) {
label = this.translatedOptions[value];
}
}
if (label === '') {
return;
}
data.push({
value: value,
label: label
label: label,
});
}, this);
@@ -249,14 +258,17 @@ define('views/fields/enum', ['views/fields/base', 'lib!Selectize'], function (De
plugins: ['remove_button'],
score: function (search) {
var score = this.getScoreFunction(search);
search = search.toLowerCase();
return function (item) {
if (item.label.toLowerCase().indexOf(search) === 0) {
return score(item);
}
return 0;
};
}
},
});
this.$el.find('.selectize-dropdown-content').addClass('small');
+5 -1
View File
@@ -152,7 +152,11 @@ define('views/notification/badge', 'view', function (Dep) {
checkBypass: function () {
var last = this.getRouter().getLast() || {};
if (last.controller == 'Admin' && last.action == 'upgrade') {
if (
last.controller == 'Admin'
&&
~['upgrade', 'extensions'].indexOf(last.action)
) {
return true;
}
},
+4 -4
View File
@@ -25,10 +25,10 @@
"laminas/laminas-servicemanager": "^3.3.1",
"monolog/monolog": "2.*",
"yzalis/identicon": "*",
"zordius/lightncandy": "1.*",
"zordius/lightncandy": "dev-espo#v1.2.5e",
"composer/semver": "^3",
"tecnickcom/tcpdf": "^6.3",
"spatie/async": "dev-for-espocrm",
"tecnickcom/tcpdf": "6.3.5",
"spatie/async": "0.0.4",
"symfony/process": "4.1.7",
"symfony/http-foundation": "4.4.7",
"cboden/ratchet": "^0.4.1",
@@ -54,7 +54,7 @@
"repositories": [
{
"type": "git",
"url": "https://github.com/yurikuzn/async.git"
"url": "https://github.com/yurikuzn/lightncandy.git"
}
]
}
Generated
+25 -189
View File
@@ -1,10 +1,10 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "f95d8c1b15356c3531ef9dd3b950c1e1",
"content-hash": "a32e7a77ab0ae1e795186b26455beb14",
"packages": [
{
"name": "cboden/ratchet",
@@ -112,20 +112,6 @@
}
],
"description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
"funding": [
{
"url": "https://packagist.com",
"type": "custom"
},
{
"url": "https://github.com/composer",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/composer/composer",
"type": "tidelift"
}
],
"time": "2020-11-11T10:22:58+00:00"
},
{
@@ -188,20 +174,6 @@
"validation",
"versioning"
],
"funding": [
{
"url": "https://packagist.com",
"type": "custom"
},
{
"url": "https://github.com/composer",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/composer/composer",
"type": "tidelift"
}
],
"time": "2020-05-26T18:22:04+00:00"
},
{
@@ -316,20 +288,6 @@
"redis",
"xcache"
],
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
"type": "custom"
},
{
"url": "https://www.patreon.com/phpdoctrine",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache",
"type": "tidelift"
}
],
"time": "2020-07-07T18:54:01+00:00"
},
{
@@ -423,20 +381,6 @@
"sqlserver",
"sqlsrv"
],
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
"type": "custom"
},
{
"url": "https://www.patreon.com/phpdoctrine",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal",
"type": "tidelift"
}
],
"time": "2020-11-15T18:20:41+00:00"
},
{
@@ -513,20 +457,6 @@
"event system",
"events"
],
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
"type": "custom"
},
{
"url": "https://www.patreon.com/phpdoctrine",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager",
"type": "tidelift"
}
],
"time": "2020-05-29T18:28:51+00:00"
},
{
@@ -575,12 +505,6 @@
"cron",
"schedule"
],
"funding": [
{
"url": "https://github.com/dragonmantank",
"type": "github"
}
],
"time": "2020-08-21T02:30:13+00:00"
},
{
@@ -1095,12 +1019,6 @@
"service-manager",
"servicemanager"
],
"funding": [
{
"url": "https://funding.communitybridge.org/projects/laminas-project",
"type": "community_bridge"
}
],
"time": "2020-05-11T14:43:22+00:00"
},
{
@@ -1339,12 +1257,6 @@
"stream",
"zip"
],
"funding": [
{
"url": "https://opencollective.com/zipstream",
"type": "open_collective"
}
],
"time": "2020-05-30T13:11:16+00:00"
},
{
@@ -1637,16 +1549,6 @@
"logging",
"psr-3"
],
"funding": [
{
"url": "https://github.com/Seldaek",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
"type": "tidelift"
}
],
"time": "2020-07-23T08:41:23+00:00"
},
{
@@ -1693,16 +1595,6 @@
"keywords": [
"enum"
],
"funding": [
{
"url": "https://github.com/mnapoli",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum",
"type": "tidelift"
}
],
"time": "2020-11-14T18:14:52+00:00"
},
{
@@ -3042,25 +2934,21 @@
"micro",
"router"
],
"funding": [
{
"url": "https://opencollective.com/slimphp",
"type": "open_collective"
},
{
"url": "https://tidelift.com/funding/github/packagist/slim/slim",
"type": "tidelift"
}
],
"time": "2020-04-14T20:49:48+00:00"
},
{
"name": "spatie/async",
"version": "dev-for-espocrm",
"version": "0.0.4",
"source": {
"type": "git",
"url": "https://github.com/yurikuzn/async.git",
"reference": "9e0f665e4cf0cb4f4d3d78c78ab567b2b539415f"
"url": "https://github.com/spatie/async.git",
"reference": "8b76df4ab77dcf7680eee4b83353d038e28f92f7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/async/zipball/8b76df4ab77dcf7680eee4b83353d038e28f92f7",
"reference": "8b76df4ab77dcf7680eee4b83353d038e28f92f7",
"shasum": ""
},
"require": {
"opis/closure": "^3.0",
@@ -3074,21 +2962,14 @@
},
"type": "library",
"autoload": {
"files": [],
"files": [
"src/helpers.php"
],
"psr-4": {
"Spatie\\Async\\": "src"
}
},
"autoload-dev": {
"psr-4": {
"Spatie\\Async\\Tests\\": "tests"
}
},
"scripts": {
"test": [
"vendor/bin/phpunit"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@@ -3106,7 +2987,7 @@
"async",
"spatie"
],
"time": "2018-12-11T08:49:14+00:00"
"time": "2018-01-29T15:09:29+00:00"
},
{
"name": "symfony/http-foundation",
@@ -3161,20 +3042,6 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-30T14:07:33+00:00"
},
{
@@ -3895,6 +3762,7 @@
"identicon",
"image"
],
"abandoned": true,
"time": "2014-07-13T09:19:12+00:00"
},
{
@@ -4071,20 +3939,14 @@
},
{
"name": "zordius/lightncandy",
"version": "v1.2.4",
"version": "dev-espo",
"source": {
"type": "git",
"url": "https://github.com/zordius/lightncandy.git",
"reference": "dfdb910ae7b59e274f1ff97d29b724871f01b4cc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zordius/lightncandy/zipball/dfdb910ae7b59e274f1ff97d29b724871f01b4cc",
"reference": "dfdb910ae7b59e274f1ff97d29b724871f01b4cc",
"shasum": ""
"url": "https://github.com/yurikuzn/lightncandy.git",
"reference": "207d424c4ced34644663fdc0758c19d5b6974adc"
},
"require": {
"php": ">=5.4.0"
"php": ">=7.1.0"
},
"require-dev": {
"phpunit/phpunit": "^7"
@@ -4100,7 +3962,6 @@
"LightnCandy\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@@ -4113,13 +3974,13 @@
"description": "An extremely fast PHP implementation of handlebars ( http://handlebarsjs.com/ ) and mustache ( http://mustache.github.io/ ).",
"homepage": "https://github.com/zordius/lightncandy",
"keywords": [
"PHP",
"handlebars",
"logicless",
"mustache",
"php",
"template"
],
"time": "2019-06-09T04:10:55+00:00"
"time": "2021-02-18T13:06:28+00:00"
}
],
"packages-dev": [
@@ -4877,16 +4738,6 @@
"testing",
"xunit"
],
"funding": [
{
"url": "https://phpunit.de/donate.html",
"type": "custom"
},
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
"time": "2020-06-22T07:06:58+00:00"
},
{
@@ -5560,20 +5411,6 @@
"polyfill",
"portable"
],
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-02-27T09:26:54+00:00"
},
{
@@ -5668,7 +5505,7 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
"spatie/async": 20
"zordius/lightncandy": 20
},
"prefer-stable": false,
"prefer-lowest": false,
@@ -5684,6 +5521,5 @@
"ext-curl": "*",
"ext-exif": "*"
},
"platform-dev": [],
"plugin-api-version": "1.1.0"
"platform-dev": []
}
+4
View File
@@ -999,6 +999,10 @@ optgroup {
}
}
.input-group .input-group-btn .btn-sm {
height: 30px;
}
.panel-body,
section {
> p:first-child,
+1
View File
@@ -1,4 +1,5 @@
@import "misc/selectize/selectize.less";
@import "misc/selectize/custom.less";
@import "misc/selectize/selectize.bootstrap3.less";
@import "misc/summernote/summernote.less";
@import "misc/summernote/icons.less";
@@ -0,0 +1,8 @@
.filter > .form-group .field {
.selectize-control {
.selectize-input {
font-size: @font-size-small;
padding: 4px 5px 0px;
}
}
}
@@ -34,4 +34,10 @@
.disabled [data-value] .remove {
border-left-color: lighten(desaturate(@selectize-color-item-border, 100%), @selectize-lighten-disabled-item-border);
}
}
.remove-single {
position: absolute;
right: 0;
top: 0;
font-size: 23px;
}
}
@@ -1,6 +1,7 @@
/**
* selectize.bootstrap3.css (v0.12.1) - Bootstrap 3 Theme
* selectize.css (v0.13.3)
* Copyright (c) 20132015 Brian Reavis & contributors
* Copyright (c) 2020 Selectize Team & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
* file except in compliance with the License. You may obtain a copy of the License at:
@@ -12,11 +13,12 @@
* governing permissions and limitations under the License.
*
* @author Brian Reavis <brian@thirdroute.com>
* @author Ris Adams <selectize@risadams.com>
*/
@import "selectize";
@selectize-fonts-family: inherit;
@selectize-font-family: inherit;
@selectize-font-size: inherit;
@selectize-line-height: @line-height-computed;
@@ -147,4 +149,4 @@
background: none;
.selectize-box-shadow(none);
.selectize-border-radius(0);
}
}
@@ -187,6 +187,9 @@
-webkit-user-select: auto !important;
.selectize-box-shadow(none) !important;
&:focus { outline: none !important; }
&[placeholder] {
box-sizing: initial;
}
}
}
@@ -226,9 +229,16 @@
.selectize-border-radius(1px);
}
}
[data-selectable], .optgroup-header {
.option, .optgroup-header {
padding: @selectize-padding-dropdown-item-y @selectize-padding-dropdown-item-x;
}
.option, [data-disabled], [data-disabled] [data-selectable].option {
cursor: inherit;
opacity: 0.5;
}
[data-selectable].option {
opacity: 1;
}
.optgroup:first-child .optgroup-header {
border-top: 0 none;
}
@@ -253,6 +263,7 @@
overflow-y: auto;
overflow-x: hidden;
max-height: @selectize-max-height-dropdown;
-webkit-overflow-scrolling: touch;
}
.selectize-control.single .selectize-input {
@@ -293,12 +304,3 @@
opacity: @selectize-opacity-disabled;
background-color: @selectize-color-disabled;
}
.filter > .form-group .field {
.selectize-control {
.selectize-input {
font-size: @font-size-small;
padding: 4px 5px 0px;
}
}
}
+32 -10
View File
@@ -34,6 +34,12 @@ class Language{
private $data = array();
protected $defaultLabels = [
'nginx' => 'linux',
'apache' => 'linux',
'microsoft-iis' => 'windows',
];
public function __construct()
{
require_once 'SystemHelper.php';
@@ -118,19 +124,35 @@ class Language{
$serverOs = $this->getSystemHelper()->getOs();
$rewriteRules = $this->getSystemHelper()->getRewriteRules();
if (isset($i18n['options']['modRewriteInstruction'][$serverType][$serverOs])) {
$modRewriteInstruction = $i18n['options']['modRewriteInstruction'][$serverType][$serverOs];
preg_match_all('/\{(.*?)\}/', $modRewriteInstruction, $match);
if (isset($match[1])) {
foreach ($match[1] as $varName) {
if (isset($rewriteRules[$varName])) {
$modRewriteInstruction = str_replace('{'.$varName.'}', $rewriteRules[$varName], $modRewriteInstruction);
}
}
$label = $i18n['options']['modRewriteInstruction'][$serverType][$serverOs] ?? null;
if (!isset($label) && isset($this->defaultLabels[$serverType])) {
$defaultLabel = $this->defaultLabels[$serverType];
if (!isset($i18n['options']['modRewriteInstruction'][$serverType][$defaultLabel])) {
$defaultLangFile = 'install/core/i18n/' . $this->defaultLanguage . '/install.json';
$defaultData = $this->getLangData($defaultLangFile);
$i18n['options']['modRewriteInstruction'][$serverType][$defaultLabel] = $defaultData['options']['modRewriteInstruction'][$serverType][$defaultLabel];
}
$i18n['options']['modRewriteInstruction'][$serverType][$serverOs] = $modRewriteInstruction;
$label = $i18n['options']['modRewriteInstruction'][$serverType][$defaultLabel];
}
if (!$label) {
return;
}
preg_match_all('/\{(.*?)\}/', $label, $match);
if (isset($match[1])) {
foreach ($match[1] as $varName) {
if (isset($rewriteRules[$varName])) {
$label = str_replace('{'.$varName.'}', $rewriteRules[$varName], $label);
}
}
}
$i18n['options']['modRewriteInstruction'][$serverType][$serverOs] = $label;
}
}
+1 -1
View File
@@ -35,7 +35,7 @@ class SystemHelper extends \Espo\Core\Utils\System
protected $apiPath;
protected $modRewriteUrl = '/Metadata';
protected $modRewriteUrl = '/';
protected $writableDir = 'data';
+14
View File
@@ -27,6 +27,20 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
$clearedCookieList = [
'auth-token-secret',
'auth-username',
'auth-token',
];
foreach ($clearedCookieList as $cookieName) {
if (!isset($_COOKIE[$cookieName])) {
continue;
}
setcookie($cookieName, null, -1, '/');
}
$config = $installer->getConfig();
$fields = array(
+11 -4
View File
@@ -30,14 +30,19 @@
return [
'apiPath' => '/api/v1',
'rewriteRules' => [
'APACHE1' => 'a2enmod rewrite
service apache2 restart',
'APACHE1' => 'sudo a2enmod rewrite
sudo service apache2 restart',
'APACHE2' => '&#60;Directory /PATH_TO_ESPO/&#62;
AllowOverride <b>All</b>
&#60;/Directory&#62;',
'APACHE3' => 'service apache2 restart',
'APACHE2_PATH1' => '/etc/apache2/sites-available/ESPO_VIRTUAL_HOST.conf',
'APACHE2_PATH2' => '/etc/apache2/apache2.conf',
'APACHE2_PATH3' => '/etc/httpd/conf/httpd.conf',
'APACHE3' => 'sudo service apache2 restart',
'APACHE4' => '# RewriteBase /',
'APACHE5' => 'RewriteBase {ESPO_PATH}{API_PATH}',
'WINDOWS_APACHE1' => 'LoadModule rewrite_module modules/mod_rewrite.so',
'NGINX_PATH' => '/etc/nginx/sites-available/YOUR_SITE',
'NGINX' => 'server {
# ...
@@ -88,5 +93,7 @@ service apache2 restart',
deny all;
}
}',
'APACHE_LINK' => 'https://www.espocrm.com/documentation/administration/apache-server-configuration/',
'NGINX_LINK' => 'https://www.espocrm.com/documentation/administration/nginx-server-configuration/',
],
];
];
+10 -11
View File
@@ -108,8 +108,8 @@
"mysqlSettingError": "EspoCRM изисква настройка MySQL \"{NAME}\", за да се настрои да {VALUE}",
"requiredMariadbVersion": "Вашият MariaDB версия не се поддържа от EspoCRM, моля обновете до MariaDB {} minVersion най-малко",
"Ajax failed": "Възникна неочаквана грешка",
"Bad init Permission": "Разрешението е отказано за \"{*}\" директория. Моля, избран 775 за \"{*}\" или просто изпълни тази команда в терминала <предварително> <б> {C} </ B> </ предварително> операция не е позволено? Предложения това: {ХСС}",
"permissionInstruction": "<br> Run тази команда в терминал: <предварително> <б> \"{C}\" </ B> </ предварително>",
"Bad init Permission": "Разрешението е отказано за \"{*}\" директория. Моля, избран 775 за \"{*}\" или просто изпълни тази команда в терминала <pre> <b> {C} </b> </pre> операция не е позволено? Предложения това: {ХСС}",
"permissionInstruction": "<br> Run тази команда в терминал: <pre> <b>\"{C}\"</b> </pre>",
"operationNotPermitted": "Операция не е позволено? Предложения това: <br> <br> {ХСС}"
},
"options": {
@@ -118,19 +118,18 @@
},
"modRewriteInstruction": {
"apache": {
"windows": "<br> <предварително> 1. Намерете httpd.conf файл (обикновено вие ще го намерите в папка, наречена конф, довереник или нещо в този дух) <br> 2. Вътре в httpd.conf файла разкоментирайте модули линия LoadModule rewrite_module / mod_rewrite.so (премахване на лирата \"#\" знак от в предната част на линията) <br> 3. Също така да намерите линията ClearModuleList се некоментирана след това намерете и се уверете, че mod_rewrite.c линията AddModule не е коментиран. </ Предварително>",
"linux": "<br> <br> 1. Активиране на \"mod_rewrite\". За това тече тези команди в терминал: <предварително> {APACHE1} </ предварително> <br> 2. Ако предишната стъпка не помогне, опитайте се да се даде възможност на .htaccess подкрепа. Добавяне / редактиране на настройките за конфигурация сървър (/etc/apache/apache2.conf, /etc/httpd/conf/httpd.conf): <предварително> {} apache2 </ предварително> След това стартирате тази команда в терминал: <предварително> {APACHE3} </ предварително> <br> 3. Ако предишната стъпка не помогне, опитайте да добавите пътя на RewriteBase. Отваряне на файл {} API_PATH .htaccess и да се замени следния ред: <предварително> {} APACHE4 </ предварително> Да <предварително> {} APACHE5 </ предварително> <br> За повече информация, моля посетете насоките <един HREF = \" https://www.espocrm.com/documentation/administration/apache-server-configuration/ \"целева =\" _ празно \">"
"windows": "<br> <pre> 1. Намерете httpd.conf файл (обикновено вие ще го намерите в папка, наречена конф, довереник или нещо в този дух) <br> 2. Вътре в httpd.conf файла разкоментирайте модули линия LoadModule rewrite_module / mod_rewrite.so (премахване на лирата \"#\" знак от в предната част на линията) <br> 3. Също така да намерите линията ClearModuleList се некоментирана след това намерете и се уверете, че mod_rewrite.c линията AddModule не е коментиран. </pre>",
"linux": "<br> <br> 1. Активиране на \"mod_rewrite\". За това тече тези команди в терминал: <pre>{APACHE1}</pre> <br> 2. Ако предишната стъпка не помогне, опитайте се да се даде възможност на .htaccess подкрепа. Добавяне / редактиране на настройките за конфигурация сървър (<code>{APACHE2_PATH1}</code>, <code>{APACHE2_PATH2}</code>, <code>{APACHE2_PATH3}</code>): <pre>{APACHE2}</pre> След това стартирате тази команда в терминал: <pre>{APACHE3}</pre> <br> 3. Ако предишната стъпка не помогне, опитайте да добавите пътя на RewriteBase. Отваряне на файл {API_PATH} .htaccess и да се замени следния ред: <pre>{APACHE4}</pre> Да <pre>{APACHE5}</pre> <br> За повече информация, моля посетете насоките <a href=\"{APACHE_LINK}\" target=\"_blank\">Apache server configuration for EspoCRM</a>.<br><br>"
},
"nginx": {
"linux": "<br> <предварително> {Nginx} </ предварително> <br> За повече информация посети насоките <един HREF = \"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" целева = \"_ празно\"> конфигурацията на сървъра Nginx за EspoCRM </a>. <br> <br>",
"windows": "<br> <предварително> {Nginx} </ предварително> <br> За повече информация посети насоките <един HREF = \"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" целева = \"_ празно\"> конфигурацията на сървъра Nginx за EspoCRM </a>. <br> <br>"
"linux": "<br> Добавете този код в Nginx сървър блок конфигурационния файл <code>{NGINX_PATH}</code> вътре в раздел \"сървър\": <pre>{NGINX}</pre> <br> За повече информация посети насоките <a href=\"{NGINX_LINK}\" target=\"_blank\">конфигурацията на сървъра Nginx за EspoCRM</a>. <br> <br>"
}
},
"modRewriteTitle": {
"apache": "API. Грешка: EspoCRM API е недостъпна <br> Възможни проблеми:. Увреждания \"mod_rewrite\" в Apache сървъра, инвалиди .htaccess подкрепа или RewriteBase въпрос <br> ли само необходимите стъпки. След всяка проверка стъпка, ако проблемът не бъде решен.",
"nginx": "API Грешка: EspoCRM API е недостъпна <br> Добавете този код в Nginx сървър блок конфигурационния файл (/ и т.н. / Nginx / сайтове-достъпни / YOUR_SITE) вътре в раздел \"сървър\".:",
"microsoft-iis": "API. Грешка: EspoCRM API е недостъпна <br> Възможен проблем: увреждания \"URL Rewrite\". Моля, проверете и се даде възможност на \"URL Rewrite\" Модул в IIS сървър",
"default": "API. Грешка: EspoCRM API е недостъпна <br> Възможен проблем: инвалиди Rewrite модул. Моля, проверете и се даде възможност на Rewrite модул в сървъра си (напр mod_rewrite в Apache) и .htaccess подкрепа."
"apache": "<h3>API. Грешка: EspoCRM API е недостъпна</h3> <br> Ли само необходимите стъпки. След всяка проверка стъпка, ако проблемът не бъде решен.",
"nginx": "<h3>API Грешка: EspoCRM API е недостъпна</h3>",
"microsoft-iis": "<h3>API. Грешка: EspoCRM API е недостъпна</h3> <br> Възможен проблем: увреждания \"URL Rewrite\". Моля, проверете и се даде възможност на \"URL Rewrite\" Модул в IIS сървър",
"default": "<h3>API. Грешка: EspoCRM API е недостъпна</h3> <br> Възможен проблем: инвалиди Rewrite модул. Моля, проверете и се даде възможност на Rewrite модул в сървъра си (напр mod_rewrite в Apache) и .htaccess подкрепа."
}
},
"systemRequirements": {
@@ -141,4 +140,4 @@
"readable": "четлив",
"requiredMariadbVersion": "MariaDB версия"
}
}
}
+8 -9
View File
@@ -94,19 +94,18 @@
"options": {
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1. Find httpd.conf filen (den findes normalt i en mappe kaldet conf, config eller noget i den retning)<br>\n2. I httpd.conf file skal linjen LoadModule rewrite_module modules/mod_rewrite.so aktiveres (fjern #-tegnet foran linjen)<br>\n3. Tjek at linjen ClearModuleList er uden #-tegn og linjen AddModule mod_rewrite.c må heller ikke have #-tegnet i begyndelsen.\n</pre>",
"linux": "\n <br><br>1.Aktiver \"mod_rewrite\". Kør disse kommandoer i et terminalvindue:<pre>{APACHE1}</pre><br>2. Aktiver .htaccess understøttelse. Tilføj/rediger Server konfigurationsindstillinger (/etc/apache/apache2.conf, /etc/httpd/conf/httpd.conf):<pre>{APACHE2}</pre>\nKør derefter denne kommando i et terminalvindue:<pre>{APACHE3}</pre><br>3. Prøv at tilføje RewriteBase stien, åbn en fil {API_PATH}.htaccess og erstat den følgende linje:<pre>{APACHE4}</pre>Med<pre>{APACHE5}</pre><br> For mere information besøg venligst guiden <a href=\"https://www.espocrm.com/documentation/administration/apache-server-configuration/\" target=\"_blank\">Apache server configuration for EspoCRM</a>.<br><br> "
"windows": "<br> <pre>1. Find httpd.conf filen (den findes normalt i en mappe kaldet conf, config eller noget i den retning)<br>\n2. I httpd.conf file skal linjen <code>{WINDOWS_APACHE1}</code> aktiveres (fjern #-tegnet foran linjen)<br>\n3. Tjek at linjen ClearModuleList er uden #-tegn og linjen AddModule mod_rewrite.c må heller ikke have #-tegnet i begyndelsen.\n</pre>",
"linux": "<br><br>1.Aktiver \"mod_rewrite\". Kør disse kommandoer i et terminalvindue:<pre>{APACHE1}</pre><br>2. Aktiver .htaccess understøttelse. Tilføj/rediger Server konfigurationsindstillinger (<code>{APACHE2_PATH1}</code>, <code>{APACHE2_PATH2}</code>, <code>{APACHE2_PATH3}</code>):<pre>{APACHE2}</pre>\nKør derefter denne kommando i et terminalvindue:<pre>{APACHE3}</pre><br>3. Prøv at tilføje RewriteBase stien, åbn en fil {API_PATH}.htaccess og erstat den følgende linje:<pre>{APACHE4}</pre>Med<pre>{APACHE5}</pre><br> For mere information besøg venligst guiden <a href=\"{APACHE_LINK}\" target=\"_blank\">Apache server configuration for EspoCRM</a>.<br><br> "
},
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> For mere information besøg venligst guiden <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br> ",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> For mere information besøg venligst guiden <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br> "
"linux": "<br> Tilføj denne kode til din Nginx servers config fil <code>{NGINX_PATH}</code> indenfor \"server\" sektionen:<pre>{NGINX}</pre> <br> For mere information besøg venligst guiden <a href=\"{NGINX_LINK}\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br> "
}
},
"modRewriteTitle": {
"apache": "API Fejl: EspoCRM API er utilgængelig.<br> Mulige problemer: deaktiveret \"mod_rewrite\" i Apache serveren, deaktiveret .htaccess understøttelse eller et problem med RewriteBase.<br>Foretag kun nødvendige skridt. Tjek efter hvert skridt om problemet er løst.",
"nginx": "API Fejl: EspoCRM API er utilgængelig.<br> Tilføj denne kode til din Nginx servers config fil (/etc/nginx/sites-available/YOUR_SITE) indenfor \"server\" sektionen:",
"microsoft-iis": "API Fejl: EspoCRM API er utilgængelig.<br> Muligt problem: deaktiveret \"URL Rewrite\". Venligst tjek og aktiver \"URL Rewrite\" Modulet i IIS serveren.",
"default": "API Fejl: EspoCRM API er utilgængelig.<br> Muligt problem: deaktiveret Rewrite Modul. Venligst tjek og aktiver Rewrite Modulet i din server (f.eks. mod_rewrite i Apache) og .htaccess understøttelse."
"apache": "<h3>API Fejl: EspoCRM API er utilgængelig.</h3><br>Foretag kun nødvendige skridt. Tjek efter hvert skridt om problemet er løst.",
"nginx": "<h3>API Fejl: EspoCRM API er utilgængelig.</h3>",
"microsoft-iis": "<h3>API Fejl: EspoCRM API er utilgængelig.</h3><br> Muligt problem: deaktiveret \"URL Rewrite\". Venligst tjek og aktiver \"URL Rewrite\" Modulet i IIS serveren.",
"default": "<h3>API Fejl: EspoCRM API er utilgængelig.</h3><br> Muligt problem: deaktiveret Rewrite Modul. Venligst tjek og aktiver Rewrite Modulet i din server (f.eks. mod_rewrite i Apache) og .htaccess understøttelse."
}
},
"systemRequirements": {
@@ -117,4 +116,4 @@
"writable": "Skrivbar",
"readable": "Læsbar"
}
}
}
+8 -9
View File
@@ -104,19 +104,18 @@
"options": {
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1. Finden Sie die httpd.conf Datei (normalerweise in einem Verzeichnis conf, config oder ähnlich)<br>2. Innerhalb der httpd.conf Datei aktivieren Sie die Zeile LoadModule rewrite_module modules/mod_rewrite.so (entfernen Sie das # Zeichen vom Anfang der Zeile)<br>3. Stellen Sie sicher, dass die Zeile ClearModuleList nicht auskommentiert ist, genauso wie die Zeile AddModule mod_rewrite.c. </pre>\n</pre>",
"linux": "<br><br>1. Aktivieren Sie mod_rewrite. Dafür führen Sie folgende Kommandos in einem Terminalfenster aus: <pre>{APACHE1}</pre><br>2. Aktivieren Sie .htaccess Unterstützung Ändern oder fügen Sie folgendes Kommando zu Ihrer Apache Konfiguration hinzu (/etc/apache/apache2.conf, /etc/httpd/conf/httpd.conf):<pre>{APACHE2}</pre>\n Anschließend führen Sie dieses Kommando in einem Terminalfenster aus: <pre>{APACHE3}</pre><br>3. Um den RewriteBase Pfad hinzuzufügen, öffnen Sie die Datei {API_PATH}.htaccess und ersetzen Sie die folgende Zeile:<pre>{APACHE4}</pre>zu<pre>{APACHE5}</pre><br> For more information please visit the guideline <a href=\"https://www.espocrm.com/documentation/administration/apache-server-configuration/\" target=\"_blank\">Apache server configuration for EspoCRM</a>.<br><br>"
"windows": "<br> <pre>1. Finden Sie die httpd.conf Datei (normalerweise in einem Verzeichnis conf, config oder ähnlich)<br>2. Innerhalb der httpd.conf Datei aktivieren Sie die Zeile <code>{WINDOWS_APACHE1}</code> (entfernen Sie das # Zeichen vom Anfang der Zeile)<br>3. Stellen Sie sicher, dass die Zeile ClearModuleList nicht auskommentiert ist, genauso wie die Zeile AddModule mod_rewrite.c. </pre>\n</pre>",
"linux": "<br>1. Aktivieren Sie mod_rewrite. Dafür führen Sie folgende Kommandos in einem Terminalfenster aus: <pre>{APACHE1}</pre><br>2. Aktivieren Sie .htaccess Unterstützung Ändern oder fügen Sie folgendes Kommando zu Ihrer Apache Konfiguration hinzu (<code>{APACHE2_PATH1}</code>, <code>{APACHE2_PATH2}</code>, <code>{APACHE2_PATH3}</code>):<pre>{APACHE2}</pre>\n Anschließend führen Sie dieses Kommando in einem Terminalfenster aus: <pre>{APACHE3}</pre><br>3. Um den RewriteBase Pfad hinzuzufügen, öffnen Sie die Datei {API_PATH}.htaccess und ersetzen Sie die folgende Zeile:<pre>{APACHE4}</pre>zu<pre>{APACHE5}</pre><br> For more information please visit the guideline <a href=\"{APACHE_LINK}\" target=\"_blank\">Apache server configuration for EspoCRM</a>.<br><br>"
},
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> Weitere Informationen sind in der Dokumentation unter <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM</a> zu finden.<br><br>",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> Weitere Informationen sind in der Dokumentation unter <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM</a> zu finden.<br><br>"
"linux": "<br>Fügen Sie diesen Code zu Nginx Host Config <code>{NGINX_PATH}</code> (innerhalb des \"server\" Blocks) hinzu:<pre>{NGINX}</pre> <br> Weitere Informationen sind in der Dokumentation unter <a href=\"{NGINX_LINK}\" target=\"_blank\">Nginx server configuration for EspoCRM</a> zu finden.<br><br>"
}
},
"modRewriteTitle": {
"apache": "API Fehler: EspoCRM API nicht verfügbar<br>Mögliche Probleme: deaktiviertes \"mod_rewrite\" des Apache Servers, nicht aktivierte .htaccess Unterstützung oder ein RewriteBase Fehler.<br>Führen Sie nur die notwendigen Schritte durch. Nach jedem Schritt prüfen Sie bitte, ob das Problem gelöst ist.",
"nginx": "API Fehler: EspoCRM API nicht verfügbar.<br>Fügen Sie diesen Code zu Nginx Host Config (innerhalb des \"server\" Blocks) hinzu:",
"microsoft-iis": "API Fehler: EspoCRM API nicht verfügbar<br>Mögliches Problem: deaktiviertes \"URL Rewrite\". Bitte überprüfen und aktivieren Sie das \"URL Rewrite\" Modul im IIS Server.",
"default": "API Fehler: EspoCRM API nicht verfügbar<br>Mögliches Problem: deaktiviertes Rewrite Modul. Bitte überprüfen und aktivieren Sie das Rewrite Modul (z.B. mod_rewrite im Apache Server) und die .htaccess Unterstützung."
"apache": "<h3>API Fehler: EspoCRM API nicht verfügbar</h3><br>Führen Sie nur die notwendigen Schritte durch. Nach jedem Schritt prüfen Sie bitte, ob das Problem gelöst ist.",
"nginx": "<h3>API Fehler: EspoCRM API nicht verfügbar.</h3>",
"microsoft-iis": "<h3>API Fehler: EspoCRM API nicht verfügbar</h3><br>Mögliches Problem: deaktiviertes \"URL Rewrite\". Bitte überprüfen und aktivieren Sie das \"URL Rewrite\" Modul im IIS Server.",
"default": "<h3>API Fehler: EspoCRM API nicht verfügbar</h3><br>Mögliches Problem: deaktiviertes Rewrite Modul. Bitte überprüfen und aktivieren Sie das Rewrite Modul (z.B. mod_rewrite im Apache Server) und die .htaccess Unterstützung."
}
},
"systemRequirements": {
@@ -127,4 +126,4 @@
"readable": "Lesbar",
"requiredMariadbVersion": "MariaDB Version"
}
}
}
+7 -8
View File
@@ -124,19 +124,18 @@
"pdo_mysql": "PDO MySQL"
},
"modRewriteTitle": {
"apache": "API Error: EspoCRM API is unavailable.<br> Possible problems: disabled \"mod_rewrite\" in Apache server, disabled .htaccess support or RewriteBase issue.<br>Do only necessary steps. After each step check if the issue is solved.",
"nginx": "API Error: EspoCRM API is unavailable.<br> Add this code to your Nginx server block config file (/etc/nginx/sites-available/YOUR_SITE) inside \"server\" section:",
"microsoft-iis": "API Error: EspoCRM API is unavailable.<br> Possible problem: disabled \"URL Rewrite\". Please check and enable \"URL Rewrite\" Module in IIS server",
"default": "API Error: EspoCRM API is unavailable.<br> Possible problem: disabled Rewrite Module. Please check and enable Rewrite Module in your server (e.g. mod_rewrite in Apache) and .htaccess support."
"apache": "<h3>API Error: EspoCRM API is unavailable.</h3><br>Do only necessary steps. After each step check if the issue is solved.",
"nginx": "<h3>API Error: EspoCRM API is unavailable.</h3>",
"microsoft-iis": "<h3>API Error: EspoCRM API is unavailable.</h3><br> Possible problem: disabled \"URL Rewrite\". Please check and enable \"URL Rewrite\" Module in IIS server",
"default": "<h3>API Error: EspoCRM API is unavailable.</h3><br> Possible problems: disabled Rewrite Module. Please check and enable Rewrite Module in your server (e.g. mod_rewrite in Apache) and .htaccess support."
},
"modRewriteInstruction": {
"apache": {
"linux": "<br><br>1. Enable \"mod_rewrite\". To do it run those commands in a Terminal:<pre>{APACHE1}</pre><br>2. If the previous step did not help, try to enable .htaccess support. Add/edit the Server configuration settings (/etc/apache/apache2.conf, /etc/httpd/conf/httpd.conf):<pre>{APACHE2}</pre>\n Afterwards run this command in a Terminal:<pre>{APACHE3}</pre><br>3. If the previous step did not help, try to add the RewriteBase path. Open a file {API_PATH}.htaccess and replace the following line:<pre>{APACHE4}</pre>To<pre>{APACHE5}</pre><br> For more information please visit the guideline <a href=\"https://www.espocrm.com/documentation/administration/apache-server-configuration/\" target=\"_blank\">Apache server configuration for EspoCRM</a>.<br><br>",
"windows": "<br> <pre>1. Find the httpd.conf file (usually you will find it in a folder called conf, config or something along those lines)<br>\n2. Inside the httpd.conf file uncomment the line LoadModule rewrite_module modules/mod_rewrite.so (remove the pound '#' sign from in front of the line)<br>\n3. Also find the line ClearModuleList is uncommented then find and make sure that the line AddModule mod_rewrite.c is not commented out.\n</pre>"
"linux": "<br><br><h4>1. Enable \"mod_rewrite\".</h4>To enable <i>mod_rewrite</i>, run these commands in a terminal:<br><br><pre>{APACHE1}</pre><hr><h4>2. If the previous step did not help, try to enable .htaccess support.</h4> Add/edit the server configuration settings <code>{APACHE2_PATH1}</code> or <code>{APACHE2_PATH2}</code> (or <code>{APACHE2_PATH3}</code>):<br><br><pre>{APACHE2}</pre>\n Afterwards run this command in a terminal:<br><br><pre>{APACHE3}</pre><hr><h4>3. If the previous step did not help, try to add the RewriteBase path.</h4>Open a file <code>{API_PATH}.htaccess</code> and replace the following line:<br><br><pre>{APACHE4}</pre>To<br><br><pre>{APACHE5}</pre><hr>For more information please visit the guideline <a href=\"{APACHE_LINK}\" target=\"_blank\">Apache server configuration for EspoCRM</a>.<br><br>",
"windows": "<br><br> <h4>1. Find the httpd.conf file.</h4>Usually it can be found in a folder called \"conf\", \"config\" or something along those lines.<br><br><h4>2. Edit the httpd.conf file.</h4> Inside the httpd.conf file uncomment the line <code>{WINDOWS_APACHE1}</code> (remove the pound '#' sign from in front of the line).<br><br><h4>3. Check others parameters.</h4>Also check if the line <code>ClearModuleList</code> is uncommented and make sure that the line <code>AddModule mod_rewrite.c</code> is not commented out.\n"
},
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> For more information please visit the guideline <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> For more information please visit the guideline <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>"
"linux": "<br> Add this code to your Nginx server config file <code>{NGINX_PATH}</code> inside \"server\" section:<br><br><pre>{NGINX}</pre> <br> For more information please visit the guideline <a href=\"{NGINX_LINK}\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>"
},
"microsoft-iis": {
"windows": ""
+8 -9
View File
@@ -98,19 +98,18 @@
"options": {
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1. Encontrar el archivo httpd.conf (generalmente lo encontrará en una carpeta llamada conf, config o o algo similar a esas líneas)<br>\n2. Dentro del archivo httpd.conf descomentamos la línea LoadModule rewrite_module modules/mod_rewrite.so (eliminar el '#' que está al comienzo de la línea)<br>\n3. También encuentre que la línea ClearModuleList no esté comentada después busque y asegurese que la línea AddModule mod_rewrite.c no está comentada tampoco.\n</pre>",
"linux": "<br> <br>1. Habilita \"mod_rewrite\". Para hacerlo, ejecute esos comandos en un Terminal: <pre>{APACHE1}</pre><br> 2. Habilita el soporte de .htaccess. Agregue/edite los ajustes de configuración del Servidor (/etc/apache/apache2.conf, /etc/httpd/conf/httpd.conf): <pre>{APACHE2}</pre>\nLuego ejecuta este comando en un Terminal: <pre>{APACHE3}</pre> <br>3. Intente agregar la ruta RewriteBase, abra un archivo {API_PATH} .htaccess y reemplace la siguiente línea: <pre>{APACHE4}</pre> a <pre>{APACHE5}</pre> <br> Para obtener más información, visite la guía <a href=\"https://www.espocrm.com/documentation/administration/apache-server-configuration/\" target=\"_blank\"> configuración del servidor Apache para EspoCRM </a>. <br> <br>"
"windows": "<br> <pre>1. Encontrar el archivo httpd.conf (generalmente lo encontrará en una carpeta llamada conf, config o o algo similar a esas líneas)<br>\n2. Dentro del archivo httpd.conf descomentamos la línea <code>{WINDOWS_APACHE1}</code> (eliminar el '#' que está al comienzo de la línea)<br>\n3. También encuentre que la línea ClearModuleList no esté comentada después busque y asegurese que la línea AddModule mod_rewrite.c no está comentada tampoco.\n</pre>",
"linux": "<br>1. Habilita \"mod_rewrite\". Para hacerlo, ejecute esos comandos en un Terminal: <pre>{APACHE1}</pre><br> 2. Habilita el soporte de .htaccess. Agregue/edite los ajustes de configuración del Servidor <code>{APACHE2_PATH1}</code> o <code>{APACHE2_PATH2}</code> (o <code>{APACHE2_PATH3}</code>): <pre>{APACHE2}</pre>\nLuego ejecuta este comando en un Terminal: <pre>{APACHE3}</pre> <br>3. Intente agregar la ruta RewriteBase, abra un archivo {API_PATH} .htaccess y reemplace la siguiente línea: <pre>{APACHE4}</pre> a <pre>{APACHE5}</pre> <br> Para obtener más información, visite la guía <a href=\"{APACHE_LINK}\" target=\"_blank\"> configuración del servidor Apache para EspoCRM </a>. <br> <br>"
},
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> Para obtener más información, visite la guía <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\"> configuración del servidor Nginx para EspoCRM </a>. <br> <br> <br>",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> Para obtener más información, visite la guía <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\"> configuración del servidor Nginx para EspoCRM </a>. <br> <br> <br>"
"linux": "<br> Agregar este código a su Configuración de Servidor Nginx <code>{NGINX_PATH}</code> (inside \"server\" block):\n<pre>\n{NGINX}\n</pre> <br> Para obtener más información, visite la guía <a href=\"{NGINX_LINK}\" target=\"_blank\"> configuración del servidor Nginx para EspoCRM </a>. <br> <br> <br>"
}
},
"modRewriteTitle": {
"apache": "API Error: EspoCRM API inaccesible.<br> Posibles problemas: se requiere RewriteBase , \"mod_rewrite\" desactivado en el servidor Apache o en el soporte .htaccess.",
"nginx": "API Error: EspoCRM API inaccesible.<br> Agregar este código a su Configuración de Servidor Nginx (inside \"server\" block):",
"microsoft-iis": "API Error: EspoCRM API inaccesible.<br> Problema posible: \"URL Rewrite\" desactivado. Por favor revisar y activar \"URL Rewrite\" Módulo en Servidor IIS",
"default": "API Error: EspoCRM API inaccesible.<br> Problema posible: Módulo Rewrite desactivado.Por favor revisar y activar el Módulo Rewrite en su servidor (e.g. mod_rewrite en Apache) y en el soporte .htaccess"
"apache": "<h3>API Error: EspoCRM API inaccesible.</h3><br> Posibles problemas: se requiere RewriteBase , \"mod_rewrite\" desactivado en el servidor Apache o en el soporte .htaccess.",
"nginx": "<h3>API Error: EspoCRM API inaccesible.</h3>",
"microsoft-iis": "<h3>API Error: EspoCRM API inaccesible.</h3><br> Problema posible: \"URL Rewrite\" desactivado. Por favor revisar y activar \"URL Rewrite\" Módulo en Servidor IIS",
"default": "<h3>API Error: EspoCRM API inaccesible.</h3><br> Problema posible: Módulo Rewrite desactivado.Por favor revisar y activar el Módulo Rewrite en su servidor (e.g. mod_rewrite en Apache) y en el soporte .htaccess"
}
},
"systemRequirements": {
@@ -119,4 +118,4 @@
"dbname": "Nombre de la Base de Datos",
"user": "Nombre de usuario"
}
}
}
+8 -9
View File
@@ -108,19 +108,18 @@
"options": {
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1. Encontrar el archivo httpd.conf (generalmente lo encontrará en una carpeta llamada conf, config o o algo similar a esas dis líneas)<br>\n2. Dentro del archivo httpd.conf descomentamos la línea LoadModule rewrite_module modules/mod_rewrite.so (eliminar el '#' que está al comienzo de la línea)<br>\n3. También encuentre que la línea ClearModuleList no esté comentada después busque y asegurese que la línea AddModule mod_rewrite.c no está comentada tampoco.\n</pre>",
"linux": "<br><br>1. Permita \"mod_rewrite\". Para hacerlo, ejecute estos comandos en una sesión de Terminal:<pre>{APACHE1}</pre><br>2. Permita soporte .htaccess Agregue/edite la configuración del servidor (/etc/apache/apache2.conf, /etc/httpd/conf/httpd.conf):<pre>{APACHE2}</pre>\n Después de correr esto en una sesión de Terminal:<pre>{APACHE3}</pre><br>3. Trate de agregar la ruta RewriteBase, abra el archivo {API_PATH}.htaccess y reemplace la línea:<pre>{APACHE4}</pre> por <pre>{APACHE5}</pre><br> Para más información, vea la guía <a href=\"https://www.espocrm.com/documentation/administration/apache-server-configuration/\" target=\"_blank\">Apache server configuration for EspoCRM (en inglés)</a>.<br><br>"
"windows": "<br> <pre>1. Encontrar el archivo httpd.conf (generalmente lo encontrará en una carpeta llamada conf, config o o algo similar a esas dis líneas)<br>\n2. Dentro del archivo httpd.conf descomentamos la línea <code>{WINDOWS_APACHE1}</code> (eliminar el '#' que está al comienzo de la línea)<br>\n3. También encuentre que la línea ClearModuleList no esté comentada después busque y asegurese que la línea AddModule mod_rewrite.c no está comentada tampoco.\n</pre>",
"linux": "<br><br>1. Permita \"mod_rewrite\". Para hacerlo, ejecute estos comandos en una sesión de Terminal:<pre>{APACHE1}</pre><br>2. Permita soporte .htaccess Agregue/edite la configuración del servidor (<code>{APACHE2_PATH1}</code>, <code>{APACHE2_PATH2}</code>, <code>{APACHE2_PATH3}</code>):<pre>{APACHE2}</pre>\n Después de correr esto en una sesión de Terminal:<pre>{APACHE3}</pre><br>3. Trate de agregar la ruta RewriteBase, abra el archivo {API_PATH}.htaccess y reemplace la línea:<pre>{APACHE4}</pre> por <pre>{APACHE5}</pre><br> Para más información, vea la guía <a href=\"{APACHE_LINK}\" target=\"_blank\">Apache server configuration for EspoCRM (en inglés)</a>.<br><br>"
},
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> Para obtener más información, vea la guía <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM (en inglés)</a>.<br><br>",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> Para obtener más información, vea la guía <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM (en inglés)</a>.<br><br>"
"linux": "<br> Añada este código al archivo de configuración de su servidor Nginx <code>{NGINX_PATH}</code> en la sección \"server\": \n<pre>\n{NGINX}\n</pre> <br> Para obtener más información, vea la guía <a href=\"{NGINX_LINK}\" target=\"_blank\">Nginx server configuration for EspoCRM (en inglés)</a>.<br><br>"
}
},
"modRewriteTitle": {
"apache": "API Error: EspoCRM API is unavailable.<br> Posibles problemas: \"mod_rewrite\" deshabilitado en el servidor Apache, soporte .htaccess deshabilitado o problema en RewriteBase.<br>Avance paso por paso. Después de cada paso, verifique si resolvió su problema. ",
"nginx": "API Error: EspoCRM API is unavailable.<br> Añada este código al archivo de configuración de su servidor Nginx (/etc/nginx/sites-available/YOUR_SITE) en la sección \"server\": ",
"microsoft-iis": "API Error: EspoCRM API is unavailable.<br> Posible problema: \"URL Rewrite\" deshabilitado. Verifique y active el módulo \"URL Rewrite\" en su servidor IIS",
"default": "API Error: EspoCRM API is unavailable.<br> Posible problema: Módulo Rewrite deshabilitado. Verifique y Active el Módulo Rewrite en su servidor (e.g. mod_rewrite en Apache) y el soporte .htaccess. "
"apache": "<h3>API Error: EspoCRM API is unavailable.</h3><br>Avance paso por paso. Después de cada paso, verifique si resolvió su problema. ",
"nginx": "<h3>API Error: EspoCRM API is unavailable.</h3>",
"microsoft-iis": "<h3>API Error: EspoCRM API is unavailable.</h3><br> Posible problema: \"URL Rewrite\" deshabilitado. Verifique y active el módulo \"URL Rewrite\" en su servidor IIS",
"default": "<h3>API Error: EspoCRM API is unavailable.</h3><br> Posible problema: Módulo Rewrite deshabilitado. Verifique y Active el Módulo Rewrite en su servidor (e.g. mod_rewrite en Apache) y el soporte .htaccess. "
}
},
"systemRequirements": {
@@ -132,4 +131,4 @@
"writable": "Permite grabar",
"readable": "Permite leer"
}
}
}
+4 -5
View File
@@ -96,17 +96,16 @@
"options": {
"modRewriteTitle": {
"apache": "خطای API: EspoCRM API در دسترس نیست. <br> مشکلات احتمالی: \"mod_rewrite\" را در سرور آپاچی غیرفعال کنید، پشتیبانی از .htaccess یا RewriteBase غیرفعال شده است. <br> تنها مراحل لازم را انجام دهید. بعد از هر مرحله چک کنید اگر مسئله حل شود.",
"nginx": "خطای API: EspoCRM API در دسترس نیست. <br> این کد را به فایل پیکربندی سرور Nginx خود اضافه کنید (/ etc / nginx / sites-available / YOUR_SITE) در داخل «سرور»:",
"nginx": "خطای API: EspoCRM API در دسترس نیست.",
"microsoft-iis": "خطای API: EspoCRM API در دسترس نیست. <br> مشکل : غیرفعال \"URL Rewrite\". لطفا ماژول URL Rewrite را در سرور IIS چک کنید و فعال کنید",
"default": "خطای API: EspoCRM API در دسترس نیست. <br> مشکل احتمالی: غیر فعال بودن ماژول Rewrite. لطفا ماژولRewrite را در سرور خود چک کنید و فعال کنید (به عنوان مثال mod_rewrite در Apache) و پشتیبانی از .htaccess."
},
"modRewriteInstruction": {
"apache": {
"linux": "<br> <br> 1. فعال کردن \\\"mod_rewrite\\\" برای انجام آن دستوراتی که در ترمینال اجرا می شود: <pre> {APACHE1} </pre> <br> 2. پشتیبانی از .htaccess را فعال کنید افزودن / ویرایش تنظیمات پیکربندی سرور (/etc/apache/apache2.conf، /etc/httpd/conf/httpd.conf): <pre> {APACHE2} </pre>\n  بعد از اجرای این دستور در ترمینال: <pre> {APACHE3} </pre> <br> 3. سعی کنید مسیر RewriteBase را اضافه کنید، فایل {API_PATH} .htaccess را باز کنید و خط زیر را جایگزین کنید: <pre> {APACHE4} </pre> برای <pre> {APACHE5} </pre> <br> برای اطلاعات بیشتر لطفا دستورالعمل <a href=\\\"https://www.espocrm.com/documentation/administration/apache-server-configuration/\\\" target=\\\"_blank\\\"> پیکربندی سرور Apache برای EspoCRM </a>. <br> <br>"
"linux": "<br> <br> 1. فعال کردن \"mod_rewrite\" برای انجام آن دستوراتی که در ترمینال اجرا می شود: <pre>{APACHE1}</pre> <br> 2. پشتیبانی از .htaccess را فعال کنید افزودن / ویرایش تنظیمات پیکربندی سرور (<code>{APACHE2_PATH1}</code>, <code>{APACHE2_PATH2}</code>, <code>{APACHE2_PATH3}</code>): <pre>{APACHE2}</pre>\n  بعد از اجرای این دستور در ترمینال: <pre>{APACHE3}</pre> <br> 3. سعی کنید مسیر RewriteBase را اضافه کنید، فایل {API_PATH} .htaccess را باز کنید و خط زیر را جایگزین کنید: <pre>{APACHE4}</pre> برای <pre> {APACHE5} </pre> <br> برای اطلاعات بیشتر لطفا دستورالعمل <a href=\"{APACHE_LINK}\" target=\"_blank\"> پیکربندی سرور Apache برای EspoCRM </a>. <br> <br>"
},
"nginx": {
"linux": "<br>\\n<pre>\\n{NGINX}\\n</pre> <br> برای کسب اطلاعات بیشتر، از دستورالعمل <a href=\\\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\\\" target=\\\"_blank\\\"> پیکربندی سرور Nginx برای EspoCRM <br> <br> <br> <br>",
"windows": "<br>\\n<pre>\\n{NGINX}\\n</pre> <br> برای کسب اطلاعات بیشتر، از دستورالعمل <a href=\\\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\\\" target=\\\"_blank\\\"> پیکربندی سرور Nginx برای EspoCRM <br> <br> <br> <br>"
"linux": "<br><br> این کد را به فایل پیکربندی سرور Nginx خود اضافه کنید <code>{NGINX_PATH}</code> در داخل «سرور»:\n<pre>\n{NGINX}\n</pre> <br> برای کسب اطلاعات بیشتر، از دستورالعمل <a href=\"{NGINX_LINK}\" target=\"_blank\"> پیکربندی سرور Nginx برای EspoCRM <br> <br> <br> <br>"
}
}
},
@@ -114,4 +113,4 @@
"dbname": "نام پایگاه داده",
"user": "نام کاربری"
}
}
}
+8 -9
View File
@@ -97,19 +97,18 @@
"options": {
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1. Pronađite httpd.conf datoteku (uobičajeno je u direktoriju conf, config ili nešto slično)<br>\n2. Unutar httpd.conf datoteke maknite komentar sa reda LoadModule rewrite_module modules/mod_rewrite.so (maknite '#' znak na početku reda)<br>\n3. Provjerite i da li su ClearModuleList AddModule mod_rewrite.c također bez znaka #.\n</pre>",
"linux": "br><br>1.Omogućite \"mod_rewrite\". Da biste to napravili, pokrenite ovaj kod u terminalu:<pre>{APACHE1}</pre><br>2. Omogućite .htaccess podršku. Dodajte/izmijenite postavke servera (/etc/apache/apache2.conf, /etc/httpd/conf/httpd.conf):<pre>{APACHE2}</pre>\n Nakon toga pokrenite ovaj kod na serveru:<pre>{APACHE3}</pre><br>3. Pokušajte dodati RewriteBase putanju, otvorite datoteku {API_PATH}.htaccess i izmijenite slijedeći red:<pre>{APACHE4}</pre>NA<pre>{APACHE5}</pre><br> Za više informacija posjetite <a href=\"https://www.espocrm.com/documentation/administration/apache-server-configuration/\" target=\"_blank\">Apache server konfiguraciju za EspoCRM</a>.<br><br>"
"windows": "<br> <pre>1. Pronađite httpd.conf datoteku (uobičajeno je u direktoriju conf, config ili nešto slično)<br>\n2. Unutar httpd.conf datoteke maknite komentar sa reda <code>{WINDOWS_APACHE1}</code> (maknite '#' znak na početku reda)<br>\n3. Provjerite i da li su ClearModuleList AddModule mod_rewrite.c također bez znaka #.\n</pre>",
"linux": "<br>1.Omogućite \"mod_rewrite\". Da biste to napravili, pokrenite ovaj kod u terminalu:<pre>{APACHE1}</pre><br>2. Omogućite .htaccess podršku. Dodajte/izmijenite postavke servera (<code>{APACHE2_PATH1}</code>, <code>{APACHE2_PATH2}</code>, <code>{APACHE2_PATH3}</code>):<pre>{APACHE2}</pre>\n Nakon toga pokrenite ovaj kod na serveru:<pre>{APACHE3}</pre><br>3. Pokušajte dodati RewriteBase putanju, otvorite datoteku {API_PATH}.htaccess i izmijenite slijedeći red:<pre>{APACHE4}</pre>NA<pre>{APACHE5}</pre><br> Za više informacija posjetite <a href=\"{APACHE_LINK}\" target=\"_blank\">Apache server konfiguraciju za EspoCRM</a>.<br><br>"
},
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> Za više informacija posjetite <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server konfiguracija za EspoCRM</a>.<br><br>",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> Za više informacija posjetite <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server konfiguracija za EspoCRM</a>.<br><br>"
"linux": "<br> Dodajte ovaj kod u svoju Nginx config datoteku <code>{NGINX_PATH}</code> unutar \"server\" sekcije:\n<pre>\n{NGINX}\n</pre> <br> Za više informacija posjetite <a href=\"{NGINX_LINK}\" target=\"_blank\">Nginx server konfiguracija za EspoCRM</a>.<br><br>"
}
},
"modRewriteTitle": {
"apache": "API Greška: EspoCRM API nije dostupan.<br> Mogući problem: \"mod_rewrite\" isključen na Apache serveru, isključena .htaccess podrška ili RewriteBase problem.<br>Učinite samo neophodne izmjene. Poslije svake provjerite da li je problem riješen.",
"nginx": "API greška: EspoCRM API je dostupan <br> Dodajte ovaj kod u svoju Nginx config datoteku (/etc/nginx/sites-available/YOUR_SITE) unutar \"server\" sekcije:",
"microsoft-iis": "API greška: EspoCRM API je dostupan <br> Mogući problem: onemogućen \"URL Rewrite \". Molimo provjerite i omogućite \"URL Rewrite \" modul u IIS serveru",
"default": "API greška: EspoCRM API je dostupan <br> Mogući problem: onemogućen Rewrite Module. Molimo provjerite i omogućiti Rewrite Module u vašem serveru (npr mod_rewrite u Apachu) i .htaccess podršku."
"apache": "<h3>API Greška: EspoCRM API nije dostupan.</h3><br> Učinite samo neophodne izmjene. Poslije svake provjerite da li je problem riješen.",
"nginx": "<h3>API greška: EspoCRM API je dostupan</h3>",
"microsoft-iis": "<h3>API greška: EspoCRM API je dostupan</h3><br> Mogući problem: onemogućen \"URL Rewrite \". Molimo provjerite i omogućite \"URL Rewrite \" modul u IIS serveru",
"default": "<h3>API greška: EspoCRM API je dostupan</h3> <br> Mogući problem: onemogućen Rewrite Module. Molimo provjerite i omogućiti Rewrite Module u vašem serveru (npr mod_rewrite u Apachu) i .htaccess podršku."
}
},
"systemRequirements": {
@@ -118,4 +117,4 @@
"dbname": "Ime baze",
"user": "Korisničko ime"
}
}
}
+7 -8
View File
@@ -98,18 +98,17 @@
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1. Keresse meg a httpd.conf fájlt (általában megtalálja azt egy mappában, amit conf, config vagy valami hasonló sorok mentén talál) <br>\n2. A httpd.conf fájl belsejében olvassa el a LoadModule rewrite_module modulok / mod_rewrite.so sorát (távolítsa el a font \"#\" jelet a sor elejéről) <br>\n3. Keresse meg a ClearModuleList vonalat sem, majd keresse meg és győződjön meg róla, hogy a mod_rewrite.c AddModule vonalat nem kommentálta.\n</pre>",
"linux": "Matton 1. Engedélyezze a \"mod_rewrite\" beállítást. Ehhez futtassa ezeket a parancsokat egy terminálban: <pre>{APACHE1}</pre> <br> 2. Engedélyezze a .htaccess támogatást. A kiszolgáló konfigurációs beállításainak hozzáadása / szerkesztése (/etc/apache/apache2.conf, /etc/httpd/conf/httpd.conf): <pre>{APACHE2}</pre>\nEzután futtassa ezt a parancsot egy terminálban: <pre>{APACHE3}</pre> <br> 3. Próbálja meg hozzáadni a RewriteBase elérési utat, nyisson meg egy {API_PATH} .htaccess fájlt, és cserélje ki a következő sort: <pre>{APACHE4}</pre> A <pre>{APACHE5}</pre> az <a href=\"https://www.espocrm.com/documentation/administration/apache-server-configuration/\" target=\"_blank\"> Apache kiszolgáló konfigurációja az EspoCRM-hez </a>. <br> <br>"
"linux": "<br><br>Matton 1. Engedélyezze a \"mod_rewrite\" beállítást. Ehhez futtassa ezeket a parancsokat egy terminálban: <pre>{APACHE1}</pre> <br> 2. Engedélyezze a .htaccess támogatást. A kiszolgáló konfigurációs beállításainak hozzáadása / szerkesztése (<code>{APACHE2_PATH1}</code>, <code>{APACHE2_PATH2}</code>, <code>{APACHE2_PATH3}</code>): <pre>{APACHE2}</pre>\nEzután futtassa ezt a parancsot egy terminálban: <pre>{APACHE3}</pre> <br> 3. Próbálja meg hozzáadni a RewriteBase elérési utat, nyisson meg egy {API_PATH} .htaccess fájlt, és cserélje ki a következő sort: <pre>{APACHE4}</pre> A <pre>{APACHE5}</pre> az <a href=\"{APACHE_LINK}\" target=\"_blank\"> Apache kiszolgáló konfigurációja az EspoCRM-hez </a>. <br> <br>"
},
"nginx": {
"linux": "<pre>\n{Nginx}\n</pre> <br> További információkért látogasson el a <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\"> Útmutató a Nginx kiszolgáló konfigurációjához EspoCRM </a>.",
"windows": "<pre>\n{Nginx}\n</pre> <br> További információkért látogasson el a <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\"> Útmutató a Nginx kiszolgáló konfigurációjához EspoCRM </a>."
"linux": "<br> Adja hozzá ezt a kódot a \"server\" szakaszban a Nginx kiszolgáló blokk konfigurációs fájljához <code>{NGINX_PATH}</code>:<br><pre>\n{NGINX}\n</pre> <br> További információkért látogasson el a <a href=\"{NGINX_LINK}\" target=\"_blank\"> Útmutató a Nginx kiszolgáló konfigurációjához EspoCRM </a>."
}
},
"modRewriteTitle": {
"apache": "API hiba: Az EspoCRM API nem érhető el. <br> Lehetséges problémák: letiltott \"mod_rewrite\" az Apache szerveren, letiltott .htaccess támogatás vagy RewriteBase kiadás. <br> Csak a szükséges lépéseket tegye meg. Minden lépés után ellenőrizze, hogy a probléma megoldódott-e.",
"nginx": "API hiba: Az EspoCRM API nem érhető el. <br> Adja hozzá ezt a kódot a \"server\" szakaszban a Nginx kiszolgáló blokk konfigurációs fájljához (/etc/nginx/sites-available/YOUR_SITE)",
"microsoft-iis": "API-hiba: az EspoCRM API nem érhető el. <br> Lehetséges probléma: letiltva \"URL Rewrite\". Kérjük, ellenőrizze és engedélyezze az \"URL Rewrite\" modult az IIS kiszolgálón",
"default": "API hiba: Az EspoCRM API nem érhető el. <br> Lehetséges probléma: letiltva újraírható modul. Kérjük, ellenőrizze és engedélyezze a Rewrite Modult a kiszolgálón (például mod_rewrite az Apache-ban) és a .htaccess támogatást."
"apache": "<h3>API hiba: Az EspoCRM API nem érhető el.</h3> <br> Csak a szükséges lépéseket tegye meg. Minden lépés után ellenőrizze, hogy a probléma megoldódott-e.",
"nginx": "<h3>API hiba: Az EspoCRM API nem érhető el.</h3>",
"microsoft-iis": "<h3>API-hiba: az EspoCRM API nem érhető el.</h3> <br> Lehetséges probléma: letiltva \"URL Rewrite\". Kérjük, ellenőrizze és engedélyezze az \"URL Rewrite\" modult az IIS kiszolgálón",
"default": "<h3>API hiba: Az EspoCRM API nem érhető el.<h3> <br> Lehetséges probléma: letiltva újraírható modul. Kérjük, ellenőrizze és engedélyezze a Rewrite Modult a kiszolgálón (például mod_rewrite az Apache-ban) és a .htaccess támogatást."
}
},
"systemRequirements": {
@@ -118,4 +117,4 @@
"dbname": "Adatbázis név",
"user": "Felhasználónév"
}
}
}
+7 -7
View File
@@ -98,14 +98,14 @@
"modRewriteInstruction": {
"apache": {
"windows": "Situs <pre> 1. Cari file httpd.conf (biasanya Anda akan menemukannya dalam folder bernama conf, konfigurasi atau sesuatu sepanjang garis) Situs\n2. Di dalam file httpd.conf tanda komentar pada LoadModule baris modul rewrite_module / mod_rewrite.so (menghapus pound '#' tanda dari di garis depan) <br>\n3. Juga menemukan garis ClearModuleList adalah tanda komentar kemudian cari dan pastikan bahwa garis AddModule mod_rewrite.c tidak komentar.\n</ Pre>",
"linux": "<br><br>1. Aktifkan \"mod_rewrite\". Untuk melakukannya menjalankan perintah-perintah dalam Terminal: <pre>{APACHE1}</pre> 2. Mengaktifkan dukungan .htaccess. Tambahkan/edit pengaturan konfigurasi Server (/etc/apache/apache2.conf, /etc/httpd/conf/httpd.conf): <pre>{APACHE2}</pre>\n Setelah menjalankan perintah ini di Terminal: <pre>{APACHE3}</pre> 3. Cobalah untuk menambahkan jalur RewriteBase, membuka file {API_PATH} .htaccess dan mengganti baris berikut: <pre>{APACHE4}</pre> Untuk <pre>{APACHE5}</pre><br> For more information please visit the guideline <a href=\"https://www.espocrm.com/documentation/administration/apache-server-configuration/\" target=\"_blank\">Apache server configuration for EspoCRM</a>.<br><br>"
}
"linux": "<br><br>1. Aktifkan \"mod_rewrite\". Untuk melakukannya menjalankan perintah-perintah dalam Terminal: <pre>{APACHE1}</pre> 2. Mengaktifkan dukungan .htaccess. Tambahkan/edit pengaturan konfigurasi Server (<code>{APACHE2_PATH1}</code>, <code>{APACHE2_PATH2}</code>, <code>{APACHE2_PATH3}</code>): <pre>{APACHE2}</pre>\n Setelah menjalankan perintah ini di Terminal: <pre>{APACHE3}</pre> 3. Cobalah untuk menambahkan jalur RewriteBase, membuka file {API_PATH} .htaccess dan mengganti baris berikut: <pre>{APACHE4}</pre> Untuk <pre>{APACHE5}</pre><br> For more information please visit the guideline <a href=\"{APACHE_LINK}\" target=\"_blank\">Apache server configuration for EspoCRM</a>.<br><br>"
}
},
"modRewriteTitle": {
"apache": "API Kesalahan: EspoCRM API tersedia <br> Kemungkinan masalah: cacat \"mod_rewrite\" di server Apache, dukungan htaccess cacat atau masalah RewriteBase Situs Apakah langkah hanya diperlukan.. Setelah setiap cek langkah jika masalah tersebut dipecahkan.",
"nginx": "API Kesalahan: EspoCRM API tersedia Situs Tambahkan kode ini ke Anda Nginx host Config (dalam \"server\" block):",
"microsoft-iis": "API Kesalahan:. EspoCRM API tersedia <br> masalah yang mungkin terjadi: cacat \"URL Rewrite\". Silakan periksa dan mengaktifkan \"URL Rewrite\" Modul di IIS server",
"default": "API Kesalahan:. EspoCRM API tersedia <br> masalah Kemungkinan: cacat Modul Rewrite. Silakan periksa dan memungkinkan Modul Rewrite di server Anda (misalnya mod_rewrite di Apache) dan dukungan .htaccess."
"apache": "<h3>API Kesalahan: EspoCRM API tersedia</h3><br> Kemungkinan masalah: cacat \"mod_rewrite\" di server Apache, dukungan htaccess cacat atau masalah RewriteBase Situs Apakah langkah hanya diperlukan.. Setelah setiap cek langkah jika masalah tersebut dipecahkan.",
"nginx": "<h3>API Kesalahan: EspoCRM API tersedia</h3>",
"microsoft-iis": "<h3>API Kesalahan:. EspoCRM API tersedia</h3> <br> masalah yang mungkin terjadi: cacat \"URL Rewrite\". Silakan periksa dan mengaktifkan \"URL Rewrite\" Modul di IIS server",
"default": "<h3>API Kesalahan: EspoCRM API tersedia</h3><br> masalah Kemungkinan: cacat Modul Rewrite. Silakan periksa dan memungkinkan Modul Rewrite di server Anda (misalnya mod_rewrite di Apache) dan dukungan .htaccess."
}
},
"systemRequirements": {
@@ -114,4 +114,4 @@
"dbname": "Nama database",
"user": "Nama pengguna"
}
}
}
+7 -8
View File
@@ -110,18 +110,17 @@
"options": {
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1.Trovare il file httpd.conf (di solito si trova in una cartella denominata conf , configurazione o qualcosa del genere)<br>\n2. All'interno del file httpd.conf decommentare la riga LoadModule rewrite_module modules/mod_rewrite.so (rimuovere il simbolo '#' all'inizio della riga)<br>\n3. Controllare che la linea ClearModuleList è commentata, quindi trovare e fare in modo che la linea AddModule mod_rewrite.c non sia commentata.\n</pre>"
"windows": "<br> <pre>1.Trovare il file httpd.conf (di solito si trova in una cartella denominata conf , configurazione o qualcosa del genere)<br>\n2. All'interno del file httpd.conf decommentare la riga <code>{WINDOWS_APACHE1}</code> (rimuovere il simbolo '#' all'inizio della riga)<br>\n3. Controllare che la linea ClearModuleList è commentata, quindi trovare e fare in modo che la linea AddModule mod_rewrite.c non sia commentata.\n</pre>"
},
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> Per maggiori informazioni, visitare la Guida in Linea <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> Per maggiori informazioni, visitare la Guida in Linea <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>"
"linux": "<br> Aggiungere questo codice al file di configurazione del server blocco Nginx <code>{NGINX_PATH}</code> nella sezione \"server\":\n<pre>\n{NGINX}\n</pre> <br> Per maggiori informazioni, visitare la Guida in Linea <a href=\"{NGINX_LINK}\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>"
}
},
"modRewriteTitle": {
"apache": "API Error: EspoCRM API non è disponibile.<br> Possibili problemi : disattivato \"mod_rewrite\" nel server Apache, disabilitato il supporto a .htaccess oppure un problema di RewriteBase.<br>Procedi un passo all volta. Dopo ogni passo controlla se il problema è risolto .",
"nginx": "API Error: EspoCRM API non è disponibile.<br> Aggiungere questo codice al file di configurazione del server blocco Nginx (/etc/nginx/sites-available/YOUR_SITE) nella sezione \"server\" :",
"microsoft-iis": "API Error: EspoCRM API non è disponibile.<br> Possibili problemi : disattivato \"URL Rewrite\". Si prega di controllare e attivare il Modulo nel IIS server \"URL Rewrite\" ",
"default": "API Error: EspoCRM API non è disponibile.<br> Possibili problemi : disattivato il Modulo Rewrite. Si prega di controllare e attivare il Rewrite Module sul vostro server (e.g. mod_rewrite in Apache) e il supporto .htaccess."
"apache": "<h3>API Error: EspoCRM API non è disponibile.</h3><br>Procedi un passo all volta. Dopo ogni passo controlla se il problema è risolto .",
"nginx": "<h3>API Error: EspoCRM API non è disponibile.</h3>",
"microsoft-iis": "<h3>API Error: EspoCRM API non è disponibile.</h3><br> Possibili problemi : disattivato \"URL Rewrite\". Si prega di controllare e attivare il Modulo nel IIS server \"URL Rewrite\" ",
"default": "<h3>API Error: EspoCRM API non è disponibile.<h3><br> Possibili problemi : disattivato il Modulo Rewrite. Si prega di controllare e attivare il Rewrite Module sul vostro server (e.g. mod_rewrite in Apache) e il supporto .htaccess."
}
},
"systemRequirements": {
@@ -133,4 +132,4 @@
"writable": "Scrivibile",
"readable": "Leggibile"
}
}
}
+7 -8
View File
@@ -107,18 +107,17 @@
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1. Suraskite httpd.conf failą (paprastai jį rasite aplanke, pavadintame conf, config arba kažką panašaus į šias eilutes) <br>\n2. Failo httpd.conf viduje atkomentuokite eilutę LoadModule rewrite_module modules / mod_rewrite.so (priešais liniją nuimkite ženkliuką \"#\") <br>\n3. Taip pat raskite eilutę ClearModuleList yra nekomentuotų, tada suraskite ir įsitikinkite, kad eilutė AddModule mod_rewrite.c nėra komentuojama.\n</pre>",
"linux": "<br> <br> 1. Įgalinti \\\"mod_rewrite\\\". Norėdami tai padaryti, paleiskite tas komandas terminale: <pre>{APACHE1} </pre> <br> 2. Įgalinti .htaccess palaikymą. Pridėti / redaguoti serverio konfigūracijos nustatymus (/etc/apache/apache2.conf, /etc/httpd/conf/httpd.conf): <pre>{APACHE2}</pre> \\nVėliau paleiskite šią komandą į terminalą: <pre>{APACHE3}</pre> <br> 3. Pabandykite įtraukti RewriteBase kelią, atidarykite failą {API_PATH} .htaccess ir pakeiskite šią eilutę: <pre>{APACHE4}</pre> to <pre>{APACHE5}</pre> <br> Daugiau informacijos rasite apsilankę <a href=\\\"https://www.espocrm.com/documentation/administration/apache-server-configuration/\\\" target=\\\"_blank\\\"> EspoCRM konfigūracija \\\"Apache\\\" </a>. <br> <br>"
"linux": "<br> 1. Įgalinti \"mod_rewrite\". Norėdami tai padaryti, paleiskite tas komandas terminale: <pre>{APACHE1} </pre> <br> 2. Įgalinti .htaccess palaikymą. Pridėti / redaguoti serverio konfigūracijos nustatymus (<code>{APACHE2_PATH1}</code>, <code>{APACHE2_PATH2}</code>, <code>{APACHE2_PATH3}</code>): <pre>{APACHE2}</pre> \nVėliau paleiskite šią komandą į terminalą: <pre>{APACHE3}</pre> <br> 3. Pabandykite įtraukti RewriteBase kelią, atidarykite failą {API_PATH} .htaccess ir pakeiskite šią eilutę: <pre>{APACHE4}</pre> to <pre>{APACHE5}</pre> <br> Daugiau informacijos rasite apsilankę <a href=\"{APACHE_LINK}\" target=\"_blank\"> EspoCRM konfigūracija \"Apache\" </a>. <br> <br>"
},
"nginx": {
"linux": "<br>\\n<pre>\\n{NGINX}\\n</pre> <br> Daugiau informacijos rasite <a href=\\\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\\\" target=\\\"_blank\\\"> Nginx serverio konfigūracijoje EspoCRM </a>. <br> <br>",
"windows": "<br>\\n<pre>\\n{NGINX}\\n</pre> <br> Daugiau informacijos rasite <a href=\\\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\\\" target=\\\"_blank\\\"> Nginx serverio konfigūracijoje EspoCRM </a>. <br> <br>"
"linux": "<br> Pridėti šį kodą į jūsų Nginx serverio blokų konfigūracijos failą <code>{NGINX_PATH}</code> \"serverio\" skyriuje:<pre>\n{NGINX}\n</pre> <br> Daugiau informacijos rasite <a href=\"{NGINX_LINK}\" target=\"_blank\"> Nginx serverio konfigūracijoje EspoCRM </a>. <br> <br>"
}
},
"modRewriteTitle": {
"apache": "API Klaida: EspoCRM API nepasiekiamas. <br> Galimos problemos: išjungta \"mod_rewrite\" \"Apache\" serveryje, išjungtas .htaccess palaikymas arba \"RewriteBase\" problema. <br> Atlikite tik būtinus veiksmus. Po kiekvieno žingsnio patikrinkite, ar problema išspręsta.",
"nginx": "API Klaida: EspoCRM API nepasiekiamas. <br> Pridėti šį kodą į jūsų Nginx serverio blokų konfigūracijos failą (/ etc / nginx / sites-available / YOUR_SITE) \"serverio\" skyriuje:",
"microsoft-iis": "API Klaida: EspoCRM API nepasiekiamas. <br> Galima problema: išjungta \"URL Rewrite\". Patikrinkite ir įjunkite \"URL Rewrite\" modulį IIS serveryje",
"default": "API Klaida: EspoCRM API nepasiekiamas. <br> Galima problema: neįgalintas Rewrite Module. Patikrinkite ir įjunkite \"Rewrite Module\" savo serveryje (pvz., Mod_rewrite \"Apache\") ir .htaccess palaikymą."
"apache": "<h3>API Klaida: EspoCRM API nepasiekiamas.</h3> <br> Atlikite tik būtinus veiksmus. Po kiekvieno žingsnio patikrinkite, ar problema išspręsta.",
"nginx": "<h3>API Klaida: EspoCRM API nepasiekiamas.</h3>",
"microsoft-iis": "<h3>API Klaida: EspoCRM API nepasiekiamas.</h3> Galima problema: išjungta \"URL Rewrite\". Patikrinkite ir įjunkite \"URL Rewrite\" modulį IIS serveryje",
"default": "<h3>API Klaida: EspoCRM API nepasiekiamas.</h3> Galima problema: neįgalintas Rewrite Module. Patikrinkite ir įjunkite \"Rewrite Module\" savo serveryje (pvz., Mod_rewrite \"Apache\") ir .htaccess palaikymą."
}
},
"systemRequirements": {
@@ -130,4 +129,4 @@
"writable": "Įrašymo",
"readable": "Skaitymo"
}
}
}
+7 -8
View File
@@ -110,18 +110,17 @@
"options": {
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1. Atrodiet failu \"httpd.conf\" (parasti to var atrast mapē ar nosaukumu \"conf\", \"config\" u. tml.)<br>\n2. Failā \"httpd.conf\" atkomentējiet rindu \"LoadModule rewrite_module modules/mod_rewrite.so\" (noņemiet rindas sākumā esošās restītes \"#\" )<br>\n3. Tāpat pārliecinieties, ka rinda \"ClearModuleList\" ir atkomentēta un rinda \"AddModule mod_rewrite.c\" nav atzīmēta ar zvaigznīti.\n</pre>"
"windows": "<br> <pre>1. Atrodiet failu \"httpd.conf\" (parasti to var atrast mapē ar nosaukumu \"conf\", \"config\" u. tml.)<br>\n2. Failā \"httpd.conf\" atkomentējiet rindu <code>{WINDOWS_APACHE1}</code> (noņemiet rindas sākumā esošās restītes \"#\" )<br>\n3. Tāpat pārliecinieties, ka rinda \"ClearModuleList\" ir atkomentēta un rinda \"AddModule mod_rewrite.c\" nav atzīmēta ar zvaigznīti.\n</pre>"
},
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> Vairāk informācijas atradīsiet vadlīnijās <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> Vairāk informācijas atradīsiet vadlīnijās <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>"
"linux": "<br>Pievienojiet šo kodu jūsu \"Nginx\" servera bloku konfigurācijas failam <code>{NGINX_PATH}</code> \"servera\" sadaļā:\n<pre>\n{NGINX}\n</pre> <br> Vairāk informācijas atradīsiet vadlīnijās <a href=\"{NGINX_LINK}\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>"
}
},
"modRewriteTitle": {
"apache": "API kļūda: \"EspoCRM\" API nav pieejams.<br> Iespējamās problēmas: \"Apache\" serverī nav atļauts \"mod_rewrite\", nav atļauts \".htaccess\" atbalsts vai bāzes pārrakstīšanas problēma.<br>Veiciet tikai nepieciešamos soļus. Pēc katra soļa pārbaudiet, vai problēma ir atrisināta.",
"nginx": "API kļūda: \"EspoCRM\" API nav pieejams.<br> Pievienojiet šo kodu jūsu \"Nginx\" servera bloku konfigurācijas failam (/etc/nginx/sites-available/YOUR_SITE) \"servera\" sadaļā:",
"microsoft-iis": "API kļūda: \"EspoCRM\" API nav pieejams.<br> Iespējamā problēma: nav atļauts \"URL Rewrite\". Pārbaudiet un atļaujiet \"URL Rewrite\" moduli IIS serverī",
"default": "API kļūda: EspoCRM API nav pieejams.<br> Iespējamā problēma: nav atļauts \"Rewrite\" modulis. Pārbaudiet un atļaujiet \"Rewrite\" moduli serverī (Piem., mod_rewrite \"Apache\" serverī) un \".htaccess\" atbalstu."
"apache": "<h3>API kļūda: EspoCRM API nav pieejams.</h3><br>Veiciet tikai nepieciešamos soļus. Pēc katra soļa pārbaudiet, vai problēma ir atrisināta.",
"nginx": "<h3>API kļūda: \"EspoCRM\" API nav pieejams.</h3>",
"microsoft-iis": "<h3>API kļūda: \"EspoCRM\" API nav pieejams.</h3>Iespējamā problēma: nav atļauts \"URL Rewrite\". Pārbaudiet un atļaujiet \"URL Rewrite\" moduli IIS serverī",
"default": "<h3>API kļūda: EspoCRM API nav pieejams.</h3> Iespējamā problēma: nav atļauts \"Rewrite\" modulis. Pārbaudiet un atļaujiet \"Rewrite\" moduli serverī (Piem., mod_rewrite \"Apache\" serverī) un \".htaccess\" atbalstu."
}
},
"systemRequirements": {
@@ -133,4 +132,4 @@
"writable": "Rakstiski",
"readable": "Lasāmi"
}
}
}
+8 -9
View File
@@ -95,19 +95,18 @@
"options": {
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1. Finn httpd.conf file (du finner den vanligvis i en mappe kalt conf, config eller lignende)<br>\n2. I httpd.conf-filen må du avkommentere linjen LoadModule rewrite_module modules/mod_rewrite.so (ved å fjerne '#'-symbolet i starten av linjen)<br>\n3. Sjekk også at linjen ClearModuleList og AddModule mod_rewrite.c er avkommentert.\n</pre> ",
"linux": "<br><br>1. Aktiver \"mod_rewrite\". For å gjøre det, kjør disse kommandoene:<pre>{APACHE1}</pre><br>2. Aktiver støtte for .htaccess. Legg til / rediger tjenerens konfigurasjon (/etc/apache/apache2.conf, /etc/httpd/conf/httpd.conf):<pre>{APACHE2}</pre>\n Kjør følgende kommando etterpå:<pre>{APACHE3}</pre><br>3. Forsøk å legg til RewriteBase-banen, åpne filen {API_PATH}.htaccess og erstatt følgende linje:<pre>{APACHE4}</pre>til<pre>{APACHE5}</pre><br> For mer informasjon kan du gå til veiledningen <a href=\"https://www.espocrm.com/documentation/administration/apache-server-configuration/\" target=\"_blank\">\"Konfigurasjon av Apache-tjener for EspoCRM</a>.<br><br>"
"windows": "<br> <pre>1. Finn httpd.conf file (du finner den vanligvis i en mappe kalt conf, config eller lignende)<br>\n2. I httpd.conf-filen må du avkommentere linjen <code>{WINDOWS_APACHE1}</code> (ved å fjerne '#'-symbolet i starten av linjen)<br>\n3. Sjekk også at linjen ClearModuleList og AddModule mod_rewrite.c er avkommentert.\n</pre> ",
"linux": "<br><br>1. Aktiver \"mod_rewrite\". For å gjøre det, kjør disse kommandoene:<pre>{APACHE1}</pre><br>2. Aktiver støtte for .htaccess. Legg til / rediger tjenerens konfigurasjon (<code>{APACHE2_PATH1}</code>, <code>{APACHE2_PATH2}</code>, <code>{APACHE2_PATH3}</code>):<pre>{APACHE2}</pre>\n Kjør følgende kommando etterpå:<pre>{APACHE3}</pre><br>3. Forsøk å legg til RewriteBase-banen, åpne filen {API_PATH}.htaccess og erstatt følgende linje:<pre>{APACHE4}</pre>til<pre>{APACHE5}</pre><br> For mer informasjon kan du gå til veiledningen <a href=\"{APACHE_LINK}\" target=\"_blank\">Konfigurasjon av Apache-tjener for EspoCRM</a>.<br><br>"
},
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> For mer informasjon kan du besøke <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">\"konfigurasjon av Nginx-tjener for EspoCRM</a>.<br><br> ",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> For mer informasjon kan du besøke <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">\"konfigurasjon av Nginx-tjener for EspoCRM</a>.<br><br> "
"linux": "<br> Legg følgende kode inn i nginx-tjenerens block-konfigureringsfilen <code>{NGINX_PATH}</code>, i \"server\"-seksjonen:<pre>{NGINX}</pre> <br> For mer informasjon kan du besøke <a href=\"{NGINX_LINK}\" target=\"_blank\">\"konfigurasjon av Nginx-tjener for EspoCRM</a>.<br><br> "
}
},
"modRewriteTitle": {
"apache": "API-feil: EspoCRMs API er utilgjengelig.<br> Mulige problemer: \"mod_rewrite\" er ikke aktivert på Apache-tjeneren, støtte for .htaccess er ikke aktivert eller problemer med RewriteBase.<br>Begynn øverst på listen og sjekk om problemet er løst før du prøver neste løsning.",
"nginx": "API-feil: EspoCRMs API er utilgjengelig.<br> Legg følgende kode inn i nginx-tjenerens block-konfigureringsfilen (/etc/nginx/sites-available/YOUR_SITE), i \"server\"-seksjonen:",
"microsoft-iis": "API-feil: EspoCRMs API er utilgjengelig.<br> Mulig problem: \"URL Rewrite\" er kanskje ikke aktivert, vennligst sjekk og aktiver \"URL Rewrite\"-modulen på IIS-tjeneren.",
"default": "API-feil: EspoCRMs API er utilgjengelig.<br> Mulig problem: Rewrite modulen er kanskje ikke aktivert. Sjekk serveren din for å finne det ut (f.eks mod_rewrite på Apache) og at .htaccess støttes."
"apache": "<h3>API-feil: EspoCRMs API er utilgjengelig.</h3>Begynn øverst på listen og sjekk om problemet er løst før du prøver neste løsning.",
"nginx": "<h3>API-feil: EspoCRMs API er utilgjengelig.</h3>",
"microsoft-iis": "<h3>API-feil: EspoCRMs API er utilgjengelig.</h3><br> Mulig problem: \"URL Rewrite\" er kanskje ikke aktivert, vennligst sjekk og aktiver \"URL Rewrite\"-modulen på IIS-tjeneren.",
"default": "<h3>API-feil: EspoCRMs API er utilgjengelig.</h3><br> Mulig problem: Rewrite modulen er kanskje ikke aktivert. Sjekk serveren din for å finne det ut (f.eks mod_rewrite på Apache) og at .htaccess støttes."
}
},
"systemRequirements": {
@@ -116,4 +115,4 @@
"dbname": "Databasenavn",
"user": "Brukernavn"
}
}
}
+6 -7
View File
@@ -105,15 +105,14 @@
},
"options": {
"modRewriteTitle": {
"apache": "API-fout: EspoCRM API is niet beschikbaar. <br> Mogelijke problemen: uitgeschakeld \"mod_rewrite\" in Apache-server, uitgeschakelde .htaccess-ondersteuning of RewriteBase-probleem. <br> Voer alleen noodzakelijke stappen uit. Controleer na elke stap of het probleem is opgelost.",
"nginx": "API-fout: EspoCRM API is niet beschikbaar. <br> Voeg deze code toe aan uw Nginx-serverblokconfiguratiebestand (/ etc / nginx / sites-available / YOUR_SITE) in de sectie \"server\":",
"microsoft-iis": "API-fout: EspoCRM API is niet beschikbaar. <br> Mogelijk probleem: uitgeschakeld \"URL Rewrite\". Controleer en schakel de module \"URL Rewrite\" in IIS-server in",
"default": "API-fout: EspoCRM API is niet beschikbaar. <br> Mogelijk probleem: uitgeschakeld Herschrijfmodule. Controleer en schakel de Rewrite-module in uw server (bijvoorbeeld mod_rewrite in Apache) en .htaccess-ondersteuning in."
"apache": "<h3>API-fout: EspoCRM API is niet beschikbaar.</h3><br> Voer alleen noodzakelijke stappen uit. Controleer na elke stap of het probleem is opgelost.",
"nginx": "<h3>API-fout: EspoCRM API is niet beschikbaar.</h3>",
"microsoft-iis": "<h3>API-fout: EspoCRM API is niet beschikbaar.</h3> Mogelijk probleem: uitgeschakeld \"URL Rewrite\". Controleer en schakel de module \"URL Rewrite\" in IIS-server in",
"default": "<h3>API-fout: EspoCRM API is niet beschikbaar.</h3> <br> Mogelijk probleem: uitgeschakeld Herschrijfmodule. Controleer en schakel de Rewrite-module in uw server (bijvoorbeeld mod_rewrite in Apache) en .htaccess-ondersteuning in."
},
"modRewriteInstruction": {
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> Ga voor meer informatie naar de handleiding <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\"> Nginx-serverconfiguratie voor EspoCRM </a>. <br>",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> Ga voor meer informatie naar de handleiding <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\"> Nginx-serverconfiguratie voor EspoCRM </a>. <br>"
"linux": "<br> Voeg deze code toe aan uw Nginx-serverblokconfiguratiebestand <code>{NGINX_PATH}</code> in de sectie \"server\":\n<pre>\n{NGINX}\n</pre> <br> Ga voor meer informatie naar de handleiding <a href=\"{NGINX_LINK}\" target=\"_blank\"> Nginx-serverconfiguratie voor EspoCRM </a>. <br>"
}
}
},
@@ -127,4 +126,4 @@
"readable": "Leesbaar",
"requiredMariadbVersion": "MariaDB-versie"
}
}
}
+7 -8
View File
@@ -105,18 +105,17 @@
"options": {
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1. Найдите файл httpd.conf (как правило, вы можете найти его в папке conf, config или в папке с похожим названием)<br>\n2. Внутри файла httpd.conf раскомментируйте строку LoadModule rewrite_module modules/mod_rewrite.so (удалите знак '#' в начале строки)<br>\n3. Также убедитесь что раскомментирована строка ClearModuleList и что строка AddModule mod_rewrite.c не закомментирована.\n</pre>"
"windows": "<br> <pre>1. Найдите файл httpd.conf (как правило, вы можете найти его в папке conf, config или в папке с похожим названием)<br>\n2. Внутри файла httpd.conf раскомментируйте строку <code>{WINDOWS_APACHE1}</code> (удалите знак '#' в начале строки)<br>\n3. Также убедитесь что раскомментирована строка ClearModuleList и что строка AddModule mod_rewrite.c не закомментирована.\n</pre>"
},
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> Для получения более подробной информации, пожалуйста, перейдите <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> Для получения более подробной информации, пожалуйста, перейдите <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>"
"linux": "<br> Добавьте этот код в конфигурацию Nginx <code>{NGINX_PATH}</code> в блок \"server\":<pre>{NGINX}</pre> <br> Для получения более подробной информации, пожалуйста, перейдите <a href=\"{NGINX_LINK}\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>"
}
},
"modRewriteTitle": {
"apache": "Ошибка API: EspoCRM API недоступен.<br> Возможные проблемы: не подключен модуль \"mod_rewrite\" к Apache серверу, отключена поддержка .htaccess или проблема с RewriteBase.<br>Совершайте только необходимые шаги. После каждого шага проверяйте решена ли проблема.",
"nginx": "Ошибка API: EspoCRM API недоступен.<br> Добавьте этот код в конфигурацию Nginx (/etc/nginx/sites-available/YOUR_SITE) в блок \"server\":",
"microsoft-iis": "Ошибка API: EspoCRM API недоступен.<br> Возможная проблема: не подключен модуль \"URL Rewrite\". Пожалуйста, проверьте и подключите модуль \"URL Rewrite\" к IIS серверу.",
"default": "Ошибка API: EspoCRM API недоступен.<br> Возможная проблема: не подключен модуль Rewrite. Пожалуйста, проверьте и подключите к серверу модуль Rewrite (например mod_rewrite в Apache) и поддержку .htaccess."
"apache": "<h3>Ошибка API: EspoCRM API недоступен.</h3><br>Совершайте только необходимые шаги. После каждого шага проверяйте решена ли проблема.",
"nginx": "<h3>Ошибка API: EspoCRM API недоступен.</h3>",
"microsoft-iis": "<h3>Ошибка API: EspoCRM API недоступен.</h3><br> Возможная проблема: не подключен модуль \"URL Rewrite\". Пожалуйста, проверьте и подключите модуль \"URL Rewrite\" к IIS серверу.",
"default": "<h3>Ошибка API: EspoCRM API недоступен.</h3><br> Возможная проблема: не подключен модуль Rewrite. Пожалуйста, проверьте и подключите к серверу модуль Rewrite (например mod_rewrite в Apache) и поддержку .htaccess."
}
},
"systemRequirements": {
@@ -126,4 +125,4 @@
"dbname": "Имя БД",
"user": "Имя пользователя"
}
}
}
+8 -9
View File
@@ -93,19 +93,18 @@
"options": {
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1. Nájdite súbor httpd.conf (obyčajne sa nachádza v priečinku s názvom conf, config alebo niečo okolo tých riadkov)<br>\n2. Vo vnútri httpd.conf odkomentujte riadok LoadModule rewrite_module modules/mod_rewrite.so (odstránte '#' na začiatku riadku)<br>\n3. Tiež skontrolujte či riadok ClearModuleList je odkomentovany a nájdite a uistite sa že riadok AddModule mod_rewrite.c nie je zakomentovaný.\n</pre>",
"linux": "<br><br>1. Povoliť \"mod_rewrite\". Spustite v termináli príkaz:<pre>{APACHE1}</pre><br>2. Povoliť podporu .htaccess. Pridajte/zmeňte nastavenia v konfigurácii servera (/etc/apache/apache2.conf, /etc/httpd/conf/httpd.conf):<pre>{APACHE2}</pre>\n Potom spustite tento príkaz v termináli:<pre>{APACHE3}</pre><br>3. Skúste pridať RewriteBase cestu, otvorte súbor {API_PATH}.htaccess a vymeňte riadok:<pre>{APACHE4}</pre>za<pre>{APACHE5}</pre><br> Pre viac informácií navštívte <a href=\"https://www.espocrm.com/documentation/administration/apache-server-configuration/\" target=\"_blank\">Konfigurácia Apache server pre EspoCRM</a>.<br><br>"
"windows": "<br> <pre>1. Nájdite súbor httpd.conf (obyčajne sa nachádza v priečinku s názvom conf, config alebo niečo okolo tých riadkov)<br>\n2. Vo vnútri httpd.conf odkomentujte riadok <code>{WINDOWS_APACHE1}</code> (odstránte '#' na začiatku riadku)<br>\n3. Tiež skontrolujte či riadok ClearModuleList je odkomentovany a nájdite a uistite sa že riadok AddModule mod_rewrite.c nie je zakomentovaný.\n</pre>",
"linux": "<br><br>1. Povoliť \"mod_rewrite\". Spustite v termináli príkaz:<pre>{APACHE1}</pre><br>2. Povoliť podporu .htaccess. Pridajte/zmeňte nastavenia v konfigurácii servera (<code>{APACHE2_PATH1}</code>, <code>{APACHE2_PATH2}</code>, <code>{APACHE2_PATH3}</code>):<pre>{APACHE2}</pre>\n Potom spustite tento príkaz v termináli:<pre>{APACHE3}</pre><br>3. Skúste pridať RewriteBase cestu, otvorte súbor {API_PATH}.htaccess a vymeňte riadok:<pre>{APACHE4}</pre>za<pre>{APACHE5}</pre><br> Pre viac informácií navštívte <a href=\"{APACHE_LINK}\" target=\"_blank\">Konfigurácia Apache server pre EspoCRM</a>.<br><br>"
},
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> Pre podrobnejšie informácie prosím navštívte stránku s návodmi <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Konfigurácia Nginx servera pre EspoCRM</a>.<br><br>",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> Pre podrobnejšie informácie prosím navštívte stránku s návodmi <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Konfigurácia Nginx servera pre EspoCRM</a>.<br><br>"
"linux": "<br> Pridajte tento kód do konfiguračného súboru Vášho serveru Nginx <code>{NGINX_PATH}</code> do vnútra sekcie \"server\":<pre>{NGINX}</pre> <br> Pre podrobnejšie informácie prosím navštívte stránku s návodmi <a href=\"{NGINX_LINK}\" target=\"_blank\">Konfigurácia Nginx servera pre EspoCRM</a>.<br><br>"
}
},
"modRewriteTitle": {
"apache": "chyba API: EspoCRM API je nedostupné.<br> Možné problémy: zakázaný \"mod_rewrite\" v Apache serveri, zakázaná podpora .htaccess alebo záležitosť RewriteBase.<br>Urobte iba nevyhnutné kroky. Po každom kroku skontrolujte, či je problém vyriešený.",
"nginx": "Chyba API: EspoCRM API je nedostupné.<br> Pridajte tento kód do konfiguračného súboru Vášho serveru Nginx (/etc/nginx/sites-available/VAŠA_STRÁNKA) do vnútra sekcie \"server\":",
"microsoft-iis": "Chyba API: EspoCRM API je nedostupné.<br> Možný problém: zakázaný \"URL Rewrite\". Prosím skontrolujte a povoľte modul \"URL Rewrite\" v IIS serveri",
"default": "Chyba API: EspoCRM API je nedostupné.<br> Možný problém: zakázaný Rewrite Module. Prosím skontrolujte a povoľte Rewrite Module vo Vašom serveri (napr. mod_rewrite v Apache) a podporu .htaccess."
"apache": "<h3>Chyba API: EspoCRM API je nedostupné.</h3><br>Urobte iba nevyhnutné kroky. Po každom kroku skontrolujte, či je problém vyriešený.",
"nginx": "<h3>Chyba API: EspoCRM API je nedostupné.</h3>",
"microsoft-iis": "<h3>Chyba API: EspoCRM API je nedostupné.</h3><br> Možný problém: zakázaný \"URL Rewrite\". Prosím skontrolujte a povoľte modul \"URL Rewrite\" v IIS serveri",
"default": "<h3>Chyba API: EspoCRM API je nedostupné.</h3><br> Možný problém: zakázaný Rewrite Module. Prosím skontrolujte a povoľte Rewrite Module vo Vašom serveri (napr. mod_rewrite v Apache) a podporu .htaccess."
}
},
"systemRequirements": {
@@ -115,4 +114,4 @@
"dbname": "Názov databázy",
"user": "Používateľské meno"
}
}
}
+8 -9
View File
@@ -94,19 +94,18 @@
"options": {
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1. Pronađite httpd.conf datoteku (uobičajeno je u fascikli conf, config ili nešto slično)<br>\n2. Unutar httpd.conf datoteke skinite komentar sa reda LoadModule rewrite_module modules/mod_rewrite.so (uklonite '#' znak na početku reda)<br>\n3. Proverite i da li su ClearModuleList AddModule mod_rewrite.c takođe bez znaka #.\n</pre>",
"linux": "br><br>1.Omogućite \"mod_rewrite\". Da ovo uradite pokrenite ovaj kod u terminalu:<pre>{APACHE1}</pre><br>2. Omogućite .htaccess podršku. Dodajte/izmenite podešacanja servera (/etc/apache/apache2.conf, /etc/httpd/conf/httpd.conf):<pre>{APACHE2}</pre>\n Nakon toga pokrenite ovaj kod na serveru:<pre>{APACHE3}</pre><br>3. Pokuštajte da dodate RewriteBase putanju, otvorite datoteku {API_PATH}.htaccess i izmenite sledeći red:<pre>{APACHE4}</pre>NA<pre>{APACHE5}</pre><br> Za više informacija posetite <a href=\"https://www.espocrm.com/documentation/administration/apache-server-configuration/\" target=\"_blank\">Apache server konfiguraciju za EspoCRM</a>.<br><br>"
"windows": "<br> <pre>1. Pronađite httpd.conf datoteku (uobičajeno je u fascikli conf, config ili nešto slično)<br>\n2. Unutar httpd.conf datoteke skinite komentar sa reda <code>{WINDOWS_APACHE1}</code> (uklonite '#' znak na početku reda)<br>\n3. Proverite i da li su ClearModuleList AddModule mod_rewrite.c takođe bez znaka #.\n</pre>",
"linux": "<br><br>1.Omogućite \"mod_rewrite\". Da ovo uradite pokrenite ovaj kod u terminalu:<pre>{APACHE1}</pre><br>2. Omogućite .htaccess podršku. Dodajte/izmenite podešacanja servera (<code>{APACHE2_PATH1}</code>, <code>{APACHE2_PATH2}</code>, <code>{APACHE2_PATH3}</code>):<pre>{APACHE2}</pre>\n Nakon toga pokrenite ovaj kod na serveru:<pre>{APACHE3}</pre><br>3. Pokuštajte da dodate RewriteBase putanju, otvorite datoteku {API_PATH}.htaccess i izmenite sledeći red:<pre>{APACHE4}</pre>NA<pre>{APACHE5}</pre><br> Za više informacija posetite <a href=\"{APACHE_LINK}\" target=\"_blank\">Apache server konfiguraciju za EspoCRM</a>.<br><br>"
},
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> Za više informacija posetite <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server konfiguraciju za EspoCRM</a>.<br><br>",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> Za više informacija posetite <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server konfiguraciju za EspoCRM</a>.<br><br>"
"linux": "<br> Dodajte ovaj kod u svoju Nginx servera blok config datoteku <code>{NGINX_PATH}</code> unutar \"server\" sekcije:<pre>{NGINX}</pre> <br> Za više informacija posetite <a href=\"{NGINX_LINK}\" target=\"_blank\">Nginx server konfiguraciju za EspoCRM</a>.<br><br>"
}
},
"modRewriteTitle": {
"apache": "API Greška: EspoCRM API nije dostupan.<br> Mogući problem: \"mod_rewrite\" isključen na Apache serveru, isključena .htaccess podrška ili RewriteBase problem.<br>Učinite samo neophodne izmene. Posle svake proverite da li je problem rešen.",
"nginx": "API greška: EspoCRM API je dostupan <br> Dodajte ovaj kod u svoju Nginx servera blok config datoteku (/etc/nginx/sites-available/YOUR_SITE)unutar \"server\" sekcije:",
"microsoft-iis": "API greška: EspoCRM API je dostupan <br> Mogući problem: onemogućen \"URL Rewrite \". Molimo proverite i omogućite \"URL Rewrite \" modul u IIS serveru",
"default": "API greška: EspoCRM API je dostupan <br> Mogući problem: onemogućen Rewrite Module. Molimo proverite i omogućiti Rewrite Module u vašem serveru (npr mod_rewrite u Apachu) i .htaccess podršku."
"apache": "<h3>API Greška: EspoCRM API nije dostupan.</h3><br>Učinite samo neophodne izmene. Posle svake proverite da li je problem rešen.",
"nginx": "<h3>API greška: EspoCRM API je dostupan</h3>",
"microsoft-iis": "<h3>API greška: EspoCRM API je dostupan</h3> <br> Mogući problem: onemogućen \"URL Rewrite \". Molimo proverite i omogućite \"URL Rewrite \" modul u IIS serveru",
"default": "<h3>API greška: EspoCRM API je dostupan</h3> <br> Mogući problem: onemogućen Rewrite Module. Molimo proverite i omogućiti Rewrite Module u vašem serveru (npr mod_rewrite u Apachu) i .htaccess podršku."
}
},
"systemRequirements": {
@@ -116,4 +115,4 @@
"dbname": "Ime baze",
"user": "Korisničko ime"
}
}
}
+7 -8
View File
@@ -101,18 +101,17 @@
},
"options": {
"modRewriteTitle": {
"apache": "API Hatası: EspoCRM API'sı kullanılamıyor. Olası sorunlar: Apache sunucusunda \"mod_rewrite \" devre dışı, .htaccess desteği veya RewriteBase sorunu devre dışı bırakıldı. <br> Gerekli adımları uygulayın. Her adımın ardından sorunun çözülüp çözülmediğini kontrol edin.",
"nginx": "API Hatası: EspoCRM API'sı kullanılamıyor. \"Sunucu \" bölümünde bu kodu Nginx sunucu blok yapılandırma dosyanıza (/etc/nginx/sites-available/YOUR_SITE) ekleyin:",
"microsoft-iis": "API Hatası: EspoCRM API'sı kullanılamıyor. <br> Olası problem: \"URL Yeniden Yaz \" devre dışı. Lütfen IIS sunucusunda \"URL Rewrite \" Modülü'nü kontrol edin ve etkinleştirin",
"default": "API Hatası: EspoCRM API'sı kullanılamıyor. <br> Olası sorun: devre dışı bırakılmış Rewrite Modülü. Lütfen sunucunuzdaki Rewrite Modülü'nü kontrol edin ve etkinleştirin (örn. Apache'deki mod_rewrite) ve .htaccess desteğini etkinleştirin."
"apache": "<h3>API Hatası: EspoCRM API'sı kullanılamıyor.</h3><br> Gerekli adımları uygulayın. Her adımın ardından sorunun çözülüp çözülmediğini kontrol edin.",
"nginx": "<h3>API Hatası: EspoCRM API'sı kullanılamıyor.</h3>",
"microsoft-iis": "<h3>API Hatası: EspoCRM API'sı kullanılamıyor.</h3> <br> Olası problem: \"URL Yeniden Yaz \" devre dışı. Lütfen IIS sunucusunda \"URL Rewrite \" Modülü'nü kontrol edin ve etkinleştirin",
"default": "<h3>API Hatası: EspoCRM API'sı kullanılamıyor.</h3> <br> Olası sorun: devre dışı bırakılmış Rewrite Modülü. Lütfen sunucunuzdaki Rewrite Modülü'nü kontrol edin ve etkinleştirin (örn. Apache'deki mod_rewrite) ve .htaccess desteğini etkinleştirin."
},
"modRewriteInstruction": {
"apache": {
"linux": "<br> <br> 1. \"Mod_rewrite \" yı etkinleştirin. Bunu yapmak için şu komutları bir Terminalde çalıştırın: <pre>{APACHE1}</pre> <br> 2. .htaccess desteğini etkinleştirin. Sunucu yapılandırma ayarlarını ekleyin / düzenleyin (/etc/apache/apache2.conf, /etc/httpd/conf/httpd.conf):<pre>{APACHE2}</pre>\n Sonra bu komutu bir Terminalde çalıştırın: <pre>{APACHE3}</pre> <br> 3. RewriteBase yolunu eklemeyi deneyin, {API_PATH} .htaccess dosyasını açın ve aşağıdaki satırı değiştirin: <pre>{APACHE4}</pre> <pre>{APACHE5}</pre> <br> Daha fazla bilgi için lütfen ziyaret edin. <a href=\"https://www.espocrm.com/documentation/administration/apache-server-configuration/\" target=\"_blank\"> EspoCRM için Apache sunucusu yapılandırması </a> kılavuzunu okuyun. <br> <br>"
"linux": "<br> <br> 1. \"Mod_rewrite \" yı etkinleştirin. Bunu yapmak için şu komutları bir Terminalde çalıştırın: <pre>{APACHE1}</pre> <br> 2. .htaccess desteğini etkinleştirin. Sunucu yapılandırma ayarlarını ekleyin / düzenleyin (<code>{APACHE2_PATH1}</code>, <code>{APACHE2_PATH2}</code>, <code>{APACHE2_PATH3}</code>):<pre>{APACHE2}</pre>\n Sonra bu komutu bir Terminalde çalıştırın: <pre>{APACHE3}</pre> <br> 3. RewriteBase yolunu eklemeyi deneyin, {API_PATH} .htaccess dosyasını açın ve aşağıdaki satırı değiştirin: <pre>{APACHE4}</pre> <pre>{APACHE5}</pre> <br> Daha fazla bilgi için lütfen ziyaret edin. <a href=\"{APACHE_LINK}\" target=\"_blank\"> EspoCRM için Apache sunucusu yapılandırması </a> kılavuzunu okuyun. <br> <br>"
},
"nginx": {
"linux": "<br>\n<pre> \n{NGINX} \n</pre> <br> Daha fazla bilgi için lütfen <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\"> EspoCRM için Nginx sunucu yapılandırması </a>. <br> <br>",
"windows": "<br>\n<pre> \n{NGINX} \n</pre> <br> Daha fazla bilgi için lütfen <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\"> EspoCRM için Nginx sunucu yapılandırması </a>. <br> <br>"
"linux": "<br>Sunucu bölümünde bu kodu Nginx sunucu blok yapılandırma dosyanıza <code>{NGINX_PATH}</code> ekleyin:\n<pre> \n{NGINX} \n</pre> <br> Daha fazla bilgi için lütfen <a href=\"{NGINX_LINK}\" target=\"_blank\">EspoCRM için Nginx sunucu yapılandırması</a>. <br> <br>"
}
}
},
@@ -123,4 +122,4 @@
"dbname": "Veritabanı adı",
"user": "Kullanıcı Adı"
}
}
}
+7 -8
View File
@@ -109,18 +109,17 @@
"options": {
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1. Знайти файл httpd.conf файл (зазвичай його можна знайти у теці, званій conf, config або ще якось так)<br> Н2. Всередині файла httpd.conf розкоментувати рядок LoadModule rewrite_module модулі/через mod_rewrite.so (видалити знак '#' на початку рядка)<br> 3. Також пересвідчитися, що рядок ClearModuleList некоментований і переконайтеся, що рядок AddModule mod_rewrite.c не закомментирований.</pre>"
"windows": "<br> <pre>1. Знайти файл httpd.conf файл (зазвичай його можна знайти у теці, званій conf, config або ще якось так)<br>2. Всередині файла httpd.conf розкоментувати рядок LoadModule rewrite_module модулі/через mod_rewrite.so (видалити знак '#' на початку рядка)<br>3. Також пересвідчитися, що рядок ClearModuleList некоментований і переконайтеся, що рядок AddModule mod_rewrite.c не закомментирований.</pre>"
},
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> Для отримання більш детальної інформації, будь ласка, перейдіть <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> Для отримання більш детальної інформації, будь ласка, перейдіть <a href=\"https://www.espocrm.com/documentation/administration/nginx-server-configuration/\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>"
"linux": "<br> Додайте цей код до Вашого файлу конфігурації Nginx <code>{NGINX_PATH}</code> всередині блоку \"server\":<pre>{NGINX}</pre> <br> Для отримання більш детальної інформації, будь ласка, перейдіть <a href=\"{NGINX_LINK}\" target=\"_blank\">Nginx server configuration for EspoCRM</a>.<br><br>"
}
},
"modRewriteTitle": {
"apache": "Помилка API: API EspoCRM недоступне.<br> Можливі проблеми: бракує RewriteBase, вимкнено \"mod_rewrite\" в Apache-сервері або файлі підтримки .htaccess.",
"nginx": "Помилка API: API EspoCRM недоступне.<br> Додайте цей код до Вашого файлу конфігурації Nginx (/etc/nginx/sites-available/YOUR_SITE) всередині блоку \"сервер\":",
"microsoft-iis": "Помилка API: EspoCRM API недоступне.<br> Можлива проблема: вимкнено \"URL Rewrite\". Будь ласка, перевірте і включіть модуль \"URL Rewrite\" сервера IIS",
"default": "Помилка API: EspoCRM API недоступний.<br> Можлива проблема: вимкнений Rewrite Module. Будь ласка, перевірте й увімкніть Rewrite Module у вашому сервері (наприклад mod_rewrite в Apache) і підтримку .htaccess."
"apache": "<h3>Помилка API: API EspoCRM недоступне.</h3><br> Виконуйте лише необхідні кроки. Після кожного кроку перевірте, чи проблема вирішена.",
"nginx": "<h3>Помилка API: API EspoCRM недоступне.</h3>",
"microsoft-iis": "<h3>Помилка API: EspoCRM API недоступне.</h3><br> Можлива проблема: вимкнено \"URL Rewrite\". Будь ласка, перевірте і включіть модуль \"URL Rewrite\" сервера IIS",
"default": "<h3>Помилка API: EspoCRM API недоступний.</h3><br> Можлива проблема: вимкнений Rewrite Module. Будь ласка, перевірте й увімкніть Rewrite Module у вашому сервері (наприклад mod_rewrite в Apache) і підтримку .htaccess."
}
},
"systemRequirements": {
@@ -133,4 +132,4 @@
"readable": "Читання",
"requiredMariadbVersion": "Версія MariaDB"
}
}
}
+7 -8
View File
@@ -100,18 +100,17 @@
"options": {
"modRewriteInstruction": {
"apache": {
"windows": "结果<前> 1。查找httpd.conf文件(通常你会发现一个名为CONF,配置或类似的规定文件夹中)结果\n2.里面的httpd.conf文件注释行的LoadModule rewrite_module模块/ mod_rewrite.so(从行前面删除井''号)结果\n3.又找到行ClearModuleList下面是注释掉然后查找并确保该行加入AddModule mod_rewrite.c没有被注释掉。\n</ PRE>"
"windows": "结果 <pre>1. 查找httpd.conf文件(通常你会发现一个名为CONF,配置或类似的规定文件夹中)结果\n2.里面的httpd.conf文件注释行的LoadModule rewrite_module模块/ mod_rewrite.so(从行前面删除井''号)结果\n3.又找到行ClearModuleList下面是注释掉然后查找并确保该行加入AddModule mod_rewrite.c没有被注释掉。\n</pre>"
},
"nginx": {
"linux": "<br>\n<pre>\n{NGINX}\n</pre> <br> 为获取更多信息,请访问帮助 <a href=\"http://www.espocrm.com/blog/nginx-server-configuration-for-espocrm/\" target=\"_blank\">EspoCRM的网页服务器配置</a>.<br><br>",
"windows": "<br>\n<pre>\n{NGINX}\n</pre> <br> 为获取更多信息,请访问帮助 <a href=\"http://www.espocrm.com/blog/nginx-server-configuration-for-espocrm/\" target=\"_blank\">EspoCRM的网页服务器配置</a>.<br><br>"
"linux": "<br>将此代码添加入你的网页服务器配置文件<code>{NGINX_PATH}</code> 在里面 \"服务器\" 部分:<pre>{NGINX}</pre> <br> 为获取更多信息,请访问帮助 <a href=\"{NGINX_LINK}\" target=\"_blank\">EspoCRM的网页服务器配置</a>.<br><br>"
}
},
"modRewriteTitle": {
"apache": "应用程序编程接口错误: EspoCRM 应用程序编程接口是不可用的.<br> 可能出现的问题: 禁用 \"mod_rewrite\" 在Apache 服务器, 禁用 .分布式配置文件支持或者重写数据问题.<br>仅执行必要操作.完成每一步需确认问题是否被解决.",
"nginx": "应用程序编程接口错误: EspoCRM 应用程序编程接口是不可用的.<br>将此代码添加入你的网页服务器配置文件(/etc/nginx/sites-available/YOUR_SITE) 在里面 \"服务器\" 部分:",
"microsoft-iis": "应用程序编程接口错误: EspoCRM应用程序编程接口是不可用的.<br>可能出现的问题: 禁用 \"网址重写\". 请核对并启用\"网址重写\" 模块在IIS服务器",
"default": "应用程序编程接口错误: EspoCRM应用程序编程接口是不可用的.<br>可能出现的问题: 禁用重写模块.请在你的服务器核对并启用重写模块 (e.g. mod_重写 在 Apache) 和.htaccess 支持."
"apache": "<h3>应用程序编程接口错误: EspoCRM 应用程序编程接口是不可用的.</h3><br> 可能出现的问题: 禁用 \"mod_rewrite\" 在Apache 服务器, 禁用 .分布式配置文件支持或者重写数据问题.<br>仅执行必要操作.完成每一步需确认问题是否被解决.",
"nginx": "<h3>应用程序编程接口错误: EspoCRM 应用程序编程接口是不可用的.</h3>",
"microsoft-iis": "<h3>应用程序编程接口错误: EspoCRM应用程序编程接口是不可用的.</h3><br>可能出现的问题: 禁用 \"网址重写\". 请核对并启用\"网址重写\" 模块在IIS服务器",
"default": "<h3>应用程序编程接口错误: EspoCRM应用程序编程接口是不可用的.</h3><br>可能出现的问题: 禁用重写模块.请在你的服务器核对并启用重写模块 (e.g. mod_重写 在 Apache) 和.htaccess 支持."
}
}
}
}
+6 -10
View File
@@ -116,18 +116,14 @@
"options": {
"modRewriteInstruction": {
"apache": {
"windows": "<br> <pre>1. 找出 httpd.conf 的位置 (通常會在一個叫 conf, config 的資料夾,或是這行中的)<br>2. 在 httpd.conf 檔案中取消註解 LoadModule rewrite_module modules/mod_rewrite.so (在要移除該行前面移除井字號 '#' )<br>3. 另外也找出 ClearModuleList 並取消註解,也請留意 AddModule mod_rewrite.c 這行不要被註解掉。\n</pre>"
},
"nginx": {
"linux": "SMTP帳號",
"windows": "SMTP帳號"
"windows": "<br> <pre>1. 找出 httpd.conf 的位置 (通常會在一個叫 conf, config 的資料夾,或是這行中的)<br>2. 在 httpd.conf 檔案中取消註解 <code>{WINDOWS_APACHE1}</code> (在要移除該行前面移除井字號 '#')<br>3. 另外也找出 ClearModuleList 並取消註解,也請留意 AddModule mod_rewrite.c 這行不要被註解掉。\n</pre>"
}
},
"modRewriteTitle": {
"apache": "API錯誤:EspoCRM API無法連線。<br>可能的問題:在Apache中停用了 mod_rewrite,停用了.htaccess 功能或 RewriteBase 功能。<br>請試必要的步驟。在試過每個步驟之後,回來檢查問題是否已解決。",
"nginx": "API錯誤:EspoCRM API無法連線。<br>將此和式碼加入到 Nginx 伺服器內的配置文件 (/etc/nginx/sites-available/YOUR_SITE)",
"microsoft-iis": "API錯誤:EspoCRM API無法連線。<br>可能的問題:停用了 URL Rewrite。請檢查並啟用 IIS 中的 URL Rewrite 模組",
"default": "API錯誤:EspoCRM API無法連線。<br>可能的問題:停用了 Rewrite 模組。請檢查並啟用伺服器中的 Rewrite 模組 (例如Apache 中的 mod_rewrite)和 .htaccess 功能。"
"apache": "<h3>API錯誤:EspoCRM API無法連線。</h3><br>可能的問題:在Apache中停用了 mod_rewrite,停用了.htaccess 功能或 RewriteBase 功能。<br>請試必要的步驟。在試過每個步驟之後,回來檢查問題是否已解決。",
"nginx": "<h3>API錯誤:EspoCRM API無法連線。</h3>",
"microsoft-iis": "<h3>API錯誤:EspoCRM API無法連線。</h3><br>可能的問題:停用了 URL Rewrite。請檢查並啟用 IIS 中的 URL Rewrite 模組",
"default": "<h3>API錯誤:EspoCRM API無法連線。</h3><br>可能的問題:停用了 Rewrite 模組。請檢查並啟用伺服器中的 Rewrite 模組 (例如Apache 中的 mod_rewrite)和 .htaccess 功能。"
}
},
"systemRequirements": {
@@ -140,4 +136,4 @@
"readable": "邀請",
"requiredMariadbVersion": "允許自定義選項"
}
}
}
+40 -21
View File
@@ -178,25 +178,6 @@ class Diff
var beforeUpgradeFileList = upgradeData.beforeUpgradeFiles || [];
var deleteDirRecursively = function (path) {
if (fs.existsSync(path) && fs.lstatSync(path).isDirectory()) {
fs.readdirSync(path).forEach(function (file, index) {
var curPath = path + "/" + file;
if (fs.lstatSync(curPath).isDirectory()) {
deleteDirRecursively(curPath);
} else {
fs.unlinkSync(curPath);
}
});
fs.rmdirSync(path);
}
else if (fs.existsSync(path) && fs.lstatSync(path).isFile()) {
fs.unlinkSync(path);
}
};
deleteDirRecursively(diffFilePath);
deleteDirRecursively(diffBeforeUpgradeFolderPath);
deleteDirRecursively(upgradePath);
@@ -421,6 +402,8 @@ class Diff
}
for (var folder of folderList) {
this.deleteGitFolderInVendor(vendorPath + '/' + folder);
if (fs.existsSync(vendorPath + '/'+ folder)) {
cp.execSync("mv " + vendorPath + '/'+ folder+" "+ upgradePath + '/vendorFiles/' + folder);
}
@@ -430,7 +413,8 @@ class Diff
resolve();
}).then(function () {
}.bind(this))
.then(function () {
var zipOutput = fs.createWriteStream(zipPath);
var archive = archiver('zip');
@@ -449,7 +433,7 @@ class Diff
archive.finalize();
});
});
}.bind(this));
}.bind(this));
}
@@ -535,8 +519,43 @@ class Diff
return previousAllFileList;
}
deleteGitFolderInVendor (dir) {
var folderList = fs.readdirSync(dir, {withFileTypes: true})
.filter(dirent => dirent.isDirectory())
.map(dirent => dirent.name);
folderList.forEach(function (folder) {
var path = dir + '/' + folder;
var gitPath = path + '/.git';
if (fs.existsSync(gitPath)) {
deleteDirRecursively(gitPath);
}
});
}
}
var deleteDirRecursively = function (path) {
if (fs.existsSync(path) && fs.lstatSync(path).isDirectory()) {
fs.readdirSync(path).forEach(function (file, index) {
var curPath = path + "/" + file;
if (fs.lstatSync(curPath).isDirectory()) {
deleteDirRecursively(curPath);
} else {
fs.unlinkSync(curPath);
}
});
fs.rmdirSync(path);
}
else if (fs.existsSync(path) && fs.lstatSync(path).isFile()) {
fs.unlinkSync(path);
}
};
function execute (command, callback) {
exec(command, function (error, stdout, stderr) {
callback(stdout);
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "espocrm",
"version": "6.1.3",
"version": "6.1.6",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "espocrm",
"version": "6.1.3",
"version": "6.1.6",
"description": "",
"main": "index.php",
"repository": {
@@ -472,4 +472,20 @@ class EvaluatorTest extends \PHPUnit\Framework\TestCase
$this->assertNotEmpty($id);
}
public function testModulo1() : void
{
$expression = "123 % 5";
$actual = $this->evaluator->process($expression);
$this->assertEquals(123 % 5, $actual);
}
public function testModulo2() : void
{
$expression = "124 % 5";
$actual = $this->evaluator->process($expression);
$this->assertEquals(124 % 5, $actual);
}
}
+3 -3
View File
@@ -787,11 +787,11 @@ class FormulaTest extends \PHPUnit\Framework\TestCase
"value": [
{
"type": "value",
"value": 3
"value": 124
},
{
"type": "value",
"value": 2
"value": 5
}
]
}
@@ -799,7 +799,7 @@ class FormulaTest extends \PHPUnit\Framework\TestCase
$result = $this->createProcessor()->process($item);
$this->assertEquals(3 % 2, $result);
$this->assertEquals(124 % 5, $result);
}
function testIfThenElse1()
@@ -125,11 +125,11 @@ class HelperTest extends \PHPUnit\Framework\TestCase
{
$this->initDatabaseHelper(null);
$this->assertFalse($this->object->isSupportsFulltext());
$this->assertFalse($this->object->isSupportsFulltext('table_name'));
$this->assertTrue($this->object->isSupportsFulltext('table_name', true));
$this->assertFalse($this->object->isTableSupportsFulltext('table_name'));
$this->assertTrue($this->object->isTableSupportsFulltext('table_name', true));
$this->assertFalse($this->object->doesSupportFulltext());
$this->assertFalse($this->object->doesSupportFulltext('table_name'));
$this->assertTrue($this->object->doesSupportFulltext('table_name', true));
$this->assertFalse($this->object->doesTableSupportFulltext('table_name'));
$this->assertTrue($this->object->doesTableSupportFulltext('table_name', true));
}
public function testGetDatabaseType()
+4
View File
@@ -0,0 +1,4 @@
{
"manifest": {
}
}
@@ -0,0 +1,84 @@
<?php
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM - Open Source CRM application.
* Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
* Website: https://www.espocrm.com
*
* EspoCRM is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* EspoCRM is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.
************************************************************************/
class AfterUpgrade
{
private $container;
public function run($container)
{
$this->container = $container;
$this->removeUnnecessaryFiles();
$this->removeUnnecessaryDirectories();
}
public function removeUnnecessaryFiles()
{
$fileList = [
'vendor/spatie/async/.git/objects/pack/pack-14ab89d3ff365322e20cfd44252880928aaa4ed6.idx',
'vendor/spatie/async/.git/objects/pack/pack-14ab89d3ff365322e20cfd44252880928aaa4ed6.pack',
'vendor/zordius/lightncandy/.git/objects/pack/pack-8b009a4f84cb95d704fb194c5fee79c724dee033.pack',
'vendor/zordius/lightncandy/.git/objects/pack/pack-8b009a4f84cb95d704fb194c5fee79c724dee033.idx',
];
foreach ($fileList as $file) {
if (!file_exists($file)) {
continue;
}
$result = unlink($file);
if (!$result) {
$this->container->get('fileManager')->getPermissionUtils()->chmod($file, [
'file' => '0664',
'dir' => '0775',
]);
unlink($file);
}
}
}
public function removeUnnecessaryDirectories()
{
$directoryList = [
'vendor/spatie/async/.git',
'vendor/zordius/lightncandy/.git',
];
foreach ($directoryList as $directory) {
if (!file_exists($directory)) {
continue;
}
$this->container->get('fileManager')->removeInDir($directory, true);
}
}
}
@@ -0,0 +1,84 @@
<?php
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM - Open Source CRM application.
* Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
* Website: https://www.espocrm.com
*
* EspoCRM is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* EspoCRM is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.
************************************************************************/
class BeforeUpgrade
{
private $container;
public function run($container)
{
$this->container = $container;
$this->removeUnnecessaryFiles();
$this->removeUnnecessaryDirectories();
}
public function removeUnnecessaryFiles()
{
$fileList = [
'vendor/spatie/async/.git/objects/pack/pack-14ab89d3ff365322e20cfd44252880928aaa4ed6.idx',
'vendor/spatie/async/.git/objects/pack/pack-14ab89d3ff365322e20cfd44252880928aaa4ed6.pack',
'vendor/zordius/lightncandy/.git/objects/pack/pack-8b009a4f84cb95d704fb194c5fee79c724dee033.pack',
'vendor/zordius/lightncandy/.git/objects/pack/pack-8b009a4f84cb95d704fb194c5fee79c724dee033.idx',
];
foreach ($fileList as $file) {
if (!file_exists($file)) {
continue;
}
$result = unlink($file);
if (!$result) {
$this->container->get('fileManager')->getPermissionUtils()->chmod($file, [
'file' => '0664',
'dir' => '0775',
]);
unlink($file);
}
}
}
public function removeUnnecessaryDirectories()
{
$directoryList = [
'vendor/spatie/async/.git',
'vendor/zordius/lightncandy/.git',
];
foreach ($directoryList as $directory) {
if (!file_exists($directory)) {
continue;
}
$this->container->get('fileManager')->removeInDir($directory, true);
}
}
}
+4
View File
@@ -0,0 +1,4 @@
{
"manifest": {
}
}
@@ -0,0 +1,52 @@
<?php
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM - Open Source CRM application.
* Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
* Website: https://www.espocrm.com
*
* EspoCRM is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* EspoCRM is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.
************************************************************************/
class AfterUpgrade
{
private $container;
public function run($container)
{
$this->container = $container;
$this->fixTimeFormat();
}
protected function fixTimeFormat()
{
$config = $this->container->get('config');
$actualTimeFormat = $config->get('timeFormat');
if ($actualTimeFormat === 'hh:mm') {
$config->set('timeFormat', 'HH:mm');
$config->save();
}
}
}
+60 -1
View File
@@ -29,14 +29,73 @@
class AfterUpgrade
{
private $container;
public function run($container)
{
$this->container = $container;
$config = $container->get('config');
$this->updateConfig();
$this->removeUnnecessaryFiles();
$this->removeUnnecessaryDirectories();
}
protected function updateConfig()
{
$config = $this->container->get('config');
$actualTimeFormat = $config->get('timeFormat');
if ($actualTimeFormat === 'hh:mm') {
$config->set('timeFormat', 'HH:mm');
}
$config->set('pdfEngine', 'Tcpdf');
$config->save();
}
protected function removeUnnecessaryFiles()
{
$fileList = [
'vendor/spatie/async/.git/objects/pack/pack-14ab89d3ff365322e20cfd44252880928aaa4ed6.idx',
'vendor/spatie/async/.git/objects/pack/pack-14ab89d3ff365322e20cfd44252880928aaa4ed6.pack',
'vendor/zordius/lightncandy/.git/objects/pack/pack-8b009a4f84cb95d704fb194c5fee79c724dee033.pack',
'vendor/zordius/lightncandy/.git/objects/pack/pack-8b009a4f84cb95d704fb194c5fee79c724dee033.idx',
];
foreach ($fileList as $file) {
if (!file_exists($file)) {
continue;
}
$result = unlink($file);
if (!$result) {
$this->container->get('fileManager')->getPermissionUtils()->chmod($file, [
'file' => '0664',
'dir' => '0775',
]);
unlink($file);
}
}
}
protected function removeUnnecessaryDirectories()
{
$directoryList = [
'vendor/spatie/async/.git',
'vendor/zordius/lightncandy/.git',
];
foreach ($directoryList as $directory) {
if (!file_exists($directory)) {
continue;
}
$this->container->get('fileManager')->removeInDir($directory, true);
}
}
}
+84
View File
@@ -0,0 +1,84 @@
<?php
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM - Open Source CRM application.
* Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
* Website: https://www.espocrm.com
*
* EspoCRM is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* EspoCRM is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.
************************************************************************/
class BeforeUpgrade
{
private $container;
public function run($container)
{
$this->container = $container;
$this->removeUnnecessaryFiles();
$this->removeUnnecessaryDirectories();
}
public function removeUnnecessaryFiles()
{
$fileList = [
'vendor/spatie/async/.git/objects/pack/pack-14ab89d3ff365322e20cfd44252880928aaa4ed6.idx',
'vendor/spatie/async/.git/objects/pack/pack-14ab89d3ff365322e20cfd44252880928aaa4ed6.pack',
'vendor/zordius/lightncandy/.git/objects/pack/pack-8b009a4f84cb95d704fb194c5fee79c724dee033.pack',
'vendor/zordius/lightncandy/.git/objects/pack/pack-8b009a4f84cb95d704fb194c5fee79c724dee033.idx',
];
foreach ($fileList as $file) {
if (!file_exists($file)) {
continue;
}
$result = unlink($file);
if (!$result) {
$this->container->get('fileManager')->getPermissionUtils()->chmod($file, [
'file' => '0664',
'dir' => '0775',
]);
unlink($file);
}
}
}
public function removeUnnecessaryDirectories()
{
$directoryList = [
'vendor/spatie/async/.git',
'vendor/zordius/lightncandy/.git',
];
foreach ($directoryList as $directory) {
if (!file_exists($directory)) {
continue;
}
$this->container->get('fileManager')->removeInDir($directory, true);
}
}
}