satanasov / phpbbgallery

core/comment.php

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);
 		}

core/auth/auth.php

Braces +22 added lines, -41 removed lines

@@ -130,9 +130,7 @@ 
 		{
 			$this->unserialize_auth_data($cached_permissions);
 			return;
-		}
-
-		else if ($user_id != $this->user->user_id)
+		} else if ($user_id != $this->user->user_id)
 		{
 			$this->user->set_user_id($user_id);
 			$cached_permissions = $this->user->get_data('user_permissions');
@@ -252,8 +250,7 @@ 
 			if (!isset($acl_array[$key]))
 			{
 				$acl_array[$key] = $key . '::' . $a_id;
-			}
-			else
+			} else
 			{
 				$acl_array[$key] .= ':' . $a_id;
 			}
@@ -302,8 +299,7 @@ 
 				if ($data[$permission] == self::ACL_NEVER)
 				{
 					$this->_auth_data_never[$album_id]->set_bit(self::$_permissions_flipped[$permission], true);
-				}
-				else if ($data[$permission] == self::ACL_YES)
+				} else if ($data[$permission] == self::ACL_YES)
 				{
 					$this->_auth_data[$album_id]->set_bit(self::$_permissions_flipped[$permission], true);
 					if (substr($permission, 0, 2) == 'm_')
@@ -311,8 +307,7 @@ 
 						$this->_auth_data[$album_id]->set_bit(self::$_permissions_flipped['m_'], true);
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->_auth_data[$album_id]->set_count($permission, $data[$permission]);
 			}
@@ -358,17 +353,17 @@ 
 		$albums = array();//@todo $this->cache->obtain_album_list();
 		foreach ($albums as $album)
 		{
-			if (!$album['album_auth_access'] || ($album['album_user_id'] == self::PUBLIC_ALBUM))# || ($album['album_user_id'] == $user_id))
+			if (!$album['album_auth_access'] || ($album['album_user_id'] == self::PUBLIC_ALBUM)) {
+				# || ($album['album_user_id'] == $user_id))
 			{
 				continue;
 			}
-			else if ($user_id == ANONYMOUS)
+			} else if ($user_id == ANONYMOUS)
 			{
 				// Level 1: No guests
 				$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
 				continue;
-			}
-			else if ($album['album_auth_access'] == self::ACCESS_NOT_FOES)
+			} else if ($album['album_auth_access'] == self::ACCESS_NOT_FOES)
 			{
 				if ($zebra == null)
 				{
@@ -380,8 +375,7 @@ 
 					$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
 					continue;
 				}
-			}
-			else if ($album['album_auth_access'] == self::ACCESS_SPECIAL_FRIENDS)
+			} else if ($album['album_auth_access'] == self::ACCESS_SPECIAL_FRIENDS)
 			{
 				if ($zebra == null)
 				{
@@ -393,8 +387,7 @@ 
 					$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
 					continue;
 				}
-			}
-			else if ($album['album_auth_access'] == self::ACCESS_FRIENDS)
+			} else if ($album['album_auth_access'] == self::ACCESS_FRIENDS)
 			{
 				if ($zebra == null)
 				{
@@ -428,21 +421,18 @@ 
 			if ($row['foe'])
 			{
 				$zebra['foe'][] = (int) $row['user_id'];
-			}
-			else
+			} else
 			{
 				if (isset($row['bff']))
 				{
 					if ($row['bff'])
 					{
 						$zebra['bff'][] = (int) $row['user_id'];
-					}
-					else
+					} else
 					{
 						$zebra['friend'][] = (int) $row['user_id'];
 					}
-				}
-				else
+				} else
 				{
 					$zebra['friend'][] = (int) $row['user_id'];
 				}
@@ -487,16 +477,13 @@ 
 			if (in_array($album_author, $zebra_array['foe']))
 			{
 				$state = 1;
-			}
-			else if (in_array($album_author, $zebra_array['friend']))
+			} else if (in_array($album_author, $zebra_array['friend']))
 			{
 				$state = 3;
-			}
-			else if (in_array($album_author, $zebra_array['bff']))
+			} else if (in_array($album_author, $zebra_array['bff']))
 			{
 				$state = 4;
-			}
-			else
+			} else
 			{
 				$state = 2;
 			}
