Minor fixes to get Openclerk running on a new environment

soundasleep · Sep 11, 2017 · 268c295 · 268c295
1 parent ac63136
commit 268c295
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     "openclerk/cache": "^0.1",
     "openclerk/coinbase": "^0.1",
     "openclerk/commodities": "^0.1",
-    "openclerk/config": "^0.1",
+    "openclerk/config": "^0.1.1",
     "openclerk/country-list": "~1.0",
     "openclerk/currencies": "^0.1",
     "openclerk/cryptocurrencies": "^0.1",

diff --git a/composer.lock b/composer.lock
diff --git a/inc/crypto.php b/inc/crypto.php
@@ -680,7 +680,7 @@ function account_data_grouped() {
       'bitfunder' => array('table' => 'accounts_bitfunder', 'group' => 'accounts', 'wizard' => 'securities', 'failure' => true, 'disabled' => true),
       'btcinve' => array('table' => 'accounts_btcinve', 'group' => 'accounts', 'wizard' => 'securities', 'failure' => true, 'disabled' => true),
       'btct' => array('table' => 'accounts_btct', 'group' => 'accounts', 'wizard' => 'securities', 'failure' => true, 'disabled' => true),
-      'crypto-trade' => array('table' => 'accounts_cryptotrade', 'group' => 'accounts', 'wizard' => 'securities', 'failure' => true),
+      'crypto-trade' => array('table' => 'accounts_cryptotrade', 'group' => 'accounts', 'wizard' => 'securities', 'failure' => true, 'disabled' => true),
       'cryptostocks' => array('table' => 'accounts_cryptostocks', 'group' => 'accounts', 'wizard' => 'securities', 'failure' => true),
       'havelock' => array('table' => 'accounts_havelock', 'group' => 'accounts', 'wizard' => 'securities', 'failure' => true),
       'litecoininvest' => array('table' => 'accounts_litecoininvest', 'group' => 'accounts', 'wizard' => 'securities', 'failure' => true),

diff --git a/inc/premium.php b/inc/premium.php
@@ -20,6 +20,8 @@ function user_limits_summary($user_id) {
       foreach ($group as $key => $data) {
         if (!isset($data['group']))
           continue;
+        if (isset($data['disabled']) && $data['disabled'])
+          continue;
 
         $q = db()->prepare("SELECT COUNT(*) AS c FROM " .  $data['table'] . " WHERE user_id=?" . ($data['failure'] ? " AND is_disabled=0" : "") . (isset($data['query']) ? $data['query'] : ""));
         $q->execute(array($user_id));