satanasov / phpbbgallery

core/acp/albums_module.php

Spacing +8 added lines, -8 removed lines

@@ -65,9 +65,9 @@ 
 
 		$action		= $request->variable('action', '');
 		$update		= (isset($_POST['update'])) ? true : false;
-		$album_id	= $request->variable('a', 0);
+		$album_id = $request->variable('a', 0);
 
-		$this->parent_id	= $request->variable('parent_id', 0);
+		$this->parent_id = $request->variable('parent_id', 0);
 		$album_data = $errors = array();
 		if ($update && !check_form_key($form_key))
 		{
@@ -81,10 +81,10 @@ 
 			switch ($action)
 			{
 				case 'delete':
-					$action_subalbums	= $request->variable('action_subalbums', '');
-					$subalbums_to_id	= $request->variable('subalbums_to_id', 0);
-					$action_images		= $request->variable('action_images', '');
-					$images_to_id		= $request->variable('images_to_id', 0);
+					$action_subalbums = $request->variable('action_subalbums', '');
+					$subalbums_to_id = $request->variable('subalbums_to_id', 0);
+					$action_images = $request->variable('action_images', '');
+					$images_to_id = $request->variable('images_to_id', 0);
 
 					$errors = $manage_albums->delete_album($album_id, $action_images, $action_subalbums, $images_to_id, $subalbums_to_id);
 
@@ -232,12 +232,12 @@ 
 						$acl_url = '&mode=manage&action=v_mask&album_id[]=' . $album_data['album_id'];
 
 						$message = ($action == 'add') ? $this->language->lang('ALBUM_CREATED') : $this->language->lang('ALBUM_UPDATED');
-						$message .= '<br /><br />' . sprintf($this->language->lang('REDIRECT_ACL'), '<a href="' . $phpbb_ext_gallery_core_url->append_sid('admin' , 'index', 'i=-phpbbgallery-core-acp-permissions_module' . $acl_url) . '">', '</a>');
+						$message .= '<br /><br />' . sprintf($this->language->lang('REDIRECT_ACL'), '<a href="' . $phpbb_ext_gallery_core_url->append_sid('admin', 'index', 'i=-phpbbgallery-core-acp-permissions_module' . $acl_url) . '">', '</a>');
 
 						// Redirect directly to permission settings screen
 						if ($action == 'add' && !$album_perm_from)
 						{
-							meta_refresh(5, $phpbb_ext_gallery_core_url->append_sid('admin' , 'index', 'i=-phpbbgallery-core-acp-permissions_module' . $acl_url));
+							meta_refresh(5, $phpbb_ext_gallery_core_url->append_sid('admin', 'index', 'i=-phpbbgallery-core-acp-permissions_module' . $acl_url));
 						}
 
 						trigger_error($message . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));

core/acp/config_module.php

Spacing +64 added lines, -64 removed lines

@@ -331,89 +331,89 @@ 
 			'vars'	=> array(
 				'' => array(),
 				'GALLERY_CONFIG'	=> array(
-					'items_per_page'		=> array('lang' => 'ITEMS_PER_PAGE',		'validate' => 'int',	'type' => 'text:7:3',		'explain' => true),
-					'allow_comments'		=> array('lang' => 'COMMENT_SYSTEM',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'comment_user_control'	=> array('lang' => 'COMMENT_USER_CONTROL',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-					'comment_length'		=> array('lang' => 'COMMENT_MAX_LENGTH',	'validate' => 'int',	'type' => 'text:7:5',		'append' => 'CHARACTERS'),
-					'allow_rates'			=> array('lang' => 'RATE_SYSTEM',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'max_rating'			=> array('lang' => 'RATE_SCALE',			'validate' => 'int',	'type' => 'text:7:2'),
-					'allow_hotlinking'		=> array('lang' => 'HOTLINK_PREVENT',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'hotlinking_domains'	=> array('lang' => 'HOTLINK_ALLOWED',		'validate' => 'string',	'type' => 'text:40:255',	'explain' => true),
+					'items_per_page'		=> array('lang' => 'ITEMS_PER_PAGE', 'validate' => 'int', 'type' => 'text:7:3', 'explain' => true),
+					'allow_comments'		=> array('lang' => 'COMMENT_SYSTEM', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'comment_user_control'	=> array('lang' => 'COMMENT_USER_CONTROL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+					'comment_length'		=> array('lang' => 'COMMENT_MAX_LENGTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'CHARACTERS'),
+					'allow_rates'			=> array('lang' => 'RATE_SYSTEM', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'max_rating'			=> array('lang' => 'RATE_SCALE', 'validate' => 'int', 'type' => 'text:7:2'),
+					'allow_hotlinking'		=> array('lang' => 'HOTLINK_PREVENT', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'hotlinking_domains'	=> array('lang' => 'HOTLINK_ALLOWED', 'validate' => 'string', 'type' => 'text:40:255', 'explain' => true),
 				),
 
 				'ALBUM_SETTINGS'	=> array(
-					'album_display'			=> array('lang' => 'RRC_DISPLAY_OPTIONS',	'validate' => 'int',	'type' => 'custom',			'method' => 'rrc_display'),
-					'default_sort_key'		=> array('lang' => 'DEFAULT_SORT_METHOD',	'validate' => 'string',	'type' => 'custom',			'method' => 'sort_method_select'),
-					'default_sort_dir'		=> array('lang' => 'DEFAULT_SORT_ORDER',	'validate' => 'string',	'type' => 'custom',			'method' => 'sort_order_select'),
-					'album_images'			=> array('lang' => 'MAX_IMAGES_PER_ALBUM',	'validate' => 'int',	'type' => 'text:7:7',		'explain' => true),
-					'mini_thumbnail_disp'	=> array('lang' => 'DISP_FAKE_THUMB',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'mini_thumbnail_size'	=> array('lang' => 'FAKE_THUMB_SIZE',		'validate' => 'int',	'type' => 'text:7:4',		'explain' => true,	'append' => 'PIXELS'),
+					'album_display'			=> array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'),
+					'default_sort_key'		=> array('lang' => 'DEFAULT_SORT_METHOD', 'validate' => 'string', 'type' => 'custom', 'method' => 'sort_method_select'),
+					'default_sort_dir'		=> array('lang' => 'DEFAULT_SORT_ORDER', 'validate' => 'string', 'type' => 'custom', 'method' => 'sort_order_select'),
+					'album_images'			=> array('lang' => 'MAX_IMAGES_PER_ALBUM', 'validate' => 'int', 'type' => 'text:7:7', 'explain' => true),
+					'mini_thumbnail_disp'	=> array('lang' => 'DISP_FAKE_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'mini_thumbnail_size'	=> array('lang' => 'FAKE_THUMB_SIZE', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'),
 				),
 
 				'SEARCH_SETTINGS'	=> array(
-					'search_display'		=> array('lang' => 'RRC_DISPLAY_OPTIONS',	'validate' => 'int',	'type' => 'custom',			'method' => 'rrc_display'),
+					'search_display'		=> array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'),
 				),
 
 				'IMAGE_SETTINGS'	=> array(
-					'num_uploads'			=> array('lang' => 'UPLOAD_IMAGES',			'validate' => 'int',	'type' => 'text:7:2'),
-					'max_filesize'			=> array('lang' => 'MAX_FILE_SIZE',			'validate' => 'int',	'type' => 'text:12:9',		'append' => 'BYTES'),
-					'max_width'				=> array('lang' => 'MAX_WIDTH',				'validate' => 'int',	'type' => 'text:7:5',		'append' => 'PIXELS'),
-					'max_height'			=> array('lang' => 'MAX_HEIGHT',			'validate' => 'int',	'type' => 'text:7:5',		'append' => 'PIXELS'),
-					'allow_resize'			=> array('lang' => 'RESIZE_IMAGES',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'allow_rotate'			=> array('lang' => 'ROTATE_IMAGES',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'jpg_quality'			=> array('lang' => 'JPG_QUALITY',			'validate' => 'int',	'type' => 'text:7:5',		'explain' => true),
+					'num_uploads'			=> array('lang' => 'UPLOAD_IMAGES', 'validate' => 'int', 'type' => 'text:7:2'),
+					'max_filesize'			=> array('lang' => 'MAX_FILE_SIZE', 'validate' => 'int', 'type' => 'text:12:9', 'append' => 'BYTES'),
+					'max_width'				=> array('lang' => 'MAX_WIDTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'PIXELS'),
+					'max_height'			=> array('lang' => 'MAX_HEIGHT', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'PIXELS'),
+					'allow_resize'			=> array('lang' => 'RESIZE_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'allow_rotate'			=> array('lang' => 'ROTATE_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'jpg_quality'			=> array('lang' => 'JPG_QUALITY', 'validate' => 'int', 'type' => 'text:7:5', 'explain' => true),
 					//'medium_cache'			=> array('lang' => 'MEDIUM_CACHE',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'medium_width'			=> array('lang' => 'RSZ_WIDTH',				'validate' => 'int',	'type' => 'text:7:4',		'append' => 'PIXELS'),
-					'medium_height'			=> array('lang' => 'RSZ_HEIGHT',			'validate' => 'int',	'type' => 'text:7:4',		'append' => 'PIXELS'),
-					'allow_gif'				=> array('lang' => 'GIF_ALLOWED',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'allow_jpg'				=> array('lang' => 'JPG_ALLOWED',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'allow_png'				=> array('lang' => 'PNG_ALLOWED',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'allow_zip'				=> array('lang' => 'ZIP_ALLOWED',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'description_length'	=> array('lang' => 'IMAGE_DESC_MAX_LENGTH',	'validate' => 'int',	'type' => 'text:7:5',		'append' => 'CHARACTERS'),
-					'disp_nextprev_thumbnail'	=> array('lang' => 'DISP_NEXTPREV_THUMB','validate' => 'bool',	'type' => 'radio:yes_no'),
-					'disp_image_url'		=> array('lang' => 'VIEW_IMAGE_URL',		'validate' => 'bool',	'type' => 'radio:yes_no'),
+					'medium_width'			=> array('lang' => 'RSZ_WIDTH', 'validate' => 'int', 'type' => 'text:7:4', 'append' => 'PIXELS'),
+					'medium_height'			=> array('lang' => 'RSZ_HEIGHT', 'validate' => 'int', 'type' => 'text:7:4', 'append' => 'PIXELS'),
+					'allow_gif'				=> array('lang' => 'GIF_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'allow_jpg'				=> array('lang' => 'JPG_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'allow_png'				=> array('lang' => 'PNG_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'allow_zip'				=> array('lang' => 'ZIP_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'description_length'	=> array('lang' => 'IMAGE_DESC_MAX_LENGTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'CHARACTERS'),
+					'disp_nextprev_thumbnail'	=> array('lang' => 'DISP_NEXTPREV_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'disp_image_url'		=> array('lang' => 'VIEW_IMAGE_URL', 'validate' => 'bool', 'type' => 'radio:yes_no'),
 				),
 
 				'THUMBNAIL_SETTINGS'	=> array(
 					//'thumbnail_cache'		=> array('lang' => 'THUMBNAIL_CACHE',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'gdlib_version'			=> array('lang' => 'GD_VERSION',			'validate' => 'int',	'type' => 'custom',			'method' => 'gd_radio'),
-					'thumbnail_width'		=> array('lang' => 'THUMBNAIL_WIDTH',		'validate' => 'int',	'type' => 'text:7:3',		'append' => 'PIXELS'),
-					'thumbnail_height'		=> array('lang' => 'THUMBNAIL_HEIGHT',		'validate' => 'int',	'type' => 'text:7:3',		'append' => 'PIXELS'),
-					'thumbnail_quality'		=> array('lang' => 'THUMBNAIL_QUALITY',		'validate' => 'int',	'type' => 'text:7:3',		'explain' => true,	'append' => 'PERCENT'),
+					'gdlib_version'			=> array('lang' => 'GD_VERSION', 'validate' => 'int', 'type' => 'custom', 'method' => 'gd_radio'),
+					'thumbnail_width'		=> array('lang' => 'THUMBNAIL_WIDTH', 'validate' => 'int', 'type' => 'text:7:3', 'append' => 'PIXELS'),
+					'thumbnail_height'		=> array('lang' => 'THUMBNAIL_HEIGHT', 'validate' => 'int', 'type' => 'text:7:3', 'append' => 'PIXELS'),
+					'thumbnail_quality'		=> array('lang' => 'THUMBNAIL_QUALITY', 'validate' => 'int', 'type' => 'text:7:3', 'explain' => true, 'append' => 'PERCENT'),
 					//'thumbnail_infoline'	=> array('lang' => 'INFO_LINE',				'validate' => 'bool',	'type' => 'radio:yes_no'),
 				),
 
 				'WATERMARK_OPTIONS'	=> array(
-					'watermark_enabled'		=> array('lang' => 'WATERMARK_IMAGES',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'watermark_source'		=> array('lang' => 'WATERMARK_SOURCE',		'validate' => 'string',	'type' => 'custom',			'explain' => true,	'method' => 'watermark_source'),
-					'watermark_height'		=> array('lang' => 'WATERMARK_HEIGHT',		'validate' => 'int',	'type' => 'text:7:4',		'explain' => true,	'append' => 'PIXELS'),
-					'watermark_width'		=> array('lang' => 'WATERMARK_WIDTH',		'validate' => 'int',	'type' => 'text:7:4',		'explain' => true,	'append' => 'PIXELS'),
-					'watermark_position'	=> array('lang' => 'WATERMARK_POSITION',	'validate' => '',		'type' => 'custom',			'method' => 'watermark_position'),
+					'watermark_enabled'		=> array('lang' => 'WATERMARK_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'watermark_source'		=> array('lang' => 'WATERMARK_SOURCE', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'watermark_source'),
+					'watermark_height'		=> array('lang' => 'WATERMARK_HEIGHT', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'),
+					'watermark_width'		=> array('lang' => 'WATERMARK_WIDTH', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'),
+					'watermark_position'	=> array('lang' => 'WATERMARK_POSITION', 'validate' => '', 'type' => 'custom', 'method' => 'watermark_position'),
 				),
 
 				'UC_LINK_CONFIG'	=> array(
-					'link_thumbnail'		=> array('lang' => 'UC_THUMBNAIL',			'validate' => 'string',	'type' => 'custom',			'explain' => true,	'method' => 'uc_select'),
-					'link_imagepage'		=> array('lang' => 'UC_IMAGEPAGE',			'validate' => 'string',	'type' => 'custom',			'explain' => true,	'method' => 'uc_select'),
-					'link_image_name'		=> array('lang' => 'UC_IMAGE_NAME',			'validate' => 'string',	'type' => 'custom',			'method' => 'uc_select'),
-					'link_image_icon'		=> array('lang' => 'UC_IMAGE_ICON',			'validate' => 'string',	'type' => 'custom',			'method' => 'uc_select'),
+					'link_thumbnail'		=> array('lang' => 'UC_THUMBNAIL', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'uc_select'),
+					'link_imagepage'		=> array('lang' => 'UC_IMAGEPAGE', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'uc_select'),
+					'link_image_name'		=> array('lang' => 'UC_IMAGE_NAME', 'validate' => 'string', 'type' => 'custom', 'method' => 'uc_select'),
+					'link_image_icon'		=> array('lang' => 'UC_IMAGE_ICON', 'validate' => 'string', 'type' => 'custom', 'method' => 'uc_select'),
 				),
 
 				'RRC_GINDEX'	=> array(
-					'rrc_gindex_mode'		=> array('lang' => 'RRC_GINDEX_MODE',		'validate' => 'int',	'type' => 'custom',			'explain' => true,	'method' => 'rrc_modes'),
-					'rrc_gindex_comments'	=> array('lang' => 'RRC_GINDEX_COMMENTS',	'validate' => 'bool',	'type' => 'radio:yes_no'),
+					'rrc_gindex_mode'		=> array('lang' => 'RRC_GINDEX_MODE', 'validate' => 'int', 'type' => 'custom', 'explain' => true, 'method' => 'rrc_modes'),
+					'rrc_gindex_comments'	=> array('lang' => 'RRC_GINDEX_COMMENTS', 'validate' => 'bool', 'type' => 'radio:yes_no'),
 					//'rrc_gindex_contests'	=> array('lang' => 'RRC_GINDEX_CONTESTS',	'validate' => 'int',	'type' => 'text:7:3'),
-					'rrc_gindex_display'	=> array('lang' => 'RRC_DISPLAY_OPTIONS',	'validate' => '',		'type' => 'custom',			'method' => 'rrc_display'),
-					'rrc_gindex_pegas'		=> array('lang' => 'RRC_GINDEX_PGALLERIES',	'validate' => 'bool',	'type' => 'radio:yes_no'),
+					'rrc_gindex_display'	=> array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => '', 'type' => 'custom', 'method' => 'rrc_display'),
+					'rrc_gindex_pegas'		=> array('lang' => 'RRC_GINDEX_PGALLERIES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
 				),
 
 				'PHPBB_INTEGRATION'	=> array(
-					'disp_gallery_icon'			=> array('lang' => 'DISP_GALLERY_ICON',				'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-					'disp_total_images'			=> array('lang' => 'DISP_TOTAL_IMAGES',				'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'profile_user_images'		=> array('lang' => 'DISP_USER_IMAGES_PROFILE',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'profile_pega'				=> array('lang' => 'DISP_PERSONAL_ALBUM_PROFILE',	'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'rrc_profile_mode'			=> array('lang' => 'RRC_PROFILE_MODE',				'validate' => 'int',	'type' => 'custom',			'explain' => true,	'method' => 'rrc_modes'),
-					'rrc_profile_items'			=> array('lang' => 'RRC_PROFILE_ITEMS',				'validate' => 'int',	'type' => 'text:7:3'),
-					'rrc_profile_display'		=> array('lang' => 'RRC_DISPLAY_OPTIONS',			'validate' => 'int',	'type' => 'custom',			'method' => 'rrc_display'),
+					'disp_gallery_icon'			=> array('lang' => 'DISP_GALLERY_ICON', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+					'disp_total_images'			=> array('lang' => 'DISP_TOTAL_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'profile_user_images'		=> array('lang' => 'DISP_USER_IMAGES_PROFILE', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'profile_pega'				=> array('lang' => 'DISP_PERSONAL_ALBUM_PROFILE', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'rrc_profile_mode'			=> array('lang' => 'RRC_PROFILE_MODE', 'validate' => 'int', 'type' => 'custom', 'explain' => true, 'method' => 'rrc_modes'),
+					'rrc_profile_items'			=> array('lang' => 'RRC_PROFILE_ITEMS', 'validate' => 'int', 'type' => 'text:7:3'),
+					'rrc_profile_display'		=> array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'),
 					//'rrc_profile_pegas'			=> array('lang' => 'RRC_GINDEX_PGALLERIES',			'validate' => 'bool',	'type' => 'radio:yes_no'),
 					//'viewtopic_icon'			=> array('lang' => 'DISP_VIEWTOPIC_ICON',			'validate' => 'bool',	'type' => 'radio:yes_no'),
 					//'viewtopic_images'			=> array('lang' => 'DISP_VIEWTOPIC_IMAGES',			'validate' => 'bool',	'type' => 'radio:yes_no'),
@@ -421,15 +421,15 @@ 
 				),
 
 				'INDEX_SETTINGS'	=> array(
-					'pegas_index_album'		=> array('lang' => 'PERSONAL_ALBUM_INDEX',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
+					'pegas_index_album'		=> array('lang' => 'PERSONAL_ALBUM_INDEX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
 					//'pegas_index_random'	=> array('lang'	=> 'RANDOM_ON_INDEX',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-					'pegas_index_rnd_count'	=> array('lang'	=> 'RANDOM_ON_INDEX_COUNT',	'validate' => 'int',	'type' => 'text:7:3'),
+					'pegas_index_rnd_count'	=> array('lang'	=> 'RANDOM_ON_INDEX_COUNT', 'validate' => 'int', 'type' => 'text:7:3'),
 					//'pegas_index_recent'	=> array('lang'	=> 'RECENT_ON_INDEX',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-					'pegas_index_rct_count'	=> array('lang'	=> 'RECENT_ON_INDEX_COUNT',	'validate' => 'int',	'type' => 'text:7:3'),
-					'disp_login'			=> array('lang' => 'DISP_LOGIN',			'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-					'disp_whoisonline'		=> array('lang' => 'DISP_WHOISONLINE',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'disp_birthdays'		=> array('lang' => 'DISP_BIRTHDAYS',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'disp_statistic'		=> array('lang' => 'DISP_STATISTIC',		'validate' => 'bool',	'type' => 'radio:yes_no'),
+					'pegas_index_rct_count'	=> array('lang'	=> 'RECENT_ON_INDEX_COUNT', 'validate' => 'int', 'type' => 'text:7:3'),
+					'disp_login'			=> array('lang' => 'DISP_LOGIN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+					'disp_whoisonline'		=> array('lang' => 'DISP_WHOISONLINE', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'disp_birthdays'		=> array('lang' => 'DISP_BIRTHDAYS', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'disp_statistic'		=> array('lang' => 'DISP_STATISTIC', 'validate' => 'bool', 'type' => 'radio:yes_no'),
 				),
 			),
 		),
@@ -572,7 +572,7 @@ 
 		global $phpbb_container;
 		$this->language = $phpbb_container->get('language');
 
-		$sort_order_options = '';//phpbb_gallery_plugins::uc_select($value, $key);
+		$sort_order_options = ''; //phpbb_gallery_plugins::uc_select($value, $key);
 
 		if ($key != 'link_imagepage')
 		{
@@ -586,7 +586,7 @@ 
 		$sort_order_options .= '<option' . (($value == 'none') ? ' selected="selected"' : '') . " value='none'>" . $this->language->lang('UC_LINK_NONE') . '</option>';
 
 		return "<select name='config[$key]' id='$key'>$sort_order_options</select>"
-			. (($key == 'link_thumbnail') ? '<br /><input class="checkbox" type="checkbox" name="update_bbcode" id="update_bbcode" value="update_bbcode" /><label for="update_bbcode">' .  $this->language->lang('UPDATE_BBCODE') . '</label>' : '');
+			. (($key == 'link_thumbnail') ? '<br /><input class="checkbox" type="checkbox" name="update_bbcode" id="update_bbcode" value="update_bbcode" /><label for="update_bbcode">' . $this->language->lang('UPDATE_BBCODE') . '</label>' : '');
 	}
 
 	/**

core/acp/permissions_module.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 			'misc'	=> array('a_list', 'i_count', 'i_unlimited', 'a_count', 'a_unlimited', 'a_restrict'),
 		);
 		$permissions->p_masks[$gallery_auth::OWN_ALBUM] = array_merge($permissions->cats[$gallery_auth::OWN_ALBUM]['i'], $permissions->cats[$gallery_auth::OWN_ALBUM]['c'], $permissions->cats[$gallery_auth::OWN_ALBUM]['m'], $permissions->cats[$gallery_auth::OWN_ALBUM]['misc']);
-		$permissions->p_masks_anti[$gallery_auth::OWN_ALBUM] = array();// Note: we set i_view to 1 as default, so it's not needed on anti array('i_view');
+		$permissions->p_masks_anti[$gallery_auth::OWN_ALBUM] = array(); // Note: we set i_view to 1 as default, so it's not needed on anti array('i_view');
 
 		// Permissions for personal albums of other users
 		// Note: Do !NOT! hide the i_upload. It's used for the moving-permissions
@@ -1244,7 +1244,7 @@ 
 	{
 		global $user, $phpbb_container;
 
-		$phpbb_ext_gallery_core_auth =  $phpbb_container->get('phpbbgallery.core.auth');
+		$phpbb_ext_gallery_core_auth = $phpbb_container->get('phpbbgallery.core.auth');
 
 		$disabled = false;
 		// We submit a "wrong" array on the check (to make it more easy) so we convert it here

core/acp/gallery_logs_module.php

Spacing +3 added lines, -3 removed lines

@@ -29,11 +29,11 @@ 
 		add_form_key('acp_logs');
 		$page = $request->variable('page', 0);
 		$filter_log = $request->variable('lf', 'all');
-		$sort_days	= $request->variable('st', 0);
+		$sort_days = $request->variable('st', 0);
 		$sort_key	= $request->variable('sk', 't');
 		$sort_dir	= $request->variable('sd', 'd');
 		$deletemark = $request->variable('delmarked', false, false, \phpbb\request\request_interface::POST);
-		$marked		= $request->variable('mark', array(0));
+		$marked = $request->variable('mark', array(0));
 		$log = $phpbb_container->get('phpbbgallery.core.log');
 
 		// Delete entries if requested and able
@@ -123,7 +123,7 @@ 
 				{
 					$additional['sort_dir'] = $sort_dir;
 				}
-				$log->build_list($filter_log, 25, ($page/25) + 1, -1, 0, $additional);
+				$log->build_list($filter_log, 25, ($page / 25) + 1, -1, 0, $additional);
 			break;
 
 			default:

core/misc.php

Spacing +3 added lines, -3 removed lines

@@ -132,7 +132,7 @@ 
 
 			$sql = 'SELECT album_id
 				FROM ' . $this->track_table . '
-				WHERE user_id = ' . (int) $this->user->data['user_id'] .'
+				WHERE user_id = ' . (int) $this->user->data['user_id'] . '
 					AND ' . $this->db->sql_in_set('album_id', $album_id);
 			$result = $this->db->sql_query($sql);
 
@@ -147,7 +147,7 @@ 
 			{
 				$sql = 'UPDATE ' . $this->track_table . '
 					SET mark_time = ' . time() . '
-					WHERE user_id = '. (int) $this->user->data['user_id'] .'
+					WHERE user_id = '. (int) $this->user->data['user_id'] . '
 						AND ' . $this->db->sql_in_set('album_id', $sql_update);
 				$this->db->sql_query($sql);
 			}
@@ -178,7 +178,7 @@ 
 
 			$sql = 'UPDATE ' . $this->track_table . '
 				SET mark_time = ' . time() . '
-				WHERE user_id = ' . (int) $this->user->data['user_id'] .'
+				WHERE user_id = ' . (int) $this->user->data['user_id'] . '
 					AND album_id = ' . (int) $album_id;
 			$this->db->sql_query($sql);
 

core/log.php

Spacing +4 added lines, -4 removed lines

@@ -273,7 +273,7 @@ 
 				),
 				'params' => array(
 				),
-			), 'pagination', 'page', $count, $limit, ($page-1) * $limit);
+			), 'pagination', 'page', $count, $limit, ($page - 1) * $limit);
 		}
 		else if ($album == -1)
 		{
@@ -293,9 +293,9 @@ 
 			{
 				$url_array['sd'] = $additional['sort_dir'];
 			}
-			$url = http_build_query($url_array,'','&');
+			$url = http_build_query($url_array, '', '&');
 
-			$this->pagination->generate_template_pagination(append_sid('index.php?' . $url), 'pagination', 'page', $count, $limit, ($page-1) * $limit);
+			$this->pagination->generate_template_pagination(append_sid('index.php?' . $url), 'pagination', 'page', $count, $limit, ($page - 1) * $limit);
 		}
 		else
 		{
@@ -307,7 +307,7 @@ 
 				'params' => array(
 					'album_id'	=> $album,
 				),
-			), 'pagination', 'page', $count, $limit, ($page-1) * $limit);
+			), 'pagination', 'page', $count, $limit, ($page - 1) * $limit);
 		}
 	}
 }

core/cache.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		if (($albums = $this->phpbb_cache->get('_albums')) === false)
 		{
 			$sql = 'SELECT a.album_id, a.parent_id, a.album_name, a.album_type, a.left_id, a.right_id, a.album_user_id, a.display_in_rrc, a.album_auth_access
-				FROM ' . $this->table_albums. ' a
+				FROM ' . $this->table_albums . ' a
 				LEFT JOIN ' . USERS_TABLE . ' u
 					ON (u.user_id = a.album_user_id)
 				ORDER BY u.username_clean, a.album_user_id, a.left_id ASC';

core/ucp/main_module.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
 		$phpbb_gallery_url = $phpbb_container->get('phpbbgallery.core.url');
 		$phpbb_gallery_url->_include('functions_display', 'phpbb');
 
-		$phpbb_ext_gallery_core_album =$phpbb_container->get('phpbbgallery.core.album');
+		$phpbb_ext_gallery_core_album = $phpbb_container->get('phpbbgallery.core.album');
 
 		$phpbb_ext_gallery_core_auth = $phpbb_container->get('phpbbgallery.core.auth');
 
@@ -151,7 +151,7 @@ 
 
 	function initialise_album()
 	{
-		global $cache, $db,  $user, $phpbb_ext_gallery_core_auth, $phpbb_ext_gallery_core_album, $phpbb_ext_gallery_config, $albums_table, $phpbb_ext_gallery_user;
+		global $cache, $db, $user, $phpbb_ext_gallery_core_auth, $phpbb_ext_gallery_core_album, $phpbb_ext_gallery_config, $albums_table, $phpbb_ext_gallery_user;
 		global $request, $users_table, $phpbb_container;
 
 		// we will have to initialse $phpbb_ext_gallery_user
@@ -445,7 +445,7 @@ 
 
 		$this->language = $phpbb_container->get('language');
 
-		$phpbb_gallery_url->_include(array('bbcode','message_parser'), 'phpbb');
+		$phpbb_gallery_url->_include(array('bbcode', 'message_parser'), 'phpbb');
 
 		$album_id = $request->variable('album_id', 0);
 		$phpbb_ext_gallery_core_album->check_user($album_id);
@@ -828,7 +828,7 @@ 
 				$sql = 'UPDATE ' . $albums_table . "
 					SET right_id = right_id - $delete_id
 					WHERE right_id > $right_id
-						AND album_user_id = ". (int) $user->data['user_id'];
+						AND album_user_id = " . (int) $user->data['user_id'];
 				$db->sql_query($sql);
 			}
 
@@ -1012,9 +1012,9 @@ 
 		$db->sql_freeresult($result);
 
 		// Subscribed images
-		$start				= $request->variable('start', 0);
-		$images_per_page	= $phpbb_ext_gallery_config->get('items_per_page');
-		$total_images		= 0;
+		$start = $request->variable('start', 0);
+		$images_per_page = $phpbb_ext_gallery_config->get('items_per_page');
+		$total_images = 0;
 
 		$sql = 'SELECT COUNT(image_id) as images
 			FROM ' . $watch_table . '

core/url.php

Spacing +2 added lines, -2 removed lines

@@ -129,12 +129,12 @@
 
 		if (isset($args[1]))
 		{
-			$args[1] .= '';//@todo: phpbb_gallery::$display_popup;
+			$args[1] .= ''; //@todo: phpbb_gallery::$display_popup;
 		}
 
 		$params = $args + array(
 			0	=> '',
-			1	=> '',//@todo: phpbb_gallery::$display_popup,
+			1	=> '', //@todo: phpbb_gallery::$display_popup,
 			2	=> true,
 			3	=> false,
 		);