RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Merge conflict

Browse Source
This commit is contained in:
Sebastian Grewe 2014-04-04 10:34:04 +02:00
commit ae7d321de4
15 changed files with 746 additions and 729 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
public/include/pages/account/edit.inc.php
View File

@ -12,52 +12,54 @@ $updating = (@$_POST['do']) ? 1 : 0;
if ($user->isAuthenticated()) {
if ($config['twofactor']['enabled']) {
$popupmsg = 'E-mail confirmations are required for ';
$popuptypes = array();
if ($config['twofactor']['options']['details'] && $oldtoken_ea !== "") {
$popuptypes[] = 'editing your details';
$ea_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_ea, 5);
$ea_sent = $user->token->doesTokenExist('account_edit', $_SESSION['USERDATA']['id']);
}
if ($config['twofactor']['options']['changepw'] && $oldtoken_cp !== "") {
$popuptypes[] = 'changing your password';
$cp_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_cp, 6);
$cp_sent = $user->token->doesTokenExist('change_pw', $_SESSION['USERDATA']['id']);
}
if ($config['twofactor']['options']['withdraw'] && $oldtoken_wf !== "") {
$popuptypes[] = 'withdrawals';
$wf_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_wf, 7);
$wf_sent = $user->token->doesTokenExist('withdraw_funds', $_SESSION['USERDATA']['id']);
}
// get the status of a token if set
$message_tokensent_invalid = 'A token was sent to your e-mail that will allow you to ';
$message_tokensent_valid = 'You can currently ';
$messages_tokensent_status = array(
'ea' => 'edit your account details',
'wf' => 'withdraw funds',
'cp' => 'change your password'
);
// build the message we're going to show them for their token(s)
$eaprep_sent = ($ea_sent) ? $message_tokensent_valid.$messages_tokensent_status['ea'] : "";
$eaprep_edit = ($ea_editable) ? $message_tokensent_invalid.$messages_tokensent_status['ea'] : "";
$wfprep_sent = ($wf_sent) ? $message_tokensent_valid.$messages_tokensent_status['wf'] : "";
$wfprep_edit = ($wf_editable) ? $message_tokensent_invalid.$messages_tokensent_status['wf'] : "";
$cpprep_sent = ($cp_sent) ? $message_tokensent_valid.$messages_tokensent_status['cp'] : "";
$cpprep_edit = ($cp_editable) ? $message_tokensent_invalid.$messages_tokensent_status['cp'] : "";
$ptc = 0;
$ptcn = count($popuptypes);
foreach ($popuptypes as $pt) {
if ($ptcn == 1) { $popupmsg.= $popuptypes[$ptc]; continue; }
if ($ptc !== ($ptcn-1)) {
$popupmsg.= $popuptypes[$ptc].', ';
} else {
$popupmsg.= 'and '.$popuptypes[$ptc];
if ($config['twofactor']['options']['details'] OR $config['twofactor']['options']['changepw'] OR $config['twofactor']['options']['withdraw']) {
$popupmsg = 'E-mail confirmations are required for ';
$popuptypes = array();
if ($config['twofactor']['options']['details'] && $oldtoken_ea !== "") {
$popuptypes[] = 'editing your details';
$ea_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_ea, 5);
$ea_sent = $user->token->doesTokenExist('account_edit', $_SESSION['USERDATA']['id']);
}
$ptc++;
if ($config['twofactor']['options']['changepw'] && $oldtoken_cp !== "") {
$popuptypes[] = 'changing your password';
$cp_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_cp, 6);
$cp_sent = $user->token->doesTokenExist('change_pw', $_SESSION['USERDATA']['id']);
}
if ($config['twofactor']['options']['withdraw'] && $oldtoken_wf !== "") {
$popuptypes[] = 'withdrawals';
$wf_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_wf, 7);
$wf_sent = $user->token->doesTokenExist('withdraw_funds', $_SESSION['USERDATA']['id']);
}
// get the status of a token if set
$message_tokensent_invalid = 'A token was sent to your e-mail that will allow you to ';
$message_tokensent_valid = 'You can currently ';
$messages_tokensent_status = array(
'ea' => 'edit your account details',
'wf' => 'withdraw funds',
'cp' => 'change your password'
);
// build the message we're going to show them for their token(s)
$eaprep_sent = ($ea_sent) ? $message_tokensent_valid.$messages_tokensent_status['ea'] : "";
$eaprep_edit = ($ea_editable) ? $message_tokensent_invalid.$messages_tokensent_status['ea'] : "";
$wfprep_sent = ($wf_sent) ? $message_tokensent_valid.$messages_tokensent_status['wf'] : "";
$wfprep_edit = ($wf_editable) ? $message_tokensent_invalid.$messages_tokensent_status['wf'] : "";
$cpprep_sent = ($cp_sent) ? $message_tokensent_valid.$messages_tokensent_status['cp'] : "";
$cpprep_edit = ($cp_editable) ? $message_tokensent_invalid.$messages_tokensent_status['cp'] : "";
$ptc = 0;
$ptcn = count($popuptypes);
foreach ($popuptypes as $pt) {
if ($ptcn == 1) { $popupmsg.= $popuptypes[$ptc]; continue; }
if ($ptc !== ($ptcn-1)) {
$popupmsg.= $popuptypes[$ptc].', ';
} else {
$popupmsg.= 'and '.$popuptypes[$ptc];
}
$ptc++;
}
// display global notice about tokens being in use and for which bits they're active
$_SESSION['POPUP'][] = array('CONTENT' => $popupmsg, 'TYPE' => 'alert alert-warning');
}
// display global notice about tokens being in use and for which bits they're active
$_SESSION['POPUP'][] = array('CONTENT' => $popupmsg, 'TYPE' => 'alert alert-warning');
}
if (isset($_POST['do']) && $_POST['do'] == 'genPin') {
@ -174,12 +176,12 @@ if ($config['twofactor']['enabled'] && $user->isAuthenticated()) {
}
// display token info per each - only when sent and editable or just sent, not by default
(!empty($eaprep_sent) && !empty($eaprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $eaprep_sent, 'TYPE' => 'success'):"";
(!empty($eaprep_sent) && empty($eaprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['ea'], 'TYPE' => 'success'):"";
(!empty($wfprep_sent) && !empty($wfprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $wfprep_sent, 'TYPE' => 'success'):"";
(!empty($wfprep_sent) && empty($wfprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['wf'], 'TYPE' => 'success'):"";
(!empty($cpprep_sent) && !empty($cpprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $cpprep_sent, 'TYPE' => 'success'):"";
(!empty($cpprep_sent) && empty($cpprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['cp'], 'TYPE' => 'success'):"";
(!empty($eaprep_sent) && !empty($eaprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $eaprep_sent, 'TYPE' => 'alert alert-success'):"";
(!empty($eaprep_sent) && empty($eaprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['ea'], 'TYPE' => 'alert alert-success'):"";
(!empty($wfprep_sent) && !empty($wfprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $wfprep_sent, 'TYPE' => 'alert alert-success'):"";
(!empty($wfprep_sent) && empty($wfprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['wf'], 'TYPE' => 'alert alert-success'):"";
(!empty($cpprep_sent) && !empty($cpprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $cpprep_sent, 'TYPE' => 'alert alert-success'):"";
(!empty($cpprep_sent) && empty($cpprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['cp'], 'TYPE' => 'alert alert-success'):"";
// two-factor stuff
$smarty->assign("CHANGEPASSUNLOCKED", $cp_editable);
$smarty->assign("WITHDRAWUNLOCKED", $wf_editable);

4
public/site_assets/bootstrap/css/design/dark.css
View File

@ -138,3 +138,7 @@ a:focus {
.dropdown-menu {
background-color: #D3D3D3;
}
.confirmations {
color: #F3FF12;
}

1234
public/site_assets/bootstrap/css/mpos.css
View File

File diff suppressed because it is too large Load Diff

17
public/templates/bootstrap/account/earnings/default.tpl
View File

@ -10,12 +10,13 @@
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
<i class="fa fa-credit-card fa-fw"></i> All Time
<i class="fa fa-credit-card fa-fw"></i> Summary
</div>
<div class="panel-body">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th class="col-xs-1"></th>
{foreach $SUMMARY as $type=>$total}
<th>{$type}</th>
{/foreach}
@ -23,6 +24,7 @@
</thead>
<tbody>
<tr>
<td class="col-xs-1">All Time</td>
{foreach $SUMMARY as $type=>$total}
<td class="right">{$total|number_format:"8"}</td>
{/foreach}
@ -44,7 +46,7 @@
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th></th>
<th class="col-xs-1"></th>
<th>Credit</th>
<th>Bonus</th>
<th>Debit AP</th>
@ -58,7 +60,7 @@
</thead>
<tbody>
<tr>
<td>Last Hour</th>
<td class="col-xs-1">Last Hour</th>
<td>{$BYTIME.1HourCredit|number_format:"8"}</td>
<td>{$BYTIME.1HourBonus|number_format:"8"}</td>
<td>{$BYTIME.1HourDebitAP|number_format:"8"}</td>
@ -70,7 +72,7 @@
<td>{$BYTIME.1HourTXFee|number_format:"8"}</td>
</tr>
<tr>
<td>Last Day</th>
<td class="col-xs-1">Last Day</th>
<td>{$BYTIME.24HourCredit|number_format:"8"}</td>
<td>{$BYTIME.24HourBonus|number_format:"8"}</td>
<td>{$BYTIME.24HourDebitAP|number_format:"8"}</td>
@ -82,7 +84,7 @@
<td>{$BYTIME.24HourTXFee|number_format:"8"}</td>
</tr>
<tr>
<td>Last Week</th>
<td class="col-xs-1">Last Week</th>
<td>{$BYTIME.1WeekCredit|number_format:"8"}</td>
<td>{$BYTIME.1WeekBonus|number_format:"8"}</td>
<td>{$BYTIME.1WeekDebitAP|number_format:"8"}</td>
@ -94,7 +96,7 @@
<td>{$BYTIME.1WeekTXFee|number_format:"8"}</td>
</tr>
<tr>
<td>Last Month</th>
<td class="col-xs-1">Last Month</th>
<td>{$BYTIME.1MonthCredit|number_format:"8"}</td>
<td>{$BYTIME.1MonthBonus|number_format:"8"}</td>
<td>{$BYTIME.1MonthDebitAP|number_format:"8"}</td>
@ -106,7 +108,7 @@
<td>{$BYTIME.1MonthTXFee|number_format:"8"}</td>
</tr>
<tr>
<td>Last Year</th>
<td class="col-xs-1">Last Year</th>
<td>{$BYTIME.1YearCredit|number_format:"8"}</td>
<td>{$BYTIME.1YearBonus|number_format:"8"}</td>
<td>{$BYTIME.1YearDebitAP|number_format:"8"}</td>
@ -123,7 +125,6 @@
</div>
</div>
</div>
</div>
</div>
</div>

2
public/templates/bootstrap/account/edit/cashout.tpl
View File

@ -28,7 +28,7 @@
{nocache}<input class="form-control" id="disabledInput" type="text" value="{$GLOBAL.userdata.coin_address|escape}" disabled />{/nocache}
</div>
<div class="form-group">
<label>4 digit PIN</label>
<label>4 Digit PIN</label>
<input class="form-control" type="password" name="authPin" size="4" maxlength="4" />
</div>
</div>

2
public/templates/bootstrap/account/edit/detail.tpl
View File

@ -54,7 +54,7 @@
<font size="1">Hide username on website from others. Admins can still get your user information.</font>
</div>
<div class="form-group">
<label>4 digit PIN</label>
<label>4 Digit PIN</label>
<font size="1">The 4 digit PIN you chose when registering</font>
<input class="form-control" type="password" name="authPin" size="4" maxlength="4">
</div>

2
public/templates/bootstrap/account/edit/password.tpl
View File

@ -31,7 +31,7 @@
{nocache}<input class="form-control" type="password" name="newPassword2" id="pw_field2"{if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.changepw && !$CHANGEPASSUNLOCKED}id="disabledInput" disabled{/if}/>{/nocache}
</div>
<div class="form-group">
<label>4 digit PIN</label>
<label>4 Digit PIN</label>
<input class="form-control" type="password" name="authPin" size="4" maxlength="4" />
</div>

24
public/templates/bootstrap/account/transactions/default.tpl
View File

@ -1,5 +1,5 @@
<div class="row">
<form class="col-lg-4" role="form">
<form class="col-lg-3" role="form">
<input type="hidden" name="page" value="{$smarty.request.page|escape}">
<input type="hidden" name="action" value="{$smarty.request.action|escape}">
<input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
@ -31,14 +31,14 @@
</div>
</form>
<div class="col-lg-8">
<div class="col-lg-9">
<div class="panel panel-info">
<div class="panel-heading">
<i class="fa fa-clock-o fa-fw"></i> Transaction History
</div>
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<table class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th class="h6">ID</th>
@ -54,10 +54,10 @@
<tbody>
{section transaction $TRANSACTIONS}
<tr>
<td class="h6">{$TRANSACTIONS[transaction].id}</td>
<td class="h6">{$TRANSACTIONS[transaction].timestamp}</td>
<td class="h6">{$TRANSACTIONS[transaction].type}</td>
<td class="h6">
<td>{$TRANSACTIONS[transaction].id}</td>
<td>{$TRANSACTIONS[transaction].timestamp}</td>
<td>{$TRANSACTIONS[transaction].type}</td>
<td>
{if $TRANSACTIONS[transaction].type == 'Credit_PPS' OR
$TRANSACTIONS[transaction].type == 'Fee_PPS' OR
$TRANSACTIONS[transaction].type == 'Donation_PPS' OR
@ -73,14 +73,14 @@
<span class="label label-warning">Unconfirmed</span>
{/if}
</td>
<td class="h6"><a href="#" onClick="alert('{$TRANSACTIONS[transaction].coin_address|escape}')">{$TRANSACTIONS[transaction].coin_address|truncate:20:"...":true:true}</a></td>
<td><a href="#" onClick="alert('{$TRANSACTIONS[transaction].coin_address|escape}')">{$TRANSACTIONS[transaction].coin_address|truncate:20:"...":true:true}</a></td>
{if ! $GLOBAL.website.transactionexplorer.disabled}
<td class="h6"><a href="{$GLOBAL.website.transactionexplorer.url}{$TRANSACTIONS[transaction].txid|escape}" title="{$TRANSACTIONS[transaction].txid|escape}" target="_blank">{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}</a></td>
<td><a href="{$GLOBAL.website.transactionexplorer.url}{$TRANSACTIONS[transaction].txid|escape}" title="{$TRANSACTIONS[transaction].txid|escape}" target="_blank">{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}</a></td>
{else}
<td class="h6"><a href="#" onClick="alert('{$TRANSACTIONS[transaction].txid|escape}')" title="{$TRANSACTIONS[transaction].txid|escape}">{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}</a></td>
<td><a href="#" onClick="alert('{$TRANSACTIONS[transaction].txid|escape}')" title="{$TRANSACTIONS[transaction].txid|escape}">{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}</a></td>
{/if}
<td class="h6">{if $TRANSACTIONS[transaction].height == 0}n/a{else}<a href="{$smarty.server.SCRIPT_NAME}?page=statistics&action=round&height={$TRANSACTIONS[transaction].height}">{$TRANSACTIONS[transaction].height}</a>{/if}</td>
<td class="h6"><font color="{if $TRANSACTIONS[transaction].type == 'Credit' or $TRANSACTIONS[transaction].type == 'Credit_PPS' or $TRANSACTIONS[transaction].type == 'Bonus'}green{else}red{/if}">{$TRANSACTIONS[transaction].amount|number_format:"8"}</td>
<td>{if $TRANSACTIONS[transaction].height == 0}n/a{else}<a href="{$smarty.server.SCRIPT_NAME}?page=statistics&action=round&height={$TRANSACTIONS[transaction].height}">{$TRANSACTIONS[transaction].height}</a>{/if}</td>
<td><font color="{if $TRANSACTIONS[transaction].type == 'Credit' or $TRANSACTIONS[transaction].type == 'Credit_PPS' or $TRANSACTIONS[transaction].type == 'Bonus'}green{else}red{/if}">{$TRANSACTIONS[transaction].amount|number_format:"8"}</td>
</tr>
{/section}
</tbody>

4
public/templates/bootstrap/account/workers/default.tpl
View File

@ -42,7 +42,7 @@
<th class="smallwidth">Worker Login</th>
<th class="smallwidth">Worker Password</th>
<th class="text-center">Active</th>
{if $GLOBAL.config.disable_notifications != 1 && $DISABLE_IDLEWORKERNOTIFICATIONS != 1}<th>Monitor</th>{/if}
{if $GLOBAL.config.disable_notifications != 1 && $DISABLE_IDLEWORKERNOTIFICATIONS != 1}<th class="text-center">Monitor</th>{/if}
<th class="text-right">Khash/s</th>
<th class="text-right">Difficulty</th>
<th class="text-center">Action</th>
@ -62,7 +62,7 @@
<td><input class="form-control" type="text" name="data[{$WORKERS[worker].id}][password]" value="{$WORKERS[worker].password|escape}" size="10" required></td>
<td class="text-center"><i class="fa fa-{if $WORKERS[worker].hashrate > 0}check{else}times{/if} fa-fw"></i></td>
{if $GLOBAL.config.disable_notifications != 1 && $DISABLE_IDLEWORKERNOTIFICATIONS != 1}
<td>
<td class="text-center">
<input type="hidden" name="data[{$WORKERS[worker].id}][monitor]" value="0" />
<input type="checkbox" class="switch" data-size="mini" name="data[{$WORKERS[worker].id}][monitor]" id="data[{$WORKERS[worker].id}][monitor]" value="1" {if $WORKERS[worker].monitor}checked{/if}/>
</td>

6
public/templates/bootstrap/admin/registrations/default.tpl
View File

@ -3,7 +3,7 @@
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
<i class="fa fa-user fa-fw"></i> Last registered Users
<i class="fa fa-user fa-fw"></i> Last Registered Users
</div>
<div class="panel-body no-padding">
<div class="table-responsive">
@ -15,7 +15,7 @@
<th>eMail</th>
<th>Reg. Date</th>
<th>Invite</th>
<th>Invited from</th>
<th>Invited From</th>
</tr>
</thead>
<tbody>
@ -25,7 +25,7 @@
<td>{$LASTREGISTEREDUSERS[user].mposuser}</td>
<td>{$LASTREGISTEREDUSERS[user].email}</td>
<td>{$LASTREGISTEREDUSERS[user].signup_timestamp|date_format:"%d/%m %H:%M:%S"}</td>
<td align="center">{if !$LASTREGISTEREDUSERS[user].inviter}<i class="fa fa-times fa-fw">{else}<i class="fa fa-check fa-fw">{/if}</td>
<td class="text-center">{if !$LASTREGISTEREDUSERS[user].inviter}<i class="fa fa-times fa-fw">{else}<i class="fa fa-check fa-fw">{/if}</td>
<td><a href="{$smarty.server.SCRIPT_NAME}?page=admin&action=user&do=query&filter[account]={$LASTREGISTEREDUSERS[user].inviter}">{$LASTREGISTEREDUSERS[user].inviter}</a></td>
</tr>
{/section}

28
public/templates/bootstrap/admin/transactions/default.tpl
View File

@ -7,7 +7,7 @@
</div>
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<table class="table table-striped table-bordered table-condensed">
<thead>
<tr>
{foreach $SUMMARY as $type=>$total}
@ -31,7 +31,7 @@
{/if}
<div class="row">
<form class="col-lg-4" role="form">
<form class="col-lg-3" role="form">
<input type="hidden" name="page" value="{$smarty.request.page|escape}">
<input type="hidden" name="action" value="{$smarty.request.action|escape}">
<input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
@ -73,14 +73,14 @@
<div class="col-lg-8">
<div class="col-lg-9">
<div class="panel panel-info">
<div class="panel-heading">
<i class="fa fa-clock-o fa-fw"></i> Transaction History
</div>
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<table class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th class="h6">ID</th>
@ -97,11 +97,11 @@
<tbody>
{section transaction $TRANSACTIONS}
<tr>
<td class="h6">{$TRANSACTIONS[transaction].id}</td>
<td class="h6">{$TRANSACTIONS[transaction].username}</td>
<td class="h6">{$TRANSACTIONS[transaction].timestamp}</td>
<td class="h6">{$TRANSACTIONS[transaction].type}</td>
<td class="h6">
<td>{$TRANSACTIONS[transaction].id}</td>
<td>{$TRANSACTIONS[transaction].username}</td>
<td>{$TRANSACTIONS[transaction].timestamp}</td>
<td>{$TRANSACTIONS[transaction].type}</td>
<td>
{if $TRANSACTIONS[transaction].type == 'Credit_PPS' OR
$TRANSACTIONS[transaction].type == 'Fee_PPS' OR
$TRANSACTIONS[transaction].type == 'Donation_PPS' OR
@ -113,14 +113,14 @@
{else if $TRANSACTIONS[transaction].confirmations == -1}<span class="label label-danger">Orphaned</span>
{else}<span class="label label-warning">Unconfirmed</span>{/if}
</td>
<td class="h6"><a href="#" onClick="alert('{$TRANSACTIONS[transaction].coin_address|escape}')">{$TRANSACTIONS[transaction].coin_address|truncate:20:"...":true:true}</a></td>
<td><a href="#" onClick="alert('{$TRANSACTIONS[transaction].coin_address|escape}')">{$TRANSACTIONS[transaction].coin_address|truncate:20:"...":true:true}</a></td>
{if ! $GLOBAL.website.transactionexplorer.disabled}
<td class="h6"><a href="{$GLOBAL.website.transactionexplorer.url}{$TRANSACTIONS[transaction].txid|escape}" title="{$TRANSACTIONS[transaction].txid|escape}" target="_blank">{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}</a></td>
<td><a href="{$GLOBAL.website.transactionexplorer.url}{$TRANSACTIONS[transaction].txid|escape}" title="{$TRANSACTIONS[transaction].txid|escape}" target="_blank">{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}</a></td>
{else}
<td class="h6"><a href="#" onClick="alert('{$TRANSACTIONS[transaction].txid|escape}')" title="{$TRANSACTIONS[transaction].txid|escape}">{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}</a></td>
<td><a href="#" onClick="alert('{$TRANSACTIONS[transaction].txid|escape}')" title="{$TRANSACTIONS[transaction].txid|escape}">{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}</a></td>
{/if}
<td class="h6">{if $TRANSACTIONS[transaction].height == 0}n/a{else}<a href="{$smarty.server.SCRIPT_NAME}?page=statistics&action=round&height={$TRANSACTIONS[transaction].height}">{/if}{$TRANSACTIONS[transaction].height}</a></td>
<td class="h6"><font color="{if $TRANSACTIONS[transaction].type == 'Credit' or $TRANSACTIONS[transaction].type == 'Credit_PPS' or $TRANSACTIONS[transaction].type == 'Bonus'}green{else}red{/if}">{$TRANSACTIONS[transaction].amount|number_format:"8"}</td>
<td>{if $TRANSACTIONS[transaction].height == 0}n/a{else}<a href="{$smarty.server.SCRIPT_NAME}?page=statistics&action=round&height={$TRANSACTIONS[transaction].height}">{/if}{$TRANSACTIONS[transaction].height}</a></td>
<td><font color="{if $TRANSACTIONS[transaction].type == 'Credit' or $TRANSACTIONS[transaction].type == 'Credit_PPS' or $TRANSACTIONS[transaction].type == 'Bonus'}green{else}red{/if}">{$TRANSACTIONS[transaction].amount|number_format:"8"}</td>
</tr>
{/section}
</tbody>

30
public/templates/bootstrap/admin/user/default.tpl
View File

@ -88,7 +88,7 @@
<tr>
<th class="h6">ID</th>
<th class="h6">Username</th>
<th class="h6">E-Mail</th>
<th class="h6">eMail</th>
<th class="h6" style="padding-right:10px">Shares</th>
<th class="h6" style="padding-right:10px">Hashrate</th>
{if $GLOBAL.config.payout_system != 'pps'}
@ -109,31 +109,31 @@
{nocache}
{section name=user loop=$USERS|default}
<tr>
<td class="h6">{$USERS[user].id}</td>
<td class="h6">{$USERS[user].username|escape}</td>
<td class="h6">{$USERS[user].email|escape}</td>
<td class="h6">{$USERS[user].shares.valid}</td>
<td class="h6">{$USERS[user].hashrate}</td>
<td>{$USERS[user].id}</td>
<td>{$USERS[user].username|escape}</td>
<td>{$USERS[user].email|escape}</td>
<td>{$USERS[user].shares.valid}</td>
<td>{$USERS[user].hashrate}</td>
{if $GLOBAL.config.payout_system != 'pps'}
<td class="h6">{$USERS[user].estimates.donation|number_format:"8"}</td>
<td class="h6">{$USERS[user].estimates.payout|number_format:"8"}</td>
<td>{$USERS[user].estimates.donation|number_format:"8"}</td>
<td>{$USERS[user].estimates.payout|number_format:"8"}</td>
{else}
<td class="h6" colspan="2">{$USERS[user].estimates.hours24|number_format:"8"}</td>
<td colspan="2">{$USERS[user].estimates.hours24|number_format:"8"}</td>
{/if}
<td class="h6">{$USERS[user].balance|number_format:"8"}</td>
<td class="h6">{$USERS[user].signup_timestamp|date_format:"%d/%m %H:%M:%S"}</td>
<td class="h6">{$USERS[user].last_login|date_format:"%d/%m %H:%M:%S"}</td>
<td class="h6">
<td>{$USERS[user].balance|number_format:"8"}</td>
<td>{$USERS[user].signup_timestamp|date_format:"%d/%m %H:%M:%S"}</td>
<td>{$USERS[user].last_login|date_format:"%d/%m %H:%M:%S"}</td>
<td>
<input type="hidden" name="admin[{$USERS[user].id}]" value="0"/>
<input type="checkbox" onclick="storeAdmin({$USERS[user].id})" name="admin[{$USERS[user].id}]" value="1" id="admin[{$USERS[user].id}]" {if $USERS[user].is_admin}checked{/if} />
<label for="admin[{$USERS[user].id}]"></label>
</td>
<td class="h6">
<td>
<input type="hidden" name="locked[{$USERS[user].id}]" value="0"/>
<input type="checkbox" onclick="storeLock({$USERS[user].id})" name="locked[{$USERS[user].id}]" value="1" id="locked[{$USERS[user].id}]" {if $USERS[user].is_locked}checked{/if} />
<label for="locked[{$USERS[user].id}]"></label>
</td>
<td class="h6">
<td>
<input type="hidden" name="nofee[{$USERS[user].id}]" value="0"/>
<input type="checkbox" onclick="storeFee({$USERS[user].id})" name="nofee[{$USERS[user].id}]" value="1" id="nofee[{$USERS[user].id}]" {if $USERS[user].no_fees}checked{/if} />
<label for="nofee[{$USERS[user].id}]"></label>

10
public/templates/bootstrap/statistics/blocks/block_overview_time.tpl
View File

@ -10,16 +10,16 @@
<thead>
<tr>
<th></th>
<th class="text-right">Gen est.</th>
<th class="text-right">Gen. Est.</th>
<th class="text-right">Found</th>
<th class="text-right">Valid</th>
<th class="text-right">Orphan</th>
<th class="text-right">Avg Diff</th>
<th class="text-right">Shares est.</th>
<th class="text-right">Avg. Diff</th>
<th class="text-right">Shares Est.</th>
<th class="text-right">Shares</th>
<th class="text-right">Percentage</th>
<th class="text-right">Amount</th>
<th class="text-right">Rate est.</th>
<th class="text-right">Rate Est.</th>
</tr>
</thead>
<tbody>
@ -178,7 +178,7 @@
</div>
</div>
<div class="panel-footer">
<h6>{if $GLOBAL.config.payout_system != 'pps'}Round earnings are not credited until <font color="orange">{$GLOBAL.confirmations}</font> confirms.{/if}</h6>
<h6>{if $GLOBAL.config.payout_system != 'pps'}Round earnings are not credited until <font class="confirmations">{$GLOBAL.confirmations}</font> confirms.{/if}</h6>
</div>
</div>
</div>

8
public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl
View File

@ -9,7 +9,7 @@
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th class="text-right">Block</th>
<th class="text-center">Block</th>
<th class="text-center">Validity</th>
<th class="text-left">Finder</th>
<th class="text-right">Time</th>
@ -32,7 +32,7 @@
{assign var="count" value=$count+1}
{if $GLOBAL.config.payout_system == 'pplns'}{assign var="pplnsshares" value=$pplnsshares+$BLOCKSFOUND[block].pplns_shares}{/if}
{if ! $GLOBAL.website.blockexplorer.disabled}
<td class="text-right"><a href="{$smarty.server.SCRIPT_NAME}?page=statistics&action=round&height={$BLOCKSFOUND[block].height}">{$BLOCKSFOUND[block].height}</a></td>
<td class="text-center"><a href="{$smarty.server.SCRIPT_NAME}?page=statistics&action=round&height={$BLOCKSFOUND[block].height}">{$BLOCKSFOUND[block].height}</a></td>
{else}
<td class="text-right">{$BLOCKSFOUND[block].height}</td>
{/if}
@ -46,7 +46,7 @@
{/if}
</td>
<td>{if $BLOCKSFOUND[block].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$BLOCKSFOUND[block].finder|default:"unknown"|escape}{/if}</td>
<td class="text-right">{$BLOCKSFOUND[block].time|date_format:"%d/%m %H:%M:%S"}</td>
<td class="text-right">{$BLOCKSFOUND[block].time|date_format:"%d/%m/%Y %H:%M:%S"}</td>
<td class="text-right">{$BLOCKSFOUND[block].difficulty|number_format:"4"}</td>
<td class="text-right">{$BLOCKSFOUND[block].amount|number_format:"2"}</td>
<td class="text-right">
@ -77,7 +77,7 @@
</div>
</div>
<div class="panel-footer">
<h6>{if $GLOBAL.config.payout_system != 'pps'}Round Earnings are not credited until <font color="orange">{$GLOBAL.confirmations}</font> confirms.{/if}</h6>
<h6>{if $GLOBAL.config.payout_system != 'pps'}Round Earnings are not credited until <font class="confirmations">{$GLOBAL.confirmations}</font> confirms.{/if}</h6>
</div>
</div>
</div>

2
public/templates/bootstrap/statistics/blocks/small_table.tpl
View File

@ -32,7 +32,7 @@
</div>
{if $GLOBAL.config.payout_system != 'pps'}
<div class="panel-footer">
<h6>Note: Round Earnings are not credited until <font color="orange">{$GLOBAL.confirmations}</font> confirms.</h6>
<h6>Note: Round Earnings are not credited until <font class="confirmations">{$GLOBAL.confirmations}</font> confirms.</h6>
</div>
{/if}
</div>