bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-07-28 03:45:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui improvements

Browse Source
This commit is contained in:
SJ
2013-08-01 22:28:42 +02:00
parent b563658a37
commit a10040ea1c
16 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webui/model/health/health.php
View File

@@ -90,9 +90,9 @@ class ModelHealthHealth extends Model {
if(isset($p[5]) && in_array($p[5], $partitions)) {
$shortinfo[] = array(
'partition' => $p[5],
'freespace' => nice_size(1000*$p[3]),
'total' => nice_size(1000*$p[1]),
'used' => nice_size(1000*$p[2]),
'freespace' => $p[3],
'total' => $p[1],
'used' => $p[2],
'utilization' => preg_replace("/\%/", "", $p[4])
);
}

2
webui/model/saas/customer.php
View File

@@ -142,6 +142,8 @@ class ModelSaasCustomer extends Model
public function get_online_users() {
$query = $this->db->query("DELETE FROM " . TABLE_ONLINE . " WHERE last_activity < ?", array(NOW - 3600));
$query = $this->db->query("SELECT * FROM " . TABLE_ONLINE . " ORDER BY username ASC");
return $query->rows;

8
webui/model/search/search.php
View File

@@ -269,7 +269,7 @@ class ModelSearchSearch extends Model {
$data['any'] = $this->fixup_sphinx_operators($data['any']);
$data['any'] = $this->fix_email_address_for_sphinx($data['any']);
$fields = '';
if($match) { $match = "($match) & "; $fields = '@subject,@body '; } $match .= "($fields " . $data['any'] . ") ";
if($match) { $match = "($match) & "; } $match .= "(@subject " . $data['any'] . " | @body " . $data['any'] . ") ";
}
@@ -759,7 +759,7 @@ class ModelSearchSearch extends Model {
public function get_search_terms() {
$query = $this->db->query("SELECT term FROM " . TABLE_SEARCH . " WHERE email=? ORDER BY ts DESC", array($_SESSION['email']));
$query = $this->db->query("SELECT term, ts FROM " . TABLE_SEARCH . " WHERE email=? ORDER BY ts DESC", array($_SESSION['email']));
if(isset($query->rows)) { return $query->rows; }
return array();
@@ -792,8 +792,8 @@ class ModelSearchSearch extends Model {
}
public function remove_search_terms() {
$query = $this->db->query("DELETE FROM " . TABLE_SEARCH . " WHERE email=?", array($_SESSION['email']));
public function remove_search_term($ts = 0) {
$query = $this->db->query("DELETE FROM " . TABLE_SEARCH . " WHERE email=? AND ts=?", array($_SESSION['email'], $ts));
}