satanasov / phpbbgallery

core/album/manage.php

Braces +26 added lines, -52 removed lines

@@ -216,8 +216,7 @@ 
 			if ($this->user->data['user_timezone'] == '')
 			{
 				$timezone = 'UTC';
-			}
-			else
+			} else
 			{
 				$timezone = $this->user->data['user_timezone'];
 			}
@@ -229,8 +228,7 @@ 
 			{
 				$errors[] = sprintf($this->language->lang('CONTEST_START_INVALID'), $contest_data['contest_start']);
 				$start_date_error = true;
-			}
-			else
+			} else
 			{
 				$contest_data['contest_start'] = gmmktime((int) $m[4], (int) $m[5], 0, (int) $m[2], (int) $m[3], (int) $m[1]) - $time->getOffset();// - $offset;
 			}
@@ -238,8 +236,7 @@ 
 			{
 				$errors[] = sprintf($this->language->lang('CONTEST_RATING_INVALID'), $contest_data['contest_rating']);
 				$date_error = true;
-			}
-			else if (!$start_date_error)
+			} else if (!$start_date_error)
 			{
 				$contest_data['contest_rating'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset();//- $offset;
 			}
@@ -247,8 +244,7 @@ 
 			{
 				$errors[] = sprintf($this->language->lang('CONTEST_END_INVALID'), $contest_data['contest_end']);
 				$date_error = true;
-			}
-			else if (!$start_date_error)
+			} else if (!$start_date_error)
 			{
 				$contest_data['contest_end'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset();//- $offset;
 			}
@@ -336,8 +332,7 @@ 
 
 					$album_data_sql['left_id'] = $row['right_id'];
 					$album_data_sql['right_id'] = $row['right_id'] + 1;
-				}
-				else
+				} else
 				{
 					$sql = 'UPDATE ' . $this->albums_table . ' 
 						SET left_id = left_id + 2, right_id = right_id + 2
@@ -354,8 +349,7 @@ 
 					$album_data_sql['left_id'] = $row['left_id'] + 1;
 					$album_data_sql['right_id'] = $row['left_id'] + 2;
 				}
-			}
-			else
+			} else
 			{
 				if (!$add_on_top)
 				{
@@ -368,8 +362,7 @@ 
 
 					$album_data_sql['left_id'] = $row['right_id'] + 1;
 					$album_data_sql['right_id'] = $row['right_id'] + 2;
-				}
-				else
+				} else
 				{
 					$sql = 'UPDATE ' . $this->albums_table . ' 
 						SET left_id = left_id + 2, right_id = right_id + 2
@@ -402,8 +395,7 @@ 
 				$this->db->sql_query($sql);
 			}
 			$this->gallery_log->add_log('admin', 'add', $album_data['album_id'], 0, array('LOG_ALBUM_ADD', $album_data['album_name']));
-		}
-		else
+		} else
 		{
 			$row = $this->gallery_album->get_info($album_data_sql['album_id']);
 			$reset_marked_images = false;
@@ -414,22 +406,19 @@ 
 				// Changing a contest to category? No!
 				$errors[] = $this->language->lang('ALBUM_WITH_CONTEST_NO_TYPE_CHANGE');
 				return $errors;
-			}
-			else if ($row['album_type'] != \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST)
+			} else if ($row['album_type'] != \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST)
 			{
 				// Changing a album to contest? No!
 				// Changing a category to contest? No!
 				$errors[] = $this->language->lang('ALBUM_NO_TYPE_CHANGE_TO_CONTEST');
 				return $errors;
-			}
-			else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_CAT && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_UPLOAD)
+			} else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_CAT && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_UPLOAD)
 			{
 				// Changing a category to a album? Yes!
 				// Reset the data (you couldn't upload directly in a cat, you must use a album)
 				$album_data_sql['album_images'] = $album_data_sql['album_images_real'] = $album_data_sql['album_last_image_id'] = $album_data_sql['album_last_user_id'] = $album_data_sql['album_last_image_time'] = $album_data_sql['album_contest'] = 0;
 				$album_data_sql['album_last_username'] = $album_data_sql['album_last_user_colour'] = $album_data_sql['album_last_image_name'] = '';
-			}
-			else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_UPLOAD && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CAT)
+			} else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_UPLOAD && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CAT)
 			{
 				// Changing a album to a category? Yes!
 				// we're turning a uploadable album into a non-uploadable album
@@ -440,22 +429,18 @@ 
 					if ($to_album_id)
 					{
 						$errors = $this->move_album_content($album_data_sql['album_id'], $to_album_id);
-					}
-					else
+					} else
 					{
 						return array($this->language->lang('NO_DESTINATION_ALBUM'));
 					}
