varrcan / telegram.send

admin/menu.php

Indentation +20 added lines, -20 removed lines

@@ -1,25 +1,25 @@
 <?php
 $menu = [
-    [
-        'parent_menu' => 'global_menu_services',
-        'sort'        => 1000,
-        'text'        => 'Телеграм',
-        'title'       => 'Телеграм',
-        'items_id'    => 'menu_references',
-        'icon'        => '',
-        'items'       => [
-            [
-                'text'  => 'Настройки',
-                'url'   => 'telegram_main.php?lang=' . LANGUAGE_ID,
-                'title' => 'Настройки',
-            ],
-            [
-                'text'  => 'Инструкция',
-                'url'   => 'telegram_instruction.php?lang=' . LANGUAGE_ID,
-                'title' => 'Регистрация бота',
-            ],
-        ],
-    ],
+	[
+		'parent_menu' => 'global_menu_services',
+		'sort'        => 1000,
+		'text'        => 'Телеграм',
+		'title'       => 'Телеграм',
+		'items_id'    => 'menu_references',
+		'icon'        => '',
+		'items'       => [
+			[
+				'text'  => 'Настройки',
+				'url'   => 'telegram_main.php?lang=' . LANGUAGE_ID,
+				'title' => 'Настройки',
+			],
+			[
+				'text'  => 'Инструкция',
+				'url'   => 'telegram_instruction.php?lang=' . LANGUAGE_ID,
+				'title' => 'Регистрация бота',
+			],
+		],
+	],
 ];
 
 return $menu;

admin/telegram_main.php

Spacing +12 added lines, -12 removed lines

@@ -39,8 +39,8 @@ 
                             </td>
                             <td class="adm-detail-content-cell-r">
                                 <input name="module_on"
-                                       value="<?=Config::statusModule();?>"
-                                    <?=Config::statusModule() ? 'checked="checked"' : '';?>
+                                       value="<?=Config::statusModule(); ?>"
+                                    <?=Config::statusModule() ? 'checked="checked"' : ''; ?>
                                        type="checkbox"
                                        class="module_on"
                                        title="">
@@ -53,7 +53,7 @@ 
                             <td class="adm-detail-content-cell-r">
                                 <input name="token"
                                        size="50"
-                                       value="<?=Config::getToken();?>"
+                                       value="<?=Config::getToken(); ?>"
                                        type="text"
                                        class="token"
                                        title="">
@@ -66,9 +66,9 @@ 
                             <td class="adm-detail-content-cell-r">
                                 <select name="mail[]" class="mail" title="" size="<?=count($mailTemplates)?>" multiple>
                                     <?php foreach ($mailTemplates as $item) : ?>
-                                        <option value="<?=$item['EVENT_NAME'];?>"
-                                            <?=in_array($item['EVENT_NAME'], Config::getMail(), true) ? 'selected' : '';?>>
-                                            <?=$item['NAME'];?>
+                                        <option value="<?=$item['EVENT_NAME']; ?>"
+                                            <?=in_array($item['EVENT_NAME'], Config::getMail(), true) ? 'selected' : ''; ?>>
+                                            <?=$item['NAME']; ?>
                                         </option>
                                     <?php endforeach; ?>
                                 </select>
@@ -142,8 +142,8 @@ 
                             </td>
                             <td class="adm-detail-content-cell-r">
                                 <input name="proxy_on"
-                                       value="<?=Config::statusProxy();?>"
-                                    <?=Config::statusProxy() ? 'checked="checked"' : '';?>
+                                       value="<?=Config::statusProxy(); ?>"
+                                    <?=Config::statusProxy() ? 'checked="checked"' : ''; ?>
                                        type="checkbox"
                                        class="proxy_on"
                                        title="">
@@ -156,7 +156,7 @@ 
                             <td class="adm-detail-content-cell-r">
                                 <input name="proxy_url"
                                        size="50"
-                                       value="<?=Config::proxyData()['url'];?>"
+                                       value="<?=Config::proxyData()['url']; ?>"
                                        type="text"
                                        class="proxy_url"
                                        title="">
@@ -169,7 +169,7 @@ 
                             <td class="adm-detail-content-cell-r">
                                 <input name="proxy_port"
                                        size="50"
-                                       value="<?=Config::proxyData()['port'];?>"
+                                       value="<?=Config::proxyData()['port']; ?>"
                                        type="text"
                                        class="proxy_port"
                                        title="">
@@ -182,7 +182,7 @@ 
                             <td class="adm-detail-content-cell-r">
                                 <input name="proxy_user"
                                        size="50"
-                                       value="<?=Config::proxyData()['user'];?>"
+                                       value="<?=Config::proxyData()['user']; ?>"
                                        type="text"
                                        class="proxy_user"
                                        title="">
