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

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

core/ucp/main_module.php

Braces +13 added lines, -26 removed lines

@@ -108,8 +108,7 @@ 
 						if (!$phpbb_ext_gallery_user->get_data('personal_album_id'))
 						{
 							$this->info();
-						}
-						else
+						} else
 						{
 							$this->manage_albums();
 						}
@@ -142,8 +141,7 @@ 
 				'L_TITLE'			=> $this->language->lang('UCP_GALLERY_PERSONAL_ALBUMS'),
 				'L_TITLE_EXPLAIN'	=> $this->language->lang('NO_PERSONAL_ALBUM'),
 			));
-		}
-		else
+		} else
 		{
 			$phpbb_gallery_url->redirect('phpbb', 'ucp', 'i=-phpbbgallery-core-ucp-main_module&mode=manage_albums&action=manage');
 		}
@@ -230,8 +228,7 @@ 
 		if (!$parent_id)
 		{
 			$navigation = $this->language->lang('PERSONAL_ALBUM');
-		}
-		else
+		} else
 		{
 			$navigation = $this->language->lang('PERSONAL_ALBUM');
 
@@ -241,8 +238,7 @@ 
 				if ($row['album_id'] == $parent_id)
 				{
 					$navigation .= ' » ' . $row['album_name'];
-				}
-				else
+				} else
 				{
 					$navigation .= ' &raquo; <a href="' . $this->u_action . '&amp;action=manage&amp;parent_id=' . $row['album_id'] . '">' . $row['album_name'] . '</a>';
 				}
@@ -357,8 +353,7 @@ 
 				'S_AUTH_ACCESS_OPTIONS'		=> $s_access_options,
 				'L_ALBUM_ACCESS_EXPLAIN'	=> $this->language->lang('ALBUM_ACCESS_EXPLAIN', '<a href="' . $phpbb_gallery_url->append_sid('phpbb', 'faq') . '#f6r0">', '</a>'),
 			));
-		}
-		else
+		} else
 		{
 			if (!check_form_key('ucp_gallery'))
 			{
@@ -506,8 +501,7 @@ 
 
 				'S_MODE' 					=> 'edit',
 			));
-		}
-		else
+		} else
 		{
 			// Is it salty ?
 			if (!check_form_key('ucp_gallery'))
@@ -591,8 +585,7 @@ 
 						WHERE album_user_id = ' . (int) $row['album_user_id'] . '
 							AND right_id >= ' . (int) $row['left_id'];
 					$db->sql_query($sql);
-				}
-				else
+				} else
 				{
 					$sql = 'UPDATE ' . $albums_table . '
 						SET left_id = left_id - ' . $moving_ids . '
@@ -638,8 +631,7 @@ 
 			if ($album_data['album_name'] == '')
 			{
 				$album_data['album_name'] = $row['album_name'];
-			}
-			else if ($row['album_name'] != $album_data['album_name'])
+			} else if ($row['album_name'] != $album_data['album_name'])
 			{
 				$sql = 'UPDATE ' . $albums_table . "
 					SET album_parents = ''";
@@ -650,8 +642,7 @@ 
 			if (isset($config['zebra_enhance_version']))
 			{
 				$album_data['album_auth_access'] = min(4, max(0, $album_data['album_auth_access']));
-			}
-			else
+			} else
 			{
 				$album_data['album_auth_access'] = min(3, max(0, $album_data['album_auth_access']));
 			}
@@ -804,8 +795,7 @@ 
 						$phpbb_ext_gallery_config->set('newest_pega_username', $newest_pgallery['username']);
 						$phpbb_ext_gallery_config->set('newest_pega_user_colour', $newest_pgallery['user_colour']);
 						$phpbb_ext_gallery_config->set('newest_pega_album_id', $newest_pgallery['album_id']);
-					}
-					else
+					} else
 					{
 						$phpbb_ext_gallery_config->set('newest_pega_user_id', 0);
 						$phpbb_ext_gallery_config->set('newest_pega_username', '');
@@ -813,8 +803,7 @@ 
 						$phpbb_ext_gallery_config->set('newest_pega_album_id', 0);
 					}
 				}
-			}
-			else
+			} else
 			{
 				// Solve the left_id right_id problem
 				$delete_id = $right_id - ($left_id - 1);
@@ -855,8 +844,7 @@ 
 
 			trigger_error($this->language->lang('DELETED_ALBUMS') . '<br /><br />
 				<a href="' . (($parent_id) ? $phpbb_gallery_url->append_sid('phpbb', 'ucp', 'i=-phpbbgallery-core-ucp-main_module&amp;mode=manage_albums&amp;action=manage&amp;parent_id=' . $parent_id) : $phpbb_gallery_url->append_sid('phpbb', 'ucp', 'i=-phpbbgallery-core-ucp-main_module&amp;mode=manage_albums')) . '">' . $this->language->lang('BACK_TO_PREV') . '</a>');
-		}
-		else
+		} else
 		{
 			$album_id = $request->variable('album_id', 0);
 			$phpbb_ext_gallery_core_album->check_user($album_id);
@@ -899,8 +887,7 @@ 
 
 			$move_up_left = $moving['left_id'];
 			$move_up_right = $moving['right_id'];
-		}
-		else
+		} else
 		{
 			$left_id = $moving['left_id'];
 			$right_id = $target['right_id'];

core/url.php

Braces +5 added lines, -10 removed lines

@@ -121,8 +121,7 @@ 
 		{
 			$mode = array_shift($args);
 			$args[0] = $this->path($mode) . $this->phpEx_file($args[0]);
-		}
-		else
+		} else
 		{
 			$args[0] = $this->path() . $this->phpEx_file($args[0]);
 		}
@@ -197,8 +196,7 @@ 
 		if (!is_array($file))
 		{
 			include($this->path($path) . $sub_directory . $this->phpEx_file($file));
-		}
-		else
+		} else
 		{
 			foreach ($file as $real_file)
 			{
@@ -244,8 +242,7 @@ 
 			if (strpos($path, 'https:/') === 0)
 			{
 				$path = 'https://' . substr($path, 7);
-			}
-			else if (strpos($path, 'http:/') === 0)
+			} else if (strpos($path, 'http:/') === 0)
 			{
 				$path = 'http://' . substr($path, 6);
 			}
@@ -300,15 +297,13 @@ 
 		if ($this->config['force_server_vars'] == 1)
 		{
 			$url = $this->config['server_protocol'] . $url;
-		}
-		else
+		} else
 		{
 			$is_secure = $this->request->server('HTTPS', '');
 			if ($is_secure == 'on')
 			{
 				$url = 'https://' . $url;
-			}
-			else
+			} else
 			{
 				$url = 'http://' . $url;
 			}

acpimport/migrations/m1_init.php

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
 			if (is_dir($file))
 			{
 				recursiveRemoveDirectory($file);
-			}
-			else
+			} else
 			{
 				unlink($file);
 			}

acpimport/acp/main_module.php

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)