From 75f0a50c641e4e34df073be99e80406e16cae764 Mon Sep 17 00:00:00 2001 From: Roland Mas Date: Thu, 7 Jan 2010 15:04:11 +0000 Subject: [PATCH] Merged from 4.8: a bunch of fixes that were mostly already present anyway --- gforge/common/forum/Forum.class.php | 4 ++-- gforge/common/include/session.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gforge/common/forum/Forum.class.php b/gforge/common/forum/Forum.class.php index 940aa4a071..1ff2febd62 100644 --- a/gforge/common/forum/Forum.class.php +++ b/gforge/common/forum/Forum.class.php @@ -126,7 +126,7 @@ class Forum extends Error { return false; } $forum_name = strtolower($forum_name); - if (!preg_match('/^([_\.0-9a-z-])*$/i',$forum_name)) { + if (!preg_match('/^([_\.0-9a-z-])*$/',$forum_name)) { $this->setError(_('Illegal Characters in Forum Name')); return false; } @@ -679,7 +679,7 @@ class Forum extends Error { //delete forum's role setting db_query_params ('DELETE FROM role_setting WHERE section_name=$1 AND ref_id=$2', array ('forum', - $this->getID())) ; + $this->getID())) ; db_commit(); return true; } diff --git a/gforge/common/include/session.php b/gforge/common/include/session.php index 885a6741ba..221b81a53e 100644 --- a/gforge/common/include/session.php +++ b/gforge/common/include/session.php @@ -175,6 +175,7 @@ function session_login_valid_dbonly ($loginname, $passwd, $allowpending) { // There is a user with the provided user_name/email, but the MD5 passwds do not match // We'll have to try checking the (crypt) unix_pw $usr = db_fetch_array($res); + $userstatus = $usr['status'] ; if (crypt ($passwd, $usr['unix_pw']) != $usr['unix_pw']) { // Even the (crypt) unix_pw does not patch -- 2.30.2