satanasov / phpbbgallery

core/notification/events/phpbbgallery_image_approved.php

Indentation +25 added lines, -25 removed lines

@@ -11,20 +11,20 @@ 
 class phpbbgallery_image_approved extends \phpbb\notification\type\base
 {
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'phpbbgallery.core.notification.image_approved';
 	}
 	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
+	 * Notification option data (for outputting to the user)
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 * 					Array of data (including keys 'id', 'lang', and 'group')
+	 */
 	public static $notification_option = array(
 		'lang'	=> 'NOTIFICATION_TYPE_PHPBBGALLERY_IMAGE_APPROVED',
 	);
@@ -46,10 +46,10 @@ 
 	}
 
 	/**
-	* Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
-	*
-	* @return bool True/False whether or not this is available to the user
-	*/
+	 * Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
 	public function is_available()
 	{
 		return true;
@@ -140,10 +140,10 @@ 
 	}
 
 	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
+	 * Users needed to query before this notification can be displayed
+	 *
+	 * @return array Array of user_ids
+	 */
 	public function users_to_query()
 	{
 		return array();
@@ -151,14 +151,14 @@ 
 
 
 	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $data The data for the updated rules
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion)
+	 *
+	 * @param array $data The data for the updated rules
+	 * @param array $pre_create_data Data from pre_create_insert_array()
+	 *
+	 * @return array Array of data ready to be inserted into the database
+	 */
 	public function create_insert_array($data, $pre_create_data = array())
 	{
 		$this->set_data('album_name', $data['album_name']);

core/notification/helper.php

Indentation +5 added lines, -5 removed lines

@@ -235,11 +235,11 @@
 	}
 
 	/**
-	* Remove albums from watch-list
-	*
-	* @param	mixed	$album_ids		Array or integer with album_id where we delete from the watch-list.
-	* @param	mixed	$user_ids		If not set, it uses the currents user_id
-	*/
+	 * Remove albums from watch-list
+	 *
+	 * @param	mixed	$album_ids		Array or integer with album_id where we delete from the watch-list.
+	 * @param	mixed	$user_ids		If not set, it uses the currents user_id
+	 */
 	public function remove_albums($album_ids, $user_ids = false)
 	{
 		$album_ids = $this->cast_mixed_int2array($album_ids);

Braces +1 added lines, -2 removed lines

@@ -244,8 +244,7 @@
 		if (is_array($ids))
 		{
 			return array_map('intval', $ids);
-		}
-		else
+		} else
 		{
 			return array((int) $ids);
 		}

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

Braces +4 added lines, -8 removed lines

@@ -72,14 +72,12 @@ 
 			if ($login_explain && isset($this->user->lang[$login_explain]))
 			{
 				$login_explain = $this->user->lang($login_explain);
-			}
-			else
+			} else
 			{
 				$login_explain = '';
 			}
 			login_box($loginlink, $login_explain);
-		}
-		else
+		} else
 		{
 			$this->url->meta_refresh(3, $backlink);
 			trigger_error('NOT_AUTHORISED');
@@ -121,8 +119,7 @@ 
 			}
 
 			return;
-		}
-		else if ($mode == 'albums')
+		} else if ($mode == 'albums')
 		{
 			// Mark album read
 			if (!is_array($album_id))
@@ -168,8 +165,7 @@ 
 			}
 
 			return;
