Vergleich admin/users.php - 1.2.2 - 1.2.7

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 3	Zeile 3
* MyBB 1.2 * Copyright � 2006 MyBB Group, All Rights Reserved *	* MyBB 1.2 * Copyright � 2006 MyBB Group, All Rights Reserved *
* Website: http://www.mybboard.com * License: http://www.mybboard.com/eula.html	* Website: http://www.mybboard.net * License: http://www.mybboard.net/eula.html
*	*
* $Id: users.php 2427 2006-11-23 17:28:27Z Tikitiki $	* $Id: users.php 3042 2007-05-06 05:08:28Z Tikitiki $
*/ define("IN_MYBB", 1);	*/ define("IN_MYBB", 1);
Zeile 405	Zeile 405
$emailmessage = sprintf($lang->email_activateaccount, $username, $mybb->settings['bbname'], $mybb->settings['bburl'], $uid, $activationcode); my_mail($email, $emailsubject, $emailmessage); }	$emailmessage = sprintf($lang->email_activateaccount, $username, $mybb->settings['bbname'], $mybb->settings['bburl'], $uid, $activationcode); my_mail($email, $emailsubject, $emailmessage); }
$cache->updatestats();
cpredirect("users.php?".SID."&lastuid={$user_info['uid']}", $lang->user_added); }	cpredirect("users.php?".SID."&lastuid={$user_info['uid']}", $lang->user_added); }
Zeile 509	Zeile 508
{ $user_info = $userhandler->update_user(); }	{ $user_info = $userhandler->update_user(); }
$cache->updatestats();
cpredirect("users.php?".SID."&lastuid={$mybb->input['uid']}", $lang->profile_updated); }	cpredirect("users.php?".SID."&lastuid={$mybb->input['uid']}", $lang->profile_updated); }
Zeile 536	Zeile 534
$db->query("DELETE FROM ".TABLE_PREFIX."sessions WHERE uid='".intval($mybb->input['uid'])."'"); // Update forum stats	$db->query("DELETE FROM ".TABLE_PREFIX."sessions WHERE uid='".intval($mybb->input['uid'])."'"); // Update forum stats
$cache->updatestats();	update_stats(array('numusers' => '-1'));
cpredirect("users.php?".SID, $lang->user_deleted); }	cpredirect("users.php?".SID, $lang->user_deleted); }
Zeile 778	Zeile 776
cperror($lang->error_invalid_destination); } $plugins->run_hooks("admin_users_do_do_merge");	cperror($lang->error_invalid_destination); } $plugins->run_hooks("admin_users_do_do_merge");
	$db->query("UPDATE ".TABLE_PREFIX."adminoptions SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'");
