1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 17:56:52 +02:00

Move certain methods out of ucp class, move ucp class into ucp, break half a dozen other features, introduce x hundred new, exciting bugs

git-svn-id: file:///svn/phpbb/trunk@4213 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2003-07-07 23:43:57 +00:00
parent 4cc4867c97
commit ff58fc5e7c
7 changed files with 565 additions and 500 deletions

View File

@@ -109,7 +109,8 @@ switch ($mode)
$sql = 'SELECT t.*, f.*
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
WHERE t.topic_id = $topic_id
AND f.forum_id IN (t.forum_id, $forum_id)";
AND (f.forum_id = t.forum_id
OR f.forum_id = $forum_id)";
$forum_validate = $topic_validate = true;
break;
@@ -131,7 +132,8 @@ switch ($mode)
WHERE p.post_id = $post_id
AND t.topic_id = p.topic_id
AND u.user_id = p.poster_id
AND f.forum_id IN (t.forum_id, $forum_id)";
AND (f.forum_id = t.forum_id
OR f.forum_id = $forum_id)";
$forum_validate = $topic_validate = $post_validate = true;
break;
@@ -667,10 +669,9 @@ if ($submit || $preview || $refresh)
if (($username != '' && $user->data['user_id'] == ANONYMOUS) || ($mode == 'edit' && $post_username != ''))
{
include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
$ucp = new ucp();
$username = strip_tags(htmlspecialchars($username));
if (($result = $ucp->validate_username($username)) != false)
if (($result = validate_username($username)) != false)
{
$error[] = $result;
}