Vergleich admin/modules/user/users.php - 1.4.0 - 1.4.4

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 6	Zeile 6
* Website: http://www.mybboard.net * License: http://www.mybboard.net/about/license *	* Website: http://www.mybboard.net * License: http://www.mybboard.net/about/license *
* $Id: users.php 4054 2008-07-31 05:19:05Z Tikitiki $	* $Id: users.php 4272 2008-11-16 23:25:10Z belloman $
*/ // Disallow direct access to this file for security reasons	*/ // Disallow direct access to this file for security reasons
Zeile 165	Zeile 165
$updated_avatar = array( "avatar" => $db->escape_string($mybb->settings['avatardir']."/".$mybb->input['avatar']), "avatardimensions" => "{$dimensions[0]}\|{$dimensions[1]}",	$updated_avatar = array( "avatar" => $db->escape_string($mybb->settings['avatardir']."/".$mybb->input['avatar']), "avatardimensions" => "{$dimensions[0]}\|{$dimensions[1]}",

"avatartype" => "gallery" );	"avatartype" => "gallery" );
Zeile 175	Zeile 176
// Log admin action log_admin_action($user['uid'], $user['username']); }	// Log admin action log_admin_action($user['uid'], $user['username']); }
remove_avatars($mybb->user['uid']);	remove_avatars($user['uid']);
// 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;
Zeile 199	Zeile 200
$mybb->settings['avatardir'] = "../".$mybb->settings['avatardir'];	$mybb->settings['avatardir'] = "../".$mybb->settings['avatardir'];
	if(!is_dir($mybb->settings['avatardir']) && is_dir(MYBB_ROOT."/images/avatars/")) { $mybb->settings['avatardir'] = "../images/avatars/"; }
// Within a gallery	// Within a gallery
if($gallery)	if(!empty($gallery))
{ $path = $gallery."/"; $real_path = $mybb->settings['avatardir']."/".$path;	{ $path = $gallery."/"; $real_path = $mybb->settings['avatardir']."/".$path;
if(is_dir($path))	if(is_dir($real_path))
{ // Build friendly gallery breadcrumb $gallery_path = explode("/", $gallery);	{ // Build friendly gallery breadcrumb $gallery_path = explode("/", $gallery);
Zeile 222	Zeile 228
else { $breadcrumb .= " » {$gallery_name}";	else { $breadcrumb .= " » {$gallery_name}";
}	}
} } else	} } else
Zeile 332	Zeile 338
echo "</html>"; exit; }	echo "</html>"; exit; }

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");
Zeile 342	Zeile 348
// Does the user not exist? if(!$user['uid'] \|\| $user['usergroup'] != 5)	// Does the user not exist? if(!$user['uid'] \|\| $user['usergroup'] != 5)
{	{
flash_message($lang->error_invalid_user, 'error'); admin_redirect("index.php?module=user/users");	flash_message($lang->error_invalid_user, 'error'); admin_redirect("index.php?module=user/users");
}	}
$updated_user['usergroup'] = $user['usergroup'];	$updated_user['usergroup'] = $user['usergroup'];
Zeile 355	Zeile 361
$updated_user = array( "coppauser" => 0 );	$updated_user = array( "coppauser" => 0 );
}	}
else { $db->delete_query("awaitingactivation", "uid='{$user['uid']}'");	else { $db->delete_query("awaitingactivation", "uid='{$user['uid']}'");
}	}
// Move out of awaiting activation if they're in it. if($user['usergroup'] == 5) {	// Move out of awaiting activation if they're in it. if($user['usergroup'] == 5) {
Zeile 374	Zeile 380