Vergleich admin/modules/user/users.php - 1.6.0 - 1.6.6

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 6	Zeile 6
* Website: http://mybb.com * License: http://mybb.com/about/license *	* Website: http://mybb.com * License: http://mybb.com/about/license *
* $Id: users.php 5161 2010-08-01 20:45:07Z RyanGordon $	* $Id: users.php 5646 2011-10-31 10:32:20Z PirataNervo $
*/ // Disallow direct access to this file for security reasons	*/ // Disallow direct access to this file for security reasons
Zeile 159	Zeile 159
// We've selected a new avatar for this user! if($mybb->input['avatar']) {	// We've selected a new avatar for this user! if($mybb->input['avatar']) {
	if(!verify_post_check($mybb->input['my_post_key'])) { echo $lang->invalid_post_verify_key2; exit; }
$mybb->input['avatar'] = str_replace(array("./", ".."), "", $mybb->input['avatar']); if(file_exists("../".$mybb->settings['avatardir']."/".$mybb->input['avatar']))	$mybb->input['avatar'] = str_replace(array("./", ".."), "", $mybb->input['avatar']); if(file_exists("../".$mybb->settings['avatardir']."/".$mybb->input['avatar']))
Zeile 181	Zeile 187
// Now a tad of javascript to submit the parent window form echo "<script type=\"text/javascript\">window.parent.submitUserForm();</script>"; exit;	// Now a tad of javascript to submit the parent window form echo "<script type=\"text/javascript\">window.parent.submitUserForm();</script>"; exit;
}	}
echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; echo "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"; echo "<head profile=\"http://gmpg.org/xfn/1\">\n";	echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; echo "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"; echo "<head profile=\"http://gmpg.org/xfn/1\">\n";
Zeile 204	Zeile 210
if(!is_dir($mybb->settings['avatardir']) && is_dir(MYBB_ROOT."/images/avatars/")) { $mybb->settings['avatardir'] = "../images/avatars/";	if(!is_dir($mybb->settings['avatardir']) && is_dir(MYBB_ROOT."/images/avatars/")) { $mybb->settings['avatardir'] = "../images/avatars/";
}	}
// Within a gallery if(!empty($gallery)) {	// Within a gallery if(!empty($gallery)) {
Zeile 223	Zeile 229
$gallery_name = ucwords($gallery_name); if($gallery_path[$key+1])	$gallery_name = ucwords($gallery_name); if($gallery_path[$key+1])
{	{
$breadcrumb .= " » <a href=\"index.php?module=user-users&action=avatar_gallery&uid={$user['uid']}&gallery={$breadcrumb_url}\">{$gallery_name}</a>"; } else { $breadcrumb .= " » {$gallery_name}";	$breadcrumb .= " » <a href=\"index.php?module=user-users&action=avatar_gallery&uid={$user['uid']}&gallery={$breadcrumb_url}\">{$gallery_name}</a>"; } else { $breadcrumb .= " » {$gallery_name}";
}	}
} } else	} } else
Zeile 238	Zeile 244
} } else	} } else
{	{
$path = ""; $real_path = $mybb->settings['avatardir']; }	$path = ""; $real_path = $mybb->settings['avatardir']; }
Zeile 252	Zeile 258
foreach($files as $file) { if($file == "." \|\| $file == ".." \|\| $file == ".svn")	foreach($files as $file) { if($file == "." \|\| $file == ".." \|\| $file == ".svn")
{	{
continue; }	continue; }
Zeile 294	Zeile 300
"width" => $dimensions[0], "height" => $dimensions[1] );	"width" => $dimensions[0], "height" => $dimensions[1] );
} } } require_once MYBB_ROOT."inc/functions_image.php";	} } } require_once MYBB_ROOT."inc/functions_image.php";
// Now we're done, we can simply show our gallery page echo "<div id=\"gallery_breadcrumb\">{$breadcrumb}</div>\n"; echo "<div id=\"gallery\">\n";	// Now we're done, we can simply show our gallery page echo "<div id=\"gallery_breadcrumb\">{$breadcrumb}</div>\n"; echo "<div id=\"gallery\">\n";
Zeile 322	Zeile 328
$top = ceil((80-$scaled_dimensions['height'])/2); $left = ceil((80-$scaled_dimensions['width'])/2); echo "<li><a href=\"index.php?module=user-users&action=avatar_gallery&uid={$user['uid']}&gallery={$gallery['path']}\"><span class=\"image\"><img src=\"{$gallery['thumb']}\" alt=\"\" style=\"margin-top: {$top}px;\" height=\"{$scaled_dimensions['height']}\" width=\"{$scaled_dimensions['width']}\"></span><span class=\"title\">{$gallery['friendly_name']}</span></a></li>\n";	$top = ceil((80-$scaled_dimensions['height'])/2); $left = ceil((80-$scaled_dimensions['width'])/2); echo "<li><a href=\"index.php?module=user-users&action=avatar_gallery&uid={$user['uid']}&gallery={$gallery['path']}\"><span class=\"image\"><img src=\"{$gallery['thumb']}\" alt=\"\" style=\"margin-top: {$top}px;\" height=\"{$scaled_dimensions['height']}\" width=\"{$scaled_dimensions['width']}\"></span><span class=\"title\">{$gallery['friendly_name']}</span></a></li>\n";
} }	} }
echo "</ul>\n"; // Build the list of any actual avatars we have echo "<ul id=\"avatars\">\n";	echo "</ul>\n"; // Build the list of any actual avatars we have echo "<ul id=\"avatars\">\n";
Zeile 334	Zeile 340
$scaled_dimensions = scale_image($avatar['width'], $avatar['height'], 80, 80); $top = ceil((80-$scaled_dimensions['height'])/2); $left = ceil((80-$scaled_dimensions['width'])/2);	$scaled_dimensions = scale_image($avatar['width'], $avatar['height'], 80, 80); $top = ceil((80-$scaled_dimensions['height'])/2); $left = ceil((80-$scaled_dimensions['width'])/2);
echo "<li><a href=\"index.php?module=user-users&action=avatar_gallery&uid={$user['uid']}&avatar={$avatar['path']}\"><span class=\"image\"><img src=\"{$mybb->settings['avatardir']}/{$avatar['path']}\" alt=\"\" style=\"margin-top: {$top}px;\" height=\"{$scaled_dimensions['height']}\" width=\"{$scaled_dimensions['width']}\" /></span><span class=\"title\">{$avatar['friendly_name']}</span></a></li>\n";	echo "<li><a href=\"index.php?module=user-users&action=avatar_gallery&uid={$user['uid']}&avatar={$avatar['path']}&my_post_key={$mybb->post_code}\"><span class=\"image\"><img src=\"{$mybb->settings['avatardir']}/{$avatar['path']}\" alt=\"\" style=\"margin-top: {$top}px;\" height=\"{$scaled_dimensions['height']}\" width=\"{$scaled_dimensions['width']}\" /></span><span class=\"title\">{$avatar['friendly_name']}</span></a></li>\n";
}	}
}	}
echo "</ul>\n"; echo "</div>"; echo "</body>";	echo "</ul>\n"; echo "</div>"; echo "</body>";
Zeile 347	Zeile 353
if($mybb->input['action'] == "activate_user") { $plugins->run_hooks("admin_user_users_coppa_activate");	if($mybb->input['action'] == "activate_user") { $plugins->run_hooks("admin_user_users_coppa_activate");
	if(!verify_post_check($mybb->input['my_post_key'])) { flash_message($lang->invalid_post_verify_key2, 'error'); admin_redirect("index.php?module=user-users"); }
$query = $db->simple_select("users", "*", "uid='".intval($mybb->input['uid'])."'"); $user = $db->fetch_array($query);	$query = $db->simple_select("users", "*", "uid='".intval($mybb->input['uid'])."'"); $user = $db->fetch_array($query);
Zeile 1049	Zeile 1061
if($user['birthday']) { $age = get_age($user['birthday']);	if($user['birthday']) { $age = get_age($user['birthday']);
}	}
else {	else {
Zeile 1598	Zeile 1610
$db->delete_query("userfields", "ufid='{$user['uid']}'"); $db->delete_query("privatemessages", "uid='{$user['uid']}'"); $db->delete_query("events", "uid='{$user['uid']}'");	$db->delete_query("userfields", "ufid='{$user['uid']}'"); $db->delete_query("privatemessages", "uid='{$user['uid']}'"); $db->delete_query("events", "uid='{$user['uid']}'");
$db->delete_query("moderators", "id='{$user['uid']}' AND isgroup = '0'");
$db->delete_query("forumsubscriptions", "uid='{$user['uid']}'"); $db->delete_query("threadsubscriptions", "uid='{$user['uid']}'"); $db->delete_query("sessions", "uid='{$user['uid']}'");	$db->delete_query("forumsubscriptions", "uid='{$user['uid']}'"); $db->delete_query("threadsubscriptions", "uid='{$user['uid']}'"); $db->delete_query("sessions", "uid='{$user['uid']}'");
Zeile 1612	Zeile 1623
// Update forum stats update_stats(array('numusers' => '-1'));	// Update forum stats update_stats(array('numusers' => '-1'));
	// Did this user have an uploaded avatar? if($user['avatartype'] == "upload") { // Removes the ./ at the beginning the timestamp on the end... @unlink("../".substr($user['avatar'], 2, -20)); } // Was this user a moderator? if(is_moderator($user['uid'])) { $db->delete_query("moderators", "id='{$user['uid']}' AND isgroup = '0'"); $cache->update_moderators(); }
$plugins->run_hooks("admin_user_users_delete_commit"); // Log admin action log_admin_action($user['uid'], $user['username']);	$plugins->run_hooks("admin_user_users_delete_commit"); // Log admin action log_admin_action($user['uid'], $user['username']);

flash_message($lang->success_user_deleted, 'success'); admin_redirect("index.php?module=user-users");	flash_message($lang->success_user_deleted, 'success'); admin_redirect("index.php?module=user-users");
Zeile 1769	Zeile 1793
if(!$destination_user['uid']) { $errors[] = $lang->error_invalid_user_destination;	if(!$destination_user['uid']) { $errors[] = $lang->error_invalid_user_destination;
	} // If we're not a super admin and we're merging a source super admin or a destination super admin then dissallow this action if(!is_super_admin($mybb->user['uid']) && (is_super_admin($source_user['uid']) \|\| is_super_admin($destination_user['uid']))) { flash_message($lang->error_no_perms_super_admin, 'error'); admin_redirect("index.php?module=user-users");
} if($source_user['uid'] == $destination_user['uid']) { $errors[] = $lang->error_cannot_merge_same_account;	} if($source_user['uid'] == $destination_user['uid']) { $errors[] = $lang->error_cannot_merge_same_account;
}	}
if(empty($errors)) { // Begin to merge the accounts	if(empty($errors)) { // Begin to merge the accounts
Zeile 1801	Zeile 1832
$db->update_query("pollvotes", $uid_update, "uid='{$source_user['uid']}'"); $db->update_query("posts", $uid_update, "uid='{$source_user['uid']}'"); $db->update_query("privatemessages", $uid_update, "uid='{$source_user['uid']}'");	$db->update_query("pollvotes", $uid_update, "uid='{$source_user['uid']}'"); $db->update_query("posts", $uid_update, "uid='{$source_user['uid']}'"); $db->update_query("privatemessages", $uid_update, "uid='{$source_user['uid']}'");
	$db->update_query("reportedposts", $uid_update, "uid='{$source_user['uid']}'");
$db->update_query("threadratings", $uid_update, "uid='{$source_user['uid']}'"); $db->update_query("threads", $uid_update, "uid='{$source_user['uid']}'"); $db->delete_query("sessions", "uid='{$source_user['uid']}'");	$db->update_query("threadratings", $uid_update, "uid='{$source_user['uid']}'"); $db->update_query("threads", $uid_update, "uid='{$source_user['uid']}'"); $db->delete_query("sessions", "uid='{$source_user['uid']}'");
Zeile 1898	Zeile 1930
while($fid = $db->fetch_field($query, "fid")) { $fids[] = $fid;	while($fid = $db->fetch_field($query, "fid")) { $fids[] = $fid;
}	}
$fids_not_in = ''; if(!empty($fids))	$fids_not_in = ''; if(!empty($fids))
{	{
$fids_not_in = "AND fid NOT IN(".implode(',', $fids).")"; }	$fids_not_in = "AND fid NOT IN(".implode(',', $fids).")"; }
Zeile 1938	Zeile 1970
$page->output_header($lang->merge_users); $page->output_nav_tabs($sub_tabs, 'merge_users');	$page->output_header($lang->merge_users); $page->output_nav_tabs($sub_tabs, 'merge_users');
// If we have any error messages, show them	// If we have any error messages, show them
if($errors) { $page->output_inline_error($errors);	if($errors) { $page->output_inline_error($errors);
Zeile 2106	Zeile 2138
$page->output_footer(); }	$page->output_footer(); }

if($mybb->input['action'] == "inline_edit") { $plugins->run_hooks("admin_user_users_inline");	if($mybb->input['action'] == "inline_edit") { $plugins->run_hooks("admin_user_users_inline");
Zeile 2218	Zeile 2250
{ // Nothing was updated, show an error flash_message($lang->inline_activated_failed, 'error');	{ // Nothing was updated, show an error flash_message($lang->inline_activated_failed, 'error');
admin_redirect("index.php?module=user-users".$vid_url);	admin_redirect("index.php?module=user-users".$vid_url);
} break; case 'multilift': // Get the users that are banned, and check that they have been selected if($mybb->input['no'])	} break; case 'multilift': // Get the users that are banned, and check that they have been selected if($mybb->input['no'])
{	{
admin_redirect("index.php?module=user-users".$vid_url); // User clicked on 'No' }	admin_redirect("index.php?module=user-users".$vid_url); // User clicked on 'No' }
Zeile 2272	Zeile 2304
while($user = $db->fetch_array($query)) { $bannedcache[] = "u_".$user['uid'];	while($user = $db->fetch_array($query)) { $bannedcache[] = "u_".$user['uid'];
}	}
// Collect the users $query = $db->simple_select("users", "uid, username, usergroup, additionalgroups, displaygroup", "uid IN (".$sql_array.")");	// Collect the users $query = $db->simple_select("users", "uid, username, usergroup, additionalgroups, displaygroup", "uid IN (".$sql_array.")");
Zeile 2369	Zeile 2401
echo $form->generate_hidden_field('inline_action', 'multiban'); echo $form->generate_hidden_field('processed', '1');	echo $form->generate_hidden_field('inline_action', 'multiban'); echo $form->generate_hidden_field('processed', '1');
$form_container = new FormContainer('<div class="float_right"><a href="index.php?module=user-users&action=inline_edit&inline_action=multilift&my_post_key={$mybb->post_code}">'.$lang->lift_bans.'</a></div>'.$lang->mass_ban);	$form_container = new FormContainer('<div class="float_right"><a href="index.php?module=user-users&action=inline_edit&inline_action=multilift&my_post_key='.$mybb->post_code.'">'.$lang->lift_bans.'</a></div>'.$lang->mass_ban);
$form_container->output_row($lang->ban_reason, "", $form->generate_text_box('reason', $mybb->input['reason'], array('id' => 'reason')), 'reason'); $ban_times = fetch_ban_times(); foreach($ban_times as $time => $period)	$form_container->output_row($lang->ban_reason, "", $form->generate_text_box('reason', $mybb->input['reason'], array('id' => 'reason')), 'reason'); $ban_times = fetch_ban_times(); foreach($ban_times as $time => $period)
Zeile 2385	Zeile 2417
$form_container->end(); $buttons[] = $form->generate_submit_button($lang->ban_users);	$form_container->end(); $buttons[] = $form->generate_submit_button($lang->ban_users);
$form->output_submit_wrapper($buttons);	$form->output_submit_wrapper($buttons);
$form->end(); $page->output_footer(); break;	$form->end(); $page->output_footer(); break;
Zeile 2932	Zeile 2964
if(!isset($admin_session['data']['last_users_view']) \|\| $admin_session['data']['last_users_view'] != str_replace("&", "&", $view['url'])) { update_admin_session('last_users_url', str_replace("&", "&", $view['url']));	if(!isset($admin_session['data']['last_users_view']) \|\| $admin_session['data']['last_users_view'] != str_replace("&", "&", $view['url'])) { update_admin_session('last_users_url', str_replace("&", "&", $view['url']));
	} if(isset($view['conditions']['referrer'])){ $view['url'] .= "&action=referrers&uid=".htmlspecialchars($view['conditions']['referrer']);
} // Do we not have any views?	} // Do we not have any views?
Zeile 2944	Zeile 2980
// Build header for table based view if($view['view_type'] != "card")	// Build header for table based view if($view['view_type'] != "card")
{	{
foreach($view['fields'] as $field) { if(!$user_view_fields[$field])	foreach($view['fields'] as $field) { if(!$user_view_fields[$field])
Zeile 2954	Zeile 2990
$view_field = $user_view_fields[$field]; $field_options = array(); if($view_field['width'])	$view_field = $user_view_fields[$field]; $field_options = array(); if($view_field['width'])
{	{
$field_options['width'] = $view_field['width']; } if($view_field['align'])	$field_options['width'] = $view_field['width']; } if($view_field['align'])
Zeile 2974	Zeile 3010
$user_like_fields = array("username", "email", "website", "icq", "aim", "yahoo", "msn", "signature", "usertitle"); foreach($user_like_fields as $search_field) {	$user_like_fields = array("username", "email", "website", "icq", "aim", "yahoo", "msn", "signature", "usertitle"); foreach($user_like_fields as $search_field) {
if($view['conditions'][$search_field])	if($view['conditions'][$search_field] && !$view['conditions'][$search_field.'_blank'])
{ $search_sql .= " AND u.{$search_field} LIKE '%".$db->escape_string_like($view['conditions'][$search_field])."%'";	{ $search_sql .= " AND u.{$search_field} LIKE '%".$db->escape_string_like($view['conditions'][$search_field])."%'";
	} else if(isset($view['conditions'][$search_field.'_blank'])) { $search_sql .= " AND u.{$search_field} != ''";
} }	} }
Zeile 2985	Zeile 3025
foreach($user_exact_fields as $search_field) { if($view['conditions'][$search_field])	foreach($user_exact_fields as $search_field) { if($view['conditions'][$search_field])
{	{
$search_sql .= " AND u.{$search_field}='".$db->escape_string($view['conditions'][$search_field])."'";	$search_sql .= " AND u.{$search_field}='".$db->escape_string($view['conditions'][$search_field])."'";
} }	} }
// LESS THAN or GREATER THAN $direction_fields = array("postnum"); foreach($direction_fields as $search_field)	// LESS THAN or GREATER THAN $direction_fields = array("postnum"); foreach($direction_fields as $search_field)
{	{
$direction_field = $search_field."_dir"; if(($view['conditions'][$search_field] \|\| $view['conditions'][$search_field] === '0') && $view['conditions'][$direction_field]) {	$direction_field = $search_field."_dir"; if(($view['conditions'][$search_field] \|\| $view['conditions'][$search_field] === '0') && $view['conditions'][$direction_field]) {
Zeile 3001	Zeile 3041
{ case "greater_than": $direction = ">";	{ case "greater_than": $direction = ">";
break;	break;
case "less_than": $direction = "<"; break;	case "less_than": $direction = "<"; break;
Zeile 3009	Zeile 3049
$direction = "="; } $search_sql .= " AND u.{$search_field}{$direction}'".$db->escape_string($view['conditions'][$search_field])."'";	$direction = "="; } $search_sql .= " AND u.{$search_field}{$direction}'".$db->escape_string($view['conditions'][$search_field])."'";
	} } // Registration searching $reg_fields = array("regdate"); foreach($reg_fields as $search_field) { if(intval($view['conditions'][$search_field])) { $threshold = TIME_NOW - (intval($view['conditions'][$search_field]) * 24 * 60 * 60); $search_sql .= " AND u.{$search_field} >= '{$threshold}'";
} }	} }
Zeile 3081	Zeile 3133
{ foreach($input as $value => $text) {	{ foreach($input as $value => $text) {
if($value == "N/A")	if($value == $column) { $value = $text; } if($value == $lang->na)
{ continue; }	{ continue; }
$userfield_sql .= ' AND '.$db->escape_string($column)."='".$db->escape_string($value)."'"; }	if(strpos($column, '_blank') !== false) { $column = str_replace('_blank', '', $column); $userfield_sql .= ' AND '.$db->escape_string($column)." != ''"; } else { $userfield_sql .= ' AND '.$db->escape_string($column)."='".$db->escape_string($value)."'"; } }
} else if(!empty($input))	} else if(!empty($input))
{ if($input == "N/A") {	{ if($input == $lang->na) {
continue; }	continue; }
$userfield_sql .= ' AND '.$db->escape_string($column)." LIKE '%".$db->escape_string($input)."%'";	if(strpos($column, '_blank') !== false) { $column = str_replace('_blank', '', $column); $userfield_sql .= ' AND '.$db->escape_string($column)." != ''"; } else { $userfield_sql .= ' AND '.$db->escape_string($column)." LIKE '%".$db->escape_string($input)."%'"; }
} }	} }

if($userfield_sql != '1=1') { $userfield_uids = array(0);	if($userfield_sql != '1=1') { $userfield_uids = array(0);
Zeile 3110	Zeile 3183
} $search_sql .= " AND u.uid IN(".implode(',', $userfield_uids).")"; unset($userfield_uids);	} $search_sql .= " AND u.uid IN(".implode(',', $userfield_uids).")"; unset($userfield_uids);
}	}
} // Usergroup based searching	} // Usergroup based searching
Zeile 3250	Zeile 3323
{ if($user['coppauser']) {	{ if($user['coppauser']) {
$popup->add_item($lang->approve_coppa_user, "index.php?module=user-users&action=activate_user&uid={$user['uid']}{$from_bit}");	$popup->add_item($lang->approve_coppa_user, "index.php?module=user-users&action=activate_user&uid={$user['uid']}&my_post_key={$mybb->post_code}{$from_bit}");
} else {	} else {
$popup->add_item($lang->approve_user, "index.php?module=user-users&action=activate_user&uid={$user['uid']}{$from_bit}");	$popup->add_item($lang->approve_user, "index.php?module=user-users&action=activate_user&uid={$user['uid']}&my_post_key={$mybb->post_code}{$from_bit}");
} }	} }
Zeile 3282	Zeile 3355
$warning_level = 100; } $user['view']['warninglevel'] = get_colored_warning_level($warning_level);	$warning_level = 100; } $user['view']['warninglevel'] = get_colored_warning_level($warning_level);
}	}
if($user['avatar'] && !stristr($user['avatar'], 'http://')) { $user['avatar'] = "../{$user['avatar']}";	if($user['avatar'] && !stristr($user['avatar'], 'http://')) { $user['avatar'] = "../{$user['avatar']}";
Zeile 3394	Zeile 3467
var search = document.getElementById('search_keywords'); search.onfocus = function()	var search = document.getElementById('search_keywords'); search.onfocus = function()
{	{
if(this.value == '{$lang->search_for_user}') { $(this).removeClassName('search_default');	if(this.value == '{$lang->search_for_user}') { $(this).removeClassName('search_default');
Zeile 3505	Zeile 3578
if($user['view'][$field]) { $value = $user['view'][$field];	if($user['view'][$field]) { $value = $user['view'][$field];
}	}
else { $value = $user[$field];	else { $value = $user[$field];
Zeile 3616	Zeile 3689
list($type, $options) = explode("\n", $profile_field['type'], 2); $type = trim($type); $field_name = "fid{$profile_field['fid']}";	list($type, $options) = explode("\n", $profile_field['type'], 2); $type = trim($type); $field_name = "fid{$profile_field['fid']}";

switch($type) { case "multiselect":	switch($type) { case "multiselect":
Zeile 3627	Zeile 3701
{ $user_options = $values[$field_name]; }	{ $user_options = $values[$field_name]; }

foreach($user_options as $val) { $selected_options[$val] = $val;	foreach($user_options as $val) { $selected_options[$val] = $val;
} $select_options = array(); $options = array(); if($search == true) { $select_options[''] = $lang->na; } $select_options += explode("\n", $options); foreach($select_options as $val)	} $select_options = explode("\n", $options); $options = array(); if($search == true)
{	{
$val = trim($val);	$select_options[''] = $lang->na; } foreach($select_options as $val) { $val = trim($val);
$options[$val] = $val; } if(!$profile_field['length'])	$options[$val] = $val; } if(!$profile_field['length'])
Zeile 3667	Zeile 3742
{ $profile_field['length'] = 1; }	{ $profile_field['length'] = 1; }
$code = $form->generate_select_box("profile_fields[{$field_name}]", $options, $values[$field_name], array('id' => "profile_field_{$field_name}", 'size' => $profile_field['length']));	if($search == true) { $code = $form->generate_select_box("profile_fields[{$field_name}][{$field_name}]", $options, $values[$field_name], array('id' => "profile_field_{$field_name}", 'size' => $profile_field['length'])); } else { $code = $form->generate_select_box("profile_fields[{$field_name}]", $options, $values[$field_name], array('id' => "profile_field_{$field_name}", 'size' => $profile_field['length'])); }
break; case "radio": $radio_options = array();	break; case "radio": $radio_options = array();
Zeile 3708	Zeile 3790
} break; case "textarea":	} break; case "textarea":
$code = $form->generate_text_area("profile_fields[{$field_name}]", $values[$field_name], array('id' => "profile_field_{$field_name}", 'rows' => 6, 'cols' => 50));	$extra = ''; if($mybb->input['action'] == "search") { $extra = " {$lang->or} ".$form->generate_check_box("profile_fields[{$field_name}_blank]", 1, $lang->is_not_blank, array('id' => "{$field_name}_blank", 'checked' => $values[$field_name.'_blank'])); } $code = $form->generate_text_area("profile_fields[{$field_name}]", $values[$field_name], array('id' => "profile_field_{$field_name}", 'rows' => 6, 'cols' => 50)).$extra;
break; default:	break; default:
$code = $form->generate_text_box("profile_fields[{$field_name}]", $values[$field_name], array('id' => "profile_field_{$field_name}", 'maxlength' => $profile_field['maxlength'], 'length' => $profile_field['length']));	$extra = ''; if($mybb->input['action'] == "search") { $extra = " {$lang->or} ".$form->generate_check_box("profile_fields[{$field_name}_blank]", 1, $lang->is_not_blank, array('id' => "{$field_name}_blank", 'checked' => $values[$field_name.'_blank'])); } $code = $form->generate_text_box("profile_fields[{$field_name}]", $values[$field_name], array('id' => "profile_field_{$field_name}", 'maxlength' => $profile_field['maxlength'], 'length' => $profile_field['length'])).$extra;
break; }	break; }

$form_container->output_row($profile_field['name'], $profile_field['description'], $code, "", array('id' => "profile_field_{$field_name}")); $code = $user_options = $selected_options = $radio_options = $val = $options = ''; }	$form_container->output_row($profile_field['name'], $profile_field['description'], $code, "", array('id' => "profile_field_{$field_name}")); $code = $user_options = $selected_options = $radio_options = $val = $options = ''; }
Zeile 3730	Zeile 3825
if(!is_array($input['conditions'])) {	if(!is_array($input['conditions'])) {
$input['conditions'] = unserialize($input['conditions']);	$input['conditions'] = unserialize($input['conditions']); } if(!is_array($input['profile_fields'])) { $input['profile_fields'] = unserialize($input['profile_fields']);
} if(!is_array($input['fields']))	} if(!is_array($input['fields']))
Zeile 3750	Zeile 3850
$form_container->output_row($lang->is_member_of_groups, $lang->additional_user_groups_desc, $form->generate_select_box('conditions[usergroup][]', $options, $input['conditions']['usergroup'], array('id' => 'usergroups', 'multiple' => true, 'size' => 5)), 'usergroups');	$form_container->output_row($lang->is_member_of_groups, $lang->additional_user_groups_desc, $form->generate_select_box('conditions[usergroup][]', $options, $input['conditions']['usergroup'], array('id' => 'usergroups', 'multiple' => true, 'size' => 5)), 'usergroups');
$form_container->output_row($lang->website_contains, "", $form->generate_text_box('conditions[website]', $input['conditions']['website'], array('id' => 'website')), 'website'); $form_container->output_row($lang->icq_number_contains, "", $form->generate_text_box('conditions[icq]', $input['conditions']['icq'], array('id' => 'icq')), 'icq'); $form_container->output_row($lang->aim_handle_contains, "", $form->generate_text_box('conditions[aim]', $input['conditions']['aim'], array('id' => 'aim')), 'aim'); $form_container->output_row($lang->yahoo_contains, "", $form->generate_text_box('conditions[yahoo]', $input['conditions']['yahoo'], array('id' => 'yahoo')), 'yahoo'); $form_container->output_row($lang->msn_contains, "", $form->generate_text_box('conditions[msn]', $input['conditions']['msn'], array('id' => 'msn')), 'msn'); $form_container->output_row($lang->signature_contains, "", $form->generate_text_box('conditions[signature]', $input['conditions']['signature'], array('id' => 'signature')), 'signature'); $form_container->output_row($lang->user_title_contains, "", $form->generate_text_box('conditions[usertitle]', $input['conditions']['usertitle'], array('id' => 'usertitle')), 'usertitle');	$form_container->output_row($lang->website_contains, "", $form->generate_text_box('conditions[website]', $input['conditions']['website'], array('id' => 'website'))." {$lang->or} ".$form->generate_check_box('conditions[website_blank]', 1, $lang->is_not_blank, array('id' => 'website_blank', 'checked' => $input['conditions']['website_blank'])), 'website'); $form_container->output_row($lang->icq_number_contains, "", $form->generate_text_box('conditions[icq]', $input['conditions']['icq'], array('id' => 'icq'))." {$lang->or} ".$form->generate_check_box('conditions[icq_blank]', 1, $lang->is_not_blank, array('id' => 'icq_blank', 'checked' => $input['conditions']['icq_blank'])), 'icq'); $form_container->output_row($lang->aim_handle_contains, "", $form->generate_text_box('conditions[aim]', $input['conditions']['aim'], array('id' => 'aim'))." {$lang->or} ".$form->generate_check_box('conditions[aim_blank]', 1, $lang->is_not_blank, array('id' => 'aim_blank', 'checked' => $input['conditions']['aim_blank'])), 'aim'); $form_container->output_row($lang->yahoo_contains, "", $form->generate_text_box('conditions[yahoo]', $input['conditions']['yahoo'], array('id' => 'yahoo'))." {$lang->or} ".$form->generate_check_box('conditions[yahoo_blank]', 1, $lang->is_not_blank, array('id' => 'yahoo_blank', 'checked' => $input['conditions']['yahoo_blank'])), 'yahoo'); $form_container->output_row($lang->msn_contains, "", $form->generate_text_box('conditions[msn]', $input['conditions']['msn'], array('id' => 'msn'))." {$lang->or} ".$form->generate_check_box('conditions[msn_blank]', 1, $lang->is_not_blank, array('id' => 'msn_blank', 'checked' => $input['conditions']['msn_blank'])), 'msn'); $form_container->output_row($lang->signature_contains, "", $form->generate_text_box('conditions[signature]', $input['conditions']['signature'], array('id' => 'signature'))." {$lang->or} ".$form->generate_check_box('conditions[signature_blank]', 1, $lang->is_not_blank, array('id' => 'signature_blank', 'checked' => $input['conditions']['signature_blank'])), 'signature'); $form_container->output_row($lang->user_title_contains, "", $form->generate_text_box('conditions[usertitle]', $input['conditions']['usertitle'], array('id' => 'usertitle'))." {$lang->or} ".$form->generate_check_box('conditions[usertitle_blank]', 1, $lang->is_not_blank, array('id' => 'usertitle_blank', 'checked' => $input['conditions']['usertitle_blank'])), 'usertitle');
$greater_options = array( "greater_than" => $lang->greater_than, "is_exactly" => $lang->is_exactly,	$greater_options = array( "greater_than" => $lang->greater_than, "is_exactly" => $lang->is_exactly,
Zeile 3764	Zeile 3864
); $form_container->output_row($lang->post_count_is, "", $form->generate_select_box('conditions[postnum_dir]', $greater_options, $input['conditions']['postnum_dir'], array('id' => 'numposts_dir'))." ".$form->generate_text_box('conditions[postnum]', $input['conditions']['postnum'], array('id' => 'numposts')), 'numposts');	); $form_container->output_row($lang->post_count_is, "", $form->generate_select_box('conditions[postnum_dir]', $greater_options, $input['conditions']['postnum_dir'], array('id' => 'numposts_dir'))." ".$form->generate_text_box('conditions[postnum]', $input['conditions']['postnum'], array('id' => 'numposts')), 'numposts');
	$form_container->output_row($lang->reg_in_x_days, '', $form->generate_text_box('conditions[regdate]', $input['conditions']['regdate'], array('id' => 'regdate')).' '.$lang->days, 'regdate');
$form_container->output_row($lang->reg_ip_matches, $lang->wildcard, $form->generate_text_box('conditions[regip]', $input['conditions']['regip'], array('id' => 'regip')), 'regip'); $form_container->output_row($lang->last_known_ip, $lang->wildcard, $form->generate_text_box('conditions[lastip]', $input['conditions']['lastip'], array('id' => 'lastip')), 'lastip'); $form_container->output_row($lang->posted_with_ip, $lang->wildcard, $form->generate_text_box('conditions[postip]', $input['conditions']['postip'], array('id' => 'postip')), 'postip');	$form_container->output_row($lang->reg_ip_matches, $lang->wildcard, $form->generate_text_box('conditions[regip]', $input['conditions']['regip'], array('id' => 'regip')), 'regip'); $form_container->output_row($lang->last_known_ip, $lang->wildcard, $form->generate_text_box('conditions[lastip]', $input['conditions']['lastip'], array('id' => 'lastip')), 'lastip'); $form_container->output_row($lang->posted_with_ip, $lang->wildcard, $form->generate_text_box('conditions[postip]', $input['conditions']['postip'], array('id' => 'postip')), 'postip');
Zeile 3787	Zeile 3888
} }	} }
output_custom_profile_fields($profile_fields['required'], $mybb->input['profile_fields'], $form_container, $form, true); output_custom_profile_fields($profile_fields['optional'], $mybb->input['profile_fields'], $form_container, $form, true);	output_custom_profile_fields($profile_fields['required'], $input['profile_fields'], $form_container, $form, true); output_custom_profile_fields($profile_fields['optional'], $input['profile_fields'], $form_container, $form, true);
$form_container->end();	$form_container->end();