-				}
-				else if ($album_data_sql['type_action'] == 'delete')
+				} else if ($album_data_sql['type_action'] == 'delete')
 				{
 					$errors = $this->delete_album_content($album_data_sql['album_id']);
-				}
-				else
+				} else
 				{
 					return array($this->language->lang('NO_ALBUM_ACTION'));
 				}
-			}
-			else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST)
+			} else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST)
 			{
 				// Changing a contest to contest? Yes!
 				// We need to check for the contest_data
@@ -483,8 +468,7 @@ 
 				if ($row['album_id'] != $album_data_sql['parent_id'])
 				{
 					$errors = $this->move_album($album_data_sql['album_id'], $album_data_sql['parent_id']);
-				}
-				else
+				} else
 				{
 					$album_data_sql['parent_id'] = $row['parent_id'];
 				}
@@ -627,13 +611,11 @@ 
 			if ($to_data['right_id'] > $from_data['right_id'])
 			{
 				$diff = '+ ' . ($to_data['right_id'] - $from_data['right_id'] - 1);
-			}
-			else
+			} else
 			{
 				$diff = '- ' . abs($to_data['right_id'] - $from_data['right_id'] - 1);
 			}
-		}
-		else
+		} else
 		{
 			$sql = 'SELECT MAX(right_id) AS right_id
 				FROM ' . $this->albums_table . ' 
@@ -679,14 +661,12 @@ 
 		{
 			$log_action_images = 'IMAGES';
 			$errors = array_merge($errors, $this->delete_album_content($album_id));
-		}
-		else if ($action_images == 'move')
+		} else if ($action_images == 'move')
 		{
 			if (!$images_to_id)
 			{
 				$errors[] = $this->language->lang('NO_DESTINATION_ALBUM');
-			}
-			else
+			} else
 			{
 				$log_action_images = 'MOVE_IMAGES';
 
@@ -700,8 +680,7 @@ 
 				if (!$row)
 				{
 					$errors[] = $this->language->lang('NO_ALBUM');
-				}
-				else
+				} else
 				{
 					$images_to_name = $row['album_name'];
 					$errors = array_merge($errors, $this->move_album_content($album_id, $images_to_id));
@@ -735,14 +714,12 @@ 
 			$sql = 'DELETE FROM ' . $this->albums_table . ' 
 				WHERE ' . $this->db->sql_in_set('album_id', $album_ids);
 			$this->db->sql_query($sql);
-		}
-		else if ($action_subalbums == 'move')
+		} else if ($action_subalbums == 'move')
 		{
 			if (!$subalbums_to_id)
 			{
 				$errors[] = $this->language->lang('NO_DESTINATION_ALBUM');
-			}
-			else
+			} else
 			{
 				$log_action_albums = 'MOVE_ALBUMS';
 
@@ -756,8 +733,7 @@ 
 				if (!$row)
 				{
 					$errors[] = $this->language->lang('NO_ALBUM');
-				}
-				else
+				} else
 				{
 					$subalbums_to_name = $row['album_name'];
 
@@ -792,8 +768,7 @@ 
 			{
 				return $errors;
 			}
-		}
-		else
+		} else
 		{
 			$diff = 2;
 			$sql = 'DELETE FROM ' . $this->albums_table . '  
@@ -1087,8 +1062,7 @@ 
 
 			$move_up_left = $album_row['left_id'];
 			$move_up_right = $album_row['right_id'];
-		}
-		else
+		} else
 		{
 			$left_id = $album_row['left_id'];
 			$right_id = $target['right_id'];

core/acp/albums_module.php

Braces +8 added lines, -16 removed lines

@@ -324,8 +324,7 @@ 
 					if (!$update)
 					{
 						$album_data = $row;
-					}
-					else
+					} else
 					{
 						$album_data['left_id'] = $row['left_id'];
 						$album_data['right_id'] = $row['right_id'];
@@ -333,8 +332,7 @@ 
 					if ($row['album_type'] == (int) \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(
@@ -356,8 +354,7 @@ 
 					/*
 					$album_data['album_password_confirm'] = $album_data['album_password'];
 					*/
-				}
-				else
+				} else
 				{
 					$this->page_title = 'CREATE_ALBUM';
 
@@ -494,8 +491,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),
@@ -635,8 +631,7 @@ 
 		if (!$this->parent_id)
 		{
 			$navigation = $user->lang['GALLERY_INDEX'];
-		}
-		else
+		} else
 		{
 			$navigation = '<a href="' . $this->u_action . '">' . $user->lang['GALLERY_INDEX'] . '</a>';
 
@@ -646,8 +641,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>';
 				}
