Vergleich admin/modules/forum/attachments.php - 1.8.9 - 1.8.20

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 223Zeile 223
if($mybb->input['action'] == "delete_orphans" && $mybb->request_method == "post")
{
$plugins->run_hooks("admin_forum_attachments_delete_orphans");

if($mybb->input['action'] == "delete_orphans" && $mybb->request_method == "post")
{
$plugins->run_hooks("admin_forum_attachments_delete_orphans");

 

$success_count = $error_count = 0;


// Deleting specific attachments from uploads directory
if(is_array($mybb->input['orphaned_files']))


// Deleting specific attachments from uploads directory
if(is_array($mybb->input['orphaned_files']))

	{
/**
* @param string $string
*
* @return string
*/
function clean_filename($string)
{
return str_replace(array(".."), "", $string);
}
$mybb->input['orphaned_files'] = array_map("clean_filename", $mybb->input['orphaned_files']);

	{











		foreach($mybb->input['orphaned_files'] as $file)
{

		foreach($mybb->input['orphaned_files'] as $file)
{

			if(!@unlink(MYBB_ROOT.$mybb->settings['uploadspath']."/".$file))





			$file = str_replace('..', '', $file);
$path = MYBB_ROOT.$mybb->settings['uploadspath']."/".$file;
$real_path = realpath($path);

if($real_path === false || strpos(str_replace('\\', '/', $real_path), str_replace('\\', '/', realpath(MYBB_ROOT)).'/') !== 0 || $real_path == realpath(MYBB_ROOT.'install/lock'))

			{

			{

				$error = true;


				$error_count++;
continue;

			}

			}

		}











if(!@unlink(MYBB_ROOT.$mybb->settings['uploadspath']."/".$file))
{
$error_count++;
}
else
{
$success_count++;
}
}

	}

// Deleting physical attachments which exist in database
if(is_array($mybb->input['orphaned_attachments']))
{
$mybb->input['orphaned_attachments'] = array_map("intval", $mybb->input['orphaned_attachments']);

	}

// Deleting physical attachments which exist in database
if(is_array($mybb->input['orphaned_attachments']))
{
$mybb->input['orphaned_attachments'] = array_map("intval", $mybb->input['orphaned_attachments']);

		require_once MYBB_ROOT."inc/functions_upload.php";

		require_once MYBB_ROOT."inc/functions_upload.php";


$query = $db->simple_select("attachments", "aid,pid,posthash", "aid IN (".implode(",", $mybb->input['orphaned_attachments']).")");
while($attachment = $db->fetch_array($query))
{
if(!$attachment['pid'])


$query = $db->simple_select("attachments", "aid,pid,posthash", "aid IN (".implode(",", $mybb->input['orphaned_attachments']).")");
while($attachment = $db->fetch_array($query))
{
if(!$attachment['pid'])

			{

			{

				remove_attachment(null, $attachment['posthash'], $attachment['aid']);
}
else
{
remove_attachment($attachment['pid'], null, $attachment['aid']);
}

				remove_attachment(null, $attachment['posthash'], $attachment['aid']);
}
else
{
remove_attachment($attachment['pid'], null, $attachment['aid']);
}

 
			$success_count++;

		}
}


		}
}


Zeile 271Zeile 278
	// Log admin action
log_admin_action();


	// Log admin action
log_admin_action();


	if($error == true)



	$message = '';
$status = 'success';
if($error_count > 0)

	{

	{

		flash_message($lang->error_not_all_removed, 'error');


		$status = 'error';
$message = $lang->sprintf($lang->error_count, $error_count);

	}

	}

	else



if($success_count > 0)

	{

	{

		flash_message($lang->success_orphan_deleted, 'success');








		if($error_count > 0)
{
$message .= '<br />'.$lang->sprintf($lang->success_count, $success_count);
}
else
{
$message = $lang->success_orphan_deleted;
}

	}

	}

	admin_redirect("index.php?module=forum-attachments");


	flash_message($message, $status);
admin_redirect('index.php?module=forum-attachments');

}

if($mybb->input['action'] == "orphans")
{
$plugins->run_hooks("admin_forum_attachments_orphans");

}

if($mybb->input['action'] == "orphans")
{
$plugins->run_hooks("admin_forum_attachments_orphans");





	// Oprhans are defined as:
// - Uploaded files in the uploads directory that don't exist in the database
// - Attachments for which the uploaded file is missing

	// Oprhans are defined as:
// - Uploaded files in the uploads directory that don't exist in the database
// - Attachments for which the uploaded file is missing

Zeile 345Zeile 364
		$form = new Form("index.php?module=forum-attachments&amp;action=delete_orphans", "post");

$table = new Table;

		$form = new Form("index.php?module=forum-attachments&amp;action=delete_orphans", "post");

$table = new Table;

		$table->construct_header($form->generate_check_box('checkall', '1', '', array('class' => 'checkall')), array( 'width' => 1));

		$table->construct_header($form->generate_check_box('allbox', '1', '', array('class' => 'checkall')), array( 'width' => 1));

		$table->construct_header($lang->size_attachments, array('colspan' => 2));
$table->construct_header($lang->reason_orphaned, array('width' => '20%', 'class' => 'align_center'));
$table->construct_header($lang->date_uploaded, array("class" => "align_center"));

		$table->construct_header($lang->size_attachments, array('colspan' => 2));
$table->construct_header($lang->reason_orphaned, array('width' => '20%', 'class' => 'align_center'));
$table->construct_header($lang->date_uploaded, array("class" => "align_center"));

Zeile 537Zeile 556
								if($bad_attachments)
{
$bad_attachments = @array_merge($bad_attachments, $attachments_to_check);

								if($bad_attachments)
{
$bad_attachments = @array_merge($bad_attachments, $attachments_to_check);

								}

								}

								else
{
$bad_attachments = $attachments_to_check;

								else
{
$bad_attachments = $attachments_to_check;

Zeile 630Zeile 649
		}

$errors = array();

		}

$errors = array();

 

// Normal users only
if($mybb->get_input('user_types', MyBB::INPUT_INT) == 1)
{
$user_types = 1;
}
// Guests only
elseif($mybb->get_input('user_types', MyBB::INPUT_INT) == -1)
{
$user_types = -1;
$search_sql .= " AND a.uid='0'";
}
// Users & Guests
else
{
$user_types = 0;
}


// Username matching
if($mybb->input['username'])
{
$user = get_user_by_username($mybb->input['username']);


// Username matching
if($mybb->input['username'])
{
$user = get_user_by_username($mybb->input['username']);





			if(!$user['uid'])
{

			if(!$user['uid'])
{

				$errors[] = $lang->error_invalid_username;










				if($user_types == 1)
{
$errors[] = $lang->error_invalid_username;
}
else
{
// Don't error if we are searching for guests or users & guests
$search_sql .= " AND p.username LIKE '%".$db->escape_string_like($mybb->input['username'])."%'";
}


			}
else
{

			}
else
{

Zeile 780Zeile 825
			$form = new Form("index.php?module=forum-attachments&amp;action=delete", "post");

$table = new Table;

			$form = new Form("index.php?module=forum-attachments&amp;action=delete", "post");

$table = new Table;

			$table->construct_header($form->generate_check_box('checkall', '1', '', array('class' => 'checkall')), array( 'width' => 1));

			$table->construct_header($form->generate_check_box('allbox', '1', '', array('class' => 'checkall')), array( 'width' => 1));

			$table->construct_header($lang->attachments, array('colspan' => 2));
$table->construct_header($lang->size, array('width' => '10%', 'class' => 'align_center'));
$table->construct_header($lang->posted_by, array('width' => '20%', 'class' => 'align_center'));

			$table->construct_header($lang->attachments, array('colspan' => 2));
$table->construct_header($lang->size, array('width' => '10%', 'class' => 'align_center'));
$table->construct_header($lang->posted_by, array('width' => '20%', 'class' => 'align_center'));

Zeile 849Zeile 894
	$form_container->output_row($lang->type_contains, "", $form->generate_text_box('mimetype', $mybb->input['mimetype'], array('id' => 'mimetype')), 'mimetype');
$form_container->output_row($lang->forum_is, "", $form->generate_forum_select('forum[]', $mybb->input['forum'], array('multiple' => true, 'size' => 5, 'id' => 'forum')), 'forum');
$form_container->output_row($lang->username_is, "", $form->generate_text_box('username', htmlspecialchars_uni($mybb->get_input('username')), array('id' => 'username')), 'username');

	$form_container->output_row($lang->type_contains, "", $form->generate_text_box('mimetype', $mybb->input['mimetype'], array('id' => 'mimetype')), 'mimetype');
$form_container->output_row($lang->forum_is, "", $form->generate_forum_select('forum[]', $mybb->input['forum'], array('multiple' => true, 'size' => 5, 'id' => 'forum')), 'forum');
$form_container->output_row($lang->username_is, "", $form->generate_text_box('username', htmlspecialchars_uni($mybb->get_input('username')), array('id' => 'username')), 'username');

 
	$form_container->output_row($lang->poster_is, "", $form->generate_select_box('user_types', array('0' => $lang->poster_is_either, '1' => $lang->poster_is_user, '-1' => $lang->poster_is_guest), $mybb->get_input('user_types', MyBB::INPUT_INT), array('id' => 'guests')), 'user_types');


$more_options = array(
"less_than" => $lang->more_than,


$more_options = array(
"less_than" => $lang->more_than,