satanasov / phpbbgallery

acpimport/acp/main_module.php

Indentation +18 added lines, -18 removed lines

@@ -58,8 +58,8 @@ 
 			foreach ($images as $image_src)
 			{
 				/**
-				* Import the images
-				*/
+				 * Import the images
+				 */
 
 				$image_src = str_replace("{{$import_schema}}", "'", $image_src);
 				$image_src_full = $gallery_url->path('import') . utf8_decode($image_src);
@@ -153,21 +153,21 @@ 
 						$file_link = $gallery_url->path('upload') . $image_filename;
 
 						/**
-						* Event to trigger before mass update
-						*
-						* @event phpbbgallery.acpimport.update_image_before
-						* @var	array	additional_sql_data		array of additional sql_data
-						* @var	string	file_link				String with real file link
-						* @since 1.2.0
-						*/
+						 * Event to trigger before mass update
+						 *
+						 * @event phpbbgallery.acpimport.update_image_before
+						 * @var	array	additional_sql_data		array of additional sql_data
+						 * @var	string	file_link				String with real file link
+						 * @since 1.2.0
+						 */
 						$vars = array('additional_sql_data', 'file_link');
 						extract($phpbb_dispatcher->trigger_event('phpbbgallery.acpimport.update_image_before', compact($vars)));
 
 						if (($filetype[0] > $gallery_config->get('max_width')) || ($filetype[1] > $gallery_config->get('max_height')))
 						{
 							/**
-							* Resize overside images
-							*/
+							 * Resize overside images
+							 */
 							if ($gallery_config->get('allow_resize'))
 							{
 								$image_tools->resize_image($gallery_config->get('max_width'), $gallery_config->get('max_height'));
@@ -180,13 +180,13 @@ 
 						$file_updated = (bool) $image_tools->resized;
 
 						/**
-						* Event to trigger before mass update
-						*
-						* @event phpbbgallery.acpimport.update_image
-						* @var	array	additional_sql_data		array of additional sql_data
-						* @var	bool	file_updated			is file resized
-						* @since 1.2.0
-						*/
+						 * Event to trigger before mass update
+						 *
+						 * @event phpbbgallery.acpimport.update_image
+						 * @var	array	additional_sql_data		array of additional sql_data
+						 * @var	bool	file_updated			is file resized
+						 * @since 1.2.0
+						 */
 						$vars = array('additional_sql_data', 'file_updated');
 						extract($phpbb_dispatcher->trigger_event('phpbbgallery.acpimport.update_image', compact($vars)));
 

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 
 	function import()
 	{
-		global $db, $template, $user, $phpbb_dispatcher, $phpbb_container, $gallery_url, $request, $table_prefix ,$gallery_config, $gallery_album, $request;
+		global $db, $template, $user, $phpbb_dispatcher, $phpbb_container, $gallery_url, $request, $table_prefix, $gallery_config, $gallery_album, $request;
 
 		$import_schema = $request->variable('import_schema', '');
 		$images = $request->variable('images', array(''), true);
@@ -302,7 +302,7 @@ 
 			$album_id = $request->variable('album_id', 0);
 			if (isset($_POST['users_pega']))
 			{
-				$image_user =  $phpbb_container->get('phpbbgallery.core.user');
+				$image_user = $phpbb_container->get('phpbbgallery.core.user');
 				$image_user->set_user_id($user_row['user_id']);
 				if ($user->data['user_id'] != $user_row['user_id'])
 				{

Braces +6 added lines, -12 removed lines

@@ -47,8 +47,7 @@ 
 				// Replace the md5 with the ' again and remove the space at the end to prevent \' troubles
 				$user_data['username'] = utf8_substr(str_replace("{{$import_schema}}", "'", $user_data['username']), 0, -1);
 				$image_name = utf8_substr(str_replace("{{$import_schema}}", "'", $image_name), 0, -1);
-			}
-			else
+			} else
 			{
 				global $phpEx;
 				trigger_error($user->lang('MISSING_IMPORT_SCHEMA', ($import_schema . '.' . $phpEx)), E_USER_WARNING);
@@ -198,8 +197,7 @@ 
 						if ($filename || ($image_name == ''))
 						{
 							$sql_ary['image_name'] = str_replace("_", " ", utf8_substr($image_src, 0, utf8_strrpos($image_src, '.')));
-						}
-						else
+						} else
 						{
 							$sql_ary['image_name'] = str_replace('{NUM}', $num_offset + $done_images, $image_name);
 						}
@@ -239,14 +237,12 @@ 
 				if (!$errors)
 				{
 					trigger_error(sprintf($user->lang['IMPORT_FINISHED'], $done_images) . adm_back_link($this->u_action));
-				}
-				else
+				} else
 				{
 					$errors = explode("\n", $errors);
 					trigger_error(sprintf($user->lang['IMPORT_FINISHED_ERRORS'], $done_images - sizeof($errors)) . implode('<br />', $errors) . adm_back_link($this->u_action), E_USER_WARNING);
 				}
-			}
-			else
+			} else
 			{
 				// Write the new list
 				$this->create_import_schema($import_schema, $album_id, $user_data, $start_time, $num_offset, $done_images, $todo_images, $image_name, $filename, $images);
@@ -256,8 +252,7 @@ 
 				meta_refresh(1, $forward_url);
 				trigger_error(sprintf($user->lang['IMPORT_DEBUG_MES'], $done_images, $todo_images));
 			}
-		}
-		else if ($submit)
+		} else if ($submit)
 		{
 			if (!check_form_key('acp_gallery'))
 			{
@@ -313,8 +308,7 @@ 
 						$album_id = $gallery_album->generate_personal_album($user_row['username'], $user_row['user_id'], $user_row['user_colour'], $image_user);
 					}
 					unset($image_user);
-				}
-				else
+				} else
 				{
 					$album_id = $image_user->get_data('personal_album_id');
 					if (!$album_id)

acpcleanup/cleanup.php

Indentation +30 added lines, -30 removed lines

@@ -89,11 +89,11 @@ 
 	}
 
 	/**
-	* Delete source files without a database entry.
-	*
-	* @param	array	$filenames		An array of filenames
-	* @return	string	Language key for the success message.
-	*/
+	 * Delete source files without a database entry.
+	 *
+	 * @param	array	$filenames		An array of filenames
+	 * @return	string	Language key for the success message.
+	 */
 	public function delete_files($filenames)
 	{
 		foreach ($filenames as $file)
@@ -106,11 +106,11 @@ 
 	}
 
 	/**
-	* Delete images, where the source file is missing.
-	*
-	* @param	mixed	$image_ids		Either an array of integers or an integer.
-	* @return	string	Language key for the success message.
-	*/
+	 * Delete images, where the source file is missing.
+	 *
+	 * @param	mixed	$image_ids		Either an array of integers or an integer.
+	 * @return	string	Language key for the success message.
+	 */
 	public function delete_images($image_ids)
 	{
 		$this->log->add_log('admin', 'clean_deleteentries', 0, 0, array('LOG_CLEANUP_DELETE_ENTRIES', count($image_ids)));
@@ -120,11 +120,11 @@ 
 	}
 
 	/**
-	* Delete images, where the author is missing.
-	*
-	* @param	mixed	$image_ids		Either an array of integers or an integer.
-	* @return	string	Language key for the success message.
-	*/
+	 * Delete images, where the author is missing.
+	 *
+	 * @param	mixed	$image_ids		Either an array of integers or an integer.
+	 * @return	string	Language key for the success message.
+	 */
 	public function delete_author_images($image_ids)
 	{
 		$this->log->add_log('admin', 'clean_deletenoauthors', 0, 0, array('LOG_CLEANUP_DELETE_NO_AUTHOR', count($image_ids)));
@@ -134,11 +134,11 @@ 
 	}
 
 	/**
-	* Delete comments, where the author is missing.
-	*
-	* @param	mixed	$comment_ids	Either an array of integers or an integer.
-	* @return	string	Language key for the success message.
-	*/
+	 * Delete comments, where the author is missing.
+	 *
+	 * @param	mixed	$comment_ids	Either an array of integers or an integer.
+	 * @return	string	Language key for the success message.
+	 */
 	public function delete_author_comments($comment_ids)
 	{
 		$this->log->add_log('admin', 'clean_deletecna', 0, 0, array('LOG_CLEANUP_COMMENT_DELETE_NO_AUTHOR', count($comment_ids)));
@@ -148,12 +148,12 @@ 
 	}
 
 	/**
-	* Delete unwanted and obsolent personal galleries.
-	*
-	* @param	array	$unwanted_pegas		User IDs we want to delete the pegas.
-	* @param	array	$obsolent_pegas		User IDs we want to delete the pegas.
-	* @return	array	Language keys for the success messages.
-	*/
+	 * Delete unwanted and obsolent personal galleries.
+	 *
+	 * @param	array	$unwanted_pegas		User IDs we want to delete the pegas.
+	 * @param	array	$obsolent_pegas		User IDs we want to delete the pegas.
+	 * @return	array	Language keys for the success messages.
+	 */
 	public function delete_pegas($unwanted_pegas, $obsolent_pegas)
 	{
 
@@ -284,8 +284,8 @@ 
 	}
 
 	/**
-	*
-	*/
+	 *
+	 */
 	public function prune($pattern)
 	{
 		$sql_where = '';
@@ -329,8 +329,8 @@ 
 	}
 
 	/**
-	*
-	*/
+	 *
+	 */
 	public function lang_prune_pattern($pattern)
 	{
 		if (isset($pattern['image_album_id']))

Braces +2 added lines, -4 removed lines

@@ -196,8 +196,7 @@ 
 			if (isset($user_image_count[(int) $row['image_user_id']]))
 			{
 				$user_image_count[(int) $row['image_user_id']]++;
-			}
-			else
+			} else
 			{
 				$user_image_count[(int) $row['image_user_id']] = 1;
 			}