@@ -678,8 +672,7 @@ 
 				if ($row['album_status'] == (int) \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'] . '" />';
 				}
@@ -705,8 +698,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/controller/moderate.php

Braces +17 added lines, -34 removed lines

@@ -149,8 +149,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_', $album['album_id'], $album['album_user_id']))
@@ -211,8 +210,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_status', $album['album_id'], $album['album_user_id']))
@@ -257,8 +255,7 @@ 
 					$this->url->meta_refresh(3, $back_link);
 					trigger_error($message);
 				}
-			}
-			else
+			} else
 			{
 				$s_hidden_fields = '<input type="hidden" name="action['.$action.']" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
@@ -307,8 +304,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_', $album['album_id'], $album['album_user_id']))
@@ -358,8 +354,7 @@ 
 				$message = $this->language->lang('WAITING_REPORTED_DONE', count($report_ary));
 				$this->url->meta_refresh(3, $back_link);
 				trigger_error($message);
-			}
-			else
+			} else
 			{
 				$s_hidden_fields = '<input type="hidden" name="action['.$action.']" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
@@ -379,8 +374,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_report', $album['album_id'], $album['album_user_id']))
@@ -470,8 +464,7 @@ 
 					$this->url->meta_refresh(3, $back_link);
 					trigger_error($message);
 				}
-			}
-			else
+			} else
 			{
 				$s_hidden_fields = '<input type="hidden" name="select_action" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
@@ -492,8 +485,7 @@ 
 						'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
 					));
 					return $this->helper->render('gallery/mcp_body.html', $this->language->lang('GALLERY'));
-				}
-				else
+				} else
 				{
 					confirm_box(false, $this->language->lang('QUEUES_A_' . strtoupper($action) . '2_CONFIRM'), $s_hidden_fields);
 				}
@@ -508,8 +500,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_', $album['album_id'], $album['album_user_id']))
@@ -583,8 +574,7 @@ 
 					$message = $this->language->lang('WAITING_REPORTED_DONE', 1);
 					$this->url->meta_refresh(3, $back_link);
 					trigger_error($message);
-				}
-				else
+				} else
 				{
 					$s_hidden_fields = '<input type="hidden" name="action" value="reports_close" />';
 					confirm_box(false, $this->language->lang('REPORT_A_CLOSE2_CONFIRM'), $s_hidden_fields);
@@ -621,13 +611,11 @@ 
 			{
 				$select_select .= '<option value="images_approve">' . $this->language->lang('QUEUE_A_APPROVE') . '</option>';
 				$select_select .= '<option value="images_lock">' . $this->language->lang('QUEUE_A_LOCK') . '</option>';
-			}
-			else if ($image_data['image_status'] == 1)
+			} else if ($image_data['image_status'] == 1)
 			{
 				$select_select .= '<option value="images_unapprove">' . $this->language->lang('QUEUE_A_UNAPPROVE') . '</option>';
 				$select_select .= '<option value="images_lock">' . $this->language->lang('QUEUE_A_LOCK') . '</option>';
-			}
-			else
+			} else
 			{
 				$select_select .= '<option value="images_approve">' . $this->language->lang('QUEUE_A_APPROVE') . '</option>';
 				$select_select .= '<option value="images_unapprove">' . $this->language->lang('QUEUE_A_UNAPPROVE') . '</option>';
@@ -646,8 +634,7 @@ 
 			if ($open_report)
 			{
 				$select_select .= '<option value="reports_close">' . $this->language->lang('REPORT_A_CLOSE') . '</option>';
-			}
-			else
+			} else
 			{
 				$select_select .= '<option value="reports_open">' . $this->language->lang('REPORT_A_OPEN') . '</option>';
 			}
