bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-06-12 23:17:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

heavy code cleanup in the webui

Browse Source
This commit is contained in:
SJ
2013-02-11 20:24:19 +01:00
parent 5286bc7d1c
commit 5535a64de4
76 changed files with 1914 additions and 3744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
webui/model/audit/audit.php
View File

@ -23,22 +23,21 @@ class ModelAuditAudit extends Model {
$sortorder = "ORDER BY `$sort` $order";
if(isset($data['action']) && $data['action'] != ACTION_ALL) {
$where .= " AND action=?";
array_push($arr, $data['action']);
}
if(isset($data['ipaddr'])) {
if(isset($data['ipaddr']) && $data['ipaddr']) {
$where .= " AND ipaddr IN (" . $this->append_search_criteria($data['ipaddr'], $arr) . ")";
}
if(isset($data['user'])) {
if(isset($data['user']) && $data['user']) {
$where .= " AND email IN (" . $this->append_search_criteria($data['user'], $arr) . ")";
}
if(isset($data['ref'])) {
$where .= " AND ref IN (" . $this->append_search_criteria($data['ref'], $arr) . ")";
if(isset($data['ref']) && $data['ref']) {
$where .= " AND meta_id IN (" . $this->append_search_criteria($data['ref'], $arr) . ")";
}
if(isset($data['date1'])) { $date1 = $data['date1']; }
@ -55,32 +54,24 @@ class ModelAuditAudit extends Model {
$from = $data['page_len'] * $data['page'];
if($where) {
$query = $this->db->query("SELECT COUNT(*) AS count FROM " . TABLE_AUDIT . " $where", $arr);
$n = $query->row['count'];
$query = $this->db->query("SELECT COUNT(*) AS count FROM " . TABLE_AUDIT . " $where", $arr);
if(ENABLE_SYSLOG == 1) { syslog(LOG_INFO, sprintf("audit query: '%s' in %.2f s, %d hits", $query->query, $query->exec_time, $query->row['count'])); }
}
else { $n = MAX_AUDIT_HITS; }
$n = $query->row['count'];
if($n > 0) {
if($n > MAX_AUDIT_HITS) { $n = MAX_AUDIT_HITS; }
$query = $this->db->query("SELECT * FROM " . TABLE_AUDIT . " $where $sortorder LIMIT $from," . $data['page_len'], $arr);
if(ENABLE_SYSLOG == 1) { syslog(LOG_INFO, sprintf("audit query: '%s', param: '%s' in %.2f s, %d hits", $query->query, implode(' ', $arr), $query->exec_time, $query->num_rows)); }
if(isset($query->rows)) {
foreach($query->rows as $a) {
if($a['meta_id'] > 0) { $q .= "," . $a['meta_id']; }
}
if($q) {
$q = substr($q, 1, strlen($q));
$Q = $this->db->query("SELECT id, piler_id FROM " . TABLE_META . " WHERE id IN($q)");
foreach($Q->rows as $a) {
$m[$a['id']] = $a['piler_id'];
}
}
foreach($query->rows as $a) {
$results[] = array(
'id' => $a['meta_id'],

5
webui/model/domain/domain.php
View File

@ -3,9 +3,12 @@
class ModelDomainDomain extends Model {
public function getDomains() {
$query = $this->db->query("SELECT domain, mapped FROM " . TABLE_DOMAIN . " ORDER BY domain ASC");
return $query->rows;
if(isset($query->rows)) { return $query->rows; }
return array();
}

4
webui/model/search/message.php
View File

@ -483,7 +483,7 @@ class ModelSearchMessage extends Model {
$query = $this->db->query("SELECT `tag` FROM " . TABLE_TAG . " WHERE uid=? AND id=?", array($uid, $id));
if(isset($query->row['tag'])) { return $query->row['tag']; }
if(isset($query->row['tag'])) { return strip_tags($query->row['tag']); }
return '';
}
@ -523,7 +523,7 @@ class ModelSearchMessage extends Model {
$query = $this->db->query("SELECT `note` FROM " . TABLE_NOTE . " WHERE uid=? AND id=?", array($uid, $id));
if(isset($query->row['note'])) { return $query->row['note']; }
if(isset($query->row['note'])) { return strip_tags(urldecode($query->row['note'])); }
return '';
}

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

@ -493,9 +493,12 @@ class ModelSearchSearch extends Model {
foreach($query->rows as $m) {
$m['shortfrom'] = make_short_string($m['from'], MAX_CGI_FROM_SUBJ_LEN);
$m['from'] = escape_gt_lt_quote_symbols($m['from']);
isset($srcpt[$m['id']]) ? $m['shortto'] = $srcpt[$m['id']] : $m['shortto'] = '';
isset($rcpt[$m['id']]) ? $m['to'] = $rcpt[$m['id']] : $m['to'] = '';
$m['to'] = escape_gt_lt_quote_symbols($m['to']);
$m['shortto'] = $srcpt[$m['id']];
$m['to'] = $rcpt[$m['id']];
if($m['subject'] == "") { $m['subject'] = "<" . $lang->data['text_no_subject'] . ">"; }
@ -516,6 +519,9 @@ class ModelSearchSearch extends Model {
if(isset($tag[$m['id']])) { $m['tag'] = $tag[$m['id']]; } else { $m['tag'] = ''; }
if(isset($note[$m['id']])) { $m['note'] = $note[$m['id']]; } else { $m['note'] = ''; }
$m['note'] = strip_tags(urldecode($m['note']));
$m['tag'] = strip_tags(urldecode($m['tag']));
array_push($messages, $m);
}
}
@ -570,7 +576,7 @@ class ModelSearchSearch extends Model {
$query = $this->db->query("SELECT `from`, `to` FROM " . VIEW_MESSAGES . " WHERE id=?", array($id));
if(isset($query->row)) {
if(isset($query->row['from'])) {
foreach ($domains as $domain) {
if(preg_match("/\@$domain$/", $query->row['from'])) { array_push($addr, $query->row['from']); }
}