@@ -195,7 +195,7 @@ 
                             <td class="adm-detail-content-cell-r">
                                 <input name="proxy_pass"
                                        size="50"
-                                       value="<?=Config::proxyData()['pass'];?>"
+                                       value="<?=Config::proxyData()['pass']; ?>"
                                        type="text"
                                        class="proxy_pass"
                                        title="">

install/version.php

Indentation +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@
 <?php
 $arModuleVersion = [
-    'VERSION'      => '1.0.4',
-    'VERSION_DATE' => '2018-10-14'
+	'VERSION'      => '1.0.4',
+	'VERSION_DATE' => '2018-10-14'
 ];

install/index.php

Indentation +124 added lines, -124 removed lines

@@ -10,137 +10,137 @@
  */
 Class telegram_send extends CModule
 {
-    const MODULE_ID = 'telegram.send';
-    public $MODULE_ID;
-    public $MODULE_VERSION;
-    public $MODULE_VERSION_DATE;
-    public $MODULE_NAME;
-    public $MODULE_DESCRIPTION;
-    public $MODULE_GROUP_RIGHTS;
-    public $PARTNER_NAME;
-    public $PARTNER_URI;
-    private $errors;
+	const MODULE_ID = 'telegram.send';
+	public $MODULE_ID;
+	public $MODULE_VERSION;
+	public $MODULE_VERSION_DATE;
+	public $MODULE_NAME;
+	public $MODULE_DESCRIPTION;
+	public $MODULE_GROUP_RIGHTS;
+	public $PARTNER_NAME;
+	public $PARTNER_URI;
+	private $errors;
 
-    /**
-     * telegram_send constructor.
-     */
-    public function __construct()
-    {
-        $arModuleVersion = [];
-        include __DIR__ . '/version.php';
-        $this->MODULE_NAME = 'Телеграм';
-        $this->MODULE_DESCRIPTION = 'Отправка почтовых сообщений в телеграм';
-        $this->MODULE_ID = 'telegram.send';
-        $this->MODULE_VERSION = $arModuleVersion['VERSION'];
-        $this->MODULE_VERSION_DATE = $arModuleVersion['VERSION_DATE'];
-        $this->MODULE_GROUP_RIGHTS = 'N';
-        $this->PARTNER_NAME = 'Varrcan';
-        $this->PARTNER_URI = 'https://varrcan.me';
-    }
+	/**
+	 * telegram_send constructor.
+	 */
+	public function __construct()
+	{
+		$arModuleVersion = [];
+		include __DIR__ . '/version.php';
+		$this->MODULE_NAME = 'Телеграм';
+		$this->MODULE_DESCRIPTION = 'Отправка почтовых сообщений в телеграм';
+		$this->MODULE_ID = 'telegram.send';
+		$this->MODULE_VERSION = $arModuleVersion['VERSION'];
+		$this->MODULE_VERSION_DATE = $arModuleVersion['VERSION_DATE'];
+		$this->MODULE_GROUP_RIGHTS = 'N';
+		$this->PARTNER_NAME = 'Varrcan';
+		$this->PARTNER_URI = 'https://varrcan.me';
+	}
 
-    /**
-     * Действия при установке модуля
-     * @return bool|void
-     */
-    public function doInstall()
-    {
-        global $USER;
-        if ($USER->IsAdmin()) {
-            ModuleManager::registerModule($this->MODULE_ID);
-            $this->InstallEvents();
-            $this->InstallFiles();
-        }
-    }
+	/**
+	 * Действия при установке модуля
+	 * @return bool|void
+	 */
+	public function doInstall()
+	{
+		global $USER;
+		if ($USER->IsAdmin()) {
+			ModuleManager::registerModule($this->MODULE_ID);
+			$this->InstallEvents();
+			$this->InstallFiles();
+		}
+	}
 
-    /**
-     * Регистрация событий
-     * @return bool|void
-     */
-    public function InstallEvents()
-    {
-        $eventManager = EventManager::getInstance();
-        $eventManager->registerEventHandler(
-            'main',
-            'OnBeforeEventSend',
-            $this->MODULE_ID,
-            'Telegram\\Send\\Main',
-            'getEventSend'
-        );
-    }
+	/**
+	 * Регистрация событий
+	 * @return bool|void
+	 */
+	public function InstallEvents()
+	{
+		$eventManager = EventManager::getInstance();
+		$eventManager->registerEventHandler(
+			'main',
+			'OnBeforeEventSend',
+			$this->MODULE_ID,
+			'Telegram\\Send\\Main',
+			'getEventSend'
+		);
+	}
 
-    /**
-     * Копирование файлов
-     *
-     * @param array $arParams
-     */
-    public function InstallFiles($arParams = [])
-    {
-        if (!is_dir($_SERVER['DOCUMENT_ROOT'] . '/bitrix/js/' . self::MODULE_ID) && !mkdir($concurrentDirectory =
-                $_SERVER['DOCUMENT_ROOT'] . '/bitrix/js/' . self::MODULE_ID) && !is_dir($concurrentDirectory)) {
-                    throw new \RuntimeException(sprintf('Directory "%s" was not created', $concurrentDirectory));
-        }
-        CopyDirFiles(
-            $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . self::MODULE_ID . '/install/admin',
-            $_SERVER['DOCUMENT_ROOT'] . '/bitrix/admin',
-            true,
-            true
-        );
-        CopyDirFiles(
-            $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . self::MODULE_ID . '/install/js/',
-            $_SERVER['DOCUMENT_ROOT'] . '/bitrix/js/',
-            true,
-            true
-        );
-    }
+	/**
+	 * Копирование файлов
+	 *
+	 * @param array $arParams
+	 */
+	public function InstallFiles($arParams = [])
+	{
+		if (!is_dir($_SERVER['DOCUMENT_ROOT'] . '/bitrix/js/' . self::MODULE_ID) && !mkdir($concurrentDirectory =
+				$_SERVER['DOCUMENT_ROOT'] . '/bitrix/js/' . self::MODULE_ID) && !is_dir($concurrentDirectory)) {
+					throw new \RuntimeException(sprintf('Directory "%s" was not created', $concurrentDirectory));
+		}
+		CopyDirFiles(
+			$_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . self::MODULE_ID . '/install/admin',
+			$_SERVER['DOCUMENT_ROOT'] . '/bitrix/admin',
+			true,
+			true
+		);
+		CopyDirFiles(
+			$_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . self::MODULE_ID . '/install/js/',
+			$_SERVER['DOCUMENT_ROOT'] . '/bitrix/js/',
+			true,
+			true
+		);
+	}
 
-    /**
-     * Действия при удалении модуля
-     */
-    public function doUninstall()
-    {
-        $this->UnInstallEvents();
-        $this->UnInstallFiles();
-        $this->UnInstallDB();
-        ModuleManager::unregisterModule($this->MODULE_ID);
-    }
+	/**
+	 * Действия при удалении модуля
+	 */
+	public function doUninstall()
+	{
+		$this->UnInstallEvents();
+		$this->UnInstallFiles();
+		$this->UnInstallDB();
+		ModuleManager::unregisterModule($this->MODULE_ID);
+	}
 
-    /**
-     * Удаление событий
-     * @return bool|void
-     */
-    public function UnInstallEvents()
-    {
+	/**
+	 * Удаление событий
+	 * @return bool|void
+	 */
+	public function UnInstallEvents()
+	{
 
-        $eventManager = EventManager::getInstance();
-        $eventManager->unRegisterEventHandler(
-            'main',
-            'OnBeforeEventSend',
-            $this->MODULE_ID,
-            'Telegram\\Send\\Main',
-            'getEventSend'
-        );
-    }
+		$eventManager = EventManager::getInstance();
+		$eventManager->unRegisterEventHandler(
+			'main',
+			'OnBeforeEventSend',
+			$this->MODULE_ID,
+			'Telegram\\Send\\Main',
+			'getEventSend'
+		);
+	}
 
-    /**
-     * Удаление файлов
-     * @return bool|void
-     */
-    public function UnInstallFiles()
-    {
-        DeleteDirFilesEx("/bitrix/admin/telegram_main.php");
-        DeleteDirFilesEx("/bitrix/js/telegram.send/");
-    }
+	/**
+	 * Удаление файлов
+	 * @return bool|void
+	 */
+	public function UnInstallFiles()
+	{
+		DeleteDirFilesEx("/bitrix/admin/telegram_main.php");
+		DeleteDirFilesEx("/bitrix/js/telegram.send/");
+	}
 
-    /**
-     * Удаление таблицы настроек
-     *
-     * @param array $arParams
-     *
-     * @return bool|void
-     * @throws \Bitrix\Main\Db\SqlQueryException
-     */
-    public function UnInstallDB($arParams = [])
-    {
-        Application::getConnection()->query("DELETE FROM b_option WHERE `MODULE_ID`='{$this->MODULE_ID}'");
-    }
+	/**
+	 * Удаление таблицы настроек
+	 *
+	 * @param array $arParams
+	 *
+	 * @return bool|void
+	 * @throws \Bitrix\Main\Db\SqlQueryException
+	 */
+	public function UnInstallDB($arParams = [])
+	{
+		Application::getConnection()->query("DELETE FROM b_option WHERE `MODULE_ID`='{$this->MODULE_ID}'");
+	}
 }

