xpressengine / xe-core

modules/file/file.model.php

Spacing +50 added lines, -50 removed lines

@@ -29,24 +29,24 @@ 
 		$mid = Context::get('mid');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = Context::get('upload_target_srl');
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if (!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 
-		if($upload_target_srl)
+		if ($upload_target_srl)
 		{
 			$tmp_files = $this->getFiles($upload_target_srl);
 			$file_count = count($tmp_files);
 
-			for($i=0;$i<$file_count;$i++)
+			for ($i = 0; $i < $file_count; $i++)
 			{
 				$file_info = $tmp_files[$i];
-				if(!$file_info->file_srl) continue;
+				if (!$file_info->file_srl) continue;
 
 				$obj = new stdClass;
 				$obj->file_srl = $file_info->file_srl;
 				$obj->source_filename = $file_info->source_filename;
 				$obj->file_size = $file_info->file_size;
 				$obj->disp_file_size = FileHandler::filesize($file_info->file_size);
-				if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
+				if ($file_info->direct_download == 'N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
 				else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
 				$obj->direct_download = $file_info->direct_download;
 				$obj->cover_image = ($file_info->cover_image === 'Y') ? true : false;
@@ -66,17 +66,17 @@ 
 		//$config = $oModuleModel->getModuleInfoByMid($mid);	//perhaps config varialbles not used
 
 		$file_config = $this->getUploadConfig();
-		$left_size = $file_config->allowed_attach_size*1024*1024 - $attached_size;
+		$left_size = $file_config->allowed_attach_size * 1024 * 1024 - $attached_size;
 		// Settings of required information
 		$attached_size = FileHandler::filesize($attached_size);
-		$allowed_attach_size = FileHandler::filesize($file_config->allowed_attach_size*1024*1024);
-		$allowed_filesize = FileHandler::filesize($file_config->allowed_filesize*1024*1024);
+		$allowed_attach_size = FileHandler::filesize($file_config->allowed_attach_size * 1024 * 1024);
+		$allowed_filesize = FileHandler::filesize($file_config->allowed_filesize * 1024 * 1024);
 		$allowed_filetypes = $file_config->allowed_filetypes;
-		$this->add("files",$files);
-		$this->add("editor_sequence",$editor_sequence);
-		$this->add("upload_target_srl",$upload_target_srl);
-		$this->add("upload_status",$upload_status);
-		$this->add("left_size",$left_size);
+		$this->add("files", $files);
+		$this->add("editor_sequence", $editor_sequence);
+		$this->add("upload_target_srl", $upload_target_srl);
+		$this->add("upload_status", $upload_status);
+		$this->add("left_size", $left_size);
 		$this->add('attached_size', $attached_size);
 		$this->add('allowed_attach_size', $allowed_attach_size);
 		$this->add('allowed_filesize', $allowed_filesize);
@@ -94,7 +94,7 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$output = executeQuery('file.getFilesCount', $args);
-		return (int)$output->data->count;
+		return (int) $output->data->count;
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 * @param string $sid
 	 * @return string Returns a url
 	 */
-	function getDownloadUrl($file_srl, $sid, $module_srl="")
+	function getDownloadUrl($file_srl, $sid, $module_srl = "")
 	{
 		return sprintf('?module=%s&amp;act=%s&amp;file_srl=%s&amp;sid=%s&amp;module_srl=%s', 'file', 'procFileDownload', $file_srl, $sid, $module_srl);
 	}
@@ -122,12 +122,12 @@ 
 
 		$file_module_config = $oModuleModel->getModuleConfig('file');
 
-		if($module_srl) $file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
-		if(!$file_config) $file_config = $file_module_config;
+		if ($module_srl) $file_config = $oModuleModel->getModulePartConfig('file', $module_srl);
+		if (!$file_config) $file_config = $file_module_config;
 
 		$config = new stdClass();
 
-		if($file_config)
+		if ($file_config)
 		{
 			$config->allowed_filesize = $file_config->allowed_filesize;
 			$config->allowed_attach_size = $file_config->allowed_attach_size;
@@ -138,31 +138,31 @@ 
 			$config->allow_outlink_format = $file_config->allow_outlink_format;
 		}
 		// Property for all files comes first than each property
-		if(!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
-		if(!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
-		if(!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
-		if(!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
-		if(!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
+		if (!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
+		if (!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
+		if (!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
+		if (!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
+		if (!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
+		if (!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
+		if (!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
 		// Default setting if not exists
-		if(!$config->allowed_filesize) $config->allowed_filesize = '2';
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = '3';
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
-		if(!$config->allow_outlink) $config->allow_outlink = 'Y';
-		if(!$config->download_grant) $config->download_grant = array();
+		if (!$config->allowed_filesize) $config->allowed_filesize = '2';
+		if (!$config->allowed_attach_size) $config->allowed_attach_size = '3';
+		if (!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
+		if (!$config->allow_outlink) $config->allow_outlink = 'Y';
+		if (!$config->download_grant) $config->download_grant = array();
 
 		$size = ini_get('upload_max_filesize');
 		$unit = strtolower($size[strlen($size) - 1]);
-		$size = (float)$size;
-		if($unit == 'g') $size *= 1024;
-		if($unit == 'k') $size /= 1024;
+		$size = (float) $size;
+		if ($unit == 'g') $size *= 1024;
+		if ($unit == 'k') $size /= 1024;
 
-		if($config->allowed_filesize > $size) 
+		if ($config->allowed_filesize > $size) 
 		{	
 			$config->allowed_filesize = $size;
 		}
-		if($config->allowed_attach_size > $size) 
+		if ($config->allowed_attach_size > $size) 
 		{
 			$config->allowed_attach_size = $size;
 		}
@@ -182,10 +182,10 @@ 
 		$args = new stdClass();
 		$args->file_srl = $file_srl;
 		$output = executeQueryArray('file.getFile', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// old version compatibility
-		if(count($output->data) == 1)
+		if (count($output->data) == 1)
 		{
 			$file = $output->data[0];
 			$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -196,9 +196,9 @@ 
 		{
 			$fileList = array();
 
-			if(is_array($output->data))
+			if (is_array($output->data))
 			{
-				foreach($output->data as $key=>$value)
+				foreach ($output->data as $key=>$value)
 				{
 					$file = $value;
 					$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -222,16 +222,16 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$args->sort_index = $sortIndex;
-		if($ckValid) $args->isvalid = 'Y';
+		if ($ckValid) $args->isvalid = 'Y';
 		$output = executeQuery('file.getFiles', $args, $columnList);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
 		$file_list = $output->data;
 
-		if($file_list && !is_array($file_list)) $file_list = array($file_list);
+		if ($file_list && !is_array($file_list)) $file_list = array($file_list);
 
 		$file_count = count($file_list);
-		for($i=0;$i<$file_count;$i++)
+		for ($i = 0; $i < $file_count; $i++)
 		{
 			$file = $file_list[$i];
 			$file->source_filename = stripslashes($file->source_filename);
@@ -254,14 +254,14 @@ 
 
 		$module_srl = Context::get('module_srl');
 		// Get the current module if module_srl doesn't exist
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$module_srl = $current_module_info->module_srl;
 		}
 		$file_config = $this->getFileConfig($module_srl);
 
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			$iniPostMaxSize = FileHandler::returnbytes(ini_get('post_max_size'));
 			$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
@@ -287,9 +287,9 @@ 
 			'%s : %s/ %s<br /> %s : %s (%s : %s)',
 			Context::getLang('allowed_attach_size'),
 			FileHandler::filesize($attached_size),
-			FileHandler::filesize($file_config->allowed_attach_size*1024*1024),
+			FileHandler::filesize($file_config->allowed_attach_size * 1024 * 1024),
 			Context::getLang('allowed_filesize'),
-			FileHandler::filesize($file_config->allowed_filesize*1024*1024),
+			FileHandler::filesize($file_config->allowed_filesize * 1024 * 1024),
 			Context::getLang('allowed_filetypes'),
 			$file_config->allowed_filetypes
 		);
@@ -316,9 +316,9 @@ 
 	 */
 	function getFileGrant($file_info, $member_info)
 	{
-		if(!$file_info) return null;
+		if (!$file_info) return null;
 
-		if($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
+		if ($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
 		{
 			$file_grant->is_deletable = true;
 			return $file_grant;
@@ -329,7 +329,7 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($file_info->upload_target_srl);
-		if($oDocument->isExists()) $document_grant = $oDocument->isGranted();
+		if ($oDocument->isExists()) $document_grant = $oDocument->isGranted();
 
 		$file_grant->is_deletable = ($document_grant || $member_info->is_admin == 'Y' || $member_info->member_srl == $file_info->member_srl || $grant->manager);
 

Braces +79 added lines, -30 removed lines

@@ -29,7 +29,9 @@ 
 		$mid = Context::get('mid');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = Context::get('upload_target_srl');
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if(!$upload_target_srl) {
+			$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		}
 
 		if($upload_target_srl)
 		{
@@ -39,22 +41,26 @@ 
 			for($i=0;$i<$file_count;$i++)
 			{
 				$file_info = $tmp_files[$i];
-				if(!$file_info->file_srl) continue;
+				if(!$file_info->file_srl) {
+					continue;
+				}
 
 				$obj = new stdClass;
 				$obj->file_srl = $file_info->file_srl;
 				$obj->source_filename = $file_info->source_filename;
 				$obj->file_size = $file_info->file_size;
 				$obj->disp_file_size = FileHandler::filesize($file_info->file_size);
-				if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
-				else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
+				if($file_info->direct_download=='N') {
+					$obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
+				} else {
+					$obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
+				}
 				$obj->direct_download = $file_info->direct_download;
 				$obj->cover_image = ($file_info->cover_image === 'Y') ? true : false;
 				$files[] = $obj;
 				$attached_size += $file_info->file_size;
 			}
-		}
-		else
+		} else
 		{
 			$upload_target_srl = 0;
 			$attached_size = 0;
@@ -122,8 +128,12 @@ 
 
 		$file_module_config = $oModuleModel->getModuleConfig('file');
 
-		if($module_srl) $file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
-		if(!$file_config) $file_config = $file_module_config;
+		if($module_srl) {
+			$file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
+		}
+		if(!$file_config) {
+			$file_config = $file_module_config;
+		}
 
 		$config = new stdClass();
 
@@ -138,25 +148,53 @@ 
 			$config->allow_outlink_format = $file_config->allow_outlink_format;
 		}
 		// Property for all files comes first than each property
-		if(!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
-		if(!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
-		if(!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
-		if(!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
-		if(!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
+		if(!$config->allowed_filesize) {
+			$config->allowed_filesize = $file_module_config->allowed_filesize;
+		}
+		if(!$config->allowed_attach_size) {
+			$config->allowed_attach_size = $file_module_config->allowed_attach_size;
+		}
+		if(!$config->allowed_filetypes) {
+			$config->allowed_filetypes = $file_module_config->allowed_filetypes;
+		}
+		if(!$config->allow_outlink) {
+			$config->allow_outlink = $file_module_config->allow_outlink;
+		}
+		if(!$config->allow_outlink_site) {
+			$config->allow_outlink_site = $file_module_config->allow_outlink_site;
+		}
+		if(!$config->allow_outlink_format) {
+			$config->allow_outlink_format = $file_module_config->allow_outlink_format;
+		}
+		if(!$config->download_grant) {
+			$config->download_grant = $file_module_config->download_grant;
+		}
 		// Default setting if not exists
-		if(!$config->allowed_filesize) $config->allowed_filesize = '2';
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = '3';
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
-		if(!$config->allow_outlink) $config->allow_outlink = 'Y';
-		if(!$config->download_grant) $config->download_grant = array();
+		if(!$config->allowed_filesize) {
+			$config->allowed_filesize = '2';
+		}
+		if(!$config->allowed_attach_size) {
+			$config->allowed_attach_size = '3';
+		}
+		if(!$config->allowed_filetypes) {
+			$config->allowed_filetypes = '*.*';
+		}
+		if(!$config->allow_outlink) {
+			$config->allow_outlink = 'Y';
+		}
+		if(!$config->download_grant) {
+			$config->download_grant = array();
+		}
 
 		$size = ini_get('upload_max_filesize');
 		$unit = strtolower($size[strlen($size) - 1]);
 		$size = (float)$size;
-		if($unit == 'g') $size *= 1024;
-		if($unit == 'k') $size /= 1024;
+		if($unit == 'g') {
+			$size *= 1024;
+		}
+		if($unit == 'k') {
+			$size /= 1024;
+		}
 
 		if($config->allowed_filesize > $size) 
 		{	
@@ -182,7 +220,9 @@ 
 		$args = new stdClass();
 		$args->file_srl = $file_srl;
 		$output = executeQueryArray('file.getFile', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// old version compatibility
 		if(count($output->data) == 1)
@@ -191,8 +231,7 @@ 
 			$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
 
 			return $file;
-		}
-		else
+		} else
 		{
 			$fileList = array();
 
@@ -222,13 +261,19 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$args->sort_index = $sortIndex;
-		if($ckValid) $args->isvalid = 'Y';
+		if($ckValid) {
+			$args->isvalid = 'Y';
+		}
 		$output = executeQuery('file.getFiles', $args, $columnList);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 
 		$file_list = $output->data;
 
-		if($file_list && !is_array($file_list)) $file_list = array($file_list);
+		if($file_list && !is_array($file_list)) {
+			$file_list = array($file_list);
+		}
 
 		$file_count = count($file_list);
 		for($i=0;$i<$file_count;$i++)
@@ -316,7 +361,9 @@ 
 	 */
 	function getFileGrant($file_info, $member_info)
 	{
-		if(!$file_info) return null;
+		if(!$file_info) {
+			return null;
+		}
 
 		if($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
 		{
@@ -329,7 +376,9 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($file_info->upload_target_srl);
-		if($oDocument->isExists()) $document_grant = $oDocument->isGranted();
+		if($oDocument->isExists()) {
+			$document_grant = $oDocument->isGranted();
+		}
 
 		$file_grant->is_deletable = ($document_grant || $member_info->is_admin == 'Y' || $member_info->member_srl == $file_info->member_srl || $grant->manager);