satanasov / phpbbgallery

core/acp/gallery_logs_module.php

Spacing +3 added lines, -3 removed lines

@@ -29,11 +29,11 @@ 
 		add_form_key('acp_logs');
 		$page = $request->variable('page', 0);
 		$filter_log = $request->variable('lf', 'all');
-		$sort_days	= $request->variable('st', 0);
+		$sort_days = $request->variable('st', 0);
 		$sort_key	= $request->variable('sk', 't');
 		$sort_dir	= $request->variable('sd', 'd');
 		$deletemark = $request->variable('delmarked', false, false, \phpbb\request\request_interface::POST);
-		$marked		= $request->variable('mark', array(0));
+		$marked = $request->variable('mark', array(0));
 		$log = $phpbb_container->get('phpbbgallery.core.log');
 
 		// Delete entries if requested and able
@@ -123,7 +123,7 @@ 
 				{
 					$additional['sort_dir'] = $sort_dir;
 				}
-				$log->build_list($filter_log, 25, ($page/25) + 1, -1, 0, $additional);
+				$log->build_list($filter_log, 25, ($page / 25) + 1, -1, 0, $additional);
 			break;
 
 			default:

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
 			if (confirm_box(true))
 			{
 				$log->delete_logs($marked);
-			}
-			else
+			} else
 			{
 				confirm_box(false, $this->language->lang('CONFIRM_OPERATION'), build_hidden_fields(array(
 					'page'		=> $page,

core/notification/events/phpbbgallery_new_report.php

Indentation +33 added lines, -33 removed lines

@@ -11,20 +11,20 @@ 
 class phpbbgallery_new_report extends \phpbb\notification\type\base
 {
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'phpbbgallery.core.notification.new_report';
 	}
 	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
+	 * Notification option data (for outputting to the user)
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 * 					Array of data (including keys 'id', 'lang', and 'group')
+	 */
 	public static $notification_option = array(
 		'lang'	=> 'NOTIFICATION_TYPE_PHPBBGALLERY_NEW_REPORT',
 	);
@@ -46,10 +46,10 @@ 
 	}
 
 	/**
-	* Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
-	*
-	* @return bool True/False whether or not this is available to the user
-	*/
+	 * Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
 	public function is_available()
 	{
 		return true;
@@ -103,10 +103,10 @@ 
 	}
 
 	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
+	 * Get the HTML formatted title of this notification
+	 *
+	 * @return string
+	 */
 	public function get_title()
 	{
 		$users = array($this->get_data('reporter'));
@@ -116,19 +116,19 @@ 
 	}
 
 	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
+	 * Get email template
+	 *
+	 * @return string|bool
+	 */
 	public function get_email_template()
 	{
 		return false;
 	}
 	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
+	 * Get email template variables
+	 *
+	 * @return array
+	 */
 	public function get_email_template_variables()
 	{
 		return array();
@@ -155,14 +155,14 @@ 
 	}
 
 	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $data The data for the updated rules
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion)
+	 *
+	 * @param array $data The data for the updated rules
+	 * @param array $pre_create_data Data from pre_create_insert_array()
+	 *
+	 * @return array Array of data ready to be inserted into the database
+	 */
 	public function create_insert_array($data, $pre_create_data = array())
 	{
 		$this->set_data('item_id', $data['item_id']);

core/notification/events/phpbbgallery_new_comment.php

Indentation +25 added lines, -25 removed lines

@@ -11,20 +11,20 @@ 
 class phpbbgallery_new_comment extends \phpbb\notification\type\base
 {
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'phpbbgallery.core.notification.new_comment';
 	}
 	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
+	 * Notification option data (for outputting to the user)
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 * 					Array of data (including keys 'id', 'lang', and 'group')
+	 */
 	public static $notification_option = array(
 		'lang'	=> 'NOTIFICATION_TYPE_PHPBBGALLERY_NEW_COMMENT',
 	);
@@ -46,10 +46,10 @@ 
 	}
 
 	/**
-	* Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
-	*
-	* @return bool True/False whether or not this is available to the user
-	*/
+	 * Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
 	public function is_available()
 	{
 		return true;
@@ -156,24 +156,24 @@ 
 	}
 
 	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
+	 * Users needed to query before this notification can be displayed
+	 *
+	 * @return array Array of user_ids
+	 */
 	public function users_to_query()
 	{
 		return array();
 	}
 
 	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $data The data for the updated rules
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion)
+	 *
+	 * @param array $data The data for the updated rules
+	 * @param array $pre_create_data Data from pre_create_insert_array()
+	 *
+	 * @return array Array of data ready to be inserted into the database
+	 */
 	public function create_insert_array($data, $pre_create_data = array())
 	{
 		$this->set_data('image_id', $data['image_id']);

core/notification/events/phpbbgallery_new_image.php

Indentation +35 added lines, -35 removed lines

@@ -11,20 +11,20 @@ 
 class phpbbgallery_new_image extends \phpbb\notification\type\base
 {
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'phpbbgallery.core.notification.new_image';
 	}
 	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
+	 * Notification option data (for outputting to the user)
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 * 					Array of data (including keys 'id', 'lang', and 'group')
+	 */
 	public static $notification_option = array(
 		'lang'	=> 'NOTIFICATION_TYPE_PHPBBGALLERY_NEW_IMAGE',
 	);
@@ -46,10 +46,10 @@ 
 	}
 
 	/**
-	* Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
-	*
-	* @return bool True/False whether or not this is available to the user
-	*/
+	 * Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
 	public function is_available()
 	{
 		return true;
@@ -93,17 +93,17 @@ 
 	}
 
 	/**
-	* Get the user's avatar
-	*/
+	 * Get the user's avatar
+	 */
 	public function get_avatar()
 	{
 		return 0;
 	}
 	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
+	 * Get the HTML formatted title of this notification
+	 *
+	 * @return string
+	 */
 	public function get_title()
 	{
 		return $this->language->lang('NOTIFICATION_PHPBBGALLERY_NEW_IMAGE', $this->get_data('album_name'));
@@ -121,19 +121,19 @@ 
 	}
 
 	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
+	 * Get email template
+	 *
+	 * @return string|bool
+	 */
 	public function get_email_template()
 	{
 		return false;
 	}
 	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
+	 * Get email template variables
+	 *
+	 * @return array
+	 */
 	public function get_email_template_variables()
 	{
 		return array();
@@ -160,14 +160,14 @@ 
 	}
 
 	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $data The data for the updated rules
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion)
+	 *
+	 * @param array $data The data for the updated rules
+	 * @param array $pre_create_data Data from pre_create_insert_array()
+	 *
+	 * @return array Array of data ready to be inserted into the database
+	 */
 	public function create_insert_array($data, $pre_create_data = array())
 	{
 		$this->set_data('album_name', $data['album_name']);

core/notification/events/phpbbgallery_image_for_approval.php

Indentation +29 added lines, -29 removed lines

@@ -11,20 +11,20 @@ 
 class phpbbgallery_image_for_approval extends \phpbb\notification\type\base
 {
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'phpbbgallery.core.notification.image_for_approval';
 	}
 	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
+	 * Notification option data (for outputting to the user)
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 * 					Array of data (including keys 'id', 'lang', and 'group')
+	 */
 	public static $notification_option = array(
 		'lang'	=> 'NOTIFICATION_TYPE_PHPBBGALLERY_IMAGE_FOR_APPROVE',
 	);
@@ -46,10 +46,10 @@ 
 	}
 
 	/**
-	* Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
-	*
-	* @return bool True/False whether or not this is available to the user
-	*/
+	 * Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
 	public function is_available()
 	{
 		return true;
@@ -127,19 +127,19 @@ 
 	}
 
 	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