include.php

Indentation +7 added lines, -7 removed lines

@@ -2,12 +2,12 @@
 defined('B_PROLOG_INCLUDED') and (B_PROLOG_INCLUDED === true) or die();
 
 if (file_exists(__DIR__ . '/reinstalljs')) {
-    CopyDirFiles(
-        $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/telegram.send/install/js/',
-        $_SERVER['DOCUMENT_ROOT'] . '/bitrix/js/',
-        true,
-        true
-    );
+	CopyDirFiles(
+		$_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/telegram.send/install/js/',
+		$_SERVER['DOCUMENT_ROOT'] . '/bitrix/js/',
+		true,
+		true
+	);
 
-    unlink(__DIR__ . '/reinstalljs');
+	unlink(__DIR__ . '/reinstalljs');
 }

lib/main.php

Indentation +54 added lines, -54 removed lines

@@ -11,61 +11,61 @@
  */
 class Main
 {
-    /**
-     * Действие после отправки письма
-     *
-     * @param $arFields
-     * @param $arTemplate
-     */
-    public static function getEventSend(&$arFields, &$arTemplate)
-    {
-        if ($arFields && $arTemplate && Config::statusModule() == 1) {
-            if (\in_array($arTemplate['EVENT_NAME'], Config::getMail(), true)) {
-                try {
-                    $message = self::delTags($arTemplate['MESSAGE']);
-                    foreach ($arFields + self::getSiteParam() as $key => $field) {
-                        $message = preg_replace('/#' . $key . '#/', $field, $message);
-                    }
-                    (new Sending)->processMessage($message);
-                } catch (\Exception $e) {
-                    Debug::writeToFile($e->getMessage(), 'getEventSend', 'telegram-log');
-                }
-            }
-        }
-    }
+	/**
+	 * Действие после отправки письма
+	 *
+	 * @param $arFields
+	 * @param $arTemplate
+	 */
+	public static function getEventSend(&$arFields, &$arTemplate)
+	{
+		if ($arFields && $arTemplate && Config::statusModule() == 1) {
+			if (\in_array($arTemplate['EVENT_NAME'], Config::getMail(), true)) {
+				try {
+					$message = self::delTags($arTemplate['MESSAGE']);
+					foreach ($arFields + self::getSiteParam() as $key => $field) {
+						$message = preg_replace('/#' . $key . '#/', $field, $message);
+					}
+					(new Sending)->processMessage($message);
+				} catch (\Exception $e) {
+					Debug::writeToFile($e->getMessage(), 'getEventSend', 'telegram-log');
+				}
+			}
+		}
+	}
 
-    /**
-     * Удаление html тегов из письма
-     *
-     * @param $text
-     *
-     * @return mixed
-     */
-    public static function delTags($text)
-    {
-        return str_replace(' ', ' ', preg_replace('/\s{2,}/', "\n", strip_tags($text)));
-    }
+	/**
+	 * Удаление html тегов из письма
+	 *
+	 * @param $text
+	 *
+	 * @return mixed
+	 */
+	public static function delTags($text)
+	{
+		return str_replace(' ', ' ', preg_replace('/\s{2,}/', "\n", strip_tags($text)));
+	}
 
-    /**
-     * Получение стандартных полей письма
-     * @return array
-     */
-    public static function getSiteParam():array
-    {
-        $defaultParam = [];
-        $getParam = SiteTable::getList([
-            'select' => ['EMAIL', 'NAME', 'SERVER_NAME'],
-            'filter' => ['ACTIVE' => 'Y']
-        ]);
-        $siteParam = $getParam->fetch();
-        if ($siteParam) {
-            $defaultParam = [
-                'DEFAULT_EMAIL_FROM' => $siteParam['EMAIL'],
-                'SITE_NAME'          => $siteParam['NAME'],
-                'SERVER_NAME'        => $siteParam['SERVER_NAME']
-            ];
-        }
+	/**
+	 * Получение стандартных полей письма
+	 * @return array
+	 */
+	public static function getSiteParam():array
+	{
+		$defaultParam = [];
+		$getParam = SiteTable::getList([
+			'select' => ['EMAIL', 'NAME', 'SERVER_NAME'],
+			'filter' => ['ACTIVE' => 'Y']
+		]);
+		$siteParam = $getParam->fetch();
+		if ($siteParam) {
+			$defaultParam = [
+				'DEFAULT_EMAIL_FROM' => $siteParam['EMAIL'],
+				'SITE_NAME'          => $siteParam['NAME'],
+				'SERVER_NAME'        => $siteParam['SERVER_NAME']
+			];
+		}
 
-        return $defaultParam;
-    }
+		return $defaultParam;
+	}
 } //

