satanasov / phpbbgallery

core/auth/auth.php

Spacing +15 added lines, -15 removed lines

@@ -12,21 +12,21 @@ 
 
 class auth
 {
-	const SETTING_PERMISSIONS	= -39839;
-	const PERSONAL_ALBUM		= -3;
+	const SETTING_PERMISSIONS = -39839;
+	const PERSONAL_ALBUM = -3;
 	const OWN_ALBUM				= -2;
-	const PUBLIC_ALBUM			= 0;
+	const PUBLIC_ALBUM = 0;
 
 	const ACCESS_ALL			= 0;
-	const ACCESS_REGISTERED		= 1;
-	const ACCESS_NOT_FOES		= 2;
-	const ACCESS_FRIENDS		= 3;
-	const ACCESS_SPECIAL_FRIENDS	= 4;
+	const ACCESS_REGISTERED = 1;
+	const ACCESS_NOT_FOES = 2;
+	const ACCESS_FRIENDS = 3;
+	const ACCESS_SPECIAL_FRIENDS = 4;
 
 	// ACL - slightly different
-	const ACL_NO		= 0;
-	const ACL_YES		= 1;
-	const ACL_NEVER		= 2;
+	const ACL_NO = 0;
+	const ACL_YES = 1;
+	const ACL_NEVER = 2;
 
 	static protected $_permission_i = array('i_view', 'i_watermark', 'i_upload', 'i_approve', 'i_edit', 'i_delete', 'i_report', 'i_rate');
 	static protected $_permission_c = array('c_read', 'c_post', 'c_edit', 'c_delete');
@@ -167,17 +167,17 @@ 
 			$sql_select .= " MAX($permission) as $permission,";
 		}
 
-		$this->_auth_data[self::OWN_ALBUM]				= new \phpbbgallery\core\auth\set();
+		$this->_auth_data[self::OWN_ALBUM] = new \phpbbgallery\core\auth\set();
 		$this->_auth_data_never[self::OWN_ALBUM]		= new \phpbbgallery\core\auth\set();
 		$this->_auth_data[self::PERSONAL_ALBUM]			= new \phpbbgallery\core\auth\set();
-		$this->_auth_data_never[self::PERSONAL_ALBUM]	= new \phpbbgallery\core\auth\set();
+		$this->_auth_data_never[self::PERSONAL_ALBUM] = new \phpbbgallery\core\auth\set();
 
 		foreach ($albums as $album)
 		{
 			if ($album['album_user_id'] == self::PUBLIC_ALBUM)
 			{
-				$this->_auth_data[$album['album_id']]		= new \phpbbgallery\core\auth\set();
-				$this->_auth_data_never[$album['album_id']]	= new \phpbbgallery\core\auth\set();
+				$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
+				$this->_auth_data_never[$album['album_id']] = new \phpbbgallery\core\auth\set();
 			}
 		}
 
@@ -355,7 +355,7 @@ 
 
 		$zebra = null;
 
-		$albums = array();//@todo $this->cache->obtain_album_list();
+		$albums = array(); //@todo $this->cache->obtain_album_list();
 		foreach ($albums as $album)
 		{
 			if (!$album['album_auth_access'] || ($album['album_user_id'] == self::PUBLIC_ALBUM))# || ($album['album_user_id'] == $user_id))

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/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/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/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,
 		);

