Vergleich global.php - 1.6.4 - 1.6.5

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 6Zeile 6
 * Website: http://mybb.com
* License: http://mybb.com/about/license
*

 * Website: http://mybb.com
* License: http://mybb.com/about/license
*

 * $Id: global.php 5502 2011-07-19 09:20:11Z Tomm $

 * $Id: global.php 5640 2011-10-26 09:22:59Z Tomm $

 */

$working_dir = dirname(__FILE__);

 */

$working_dir = dirname(__FILE__);

Zeile 61Zeile 61
$mybb->post_code = generate_post_check();

// Set and load the language

$mybb->post_code = generate_post_check();

// Set and load the language

if($mybb->input['language'] && $lang->language_exists($mybb->input['language']))

if($mybb->input['language'] && $lang->language_exists($mybb->input['language']) && verify_post_check($mybb->input['my_post_key'], true))

{
$mybb->settings['bblanguage'] = $mybb->input['language'];
// If user is logged in, update their language selection with the new one

{
$mybb->settings['bblanguage'] = $mybb->input['language'];
// If user is logged in, update their language selection with the new one

Zeile 657Zeile 657

// Find out if this user of ours is using a banned email address.
// If they are, redirect them to change it


// Find out if this user of ours is using a banned email address.
// If they are, redirect them to change it

if($mybb->settings['emailkeep'] && $mybb->user['uid'])

if($mybb->user['uid'] && is_banned_email($mybb->user['email']) && $mybb->settings['emailkeep'] != 1)

{

{

	if(is_banned_email($mybb->user['email']))

	if(THIS_SCRIPT != "usercp.php" || THIS_SCRIPT == "usercp.php" && $mybb->input['action'] != "email" && $mybb->input['action'] != "do_email")

	{

	{

		if(THIS_SCRIPT != "usercp.php" || THIS_SCRIPT == "usercp.php" && $mybb->input['action'] != "email" && $mybb->input['action'] != "do_email")
{
redirect("usercp.php?action=email");
}
else if($mybb->request_method != "post")
{
$banned_email_error = inline_error(array($lang->banned_email_warning));
}

		redirect("usercp.php?action=email");
}
else if($mybb->request_method != "post")
{
$banned_email_error = inline_error(array($lang->banned_email_warning));




	}
}


	}
}