satanasov / phpbbgallery

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

Spacing +3 added lines, -3 removed lines

@@ -354,7 +354,7 @@ 
 			$album_user_id = $image_data['album_user_id'];
 
 			//@todo: $rating = new phpbb_gallery_image_rating($image_data['image_id'], $image_data, $image_data);
-			$image_data['rating'] = '0';//@todo: $rating->get_image_rating(false, false);
+			$image_data['rating'] = '0'; //@todo: $rating->get_image_rating(false, false);
 			//@todo: unset($rating);
 
 			$s_user_allowed = (($image_data['image_user_id'] == $this->user->data['user_id']) && ($album_status != (int) \phpbbgallery\core\block::ALBUM_LOCKED));
@@ -412,14 +412,14 @@ 
 
 				'U_USER_IP'                  => $show_ip && $this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id) ? $image_data['image_user_ip'] : false,
 				'S_IMAGE_REPORTED'           => $image_data['image_reported'],
-				'U_IMAGE_REPORTED'           => '',//($image_data['image_reported']) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported']) : '',
+				'U_IMAGE_REPORTED'           => '', //($image_data['image_reported']) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported']) : '',
 				'S_STATUS_APPROVED'          => ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_APPROVED) ? true : false,
 				'S_STATUS_UNAPPROVED'        => ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_UNAPPROVED) ? true : false,
 				'S_STATUS_UNAPPROVED_ACTION' => ($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id) && $image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_UNAPPROVED) ? $this->helper->route('phpbbgallery_core_moderate_image_approve', array('image_id' => $image_data['image_id'])) : '',
 				'S_STATUS_LOCKED'            => ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_LOCKED) ? true : false,
 
 				'U_REPORT' => ($this->auth->acl_check('m_report', $image_data['image_album_id'], $album_user_id) && $image_data['image_reported']) ? '123'/*$this->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported'])*/ : '',
-				'U_STATUS' => '',//($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id)) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=queue_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_id']) : '',
+				'U_STATUS' => '', //($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id)) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=queue_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_id']) : '',
 				'L_STATUS' => ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_UNAPPROVED) ? $this->language->lang('APPROVE_IMAGE') : (($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_APPROVED) ? $this->language->lang('CHANGE_IMAGE_STATUS') : $this->language->lang('UNLOCK_IMAGE')),
 
 				'S_CONTEST_RANK' => $image_data['image_contest_rank'],

core/album/album.php

Braces +9 added lines, -18 removed lines

@@ -221,8 +221,7 @@ 
 			{
 				$padding .= '   ';
 				$padding_store[$row['parent_id']] = $padding;
-			}
-			else if ($row['left_id'] > $right + 1)
+			} else if ($row['left_id'] > $right + 1)
 			{
 				$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
 			}
@@ -248,15 +247,13 @@ 
 			if (($select_id == $this->gallery_auth->get_setting_permissions()) && !$row['album_user_id'])
 			{
 				$list = true;
-			}
-			else if (!$row['album_user_id'])
+			} else if (!$row['album_user_id'])
 			{
 				if ($this->gallery_auth->acl_check('a_list', $row['album_id'], $row['album_user_id']) || defined('IN_ADMIN'))
 				{
 					$list = true;
 				}
-			}
-			else if (!$ignore_personals)
+			} else if (!$ignore_personals)
 			{
 				if ($row['album_user_id'] == $this->user->data['user_id'])
 				{
@@ -267,16 +264,14 @@ 
 						if ($requested_permission)
 						{
 							$requested_own = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_own_album());
-						}
-						else
+						} else
 						{
 							$requested_own = false; // We need the negated version of true here
 						}
 					}
 					$list = (!$list) ? $access_own : $list;
 					$disabled = (!$disabled) ? $requested_own : $disabled;
-				}
-				else if ($row['album_user_id'])
+				} else if ($row['album_user_id'])
 				{
 					if (!$c_access_personal)
 					{
@@ -285,8 +280,7 @@ 
 						if ($requested_permission)
 						{
 							$requested_personal = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_personal_album());
-						}
-						else
+						} else
 						{
 							$requested_personal = false; // We need the negated version of true here
 						}
