Fix so plain text signature field uses monospace font (#1490435)

Aleksander Machniak

2015-06-17 3f4521bcf4b538b6ac54817cfad22b51e347546d

 program/lib/Roundcube/rcube_session.php

@@ -44,9 +44,15 @@
    private $secret = '';
    private $ip_check = false;
    private $logging = false;
    private $nowrite = false;
    private $storage;
    private $memcache;

    /**
     * Blocks session data from being written to database.
     * Can be used if write-race conditions are to be expected
     * @var boolean
     */
    public $nowrite = false;


    /**
@@ -97,6 +103,8 @@
                array($this, 'db_write'),
                array($this, 'db_destroy'),
                array($this, 'gc'));

            $this->table_name = $this->db->table_name('session', true);
        }
    }

@@ -136,7 +144,15 @@
     */
    public function destroy($key)
    {
        return $this->memcache ? $this->mc_destroy($key) : $this->db_destroy($key);
        if ($this->storage == 'memcache' && $this->memcache) {
            return $this->mc_destroy($key);
        }
        else if ($this->storage == 'db') {
            return $this->db_destroy($key);
        }
        else {
            return true;
        }
    }


@@ -169,9 +185,8 @@
    public function db_read($key)
    {
        $sql_result = $this->db->query(
            "SELECT vars, ip, changed, " . $this->db->now() . " AS ts"
            . " FROM " . $this->db->table_name('session')
            . " WHERE sess_id = ?", $key);
            "SELECT `vars`, `ip`, `changed`, " . $this->db->now() . " AS ts"
            . " FROM {$this->table_name} WHERE `sess_id` = ?", $key);

        if ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
            $this->time_diff = time() - strtotime($sql_arr['ts']);
@@ -198,9 +213,8 @@
     */
    public function db_write($key, $vars)
    {
        $now   = $this->db->now();
        $table = $this->db->table_name('session');
        $ts    = microtime(true);
        $now = $this->db->now();
        $ts  = microtime(true);

        if ($this->nowrite)
            return true;
@@ -221,17 +235,18 @@
            $newvars = $this->_fixvars($vars, $oldvars);

            if ($newvars !== $oldvars) {
                $this->db->query("UPDATE $table "
                    . "SET changed = $now, vars = ? WHERE sess_id = ?",
                $this->db->query("UPDATE {$this->table_name} "
                    . "SET `changed` = $now, `vars` = ? WHERE `sess_id` = ?",
                    base64_encode($newvars), $key);
            }
            else if ($ts - $this->changed + $this->time_diff > $this->lifetime / 2) {
                $this->db->query("UPDATE $table SET changed = $now"
                    . " WHERE sess_id = ?", $key);
                $this->db->query("UPDATE {$this->table_name} SET `changed` = $now"
                    . " WHERE `sess_id` = ?", $key);
            }
        }
        else {
            $this->db->query("INSERT INTO $table (sess_id, vars, ip, created, changed)"
            $this->db->query("INSERT INTO {$this->table_name}"
                . " (`sess_id`, `vars`, `ip`, `created`, `changed`)"
                . " VALUES (?, ?, ?, $now, $now)",
                $key, base64_encode($vars), (string)$this->ip);
        }
@@ -284,8 +299,7 @@
    public function db_destroy($key)
    {
        if ($key) {
            $this->db->query(sprintf("DELETE FROM %s WHERE sess_id = ?",
                $this->db->table_name('session')), $key);
            $this->db->query("DELETE FROM {$this->table_name} WHERE `sess_id` = ?", $key);
        }

        return true;
@@ -401,8 +415,8 @@
        if ($this->gc_enabled) {
            // just delete all expired sessions
            if ($this->storage == 'db') {
                $this->db->query("DELETE FROM " . $this->db->table_name('session')
                    . " WHERE changed < " . $this->db->now(-$this->gc_enabled));
                $this->db->query("DELETE FROM {$this->table_name}"
                    . " WHERE `changed` < " . $this->db->now(-$this->gc_enabled));
            }

            foreach ($this->gc_handlers as $fct) {
@@ -726,16 +740,6 @@
        if ($cookiename) {
            $this->cookiename = $cookiename;
        }
    }


    /**
     * Blocks session data from being written to database.
     * Can be used if write-race conditions are to be expected
     */
    function nowrite($block = true)
    {
        $this->nowrite = $block;
    }