@@ -246,8 +245,7 @@ 
 				$this->gallery_config->set('newest_pega_username', $newest_pega['username']);
 				$this->gallery_config->set('newest_pega_user_colour', $newest_pega['user_colour']);
 				$this->gallery_config->set('newest_pega_album_id', $newest_pega['album_id']);
-			}
-			else
+			} else
 			{
 				$this->gallery_config->set('newest_pega_user_id', 0);
 				$this->gallery_config->set('newest_pega_username', '');

acpcleanup/acp/main_module.php

Braces +4 added lines, -8 removed lines

@@ -223,14 +223,12 @@ 
 			}
 
 			trigger_error($message_string . adm_back_link($this->u_action));
-		}
-		else if ($delete || $prune || (isset($_POST['cancel'])))
+		} else if ($delete || $prune || (isset($_POST['cancel'])))
 		{
 			if (isset($_POST['cancel']))
 			{
 				trigger_error($user->lang['CLEAN_GALLERY_ABORT'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-			else
+			} else
 			{
 				$user->lang['CLEAN_GALLERY_CONFIRM'] = $user->lang['CONFIRM_CLEAN'];
 				if ($missing_sources)
@@ -261,8 +259,7 @@ 
 						if (in_array($row['album_user_id'], $personals_bad))
 						{
 							$personals_bad_names[] = $row['album_name'];
-						}
-						else
+						} else
 						{
 							$missing_personals_names[] = $row['album_name'];
 						}
@@ -280,8 +277,7 @@ 
 				if ($prune && empty($prune_pattern))
 				{
 					trigger_error($user->lang['CLEAN_PRUNE_NO_PATTERN'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-				else if ($prune && $prune_pattern)
+				} else if ($prune && $prune_pattern)
 				{
 					$user->lang['CLEAN_GALLERY_CONFIRM'] = $user->lang('CONFIRM_PRUNE', $core_cleanup->lang_prune_pattern($prune_pattern)) . '<br />' . $user->lang['CLEAN_GALLERY_CONFIRM'];
 				}

exif/language/bg/exif.php

Spacing +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@ 
 	'EXIF_CAM_MODEL'			=> 'Camera-model',
 	'EXIF_DATE'					=> 'Image taken on',
 	'EXIF_EXPOSURE'				=> 'Shutter speed',
-	'EXIF_EXPOSURE_EXP'			=> '%s Sec',// 'EXIF_EXPOSURE' unit
+	'EXIF_EXPOSURE_EXP'			=> '%s Sec', // 'EXIF_EXPOSURE' unit
 	'EXIF_EXPOSURE_BIAS'		=> 'Exposure bias',
-	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV',// 'EXIF_EXPOSURE_BIAS' unit
+	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV', // 'EXIF_EXPOSURE_BIAS' unit
 	'EXIF_EXPOSURE_PROG'		=> 'Exposure program',
 	'EXIF_EXPOSURE_PROG_0'		=> 'Not defined',
 	'EXIF_EXPOSURE_PROG_1'		=> 'Manual',
@@ -72,7 +72,7 @@ 
 	'EXIF_FLASH_CASE_93'		=> 'Flash fired, auto mode, return light not detected, red-eye reduction mode',
 	'EXIF_FLASH_CASE_95'		=> 'Flash fired, auto mode, return light detected, red-eye reduction mode',
 	'EXIF_FOCAL'				=> 'Focus length',
-	'EXIF_FOCAL_EXP'			=> '%s mm',// 'EXIF_FOCAL' unit
+	'EXIF_FOCAL_EXP'			=> '%s mm', // 'EXIF_FOCAL' unit
 	'EXIF_ISO'					=> 'ISO speed rating',
 	'EXIF_METERING_MODE'		=> 'Metering mode',
 	'EXIF_METERING_MODE_0'		=> 'Unknown',