- don't set password via remoting if field is empty

Marius Cramer

2015-08-06 37b29231e47a0c4458dc1c15d98588f16f07e1e2

 interface/web/sites/web_sites_stats.php

@@ -42,26 +42,26 @@
      $tmp_month = date('m');
      $tmp_rec = $app->db->queryOneRecord("SELECT SUM(traffic_bytes) as t FROM web_traffic WHERE hostname = ? AND YEAR(traffic_date) = ? AND MONTH(traffic_date) = ?", $rec['domain'], $tmp_year, $tmp_month);
      $rec['this_month'] = $app->functions->formatBytes($tmp_rec['t']);
      $this->sum_this_month += $app->functions->formatBytes($tmp_rec['t']);
      $this->sum_this_month += $tmp_rec['t'];


      //** Traffic of the current year
      $tmp_rec = $app->db->queryOneRecord("SELECT sum(traffic_bytes) as t FROM web_traffic WHERE hostname = ? AND YEAR(traffic_date) = ?", $rec['domain'], $tmp_year);
      $rec['this_year'] = $app->functions->formatBytes($tmp_rec['t']);
      $this->sum_this_year += $app->functions->formatBytes($tmp_rec['t']);
      $this->sum_this_year += $tmp_rec['t'];

      //** Traffic of the last month
      $tmp_year = date('Y', mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
      $tmp_month = date('m', mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
      $tmp_rec = $app->db->queryOneRecord("SELECT sum(traffic_bytes) as t FROM web_traffic WHERE hostname = ? AND YEAR(traffic_date) = ? AND MONTH(traffic_date) = ?", $rec['domain'], $tmp_year, $tmp_month);
      $rec['last_month'] = $app->functions->formatBytes($tmp_rec['t']);
      $this->sum_last_month += $app->functions->formatBytes($tmp_rec['t']);
      $this->sum_last_month += $tmp_rec['t'];

      //** Traffic of the last year
      $tmp_year = date('Y', mktime(0, 0, 0, date("m"), date("d"), date("Y")-1));
      $tmp_rec = $app->db->queryOneRecord("SELECT sum(traffic_bytes) as t FROM web_traffic WHERE hostname = ? AND YEAR(traffic_date) = ?", $rec['domain'], $tmp_year);
      $rec['last_year'] = $app->functions->formatBytes($tmp_rec['t']);
      $this->sum_last_year += $app->functions->formatBytes($tmp_rec['t']);
      $this->sum_last_year += $tmp_rec['t'];

      //* The variable "id" contains always the index variable
      $rec['id'] = $rec[$this->idx_key];
@@ -73,10 +73,10 @@
   {
      global $app;

      $app->tpl->setVar('sum_this_month', number_format($app->functions->intval($this->sum_this_month), 0, '.', ' '));
      $app->tpl->setVar('sum_this_year', number_format($app->functions->intval($this->sum_this_year), 0, '.', ' '));
      $app->tpl->setVar('sum_last_month', number_format($app->functions->intval($this->sum_last_month), 0, '.', ' '));
      $app->tpl->setVar('sum_last_year', number_format($app->functions->intval($this->sum_last_year), 0, '.', ' '));
      $app->tpl->setVar('sum_this_month', $app->functions->formatBytes($this->sum_this_month));
      $app->tpl->setVar('sum_this_year', $app->functions->formatBytes($this->sum_this_year));
      $app->tpl->setVar('sum_last_month', $app->functions->formatBytes($this->sum_last_month));
      $app->tpl->setVar('sum_last_year', $app->functions->formatBytes($this->sum_last_year));
      $app->tpl->setVar('sum_txt', $app->listform->lng('sum_txt'));

      $app->tpl_defaults();