-		}
-		else if ($mode == 'album')
+		} else if ($mode == 'album')
 		{
 			if ($album_id === false)
 			{

core/log.php

Indentation +3 added lines, -3 removed lines

@@ -106,9 +106,9 @@
 	}
 
 	/**
-	* Delete logs
-	* @param	array	$mark	Logs selected for deletion
-	**/
+	 * Delete logs
+	 * @param	array	$mark	Logs selected for deletion
+	 **/
 	public function delete_logs($mark)
 	{
 		$sql = 'DELETE FROM ' . $this->log_table . ' WHERE ' . $this->db->sql_in_set('log_id', $mark);

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

Braces +4 added lines, -8 removed lines

@@ -204,8 +204,7 @@ 
 					$sql_array['GROUP_BY'] = 'l.description, l.log_id, i.image_id';
 				break;
 			}
-		}
-		else
+		} else
 		{
 			$sql_array['ORDER_BY'] = 'l.log_time ' . (isset($additional['sort_dir']) ? 'ASC' : 'DESC');
 			$sql_array['GROUP_BY'] = 'l.log_time, l.log_id, i.image_id';
@@ -219,8 +218,7 @@ 
 		if ($row)
 		{
 			$count = $row['count'];
-		}
-		else
+		} else
 		{
 			$count = 0;
 		}
@@ -281,8 +279,7 @@ 
 				'params' => array(
 				),
 			), 'pagination', 'page', $count, $limit, ($page-1) * $limit);
-		}
-		else if ($album == -1)
+		} else if ($album == -1)
 		{
 			$url_array = array(
 				'i' => '-phpbbgallery-core-acp-gallery_logs_module',
@@ -303,8 +300,7 @@ 
 			$url = http_build_query($url_array,'','&');
 
 			$this->pagination->generate_template_pagination(append_sid('index.php?' . $url), 'pagination', 'page', $count, $limit, ($page-1) * $limit);
-		}
-		else
+		} else
 		{
 			$this->pagination->generate_template_pagination(array(
 				'routes' => array(

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

Braces +1 added lines, -2 removed lines

@@ -180,8 +180,7 @@
 		if ($subtarget)
 		{
 			$this->phpbb_cache->destroy($target, $subtarget);
-		}
-		else
+		} else
 		{
 			$this->phpbb_cache->destroy($target);
 		}

Indentation +12 added lines, -12 removed lines

@@ -19,12 +19,12 @@ 
 	protected $table_images;
 
 	/**
-	* cache constructor.
-	* @param \phpbb\cache\service $cache
-	* @param \phpbb\db\driver\driver_interface $db
-	* @param $albums_table
-	* @param $images_table
-	*/
+	 * cache constructor.
+	 * @param \phpbb\cache\service $cache
+	 * @param \phpbb\db\driver\driver_interface $db
+	 * @param $albums_table
+	 * @param $images_table
+	 */
 	public function __construct(\phpbb\cache\service $cache, \phpbb\db\driver\driver_interface $db,
 								$albums_table, $images_table)
 	{
@@ -155,18 +155,18 @@ 
 	}
 
 	/**
-	* Destroy images cache - if we had updated image information or we want other set - we will have to destroy cache
-	*/
+	 * Destroy images cache - if we had updated image information or we want other set - we will have to destroy cache
+	 */
 	public function destroy_images()
 	{
 		$this->phpbb_cache->destroy('_images');
 	}
 
 	/**
-	* Destroy album cache
-	* Basicly some tests fail due album cache not destroyed ...
-	* So lets try it now?
-	*/
+	 * Destroy album cache
+	 * Basicly some tests fail due album cache not destroyed ...
+	 * So lets try it now?
+	 */
 	public function destroy_albums()
 	{
 		$this->phpbb_cache->destroy('_albums');

core/ucp/settings_module.php

Indentation +11 added lines, -11 removed lines

@@ -92,12 +92,12 @@ 
 			$additional_settings = array();
 
 			/**
-			* Event set personal settings
-			*
-			* @event phpbbgallery.core.ucp.set_settings_submit
-			* @var	array	additional_settings		array of additional settings
-			* @since 1.2.0
-			*/
+			 * Event set personal settings
+			 *
+			 * @event phpbbgallery.core.ucp.set_settings_submit
+			 * @var	array	additional_settings		array of additional settings
+			 * @since 1.2.0
+			 */
 			$vars = array('additional_settings');
 			extract($this->dispatcher->trigger_event('phpbbgallery.core.ucp.set_settings_submit', compact($vars)));
 
@@ -118,11 +118,11 @@ 
 		}
 
 		/**
-		* Event no submit personal settings
-		*
-		* @event phpbbgallery.core.ucp.set_settings_nosubmit
-		* @since 1.2.0
-		*/
+		 * Event no submit personal settings
+		 *
+		 * @event phpbbgallery.core.ucp.set_settings_nosubmit
+		 * @since 1.2.0
+		 */
 		$this->dispatcher->dispatch('phpbbgallery.core.ucp.set_settings_nosubmit');
 
 		$this->template->assign_vars(array(

core/ucp/main_module.php

Indentation +11 added lines, -11 removed lines

@@ -389,10 +389,10 @@ 
 			generate_text_for_storage($album_data['album_desc'], $album_data['album_desc_uid'], $album_data['album_desc_bitfield'], $album_data['album_desc_options'], $request->variable('desc_parse_bbcode', false), $request->variable('desc_parse_urls', false), $request->variable('desc_parse_smilies', false));
 
 			/**
-			* borrowed from phpBB3
-			* @author: phpBB Group
-			* @location: acp_forums->manage_forums
-			*/
+			 * borrowed from phpBB3
+			 * @author: phpBB Group
+			 * @location: acp_forums->manage_forums
+			 */
 			// Parent should always be filled otherwise we use initialise_album()
 			if ($album_data['parent_id'])
 			{
@@ -833,13 +833,13 @@ 
 			}
 
 			/**
-			* Event delete user albums
-			*
-			* @event phpbbgallery.core.ucp.delete_album
-			* @var	int		album_id			Album ID
-			* @var	array	deleted_albums		Deleted album IDs
-			* @since 1.2.0
-			*/
+			 * Event delete user albums
+			 *
+			 * @event phpbbgallery.core.ucp.delete_album
+			 * @var	int		album_id			Album ID
+			 * @var	array	deleted_albums		Deleted album IDs
+			 * @since 1.2.0
+			 */
 			$vars = array('album_id', 'deleted_albums');
 			extract($phpbb_dispatcher->trigger_event('phpbbgallery.core.ucp.delete_album', compact($vars)));
 

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 . '

Braces +13 added lines, -26 removed lines

@@ -108,8 +108,7 @@ 
 						if (!$phpbb_ext_gallery_user->get_data('personal_album_id'))
 						{
 							$this->info();
-						}
-						else
+						} else
 						{
 							$this->manage_albums();
 						}
@@ -142,8 +141,7 @@ 
 				'L_TITLE'			=> $this->language->lang('UCP_GALLERY_PERSONAL_ALBUMS'),
 				'L_TITLE_EXPLAIN'	=> $this->language->lang('NO_PERSONAL_ALBUM'),
 			));
-		}
-		else
+		} else
 		{
 			$phpbb_gallery_url->redirect('phpbb', 'ucp', 'i=-phpbbgallery-core-ucp-main_module&mode=manage_albums&action=manage');
 		}
