Merge pull request #46 from mrtremendous/mr-t-ideas

Mr t ideas
PLSRcoin · Feb 3, 2018 · 4dc777b · 4dc777b
2 parents 9d2e2f5 + 0b068fe
commit 4dc777b
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+settings.php
diff --git a/README.md b/README.md
@@ -5,6 +5,10 @@ piWallet is a secure opensource online altcoin wallet that works with practicall
 
 Setup: https://github.com/johnathanmartin/piWallet/wiki/Installation
 
+TODO: Add a step in the wiki explaining to copy settings-example.php into a new file settings.php and then change the values.
+
+TODO: Add a step in the wiki explaining to delete users.sql.
+
 Bitcoin Talk: https://bitcointalk.org/index.php?topic=911212
 
 Please be cautious when paying others to install piWallet for you, I'd be willing to install for a negotiable fee. Please send me an email. [email protected]

diff --git a/common.php b/common.php
@@ -22,26 +22,7 @@ function satoshitrim($satoshitrim) {
    return rtrim(rtrim($satoshitrim, "0"), ".");
 }
 
-$server_url = "/";  // ENTER WEBSITE URL ALONG WITH A TRAILING SLASH
-
-$db_host = "localhost";
-$db_user = "root";
-$db_pass = "password";
-$db_name = "wallet";
-
-$rpc_host = "127.0.0.1";
-$rpc_port = "8332";
-$rpc_user = "bitcoinrpc";
-$rpc_pass = "Cp68nBkCAADKkskaKSskaDKdmSYLtLJ";
-
-$fullname = "Bitcoin"; //Website Title (Do Not include 'wallet')
-$short = "BTC"; //Coin Short (BTC)
-$blockchain_url = "http://blockchain.info/tx/"; //Blockchain Url
-$support = "[email protected]"; //Your support eMail
-$hide_ids = array(1); //Hide account from admin dashboard
-$donation_address = "13jy6rHB7HMgQBoYxQQXSM7TFTZZ6CDAAZ"; //Donation Address
-
-$reserve = "0"; //This fee acts as a reserve. The users balance will display as the balance in the daemon minus the reserve. We don't reccomend setting this more than the Fee the daemon charges.
+require('settings.php');
 
 if(isSet($_GET['lang']))
 {

diff --git a/settings-example.php b/settings-example.php
@@ -0,0 +1,24 @@
+<?php
+
+$server_url = "/";  // ENTER WEBSITE URL ALONG WITH A TRAILING SLASH
+
+$db_host = "localhost";
+$db_user = "root";
+$db_pass = "password";
+$db_name = "wallet";
+
+$rpc_host = "127.0.0.1";
+$rpc_port = "8332";
+$rpc_user = "bitcoinrpc";
+$rpc_pass = "Cp68nBkCAADKkskaKSskaDKdmSYLtLJ";
+
+$fullname = "Bitcoin"; //Website Title (Do Not include 'wallet')
+$short = "BTC"; //Coin Short (BTC)
+$blockchain_tx_url = "http://blockchain.info/tx/"; //Blockchain Url
+$support = "[email protected]"; //Your support eMail
+$hide_ids = array(1); //Hide account from admin dashboard
+$donation_address = "13jy6rHB7HMgQBoYxQQXSM7TFTZZ6CDAAZ"; //Donation Address
+
+$reserve = "0"; //This fee acts as a reserve. The users balance will display as the balance in the daemon minus the reserve. We don't reccomend setting this more than the Fee the daemon charges.
+
+?>
diff --git a/view/admin_info.php b/view/admin_info.php
@@ -89,7 +89,7 @@
                <td>'.abs($transaction['amount']).'</td>
                <td>'.$transaction['fee'].'</td>
                <td>'.$transaction['confirmations'].'</td>
-               <td><a href="' . $blockchain_url, $transaction['txid'] . '" target="_blank">Info</a></td>
+               <td><a href="' . $blockchain_tx_url, $transaction['txid'] . '" target="_blank">Info</a></td>
             </tr>';
    }
    ?>
@@ -103,7 +103,7 @@
 }
 ?>
 <script type="text/javascript">
-var blockchain_url = "<?=$blockchain_url?>";
+var blockchain_tx_url = "<?=$blockchain_tx_url?>";
 $("#withdrawform input[name='action']").first().attr("name", "jsaction");
 $("#newaddressform input[name='action']").first().attr("name", "jsaction");
 $("#pwdform input[name='action']").first().attr("name", "jsaction");
@@ -223,7 +223,7 @@ function updateTables(json)
                <td>' + Math.abs(json.transactionList[i]['amount']) + '</td> \
                <td>' + json.transactionList[i]['fee'] + '</td> \
                <td>' + json.transactionList[i]['confirmations'] + '</td> \
-               <td><a href="' + blockchain_url.replace("%s", json.transactionList[i]['txid']) + '" target="_blank">Info</a></td> \
+               <td><a href="' + blockchain_tx_url.replace("%s", json.transactionList[i]['txid']) + '" target="_blank">Info</a></td> \
             </tr>');
    }
 }

diff --git a/view/wallet.php b/view/wallet.php
@@ -125,14 +125,14 @@
                <td>'.abs($transaction['amount']).'</td>
                <td>'.$transaction['fee'].'</td>
                <td>'.$transaction['confirmations'].'</td>
-               <td><a href="' . $blockchain_url,  $transaction['txid'] . '" target="_blank">Info</a></td>
+               <td><a href="' . $blockchain_tx_url,  $transaction['txid'] . '" target="_blank">Info</a></td>
             </tr>';
    }
    ?>
    </tbody>
 </table>
 <script type="text/javascript">
-var blockchain_url = "<?=$blockchain_url?>";
+var blockchain_tx_url = "<?=$blockchain_tx_url?>";
 $("#withdrawform input[name='action']").first().attr("name", "jsaction");
 $("#newaddressform input[name='action']").first().attr("name", "jsaction");
 $("#pwdform input[name='action']").first().attr("name", "jsaction");
@@ -267,9 +267,9 @@ function updateTables(json)
                <td>' + json.transactionList[i]['address'] + '</td> \
                <td>' + tx_type + '</td> \
                <td>' + Math.abs(json.transactionList[i]['amount']) + '</td> \
-               <td>' + json.transactionList[i]['fee'] + '</td> \
+               <td>' + (json.transactionList[i]['fee']?json.transactionList[i]['fee']:'') + '</td> \
                <td>' + json.transactionList[i]['confirmations'] + '</td> \
-               <td><a href="' + blockchain_url.replace("%s", json.transactionList[i]['txid']) + '" target="_blank">Info</a></td> \
+               <td><a href="' + blockchain_tx_url.replace("%s", json.transactionList[i]['txid']) + '" target="_blank">Info</a></td> \
             </tr>');
 	}
 }