+	 * Get email template
+	 *
+	 * @return string|bool
+	 */
 	public function get_email_template()
 	{
 		return false;
 	}
 	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
+	 * Get email template variables
+	 *
+	 * @return array
+	 */
 	public function get_email_template_variables()
 	{
 		return array();
@@ -166,14 +166,14 @@ 
 	}
 
 	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $data The data for the updated rules
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion)
+	 *
+	 * @param array $data The data for the updated rules
+	 * @param array $pre_create_data Data from pre_create_insert_array()
+	 *
+	 * @return array Array of data ready to be inserted into the database
+	 */
 	public function create_insert_array($data, $pre_create_data = array())
 	{
 		$this->set_data('album_name', $data['album_name']);

core/notification/events/phpbbgallery_image_not_approved.php

Indentation +25 added lines, -25 removed lines

@@ -10,20 +10,20 @@ 
 class phpbbgallery_image_not_approved extends \phpbb\notification\type\base
 {
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'phpbbgallery.core.notification.image_not_approved';
 	}
 	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
+	 * Notification option data (for outputting to the user)
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 * 					Array of data (including keys 'id', 'lang', and 'group')
+	 */
 	public static $notification_option = array(
 		'lang'	=> 'NOTIFICATION_TYPE_PHPBBGALLERY_IMAGE_NOT_APPROVED',
 	);
@@ -45,10 +45,10 @@ 
 	}
 
 	/**
-	* Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
-	*
-	* @return bool True/False whether or not this is available to the user
-	*/
+	 * Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
 	public function is_available()
 	{
 		return true;
@@ -139,10 +139,10 @@ 
 	}
 
 	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