@@ -230,8 +228,7 @@ 
 		if (!$parent_id)
 		{
 			$navigation = $this->language->lang('PERSONAL_ALBUM');
-		}
-		else
+		} else
 		{
 			$navigation = $this->language->lang('PERSONAL_ALBUM');
 
@@ -241,8 +238,7 @@ 
 				if ($row['album_id'] == $parent_id)
 				{
 					$navigation .= ' » ' . $row['album_name'];
-				}
-				else
+				} else
 				{
 					$navigation .= ' &raquo; <a href="' . $this->u_action . '&amp;action=manage&amp;parent_id=' . $row['album_id'] . '">' . $row['album_name'] . '</a>';
 				}
@@ -357,8 +353,7 @@ 
 				'S_AUTH_ACCESS_OPTIONS'		=> $s_access_options,
 				'L_ALBUM_ACCESS_EXPLAIN'	=> $this->language->lang('ALBUM_ACCESS_EXPLAIN', '<a href="' . $phpbb_gallery_url->append_sid('phpbb', 'faq') . '#f6r0">', '</a>'),
 			));
-		}
-		else
+		} else
 		{
 			if (!check_form_key('ucp_gallery'))
 			{
@@ -506,8 +501,7 @@ 
 
 				'S_MODE' 					=> 'edit',
 			));
