Revert "from -> sender transition, part 1"

This reverts commit c6ecefddbf.
This commit is contained in:
Janos SUTO
2020-07-11 19:56:57 +02:00
parent 37cf545c51
commit ac67a630ef
4 changed files with 14 additions and 14 deletions

View File

@ -98,7 +98,7 @@ class ControllerSearchHelper extends Controller {
private function fixup_post_simple_request() {
$match = '';
if(isset($this->request->post['from']) && $this->request->post['from']) { $match .= "@sender " . $this->request->post['from'] . ' '; }
if(isset($this->request->post['from']) && $this->request->post['from']) { $match .= "@from " . $this->request->post['from'] . ' '; }
if(isset($this->request->post['to']) && $this->request->post['to']) { $match .= "@to " . $this->request->post['to'] . ' '; }
if(isset($this->request->post['subject']) && $this->request->post['subject']) { $match .= "@subject " . $this->request->post['subject'] . ' '; }
if(isset($this->request->post['body']) && $this->request->post['body']) { $match .= "@body " . $this->request->post['body'] . ' '; }
@ -149,7 +149,7 @@ class ControllerSearchHelper extends Controller {
}
else if(strchr($v, '@')) {
$prev_token_is_email = 1;
if($from == '') { $from = "@sender"; }
if($from == '') { $from = "@from"; }
$from .= " $v";
}
else {