satanasov / phpbbgallery

core/acp/main_module.php

Braces +10 added lines, -20 removed lines

@@ -95,8 +95,7 @@ 
 				'U_SOURCE_DIR_STATE'	=>  $this->language->lang('NO_WRITE_ACCESS'),
 				'U_SOURCE_DIR_STATE_ERROR'	=> 1,
 			));
-		}
-		else
+		} else
 		{
 			$template->assign_vars(array(
 				'U_FILE_DIR_STATE'	=>  $this->language->lang('WRITE_ACCESS'),
@@ -109,15 +108,13 @@ 
 					'U_CORE_DIR_STATE'	=>  $this->language->lang('DIR_CREATED'),
 					'U_CORE_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else if (is_writable($phpbbgallery_core_file))
+			} else if (is_writable($phpbbgallery_core_file))
 			{
 				$template->assign_vars(array(
 					'U_CORE_DIR_STATE'	=>  $this->language->lang('WRITE_ACCESS'),
 					'U_CORE_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else
+			} else
 			{
 				$template->assign_vars(array(
 					'U_CORE_DIR_STATE'	=>  $this->language->lang('NO_WRITE_ACCESS'),
@@ -131,15 +128,13 @@ 
 					'U_MEDIUM_DIR_STATE'	=>  $this->language->lang('DIR_CREATED'),
 					'U_MEDIUM_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else if (is_writable($phpbbgallery_core_file_medium))
+			} else if (is_writable($phpbbgallery_core_file_medium))
 			{
 				$template->assign_vars(array(
 					'U_MEDIUM_DIR_STATE'	=>  $this->language->lang('WRITE_ACCESS'),
 					'U_MEDIUM_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else
+			} else
 			{
 				$template->assign_vars(array(
 					'U_MEDIUM_DIR_STATE'	=>  $this->language->lang('NO_WRITE_ACCESS'),
@@ -153,15 +148,13 @@ 
 					'U_MINI_DIR_STATE'	=>  $this->language->lang('DIR_CREATED'),
 					'U_MINI_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else if (is_writable($phpbbgallery_core_file_mini))
+			} else if (is_writable($phpbbgallery_core_file_mini))
 			{
 				$template->assign_vars(array(
 					'U_MINI_DIR_STATE'	=>  $this->language->lang('WRITE_ACCESS'),
 					'U_MINI_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else
+			} else
 			{
 				$template->assign_vars(array(
 					'U_MINI_DIR_STATE'	=>  $this->language->lang('NO_WRITE_ACCESS'),
@@ -175,15 +168,13 @@ 
 					'U_SOURCE_DIR_STATE'	=>  $this->language->lang('DIR_CREATED'),
 					'U_SOURCE_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else if (is_writable($phpbbgallery_core_file_source))
+			} else if (is_writable($phpbbgallery_core_file_source))
 			{
 				$template->assign_vars(array(
 					'U_SOURCE_DIR_STATE'	=>  $this->language->lang('WRITE_ACCESS'),
 					'U_SOURCE_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else
+			} else
 			{
 				$template->assign_vars(array(
 					'U_SOURCE_DIR_STATE'	=>  $this->language->lang('NO_WRITE_ACCESS'),
@@ -282,8 +273,7 @@ 
 					'reset_album_id'	=> $album_id,
 				)));
 			}
-		}
-		else
+		} else
 		{
 			switch ($action)
 			{

core/acp/permissions_module.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 			'misc'	=> array('a_list', 'i_count', 'i_unlimited', 'a_count', 'a_unlimited', 'a_restrict'),
 		);
 		$permissions->p_masks[$gallery_auth::OWN_ALBUM] = array_merge($permissions->cats[$gallery_auth::OWN_ALBUM]['i'], $permissions->cats[$gallery_auth::OWN_ALBUM]['c'], $permissions->cats[$gallery_auth::OWN_ALBUM]['m'], $permissions->cats[$gallery_auth::OWN_ALBUM]['misc']);
-		$permissions->p_masks_anti[$gallery_auth::OWN_ALBUM] = array();// Note: we set i_view to 1 as default, so it's not needed on anti array('i_view');
+		$permissions->p_masks_anti[$gallery_auth::OWN_ALBUM] = array(); // Note: we set i_view to 1 as default, so it's not needed on anti array('i_view');
 
 		// Permissions for personal albums of other users
 		// Note: Do !NOT! hide the i_upload. It's used for the moving-permissions
@@ -1244,7 +1244,7 @@ 
 	{
 		global $user, $phpbb_container;
 
-		$phpbb_ext_gallery_core_auth =  $phpbb_container->get('phpbbgallery.core.auth');
+		$phpbb_ext_gallery_core_auth = $phpbb_container->get('phpbbgallery.core.auth');
 
 		$disabled = false;
 		// We submit a "wrong" array on the check (to make it more easy) so we convert it here

Indentation +12 added lines, -12 removed lines

@@ -51,8 +51,8 @@ 
 		$action = $request->variable('action', '');
 
 		/**
-		* All our beautiful permissions
-		*/
+		 * All our beautiful permissions
+		 */
 		if (!isset($permissions))
 		{
 			$permissions = new \stdClass();
@@ -703,12 +703,12 @@ 
 			$coal = $gallery_cache->get('albums');
 
 			/**
-			* Grab the permissions
-			*
-			* includes/acp/acp_permissions.php says:
-			* // We obtain and check $_POST['setting'][$ug_id][$forum_id] directly and not using request_var() because request_var()
-			* // currently does not support the amount of dimensions required. ;)
-			*/
+			 * Grab the permissions
+			 *
+			 * includes/acp/acp_permissions.php says:
+			 * // We obtain and check $_POST['setting'][$ug_id][$forum_id] directly and not using request_var() because request_var()
+			 * // currently does not support the amount of dimensions required. ;)
+			 */
 			//		$auth_settings = request_var('setting', array(0 => array(0 => array('' => 0))));
 			$requests = $request->variable('setting', array(0 => array(0 => array('' => 0))));
 			$p_mask_count = 0;
@@ -762,8 +762,8 @@ 
 				}
 			}
 			/**
-			* Inherit the permissions
-			*/
+			 * Inherit the permissions
+			 */
 			$inherit = $request->variable('setting', array(0 => array('' => 0)));
 			foreach ($inherit as $c_mask => $v_sets)
 			{
@@ -993,8 +993,8 @@ 
 	}
 
 	/**
-	* Handles copying permissions from one album to others
-	*/
+	 * Handles copying permissions from one album to others
+	 */
 	private function copy_album_permissions()
 	{
 		global $cache, $db, $template, $user, $table_prefix, $phpbb_dispatcher, $table_name, $users_table, $phpbb_container;

Braces +17 added lines, -34 removed lines

@@ -110,8 +110,7 @@ 
 						if (!$submit)
 						{
 							$this->permissions_v_mask();
-						}
-						else
+						} else
 						{
 							$this->permissions_p_mask();
 						}
@@ -449,13 +448,11 @@ 
 		if (!sizeof($group_id) && !sizeof($user_id))
 		{
 			trigger_error('NO_VICTIM_SELECTED', E_USER_WARNING);
-		}
-		else if (sizeof($group_id))
+		} else if (sizeof($group_id))
 		{
 			$victim_mode = 'group';
 			$victim_id = $group_id;
-		}
-		else
+		} else
 		{
 			$victim_mode = 'user';
 			$victim_id = $user_id;
@@ -487,8 +484,7 @@ 
 				$victim_list[$row['group_id']] = $victim_row;
 			}
 			$db->sql_freeresult($result);
-		}
-		else
+		} else
 		{
 			// Get the user information
 			$sql = 'SELECT username, user_id, user_colour
@@ -571,12 +567,10 @@ 
 								if (isset($roles[$role_id][$permission]) && ($roles[$role_id][$permission] == $phpbb_ext_gallery_core_auth::ACL_YES))
 								{
 									$acl_s_yes++;
-								}
-								else if (isset($roles[$role_id][$permission]) && ($roles[$role_id][$permission] == $phpbb_ext_gallery_core_auth::ACL_NEVER))
+								} else if (isset($roles[$role_id][$permission]) && ($roles[$role_id][$permission] == $phpbb_ext_gallery_core_auth::ACL_NEVER))
 								{
 									$acl_s_never++;
-								}
-								else if (isset($roles[$role_id][$permission]) && ($roles[$role_id][$permission] == $phpbb_ext_gallery_core_auth::ACL_NO))
+								} else if (isset($roles[$role_id][$permission]) && ($roles[$role_id][$permission] == $phpbb_ext_gallery_core_auth::ACL_NO))
 								{
 									$acl_s_no++;
 								}
@@ -607,8 +601,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			$template->assign_block_vars('c_mask', array(
 				'C_MASK_ID'				=> $p_system,
@@ -686,13 +679,11 @@ 
 		if (!sizeof($group_id) && !sizeof($user_id))
 		{
 			trigger_error('NO_VICTIM_SELECTED', E_USER_WARNING);
-		}
-		else if (sizeof($group_id))
+		} else if (sizeof($group_id))
 		{
 			$victim_mode = 'group';
 			$victim_id = $group_id;
-		}
-		else
+		} else
 		{
 			$victim_mode = 'user';
 			$victim_id = $user_id;
@@ -741,8 +732,7 @@ 
 						if (substr($p_mask, -6, 6) == '_count')
 						{
 							$auth_settings[$c_mask][$v_mask][$p_mask] = $value;
-						}
-						else
+						} else
 						{
 							$auth_settings[$c_mask][$v_mask][$p_mask] = ($value == ACL_YES) ? $phpbb_ext_gallery_core_auth::ACL_YES : (($value == ACL_NEVER) ? $phpbb_ext_gallery_core_auth::ACL_NEVER : $phpbb_ext_gallery_core_auth::ACL_NO);
 							// Do we have moderators?
@@ -792,15 +782,13 @@ 
 								}
 								// We take all permissions of another c_mask, so:
 								break;
-							}
-							else
+							} else
 							{
 								// The chosen option was disabled: Hacking attempt?!
 								trigger_error('HACKING_ATTEMPT', E_USER_WARNING);
 							}
 						}
-					}
-					else if ($i_mask)
+					} else if ($i_mask)
 					{
 						// Inherit permissions of one [c_mask][v_mask]
 						$v_mask = (int) $v_mask;
@@ -821,8 +809,7 @@ 
 								}
 								$auth_settings[$c_mask][$v_mask] = $auth_settings[$ci_mask][$vi_mask];
 								$p_mask_storage[$auth_settings[$c_mask][$v_mask]]['usage'][] = array('c_mask' => $c_mask, 'v_mask' => $v_mask);
-							}
-							else
+							} else
 							{
 								// The chosen option was disabled: Hacking attempt?!
 								trigger_error('HACKING_ATTEMPT', E_USER_WARNING);
@@ -895,8 +882,7 @@ 
 						$victim_names[$row['group_id']] = $row['group_name'];
 					}
 					$db->sql_freeresult($result);
-				}
-				else
+				} else
 				{
 					// Get username's for the GALLERY_MODSCACHE_TABLE
 					$sql = 'SELECT user_id, username
@@ -962,8 +948,7 @@ 
 									'group_id'		=> $usage['v_mask'],
 									'group_name'	=> $victim_names[$usage['v_mask']],
 								);
-							}
-							else
+							} else
 							{
 								$sql_moderators[] = array(
 									'album_id'		=> $usage['c_mask'],
@@ -972,8 +957,7 @@ 
 								);
 							}
 						}
-					}
-					else
+					} else
 					{
 						$sql_permissions[] = array(
 							'perm_role_id'					=> $role_id,
@@ -1097,8 +1081,7 @@ 
 				$phpbb_ext_gallery_core_auth->set_user_permissions('all', '');
 
 				trigger_error($this->language->lang('COPY_PERMISSIONS_SUCCESSFUL') . adm_back_link($this->u_action));
-			}
-			else
+			} else
 			{
 				$s_hidden_fields = array(
 					'submit'			=> $submit,

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

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