@@ -298,8 +292,7 @@ 
 			if (($album_user_id != (int) \phpbbgallery\core\block::PUBLIC_ALBUM) && ($album_user_id != $row['album_user_id']))
 			{
 				$list = false;
-			}
-			else if (($album_user_id != (int) \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0))
+			} else if (($album_user_id != (int) \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0))
 			{
 				$disabled = true;
 			}
@@ -317,8 +310,7 @@ 
 			$gallery_albumbox = "<select name='$select_name' id='$select_name'>";
 			$gallery_albumbox .= $album_list;
 			$gallery_albumbox .= '</select>';
-		}
-		else
+		} else
 		{
 			$gallery_albumbox = $album_list;
 		}
@@ -387,8 +379,7 @@ 
 				'album_last_user_colour' => $row['image_user_colour'],
 				'album_last_user_id'     => $row['image_user_id'],
 			);
-		}
-		else
+		} else
 		{
 			// No approved image, so we clear the columns
 			$sql_ary = array(

core/controller/image.php

Braces +11 added lines, -22 removed lines

@@ -250,8 +250,7 @@ 
 			}
 
 			$this->loader->load($this->data['image_album_id']);
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			throw new \phpbb\exception\http_exception(404, 'INVALID_IMAGE');
 		}
@@ -264,8 +263,7 @@ 
 		if ($this->gallery_auth->acl_check('m_status', $album_id, $album_data['album_user_id']))
 		{
 			$image_status_check = '';
-		}
-		else
+		} else
 		{
 			$user_id = (int) $this->user->data['user_id'];
 			$image_status_check = ' AND (image_status = ' . (int) \phpbbgallery\core\block::STATUS_APPROVED . ' OR image_user_id = ' . $user_id . ')';
@@ -322,8 +320,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');
 		}
@@ -551,8 +548,7 @@ 
 			if (isset($album_data['contest_start']))
 			{
 				$s_hide_comment_input = (time() < ($album_data['contest_start'] + $album_data['contest_end'])) ? true : false;
-			}
-			else
+			} else
 			{
 				$s_hide_comment_input = false;
 			}
@@ -598,8 +594,7 @@ 
 				//$this->template->assign_var('S_COMMENT_ACTION', append_sid($this->url->path('full') . 'comment/' . $image_id . '/add/0'));
 				$this->template->assign_var('S_COMMENT_ACTION', $this->helper->route('phpbbgallery_core_comment_add', array('image_id' => $image_id, 'comment_id' => 0)));
 			}
-		}
-		else if ($this->gallery_config->get('comment_user_control') && !$image_data['image_allow_comments'])
+		} else if ($this->gallery_config->get('comment_user_control') && !$image_data['image_allow_comments'])
 		{
 			$this->template->assign_var('S_COMMENTS_DISABLED', true);
 		}
@@ -790,8 +785,7 @@ 
 								'NAME'      => $field_data['PROFILE_FIELD_NAME'],
 								'U_CONTACT' => $field_data['PROFILE_FIELD_CONTACT'],
 							));
-						}
-						else
+						} else
 						{
 							$this->template->assign_block_vars('commentrow.custom_fields', $field_data);
 						}
@@ -917,8 +911,7 @@ 
 					{
 						$change_image_count = true;
 					}
-				}
-				else if ($this->request->variable('change_author', '', true))
+				} else if ($this->request->variable('change_author', '', true))
 				{
 					$errors[] = $this->language->lang('INVALID_USERNAME');
 				}
@@ -939,8 +932,7 @@ 
 					{
 						$personal_album_id = $this->album->generate_personal_album($image_data['image_username'], $image_data['image_user_id'], $image_data['image_user_colour'], $image_user);
 					}
