From 746f293d22748cc09af2c859c5b6143842e00313 Mon Sep 17 00:00:00 2001 From: ArtemKo7v Date: Tue, 4 Apr 2017 14:52:59 +0700 Subject: [PATCH] Config structure updated --- .htaccess | 4 ++ index.php | 83 +++++++++++---------------------------- js/ethplorer.js | 3 ++ robots.txt | 1 + service/config.sample.php | 3 ++ service/lib/ethplorer.php | 8 ++-- widgets.html | 69 +++++++------------------------- 7 files changed, 53 insertions(+), 118 deletions(-) diff --git a/.htaccess b/.htaccess index bac7eda7..cef7ebd7 100644 --- a/.htaccess +++ b/.htaccess @@ -7,8 +7,12 @@ RewriteRule ^top$ page627210.html RewriteRule ^about$ page627364.html RewriteRule ^privacy$ page627373.html +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d +RewriteRule ^js/config.js$ config.php [L,QSA] RewriteRule ^widgets$ widgets.html + RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteRule ^tx/(.*) index.php [L,QSA] diff --git a/index.php b/index.php index b30729ba..2d6126d4 100644 --- a/index.php +++ b/index.php @@ -18,16 +18,14 @@ $codeVersion = "141"; require dirname(__FILE__) . '/service/lib/ethplorer.php'; -$esCfg = require_once dirname(__FILE__) . '/service/config.php'; -$esCfg['mongo'] = FALSE; // No mongo connection -$es = Ethplorer::db($esCfg); +$es = Ethplorer::db(array()); $error = TRUE; $header = ""; $uri = $_SERVER['REQUEST_URI']; // Uri to lowercase -if(preg_match("/[A-Z]+/", $uri)){ +if(preg_match("/[A-Z]+/", $uri) && (FALSE === strpos($uri, '1dea4'))){ header("Location: " . strtolower($uri)); die(); } @@ -81,6 +79,7 @@ + @@ -567,28 +566,6 @@ (d.head || d.body).appendChild(s); })(); - - -
-
- About -     - Discuss ethplorer -     - Sources -     - API -
-
- (c) 2016 Everex -     - support@ethplorer.io
- Privacy & Terms -
-
- - */ ?>
@@ -604,7 +581,6 @@
- - - - - diff --git a/js/ethplorer.js b/js/ethplorer.js index 9098cc70..219cf280 100644 --- a/js/ethplorer.js +++ b/js/ethplorer.js @@ -22,6 +22,9 @@ Ethplorer = { searchCache: {}, saveData: function(){}, init: function(){ + if('undefined' !== typeof(ethplorerConfig)){ + Ethplorer.Config = ethplorerConfig; + } Ethplorer.isProd = ('ethplorer.io' === document.location.host); BigNumber.config({ ERRORS: false }); Ethplorer.Nav.init(); diff --git a/robots.txt b/robots.txt index 1cb2dd1b..fb39d20d 100755 --- a/robots.txt +++ b/robots.txt @@ -1,2 +1,3 @@ User-Agent: * Host: ethplorer.io +Disallow: /service/csv.php diff --git a/service/config.sample.php b/service/config.sample.php index fca48b66..59b4db22 100644 --- a/service/config.sample.php +++ b/service/config.sample.php @@ -1,5 +1,8 @@ '', + 'fb' => '', "mongo" => array( "server" => "mongodb://127.0.0.1:27017", "dbName" => "everex-db", diff --git a/service/lib/ethplorer.php b/service/lib/ethplorer.php index 97e07446..10e0106c 100644 --- a/service/lib/ethplorer.php +++ b/service/lib/ethplorer.php @@ -88,10 +88,7 @@ protected function __construct(array $aConfig){ ); $this->oCache = new evxCache($this->aSettings['cacheDir']); - if(!isset($this->aSettings['ethereum'])){ - throw new Exception("Ethereum configuration not found"); - } - if(isset($this->aSettings['mongo']) && (FALSE !== $this->aSettings['mongo'])){ + if(isset($this->aSettings['mongo']) && is_array($this->aSettings['mongo'])){ if(class_exists("MongoClient")){ $oMongo = new MongoClient($this->aSettings['mongo']['server']); $oDB = $oMongo->{$this->aSettings['mongo']['dbName']}; @@ -1203,6 +1200,9 @@ public function countChainy($useFilter = TRUE){ * @return array */ protected function _callRPC($method, $params = array()){ + if(!isset($this->aSettings['ethereum'])){ + throw new Exception("Ethereum configuration not found"); + } $data = array( 'jsonrpc' => "2.0", 'id' => time(), diff --git a/widgets.html b/widgets.html index 4e0fb4b9..62910603 100644 --- a/widgets.html +++ b/widgets.html @@ -594,16 +594,6 @@

Top Tokens by Activity

-
@@ -627,7 +616,6 @@

Top Tokens by Activity

    -
  • About
  • Widgets
  • Discuss ethplorer
  • Sources
    • @@ -651,53 +639,24 @@

    Top Tokens by Activity

    $(document).ready(function () { EthplorerSearch.init($('#search-form'), $('#search'), Ethplorer.search); }); - if (false && Ethplorer.Config.ga) { - (function (i, s, o, g, r, a, m) { - i['GoogleAnalyticsObject'] = r;i[r] = i[r] || function () { - (i[r].q = i[r].q || []).push(arguments) - }, i[r].l = 1 * new Date(); - a = s.createElement(o), - m = s.getElementsByTagName(o)[0]; - a.async = 1; - a.src = g; - m.parentNode.insertBefore(a, m) - })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga'); + if(Ethplorer.Config.ga){ + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); ga('create', Ethplorer.Config.ga, 'auto'); ga('send', 'pageview'); } + if(Ethplorer.Config.fb){ + !function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod? + n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n; + n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0; + t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window, + document,'script','https://connect.facebook.net/en_US/fbevents.js'); + fbq('init', Ethplorer.Config.fb); + fbq('track', 'PageView'); + } - - - - - \ No newline at end of file