-		}
-		else
+		} else
 		{
 			// Is it salty ?
 			if (!check_form_key('ucp_gallery'))
@@ -591,8 +585,7 @@ 
 						WHERE album_user_id = ' . (int) $row['album_user_id'] . '
 							AND right_id >= ' . (int) $row['left_id'];
 					$db->sql_query($sql);
-				}
-				else
+				} else
 				{
 					$sql = 'UPDATE ' . $albums_table . '
 						SET left_id = left_id - ' . $moving_ids . '
@@ -638,8 +631,7 @@ 
 			if ($album_data['album_name'] == '')
 			{
 				$album_data['album_name'] = $row['album_name'];
-			}
-			else if ($row['album_name'] != $album_data['album_name'])
+			} else if ($row['album_name'] != $album_data['album_name'])
 			{
 				$sql = 'UPDATE ' . $albums_table . "
 					SET album_parents = ''";
@@ -650,8 +642,7 @@ 
 			if (isset($config['zebra_enhance_version']))
 			{
 				$album_data['album_auth_access'] = min(4, max(0, $album_data['album_auth_access']));
-			}
-			else
+			} else
 			{
 				$album_data['album_auth_access'] = min(3, max(0, $album_data['album_auth_access']));
 			}
@@ -804,8 +795,7 @@ 
 						$phpbb_ext_gallery_config->set('newest_pega_username', $newest_pgallery['username']);
 						$phpbb_ext_gallery_config->set('newest_pega_user_colour', $newest_pgallery['user_colour']);
 						$phpbb_ext_gallery_config->set('newest_pega_album_id', $newest_pgallery['album_id']);
-					}
-					else
+					} else
 					{
 						$phpbb_ext_gallery_config->set('newest_pega_user_id', 0);
 						$phpbb_ext_gallery_config->set('newest_pega_username', '');
@@ -813,8 +803,7 @@ 
 						$phpbb_ext_gallery_config->set('newest_pega_album_id', 0);
 					}
 				}
-			}
-			else
+			} else
 			{
 				// Solve the left_id right_id problem
 				$delete_id = $right_id - ($left_id - 1);
@@ -855,8 +844,7 @@ 
 
 			trigger_error($this->language->lang('DELETED_ALBUMS') . '<br /><br />
 				<a href="' . (($parent_id) ? $phpbb_gallery_url->append_sid('phpbb', 'ucp', 'i=-phpbbgallery-core-ucp-main_module&amp;mode=manage_albums&amp;action=manage&amp;parent_id=' . $parent_id) : $phpbb_gallery_url->append_sid('phpbb', 'ucp', 'i=-phpbbgallery-core-ucp-main_module&amp;mode=manage_albums')) . '">' . $this->language->lang('BACK_TO_PREV') . '</a>');
-		}
-		else
+		} else
 		{
 			$album_id = $request->variable('album_id', 0);
 			$phpbb_ext_gallery_core_album->check_user($album_id);
@@ -899,8 +887,7 @@ 
 
 			$move_up_left = $moving['left_id'];
 			$move_up_right = $moving['right_id'];
-		}
-		else
+		} else
 		{
 			$left_id = $moving['left_id'];
 			$right_id = $target['right_id'];

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

Braces +5 added lines, -10 removed lines

@@ -121,8 +121,7 @@ 
 		{
 			$mode = array_shift($args);
 			$args[0] = $this->path($mode) . $this->phpEx_file($args[0]);
-		}
-		else
+		} else
 		{
 			$args[0] = $this->path() . $this->phpEx_file($args[0]);
 		}