lib/sending.php

Indentation +100 added lines, -100 removed lines

@@ -10,116 +10,116 @@
  */
 class Sending
 {
-    private $apiKey;
-    private $chatId;
-    private $arUpdates;
-    private $apiBaseUri = 'https://api.telegram.org/bot';
+	private $apiKey;
+	private $chatId;
+	private $arUpdates;
+	private $apiBaseUri = 'https://api.telegram.org/bot';
 
-    /**
-     * Sending constructor.
-     */
-    public function __construct()
-    {
-        $this->apiKey = Config::getToken();
-        $this->chatId = Config::getUser();
-    }
+	/**
+	 * Sending constructor.
+	 */
+	public function __construct()
+	{
+		$this->apiKey = Config::getToken();
+		$this->chatId = Config::getUser();
+	}
 
-    /**
-     * Отправка сообщения
-     *
-     * @param $message
-     */
-    public function processMessage($message)
-    {
-        foreach ($this->chatId as $key => $value) {
-            $this->apiRequest('sendMessage', ['chat_id' => $key, 'text' => $message]);
-        }
-    }
+	/**
+	 * Отправка сообщения
+	 *
+	 * @param $message
+	 */
+	public function processMessage($message)
+	{
+		foreach ($this->chatId as $key => $value) {
+			$this->apiRequest('sendMessage', ['chat_id' => $key, 'text' => $message]);
+		}
+	}
 
-    /**
-     * Подготовка curl запроса
-     *
-     * @param      $method
-     * @param bool $parameters
-     *
-     * @return mixed
-     */
-    public function apiRequest($method, $parameters = false)
-    {
-        $handle  = curl_init();
-        $options = [
-            CURLOPT_URL               => $this->apiBaseUri . $this->apiKey . '/' . $method . '?' . http_build_query($parameters),
-            CURLOPT_RETURNTRANSFER    => true,
-            CURLOPT_FOLLOWLOCATION    => 1,
-            CURLOPT_CONNECTTIMEOUT    => 5,
-            CURLOPT_TIMEOUT           => 30,
-            CURLOPT_POST              => true,
-            CURLOPT_FRESH_CONNECT     => true,
-            CURLOPT_UNRESTRICTED_AUTH => true,
-        ];
+	/**
+	 * Подготовка curl запроса
+	 *
+	 * @param      $method
+	 * @param bool $parameters
+	 *
+	 * @return mixed
+	 */
+	public function apiRequest($method, $parameters = false)
+	{
+		$handle  = curl_init();
+		$options = [
+			CURLOPT_URL               => $this->apiBaseUri . $this->apiKey . '/' . $method . '?' . http_build_query($parameters),
+			CURLOPT_RETURNTRANSFER    => true,
+			CURLOPT_FOLLOWLOCATION    => 1,
+			CURLOPT_CONNECTTIMEOUT    => 5,
+			CURLOPT_TIMEOUT           => 30,
+			CURLOPT_POST              => true,
+			CURLOPT_FRESH_CONNECT     => true,
+			CURLOPT_UNRESTRICTED_AUTH => true,
+		];
 
-        if (Config::statusProxy()) {
-            $proxy = Config::proxyData();
+		if (Config::statusProxy()) {
+			$proxy = Config::proxyData();
 
-            //TODO: why not work?
-            //if (filter_var($proxy['url'], FILTER_VALIDATE_IP)) {
-            //    $options[CURLOPT_PROXYTYPE] = CURLPROXY_SOCKS5;
-            //} else {
-            //    $options[CURLOPT_PROXYTYPE] = CURLPROXY_SOCKS5_HOSTNAME;
-            //}
+			//TODO: why not work?
+			//if (filter_var($proxy['url'], FILTER_VALIDATE_IP)) {
+			//    $options[CURLOPT_PROXYTYPE] = CURLPROXY_SOCKS5;
+			//} else {
+			//    $options[CURLOPT_PROXYTYPE] = CURLPROXY_SOCKS5_HOSTNAME;
+			//}
 
-            $options += [
-                CURLOPT_PROXYTYPE     => CURLPROXY_SOCKS5_HOSTNAME,
-                CURLOPT_PROXY         => $proxy['url'],
-                CURLOPT_PROXYPORT     => $proxy['port'],
-                CURLOPT_PROXYUSERNAME => $proxy['user'],
-                CURLOPT_PROXYPASSWORD => $proxy['pass'],
-            ];
-        }
+			$options += [
+				CURLOPT_PROXYTYPE     => CURLPROXY_SOCKS5_HOSTNAME,
+				CURLOPT_PROXY         => $proxy['url'],
+				CURLOPT_PROXYPORT     => $proxy['port'],
+				CURLOPT_PROXYUSERNAME => $proxy['user'],
+				CURLOPT_PROXYPASSWORD => $proxy['pass'],
+			];
+		}
 
-        curl_setopt_array($handle, $options);
+		curl_setopt_array($handle, $options);
 
-        return $this->execCurlRequest($handle);
-    }
+		return $this->execCurlRequest($handle);
+	}
 
-    /**
-     * Отправка curl запроса
-     *
-     * @param $handle
-     *
-     * @return mixed
-     */
-    public function execCurlRequest($handle)
-    {
-        $response = curl_exec($handle);
-        if ((int)curl_getinfo($handle, CURLINFO_HTTP_CODE) === 200) {
-            $response = json_decode($response, true)['result'];
-        } else {
-            Debug::writeToFile(curl_getinfo($handle), 'execCurlRequest', 'telegram-log');
-            curl_close($handle);
-        }
+	/**
+	 * Отправка curl запроса
+	 *
+	 * @param $handle
+	 *
+	 * @return mixed
+	 */
+	public function execCurlRequest($handle)
+	{
+		$response = curl_exec($handle);
+		if ((int)curl_getinfo($handle, CURLINFO_HTTP_CODE) === 200) {
+			$response = json_decode($response, true)['result'];
+		} else {
+			Debug::writeToFile(curl_getinfo($handle), 'execCurlRequest', 'telegram-log');
+			curl_close($handle);
+		}
 
-        return $response;
-    }
+		return $response;
+	}
 
-    /**
-     * Обновление входящих запросов
-     *
-     * @param int $offset
-     * @param int $limit
-     *
-     * @return mixed
-     */
-    public function updatesUser($offset = 0, $limit = 100)
-    {
-        $paramRequest    = ['offset' => $offset, 'limit' => $limit];
-        $this->arUpdates = $this->apiRequest('getUpdates', $paramRequest);
-        if (\count($this->arUpdates) >= 1) {
-            $lastElementId = $this->arUpdates[\count($this->arUpdates) - 1]['update_id'] + 1;
-            $paramRequest  = ['offset' => $lastElementId, 'limit' => '1'];
-            $this->apiRequest('getUpdates', $paramRequest);
-        }
+	/**
+	 * Обновление входящих запросов
+	 *
+	 * @param int $offset
+	 * @param int $limit
+	 *
+	 * @return mixed
+	 */
+	public function updatesUser($offset = 0, $limit = 100)
+	{
+		$paramRequest    = ['offset' => $offset, 'limit' => $limit];
+		$this->arUpdates = $this->apiRequest('getUpdates', $paramRequest);
+		if (\count($this->arUpdates) >= 1) {
+			$lastElementId = $this->arUpdates[\count($this->arUpdates) - 1]['update_id'] + 1;
+			$paramRequest  = ['offset' => $lastElementId, 'limit' => '1'];
+			$this->apiRequest('getUpdates', $paramRequest);
+		}
 
-        return $this->arUpdates;
-    }
+		return $this->arUpdates;
+	}
 } //

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
     public function execCurlRequest($handle)
     {
         $response = curl_exec($handle);
-        if ((int)curl_getinfo($handle, CURLINFO_HTTP_CODE) === 200) {
+        if ((int) curl_getinfo($handle, CURLINFO_HTTP_CODE) === 200) {
             $response = json_decode($response, true)['result'];
         } else {
             Debug::writeToFile(curl_getinfo($handle), 'execCurlRequest', 'telegram-log');

lib/config.php

Indentation +210 added lines, -210 removed lines

@@ -12,214 +12,214 @@
  */
 class Config
 {
-    public static $module_id = 'telegram.send';
-    public static $request;
-    public static $response = [
-        'updates' => false,
-        'message' => false
-    ];
-
-    /**
-     * Request
-     */
-    public static function processRequest()
-    {
-        self::$request = Context::getCurrent()->getRequest();
-        $funcName = self::$request->getPost('funcName');
-        if ($funcName) {
-            self::$funcName();
-        }
-    }
-
-    /**
-     * Получение всех почтовых шаблонов
-     * @return array
-     */
-    public static function getMailTemplates():array
-    {
-        $getRow = EventTypeTable::getList([
-            'select' => ['ID', 'EVENT_NAME', 'NAME'],
-            'filter' => ['=LID' => LANGUAGE_ID],
-            'order'  => ['EVENT_NAME' => 'ASC']
-        ]);
-
-        return $getRow->fetchAll();
-    }
-
-    /**
-     * Получение входящих запросов
-     */
-    public static function getUpdates()
-    {
-        $arReturn = [];
-        $arUpdates = (new Sending)->updatesUser()[0];
-        if ($arUpdates['message']['text'] === '/start' && $arUpdates['message']['chat']['id']) {
-            $arUsers = self::getUser();
-            if (!array_key_exists($arUpdates['message']['chat']['id'], $arUsers)) {
-                $arReturn = $arUpdates['message']['chat'];
-            }
-        }
-        if (!$arReturn) {
-            self::$response['message'] = self::setNote('Входящих запросов нет', 'ERROR');
-        }
-        self::$response['updates'] = $arReturn;
-        self::sendResponse();
-    }
-
-    /**
-     * Добавленные пользователи
-     * @return mixed
-     */
-    public static function getUser()
-    {
-        return unserialize(Option::get(self::$module_id, 'user'));
-    }
-
-    /**
-     * Генерация уведомления
-     *
-     * @param $message
-     * @param $type "ERROR"|"OK"|"PROGRESS"
-     *
-     * @return string
-     */
-    public static function setNote($message, $type):string
-    {
-        return (new \CAdminMessage(['MESSAGE' => $message, 'TYPE' => $type]))->Show();
-    }
-
-    /**
-     * Отправка json ответа
-     */
-    public static function sendResponse()
-    {
-        header('Content-Type: application/json');
-        die(json_encode(self::$response));
-    }
-
-    /**
-     * Добавление пользователя
-     */
-    public static function setUser()
-    {
-        $fields = self::$request->getPost('fields');
-        if ($fields) {
-            $savedUser = self::getUser();
-            if (!array_key_exists($fields['id'], $savedUser)) {
-                $newUser = [
-                    $fields['id'] => [
-                        'nickname' => $fields['nickname'],
-                        'username' => $fields['username']
-                    ]
-                ];
-                if ($savedUser) {
-                    $newUser += $savedUser;
-                }
-                self::setOption('user', $newUser);
-                self::$response['message'] = self::setNote('Пользователь добавлен', 'OK');
-            } else {
-                self::$response['message'] = self::setNote('Пользователь уже существует', 'ERROR');
-            }
-        }
-        self::sendResponse();
-    }
-
-    /**
-     * Запись данных в базу
-     *
-     * @param      $name
-     * @param      $option
-     * @param bool $serialize
-     */
-    public static function setOption($name, $option, $serialize = true)
-    {
-        Option::set(self::$module_id, $name, $serialize ? serialize($option) : $option);
-    }
-
-    /**
-     * Удаление пользователя
-     */
-    public static function deleteUser()
-    {
-        $fields = self::$request->getPost('fields');
-        if ($fields) {
-            $savedUser = self::getUser();
-            if (array_key_exists($fields['id'], $savedUser)) {
-                unset($savedUser[$fields['id']]);
-                self::setOption('user', $savedUser);
-                self::$response['message'] = self::setNote('Пользователь удален', 'OK');
-            } else {
-                self::$response['message'] = self::setNote('Этот пользователь уже удален', 'ERROR');
-            }
-        }
-        self::sendResponse();
-    }
-
-    /**
-     * Сохранение настроек
-     */
-    public static function saveConfig()
-    {
-        $fields = self::$request->getPost('fields');
-        if ($fields) {
-            foreach ($fields as $field => $value) {
-                if (\is_array($value)) {
-                    self::setOption($field, $value);
-                } else {
-                    self::setOption($field, $value, false);
-                }
-            }
-        }
-        if ($fields['module_on'] === '1') {
-            self::$response['message'] = self::setNote('Настройки сохранены', 'OK');
-        } else {
-            self::$response['message'] = self::setNote('Модуль отключен', 'ERROR');
-        }
-        self::sendResponse();
-    }
-
-    /**
-     * Активность модуля
-     * @return string
-     */
-    public static function statusModule():string
-    {
-        return Option::get(self::$module_id, 'module_on');
-    }
-
-    /**
-     * Токен бота
-     * @return string
-     */
-    public static function getToken():string
-    {
-        return Option::get(self::$module_id, 'token');
-    }
-
-    /**
-     * Почтовые шаблоны
-     * @return mixed
-     */
-    public static function getMail()
-    {
-        return unserialize(Option::get(self::$module_id, 'mail'));
-    }
-
-    /**
-     * Активность прокси
-     * @return mixed
-     */
-    public static function statusProxy()
-    {
-        return Option::get(self::$module_id, 'proxy_on');
-    }
-
-    /**
-     * Данные прокси
-     * @return mixed
-     */
-    public static function proxyData()
-    {
-        return unserialize(Option::get(self::$module_id, 'proxy'));
-    }
+	public static $module_id = 'telegram.send';
+	public static $request;
+	public static $response = [
+		'updates' => false,
+		'message' => false
+	];
+
+	/**
+	 * Request
+	 */
+	public static function processRequest()
+	{
+		self::$request = Context::getCurrent()->getRequest();
+		$funcName = self::$request->getPost('funcName');
+		if ($funcName) {
+			self::$funcName();
+		}
+	}
+
+	/**
+	 * Получение всех почтовых шаблонов
+	 * @return array
+	 */
+	public static function getMailTemplates():array
+	{
+		$getRow = EventTypeTable::getList([
+			'select' => ['ID', 'EVENT_NAME', 'NAME'],
+			'filter' => ['=LID' => LANGUAGE_ID],
+			'order'  => ['EVENT_NAME' => 'ASC']
+		]);
+
+		return $getRow->fetchAll();
+	}
+
+	/**
+	 * Получение входящих запросов
+	 */
+	public static function getUpdates()
+	{
+		$arReturn = [];
+		$arUpdates = (new Sending)->updatesUser()[0];
+		if ($arUpdates['message']['text'] === '/start' && $arUpdates['message']['chat']['id']) {
+			$arUsers = self::getUser();
+			if (!array_key_exists($arUpdates['message']['chat']['id'], $arUsers)) {
+				$arReturn = $arUpdates['message']['chat'];
+			}
+		}
+		if (!$arReturn) {
+			self::$response['message'] = self::setNote('Входящих запросов нет', 'ERROR');
+		}
+		self::$response['updates'] = $arReturn;
+		self::sendResponse();
+	}
+
+	/**
+	 * Добавленные пользователи
+	 * @return mixed
+	 */
+	public static function getUser()
+	{
+		return unserialize(Option::get(self::$module_id, 'user'));
+	}
+
+	/**
+	 * Генерация уведомления
+	 *
+	 * @param $message
+	 * @param $type "ERROR"|"OK"|"PROGRESS"
+	 *
+	 * @return string
+	 */
+	public static function setNote($message, $type):string
+	{
+		return (new \CAdminMessage(['MESSAGE' => $message, 'TYPE' => $type]))->Show();
+	}
+
+	/**
+	 * Отправка json ответа
+	 */
+	public static function sendResponse()
+	{
+		header('Content-Type: application/json');
+		die(json_encode(self::$response));
+	}
+
+	/**
+	 * Добавление пользователя
+	 */
+	public static function setUser()
+	{
+		$fields = self::$request->getPost('fields');
+		if ($fields) {
+			$savedUser = self::getUser();
+			if (!array_key_exists($fields['id'], $savedUser)) {
+				$newUser = [
+					$fields['id'] => [
+						'nickname' => $fields['nickname'],
+						'username' => $fields['username']
+					]
+				];
+				if ($savedUser) {
+					$newUser += $savedUser;
+				}
+				self::setOption('user', $newUser);
+				self::$response['message'] = self::setNote('Пользователь добавлен', 'OK');
+			} else {
+				self::$response['message'] = self::setNote('Пользователь уже существует', 'ERROR');
+			}
+		}
+		self::sendResponse();
+	}
+
+	/**
+	 * Запись данных в базу
+	 *
+	 * @param      $name
+	 * @param      $option
+	 * @param bool $serialize
+	 */
+	public static function setOption($name, $option, $serialize = true)
+	{
+		Option::set(self::$module_id, $name, $serialize ? serialize($option) : $option);
+	}
+
+	/**
+	 * Удаление пользователя
+	 */
+	public static function deleteUser()
+	{
+		$fields = self::$request->getPost('fields');
+		if ($fields) {
+			$savedUser = self::getUser();
+			if (array_key_exists($fields['id'], $savedUser)) {
+				unset($savedUser[$fields['id']]);
+				self::setOption('user', $savedUser);
+				self::$response['message'] = self::setNote('Пользователь удален', 'OK');
+			} else {
+				self::$response['message'] = self::setNote('Этот пользователь уже удален', 'ERROR');
+			}
+		}
+		self::sendResponse();
+	}
+
+	/**
+	 * Сохранение настроек
+	 */
+	public static function saveConfig()
+	{
+		$fields = self::$request->getPost('fields');
+		if ($fields) {
+			foreach ($fields as $field => $value) {
+				if (\is_array($value)) {
+					self::setOption($field, $value);
+				} else {
+					self::setOption($field, $value, false);
+				}
+			}
+		}
+		if ($fields['module_on'] === '1') {
+			self::$response['message'] = self::setNote('Настройки сохранены', 'OK');
+		} else {
+			self::$response['message'] = self::setNote('Модуль отключен', 'ERROR');
+		}
+		self::sendResponse();
+	}
+
+	/**
+	 * Активность модуля
+	 * @return string
+	 */
+	public static function statusModule():string
+	{
+		return Option::get(self::$module_id, 'module_on');
+	}
+
+	/**
+	 * Токен бота
+	 * @return string
+	 */
+	public static function getToken():string
+	{
+		return Option::get(self::$module_id, 'token');
+	}
+
+	/**
+	 * Почтовые шаблоны
+	 * @return mixed
+	 */
+	public static function getMail()
+	{
+		return unserialize(Option::get(self::$module_id, 'mail'));
+	}
+
+	/**
+	 * Активность прокси
+	 * @return mixed
+	 */
+	public static function statusProxy()
+	{
+		return Option::get(self::$module_id, 'proxy_on');
+	}
+
+	/**
+	 * Данные прокси
+	 * @return mixed
+	 */
+	public static function proxyData()
+	{
+		return unserialize(Option::get(self::$module_id, 'proxy'));
+	}
 } //