+	 * Users needed to query before this notification can be displayed
+	 *
+	 * @return array Array of user_ids
+	 */
 	public function users_to_query()
 	{
 		return array();
@@ -150,14 +150,14 @@ 
 
 
 	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $data The data for the updated rules
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion)
+	 *
+	 * @param array $data The data for the updated rules
+	 * @param array $pre_create_data Data from pre_create_insert_array()
+	 *
+	 * @return array Array of data ready to be inserted into the database
+	 */
 	public function create_insert_array($data, $pre_create_data = array())
 	{
 		$this->set_data('album_name', $data['album_name']);

core/notification/events/phpbbgallery_image_approved.php

Indentation +25 added lines, -25 removed lines

@@ -11,20 +11,20 @@ 
 class phpbbgallery_image_approved extends \phpbb\notification\type\base
 {
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'phpbbgallery.core.notification.image_approved';
 	}
 	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
+	 * Notification option data (for outputting to the user)
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 * 					Array of data (including keys 'id', 'lang', and 'group')
+	 */
 	public static $notification_option = array(
 		'lang'	=> 'NOTIFICATION_TYPE_PHPBBGALLERY_IMAGE_APPROVED',
 	);
@@ -46,10 +46,10 @@ 
 	}
 
 	/**
-	* Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
-	*
-	* @return bool True/False whether or not this is available to the user
-	*/
+	 * Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
 	public function is_available()
 	{
 		return true;
@@ -140,10 +140,10 @@ 
 	}
 
 	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
+	 * Users needed to query before this notification can be displayed
+	 *
+	 * @return array Array of user_ids
+	 */
 	public function users_to_query()
 	{
 		return array();
@@ -151,14 +151,14 @@ 
 
 
 	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $data The data for the updated rules
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion)
+	 *
+	 * @param array $data The data for the updated rules
+	 * @param array $pre_create_data Data from pre_create_insert_array()
+	 *
+	 * @return array Array of data ready to be inserted into the database
+	 */
 	public function create_insert_array($data, $pre_create_data = array())
 	{
 		$this->set_data('album_name', $data['album_name']);

core/notification/helper.php

Indentation +5 added lines, -5 removed lines

@@ -235,11 +235,11 @@
 	}
 
 	/**
-	* Remove albums from watch-list
-	*
-	* @param	mixed	$album_ids		Array or integer with album_id where we delete from the watch-list.
-	* @param	mixed	$user_ids		If not set, it uses the currents user_id
-	*/
+	 * Remove albums from watch-list
+	 *
+	 * @param	mixed	$album_ids		Array or integer with album_id where we delete from the watch-list.
+	 * @param	mixed	$user_ids		If not set, it uses the currents user_id
+	 */
 	public function remove_albums($album_ids, $user_ids = false)
 	{
 		$album_ids = $this->cast_mixed_int2array($album_ids);

Braces +1 added lines, -2 removed lines

@@ -263,8 +263,7 @@
 		if (is_array($ids))
 		{
 			return array_map('intval', $ids);
-		}
-		else
+		} else
 		{
 			return array((int) $ids);
 		}

core/misc.php

Spacing +3 added lines, -3 removed lines

@@ -132,7 +132,7 @@ 
 
 			$sql = 'SELECT album_id
 				FROM ' . $this->track_table . '
-				WHERE user_id = ' . (int) $this->user->data['user_id'] .'
+				WHERE user_id = ' . (int) $this->user->data['user_id'] . '
 					AND ' . $this->db->sql_in_set('album_id', $album_id);
 			$result = $this->db->sql_query($sql);
 
@@ -147,7 +147,7 @@ 
 			{
 				$sql = 'UPDATE ' . $this->track_table . '
 					SET mark_time = ' . time() . '
-					WHERE user_id = '. (int) $this->user->data['user_id'] .'
+					WHERE user_id = '. (int) $this->user->data['user_id'] . '
 						AND ' . $this->db->sql_in_set('album_id', $sql_update);
 				$this->db->sql_query($sql);
 			}
@@ -178,7 +178,7 @@ 
 
 			$sql = 'UPDATE ' . $this->track_table . '
 				SET mark_time = ' . time() . '
-				WHERE user_id = ' . (int) $this->user->data['user_id'] .'
+				WHERE user_id = ' . (int) $this->user->data['user_id'] . '
 					AND album_id = ' . (int) $album_id;
 			$this->db->sql_query($sql);
 

Braces +4 added lines, -8 removed lines

@@ -72,14 +72,12 @@ 
 			if ($login_explain && isset($this->user->lang[$login_explain]))
 			{
 				$login_explain = $this->user->lang($login_explain);
-			}
-			else
+			} else
 			{
 				$login_explain = '';
 			}
 			login_box($loginlink, $login_explain);
-		}
-		else
+		} else
 		{
 			$this->url->meta_refresh(3, $backlink);
 			trigger_error('NOT_AUTHORISED');
@@ -121,8 +119,7 @@ 
 			}
 
 			return;
-		}
-		else if ($mode == 'albums')
+		} else if ($mode == 'albums')
 		{
 			// Mark album read
 			if (!is_array($album_id))
@@ -168,8 +165,7 @@ 
 			}
 
 			return;
-		}
-		else if ($mode == 'album')
+		} else if ($mode == 'album')
 		{
 			if ($album_id === false)
 			{