satanasov / phpbbgallery

core/album/display.php

Spacing +6 added lines, -6 removed lines

@@ -96,7 +96,7 @@ 
 
 		$sql = 'SELECT a2.*
 			FROM ' . $this->table_albums . ' a1
-			LEFT JOIN ' . $this->table_albums . ' a2 ON (' . $condition .') AND a2.album_user_id = ' . (int) $branch_user_id .'
+			LEFT JOIN ' . $this->table_albums . ' a2 ON (' . $condition . ') AND a2.album_user_id = ' . (int) $branch_user_id . '
 			WHERE a1.album_id = ' . (int) $album_id . '
 				AND a1.album_user_id = ' . (int) $branch_user_id . '
 			ORDER BY a2.left_id ' . (($order == 'descending') ? 'ASC' : 'DESC');
@@ -179,9 +179,9 @@ 
 			'ALBUM_ID' 		=> $album_data['album_id'],
 			'ALBUM_NAME'	=> $album_data['album_name'],
 			'ALBUM_DESC'	=> generate_text_for_display($album_data['album_desc'], $album_data['album_desc_uid'], $album_data['album_desc_bitfield'], $album_data['album_desc_options']),
-			'ALBUM_CONTEST_START'	=> ($album_data['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_START' . ((($album_data['contest_start']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start']), false, true)) : '',
-			'ALBUM_CONTEST_RATING'	=> ($album_data['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_RATING_START' . ((($album_data['contest_start'] + $album_data['contest_rating']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_rating']), false, true)) : '',
-			'ALBUM_CONTEST_END'		=> ($album_data['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_END' . ((($album_data['contest_start'] + $album_data['contest_end']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_end']), false, true)) : '',
+			'ALBUM_CONTEST_START'	=> ($album_data['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_START' . ((($album_data['contest_start']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start']), false, true)) : '',
+			'ALBUM_CONTEST_RATING'	=> ($album_data['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_RATING_START' . ((($album_data['contest_start'] + $album_data['contest_rating']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_rating']), false, true)) : '',
+			'ALBUM_CONTEST_END'		=> ($album_data['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_END' . ((($album_data['contest_start'] + $album_data['contest_end']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_end']), false, true)) : '',
 			'U_VIEW_ALBUM'	=> $this->helper->route('phpbbgallery_core_album', array('album_id' => (int) $album_data['album_id'])),
 		));
 
@@ -696,9 +696,9 @@ 
 				// phpbb_ext_gallery_core_image::generate_link('thumbnail', $phpbb_ext_gallery->config->get('link_thumbnail'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				$lastimage_uc_thumbnail = $row['album_image'] ? generate_board_url() . '/' . $row['album_image'] : $this->helper->route('phpbbgallery_core_image_file_mini', array('image_id' => $row['album_last_image_id']));
 				// phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
-				$lastimage_uc_name = '';//@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
+				$lastimage_uc_name = ''; //@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				// phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
-				$lastimage_uc_icon = '';//@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
+				$lastimage_uc_icon = ''; //@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 			}
 			else
 			{

Braces +15 added lines, -25 removed lines

@@ -226,8 +226,7 @@ 
 					SET album_parents = '" . $this->db->sql_escape($album_data['album_parents']) . "'
 					WHERE parent_id = " . (int) $album_data['parent_id'];
 				$this->db->sql_query($sql);
-			}
-			else
+			} else
 			{
 				$album_parents = unserialize($album_data['album_parents']);
 			}
@@ -295,16 +294,14 @@ 
 			if (!empty($row['user_id']))
 			{
 				$album_moderators[$a_id][] = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
-			}
-			else
+			} else
 			{
 				$group_name = (($row['group_type'] == GROUP_SPECIAL) ? $this->language->lang('G_' . $row['group_name']) : $row['group_name']);
 
 				if ($this->user->data['user_id'] != ANONYMOUS && !$this->auth->acl_get('u_viewprofile'))
 				{
 					$album_moderators[$a_id][] = '<span' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . '>' . $group_name . '</span>';
-				}
-				else
+				} else
 				{
 					$album_moderators[$a_id][] = '<a' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . ' href="' . append_sid($this->root_path . 'memberlist.' . $this->php_ext, 'mode=group&amp;g=' . $row['group_id']) . '">' . $group_name . '</a>';
 				}
@@ -348,8 +345,7 @@ 
 			}
 			$root_data = array('album_id' => (int) \phpbbgallery\core\block::PUBLIC_ALBUM);
 			$sql_where = 'a.album_user_id = ' . (int) \phpbbgallery\core\block::PUBLIC_ALBUM;
-		}
-		else if ($root_data == 'personal')
+		} else if ($root_data == 'personal')
 		{
 			if ($mark_read == 'albums')
 			{
@@ -366,8 +362,7 @@ 
 				{
 					$sql_where .= ' AND u.username_clean NOT ' . $this->db->sql_like_expression(chr($i) . $this->db->any_char);
 				}
-			}
-			else if ($first_char)
+			} else if ($first_char)
 			{
 				$sql_where .= ' AND u.username_clean ' . $this->db->sql_like_expression(substr($first_char, 0, 1) . $this->db->any_char);
 			}
@@ -411,8 +406,7 @@ 
 					'phpbbgallery_core_search_recent_page',),
 					'params' => array()), 'pagination', 'page', $num_pegas, $limit, $start
 			);*/
-		}
-		else
+		} else
 		{
 			$sql_where = 'a.left_id > ' . $root_data['left_id'] . ' AND a.left_id < ' . $root_data['right_id'] . ' AND a.album_user_id = ' . $root_data['album_user_id'];
 		}
@@ -500,10 +494,12 @@ 
 				continue;
 			}
 
-			if (false)//@todo !$this->gallery_auth->acl_check('a_list', $album_id, $row['album_user_id']))
+			if (false) {
+				//@todo !$this->gallery_auth->acl_check('a_list', $album_id, $row['album_user_id']))
 			{
 				// if the user does not have permissions to list this album, skip everything until next branch
 				$right_id = $row['right_id'];
+			}
 				continue;
 			}
 
@@ -528,8 +524,7 @@ 
 				$album_rows[$parent_id]['album_type_last_image'] = $row['album_type'];
 				$album_rows[$parent_id]['album_contest_marked'] = $row['contest_marked'];
 				$album_rows[$parent_id]['orig_album_last_image_time'] = $row['album_last_image_time'];
-			}
-			else if ($row['album_type'])
+			} else if ($row['album_type'])
 			{
 				$subalbums[$parent_id][$album_id]['display'] = ($row['display_on_index']) ? true : false;
 				$subalbums[$parent_id][$album_id]['name'] = $row['album_name'];
@@ -571,16 +566,14 @@ 
 				{
 					$this->misc->markread('all');
 					$message = $this->language->lang('RETURN_INDEX', '<a href="' . $redirect . '">', '</a>');
-				}
-				else
+				} else
 				{
 					$this->misc->markread('albums', $album_ids);
 					$message = $this->language->lang('RETURN_ALBUM', '<a href="' . $redirect . '">', '</a>');
 				}
 				meta_refresh(3, $redirect);
 				trigger_error($this->language->lang('ALBUMS_MARKED') . '<br /><br />' . $message);
-			}
-			else
+			} else
 			{
 				$message = $this->language->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
 				meta_refresh(3, $redirect);
@@ -658,8 +651,7 @@ 
 							'name'		=> $subalbum_row['name'],
 							'unread'	=> $subalbum_unread,
 						);
-					}
-					else
+					} else
 					{
 						unset($subalbums[$album_id][$subalbum_id]);
 					}
@@ -672,8 +664,7 @@ 
 
 				$l_subalbums = (sizeof($subalbums[$album_id]) == 1) ? $this->language->lang('SUBALBUM') : $this->language->lang('SUBALBUMS');
 				$folder_image = ($album_unread) ? 'forum_unread_subforum' : 'forum_read_subforum';
-			}
-			else
+			} else
 			{
 				$folder_alt = ($album_unread) ? 'NEW_IMAGES' : 'NO_NEW_IMAGES';
 				$folder_image = ($album_unread) ? 'forum_unread' : 'forum_read';
@@ -699,8 +690,7 @@ 
 				$lastimage_uc_name = '';//@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				// phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				$lastimage_uc_icon = '';//@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
-			}
-			else
+			} else
 			{
 				$lastimage_time = $lastimage_album_type = $lastimage_contest_marked = 0;
 				$lastimage_uc_fake_thumbnail = $lastimage_uc_fake_thumbnail_url = $lastimage_uc_thumbnail = $lastimage_uc_name = $lastimage_uc_icon = '';

core/controller/moderate.php

Braces +16 added lines, -32 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);
@@ -626,8 +616,7 @@ 
 			{
 				$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 +635,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>';
 			}
@@ -729,8 +717,7 @@ 
 			));
 			return $this->helper->render('gallery/message.html', $this->language->lang('GALLERY'));
 			//trigger_error($message);
-		}
-		else
+		} else
 		{
 			$this->template->assign_vars(array(
 				'S_NOTIFY_POSTER'			=> $show_notify,
@@ -779,8 +766,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);
@@ -821,8 +807,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(
@@ -866,8 +851,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);