LBRYFoundation/pool
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/pool.git synced 2025-09-13 22:19:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

triggers: fix variable errors

Browse source
This commit is contained in:
Tanguy Pruvot 2016-12-24 23:04:02 +01:00
parent 91932aef32
commit 5ed5e2da35
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
web/yaamp/core/backend/notify.php
View file

@ -65,7 +65,7 @@ function NotifyCheckRules()
if (!$triggered) continue; if (!$triggered) continue;
$value = bitcoinvaluetoa($value); $value = bitcoinvaluetoa($value);
debuglog("trigger: {$coin->symbol} {$rule->conditiontype} {$rule->conditionvalue} ({$value})"); debuglog("trigger: {$coin->symbol} {$rule->notifytype} {$rule->conditiontype} {$rule->conditionvalue} ({$value})");
switch ($rule->notifytype) switch ($rule->notifytype)
{ {
@ -80,21 +80,21 @@ function NotifyCheckRules()
// replace some possible vars in message (description) // replace some possible vars in message (description)
$message = str_replace('$X', $value, $message); $message = str_replace('$X', $value, $message);
$message = str_replace('$F', $field, $message); $message = str_replace('$F', $field, $message);
$message = str_replace('$T', $conditiontype, $message); $message = str_replace('$T', $rule->conditiontype, $message);
$message = str_replace('$V', $conditionvalue, $message); $message = str_replace('$V', $rule->conditionvalue, $message);
$message = str_replace('$N', $coin->name, $message); $message = str_replace('$N', $coin->name, $message);
$message = str_replace('$SYM', $coin->symbol, $message); $message = str_replace('$SYM', $coin->symbol, $message);
$message = str_replace('$S2', $coin->symbol2, $message); $message = str_replace('$S2', $coin->symbol2, $message);
$message = str_replace('$A', $coin->master_wallet, $message); $message = str_replace('$A', $coin->master_wallet, $message);
$dest = YAAMP_ADMIN_EMAIL; $dest = YAAMP_ADMIN_EMAIL;
if (!empty($rule->notifycmd) && strstr($notifycmd, "@")) { if (!empty($rule->notifycmd) && strstr($rule->notifycmd, "@")) {
$dest = $rule->notifycmd; $dest = $rule->notifycmd;
} }
$res = mail($dest, $subject, $message); $res = mail($dest, $subject, $message);
if (!$res) if (!$res)
debuglog("notify: unable to send mail to {$dest}!"); debuglog("notify: {$coin->symbol} unable to send mail to {$dest}!");
break; break;
case 'rpc': case 'rpc':
@ -104,8 +104,8 @@ function NotifyCheckRules()
// replace some possible vars in user command // replace some possible vars in user command
$command = str_replace('$X', $value, $command); $command = str_replace('$X', $value, $command);
$command = str_replace('$F', $field, $command); $command = str_replace('$F', $field, $command);
$command = str_replace('$T', $conditiontype, $command); $command = str_replace('$T', $rule->conditiontype, $command);
$command = str_replace('$V', $conditionvalue, $command); $command = str_replace('$V', $rule->conditionvalue, $command);
$command = str_replace('$N', $coin->name, $command); $command = str_replace('$N', $coin->name, $command);
$command = str_replace('$SYM', $coin->symbol, $command); $command = str_replace('$SYM', $coin->symbol, $command);
$command = str_replace('$S2', $coin->symbol2, $command); $command = str_replace('$S2', $coin->symbol2, $command);
@ -115,7 +115,9 @@ function NotifyCheckRules()
$res = $remote->execute($command); $res = $remote->execute($command);
if ($res === false) if ($res === false)
debuglog("notify: rpc error {$coin->symbol} {$command}"); debuglog("trigger: {$coin->symbol} rpc error '{$command}' {$remote->error}");
else
debuglog("trigger: {$coin->symbol} rpc -> $res");
break; break;
case 'system': case 'system':
@ -125,8 +127,8 @@ function NotifyCheckRules()
// replace some possible vars in user command // replace some possible vars in user command
$command = str_replace('$X', $value, $command); $command = str_replace('$X', $value, $command);
$command = str_replace('$F', $field, $command); $command = str_replace('$F', $field, $command);
$command = str_replace('$T', $conditiontype, $command); $command = str_replace('$T', $rule->conditiontype, $command);
$command = str_replace('$V', $conditionvalue, $command); $command = str_replace('$V', $rule->conditionvalue, $command);
$command = str_replace('$N', $coin->name, $command); $command = str_replace('$N', $coin->name, $command);
$command = str_replace('$SYM', $coin->symbol, $command); $command = str_replace('$SYM', $coin->symbol, $command);
$command = str_replace('$S2', $coin->symbol2, $command); $command = str_replace('$S2', $coin->symbol2, $command);
@ -134,7 +136,7 @@ function NotifyCheckRules()
$res = system($command); $res = system($command);
if ($res === false) if ($res === false)
debuglog("notify: unable to execute {$rule->notifycmd}!"); debuglog("trigger: {$coin->symbol} unable to execute '{$command}'!");
break; break;
} }
} }

2
web/yaamp/core/functions/admin.php
View file

@ -24,7 +24,7 @@ function getAdminWalletLinks($coin, $info=NULL, $src='wallet')
$html .= ' || '.$coin->createExplorerLink("<b>EXPLORER</b>"); $html .= ' || '.$coin->createExplorerLink("<b>EXPLORER</b>");
$html .= ' || '.CHtml::link("<b>PEERS</b>", '/site/peers?id='.$coin->id); $html .= ' || '.CHtml::link("<b>PEERS</b>", '/site/peers?id='.$coin->id);
$html .= ' || '.CHtml::link("<b>CONSOLE</b>", '/site/console?id='.$coin->id); $html .= ' || '.CHtml::link("<b>CONSOLE</b>", '/site/console?id='.$coin->id);
$html .= ' || '.CHtml::link("<b>TRIGGER</b>", '/site/triggers?id='.$coin->id); $html .= ' || '.CHtml::link("<b>TRIGGERS</b>", '/site/triggers?id='.$coin->id);
if ($src != 'wallet') if ($src != 'wallet')
$html .= ' || '.CHtml::link("<b>{$coin->symbol}</b>", '/site/coin?id='.$coin->id); $html .= ' || '.CHtml::link("<b>{$coin->symbol}</b>", '/site/coin?id='.$coin->id);
} }