[0.7.9RC3] Deletion of image files on server

Code: Select all

	...
	$result = $database->getRows("select * from image where image_id = '" . (int)$request->get('image_id') . "'");
	$result = array_shift($result);
	$image->delete($result['filename']);
	$database->query("delete from image where image_id = '" . (int)$request->get('image_id') . "'");
	...

Code: Select all

	...
	$result = $database->getRows("select * from image where image_id = '" . (int)$request->get('image_id') . "'");
	$result = array_shift($result);
	$filename = $result['filename'];
	$rows = $database->getRows("select filename from image where filename=$filename");
	if (count($rows) <= 1) {
		$image->delete($filename);
	}
	$database->query("delete from image where image_id = '" . (int)$request->get('image_id') . "'");
	...

Code: Select all

	function delete() {
		$request	=& $this->locator->get('request');
		$response	=& $this->locator->get('response');
		$database	=& $this->locator->get('database');
		$url		=& $this->locator->get('url');
		$language	=& $this->locator->get('language');
		$template	=& $this->locator->get('template');
		$session	=& $this->locator->get('session');
		$module		=& $this->locator->get('module');
		$cache		=& $this->locator->get('cache');
		$image		=& $this->locator->get('image');
 
		$language->load('controller/image.php');
		
		$template->set('title', $language->get('heading_title'));
		 
		if (($request->get('image_id')) && ($this->validateDelete())) {
			$result = $database->getRows("select * from image where image_id = '" . (int)$request->get('image_id') . "'");
			$result = array_shift($result);
			$filename = $result['filename'];
			$rows = $database->getRows("select filename from image where filename='$filename'");
			if (count($rows) <= 1) {
				$image->delete($filename);
			}
			$database->query("delete from image where image_id = '" . (int)$request->get('image_id') . "'");
			$database->query("delete from image_description where image_id = '" . (int)$request->get('image_id') . "'");
	  		$cache->delete('image');
			$session->set('message', $language->get('text_message'));
		  	$response->redirect($url->ssl('image'));
		}
    
		$template->set('content', $this->getList());
		$template->set($module->fetch());
	
		$response->set($template->fetch('layout.tpl'));
	}