From 2eb15cb600726b7346e0cd08422ec75e7e8e8578 Mon Sep 17 00:00:00 2001 From: Alexander Minkin Date: Mon, 11 Dec 2023 13:11:04 +0300 Subject: [PATCH] fix(composer,templates): remove zadarma traces --- Web/Presenters/templates/About/Version.xml | 14 +++--- Web/Presenters/templates/User/Edit.xml | 2 +- composer.json | 1 - composer.lock | 53 +--------------------- 4 files changed, 9 insertions(+), 61 deletions(-) diff --git a/Web/Presenters/templates/About/Version.xml b/Web/Presenters/templates/About/Version.xml index 4d89a93d..47fc7ed6 100644 --- a/Web/Presenters/templates/About/Version.xml +++ b/Web/Presenters/templates/About/Version.xml @@ -282,7 +282,7 @@ Number verification - {php echo OPENVK_ROOT_CONF["openvk"]["credentials"]["zadarma"]["enable"] ? "SMS (Zadarma)" : "Disabled"} + {php echo OPENVK_ROOT_CONF["openvk"]["credentials"]["smsc"]["enable"] ? "SMS" : "Disabled"} Disabled @@ -364,21 +364,21 @@ Vladimir Barinov, Konstantin Kichulkin and Daniel Myslivets - + - {$theme->getName()} + {$themeEntry->getName()} - {$theme->isEnabled() ? "Enabled" : "Installed"} + {$themeEntry->isEnabled() ? "Enabled" : "Installed"} - {$theme->getVersion()} + {$themeEntry->getVersion()} - {$theme->getDescription()|truncate:20} + {$themeEntry->getDescription()|truncate:20} - {$theme->getAuthor()} + {$themeEntry->getAuthor()} diff --git a/Web/Presenters/templates/User/Edit.xml b/Web/Presenters/templates/User/Edit.xml index aa1a46ea..1ee3471a 100644 --- a/Web/Presenters/templates/User/Edit.xml +++ b/Web/Presenters/templates/User/Edit.xml @@ -70,7 +70,7 @@ - {if OPENVK_ROOT_CONF['openvk']['credentials']['zadarma']['enable']} + {if OPENVK_ROOT_CONF['openvk']['credentials']['smsc']['enable']} {_phone}: diff --git a/composer.json b/composer.json index 373d667d..3c277942 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,6 @@ "guzzlehttp/guzzle": "^6.5", "komeiji-satori/curl": "dev-master", "whichbrowser/parser": "dev-master", - "zadarma/user-api-v1": "dev-master", "james-heinrich/getid3": "^1.9@dev", "rybakit/msgpack": "dev-master", "wapmorgan/binary-stream": "dev-master", diff --git a/composer.lock b/composer.lock index ef406e37..fbf19bf2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "74fb28e354c833498ae89dd108eb1d76", + "content-hash": "636b9c2de242c3485ec3924bc662629e", "packages": [ { "name": "al/emoji-detector", @@ -2713,56 +2713,6 @@ "source": "https://github.com/WhichBrowser/Parser-PHP/tree/v2.1.7" }, "time": "2022-04-19T20:14:54+00:00" - }, - { - "name": "zadarma/user-api-v1", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/zadarma/user-api-v1.git", - "reference": "bfdb7550b8f17e49b2928a84bfa0ec8587838806" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zadarma/user-api-v1/zipball/bfdb7550b8f17e49b2928a84bfa0ec8587838806", - "reference": "bfdb7550b8f17e49b2928a84bfa0ec8587838806", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "php": ">=5.5.0" - }, - "default-branch": true, - "type": "library", - "autoload": { - "psr-4": { - "Zadarma_API\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Zadarma", - "email": "github@zadarma.com" - } - ], - "description": "PHP class for Zadarma API", - "homepage": "https://github.com/zadarma/user-api-v1", - "keywords": [ - "api", - "free calls", - "pbx", - "sip", - "zadarma" - ], - "support": { - "issues": "https://github.com/zadarma/user-api-v1/issues", - "source": "https://github.com/zadarma/user-api-v1/tree/v1.1.9" - }, - "time": "2023-01-17T09:52:53+00:00" } ], "packages-dev": [], @@ -2771,7 +2721,6 @@ "stability-flags": { "komeiji-satori/curl": 20, "whichbrowser/parser": 20, - "zadarma/user-api-v1": 20, "james-heinrich/getid3": 20, "rybakit/msgpack": 20, "wapmorgan/binary-stream": 20,