-				}
-				else
+				} else
 				{
 					$personal_album_id = $this->gallery_user->get_data('personal_album_id');
 					if (!$personal_album_id && $this->gallery_auth->acl_check('i_upload', $this->gallery_auth->get_own_album()))
@@ -1108,8 +1100,7 @@ 
 			$this->notification_helper->read('approval', $album_id);
 			$this->url->meta_refresh(3, $album_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			if (isset($_POST['cancel']))
 			{
@@ -1117,8 +1108,7 @@ 
 				$message .= '<br />' . sprintf($this->language->lang('CLICK_RETURN_IMAGE'), '<a href="' . $image_backlink . '">', '</a>');
 				$this->url->meta_refresh(3, $image_backlink);
 				trigger_error($message);
-			}
-			else
+			} else
 			{
 				confirm_box(false, 'DELETE_IMAGE2', $s_hidden_fields);
 			}
@@ -1223,8 +1213,7 @@ 
 			{
 				// @todo Add "redirect after login" url
 				login_box();
-			}
-			else
+			} else
 			{
 				//return $this->error('NOT_AUTHORISED', 403);
 				redirect('gallery/album/' . $album_id);

core/acp/gallery_logs_module.php

Spacing +5 added lines, -5 removed lines

@@ -28,13 +28,13 @@
 		$this->tpl_name = 'gallery_logs';
 		add_form_key('acp_logs');
 
-		$page				= $request->variable('page', 0);
-		$filter_log		= $request->variable('lf', 'all');
-		$sort_days		= $request->variable('st', 0);
+		$page = $request->variable('page', 0);
+		$filter_log = $request->variable('lf', 'all');
+		$sort_days = $request->variable('st', 0);
 		$sort_key		= $request->variable('sk', 't');
 		$sort_dir		= $request->variable('sd', 'd');
-		$deletemark		= $request->is_set_post('delmarked');
-		$marked			= $request->variable('mark', []);
+		$deletemark = $request->is_set_post('delmarked');
+		$marked = $request->variable('mark', []);
 
 		$log = $phpbb_container->get('phpbbgallery.core.log');
 

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,

core/language/de/gallery_acp.php

Spacing +1 added lines, -1 removed lines

@@ -159,7 +159,7 @@
 	'GALLERY_RESYNC_ALBUMS_TO_CPF_EXPLAIN'  => 'Diese Aktion wird alle persönlichen Alben auf dem Toplevel als kontaktbasierte selbsterstellt Profilfelder resynchronisieren . <br> WARNUNG! Dies kann beim Vorhandensein sehr vieler solcher Alben sehr lange dauern!',
 	'GALLERY_RESYNC_ALBUMS_TO_CPF_CONFIRM' => 'Bist Du sicher, dass Du den Resync aller persönlichen Alben auf dem Toplevel als kontaktbasierte selbsterstellte Profilfelder durchführen willst?',
 	'GALLERY_STATS'                        => 'Galerie Statistik',
-	'GALLERY_VERSION'                      => 'Version der phpBB Gallery',//ja mit ll und y, da es sich um den MOD-Namen handelt
+	'GALLERY_VERSION'                      => 'Version der phpBB Gallery', //ja mit ll und y, da es sich um den MOD-Namen handelt
 	'GD_VERSION'                           => 'GD Version optimieren',
 	'GENERAL_ALBUM_SETTINGS'               => 'Allgemeine Albumseinstellungen',
 	'GIF_ALLOWED'                          => 'Es ist erlaubt GIF-Dateien hochzuladen',

core/user.php

Braces +7 added lines, -14 removed lines

@@ -202,8 +202,7 @@ 
 		if (isset($this->data[$key]))
 		{
 			return $this->data[$key];
-		}
-		else if ($default && $this->get_default_value($key) !== null)
+		} else if ($default && $this->get_default_value($key) !== null)
 		{
 			return $this->get_default_value($key);
 		}
