elkarte / Elkarte

sources/controllers/ProfileOptions.controller.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 			'forumprofile' => array(
 				'fields' => array(
 					'avatar_choice', 'hr',
-					'bday1', 'usertitle','hr',
+					'bday1', 'usertitle', 'hr',
 					'signature', 'hr',
 					'karma_good', 'hr',
 					'website_title', 'website_url',

sources/subs/MessageIndex.subs.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 			$indexOptions['custom_selects'] = array_merge($indexOptions['custom_selects'], array('ml.body AS last_body', 'mf.body AS first_body'));
 		// Default: a SUBSTRING
 		elseif (!empty($indexOptions['previews']))
-			$indexOptions['custom_selects'] =  array_merge($indexOptions['custom_selects'], array('SUBSTRING(ml.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS last_body', 'SUBSTRING(mf.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS first_body'));
+			$indexOptions['custom_selects'] = array_merge($indexOptions['custom_selects'], array('SUBSTRING(ml.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS last_body', 'SUBSTRING(mf.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS first_body'));
 
 		if (!empty($indexOptions['include_avatars']))
 		{

sources/subs/Errors/Errors.php

Doc Comments +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
 	 * this __construct will feed AbstractModel with a value just to stop it
 	 * from trying to initialize the database connection.
 	 *
-	 * @param $db Database|null
+	 * @param integer $db Database|null
 	 */
 	public function __construct($db = null)
 	{
@@ -57,7 +57,7 @@ 
 	/**
 	 * Halts execution, optionally displays an error message
 	 *
-	 * @param string|integer $error
+	 * @param string $error
 	 */
 	protected function terminate($error = '')
 	{

sources/subs/Graphics.subs.php

Doc Comments +3 added lines, -3 removed lines

@@ -1401,7 +1401,7 @@ 
  * @param int $height Height of the image
  * @param string $format Type of the image (valid types are png, jpeg, gif)
  *
- * @return boolean|resource The image or false if neither Imagick nor GD are found
+ * @return string|false The image or false if neither Imagick nor GD are found
  */
 function generateTextImage($text, $width = 100, $height = 100, $format = 'png')
 {
@@ -1439,7 +1439,7 @@ 
  * @param int $height Height of the image
  * @param string $format Type of the image (valid types are png, jpeg, gif)
  *
- * @return resource|boolean The image
+ * @return string|false The image
  */
 function generateTextImageWithGD($text, $width = 100, $height = 100, $format = 'png')
 {
@@ -1506,7 +1506,7 @@ 
  * @param int $height Height of the image
  * @param string $format Type of the image (valid types are png, jpeg, gif)
  *
- * @return boolean|resource The image or false on error
+ * @return string|false The image or false on error
  */
 function generateTextImageWithIM($text, $width = 100, $height = 100, $format = 'png')
 {

Spacing +1 added lines, -1 removed lines

@@ -377,7 +377,7 @@
 
 			// The behavior of bestfit changed in Imagick 3.0.0 and it will now scale up, we prevent that
 			$dest_width = empty($max_width) ? $src_width : ($force_resize ? $max_width : min($max_width, $src_width));
-			$dest_height = empty($max_height) ? $src_height : ($force_resize ? $max_height :  min($max_height, $src_height));
+			$dest_height = empty($max_height) ? $src_height : ($force_resize ? $max_height : min($max_height, $src_height));
 
 			// Set jpeg image quality to 80
 			if ($default_formats[$preferred_format] === 'jpeg')

themes/default/Theme.php

Spacing +1 added lines, -1 removed lines

@@ -1144,7 +1144,7 @@
 			// Variant icon definitions?
 			if (file_exists($settings['theme_dir'] . '/css/' . $context['theme_variant'] . '/icons_svg' . $context['theme_variant'] . '.css'))
 			{
-				loadCSSFile($context['theme_variant'] .  '/icons_svg' . $context['theme_variant'] . '.css');
+				loadCSSFile($context['theme_variant'] . '/icons_svg' . $context['theme_variant'] . '.css');
 			}
 
 			// Load a theme variant custom CSS

sources/subs/Who.subs.php

Spacing +1 added lines, -1 removed lines

@@ -503,7 +503,7 @@
 			'<a href="http://jqueryui.com/">JQuery UI</a> | &copy; jQuery Foundation and other contributors | Licensed under <a href="http://opensource.org/licenses/MIT">The MIT License (MIT)</a>',
 			'<a href="https://github.com/tchwork/jsqueeze">Jsqueeze</a> &copy Nicolas Grekas| Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>',
 			'<a href="https://github.com/mailcheck">MailCheck</a> | &copy; Received Inc | Licensed under <a href="http://opensource.org/licenses/MIT">The MIT License (MIT)</a>',
-			'<a href="https://github.com/michelf/php-markdown">PHP Markdown Lib</a> | &copy; Michel Fortin | Licensed under <a href="https://github.com/michelf/php-markdown/blob/lib/License.md">BSD-style open source</a>',			'<a href="http://www.openwall.com/phpass/">PH Pass</a> | Author: Solar Designer | Placed in the public domain</a>',
+			'<a href="https://github.com/michelf/php-markdown">PHP Markdown Lib</a> | &copy; Michel Fortin | Licensed under <a href="https://github.com/michelf/php-markdown/blob/lib/License.md">BSD-style open source</a>', '<a href="http://www.openwall.com/phpass/">PH Pass</a> | Author: Solar Designer | Placed in the public domain</a>',
 			'<a href="http://www.sceditor.com/">SCEditor</a> | &copy; Sam Clarke | Licensed under <a href="http://opensource.org/licenses/MIT">The MIT License (MIT)</a>',
 			'<a href="http://sourceforge.net/projects/simplehtmldom/">Simple HTML DOM</a> | Licensed under <a href="http://opensource.org/licenses/MIT">The MIT License (MIT)</a>',
 			'<a href="http://www.simplemachines.org/">Simple Machines</a> | &copy; Simple Machines | Licensed under <a href="http://www.simplemachines.org/about/smf/license.php">The BSD License</a>',

sources/subs/Auth.subs.php

Spacing +3 added lines, -3 removed lines

@@ -349,7 +349,7 @@ 
 
 	if ($use_wildcards || $maybe_email)
 		$email_condition = '
-			OR (' . $email_condition . 'email_address ' . $comparison . ' ' . implode( ') OR (' . $email_condition . ' email_address ' . $comparison . ' ', $names) . ')';
+			OR (' . $email_condition . 'email_address ' . $comparison . ' ' . implode(') OR (' . $email_condition . ' email_address ' . $comparison . ' ', $names) . ')';
 	else
 		$email_condition = '';
 
@@ -368,8 +368,8 @@ 
 		LIMIT {int:limit}',
 		array(
 			'buddy_list' => $user_info['buddies'],
-			'member_name_search' => $member_name . ' ' . $comparison . ' ' . implode( ' OR ' . $member_name . ' ' . $comparison . ' ', $names) . '',
-			'real_name_search' => $real_name . ' ' . $comparison . ' ' . implode( ' OR ' . $real_name . ' ' . $comparison . ' ', $names) . '',
+			'member_name_search' => $member_name . ' ' . $comparison . ' ' . implode(' OR ' . $member_name . ' ' . $comparison . ' ', $names) . '',
+			'real_name_search' => $real_name . ' ' . $comparison . ' ' . implode(' OR ' . $real_name . ' ' . $comparison . ' ', $names) . '',
 			'email_condition' => $email_condition,
 			'limit' => $max,
 		)

sources/subs/MessageTopicIcons.class.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 	 * Icons that are default with ElkArte
 	 * @var array
 	 */
-	protected $_stable_icons = 	array();
+	protected $_stable_icons = array();
 
 	/**
 	 * Icons to load in addition to the default
@@ -71,7 +71,7 @@ 
 		$this->_loadStableIcons();
 
 		// Merge in additional ones
-		$custom_icons = array_map(function($element) {
+		$custom_icons = array_map(function ($element) {
 			return $element['first_icon'];
 		}, $custom);
 		$this->_stable_icons = array_merge($this->_stable_icons, $custom_icons);

sources/subs/Agreement.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
 	/**
 	 * Creates a backup of the current version of the agreement/s.
 	 *
-	 * @return string|bool the backup_id if successful, false if creating the backup fails
+	 * @return false|string the backup_id if successful, false if creating the backup fails
 	 */
 	public function storeBackup()
 	{