@@ -543,12 +530,10 @@ 
 		if (is_array($user_ids))
 		{
 			$sql_where = 'WHERE ' . $this->db->sql_in_set('user_id', array_map('intval', $user_ids));
-		}
-		else if ($user_ids == 'all')
+		} else if ($user_ids == 'all')
 		{
 			$sql_where = '';
-		}
-		else
+		} else
 		{
 			$sql_where = 'WHERE user_id = ' . (int) $user_ids;
 		}
@@ -617,8 +602,7 @@ 
 			if ($this->user->is_user($u_id))
 			{
 				$p_id = self::OWN_ALBUM;
-			}
-			else
+			} else
 			{
 				if (!isset($this->_auth_data[$a_id]))
 				{
@@ -700,12 +684,10 @@ 
 			if ($this->user->is_user($album['album_user_id']))
 			{
 				$a_id = self::OWN_ALBUM;
-			}
-			else if ($album['album_user_id'] > self::PUBLIC_ALBUM)
+			} else if ($album['album_user_id'] > self::PUBLIC_ALBUM)
 			{
 				$a_id = self::PERSONAL_ALBUM;
-			}
-			else
+			} else
 			{
 				$a_id = $album['album_id'];
 			}
@@ -755,8 +737,7 @@ 
 		if ($album_data['album_user_id'] != 0)
 		{
 			$sql = 'SELECT * FROM ' . $this->table_permissions . ' WHERE ' . $this->db->sql_in_set('perm_system', array(-2, -3));
-		}
-		else
+		} else
 		{
 			$sql = 'SELECT * FROM ' . $this->table_permissions . ' WHERE perm_album_id = ' . (int) $album_id;
 		}

core/acp/albums_module.php

Braces +8 added lines, -16 removed lines

@@ -321,8 +321,7 @@ 
 					if (!$update)
 					{
 						$album_data = $row;
-					}
-					else
+					} else
 					{
 						$album_data['left_id'] = $row['left_id'];
 						$album_data['right_id'] = $row['right_id'];
@@ -330,8 +329,7 @@ 
 					if ($row['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST)
 					{
 						$contest_data = $phpbb_gallery_contest->get_contest($album_id, 'album');
-					}
-					else
+					} else
 					{
 						// Default values, 3 days later rate and 7 for the end of the contest
 						$contest_data = array(
@@ -353,8 +351,7 @@ 
 					/*
 					$album_data['album_password_confirm'] = $album_data['album_password'];
 					*/
-				}
-				else
+				} else
 				{
 					$this->page_title = 'CREATE_ALBUM';
 
@@ -491,8 +488,7 @@ 
 						'S_HAS_SUBALBUMS'		=> ($album_data['right_id'] - $album_data['left_id'] > 1) ? true : false,
 						'S_ALBUMS_LIST'			=> $albums_list,
 					));
-				}
-				else if ($uploadable_album_exists)
+				} else if ($uploadable_album_exists)
 				{
 					$template->assign_vars(array(
 						'S_MOVE_ALBUM_OPTIONS'		=> $phpbb_ext_gallery_core_album->get_albumbox(true, '', $album_data['parent_id'], false, $album_id, 0, \phpbbgallery\core\block::TYPE_UPLOAD),
@@ -632,8 +628,7 @@ 
 		if (!$this->parent_id)
 		{
 			$navigation = $user->lang['GALLERY_INDEX'];
-		}
-		else
+		} else
 		{
 			$navigation = '<a href="' . $this->u_action . '">' . $user->lang['GALLERY_INDEX'] . '</a>';
 
@@ -643,8 +638,7 @@ 
 				if ($row['album_id'] == $this->parent_id)
 				{
 					$navigation .= ' -&gt; ' . $row['album_name'];
-				}
-				else
+				} else
 				{
 					$navigation .= ' -&gt; <a href="' . $this->u_action . '&amp;parent_id=' . $row['album_id'] . '">' . $row['album_name'] . '</a>';
 				}
@@ -675,8 +669,7 @@ 
 				if ($row['album_status'] == \phpbbgallery\core\block::ALBUM_LOCKED)
 				{
 					$folder_image = '<img src="images/icon_folder_lock.gif" alt="' . $user->lang['LOCKED'] . '" />';
-				}
-				else
+				} else
 				{
 					$folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="' . $user->lang['SUBALBUM'] . '" />' : '<img src="images/icon_folder.gif" alt="' . $user->lang['FOLDER'] . '" />';
 				}
@@ -702,8 +695,7 @@ 
 				);
 			}
 			while ($row = $db->sql_fetchrow($result));
