elkarte / Elkarte

sources/subs/Attachments.subs.php

Spacing +21 added lines, -21 removed lines

@@ -42,7 +42,7 @@ 
  * @return bool
  * @package Attachments
  */
-function processAttachments($id_msg = null)
+function processAttachments ($id_msg = null)
 {
 	global $context, $modSettings, $txt, $topic, $board;
 
@@ -232,7 +232,7 @@ 
  * @return array
  * @package Attachments
  */
-function attachmentUploadChecks($attachID)
+function attachmentUploadChecks ($attachID)
 {
 	global $modSettings, $txt;
 
@@ -288,7 +288,7 @@ 
  * @return bool
  * @package Attachments
  */
-function createAttachment(&$attachmentOptions)
+function createAttachment (&$attachmentOptions)
 {
 	global $modSettings;
 
@@ -458,7 +458,7 @@ 
  * @return array|bool
  * @package Attachments
  */
-function isAttachmentImage($id_attach)
+function isAttachmentImage ($id_attach)
 {
 	$db = database();
 
@@ -481,7 +481,7 @@ 
 			'type' => 0,
 		)
 	)->fetch_callback(
-		function ($row) use (&$attachmentData) {
+		function($row) use (&$attachmentData) {
 			$attachmentData = $row;
 			$attachmentData['is_image'] = substr($attachmentData['mime_type'], 0, 5) === 'image';
 			$attachmentData['size'] = byte_format($attachmentData['size']);
@@ -508,7 +508,7 @@ 
  * @return bool whether the download and resize was successful.
  * @package Attachments
  */
-function saveAvatar($temporary_path, $memID, $max_width, $max_height)
+function saveAvatar ($temporary_path, $memID, $max_width, $max_height)
 {
 	global $modSettings;
 
@@ -615,7 +615,7 @@ 
  * @return mixed[]|bool the image size as array(width, height), or false on failure
  * @package Attachments
  */
-function url_image_size($url)
+function url_image_size ($url)
 {
 	// Can we pull this from the cache... please please?
 	$temp = array();
@@ -691,7 +691,7 @@ 
  * @return array
  * @package Attachments
  */
-function getAttachments($messages, $includeUnapproved = false, $filter = null, $all_posters = array())
+function getAttachments ($messages, $includeUnapproved = false, $filter = null, $all_posters = array())
 {
 	global $modSettings;
 
@@ -713,7 +713,7 @@ 
 			'attachment_type' => 0,
 		)
 	)->fetch_callback(
-		function ($row) use ($includeUnapproved, $filter, $all_posters, &$attachments, &$temp) {
+		function($row) use ($includeUnapproved, $filter, $all_posters, &$attachments, &$temp) {
 			if (!$row['approved'] && !$includeUnapproved
 				&& (empty($filter) || !call_user_func($filter, $row, $all_posters)))
 			{
@@ -747,7 +747,7 @@ 
  * @return array
  * @package Attachments
  */
-function getServerStoredAvatars($directory)
+function getServerStoredAvatars ($directory)
 {
 	global $context, $txt, $modSettings;
 
@@ -836,7 +836,7 @@ 
  * @return array The updated information
  * @package Attachments
  */
-function updateAttachmentThumbnail($filename, $id_attach, $id_msg, $old_id_thumb = 0, $real_filename = '')
+function updateAttachmentThumbnail ($filename, $id_attach, $id_msg, $old_id_thumb = 0, $real_filename = '')
 {
 	global $modSettings;
 
@@ -913,7 +913,7 @@ 
  * @package Attachments
  * @return mixed
  */
-function attachmentsSizeForMessage($id_msg, $include_count = true)
+function attachmentsSizeForMessage ($id_msg, $include_count = true)
 {
 	$db = database();
 
@@ -965,7 +965,7 @@ 
  *
  * @package Attachments
  */
-function loadAttachmentContext($id_msg)
+function loadAttachmentContext ($id_msg)
 {
 	global $attachments, $modSettings, $scripturl, $topic;
 
@@ -1100,7 +1100,7 @@ 
  * @return null|string|string[]
  * @package Attachments
  */
-function getLegacyAttachmentFilename($filename, $attachment_id, $dir = null, $new = false)
+function getLegacyAttachmentFilename ($filename, $attachment_id, $dir = null, $new = false)
 {
 	global $modSettings;
 
@@ -1136,7 +1136,7 @@ 
  * @param int[] $attachment_ids
  * @package Attachments
  */
-function bindMessageAttachments($id_msg, $attachment_ids)
+function bindMessageAttachments ($id_msg, $attachment_ids)
 {
 	$db = database();
 
@@ -1170,7 +1170,7 @@ 
  * @todo and of course everything relies on this behavior and work around it. :P.
  * Converters included.
  */
-function getAttachmentFilename($filename, $attachment_id, $dir = null, $new = false, $file_hash = '')
+function getAttachmentFilename ($filename, $attachment_id, $dir = null, $new = false, $file_hash = '')
 {
 	global $modSettings;
 
@@ -1203,7 +1203,7 @@ 
  * @return int[]|bool on fail else an array of id_board, id_topic
  * @package Attachments
  */
-function getAttachmentPosition($id_attach)
+function getAttachmentPosition ($id_attach)
 {
 	$db = database();
 
@@ -1240,7 +1240,7 @@ 
  *
  * @return array|bool
  */
-function elk_getimagesize($file, $error = 'array')
+function elk_getimagesize ($file, $error = 'array')
 {
 	$sizes = @getimagesize($file);
 
@@ -1261,7 +1261,7 @@ 
  *
  * @return bool|string
  */
-function returnMimeThumb($file_ext, $url = false)
+function returnMimeThumb ($file_ext, $url = false)
 {
 	global $settings;
 
@@ -1312,7 +1312,7 @@ 
  *
  * @return string
  */
-function getValidMimeImageType($mime)
+function getValidMimeImageType ($mime)
 {
 	// These are the only valid image types.
 	$validImageTypes = array(
@@ -1345,7 +1345,7 @@ 
  * @param string $filename
  * @return string
  */
-function getMimeType($filename)
+function getMimeType ($filename)
 {
 	$mimeType = '';
 

sources/ElkArte/Attachments/Download.php

Spacing +19 added lines, -19 removed lines

@@ -42,7 +42,7 @@ 
 	 *
 	 * @param string $id_attach String version of the attachment id
 	 */
-	public function __construct($id_attach)
+	public function __construct ($id_attach)
 	{
 		$this->string_attach = $id_attach;
 		// Non-temporary attachments shall have integer ids
@@ -56,7 +56,7 @@ 
 	/**
 	 * Temporary attachments have special names, so need slightly special handling
 	 */
-	public function isTemporary()
+	public function isTemporary ()
 	{
 		// Temporary attachment, special case...
 		return strpos($this->string_attach, 'post_tmp_' . User::$info->id . '_') !== false;
@@ -69,7 +69,7 @@ 
 	 * @param null|int $id_topic
 	 * @throws \ElkArte\Exceptions\Exception
 	 */
-	public function validate($type, $id_topic = null)
+	public function validate ($type, $id_topic = null)
 	{
 		if (empty($this->id_attach))
 		{
@@ -118,7 +118,7 @@ 
 	/**
 	 * Same as validate, but for temporary attachments
 	 */
-	protected function validateTemporary()
+	protected function validateTemporary ()
 	{
 		global $modSettings;
 
@@ -159,7 +159,7 @@ 
 	 * @param bool $inline
 	 * @param bool $use_compression
 	 */
-	public function send($inline, $use_compression)
+	public function send ($inline, $use_compression)
 	{
 		if (empty($this->id_attach) || empty($this->data['real_filename']))
 		{
@@ -193,7 +193,7 @@ 
 			$image = new Image($this->file_path);
 
 			$this->file_path = $this->file_path . '_thumb';
-			$image->createThumbnail(100, 100, $this->file_path, '',false);
+			$image->createThumbnail(100, 100, $this->file_path, '', false);
 		}
 
 		return $this->send_file($use_compression && $this->isCompressible());
@@ -202,7 +202,7 @@ 
 	/**
 	 * Is the atachment is approved or not
 	 */
-	public function isApproved()
+	public function isApproved ()
 	{
 		return !empty($this->data['is_approved']);
 	}
@@ -210,7 +210,7 @@ 
 	/**
 	 * If the user requesting the attachment is its owner
 	 */
-	public function isOwner()
+	public function isOwner ()
 	{
 		return (int) $this->data['id_member'] !== 0 && User::$info->id === (int) $this->data['id_member'];
 	}
@@ -218,7 +218,7 @@ 
 	/**
 	 * If the attachment is an avatar
 	 */
-	public function isAvatar()
+	public function isAvatar ()
 	{
 		return $this->data['attachment_type'] == Attachment::DB_TYPE_AVATAR;
 	}
@@ -229,7 +229,7 @@ 
 	 * @param null|string $text
 	 * @throws \ElkArte\Exceptions\Exception
 	 */
-	public function noAttach($text = null)
+	public function noAttach ($text = null)
 	{
 		global $txt;
 
@@ -266,7 +266,7 @@ 
 	 * @param int $id_attach
 	 * @package Attachments
 	 */
-	public function increaseDownloadCounter()
+	public function increaseDownloadCounter ()
 	{
 		if (empty($this->id_attach) || $this->isAvatar())
 		{
@@ -287,7 +287,7 @@ 
 	 * Sends the requested file to the user.  If the file is compressible e.g.
 	 * has a mine type of text/??? may compress the file prior to sending.
 	 */
-	protected function send_file($use_compression)
+	protected function send_file ($use_compression)
 	{
 		$headers = Headers::instance();
 		$body = file_get_contents($this->file_path);
@@ -313,7 +313,7 @@ 
 	 *
 	 * @return bool if we should compress the file
 	 */
-	protected function isCompressible()
+	protected function isCompressible ()
 	{
 		// Not compressible, or not supported / requested by client
 		return (bool) preg_match('~^(?:text/|application/(?:json|xml|rss\+xml)$)~i', $this->data['mime_type']);
@@ -330,7 +330,7 @@ 
 	 * @param bool $do_cache If send the a max-age header or not
 	 * @param bool $check_filename When false, any check on $filename is skipped
 	 */
-	protected function prepare_headers($filename, $eTag, $mime_type, $disposition, $real_filename, $do_cache, $check_filename = true)
+	protected function prepare_headers ($filename, $eTag, $mime_type, $disposition, $real_filename, $do_cache, $check_filename = true)
 	{
 		global $txt;
 
@@ -412,7 +412,7 @@ 
 	/**
 	 * Some magic in case data are not available immediately
 	 */
-	protected function rebuildData($id_topic)
+	protected function rebuildData ($id_topic)
 	{
 		global $modSettings;
 
@@ -460,7 +460,7 @@ 
 	 * @return array
 	 * @package Attachments
 	 */
-	protected function getAvatar()
+	protected function getAvatar ()
 	{
 		// Use our cache when possible
 		$cache = array();
@@ -483,7 +483,7 @@ 
 				'blank_id_member' => 0,
 			)
 		)->fetch_callback(
-			function ($row) use (&$avatarData) {
+			function($row) use (&$avatarData) {
 				$avatarData = $row;
 			}
 		);
@@ -508,7 +508,7 @@ 
 	 * @return array
 	 * @package Attachments
 	 */
-	protected function getFromTopic($id_topic)
+	protected function getFromTopic ($id_topic)
 	{
 		// Make sure this attachment is on this board.
 		$attachmentData = array();
@@ -550,7 +550,7 @@ 
 	 * @return array
 	 * @package Attachments
 	 */
-	function getThumbFromTopic($id_topic)
+	function getThumbFromTopic ($id_topic)
 	{
 		// Make sure this attachment is on this board.
 		$request = $this->db->fetchQuery('

sources/ElkArte/Controller/Attachment.php

Spacing +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
 	/**
 	 * {@inheritdoc }
 	 */
-	public function needTheme($action = '')
+	public function needTheme ($action = '')
 	{
 		global $modSettings, $maintenance;
 
@@ -67,7 +67,7 @@ 
 	/**
 	 * {@inheritdoc }
 	 */
-	public function trackStats($action = '')
+	public function trackStats ($action = '')
 	{
 		return false;
 	}
@@ -76,7 +76,7 @@ 
 	 * The default action is to download an attachment.
 	 * This allows ?action=attachment to be forwarded to action_dlattach()
 	 */
-	public function action_index()
+	public function action_index ()
 	{
 		// add a subaction array to act accordingly
 		$subActions = array(
@@ -101,7 +101,7 @@ 
 	 * - Pass the form data with session vars
 	 * - Responds back with errors or file data
 	 */
-	public function action_ulattach()
+	public function action_ulattach ()
 	{
 		global $context, $modSettings, $txt;
 
@@ -189,7 +189,7 @@ 
 	 * - Requires file name and file path
 	 * - Responds back with success or error
 	 */
-	public function action_rmattach()
+	public function action_rmattach ()
 	{
 		global $context, $txt;
 
@@ -275,7 +275,7 @@ 
 	 *
 	 * @throws \ElkArte\Exceptions\Exception
 	 */
-	public function action_dlattach()
+	public function action_dlattach ()
 	{
 		global $modSettings, $context, $topic, $board;