@@ -197,8 +196,7 @@ 
 		if (!is_array($file))
 		{
 			include($this->path($path) . $sub_directory . $this->phpEx_file($file));
-		}
-		else
+		} else
 		{
 			foreach ($file as $real_file)
 			{
@@ -244,8 +242,7 @@ 
 			if (strpos($path, 'https:/') === 0)
 			{
 				$path = 'https://' . substr($path, 7);
-			}
-			else if (strpos($path, 'http:/') === 0)
+			} else if (strpos($path, 'http:/') === 0)
 			{
 				$path = 'http://' . substr($path, 6);
 			}
@@ -300,15 +297,13 @@ 
 		if ($this->config['force_server_vars'] == 1)
 		{
 			$url = $this->config['server_protocol'] . $url;
-		}
-		else
+		} else
 		{
 			$is_secure = $this->request->server('HTTPS', '');
 			if ($is_secure == 'on')
 			{
 				$url = 'https://' . $url;
-			}
-			else
+			} else
 			{
 				$url = 'http://' . $url;
 			}

Indentation +24 added lines, -24 removed lines

@@ -22,28 +22,28 @@ 
 	private $config;
 
 	/**
-	* Path from the gallery root, back to phpbb's root
-	*/
+	 * Path from the gallery root, back to phpbb's root
+	 */
 	private $phpbb_root_path = '../';
 
 	/**
-	* Path from the phpbb root, into admin's root
-	*/
+	 * Path from the phpbb root, into admin's root
+	 */
 	private $phpbb_admin_path = 'adm/';
 
 	/**
-	* Path from the phpbb root, into gallery's file root
-	*/
+	 * Path from the phpbb root, into gallery's file root
+	 */
 	private $phpbb_gallery_file_path = 'files/phpbbgallery/';
 
 	/**
-	* Path from the phpbb root, into gallery's root
-	*/
+	 * Path from the phpbb root, into gallery's root
+	 */
 	private $phpbb_gallery_path = 'gallery/';
 
 	/**
-	* PHP file extension (e.g. .php)
-	*/
+	 * PHP file extension (e.g. .php)
+	 */
 	private $php_ext;
 
 	const IMAGE_PATH = 'images/';
@@ -237,16 +237,16 @@ 
 	}
 
 	/**
-	* Creates beautiful relative path from ugly relative path
-	* Resolves .. (up directory)
-	*
-	* @author	bantu		based on phpbb_own_realpath() by Chris Smith
-	* @license	http://opensource.org/licenses/gpl-license.php GNU Public License
-	*
-	* @param	string		ugly path e.g. "../community/../gallery/"
-	* @param	bool		is it a full url, so we need to fix teh http:// at the beginning?
-	* @return	string		beautiful path e.g. "../gallery/"
-	*/
+	 * Creates beautiful relative path from ugly relative path
+	 * Resolves .. (up directory)
+	 *
+	 * @author	bantu		based on phpbb_own_realpath() by Chris Smith
+	 * @license	http://opensource.org/licenses/gpl-license.php GNU Public License
+	 *
+	 * @param	string		ugly path e.g. "../community/../gallery/"
+	 * @param	bool		is it a full url, so we need to fix teh http:// at the beginning?
+	 * @return	string		beautiful path e.g. "../gallery/"
+	 */
 	static public function beautiful_path($path, $is_full_url = false)
 	{
 		// Remove any repeated slashes
@@ -288,10 +288,10 @@ 
 	}
 
 	/**
-	* Custom meta_refresh implementation
-	* @param	int		$time	Time in seconds.
-	* @param	string	$route	Route generated by $helper->route
-	*/
+	 * Custom meta_refresh implementation
+	 * @param	int		$time	Time in seconds.
+	 * @param	string	$route	Route generated by $helper->route
+	 */
 	public function meta_refresh($time, $route)
 	{
 		// For XHTML compatibility we change back & to &

acpimport/migrations/m1_init.php

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
 			if (is_dir($file))
 			{
 				recursiveRemoveDirectory($file);
-			}
-			else
+			} else
 			{
 				unlink($file);
 			}