mirror of
https://bitbucket.org/jsuto/piler.git
synced 2025-06-12 23:27:03 +02:00
heavy code cleanup in the webui
This commit is contained in:
@ -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 '';
|
||||
}
|
||||
|
@ -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']); }
|
||||
}
|
||||
|
Reference in New Issue
Block a user