[ENHANCEMENT] Bootstrap implementation

cronjobs/tickerupdate.php

@@ -33,18 +33,26 @@
 $strLogMask = "| %-25.25s | %15.15s | %8.8s | %-6.6s | %-80.80s |";
 $log->logInfo(sprintf($strLogMask, 'Method', 'Value', 'Runtime', 'Status', 'Message'));
 
+empty($config['price']['enabled']) ? $tickerupdate = false : $tickerupdate = $config['price']['enabled'];
+
 // Fetch latest coin price via API call
 $start = microtime(true);
-$message = 'Updated latest ' . $config['currency'] . ' price from ' . $config['price']['url'] . ' API';
-$status = 'OK';
-if ($price = $tools->getPrice()) {
-  if (!$setting->setValue('price', $price)) {
-    $message = 'Unable to store new price value: ' . $setting->getCronError();
+if ($tickerupdate) {
+  $message = 'Updated latest ' . $config['currency'] . ' price from ' . $config['price']['url'] . ' API';
+  $status = 'OK';
+  if ($price = $tools->getPrice()) {
+    if (!$setting->setValue('price', $price)) {
+      $message = 'Unable to store new price value: ' . $setting->getCronError();
+      $status = 'ERROR';
+    }
+  } else {
+    $message = 'Failed to fetch price from API: ' . $tools->getCronError();
     $status = 'ERROR';
   }
 } else {
-  $message = 'Failed to fetch price from API: ' . $tools->getCronError();
-  $status = 'ERROR';
+  $message = 'Tickerupdate is disabled';
+  $status = 'OK';
+  $price = 0;
 }
 $log->logInfo(sprintf($strLogMask, 'Price Update', $price, number_format(microtime(true) - $start, 3), $status, $message));
 

public/include/admin_checks.php

@@ -127,16 +127,16 @@
 
   // display the errors
   foreach ($enotice as $en) {
-    $_SESSION['POPUP'][] = array('CONTENT' => $en, 'TYPE' => 'info');
+    $_SESSION['POPUP'][] = array('CONTENT' => $en, 'TYPE' => 'alert alert-info');
   }
   if (!count($notice) && !count($error)) {
-    $_SESSION['POPUP'][] = array('CONTENT' => 'The config options we checked seem OK', 'TYPE' => 'success');
+    $_SESSION['POPUP'][] = array('CONTENT' => 'The config options we checked seem OK', 'TYPE' => 'alert alert-success');
   } else {
     foreach ($notice as $n) {
-      $_SESSION['POPUP'][] = array('CONTENT' => $n, 'TYPE' => 'warning');
+      $_SESSION['POPUP'][] = array('CONTENT' => $n, 'TYPE' => 'alert alert-warning');
     }
     foreach ($error as $e) {
-      $_SESSION['POPUP'][] = array('CONTENT' => $e, 'TYPE' => 'errormsg');
+      $_SESSION['POPUP'][] = array('CONTENT' => $e, 'TYPE' => 'alert alert-danger');
     }
   }
 }

public/include/autoloader.inc.php

@@ -27,20 +27,14 @@
   die('Unable to load your coins class definition for ' . $config['algorithm']);
 }
 
-// We need this one in here to properly set our theme
-require_once(INCLUDE_DIR . '/lib/Mobile_Detect.php');
-
 // Detect device