-		}
-		else if ($this->parent_id)
+		} else if ($this->parent_id)
 		{
 			$row = $phpbb_ext_gallery_core_album->get_info($this->parent_id);
 

core/acp/config_module.php

Braces +4 added lines, -8 removed lines

@@ -226,8 +226,7 @@ 
 				if (is_array($langs_var))
 				{
 					$vars['append'] = ' ' . substr($this->language->lang($vars['append'], 0), 1);
-				}
-				else
+				} else
 				{
 					$vars['append'] = ' ' . $this->language->lang($vars['append']);
 				}
@@ -577,8 +576,7 @@ 
 		if ($key != 'link_imagepage')
 		{
 			$sort_order_options .= '<option' . (($value == 'image_page') ? ' selected="selected"' : '') . " value='image_page'>" . $this->language->lang('UC_LINK_IMAGE_PAGE') . '</option>';
-		}
-		else
+		} else
 		{
 			$sort_order_options .= '<option' . (($value == 'next') ? ' selected="selected"' : '') . " value='next'>" . $this->language->lang('UC_LINK_NEXT') . '</option>';
 		}
@@ -658,12 +656,10 @@ 
 		if ($value == 'image_page')
 		{
 			$bbcode_tpl = '<a href="' . $gallery_url . 'image/{NUMBER}"><img src="' . $gallery_url . 'image/{NUMBER}/mini" alt="{NUMBER}" /></a>';
-		}
-		else if ($value == 'image')
+		} else if ($value == 'image')
 		{
 			$bbcode_tpl = '<a href="' . $gallery_url . 'image/{NUMBER}/source"><img src="' . $gallery_url . 'image/{NUMBER}/mini" alt="{NUMBER}" /></a>';
-		}
-		else
+		} else
 		{
 			$bbcode_tpl = '<img src="' . $gallery_url . 'image/{NUMBER}/mini" alt="{NUMBER}" />';
 		}

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

Braces +17 added lines, -34 removed lines

@@ -96,8 +96,7 @@ 
 						if (!$submit)
 						{
 							$this->permissions_v_mask();
-						}
-						else
+						} else
 						{
 							$this->permissions_p_mask();
 						}
@@ -440,13 +439,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;
@@ -478,8 +475,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
@@ -562,12 +558,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++;
 								}
@@ -596,8 +590,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			$template->assign_block_vars('c_mask', array(
 				'C_MASK_ID'				=> $p_system,
@@ -673,13 +666,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;
@@ -728,8 +719,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?
@@ -779,15 +769,13 @@ 
 								}
 								// We take all permissions of another c_mask, so:
 								break;
-							}
-							else
+							} else
 							{
 								// The choosen 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;
@@ -808,8 +796,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 choosen option was disabled: Hacking attempt?!
 								trigger_error('HACKING_ATTEMPT', E_USER_WARNING);
@@ -882,8 +869,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
@@ -949,8 +935,7 @@ 
 									'group_id'		=> $usage['v_mask'],
 									'group_name'	=> $victim_names[$usage['v_mask']],
 								);
-							}
-							else
+							} else
 							{
 								$sql_moderators[] = array(
 									'album_id'		=> $usage['c_mask'],
@@ -959,8 +944,7 @@ 
 								);
 							}
 						}
-					}
-					else
+					} else
 					{
 						$sql_permissions[] = array(
 							'perm_role_id'					=> $role_id,
@@ -1084,8 +1068,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/acp/gallery_logs_module.php

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/misc.php

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)
 			{

core/cache.php

Braces +1 added lines, -2 removed lines

@@ -180,8 +180,7 @@
 		if ($subtarget)
 		{
 			$this->phpbb_cache->destroy($target, $subtarget);
-		}
-		else
+		} else
 		{
 			$this->phpbb_cache->destroy($target);
 		}