Zeile 54 | Zeile 54 |
---|
$optionselected = ''; $selecteddone = "0"; }
|
$optionselected = ''; $selecteddone = "0"; }
|
if($forum['password'] != '')
| if(forum_password_validated($forum, true))
|
{
|
{
|
if($mybb->cookies['forumpass'][$forum['fid']] === md5($mybb->user['uid'].$forum['password'])) { $pwverified = 1; } else { $pwverified = 0; } } if(empty($forum['password']) || $pwverified == 1) { eval("\$forumlistbits .= \"".$templates->get("search_forumlist_forum")."\";");
| eval("\$forumlistbits .= \"".$templates->get("search_forumlist_forum")."\";");
|
} if(!empty($pforumcache[$forum['fid']])) {
| } if(!empty($pforumcache[$forum['fid']])) {
|
Zeile 83 | Zeile 72 |
---|
eval("\$forumlist = \"".$templates->get("search_forumlist")."\";"); } return $forumlist;
|
eval("\$forumlist = \"".$templates->get("search_forumlist")."\";"); } return $forumlist;
|
}
| }
|
/** * Build a comma separated list of the forums this user cannot search *
| /** * Build a comma separated list of the forums this user cannot search *
|
Zeile 94 | Zeile 83 |
---|
*/ function get_unsearchable_forums($pid=0, $first=1) {
|
*/ function get_unsearchable_forums($pid=0, $first=1) {
|
global $db, $forum_cache, $permissioncache, $mybb, $unsearchableforums, $unsearchable, $templates, $forumpass;
| global $forum_cache, $permissioncache, $mybb, $unsearchableforums, $unsearchable, $templates, $forumpass;
|
$pid = (int)$pid;
if(!is_array($forum_cache)) {
|
$pid = (int)$pid;
if(!is_array($forum_cache)) {
|
// Get Forums $query = $db->simple_select("forums", "fid,parentlist,password,active", '', array('order_by' => 'pid, disporder')); while($forum = $db->fetch_array($query)) { $forum_cache[$forum['fid']] = $forum; }
| cache_forums();
|
} if(!is_array($permissioncache)) {
| } if(!is_array($permissioncache)) {
|
Zeile 120 | Zeile 104 |
---|
else { $perms = $mybb->usergroup;
|
else { $perms = $mybb->usergroup;
|
}
$pwverified = 1; if($forum['password'] != '') { if(!isset($mybb->cookies['forumpass'][$forum['fid']]) || !my_hash_equals($mybb->cookies['forumpass'][$forum['fid']], md5($mybb->user['uid'].$forum['password']))) { $pwverified = 0; }
| |
}
$parents = explode(",", $forum['parentlist']);
| }
$parents = explode(",", $forum['parentlist']);
|
Zeile 139 | Zeile 114 |
---|
if($forum_cache[$parent]['active'] == 0) { $forum['active'] = 0;
|
if($forum_cache[$parent]['active'] == 0) { $forum['active'] = 0;
|
} } }
if($perms['canview'] != 1 || $perms['cansearch'] != 1 || $pwverified == 0 || $forum['active'] == 0)
| } } }
if($perms['canview'] != 1 || $perms['cansearch'] != 1 || !forum_password_validated($forum, true) || $forum['active'] == 0)
|
{ if($unsearchableforums) {
| { if($unsearchableforums) {
|
Zeile 168 | Zeile 143 |
---|
}
return $unsearchable;
|
}
return $unsearchable;
|
| }
/** * Build query condition for threads/posts the user is allowed to see. * Will return for example: * - visible = 1 - for normal users * - visible >= -1 - for admins & super mods * - (visible = 1 OR (visible = ? AND fid IN ...)) - for forum moderators * * @param string $table_alias The alias of the table eg t to use t.visible instead of visible * @return string the query condition */ function get_visible_where($table_alias = null) { global $db, $mybb;
$aliasdot = ''; if(!empty($table_alias)) { $aliasdot = $table_alias.'.'; }
if($mybb->usergroup['issupermod'] == 1) { // Super moderators (and admins) return "{$aliasdot}visible >= -1"; } elseif(is_moderator()) { // Normal moderators $unapprove_forums = array(); $deleted_forums = array(); $unapproved_where = "({$aliasdot}visible = 1"; $moderated_fids = get_moderated_fids($mybb->user['uid']);
if($moderated_fids !== false) { foreach($moderated_fids as $fid) { if(!is_moderator($fid)) { // Shouldn't occur. continue; } // Use moderates this forum $modperms = get_moderator_permissions($fid, $mybb->user['uid']); if($modperms['canviewunapprove'] == 1) { $unapprove_forums[] = $fid; } if($modperms['canviewdeleted'] == 1) { $deleted_forums[] = $fid; } } if(!empty($unapprove_forums)) { $unapproved_where .= " OR ({$aliasdot}visible = 0 AND {$aliasdot}fid IN(".implode(',', $unapprove_forums)."))"; } if(!empty($deleted_forums)) { $unapproved_where .= " OR ({$aliasdot}visible = -1 AND {$aliasdot}fid IN(".implode(',', $deleted_forums)."))"; } $unapproved_where .= ')'; return $unapproved_where; } }
// Normal users if($mybb->user['uid'] > 0 && $mybb->settings['showownunapproved'] == 1) { return "({$aliasdot}visible = 1 OR ({$aliasdot}visible = 0 AND {$aliasdot}uid = {$mybb->user['uid']}))"; } return "{$aliasdot}visible = 1";
|
}
/**
| }
/**
|
Zeile 179 | Zeile 234 |
---|
function get_password_protected_forums($fids=array()) { global $forum_cache, $mybb;
|
function get_password_protected_forums($fids=array()) { global $forum_cache, $mybb;
|
|
|
if(!is_array($fids))
|
if(!is_array($fids))
|
{
| {
|
return false; }
| return false; }
|
Zeile 191 | Zeile 246 |
---|
if(!$forum_cache) { return false;
|
if(!$forum_cache) { return false;
|
} }
| } }
|
if(empty($fids))
|
if(empty($fids))
|
{
| {
|
$fids = array_keys($forum_cache); }
$pass_fids = array(); foreach($fids as $fid) {
|
$fids = array_keys($forum_cache); }
$pass_fids = array(); foreach($fids as $fid) {
|
if(empty($forum_cache[$fid]['password'])) { continue; }
if(md5($mybb->user['uid'].$forum_cache[$fid]['password']) !== $mybb->cookies['forumpass'][$fid]) {
| if(!forum_password_validated($forum_cache[$fid], true)) {
|
$pass_fids[] = $fid;
|
$pass_fids[] = $fid;
|
$child_list = get_child_list($fid); }
if(is_array($child_list)) { $pass_fids = array_merge($pass_fids, $child_list);
| $pass_fids = array_merge($pass_fids, get_child_list($fid));
|
} } return array_unique($pass_fids);
| } } return array_unique($pass_fids);
|
Zeile 229 | Zeile 274 |
---|
*/ function clean_keywords($keywords) {
|
*/ function clean_keywords($keywords) {
|
global $db;
| global $db, $lang;
|
$keywords = my_strtolower($keywords); $keywords = $db->escape_string_like($keywords);
| $keywords = my_strtolower($keywords); $keywords = $db->escape_string_like($keywords);
|
Zeile 243 | Zeile 288 |
---|
if(my_strpos($keywords, "or") === 0) { $keywords = substr_replace($keywords, "", 0, 2);
|
if(my_strpos($keywords, "or") === 0) { $keywords = substr_replace($keywords, "", 0, 2);
|
| $keywords = " ".$keywords;
|
}
if(my_strpos($keywords, "and") === 0) { $keywords = substr_replace($keywords, "", 0, 3);
|
}
if(my_strpos($keywords, "and") === 0) { $keywords = substr_replace($keywords, "", 0, 3);
|
}
| $keywords = " ".$keywords; }
if(!$keywords) { error($lang->error_nosearchterms); }
|
return $keywords; }
| return $keywords; }
|
Zeile 272 | Zeile 324 |
---|
// Separate braces for further processing $keywords = preg_replace("#((\+|-|<|>|~)?\(|\))#s", " $1 ", $keywords); $keywords = preg_replace("#\s+#s", " ", $keywords);
|
// Separate braces for further processing $keywords = preg_replace("#((\+|-|<|>|~)?\(|\))#s", " $1 ", $keywords); $keywords = preg_replace("#\s+#s", " ", $keywords);
|
|
|
global $mybb;
|
global $mybb;
|
|
|
$min_word_length = (int) $mybb->settings['minsearchword']; if($min_word_length <= 0)
|
$min_word_length = (int) $mybb->settings['minsearchword']; if($min_word_length <= 0)
|
{
| {
|
$min_word_length = 3;
|
$min_word_length = 3;
|
}
| }
|
$min_word_length -= 1;
|
$min_word_length -= 1;
|
| $word_length_regex = ''; if($min_word_length > 1) { $word_length_regex = "{1,{$min_word_length}}"; }
|
// Replaces less than 3 characters
|
// Replaces less than 3 characters
|
$keywords = preg_replace("/(\b.{1,{$min_word_length}})(\s)|(\b.{1,{$min_word_length}}$)/", '$2', $keywords);
| $keywords = preg_replace("/(\b.{$word_length_regex})(\s)|(\b.{$word_length_regex}$)/u", '$2', $keywords);
|
// Collapse multiple spaces $keywords = preg_replace('/(\s)+/', '$1', $keywords); $keywords = trim($keywords);
| // Collapse multiple spaces $keywords = preg_replace('/(\s)+/', '$1', $keywords); $keywords = trim($keywords);
|
Zeile 668 | Zeile 726 |
---|
}
if(!is_array($search['folder']))
|
}
if(!is_array($search['folder']))
|
{
| {
|
$search['folder'] = array($search['folder']); }
| $search['folder'] = array($search['folder']); }
|
Zeile 760 | Zeile 818 |
---|
{ $mybb->settings['minsearchword'] = 3; }
|
{ $mybb->settings['minsearchword'] = 3; }
|
|
|
$name_lookin = ""; $document_lookin = ""; $searchsql = "enabled='1'";
| $name_lookin = ""; $document_lookin = ""; $searchsql = "enabled='1'";
|
Zeile 829 | Zeile 887 |
---|
elseif($search['name'] && !$search['document'] && $name_lookin == " AND (") { // Just in a name?
|
elseif($search['name'] && !$search['document'] && $name_lookin == " AND (") { // Just in a name?
|
continue; }
| continue; }
|
elseif(!$search['name'] && $search['document'] && $document_lookin == " {$string} (") { // Just in a document? continue; }
|
elseif(!$search['name'] && $search['document'] && $document_lookin == " {$string} (") { // Just in a document? continue; }
|
}
| }
|
$boolean = $word;
|
$boolean = $word;
|
}
| }
|
// Otherwise check the length of the word as it is a normal search term else {
| // Otherwise check the length of the word as it is a normal search term else {
|
Zeile 854 | Zeile 912 |
---|
if($search['name'] == 1) { $name_lookin .= " $boolean {$nfield} LIKE '%{$word}%'";
|
if($search['name'] == 1) { $name_lookin .= " $boolean {$nfield} LIKE '%{$word}%'";
|
} if($search['document'] == 1) { $document_lookin .= " $boolean {$dfield} LIKE '%{$word}%'"; } } } } // In the middle of a quote (phrase) else { $phrase = str_replace(array("+", "-", "*"), '', trim($phrase));
| } if($search['document'] == 1) { $document_lookin .= " $boolean {$dfield} LIKE '%{$word}%'"; } } } } // In the middle of a quote (phrase) else { $phrase = str_replace(array("+", "-", "*"), '', trim($phrase));
|
if(my_strlen($phrase) < $mybb->settings['minsearchword']) { $lang->error_minsearchlength = $lang->sprintf($lang->error_minsearchlength, $mybb->settings['minsearchword']);
| if(my_strlen($phrase) < $mybb->settings['minsearchword']) { $lang->error_minsearchlength = $lang->sprintf($lang->error_minsearchlength, $mybb->settings['minsearchword']);
|
Zeile 1239 | Zeile 1297 |
---|
if(isset($forum_permissions['canonlyviewownthreads']) && $forum_permissions['canonlyviewownthreads'] == 1) { $onlyusfids[] = $fid;
|
if(isset($forum_permissions['canonlyviewownthreads']) && $forum_permissions['canonlyviewownthreads'] == 1) { $onlyusfids[] = $fid;
|
} } } if(!empty($onlyusfids)) { $permsql .= "AND ((t.fid IN(".implode(',', $onlyusfids).") AND t.uid='{$mybb->user['uid']}') OR t.fid NOT IN(".implode(',', $onlyusfids)."))"; }
$unsearchforums = get_unsearchable_forums(); if($unsearchforums) { $permsql .= " AND t.fid NOT IN ($unsearchforums)"; } $inactiveforums = get_inactive_forums(); if($inactiveforums) { $permsql .= " AND t.fid NOT IN ($inactiveforums)"; }
$visiblesql = $post_visiblesql = $plain_post_visiblesql = ""; if(isset($search['visible'])) {
| } } } if(!empty($onlyusfids)) { $permsql .= "AND ((t.fid IN(".implode(',', $onlyusfids).") AND t.uid='{$mybb->user['uid']}') OR t.fid NOT IN(".implode(',', $onlyusfids)."))"; }
$unsearchforums = get_unsearchable_forums(); if($unsearchforums) { $permsql .= " AND t.fid NOT IN ($unsearchforums)"; } $inactiveforums = get_inactive_forums(); if($inactiveforums) { $permsql .= " AND t.fid NOT IN ($inactiveforums)"; }
$visiblesql = $post_visiblesql = $plain_post_visiblesql = $unapproved_where_t = $unapproved_where_p = ""; if(isset($search['visible'])) {
|
if($search['visible'] == 1) { $visiblesql = " AND t.visible = '1'";
| if($search['visible'] == 1) { $visiblesql = " AND t.visible = '1'";
|
Zeile 1292 | Zeile 1350 |
---|
} } }
|
} } }
|
| // Moderators can view unapproved threads and deleted threads from forums they moderate $unapproved_where_t = get_visible_where('t'); $unapproved_where_p = get_visible_where('p');
|
// Searching a specific thread? $tidsql = '';
| // Searching a specific thread? $tidsql = '';
|
Zeile 1318 | Zeile 1380 |
---|
$query = $db->query(" SELECT t.tid, t.firstpost FROM ".TABLE_PREFIX."threads t
|
$query = $db->query(" SELECT t.tid, t.firstpost FROM ".TABLE_PREFIX."threads t
|
WHERE 1=1 {$thread_datecut} {$thread_replycut} {$thread_prefixcut} {$forumin} {$thread_usersql} {$permsql} {$visiblesql} AND t.closed NOT LIKE 'moved|%' {$subject_lookin}
| WHERE 1=1 {$thread_datecut} {$thread_replycut} {$thread_prefixcut} {$forumin} {$thread_usersql} {$permsql} {$visiblesql} AND ({$unapproved_where_t}) AND t.closed NOT LIKE 'moved|%' {$subject_lookin}
|
{$limitsql} "); while($thread = $db->fetch_array($query))
| {$limitsql} "); while($thread = $db->fetch_array($query))
|
Zeile 1335 | Zeile 1397 |
---|
SELECT p.pid, p.tid FROM ".TABLE_PREFIX."posts p LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid=p.tid)
|
SELECT p.pid, p.tid FROM ".TABLE_PREFIX."posts p LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid=p.tid)
|
WHERE 1=1 {$post_datecut} {$thread_replycut} {$thread_prefixcut} {$forumin} {$post_usersql} {$permsql} {$tidsql} {$visiblesql} {$post_visiblesql} AND t.closed NOT LIKE 'moved|%' {$message_lookin} {$limitsql}
| WHERE 1=1 {$post_datecut} {$thread_replycut} {$thread_prefixcut} {$forumin} {$post_usersql} {$permsql} {$tidsql} {$visiblesql} {$post_visiblesql} AND ({$unapproved_where_t}) AND ({$unapproved_where_p}) AND t.closed NOT LIKE 'moved|%' {$message_lookin} {$limitsql}
|
"); while($post = $db->fetch_array($query)) {
| "); while($post = $db->fetch_array($query)) {
|
Zeile 1404 | Zeile 1466 |
---|
global $mybb, $db, $lang;
$keywords = clean_keywords_ft($search['keywords']);
|
global $mybb, $db, $lang;
$keywords = clean_keywords_ft($search['keywords']);
|
// Attempt to determine minimum word length from MySQL for fulltext searches $query = $db->query("SHOW VARIABLES LIKE 'ft_min_word_len';"); $min_length = $db->fetch_field($query, 'Value'); if(is_numeric($min_length)) { $mybb->settings['minsearchword'] = $min_length; } // Otherwise, could not fetch - default back to MySQL fulltext default setting else
| if($mybb->settings['minsearchword'] < 1)
|
{ $mybb->settings['minsearchword'] = 4; }
|
{ $mybb->settings['minsearchword'] = 4; }
|
| $message_lookin = $subject_lookin = '';
|
if($keywords) { $keywords_exp = explode("\"", $keywords);
| if($keywords) { $keywords_exp = explode("\"", $keywords);
|
Zeile 1465 | Zeile 1520 |
---|
{ $lang->error_minsearchlength = $lang->sprintf($lang->error_minsearchlength, $mybb->settings['minsearchword']); error($lang->error_minsearchlength);
|
{ $lang->error_minsearchlength = $lang->sprintf($lang->error_minsearchlength, $mybb->settings['minsearchword']); error($lang->error_minsearchlength);
|
}
| }
|
$message_lookin = "AND MATCH(message) AGAINST('".$db->escape_string($keywords)."' IN BOOLEAN MODE)"; $subject_lookin = "AND MATCH(subject) AGAINST('".$db->escape_string($keywords)."' IN BOOLEAN MODE)"; }
| $message_lookin = "AND MATCH(message) AGAINST('".$db->escape_string($keywords)."' IN BOOLEAN MODE)"; $subject_lookin = "AND MATCH(subject) AGAINST('".$db->escape_string($keywords)."' IN BOOLEAN MODE)"; }
|
Zeile 1490 | Zeile 1545 |
---|
while($user = $db->fetch_array($query)) { $userids[] = $user['uid'];
|
while($user = $db->fetch_array($query)) { $userids[] = $user['uid'];
|
}
| }
|
}
if(count($userids) < 1)
| }
if(count($userids) < 1)
|
Zeile 1504 | Zeile 1559 |
---|
$thread_usersql = " AND t.uid IN (".$userids.")"; } }
|
$thread_usersql = " AND t.uid IN (".$userids.")"; } }
|
$datecut = '';
| $datecut = $thread_datecut = $post_datecut = '';
|
if($search['postdate']) { if($search['pddir'] == 0)
| if($search['postdate']) { if($search['pddir'] == 0)
|
Zeile 1540 | Zeile 1595 |
---|
if($search['threadprefix'] && $search['threadprefix'][0] != 'any') { foreach($search['threadprefix'] as $threadprefix)
|
if($search['threadprefix'] && $search['threadprefix'][0] != 'any') { foreach($search['threadprefix'] as $threadprefix)
|
{
| {
|
$threadprefix = (int)$threadprefix; $prefixlist[] = $threadprefix;
|
$threadprefix = (int)$threadprefix; $prefixlist[] = $threadprefix;
|
} }
| } }
|
if(count($prefixlist) == 1) { $thread_prefixcut .= " AND t.prefix='$threadprefix' "; } else
|
if(count($prefixlist) == 1) { $thread_prefixcut .= " AND t.prefix='$threadprefix' "; } else
|
{
| {
|
if(count($prefixlist) > 1) { $thread_prefixcut = " AND t.prefix IN (".implode(',', $prefixlist).")";
| if(count($prefixlist) > 1) { $thread_prefixcut = " AND t.prefix IN (".implode(',', $prefixlist).")";
|
Zeile 1565 | Zeile 1620 |
---|
if(!is_array($search['forums'])) { $search['forums'] = array((int)$search['forums']);
|
if(!is_array($search['forums'])) { $search['forums'] = array((int)$search['forums']);
|
}
| }
|
foreach($search['forums'] as $forum) { $forum = (int)$forum;
| foreach($search['forums'] as $forum) { $forum = (int)$forum;
|
Zeile 1592 | Zeile 1647 |
---|
$group_permissions = forum_permissions(); foreach($group_permissions as $fid => $forum_permissions) {
|
$group_permissions = forum_permissions(); foreach($group_permissions as $fid => $forum_permissions) {
|
if($forum_permissions['canonlyviewownthreads'] == 1)
| if(isset($forum_permissions['canonlyviewownthreads']) && $forum_permissions['canonlyviewownthreads'] == 1)
|
{ $onlyusfids[] = $fid; }
| { $onlyusfids[] = $fid; }
|
Zeile 1613 | Zeile 1668 |
---|
$permsql .= " AND t.fid NOT IN ($inactiveforums)"; }
|
$permsql .= " AND t.fid NOT IN ($inactiveforums)"; }
|
$visiblesql = $post_visiblesql = $plain_post_visiblesql = "";
| $visiblesql = $post_visiblesql = $plain_post_visiblesql = $unapproved_where_t = $unapproved_where_p = "";
|
if(isset($search['visible'])) { if($search['visible'] == 1)
| if(isset($search['visible'])) { if($search['visible'] == 1)
|
Zeile 1647 | Zeile 1702 |
---|
} } }
|
} } }
|
| // Moderators can view unapproved threads and deleted threads from forums they moderate $unapproved_where_t = get_visible_where('t'); $unapproved_where_p = get_visible_where('p');
|
// Searching a specific thread?
|
// Searching a specific thread?
|
if($search['tid'])
| $tidsql = ''; if(!empty($search['tid']))
|
{ $tidsql = " AND t.tid='".(int)$search['tid']."'";
|
{ $tidsql = " AND t.tid='".(int)$search['tid']."'";
|
}
| }
|
$limitsql = ''; if((int)$mybb->settings['searchhardlimit'] > 0) {
| $limitsql = ''; if((int)$mybb->settings['searchhardlimit'] > 0) {
|
Zeile 1667 | Zeile 1727 |
---|
if($search['postthread'] == 1) { // No need to search subjects when looking for results within a specific thread
|
if($search['postthread'] == 1) { // No need to search subjects when looking for results within a specific thread
|
if(!$search['tid'])
| if(empty($search['tid']))
|
{ $query = $db->query(" SELECT t.tid, t.firstpost FROM ".TABLE_PREFIX."threads t
|
{ $query = $db->query(" SELECT t.tid, t.firstpost FROM ".TABLE_PREFIX."threads t
|
WHERE 1=1 {$thread_datecut} {$thread_replycut} {$thread_prefixcut} {$forumin} {$thread_usersql} {$permsql} {$visiblesql} AND t.closed NOT LIKE 'moved|%' {$subject_lookin}
| WHERE 1=1 {$thread_datecut} {$thread_replycut} {$thread_prefixcut} {$forumin} {$thread_usersql} {$permsql} {$visiblesql} AND ({$unapproved_where_t}) AND t.closed NOT LIKE 'moved|%' {$subject_lookin}
|
{$limitsql} "); while($thread = $db->fetch_array($query))
| {$limitsql} "); while($thread = $db->fetch_array($query))
|
Zeile 1689 | Zeile 1749 |
---|
SELECT p.pid, p.tid FROM ".TABLE_PREFIX."posts p LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid=p.tid)
|
SELECT p.pid, p.tid FROM ".TABLE_PREFIX."posts p LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid=p.tid)
|
WHERE 1=1 {$post_datecut} {$thread_replycut} {$thread_prefixcut} {$forumin} {$post_usersql} {$permsql} {$tidsql} {$post_visiblesql} {$visiblesql} AND t.closed NOT LIKE 'moved|%' {$message_lookin}
| WHERE 1=1 {$post_datecut} {$thread_replycut} {$thread_prefixcut} {$forumin} {$post_usersql} {$permsql} {$tidsql} {$post_visiblesql} {$visiblesql} AND ({$unapproved_where_t}) AND {$unapproved_where_p} AND t.closed NOT LIKE 'moved|%' {$message_lookin}
|
{$limitsql} "); while($post = $db->fetch_array($query))
| {$limitsql} "); while($post = $db->fetch_array($query))
|