$db->query("UPDATE ".TABLE_PREFIX."adminlog SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."announcements SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."events SET author='".$destuser['uid']."' WHERE author='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."favorites SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'");	$db->query("UPDATE ".TABLE_PREFIX."adminlog SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."announcements SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."events SET author='".$destuser['uid']."' WHERE author='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."favorites SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'");
$db->query("UPDATE ".TABLE_PREFIX."forums SET lastposter='".$destuser['username']."' WHERE lastposter='".$sourceuser['username']."'");	$db->query("UPDATE ".TABLE_PREFIX."forums SET lastposter='".$db->escape_string($destuser['username'])."' WHERE lastposter='".$db->escape_string($sourceuser['username'])."'");
$db->query("UPDATE ".TABLE_PREFIX."forumsubscriptions SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."moderatorlog SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."moderators SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."pollvotes SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'");	$db->query("UPDATE ".TABLE_PREFIX."forumsubscriptions SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."moderatorlog SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."moderators SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."pollvotes SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'");
$db->query("UPDATE ".TABLE_PREFIX."posts SET uid='".$destuser['uid']."', username='".$destuser['username']."' WHERE uid='".$sourceuser['uid']."'");	$db->query("UPDATE ".TABLE_PREFIX."posts SET uid='".$destuser['uid']."', username='".$db->escape_string($destuser['username'])."' WHERE uid='".$sourceuser['uid']."'");
$db->query("UPDATE ".TABLE_PREFIX."posts SET edituid='".$destuser['uid']."' WHERE edituid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."privatemessages SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."privatemessages SET toid='".$destuser['uid']."' WHERE toid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."privatemessages SET fromid='".$destuser['uid']."' WHERE fromid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."reputation SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."threadratings SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'");	$db->query("UPDATE ".TABLE_PREFIX."posts SET edituid='".$destuser['uid']."' WHERE edituid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."privatemessages SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."privatemessages SET toid='".$destuser['uid']."' WHERE toid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."privatemessages SET fromid='".$destuser['uid']."' WHERE fromid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."reputation SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."threadratings SET uid='".$destuser['uid']."' WHERE uid='".$sourceuser['uid']."'");
$db->query("UPDATE ".TABLE_PREFIX."threads SET uid='".$destuser['uid']."', username='".$destuser['username']."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."threads SET lastposter='".$destuser['username']."', username='".$destuser['username']."' WHERE lastposter='".$sourceuser['username']."'");	$db->query("UPDATE ".TABLE_PREFIX."threads SET uid='".$destuser['uid']."', username='".$db->escape_string($destuser['username'])."' WHERE uid='".$sourceuser['uid']."'"); $db->query("UPDATE ".TABLE_PREFIX."threads SET lastposter='".$db->escape_string($destuser['username'])."', username='".$db->escape_string($destuser['username'])."' WHERE lastposter='".$db->escape_string($sourceuser['username'])."'");
$db->query("DELETE FROM ".TABLE_PREFIX."users WHERE uid='".$sourceuser['uid']."'"); $db->query("DELETE FROM ".TABLE_PREFIX."banned WHERE uid='".$sourceuser['uid']."'"); $query = $db->query("SELECT COUNT(*) AS postnum FROM ".TABLE_PREFIX."posts WHERE uid='".$destuser['uid']."'"); $num = $db->fetch_array($query); $db->query("UPDATE ".TABLE_PREFIX."users SET postnum='".$num['postnum']."' WHERE uid='".$destuser['uid']."'");	$db->query("DELETE FROM ".TABLE_PREFIX."users WHERE uid='".$sourceuser['uid']."'"); $db->query("DELETE FROM ".TABLE_PREFIX."banned WHERE uid='".$sourceuser['uid']."'"); $query = $db->query("SELECT COUNT(*) AS postnum FROM ".TABLE_PREFIX."posts WHERE uid='".$destuser['uid']."'"); $num = $db->fetch_array($query); $db->query("UPDATE ".TABLE_PREFIX."users SET postnum='".$num['postnum']."' WHERE uid='".$destuser['uid']."'");
	update_stats(array('numusers' => '-1'));
$lang->users_merged = sprintf($lang->users_merged, $sourceuser['username'], $sourceuser['username'], $destuser['username']); cpmessage($lang->users_merged); }	$lang->users_merged = sprintf($lang->users_merged, $sourceuser['username'], $sourceuser['username'], $destuser['username']); cpmessage($lang->users_merged); }
Zeile 873	Zeile 873
makelabelcode($lang->birthday, $birthday_dropdown); make_profile_field_input(); tablesubheader($lang->account_prefs);	makelabelcode($lang->birthday, $birthday_dropdown); make_profile_field_input(); tablesubheader($lang->account_prefs);
	makeyesnocode($lang->enable_dst, "enabledst", 'no');
makeyesnocode($lang->invisible_mode, "invisible", 'no'); makeyesnocode($lang->admin_emails, "allownotices", 'yes'); makeyesnocode($lang->hide_email, "hideemail", 'no');	makeyesnocode($lang->invisible_mode, "invisible", 'no'); makeyesnocode($lang->admin_emails, "allownotices", 'yes'); makeyesnocode($lang->hide_email, "hideemail", 'no');
Zeile 951	Zeile 952
makelabelcode($lang->birthday, $birthday_dropdown); make_profile_field_input(0, $user['uid']); tablesubheader($lang->account_prefs);	makelabelcode($lang->birthday, $birthday_dropdown); make_profile_field_input(0, $user['uid']); tablesubheader($lang->account_prefs);
	makeyesnocode($lang->enable_dst, "enabledst", $user['dst']);
makeyesnocode($lang->invisible_mode, "invisible", $user['invisible']); makeyesnocode($lang->admin_emails, "allownotices", $user['allownotices']); makeyesnocode($lang->hide_email, "hideemail", $user['hideemail']); makeyesnocode($lang->email_notify, "emailnotify", $user['emailnotify']); makeyesnocode($lang->enable_pms, "receivepms", $user['receivepms']); makeyesnocode($lang->pm_popup, "pmpopup", $user['pmpopup']);	makeyesnocode($lang->invisible_mode, "invisible", $user['invisible']); makeyesnocode($lang->admin_emails, "allownotices", $user['allownotices']); makeyesnocode($lang->hide_email, "hideemail", $user['hideemail']); makeyesnocode($lang->email_notify, "emailnotify", $user['emailnotify']); makeyesnocode($lang->enable_pms, "receivepms", $user['receivepms']); makeyesnocode($lang->pm_popup, "pmpopup", $user['pmpopup']);
makeyesnocode($lang->pm_notify, "emailpmnotify", $user['emailpmnotify']);	makeyesnocode($lang->pm_notify, "emailpmnotify", $user['pmnotify']);
makeinputcode($lang->time_offset, "timezoneoffset", $user['timezone']); if(!$user['style']) {	makeinputcode($lang->time_offset, "timezoneoffset", $user['timezone']); if(!$user['style']) {
Zeile 1676	Zeile 1678
{ foreach($search as $key => $val) {	{ foreach($search as $key => $val) {
if($key != 'additionalgroups' && $key != "profilefields")	if($key != 'usergroups' && $key != 'additionalgroups' && $key != "profilefields")
{ $hiddens .= "<input type=\"hidden\" name=\"search[$key]\" value=\"$val\" />"; } } }	{ $hiddens .= "<input type=\"hidden\" name=\"search[$key]\" value=\"$val\" />"; } } }
	if(is_array($search['usergroups'])) { foreach($search['usergroups'] as $key => $val) { $hiddens .= "<input type=\"hidden\" name=\"search[usergroups][]\" value=\"$val\" />"; } } else if($search['usergroups']) { $hiddens .= "<input type=\"hidden\" name=\"search[usergroups]\" value=\"$val\" />"; }
if(is_array($search['additionalgroups'])) { foreach($search['additionalgroups'] as $key => $val)	if(is_array($search['additionalgroups'])) { foreach($search['additionalgroups'] as $key => $val)