@@ -401,12 +400,10 @@ 
 		if (is_array($user_ids) && !empty($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;
 		}
@@ -437,8 +434,7 @@ 
 					{
 						// While incrementing, the images might be lower than 0.
 						$validated_data[$name] = (int) $value;
-					}
-					else
+					} else
 					{
 						$validated_data[$name] = max(0, (int) $value);
 					}
@@ -584,8 +580,7 @@ 
 					'warnings'            => 0,
 					'allow_pm'            => 0,
 				);
-			}
-			else
+			} else
 			{
 				$user_sig = '';
 				// We add the signature to every posters entry because enable_sig is post dependent
@@ -631,8 +626,7 @@ 
 				if ((!empty($row['user_allow_viewemail']) && $this->auth->acl_get('u_sendemail')) || $this->auth->acl_get('a_email'))
 				{
 					$user_cache[$user_id]['email'] = ($this->config['board_email_form'] && $this->config['email_enable']) ? append_sid("{$this->root_path}memberlist.$this->php_ext", "mode=email&u=$user_id") : (($this->config['board_hide_emails'] && !$this->auth->acl_get('a_email')) ? '' : 'mailto:' . $row['user_email']);
-				}
-				else
+				} else
 				{
 					$user_cache[$user_id]['email'] = '';
 				}
@@ -645,8 +639,7 @@ 
 						if ($diff == 0)
 						{
 							$diff = ($now['mday'] - $bday_day < 0) ? 1 : 0;
-						}
-						else
+						} else
 						{
 							$diff = ($diff < 0) ? 1 : 0;
 						}

core/language/de/gallery_ucp.php

Indentation +2 added lines, -2 removed lines

@@ -11,8 +11,8 @@
  */
 
  /**
- * DO NOT CHANGE
- */
+  * DO NOT CHANGE
+  */
 if (!defined('IN_PHPBB'))
 {
 	exit;

exif/language/it/info_exif.php

Spacing +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@ 
 	'EXIF_CAM_MODEL'			=> 'Modello Camera',
 	'EXIF_DATE'					=> 'Immagine scattata il',
 	'EXIF_EXPOSURE'				=> 'Velocita\' otturatore',
-	'EXIF_EXPOSURE_EXP'			=> '%s Sec',// 'EXIF_EXPOSURE' unit
+	'EXIF_EXPOSURE_EXP'			=> '%s Sec', // 'EXIF_EXPOSURE' unit
 	'EXIF_EXPOSURE_BIAS'		=> 'Inclinazione di esposizione',
-	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV',// 'EXIF_EXPOSURE_BIAS' unit
+	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV', // 'EXIF_EXPOSURE_BIAS' unit
 	'EXIF_EXPOSURE_PROG'		=> 'Programma di esposizione',
 	'EXIF_EXPOSURE_PROG_0'		=> 'Non definito',
 	'EXIF_EXPOSURE_PROG_1'		=> 'Manuale',
@@ -72,7 +72,7 @@ 
 	'EXIF_FLASH_CASE_93'		=> 'Il flash e\' scattato, modalita\' automatica, luce di ritorno non rilevata, modalita\' riduzione occhi rossi',
 	'EXIF_FLASH_CASE_95'		=> 'Il flash e\' scattato, modalita\' automatica, luce di ritorno rilevata, modalita\' riduzione occhi rossi',
 	'EXIF_FOCAL'				=> 'Lunghezza di Focus',
-	'EXIF_FOCAL_EXP'			=> '%s mm',// 'EXIF_FOCAL' unit
+	'EXIF_FOCAL_EXP'			=> '%s mm', // 'EXIF_FOCAL' unit
 	'EXIF_ISO'					=> 'Valore di velocita\' ISO',
 	'EXIF_METERING_MODE'		=> 'Modalita\' di metratura',
 	'EXIF_METERING_MODE_0'		=> 'Sconosciuta',

acpimport/migrations/m1_init.php

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
 				if ($file->isDir())
 				{
 					$this->recursiveRemoveDirectory($file->getPathname());
-				}
-				else
+				} else
 				{
 					@unlink($file->getPathname());
 				}