acpimport/acp/main_module.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 
 	function import()
 	{
-		global $db, $template, $user, $phpbb_dispatcher, $phpbb_container, $gallery_url, $request, $table_prefix ,$gallery_config, $gallery_album, $request;
+		global $db, $template, $user, $phpbb_dispatcher, $phpbb_container, $gallery_url, $request, $table_prefix, $gallery_config, $gallery_album, $request;
 
 		$import_schema = $request->variable('import_schema', '');
 		$images = $request->variable('images', array(''), true);
@@ -302,7 +302,7 @@ 
 			$album_id = $request->variable('album_id', 0);
 			if (isset($_POST['users_pega']))
 			{
-				$image_user =  $phpbb_container->get('phpbbgallery.core.user');
+				$image_user = $phpbb_container->get('phpbbgallery.core.user');
 				$image_user->set_user_id($user_row['user_id']);
 				if ($user->data['user_id'] != $user_row['user_id'])
 				{

core/controller/moderate.php

Spacing +7 added lines, -7 removed lines

@@ -260,7 +260,7 @@ 
 			}
 			else
 			{
-				$s_hidden_fields = '<input type="hidden" name="action['.$action.']" value="' . $action . '" />';
+				$s_hidden_fields = '<input type="hidden" name="action[' . $action . ']" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
 				foreach ($approve_ary as $id => $var)
 				{
@@ -361,7 +361,7 @@ 
 			}
 			else
 			{
-				$s_hidden_fields = '<input type="hidden" name="action['.$action.']" value="' . $action . '" />';
+				$s_hidden_fields = '<input type="hidden" name="action[' . $action . ']" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
 				foreach ($report_ary as $var)
 				{
@@ -583,7 +583,7 @@ 
 			case 'reports_close':
 				if (confirm_box(true))
 				{
-					$back_link =  $this->helper->route('phpbbgallery_core_moderate_image', array('image_id' => $image_id));
+					$back_link = $this->helper->route('phpbbgallery_core_moderate_image', array('image_id' => $image_id));
 					$this->report->close_reports_by_image($image_id);
 					$message = $this->language->lang('WAITING_REPORTED_DONE', 1);
 					$this->url->meta_refresh(3, $back_link);
@@ -679,7 +679,7 @@ 
 				'REPORT_TIME'	=> $this->user->format_date($var['report_time']),
 				'REPORT_NOTE'	=> $var['report_note'],
 				'STATUS'		=> $var['report_status'],
-				'MANAGER'		=> $var['report_manager'] != 0 ?  $this->user_loader->get_username($var['report_manager'], 'full') : false,
+				'MANAGER'		=> $var['report_manager'] != 0 ? $this->user_loader->get_username($var['report_manager'], 'full') : false,
 			));
 		}
 		return $this->helper->render('gallery/moderate_image_overview.html', $this->language->lang('GALLERY'));
@@ -804,7 +804,7 @@ 
 		$image_data = $this->image->get_image_data($image_id);
 		$album_id = $image_data['image_album_id'];
 		//$user_id = $image_data['image_user_id'];
-		$album_data =  $this->album->get_info($album_id);
+		$album_data = $this->album->get_info($album_id);
 		$album_backlink = $this->helper->route('phpbbgallery_core_album', array('album_id' => $album_id));
 		$image_backlink = $this->helper->route('phpbbgallery_core_image', array('image_id' => $image_id));
 		$album_loginlink = append_sid($this->root_path . 'ucp.' . $this->php_ext . '?mode=login');
@@ -852,7 +852,7 @@ 
 		$image_data = $this->image->get_image_data($image_id);
 		$album_id = $image_data['image_album_id'];
 		//$user_id = $image_data['image_user_id'];
-		$album_data =  $this->album->get_info($album_id);
+		$album_data = $this->album->get_info($album_id);
 		$album_backlink = $this->helper->route('phpbbgallery_core_album', array('album_id' => $album_id));
 		$image_backlink = $this->helper->route('phpbbgallery_core_image', array('image_id' => $image_id));
 		$album_loginlink = append_sid($this->root_path . 'ucp.' . $this->php_ext . '?mode=login');
@@ -868,7 +868,7 @@ 
 			$image_id_ary = array($image_id);
 			$this->image->lock_images($image_id_ary, $album_data['album_id']);
 			// To DO - add notification
-			$message = sprintf($this->language->lang('WAITING_LOCKED_IMAGE',1));
+			$message = sprintf($this->language->lang('WAITING_LOCKED_IMAGE', 1));
 			meta_refresh($meta_refresh_time, $image_backlink);
 			trigger_error($message);
 		}