diff options
| author | justauser <[email protected]> | 2013-07-07 13:57:06 -0400 |
|---|---|---|
| committer | justauser <[email protected]> | 2013-07-07 13:57:06 -0400 |
| commit | 3b96b0ed7cf8d960dd3ec2208ad8addb584bc1c9 (patch) | |
| tree | d83db38f58511d5648b6bd665ab3760d74e73875 /include | |
| parent | ef3a8db1cc83e02a9f8933869d19f299f2abe72a (diff) | |
| parent | e4e9ac1fc288d6715f6419cd4c8a44386362ecf0 (diff) | |
Merge branch 'master' into hookhead
Conflicts:
include/functions.php
changes for conflicts with master
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.php | 5 | ||||
| -rw-r--r-- | include/sessions.php | 18 |
2 files changed, 20 insertions, 3 deletions
diff --git a/include/functions.php b/include/functions.php index eb011b6db..556b8a8cd 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2578,8 +2578,10 @@ } } + $content_query_part = "content, content AS content_preview, cached_content, "; + if (is_numeric($feed)) { if ($feed >= 0) { @@ -3784,7 +3786,7 @@ * @return string Absolute URL */ function rewrite_relative_url($url, $rel_url) { - if (strpos($rel_url, "magnet:") === 0) { + if (strpos($rel_url, ":") !== false) { return $rel_url; } else if (strpos($rel_url, "://") !== false) { return $rel_url; @@ -3954,6 +3956,7 @@ $reg_qpart = "REGEXP"; foreach ($filter["rules"] AS $rule) { + $rule['reg_exp'] = str_replace('/', '\/', $rule["reg_exp"]); $regexp_valid = preg_match('/' . $rule['reg_exp'] . '/', $rule['reg_exp']) !== FALSE; diff --git a/include/sessions.php b/include/sessions.php index 423ef0eda..66214afe7 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -62,11 +62,17 @@ return false; } - if ($_SESSION["ref_schema_version"] != session_get_schema_version(true)) + if ($_SESSION["ref_schema_version"] != session_get_schema_version(true)) { + $_SESSION["login_error_msg"] = + __("Session failed to validate (schema version changed)"); return false; + } - if (sha1($_SERVER['HTTP_USER_AGENT']) != $_SESSION["user_agent"]) + if (sha1($_SERVER['HTTP_USER_AGENT']) != $_SESSION["user_agent"]) { + $_SESSION["login_error_msg"] = + __("Session failed to validate (user agent changed)"); return false; + } if ($_SESSION["uid"]) { $result = Db::get()->query( @@ -74,11 +80,19 @@ // user not found if (Db::get()->num_rows($result) == 0) { + + $_SESSION["login_error_msg"] = + __("Session failed to validate (user not found)"); + return false; } else { $pwd_hash = Db::get()->fetch_result($result, 0, "pwd_hash"); if ($pwd_hash != $_SESSION["pwd_hash"]) { + + $_SESSION["login_error_msg"] = + __("Session failed to validate (password changed)"); + return false; } } |