From ff406834043d4213b9682c2c941ec2952e9783f7 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 17 Jun 2015 03:30:44 -0400
Subject: [PATCH] Fix so links with href == content aren't added to links list on html to text conversion (#1490434)
---
program/lib/Roundcube/rcube_session.php | 48 ++++++++++++++----------------------------------
1 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/program/lib/Roundcube/rcube_session.php b/program/lib/Roundcube/rcube_session.php
index fc1d871..2d26ad6 100644
--- a/program/lib/Roundcube/rcube_session.php
+++ b/program/lib/Roundcube/rcube_session.php
@@ -1,6 +1,6 @@
<?php
-/*
+/**
+-----------------------------------------------------------------------+
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2005-2014, The Roundcube Dev Team |
@@ -15,7 +15,7 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
| Author: Aleksander Machniak <alec@alec.pl> |
- | Author: Cor Bosman <cor@roundcu.be> |
+ | Author: Cor Bosman <cor@roundcu.be> |
+-----------------------------------------------------------------------+
*/
@@ -29,22 +29,22 @@
*/
abstract class rcube_session
{
+ protected $config;
protected $key;
protected $ip;
protected $changed;
protected $start;
- protected $time_diff = 0;
- protected $reloaded = false;
- protected $appends = array();
- protected $unsets = array();
- protected $gc_handlers = array();
- protected $cookiename = 'roundcube_sessauth';
protected $vars;
protected $now;
- protected $secret = '';
- protected $ip_check = false;
- protected $logging = false;
- protected $config;
+ protected $time_diff = 0;
+ protected $reloaded = false;
+ protected $appends = array();
+ protected $unsets = array();
+ protected $gc_handlers = array();
+ protected $cookiename = 'roundcube_sessauth';
+ protected $secret = '';
+ protected $ip_check = false;
+ protected $logging = false;
/**
* Blocks session data from being written to database.
@@ -86,9 +86,6 @@
{
$this->config = $config;
- // register default gc handler
- $this->register_gc_handler(array($this, 'gc'));
-
// set secret
$this->set_secret($this->config->get('des_key') . dirname($_SERVER['SCRIPT_NAME']));
@@ -119,7 +116,6 @@
);
}
-
/**
* Wrapper for session_start()
*/
@@ -145,12 +141,12 @@
abstract function write($key, $vars);
abstract function update($key, $newvars, $oldvars);
-
/**
* session write handler. This calls the implementation methods for write/update after some initial checks.
*
* @param $key
* @param $vars
+ *
* @return bool
*/
public function sess_write($key, $vars)
@@ -171,7 +167,6 @@
return $this->write($key, $vars);
}
}
-
/**
* Wrapper for session_write_close()
@@ -245,7 +240,6 @@
$this->gc_handlers[] = $func;
}
-
/**
* Garbage collector handler to run on script shutdown
*/
@@ -257,7 +251,6 @@
}
}
}
-
/**
* Generate and set new session id
@@ -297,7 +290,6 @@
return $cache;
}
-
/**
* Append the given value to the certain node in the session data array
*
@@ -331,7 +323,6 @@
unset($this->unsets[$path]);
}
-
/**
* Unset a session variable
*
@@ -359,18 +350,16 @@
return true;
}
-
/**
* Kill this session
*/
public function kill()
{
$this->vars = null;
- $this->ip = rcube_utils::remote_addr(); // update IP (might have changed)
+ $this->ip = rcube_utils::remote_addr(); // update IP (might have changed)
$this->destroy(session_id());
rcube_utils::setcookie($this->cookiename, '-del-', time() - 60);
}
-
/**
* Re-read session data from storage backend
@@ -446,7 +435,6 @@
return $data;
}
-
/**
* Unserialize session data
@@ -546,7 +534,6 @@
return unserialize( 'a:' . $items . ':{' . $serialized . '}' );
}
-
/**
* Setter for session lifetime
*/
@@ -559,7 +546,6 @@
$this->now = $now - ($now % ($this->lifetime / 2));
}
-
/**
* Getter for remote IP saved with this session
*/
@@ -567,7 +553,6 @@
{
return $this->ip;
}
-
/**
* Setter for cookie encryption secret
@@ -577,7 +562,6 @@
$this->secret = $secret;
}
-
/**
* Enable/disable IP check
*/
@@ -585,7 +569,6 @@
{
$this->ip_check = $check;
}
-
/**
* Setter for the cookie name used for session cookie
@@ -596,7 +579,6 @@
$this->cookiename = $cookiename;
}
}
-
/**
* Check session authentication cookie
@@ -635,7 +617,6 @@
return $result;
}
-
/**
* Set session authentication cookie
*/
@@ -645,7 +626,6 @@
rcube_utils::setcookie($this->cookiename, $this->cookie, 0);
$_COOKIE[$this->cookiename] = $this->cookie;
}
-
/**
* Create session cookie from session data
--
Gitblit v1.9.1