remove hard coded site urls

This commit is contained in:
Tanguy Pruvot 2015-07-19 19:10:32 +02:00
parent 00aa5f13dc
commit a1909ed636
6 changed files with 20 additions and 18 deletions

View file

@ -198,7 +198,7 @@ function yaamp_profitability($coin)
function yaamp_convert_amount_user($coin, $amount, $user)
{
$refcoin = getdbo('db_coins', $user->coinid);
if(!$refcoin) $refcoin = getdbosql('db_coins', "symbol='BTC'");
if(!$refcoin && YAAMP_ALLOW_EXCHANGE) $refcoin = getdbosql('db_coins', "symbol='BTC'");
if(!$refcoin || $refcoin->price2<=0) return 0;
$value = $amount * $coin->price2 / $refcoin->price2;
@ -208,7 +208,7 @@ function yaamp_convert_amount_user($coin, $amount, $user)
function yaamp_convert_earnings_user($user, $status)
{
$refcoin = getdbo('db_coins', $user->coinid);
if(!$refcoin) $refcoin = getdbosql('db_coins', "symbol='BTC'");
if(!$refcoin && YAAMP_ALLOW_EXCHANGE) $refcoin = getdbosql('db_coins', "symbol='BTC'");
if(!$refcoin || $refcoin->price2<=0) return 0;
$value = dboscalar("select sum(amount*price) from earnings where $status and userid=$user->id");

View file

@ -313,7 +313,7 @@ class ApiController extends CommonController
// $uptime = system('uptime');
// $name = system('hostname');
// fetch_url("http://yiimp.ccminer.org/api/nodereport?name=$name&uptime=$uptime");
// fetch_url("http://".YAAMP_SITE_URL."/api/nodereport?name=$name&uptime=$uptime");
// }

View file

@ -7,7 +7,7 @@
<br>
GOTO <a href='http://yiimp.ccminer.org'>YIIMP</a>
GOTO <a href="http://<?= YAAMP_SITE_URL ?>">YIIMP</a>
<br><br><br><br><br>

View file

@ -11,7 +11,7 @@ you have from 5 to 15 submits per minute. It's a good trade off between bandwidt
if you want to set the difficulty to 64, you would use:</p>
<pre class="main-left-box" style='padding: 3px; font-size: .9em; background-color: #ffffee; font-family: monospace;'>
-o stratum+tcp://yiimp.ccminer.org:3433 -u wallet_adress -p d=64
-o stratum+tcp://<?= YAAMP_SITE_URL ?>:3433 -u wallet_adress -p d=64
</pre>
<p style="width: 700px;">Here are the accepted values for the custom diff:</p>

View file

@ -11,7 +11,7 @@ JavascriptFile('/yaamp/ui/js/auto_refresh.js');
$height = '240px';
echo <<<END
?>
<div id='resume_update_button' style='color: #444; background-color: #ffd; border: 1px solid #eea;
padding: 10px; margin-left: 20px; margin-right: 20px; margin-top: 15px; cursor: pointer; display: none;'
@ -53,10 +53,14 @@ echo <<<END
<li>
<p class="main-left-box" style='padding: 3px; font-size: .8em; background-color: #ffffee; font-family: monospace;'>
-o stratum+tcp://yiimp.ccminer.org:PORT -u WALLET_ADDRESS -p xx</p>
-o stratum+tcp://<?= YAAMP_SITE_URL ?>:PORT -u WALLET_ADDRESS -p xx</p>
</li>
<?php if (YAAMP_ALLOW_EXCHANGE): ?>
<li>WALLET_ADDRESS can be of any currency we mine or a BTC address.</li>
<?php else: ?>
<li>WALLET_ADDRESS should be the currency you mine. DO NOT USE any BTC address here, <b>the auto exchange is disabled</b>!</li>
<?php endif; ?>
<li>Use -p "c=SYMBOL" if yiimp does not recognize the currency correctly.</li>
<li>See the "Pool Status" area on the right for PORT numbers. Algorithms without associated coins are disabled.</li>
@ -74,13 +78,13 @@ echo <<<END
<ul>
<li><b>BitcoinTalk</b> - <a href='https://bitcointalk.org/index.php?topic=508786.0' target=_blank >https://bitcointalk.org/index.php?topic=508786.0</a></li>
<!--li><b>IRC</b> - <a href='http://webchat.freenode.net/?channels=#yaamp' target=_blank >http://webchat.freenode.net/?channels=#yaamp</a></li-->
<li><b>IRC</b> - <a href='http://webchat.freenode.net/?channels=#yiimp' target=_blank >http://webchat.freenode.net/?channels=#yiimp</a></li>
<li><b>API</b> - <a href='/site/api'>http://yiimp.ccminer.org/site/api</a></li>
<li><b>Difficulty</b> - <a href='/site/diff'>http://yiimp.ccminer.org/site/diff</a></li>
<!--
<li><b>Algo Switching</b> - <a href='/site/multialgo'>http://yiimp.ccminer.org/site/multialgo</a></li>
-->
<li><b>API</b> - <a href='/site/api'>http://<?= YAAMP_SITE_URL ?>/site/api</a></li>
<li><b>Difficulty</b> - <a href='/site/diff'>http://<?= YAAMP_SITE_URL ?>/site/diff</a></li>
<?php if (YAAMP_ALLOW_EXCHANGE): ?>
<li><b>Algo Switching</b> - <a href='/site/multialgo'>http://<?= YAAMP_SITE_URL ?>/site/multialgo</a></li>
<?php endif; ?>
<br>
@ -152,5 +156,3 @@ function pool_history_refresh()
</script>
END;

View file

@ -110,10 +110,10 @@ function showPageHeader()
echo "<span style='float: right;'>";
$mining = getdbosql('db_mining');
$nextpayment = date('H:i', $mining->last_payout+YAAMP_PAYMENTS_FREQ);
$nextpayment = date('H:i T', $mining->last_payout+YAAMP_PAYMENTS_FREQ);
echo "<span style='font-size: .8em;'>Next Payout: $nextpayment EUST</span>";
echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&copy; yiimp.ccminer.org</span>";
echo "<span style='font-size: .8em;'>Next Payout: $nextpayment</span>";
echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&copy; ".YAAMP_SITE_URL."</span>";
echo "</div>";
echo "</div>";