CS fixes

Aleksander Machniak

2014-05-15 47a7833aca96a263068eed53f9471a3699ef257b

 program/lib/Roundcube/rcube_imap_search.php

@@ -29,7 +29,7 @@
{
    public $options = array();

    protected $jobs = array();
    protected $jobs      = array();
    protected $timelimit = 0;
    protected $results;
    protected $conn;
@@ -40,7 +40,7 @@
    public function __construct($options, $conn)
    {
        $this->options = $options;
        $this->conn = $conn;
        $this->conn    = $conn;
    }

    /**
@@ -54,7 +54,7 @@
     */
    public function exec($folders, $str, $charset = null, $sort_field = null, $threading=null)
    {
        $start = floor(microtime(true));
        $start   = floor(microtime(true));
        $results = new rcube_result_multifolder($folders);

        // start a search job for every folder to search in
@@ -65,7 +65,8 @@
                $results->add($result);
            }
            else {
                $job = new rcube_imap_search_job($folder, $str, $charset, $sort_field, $threading);
                $search = is_array($str) && $str[$folder] ? $str[$folder] : $str;
                $job = new rcube_imap_search_job($folder, $search, $charset, $sort_field, $threading);
                $job->worker = $this;
                $this->jobs[] = $job;
            }
@@ -129,11 +130,11 @@

    public function __construct($folder, $str, $charset = null, $sort_field = null, $threading=false)
    {
        $this->folder = $folder;
        $this->search = $str;
        $this->charset = $charset;
        $this->folder     = $folder;
        $this->search     = $str;
        $this->charset    = $charset;
        $this->sort_field = $sort_field;
        $this->threading = $threading;
        $this->threading  = $threading;

        $this->result = new rcube_result_index($folder);
        $this->result->incomplete = true;
@@ -150,9 +151,8 @@
    protected function search_index()
    {
        $criteria = $this->search;
        $charset = $this->charset;

        $imap = $this->worker->get_imap();
        $charset  = $this->charset;
        $imap     = $this->worker->get_imap();

        if (!$imap->connected()) {
            trigger_error("No IMAP connection for $this->folder", E_USER_WARNING);
@@ -228,7 +228,4 @@
    {
        return $this->result;
    }

}