-if ($detect->isMobile() && $setting->getValue('website_mobile_theme')) {
-  // Set to mobile theme
-  $setting->getValue('website_mobile_theme') ? $theme = $setting->getValue('website_mobile_theme') : $theme = 'mobile';
-} else if ( PHP_SAPI == 'cli') {
+if ( PHP_SAPI == 'cli') {
   // Create a new compile folder just for crons
   // We call mail templates directly anyway
   $theme = 'cron';
 } else {
   // Use configured theme, fallback to default theme
-  $setting->getValue('website_theme') ? $theme = $setting->getValue('website_theme') : $theme = 'mpos';
+  $setting->getValue('website_theme') ? $theme = $setting->getValue('website_theme') : $theme = 'bootstrap';
 }
 define('THEME', $theme);
 
@@ -76,4 +70,4 @@
 require_once(INCLUDE_DIR . '/lib/Michelf/Markdown.php');
 require_once(INCLUDE_DIR . '/lib/scrypt.php');
 
-?>
+?>

public/include/bootstrap.php

@@ -36,4 +36,4 @@
 // We include all needed files here, even though our templates could load them themself
 require_once(INCLUDE_DIR . '/autoloader.inc.php');
 
-?>
+?>

public/include/classes/notification.class.php

@@ -58,10 +58,10 @@ public function addNotification($account_id, $type, $data) {
    * @param id int Account ID
    * @return array Notification data
    **/
-  public function getNotifications($account_id) {
+  public function getNotifications($account_id,$limit=50) {
     $this->debug->append("STA " . __METHOD__, 4);
-    $stmt = $this->mysqli->prepare("SELECT * FROM $this->table WHERE account_id = ? ORDER BY time DESC");
-    if ($stmt && $stmt->bind_param('i', $account_id) && $stmt->execute() && $result = $stmt->get_result())
+    $stmt = $this->mysqli->prepare("SELECT * FROM $this->table WHERE account_id = ? ORDER BY time DESC LIMIT ?");
+    if ($stmt && $stmt->bind_param('ii', $account_id, $limit) && $stmt->execute() && $result = $stmt->get_result())
       return $result->fetch_all(MYSQLI_ASSOC);
     return $this->getError();
   }

public/include/classes/template.class.php

@@ -31,6 +31,23 @@ public function getThemes() {
     return $aThemes;
   }
 
+  /**
+   * Get all available designs
+   * Read css files from css/design folder
+   *
+   * @return array - list of available designs
+   */
+  public function getDesigns() {
+    $this->debug->append("STA " . __METHOD__, 4);
+    $aTmpDesigns = glob(BASEPATH . 'site_assets/' . THEME . '/css/design/*.css');
+    $aDesigns = array();
+    $aDesigns['default'] = 'default';
+    foreach ($aTmpDesigns as $filename) {
+      if (basename($filename) != '.' && basename($filename) != '..') $aDesigns[basename($filename, ".css")] = basename($filename, ".css");
+    }
+    return $aDesigns;
+  }
+
   /**
    * Cached getActiveTemplates method
    *

public/include/classes/transaction.class.php

@@ -100,6 +100,60 @@ public function getTransactionSummary($account_id=NULL) {
     return $this->sqlError();
   }
 
+
+  /**
+   * Fetch a transaction summary by user with total amounts
+   * @param account_id int Account ID, NULL for all
+   * @return data array type and total
+   **/
+  public function getTransactionTypebyTime($account_id=NULL) {
+    $this->debug->append("STA " . __METHOD__, 4);
+    if ($data = $this->memcache->get(__FUNCTION__)) return $data;
+    $stmt = $this->mysqli->prepare(" 
+      SELECT 
+        IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourCredit,
+        IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourDebitMP,
+        IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourDebitAP,
+        IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourTXFee,
+        IFNULL(SUM(IF(t.type = 'Fee' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourFee,
+        IFNULL(SUM(IF(t.type = 'Donation' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourDonation,
+
+        IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourCredit,
+        IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourDebitMP,
+        IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourDebitAP,
+        IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourTXFee,
+        IFNULL(SUM(IF(t.type = 'Fee' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourFee,
+        IFNULL(SUM(IF(t.type = 'Donation' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourDonation,
+
+        IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekCredit,
+        IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekDebitMP,
+        IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekDebitAP,
+        IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekTXFee,
+        IFNULL(SUM(IF(t.type = 'Fee' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekFee,
+        IFNULL(SUM(IF(t.type = 'Donation' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekDonation,
+
+        IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthCredit,
+        IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthDebitMP,
+        IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthDebitAP,
+        IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthTXFee,
+        IFNULL(SUM(IF(t.type = 'Fee' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthFee,
+        IFNULL(SUM(IF(t.type = 'Donation' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthDonation,
+
+        IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearCredit,
+        IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearDebitMP,
+        IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearDebitAP,
+        IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearTXFee,
+        IFNULL(SUM(IF(t.type = 'Fee' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearFee,
+        IFNULL(SUM(IF(t.type = 'Donation' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearDonation
+      FROM transactions AS t
+      LEFT OUTER JOIN blocks AS b ON b.id = t.block_id
+      WHERE
+        t.account_id = ? AND (b.confirmations > 0 OR b.id IS NULL)");
+    if ($this->checkStmt($stmt) && $stmt->bind_param("i", $account_id) && $stmt->execute() && $result = $stmt->get_result())
+    	return $this->memcache->setCache(__FUNCTION__ . $account_id, $result->fetch_assoc(), 60);
+    return $this->sqlError();
+  }
+
   /**
    * Get all transactions from start for account_id
    * @param start int Starting point, id of transaction

public/include/config/admin_settings.inc.php

@@ -2,6 +2,7 @@
 $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
 
 $aThemes = $template->getThemes();
+$aDesigns = $template->getDesigns();
 
 // Load the settings available in this system
 $aSettings['website'][] = array(
@@ -49,16 +50,30 @@
 $aSettings['website'][] = array(
   'display' => 'Website theme', 'type' => 'select',
   'options' => $aThemes,
-  'default' => 'mpos',
+  'default' => 'bootstrap',
   'name' => 'website_theme', 'value' => $setting->getValue('website_theme'),
   'tooltip' => 'The default theme used on your pool.'
 );
 $aSettings['website'][] = array(
-  'display' => 'Website mobile theme', 'type' => 'select',
-  'options' => $aThemes,
-  'default' => 'mobile',
-  'name' => 'website_mobile_theme', 'value' => $setting->getValue('website_mobile_theme'),
-  'tooltip' => 'The mobile theme used for your pool.'
+  'display' => 'Website Design', 'type' => 'select',
+  'options' => $aDesigns,
+  'default' => 'default',
+  'name' => 'website_design', 'value' => $setting->getValue('website_design'),
+  'tooltip' => 'The default design used on your pool.'
+);
+$aSettings['website'][] = array(
+  'display' => 'Website News Style', 'type' => 'select',
+  'options' => array( 0 => 'Show all news in one Page', 1 => 'Show Responsive News Table' ),
+  'default' => 0,
+  'name' => 'website_news_style', 'value' => $setting->getValue('website_news_style'),
+  'tooltip' => 'How News are displayed on Main Page.'
+);
+$aSettings['website'][] = array(
+  'display' => 'Auto Hide Notifications', 'type' => 'select',
+  'options' => array( 0 => 'Notifications always visible', 1 => 'Hide Notifications automatically' ),
+  'default' => 0,
+  'name' => 'website_notification_autohide', 'value' => $setting->getValue('website_notification_autohide'),
+  'tooltip' => 'Hides Notifications after 5 seconds.'
 );
 $aSettings['blockchain'][] = array(
   'display' => 'Disable Blockexplorer', 'type' => 'select',
@@ -432,3 +447,18 @@
   'name' => 'notifications_disable_idle_worker', 'value' => $setting->getValue('notifications_disable_idle_worker'),
   'tooltip' => 'Enable/Disable IDLE worker notifications globally. Will remove the user option too.'
 );
+$aSettings['pools'][] = array(
+  'display' => 'Enable Pool Navigation', 'type' => 'select',
+  'options' => array( 0 => 'No', 1 => 'Yes' ),
+  'default' => 0,
+  'name' => 'poolnav_enabled', 'value' => $setting->getValue('poolnav_enabled'),
+  'tooltip' => 'Enable or Disable Pool Navigation for multiple Pools in Header.'
+);
+$aSettings['pools'][] = array(
+  'display' => 'Pools for Pool Navigation', 'type' => 'textarea',
+  'size' => 20,
+  'height' => 12,
+  'default' => 'Pool Name|Pool URL',
+  'name' => 'poolnav_pools', 'value' => $setting->getValue('poolnav_pools'),
+  'tooltip' => '.'
+);

public/include/config/global.inc.dist.php

@@ -72,6 +72,7 @@
  *  Fetch exchange rates via an API
  *   https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-ticker-api
  **/
+$config['price']['enabled'] = false;
 $config['price']['url'] = 'https://btc-e.com';
 $config['price']['target'] = '/api/2/ltc_usd/ticker';
 $config['price']['currency'] = 'USD';