Skip to content

Commit

Permalink
ново дефиниране на константа
Browse files Browse the repository at this point in the history
  • Loading branch information
@dminko
dminko committed Dec 22, 2021
1 parent cac1ff9 commit ade25f1
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 26 deletions.
18 changes: 13 additions & 5 deletions phpsignal/Client.class.php
View file
Expand Up @@ -31,7 +31,7 @@ public static function send(array $number, $message)
if (core_Composer::isInUse()) {
try {
// Инстанция на класа
$binPath = phpsignal_Setup::get('SIGNAL_PATH') . '/signal-cli-' . phpsignal_Setup::get('SIGNAL_VERSION') . '/bin/signal-cli';
$binPath = phpsignal_Setup::get('SIGNAL_BIN_PATH');
$client = new Signal($binPath, phpsignal_Setup::get('SIGNAL_NUMBER'), Signal::FORMAT_JSON);
} catch (Exception $e) {
reportException($e);
Expand Down Expand Up @@ -61,7 +61,7 @@ public function act_ValidateCode()
if (core_Composer::isInUse()) {
$signalNumber = phpsignal_Setup::get('SIGNAL_NUMBER');
// Инстанция на класа
$binPath = phpsignal_Setup::get('SIGNAL_PATH') . '/signal-cli-' . phpsignal_Setup::get('SIGNAL_VERSION') . '/bin/signal-cli';
$binPath = phpsignal_Setup::get('SIGNAL_BIN_PATH');
$client = new Signal($binPath, $signalNumber, Signal::FORMAT_JSON);
}
$msg = "Неуспешна валидация";
Expand Down Expand Up @@ -90,7 +90,7 @@ public function act_UnRegister()
if (core_Composer::isInUse()) {
try {
// Инстанция на класа
$binPath = phpsignal_Setup::get('SIGNAL_PATH') . '/signal-cli-' . phpsignal_Setup::get('SIGNAL_VERSION') . '/bin/signal-cli';
$binPath = phpsignal_Setup::get('SIGNAL_BIN_PATH');
$client = new Signal($binPath, phpsignal_Setup::get('SIGNAL_NUMBER'), Signal::FORMAT_JSON);
} catch (Exception $e) {
reportException($e);
Expand Down Expand Up @@ -131,7 +131,7 @@ public function act_Register()
if (core_Composer::isInUse()) {
$signalNumber = phpsignal_Setup::get('SIGNAL_NUMBER');
// Инстанция на класа
$binPath = phpsignal_Setup::get('SIGNAL_PATH') . '/signal-cli-' . phpsignal_Setup::get('SIGNAL_VERSION') . '/bin/signal-cli';
$binPath = phpsignal_Setup::get('SIGNAL_BIN_PATH');
$client = new Signal($binPath, $signalNumber, Signal::FORMAT_JSON);
}

Expand All @@ -151,5 +151,13 @@ public function act_Register()

return $tpl;
}


/**
* Регистрира signal клиента
*/
public function act_Test()
{
requireRole('admin');
bp(phpsignal_Client::send(['+359887181813'], "Hi hi hi ..."));
}
}
50 changes: 29 additions & 21 deletions phpsignal/Setup.class.php
View file
Expand Up @@ -5,8 +5,8 @@
/**
* Местоположение на signal-cli
*/
defIfNot('PHPSIGNAL_SIGNAL_PATH', EF_ROOT_PATH);
defIfNot('PHPSIGNAL_SIGNAL_VERSION', '0.9.2');
defIfNot('PHPSIGNAL_SIGNAL_BIN_PATH', '/usr/local/bin/signal-cli');
//defIfNot('PHPSIGNAL_SIGNAL_VERSION', '0.9.2');
defIfNot('PHPSIGNAL_SIGNAL_NUMBER', '+359');
defIfNot('PHPSIGNAL_SIGNAL_TEST_NUMBER','+359');

Expand Down Expand Up @@ -63,8 +63,8 @@ class phpsignal_Setup extends core_ProtoSetup
* Описание на конфигурационните константи
*/
public $configDescription = array(
'PHPSIGNAL_SIGNAL_PATH' => array('varchar', 'mandatory, caption=Настройки signal-cli->Път'),
'PHPSIGNAL_SIGNAL_VERSION' => array('varchar', 'mandatory, caption=Настройки signal-cli->Версия'),
'PHPSIGNAL_SIGNAL_BIN_PATH' => array('varchar', 'mandatory, caption=Настройки signal-cli->Път изпълним файл'),
// 'PHPSIGNAL_SIGNAL_VERSION' => array('varchar', 'mandatory, caption=Настройки signal-cli->Версия'),
'PHPSIGNAL_SIGNAL_NUMBER' => array('varchar(20)', 'mandatory, caption=Настройки клиент->Номер'),
'PHPSIGNAL_SIGNAL_TEST_NUMBER' => array('varchar(20)', 'caption=Номер за тестово съобщение->стойност'),
);
Expand All @@ -84,23 +84,26 @@ public function install()
}

// Проверка за наличие на cli signal клиент
$binPath = phpsignal_Setup::get('SIGNAL_PATH') . '/signal-cli-' . phpsignal_Setup::get('SIGNAL_VERSION') . '/bin/';
// $binPath = phpsignal_Setup::get('SIGNAL_PATH') . '/signal-cli-' . phpsignal_Setup::get('SIGNAL_VERSION') . '/bin/';
$binPath = phpsignal_Setup::get('SIGNAL_BIN_PATH');
// Ако няма CLI - го сваляме
if (!is_executable($binPath . 'signal-cli')) {
$filename = "signal-cli-" . phpsignal_Setup::get('SIGNAL_VERSION') . ".tar.gz";
$cmd = "wget -O /tmp/{$filename} https://github.com/AsamK/signal-cli/releases/download/v" . phpsignal_Setup::get('SIGNAL_VERSION') . "/{$filename} -P /tmp/ 2>&1";
$outputDwnl = null;
exec ($cmd, $outputDwnl);
$output = null;
$cmd = "tar xf /tmp/{$filename} -C " . phpsignal_Setup::get('SIGNAL_PATH') . " 2>&1";
exec ($cmd, $output);
if (is_executable($binPath . 'signal-cli')) {
$html .= "<li class='debug-new'>Успешно инсталиран signal-cli</li>";
} else {
$html .= "<li class='debug-error'>Проблем с инсталирането на signal-cli</li>";
$html .= "<li class='debug-error'>Резултат сваляне: <pre>" . print_r($outputDwnl, true) . "</pre></li>";
$html .= "<li class='debug-error'>Резултат разархивиране: <pre>" . print_r($output, true) . "</pre></li>";
}
if (!is_executable($binPath)) {
$html .= "<li class='debug-error'>{$binPath} не може да се изпълни!</li>";

// $filename = "signal-cli-" . phpsignal_Setup::get('SIGNAL_VERSION') . ".tar.gz";
// $cmd = "wget -O /tmp/{$filename} https://github.com/AsamK/signal-cli/releases/download/v" . phpsignal_Setup::get('SIGNAL_VERSION') . "/{$filename} -P /tmp/ 2>&1";
// $outputDwnl = null;
// exec ($cmd, $outputDwnl);
// $output = null;
// $cmd = "tar xf /tmp/{$filename} -C " . phpsignal_Setup::get('SIGNAL_PATH') . " 2>&1";
// exec ($cmd, $output);
// if (is_executable($binPath . 'signal-cli')) {
// $html .= "<li class='debug-new'>Успешно инсталиран signal-cli</li>";
// } else {
// $html .= "<li class='debug-error'>Проблем с инсталирането на signal-cli</li>";
// $html .= "<li class='debug-error'>Резултат сваляне: <pre>" . print_r($outputDwnl, true) . "</pre></li>";
// $html .= "<li class='debug-error'>Резултат разархивиране: <pre>" . print_r($output, true) . "</pre></li>";
// }
} else {
$html .= "<li class='debug-info'>Инсталиран от преди това signal-cli</li>";
}
Expand All @@ -119,8 +122,13 @@ public function checkConfig($fullCheck = false)

return;
}
$binPath = phpsignal_Setup::get('SIGNAL_BIN_PATH');
// Ако няма CLI - го сваляме
if (!is_executable($binPath)) {
$html .= "<li class='debug-error'>{$binPath} не е изпълним!</li>";
}
if (core_Composer::isInUse()) {
$binPath = phpsignal_Setup::get('SIGNAL_PATH') . '/signal-cli-' . phpsignal_Setup::get('SIGNAL_VERSION') . '/bin/signal-cli';
$binPath = phpsignal_Setup::get('SIGNAL_BIN_PATH');
$client = new Signal($binPath, phpsignal_Setup::get('SIGNAL_NUMBER'), Signal::FORMAT_JSON);
} else {
return "Не е инсталиран композер!";
Expand Down

0 comments on commit ade25f1

Please sign in to comment.