RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-02-07 18:49:23 +03:00
Code Issues Projects Releases Wiki Activity

security fixes

Browse Source
This commit is contained in:
Grigory Pomadchin 2014-11-27 15:59:01 +03:00
parent 3f3d2e4ef3
commit f6ce86310d
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
intaro.intarocrm/classes/general/ICrmOrderActions.php
View File

@ -1091,13 +1091,11 @@ class ICrmOrderActions
public static function orderAgent() { public static function orderAgent() {
if(self::isForkable()) { if(self::isForkable()) {
$ch = curl_init(); $ch = curl_init();
curl_setopt($ch,CURLOPT_URL, curl_setopt($ch, CURLOPT_URL, ($_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://') .
($_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . '/retailcrm/agent.php');
$_SERVER['SERVER_NAME'] . '/intaro/agent.php'
);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
//curl_setopt($ch,CURLOPT_HEADER, true); // headers //curl_setopt($ch,CURLOPT_HEADER, true); // headers
curl_exec($ch); $result = curl_exec($ch);
curl_close($ch); curl_close($ch);
} else { } else {
self::notForkedOrderAgent(); self::notForkedOrderAgent();
@ -1535,7 +1533,8 @@ class ICrmOrderActions
$fork = COption::GetOptionString('main', 'agents_use_crontab', 'N'); $fork = COption::GetOptionString('main', 'agents_use_crontab', 'N');
if($fork === 'N') { if($fork === 'N') {
$file = $_SERVER['DOCUMENT_ROOT'] . '/retailcrm/agent.php'; $file = $_SERVER['DOCUMENT_ROOT'] . '/retailcrm/agent.php';
return file_exists($file) && is_callable('curl_init'); return file_exists($file) && is_callable('curl_init') &&
isset($_SERVER['SERVER_NAME']) && $_SERVER['SERVER_NAME'];
} }
return false; return false;

1
intaro.intarocrm/classes/general/agent.php
View File

@ -1,5 +1,6 @@
<?php <?php
require_once($_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/main/include/prolog_before.php'); require_once($_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/main/include/prolog_before.php');
if ($_SERVER['SERVER_ADDR'] != $_SERVER['REMOTE_ADDR']) die('You are not allowed to access this file.');
if (!CModule::IncludeModule('intaro.intarocrm')) die('retailCRM not installed.'); if (!CModule::IncludeModule('intaro.intarocrm')) die('retailCRM not installed.');
ICrmOrderActions::notForkedOrderAgent(); ICrmOrderActions::notForkedOrderAgent();

4
intaro.intarocrm/install/index.php
View File

@ -1230,7 +1230,7 @@ class intaro_intarocrm extends CModule {
$dateAgent->add($intAgent); $dateAgent->add($intAgent);
CAgent::AddAgent( CAgent::AddAgent(
"ICrmOrderActions::forkedOrderAgent();", $this->MODULE_ID, "N", 600, // interval - 10 mins "ICrmOrderActions::orderAgent();", $this->MODULE_ID, "N", 600, // interval - 10 mins
$dateAgent->format('d.m.Y H:i:s'), // date of first check $dateAgent->format('d.m.Y H:i:s'), // date of first check
"Y", // agent is active "Y", // agent is active
$dateAgent->format('d.m.Y H:i:s'), // date of first start $dateAgent->format('d.m.Y H:i:s'), // date of first start
@ -1270,7 +1270,7 @@ class intaro_intarocrm extends CModule {
CAgent::RemoveAgent("ICrmOrderActions::uploadOrdersAgent();", $this->MODULE_ID); CAgent::RemoveAgent("ICrmOrderActions::uploadOrdersAgent();", $this->MODULE_ID);
CAgent::RemoveAgent("ICrmOrderActions::orderHistoryAgent();", $this->MODULE_ID); CAgent::RemoveAgent("ICrmOrderActions::orderHistoryAgent();", $this->MODULE_ID);
CAgent::RemoveAgent("ICrmOrderActions::orderAgent();", $this->MODULE_ID); CAgent::RemoveAgent("ICrmOrderActions::orderAgent();", $this->MODULE_ID);
CAgent::RemoveAgent("ICrmOrderActions::forkedOrderAgent();", $this->MODULE_ID); CAgent::RemoveAgent("ICrmOrderActions::orderAgent();", $this->MODULE_ID);
COption::RemoveOption($this->MODULE_ID, $this->CRM_API_HOST_OPTION); COption::RemoveOption($this->MODULE_ID, $this->CRM_API_HOST_OPTION);
COption::RemoveOption($this->MODULE_ID, $this->CRM_API_KEY_OPTION); COption::RemoveOption($this->MODULE_ID, $this->CRM_API_KEY_OPTION);

2
intaro.intarocrm/install/version.php
View File

@ -1,5 +1,5 @@
<? <?
$arModuleVersion = array( $arModuleVersion = array(
"VERSION" => "1.0.15", "VERSION" => "1.0.15",
"VERSION_DATE" => "2014-11-24 23:55:00" "VERSION_DATE" => "2014-11-27 16:00:00"
); );