@@ -725,8 +712,7 @@ 
 			$message = $this->language->lang('WAITING_APPROVED_IMAGE', 1);
 			meta_refresh($meta_refresh_time, $image_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			$this->template->assign_vars(array(
 				'S_NOTIFY_POSTER'			=> $show_notify,
@@ -775,8 +761,7 @@ 
 			$message = sprintf($this->language->lang('WAITING_UNAPPROVED_IMAGE', 1));
 			meta_refresh($meta_refresh_time, $image_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			$s_hidden_fields = '';
 			confirm_box(false, 'QUEUE_A_UNAPPROVE2', $s_hidden_fields);
@@ -817,8 +802,7 @@ 
 			$this->album->update_info($moving_target);
 			meta_refresh($meta_refresh_time, $image_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			$category_select = $this->album->get_albumbox(false, 'moving_target', $album_id, 'm_move', $album_id);
 			$this->template->assign_vars(array(
@@ -862,8 +846,7 @@ 
 			$message = sprintf($this->language->lang('WAITING_LOCKED_IMAGE',1));
 			meta_refresh($meta_refresh_time, $image_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			$s_hidden_fields = '';
 			confirm_box(false, 'QUEUE_A_LOCK2', $s_hidden_fields);

core/controller/album.php

Braces +8 added lines, -16 removed lines

@@ -142,8 +142,7 @@ 
 		try
 		{
 			$this->loader->load($album_id);
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			throw new \phpbb\exception\http_exception(404, 'ALBUM_NOT_EXIST');
 		}
@@ -203,8 +202,7 @@ 
 					'phpbbgallery_core_album_upload',
 					array('album_id' => (int) $album_id)
 				));
-			}
-			else
+			} else
 			{
 				if ($album_data['contest_start'] + $album_data['contest_rating'] > time())
 				{
@@ -261,8 +259,7 @@ 
 		{
 			$image_status_check = '';
 			$image_counter = $album_data['album_images_real'];
-		}
-		else
+		} else
 		{
 			$image_status_check = " AND (image_status <> " . (int) \phpbbgallery\core\block::STATUS_UNAPPROVED . " OR image_user_id = $user_id)";
 
@@ -279,8 +276,7 @@ 
 		if (in_array($sort_key, array('r', 'ra')))
 		{
 			$sql_help_sort = ', image_id ' . (($sort_dir == 'd') ? 'ASC' : 'DESC');
-		}
-		else
+		} else
 		{
 			$sql_help_sort = ', image_id ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
 		}
@@ -471,8 +467,7 @@ 
 				));
 				$this->url->meta_refresh(3, $back_link);
 				return $this->helper->render('gallery/message.html', $this->language->lang('GALLERY'));
-			}
-			else
+			} else
 			{
 				$this->notifications_helper->add_albums($album_id);
 				$this->template->assign_vars(array(
@@ -481,14 +476,12 @@ 
 				$this->url->meta_refresh(3, $back_link);
 				return $this->helper->render('gallery/message.html', $this->language->lang('GALLERY'));
 			}
-		}
-		else
+		} else
 		{
 			if ($this->notifications_helper->get_watched_album($album_id) == 1)
 			{
 				$lang = $this->language->lang('UNWATCH_ALBUM');
-			}
-			else
+			} else
 			{
 				$lang = $this->language->lang('WATCH_ALBUM');
 			}
@@ -520,8 +513,7 @@ 
 			if (!$this->user->data['is_registered'])
 			{
 				login_box();
-			}
-			else
+			} else
 			{
 				//return $this->error('NOT_AUTHORISED', 403);
 				trigger_error($this->language->lang('NOT_AUTHORISED'));

core/acp/permissions_module.php

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/acp/gallery_logs_module.php

Braces +1 added lines, -2 removed lines

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